Merged SvTreeListBox and SvLBox.

There is no reason to keep SvLBox separate.

Change-Id: I0b34aa8f8ca539d4f4f0f9cea9fa9b8faec241e8

13 files changed, 19 insertions, 18 deletions

diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index 11f89c23eebd..17ae90ee6f7f 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -37,7 +37,7 @@
 #include <vcl/lstbox.hxx>
 #include <svtools/svmedit.hxx>
 #include <svtools/headbar.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
 #include <vcl/combobox.hxx>
 #include <svl/lstner.hxx>
 class SwMailMergeWizard;
diff --git a/sw/source/ui/envelp/labimp.hxx b/sw/source/ui/envelp/labimp.hxx
index 2c7c4007a443..d4d98dc17fc8 100644
--- a/sw/source/ui/envelp/labimp.hxx
+++ b/sw/source/ui/envelp/labimp.hxx
@@ -80,7 +80,7 @@
 #include <com/sun/star/awt/XLayoutConstrains.hpp>
 #include <com/sun/star/awt/XProgressBar.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
 #include <label.hxx>
 #include <labimg.hxx>
 #include <vector>
diff --git a/sw/source/ui/fldui/FldRefTreeListBox.hxx b/sw/source/ui/fldui/FldRefTreeListBox.hxx
index bdb7d1c7e14e..782f4571013d 100644
--- a/sw/source/ui/fldui/FldRefTreeListBox.hxx
+++ b/sw/source/ui/fldui/FldRefTreeListBox.hxx
@@ -19,7 +19,7 @@
 #ifndef _FLDREFTREELISTBOX_HXX
 #define _FLDREFTREELISTBOX_HXX
 
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
 
 class SwFldRefTreeListBox : public SvTreeListBox
 {
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index 57182d6ed1b2..0ab9d75758c4 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -33,7 +33,7 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/button.hxx>
 #include <vcl/group.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
 
 #include "numfmtlb.hxx"
 #include "fldpage.hxx"
diff --git a/sw/source/ui/inc/changedb.hxx b/sw/source/ui/inc/changedb.hxx
index 92a4cc00fd25..c7f6042c6e47 100644
--- a/sw/source/ui/inc/changedb.hxx
+++ b/sw/source/ui/inc/changedb.hxx
@@ -33,7 +33,7 @@
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include <svtools/stdctrl.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
 #include <svx/stddlg.hxx>
 #include "dbtree.hxx"
 
diff --git a/sw/source/ui/inc/cnttab.hxx b/sw/source/ui/inc/cnttab.hxx
index e18522b42d6f..ae91648db673 100644
--- a/sw/source/ui/inc/cnttab.hxx
+++ b/sw/source/ui/inc/cnttab.hxx
@@ -35,7 +35,7 @@
 #include <toxmgr.hxx>
 #include <svx/checklbx.hxx>
 #include <tools/resary.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
 #include <vcl/menubtn.hxx>
 #include <svx/langbox.hxx>
 
diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx
index 01e90a6c9056..5725a5df0826 100644
--- a/sw/source/ui/inc/conttree.hxx
+++ b/sw/source/ui/inc/conttree.hxx
@@ -28,7 +28,8 @@
 #ifndef _CONTTREE_HXX
 #define _CONTTREE_HXX
 
-#include <svtools/svtreebx.hxx>
+#include "svtools/treelistbox.hxx"
+#include "svtools/svlbitm.hxx"
 #include "swcont.hxx"
 
 #include <map>
@@ -101,7 +102,7 @@ class SwContentTree : public SvTreeListBox
 
     void                FindActiveTypeAndRemoveUserData();
 
-    using SvLBox::ExecuteDrop;
+    using SvTreeListBox::ExecuteDrop;
     using SvTreeListBox::EditEntry;
     using SvListView::Expand;
     using SvListView::Collapse;
@@ -219,7 +220,7 @@ public:
     {
     }
 
-    virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags,
+    virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags,
         SvLBoxEntry* pEntry);
 };
 
@@ -254,8 +255,8 @@ private:
 
     DECL_LINK(  DialogClosedHdl, sfx2::FileDialogHelper* );
 
-    using SvLBox::DoubleClickHdl;
-    using SvLBox::ExecuteDrop;
+    using SvTreeListBox::DoubleClickHdl;
+    using SvTreeListBox::ExecuteDrop;
     using Window::Update;
 
 protected:
diff --git a/sw/source/ui/inc/dbtree.hxx b/sw/source/ui/inc/dbtree.hxx
index 08d29470ebf0..fdcaf5368259 100644
--- a/sw/source/ui/inc/dbtree.hxx
+++ b/sw/source/ui/inc/dbtree.hxx
@@ -28,7 +28,7 @@
 #ifndef _DBTREE_HXX
 #define _DBTREE_HXX
 
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
 #include <com/sun/star/uno/Reference.h>
 
 #include "swdllapi.h"
diff --git a/sw/source/ui/inc/glossary.hxx b/sw/source/ui/inc/glossary.hxx
index 2181cc576ba4..c707f46e25e6 100644
--- a/sw/source/ui/inc/glossary.hxx
+++ b/sw/source/ui/inc/glossary.hxx
@@ -29,7 +29,7 @@
 #define _GLOSSARY_HXX
 
 #include <vcl/edit.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
 #include <svx/stddlg.hxx>
 
 #include <vcl/button.hxx>
diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx
index 0217dbfd7f31..8fce92f63ed1 100644
--- a/sw/source/ui/inc/regionsw.hxx
+++ b/sw/source/ui/inc/regionsw.hxx
@@ -36,7 +36,7 @@
 #include <vcl/fixed.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/group.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <editeng/brshitem.hxx>
diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx
index 30f1c5f0627e..8c57979a3f4a 100644
--- a/sw/source/ui/inc/swuicnttab.hxx
+++ b/sw/source/ui/inc/swuicnttab.hxx
@@ -43,7 +43,7 @@
 #include "tox.hxx"
 #include <toxmgr.hxx>
 #include <svx/checklbx.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
 #include <vcl/menubtn.hxx>
 #include <svx/langbox.hxx>
 #include <cnttab.hxx>
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index c3d0d44c2ee5..c000e4c980d5 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -3130,7 +3130,7 @@ public:
     SwContentLBoxString( 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);
 };
 
@@ -3145,7 +3145,7 @@ void SwContentTree::InitEntry(SvLBoxEntry* pEntry,
     pEntry->ReplaceItem( pStr, nColToHilite );
 }
 
-void SwContentLBoxString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags,
+void SwContentLBoxString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags,
     SvLBoxEntry* pEntry )
 {
     if(lcl_IsContent(pEntry) &&
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx
index bd460d33f5a0..f3d2929c7597 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -1234,7 +1234,7 @@ void SwGlobalTree::InitEntry(SvLBoxEntry* pEntry,
     pEntry->ReplaceItem( pStr, nColToHilite );
 }
 
-void SwLBoxString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags,
+void SwLBoxString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags,
     SvLBoxEntry* pEntry )
 {
     SwGlblDocContent* pCont = (SwGlblDocContent*)pEntry->GetUserData();