[Libreoffice-commits] .: sfx2/inc sfx2/source

[Ivan Timofeev]

 sfx2/inc/sfx2/dispatch.hxx       |    1 -
 sfx2/source/control/dispatch.cxx |   12 +-----------
 sfx2/source/view/viewfrm.cxx     |    3 ---
 3 files changed, 1 insertion(+), 15 deletions(-)

New commits:
commit ff2c26f586c87452a23f307f4b63568e5276538c
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Sat Jan 28 22:06:19 2012 +0400

    bUILocked is always false

diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx
index c517632..5aa01d9 100644
--- a/sfx2/inc/sfx2/dispatch.hxx
+++ b/sfx2/inc/sfx2/dispatch.hxx
@@ -198,7 +198,6 @@ public:
     SAL_DLLPRIVATE sal_Bool IsUpdated_Impl() const;
     SAL_DLLPRIVATE int GetShellAndSlot_Impl( sal_uInt16 nSlot, SfxShell **ppShell, const SfxSlot **ppSlot,
                                               sal_Bool bOwnShellsOnly, sal_Bool bModal, sal_Bool bRealSlot=sal_True );
-    SAL_DLLPRIVATE void LockUI_Impl( sal_Bool bLock = sal_True );
     SAL_DLLPRIVATE void SetReadOnly_Impl( sal_Bool  bOn );
     SAL_DLLPRIVATE sal_Bool GetReadOnly_Impl() const;
     SAL_DLLPRIVATE sal_Bool IsSlotEnabledByFilter_Impl( sal_uInt16 nSID ) const;
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 5ad8d58..1f722c0 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -145,7 +145,6 @@ struct SfxDispatcher_Impl
     std::vector<sal_uInt32> aChildWins;
     sal_uInt16           nActionLevel;  // in EnterAction
     sal_uInt32           nEventId;      // EventId UserEvent
-    sal_Bool             bUILocked;     // Update disconnected (no flicker)
     sal_Bool             bNoUI;         // UI only from Parent Dispatcher
     sal_Bool             bReadOnly;     // Document is ReadOnly
     sal_Bool             bQuiet;        // Only use parent dispatcher
@@ -330,7 +329,6 @@ void SfxDispatcher::Construct_Impl( SfxDispatcher* pParent )
     pImp->bLocked = sal_False;
     pImp->bActive = sal_False;
     pImp->pParent = NULL;
-    pImp->bUILocked = sal_False;
     pImp->bNoUI = sal_False;
     pImp->bReadOnly = sal_False;
     pImp->bQuiet = sal_False;
@@ -1305,7 +1303,7 @@ void SfxDispatcher::Update_Impl( sal_Bool bForce )
 
     Flush();
 
-    if ( !pImp->pFrame || pImp->bUILocked )
+    if ( !pImp->pFrame )
         return;
 
     SFX_APP();  // -Wall is this required???
@@ -2183,14 +2181,6 @@ sal_uInt32 SfxDispatcher::GetObjectBarId( sal_uInt16 nPos ) const
     return pImp->aObjBars[nPos].nResId;
 }
 
-void SfxDispatcher::LockUI_Impl( sal_Bool bLock )
-{
-    sal_Bool bWasLocked = pImp->bUILocked;
-    pImp->bUILocked = bLock;
-    if ( !bLock && bWasLocked )
-        Update_Impl( sal_True );
-}
-
 //-------------------------------------------------------------------------
 void SfxDispatcher::HideUI( sal_Bool bHide )
 {
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index b6584e0..e342fad 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1876,9 +1876,6 @@ void SfxViewFrame::SetActiveChildFrame_Impl( SfxViewFrame *pViewFrame )
 {
     if ( pViewFrame != pImp->pActiveChild )
     {
-        if ( !pImp->pActiveChild )
-            GetDispatcher()->LockUI_Impl( sal_False );
-
         pImp->pActiveChild = pViewFrame;
 
         Reference< XFramesSupplier > xFrame( GetFrame().GetFrameInterface(), UNO_QUERY );