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 /sd | |
| parent | 9cde190a46af066a2d64caf47a50326b26a8f4fc (diff) | |
remove '#define UNOOUSTRING ::rtl::OUString'
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/unoidl/sddetect.cxx | 20 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unomodule.cxx | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index bf61a6fcc8a3..59a772938c30 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -489,16 +489,16 @@ SdFilterDetect::~SdFilterDetect() SFX_IMPL_SINGLEFACTORY( SdFilterDetect ) /* XServiceInfo */ -UNOOUSTRING SAL_CALL SdFilterDetect::getImplementationName() throw( UNORUNTIMEEXCEPTION ) +rtl::OUString SAL_CALL SdFilterDetect::getImplementationName() throw( UNORUNTIMEEXCEPTION ) { return impl_getStaticImplementationName(); } \ /* XServiceInfo */ -sal_Bool SAL_CALL SdFilterDetect::supportsService( const UNOOUSTRING& sServiceName ) throw( UNORUNTIMEEXCEPTION ) +sal_Bool SAL_CALL SdFilterDetect::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 ) @@ -510,23 +510,23 @@ sal_Bool SAL_CALL SdFilterDetect::supportsService( const UNOOUSTRING& sServiceNa } /* XServiceInfo */ -UNOSEQUENCE< UNOOUSTRING > SAL_CALL SdFilterDetect::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION ) +UNOSEQUENCE< rtl::OUString > SAL_CALL SdFilterDetect::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION ) { return impl_getStaticSupportedServiceNames(); } /* Helper for XServiceInfo */ -UNOSEQUENCE< UNOOUSTRING > SdFilterDetect::impl_getStaticSupportedServiceNames() +UNOSEQUENCE< rtl::OUString > SdFilterDetect::impl_getStaticSupportedServiceNames() { - UNOSEQUENCE< UNOOUSTRING > seqServiceNames( 1 ); - seqServiceNames.getArray() [0] = UNOOUSTRING(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ExtendedTypeDetection" )); + UNOSEQUENCE< rtl::OUString > seqServiceNames( 1 ); + seqServiceNames.getArray() [0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ExtendedTypeDetection" )); return seqServiceNames ; } /* Helper for XServiceInfo */ -UNOOUSTRING SdFilterDetect::impl_getStaticImplementationName() +rtl::OUString SdFilterDetect::impl_getStaticImplementationName() { - return UNOOUSTRING(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.draw.FormatDetector" )); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.draw.FormatDetector" )); } /* Helper for registry */ diff --git a/sd/source/ui/unoidl/unomodule.cxx b/sd/source/ui/unoidl/unomodule.cxx index 76f6bd342939..65ffab37c702 100644 --- a/sd/source/ui/unoidl/unomodule.cxx +++ b/sd/source/ui/unoidl/unomodule.cxx @@ -143,8 +143,8 @@ REFERENCE< XDISPATCH > SAL_CALL SdUnoModule::queryDispatch( const UNOURL& aURL, sal_Bool SAL_CALL SdUnoModule::supportsService( const ::rtl::OUString& sServiceName ) throw(::com::sun::star::uno::RuntimeException) { - 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 ) |