diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-04-02 12:26:08 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-04-02 14:21:18 +0200 |
| commit | 381c5bf1ca968424585f679da8382ae3f8d6ac66 (patch) | |
| tree | 1dd044ed3a77e1d861007c4d31bdacb2bcbd504f /sfx2/source/view/frmload.cxx | |
| parent | 7d1044842e2316507eda719e116819572f4ce8d9 (diff) | |
sfx2: remove macros
Change-Id: I8871b0c95874ceab755b3cb304a60c34981c649c
Diffstat (limited to 'sfx2/source/view/frmload.cxx')
| -rw-r--r-- | sfx2/source/view/frmload.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index c56c45b07d7b..1ebdc4dc5116 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -659,7 +659,7 @@ rtl::OUString SAL_CALL SfxFrameLoader_Impl::getImplementationName() throw( Runti /* XServiceInfo */ sal_Bool SAL_CALL SfxFrameLoader_Impl::supportsService( const rtl::OUString& sServiceName ) throw( RuntimeException ) { - UNOSEQUENCE< rtl::OUString > seqServiceNames = getSupportedServiceNames(); + Sequence< rtl::OUString > seqServiceNames = getSupportedServiceNames(); const rtl::OUString* pArray = seqServiceNames.getConstArray(); for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ ) { @@ -672,16 +672,16 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::supportsService( const rtl::OUString& sSe } /* XServiceInfo */ -UNOSEQUENCE< rtl::OUString > SAL_CALL SfxFrameLoader_Impl::getSupportedServiceNames() throw( RuntimeException ) +Sequence< rtl::OUString > SAL_CALL SfxFrameLoader_Impl::getSupportedServiceNames() throw( RuntimeException ) { return impl_getStaticSupportedServiceNames(); } /* Helper for XServiceInfo */ -UNOSEQUENCE< rtl::OUString > SfxFrameLoader_Impl::impl_getStaticSupportedServiceNames() +Sequence< rtl::OUString > SfxFrameLoader_Impl::impl_getStaticSupportedServiceNames() { - UNOMUTEXGUARD aGuard( UNOMUTEX::getGlobalMutex() ); - UNOSEQUENCE< rtl::OUString > seqServiceNames( 1 ); + ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); + Sequence< rtl::OUString > seqServiceNames( 1 ); seqServiceNames.getArray() [0] = ::rtl::OUString( "com.sun.star.frame.SynchronousFrameLoader" ); return seqServiceNames ; } @@ -693,9 +693,9 @@ rtl::OUString SfxFrameLoader_Impl::impl_getStaticImplementationName() } /* Helper for registry */ -Reference< UNOXINTERFACE > SAL_CALL SfxFrameLoader_Impl::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) throw( UNOEXCEPTION ) +Reference< css::uno::XInterface > SAL_CALL SfxFrameLoader_Impl::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) throw( Exception ) { - return Reference< XInterface >( *new SfxFrameLoader_Impl( comphelper::getComponentContext(xServiceManager) ) ); + return Reference< css::uno::XInterface >( *new SfxFrameLoader_Impl( comphelper::getComponentContext(xServiceManager) ) ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |