diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-09-19 14:55:24 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-20 16:35:29 +0100 |
| commit | d023339c2f85555212bdb9804854dcc2c403b50e (patch) | |
| tree | 2c4f10df45f2ce8d4200fcda72fc87e1eb1b8219 /sfx2/source/sidebar/SidebarChildWindow.cxx | |
| parent | e9ba193f5e61d7855be694a2c414b9e1bc198d5e (diff) | |
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
Diffstat (limited to 'sfx2/source/sidebar/SidebarChildWindow.cxx')
| -rw-r--r-- | sfx2/source/sidebar/SidebarChildWindow.cxx | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx index 2a75ff4936ba..10afde2af123 100644 --- a/sfx2/source/sidebar/SidebarChildWindow.cxx +++ b/sfx2/source/sidebar/SidebarChildWindow.cxx @@ -23,7 +23,6 @@ #include "sfx2/sfxsids.hrc" #include "helpid.hrc" #include "sfx2/dockwin.hxx" -#include "sfx2/viewfrm.hxx" #include <sfx2/sidebar/ResourceDefinitions.hrc> @@ -75,13 +74,6 @@ sal_Int32 SidebarChildWindow::GetDefaultWidth (Window* pWindow) return 0; } -void SidebarChildWindow::RegisterChildWindowIfEnabled (sal_Bool bVisible, - SfxModule *pMod, - sal_uInt16 nFlags) -{ - if ( SfxViewFrame::IsSidebarEnabled() ) - RegisterChildWindow( bVisible, pMod, nFlags ); -} } } // end of namespace sfx2::sidebar |