summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-06-21 09:14:33 +0100
committerAndras Timar <andras.timar@collabora.com>2018-07-06 10:43:04 +0200
commit1e1b6fab2cde6dce8a398621bf7a40c143516ef6 (patch)
tree94e76846d361928e2aa1ff74229cc06799ff8087
parent8c192eb98671e804518215e9e278523d974856a7 (diff)
Resolves: tdf#115816 second 'Insert' menu is paste
reuse existing translation to be backportable wrt no new translations Change-Id: I1fb94f66d696f836e8f6a10ba2d6933f69cfac95 Reviewed-on: https://gerrit.libreoffice.org/56245 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 74b897f9c578cb0b64124ef9563f2355680c8d84)
-rw-r--r--include/tools/wintypes.hxx3
-rw-r--r--svx/source/gallery2/galbrws2.cxx2
-rw-r--r--vcl/source/control/button.cxx1
3 files changed, 5 insertions, 1 deletions
diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
index 897e63e520e1..7a984389cc41 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
@@ -259,7 +259,8 @@ enum class StandardButtonType
Ignore = 8,
Abort = 9,
Less = 10,
- Count = 11,
+ Paste = 11,
+ Count = 12,
};
// prominent place for ListBox window types
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 0a77441323f4..add5495ed895 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -259,6 +259,8 @@ 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/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index d39a9f72de1b..a4948e6c833a 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -146,6 +146,7 @@ OUString Button::GetStandardText(StandardButtonType eButton)
SV_BUTTONTEXT_IGNORE,
SV_BUTTONTEXT_ABORT,
SV_BUTTONTEXT_LESS,
+ SV_BUTTONTEXT_PASTE,
};
return VclResId(aResIdAry[(sal_uInt16)eButton]);