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

[Kohei Yoshida]

 sc/source/ui/dbgui/PivotLayoutDialog.cxx       |    9 ---------
 sc/source/ui/inc/PivotLayoutDialog.hxx         |    2 --
 sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui |   16 ----------------
 3 files changed, 27 deletions(-)

New commits:
commit 28ab89377ed5f973bef2e07c1a708d97d916d5b7
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Wed May 21 21:32:59 2014 -0400

    Keep only "Apply" and "Close".
    
    Change-Id: I963419baec24d7599ddb3e481738cbe6ec4e0a69
    (cherry picked from commit 251507d0974418ebefce302e45dbb291c87e56da)

diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 4b74fca..8c667dd 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -93,7 +93,6 @@ ScPivotLayoutDialog::ScPivotLayoutDialog(
     get(mpCheckTotalRows,           "check-total-rows");
     get(mpCheckDrillToDetail,       "check-drill-to-details");
 
-    get(mpButtonOk,     "ok");
     get(mpButtonApply,  "apply");
     get(mpButtonClose,  "close");
 
@@ -147,7 +146,6 @@ ScPivotLayoutDialog::ScPivotLayoutDialog(
     mpDestinationButton->SetLoseFocusHdl(aLink);
 
     // Buttons
-    mpButtonOk->SetClickHdl(   LINK(this, ScPivotLayoutDialog, OkClicked));
     mpButtonClose->SetClickHdl(LINK(this, ScPivotLayoutDialog, CloseClicked));
     mpButtonApply->SetClickHdl(LINK(this, ScPivotLayoutDialog, ApplyClicked));
 
@@ -608,13 +606,6 @@ void ScPivotLayoutDialog::PushDataFieldNames(std::vector<ScDPName>& rDataFieldNa
     return mpListBoxData->PushDataFieldNames(rDataFieldNames);
 }
 
-IMPL_LINK( ScPivotLayoutDialog, OkClicked, PushButton*, /*pButton*/ )
-{
-    if (ApplyChanges())
-        CloseClicked(NULL);
-    return 0;
-}
-
 IMPL_LINK( ScPivotLayoutDialog, ApplyClicked, PushButton*, /*pButton*/ )
 {
     ApplyChanges();
diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx
index aae1038..71c9666 100644
--- a/sc/source/ui/inc/PivotLayoutDialog.hxx
+++ b/sc/source/ui/inc/PivotLayoutDialog.hxx
@@ -82,14 +82,12 @@ private:
     formula::RefButton* mpDestinationButton;
 
     PushButton*      mpButtonApply;
-    OKButton*        mpButtonOk;
     CloseButton*     mpButtonClose;
 
     formula::RefEdit*   mpActiveEdit;
     ScAddress::Details  maAddressDetails;
     bool                mbDialogLostFocus;
 
-    DECL_LINK(OkClicked,              PushButton*);
     DECL_LINK(CloseClicked,           PushButton*);
     DECL_LINK(ApplyClicked,           PushButton*);
     DECL_LINK(GetFocusHandler,        Control*);
diff --git a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
index 3af1f19..565e627 100644
--- a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
+++ b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
@@ -18,22 +18,6 @@
             <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
-              <object class="GtkButton" id="ok">
-                <property name="label">gtk-ok</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkButton" id="apply">
                 <property name="label">gtk-apply</property>
                 <property name="visible">True</property>