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 /svx/inc | |
| 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 'svx/inc')
| -rw-r--r-- | svx/inc/svx/checklbx.hxx | 2 | ||||
| -rw-r--r-- | svx/inc/svx/ctredlin.hxx | 3 | ||||
| -rw-r--r-- | svx/inc/svx/fontlb.hxx | 5 |
3 files changed, 6 insertions, 4 deletions
diff --git a/svx/inc/svx/checklbx.hxx b/svx/inc/svx/checklbx.hxx index 79d35ae7b1c4..1e977ddeff83 100644 --- a/svx/inc/svx/checklbx.hxx +++ b/svx/inc/svx/checklbx.hxx @@ -28,7 +28,7 @@ #ifndef _SVX_CHECKLBX_HXX #define _SVX_CHECKLBX_HXX -#include <svtools/svtreebx.hxx> +#include <svtools/treelistbox.hxx> #include <svtools/svlbitm.hxx> #include <vcl/lstbox.hxx> diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx index 74e92bcce50b..64348d9bbfc1 100644 --- a/svx/inc/svx/ctredlin.hxx +++ b/svx/inc/svx/ctredlin.hxx @@ -33,6 +33,7 @@ #include <vcl/combobox.hxx> #include <svtools/headbar.hxx> #include <svtools/svtabbx.hxx> +#include "svtools/svlbitm.hxx" #include <vcl/lstbox.hxx> #include <vcl/tabpage.hxx> #include <vcl/field.hxx> @@ -86,7 +87,7 @@ public: SvLBoxColorString(); ~SvLBoxColorString(); - void Paint( const Point&, SvLBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* ); + void Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* ); SvLBoxItem* Create() const; }; diff --git a/svx/inc/svx/fontlb.hxx b/svx/inc/svx/fontlb.hxx index ab6dfe8081c6..dad16fa35218 100644 --- a/svx/inc/svx/fontlb.hxx +++ b/svx/inc/svx/fontlb.hxx @@ -30,6 +30,7 @@ #define SVX_FONTLB_HXX #include <svtools/svtabbx.hxx> +#include <svtools/svlbitm.hxx> #include <vcl/virdev.hxx> #include "svx/svxdllapi.h" @@ -56,12 +57,12 @@ public: /** Creates a new empty list box item. */ virtual SvLBoxItem* Create() const; - void InitViewData( SvLBox*,SvLBoxEntry*,SvViewDataItem* ); + void InitViewData( SvTreeListBox*,SvLBoxEntry*,SvViewDataItem* ); /** Paints this entry to the specified position, using the own font settings. */ void Paint( const Point& rPos, - SvLBox& rDev, + SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry ); }; |