Kaydet (Commit) 68a37c46 authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: tdf#115816 simpler fix for master

Change-Id: Ibafd041728624e781b5da44a0b484206f760d4d0
Reviewed-on: https://gerrit.libreoffice.org/56248
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 162b729b
...@@ -254,8 +254,7 @@ enum class StandardButtonType ...@@ -254,8 +254,7 @@ enum class StandardButtonType
Ignore = 8, Ignore = 8,
Abort = 9, Abort = 9,
Less = 10, Less = 10,
Paste = 11, Count = 11,
Count = 12,
}; };
// prominent place for ListBox window types // prominent place for ListBox window types
......
...@@ -259,8 +259,6 @@ void GalleryThemePopup::ExecutePopup( vcl::Window *pWindow, const ::Point &aPos ...@@ -259,8 +259,6 @@ void GalleryThemePopup::ExecutePopup( vcl::Window *pWindow, const ::Point &aPos
mpPopupMenu->EnableItem(mpPopupMenu->GetItemId("paste")); mpPopupMenu->EnableItem(mpPopupMenu->GetItemId("paste"));
} }
mpPopupMenu->SetItemText(mpPopupMenu->GetItemId("paste"), Button::GetStandardText(StandardButtonType::Paste));
// update status // update status
css::uno::Reference< css::frame::XDispatchProvider> xDispatchProvider( css::uno::Reference< css::frame::XDispatchProvider> xDispatchProvider(
GalleryBrowser2::GetFrame(), css::uno::UNO_QUERY ); GalleryBrowser2::GetFrame(), css::uno::UNO_QUERY );
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 --> <!-- Generated with glade 3.20.4 -->
<interface domain="svx"> <interface domain="svx">
<requires lib="gtk+" version="3.18"/> <requires lib="gtk+" version="3.18"/>
<object class="GtkMenu" id="menu"> <object class="GtkMenu" id="menu">
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<object class="GtkMenuItem" id="paste"> <object class="GtkMenuItem" id="paste">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</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> <property name="use_underline">True</property>
</object> </object>
</child> </child>
......
...@@ -146,7 +146,6 @@ OUString Button::GetStandardText(StandardButtonType eButton) ...@@ -146,7 +146,6 @@ OUString Button::GetStandardText(StandardButtonType eButton)
SV_BUTTONTEXT_IGNORE, SV_BUTTONTEXT_IGNORE,
SV_BUTTONTEXT_ABORT, SV_BUTTONTEXT_ABORT,
SV_BUTTONTEXT_LESS, SV_BUTTONTEXT_LESS,
SV_BUTTONTEXT_PASTE,
}; };
return VclResId(aResIdAry[static_cast<sal_uInt16>(eButton)]); return VclResId(aResIdAry[static_cast<sal_uInt16>(eButton)]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment