diff options
author | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
commit | 06ec1c089519ef3249464aa09eadf03a8db93a39 (patch) | |
tree | 85b2eb6d8ba6ca95e18e1ff82151224cb14106f6 /dbaccess/source/ui/inc/listviewitems.hxx | |
parent | Add some check to renewpo (diff) | |
parent | oox: ZipStorage: better exception tracing (diff) | |
download | core-06ec1c089519ef3249464aa09eadf03a8db93a39.tar.gz core-06ec1c089519ef3249464aa09eadf03a8db93a39.zip |
Merge branch 'master' into feature/killsdf
Conflicts:
Repository.mk
RepositoryFixes.mk
connectivity/prj/build.lst
extensions/prj/build.lst
filter/prj/build.lst
fpicker/prj/build.lst
l10ntools/StaticLibrary_transex.mk
saxon/build.xml
shell/prj/build.lst
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/Configuration.mk
solenv/gbuild/UI.mk
ucb/source/ucp/webdav/webdavcontent.cxx
Diffstat (limited to 'dbaccess/source/ui/inc/listviewitems.hxx')
-rw-r--r-- | dbaccess/source/ui/inc/listviewitems.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/source/ui/inc/listviewitems.hxx b/dbaccess/source/ui/inc/listviewitems.hxx index 99aca2095a40..c9d076cc9ca4 100644 --- a/dbaccess/source/ui/inc/listviewitems.hxx +++ b/dbaccess/source/ui/inc/listviewitems.hxx @@ -37,7 +37,7 @@ namespace dbaui sal_Bool m_bEmphasized; public: - OBoldListboxString(SvLBoxEntry* _pEntry, sal_uInt16 _nFlags, const XubString& _rStr) + OBoldListboxString(SvTreeListEntry* _pEntry, sal_uInt16 _nFlags, const XubString& _rStr) :SvLBoxString(_pEntry, _nFlags, _rStr) ,m_bEmphasized(sal_False) { @@ -45,8 +45,8 @@ namespace dbaui virtual sal_uInt16 IsA(); - virtual void Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry); - virtual void InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* _pViewData); + virtual void Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvTreeListEntry* pEntry); + virtual void InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* _pViewData); sal_Bool isEmphasized() const { return m_bEmphasized; } void emphasize(sal_Bool _bEmphasize) { m_bEmphasized = _bEmphasize; } |