[Libreoffice-commits] core.git: include/tools svx/source svx/uiconfig vcl/source

[Caolán McNamara]

 include/tools/wintypes.hxx       |    3 +--
 svx/source/gallery2/galbrws2.cxx |    2 --
 svx/uiconfig/ui/gallerymenu2.ui  |    4 ++--
 vcl/source/control/button.cxx    |    1 -
 4 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 68a37c46f21daaedcae479ccce9889ee0459e745
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jun 21 15:58:34 2018 +0100

    Resolves: tdf#115816 simpler fix for master
    
    Change-Id: Ibafd041728624e781b5da44a0b484206f760d4d0
    Reviewed-on: https://gerrit.libreoffice.org/56248
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
index 87896e23fab3..9f5229806e3f 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
@@ -254,8 +254,7 @@ enum class StandardButtonType
     Ignore       = 8,
     Abort        = 9,
     Less         = 10,
-    Paste        = 11,
-    Count        = 12,
+    Count        = 11,
 };
 
 // prominent place for ListBox window types
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 87da4785a941..3570c4c703ed 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -259,8 +259,6 @@ void GalleryThemePopup::ExecutePopup( vcl::Window *pWindow, const ::Point &aPos
         mpPopupMenu->EnableItem(mpPopupMenu->GetItemId("paste"));
     }
 
-    mpPopupMenu->SetItemText(mpPopupMenu->GetItemId("paste"), Button::GetStandardText(StandardButtonType::Paste));
-
     // update status
     css::uno::Reference< css::frame::XDispatchProvider> xDispatchProvider(
         GalleryBrowser2::GetFrame(), css::uno::UNO_QUERY );
diff --git a/svx/uiconfig/ui/gallerymenu2.ui b/svx/uiconfig/ui/gallerymenu2.ui
index 8d81d130ec49..8cd3cc8a1e4e 100644
--- a/svx/uiconfig/ui/gallerymenu2.ui
+++ b/svx/uiconfig/ui/gallerymenu2.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.20.4 -->
 <interface domain="svx">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkMenu" id="menu">
@@ -79,7 +79,7 @@
       <object class="GtkMenuItem" id="paste">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes" context="gallerymenu2|paste">_Insert</property>
+        <property name="label" translatable="yes" context="gallerymenu2|paste">_Paste</property>
         <property name="use_underline">True</property>
       </object>
     </child>
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 72e4420d357a..6facf9159838 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -146,7 +146,6 @@ OUString Button::GetStandardText(StandardButtonType eButton)
         SV_BUTTONTEXT_IGNORE,
         SV_BUTTONTEXT_ABORT,
         SV_BUTTONTEXT_LESS,
-        SV_BUTTONTEXT_PASTE,
     };
 
     return VclResId(aResIdAry[static_cast<sal_uInt16>(eButton)]);