diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-02-09 12:57:14 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-02-09 12:57:14 +0000 |
| commit | 9d0614eef80f5ac8c3d700c7cd452206408ffa55 (patch) | |
| tree | 15d6909016876fb98c6b2296177a231ff4bdff71 /sfx2/source/appl/appopen.cxx | |
| parent | e1b5a6d0e013560b85be5e096cb86728e8c41753 (diff) | |
INTEGRATION: CWS rtfpp2 (1.100.44); FILE MERGED
2005/12/22 14:42:37 mba 1.100.44.2: #129054#: don't remove all metadata when creating a document from template
2005/12/14 13:28:09 mba 1.100.44.1: #i18807#: allow to make a frame visible after loading in hidden mode
Diffstat (limited to 'sfx2/source/appl/appopen.cxx')
| -rw-r--r-- | sfx2/source/appl/appopen.cxx | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 7a71dd44db7a..684c36f8a265 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -4,9 +4,9 @@ * * $RCSfile: appopen.cxx,v $ * - * $Revision: 1.101 $ + * $Revision: 1.102 $ * - * last change: $Author: kz $ $Date: 2006-02-01 19:11:16 $ + * last change: $Author: rt $ $Date: 2006-02-09 13:57:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -292,7 +292,7 @@ SfxObjectShellRef SfxApplication::DocAlreadyLoaded SfxTopViewFrame *pFrame; for( pFrame = (SfxTopViewFrame*) SfxViewFrame::GetFirst( xDoc, TYPE(SfxTopViewFrame) ); - pFrame && !pFrame->IsVisible(); + pFrame && !pFrame->IsVisible_Impl(); pFrame = (SfxTopViewFrame*) SfxViewFrame::GetNext( *pFrame, xDoc, TYPE(SfxTopViewFrame) ) ); if ( pFrame ) @@ -315,23 +315,10 @@ void SetTemplate_Impl( const String &rFileName, const String &rLongName, SfxObjectShell *pDoc) { - SfxDocumentInfo &rInfo = pDoc->GetDocInfo(); - rInfo.Clear(); - // write TemplateName to DocumentInfo of document // TemplateDate stays as default (=current date) - if( ::utl::LocalFileHelper::IsLocalFile( rFileName ) ) - { - String aFoundName; - if( SFX_APP()->Get_Impl()->GetDocumentTemplates()->GetFull( String(), rLongName, aFoundName ) ) - { - INetURLObject aObj( rFileName ); - rInfo.SetTemplateFileName( aObj.GetMainURL(INetURLObject::DECODE_TO_IURI) ); - rInfo.SetTemplateName( rLongName ); - rInfo.SetTemplateConfig( sal_False ); - } - } - + SfxDocumentInfo &rInfo = pDoc->GetDocInfo(); + rInfo.ResetFromTemplate( rLongName, rFileName ); pDoc->FlushDocInfo(); } |