summaryrefslogtreecommitdiff
path: root/sax
diff options
context:
space:
mode:
Diffstat (limited to 'sax')
-rw-r--r--sax/source/expatwrap/sax_expat.cxx8
-rw-r--r--sax/source/fastparser/facreg.cxx8
-rw-r--r--sax/source/fastparser/fastparser.cxx4
-rw-r--r--sax/source/tools/fastserializer.cxx6
-rw-r--r--sax/test/saxdemo.cxx3
5 files changed, 14 insertions, 15 deletions
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index 7de05b6c7e4c..f1e5470da9bd 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -596,7 +596,7 @@ void SaxExpatParser::setLocale( const Locale & locale ) throw (RuntimeException)
// XServiceInfo
OUString SaxExpatParser::getImplementationName() throw ()
{
- return OUString::createFromAscii( IMPLEMENTATION_NAME );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM( IMPLEMENTATION_NAME ));
}
// XServiceInfo
@@ -617,7 +617,7 @@ Sequence< OUString > SaxExpatParser::getSupportedServiceNames(void) throw ()
{
Sequence<OUString> seq(1);
- seq.getArray()[0] = OUString::createFromAscii( SERVICE_NAME );
+ seq.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ));
return seq;
}
@@ -1047,8 +1047,8 @@ sal_Bool SAL_CALL component_writeInfo(
reinterpret_cast< XRegistryKey * >( pRegistryKey ) );
Reference< XRegistryKey > xNewKey = xKey->createKey(
- OUString::createFromAscii( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" ) );
- xNewKey->createKey( OUString::createFromAscii( SERVICE_NAME ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "/" IMPLEMENTATION_NAME "/UNO/SERVICES" )) );
+ xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME )) );
xNewKey = xKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/")) +
SaxWriter_getImplementationName()+
diff --git a/sax/source/fastparser/facreg.cxx b/sax/source/fastparser/facreg.cxx
index 7d968ad1b219..bd66ab30c79e 100644
--- a/sax/source/fastparser/facreg.cxx
+++ b/sax/source/fastparser/facreg.cxx
@@ -52,12 +52,12 @@ sal_Bool SAL_CALL component_writeInfo(
Reference< XRegistryKey > xKey( reinterpret_cast< XRegistryKey * >( pRegistryKey ) );
Reference< XRegistryKey > xNewKey( xKey->createKey(
- OUString::createFromAscii( "/" PARSER_IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) );
- xNewKey->createKey( OUString::createFromAscii( PARSER_SERVICE_NAME ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "/" PARSER_IMPLEMENTATION_NAME "/UNO/SERVICES" )) ) );
+ xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( PARSER_SERVICE_NAME )) );
Reference< XRegistryKey > xNewKey1( xKey->createKey(
- OUString::createFromAscii( "/" SERIALIZER_IMPLEMENTATION_NAME "/UNO/SERVICES" ) ) );
- xNewKey1->createKey( OUString::createFromAscii( SERIALIZER_SERVICE_NAME ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "/" SERIALIZER_IMPLEMENTATION_NAME "/UNO/SERVICES" )) ) );
+ xNewKey1->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM( SERIALIZER_SERVICE_NAME )) );
return sal_True;
}
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 90596009c617..9fdd0117599e 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -551,7 +551,7 @@ Sequence< OUString > FastSaxParser::getSupportedServiceNames_Static(void)
// XServiceInfo
OUString FastSaxParser::getImplementationName() throw (RuntimeException)
{
- return OUString::createFromAscii( PARSER_IMPLEMENTATION_NAME );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM( PARSER_IMPLEMENTATION_NAME ));
}
// XServiceInfo
@@ -572,7 +572,7 @@ Sequence< OUString > FastSaxParser::getSupportedServiceNames(void) throw (Runtim
{
Sequence<OUString> seq(1);
- seq.getArray()[0] = OUString::createFromAscii( PARSER_SERVICE_NAME );
+ seq.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( PARSER_SERVICE_NAME ));
return seq;
}
diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx
index 5f31a232bdf4..47e865c25785 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -296,7 +296,7 @@ namespace sax_fastparser {
// XServiceInfo
OUString FastSaxSerializer::getImplementationName() throw (RuntimeException)
{
- return OUString::createFromAscii( SERIALIZER_IMPLEMENTATION_NAME );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM( SERIALIZER_IMPLEMENTATION_NAME ));
}
// XServiceInfo
@@ -316,13 +316,13 @@ namespace sax_fastparser {
Sequence< OUString > FastSaxSerializer::getSupportedServiceNames(void) throw (RuntimeException)
{
Sequence<OUString> seq(1);
- seq.getArray()[0] = OUString::createFromAscii( SERIALIZER_SERVICE_NAME );
+ seq.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SERIALIZER_SERVICE_NAME ));
return seq;
}
OUString FastSaxSerializer::getImplementationName_Static()
{
- return OUString::createFromAscii( SERIALIZER_IMPLEMENTATION_NAME );
+ return OUString(RTL_CONSTASCII_USTRINGPARAM( SERIALIZER_IMPLEMENTATION_NAME ));
}
Sequence< OUString > FastSaxSerializer::getSupportedServiceNames_Static(void)
diff --git a/sax/test/saxdemo.cxx b/sax/test/saxdemo.cxx
index 28799f780dde..2c145b999683 100644
--- a/sax/test/saxdemo.cxx
+++ b/sax/test/saxdemo.cxx
@@ -521,8 +521,7 @@ int main (int argc, char **argv)
try
{
// Load dll for the tested component
- OUString aDllName =
- OUString::createFromAscii( "sax.uno" SAL_DLLEXTENSION );
+ OUString aDllName(RTL_CONSTASCII_USTRINGPARAM( "sax.uno" SAL_DLLEXTENSION ));
xReg->registerImplementation(
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.loader.SharedLibrary")),
aDllName,