diff options
| author | Mathias Bauer <mba@openoffice.org> | 2002-07-08 06:38:48 +0000 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2002-07-08 06:38:48 +0000 |
| commit | 3108b0d0a4ac38652e0f6aa62ece5f46aa67ab5e (patch) | |
| tree | 45a3346290cfa4bde0714ebe9b13f0ec9267bc53 /sfx2/source/appl | |
| parent | ad3ed2dd4f471aef2e2cf2d2a9fa67f64b7ff1e1 (diff) | |
#74786#: LoadTemplate always resets title
Diffstat (limited to 'sfx2/source/appl')
| -rw-r--r-- | sfx2/source/appl/appopen.cxx | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 252b8bdfb431..7177bec7c4ad 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appopen.cxx,v $ * - * $Revision: 1.51 $ + * $Revision: 1.52 $ * - * last change: $Author: mba $ $Date: 2002-07-03 16:28:36 $ + * last change: $Author: mba $ $Date: 2002-07-08 07:33:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -415,10 +415,8 @@ ULONG CheckPasswd_Impl //-------------------------------------------------------------------- -ULONG SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String &rFileName, - const String &rLongName, BOOL bCopy, SfxItemSet* pSet ) +ULONG SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String &rFileName, BOOL bCopy, SfxItemSet* pSet ) { - BOOL bWithInfo = ( rLongName.Len() != 0 ); const SfxFilter* pFilter = NULL; SfxMedium aMedium( rFileName, ( STREAM_READ | STREAM_SHARE_DENYNONE ), FALSE ); @@ -492,15 +490,12 @@ ULONG SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const String &rFil return aTmpStor->GetErrorCode(); } - if ( bWithInfo ) - SetTemplate_Impl( aTmpStor, rFileName, rLongName, xDoc ); + SetTemplate_Impl( aTmpStor, rFileName, String(), xDoc ); } - else if ( bWithInfo ) - SetTemplate_Impl( xDoc->GetStorage(), rFileName, rLongName, xDoc ); - - if ( bWithInfo ) - xDoc->Broadcast( SfxDocumentInfoHint( &xDoc->GetDocInfo() ) ); + else + SetTemplate_Impl( xDoc->GetStorage(), rFileName, String(), xDoc ); + xDoc->Broadcast( SfxDocumentInfoHint( &xDoc->GetDocInfo() ) ); xDoc->SetNoName(); xDoc->InvalidateName(); xDoc->SetModified(FALSE); |