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

[Katarina Behrens]

 sc/source/ui/dbgui/PivotLayoutDialog.cxx |    9 +++++++--
 sc/source/ui/inc/PivotLayoutDialog.hxx   |    1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit bd50ecbb99d023e330a1b0e929370d883c5c9f3b
Author: Katarina Behrens <bubli at bubli.org>
Date:   Tue Feb 10 23:27:28 2015 +0100

    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

diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 3d3a191..b5d2c65 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 e94d9bd..c806a8c 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;