From ac7acb0ab1329913b0cec79790adcde0263960be Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@gmail.com>
Date: Thu, 11 Oct 2012 16:13:12 -0400
Subject: Merged SvTreeListBox and SvLBox.

There is no reason to keep SvLBox separate.

Change-Id: I0b34aa8f8ca539d4f4f0f9cea9fa9b8faec241e8
---
 basctl/source/basicide/bastype2.hxx | 2 +-
 basctl/source/basicide/moduldl2.cxx | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'basctl')

diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index b718ce2df6de..1c0de301f33f 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -24,7 +24,7 @@
 #include <memory>
 #include "tools/solar.h"
 
-#include <svtools/svtreebx.hxx>
+#include <svtools/treelistbox.hxx>
 #include <svl/lstner.hxx>
 #include <basic/sbstar.hxx>
 #include <sbxitem.hxx>
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 931e727c6f64..4986ad2dad37 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -40,6 +40,7 @@
 #include <sfx2/request.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
+#include <svtools/svlbitm.hxx>
 
 #include <sot/storage.hxx>
 #include <com/sun/star/io/Pipe.hpp>
@@ -121,12 +122,12 @@ public:
     LibLBoxString( 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 LibLBoxString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, SvLBoxEntry* pEntry )
+void LibLBoxString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvLBoxEntry* pEntry )
 {
     // Change text color if library is read only:
     bool bReadOnly = false;
@@ -1445,7 +1446,7 @@ void LibPage::DeleteCurrent()
         if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) )
             xDlgLibContainer->removeLibrary( aOULibName );
 
-        static_cast<SvLBox&>(aLibBox).GetModel()->Remove( pCurEntry );
+        static_cast<SvTreeListBox&>(aLibBox).GetModel()->Remove( pCurEntry );
         MarkDocumentModified( m_aCurDocument );
     }
 }
-- 
cgit