writerperfect/source/common/WPFTEncodingDialog.cxx | 2 +-
writerperfect/uiconfig/ui/wpftencodingdialog.ui | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b8f3b8fd99a0b7c784b0f361f0c28a663839695c
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue May 19 10:25:11 2015 +0200
Fix wpftencodingdialog.ui
Change-Id: I03430895a9289331bcbbd1f4a442dabddab5e751
diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx
b/writerperfect/source/common/WPFTEncodingDialog.cxx
index f6afb90..4c69a77 100644
--- a/writerperfect/source/common/WPFTEncodingDialog.cxx
+++ b/writerperfect/source/common/WPFTEncodingDialog.cxx
@@ -126,7 +126,7 @@ WPFTEncodingDialog::WPFTEncodingDialog(
vcl::Window *pParent,
const OUString *pStrTitle,
const OUString *encoding)
- : ModalDialog(pParent, "WPFTEncodingDialog",
"writerperfect/ui/WPFTEncodingDialog.ui"),
+ : ModalDialog(pParent, "WPFTEncodingDialog",
"writerperfect/ui/wpftencodingdialog.ui"),
m_pLbCharset(), m_pBtnOk(), m_pBtnCancel(), m_userHasCancelled(false)
{
get(m_pLbCharset, "comboboxtext");
diff --git a/writerperfect/uiconfig/ui/wpftencodingdialog.ui
b/writerperfect/uiconfig/ui/wpftencodingdialog.ui
index bf00869..8c47bf8 100644
--- a/writerperfect/uiconfig/ui/wpftencodingdialog.ui
+++ b/writerperfect/uiconfig/ui/wpftencodingdialog.ui
@@ -34,7 +34,7 @@
</child>
<child>
<object class="GtkButton" id="cancel">
- <property name="label">gtk-undo</property>
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
