Kaydet (Commit) 93236fcd authored tarafından Ivan Timofeev's avatar Ivan Timofeev

remove '#define UNOOUSTRING ::rtl::OUString'

üst 9cde190a
...@@ -869,16 +869,16 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream ) ...@@ -869,16 +869,16 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
SFX_IMPL_SINGLEFACTORY( ScFilterDetect ) SFX_IMPL_SINGLEFACTORY( ScFilterDetect )
/* XServiceInfo */ /* XServiceInfo */
UNOOUSTRING SAL_CALL ScFilterDetect::getImplementationName() throw( UNORUNTIMEEXCEPTION ) rtl::OUString SAL_CALL ScFilterDetect::getImplementationName() throw( UNORUNTIMEEXCEPTION )
{ {
return impl_getStaticImplementationName(); return impl_getStaticImplementationName();
} }
\ \
/* XServiceInfo */ /* XServiceInfo */
sal_Bool SAL_CALL ScFilterDetect::supportsService( const UNOOUSTRING& sServiceName ) throw( UNORUNTIMEEXCEPTION ) sal_Bool SAL_CALL ScFilterDetect::supportsService( const rtl::OUString& sServiceName ) throw( UNORUNTIMEEXCEPTION )
{ {
UNOSEQUENCE< UNOOUSTRING > seqServiceNames(getSupportedServiceNames()); UNOSEQUENCE< rtl::OUString > seqServiceNames(getSupportedServiceNames());
const UNOOUSTRING* pArray = seqServiceNames.getConstArray(); const rtl::OUString* pArray = seqServiceNames.getConstArray();
for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ ) for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ )
{ {
if ( pArray[nCounter] == sServiceName ) if ( pArray[nCounter] == sServiceName )
...@@ -890,23 +890,23 @@ sal_Bool SAL_CALL ScFilterDetect::supportsService( const UNOOUSTRING& sServiceNa ...@@ -890,23 +890,23 @@ sal_Bool SAL_CALL ScFilterDetect::supportsService( const UNOOUSTRING& sServiceNa
} }
/* XServiceInfo */ /* XServiceInfo */
UNOSEQUENCE< UNOOUSTRING > SAL_CALL ScFilterDetect::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION ) UNOSEQUENCE< rtl::OUString > SAL_CALL ScFilterDetect::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION )
{ {
return impl_getStaticSupportedServiceNames(); return impl_getStaticSupportedServiceNames();
} }
/* Helper for XServiceInfo */ /* Helper for XServiceInfo */
UNOSEQUENCE< UNOOUSTRING > ScFilterDetect::impl_getStaticSupportedServiceNames() UNOSEQUENCE< rtl::OUString > ScFilterDetect::impl_getStaticSupportedServiceNames()
{ {
UNOSEQUENCE< UNOOUSTRING > seqServiceNames( 1 ); UNOSEQUENCE< rtl::OUString > seqServiceNames( 1 );
seqServiceNames.getArray() [0] = UNOOUSTRING(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ExtendedTypeDetection" )); seqServiceNames.getArray() [0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ExtendedTypeDetection" ));
return seqServiceNames ; return seqServiceNames ;
} }
/* Helper for XServiceInfo */ /* Helper for XServiceInfo */
UNOOUSTRING ScFilterDetect::impl_getStaticImplementationName() OUString ScFilterDetect::impl_getStaticImplementationName()
{ {
return UNOOUSTRING(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.calc.FormatDetector" )); return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.calc.FormatDetector" ));
} }
/* Helper for registry */ /* Helper for registry */
......
...@@ -489,16 +489,16 @@ SdFilterDetect::~SdFilterDetect() ...@@ -489,16 +489,16 @@ SdFilterDetect::~SdFilterDetect()
SFX_IMPL_SINGLEFACTORY( SdFilterDetect ) SFX_IMPL_SINGLEFACTORY( SdFilterDetect )
/* XServiceInfo */ /* XServiceInfo */
UNOOUSTRING SAL_CALL SdFilterDetect::getImplementationName() throw( UNORUNTIMEEXCEPTION ) rtl::OUString SAL_CALL SdFilterDetect::getImplementationName() throw( UNORUNTIMEEXCEPTION )
{ {
return impl_getStaticImplementationName(); return impl_getStaticImplementationName();
} }
\ \
/* XServiceInfo */ /* 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(); UNOSEQUENCE< rtl::OUString > seqServiceNames = getSupportedServiceNames();
const UNOOUSTRING* pArray = seqServiceNames.getConstArray(); const rtl::OUString* pArray = seqServiceNames.getConstArray();
for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ ) for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ )
{ {
if ( pArray[nCounter] == sServiceName ) if ( pArray[nCounter] == sServiceName )
...@@ -510,23 +510,23 @@ sal_Bool SAL_CALL SdFilterDetect::supportsService( const UNOOUSTRING& sServiceNa ...@@ -510,23 +510,23 @@ sal_Bool SAL_CALL SdFilterDetect::supportsService( const UNOOUSTRING& sServiceNa
} }
/* XServiceInfo */ /* XServiceInfo */
UNOSEQUENCE< UNOOUSTRING > SAL_CALL SdFilterDetect::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION ) UNOSEQUENCE< rtl::OUString > SAL_CALL SdFilterDetect::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION )
{ {
return impl_getStaticSupportedServiceNames(); return impl_getStaticSupportedServiceNames();
} }
/* Helper for XServiceInfo */ /* Helper for XServiceInfo */
UNOSEQUENCE< UNOOUSTRING > SdFilterDetect::impl_getStaticSupportedServiceNames() UNOSEQUENCE< rtl::OUString > SdFilterDetect::impl_getStaticSupportedServiceNames()
{ {
UNOSEQUENCE< UNOOUSTRING > seqServiceNames( 1 ); UNOSEQUENCE< rtl::OUString > seqServiceNames( 1 );
seqServiceNames.getArray() [0] = UNOOUSTRING(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ExtendedTypeDetection" )); seqServiceNames.getArray() [0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ExtendedTypeDetection" ));
return seqServiceNames ; return seqServiceNames ;
} }
/* Helper for XServiceInfo */ /* 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 */ /* Helper for registry */
......
...@@ -143,8 +143,8 @@ REFERENCE< XDISPATCH > SAL_CALL SdUnoModule::queryDispatch( const UNOURL& aURL, ...@@ -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) sal_Bool SAL_CALL SdUnoModule::supportsService( const ::rtl::OUString& sServiceName ) throw(::com::sun::star::uno::RuntimeException)
{ {
UNOSEQUENCE< UNOOUSTRING > seqServiceNames = getSupportedServiceNames(); UNOSEQUENCE< rtl::OUString > seqServiceNames = getSupportedServiceNames();
const UNOOUSTRING* pArray = seqServiceNames.getConstArray(); const rtl::OUString* pArray = seqServiceNames.getConstArray();
for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ ) for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ )
{ {
if ( pArray[nCounter] == sServiceName ) if ( pArray[nCounter] == sServiceName )
......
This diff is collapsed.
...@@ -664,16 +664,16 @@ void SfxFrameLoader_Impl::cancel() throw( RuntimeException ) ...@@ -664,16 +664,16 @@ void SfxFrameLoader_Impl::cancel() throw( RuntimeException )
SFX_IMPL_SINGLEFACTORY( SfxFrameLoader_Impl ) SFX_IMPL_SINGLEFACTORY( SfxFrameLoader_Impl )
/* XServiceInfo */ /* XServiceInfo */
UNOOUSTRING SAL_CALL SfxFrameLoader_Impl::getImplementationName() throw( RuntimeException ) rtl::OUString SAL_CALL SfxFrameLoader_Impl::getImplementationName() throw( RuntimeException )
{ {
return impl_getStaticImplementationName(); return impl_getStaticImplementationName();
} }
\ \
/* XServiceInfo */ /* XServiceInfo */
sal_Bool SAL_CALL SfxFrameLoader_Impl::supportsService( const UNOOUSTRING& sServiceName ) throw( RuntimeException ) sal_Bool SAL_CALL SfxFrameLoader_Impl::supportsService( const rtl::OUString& sServiceName ) throw( RuntimeException )
{ {
UNOSEQUENCE< UNOOUSTRING > seqServiceNames = getSupportedServiceNames(); UNOSEQUENCE< rtl::OUString > seqServiceNames = getSupportedServiceNames();
const UNOOUSTRING* pArray = seqServiceNames.getConstArray(); const rtl::OUString* pArray = seqServiceNames.getConstArray();
for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ ) for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ )
{ {
if ( pArray[nCounter] == sServiceName ) if ( pArray[nCounter] == sServiceName )
...@@ -685,22 +685,22 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::supportsService( const UNOOUSTRING& sServ ...@@ -685,22 +685,22 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::supportsService( const UNOOUSTRING& sServ
} }
/* XServiceInfo */ /* XServiceInfo */
UNOSEQUENCE< UNOOUSTRING > SAL_CALL SfxFrameLoader_Impl::getSupportedServiceNames() throw( RuntimeException ) UNOSEQUENCE< rtl::OUString > SAL_CALL SfxFrameLoader_Impl::getSupportedServiceNames() throw( RuntimeException )
{ {
return impl_getStaticSupportedServiceNames(); return impl_getStaticSupportedServiceNames();
} }
/* Helper for XServiceInfo */ /* Helper for XServiceInfo */
UNOSEQUENCE< UNOOUSTRING > SfxFrameLoader_Impl::impl_getStaticSupportedServiceNames() UNOSEQUENCE< rtl::OUString > SfxFrameLoader_Impl::impl_getStaticSupportedServiceNames()
{ {
UNOMUTEXGUARD aGuard( UNOMUTEX::getGlobalMutex() ); UNOMUTEXGUARD aGuard( UNOMUTEX::getGlobalMutex() );
UNOSEQUENCE< UNOOUSTRING > seqServiceNames( 1 ); UNOSEQUENCE< rtl::OUString > seqServiceNames( 1 );
seqServiceNames.getArray() [0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.SynchronousFrameLoader" )); seqServiceNames.getArray() [0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.SynchronousFrameLoader" ));
return seqServiceNames ; return seqServiceNames ;
} }
/* Helper for XServiceInfo */ /* Helper for XServiceInfo */
UNOOUSTRING SfxFrameLoader_Impl::impl_getStaticImplementationName() rtl::OUString SfxFrameLoader_Impl::impl_getStaticImplementationName()
{ {
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.office.FrameLoader" )); return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.office.FrameLoader" ));
} }
......
...@@ -420,16 +420,16 @@ SmFilterDetect::~SmFilterDetect() ...@@ -420,16 +420,16 @@ SmFilterDetect::~SmFilterDetect()
SFX_IMPL_SINGLEFACTORY( SmFilterDetect ) SFX_IMPL_SINGLEFACTORY( SmFilterDetect )
/* XServiceInfo */ /* XServiceInfo */
UNOOUSTRING SAL_CALL SmFilterDetect::getImplementationName() throw( UNORUNTIMEEXCEPTION ) rtl::OUString SAL_CALL SmFilterDetect::getImplementationName() throw( UNORUNTIMEEXCEPTION )
{ {
return impl_getStaticImplementationName(); return impl_getStaticImplementationName();
} }
\ \
/* XServiceInfo */ /* XServiceInfo */
sal_Bool SAL_CALL SmFilterDetect::supportsService( const UNOOUSTRING& sServiceName ) throw( UNORUNTIMEEXCEPTION ) sal_Bool SAL_CALL SmFilterDetect::supportsService( const rtl::OUString& sServiceName ) throw( UNORUNTIMEEXCEPTION )
{ {
UNOSEQUENCE< UNOOUSTRING > seqServiceNames = getSupportedServiceNames(); UNOSEQUENCE< rtl::OUString > seqServiceNames = getSupportedServiceNames();
const UNOOUSTRING* pArray = seqServiceNames.getConstArray(); const rtl::OUString* pArray = seqServiceNames.getConstArray();
for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ ) for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ )
{ {
if ( pArray[nCounter] == sServiceName ) if ( pArray[nCounter] == sServiceName )
...@@ -441,23 +441,23 @@ sal_Bool SAL_CALL SmFilterDetect::supportsService( const UNOOUSTRING& sServiceNa ...@@ -441,23 +441,23 @@ sal_Bool SAL_CALL SmFilterDetect::supportsService( const UNOOUSTRING& sServiceNa
} }
/* XServiceInfo */ /* XServiceInfo */
UNOSEQUENCE< UNOOUSTRING > SAL_CALL SmFilterDetect::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION ) UNOSEQUENCE< rtl::OUString > SAL_CALL SmFilterDetect::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION )
{ {
return impl_getStaticSupportedServiceNames(); return impl_getStaticSupportedServiceNames();
} }
/* Helper for XServiceInfo */ /* Helper for XServiceInfo */
UNOSEQUENCE< UNOOUSTRING > SmFilterDetect::impl_getStaticSupportedServiceNames() UNOSEQUENCE< rtl::OUString > SmFilterDetect::impl_getStaticSupportedServiceNames()
{ {
UNOSEQUENCE< UNOOUSTRING > seqServiceNames( 1 ); UNOSEQUENCE< rtl::OUString > seqServiceNames( 1 );
seqServiceNames.getArray() [0] = UNOOUSTRING(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ExtendedTypeDetection" )); seqServiceNames.getArray() [0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ExtendedTypeDetection" ));
return seqServiceNames ; return seqServiceNames ;
} }
/* Helper for XServiceInfo */ /* Helper for XServiceInfo */
UNOOUSTRING SmFilterDetect::impl_getStaticImplementationName() rtl::OUString SmFilterDetect::impl_getStaticImplementationName()
{ {
return UNOOUSTRING(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.math.FormatDetector" )); return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.math.FormatDetector" ));
} }
/* Helper for registry */ /* Helper for registry */
......
...@@ -426,16 +426,16 @@ SwFilterDetect::~SwFilterDetect() ...@@ -426,16 +426,16 @@ SwFilterDetect::~SwFilterDetect()
SFX_IMPL_SINGLEFACTORY( SwFilterDetect ) SFX_IMPL_SINGLEFACTORY( SwFilterDetect )
/* XServiceInfo */ /* XServiceInfo */
UNOOUSTRING SAL_CALL SwFilterDetect::getImplementationName() throw( UNORUNTIMEEXCEPTION ) rtl::OUString SAL_CALL SwFilterDetect::getImplementationName() throw( UNORUNTIMEEXCEPTION )
{ {
return impl_getStaticImplementationName(); return impl_getStaticImplementationName();
} }
\ \
/* XServiceInfo */ /* XServiceInfo */
sal_Bool SAL_CALL SwFilterDetect::supportsService( const UNOOUSTRING& sServiceName ) throw( UNORUNTIMEEXCEPTION ) sal_Bool SAL_CALL SwFilterDetect::supportsService( const rtl::OUString& sServiceName ) throw( UNORUNTIMEEXCEPTION )
{ {
UNOSEQUENCE< UNOOUSTRING > seqServiceNames = getSupportedServiceNames(); UNOSEQUENCE< rtl::OUString > seqServiceNames = getSupportedServiceNames();
const UNOOUSTRING* pArray = seqServiceNames.getConstArray(); const rtl::OUString* pArray = seqServiceNames.getConstArray();
for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ ) for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ )
{ {
if ( pArray[nCounter] == sServiceName ) if ( pArray[nCounter] == sServiceName )
...@@ -447,15 +447,15 @@ sal_Bool SAL_CALL SwFilterDetect::supportsService( const UNOOUSTRING& sServiceNa ...@@ -447,15 +447,15 @@ sal_Bool SAL_CALL SwFilterDetect::supportsService( const UNOOUSTRING& sServiceNa
} }
/* XServiceInfo */ /* XServiceInfo */
UNOSEQUENCE< UNOOUSTRING > SAL_CALL SwFilterDetect::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION ) UNOSEQUENCE< rtl::OUString > SAL_CALL SwFilterDetect::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION )
{ {
return impl_getStaticSupportedServiceNames(); return impl_getStaticSupportedServiceNames();
} }
/* Helper for XServiceInfo */ /* Helper for XServiceInfo */
UNOSEQUENCE< UNOOUSTRING > SwFilterDetect::impl_getStaticSupportedServiceNames() UNOSEQUENCE< rtl::OUString > SwFilterDetect::impl_getStaticSupportedServiceNames()
{ {
UNOSEQUENCE< UNOOUSTRING > seqServiceNames( 3 ); UNOSEQUENCE< rtl::OUString > seqServiceNames( 3 );
seqServiceNames.getArray() [0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ExtendedTypeDetection" )); seqServiceNames.getArray() [0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ExtendedTypeDetection" ));
seqServiceNames.getArray() [1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.FormatDetector" )); seqServiceNames.getArray() [1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.FormatDetector" ));
seqServiceNames.getArray() [2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.W4WFormatDetector" )); seqServiceNames.getArray() [2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.W4WFormatDetector" ));
...@@ -463,7 +463,7 @@ UNOSEQUENCE< UNOOUSTRING > SwFilterDetect::impl_getStaticSupportedServiceNames() ...@@ -463,7 +463,7 @@ UNOSEQUENCE< UNOOUSTRING > SwFilterDetect::impl_getStaticSupportedServiceNames()
} }
/* Helper for XServiceInfo */ /* Helper for XServiceInfo */
UNOOUSTRING SwFilterDetect::impl_getStaticImplementationName() rtl::OUString SwFilterDetect::impl_getStaticImplementationName()
{ {
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.writer.FormatDetector" )); return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.writer.FormatDetector" ));
} }
......
...@@ -152,8 +152,8 @@ REFERENCE< XDISPATCH > SAL_CALL SwUnoModule::queryDispatch( ...@@ -152,8 +152,8 @@ REFERENCE< XDISPATCH > SAL_CALL SwUnoModule::queryDispatch(
sal_Bool SAL_CALL SwUnoModule::supportsService( const ::rtl::OUString& sServiceName ) throw(uno::RuntimeException) sal_Bool SAL_CALL SwUnoModule::supportsService( const ::rtl::OUString& sServiceName ) throw(uno::RuntimeException)
{ {
UNOSEQUENCE< UNOOUSTRING > seqServiceNames = getSupportedServiceNames(); UNOSEQUENCE< rtl::OUString > seqServiceNames = getSupportedServiceNames();
const UNOOUSTRING* pArray = seqServiceNames.getConstArray(); const rtl::OUString* pArray = seqServiceNames.getConstArray();
for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ ) for ( sal_Int32 nCounter=0; nCounter<seqServiceNames.getLength(); nCounter++ )
{ {
if ( pArray[nCounter] == sServiceName ) if ( pArray[nCounter] == sServiceName )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment