diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2014-05-22 08:45:37 +0200 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2014-05-22 12:50:47 +0200 |
commit | e856f2323289efd3a6f070ff6e1b0f7cd3afb2aa (patch) | |
tree | d5174713f9c1aca04833d06d7793aec2c0a5514f /stoc/source/javavm | |
parent | b2d99944c55acbdd4204db37079cde476d6388be (diff) |
stoc: make use of css alias
Change-Id: I1dd85a7b1236cfebd5e653fe6d329968e556364b
Diffstat (limited to 'stoc/source/javavm')
-rw-r--r-- | stoc/source/javavm/interact.hxx | 20 | ||||
-rw-r--r-- | stoc/source/javavm/javavm.cxx | 2 | ||||
-rw-r--r-- | stoc/source/javavm/javavm.hxx | 70 |
3 files changed, 46 insertions, 46 deletions
diff --git a/stoc/source/javavm/interact.hxx b/stoc/source/javavm/interact.hxx index af1658a9ef54..950ef3e00418 100644 --- a/stoc/source/javavm/interact.hxx +++ b/stoc/source/javavm/interact.hxx @@ -34,17 +34,17 @@ namespace com { namespace sun { namespace star { namespace task { namespace stoc_javavm { class InteractionRequest: - public cppu::WeakImplHelper1< com::sun::star::task::XInteractionRequest > + public cppu::WeakImplHelper1< css::task::XInteractionRequest > { public: - explicit InteractionRequest(com::sun::star::uno::Any const & rRequest); + explicit InteractionRequest(css::uno::Any const & rRequest); - virtual com::sun::star::uno::Any SAL_CALL getRequest() - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getRequest() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual com::sun::star::uno::Sequence< com::sun::star::uno::Reference< - com::sun::star::task::XInteractionContinuation > > SAL_CALL - getContinuations() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Reference< + css::task::XInteractionContinuation > > SAL_CALL + getContinuations() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; bool retry() const; @@ -56,9 +56,9 @@ private: virtual ~InteractionRequest(); - com::sun::star::uno::Any m_aRequest; - com::sun::star::uno::Sequence< com::sun::star::uno::Reference< - com::sun::star::task::XInteractionContinuation > > m_aContinuations; + css::uno::Any m_aRequest; + css::uno::Sequence< css::uno::Reference< + css::task::XInteractionContinuation > > m_aContinuations; rtl::Reference< RetryContinuation > m_xRetryContinuation; }; diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index 035447d9d1cb..0cc10bbf3f3b 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -1536,7 +1536,7 @@ void JavaVirtualMachine::setUpUnoVirtualMachine(JNIEnv * environment) { OUString("$URE_INTERNAL_JAVA_DIR/")); } catch (css::lang::IllegalArgumentException &) { throw css::uno::RuntimeException( - OUString("com::sun::star::lang::IllegalArgumentException"), + OUString("css::lang::IllegalArgumentException"), static_cast< cppu::OWeakObject * >(this)); } OUString classPath; diff --git a/stoc/source/javavm/javavm.hxx b/stoc/source/javavm/javavm.hxx index f665b0b09c62..b381034cb575 100644 --- a/stoc/source/javavm/javavm.hxx +++ b/stoc/source/javavm/javavm.hxx @@ -45,16 +45,16 @@ namespace jvmaccess { namespace stoc_javavm { -bool configureJava(const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext>& xContext); +bool configureJava(const css::uno::Reference< + css::uno::XComponentContext>& xContext); // The MS compiler needs a typedef here, so the JavaVirtualMachine ctor can call // its base class ctor: typedef -cppu::WeakComponentImplHelper5< com::sun::star::lang::XInitialization, - com::sun::star::lang::XServiceInfo, - com::sun::star::java::XJavaVM, - com::sun::star::java::XJavaThreadRegister_11, - com::sun::star::container::XContainerListener > +cppu::WeakComponentImplHelper5< css::lang::XInitialization, + css::lang::XServiceInfo, + css::java::XJavaVM, + css::java::XJavaThreadRegister_11, + css::container::XContainerListener > JavaVirtualMachine_Impl; class JavaVirtualMachine: @@ -62,63 +62,63 @@ class JavaVirtualMachine: { public: explicit JavaVirtualMachine( - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > const & rContext); + css::uno::Reference< + css::uno::XComponentContext > const & rContext); // XInitialization virtual void SAL_CALL - initialize(com::sun::star::uno::Sequence< com::sun::star::uno::Any > const & + initialize(css::uno::Sequence< css::uno::Any > const & rArguments) - throw (com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(OUString const & rServiceName) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XJavaVM - virtual com::sun::star::uno::Any SAL_CALL - getJavaVM(com::sun::star::uno::Sequence< sal_Int8 > const & rProcessId) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL + getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isVMStarted() - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isVMEnabled() - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XJavaThreadRegister_11 virtual sal_Bool SAL_CALL isThreadAttached() - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL registerThread() - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL revokeThread() - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XContainerListener virtual void SAL_CALL - disposing(com::sun::star::lang::EventObject const & rSource) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + disposing(css::lang::EventObject const & rSource) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - elementInserted(com::sun::star::container::ContainerEvent const & rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + elementInserted(css::container::ContainerEvent const & rEvent) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - elementRemoved(com::sun::star::container::ContainerEvent const & rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + elementRemoved(css::container::ContainerEvent const & rEvent) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - elementReplaced(com::sun::star::container::ContainerEvent const & rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + elementReplaced(css::container::ContainerEvent const & rEvent) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: JavaVirtualMachine(JavaVirtualMachine &); // not implemented @@ -129,7 +129,7 @@ private: virtual void SAL_CALL disposing() SAL_OVERRIDE; JavaVM * createJavaVM(JVM const & jvm, JNIEnv ** pMainThreadEnv); - // throws com::sun::star::uno::RuntimeException + // throws css::uno::RuntimeException void registerConfigChangesListener(); @@ -139,7 +139,7 @@ private: void handleJniException(JNIEnv * environment); - com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > + css::uno::Reference< css::uno::XComponentContext > m_xContext; // the following are controlled by BaseMutex::m_aMutex: @@ -152,9 +152,9 @@ private: // If the first creation of Java failed and this flag is set then the // next call to getJavaVM throws a RuntimException. This is useful when // the second attempt to create Java might cause a crash. - com::sun::star::uno::Reference< com::sun::star::container::XContainer > + css::uno::Reference< css::container::XContainer > m_xInetConfiguration; - com::sun::star::uno::Reference< com::sun::star::container::XContainer > + css::uno::Reference< css::container::XContainer > m_xJavaConfiguration; // for Java settings osl::ThreadData m_aAttachGuards; |