sc/source/filter/ftools/fapihelper.cxx | 4 +--- sfx2/source/appl/appopen.cxx | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)
New commits: commit ac4cfb4cf76d1cf1459d3cbf1c135aae2753f32d Author: Stephan Bergmann <[email protected]> Date: Tue Oct 20 14:43:58 2015 +0200 Avoid some confusing uses of "document name" instead of "document URL" Change-Id: I88258d3aaa2a18315a5a38ea01e77bdfd4bc1a84 diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx index 121491a..7f86384 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 04c729e..ca7cc1f 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 ); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
