summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2003-07-09 08:15:08 +0000
committerVladimir Glazounov <vg@openoffice.org>2003-07-09 08:15:08 +0000
commit010aaa69b954ebd551c0639c6d1c4b33c8df01b7 (patch)
tree839f0910e15a7e11b5abde2b10e57198c5c1737d /sfx2
parent4bbda1c4c52379d1b88d5a20344ea9b60f819b51 (diff)
INTEGRATION: CWS sw020 (1.56.72); FILE MERGED
2003/07/02 14:25:54 mav 1.56.72.1: #110533# do not leave object in handsoff state
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/doc/objserv.cxx14
1 files changed, 11 insertions, 3 deletions
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index ab801688e95b..cc660088210a 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: objserv.cxx,v $
*
- * $Revision: 1.56 $
+ * $Revision: 1.57 $
*
- * last change: $Author: hr $ $Date: 2003-04-04 19:23:35 $
+ * last change: $Author: vg $ $Date: 2003-07-09 09:15:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1522,7 +1522,15 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
ErrorHandler::HandleError(lErr);
ResetError();
delete pTemplates;
- DoSaveCompleted();
+
+ if ( IsHandsOff() )
+ {
+ if ( !DoSaveCompleted( pMedium ) )
+ DBG_ERROR("Case not handled - no way to get a storage!");
+ }
+ else
+ DoSaveCompleted();
+
SetTemplateConfig( bHasTemplateConfig );
SetModified(bModified);
rReq.SetReturnValue( SfxBoolItem( 0, bOK ) );