summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-06-21 09:14:33 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-06-21 21:52:46 +0200
commit22c451df33b733440f24c1feb6380d31240d55e6 (patch)
tree264c1e1bd6a994f14328c79e30ecad8a36faad54
parent6adec4f77ad0aff851d0abf505a430ebb7329d4e (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/56244 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-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 9f5229806e3f..87896e23fab3 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
@@ -254,7 +254,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 dc7d4ff6a386..db17f9264376 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 6facf9159838..72e4420d357a 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[static_cast<sal_uInt16>(eButton)]);