diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-05-21 21:32:59 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-05-21 21:35:51 -0400 |
| commit | 251507d0974418ebefce302e45dbb291c87e56da (patch) | |
| tree | 9ff77c6eacb6c9ad5a4e1fb9ffbf3347cda820b9 /sc/source | |
| parent | 2c61edfdf57dabbd86ecc440444b6b00443f916a (diff) | |
Keep only "Apply" and "Close".
Change-Id: I963419baec24d7599ddb3e481738cbe6ec4e0a69
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/ui/dbgui/PivotLayoutDialog.cxx | 9 | ||||
| -rw-r--r-- | sc/source/ui/inc/PivotLayoutDialog.hxx | 2 |
2 files changed, 0 insertions, 11 deletions
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index 4b74fca65e82..8c667dd0319b 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 aae10381eb8f..71c96667e692 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*); |