diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-07-26 14:54:17 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-07-26 14:57:33 +0200 |
| commit | e443e032f859d0c1e0859a2e29486a2f29d09df2 (patch) | |
| tree | ba7b545f4ad4f38485b8cf2bf17d7d85eb5557b9 /sd/source/ui/app | |
| parent | cd466bf5595fdf965ee9062392de1271b4284387 (diff) | |
change from SID_PASSWORD to SID_ENCRYPTIONDATA
Diffstat (limited to 'sd/source/ui/app')
| -rw-r--r-- | sd/source/ui/app/sdmod1.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index d6934a1f609c..f46b82354484 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -48,6 +48,7 @@ #include <editeng/paperinf.hxx> #include <editeng/eeitem.hxx> #include <unotools/useroptions.hxx> +#include <com/sun/star/uno/Sequence.h> #include "app.hrc" #include "glob.hrc" @@ -84,6 +85,7 @@ using ::sd::framework::FrameworkHelper; using ::com::sun::star::uno::Reference; using ::com::sun::star::frame::XFrame; +using ::com::sun::star::uno::Sequence; namespace { @@ -615,11 +617,11 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) DBG_ASSERT( aFileToOpen.Len()!=0, "The autopilot should have asked for a file itself already!" ); if(aFileToOpen.Len() != 0) { - const String aPasswrd( pPilotDlg->GetPassword() ); + com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > aPasswrd( pPilotDlg->GetPassword() ); SfxStringItem aFile( SID_FILE_NAME, aFileToOpen ); SfxStringItem aReferer( SID_REFERER, UniString() ); - SfxStringItem aPassword( SID_PASSWORD, aPasswrd ); + SfxUnoAnyItem aPassword( SID_ENCRYPTIONDATA, com::sun::star::uno::makeAny(aPasswrd) ); if ( xTargetFrame.is() ) { @@ -628,7 +630,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) aSet.Put( aReferer ); // Put the password into the request // only if it is not empty. - if (aPasswrd.Len() > 0) + if (aPasswrd.getLength() > 0) aSet.Put( aPassword ); const SfxPoolItem* pRet = SfxFrame::OpenDocumentSynchron( aSet, xTargetFrame ); @@ -643,7 +645,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq ) aRequest.AppendItem (aReferer); // Put the password into the request // only if it is not empty. - if (aPasswrd.Len() > 0) + if (aPasswrd.getLength() > 0) aRequest.AppendItem (aPassword); aRequest.AppendItem (SfxStringItem ( SID_TARGETNAME, |