From a836afe471d6df7bfc932fc419f7ccad7d40efb2 Mon Sep 17 00:00:00 2001 From: Samuel Mehrbrodt Date: Thu, 25 Sep 2014 16:54:39 +0200 Subject: fdo#73151 Always open Styles&Formatting dialog in the sidebar Change-Id: I05b63dc00023945d92fd837bd64042135d3f9aed Reviewed-on: https://gerrit.libreoffice.org/11648 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt --- sw/source/uibase/app/docst.cxx | 8 +------- sw/source/uibase/uiview/view0.cxx | 1 - sw/source/uibase/web/wview.cxx | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) (limited to 'sw/source') diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx index 8b9b02a14dda..d99b68e36087 100644 --- a/sw/source/uibase/app/docst.cxx +++ b/sw/source/uibase/app/docst.cxx @@ -477,14 +477,8 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq ) nRet = UpdateStyle(aParam, nFamily, pActShell); break; case SID_STYLE_NEW_BY_EXAMPLE: - { nRet = MakeByExample(aParam, nFamily, nMask, pActShell ); - SfxTemplateDialog* pDlg = SfxGetpApp()->GetTemplateDialog(); - - if(pDlg && pDlg->IsVisible()) - pDlg->Update(); - } - break; + break; default: OSL_FAIL("Invalid SlotId"); diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx index 6359ae839c20..c7e81bbe6af3 100644 --- a/sw/source/uibase/uiview/view0.cxx +++ b/sw/source/uibase/uiview/view0.cxx @@ -96,7 +96,6 @@ 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 c2bd48b1fb78..258cdcda5912 100644 --- a/sw/source/uibase/web/wview.cxx +++ b/sw/source/uibase/web/wview.cxx @@ -76,7 +76,6 @@ 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