diff options
| -rw-r--r-- | comphelper/source/misc/docpasswordrequest.cxx | 28 | ||||
| -rw-r--r-- | include/comphelper/docpasswordrequest.hxx | 13 |
2 files changed, 19 insertions, 22 deletions
diff --git a/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx index 29cf4a90d704..3ebcde4e82f7 100644 --- a/comphelper/source/misc/docpasswordrequest.cxx +++ b/comphelper/source/misc/docpasswordrequest.cxx @@ -82,10 +82,8 @@ SimplePasswordRequest::SimplePasswordRequest( PasswordRequestMode eMode ) InteractionClassification_QUERY, eMode ); maRequest <<= aRequest; - maContinuations.realloc( 2 ); - maContinuations[ 0 ].set( new AbortContinuation ); - mpPassword = new PasswordContinuation; - maContinuations[ 1 ].set( mpPassword ); + mxAbort = new AbortContinuation; + mxPassword = new PasswordContinuation; } SimplePasswordRequest::~SimplePasswordRequest() @@ -94,12 +92,12 @@ SimplePasswordRequest::~SimplePasswordRequest() bool SimplePasswordRequest::isPassword() const { - return mpPassword->isSelected(); + return mxPassword->isSelected(); } OUString SimplePasswordRequest::getPassword() const { - return mpPassword->getPassword(); + return mxPassword->getPassword(); } Any SAL_CALL SimplePasswordRequest::getRequest() throw( RuntimeException, std::exception ) @@ -109,7 +107,7 @@ Any SAL_CALL SimplePasswordRequest::getRequest() throw( RuntimeException, std::e Sequence< Reference< XInteractionContinuation > > SAL_CALL SimplePasswordRequest::getContinuations() throw( RuntimeException, std::exception ) { - return maContinuations; + return { mxAbort.get(), mxPassword.get() }; } @@ -136,10 +134,8 @@ DocPasswordRequest::DocPasswordRequest( DocPasswordRequestType eType, implementation of a new enum value. */ } - maContinuations.realloc( 2 ); - maContinuations[ 0 ].set( new AbortContinuation ); - mpPassword = new PasswordContinuation; - maContinuations[ 1 ].set( mpPassword ); + mxAbort = new AbortContinuation; + mxPassword = new PasswordContinuation; } DocPasswordRequest::~DocPasswordRequest() @@ -148,22 +144,22 @@ DocPasswordRequest::~DocPasswordRequest() bool DocPasswordRequest::isPassword() const { - return mpPassword->isSelected(); + return mxPassword->isSelected(); } OUString DocPasswordRequest::getPassword() const { - return mpPassword->getPassword(); + return mxPassword->getPassword(); } OUString DocPasswordRequest::getPasswordToModify() const { - return mpPassword->getPasswordToModify(); + return mxPassword->getPasswordToModify(); } bool DocPasswordRequest::getRecommendReadOnly() const { - return mpPassword->getRecommendReadOnly(); + return mxPassword->getRecommendReadOnly(); } Any SAL_CALL DocPasswordRequest::getRequest() throw( RuntimeException, std::exception ) @@ -173,7 +169,7 @@ Any SAL_CALL DocPasswordRequest::getRequest() throw( RuntimeException, std::exce Sequence< Reference< XInteractionContinuation > > SAL_CALL DocPasswordRequest::getContinuations() throw( RuntimeException, std::exception ) { - return maContinuations; + return { mxAbort.get(), mxPassword.get() }; } diff --git a/include/comphelper/docpasswordrequest.hxx b/include/comphelper/docpasswordrequest.hxx index f8b19b180218..f5657a4b4ad9 100644 --- a/include/comphelper/docpasswordrequest.hxx +++ b/include/comphelper/docpasswordrequest.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/task/PasswordRequestMode.hpp> #include <com/sun/star/task/XInteractionRequest.hpp> #include <cppuhelper/implbase.hxx> +#include <rtl/ref.hxx> namespace comphelper { @@ -56,9 +57,9 @@ private: virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( css::uno::RuntimeException, std::exception ) override; private: - css::uno::Any maRequest; - css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > maContinuations; - PasswordContinuation * mpPassword; + css::uno::Any maRequest; + rtl::Reference<AbortContinuation> mxAbort; + rtl::Reference<PasswordContinuation> mxPassword; }; @@ -89,9 +90,9 @@ private: virtual css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL getContinuations() throw( css::uno::RuntimeException, std::exception ) override; private: - css::uno::Any maRequest; - css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > maContinuations; - PasswordContinuation * mpPassword; + css::uno::Any maRequest; + rtl::Reference<AbortContinuation> mxAbort; + rtl::Reference<PasswordContinuation> mxPassword; }; |