[Libreoffice-commits] .: 2 commits - svtools/inc svtools/source

[Caolán McNamara]

 svtools/inc/svtools/svlbox.hxx   |    2 --
 svtools/inc/svtools/svtreebx.hxx |    1 -
 svtools/inc/svtools/treelist.hxx |    5 -----
 svtools/source/misc/transfer.cxx |    3 ++-
 4 files changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 6b789a8d3b8d9b3a8bc35fa38bb6460d1b1e6622
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 5 14:29:38 2011 +0100

    and some more

diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx
index e0510a3..414ff77 100644
--- a/svtools/inc/svtools/svlbox.hxx
+++ b/svtools/inc/svtools/svlbox.hxx
@@ -324,7 +324,6 @@ protected:
 
     virtual sal_uLong Insert( SvLBoxEntry* pEnt,SvLBoxEntry* pPar,sal_uLong nPos=LIST_APPEND);
     virtual sal_uLong Insert( SvLBoxEntry* pEntry,sal_uLong nRootPos = LIST_APPEND );
-    void            InsertTree( SvLBoxEntry* pTree, SvLBoxEntry* pTarget) {pModel->InsertTree( pTree, pTarget ); }
 
     // Inplace-Editing
     SvInplaceEdit2*  pEdCtrl;
diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index 252c688..bddb362 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -354,7 +354,6 @@ public:
     sal_uLong           Insert( SvListEntry* pEntry,sal_uLong nRootPos = ULONG_MAX )
     { return Insert(pEntry, pRootItem, nRootPos ); }
 
-    void                InsertTree( SvListEntry* pTree, SvListEntry* pTarget );
     void                InsertTree( SvListEntry* pTree, SvListEntry* pTargetParent, sal_uLong nListPos );
 
     // Entries muessen im gleichen Model stehen!
commit 7531ba8815517fc347e71b3b098cf9034d213016
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 5 13:56:10 2011 +0100

    build-breakage: remove stray unused inlines and now dead usings

diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx
index a4cf74a..e0510a3 100644
--- a/svtools/inc/svtools/svlbox.hxx
+++ b/svtools/inc/svtools/svlbox.hxx
@@ -568,7 +568,6 @@ protected:
     using SvListView::Expand;
     using SvListView::Collapse;
     using SvListView::Select;
-    using SvListView::SelectChilds;
     using SvListView::SelectAll;
 };
 
diff --git a/svtools/inc/svtools/svtreebx.hxx b/svtools/inc/svtools/svtreebx.hxx
index 342a40b..5f53181 100644
--- a/svtools/inc/svtools/svtreebx.hxx
+++ b/svtools/inc/svtools/svtreebx.hxx
@@ -395,7 +395,6 @@ protected:
     using SvListView::Expand;
     using SvListView::Collapse;
     using SvListView::Select;
-    using SvListView::SelectChilds;
     using SvListView::SelectAll;
 };
 
diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index 63545ed..252c688 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -289,7 +289,6 @@ class SVT_DLLPUBLIC SvTreeList
     SvListEntry*        LastSelected( const SvListView*) const;
 
     sal_Bool            Select( SvListView*,SvListEntry* pEntry, sal_Bool bSelect=sal_True );
-    sal_uLong           SelectChilds( SvListView*,SvListEntry* pParent, sal_Bool bSelect );
     void                SelectAll( SvListView*,sal_Bool bSelect ); // ruft nicht Select-Hdl
     sal_uLong           GetChildSelectionCount( const SvListView*,SvListEntry* pParent ) const;
 
@@ -521,9 +520,6 @@ public:
     sal_Bool            Select( SvListEntry* pEntry, sal_Bool bSelect=sal_True )
     { return pModel->Select((SvListView*)this,pEntry,bSelect); }
 
-    sal_uLong           SelectChilds( SvListEntry* pParent, sal_Bool bSelect )
-    { return pModel->SelectChilds((SvListView*)this,pParent, bSelect); }
-
     // ruft nicht Select-Hdl
     virtual void        SelectAll( sal_Bool bSelect, sal_Bool )
     { pModel->SelectAll((SvListView*)this, bSelect); }
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index b69a264..dd404e3 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -2242,6 +2242,7 @@ TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( Window
     if( pWindow )
         xClipboard = pWindow->GetClipboard();
 
+#if 0
     if( xClipboard.is() )
     {
         try
@@ -2259,7 +2260,7 @@ TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( Window
         {
         }
     }
-
+#endif
     return aRet;
 }