summaryrefslogtreecommitdiff
path: root/sd/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui')
-rw-r--r--sd/source/ui/dlg/PaneChildWindows.cxx2
-rw-r--r--sd/source/ui/framework/tools/FrameworkHelper.cxx4
-rw-r--r--sd/source/ui/toolpanel/ToolPanelViewShell.cxx4
3 files changed, 6 insertions, 4 deletions
diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx
index 3b12bf101e36..df7997401228 100644
--- a/sd/source/ui/dlg/PaneChildWindows.cxx
+++ b/sd/source/ui/dlg/PaneChildWindows.cxx
@@ -194,7 +194,7 @@ void ToolPanelChildWindow::ActivateToolPanel( const OUString& i_rPanelURL )
if ( i_rPanelURL.indexOf( framework::FrameworkHelper::msTaskPanelURLPrefix ) == 0 )
{
// it's one of our standard panels known to the drawing framework
- pFrameworkHelper->RequestSidebarPanel( i_rPanelURL ); // MMeeks
+ pFrameworkHelper->RequestSidebarPanel( i_rPanelURL );
}
else
{
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 00667d231e38..3fe13aaa0cfb 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -198,7 +198,9 @@ const OUString FrameworkHelper::msViewTabBarURL( msToolBarURLPrefix + "ViewTabBa
// Task panel URLs.
-const OUString FrameworkHelper::msTaskPanelURLPrefix("private:resource/toolpanel/DrawingFramework/"); // MMeeks - checkout uielementfactorymanager.cxx (WindowContentFactoryManager::RetrieveTypeNameFromResourceURL) to get somewhere here ...
+// cf. uielementfactorymanager.cxx (WindowContentFactoryManager::RetrieveTypeNameFromResourceURL) which
+// requires the DrawingFramework/ sub-path to get it's lookup right.
+const OUString FrameworkHelper::msTaskPanelURLPrefix("private:resource/toolpanel/DrawingFramework/");
// const OUString FrameworkHelper::msTaskPanelURLPrefix( "private:resource/toolpanel/" );
const OUString FrameworkHelper::msMasterPagesTaskPanelURL( msTaskPanelURLPrefix + "MasterPages");
diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
index 6d5878b899e1..8765c8945666 100644
--- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
+++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
@@ -410,7 +410,7 @@ void ToolPanelViewShell_Impl::Setup()
else
{
::boost::shared_ptr< FrameworkHelper > pFrameworkHelper( FrameworkHelper::Instance( GetAntiImpl().GetViewShellBase() ) );
- pFrameworkHelper->RequestSidebarPanel( aInitialPanel.sPanelResourceURL ); // MMeeks
+ pFrameworkHelper->RequestSidebarPanel( aInitialPanel.sPanelResourceURL );
}
}
@@ -804,7 +804,7 @@ void ToolPanelViewShell_Impl::ActivePanelChanged( const ::boost::optional< size_
{
// activate the resource belonging to the new panel. This will automatically de-activate the previously active
// panel resource (since ResourceActivationMode_REPLACE is used)
- pFrameworkHelper->RequestSidebarPanel( sNewPanelURL ); // MMeeks
+ pFrameworkHelper->RequestSidebarPanel( sNewPanelURL );
}
else if ( !sOldPanelURL.isEmpty() )
{