[Libreoffice-commits] core.git: svx/source

[Gokul]

 svx/source/table/tablecontroller.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 635f3da03a09213b3d86ced40e7e280cc03d409e
Author: Gokul <gswaminathan at kacst.edu.sa>
Date:   Sat Mar 30 09:02:20 2013 +0300

    Fix related to fdo#62224.
    
    on clicking Cancel Button in Format cells Widget in Impress,
    Their is change in "Spacing of contents" values.
    Values should not be changed.
    
    Change-Id: If9395eda7f82f8e25148f906094588480a6a1029
    Reviewed-on: https://gerrit.libreoffice.org/3092
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 0277aaf..0330cf7 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -61,6 +61,7 @@
 #include "svx/svdpage.hxx"
 #include "tableundo.hxx"
 #include "tablelayouter.hxx"
+#include <vcl/msgbox.hxx>
 
 using ::editeng::SvxBorderLine;
 using ::rtl::OUString;
@@ -736,7 +737,8 @@ void SvxTableController::onFormatTable( SfxRequest& rReq )
 
         SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
         std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact ? pFact->CreateSvxFormatCellsDialog( NULL, &aNewAttr, pTableObj->GetModel(), pTableObj) : 0 );
-        if( pDlg.get() && pDlg->Execute() )
+        // Even Cancel Button is returning positive(101) value,
+        if( pDlg.get() && ( pDlg->Execute() == RET_OK ) )
         {
             SfxItemSet aNewSet( *(pDlg->GetOutputItemSet ()) );