From 89ecdc47e14e3be7fe939b5e76985b9531fcfb42 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann <sbergman@redhat.com> Date: Thu, 25 Sep 2014 10:58:43 +0200 Subject: 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). --- sw/source/uibase/app/docst.cxx | 8 +++++++- sw/source/uibase/uiview/view0.cxx | 1 + sw/source/uibase/web/wview.cxx | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) (limited to 'sw') diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index d99b68e36087..8b9b02a14dda 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -477,8 +477,14 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq ) nRet = UpdateStyle(aParam, nFamily, pActShell); break; case SID_STYLE_NEW_BY_EXAMPLE: + { nRet = MakeByExample(aParam, nFamily, nMask, pActShell ); - break; + SfxTemplateDialog* pDlg = SfxGetpApp()->GetTemplateDialog(); + + if(pDlg && pDlg->IsVisible()) + pDlg->Update(); + } + break; default: OSL_FAIL("Invalid SlotId"); diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx index c7e81bbe6af3..6359ae839c20 100644 --- a/sw/source/uibase/uiview/view0.cxx +++ b/sw/source/uibase/uiview/view0.cxx @@ -96,6 +96,7 @@ void SwView::InitInterface_Impl() GetStaticInterface()->RegisterChildWindow(SID_NAVIGATOR, true); GetStaticInterface()->RegisterChildWindow(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId()); + GetStaticInterface()->RegisterChildWindow(SfxTemplateDialogWrapper::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(SvxSearchDialogWrapper::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(SwSpellDialogChildWindow::GetChildWindowId()); diff --git a/sw/source/uibase/web/wview.cxx b/sw/source/uibase/web/wview.cxx index 258cdcda5912..c2bd48b1fb78 100644 --- a/sw/source/uibase/web/wview.cxx +++ b/sw/source/uibase/web/wview.cxx @@ -76,6 +76,7 @@ SFX_IMPL_INTERFACE(SwWebView, SwView, SW_RES(RID_WEBTOOLS_TOOLBOX) ) void SwWebView::InitInterface_Impl() { + GetStaticInterface()->RegisterChildWindow(SfxTemplateDialogWrapper::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(SvxSearchDialogWrapper::GetChildWindowId()); GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId()); -- cgit