diff options
| author | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2014-09-02 00:18:52 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2014-09-24 17:57:52 +0000 |
| commit | 473ed449a4b6f550dc1af47a07c6e0ef243a98b2 (patch) | |
| tree | f2cf202095cb8b0b6fd4e6b9792f51e8403aa416 /sw/source | |
| parent | 9fd7ca788bc8fd88b048c544edb0dc6518010e11 (diff) | |
fdo#73151 Always open Styles&Formatting dialog in the sidebar
This removes the floating window for Styles&Formatting as discussed in fdo#73151.
Change-Id: I352d27a4d30632dcfda8963c23629e62ab850524
Reviewed-on: https://gerrit.libreoffice.org/11253
Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/uibase/app/docst.cxx | 8 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/view0.cxx | 1 | ||||
| -rw-r--r-- | sw/source/uibase/web/wview.cxx | 1 |
3 files changed, 1 insertions, 9 deletions
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()); |