diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-01-28 22:06:19 +0400 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-01-28 22:13:14 +0400 |
| commit | ff2c26f586c87452a23f307f4b63568e5276538c (patch) | |
| tree | a8c6d2210934d8ad38072cc158eaaefd87185377 | |
| parent | 763b3e1e598ae0ebe29c9168f5dc2a73f910ce38 (diff) | |
bUILocked is always false
| -rw-r--r-- | sfx2/inc/sfx2/dispatch.hxx | 1 | ||||
| -rw-r--r-- | sfx2/source/control/dispatch.cxx | 12 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 3 |
3 files changed, 1 insertions, 15 deletions
diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx index c51763294388..5aa01d9b5709 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 5ad8d588d13c..1f722c0d9903 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 b6584e091f74..e342fadc29c2 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 ); |