Turn sidebar back to non-experimental

This reverts commit 7ce2a89f4f8fa84232896766276cb3433ada239c.

Change-Id: I53f572777e84f66fd4c3d18fb686dac09095804a

revert d38cb53e3bcf3fd95a75e03b01c3b7a209d07b46

Change-Id: I5b243b69e50084316aaeab250d6b01079c12b718

Revert "sidebar: disable impress task pane if sidebar is enabled."

This reverts commit ee1726bfdba483623d496a3bcc09089e8b55cd65.

revert 54d820a7815af03a248c1aa424fae9bf9a4881f4

Change-Id: Ie7c83d88f5427a7e42fa50879280a0c4a7c2cdd1

Revert "Only register and use the Sidebar if it is globally enabled."

This reverts commit 66a5cc468cef0c6db8b42b7f25367f04208e6f2e.

Conflicts:
	sfx2/source/view/viewfrm.cxx

Change-Id: I17fe702996c4adf7f387573d36ea993f8cc32c96

Revert "disable sidebar menu option if it is disabled."

This reverts commit 05f0eb57618d090fa45011120a907a3b1157accb.

Revert "finally get the taskpane rendering again"

This reverts commit 228bb7ffe0d404ba1225f7b4d26ca71e098577d9.

Conflicts:
	officecfg/registry/data/org/openoffice/Office/Impress.xcu
	sd/source/ui/framework/factories/TaskPanelFactory.cxx
	sd/source/ui/framework/tools/FrameworkHelper.cxx

Change-Id: I248cc9a769695cde19e78774d42ce666dc685599

Revert "don't throw up the sidebar on start."

This reverts commit 645db9a2bd9b1eec381de60c491e6b7f9ee7a7b4.

Conflicts:
	officecfg/registry/data/org/openoffice/Office/Views.xcu

Change-Id: I911859757e2e019836e8ed5213d2ba69ff82aec8

Revert "update to the right service name for new URLs."

This reverts commit 55f49970f4085e3a1498961edabd5303bd6bea6c.

Conflicts:
	sd/source/ui/framework/tools/FrameworkHelper.cxx

Change-Id: I1ba2762a4c969a9125ff8354a9b6035813290021

Revert "tentatively restore more UNO / task-pane goo ..."

This reverts commit 052ac10a6f9b28b9b06884dd3ed41879722be6c9.

Conflicts:
	officecfg/registry/data/org/openoffice/Office/Impress.xcu

Change-Id: I7e62f27329af033df811549436718648a6447dea

Revert "more reverts, first cut at making sidebar optional."

This reverts commit a65a423e22fc03d0b7850bbf20dfc30f6cfa34dd.

Revert "add experimental option for sidebar to 'Advanced' pane."

This reverts commit 54d820a7815af03a248c1aa424fae9bf9a4881f4.

Conflicts:
	cui/source/options/optjava.cxx
	sd/source/ui/framework/module/ImpressModule.cxx

Change-Id: I09a6c0f7834c8ef330d05a014505aaaf09ae096f

Revert "Restore FrameworkHelper taskpane URLs."

This reverts commit e9c2d5b26b1e1b52bdf87192a76314b7362fa80c.

more foo

Change-Id: I2eaa2fbd74dc7a2f7ba937d310472cee6b5a0b57

really go to town on it

Change-Id: I885dc03cd0286bbfdf05c05da9f0bbea2b78bcf4

1 files changed, 0 insertions, 89 deletions

diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx
index c82a32679f51..fd8237aa42b0 100644
--- a/sd/source/ui/dlg/PaneChildWindows.cxx
+++ b/sd/source/ui/dlg/PaneChildWindows.cxx
@@ -46,7 +46,6 @@ using ::com::sun::star::drawing::framework::ResourceActivationMode_REPLACE;
 
 SFX_IMPL_DOCKINGWINDOW_WITHID(LeftPaneImpressChildWindow, SID_LEFT_PANE_IMPRESS)
 SFX_IMPL_DOCKINGWINDOW_WITHID(LeftPaneDrawChildWindow, SID_LEFT_PANE_DRAW)
-SFX_IMPL_DOCKINGWINDOW_WITHID(ToolPanelChildWindow, SID_TASKPANE)
 
 //===== PaneChildWindow =======================================================
 
@@ -135,94 +134,6 @@ LeftPaneDrawChildWindow::LeftPaneDrawChildWindow (
 {
 }
 
-
-ToolPanelChildWindow::ToolPanelChildWindow( ::Window* i_pParentWindow, sal_uInt16 i_nId, SfxBindings* i_pBindings,
-        SfxChildWinInfo* i_pChildWindowInfo )
-    :PaneChildWindow( i_pParentWindow, i_nId, i_pBindings, i_pChildWindowInfo,
-        FLT_TOOL_PANEL_DOCKING_WINDOW, STR_RIGHT_PANE_TITLE, SFX_ALIGN_RIGHT )
-{
-    // just in case this window has been created by SFX, instead our resource framework: Ensure that the resource framework
-    // activates the task pane, so it is really filled with content (in opposite to the other SFX applications, the
-    // child window registered for SID_TASKPANE is not responsible for its content, but here in SD, it's the ToolPanelViewShell
-    // which has this responsibility. And this view shell is created implicitly via the resource framework.)
-    // #i113788#
-    SfxDockingWindow* pDockingWindow = dynamic_cast< SfxDockingWindow* >( GetWindow() );
-    ViewShellBase* pViewShellBase = ViewShellBase::GetViewShellBase( pDockingWindow->GetBindings().GetDispatcher()->GetFrame() );
-    ENSURE_OR_RETURN_VOID( pViewShellBase != NULL, "ToolPanelChildWindow::ToolPanelChildWindow: no view shell access!" );
-
-    const ::boost::shared_ptr< framework::FrameworkHelper > pFrameworkHelper( framework::FrameworkHelper::Instance( *pViewShellBase ) );
-    ENSURE_OR_RETURN_VOID( pFrameworkHelper.get(), "ToolPanelChildWindow::ToolPanelChildWindow: no framework helper for the view shell!" );
-    Reference<XConfigurationController> xConfigController( pFrameworkHelper->GetConfigurationController() );
-    ENSURE_OR_RETURN_VOID( xConfigController.is(), "ToolPanelChildWindow::ToolPanelChildWindow: no config controller!" );
-    xConfigController->requestResourceActivation(
-        framework::FrameworkHelper::CreateResourceId( framework::FrameworkHelper::msRightPaneURL ),
-        ResourceActivationMode_ADD );
-    xConfigController->requestResourceActivation(
-        framework::FrameworkHelper::CreateResourceId( framework::FrameworkHelper::msTaskPaneURL, framework::FrameworkHelper::msRightPaneURL ),
-        ResourceActivationMode_REPLACE
-    );
-}
-
-//----------------------------------------------------------------------------------------------------------------------
-struct DelayedToolPanelActivation
-{
-    DelayedToolPanelActivation( ToolPanelChildWindow& i_rToolPanelWindow, const OUString& i_rPanelURL )
-        :m_rToolPanelWindow( i_rToolPanelWindow )
-        ,m_sPanelURL( i_rPanelURL )
-    {
-    }
-
-    void operator() (bool)
-    {
-        m_rToolPanelWindow.ActivateToolPanel( m_sPanelURL );
-    }
-
-private:
-    ToolPanelChildWindow&   m_rToolPanelWindow;
-    const OUString   m_sPanelURL;
-};
-
-//----------------------------------------------------------------------------------------------------------------------
-void ToolPanelChildWindow::ActivateToolPanel( const OUString& i_rPanelURL )
-{
-    SfxDockingWindow* pDockingWindow = dynamic_cast< SfxDockingWindow* >( GetWindow() );
-    ViewShellBase* pViewShellBase = ViewShellBase::GetViewShellBase( pDockingWindow->GetBindings().GetDispatcher()->GetFrame() );
-    ENSURE_OR_RETURN_VOID( pViewShellBase != NULL, "ToolPanelChildWindow::ActivateToolPanel: no view shell access!" );
-
-    const ::boost::shared_ptr< framework::FrameworkHelper > pFrameworkHelper( framework::FrameworkHelper::Instance( *pViewShellBase ) );
-
-    if ( i_rPanelURL.indexOf( framework::FrameworkHelper::msTaskPanelURLPrefix ) == 0 )
-    {
-        // it's one of our standard panels known to the drawing framework
-        pFrameworkHelper->RequestSidebarPanel( i_rPanelURL );
-    }
-    else
-    {
-        // TODO: it would be nice if the drawing framework were able to handle non-standard panels, installed by
-        // extensions, too. As long as this is not the case, we need to take the direct way ...
-        ::boost::shared_ptr< ViewShell > pViewShell = pFrameworkHelper->GetViewShell( framework::FrameworkHelper::msRightPaneURL );
-        toolpanel::ToolPanelViewShell* pToolPanelViewShell = dynamic_cast< toolpanel::ToolPanelViewShell* >( pViewShell.get() );
-        if ( pToolPanelViewShell )
-        {
-            pToolPanelViewShell->ActivatePanel( i_rPanelURL );
-        }
-        else
-        {
-            Reference< XResourceId > xTaskPaneResource = pFrameworkHelper->RequestView(
-                framework::FrameworkHelper::msTaskPaneURL, framework::FrameworkHelper::msRightPaneURL );
-            pFrameworkHelper->RunOnResourceActivation( xTaskPaneResource, DelayedToolPanelActivation( *this, i_rPanelURL ) );
-        }
-    }
-}
-
-void ToolPanelChildWindow::RegisterChildWindowIfEnabled (sal_Bool bVisible,
-                                                         SfxModule *pMod,
-                                                         sal_uInt16 nFlags)
-{
-    if ( ! SfxViewFrame::IsSidebarEnabled() )
-        RegisterChildWindow( bVisible, pMod, nFlags );
-}
-
 } // end of namespace ::sd
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */