diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-10-11 16:13:12 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-10-11 23:35:15 -0400 |
| commit | ac7acb0ab1329913b0cec79790adcde0263960be (patch) | |
| tree | d9d01baa97e42524c280e6e31f768e3d6119f41a /cui/source/customize | |
| parent | ddf31912ddb5573a085b8601669cf31bf4b1f690 (diff) | |
Merged SvTreeListBox and SvLBox.
There is no reason to keep SvLBox separate.
Change-Id: I0b34aa8f8ca539d4f4f0f9cea9fa9b8faec241e8
Diffstat (limited to 'cui/source/customize')
| -rw-r--r-- | cui/source/customize/acccfg.cxx | 14 | ||||
| -rw-r--r-- | cui/source/customize/cfg.cxx | 3 | ||||
| -rw-r--r-- | cui/source/customize/macropg.cxx | 5 |
3 files changed, 9 insertions, 13 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index a3dbed09dabd..1bfbfd48853f 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -628,10 +628,8 @@ class SfxAccCfgLBoxString_Impl : public SvLBoxString virtual ~SfxAccCfgLBoxString_Impl(); - virtual void Paint(const Point& aPos , - SvLBox& rDevice, - sal_uInt16 nFlags , - SvLBoxEntry* pEntry ); + virtual void Paint( + const Point& aPos, SvTreeListBox& rDevice, sal_uInt16 nFlags, SvLBoxEntry* pEntry); }; //----------------------------------------------- @@ -647,13 +645,9 @@ SfxAccCfgLBoxString_Impl::~SfxAccCfgLBoxString_Impl() { } -//----------------------------------------------- -void SfxAccCfgLBoxString_Impl::Paint(const Point& aPos , - SvLBox& rDevice, - sal_uInt16 /*nFlags*/, - SvLBoxEntry* pEntry ) +void SfxAccCfgLBoxString_Impl::Paint( + const Point& aPos, SvTreeListBox& rDevice, sal_uInt16 /*nFlags*/, SvLBoxEntry* pEntry) { - if (!pEntry) return; diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 2f1945c6cd36..50e21ff19710 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -43,6 +43,7 @@ #include <sfx2/filedlghelper.hxx> #include <svl/stritem.hxx> #include <svtools/miscopt.hxx> +#include <svtools/svlbitm.hxx> #include <tools/diagnose_ex.h> #include <toolkit/unohlp.hxx> @@ -1358,7 +1359,7 @@ public: ~PopupPainter() { } - void Paint( const Point& rPos, SvLBox& rOutDev, + void Paint( const Point& rPos, SvTreeListBox& rOutDev, sal_uInt16 nViewDataEntryFlags, SvLBoxEntry* pEntry ) { SvLBoxString::Paint( rPos, rOutDev, nViewDataEntryFlags, pEntry ); diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index c4d90cfdd529..7aa0c95e3101 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -22,6 +22,7 @@ #include "macropg.hxx" #include <vcl/msgbox.hxx> #include <svtools/svmedit.hxx> +#include <svtools/svlbitm.hxx> #include <svl/eitem.hxx> #include <tools/diagnose_ex.h> #include <sfx2/app.hxx> @@ -434,7 +435,7 @@ class IconLBoxString : public SvLBoxString public: IconLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& sText, Image* pMacroImg, Image* pComponentImg ); - virtual void Paint(const Point& aPos, SvLBox& aDevice, sal_uInt16 nFlags, SvLBoxEntry* pEntry ); + virtual void Paint(const Point& aPos, SvTreeListBox& aDevice, sal_uInt16 nFlags, SvLBoxEntry* pEntry ); }; @@ -448,7 +449,7 @@ IconLBoxString::IconLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const St } //=============================================== -void IconLBoxString::Paint( const Point& aPos, SvLBox& aDevice, +void IconLBoxString::Paint( const Point& aPos, SvTreeListBox& aDevice, sal_uInt16 /*nFlags*/, SvLBoxEntry* /*pEntry*/ ) { String aTxt( GetText() ); |