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, 1 insertions, 35 deletions

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 5514e17cbea8..3ec4771aaef1 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -172,10 +172,8 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
 	sd/source/ui/accessibility/AccessiblePresentationGraphicShape \
 	sd/source/ui/accessibility/AccessiblePresentationOLEShape \
 	sd/source/ui/accessibility/AccessiblePresentationShape \
-	sd/source/ui/accessibility/AccessibleScrollPanel \
 	sd/source/ui/accessibility/AccessibleSlideSorterObject \
 	sd/source/ui/accessibility/AccessibleSlideSorterView \
-	sd/source/ui/accessibility/AccessibleTreeNode \
 	sd/source/ui/accessibility/AccessibleViewForwarder \
 	sd/source/ui/accessibility/SdShapeTypes \
 	sd/source/ui/animations/CustomAnimationCreateDialog \
@@ -251,7 +249,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
 	sd/source/ui/framework/factories/FullScreenPane \
 	sd/source/ui/framework/factories/Pane \
 	sd/source/ui/framework/factories/PresentationFactory \
-	sd/source/ui/framework/factories/TaskPanelFactory \
 	sd/source/ui/framework/factories/ViewShellWrapper \
 	sd/source/ui/framework/module/CenterViewFocusModule \
 	sd/source/ui/framework/module/DrawModule \
@@ -340,6 +337,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
 	sd/source/ui/sidebar/MasterPageContainerProviders \
 	sd/source/ui/sidebar/MasterPageContainerQueue \
 	sd/source/ui/sidebar/MasterPageDescriptor \
+	sd/source/ui/sidebar/MasterPageObserver \
 	sd/source/ui/sidebar/MasterPagesSelector \
 	sd/source/ui/sidebar/NavigatorWrapper \
 	sd/source/ui/sidebar/PanelBase \
@@ -406,38 +404,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
 	sd/source/ui/table/TableDesignPane \
 	sd/source/ui/table/tablefunction \
 	sd/source/ui/table/tableobjectbar \
-	sd/source/ui/toolpanel/ControlContainer \
-	sd/source/ui/toolpanel/LayoutMenu \
-	sd/source/ui/toolpanel/ScrollPanel \
-	sd/source/ui/toolpanel/SlideSorterCacheDisplay \
-	sd/source/ui/toolpanel/SubToolPanel \
-	sd/source/ui/toolpanel/TaskPaneControlFactory \
-	sd/source/ui/toolpanel/TaskPaneFocusManager \
-	sd/source/ui/toolpanel/TaskPaneShellManager \
-	sd/source/ui/toolpanel/TaskPaneTreeNode \
-	sd/source/ui/toolpanel/TitleBar \
-	sd/source/ui/toolpanel/TitledControl \
-	sd/source/ui/toolpanel/ToolPanel \
-	sd/source/ui/toolpanel/ToolPanelFactory \
-	sd/source/ui/toolpanel/ToolPanelUIElement \
-	sd/source/ui/toolpanel/ToolPanelViewShell \
-	sd/source/ui/toolpanel/controls/AllMasterPagesSelector \
-	sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector \
-	sd/source/ui/toolpanel/controls/CustomAnimationPanel \
-	sd/source/ui/toolpanel/controls/DocumentHelper \
-	sd/source/ui/toolpanel/controls/MasterPageContainer \
-	sd/source/ui/toolpanel/controls/MasterPageContainerFiller \
-	sd/source/ui/toolpanel/controls/MasterPageContainerProviders \
-	sd/source/ui/toolpanel/controls/MasterPageContainerQueue \
-	sd/source/ui/toolpanel/controls/MasterPageDescriptor \
-	sd/source/ui/toolpanel/controls/MasterPageObserver \
-	sd/source/ui/toolpanel/controls/MasterPagesPanel \
-	sd/source/ui/toolpanel/controls/MasterPagesSelector \
-	sd/source/ui/toolpanel/controls/PreviewValueSet \
-	sd/source/ui/toolpanel/controls/RecentMasterPagesSelector \
-	sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages \
-	sd/source/ui/toolpanel/controls/SlideTransitionPanel \
-	sd/source/ui/toolpanel/controls/TableDesignPanel \
 	sd/source/ui/tools/AsynchronousCall \
 	sd/source/ui/tools/ConfigurationAccess \
 	sd/source/ui/tools/EventMultiplexer \