diff options
author | Noel Grandin <noel@peralex.com> | 2015-11-06 10:51:51 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-11-06 11:55:09 +0200 |
commit | 2633976ef3406d48907bd922f067ea04e39c94f1 (patch) | |
tree | c29440a174d106805b686299fcaa4a3bacf23592 /sw/source/core/docnode | |
parent | 41d83eb8cd8e9544641182ff19a8c635760e75dc (diff) |
com::sun::star->css in sw/source/core
Change-Id: I30016977f1be8fb53dd239367d043de92a9467d9
Diffstat (limited to 'sw/source/core/docnode')
-rw-r--r-- | sw/source/core/docnode/cancellablejob.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/docnode/cancellablejob.hxx | 6 | ||||
-rw-r--r-- | sw/source/core/docnode/finalthreadmanager.cxx | 12 | ||||
-rw-r--r-- | sw/source/core/docnode/retrievedinputstreamdata.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/docnode/retrieveinputstream.cxx | 6 | ||||
-rw-r--r-- | sw/source/core/docnode/retrieveinputstreamconsumer.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/docnode/section.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/docnode/threadmanager.cxx | 4 |
8 files changed, 19 insertions, 19 deletions
diff --git a/sw/source/core/docnode/cancellablejob.cxx b/sw/source/core/docnode/cancellablejob.cxx index ef965e4ab29d..9704824e10ce 100644 --- a/sw/source/core/docnode/cancellablejob.cxx +++ b/sw/source/core/docnode/cancellablejob.cxx @@ -24,8 +24,8 @@ CancellableJob::CancellableJob( const rtl::Reference< ObservableThread >& rThrea { } -// ::com::sun::star::util::XCancellable: -void SAL_CALL CancellableJob::cancel() throw (com::sun::star::uno::RuntimeException, std::exception) +// css::util::XCancellable: +void SAL_CALL CancellableJob::cancel() throw (css::uno::RuntimeException, std::exception) { mrThread->join(); } diff --git a/sw/source/core/docnode/cancellablejob.hxx b/sw/source/core/docnode/cancellablejob.hxx index 4a7596e0dda1..dabde55257e3 100644 --- a/sw/source/core/docnode/cancellablejob.hxx +++ b/sw/source/core/docnode/cancellablejob.hxx @@ -28,14 +28,14 @@ class ObservableThread; -class CancellableJob : public ::cppu::WeakImplHelper<com::sun::star::util::XCancellable> +class CancellableJob : public ::cppu::WeakImplHelper<css::util::XCancellable> { public: explicit CancellableJob( const ::rtl::Reference< ObservableThread >& rThread ); virtual ~CancellableJob() {} - // ::com::sun::star::util::XCancellable: - virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException, std::exception) override; + // css::util::XCancellable: + virtual void SAL_CALL cancel() throw (css::uno::RuntimeException, std::exception) override; private: CancellableJob( CancellableJob& ) = delete; diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx index 86dc48d07e71..93e2d8a14fcd 100644 --- a/sw/source/core/docnode/finalthreadmanager.cxx +++ b/sw/source/core/docnode/finalthreadmanager.cxx @@ -299,7 +299,7 @@ css::uno::Sequence< OUString > SAL_CALL FinalThreadManager::getSupportedServiceN return s; } -// ::com::sun::star::util::XJobManager: +// css::util::XJobManager: void SAL_CALL FinalThreadManager::registerJob(const css::uno::Reference< css::util::XCancellable > & Job) throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard aGuard(maMutex); @@ -353,7 +353,7 @@ void SAL_CALL FinalThreadManager::cancelAllJobs() throw (css::uno::RuntimeExcept } } -// ::com::sun::star::frame::XTerminateListener +// css::frame::XTerminateListener void SAL_CALL FinalThreadManager::queryTermination( const css::lang::EventObject& ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) { osl::MutexGuard aGuard(maMutex); @@ -438,15 +438,15 @@ void SAL_CALL FinalThreadManager::notifyTermination( const css::lang::EventObjec SwThreadJoiner::ReleaseThreadJoiner(); } -// ::com::sun:star::lang::XEventListener (inherited via com::sun::star::frame::XTerminateListener) +// ::com::sun:star::lang::XEventListener (inherited via css::frame::XTerminateListener) void SAL_CALL FinalThreadManager::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception) { // nothing to do, because instance doesn't hold any references of observed objects } -extern "C" SAL_DLLPUBLIC_EXPORT ::com::sun::star::uno::XInterface* SAL_CALL -com_sun_star_util_comp_FinalThreadManager_get_implementation(::com::sun::star::uno::XComponentContext* context, - ::com::sun::star::uno::Sequence<css::uno::Any> const &) +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL +com_sun_star_util_comp_FinalThreadManager_get_implementation(css::uno::XComponentContext* context, + css::uno::Sequence<css::uno::Any> const &) { return cppu::acquire(new FinalThreadManager(context)); } diff --git a/sw/source/core/docnode/retrievedinputstreamdata.cxx b/sw/source/core/docnode/retrievedinputstreamdata.cxx index 4631ef8866a1..0838761767fb 100644 --- a/sw/source/core/docnode/retrievedinputstreamdata.cxx +++ b/sw/source/core/docnode/retrievedinputstreamdata.cxx @@ -63,7 +63,7 @@ SwRetrievedInputStreamDataManager::tDataKey SwRetrievedInputStreamDataManager::R void SwRetrievedInputStreamDataManager::PushData( const tDataKey nDataKey, - com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream, + css::uno::Reference<css::io::XInputStream> xInputStream, const bool bIsStreamReadOnly ) { osl::MutexGuard aGuard(maMutex); diff --git a/sw/source/core/docnode/retrieveinputstream.cxx b/sw/source/core/docnode/retrieveinputstream.cxx index ad70921e2902..030dcfbbbf16 100644 --- a/sw/source/core/docnode/retrieveinputstream.cxx +++ b/sw/source/core/docnode/retrieveinputstream.cxx @@ -53,7 +53,7 @@ void SwAsyncRetrieveInputStreamThread::threadFunction() { osl_setThreadName("SwAsyncRetrieveInputStreamThread"); - com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > xProps( 2 ); + css::uno::Sequence < css::beans::PropertyValue > xProps( 2 ); xProps[0].Name = "URL"; xProps[0].Value <<= mrLinkedURL; xProps[1].Name = "Referer"; @@ -62,11 +62,11 @@ void SwAsyncRetrieveInputStreamThread::threadFunction() aMedium.addInputStream(); - com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream; + css::uno::Reference<css::io::XInputStream> xInputStream; aMedium[utl::MediaDescriptor::PROP_INPUTSTREAM()] >>= xInputStream; if ( !xInputStream.is() ) { - com::sun::star::uno::Reference<com::sun::star::io::XStream> xStream; + css::uno::Reference<css::io::XStream> xStream; aMedium[utl::MediaDescriptor::PROP_STREAM()] >>= xStream; if ( xStream.is() ) { diff --git a/sw/source/core/docnode/retrieveinputstreamconsumer.cxx b/sw/source/core/docnode/retrieveinputstreamconsumer.cxx index 6bfa562c2aa2..258768f34e2f 100644 --- a/sw/source/core/docnode/retrieveinputstreamconsumer.cxx +++ b/sw/source/core/docnode/retrieveinputstreamconsumer.cxx @@ -54,7 +54,7 @@ void SwAsyncRetrieveInputStreamThreadConsumer::CreateThread( const OUString& rUR } void SwAsyncRetrieveInputStreamThreadConsumer::ApplyInputStream( - com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream, + css::uno::Reference<css::io::XInputStream> xInputStream, const bool bIsStreamReadOnly ) { mrGrfNode.ApplyInputStream( xInputStream, bIsStreamReadOnly ); diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index 0571943a5150..c3ee22c092bd 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -79,7 +79,7 @@ public: virtual void Closed() override; virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( - const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) override; + const OUString& rMimeType, const css::uno::Any & rValue ) override; virtual const SwNode* GetAnchor() const override; virtual bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, sal_Int32 nStt = 0, diff --git a/sw/source/core/docnode/threadmanager.cxx b/sw/source/core/docnode/threadmanager.cxx index 786dd763b9f3..cb1e380faeab 100644 --- a/sw/source/core/docnode/threadmanager.cxx +++ b/sw/source/core/docnode/threadmanager.cxx @@ -130,7 +130,7 @@ void ThreadManager::RemoveThread( const oslInterlockedCount nThreadID, if ( bThreadFinished ) { // release thread as job from thread joiner instance - ::com::sun::star::uno::Reference< ::com::sun::star::util::XJobManager > rThreadJoiner( mrThreadJoiner ); + css::uno::Reference< css::util::XJobManager > rThreadJoiner( mrThreadJoiner ); if ( rThreadJoiner.is() ) { rThreadJoiner->releaseJob( aTmpThreadData.aJob ); @@ -183,7 +183,7 @@ bool ThreadManager::StartThread( const tThreadData& rThreadData ) maStartedThreads.push_back( rThreadData ); // register thread as job at thread joiner instance - ::com::sun::star::uno::Reference< ::com::sun::star::util::XJobManager > rThreadJoiner( mrThreadJoiner ); + css::uno::Reference< css::util::XJobManager > rThreadJoiner( mrThreadJoiner ); if ( rThreadJoiner.is() ) { rThreadJoiner->registerJob( rThreadData.aJob ); |