summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sc/source/ui/unoobj/scdetect.cxx20
-rw-r--r--sd/source/ui/unoidl/sddetect.cxx20
-rw-r--r--sd/source/ui/unoidl/unomodule.cxx4
-rw-r--r--sfx2/inc/sfx2/sfxuno.hxx33
-rw-r--r--sfx2/source/view/frmload.cxx16
-rw-r--r--starmath/source/smdetect.cxx20
-rw-r--r--sw/source/ui/uno/swdetect.cxx16
-rw-r--r--sw/source/ui/uno/unomodule.cxx4
8 files changed, 66 insertions, 67 deletions
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index d45fbd536314..a460a02bfea1 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -869,16 +869,16 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
SFX_IMPL_SINGLEFACTORY( ScFilterDetect )
/* XServiceInfo */
-UNOOUSTRING SAL_CALL ScFilterDetect::getImplementationName() throw( UNORUNTIMEEXCEPTION )
+rtl::OUString SAL_CALL ScFilterDetect::getImplementationName() throw( UNORUNTIMEEXCEPTION )
{
return impl_getStaticImplementationName();
}
\
/* 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());
- 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 )
@@ -890,23 +890,23 @@ sal_Bool SAL_CALL ScFilterDetect::supportsService( const UNOOUSTRING& sServiceNa
}
/* XServiceInfo */
-UNOSEQUENCE< UNOOUSTRING > SAL_CALL ScFilterDetect::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION )
+UNOSEQUENCE< rtl::OUString > SAL_CALL ScFilterDetect::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION )
{
return impl_getStaticSupportedServiceNames();
}
/* Helper for XServiceInfo */
-UNOSEQUENCE< UNOOUSTRING > ScFilterDetect::impl_getStaticSupportedServiceNames()
+UNOSEQUENCE< rtl::OUString > ScFilterDetect::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 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 */
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 )
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 ) \
}
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index 7b8a58346b30..c8f7f271868f 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -664,16 +664,16 @@ void SfxFrameLoader_Impl::cancel() throw( RuntimeException )
SFX_IMPL_SINGLEFACTORY( SfxFrameLoader_Impl )
/* XServiceInfo */
-UNOOUSTRING SAL_CALL SfxFrameLoader_Impl::getImplementationName() throw( RuntimeException )
+rtl::OUString SAL_CALL SfxFrameLoader_Impl::getImplementationName() throw( RuntimeException )
{
return impl_getStaticImplementationName();
}
\
/* 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();
- 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 )
@@ -685,22 +685,22 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::supportsService( const UNOOUSTRING& sServ
}
/* XServiceInfo */
-UNOSEQUENCE< UNOOUSTRING > SAL_CALL SfxFrameLoader_Impl::getSupportedServiceNames() throw( RuntimeException )
+UNOSEQUENCE< rtl::OUString > SAL_CALL SfxFrameLoader_Impl::getSupportedServiceNames() throw( RuntimeException )
{
return impl_getStaticSupportedServiceNames();
}
/* Helper for XServiceInfo */
-UNOSEQUENCE< UNOOUSTRING > SfxFrameLoader_Impl::impl_getStaticSupportedServiceNames()
+UNOSEQUENCE< rtl::OUString > SfxFrameLoader_Impl::impl_getStaticSupportedServiceNames()
{
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" ));
return seqServiceNames ;
}
/* 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" ));
}
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index c2d0a5c596ba..63b0314309cd 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -420,16 +420,16 @@ SmFilterDetect::~SmFilterDetect()
SFX_IMPL_SINGLEFACTORY( SmFilterDetect )
/* XServiceInfo */
-UNOOUSTRING SAL_CALL SmFilterDetect::getImplementationName() throw( UNORUNTIMEEXCEPTION )
+rtl::OUString SAL_CALL SmFilterDetect::getImplementationName() throw( UNORUNTIMEEXCEPTION )
{
return impl_getStaticImplementationName();
}
\
/* 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();
- 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 )
@@ -441,23 +441,23 @@ sal_Bool SAL_CALL SmFilterDetect::supportsService( const UNOOUSTRING& sServiceNa
}
/* XServiceInfo */
-UNOSEQUENCE< UNOOUSTRING > SAL_CALL SmFilterDetect::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION )
+UNOSEQUENCE< rtl::OUString > SAL_CALL SmFilterDetect::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION )
{
return impl_getStaticSupportedServiceNames();
}
/* Helper for XServiceInfo */
-UNOSEQUENCE< UNOOUSTRING > SmFilterDetect::impl_getStaticSupportedServiceNames()
+UNOSEQUENCE< rtl::OUString > SmFilterDetect::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 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 */
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index cf4d6135ac91..bcba59fe8340 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -426,16 +426,16 @@ SwFilterDetect::~SwFilterDetect()
SFX_IMPL_SINGLEFACTORY( SwFilterDetect )
/* XServiceInfo */
-UNOOUSTRING SAL_CALL SwFilterDetect::getImplementationName() throw( UNORUNTIMEEXCEPTION )
+rtl::OUString SAL_CALL SwFilterDetect::getImplementationName() throw( UNORUNTIMEEXCEPTION )
{
return impl_getStaticImplementationName();
}
\
/* 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();
- 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 )
@@ -447,15 +447,15 @@ sal_Bool SAL_CALL SwFilterDetect::supportsService( const UNOOUSTRING& sServiceNa
}
/* XServiceInfo */
-UNOSEQUENCE< UNOOUSTRING > SAL_CALL SwFilterDetect::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION )
+UNOSEQUENCE< rtl::OUString > SAL_CALL SwFilterDetect::getSupportedServiceNames() throw( UNORUNTIMEEXCEPTION )
{
return impl_getStaticSupportedServiceNames();
}
/* 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() [1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.FormatDetector" ));
seqServiceNames.getArray() [2] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.W4WFormatDetector" ));
@@ -463,7 +463,7 @@ UNOSEQUENCE< UNOOUSTRING > SwFilterDetect::impl_getStaticSupportedServiceNames()
}
/* Helper for XServiceInfo */
-UNOOUSTRING SwFilterDetect::impl_getStaticImplementationName()
+rtl::OUString SwFilterDetect::impl_getStaticImplementationName()
{
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.writer.FormatDetector" ));
}
diff --git a/sw/source/ui/uno/unomodule.cxx b/sw/source/ui/uno/unomodule.cxx
index e9f74f30813f..6a033f61c1af 100644
--- a/sw/source/ui/uno/unomodule.cxx
+++ b/sw/source/ui/uno/unomodule.cxx
@@ -152,8 +152,8 @@ REFERENCE< XDISPATCH > SAL_CALL SwUnoModule::queryDispatch(
sal_Bool SAL_CALL SwUnoModule::supportsService( const ::rtl::OUString& sServiceName ) throw(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 )
generated by cgit (git 2.34.1) at 2025-02-22 00:29:47 +0000