diff options
Diffstat (limited to 'sdext/source/pdfimport/misc/pwdinteract.cxx')
-rw-r--r-- | sdext/source/pdfimport/misc/pwdinteract.cxx | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/sdext/source/pdfimport/misc/pwdinteract.cxx b/sdext/source/pdfimport/misc/pwdinteract.cxx index a68c63054137..43dfd1151964 100644 --- a/sdext/source/pdfimport/misc/pwdinteract.cxx +++ b/sdext/source/pdfimport/misc/pwdinteract.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/task/XInteractionRequest.hpp> #include <com/sun/star/task/XInteractionPassword.hpp> -#include <com/sun/star/task/PasswordRequest.hpp> +#include <com/sun/star/task/DocumentPasswordRequest.hpp> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/compbase2.hxx> @@ -53,12 +53,12 @@ class PDFPasswordRequest : private cppu::BaseMutex, public PDFPasswordRequestBase { private: - task::PasswordRequest m_aRequest; - rtl::OUString m_aPassword; - bool m_bSelected; + task::DocumentPasswordRequest m_aRequest; + rtl::OUString m_aPassword; + bool m_bSelected; public: - explicit PDFPasswordRequest(bool bFirstTry); + explicit PDFPasswordRequest(bool bFirstTry, const rtl::OUString& rName); // XInteractionRequest virtual uno::Any SAL_CALL getRequest( ) throw (uno::RuntimeException); @@ -74,7 +74,7 @@ public: bool isSelected() const { osl::MutexGuard const guard( m_aMutex ); return m_bSelected; } }; -PDFPasswordRequest::PDFPasswordRequest( bool bFirstTry ) : +PDFPasswordRequest::PDFPasswordRequest( bool bFirstTry, const rtl::OUString& rName ) : PDFPasswordRequestBase( m_aMutex ), m_aRequest(), m_aPassword(), @@ -84,6 +84,7 @@ PDFPasswordRequest::PDFPasswordRequest( bool bFirstTry ) : task::PasswordRequestMode_PASSWORD_ENTER : task::PasswordRequestMode_PASSWORD_REENTER; m_aRequest.Classification = task::InteractionClassification_QUERY; + m_aRequest.Name = rName; } uno::Any SAL_CALL PDFPasswordRequest::getRequest() throw (uno::RuntimeException) @@ -132,13 +133,15 @@ namespace pdfi bool getPassword( const uno::Reference< task::XInteractionHandler >& xHandler, rtl::OUString& rOutPwd, - bool bFirstTry ) + bool bFirstTry, + const rtl::OUString& rDocName + ) { bool bSuccess = false; PDFPasswordRequest* pRequest; uno::Reference< task::XInteractionRequest > xReq( - pRequest = new PDFPasswordRequest( bFirstTry ) ); + pRequest = new PDFPasswordRequest( bFirstTry, rDocName ) ); try { xHandler->handle( xReq ); |