Merged SvTreeListBox and SvLBox.

There is no reason to keep SvLBox separate.

Change-Id: I0b34aa8f8ca539d4f4f0f9cea9fa9b8faec241e8

17 files changed, 35 insertions, 30 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 );
 };
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 01e1c4cdf174..e1600455b8e2 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -31,6 +31,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
 #include <svtools/txtcmp.hxx>
+#include <svtools/svlbitm.hxx>
 #include <unotools/charclass.hxx>
 
 #include <editeng/unolingu.hxx>
@@ -120,7 +121,7 @@ SvLBoxItem* SvLBoxColorString::Create() const
     return new SvLBoxColorString;
 }
 
-void SvLBoxColorString::Paint( const Point& rPos, SvLBox& rDev,
+void SvLBoxColorString::Paint( const Point& rPos, SvTreeListBox& rDev,
                              sal_uInt16 nFlags, SvLBoxEntry* pEntry )
 /* [Description]
 
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 59126ffc1643..621c928dc6f0 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -892,7 +892,7 @@ RecovDocListEntry::RecovDocListEntry(      SvLBoxEntry* pEntry,
 
 //===============================================
 void RecovDocListEntry::Paint(const Point&       aPos   ,
-                                    SvLBox&      aDevice,
+                                    SvTreeListBox&      aDevice,
                                     sal_uInt16       /*nFlags */,
                                     SvLBoxEntry* pEntry )
 {
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index b697a66061c8..eaaee5f49964 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -64,7 +64,7 @@ SvLBoxItem* SvLBoxFontString::Create() const
     return new SvLBoxFontString;
 }
 
-void SvLBoxFontString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry )
+void SvLBoxFontString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry )
 {
     DBG_CHKTHIS( SvLBoxFontString, 0 );
     Font aOldFont( rDev.GetFont() );
@@ -81,7 +81,7 @@ void SvLBoxFontString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags
     rDev.SetFont( aOldFont );
 }
 
-void SvLBoxFontString::InitViewData( SvLBox* pView, SvLBoxEntry* pEntry, SvViewDataItem* pViewData )
+void SvLBoxFontString::InitViewData( SvTreeListBox* pView, SvLBoxEntry* pEntry, SvViewDataItem* pViewData )
 {
     DBG_CHKTHIS( SvLBoxFontString, 0 );
     Font aOldFont( pView->GetFont() );
diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx
index 97c223d094c4..e76ad7ba8f18 100644
--- a/svx/source/dialog/simptabl.cxx
+++ b/svx/source/dialog/simptabl.cxx
@@ -31,6 +31,7 @@
 
 #include <comphelper/processfactory.hxx>
 #include <unotools/intlwrapper.hxx>
+#include <svtools/svlbitm.hxx>
 
 // SvxSimpleTableContainer  ------------------------------------------------------
 
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 270b9562d81e..9a9fba93093a 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -62,6 +62,7 @@
 #include <tools/shl.hxx>
 #include <vcl/wrkwin.hxx>
 #include <tools/diagnose_ex.h>
+#include <svtools/svlbitm.hxx>
 
 #include <functional>
 
@@ -1040,13 +1041,13 @@ public:
     FmFilterItemsString( SvLBoxEntry* pEntry, sal_uInt16 nFlags,    const XubString& rStr )
         :SvLBoxString(pEntry,nFlags,rStr){}
 
-    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);
 };
 
 const int nxDBmp = 12;
 //------------------------------------------------------------------------
-void FmFilterItemsString::Paint(const Point& rPos, SvLBox& rDev, sal_uInt16 /*nFlags*/, SvLBoxEntry* pEntry )
+void FmFilterItemsString::Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /*nFlags*/, SvLBoxEntry* pEntry )
 {
     FmFilterItems* pRow = (FmFilterItems*)pEntry->GetUserData();
     FmFormItem* pForm = (FmFormItem*)pRow->GetParent();
@@ -1079,7 +1080,7 @@ void FmFilterItemsString::Paint(const Point& rPos, SvLBox& rDev, sal_uInt16 /*nF
 }
 
 //------------------------------------------------------------------------
-void FmFilterItemsString::InitViewData( SvLBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* pViewData)
+void FmFilterItemsString::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* pViewData)
 {
     if( !pViewData )
         pViewData = pView->GetViewDataItem( pEntry, this );
@@ -1104,14 +1105,14 @@ public:
         m_aName.AppendAscii(": ");
     }
 
-    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);
 };
 
 const int nxD = 4;
 
 //------------------------------------------------------------------------
-void FmFilterString::InitViewData( SvLBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* pViewData)
+void FmFilterString::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* pViewData)
 {
     if( !pViewData )
         pViewData = pView->GetViewDataItem( pEntry, this );
@@ -1128,7 +1129,7 @@ void FmFilterString::InitViewData( SvLBox* pView,SvLBoxEntry* pEntry, SvViewData
 }
 
 //------------------------------------------------------------------------
-void FmFilterString::Paint(const Point& rPos, SvLBox& rDev, sal_uInt16 /*nFlags*/, SvLBoxEntry* /*pEntry*/ )
+void FmFilterString::Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /*nFlags*/, SvLBoxEntry* /*pEntry*/ )
 {
     Font aOldFont( rDev.GetFont());
     Font aFont( aOldFont );
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index 32c2bf1622bf..fab396509a3a 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -32,7 +32,7 @@
 #include <svl/itempool.hxx>
 
 #include <sot/formats.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
 #include <tools/diagnose_ex.h>
 
 
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index e814bfc0d6eb..462c9911665e 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -38,7 +38,7 @@
 #include <vcl/toolbox.hxx>
 #include <svtools/inettbc.hxx>
 #include <svtools/svmedit.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
 #include <sfx2/dockwin.hxx>
 #include <sfx2/ctrlitem.hxx>
 #include <svx/simptabl.hxx>
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index fe0254aed368..12cb6804b1d6 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -35,7 +35,8 @@
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include <svtools/svmedit2.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
+#include <svtools/svlbitm.hxx>
 #include <svx/simptabl.hxx>
 
 #include <cppuhelper/implbase1.hxx>
@@ -576,10 +577,8 @@ class RecovDocListEntry : public SvLBoxString
 
         //---------------------------------------
         /** @short TODO */
-        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);
 };
 
 //===============================================
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index cb80e295820c..753b38db21a2 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -41,7 +41,7 @@
 #include <sfx2/dockwin.hxx>
 #include <sfx2/ctrlitem.hxx>
 #include <vcl/image.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
 
 #include <vcl/dialog.hxx>
 #include <vcl/group.hxx>
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 6d7131ae050a..89a8dd67702b 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -47,7 +47,7 @@
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
 
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
 
 #include <vcl/dialog.hxx>
 #include <vcl/group.hxx>
diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx
index 3362316204c3..ba6f87c1be98 100644
--- a/svx/source/inc/tabwin.hxx
+++ b/svx/source/inc/tabwin.hxx
@@ -19,7 +19,7 @@
 #ifndef _SVX_TABWIN_HXX
 #define _SVX_TABWIN_HXX
 
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
 #include <vcl/floatwin.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/childwin.hxx>
@@ -51,10 +51,10 @@ protected:
     // DragSourceHelper
     virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
 
-    // SvLBox
+    // SvTreeListBox
     virtual sal_Bool DoubleClickHdl();
 
-    using SvLBox::ExecuteDrop;
+    using SvTreeListBox::ExecuteDrop;
 };
 
 //========================================================================
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx
index 0c487f6af7ac..2218543b9de6 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -30,7 +30,7 @@
 
 #include "svx/svxdllapi.h"
 
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
 #include <vcl/button.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/field.hxx>
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 3d347f319d78..f58ef9e722c6 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -40,6 +40,7 @@
 #include <com/sun/star/lang/Locale.hpp>
 // header for class HeaderBar
 #include <svtools/headbar.hxx>
+#include <svtools/svlbitm.hxx>
 // header for define RET_OK
 #include <vcl/msgbox.hxx>
 // header for class SvtLinguConfigItem
diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx
index 03c0375f578d..4d35ebaf515b 100644
--- a/svx/workben/msview/msview.cxx
+++ b/svx/workben/msview/msview.cxx
@@ -47,7 +47,7 @@
 #include <tools/urlobj.hxx>
 #include <osl/file.hxx>
 #include <vcl/unohelp2.hxx>
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
 #include <svtools/svmedit.hxx>
 #include <sfx2/filedlghelper.hxx>