[Libreoffice-commits] core.git: dbaccess/source

[Caolán McNamara]

 dbaccess/source/ui/app/AppDetailPageHelper.cxx |    5 ++---
 dbaccess/source/ui/control/tabletree.cxx       |   20 ++++++++------------
 dbaccess/source/ui/inc/tabletree.hxx           |   21 ++++++++-------------
 3 files changed, 18 insertions(+), 28 deletions(-)

New commits:
commit d2c2ab1cb6e974195ccbd7f96234f8660621b06f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 21 12:17:38 2014 +0000

    tidy up OTableTreeListBox to make it easier to .ui-ify
    
    Change-Id: I2463d665c857425bc4cf9df89338a0aab89f0a90

diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 6c2777e..c8a7dda 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -589,9 +589,8 @@ void OAppDetailPageHelper::createTablesPage(const Reference< XConnection>& _xCon
 
     if ( !m_pLists[E_TABLE] )
     {
-        OTableTreeListBox* pTreeView = new OTableTreeListBox(this
-                                                            ,WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP
-                                                            ,sal_False);
+        OTableTreeListBox* pTreeView = new OTableTreeListBox(this,
+            WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP);
         pTreeView->SetHelpId(HID_APP_TABLE_TREE);
         m_pLists[E_TABLE] = pTreeView;
 
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index 57aae83..e1f8333 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -64,10 +64,10 @@ namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject;
 namespace DatabaseObjectContainer = ::com::sun::star::sdb::application::DatabaseObjectContainer;
 
 // OTableTreeListBox
-OTableTreeListBox::OTableTreeListBox( Window* pParent, WinBits nWinStyle, sal_Bool _bVirtualRoot )
+OTableTreeListBox::OTableTreeListBox(Window* pParent, WinBits nWinStyle)
     :OMarkableTreeListBox(pParent, nWinStyle)
-    ,m_pImageProvider( new ImageProvider )
-    ,m_bVirtualRoot(_bVirtualRoot)
+    ,m_xImageProvider( new ImageProvider )
+    ,m_bVirtualRoot(false)
     ,m_bNoEmptyFolders( false )
 {
     implSetDefaultImages();
@@ -75,17 +75,13 @@ OTableTreeListBox::OTableTreeListBox( Window* pParent, WinBits nWinStyle, sal_Bo
 
 OTableTreeListBox::OTableTreeListBox( Window* pParent, const ResId& rResId, sal_Bool _bVirtualRoot)
     :OMarkableTreeListBox(pParent, rResId)
-    ,m_pImageProvider( new ImageProvider )
+    ,m_xImageProvider( new ImageProvider )
     ,m_bVirtualRoot(_bVirtualRoot)
     ,m_bNoEmptyFolders( false )
 {
     implSetDefaultImages();
 }
 
-OTableTreeListBox::~OTableTreeListBox()
-{
-}
-
 void OTableTreeListBox::implSetDefaultImages()
 {
     ImageProvider aImageProvider;
@@ -122,12 +118,12 @@ void OTableTreeListBox::notifyHiContrastChanged()
                 Image aImage;
                 if ( isFolderEntry( pEntryLoop ) )
                 {
-                    aImage = m_pImageProvider->getFolderImage( DatabaseObject::TABLE );
+                    aImage = m_xImageProvider->getFolderImage( DatabaseObject::TABLE );
                 }
                 else
                 {
                     OUString sCompleteName( getQualifiedTableName( pEntryLoop ) );
-                    m_pImageProvider->getImages( sCompleteName, DatabaseObject::TABLE, aImage );
+                    m_xImageProvider->getImages( sCompleteName, DatabaseObject::TABLE, aImage );
                 }
 
                 pContextBitmapItem->SetBitmap1( aImage );
@@ -142,7 +138,7 @@ void OTableTreeListBox::notifyHiContrastChanged()
 void OTableTreeListBox::implOnNewConnection( const Reference< XConnection >& _rxConnection )
 {
     m_xConnection = _rxConnection;
-    m_pImageProvider.reset( new ImageProvider( m_xConnection  ) );
+    m_xImageProvider.reset( new ImageProvider( m_xConnection  ) );
 }
 
 void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConnection ) throw(SQLException)
@@ -469,7 +465,7 @@ SvTreeListEntry* OTableTreeListBox::implAddEntry(
         pRet = InsertEntry( sName, pParentEntry, sal_False, LIST_APPEND );
 
         Image aImage;
-        m_pImageProvider->getImages( _rTableName, DatabaseObject::TABLE, aImage );
+        m_xImageProvider->getImages( _rTableName, DatabaseObject::TABLE, aImage );
 
         SetExpandedEntryBmp( pRet, aImage );
         SetCollapsedEntryBmp( pRet, aImage );
diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx
index 10f2959..2972867 100644
--- a/dbaccess/source/ui/inc/tabletree.hxx
+++ b/dbaccess/source/ui/inc/tabletree.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLETREE_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLETREE_HXX
 
+#include "imageprovider.hxx"
 #include "marktree.hxx"
 
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -28,38 +29,32 @@
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbc/XDriver.hpp>
 #include <com/sun/star/sdb/application/NamedDatabaseObject.hpp>
-
-#include <memory>
+#include <boost/scoped_ptr.hpp>
 
 namespace dbaui
 {
 
-class ImageProvider;
-
 // OTableTreeListBox
 class OTableTreeListBox : public OMarkableTreeListBox
 {
 protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >
                     m_xConnection;      // the connection we're working for, set in implOnNewConnection, called by UpdateTableList
-    ::std::auto_ptr< ImageProvider >
-                    m_pImageProvider;   // provider for our images
-    sal_Bool        m_bVirtualRoot; // should the first entry be visible
+    boost::scoped_ptr< ImageProvider >
+                    m_xImageProvider;   // provider for our images
+    sal_Bool        m_bVirtualRoot;     // should the first entry be visible
     bool            m_bNoEmptyFolders;  // should empty catalogs/schematas be prevented from being displayed?
 
 public:
-    OTableTreeListBox(
-        Window* pParent,
-        WinBits nWinStyle,
-        sal_Bool _bVirtualRoot );
+    OTableTreeListBox(Window* pParent, WinBits nWinStyle);
+
+    void init(bool bVirtualRoot) { m_bVirtualRoot = bVirtualRoot; }
 
     OTableTreeListBox(
         Window* pParent,
         const ResId& rResId,
         sal_Bool _bVirtualRoot );
 
-    ~OTableTreeListBox();
-
     typedef ::std::pair< OUString,sal_Bool>  TTableViewName;
     typedef ::std::vector< TTableViewName >         TNames;