[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/uiconfig

[Yousuf Philips]

 sw/uiconfig/swriter/popupmenu/drawtext.xml |    3 +++
 sw/uiconfig/swriter/popupmenu/table.xml    |    8 +++++++-
 sw/uiconfig/swriter/popupmenu/text.xml     |    8 +++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 2c21380ce9d1a65a55ecffe93116b42233d792f2
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Tue May 23 04:21:15 2017 +0400

    tdf#102915 Restore 'Clear Direct Formatting' to context menu
    
    Change-Id: If3f1a8c2255cb2daa280ca9745b91fd665bf127e
    Reviewed-on: https://gerrit.libreoffice.org/37925
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
    (cherry picked from commit dc8ac5373d21c0ea35f73e2730940f3da35f5654)
    Reviewed-on: https://gerrit.libreoffice.org/38092
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sw/uiconfig/swriter/popupmenu/drawtext.xml b/sw/uiconfig/swriter/popupmenu/drawtext.xml
index 0dd2aed1b1a4..32a75029e6cf 100644
--- a/sw/uiconfig/swriter/popupmenu/drawtext.xml
+++ b/sw/uiconfig/swriter/popupmenu/drawtext.xml
@@ -23,5 +23,8 @@
   <menu:menuitem menu:id=".uno:FontDialog"/>
   <menu:menuitem menu:id=".uno:ParagraphDialog"/>
   <menu:menuitem menu:id=".uno:InsertCaptionDialog"/>
+  <menu:menuseparator/>
+  <menu:menuitem menu:id=".uno:ResetAttributes"/>
+  <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:ThesaurusFromContext"/>
 </menu:menupopup>
diff --git a/sw/uiconfig/swriter/popupmenu/table.xml b/sw/uiconfig/swriter/popupmenu/table.xml
index 624905ff401c..63f079f80134 100644
--- a/sw/uiconfig/swriter/popupmenu/table.xml
+++ b/sw/uiconfig/swriter/popupmenu/table.xml
@@ -71,7 +71,13 @@
   <menu:menuitem menu:id=".uno:NextTrackedChange"/>
   <menu:menuitem menu:id=".uno:PreviousTrackedChange"/>
   <menu:menuseparator/>
-  <menu:menuitem menu:id=".uno:EditStyle"/>
+  <menu:menu menu:id=".uno:FormatStylesMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ResetAttributes"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:EditStyle"/>
+    </menu:menupopup>
+  </menu:menu>
   <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:OpenHyperlinkOnCursor"/>
   <menu:menuitem menu:id=".uno:EditHyperlink"/>
diff --git a/sw/uiconfig/swriter/popupmenu/text.xml b/sw/uiconfig/swriter/popupmenu/text.xml
index 603fe80ff19a..8374a5e4d8ce 100644
--- a/sw/uiconfig/swriter/popupmenu/text.xml
+++ b/sw/uiconfig/swriter/popupmenu/text.xml
@@ -42,7 +42,13 @@
   <menu:menuitem menu:id=".uno:NextTrackedChange"/>
   <menu:menuitem menu:id=".uno:PreviousTrackedChange"/>
   <menu:menuseparator/>
-  <menu:menuitem menu:id=".uno:EditStyle"/>
+  <menu:menu menu:id=".uno:FormatStylesMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:ResetAttributes"/>
+      <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:EditStyle"/>
+    </menu:menupopup>
+  </menu:menu>
   <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:OpenHyperlinkOnCursor"/>
   <menu:menuitem menu:id=".uno:EditHyperlink"/>