[Libreoffice-commits] .: l10ntools/source padmin/source sax/source sax/test
Gert Faller
gfaller at kemper.freedesktop.org
Tue Nov 23 10:51:53 PST 2010
l10ntools/source/xmlparse.cxx | 4 ++--
padmin/source/pamain.cxx | 4 ++--
sax/source/expatwrap/sax_expat.cxx | 8 ++++----
sax/source/fastparser/facreg.cxx | 8 ++++----
sax/source/fastparser/fastparser.cxx | 4 ++--
sax/source/tools/fastserializer.cxx | 6 +++---
sax/test/saxdemo.cxx | 3 +--
7 files changed, 18 insertions(+), 19 deletions(-)
New commits:
commit 9fbbf75b7ce4f6f14c7a15381e1bb1131abf1323
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Tue Nov 23 19:50:59 2010 +0100
RTL_CONSTASCII_USTRINGPARAM in libs-gui 15
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index 4310bcd..d8a69a8 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -931,9 +931,9 @@ void XMLElement::Print(XMLNode *pCur, OUStringBuffer& buffer , bool rootelement
buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM(" ")) );
buffer.append( aAttrName );
buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("=")) );
- buffer.append( OUString::createFromAscii("\\\"") );
+ buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("\\\"")) );
buffer.append( pElement->GetAttributeList()->GetObject( j )->GetValue() );
- buffer.append( OUString::createFromAscii("\\\"") );
+ buffer.append( OUString(RTL_CONSTASCII_USTRINGPARAM("\\\"")) );
}
}
}
diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx
index 352b54b..4b2c949 100644
--- a/padmin/source/pamain.cxx
+++ b/padmin/source/pamain.cxx
@@ -129,8 +129,8 @@ void MyApp::Main()
* Create UCB.
*/
Sequence< Any > aArgs( 2 );
- aArgs[ 0 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
- aArgs[ 1 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
+ aArgs[ 0 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
+ aArgs[ 1 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
#if OSL_DEBUG_LEVEL > 1
sal_Bool bSuccess =
#endif
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index 52d55a7..048f96a 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 3f9900c..8635f5a 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 d4c6537..a1a56f5 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 5f31a23..47e865c 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 27d365c..acf78e4 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,
More information about the Libreoffice-commits
mailing list