Kaydet (Commit) 56c40322 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin

com::sun::star->css in shell

Change-Id: Id74a5e79764f37944afab4d2a0dcfc7dbfc9b295
Reviewed-on: https://gerrit.libreoffice.org/19663Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 2c472bcb
...@@ -30,8 +30,7 @@ namespace com { namespace sun { namespace star { namespace uno { ...@@ -30,8 +30,7 @@ namespace com { namespace sun { namespace star { namespace uno {
namespace kde4access { namespace kde4access {
com::sun::star::beans::Optional< com::sun::star::uno::Any > getValue( css::beans::Optional< css::uno::Any > getValue(OUString const & id);
OUString const & id);
} }
......
...@@ -31,8 +31,7 @@ namespace rtl { class OUString; } ...@@ -31,8 +31,7 @@ namespace rtl { class OUString; }
namespace kdeaccess { namespace kdeaccess {
com::sun::star::beans::Optional< com::sun::star::uno::Any > getValue( css::beans::Optional< css::uno::Any > getValue(OUString const & id);
OUString const & id);
} }
......
...@@ -126,21 +126,21 @@ class WinInetBackend : public ::cppu::WeakImplHelper < ...@@ -126,21 +126,21 @@ class WinInetBackend : public ::cppu::WeakImplHelper <
~WinInetBackend() ; ~WinInetBackend() ;
private: private:
com::sun::star::beans::Optional< com::sun::star::uno::Any > css::beans::Optional< css::uno::Any >
valueProxyType_; valueProxyType_;
com::sun::star::beans::Optional< com::sun::star::uno::Any > css::beans::Optional< css::uno::Any >
valueNoProxy_; valueNoProxy_;
com::sun::star::beans::Optional< com::sun::star::uno::Any > css::beans::Optional< css::uno::Any >
valueHttpProxyName_; valueHttpProxyName_;
com::sun::star::beans::Optional< com::sun::star::uno::Any > css::beans::Optional< css::uno::Any >
valueHttpProxyPort_; valueHttpProxyPort_;
com::sun::star::beans::Optional< com::sun::star::uno::Any > css::beans::Optional< css::uno::Any >
valueHttpsProxyName_; valueHttpsProxyName_;
com::sun::star::beans::Optional< com::sun::star::uno::Any > css::beans::Optional< css::uno::Any >
valueHttpsProxyPort_; valueHttpsProxyPort_;
com::sun::star::beans::Optional< com::sun::star::uno::Any > css::beans::Optional< css::uno::Any >
valueFtpProxyName_; valueFtpProxyName_;
com::sun::star::beans::Optional< com::sun::star::uno::Any > css::beans::Optional< css::uno::Any >
valueFtpProxyPort_; valueFtpProxyPort_;
} ; } ;
......
...@@ -158,7 +158,7 @@ Any SAL_CALL CmdMailMsg::getByName( const OUString& aName ) ...@@ -158,7 +158,7 @@ Any SAL_CALL CmdMailMsg::getByName( const OUString& aName )
} }
Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames( ) Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames( )
throw (::com::sun::star::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
MutexGuard aGuard( m_aMutex ); MutexGuard aGuard( m_aMutex );
......
...@@ -34,18 +34,18 @@ ...@@ -34,18 +34,18 @@
class CmdMailMsg : class CmdMailMsg :
public cppu::WeakImplHelper< public cppu::WeakImplHelper<
::com::sun::star::system::XSimpleMailMessage2, css::system::XSimpleMailMessage2,
::com::sun::star::container::XNameAccess > css::container::XNameAccess >
{ {
OUString m_aBody; OUString m_aBody;
OUString m_aRecipient; OUString m_aRecipient;
OUString m_aOriginator; OUString m_aOriginator;
OUString m_aSubject; OUString m_aSubject;
::com::sun::star::uno::Sequence< OUString > m_CcRecipients; css::uno::Sequence< OUString > m_CcRecipients;
::com::sun::star::uno::Sequence< OUString > m_BccRecipients; css::uno::Sequence< OUString > m_BccRecipients;
::com::sun::star::uno::Sequence< OUString > m_Attachments; css::uno::Sequence< OUString > m_Attachments;
::osl::Mutex m_aMutex; ::osl::Mutex m_aMutex;
public: public:
...@@ -56,69 +56,69 @@ public: ...@@ -56,69 +56,69 @@ public:
virtual void SAL_CALL setBody( const OUString& aBody ) virtual void SAL_CALL setBody( const OUString& aBody )
throw (::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getBody( ) virtual OUString SAL_CALL getBody( )
throw (::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setRecipient( const OUString& aRecipient ) virtual void SAL_CALL setRecipient( const OUString& aRecipient )
throw (::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getRecipient( ) virtual OUString SAL_CALL getRecipient( )
throw (::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setCcRecipient( const ::com::sun::star::uno::Sequence< OUString >& aCcRecipient ) virtual void SAL_CALL setCcRecipient( const css::uno::Sequence< OUString >& aCcRecipient )
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 getCcRecipient( ) virtual css::uno::Sequence< OUString > SAL_CALL getCcRecipient( )
throw (::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setBccRecipient( const ::com::sun::star::uno::Sequence< OUString >& aBccRecipient ) virtual void SAL_CALL setBccRecipient( const css::uno::Sequence< OUString >& aBccRecipient )
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 getBccRecipient( ) virtual css::uno::Sequence< OUString > SAL_CALL getBccRecipient( )
throw (::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setOriginator( const OUString& aOriginator ) virtual void SAL_CALL setOriginator( const OUString& aOriginator )
throw (::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getOriginator( ) virtual OUString SAL_CALL getOriginator( )
throw (::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setSubject( const OUString& aSubject ) virtual void SAL_CALL setSubject( const OUString& aSubject )
throw (::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL getSubject( ) virtual OUString SAL_CALL getSubject( )
throw (::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL setAttachement( const ::com::sun::star::uno::Sequence< OUString >& aAttachement ) virtual void SAL_CALL setAttachement( const css::uno::Sequence< OUString >& aAttachement )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAttachement( ) virtual css::uno::Sequence< OUString > SAL_CALL getAttachement( )
throw (::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
// XNameAccess // XNameAccess
virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( )
throw (::com::sun::star::uno::RuntimeException, std::exception) override ; throw (css::uno::RuntimeException, std::exception) override ;
virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
throw (::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
// XElementAccess // XElementAccess
virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) virtual css::uno::Type SAL_CALL getElementType( )
throw (::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL hasElements( ) virtual sal_Bool SAL_CALL hasElements( )
throw (::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
}; };
......
...@@ -94,7 +94,7 @@ Reference< XSimpleMailClient > SAL_CALL CmdMailSuppl::querySimpleMailClient( ) ...@@ -94,7 +94,7 @@ Reference< XSimpleMailClient > SAL_CALL CmdMailSuppl::querySimpleMailClient( )
Reference< XSimpleMailMessage > SAL_CALL CmdMailSuppl::createSimpleMailMessage( ) Reference< XSimpleMailMessage > SAL_CALL CmdMailSuppl::createSimpleMailMessage( )
throw (::com::sun::star::uno::RuntimeException, std::exception) throw (css::uno::RuntimeException, std::exception)
{ {
return Reference< XSimpleMailMessage >( new CmdMailMsg( ) ); return Reference< XSimpleMailMessage >( new CmdMailMsg( ) );
} }
...@@ -149,13 +149,13 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM ...@@ -149,13 +149,13 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
{ {
if ( ! xSimpleMailMessage.is() ) if ( ! xSimpleMailMessage.is() )
{ {
throw ::com::sun::star::lang::IllegalArgumentException( "No message specified" , throw css::lang::IllegalArgumentException( "No message specified" ,
static_cast < XSimpleMailClient * > (this), 1 ); static_cast < XSimpleMailClient * > (this), 1 );
} }
if( ! m_xConfigurationProvider.is() ) if( ! m_xConfigurationProvider.is() )
{ {
throw ::com::sun::star::uno::Exception( "Can not access configuration" , throw css::uno::Exception( "Can not access configuration" ,
static_cast < XSimpleMailClient * > (this) ); static_cast < XSimpleMailClient * > (this) );
} }
...@@ -166,7 +166,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM ...@@ -166,7 +166,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
OUString aProgram; OUString aProgram;
if ( FileBase::E_None != FileBase::getSystemPathFromFileURL(aProgramURL, aProgram)) if ( FileBase::E_None != FileBase::getSystemPathFromFileURL(aProgramURL, aProgram))
{ {
throw ::com::sun::star::uno::Exception("Cound not convert executable path", throw css::uno::Exception("Cound not convert executable path",
static_cast < XSimpleMailClient * > (this)); static_cast < XSimpleMailClient * > (this));
} }
...@@ -298,7 +298,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM ...@@ -298,7 +298,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
FILE * f = popen(cmd.getStr(), "w"); FILE * f = popen(cmd.getStr(), "w");
if (f == 0 || pclose(f) != 0) if (f == 0 || pclose(f) != 0)
{ {
throw ::com::sun::star::uno::Exception("No mail client configured", throw css::uno::Exception("No mail client configured",
static_cast < XSimpleMailClient * > (this) ); static_cast < XSimpleMailClient * > (this) );
} }
} }
......
...@@ -36,45 +36,45 @@ ...@@ -36,45 +36,45 @@
class CmdMailSuppl : class CmdMailSuppl :
public cppu::WeakImplHelper< public cppu::WeakImplHelper<
com::sun::star::system::XSimpleMailClientSupplier, css::system::XSimpleMailClientSupplier,
com::sun::star::system::XSimpleMailClient, css::system::XSimpleMailClient,
com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xConfigurationProvider; css::uno::Reference< css::lang::XMultiServiceFactory > m_xConfigurationProvider;
public: public:
explicit CmdMailSuppl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); explicit CmdMailSuppl( const css::uno::Reference< css::uno::XComponentContext >& xContext );
// XSimpleMailClientSupplier // XSimpleMailClientSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::system::XSimpleMailClient > SAL_CALL querySimpleMailClient( ) virtual css::uno::Reference< css::system::XSimpleMailClient > SAL_CALL querySimpleMailClient( )
throw (::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
// XSimpleMailClient // XSimpleMailClient
virtual ::com::sun::star::uno::Reference< ::com::sun::star::system::XSimpleMailMessage > SAL_CALL createSimpleMailMessage( ) virtual css::uno::Reference< css::system::XSimpleMailMessage > SAL_CALL createSimpleMailMessage( )
throw (::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL sendSimpleMailMessage( const ::com::sun::star::uno::Reference< ::com::sun::star::system::XSimpleMailMessage >& xSimpleMailMessage, sal_Int32 aFlag ) virtual void SAL_CALL sendSimpleMailMessage( const css::uno::Reference< css::system::XSimpleMailMessage >& xSimpleMailMessage, sal_Int32 aFlag )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::lang::IllegalArgumentException, css::uno::Exception, css::uno::RuntimeException, std::exception) override;
// 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 supportsService( const OUString& ServiceName ) 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 getSupportedServiceNames( ) virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw(::com::sun::star::uno::RuntimeException, std::exception) override; throw(css::uno::RuntimeException, std::exception) override;
}; };
#endif #endif
......
...@@ -20,36 +20,36 @@ namespace shell { namespace sessioninstall ...@@ -20,36 +20,36 @@ namespace shell { namespace sessioninstall
class SyncDbusSessionHelper : public ::cppu::WeakImplHelper< ::org::freedesktop::PackageKit::XSyncDbusSessionHelper > class SyncDbusSessionHelper : public ::cppu::WeakImplHelper< ::org::freedesktop::PackageKit::XSyncDbusSessionHelper >
{ {
public: public:
SyncDbusSessionHelper(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const&); SyncDbusSessionHelper(css::uno::Reference< css::uno::XComponentContext> const&);
virtual ~SyncDbusSessionHelper() {} virtual ~SyncDbusSessionHelper() {}
// XModify Methods // XModify Methods
virtual void SAL_CALL InstallPackageFiles( ::sal_uInt32 xid, const ::com::sun::star::uno::Sequence< OUString >& files, const OUString& interaction ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL InstallPackageFiles( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& files, const OUString& interaction ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL InstallProvideFiles( ::sal_uInt32 xid, const ::com::sun::star::uno::Sequence< OUString >& files, const OUString& interaction ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL InstallProvideFiles( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& files, const OUString& interaction ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL InstallCatalogs( ::sal_uInt32 xid, const ::com::sun::star::uno::Sequence< OUString >& files, const OUString& interaction ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL InstallCatalogs( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& files, const OUString& interaction ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL InstallPackageNames( ::sal_uInt32 xid, const ::com::sun::star::uno::Sequence< OUString >& packages, const OUString& interaction ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL InstallPackageNames( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& packages, const OUString& interaction ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL InstallMimeTypes( ::sal_uInt32 xid, const ::com::sun::star::uno::Sequence< OUString >& mimeTypes, const OUString& interaction ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL InstallMimeTypes( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& mimeTypes, const OUString& interaction ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL InstallFontconfigResources( ::sal_uInt32 xid, const ::com::sun::star::uno::Sequence< OUString >& resources, const OUString& interaction ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL InstallFontconfigResources( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& resources, const OUString& interaction ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL InstallGStreamerResources( ::sal_uInt32 xid, const ::com::sun::star::uno::Sequence< OUString >& resources, const OUString& interaction ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL InstallGStreamerResources( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& resources, const OUString& interaction ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL InstallResources( ::sal_uInt32 /* xid */, const ::com::sun::star::uno::Sequence< OUString >& /* types */, const ::com::sun::star::uno::Sequence< OUString >& /* resources */, const OUString& /* interaction */ ) throw (::com::sun::star::uno::RuntimeException, std::exception) override virtual void SAL_CALL InstallResources( ::sal_uInt32 /* xid */, const css::uno::Sequence< OUString >& /* types */, const css::uno::Sequence< OUString >& /* resources */, const OUString& /* interaction */ ) throw (css::uno::RuntimeException, std::exception) override
{ throw ::com::sun::star::uno::RuntimeException(); } // not implemented { throw css::uno::RuntimeException(); } // not implemented
virtual void SAL_CALL RemovePackageByFiles( ::sal_uInt32 xid, const ::com::sun::star::uno::Sequence< OUString >& files, const OUString& interaction ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL RemovePackageByFiles( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& files, const OUString& interaction ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL InstallPrinterDrivers( ::sal_uInt32 xid, const ::com::sun::star::uno::Sequence< OUString >& files, const OUString& interaction ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL InstallPrinterDrivers( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& files, const OUString& interaction ) throw (css::uno::RuntimeException, std::exception) override;
// XQuery Methods // XQuery Methods
virtual void SAL_CALL IsInstalled( const OUString& /* package_name */, const OUString& /* interaction */, sal_Bool& /* installed */ ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL IsInstalled( const OUString& /* package_name */, const OUString& /* interaction */, sal_Bool& /* installed */ ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL SearchFile( const OUString& /* file_name */, const OUString& /* interaction */, sal_Bool& /* installed */, OUString& /* package_name */ ) throw (::com::sun::star::uno::RuntimeException, std::exception) override virtual void SAL_CALL SearchFile( const OUString& /* file_name */, const OUString& /* interaction */, sal_Bool& /* installed */, OUString& /* package_name */ ) throw (css::uno::RuntimeException, std::exception) override
{ throw ::com::sun::star::uno::RuntimeException(); } // not implemented { throw css::uno::RuntimeException(); } // not implemented
private: private:
SyncDbusSessionHelper( const SyncDbusSessionHelper& ) = delete; SyncDbusSessionHelper( const SyncDbusSessionHelper& ) = delete;
......
...@@ -122,9 +122,8 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar ...@@ -122,9 +122,8 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
// We need to re-encode file urls because osl_getFileURLFromSystemPath converts // We need to re-encode file urls because osl_getFileURLFromSystemPath converts
// to UTF-8 before encoding non ascii characters, which is not what other apps // to UTF-8 before encoding non ascii characters, which is not what other apps
// expect. // expect.
OUString aURL( OUString aURL = css::uri::ExternalUriReferenceTranslator::create(
com::sun::star::uri::ExternalUriReferenceTranslator::create( m_xContext)->translateToExternal(aCommand);
m_xContext)->translateToExternal(aCommand));
if ( aURL.isEmpty() && !aCommand.isEmpty() ) if ( aURL.isEmpty() && !aCommand.isEmpty() )
{ {
throw RuntimeException( throw RuntimeException(
...@@ -160,13 +159,12 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar ...@@ -160,13 +159,12 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
#else #else
// The url launchers are expected to be in the $BRAND_BASE_DIR/LIBO_LIBEXEC_FOLDER // The url launchers are expected to be in the $BRAND_BASE_DIR/LIBO_LIBEXEC_FOLDER
// directory: // directory:
com::sun::star::uno::Reference< com::sun::star::util::XMacroExpander > css::uno::Reference< css::util::XMacroExpander > exp = css::util::theMacroExpander::get(m_xContext);
exp = com::sun::star::util::theMacroExpander::get(m_xContext);
OUString aProgramURL; OUString aProgramURL;
try { try {
aProgramURL = exp->expandMacros( aProgramURL = exp->expandMacros(
OUString( "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER "/")); OUString( "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER "/"));
} catch (com::sun::star::lang::IllegalArgumentException &) } catch (css::lang::IllegalArgumentException &)
{ {
throw SystemShellExecuteException( throw SystemShellExecuteException(
"Could not expand $BRAND_BASE_DIR path", "Could not expand $BRAND_BASE_DIR path",
......
...@@ -32,34 +32,33 @@ ...@@ -32,34 +32,33 @@
// class declaration // class declaration
class ShellExec : public ::cppu::WeakImplHelper< com::sun::star::system::XSystemShellExecute, com::sun::star::lang::XServiceInfo > class ShellExec : public ::cppu::WeakImplHelper< css::system::XSystemShellExecute, css::lang::XServiceInfo >
{ {
OString m_aDesktopEnvironment; OString m_aDesktopEnvironment;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > css::uno::Reference< css::uno::XComponentContext > m_xContext;
m_xContext;
public: public:
explicit ShellExec(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext); explicit ShellExec(const css::uno::Reference< css::uno::XComponentContext >& xContext);
// XSystemShellExecute // XSystemShellExecute
virtual void SAL_CALL execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags ) virtual void SAL_CALL execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::system::SystemShellExecuteException, ::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::lang::IllegalArgumentException, css::system::SystemShellExecuteException, css::uno::RuntimeException, std::exception) override;
// 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 supportsService( const OUString& ServiceName ) 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 getSupportedServiceNames( ) virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw(::com::sun::star::uno::RuntimeException, std::exception) override; throw(css::uno::RuntimeException, std::exception) override;
}; };
......
...@@ -40,34 +40,33 @@ protected: ...@@ -40,34 +40,33 @@ protected:
class CSysShExec : class CSysShExec :
public CSysShExecBase, public CSysShExecBase,
public cppu::WeakComponentImplHelper< public cppu::WeakComponentImplHelper<
com::sun::star::system::XSystemShellExecute, css::system::XSystemShellExecute,
com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > css::uno::Reference< css::uno::XComponentContext > m_xContext;
m_xContext;
public: public:
CSysShExec(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext); CSysShExec(const css::uno::Reference< css::uno::XComponentContext >& xContext);
// XSystemShellExecute // XSystemShellExecute
virtual void SAL_CALL execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags ) virtual void SAL_CALL execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::system::SystemShellExecuteException, ::com::sun::star::uno::RuntimeException); throw (css::lang::IllegalArgumentException, css::system::SystemShellExecuteException, css::uno::RuntimeException);
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) virtual OUString SAL_CALL getImplementationName( )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
}; };
#endif #endif
......
...@@ -171,7 +171,7 @@ Reference<XSimpleMailMessage> SAL_CALL CSmplMailClient::createSimpleMailMessage( ...@@ -171,7 +171,7 @@ Reference<XSimpleMailMessage> SAL_CALL CSmplMailClient::createSimpleMailMessage(
[in|out] a buffer for the command line arguments. The buffer [in|out] a buffer for the command line arguments. The buffer
is assumed to be empty. is assumed to be empty.
@throws com::sun::star::lang::IllegalArgumentException @throws css::lang::IllegalArgumentException
if an invalid file URL has been detected in the attachment list. if an invalid file URL has been detected in the attachment list.
*/ */
void CSmplMailClient::assembleCommandLine( void CSmplMailClient::assembleCommandLine(
......
...@@ -29,74 +29,73 @@ ...@@ -29,74 +29,73 @@
// class declaration // class declaration
class CSmplMailMsg : class CSmplMailMsg : public cppu::WeakImplHelper< css::system::XSimpleMailMessage2 >
public cppu::WeakImplHelper< com::sun::star::system::XSimpleMailMessage2 >
{ {
public: public:
CSmplMailMsg( ); CSmplMailMsg( );
virtual void SAL_CALL setBody( const ::rtl::OUString& aBody ) virtual void SAL_CALL setBody( const ::rtl::OUString& aBody )
throw (::com::sun::star::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual ::rtl::OUString SAL_CALL getBody( ) virtual ::rtl::OUString SAL_CALL getBody( )
throw (::com::sun::star::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual void SAL_CALL setRecipient( const OUString& aRecipient ) virtual void SAL_CALL setRecipient( const OUString& aRecipient )
throw (::com::sun::star::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual OUString SAL_CALL getRecipient( ) virtual OUString SAL_CALL getRecipient( )
throw (::com::sun::star::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual void SAL_CALL setCcRecipient( const ::com::sun::star::uno::Sequence< OUString >& aCcRecipient ) virtual void SAL_CALL setCcRecipient( const css::uno::Sequence< OUString >& aCcRecipient )
throw (::com::sun::star::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCcRecipient( ) virtual css::uno::Sequence< OUString > SAL_CALL getCcRecipient( )
throw (::com::sun::star::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual void SAL_CALL setBccRecipient( const ::com::sun::star::uno::Sequence< OUString >& aBccRecipient ) virtual void SAL_CALL setBccRecipient( const css::uno::Sequence< OUString >& aBccRecipient )
throw (::com::sun::star::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getBccRecipient( ) virtual css::uno::Sequence< OUString > SAL_CALL getBccRecipient( )
throw (::com::sun::star::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual void SAL_CALL setOriginator( const OUString& aOriginator ) virtual void SAL_CALL setOriginator( const OUString& aOriginator )
throw (::com::sun::star::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual OUString SAL_CALL getOriginator( ) virtual OUString SAL_CALL getOriginator( )
throw (::com::sun::star::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual void SAL_CALL setSubject( const OUString& aSubject ) virtual void SAL_CALL setSubject( const OUString& aSubject )
throw (::com::sun::star::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual OUString SAL_CALL getSubject( ) virtual OUString SAL_CALL getSubject( )
throw (::com::sun::star::uno::RuntimeException); throw (css::uno::RuntimeException);
virtual void SAL_CALL setAttachement( const ::com::sun::star::uno::Sequence< OUString >& aAttachement ) virtual void SAL_CALL setAttachement( const css::uno::Sequence< OUString >& aAttachement )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAttachement( ) virtual css::uno::Sequence< OUString > SAL_CALL getAttachement( )
throw (::com::sun::star::uno::RuntimeException); throw (css::uno::RuntimeException);
private: private:
OUString m_aBody; OUString m_aBody;
OUString m_aRecipient; OUString m_aRecipient;
OUString m_aOriginator; OUString m_aOriginator;
OUString m_aSubject; OUString m_aSubject;
com::sun::star::uno::Sequence< OUString > m_CcRecipients; css::uno::Sequence< OUString > m_CcRecipients;
com::sun::star::uno::Sequence< OUString > m_BccRecipients; css::uno::Sequence< OUString > m_BccRecipients;
com::sun::star::uno::Sequence< OUString > m_Attachements; css::uno::Sequence< OUString > m_Attachements;
}; };
#endif #endif
......
...@@ -37,26 +37,26 @@ protected: ...@@ -37,26 +37,26 @@ protected:
class CSmplMailSuppl : class CSmplMailSuppl :
public CSmplMailSupplBase, public CSmplMailSupplBase,
public cppu::WeakComponentImplHelper< public cppu::WeakComponentImplHelper<
com::sun::star::system::XSimpleMailClientSupplier, css::system::XSimpleMailClientSupplier,
com::sun::star::lang::XServiceInfo > css::lang::XServiceInfo >
{ {
public: public:
CSmplMailSuppl( ); CSmplMailSuppl( );
~CSmplMailSuppl( ); ~CSmplMailSuppl( );
// XSimpleMailClientSupplier // XSimpleMailClientSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::system::XSimpleMailClient > SAL_CALL querySimpleMailClient( ) virtual css::uno::Reference< css::system::XSimpleMailClient > SAL_CALL querySimpleMailClient( )
throw (::com::sun::star::uno::RuntimeException); throw (css::uno::RuntimeException);
// XServiceInfo // XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) virtual OUString SAL_CALL getImplementationName( )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw(::com::sun::star::uno::RuntimeException); throw(css::uno::RuntimeException);
}; };
#endif #endif
......
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