diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2014-07-19 22:47:17 +0200 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-07-19 22:41:19 -0400 |
| commit | 917ff913b11309dfb13f5ee0d46a609608e5bbe3 (patch) | |
| tree | 4cea071265bceedb72f2ed16abfdb7dbfaf7d905 | |
| parent | 6ace1e560373284a116c645bca82ff78ef112576 (diff) | |
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@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
(cherry picked from commit a82ff18269e5b37348d402b7c21c3f200068265c)
| -rw-r--r-- | sc/source/ui/inc/PivotLayoutDialog.hxx | 2 | ||||
| -rw-r--r-- | sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index ace1ed5ffdb9..c63177b5273e 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 ad42d3ff97a2..7ffba7e2b51a 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> |