diff options
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/Impress.xcu | 4 | ||||
-rw-r--r-- | sd/source/ui/dlg/PaneChildWindows.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/framework/tools/FrameworkHelper.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/dialog/taskpane.cxx | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu b/officecfg/registry/data/org/openoffice/Office/Impress.xcu index 4d5ab3f43e2a..ad5cbd9b1559 100644 --- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu @@ -150,7 +150,7 @@ </node> <node oor:name="F3" oor:op="replace"> <prop oor:name="ServiceName"> - <value>com.sun.star.drawing.framework.TaskPanelFactory</value> <!-- MMeeks --> + <value>com.sun.star.drawing.framework.TaskPanelFactory</value> </prop> <node oor:name="ResourceList"> <node oor:name="R0a" oor:op="replace"> @@ -164,7 +164,7 @@ </prop> </node> <node oor:name="R0c" oor:op="replace"> - <prop oor:name="URL"> <!-- MMeeks renamed from UsedMasterPages --> + <prop oor:name="URL"> <value>private:resource/toolpanel/DrawingFramework/MasterPages</value> </prop> </node> 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() ) { diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index d79ede735eb8..c7aa092801e5 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -938,8 +938,6 @@ namespace sfx2 LINK( this, TaskPaneController_Impl, OnToolboxClicked ) ); m_rDockingWindow.SetEndDockingHdl( LINK( this, TaskPaneController_Impl, DockingChanged ) ); - // MMeeks - this is the big switch changing how the tabs look ... -// impl_setLayout(LAYOUT_TABS_RIGHT, true); impl_setLayout(LAYOUT_DRAWERS, true); m_rTaskPane.GetPanelDeck().AddListener( *this ); |