summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKatarina Behrens <bubli@bubli.org>2015-02-10 23:27:28 +0100
committerKatarina Behrens <bubli@bubli.org>2015-02-10 23:37:01 +0100
commit0dda7929f7a358311aec91e6a742620fe2f0df26 (patch)
treebd37b3347e1d69a854ea4132e0586e0571d73294
parent6ee0bc42a944e3101eb4c73716ecc6acf12f77cb (diff)
tdf#79239: make the dialog closable with 'X' button again
that one of window manager, top-right corner mostly. We need to reimplement Close() method for this class - I don't quite get why this has to be the case, but all classes derived from ScAnyRefDlg do it as well. Change-Id: I3e94b7ee09f9b3581d054818d36ea4fb0fd55f78
-rw-r--r--sc/source/ui/dbgui/PivotLayoutDialog.cxx9
-rw-r--r--sc/source/ui/inc/PivotLayoutDialog.hxx1
2 files changed, 8 insertions, 2 deletions
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 3d3a1910224e..b5d2c658e352 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -604,16 +604,21 @@ void ScPivotLayoutDialog::PushDataFieldNames(std::vector<ScDPName>& rDataFieldNa
return mpListBoxData->PushDataFieldNames(rDataFieldNames);
}
+bool ScPivotLayoutDialog::Close()
+{
+ return DoClose( ScPivotLayoutWrapper::GetChildWindowId() );
+}
+
IMPL_LINK( ScPivotLayoutDialog, OKClicked, PushButton*, /*pButton*/ )
{
ApplyChanges();
- DoClose( ScPivotLayoutWrapper::GetChildWindowId() );
+ Close();
return 0;
}
IMPL_LINK( ScPivotLayoutDialog, CancelClicked, PushButton*, /*pButton*/ )
{
- DoClose( ScPivotLayoutWrapper::GetChildWindowId() );
+ Close();
return 0;
}
diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx
index e94d9bda1984..c806a8ccb2ff 100644
--- a/sc/source/ui/inc/PivotLayoutDialog.hxx
+++ b/sc/source/ui/inc/PivotLayoutDialog.hxx
@@ -95,6 +95,7 @@ private:
DECL_LINK(ToggleSource, void*);
DECL_LINK(ToggleDestination, void*);
DECL_LINK(SourceEditModified, void*);
+ virtual bool Close() SAL_OVERRIDE;
ScPivotParam maPivotParameters;