callcatcher: update unused code list and drop more old-layouting unuseds

Change-Id: I1096ea50a23040090c9ee2975a4165c6de238497

5 files changed, 2 insertions, 61 deletions

diff --git a/unusedcode.easy b/unusedcode.easy
index 9b3b630f8c8b..733c720fdb89 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -78,7 +78,7 @@ connectivity::mork::ProfileAccess::isProfileLocked(com::sun::star::mozilla::Mozi
 connectivity::mozab::MQueryHelper::next()
 connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char)
 connectivity::sdbcx::OGroup::OGroup(unsigned char)
-dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
+dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
 formula::FormulaTokenIterator::First()
 framework::OReadMenuDocumentHandler::getServiceFactory()
 jfw_plugin::VendorBase::createInstance()
diff --git a/vcl/inc/vcl/arrange.hxx b/vcl/inc/vcl/arrange.hxx
index 90316bdd7d09..5d99723da797 100644
--- a/vcl/inc/vcl/arrange.hxx
+++ b/vcl/inc/vcl/arrange.hxx
@@ -317,7 +317,6 @@ namespace vcl
 
         // returns the index of the added label
         size_t addRow( Window* i_pLabel, boost::shared_ptr<WindowArranger> const& i_rElement, long i_nIndent = 0 );
-        size_t addRow( Window* i_pLabel, Window* i_pElement, long i_nIndent = 0, const Size& i_rElementMinSize = Size() );
     };
 
     class VCL_DLLPUBLIC Indenter : public WindowArranger
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index 0de41b613404..a70ff66f61e4 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -126,7 +126,6 @@ namespace dnd {
 
 namespace vcl {
     struct ControlLayoutData;
-    class WindowArranger;
     struct ExtWindowImpl;
 }
 
@@ -1313,20 +1312,7 @@ public:
 
     // ExtImpl
 
-    // layouting
-    boost::shared_ptr< vcl::WindowArranger > getLayout();
-
-    /* add a child Window
-       addWindow will do the following things
-       - insert the passed window into the child list (equivalent to i_pWin->SetParent( this ))
-       - mark the window as "owned", meaning that the added Window will be destroyed by
-         the parent's desctructor.
-         This means: do not pass in member windows or stack objects here. Do not cause
-         the destructor of the added window to be called in any way.
-
-         to avoid ownership pass i_bTakeOwnership as "false"
-    */
-    void addWindow( Window* i_pWin, bool i_bTakeOwnership = true );
+    // old layouting, in-process-of-removal
 
     /* return the identifier of this window
     */
diff --git a/vcl/source/window/arrange.cxx b/vcl/source/window/arrange.cxx
index 56ad168ef7e2..d7f79a0872b5 100644
--- a/vcl/source/window/arrange.cxx
+++ b/vcl/source/window/arrange.cxx
@@ -730,18 +730,6 @@ size_t LabelColumn::addRow( Window* i_pLabel, boost::shared_ptr<WindowArranger>
     return nIndex;
 }
 
-size_t LabelColumn::addRow( Window* i_pLabel, Window* i_pElement, long i_nIndent, const Size& i_rElementMinSize )
-{
-    boost::shared_ptr< LabeledElement > xLabel( new LabeledElement( this, 1 ) );
-    xLabel->setLabel( i_pLabel );
-    xLabel->setBorders( 0, i_nIndent, 0, 0, 0 );
-    xLabel->setElement( i_pElement );
-    xLabel->setMinimumSize( 1, i_rElementMinSize );
-    size_t nIndex = addChild( xLabel );
-    resize();
-    return nIndex;
-}
-
 // ----------------------------------------
 // vcl::Indenter
 //-----------------------------------------
diff --git a/vcl/source/window/window4.cxx b/vcl/source/window/window4.cxx
index f0d8f47b2515..af22d6641f1d 100644
--- a/vcl/source/window/window4.cxx
+++ b/vcl/source/window/window4.cxx
@@ -100,38 +100,6 @@ void Window::ImplExtResize()
     }
 }
 
-boost::shared_ptr< vcl::WindowArranger > Window::getLayout()
-{
-    boost::shared_ptr< vcl::WindowArranger > xRet;
-    vcl::ExtWindowImpl* pImpl = ImplGetExtWindowImpl();
-    if( pImpl )
-    {
-        if( ! pImpl->mxLayout.get() )
-        {
-            pImpl->mxLayout.reset( new vcl::LabelColumn() );
-            pImpl->mxLayout->setParentWindow( this );
-            pImpl->mxLayout->setOuterBorder( -1 );
-        }
-        xRet = pImpl->mxLayout;
-    }
-
-    return xRet;
-}
-
-void Window::addWindow( Window* i_pWin, bool i_bTakeOwnership )
-{
-    vcl::ExtWindowImpl* pImpl = ImplGetExtWindowImpl();
-    if( pImpl && i_pWin )
-    {
-        vcl::ExtWindowImpl* pChildImpl = i_pWin->ImplGetExtWindowImpl();
-        if( pChildImpl )
-        {
-            i_pWin->SetParent( this );
-            pChildImpl->mbOwnedByParent = i_bTakeOwnership;
-        }
-    }
-}
-
 Window* Window::findWindow( const rtl::OUString& i_rIdentifier ) const
 {
     if( getIdentifier() == i_rIdentifier )