diff options
Diffstat (limited to 'sd/source/ui/framework')
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx | 3 | ||||
| -rwxr-xr-x | sd/source/ui/framework/factories/BasicViewFactory.cxx | 16 | ||||
| -rwxr-xr-x | sd/source/ui/framework/factories/BasicViewFactory.hxx | 6 | ||||
| -rwxr-xr-x | sd/source/ui/framework/tools/FrameworkHelper.cxx | 17 |
4 files changed, 31 insertions, 11 deletions
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx index 5e70c313f251..bf3571cbd8f4 100644..100755 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx @@ -197,9 +197,10 @@ void ChangeRequestQueueProcessor::ProcessOneEvent (void) // its state. if (mpConfigurationUpdater.get() != NULL) { +#ifdef VERBOSE ConfigurationTracer::TraceConfiguration ( mxConfiguration, "updating to configuration"); - +#endif mpConfigurationUpdater->RequestUpdate(mxConfiguration); } } diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 1320df5c827b..2dd7689f2b39 100755 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -227,7 +227,7 @@ Reference<XResource> SAL_CALL BasicViewFactory::createResource ( // When the requested view is not in the cache then create a new view. if (pDescriptor.get() == NULL) { - pDescriptor = CreateView(rxViewId, *pFrame, *pWindow, xPane, pFrameView); + pDescriptor = CreateView(rxViewId, *pFrame, *pWindow, xPane, pFrameView, bIsCenterPane); } if (pDescriptor.get() != NULL) @@ -351,7 +351,8 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments) SfxViewFrame& rFrame, ::Window& rWindow, const Reference<XPane>& rxPane, - FrameView* pFrameView) + FrameView* pFrameView, + const bool bIsCenterPane) { ::boost::shared_ptr<ViewDescriptor> pDescriptor (new ViewDescriptor()); @@ -359,13 +360,12 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments) rxViewId, rFrame, rWindow, - pFrameView); + pFrameView, + bIsCenterPane); pDescriptor->mxViewId = rxViewId; if (pDescriptor->mpViewShell.get() != NULL) { - const bool bIsCenterPane ( - rxViewId->isBoundToURL(FrameworkHelper::msCenterPaneURL, AnchorBindingMode_DIRECT)); pDescriptor->mpViewShell->Init(bIsCenterPane); mpBase->GetViewShellManager()->ActivateViewShell(pDescriptor->mpViewShell.get()); @@ -386,7 +386,8 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments) const Reference<XResourceId>& rxViewId, SfxViewFrame& rFrame, ::Window& rWindow, - FrameView* pFrameView) + FrameView* pFrameView, + const bool bIsCenterPane) { ::boost::shared_ptr<ViewShell> pViewShell; const OUString& rsViewURL (rxViewId->getResourceURL()); @@ -462,7 +463,8 @@ void SAL_CALL BasicViewFactory::initialize (const Sequence<Any>& aArguments) &rFrame, *mpBase, &rWindow, - pFrameView); + pFrameView, + bIsCenterPane); } return pViewShell; diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx index e5bb43551a24..0cdb45ffc7c1 100755 --- a/sd/source/ui/framework/factories/BasicViewFactory.hxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx @@ -128,13 +128,15 @@ private: SfxViewFrame& rFrame, ::Window& rWindow, const css::uno::Reference<css::drawing::framework::XPane>& rxPane, - FrameView* pFrameView); + FrameView* pFrameView, + const bool bIsCenterView); ::boost::shared_ptr<ViewShell> CreateViewShell ( const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, SfxViewFrame& rFrame, ::Window& rWindow, - FrameView* pFrameView); + FrameView* pFrameView, + const bool bIsCenterView); void ActivateCenterView ( const ::boost::shared_ptr<ViewDescriptor>& rpDescriptor); diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 078f86a88d86..8c325ff202af 100755 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -565,12 +565,27 @@ Reference<XResourceId> FrameworkHelper::RequestView ( void FrameworkHelper::RequestTaskPanel ( - const OUString& rsTaskPanelURL) + const OUString& rsTaskPanelURL, + const bool bEnsureTaskPaneIsVisible) { try { if (mxConfigurationController.is()) { + // Check the existence of the task pane. + if ( ! bEnsureTaskPaneIsVisible) + { + Reference<XConfiguration> xConfiguration ( + mxConfigurationController->getCurrentConfiguration()); + if (xConfiguration.is()) + if ( ! xConfiguration->hasResource( + CreateResourceId(msTaskPaneURL, msRightPaneURL))) + { + // Task pane does is not active. Do not force it. + return; + } + } + // Create the resource id from URLs for the pane, the task pane // view, and the task panel. mxConfigurationController->requestResourceActivation( |