Kaydet (Commit) 319c9b90 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin

com::sun::star->css in uui/

Change-Id: I1be458bd5f22014f4720583ff87cf8aad4a07dc8
Reviewed-on: https://gerrit.libreoffice.org/20021Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 7f5c8793
...@@ -165,7 +165,7 @@ bool FilterDialog::AskForFilter( FilterNameListPtr& pSelectedItem ) ...@@ -165,7 +165,7 @@ bool FilterDialog::AskForFilter( FilterNameListPtr& pSelectedItem )
@seealso method InetURLObject::getAbbreviated() @seealso method InetURLObject::getAbbreviated()
@threadsafe no @threadsafe no
*//*-*************************************************************************************************************/ *//*-*************************************************************************************************************/
class StringCalculator : public ::cppu::WeakImplHelper< ::com::sun::star::util::XStringWidth > class StringCalculator : public ::cppu::WeakImplHelper< css::util::XStringWidth >
{ {
public: public:
explicit StringCalculator( const OutputDevice* pDevice ) explicit StringCalculator( const OutputDevice* pDevice )
...@@ -173,7 +173,7 @@ class StringCalculator : public ::cppu::WeakImplHelper< ::com::sun::star::util:: ...@@ -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)); return (sal_Int32)(m_pDevice->GetTextWidth(sString));
} }
...@@ -207,7 +207,7 @@ OUString FilterDialog::impl_buildUIFileName( const OUString& sName ) ...@@ -207,7 +207,7 @@ OUString FilterDialog::impl_buildUIFileName( const OUString& sName )
else else
{ {
// otherwise its really a url ... build short name by using INetURLObject // 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() ) if( xStringCalculator.is() )
{ {
INetURLObject aBuilder ( sName ); INetURLObject aBuilder ( sName );
......
...@@ -31,13 +31,12 @@ namespace com { namespace sun { namespace star { ...@@ -31,13 +31,12 @@ namespace com { namespace sun { namespace star {
template< class t1 > template< class t1 >
bool setContinuation( bool setContinuation(
com::sun::star::uno::Reference< css::uno::Reference< css::task::XInteractionContinuation > const & rContinuation,
com::sun::star::task::XInteractionContinuation > const & rContinuation, css::uno::Reference< t1 > * pContinuation)
com::sun::star::uno::Reference< t1 > * pContinuation)
{ {
if (pContinuation && !pContinuation->is()) if (pContinuation && !pContinuation->is())
{ {
pContinuation->set(rContinuation, com::sun::star::uno::UNO_QUERY); pContinuation->set(rContinuation, css::uno::UNO_QUERY);
if (pContinuation->is()) if (pContinuation->is())
return true; return true;
} }
...@@ -46,12 +45,10 @@ bool setContinuation( ...@@ -46,12 +45,10 @@ bool setContinuation(
template< class t1, class t2 > template< class t1, class t2 >
void getContinuations( void getContinuations(
com::sun::star::uno::Sequence< css::uno::Sequence<
com::sun::star::uno::Reference< css::uno::Reference< css::task::XInteractionContinuation > > const & rContinuations,
com::sun::star::task::XInteractionContinuation > > const & css::uno::Reference< t1 > * pContinuation1,
rContinuations, css::uno::Reference< t2 > * pContinuation2)
com::sun::star::uno::Reference< t1 > * pContinuation1,
com::sun::star::uno::Reference< t2 > * pContinuation2)
{ {
for (sal_Int32 i = 0; i < rContinuations.getLength(); ++i) for (sal_Int32 i = 0; i < rContinuations.getLength(); ++i)
{ {
...@@ -64,13 +61,11 @@ void getContinuations( ...@@ -64,13 +61,11 @@ void getContinuations(
template< class t1, class t2, class t3 > template< class t1, class t2, class t3 >
void getContinuations( void getContinuations(
com::sun::star::uno::Sequence< css::uno::Sequence<
com::sun::star::uno::Reference< css::uno::Reference< css::task::XInteractionContinuation > > const & rContinuations,
com::sun::star::task::XInteractionContinuation > > const & css::uno::Reference< t1 > * pContinuation1,
rContinuations, css::uno::Reference< t2 > * pContinuation2,
com::sun::star::uno::Reference< t1 > * pContinuation1, css::uno::Reference< t3 > * pContinuation3)
com::sun::star::uno::Reference< t2 > * pContinuation2,
com::sun::star::uno::Reference< t3 > * pContinuation3)
{ {
for (sal_Int32 i = 0; i < rContinuations.getLength(); ++i) for (sal_Int32 i = 0; i < rContinuations.getLength(); ++i)
{ {
...@@ -85,14 +80,12 @@ void getContinuations( ...@@ -85,14 +80,12 @@ void getContinuations(
template< class t1, class t2, class t3, class t4 > template< class t1, class t2, class t3, class t4 >
void getContinuations( void getContinuations(
com::sun::star::uno::Sequence< css::uno::Sequence<
com::sun::star::uno::Reference< css::uno::Reference< css::task::XInteractionContinuation > > const & rContinuations,
com::sun::star::task::XInteractionContinuation > > const & css::uno::Reference< t1 > * pContinuation1,
rContinuations, css::uno::Reference< t2 > * pContinuation2,
com::sun::star::uno::Reference< t1 > * pContinuation1, css::uno::Reference< t3 > * pContinuation3,
com::sun::star::uno::Reference< t2 > * pContinuation2, css::uno::Reference< t4 > * pContinuation4)
com::sun::star::uno::Reference< t3 > * pContinuation3,
com::sun::star::uno::Reference< t4 > * pContinuation4)
{ {
for (sal_Int32 i = 0; i < rContinuations.getLength(); ++i) for (sal_Int32 i = 0; i < rContinuations.getLength(); ++i)
{ {
......
...@@ -302,7 +302,7 @@ namespace ...@@ -302,7 +302,7 @@ namespace
static bool lcl_matchesRequest( const Any& i_rRequest, const OUString& i_rTypeName, const OUString& i_rPropagation ) 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(); const typelib_TypeDescription* pTypeDesc = aTypeDesc.get();
if ( !pTypeDesc || !pTypeDesc->pWeakRef ) if ( !pTypeDesc || !pTypeDesc->pWeakRef )
{ {
...@@ -315,7 +315,7 @@ namespace ...@@ -315,7 +315,7 @@ namespace
#endif #endif
return false; 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"; const bool bExactMatch = i_rPropagation == "named-only";
if ( bExactMatch ) if ( bExactMatch )
......
This diff is collapsed.
...@@ -35,53 +35,46 @@ using namespace com::sun::star; ...@@ -35,53 +35,46 @@ using namespace com::sun::star;
namespace { namespace {
class UUIInteractionHandler: class UUIInteractionHandler:
public cppu::WeakImplHelper< com::sun::star::lang::XServiceInfo, public cppu::WeakImplHelper< css::lang::XServiceInfo,
com::sun::star::lang::XInitialization, css::lang::XInitialization,
com::sun::star::task::XInteractionHandler2 >, css::task::XInteractionHandler2 >,
private boost::noncopyable private boost::noncopyable
{ {
private: private:
UUIInteractionHelper * m_pImpl; UUIInteractionHelper * m_pImpl;
public: public:
explicit UUIInteractionHandler(com::sun::star::uno::Reference< explicit UUIInteractionHandler(css::uno::Reference< css::uno::XComponentContext > const & rxContext);
com::sun::star::uno::XComponentContext >
const & rxContext);
virtual ~UUIInteractionHandler(); virtual ~UUIInteractionHandler();
virtual OUString SAL_CALL getImplementationName() 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 & virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName)
rServiceName) throw (css::uno::RuntimeException, std::exception) override;
throw (com::sun::star::uno::RuntimeException, std::exception) override;
virtual com::sun::star::uno::Sequence< OUString > SAL_CALL virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() getSupportedServiceNames()
throw (com::sun::star::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL virtual void SAL_CALL
initialize( initialize(
com::sun::star::uno::Sequence< com::sun::star::uno::Any > const & css::uno::Sequence< css::uno::Any > const & rArguments)
rArguments) throw (css::uno::Exception, std::exception) override;
throw (com::sun::star::uno::Exception, std::exception) override;
virtual void SAL_CALL virtual void SAL_CALL
handle(com::sun::star::uno::Reference< handle(css::uno::Reference< css::task::XInteractionRequest > const & rRequest)
com::sun::star::task::XInteractionRequest > const & throw (css::uno::RuntimeException, std::exception) override;
rRequest)
throw (com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL virtual sal_Bool SAL_CALL
handleInteractionRequest( handleInteractionRequest(
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& _Request const css::uno::Reference< css::task::XInteractionRequest >& _Request
) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; ) throw ( css::uno::RuntimeException, std::exception ) override;
}; };
UUIInteractionHandler::UUIInteractionHandler( UUIInteractionHandler::UUIInteractionHandler(
uno::Reference< uno::XComponentContext > const & uno::Reference< uno::XComponentContext > const & rxContext)
rxContext)
: m_pImpl(new UUIInteractionHelper(rxContext)) : m_pImpl(new UUIInteractionHelper(rxContext))
{ {
} }
......
...@@ -35,8 +35,8 @@ IMPL_LINK_NOARG_TYPED(MasterPasswordDialog, OKHdl_Impl, Button*, void) ...@@ -35,8 +35,8 @@ IMPL_LINK_NOARG_TYPED(MasterPasswordDialog, OKHdl_Impl, Button*, void)
MasterPasswordDialog::MasterPasswordDialog MasterPasswordDialog::MasterPasswordDialog
( (
vcl::Window* pParent, vcl::Window* pParent,
::com::sun::star::task::PasswordRequestMode aDialogMode, css::task::PasswordRequestMode aDialogMode,
ResMgr* pResMgr ResMgr* pResMgr
) )
: ModalDialog(pParent, "MasterPasswordDialog", "uui/ui/masterpassworddlg.ui") : ModalDialog(pParent, "MasterPasswordDialog", "uui/ui/masterpassworddlg.ui")
...@@ -45,7 +45,7 @@ MasterPasswordDialog::MasterPasswordDialog ...@@ -45,7 +45,7 @@ MasterPasswordDialog::MasterPasswordDialog
{ {
get(m_pEDMasterPassword, "password"); get(m_pEDMasterPassword, "password");
get(m_pOKBtn, "ok"); 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 )); OUString aErrorMsg( ResId( STR_ERROR_MASTERPASSWORD_WRONG, *pResourceMgr ));
ScopedVclPtrInstance< MessageDialog > aErrorBox(pParent, aErrorMsg); ScopedVclPtrInstance< MessageDialog > aErrorBox(pParent, aErrorMsg);
......
...@@ -36,15 +36,15 @@ class MasterPasswordDialog : public ModalDialog ...@@ -36,15 +36,15 @@ class MasterPasswordDialog : public ModalDialog
DECL_LINK_TYPED(OKHdl_Impl, Button*, void); DECL_LINK_TYPED(OKHdl_Impl, Button*, void);
public: 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 ~MasterPasswordDialog();
virtual void dispose() override; virtual void dispose() override;
OUString GetMasterPassword() const { return m_pEDMasterPassword->GetText(); } OUString GetMasterPassword() const { return m_pEDMasterPassword->GetText(); }
private: private:
::com::sun::star::task::PasswordRequestMode nDialogMode; css::task::PasswordRequestMode nDialogMode;
ResMgr* pResourceMgr; ResMgr* pResourceMgr;
}; };
#endif // INCLUDED_UUI_SOURCE_MASTERPASSWORDDLG_HXX #endif // INCLUDED_UUI_SOURCE_MASTERPASSWORDDLG_HXX
......
...@@ -48,9 +48,7 @@ class PasswordContainerHelper ...@@ -48,9 +48,7 @@ class PasswordContainerHelper
{ {
public: public:
explicit PasswordContainerHelper( explicit PasswordContainerHelper(
com::sun::star::uno::Reference< css::uno::Reference< css::uno::XComponentContext > const & xContext );
com::sun::star::uno::XComponentContext > const &
xContext );
...@@ -84,13 +82,10 @@ public: ...@@ -84,13 +82,10 @@ public:
False, otherwise. False, otherwise.
*/ */
bool handleAuthenticationRequest( bool handleAuthenticationRequest(
com::sun::star::ucb::AuthenticationRequest const & rRequest, css::ucb::AuthenticationRequest const & rRequest,
com::sun::star::uno::Reference< css::uno::Reference< css::ucb::XInteractionSupplyAuthentication > const & xSupplyAuthentication,
com::sun::star::ucb::XInteractionSupplyAuthentication > const &
xSupplyAuthentication,
OUString const & rURL, OUString const & rURL,
com::sun::star::uno::Reference< css::uno::Reference< css::task::XInteractionHandler2 > const & xIH );
com::sun::star::task::XInteractionHandler2 > const & xIH );
/** This member function adds credentials for the given URL to the password /** This member function adds credentials for the given URL to the password
container. container.
...@@ -121,69 +116,59 @@ public: ...@@ -121,69 +116,59 @@ public:
*/ */
bool addRecord( OUString const & rURL, bool addRecord( OUString const & rURL,
OUString const & rUsername, OUString const & rUsername,
com::sun::star::uno::Sequence< OUString > const & css::uno::Sequence< OUString > const & rPasswords,
rPasswords, css::uno::Reference< css::task::XInteractionHandler2 > const & xIH,
com::sun::star::uno::Reference<
com::sun::star::task::XInteractionHandler2 > const & xIH,
bool bPersist ); bool bPersist );
private: private:
com::sun::star::uno::Reference< css::uno::Reference< css::task::XPasswordContainer2 > m_xPasswordContainer;
com::sun::star::task::XPasswordContainer2 > m_xPasswordContainer;
}; };
class PasswordContainerInteractionHandler : class PasswordContainerInteractionHandler :
public cppu::WeakImplHelper< com::sun::star::lang::XServiceInfo, public cppu::WeakImplHelper< css::lang::XServiceInfo,
com::sun::star::task::XInteractionHandler2 > css::task::XInteractionHandler2 >
{ {
public: public:
explicit PasswordContainerInteractionHandler( explicit PasswordContainerInteractionHandler(
const com::sun::star::uno::Reference< const css::uno::Reference< css::uno::XComponentContext >& xContext );
com::sun::star::uno::XComponentContext >& xContext );
virtual ~PasswordContainerInteractionHandler(); virtual ~PasswordContainerInteractionHandler();
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName() 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 virtual sal_Bool SAL_CALL
supportsService( const OUString& ServiceName ) 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() getSupportedServiceNames()
throw ( com::sun::star::uno::RuntimeException, std::exception ) override; throw ( css::uno::RuntimeException, std::exception ) override;
// XInteractionHandler2 // XInteractionHandler2
virtual void SAL_CALL virtual void SAL_CALL
handle( const ::com::sun::star::uno::Reference< handle( const css::uno::Reference< css::task::XInteractionRequest >& Request )
::com::sun::star::task::XInteractionRequest >& Request ) throw (css::uno::RuntimeException, std::exception) override;
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL virtual sal_Bool SAL_CALL
handleInteractionRequest( const ::com::sun::star::uno::Reference< handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& Request )
::com::sun::star::task::XInteractionRequest >& Request ) throw (css::uno::RuntimeException, std::exception) override;
throw (::com::sun::star::uno::RuntimeException, std::exception) override;
// Non-UNO interfaces // Non-UNO interfaces
static OUString static OUString
getImplementationName_Static(); getImplementationName_Static();
static com::sun::star::uno::Sequence< OUString > static css::uno::Sequence< OUString >
getSupportedServiceNames_Static(); getSupportedServiceNames_Static();
static com::sun::star::uno::Reference< static css::uno::Reference< css::lang::XSingleServiceFactory >
com::sun::star::lang::XSingleServiceFactory > createServiceFactory( const css::uno::Reference< css::lang::XMultiServiceFactory > & rxServiceMgr );
createServiceFactory( const com::sun::star::uno::Reference<
com::sun::star::lang::XMultiServiceFactory > & rxServiceMgr );
private: private:
//com::sun::star::uno::Reference<
// com::sun::star::lang::XMultiServiceFactory > m_xSMgr;
PasswordContainerHelper m_aPwContainerHelper; PasswordContainerHelper m_aPwContainerHelper;
}; };
......
...@@ -44,7 +44,7 @@ class PasswordDialog : public ModalDialog ...@@ -44,7 +44,7 @@ class PasswordDialog : public ModalDialog
DECL_LINK_TYPED(OKHdl_Impl, Button*, void); DECL_LINK_TYPED(OKHdl_Impl, Button*, void);
public: 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 ); bool bOpenToModify = false, bool bIsSimplePasswordRequest = false );
virtual ~PasswordDialog(); virtual ~PasswordDialog();
virtual void dispose() override; virtual void dispose() override;
...@@ -53,8 +53,8 @@ public: ...@@ -53,8 +53,8 @@ public:
OUString GetPassword() const { return m_pEDPassword->GetText(); } OUString GetPassword() const { return m_pEDPassword->GetText(); }
private: private:
::com::sun::star::task::PasswordRequestMode nDialogMode; css::task::PasswordRequestMode nDialogMode;
ResMgr* pResourceMgr; ResMgr* pResourceMgr;
}; };
#endif // INCLUDED_UUI_SOURCE_PASSWORDDLG_HXX #endif // INCLUDED_UUI_SOURCE_PASSWORDDLG_HXX
......
...@@ -31,20 +31,19 @@ class UUIInteractionHelper; ...@@ -31,20 +31,19 @@ class UUIInteractionHelper;
class UUIInteractionRequestStringResolver: class UUIInteractionRequestStringResolver:
public cppu::WeakImplHelper< public cppu::WeakImplHelper<
com::sun::star::lang::XServiceInfo, css::lang::XServiceInfo,
com::sun::star::task::XInteractionRequestStringResolver > css::task::XInteractionRequestStringResolver >
{ {
public: public:
static char const m_aImplementationName[]; static char const m_aImplementationName[];
static com::sun::star::uno::Sequence< OUString > static css::uno::Sequence< OUString >
getSupportedServiceNames_static(); getSupportedServiceNames_static();
static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > static css::uno::Reference< css::uno::XInterface >
SAL_CALL SAL_CALL
createInstance( createInstance(
com::sun::star::uno::Reference< css::uno::Reference< css::lang::XMultiServiceFactory > const &
com::sun::star::lang::XMultiServiceFactory > const &
rServiceFactory); rServiceFactory);
private: private:
...@@ -54,28 +53,25 @@ private: ...@@ -54,28 +53,25 @@ private:
void operator =(UUIInteractionRequestStringResolver&) = delete; void operator =(UUIInteractionRequestStringResolver&) = delete;
explicit UUIInteractionRequestStringResolver( explicit UUIInteractionRequestStringResolver(
com::sun::star::uno::Reference< css::uno::Reference< css::uno::XComponentContext > const & rxContext);
com::sun::star::uno::XComponentContext >
const & rxContext);
virtual ~UUIInteractionRequestStringResolver(); virtual ~UUIInteractionRequestStringResolver();
virtual OUString SAL_CALL getImplementationName() 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 & virtual sal_Bool SAL_CALL supportsService(OUString const &
rServiceName) 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() 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( getStringFromInformationalRequest(
const com::sun::star::uno::Reference< const css::uno::Reference< css::task::XInteractionRequest >& Request )
com::sun::star::task::XInteractionRequest >& Request ) throw (css::uno::RuntimeException, std::exception) override;
throw (com::sun::star::uno::RuntimeException, std::exception) override;
}; };
#endif // INCLUDED_UUI_SOURCE_REQUESTSTRINGRESOLVER_HXX #endif // INCLUDED_UUI_SOURCE_REQUESTSTRINGRESOLVER_HXX
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment