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 /dbaccess/source/ui/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 'dbaccess/source/ui/inc')
| -rw-r--r-- | dbaccess/source/ui/inc/TableWindowListBox.hxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/dbtreelistbox.hxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/indexdialog.hxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/listviewitems.hxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/marktree.hxx | 1 |
5 files changed, 6 insertions, 5 deletions
diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx index 1bec9757ed0d..890f69887e6e 100644 --- a/dbaccess/source/ui/inc/TableWindowListBox.hxx +++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx @@ -19,7 +19,7 @@ #ifndef DBAUI_TABLEWINDOWLISTBOX_HXX #define DBAUI_TABLEWINDOWLISTBOX_HXX -#include <svtools/svtreebx.hxx> +#include <svtools/treelistbox.hxx> #include "callbacks.hxx" struct AcceptDropEvent; diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index 7ef0cd1a328c..f5948baee4cd 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <svtools/svtreebx.hxx> +#include <svtools/treelistbox.hxx> #include <vcl/timer.hxx> #include <set> diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index 1a0ab7e7709a..61ae42971402 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -29,7 +29,7 @@ #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <vcl/toolbox.hxx> -#include <svtools/svtreebx.hxx> +#include <svtools/treelistbox.hxx> #include <unotools/viewoptions.hxx> #include "indexes.hxx" #include "ToolBoxHelper.hxx" diff --git a/dbaccess/source/ui/inc/listviewitems.hxx b/dbaccess/source/ui/inc/listviewitems.hxx index 6fb05f0a1a20..99aca2095a40 100644 --- a/dbaccess/source/ui/inc/listviewitems.hxx +++ b/dbaccess/source/ui/inc/listviewitems.hxx @@ -45,8 +45,8 @@ namespace dbaui virtual sal_uInt16 IsA(); - virtual void Paint(const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry); - virtual void InitViewData( SvLBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* _pViewData); + virtual void Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry); + virtual void InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* _pViewData); sal_Bool isEmphasized() const { return m_bEmphasized; } void emphasize(sal_Bool _bEmphasize) { m_bEmphasized = _bEmphasize; } diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx index 12db88750880..adda68952197 100644 --- a/dbaccess/source/ui/inc/marktree.hxx +++ b/dbaccess/source/ui/inc/marktree.hxx @@ -22,6 +22,7 @@ #include "dbtreelistbox.hxx" +#include "svtools/svlbitm.hxx" //......................................................................... |