[Libreoffice-commits] core.git: sw/qa sw/uiconfig sw/UIConfig_swriter.mk test/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Fri Dec 20 14:02:03 UTC 2019
sw/UIConfig_swriter.mk | 1
sw/qa/unit/data/sw-dialogs-test.txt | 1
sw/qa/unit/data/sw-dialogs-test_2.txt | 1
sw/uiconfig/swriter/ui/sidebarpage.ui | 131 ----------------------------------
test/source/screenshot_test.cxx | 1
5 files changed, 135 deletions(-)
New commits:
commit 29d800cbed481cd4b79376ecdd985092ec180ded
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Dec 20 09:04:03 2019 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Dec 20 15:00:53 2019 +0100
remove unused sidebarpage.ui
since...
commit 292560a957498bed70b625c992ec6bcf631dceb3
Date: Mon Oct 17 13:23:23 2016 +0200
loplugin:unusedmethods
Change-Id: I3a954cbeef459195247d22e17d2a0377f516f307
Reviewed-on: https://gerrit.libreoffice.org/85575
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 65de527c3b89..339c7774d528 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -251,7 +251,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/selectblockdialog \
sw/uiconfig/swriter/ui/selectindexdialog \
sw/uiconfig/swriter/ui/selecttabledialog \
- sw/uiconfig/swriter/ui/sidebarpage \
sw/uiconfig/swriter/ui/pageformatpanel \
sw/uiconfig/swriter/ui/pagestylespanel \
sw/uiconfig/swriter/ui/pageheaderpanel \
diff --git a/sw/qa/unit/data/sw-dialogs-test.txt b/sw/qa/unit/data/sw-dialogs-test.txt
index 54fa2761b575..4a077f3278cc 100644
--- a/sw/qa/unit/data/sw-dialogs-test.txt
+++ b/sw/qa/unit/data/sw-dialogs-test.txt
@@ -175,7 +175,6 @@ modules/swriter/ui/selectautotextdialog.ui
modules/swriter/ui/selectblockdialog.ui
modules/swriter/ui/selectindexdialog.ui
modules/swriter/ui/selecttabledialog.ui
-modules/swriter/ui/sidebarpage.ui
modules/swriter/ui/sidebarstylepresets.ui
modules/swriter/ui/sidebartheme.ui
modules/swriter/ui/sidebarwrap.ui
diff --git a/sw/qa/unit/data/sw-dialogs-test_2.txt b/sw/qa/unit/data/sw-dialogs-test_2.txt
index a36bbdca3dae..9384a0a20591 100644
--- a/sw/qa/unit/data/sw-dialogs-test_2.txt
+++ b/sw/qa/unit/data/sw-dialogs-test_2.txt
@@ -44,7 +44,6 @@ modules/swriter/ui/selectautotextdialog.ui
modules/swriter/ui/selectblockdialog.ui
modules/swriter/ui/selectindexdialog.ui
modules/swriter/ui/selecttabledialog.ui
-modules/swriter/ui/sidebarpage.ui
modules/swriter/ui/sidebarstylepresets.ui
modules/swriter/ui/sidebartheme.ui
modules/swriter/ui/sidebarwrap.ui
diff --git a/sw/uiconfig/swriter/ui/sidebarpage.ui b/sw/uiconfig/swriter/ui/sidebarpage.ui
deleted file mode 100644
index d70a3e442dbe..000000000000
--- a/sw/uiconfig/swriter/ui/sidebarpage.ui
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
-<interface domain="sw">
- <requires lib="gtk+" version="3.18"/>
- <requires lib="LibreOffice" version="1.0"/>
- <object class="GtkGrid" id="PagePropertyPanel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_homogeneous">True</property>
- <property name="column_homogeneous">True</property>
- <child>
- <object class="GtkGrid" id="grid2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="border_width">6</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
- <property name="column_homogeneous">True</property>
- <child>
- <object class="sfxlo-SidebarToolBox" id="selectorientation">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">center</property>
- <child>
- <object class="GtkMenuToolButton" id="orientation">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes" context="sidebarpage|orientation|tooltip_text">Orientation</property>
- <property name="action_name">.uno:Orientation</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolbar" id="selectsize">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkMenuToolButton" id="size">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes" context="sidebarpage|size|tooltip_text">Size</property>
- <property name="action_name">.uno:AttributePageSize</property>
- <property name="label" translatable="no">toolbutton3</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolbar" id="selectcolumn">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkMenuToolButton" id="column">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes" context="sidebarpage|column|tooltip_text">Columns</property>
- <property name="action_name">.uno:PageColumnType</property>
- <property name="label" translatable="no">toolbutton4</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolbar" id="selectmargin">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">center</property>
- <child>
- <object class="GtkMenuToolButton" id="margin">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_text" translatable="yes" context="sidebarpage|margin|tooltip_text">Margin</property>
- <property name="action_name">.uno:PageMargin</property>
- <property name="label" translatable="no">toolbutton2</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- </object>
-</interface>
diff --git a/test/source/screenshot_test.cxx b/test/source/screenshot_test.cxx
index ad63f98b8809..34e491741af8 100644
--- a/test/source/screenshot_test.cxx
+++ b/test/source/screenshot_test.cxx
@@ -201,7 +201,6 @@ void ScreenshotTest::dumpDialogToPath(const OString& rUIXMLDescription)
if (!rUIXMLDescription.isEmpty())
{
bool bNonConforming = rUIXMLDescription == "modules/swriter/ui/sidebarstylepresets.ui" ||
- rUIXMLDescription == "modules/swriter/ui/sidebarpage.ui" ||
rUIXMLDescription == "modules/swriter/ui/sidebartheme.ui" ||
rUIXMLDescription == "modules/swriter/ui/sidebarwrap.ui" ||
rUIXMLDescription == "modules/swriter/ui/notebookbar.ui" ||
More information about the Libreoffice-commits
mailing list