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 /include | |
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 'include')
-rw-r--r-- | include/sfx2/app.hxx | 1 | ||||
-rw-r--r-- | include/sfx2/templdlg.hxx | 10 |
2 files changed, 0 insertions, 11 deletions
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 5c456af41ded..1f1e831f837b 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -175,7 +175,6 @@ public: * @param pArgs Takes ownership */ sal_uIntPtr LoadTemplate( SfxObjectShellLock& xDoc, const OUString& rFileName, bool bCopy=true, SfxItemSet* pArgs = 0 ); - SfxTemplateDialog* GetTemplateDialog(); vcl::Window* GetTopWindow() const; // members diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx index 4bd6ac4292d6..6e6ed778ddb1 100644 --- a/include/sfx2/templdlg.hxx +++ b/include/sfx2/templdlg.hxx @@ -34,7 +34,6 @@ class SfxTemplateDialog_Impl; class SfxTemplateDialog : public SfxDockingWindow { private: -friend class SfxTemplateDialogWrapper; friend class SfxTemplateDialog_Impl; SfxTemplateDialog_Impl* pImpl; @@ -56,15 +55,6 @@ public: static SfxStyleFamily SFX2_DLLPUBLIC NIdToSfxFamilyId(sal_uInt16 nId); }; -// class SfxTemplateDialogWrapper ---------------------------------------- - -class SFX2_DLLPUBLIC SfxTemplateDialogWrapper : public SfxChildWindow -{ -public: - SfxTemplateDialogWrapper - (vcl::Window*,sal_uInt16,SfxBindings*,SfxChildWinInfo*); - SFX_DECL_CHILDWINDOW_WITHID(SfxTemplateDialogWrapper); -}; // class SfxTemplatePanelControl ----------------------------------------- |