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 | |
parent | Avoid sub-classing from std container, especially for this. (diff) | |
download | core-ac7acb0ab1329913b0cec79790adcde0263960be.tar.gz core-ac7acb0ab1329913b0cec79790adcde0263960be.zip |
Merged SvTreeListBox and SvLBox.
There is no reason to keep SvLBox separate.
Change-Id: I0b34aa8f8ca539d4f4f0f9cea9fa9b8faec241e8
Diffstat (limited to 'cui')
-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 | ||||
-rw-r--r-- | cui/source/dialogs/thesdlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/thesdlg_impl.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/acccfg.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/cfg.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/cfgutil.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/hlmarkwn.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/scriptdlg.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/selector.hxx | 2 | ||||
-rw-r--r-- | cui/source/options/fontsubs.cxx | 1 | ||||
-rw-r--r-- | cui/source/options/optHeaderTabListbox.cxx | 5 | ||||
-rw-r--r-- | cui/source/options/optfltr.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optlingu.cxx | 10 | ||||
-rw-r--r-- | cui/source/options/radiobtnbox.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/macroass.cxx | 1 |
18 files changed, 34 insertions, 31 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() ); diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index fea6127f3bfd..47a396549d91 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -26,7 +26,7 @@ #include <svl/lngmisc.hxx> #include <svtools/filter.hxx> #include <svtools/svlbitm.hxx> -#include <svtools/svtreebx.hxx> +#include <svtools/treelistbox.hxx> #include <vcl/wrkwin.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> @@ -139,7 +139,7 @@ AlternativesString::AlternativesString( void AlternativesString::Paint( const Point& rPos, - SvLBox& rDev, sal_uInt16, + SvTreeListBox& rDev, sal_uInt16, SvLBoxEntry* pEntry ) { AlternativesExtraData* pData = m_rControlImpl.GetExtraData( pEntry ); diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx index 5269cb30fdf9..8c827fde6b72 100644 --- a/cui/source/dialogs/thesdlg_impl.hxx +++ b/cui/source/dialogs/thesdlg_impl.hxx @@ -56,7 +56,7 @@ public: AlternativesString( ThesaurusAlternativesCtrl &rControl, SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rStr ); - virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry); + virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry); }; #endif diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 6686cb3139c2..ca4a8c5c6dbd 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -40,7 +40,7 @@ #include <vcl/lstbox.hxx> #include <vcl/group.hxx> #include <svtools/svtabbx.hxx> -#include <svtools/svtreebx.hxx> +#include <svtools/treelistbox.hxx> #include <sfx2/tabdlg.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/minarray.hxx> diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index d37911ce86fe..3db2a5506981 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -24,7 +24,7 @@ #include <vcl/group.hxx> #include <vcl/menubtn.hxx> #include <vcl/toolbox.hxx> -#include <svtools/svtreebx.hxx> +#include <svtools/treelistbox.hxx> #include <svtools/svmedit2.hxx> #include <svtools/svmedit.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index fe869d957f65..52584ebc822a 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -31,7 +31,7 @@ #include <com/sun/star/script/browse/XBrowseNode.hpp> #include <vcl/timer.hxx> #include <svtools/svtabbx.hxx> -#include <svtools/svtreebx.hxx> +#include <svtools/treelistbox.hxx> #include <vcl/image.hxx> class SfxMacroInfoItem; diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index de683b4f7299..eb51856f96a6 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <vcl/dialog.hxx> #include <vcl/button.hxx> -#include <svtools/svtreebx.hxx> +#include <svtools/treelistbox.hxx> #include "hlmarkwn_def.hxx" class SvxHyperlinkTabPageBase; diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 514089c7dbdf..9aef16f40e46 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -24,7 +24,7 @@ #include "tools/solar.h" -#include <svtools/svtreebx.hxx> +#include <svtools/treelistbox.hxx> #include <vcl/dialog.hxx> #include <vcl/button.hxx> #include <vcl/fixed.hxx> diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 4da182f509c0..c2828114c164 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -23,7 +23,7 @@ #include <vcl/fixed.hxx> #include <vcl/group.hxx> #include <vcl/menubtn.hxx> -#include <svtools/svtreebx.hxx> +#include <svtools/treelistbox.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/frame/XFrame.hpp> diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index c250a2d55299..13ef512dbbb6 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -22,6 +22,7 @@ #include <officecfg/Office/Common.hxx> #include <tools/shl.hxx> #include <svtools/ctrltool.hxx> +#include <svtools/svlbitm.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> #include <svtools/fontsubstconfig.hxx> diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx index 49cb98527809..a479751a3986 100644 --- a/cui/source/options/optHeaderTabListbox.cxx +++ b/cui/source/options/optHeaderTabListbox.cxx @@ -20,6 +20,7 @@ #include "optHeaderTabListbox.hxx" #include <vcl/svapp.hxx> #include <svtools/headbar.hxx> +#include <svtools/svlbitm.hxx> namespace svx { @@ -31,12 +32,12 @@ public: OptLBoxString_Impl( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rTxt ) : SvLBoxString( pEntry, nFlags, rTxt ) {} - virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry ); + virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry ); }; // ----------------------------------------------------------------------- -void OptLBoxString_Impl::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, SvLBoxEntry* pEntry ) +void OptLBoxString_Impl::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvLBoxEntry* pEntry ) { Font aOldFont( rDev.GetFont() ); Font aFont( aOldFont ); diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index fc6a2185210d..6afeba5bdbfe 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -25,6 +25,8 @@ #include "helpid.hrc" #include <dialmgr.hxx> +#include "svtools/svlbitm.hxx" + enum MSFltrPg2_CheckBoxEntries { Math, Writer, diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 3ea970e72d3b..cae53775497a 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -47,7 +47,7 @@ #include <com/sun/star/system/SystemShellExecute.hpp> #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <unotools/extendedsecurityoptions.hxx> -#include <svtools/svlbox.hxx> +#include <svtools/treelistbox.hxx> #include <svtools/langhelp.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> @@ -283,11 +283,11 @@ public: BrwStringDic_Impl( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) : SvLBoxString( pEntry, nFlags, rStr ) {} - virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, + virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry); }; -void BrwStringDic_Impl::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, +void BrwStringDic_Impl::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvLBoxEntry* pEntry ) { ModuleUserData_Impl* pData = (ModuleUserData_Impl*)pEntry->GetUserData(); @@ -450,11 +450,11 @@ public: BrwString_Impl( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) : SvLBoxString( pEntry, nFlags, rStr ) {} - virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, + virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry); }; -void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, +void BrwString_Impl::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvLBoxEntry* pEntry ) { Point aPos(rPos); diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx index 76b1a4ffca4e..dd5fb5979c7d 100644 --- a/cui/source/options/radiobtnbox.cxx +++ b/cui/source/options/radiobtnbox.cxx @@ -20,6 +20,8 @@ #include "radiobtnbox.hxx" #include <dialmgr.hxx> +#include "svtools/svlbitm.hxx" + namespace svx { // class SvxRadioButtonListBox ---------------------------------------------------- diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 8d839d0e1203..646e48b8fdd0 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -333,11 +333,11 @@ public: OfaImpBrwString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) : SvLBoxString(pEntry,nFlags,rStr){} - virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, + virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry); }; -void OfaImpBrwString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 /*nFlags*/, +void OfaImpBrwString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /*nFlags*/, SvLBoxEntry* pEntry ) { rDev.DrawText( rPos, GetText() ); diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 881e59a7d2cf..6fa74205d4fd 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -36,6 +36,7 @@ #include "cuires.hrc" #include <vcl/fixed.hxx> #include "headertablistbox.hxx" +#include "svtools/svlbitm.hxx" using ::com::sun::star::uno::Reference; using ::com::sun::star::frame::XFrame; |