[Libreoffice-commits] core.git: include/vcl vcl/source

[Caolán McNamara]

 include/vcl/layout.hxx       |    2 ++
 vcl/source/window/layout.cxx |    7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 88ec9b084cfc3e2ad540b1c294d57eb99a3aa3d6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Dec 21 20:08:24 2013 +0000

    add an intermediate virtual 'response' to MessageDialog
    
    so subclasses can decide to not EndDialog on a given responseid
    
    Change-Id: I78a02f121b414c458bece1574f890d952ad5cc23

diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 57890f2..26c9f3b 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -715,6 +715,8 @@ public:
     MessageDialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescription);
     virtual bool set_property(const OString &rKey, const OString &rValue);
     virtual short Execute();
+    ///Emitted when an action widget is clicked
+    virtual void response(short nResponseId);
     OUString get_primary_text() const;
     OUString get_secondary_text() const;
     void set_primary_text(const OUString &rPrimaryString);
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 1532ce9..b472f42 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1947,9 +1947,14 @@ MessageDialog::~MessageDialog()
     delete m_pGrid;
 }
 
+void MessageDialog::response(short nResponseId)
+{
+    EndDialog(nResponseId);
+}
+
 IMPL_LINK(MessageDialog, ButtonHdl, Button *, pButton)
 {
-    EndDialog(get_response(pButton));
+    response(get_response(pButton));
     return 0;
 }