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 /sfx2/source/appl | |
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 'sfx2/source/appl')
-rw-r--r-- | sfx2/source/appl/appchild.cxx | 14 | ||||
-rw-r--r-- | sfx2/source/appl/appreg.cxx | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx index a0add3ebf2d9..43ff5f1fbe9d 100644 --- a/sfx2/source/appl/appchild.cxx +++ b/sfx2/source/appl/appchild.cxx @@ -132,6 +132,20 @@ SfxChildWinFactArr_Impl& SfxApplication::GetChildWinFactories_Impl() const } + +SfxTemplateDialog* SfxApplication::GetTemplateDialog() +{ + if ( pAppData_Impl->pViewFrame ) + { + SfxChildWindow *pChild = pAppData_Impl->pViewFrame->GetChildWindow(SfxTemplateDialogWrapper::GetChildWindowId()); + return pChild ? (SfxTemplateDialog*) pChild->GetWindow() : 0; + } + + return NULL; +} + + + SfxWorkWindow* SfxApplication::GetWorkWindow_Impl(const SfxViewFrame *pFrame) const { if ( pFrame ) diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx index e9c1e6e1905a..caa32b13a0f2 100644 --- a/sfx2/source/appl/appreg.cxx +++ b/sfx2/source/appl/appreg.cxx @@ -54,6 +54,7 @@ void SfxApplication::Registrations_Impl() SfxRecordingFloatWrapper_Impl::RegisterChildWindow(); SfxNavigatorWrapper::RegisterChildWindow( false, NULL, SFX_CHILDWIN_NEVERHIDE ); SfxPartChildWnd_Impl::RegisterChildWindow(); + SfxTemplateDialogWrapper::RegisterChildWindow(true); SfxDockingWrapper::RegisterChildWindow(); SfxInfoBarContainerChild::RegisterChildWindow( true, NULL, SFX_CHILDWIN_NEVERHIDE ); |