summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomoyuki Kubota <himajin100000@gmail.com>2021-11-26 00:10:59 +0200
committerCaolán McNamara <caolanm@redhat.com>2021-11-26 14:13:48 +0100
commitd9796e597329849a6d360f205c5d36f7838884d8 (patch)
tree40e4c5f52a073d89b3b0d328dd2a075a113e0cb0
parent547cb22e1a4ad5c39f116eb74b74baf7a729d2e9 (diff)
floatingnavigation.ui is no longer used
since https://gerrit.libreoffice.org/c/core/+/87005/9/sw/source/uibase/utlui/navipi.cxx#b393 and https://gerrit.libreoffice.org/c/core/+/87005/9/sw/source/uibase/ribbar/workctrl.cxx#b310 Change-Id: Id95f73d782f8d785b26ee6739014314c4d1a6fae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125831 Tested-by: Jenkins Tested-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--solenv/sanitizers/ui/modules/swriter.suppr1
-rw-r--r--sw/UIConfig_swriter.mk1
-rw-r--r--sw/qa/unit/data/sw-dialogs-test.txt1
-rw-r--r--sw/qa/unit/data/sw-dialogs-test_2.txt1
-rw-r--r--sw/uiconfig/swriter/ui/floatingnavigation.ui331
5 files changed, 0 insertions, 335 deletions
diff --git a/solenv/sanitizers/ui/modules/swriter.suppr b/solenv/sanitizers/ui/modules/swriter.suppr
index fd275e81c697..0c10473abe14 100644
--- a/solenv/sanitizers/ui/modules/swriter.suppr
+++ b/solenv/sanitizers/ui/modules/swriter.suppr
@@ -41,7 +41,6 @@ sw/uiconfig/swriter/ui/exchangedatabases.ui://GtkLabel[@id='dbnameft'] orphan-la
sw/uiconfig/swriter/ui/flddocumentpage.ui://GtkSpinButton[@id='offset'] duplicate-mnemonic
sw/uiconfig/swriter/ui/fldrefpage.ui://GtkLabel[@id='label4'] orphan-label
sw/uiconfig/swriter/ui/fldvarpage.ui://GtkLabel[@id='label5'] orphan-label
-sw/uiconfig/swriter/ui/floatingnavigation.ui://GtkLabel[@id='label'] orphan-label
sw/uiconfig/swriter/ui/footnotepage.ui://GtkLabel[@id='label6'] orphan-label
sw/uiconfig/swriter/ui/footnotepage.ui://GtkLabel[@id='label7'] orphan-label
sw/uiconfig/swriter/ui/footnotepage.ui://GtkLabel[@id='label8'] orphan-label
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index ce3058308d6e..78b2b0441b8b 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -149,7 +149,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/fldfuncpage \
sw/uiconfig/swriter/ui/fldrefpage \
sw/uiconfig/swriter/ui/fldvarpage \
- sw/uiconfig/swriter/ui/floatingnavigation \
sw/uiconfig/swriter/ui/floatingsync \
sw/uiconfig/swriter/ui/formatsectiondialog \
sw/uiconfig/swriter/ui/formattablepage \
diff --git a/sw/qa/unit/data/sw-dialogs-test.txt b/sw/qa/unit/data/sw-dialogs-test.txt
index 9bddf8bf92c6..bdb46c66f813 100644
--- a/sw/qa/unit/data/sw-dialogs-test.txt
+++ b/sw/qa/unit/data/sw-dialogs-test.txt
@@ -206,5 +206,4 @@ modules/swriter/ui/bibliographyentry.ui
modules/swriter/ui/inforeadonlydialog.ui
modules/swriter/ui/inforeadonlydialog.ui
modules/swriter/ui/inforeadonlydialog.ui
-modules/swriter/ui/floatingnavigation.ui
modules/swriter/ui/queryrotateintostandarddialog.ui
diff --git a/sw/qa/unit/data/sw-dialogs-test_2.txt b/sw/qa/unit/data/sw-dialogs-test_2.txt
index 9384a0a20591..fabeae19b3b2 100644
--- a/sw/qa/unit/data/sw-dialogs-test_2.txt
+++ b/sw/qa/unit/data/sw-dialogs-test_2.txt
@@ -75,5 +75,4 @@ modules/swriter/ui/bibliographyentry.ui
modules/swriter/ui/inforeadonlydialog.ui
modules/swriter/ui/inforeadonlydialog.ui
modules/swriter/ui/inforeadonlydialog.ui
-modules/swriter/ui/floatingnavigation.ui
modules/swriter/ui/queryrotateintostandarddialog.ui
diff --git a/sw/uiconfig/swriter/ui/floatingnavigation.ui b/sw/uiconfig/swriter/ui/floatingnavigation.ui
deleted file mode 100644
index 448406109d92..000000000000
--- a/sw/uiconfig/swriter/ui/floatingnavigation.ui
+++ /dev/null
@@ -1,331 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
-<interface domain="sw">
- <requires lib="gtk+" version="3.20"/>
- <object class="GtkPopover" id="FloatingNavigation">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
- <property name="border_width">4</property>
- <property name="constrain-to">none</property>
- <child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="container">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="row_spacing">12</property>
- <child>
- <object class="GtkBox" id="box">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkToolbar" id="line1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToggleToolButton" id="tbl">
- <property name="visible">True</property>
- <property name="action_name">tbl</property>
- <property name="label" translatable="yes" context="floatingnavigation|ST_TBL">Table</property>
- <property name="use_underline">True</property>
- <property name="icon_name">sw/res/sr20002.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleToolButton" id="frm">
- <property name="visible">True</property>
- <property name="action_name">frm</property>
- <property name="label" translatable="yes" context="floatingnavigation|ST_FRM">Frame</property>
- <property name="use_underline">True</property>
- <property name="icon_name">sw/res/sr20003.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleToolButton" id="grf">
- <property name="visible">True</property>
- <property name="action_name">grf</property>
- <property name="label" translatable="yes" context="floatingnavigation|ST_GRF">Graphics</property>
- <property name="use_underline">True</property>
- <property name="icon_name">sw/res/sr20009.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleToolButton" id="ole">
- <property name="visible">True</property>
- <property name="action_name">ole</property>
- <property name="label" translatable="yes" context="floatingnavigation|ST_OLE">OLE object</property>
- <property name="use_underline">True</property>
- <property name="icon_name">sw/res/sr20010.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleToolButton" id="pge">
- <property name="visible">True</property>
- <property name="action_name">pge</property>
- <property name="label" translatable="yes" context="floatingnavigation|ST_PGE">Page</property>
- <property name="use_underline">True</property>
- <property name="icon_name">sw/res/sr20004.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleToolButton" id="outl">
- <property name="visible">True</property>
- <property name="action_name">outl</property>
- <property name="label" translatable="yes" context="floatingnavigation|ST_OUTL">Headings</property>
- <property name="use_underline">True</property>
- <property name="icon_name">sw/res/sr20011.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleToolButton" id="mark">
- <property name="visible">True</property>
- <property name="action_name">mark</property>
- <property name="label" translatable="yes" context="floatingnavigation|ST_MARK">Reminder</property>
- <property name="use_underline">True</property>
- <property name="icon_name">sw/res/sr20014.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleToolButton" id="drw">
- <property name="visible">True</property>
- <property name="action_name">drw</property>
- <property name="label" translatable="yes" context="floatingnavigation|ST_DRW">Drawing</property>
- <property name="use_underline">True</property>
- <property name="icon_name">sw/res/sr20005.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleToolButton" id="ctrl">
- <property name="visible">True</property>
- <property name="action_name">ctrl</property>
- <property name="label" translatable="yes" context="floatingnavigation|ST_CTRL">Control</property>
- <property name="use_underline">True</property>
- <property name="icon_name">sw/res/sr20006.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="prev">
- <property name="visible">True</property>
- <property name="action_name">prev</property>
- <property name="label" translatable="yes" context="floatingnavigation|STR_IMGBTN_PGE_UP">Previous page</property>
- <property name="use_underline">True</property>
- <property name="icon_name">sw/res/sr20001.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolbar" id="line2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="toolbar_style">icons</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToggleToolButton" id="reg">
- <property name="visible">True</property>
- <property name="action_name">reg</property>
- <property name="label" translatable="yes" context="floatingnavigation|ST_REG">Section</property>
- <property name="use_underline">True</property>
- <property name="icon_name">sw/res/sr20007.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleToolButton" id="bkm">
- <property name="visible">True</property>
- <property name="action_name">bkm</property>
- <property name="label" translatable="yes" context="floatingnavigation|ST_BKM">Bookmark</property>
- <property name="use_underline">True</property>
- <property name="icon_name">sw/res/sr20008.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleToolButton" id="sel">
- <property name="visible">True</property>
- <property name="action_name">sel</property>
- <property name="label" translatable="yes" context="floatingnavigation|ST_SEL">Selection</property>
- <property name="use_underline">True</property>
- <property name="icon_name">sw/res/sr20012.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleToolButton" id="ftn">
- <property name="visible">True</property>
- <property name="action_name">ftn</property>
- <property name="label" translatable="yes" context="floatingnavigation|ST_FTN">Footnote</property>
- <property name="use_underline">True</property>
- <property name="icon_name">sw/res/sr20013.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleToolButton" id="postit">
- <property name="visible">True</property>
- <property name="action_name">postit</property>
- <property name="label" translatable="yes" context="floatingnavigation|ST_POSTIT">Comment</property>
- <property name="use_underline">True</property>
- <property name="icon_name">sw/res/sr20015.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleToolButton" id="rep">
- <property name="visible">True</property>
- <property name="action_name">rep</property>
- <property name="label" translatable="yes" context="floatingnavigation|ST_SRCH_REP">Repeat search</property>
- <property name="use_underline">True</property>
- <property name="icon_name">sw/res/sr20016.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleToolButton" id="entry">
- <property name="visible">True</property>
- <property name="action_name">entry</property>
- <property name="label" translatable="yes" context="floatingnavigation|ST_INDEX_ENTRY">Index entry</property>
- <property name="use_underline">True</property>
- <property name="icon_name">sw/res/sr20017.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleToolButton" id="formula">
- <property name="visible">True</property>
- <property name="action_name">formula</property>
- <property name="label" translatable="yes" context="floatingnavigation|ST_TABLE_FORMULA">Table formula</property>
- <property name="use_underline">True</property>
- <property name="icon_name">sw/res/sr20018.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleToolButton" id="formulaerror">
- <property name="visible">True</property>
- <property name="action_name">formulaerror</property>
- <property name="label" translatable="yes" context="floatingnavigation|ST_TABLE_FORMULA_ERROR">Wrong table formula</property>
- <property name="use_underline">True</property>
- <property name="icon_name">sw/res/sr20019.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="next">
- <property name="visible">True</property>
- <property name="action_name">next</property>
- <property name="label" translatable="yes" context="floatingnavigation|STR_IMGBTN_PGE_DOWN">Next page</property>
- <property name="use_underline">True</property>
- <property name="icon_name">sw/res/sr20000.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
-</interface>