[Libreoffice-commits] core.git: include/sfx2 officecfg/registry sc/source sd/source sfx2/sdi sfx2/source svx/source sw/source
Stephan Bergmann
sbergman at redhat.com
Thu Sep 25 02:02:23 PDT 2014
include/sfx2/app.hxx | 1
include/sfx2/templdlg.hxx | 10 +++++
officecfg/registry/data/org/openoffice/Office/Views.xcu | 6 +++
sc/source/ui/view/tabvwsh.cxx | 1
sd/source/ui/slideshow/slideshowimpl.cxx | 1
sd/source/ui/view/drvwshrg.cxx | 2 +
sd/source/ui/view/outlnvsh.cxx | 1
sfx2/sdi/frmslots.sdi | 1
sfx2/source/appl/appchild.cxx | 14 ++++++++
sfx2/source/appl/appreg.cxx | 1
sfx2/source/dialog/templdlg.cxx | 16 +++++++++
sfx2/source/inc/templdgi.hxx | 3 +
sfx2/source/view/viewfrm.cxx | 11 ------
svx/source/sidebar/gallery/GalleryPanel.hxx | 27 ++++++++++++++++
sw/source/uibase/app/docst.cxx | 8 ++++
sw/source/uibase/uiview/view0.cxx | 1
sw/source/uibase/web/wview.cxx | 1
17 files changed, 93 insertions(+), 12 deletions(-)
New commits:
commit 89ecdc47e14e3be7fe939b5e76985b9531fcfb42
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Sep 25 10:58:43 2014 +0200
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).
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 1f1e831..5c456af 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 6e6ed778..4bd6ac4 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 -----------------------------------------
diff --git a/officecfg/registry/data/org/openoffice/Office/Views.xcu b/officecfg/registry/data/org/openoffice/Office/Views.xcu
index a2c7f43..771ed28 100644
--- a/officecfg/registry/data/org/openoffice/Office/Views.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Views.xcu
@@ -19,6 +19,12 @@
<!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:install="http://openoffice.org/2004/installation" oor:name="Views" oor:package="org.openoffice.Office">
<node oor:name="Windows">
+ <!-- Hide Styles&Formatting dialog -->
+ <node oor:name="5539" oor:op="replace">
+ <prop oor:name="Visible" oor:type="xs:boolean">
+ <value>false</value>
+ </prop>
+ </node>
<!-- Show sidebar only in Impress and Writer by default -->
<node oor:name="10336" oor:op="replace">
<prop oor:name="Visible" oor:type="xs:boolean">
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 51aaae8..847f3f6 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -54,6 +54,7 @@ void ScTabViewShell::InitInterface_Impl()
ScResId(RID_OBJECTBAR_TOOLS));
GetStaticInterface()->RegisterChildWindow(FID_INPUTLINE_STATUS);
+ GetStaticInterface()->RegisterChildWindow(SfxTemplateDialogWrapper::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SID_NAVIGATOR, true);
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 4704c90..a6ccac9 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2482,6 +2482,7 @@ FncGetChildWindowId aShowChildren[] =
&SvxBmpMaskChildWindow::GetChildWindowId,
&SvxIMapDlgChildWindow::GetChildWindowId,
&SvxHlinkDlgWrapper::GetChildWindowId,
+ &SfxTemplateDialogWrapper::GetChildWindowId,
&SfxInfoBarContainerChild::GetChildWindowId
};
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index b588cb2..0e39e0a 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -67,6 +67,7 @@ void DrawViewShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(SID_NAVIGATOR, true);
+ GetStaticInterface()->RegisterChildWindow(SfxTemplateDialogWrapper::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SvxFontWorkChildWindow::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SvxColorChildWindow::GetChildWindowId());
@@ -93,6 +94,7 @@ void GraphicViewShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(SID_NAVIGATOR, true);
+ GetStaticInterface()->RegisterChildWindow(SfxTemplateDialogWrapper::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SvxFontWorkChildWindow::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SvxColorChildWindow::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(Svx3DChildWindow::GetChildWindowId());
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index c5d440c..0ad65d4 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -117,6 +117,7 @@ void OutlineViewShell::InitInterface_Impl()
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER | SFX_VISIBILITY_READONLYDOC,
SdResId(RID_DRAW_VIEWER_TOOLBOX));
+ GetStaticInterface()->RegisterChildWindow(SfxTemplateDialogWrapper::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SvxHlinkDlgWrapper::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(::sd::SpellDialogChildWindow::GetChildWindowId());
diff --git a/sfx2/sdi/frmslots.sdi b/sfx2/sdi/frmslots.sdi
index 617f77f..362ced4 100644
--- a/sfx2/sdi/frmslots.sdi
+++ b/sfx2/sdi/frmslots.sdi
@@ -94,6 +94,7 @@ interface Window
SID_STYLE_DESIGNER // ole(no) api(final/play/rec)
[
ExecMethod = ChildWindowExecute ;
+ StateMethod = ChildWindowState ;
]
SID_RECORDING_FLOATWINDOW // ole(no) api(final/play/rec)
[
diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx
index a0add3e..43ff5f1 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 e9c1e6e..caa32b1 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 );
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 91490b4..45db4a6 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -90,6 +90,9 @@ static sal_uInt16 nLastItemId = USHRT_MAX;
TYPEINIT0(SfxCommonTemplateDialog_Impl);
TYPEINIT1(SfxTemplateDialog_Impl,SfxCommonTemplateDialog_Impl);
+SFX_IMPL_DOCKINGWINDOW_WITHID(SfxTemplateDialogWrapper, SID_STYLE_DESIGNER)
+
+
class SfxCommonTemplateDialog_Impl::DeletionWatcher : private boost::noncopyable
{
@@ -345,6 +348,19 @@ PopupMenu* SfxActionListBox::CreateContextMenu( void )
}
+
+SfxTemplateDialogWrapper::SfxTemplateDialogWrapper(vcl::Window *pParentWnd,
+ sal_uInt16 nId, SfxBindings *p, SfxChildWinInfo *pInfo) :
+ SfxChildWindow(pParentWnd, nId)
+{
+ SfxTemplateDialog *pWin = new SfxTemplateDialog(p, this, pParentWnd);
+ pWindow = pWin;
+ eChildAlignment = SFX_ALIGN_NOALIGNMENT;
+
+ pWin->Initialize( pInfo );
+ pWin->SetMinOutputSizePixel(pWin->pImpl->GetMinOutputSizePixel());
+}
+
//===== SfxTemplatePanelControl ===============================================
SfxTemplatePanelControl::SfxTemplatePanelControl (
SfxBindings* pBindings,
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index fe7cf61..9da6c97 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -44,6 +44,7 @@ class SvTreeListBox ;
class StyleTreeListBox_Impl;
class SfxTemplateDialog_Impl;
class SfxCommonTemplateDialog_Impl;
+class SfxTemplateDialogWrapper;
class SfxDockingWindow;
namespace com { namespace sun { namespace star { namespace frame { class XModuleManager2; } } } }
@@ -153,6 +154,7 @@ protected:
friend class DropListBox_Impl;
friend class SfxTemplateControllerItem;
+ friend class SfxTemplateDialogWrapper;
SfxBindings* pBindings;
SfxTemplateControllerItem* pBoundItems[COUNT_BOUND_FUNC];
@@ -309,6 +311,7 @@ class SfxTemplateDialog_Impl : public SfxCommonTemplateDialog_Impl
{
private:
friend class SfxTemplateControllerItem;
+ friend class SfxTemplateDialogWrapper;
friend class DropToolBox_Impl;
friend class SfxTemplatePanelControl;
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 458fb01..e4e44d1 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -133,7 +133,6 @@ using ::com::sun::star::container::XIndexContainer;
#include <sfx2/frmdescr.hxx>
#include <sfx2/sfxuno.hxx>
#include <sfx2/progress.hxx>
-#include <sfx2/sidebar/Sidebar.hxx>
#include "workwin.hxx"
#include "helper.hxx"
#include <sfx2/minfitem.hxx>
@@ -3139,16 +3138,6 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
rReq.Done();
return;
}
- if (nSID == SID_STYLE_DESIGNER)
- {
- // First make sure that the sidebar is visible
- ShowChildWindow(SID_SIDEBAR);
-
- ::sfx2::sidebar::Sidebar::ShowPanel("StyleListPanel",
- GetFrame().GetFrameInterface());
- rReq.Done();
- return;
- }
bool bHasChild = HasChildWindow(nSID);
bool bShow = pShowItem ? pShowItem->GetValue() : !bHasChild;
diff --git a/svx/source/sidebar/gallery/GalleryPanel.hxx b/svx/source/sidebar/gallery/GalleryPanel.hxx
new file mode 100644
index 0000000..d75f080
--- /dev/null
+++ b/svx/source/sidebar/gallery/GalleryPanel.hxx
@@ -0,0 +1,27 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_GALLERY_GALLERYPANEL_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_GALLERY_GALLERYPANEL_HXX
+
+class GelleryPanel
+{
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index d99b68e..8b9b02a 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -477,8 +477,14 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
nRet = UpdateStyle(aParam, nFamily, pActShell);
break;
case SID_STYLE_NEW_BY_EXAMPLE:
+ {
nRet = MakeByExample(aParam, nFamily, nMask, pActShell );
- break;
+ SfxTemplateDialog* pDlg = SfxGetpApp()->GetTemplateDialog();
+
+ if(pDlg && pDlg->IsVisible())
+ pDlg->Update();
+ }
+ break;
default:
OSL_FAIL("Invalid SlotId");
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index c7e81bb..6359ae8 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -96,6 +96,7 @@ 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 258cdcd..c2bd48b 100644
--- a/sw/source/uibase/web/wview.cxx
+++ b/sw/source/uibase/web/wview.cxx
@@ -76,6 +76,7 @@ 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());
More information about the Libreoffice-commits
mailing list