extras/source/glade/libreoffice-catalog.xml.in | 4 ----
solenv/bin/native-code.py | 1 -
sw/source/uibase/inc/navipi.hxx | 9 +--------
sw/source/uibase/utlui/navipi.cxx | 13 -------------
sw/uiconfig/swriter/ui/navigatorpanel.ui | 2 +-
5 files changed, 2 insertions(+), 27 deletions(-)
New commits:
commit 6efe229c46ac9d66a141e36647aecaa7adaaa790
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Jan 15 20:23:54 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Jan 16 10:25:08 2020 +0100
can replace SwNavHelpToolBox with basic ToolBox now
Change-Id: Ifcbba2b306e5c89fa970aa101df85d1b259c608d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86885
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index 1b43f651ac91..1d2164a56916 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -123,10 +123,6 @@
</properties>
</glade-widget-class>
- <glade-widget-class title="Writer Navigator ToolBox"
name="swlo-SwNavHelpToolBox"
- generic-name="Writer Navigator ToolBox"
parent="GtkToolbar"
- icon-name="widget-gtk-toolbar"/>
-
<glade-widget-class title="Recent Documents View"
name="sfxlo-RecentDocsView"
generic-name="Icon View" parent="GtkIconView"
icon-name="widget-gtk-iconview"/>
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 10d4f73dab7b..99b867ba335b 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -517,7 +517,6 @@ custom_widgets = [
'SvxColorValueSet',
'SvxLightCtl3D',
'SvxRelativeField',
- 'SwNavHelpToolBox',
'TemplateDefaultView',
]
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index 2aba488ef4be..24af7ae139f4 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -46,13 +46,6 @@ class SfxChildWindowContext;
enum class RegionMode;
class SpinField;
-class SwNavHelpToolBox : public ToolBox
-{
-public:
- SwNavHelpToolBox(Window* pParent);
- ~SwNavHelpToolBox() override;
-};
-
class NaviStateListener final : public SfxControllerItem
{
private:
@@ -73,7 +66,7 @@ class SwNavigationPI : public PanelLayout,
friend class SwGlobalTree;
friend class SwNavigationPIUIObject;
- VclPtr<SwNavHelpToolBox> m_aContentToolBox;
+ VclPtr<ToolBox> m_aContentToolBox;
std::unique_ptr<NaviStateListener> m_xNaviListener;
VclPtr<ToolBox> m_aGlobalToolBox;
VclPtr<NumEditAction> m_xEdit;
diff --git a/sw/source/uibase/utlui/navipi.cxx
b/sw/source/uibase/utlui/navipi.cxx
index 79edfb9d18e0..d9e8a007467f 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -20,7 +20,6 @@
#include <comphelper/string.hxx>
#include <svl/urlbmk.hxx>
#include <svl/stritem.hxx>
-#include <vcl/builderfactory.hxx>
#include <vcl/graphicfilter.hxx>
#include <sot/formats.hxx>
#include <sot/filelist.hxx>
@@ -389,13 +388,6 @@ IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl,
ToolBox*, pBox, void )
}
}
-SwNavHelpToolBox::SwNavHelpToolBox(Window* pParent)
- : ToolBox(pParent)
-{
-}
-
-VCL_BUILDER_FACTORY(SwNavHelpToolBox)
-
void SwNavigationPI::CreateNavigationTool()
{
auto xPopup = VclPtr<SwScrollNaviPopup>::Create(m_aContentToolBox.get());
@@ -413,11 +405,6 @@ FactoryFunction SwNavigationPI::GetUITestFactory() const
return SwNavigationPIUIObject::create;
}
-SwNavHelpToolBox::~SwNavHelpToolBox()
-{
- disposeOnce();
-}
-
// Action-Handler Edit:
// Switches to the page if the structure view is not turned on.
diff --git a/sw/uiconfig/swriter/ui/navigatorpanel.ui
b/sw/uiconfig/swriter/ui/navigatorpanel.ui
index 1d3537ab660e..d82314958905 100644
--- a/sw/uiconfig/swriter/ui/navigatorpanel.ui
+++ b/sw/uiconfig/swriter/ui/navigatorpanel.ui
@@ -23,7 +23,7 @@
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
- <object class="swlo-SwNavHelpToolBox" id="content">
+ <object class="GtkToolbar" id="content">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">icons</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
