[Libreoffice-commits] .: padmin/source sax/source

[Thorsten Behrens]

 padmin/source/pamain.cxx             |    4 ++--
 sax/source/fastparser/fastparser.cxx |   14 +++++++-------
 sax/source/tools/fastserializer.cxx  |    6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 017b1c5d0a1f6ceaa9a4810400d32477c13183b1
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Fri Jun 1 17:07:07 2012 +0200

    Targeted string re-work in padmin and sax

diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx
index 571d44d..58e3dc3 100644
--- a/padmin/source/pamain.cxx
+++ b/padmin/source/pamain.cxx
@@ -121,8 +121,8 @@ int MyApp::Main()
      *  Create UCB.
      */
     Sequence< Any > aArgs( 2 );
-    aArgs[ 0 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
-    aArgs[ 1 ] <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
+    aArgs[ 0 ] <<= OUString( UCB_CONFIGURATION_KEY1_LOCAL );
+    aArgs[ 1 ] <<= OUString( UCB_CONFIGURATION_KEY2_OFFICE );
 #if OSL_DEBUG_LEVEL > 1
     sal_Bool bSuccess =
 #endif
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index a320c90..b773d8a 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -453,7 +453,7 @@ void FastSaxParser::parseStream( const InputSource& maStructSource) throw (SAXEx
     entity.maStructSource = maStructSource;
 
     if( !entity.maStructSource.aInputStream.is() )
-        throw SAXException( OUString( RTL_CONSTASCII_USTRINGPARAM( "No input source" ) ), Reference< XInterface >(), Any() );
+        throw SAXException( OUString(  "No input source" ), Reference< XInterface >(), Any() );
 
     entity.maConverter.setInputStream( entity.maStructSource.aInputStream );
     if( !entity.maStructSource.sEncoding.isEmpty() )
@@ -462,7 +462,7 @@ void FastSaxParser::parseStream( const InputSource& maStructSource) throw (SAXEx
     // create parser with proper encoding
     entity.mpParser = XML_ParserCreate( 0 );
     if( !entity.mpParser )
-        throw SAXException( OUString( RTL_CONSTASCII_USTRINGPARAM( "Couldn't create parser" ) ), Reference< XInterface >(), Any() );
+        throw SAXException( OUString( "Couldn't create parser" ), Reference< XInterface >(), Any() );
 
     // set all necessary C-Callbacks
     XML_SetUserData( entity.mpParser, this );
@@ -566,14 +566,14 @@ void FastSaxParser::setLocale( const Locale & Locale ) throw (RuntimeException)
 Sequence< OUString > FastSaxParser::getSupportedServiceNames_Static(void)
 {
     Sequence<OUString> aRet(1);
-    aRet.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(PARSER_SERVICE_NAME) );
+    aRet.getArray()[0] = ::rtl::OUString( PARSER_SERVICE_NAME );
     return aRet;
 }
 
 // XServiceInfo
 OUString FastSaxParser::getImplementationName() throw (RuntimeException)
 {
-    return OUString(RTL_CONSTASCII_USTRINGPARAM( PARSER_IMPLEMENTATION_NAME ));
+    return OUString( PARSER_IMPLEMENTATION_NAME );
 }
 
 // XServiceInfo
@@ -594,7 +594,7 @@ Sequence< OUString > FastSaxParser::getSupportedServiceNames(void) throw (Runtim
 {
 
     Sequence<OUString> seq(1);
-    seq.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( PARSER_SERVICE_NAME ));
+    seq.getArray()[0] = OUString( PARSER_SERVICE_NAME );
     return seq;
 }
 
@@ -911,8 +911,8 @@ void FastSaxParser::callbackEntityDecl(
         OSL_TRACE("FastSaxParser: internal entity declaration, stopping");
         XML_StopParser(getEntity().mpParser, XML_FALSE);
         getEntity().maSavedException <<= SAXParseException(
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                    "FastSaxParser: internal entity declaration, stopping")),
+            ::rtl::OUString(
+                    "FastSaxParser: internal entity declaration, stopping"),
             static_cast<OWeakObject*>(this), Any(),
             mxDocumentLocator->getPublicId(),
             mxDocumentLocator->getSystemId(),
diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx
index b5bc636..8f2a95f 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -301,7 +301,7 @@ namespace sax_fastparser {
     // XServiceInfo
     OUString FastSaxSerializer::getImplementationName() throw (RuntimeException)
     {
-        return OUString(RTL_CONSTASCII_USTRINGPARAM( SERIALIZER_IMPLEMENTATION_NAME ));
+        return OUString( SERIALIZER_IMPLEMENTATION_NAME );
     }
 
     // XServiceInfo
@@ -321,14 +321,14 @@ namespace sax_fastparser {
     Sequence< OUString > FastSaxSerializer::getSupportedServiceNames(void) throw (RuntimeException)
     {
         Sequence<OUString> seq(1);
-        seq.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( SERIALIZER_SERVICE_NAME ));
+        seq.getArray()[0] = OUString( SERIALIZER_SERVICE_NAME );
         return seq;
     }
 
     Sequence< OUString > FastSaxSerializer::getSupportedServiceNames_Static(void)
     {
         Sequence<OUString> aRet(1);
-        aRet.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM(SERIALIZER_SERVICE_NAME) );
+        aRet.getArray()[0] = OUString( SERIALIZER_SERVICE_NAME );
         return aRet;
     }