diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2005-01-31 07:45:08 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2005-01-31 07:45:08 +0000 |
commit | 4a4f2d0639fb4a0bca7508b85cd3ea0e55e5db62 (patch) | |
tree | 846750382fc824aad96585fb43df13abd0077b24 | |
parent | 27db57efc51487b3976fbf73df1868b8fb78d201 (diff) |
INTEGRATION: CWS fwkbugfix05 (1.74.4); FILE MERGED
2005/01/19 13:40:18 mba 1.74.4.2: RESYNC: (1.74-1.75); FILE MERGED
2005/01/17 17:03:05 mba 1.74.4.1: #i40566#: SaveAs for password protected files should use passwords also
-rw-r--r-- | sfx2/source/doc/objserv.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 32f70356c0e3..88bdb5a1b869 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -2,9 +2,9 @@ * * $RCSfile: objserv.cxx,v $ * - * $Revision: 1.78 $ + * $Revision: 1.79 $ * - * last change: $Author: kz $ $Date: 2005-01-21 17:34:09 $ + * last change: $Author: rt $ $Date: 2005-01-31 08:45:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -595,6 +595,11 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) } // ======================================================================================================== + SFX_REQUEST_ARG( rReq, pPasswordItem, SfxStringItem, SID_PASSWORD, FALSE ); + SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pOldPasswordItem, SfxStringItem, SID_PASSWORD, FALSE ); + if ( pOldPasswordItem && !pPasswordItem ) + rReq.AppendItem( SfxStringItem( SID_PASSWORD, String() ) ); + uno::Sequence< beans::PropertyValue > aDispatchArgs; if ( rReq.GetArgs() ) TransformItems( nId, |