diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2012-02-20 17:15:23 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2012-02-20 19:15:46 +0100 |
commit | 8597f9874f23a1ecd6b8b556c147d156a398077f (patch) | |
tree | 77af30f1ff5915a09676077fc6db8209b46bbf95 /sd | |
parent | Work around the fact that empty directories are not present in an .apk (diff) | |
download | core-8597f9874f23a1ecd6b8b556c147d156a398077f.tar.gz core-8597f9874f23a1ecd6b8b556c147d156a398077f.zip |
unusedcode.easy: remove UpdateLockManager
Seems UpdateLockManager is dead. So cut it out.
Also mbFirstUpdateSeen had no effect.
Diffstat (limited to 'sd')
-rw-r--r-- | sd/Library_sd.mk | 1 | ||||
-rw-r--r-- | sd/source/ui/framework/configuration/ConfigurationController.cxx | 3 | ||||
-rw-r--r-- | sd/source/ui/framework/factories/BasicPaneFactory.cxx | 34 | ||||
-rw-r--r-- | sd/source/ui/framework/factories/BasicPaneFactory.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/inc/UpdateLockManager.hxx | 94 | ||||
-rw-r--r-- | sd/source/ui/inc/ViewShellBase.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/PresentationViewShellBase.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/UpdateLockManager.cxx | 430 | ||||
-rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 24 |
9 files changed, 3 insertions, 595 deletions
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 849d0c6bc07b..251563319b41 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -449,7 +449,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/view/PresentationViewShellBase \ sd/source/ui/view/SlideSorterViewShellBase \ sd/source/ui/view/ToolBarManager \ - sd/source/ui/view/UpdateLockManager \ sd/source/ui/view/ViewClipboard \ sd/source/ui/view/ViewShellBase \ sd/source/ui/view/ViewShellHint \ diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index f11c5bb2d0f6..617de844cf9a 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -26,9 +26,7 @@ * ************************************************************************/ - #include "framework/ConfigurationController.hxx" - #include "framework/Configuration.hxx" #include "framework/FrameworkHelper.hxx" #include "ConfigurationUpdater.hxx" @@ -40,7 +38,6 @@ #include "ChangeRequestQueueProcessor.hxx" #include "ConfigurationClassifier.hxx" #include "ViewShellBase.hxx" -#include "UpdateLockManager.hxx" #include "DrawController.hxx" #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/util/XURLTransformer.hpp> diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index a854237ca603..2b6b9d67bd15 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -133,9 +133,7 @@ BasicPaneFactory::BasicPaneFactory ( mxComponentContext(rxContext), mxConfigurationControllerWeak(), mpViewShellBase(NULL), - mpPaneContainer(new PaneContainer), - mbFirstUpdateSeen(false), - mpUpdateLockManager() + mpPaneContainer(new PaneContainer) { } @@ -199,7 +197,6 @@ void SAL_CALL BasicPaneFactory::initialize (const Sequence<Any>& aArguments) (sal::static_int_cast<sal_uIntPtr>( xTunnel->getSomething(DrawController::getUnoTunnelId())))); mpViewShellBase = pController->GetViewShellBase(); - mpUpdateLockManager = mpViewShellBase->GetUpdateLockManager(); } catch(RuntimeException&) {} @@ -400,35 +397,10 @@ void SAL_CALL BasicPaneFactory::releaseResource ( //===== XConfigurationChangeListener ========================================== void SAL_CALL BasicPaneFactory::notifyConfigurationChange ( - const ConfigurationChangeEvent& rEvent) + const ConfigurationChangeEvent& /* rEvent */ ) throw (RuntimeException) { - sal_Int32 nEventType = 0; - rEvent.UserData >>= nEventType; - switch (nEventType) - { - case gnConfigurationUpdateStartEvent: - // Lock UI updates while we are switching the views except for - // the first time after creation. Outherwise this leads to - // problems after reload (missing resizes for the side panes). - if (mbFirstUpdateSeen) - { - } - else - mbFirstUpdateSeen = true; - break; - - case gnConfigurationUpdateEndEvent: - // Unlock the update lock here when only the visibility of - // windows but not the view shells displayed in them have - // changed. Otherwise the UpdateLockManager takes care of - // unlocking at the right time. - if (mpUpdateLockManager.get() != NULL) - { - ::osl::Guard< ::osl::Mutex > aGuard (::osl::Mutex::getGlobalMutex()); - } - break; - } + // FIXME: nothing to do } diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx index bed0dc3b5e28..7def9e74b71a 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx @@ -40,8 +40,6 @@ #include <osl/mutex.hxx> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase3.hxx> -#include "UpdateLockManager.hxx" - #include <boost/scoped_ptr.hpp> #include <boost/shared_ptr.hpp> @@ -130,8 +128,6 @@ private: class PaneDescriptor; class PaneContainer; ::boost::scoped_ptr<PaneContainer> mpPaneContainer; - bool mbFirstUpdateSeen; - ::boost::shared_ptr<UpdateLockManager> mpUpdateLockManager; /** Create a new instance of FrameWindowPane. @param rPaneId diff --git a/sd/source/ui/inc/UpdateLockManager.hxx b/sd/source/ui/inc/UpdateLockManager.hxx deleted file mode 100644 index 2f5a4df30c5f..000000000000 --- a/sd/source/ui/inc/UpdateLockManager.hxx +++ /dev/null @@ -1,94 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef SD_UPDATE_LOCK_MANAGER_HXX -#define SD_UPDATE_LOCK_MANAGER_HXX - -#include <memory> - -namespace sd { - -class ViewShellBase; - -/** Manage update locks of ViewShellBase objects. - A ViewShellBase object is locked while views are switched in order to - avoid unnecessary repaints of views and object bars. - Locking a ViewShellBase locks the frame::XLayoutManager and prevents - Activate() and Deactivate() calls at ViewShell objects being processed. - - The main responsibility of this class is find the right moment to unlock - the managed ViewShellBase object: Only Lock() has to be called from the - outside (usually from PaneManager). Unlock() is called by this class - itself. When all else fails it has a timer that calls Unlock() - eventually. -*/ -class UpdateLockManager -{ -public: - /** The newly created instance supports locking for the specified - ViewShellBase object by default. Call Disable() for Lock() and - Unlock() calls being ignored. - */ - UpdateLockManager (ViewShellBase& rBase); - ~UpdateLockManager (void); - - /** For e.g. the PresentationViewShellBase locking is not necessary and - does lead to problems. This method lets Lock() and Unlock() calls - be ignored and thus turns locking essentially off. - */ - void Disable (void); - - /** Lock some UI updates. For every call to this method a call to - Unlock() is required to really unlock. - */ - void Lock (void); - - /** When called as many times as Lock() has been called before then the - ViewShellBase object is unlocked. - */ - void Unlock (void); - - /** Return whether the ViewShellBase object is locked. When locking is - disabled, i.e. Disable() has been called before, then this method - always returns <FALSE/>. - */ - bool IsLocked (void) const; - -private: - class Implementation; - Implementation* mpImpl; - - UpdateLockManager (const UpdateLockManager&); // Not supported. - UpdateLockManager& operator= (const UpdateLockManager&); // Not supported. -}; - -} // end of namespace sd - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 26355e41baeb..e8e6f394cc4d 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -55,7 +55,6 @@ class DrawController; class DrawDocShell; class FormShellManager; class ToolBarManager; -class UpdateLockManager; class ViewShell; class ViewShellManager; @@ -221,10 +220,7 @@ public: */ const Rectangle& getClientRectangle() const; - ::boost::shared_ptr<UpdateLockManager> GetUpdateLockManager (void) const; - ::boost::shared_ptr<ToolBarManager> GetToolBarManager (void) const; - ::boost::shared_ptr<FormShellManager> GetFormShellManager (void) const; DrawController& GetDrawController (void) const; diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx index 2216f053437e..424b7ed9fedb 100644 --- a/sd/source/ui/view/PresentationViewShellBase.cxx +++ b/sd/source/ui/view/PresentationViewShellBase.cxx @@ -26,12 +26,10 @@ * ************************************************************************/ - #include "PresentationViewShellBase.hxx" #include "sdresid.hxx" #include "DrawDocShell.hxx" #include "strings.hrc" -#include "UpdateLockManager.hxx" #include "framework/FrameworkHelper.hxx" #include "framework/PresentationModule.hxx" @@ -79,8 +77,6 @@ PresentationViewShellBase::PresentationViewShellBase ( SfxViewShell* pOldShell) : ViewShellBase (_pFrame, pOldShell) { - GetUpdateLockManager()->Disable(); - // Hide the automatic (non-context sensitive) tool bars. if (_pFrame!=NULL) { diff --git a/sd/source/ui/view/UpdateLockManager.cxx b/sd/source/ui/view/UpdateLockManager.cxx deleted file mode 100644 index fa64003696a2..000000000000 --- a/sd/source/ui/view/UpdateLockManager.cxx +++ /dev/null @@ -1,430 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include "UpdateLockManager.hxx" - -#include "MutexOwner.hxx" -#include "ViewShellBase.hxx" -#include <com/sun/star/frame/XLayoutManager.hpp> -#include <com/sun/star/frame/XLayoutManagerEventBroadcaster.hpp> -#include <com/sun/star/frame/LayoutManagerEvents.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <cppuhelper/compbase1.hxx> - -#include <vcl/timer.hxx> -#include <sfx2/viewfrm.hxx> - -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star; - -namespace { -typedef cppu::WeakComponentImplHelper1<frame::XLayoutManagerListener> InterfaceBase; -} - -namespace sd { - - -/** This implementation class not only implements the Lock() and Unlock() - methods but as well listens for the right combination of events to call - Unlock() when all is ready after the PaneManager has switched (some of) - its view shells. -*/ - -class UpdateLockManager::Implementation - : protected MutexOwner, - public InterfaceBase -{ -public: - Implementation (ViewShellBase& rBase); - virtual ~Implementation (void); - - void Lock (void); - void Unlock (void); - bool IsLocked (void) const; - - /** Unlock regardless of the current lock level. - */ - void ForceUnlock (void); - -private: - ViewShellBase& mrBase; - /// A lock level greater than 0 indicates that the ViewShellBase is locked. - sal_Int32 mnLockDepth; - /// The emergency timer to unlock the ViewShellBase when all else fails. - Timer maTimer; - /// Remember when to unlock after a layout event from frame::XLayoutManager - bool mbUnlockOnNextLayout; - /// Remember whether we are listening to the frame::XLayoutManager - bool mbListenerIsRegistered; - /// Remember whether the frame::XLayoutManager is locked. - bool mbLayouterIsLocked; - /** We hold a weak reference to the layout manager in order to have - access to it even when the ViewShellBase object is not valid anymore - and can not be used to obtain the layout manager. - */ - WeakReference<frame::XLayoutManager> mxLayoutManager; - - //===== frame::XLayoutEventListener ===================================== - - /** The event of the layouter are observed to find the best moment for - unlocking. This is the first layout after the lock level of the - layouter drops to one (we hold a lock to it ourselves which we - release when unlocking). - */ - virtual void SAL_CALL layoutEvent ( - const lang::EventObject& xSource, - sal_Int16 eLayoutEvent, - const Any& rInfo) - throw (uno::RuntimeException); - - //===== lang::XEventListener ============================================ - virtual void SAL_CALL - disposing (const lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException); - - virtual void SAL_CALL disposing (void); - - /** This is only a fallback to make the office usable when for some - reason the intended way of unlocking it failed. - */ - DECL_LINK(Timeout, void*); - - /** Convenience method that finds the layout manager associated with the - frame that shows the ViewShellBase. - */ - Reference<frame::XLayoutManager> GetLayoutManager (void); - - Implementation (const Implementation&); // Not implemented. - Implementation& operator= (const Implementation&); // Not implemented. -}; - - - - -//===== UpdateLockManager ===================================================== - -UpdateLockManager::UpdateLockManager (ViewShellBase& rBase) - : mpImpl(new Implementation(rBase)) -{ - mpImpl->acquire(); -} - - - -UpdateLockManager::~UpdateLockManager (void) -{ - if (mpImpl != NULL) - { - mpImpl->ForceUnlock(); - mpImpl->release(); - } -} - - - - -void UpdateLockManager::Disable (void) -{ - if (mpImpl != NULL) - { - mpImpl->ForceUnlock(); - mpImpl->release(); - mpImpl = NULL; - } -} - - - - -void UpdateLockManager::Lock (void) -{ - if (mpImpl != NULL) - mpImpl->Lock(); -} - - - - -void UpdateLockManager::Unlock (void) -{ - if (mpImpl != NULL) - mpImpl->Unlock(); -} - - - - -bool UpdateLockManager::IsLocked (void) const -{ - if (mpImpl != NULL) - return mpImpl->IsLocked(); - else - return false; -} - - - -//===== UpdateLock::Implementation ============================================ - -UpdateLockManager::Implementation::Implementation (ViewShellBase& rBase) - : InterfaceBase(maMutex), - mrBase(rBase), - mnLockDepth(0), - maTimer(), - mbUnlockOnNextLayout(false), - mbListenerIsRegistered(false), - mbLayouterIsLocked(false) -{ -} - - - - -UpdateLockManager::Implementation::~Implementation (void) -{ - OSL_ASSERT(mnLockDepth==0); - ForceUnlock(); -} - - - - -void UpdateLockManager::Implementation::Lock (void) -{ - ++mnLockDepth; - if (mnLockDepth == 1) - { - Reference<frame::XLayoutManager> xLayouter (GetLayoutManager()); - if (xLayouter.is()) - { - // Register as event listener. - Reference<frame::XLayoutManagerEventBroadcaster> xBroadcaster ( - xLayouter, UNO_QUERY); - if (xBroadcaster.is()) - { - mbListenerIsRegistered = true; - xBroadcaster->addLayoutManagerEventListener( - Reference<frame::XLayoutManagerListener> ( - static_cast<XWeak*>(this), UNO_QUERY) ); - } - - // Lock the layout manager. - mbLayouterIsLocked = true; - xLayouter->lock(); - } - - // As a fallback, when the notification mechanism does not work (or is - // incorrectly used) we use a timer that will unlock us eventually. - maTimer.SetTimeout(5000 /*ms*/); - maTimer.SetTimeoutHdl(LINK(this,UpdateLockManager::Implementation,Timeout)); - maTimer.Start(); - } -} - - - - -void UpdateLockManager::Implementation::Unlock (void) -{ - --mnLockDepth; - - if (mnLockDepth == 0) - { - // Stop the timer. We don't need it anymore. - maTimer.Stop(); - - try - { - Reference<frame::XLayoutManager> xLayouter (GetLayoutManager()); - if (xLayouter.is()) - { - // Detach from the layouter. - if (mbListenerIsRegistered) - { - Reference<frame::XLayoutManagerEventBroadcaster> xBroadcaster ( - xLayouter, UNO_QUERY); - if (xBroadcaster.is()) - { - mbListenerIsRegistered = false; - xBroadcaster->removeLayoutManagerEventListener( - Reference<frame::XLayoutManagerListener> ( - static_cast<XWeak*>(this), UNO_QUERY) ); - } - } - - // Unlock the layouter. - if (mbLayouterIsLocked) - { - mbLayouterIsLocked = false; - xLayouter->unlock(); - } - } - } - catch (const RuntimeException&) - { - } - - // Force a rearrangement of the UI elements of the views. - mrBase.Rearrange(); - } -} - - - - -bool UpdateLockManager::Implementation::IsLocked (void) const -{ - return (mnLockDepth > 0); -} - - - - -void UpdateLockManager::Implementation::ForceUnlock (void) -{ - while (IsLocked()) - Unlock(); -} - - - - -void SAL_CALL UpdateLockManager::Implementation::layoutEvent ( - const lang::EventObject&, - sal_Int16 eLayoutEvent, - const Any& rInfo) - throw (uno::RuntimeException) -{ - switch (eLayoutEvent) - { - case frame::LayoutManagerEvents::LOCK: - { - sal_Int32 nLockCount; - rInfo >>= nLockCount; - } - break; - - case frame::LayoutManagerEvents::UNLOCK: - { - sal_Int32 nLockCount = 0; - rInfo >>= nLockCount; - if (nLockCount == 1) - { - // The lock count dropped to one. This means that we are - // the only one that still holds a lock to the layout - // manager. We unlock the layout manager now and the - // ViewShellBase on the next layout of the layout manager. - mbUnlockOnNextLayout = true; - Reference<frame::XLayoutManager> xLayouter (GetLayoutManager()); - if (xLayouter.is() && mbLayouterIsLocked) - { - mbLayouterIsLocked = false; - xLayouter->unlock(); - } - } - } - break; - - case frame::LayoutManagerEvents::LAYOUT: - // Unlock when the layout manager is not still locked. - if (mbUnlockOnNextLayout) - Unlock(); - break; - } -} - - - - -void SAL_CALL UpdateLockManager::Implementation::disposing (const lang::EventObject& ) - throw (::com::sun::star::uno::RuntimeException) -{ -} - - - - -void SAL_CALL UpdateLockManager::Implementation::disposing (void) -{ -} - - - - -IMPL_LINK(UpdateLockManager::Implementation, Timeout, void*, EMPTYARG) -{ - // This method is only called when all else failed. We unlock - // regardless of how deep the lock depth. - while (mnLockDepth > 0) - Unlock(); - return 1; -} - - - - -Reference< ::com::sun::star::frame::XLayoutManager> - UpdateLockManager::Implementation::GetLayoutManager (void) -{ - Reference<frame::XLayoutManager> xLayoutManager; - - if (mxLayoutManager.get() == NULL) - { - if (mrBase.GetViewFrame()!=NULL) - { - Reference<beans::XPropertySet> xFrameProperties ( - mrBase.GetViewFrame()->GetFrame().GetFrameInterface(), - UNO_QUERY); - if (xFrameProperties.is()) - { - try - { - Any aValue (xFrameProperties->getPropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")))); - aValue >>= xLayoutManager; - } - catch (const beans::UnknownPropertyException&) - { - } - } - mxLayoutManager = xLayoutManager; - } - } - else - xLayoutManager = mxLayoutManager; - - return xLayoutManager; -} - - - - -} // end of anonymous namespace - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 253e2884869e..9889685a959a 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -26,7 +26,6 @@ * ************************************************************************/ - #include <comphelper/processfactory.hxx> #include <com/sun/star/frame/UnknownModuleException.hpp> @@ -50,7 +49,6 @@ #include "NotesChildWindow.hxx" #include "ViewShellManager.hxx" #include "DrawController.hxx" -#include "UpdateLockManager.hxx" #include "FrameView.hxx" #include "ViewTabBar.hxx" #include <sfx2/event.hxx> @@ -152,15 +150,9 @@ public: It does not include the ViewTabBar. */ ::boost::scoped_ptr< ::Window> mpViewWindow; - ::boost::shared_ptr<ToolBarManager> mpToolBarManager; - ::boost::shared_ptr<ViewShellManager> mpViewShellManager; - ::boost::shared_ptr<tools::EventMultiplexer> mpEventMultiplexer; - - ::boost::shared_ptr<UpdateLockManager> mpUpdateLockManager; - ::boost::shared_ptr<FormShellManager> mpFormShellManager; Implementation (ViewShellBase& rBase); @@ -282,7 +274,6 @@ ViewShellBase::ViewShellBase ( mpImpl.reset(new Implementation(*this)); mpImpl->mpViewWindow.reset(new FocusForwardingWindow(_pFrame->GetWindow(),*this)); mpImpl->mpViewWindow->SetBackground(Wallpaper()); - mpImpl->mpUpdateLockManager.reset(new UpdateLockManager(*this)); _pFrame->GetWindow().SetBackground(Wallpaper()); @@ -323,7 +314,6 @@ ViewShellBase::~ViewShellBase (void) pShell->GetActiveWindow()->GetParent()->Hide(); } - mpImpl->mpUpdateLockManager->Disable(); mpImpl->mpToolBarManager->Shutdown(); mpImpl->mpViewShellManager->Shutdown(); @@ -1095,19 +1085,6 @@ const Rectangle& ViewShellBase::getClientRectangle (void) const } - - -::boost::shared_ptr<UpdateLockManager> ViewShellBase::GetUpdateLockManager (void) const -{ - OSL_ASSERT(mpImpl.get()!=NULL); - OSL_ASSERT(mpImpl->mpUpdateLockManager.get()!=NULL); - - return mpImpl->mpUpdateLockManager; -} - - - - ::boost::shared_ptr<ToolBarManager> ViewShellBase::GetToolBarManager (void) const { OSL_ASSERT(mpImpl.get()!=NULL); @@ -1218,7 +1195,6 @@ ViewShellBase::Implementation::Implementation (ViewShellBase& rBase) mpToolBarManager(), mpViewShellManager(), mpEventMultiplexer(), - mpUpdateLockManager(), mpFormShellManager(), mrBase(rBase), mpPageCacheManager(slidesorter::cache::PageCacheManager::Instance()) |