[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source sc/uiconfig

[Julien Nabet]

 sc/source/ui/inc/PivotLayoutDialog.hxx         |    2 +-
 sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 917ff913b11309dfb13f5ee0d46a609608e5bbe3
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Jul 19 22:47:17 2014 +0200

    Resolves fdo#81549: Crash pivot table
    
    Regression from http://cgit.freedesktop.org/libreoffice/core/commit/?id=345d6dd9d938a88722fb6d1f1963047a9761412d ?
    
    Change-Id: Ie2ebef88bd8369065b8a4ab176099c71674d5090
    Reviewed-on: https://gerrit.libreoffice.org/10410
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
    Tested-by: Kohei Yoshida <libreoffice at kohei.us>
    (cherry picked from commit a82ff18269e5b37348d402b7c21c3f200068265c)

diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx
index ace1ed5..c63177b 100644
--- a/sc/source/ui/inc/PivotLayoutDialog.hxx
+++ b/sc/source/ui/inc/PivotLayoutDialog.hxx
@@ -82,7 +82,7 @@ private:
     formula::RefButton* mpDestinationButton;
 
     PushButton*      mpBtnOK;
-    CloseButton*     mpBtnCancel;
+    CancelButton*     mpBtnCancel;
 
     formula::RefEdit*   mpActiveEdit;
     ScAddress::Details  maAddressDetails;
diff --git a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
index ad42d3f..7ffba7e 100644
--- a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
+++ b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
@@ -797,8 +797,7 @@
     </child>
     <action-widgets>
       <action-widget response="0">ok</action-widget>
-      <action-widget response="0">apply</action-widget>
-      <action-widget response="0">close</action-widget>
+      <action-widget response="0">cancel</action-widget>
     </action-widgets>
   </object>
 </interface>