diff options
Diffstat (limited to 'uui')
-rw-r--r-- | uui/source/fltdlg.cxx | 6 | ||||
-rw-r--r-- | uui/source/getcontinuations.hxx | 43 | ||||
-rw-r--r-- | uui/source/iahndl.cxx | 4 | ||||
-rw-r--r-- | uui/source/iahndl.hxx | 131 | ||||
-rw-r--r-- | uui/source/interactionhandler.cxx | 39 | ||||
-rw-r--r-- | uui/source/masterpassworddlg.cxx | 6 | ||||
-rw-r--r-- | uui/source/masterpassworddlg.hxx | 6 | ||||
-rw-r--r-- | uui/source/passwordcontainer.hxx | 57 | ||||
-rw-r--r-- | uui/source/passworddlg.hxx | 6 | ||||
-rw-r--r-- | uui/source/requeststringresolver.hxx | 30 |
10 files changed, 131 insertions, 197 deletions
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx index d898feb425bf..c45605de66e5 100644 --- a/uui/source/fltdlg.cxx +++ b/uui/source/fltdlg.cxx @@ -165,7 +165,7 @@ bool FilterDialog::AskForFilter( FilterNameListPtr& pSelectedItem ) @seealso method InetURLObject::getAbbreviated() @threadsafe no *//*-*************************************************************************************************************/ -class StringCalculator : public ::cppu::WeakImplHelper< ::com::sun::star::util::XStringWidth > +class StringCalculator : public ::cppu::WeakImplHelper< css::util::XStringWidth > { public: explicit StringCalculator( const OutputDevice* pDevice ) @@ -173,7 +173,7 @@ class StringCalculator : public ::cppu::WeakImplHelper< ::com::sun::star::util:: { } - sal_Int32 SAL_CALL queryStringWidth( const OUString& sString ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override + sal_Int32 SAL_CALL queryStringWidth( const OUString& sString ) throw( css::uno::RuntimeException, std::exception ) override { return (sal_Int32)(m_pDevice->GetTextWidth(sString)); } @@ -207,7 +207,7 @@ OUString FilterDialog::impl_buildUIFileName( const OUString& sName ) else { // otherwise its really a url ... build short name by using INetURLObject - ::com::sun::star::uno::Reference< ::com::sun::star::util::XStringWidth > xStringCalculator( new StringCalculator(m_pFtURL) ); + css::uno::Reference< css::util::XStringWidth > xStringCalculator( new StringCalculator(m_pFtURL) ); if( xStringCalculator.is() ) { INetURLObject aBuilder ( sName ); diff --git a/uui/source/getcontinuations.hxx b/uui/source/getcontinuations.hxx index d7e80cb2f2bd..8175b002b974 100644 --- a/uui/source/getcontinuations.hxx +++ b/uui/source/getcontinuations.hxx @@ -31,13 +31,12 @@ namespace com { namespace sun { namespace star { template< class t1 > bool setContinuation( - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionContinuation > const & rContinuation, - com::sun::star::uno::Reference< t1 > * pContinuation) + css::uno::Reference< css::task::XInteractionContinuation > const & rContinuation, + css::uno::Reference< t1 > * pContinuation) { if (pContinuation && !pContinuation->is()) { - pContinuation->set(rContinuation, com::sun::star::uno::UNO_QUERY); + pContinuation->set(rContinuation, css::uno::UNO_QUERY); if (pContinuation->is()) return true; } @@ -46,12 +45,10 @@ bool setContinuation( template< class t1, class t2 > void getContinuations( - com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionContinuation > > const & - rContinuations, - com::sun::star::uno::Reference< t1 > * pContinuation1, - com::sun::star::uno::Reference< t2 > * pContinuation2) + css::uno::Sequence< + css::uno::Reference< css::task::XInteractionContinuation > > const & rContinuations, + css::uno::Reference< t1 > * pContinuation1, + css::uno::Reference< t2 > * pContinuation2) { for (sal_Int32 i = 0; i < rContinuations.getLength(); ++i) { @@ -64,13 +61,11 @@ void getContinuations( template< class t1, class t2, class t3 > void getContinuations( - com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionContinuation > > const & - rContinuations, - com::sun::star::uno::Reference< t1 > * pContinuation1, - com::sun::star::uno::Reference< t2 > * pContinuation2, - com::sun::star::uno::Reference< t3 > * pContinuation3) + css::uno::Sequence< + css::uno::Reference< css::task::XInteractionContinuation > > const & rContinuations, + css::uno::Reference< t1 > * pContinuation1, + css::uno::Reference< t2 > * pContinuation2, + css::uno::Reference< t3 > * pContinuation3) { for (sal_Int32 i = 0; i < rContinuations.getLength(); ++i) { @@ -85,14 +80,12 @@ void getContinuations( template< class t1, class t2, class t3, class t4 > void getContinuations( - com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionContinuation > > const & - rContinuations, - com::sun::star::uno::Reference< t1 > * pContinuation1, - com::sun::star::uno::Reference< t2 > * pContinuation2, - com::sun::star::uno::Reference< t3 > * pContinuation3, - com::sun::star::uno::Reference< t4 > * pContinuation4) + css::uno::Sequence< + css::uno::Reference< css::task::XInteractionContinuation > > const & rContinuations, + css::uno::Reference< t1 > * pContinuation1, + css::uno::Reference< t2 > * pContinuation2, + css::uno::Reference< t3 > * pContinuation3, + css::uno::Reference< t4 > * pContinuation4) { for (sal_Int32 i = 0; i < rContinuations.getLength(); ++i) { diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 3652d79f80cc..19e63efabcf1 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -302,7 +302,7 @@ namespace static bool lcl_matchesRequest( const Any& i_rRequest, const OUString& i_rTypeName, const OUString& i_rPropagation ) { - const ::com::sun::star::uno::TypeDescription aTypeDesc( i_rTypeName ); + const css::uno::TypeDescription aTypeDesc( i_rTypeName ); const typelib_TypeDescription* pTypeDesc = aTypeDesc.get(); if ( !pTypeDesc || !pTypeDesc->pWeakRef ) { @@ -315,7 +315,7 @@ namespace #endif return false; } - const ::com::sun::star::uno::Type aType( pTypeDesc->pWeakRef ); + const css::uno::Type aType( pTypeDesc->pWeakRef ); const bool bExactMatch = i_rPropagation == "named-only"; if ( bExactMatch ) diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx index ffd4060d165e..7aade5b4080b 100644 --- a/uui/source/iahndl.hxx +++ b/uui/source/iahndl.hxx @@ -80,150 +80,128 @@ typedef std::unordered_map< OUString, OUString, OUStringHash > StringHashMap; class UUIInteractionHelper { private: - mutable osl::Mutex m_aPropertyMutex; - ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext; - ::com::sun::star::uno::Reference< com::sun::star::awt::XWindow > m_xWindowParam; - const OUString m_aContextParam; - StringHashMap m_aTypedCustomHandlers; + mutable osl::Mutex m_aPropertyMutex; + css::uno::Reference< css::uno::XComponentContext > m_xContext; + css::uno::Reference< css::awt::XWindow > m_xWindowParam; + const OUString m_aContextParam; + StringHashMap m_aTypedCustomHandlers; UUIInteractionHelper(UUIInteractionHelper &) = delete; void operator =(const UUIInteractionHelper&) = delete; public: UUIInteractionHelper( - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > const & rxContext, - com::sun::star::uno::Reference< - com::sun::star::awt::XWindow > const & rxWindow, + css::uno::Reference< css::uno::XComponentContext > const & rxContext, + css::uno::Reference< css::awt::XWindow > const & rxWindow, const OUString & rContextParam); explicit UUIInteractionHelper( - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > const & rxContext); + css::uno::Reference< css::uno::XComponentContext > const & rxContext); ~UUIInteractionHelper(); - bool - handleRequest( - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest); + bool handleRequest( css::uno::Reference< css::task::XInteractionRequest > const & rRequest); - com::sun::star::beans::Optional< OUString > + css::beans::Optional< OUString > getStringFromRequest( - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest); + css::uno::Reference< css::task::XInteractionRequest > const & rRequest); // Helper. static OUString replaceMessageWithArguments( - const OUString& aMessage, + const OUString& aMessage, std::vector< OUString > const & rArguments ); - ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > getORB() const { return m_xContext; } private: bool handleRequest_impl( - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest, + css::uno::Reference< css::task::XInteractionRequest > const & rRequest, bool bObtainErrorStringOnly, bool & bHasErrorString, OUString & rErrorString); static void handlerequest(void* pHandleData, void* pInteractionHandler); - com::sun::star::beans::Optional< OUString > + css::beans::Optional< OUString > getStringFromRequest_impl( - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest); + css::uno::Reference< css::task::XInteractionRequest > const & rRequest); static void getstringfromrequest(void* pHandleData, void* pInteractionHandler); vcl::Window * getParentProperty(); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> + css::uno::Reference< css::awt::XWindow> getParentXWindow() const; OUString getContextProperty(); - com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler2 > + css::uno::Reference< css::task::XInteractionHandler2 > getInteractionHandler(); bool handleTypedHandlerImplementations( - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest > const & rRequest + css::uno::Reference< css::task::XInteractionRequest > const & rRequest ); bool tryOtherInteractionHandler( - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest); + css::uno::Reference< css::task::XInteractionRequest > const & rRequest); void getInteractionHandlerList(InteractionHandlerDataList &rdataList); static bool isInformationalErrorMessageRequest( - com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionContinuation > > const & - rContinuations); + css::uno::Sequence< + css::uno::Reference< css::task::XInteractionContinuation > > const & rContinuations); bool handleInteractiveIOException( - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest, + css::uno::Reference< css::task::XInteractionRequest > const & rRequest, bool bObtainErrorStringOnly, bool & bHasErrorString, OUString & rErrorString); bool handleAuthenticationRequest( - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest); + css::uno::Reference< css::task::XInteractionRequest > const & rRequest); bool handleCertificateValidationRequest( - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest); + css::uno::Reference< css::task::XInteractionRequest > const & rRequest); void handleNameClashResolveRequest( - com::sun::star::ucb::NameClashResolveRequest const & rRequest, - com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionContinuation > > const & - rContinuations); + css::ucb::NameClashResolveRequest const & rRequest, + css::uno::Sequence< + css::uno::Reference< css::task::XInteractionContinuation > > const & rContinuations); bool handleMasterPasswordRequest( - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest); + css::uno::Reference< css::task::XInteractionRequest > const & rRequest); bool handlePasswordRequest( - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest); + css::uno::Reference< css::task::XInteractionRequest > const & rRequest); bool handleNoSuchFilterRequest( - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest); + css::uno::Reference< css::task::XInteractionRequest > const & rRequest); bool handleFilterOptionsRequest( - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest); + css::uno::Reference< + css::task::XInteractionRequest > const & rRequest); void handleErrorHandlerRequest( - com::sun::star::task::InteractionClassification eClassification, + css::task::InteractionClassification eClassification, ErrCode nErrorCode, std::vector< OUString > const & rArguments, - com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionContinuation > > const & - rContinuations, + css::uno::Sequence< + css::uno::Reference< css::task::XInteractionContinuation > > const & rContinuations, bool bObtainErrorStringOnly, bool & bHasErrorString, OUString & rErrorString); @@ -231,10 +209,8 @@ private: void handleGenericErrorRequest( sal_Int32 nErrorCode, - com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionContinuation > > const & - rContinuations, + css::uno::Sequence< + css::uno::Reference< css::task::XInteractionContinuation > > const & rContinuations, bool bObtainErrorStringOnly, bool & bHasErrorString, OUString & rErrorString); @@ -242,42 +218,33 @@ private: void handleMacroConfirmRequest( const OUString& aDocumentURL, - const ::com::sun::star::uno::Reference< - ::com::sun::star::embed::XStorage >& xZipStorage, + const css::uno::Reference< css::embed::XStorage >& xZipStorage, const OUString& aDocumentVersion, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::security::DocumentSignatureInformation >& - aSignInfo, - com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionContinuation > > const & - rContinuations); + const css::uno::Sequence< css::security::DocumentSignatureInformation >& aSignInfo, + css::uno::Sequence< + css::uno::Reference< css::task::XInteractionContinuation > > const & rContinuations); void handleBrokenPackageRequest( std::vector< OUString > const & rArguments, - ::com::sun::star::uno::Sequence< - ::com::sun::star::uno::Reference< - ::com::sun::star::task::XInteractionContinuation > > const & - rContinuations, + css::uno::Sequence< + css::uno::Reference< css::task::XInteractionContinuation > > const & rContinuations, bool bObtainErrorStringOnly, bool & bHasErrorString, OUString & rErrorString); bool handleLockedDocumentRequest( - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest); + css::uno::Reference< css::task::XInteractionRequest > const & rRequest); bool handleChangedByOthersRequest( - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest); + css::uno::Reference< + css::task::XInteractionRequest > const & rRequest); bool handleLockFileIgnoreRequest( - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & rRequest); + css::uno::Reference< css::task::XInteractionRequest > const & rRequest); bool handleCustomRequest( - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& i_rRequest, + const css::uno::Reference< css::task::XInteractionRequest >& i_rRequest, const OUString& i_rServiceName ) const; diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx index dbd270168060..56b60889090c 100644 --- a/uui/source/interactionhandler.cxx +++ b/uui/source/interactionhandler.cxx @@ -35,53 +35,46 @@ using namespace com::sun::star; namespace { class UUIInteractionHandler: - public cppu::WeakImplHelper< com::sun::star::lang::XServiceInfo, - com::sun::star::lang::XInitialization, - com::sun::star::task::XInteractionHandler2 >, + public cppu::WeakImplHelper< css::lang::XServiceInfo, + css::lang::XInitialization, + css::task::XInteractionHandler2 >, private boost::noncopyable { private: UUIInteractionHelper * m_pImpl; public: - explicit UUIInteractionHandler(com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > - const & rxContext); + explicit UUIInteractionHandler(css::uno::Reference< css::uno::XComponentContext > const & rxContext); virtual ~UUIInteractionHandler(); virtual OUString SAL_CALL getImplementationName() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(OUString const & - rServiceName) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName) + throw (css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL initialize( - com::sun::star::uno::Sequence< com::sun::star::uno::Any > const & - rArguments) - throw (com::sun::star::uno::Exception, std::exception) override; + css::uno::Sequence< css::uno::Any > const & rArguments) + throw (css::uno::Exception, std::exception) override; virtual void SAL_CALL - handle(com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest > const & - rRequest) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + handle(css::uno::Reference< css::task::XInteractionRequest > const & rRequest) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL handleInteractionRequest( - const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& _Request - ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::task::XInteractionRequest >& _Request + ) throw ( css::uno::RuntimeException, std::exception ) override; }; UUIInteractionHandler::UUIInteractionHandler( - uno::Reference< uno::XComponentContext > const & - rxContext) + uno::Reference< uno::XComponentContext > const & rxContext) : m_pImpl(new UUIInteractionHelper(rxContext)) { } diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx index b45f588552a0..5b580945534b 100644 --- a/uui/source/masterpassworddlg.cxx +++ b/uui/source/masterpassworddlg.cxx @@ -35,8 +35,8 @@ IMPL_LINK_NOARG_TYPED(MasterPasswordDialog, OKHdl_Impl, Button*, void) MasterPasswordDialog::MasterPasswordDialog ( - vcl::Window* pParent, - ::com::sun::star::task::PasswordRequestMode aDialogMode, + vcl::Window* pParent, + css::task::PasswordRequestMode aDialogMode, ResMgr* pResMgr ) : ModalDialog(pParent, "MasterPasswordDialog", "uui/ui/masterpassworddlg.ui") @@ -45,7 +45,7 @@ MasterPasswordDialog::MasterPasswordDialog { get(m_pEDMasterPassword, "password"); get(m_pOKBtn, "ok"); - if( nDialogMode == ::com::sun::star::task::PasswordRequestMode_PASSWORD_REENTER ) + if( nDialogMode == css::task::PasswordRequestMode_PASSWORD_REENTER ) { OUString aErrorMsg( ResId( STR_ERROR_MASTERPASSWORD_WRONG, *pResourceMgr )); ScopedVclPtrInstance< MessageDialog > aErrorBox(pParent, aErrorMsg); diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx index ccc1d602def2..bff1996c1ed0 100644 --- a/uui/source/masterpassworddlg.hxx +++ b/uui/source/masterpassworddlg.hxx @@ -36,15 +36,15 @@ class MasterPasswordDialog : public ModalDialog DECL_LINK_TYPED(OKHdl_Impl, Button*, void); public: - MasterPasswordDialog( vcl::Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr ); + MasterPasswordDialog( vcl::Window* pParent, css::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr ); virtual ~MasterPasswordDialog(); virtual void dispose() override; OUString GetMasterPassword() const { return m_pEDMasterPassword->GetText(); } private: - ::com::sun::star::task::PasswordRequestMode nDialogMode; - ResMgr* pResourceMgr; + css::task::PasswordRequestMode nDialogMode; + ResMgr* pResourceMgr; }; #endif // INCLUDED_UUI_SOURCE_MASTERPASSWORDDLG_HXX diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx index 8ddd3e0ab5ed..a638a9e7a890 100644 --- a/uui/source/passwordcontainer.hxx +++ b/uui/source/passwordcontainer.hxx @@ -48,9 +48,7 @@ class PasswordContainerHelper { public: explicit PasswordContainerHelper( - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > const & - xContext ); + css::uno::Reference< css::uno::XComponentContext > const & xContext ); @@ -84,13 +82,10 @@ public: False, otherwise. */ bool handleAuthenticationRequest( - com::sun::star::ucb::AuthenticationRequest const & rRequest, - com::sun::star::uno::Reference< - com::sun::star::ucb::XInteractionSupplyAuthentication > const & - xSupplyAuthentication, + css::ucb::AuthenticationRequest const & rRequest, + css::uno::Reference< css::ucb::XInteractionSupplyAuthentication > const & xSupplyAuthentication, OUString const & rURL, - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionHandler2 > const & xIH ); + css::uno::Reference< css::task::XInteractionHandler2 > const & xIH ); /** This member function adds credentials for the given URL to the password container. @@ -121,69 +116,59 @@ public: */ bool addRecord( OUString const & rURL, OUString const & rUsername, - com::sun::star::uno::Sequence< OUString > const & - rPasswords, - com::sun::star::uno::Reference< - com::sun::star::task::XInteractionHandler2 > const & xIH, + css::uno::Sequence< OUString > const & rPasswords, + css::uno::Reference< css::task::XInteractionHandler2 > const & xIH, bool bPersist ); private: - com::sun::star::uno::Reference< - com::sun::star::task::XPasswordContainer2 > m_xPasswordContainer; + css::uno::Reference< css::task::XPasswordContainer2 > m_xPasswordContainer; }; class PasswordContainerInteractionHandler : - public cppu::WeakImplHelper< com::sun::star::lang::XServiceInfo, - com::sun::star::task::XInteractionHandler2 > + public cppu::WeakImplHelper< css::lang::XServiceInfo, + css::task::XInteractionHandler2 > { public: explicit PasswordContainerInteractionHandler( - const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& xContext ); + const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~PasswordContainerInteractionHandler(); // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + throw ( css::uno::RuntimeException, std::exception ) override; // XInteractionHandler2 virtual void SAL_CALL - handle( const ::com::sun::star::uno::Reference< - ::com::sun::star::task::XInteractionRequest >& Request ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + handle( const css::uno::Reference< css::task::XInteractionRequest >& Request ) + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL - handleInteractionRequest( const ::com::sun::star::uno::Reference< - ::com::sun::star::task::XInteractionRequest >& Request ) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& Request ) + throw (css::uno::RuntimeException, std::exception) override; // Non-UNO interfaces static OUString getImplementationName_Static(); - static com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static com::sun::star::uno::Reference< - com::sun::star::lang::XSingleServiceFactory > - createServiceFactory( const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > & rxServiceMgr ); + static css::uno::Reference< css::lang::XSingleServiceFactory > + createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory > & rxServiceMgr ); private: - //com::sun::star::uno::Reference< - // com::sun::star::lang::XMultiServiceFactory > m_xSMgr; PasswordContainerHelper m_aPwContainerHelper; }; diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx index ffc99a5e64e6..6dfaed4fec8e 100644 --- a/uui/source/passworddlg.hxx +++ b/uui/source/passworddlg.hxx @@ -44,7 +44,7 @@ class PasswordDialog : public ModalDialog DECL_LINK_TYPED(OKHdl_Impl, Button*, void); public: - PasswordDialog( vcl::Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, const OUString& aDocURL, + PasswordDialog( vcl::Window* pParent, css::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, const OUString& aDocURL, bool bOpenToModify = false, bool bIsSimplePasswordRequest = false ); virtual ~PasswordDialog(); virtual void dispose() override; @@ -53,8 +53,8 @@ public: OUString GetPassword() const { return m_pEDPassword->GetText(); } private: - ::com::sun::star::task::PasswordRequestMode nDialogMode; - ResMgr* pResourceMgr; + css::task::PasswordRequestMode nDialogMode; + ResMgr* pResourceMgr; }; #endif // INCLUDED_UUI_SOURCE_PASSWORDDLG_HXX diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx index 8d7c21e12a2a..77d25e816d36 100644 --- a/uui/source/requeststringresolver.hxx +++ b/uui/source/requeststringresolver.hxx @@ -31,20 +31,19 @@ class UUIInteractionHelper; class UUIInteractionRequestStringResolver: public cppu::WeakImplHelper< - com::sun::star::lang::XServiceInfo, - com::sun::star::task::XInteractionRequestStringResolver > + css::lang::XServiceInfo, + css::task::XInteractionRequestStringResolver > { public: static char const m_aImplementationName[]; - static com::sun::star::uno::Sequence< OUString > + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); - static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > + static css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( - com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > const & + css::uno::Reference< css::lang::XMultiServiceFactory > const & rServiceFactory); private: @@ -54,28 +53,25 @@ private: void operator =(UUIInteractionRequestStringResolver&) = delete; explicit UUIInteractionRequestStringResolver( - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > - const & rxContext); + css::uno::Reference< css::uno::XComponentContext > const & rxContext); virtual ~UUIInteractionRequestStringResolver(); virtual OUString SAL_CALL getImplementationName() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::beans::Optional< OUString > SAL_CALL + virtual css::beans::Optional< OUString > SAL_CALL getStringFromInformationalRequest( - const com::sun::star::uno::Reference< - com::sun::star::task::XInteractionRequest >& Request ) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::task::XInteractionRequest >& Request ) + throw (css::uno::RuntimeException, std::exception) override; }; #endif // INCLUDED_UUI_SOURCE_REQUESTSTRINGRESOLVER_HXX |