[Libreoffice-commits] core.git: sc/uiconfig sd/uiconfig sw/uiconfig

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Oct 1 11:19:28 UTC 2018


 sc/uiconfig/scalc/popupmenu/cell.xml          |    3 ++-
 sc/uiconfig/scalc/popupmenu/drawtext.xml      |    1 +
 sd/uiconfig/sdraw/menubar/menubar.xml         |    1 +
 sd/uiconfig/sdraw/popupmenu/drawtext.xml      |    1 +
 sd/uiconfig/sdraw/popupmenu/tabletext.xml     |    1 +
 sd/uiconfig/simpress/popupmenu/drawtext.xml   |    1 +
 sd/uiconfig/simpress/popupmenu/tabletext.xml  |    1 +
 sw/uiconfig/sglobal/popupmenu/annotation.xml  |    6 ++++++
 sw/uiconfig/sweb/popupmenu/annotation.xml     |    6 ++++++
 sw/uiconfig/swform/popupmenu/annotation.xml   |    6 ++++++
 sw/uiconfig/swreport/popupmenu/annotation.xml |    6 ++++++
 sw/uiconfig/swriter/popupmenu/annotation.xml  |    6 ++++++
 sw/uiconfig/swxform/popupmenu/annotation.xml  |    6 ++++++
 13 files changed, 44 insertions(+), 1 deletion(-)

New commits:
commit 43cd16a158d80b9a1cb3ef2961c4bf4dcd0e6505
Author:     andreas kainz <kainz.a at gmail.com>
AuthorDate: Thu Sep 6 00:40:46 2018 +0200
Commit:     Heiko Tietze <tietze.heiko at gmail.com>
CommitDate: Mon Oct 1 13:19:07 2018 +0200

    tdf#119411 where needed added PasteUnformated
    
    checked all different apps and options. this it what will work now
    maybe in the future additional options will be available but now
    it's fine with this patch
    
    Change-Id: I27671e80c9ec3d1304605405ff79cb19c3f4c88c
    Reviewed-on: https://gerrit.libreoffice.org/60062
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <tietze.heiko at gmail.com>

diff --git a/sc/uiconfig/scalc/popupmenu/cell.xml b/sc/uiconfig/scalc/popupmenu/cell.xml
index 07bb61e3e59b..cb15f1aae70f 100644
--- a/sc/uiconfig/scalc/popupmenu/cell.xml
+++ b/sc/uiconfig/scalc/popupmenu/cell.xml
@@ -13,10 +13,11 @@
   <menu:menuitem menu:id=".uno:Paste"/>
   <menu:menu menu:id=".uno:PasteSpecialMenu">
     <menu:menupopup>
+      <menu:menuitem menu:id=".uno:PasteUnformatted"/>
+      <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:PasteOnlyText"/>
       <menu:menuitem menu:id=".uno:PasteOnlyValue"/>
       <menu:menuitem menu:id=".uno:PasteOnlyFormula"/>
-      <menu:menuitem menu:id=".uno:PasteUnformatted"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:PasteSpecial"/>
     </menu:menupopup>
diff --git a/sc/uiconfig/scalc/popupmenu/drawtext.xml b/sc/uiconfig/scalc/popupmenu/drawtext.xml
index 5c8e678d8692..d119bd036624 100644
--- a/sc/uiconfig/scalc/popupmenu/drawtext.xml
+++ b/sc/uiconfig/scalc/popupmenu/drawtext.xml
@@ -11,6 +11,7 @@
   <menu:menuitem menu:id=".uno:Cut"/>
   <menu:menuitem menu:id=".uno:Copy"/>
   <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menuitem menu:id=".uno:PasteSpecial"/>
   <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:StandardTextAttributes"/>
   <menu:menuseparator/>
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index d1c4b820476e..f519c1739c2a 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -79,6 +79,7 @@
       <menu:menuitem menu:id=".uno:Cut"/>
       <menu:menuitem menu:id=".uno:Copy"/>
       <menu:menuitem menu:id=".uno:Paste"/>
+      <menu:menuitem menu:id=".uno:PasteUnformatted"/>
       <menu:menuitem menu:id=".uno:PasteSpecial"/>
       <menu:menuitem menu:id=".uno:SelectAll"/>
       <menu:menuseparator/>
diff --git a/sd/uiconfig/sdraw/popupmenu/drawtext.xml b/sd/uiconfig/sdraw/popupmenu/drawtext.xml
index 8929693c3821..534c937c857a 100644
--- a/sd/uiconfig/sdraw/popupmenu/drawtext.xml
+++ b/sd/uiconfig/sdraw/popupmenu/drawtext.xml
@@ -11,6 +11,7 @@
   <menu:menuitem menu:id=".uno:Cut"/>
   <menu:menuitem menu:id=".uno:Copy"/>
   <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menuitem menu:id=".uno:PasteUnformatted"/>
   <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:HideLastLevel"/>
   <menu:menuitem menu:id=".uno:ShowNextLevel"/>
diff --git a/sd/uiconfig/sdraw/popupmenu/tabletext.xml b/sd/uiconfig/sdraw/popupmenu/tabletext.xml
index 9752fda0a40d..9ae33c9fe055 100644
--- a/sd/uiconfig/sdraw/popupmenu/tabletext.xml
+++ b/sd/uiconfig/sdraw/popupmenu/tabletext.xml
@@ -11,6 +11,7 @@
   <menu:menuitem menu:id=".uno:Cut"/>
   <menu:menuitem menu:id=".uno:Copy"/>
   <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menuitem menu:id=".uno:PasteUnformatted"/>
   <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:SetDefault"/>
   <menu:menuseparator/>
diff --git a/sd/uiconfig/simpress/popupmenu/drawtext.xml b/sd/uiconfig/simpress/popupmenu/drawtext.xml
index 8929693c3821..534c937c857a 100644
--- a/sd/uiconfig/simpress/popupmenu/drawtext.xml
+++ b/sd/uiconfig/simpress/popupmenu/drawtext.xml
@@ -11,6 +11,7 @@
   <menu:menuitem menu:id=".uno:Cut"/>
   <menu:menuitem menu:id=".uno:Copy"/>
   <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menuitem menu:id=".uno:PasteUnformatted"/>
   <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:HideLastLevel"/>
   <menu:menuitem menu:id=".uno:ShowNextLevel"/>
diff --git a/sd/uiconfig/simpress/popupmenu/tabletext.xml b/sd/uiconfig/simpress/popupmenu/tabletext.xml
index 9752fda0a40d..9ae33c9fe055 100644
--- a/sd/uiconfig/simpress/popupmenu/tabletext.xml
+++ b/sd/uiconfig/simpress/popupmenu/tabletext.xml
@@ -11,6 +11,7 @@
   <menu:menuitem menu:id=".uno:Cut"/>
   <menu:menuitem menu:id=".uno:Copy"/>
   <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menuitem menu:id=".uno:PasteUnformatted"/>
   <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:SetDefault"/>
   <menu:menuseparator/>
diff --git a/sw/uiconfig/sglobal/popupmenu/annotation.xml b/sw/uiconfig/sglobal/popupmenu/annotation.xml
index 8bb8fdf31f04..2ddcf03e8591 100644
--- a/sw/uiconfig/sglobal/popupmenu/annotation.xml
+++ b/sw/uiconfig/sglobal/popupmenu/annotation.xml
@@ -11,6 +11,12 @@
   <menu:menuitem menu:id=".uno:Cut"/>
   <menu:menuitem menu:id=".uno:Copy"/>
   <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menu menu:id=".uno:PasteSpecialMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:PasteUnformatted"/>
+      <menu:menuitem menu:id=".uno:PasteSpecial"/>
+    </menu:menupopup>
+  </menu:menu>
   <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:ReplyComment"/>
   <menu:menuseparator/>
diff --git a/sw/uiconfig/sweb/popupmenu/annotation.xml b/sw/uiconfig/sweb/popupmenu/annotation.xml
index 8bb8fdf31f04..2ddcf03e8591 100644
--- a/sw/uiconfig/sweb/popupmenu/annotation.xml
+++ b/sw/uiconfig/sweb/popupmenu/annotation.xml
@@ -11,6 +11,12 @@
   <menu:menuitem menu:id=".uno:Cut"/>
   <menu:menuitem menu:id=".uno:Copy"/>
   <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menu menu:id=".uno:PasteSpecialMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:PasteUnformatted"/>
+      <menu:menuitem menu:id=".uno:PasteSpecial"/>
+    </menu:menupopup>
+  </menu:menu>
   <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:ReplyComment"/>
   <menu:menuseparator/>
diff --git a/sw/uiconfig/swform/popupmenu/annotation.xml b/sw/uiconfig/swform/popupmenu/annotation.xml
index 8bb8fdf31f04..2ddcf03e8591 100644
--- a/sw/uiconfig/swform/popupmenu/annotation.xml
+++ b/sw/uiconfig/swform/popupmenu/annotation.xml
@@ -11,6 +11,12 @@
   <menu:menuitem menu:id=".uno:Cut"/>
   <menu:menuitem menu:id=".uno:Copy"/>
   <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menu menu:id=".uno:PasteSpecialMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:PasteUnformatted"/>
+      <menu:menuitem menu:id=".uno:PasteSpecial"/>
+    </menu:menupopup>
+  </menu:menu>
   <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:ReplyComment"/>
   <menu:menuseparator/>
diff --git a/sw/uiconfig/swreport/popupmenu/annotation.xml b/sw/uiconfig/swreport/popupmenu/annotation.xml
index 8bb8fdf31f04..2ddcf03e8591 100644
--- a/sw/uiconfig/swreport/popupmenu/annotation.xml
+++ b/sw/uiconfig/swreport/popupmenu/annotation.xml
@@ -11,6 +11,12 @@
   <menu:menuitem menu:id=".uno:Cut"/>
   <menu:menuitem menu:id=".uno:Copy"/>
   <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menu menu:id=".uno:PasteSpecialMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:PasteUnformatted"/>
+      <menu:menuitem menu:id=".uno:PasteSpecial"/>
+    </menu:menupopup>
+  </menu:menu>
   <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:ReplyComment"/>
   <menu:menuseparator/>
diff --git a/sw/uiconfig/swriter/popupmenu/annotation.xml b/sw/uiconfig/swriter/popupmenu/annotation.xml
index 8bb8fdf31f04..2ddcf03e8591 100644
--- a/sw/uiconfig/swriter/popupmenu/annotation.xml
+++ b/sw/uiconfig/swriter/popupmenu/annotation.xml
@@ -11,6 +11,12 @@
   <menu:menuitem menu:id=".uno:Cut"/>
   <menu:menuitem menu:id=".uno:Copy"/>
   <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menu menu:id=".uno:PasteSpecialMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:PasteUnformatted"/>
+      <menu:menuitem menu:id=".uno:PasteSpecial"/>
+    </menu:menupopup>
+  </menu:menu>
   <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:ReplyComment"/>
   <menu:menuseparator/>
diff --git a/sw/uiconfig/swxform/popupmenu/annotation.xml b/sw/uiconfig/swxform/popupmenu/annotation.xml
index 8bb8fdf31f04..2ddcf03e8591 100644
--- a/sw/uiconfig/swxform/popupmenu/annotation.xml
+++ b/sw/uiconfig/swxform/popupmenu/annotation.xml
@@ -11,6 +11,12 @@
   <menu:menuitem menu:id=".uno:Cut"/>
   <menu:menuitem menu:id=".uno:Copy"/>
   <menu:menuitem menu:id=".uno:Paste"/>
+  <menu:menu menu:id=".uno:PasteSpecialMenu">
+    <menu:menupopup>
+      <menu:menuitem menu:id=".uno:PasteUnformatted"/>
+      <menu:menuitem menu:id=".uno:PasteSpecial"/>
+    </menu:menupopup>
+  </menu:menu>
   <menu:menuseparator/>
   <menu:menuitem menu:id=".uno:ReplyComment"/>
   <menu:menuseparator/>


More information about the Libreoffice-commits mailing list