diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-04 18:23:55 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-04 18:23:55 +0000 |
| commit | 4ed6811a835da3e821dfe399d4fa05438a1685b6 (patch) | |
| tree | e66b991090d641e4416afdfc3b80fe9f2b441499 /sfx2 | |
| parent | c64b03e63a4204a72cb1581886cb938954a0b0c3 (diff) | |
INTEGRATION: CWS mav3 (1.111.2.4.10); FILE MERGED
2003/03/27 17:17:19 mav 1.111.2.4.10.4: RESYNC: (1.111.2.4-1.111.2.6); FILE MERGED
2003/03/13 08:58:23 mav 1.111.2.4.10.3: #i2822# in storeTo mode handsOff is possible
2003/03/13 08:38:09 mav 1.111.2.4.10.2: #i2822# handsOff is useless in case of private:stream
2003/03/11 13:00:31 mav 1.111.2.4.10.1: #i2822# private:stream is not a normal url
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 67d1912a8bfe..f61adff76fae 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2,9 +2,9 @@ * * $RCSfile: objstor.cxx,v $ * - * $Revision: 1.113 $ + * $Revision: 1.114 $ * - * last change: $Author: hr $ $Date: 2003-04-04 16:08:17 $ + * last change: $Author: hr $ $Date: 2003-04-04 19:23:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1210,7 +1210,8 @@ sal_Bool SfxObjectShell::SaveTo_Impl // When the new medium ( rMedium ) has the same name as the current one, // we need to call DoHandsOff() so Commit() can overwrite the old version - if ( bOk && pMedium && ( rMedium.GetName().EqualsIgnoreCaseAscii( pMedium->GetName() ) ) ) + if ( bOk && pMedium && ( rMedium.GetName().EqualsIgnoreCaseAscii( pMedium->GetName() ) ) + && rMedium.GetName().CompareIgnoreCaseToAscii( "private:stream", 14 ) != COMPARE_EQUAL ) DoHandsOff(); } @@ -1951,7 +1952,8 @@ sal_Bool SfxObjectShell::CommonSaveAs_Impl SfxMedium *pActMed = GetMedium(); const INetURLObject aActName(pActMed->GetName()); - if ( aURL == aActName ) + if ( aURL == aActName + && aURL != INetURLObject( OUString::createFromAscii( "private:stream" ) ) ) { if ( IsReadOnly() ) { @@ -2135,7 +2137,12 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl SetError( pNewFile->GetErrorCode() ); // notify the document that saving was done successfully - if ( !bCopyTo ) + if ( bCopyTo ) + { + if ( IsHandsOff() ) + bOk = DoSaveCompleted( pMedium ); + } + else { // Muss !!! if ( bToOwnFormat ) |