[Libreoffice-commits] core.git: sc/source sc/uiconfig sd/source sd/uiconfig
Tomaž Vajngerl (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jan 13 11:00:58 UTC 2021
sc/source/ui/app/scdll.cxx | 4 +++-
sc/source/ui/view/tabvwsh.cxx | 2 ++
sc/uiconfig/scalc/menubar/menubar.xml | 1 +
sd/source/ui/app/sddll.cxx | 2 ++
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 2 ++
sd/source/ui/view/drvwshrg.cxx | 7 +++++--
sd/source/ui/view/outlnvsh.cxx | 4 +++-
sd/uiconfig/sdraw/menubar/menubar.xml | 1 +
sd/uiconfig/simpress/menubar/menubar.xml | 1 +
9 files changed, 20 insertions(+), 4 deletions(-)
New commits:
commit c7337b7a1f0bdb60be9b4307a61c464e2a82e911
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Fri Jan 8 22:35:23 2021 +0900
Commit: Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Wed Jan 13 12:00:03 2021 +0100
devtools: Enable DevTools in Calc, Impress and Draw
This adds the DevTools to menu in Calc, Impress and Draw, so it
is possible to turn on the DevTools docking window in these most
relevant modules.
Change-Id: I446d2f0c9b6e5a1169d4eef556ac6989fa080634
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108977
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index c675ef07b792..35c3071e9a28 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -25,6 +25,7 @@
#include <comphelper/lok.hxx>
#include <sfx2/sidebar/SidebarChildWindow.hxx>
#include <sfx2/app.hxx>
+#include <svx/devtools/DevelopmentToolDockingWindow.hxx>
#include <avmedia/mediatoolbox.hxx>
#include <NumberFormatControl.hxx>
@@ -160,7 +161,8 @@ void ScDLL::Init()
#endif
// Common SFX Controller
- ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(false, pMod);
+ sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(false, pMod);
+ DevelopmentToolChildWindow::RegisterChildWindow(false, pMod);
// SvxStatusBar Controller
SvxInsertStatusBarControl ::RegisterControl(SID_ATTR_INSERT, pMod);
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 583e25c6af11..e7f2fafe53cc 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -23,6 +23,7 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/infobar.hxx>
#include <sfx2/sidebar/SidebarChildWindow.hxx>
+#include <svx/devtools/DevelopmentToolDockingWindow.hxx>
#include <sfx2/viewfac.hxx>
#include <cellvalue.hxx>
@@ -55,6 +56,7 @@ void ScTabViewShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(SID_NAVIGATOR, true);
GetStaticInterface()->RegisterChildWindow(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
+ GetStaticInterface()->RegisterChildWindow(DevelopmentToolChildWindow::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(ScNameDlgWrapper::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(ScNameDefDlgWrapper::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(ScSolverDlgWrapper::GetChildWindowId());
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 8e2b151e53a4..a8089440f73c 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -756,6 +756,7 @@
</menu:menu>
<menu:menu menu:id=".uno:HelpMenu">
<menu:menupopup>
+ <menu:menuitem menu:id=".uno:DevelopmentToolsDockingWindow"/>
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
<menu:menuitem menu:id=".uno:Documentation"/>
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index b3043e7eaca9..32bf8646573c 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -75,6 +75,7 @@
#include <svx/zoomsliderctrl.hxx>
#include <svx/tbxctl.hxx>
#include <sfx2/sidebar/SidebarChildWindow.hxx>
+#include <svx/devtools/DevelopmentToolDockingWindow.hxx>
#include <comphelper/lok.hxx>
#include <sdabstdlg.hxx>
#include <sdfilter.hxx>
@@ -166,6 +167,7 @@ void SdDLL::RegisterControllers(SdModule* pMod)
::sd::LeftPaneImpressChildWindow::RegisterChildWindow(false, pMod);
::sd::LeftPaneDrawChildWindow::RegisterChildWindow(false, pMod);
::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(false, pMod);
+ DevelopmentToolChildWindow::RegisterChildWindow(false, pMod);
SvxFillToolBoxControl::RegisterControl(0, pMod);
SvxLineWidthToolBoxControl::RegisterControl(0, pMod);
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index b8c5ccd3cfc9..ef85346c4a05 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -51,6 +51,7 @@
#include <sfx2/bindings.hxx>
#include <sfx2/request.hxx>
#include <sfx2/sidebar/SidebarChildWindow.hxx>
+#include <svx/devtools/DevelopmentToolDockingWindow.hxx>
#include <svx/svxids.hrc>
#include <vcl/EnumContext.hxx>
#include <svx/sidebar/ContextChangeEventMultiplexer.hxx>
@@ -74,6 +75,7 @@ SFX_IMPL_INTERFACE(SlideSorterViewShell, SfxShell)
void SlideSorterViewShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterChildWindow(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
+ GetStaticInterface()->RegisterChildWindow(DevelopmentToolChildWindow::GetChildWindowId());
}
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index 82e0e88ae74e..ccde86763911 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -29,6 +29,7 @@
#include <sfx2/objface.hxx>
#include <sfx2/sidebar/SidebarChildWindow.hxx>
#include <svx/f3dchild.hxx>
+#include <svx/devtools/DevelopmentToolDockingWindow.hxx>
#include <svx/svxids.hrc>
#include <svx/hyperdlg.hxx>
@@ -74,7 +75,8 @@ void DrawViewShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(::avmedia::MediaPlayer::GetChildWindowId());
#endif
GetStaticInterface()->RegisterChildWindow(
- ::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
+ sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
+ GetStaticInterface()->RegisterChildWindow(DevelopmentToolChildWindow::GetChildWindowId());
}
// SdGraphicViewShell
@@ -99,7 +101,8 @@ void GraphicViewShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(::avmedia::MediaPlayer::GetChildWindowId());
#endif
GetStaticInterface()->RegisterChildWindow(
- ::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
+ sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
+ GetStaticInterface()->RegisterChildWindow(DevelopmentToolChildWindow::GetChildWindowId());
}
} // end of namespace sd
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index ce1cb0ceeee3..b7434886e7cc 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -79,6 +79,7 @@
#include <DrawDocShell.hxx>
#include <OutlineView.hxx>
#include <framework/FrameworkHelper.hxx>
+#include <svx/devtools/DevelopmentToolDockingWindow.hxx>
#include <memory>
@@ -115,7 +116,8 @@ void OutlineViewShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(SvxHlinkDlgWrapper::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(::sd::SpellDialogChildWindow::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SID_SEARCH_DLG);
- GetStaticInterface()->RegisterChildWindow(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
+ GetStaticInterface()->RegisterChildWindow(sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
+ GetStaticInterface()->RegisterChildWindow(DevelopmentToolChildWindow::GetChildWindowId());
}
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index a2d06a2ec2ec..ae7b985daa47 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -638,6 +638,7 @@
</menu:menu>
<menu:menu menu:id=".uno:HelpMenu">
<menu:menupopup>
+ <menu:menuitem menu:id=".uno:DevelopmentToolsDockingWindow"/>
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
<menu:menuitem menu:id=".uno:Documentation"/>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index 758221939417..3913327c3833 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -669,6 +669,7 @@
</menu:menu>
<menu:menu menu:id=".uno:HelpMenu">
<menu:menupopup>
+ <menu:menuitem menu:id=".uno:DevelopmentToolsDockingWindow"/>
<menu:menuitem menu:id=".uno:HelpIndex"/>
<menu:menuitem menu:id=".uno:ExtendedHelp"/>
<menu:menuitem menu:id=".uno:Documentation"/>
More information about the Libreoffice-commits
mailing list