summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGokul <gswaminathan@kacst.edu.sa>2013-03-30 09:02:20 +0300
committerBjörn Michaelsen <bjoern.michaelsen@canonical.com>2013-04-02 12:01:41 +0000
commit635f3da03a09213b3d86ced40e7e280cc03d409e (patch)
treea6290e18bfc80e9f25125f649da0dc094622de78
parentbb920862c02047471f0ac5e78358e8d8fd9b93e7 (diff)
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@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
-rw-r--r--svx/source/table/tablecontroller.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 0277aaf9bdf5..0330cf7f13f5 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 ()) );