From 652c97b8216c03676bbee08f749e2164e8808c8d Mon Sep 17 00:00:00 2001
From: Muhammet Kara <muhammet.kara@pardus.org.tr>
Date: Wed, 28 Sep 2016 18:10:03 +0300
Subject: tdf#101549: Remove tooltip_markup from glade .ui files

where there is also an identical tooltip_text.
And convert the remaining tooltip_markup properties
to tooltip_text.

Change-Id: Id9995217468fb7046a2822dcef9a99072a7269ee
Reviewed-on: https://gerrit.libreoffice.org/29367
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
---
 sw/uiconfig/swriter/ui/addressblockdialog.ui | 1 -
 sw/uiconfig/swriter/ui/cardmediumpage.ui     | 2 +-
 sw/uiconfig/swriter/ui/envaddresspage.ui     | 2 +-
 sw/uiconfig/swriter/ui/fldvarpage.ui         | 2 --
 sw/uiconfig/swriter/ui/tocentriespage.ui     | 8 ++------
 5 files changed, 4 insertions(+), 11 deletions(-)

(limited to 'sw')

diff --git a/sw/uiconfig/swriter/ui/addressblockdialog.ui b/sw/uiconfig/swriter/ui/addressblockdialog.ui
index 0b4fd2596b91..1de46e6afb5e 100644
--- a/sw/uiconfig/swriter/ui/addressblockdialog.ui
+++ b/sw/uiconfig/swriter/ui/addressblockdialog.ui
@@ -307,7 +307,6 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Remove from address</property>
                     <property name="tooltip_text" translatable="yes">Remove from address</property>
                     <property name="image">image6</property>
                   </object>
diff --git a/sw/uiconfig/swriter/ui/cardmediumpage.ui b/sw/uiconfig/swriter/ui/cardmediumpage.ui
index 52509aa4368a..eb4df8baf9c2 100644
--- a/sw/uiconfig/swriter/ui/cardmediumpage.ui
+++ b/sw/uiconfig/swriter/ui/cardmediumpage.ui
@@ -252,7 +252,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_markup" translatable="yes">Insert</property>
+                    <property name="tooltip_text" translatable="yes">Insert</property>
                     <property name="valign">center</property>
                     <property name="image">image1</property>
                   </object>
diff --git a/sw/uiconfig/swriter/ui/envaddresspage.ui b/sw/uiconfig/swriter/ui/envaddresspage.ui
index 76b988a9d16b..75f08f1e814c 100644
--- a/sw/uiconfig/swriter/ui/envaddresspage.ui
+++ b/sw/uiconfig/swriter/ui/envaddresspage.ui
@@ -234,7 +234,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
-            <property name="tooltip_markup" translatable="yes">Insert</property>
+            <property name="tooltip_text" translatable="yes">Insert</property>
             <property name="valign">center</property>
             <property name="image">image1</property>
           </object>
diff --git a/sw/uiconfig/swriter/ui/fldvarpage.ui b/sw/uiconfig/swriter/ui/fldvarpage.ui
index 845e6e1688e8..7e8dc99344d8 100644
--- a/sw/uiconfig/swriter/ui/fldvarpage.ui
+++ b/sw/uiconfig/swriter/ui/fldvarpage.ui
@@ -455,7 +455,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Apply</property>
                     <property name="tooltip_text" translatable="yes">Apply</property>
                     <property name="action_name">apply</property>
                     <property name="use_underline">True</property>
@@ -471,7 +470,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Delete</property>
                     <property name="tooltip_text" translatable="yes">Delete</property>
                     <property name="action_name">delete</property>
                     <property name="use_underline">True</property>
diff --git a/sw/uiconfig/swriter/ui/tocentriespage.ui b/sw/uiconfig/swriter/ui/tocentriespage.ui
index d4068e5d020e..36269d765774 100644
--- a/sw/uiconfig/swriter/ui/tocentriespage.ui
+++ b/sw/uiconfig/swriter/ui/tocentriespage.ui
@@ -887,7 +887,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="tooltip_markup" translatable="yes">Ascending</property>
+                            <property name="tooltip_text" translatable="yes">Ascending</property>
                             <property name="image">image1</property>
                             <property name="xalign">0</property>
                             <property name="active">True</property>
@@ -904,7 +904,7 @@
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
-                            <property name="tooltip_markup" translatable="yes">Descending</property>
+                            <property name="tooltip_text" translatable="yes">Descending</property>
                             <property name="image">image2</property>
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
@@ -921,7 +921,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Ascending</property>
                             <property name="tooltip_text" translatable="yes">Ascending</property>
                             <property name="image">image3</property>
                             <property name="xalign">0</property>
@@ -939,7 +938,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Ascending</property>
                             <property name="tooltip_text" translatable="yes">Ascending</property>
                             <property name="image">image4</property>
                             <property name="xalign">0</property>
@@ -957,7 +955,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Descending</property>
                             <property name="tooltip_text" translatable="yes">Descending</property>
                             <property name="image">image5</property>
                             <property name="xalign">0</property>
@@ -975,7 +972,6 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Descending</property>
                             <property name="tooltip_text" translatable="yes">Descending</property>
                             <property name="image">image6</property>
                             <property name="xalign">0</property>
-- 
cgit