diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2003-04-17 14:57:03 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2003-04-17 14:57:03 +0000 |
commit | 8a09700b67c21c0becd45ec29d1f2e5d4890085f (patch) | |
tree | dbbecbdae26ccf01df676516bc88c818d756cf90 | |
parent | 76ecf77e01c26565014fb51ca95932a6d7f511f4 (diff) |
INTEGRATION: CWS sw011 (1.60.2.7.38); FILE MERGED
2003/04/08 10:04:09 mav 1.60.2.7.38.1: #108649# DocumentTitle media descriptor property
-rw-r--r-- | sfx2/source/view/frmload.cxx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index 412d273d9f44..ca35d5e5a368 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmload.cxx,v $ * - * $Revision: 1.63 $ + * $Revision: 1.64 $ * - * last change: $Author: hr $ $Date: 2003-04-04 19:25:26 $ + * last change: $Author: vg $ $Date: 2003-04-17 15:57:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -333,6 +333,8 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA pCombinedFilters = pCont->GetAnyFilter( nMust, nDont ); } + SFX_ITEMSET_ARG( &aSet, pDocumentTitleItem, SfxStringItem, SID_DOCINFO_TITLE, FALSE ); + if ( pCombinedFilters ) { INetURLObject aObj( rURL ); @@ -350,6 +352,9 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA // of a "NewDocument" request aReq.AppendItem( SfxBoolItem ( SID_NEWDOCDIRECT, TRUE ) ); + if ( pDocumentTitleItem ) + aReq.AppendItem( *pDocumentTitleItem ); + const SfxPoolItem* pRet = pMod->ExecuteSlot( aReq ); if ( pRet ) { @@ -391,6 +396,10 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA SfxRequest aReq( SID_NEWDOCDIRECT, SFX_CALLMODE_SYNCHRON, aSet ); aReq.AppendItem( SfxFrameItem( SID_DOCFRAME, pFrame ) ); aReq.AppendItem( SfxStringItem( SID_NEWDOCDIRECT, String::CreateFromAscii(pFactory->GetShortName()) ) ); + + if ( pDocumentTitleItem ) + aReq.AppendItem( *pDocumentTitleItem ); + const SfxPoolItem* pRet = pApp->ExecuteSlot( aReq ); if (pRet) { |