diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-25 10:58:43 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-25 11:01:52 +0200 |
| commit | 89ecdc47e14e3be7fe939b5e76985b9531fcfb42 (patch) | |
| tree | 806ae2abe619b1304ba0d6d29dc41be6a2815fd1 /sfx2/source/view/viewfrm.cxx | |
| parent | 805df2f4131be1a62e64da87cc990c07481b988f (diff) | |
Revert "fdo#73151 Always open Styles&Formatting dialog in the sidebar"
This reverts commit 473ed449a4b6f550dc1af47a07c6e0ef243a98b2, which made
JunitTest_toolkit_unoapi fail, as
AccessibleDropDownListBox.createTestEnvironment
(qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java) was no longer
able to find its AccessilbeRole.COMBO_BOX AccessibleDropDownListBox, which it
apparently expected to find in a docked stylist (cf. DesktopTools.dockStylist
in AccessibleDropDownListBox.initialize).
Diffstat (limited to 'sfx2/source/view/viewfrm.cxx')
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 458fb01168c3..e4e44d166bde 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -133,7 +133,6 @@ using ::com::sun::star::container::XIndexContainer; #include <sfx2/frmdescr.hxx> #include <sfx2/sfxuno.hxx> #include <sfx2/progress.hxx> -#include <sfx2/sidebar/Sidebar.hxx> #include "workwin.hxx" #include "helper.hxx" #include <sfx2/minfitem.hxx> @@ -3139,16 +3138,6 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq ) rReq.Done(); return; } - if (nSID == SID_STYLE_DESIGNER) - { - // First make sure that the sidebar is visible - ShowChildWindow(SID_SIDEBAR); - - ::sfx2::sidebar::Sidebar::ShowPanel("StyleListPanel", - GetFrame().GetFrameInterface()); - rReq.Done(); - return; - } bool bHasChild = HasChildWindow(nSID); bool bShow = pShowItem ? pShowItem->GetValue() : !bHasChild; |