static/CustomTarget_emscripten_fs_image.mk | 1 sw/UIConfig_swriter.mk | 1 sw/qa/unit/data/sw-dialogs-test.txt | 1 sw/uiconfig/swriter/ui/charurlpage.ui | 349 ----------------------------- vcl/jsdialog/enabled.cxx | 1 5 files changed, 353 deletions(-)
New commits: commit 2e6a65204f87f3c2c9f602dab5a581f4f0d82f21 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Dec 11 15:02:13 2025 +0000 Commit: Miklos Vajna <[email protected]> CommitDate: Fri Dec 12 11:46:45 2025 +0100 sw/uiconfig/swriter/ui/charurlpage.ui isn't used anymore since: commit 63315d601296f7c188e920f73b12260d018807d0 Date: Tue Apr 23 17:20:47 2024 +0200 Resolves tdf#132253 - Remove hyperlink tab from character dialog Change-Id: I35d5e1af6dc7cdb1ea8661ea5661bf183becc0ef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195472 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/static/CustomTarget_emscripten_fs_image.mk b/static/CustomTarget_emscripten_fs_image.mk index e164f5ed0e89..2c65e60015c5 100644 --- a/static/CustomTarget_emscripten_fs_image.mk +++ b/static/CustomTarget_emscripten_fs_image.mk @@ -592,7 +592,6 @@ gb_emscripten_fs_image_files += \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/cardmediumpage.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/ccdialog.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/characterproperties.ui \ - $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/charurlpage.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/checkbox.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/columndialog.ui \ $(INSTROOT)/$(LIBO_SHARE_FOLDER)/config/soffice.cfg/modules/swriter/ui/columnpage.ui \ diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index 062d95b1f1d8..d47152a7e303 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -125,7 +125,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/cardmediumpage \ sw/uiconfig/swriter/ui/ccdialog \ sw/uiconfig/swriter/ui/characterproperties \ - sw/uiconfig/swriter/ui/charurlpage \ sw/uiconfig/swriter/ui/checkbox \ sw/uiconfig/swriter/ui/columndialog \ sw/uiconfig/swriter/ui/columnpage \ diff --git a/sw/qa/unit/data/sw-dialogs-test.txt b/sw/qa/unit/data/sw-dialogs-test.txt index 2631e279a211..50736fd327d5 100644 --- a/sw/qa/unit/data/sw-dialogs-test.txt +++ b/sw/qa/unit/data/sw-dialogs-test.txt @@ -68,7 +68,6 @@ modules/swriter/ui/captionoptions.ui modules/swriter/ui/cardmediumpage.ui modules/swriter/ui/ccdialog.ui modules/swriter/ui/characterproperties.ui -modules/swriter/ui/charurlpage.ui modules/swriter/ui/columndialog.ui modules/swriter/ui/columnpage.ui modules/swriter/ui/columnwidth.ui diff --git a/sw/uiconfig/swriter/ui/charurlpage.ui b/sw/uiconfig/swriter/ui/charurlpage.ui deleted file mode 100644 index cd853ce363c6..000000000000 --- a/sw/uiconfig/swriter/ui/charurlpage.ui +++ /dev/null @@ -1,349 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> -<interface domain="sw"> - <requires lib="gtk+" version="3.20"/> - <object class="GtkBox" id="CharURLPage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="orientation">vertical</property> - <property name="spacing">12</property> - <child> - <object class="GtkFrame" id="frame10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <property name="margin-start">12</property> - <property name="margin-top">6</property> - <child> - <object class="GtkLabel" id="label36"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="charurlpage|label36">URL:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">urled</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label37"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="charurlpage|label37">Name:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">nameed</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="textft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="charurlpage|textft">Text:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">texted</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label39"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="charurlpage|label39">Target frame:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">targetfrmlb</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkButton" id="eventpb"> - <property name="label" translatable="yes" context="charurlpage|eventpb">Events...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="valign">center</property> - <child internal-child="accessible"> - <object class="AtkObject" id="eventpb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|eventpb">Specify an event that triggers when you click the hyperlink.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="urled"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="width_chars">32</property> - <property name="truncate-multiline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="urled-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|urled">Enter a URL for the file that you want to open when you click the hyperlink.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="nameed"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="width_chars">32</property> - <property name="truncate-multiline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="nameed-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|nameed">Enter a name for the hyperlink.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="texted"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="width_chars">32</property> - <property name="truncate-multiline">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="texted-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|texted">Enter the text that you want to display for the hyperlink.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="urlpb"> - <property name="label" translatable="yes" context="charurlpage|urlpb">Browse...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="valign">center</property> - <child internal-child="accessible"> - <object class="AtkObject" id="urlpb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|urlpb">Locate the file that you want to link to, and then click Open.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="targetfrmlb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="has_entry">True</property> - <child internal-child="entry"> - <object class="GtkEntry" id="comboboxtext-entry"> - <property name="can_focus">True</property> - <property name="truncate-multiline">True</property> - <property name="activates_default">True</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="targetfrmlb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|targetfrmlb">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label32"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="charurlpage|label32">Hyperlink</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="charstyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <property name="margin-start">12</property> - <property name="margin-top">6</property> - <child> - <object class="GtkLabel" id="label34"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="charurlpage|label34">Visited links:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">visitedlb</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="charurlpage|label10">Unvisited links:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">unvisitedlb</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="visitedlb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="visitedlb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|visitedlb">Select a formatting style to use for visited links from the list. To add or modify a style in this list, close this dialog, and click the Styles icon on the Formatting toolbar.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="unvisitedlb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="unvisitedlb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|unvisitedlb">Select a formatting style to use for unvisited links from the list. To add or modify a style in this list, close this dialog, and click the Styles icon on the Formatting toolbar.</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label33"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="charurlpage|label33">Character Styles</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="CharURLPage-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="charurlpage|extended_tip|CharURLPage">Assigns a new hyperlink or edits the selected hyperlink.</property> - </object> - </child> - </object> - <object class="GtkSizeGroup" id="sizegroup1"> - <property name="ignore_hidden">True</property> - <widgets> - <widget name="label36"/> - <widget name="label37"/> - <widget name="textft"/> - <widget name="label39"/> - <widget name="label34"/> - <widget name="label10"/> - </widgets> - </object> - <object class="GtkSizeGroup" id="sizegroup2"> - <property name="ignore_hidden">True</property> - <widgets> - <widget name="urled"/> - <widget name="nameed"/> - <widget name="texted"/> - <widget name="targetfrmlb"/> - <widget name="visitedlb"/> - <widget name="unvisitedlb"/> - </widgets> - </object> -</interface> diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index dd3508829eff..7405ff732da2 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -216,7 +216,6 @@ constexpr auto SwriterDialogList { u"modules/swriter/ui/bulletsandnumbering.ui" }, { u"modules/swriter/ui/captionoptions.ui" }, { u"modules/swriter/ui/characterproperties.ui" }, - { u"modules/swriter/ui/charurlpage.ui" }, { u"modules/swriter/ui/columndialog.ui" }, { u"modules/swriter/ui/columnpage.ui" }, { u"modules/swriter/ui/contentcontroldlg.ui" },
