[Libreoffice-commits] core.git: UnoControls/inc UnoControls/source

[Libreoffice Gerrit user]

 UnoControls/inc/basecontainercontrol.hxx         |    5 -----
 UnoControls/source/base/basecontainercontrol.cxx |   22 ----------------------
 2 files changed, 27 deletions(-)

New commits:
commit da0a588b64edb93ea362b246049cd71466c3f018
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Sep 17 13:55:02 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Sep 18 20:53:38 2018 +0200

    m_xTabControllerList is dead
    
    ever since
        commit af4b38d6e7f769bf403a768bd310e5fa2b3e8ddd
        Date:   Mon Mar 24 15:59:06 2014 +0100
        Remove dead code
    
    Change-Id: Ia7848f469d91666f13130132ebe5766c4fedcebb
    Reviewed-on: https://gerrit.libreoffice.org/60621
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx
index 3cc791444c24..d0dc2e3371f5 100644
--- a/UnoControls/inc/basecontainercontrol.hxx
+++ b/UnoControls/inc/basecontainercontrol.hxx
@@ -151,14 +151,9 @@ protected:
     ) override;
 
 private:
-    void impl_activateTabControllers();
-
     // list of pointer of "struct IMPL_ControlInfo" to hold child-controls
     ::std::vector< std::unique_ptr<IMPL_ControlInfo> > maControlInfoList;
 
-    // list of references of XTabController to hold tab-order in this container
-    css::uno::Sequence< css::uno::Reference< css::awt::XTabController > >  m_xTabControllerList;
-
     ::cppu::OMultiTypeInterfaceContainerHelper                          m_aListeners;
 
 };
diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx
index b5dd4853f7e3..5d78317cf043 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -123,10 +123,6 @@ void SAL_CALL BaseContainerControl::createPeer( const   Reference< XToolkit >&
         {
             seqControlList.getArray()[n]->createPeer( xToolkit, getPeer() );
         }
-
-        // activate new tab order
-        impl_activateTabControllers();
-
     }
 }
 
@@ -217,7 +213,6 @@ void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Re
     {
         // .. then create a peer on child
         pNewControl->xControl->createPeer ( getPeer()->getToolkit(), getPeer() );
-        impl_activateTabControllers ();
     }
 
     // Send message to all listener
@@ -393,23 +388,6 @@ void BaseContainerControl::impl_paint ( sal_Int32 /*nX*/, sal_Int32 /*nY*/, cons
 {
 }
 
-//  private method
-
-void BaseContainerControl::impl_activateTabControllers ()
-{
-    // Ready for multithreading
-    MutexGuard aGuard (m_aMutex);
-
-    sal_uInt32  nMaxCount   =   m_xTabControllerList.getLength ();
-    sal_uInt32  nCount      =   0;
-
-    for ( nCount = 0; nCount < nMaxCount; ++nCount )
-    {
-         m_xTabControllerList.getArray () [nCount]->setContainer        ( this  );
-         m_xTabControllerList.getArray () [nCount]->activateTabOrder    (       );
-    }
-}
-
 } // namespace unocontrols
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */