summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/source/form/fmshell.cxx11
1 files changed, 4 insertions, 7 deletions
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 31d9e5543c66..99bcb04f61ba 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -265,7 +265,7 @@ bool FmFormShell::PrepareClose(bool bUI)
const svx::ControllerFeatures& rController = GetImpl()->getActiveControllerFeatures();
if ( rController->commitCurrentControl() )
{
- bool bModified = rController->isModifiedRow();
+ const bool bModified = rController->isModifiedRow();
if ( bModified && bUI )
{
@@ -274,19 +274,16 @@ bool FmFormShell::PrepareClose(bool bUI)
"svx/ui/savemodifieddialog.ui");
switch (aQry->Execute())
{
- case RET_NO:
- bModified = false;
- // fallthrough to next case
case RET_YES:
+ bResult = rController->commitCurrentRecord( );
+ // fallthrough to next case
+ case RET_NO:
GetImpl()->didPrepareClose( true );
break;
case RET_CANCEL:
return false;
}
-
- if ( bModified )
- bResult = rController->commitCurrentRecord( );
}
}
}