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 /include | |
| 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 'include')
| -rw-r--r-- | include/sfx2/app.hxx | 1 | ||||
| -rw-r--r-- | include/sfx2/templdlg.hxx | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 1f1e831f837b..5c456af41ded 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -175,6 +175,7 @@ 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 6e6ed778ddb1..4bd6ac4292d6 100644 --- a/include/sfx2/templdlg.hxx +++ b/include/sfx2/templdlg.hxx @@ -34,6 +34,7 @@ class SfxTemplateDialog_Impl; class SfxTemplateDialog : public SfxDockingWindow { private: +friend class SfxTemplateDialogWrapper; friend class SfxTemplateDialog_Impl; SfxTemplateDialog_Impl* pImpl; @@ -55,6 +56,15 @@ 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 ----------------------------------------- |