diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-20 14:43:58 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-20 14:43:58 +0200 |
| commit | ac4cfb4cf76d1cf1459d3cbf1c135aae2753f32d (patch) | |
| tree | 908ec531d4a3e57312a8605322a455739427079f | |
| parent | 931c51f65b77285d912b4f3d4a5385a82fb28172 (diff) | |
Avoid some confusing uses of "document name" instead of "document URL"
Change-Id: I88258d3aaa2a18315a5a38ea01e77bdfd4bc1a84
| -rw-r--r-- | sc/source/filter/ftools/fapihelper.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/appl/appopen.cxx | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx index 121491ad0520..7f863843b375 100644 --- a/sc/source/filter/ftools/fapihelper.cxx +++ b/sc/source/filter/ftools/fapihelper.cxx @@ -114,11 +114,9 @@ uno::Sequence< beans::NamedValue > ScfApiHelper::QueryEncryptionDataForMedium( S if ( pPasswordItem ) aPassword = pPasswordItem->GetValue(); - OUString aDocName = rMedium.GetOrigURL(); - bool bIsDefaultPassword = false; aEncryptionData = ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword( - rVerifier, aEncryptionData, aPassword, rMedium.GetInteractionHandler(), aDocName, + rVerifier, aEncryptionData, aPassword, rMedium.GetInteractionHandler(), rMedium.GetOrigURL(), ::comphelper::DocPasswordRequestType_MS, pDefaultPasswords, &bIsDefaultPassword ); rMedium.GetItemSet()->ClearItem( SID_PASSWORD ); diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 04c729ef6dad..ca7cc1f7ca8a 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -241,11 +241,9 @@ sal_uInt32 CheckPasswd_Impl if ( pEncryptionDataItem ) pEncryptionDataItem->GetValue() >>= aEncryptionData; - OUString aDocumentName = pFile->GetOrigURL(); - SfxDocPasswordVerifier aVerifier( xStorage ); aEncryptionData = ::comphelper::DocPasswordHelper::requestAndVerifyDocPassword( - aVerifier, aEncryptionData, aPassword, xInteractionHandler, aDocumentName, comphelper::DocPasswordRequestType_STANDARD ); + aVerifier, aEncryptionData, aPassword, xInteractionHandler, pFile->GetOrigURL(), comphelper::DocPasswordRequestType_STANDARD ); pSet->ClearItem( SID_PASSWORD ); pSet->ClearItem( SID_ENCRYPTIONDATA ); |