diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-01-29 21:56:21 +0400 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-01-30 12:23:34 +0400 |
| commit | 93236fcdf26838ad48e88402020c11de47ce91af (patch) | |
| tree | 33ac68dfce25a1b966eab62608a9f9976c83b3b1 /sfx2/inc | |
| parent | 9cde190a46af066a2d64caf47a50326b26a8f4fc (diff) | |
remove '#define UNOOUSTRING ::rtl::OUString'
Diffstat (limited to 'sfx2/inc')
| -rw-r--r-- | sfx2/inc/sfx2/sfxuno.hxx | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/sfx2/inc/sfx2/sfxuno.hxx b/sfx2/inc/sfx2/sfxuno.hxx index 5bd7b2f0c521..d9614d212a76 100644 --- a/sfx2/inc/sfx2/sfxuno.hxx +++ b/sfx2/inc/sfx2/sfxuno.hxx @@ -69,7 +69,6 @@ #define UNOMUTEXGUARD ::osl::MutexGuard #define UNOOIMPLEMENTATIONID ::cppu::OImplementationId #define UNOOTYPECOLLECTION ::cppu::OTypeCollection -#define UNOOUSTRING ::rtl::OUString #define UNOPROPERTYVALUE ::com::sun::star::beans::PropertyValue #define UNOREFERENCE ::com::sun::star::uno::Reference #define UNORUNTIMEEXCEPTION ::com::sun::star::uno::RuntimeException @@ -158,13 +157,13 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ //************************************************************************************************************************ #define SFX_DECL_XSERVICEINFO \ /* XServiceInfo */ \ - virtual UNOOUSTRING SAL_CALL getImplementationName() throw( UNORUNTIMEEXCEPTION ); \ - virtual sal_Bool SAL_CALL supportsService( const UNOOUSTRING& sServiceName ) throw( UNORUNTIMEEXCEPTION ); \ - virtual UNOSEQUENCE< UNOOUSTRING > SAL_CALL getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION ); \ + virtual rtl::OUString SAL_CALL getImplementationName() throw( UNORUNTIMEEXCEPTION ); \ + virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& sServiceName ) throw( UNORUNTIMEEXCEPTION ); \ + virtual UNOSEQUENCE< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION ); \ \ /* Helper for XServiceInfo */ \ - static UNOSEQUENCE< UNOOUSTRING > impl_getStaticSupportedServiceNames(); \ - static UNOOUSTRING impl_getStaticImplementationName(); \ + static UNOSEQUENCE< rtl::OUString > impl_getStaticSupportedServiceNames(); \ + static rtl::OUString impl_getStaticImplementationName(); \ \ /* Helper for registry */ \ static UNOREFERENCE< UNOXINTERFACE > SAL_CALL impl_createInstance( const UNOREFERENCE< UNOXMULTISERVICEFACTORY >& xServiceManager ) throw( UNOEXCEPTION );\ @@ -510,16 +509,16 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ #define SFX_IMPL_XSERVICEINFO( IMPLCLASS, IMPLSERVICENAME, IMPLNAME ) \ \ /* XServiceInfo */ \ - UNOOUSTRING SAL_CALL IMPLCLASS::getImplementationName() throw( UNORUNTIMEEXCEPTION ) \ + rtl::OUString SAL_CALL IMPLCLASS::getImplementationName() throw( UNORUNTIMEEXCEPTION ) \ { \ return impl_getStaticImplementationName(); \ } \ \ /* XServiceInfo */ \ - sal_Bool SAL_CALL IMPLCLASS::supportsService( const UNOOUSTRING& sServiceName ) throw( UNORUNTIMEEXCEPTION ) \ + sal_Bool SAL_CALL IMPLCLASS::supportsService( const rtl::OUString& sServiceName ) throw( UNORUNTIMEEXCEPTION ) \ { \ - UNOSEQUENCE< UNOOUSTRING > seqServiceNames = getSupportedServiceNames(); \ - const UNOOUSTRING* pArray = seqServiceNames.getConstArray(); \ + UNOSEQUENCE< rtl::OUString > seqServiceNames = getSupportedServiceNames(); \ + const rtl::OUString* pArray = seqServiceNames.getConstArray(); \ for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ ) \ { \ if ( pArray[nCounter] == sServiceName ) \ @@ -531,23 +530,23 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ } \ \ /* XServiceInfo */ \ - UNOSEQUENCE< UNOOUSTRING > SAL_CALL IMPLCLASS::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION ) \ + UNOSEQUENCE< rtl::OUString > SAL_CALL IMPLCLASS::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION ) \ { \ return impl_getStaticSupportedServiceNames(); \ } \ \ /* Helper for XServiceInfo */ \ - UNOSEQUENCE< UNOOUSTRING > IMPLCLASS::impl_getStaticSupportedServiceNames() \ + UNOSEQUENCE< rtl::OUString > IMPLCLASS::impl_getStaticSupportedServiceNames() \ { \ - UNOSEQUENCE< UNOOUSTRING > seqServiceNames( 1 ); \ - seqServiceNames.getArray() [0] = UNOOUSTRING::createFromAscii( IMPLSERVICENAME ); \ + UNOSEQUENCE< rtl::OUString > seqServiceNames( 1 ); \ + seqServiceNames.getArray() [0] = rtl::OUString::createFromAscii( IMPLSERVICENAME ); \ return seqServiceNames ; \ } \ \ /* Helper for XServiceInfo */ \ - UNOOUSTRING IMPLCLASS::impl_getStaticImplementationName() \ + rtl::OUString IMPLCLASS::impl_getStaticImplementationName() \ { \ - return UNOOUSTRING::createFromAscii( IMPLNAME ); \ + return rtl::OUString::createFromAscii( IMPLNAME ); \ } \ \ /* Helper for registry */ \ @@ -601,7 +600,7 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ //************************************************************************************************************************ #define IF_NAME_CREATECOMPONENTFACTORY(CLASS) \ \ - if ( CLASS::impl_getStaticImplementationName().equals( UNOOUSTRING::createFromAscii( pImplementationName ) ) ) \ + if ( CLASS::impl_getStaticImplementationName().equals( rtl::OUString::createFromAscii( pImplementationName ) ) ) \ { \ CREATEFACTORY ( CLASS ) \ } |