[Libreoffice-commits] .: i18npool/source svl/source

[Thomas Arnhold]

 i18npool/source/localedata/LocaleNode.cxx |    2 +-
 svl/source/items/srchitem.cxx             |   24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 88d6104236dee2f154c590d1ec3895ffb225dcc6
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Fri Jan 28 16:26:37 2011 +0100

    Replace suitable equalsAscii calls with equalsAsciiL.

diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index cf91a0f..0c757d8 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -233,7 +233,7 @@ void print_node( const LocaleNode* p, int depth=0 )
 void LocaleNode :: generateCode (const OFileWriter &of) const
 {
     ::rtl::OUString aDTD = getAttr().getValueByName("versionDTD");
-    if (!aDTD.equalsAscii( LOCALE_VERSION_DTD))
+    if (!aDTD.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(LOCALE_VERSION_DTD)))
     {
         ++nError;
         fprintf( stderr, "Error: Locale versionDTD is not %s, see comment in locale.dtd\n", LOCALE_VERSION_DTD);
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index d121cbf..0ee9925 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -538,12 +538,12 @@ bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMember
                 sal_Int16 nConvertedCount( 0 );
                 for ( sal_Int32 i = 0; i < aSeq.getLength(); ++i )
                 {
-                    if ( aSeq[i].Name.equalsAscii( SRCH_PARA_OPTIONS ) )
+                    if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_OPTIONS ) ) )
                     {
                         if ( ( aSeq[i].Value >>= aSearchOpt ) == sal_True )
                             ++nConvertedCount;
                     }
-                    else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_FAMILY ) )
+                    else if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_FAMILY ) ) )
                     {
                         sal_uInt16 nTemp( 0 );
                         if ( ( aSeq[i].Value >>= nTemp ) == sal_True )
@@ -552,52 +552,52 @@ bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMember
                             ++nConvertedCount;
                         }
                     }
-                    else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_COMMAND ) )
+                    else if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_COMMAND ) ) )
                     {
                         if ( ( aSeq[i].Value >>= nCommand ) == sal_True )
                             ++nConvertedCount;
                     }
-                    else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_CELLTYPE ) )
+                    else if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_CELLTYPE ) ) )
                     {
                         if ( ( aSeq[i].Value >>= nCellType ) == sal_True )
                             ++nConvertedCount;
                     }
-                    else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_APPFLAG ) )
+                    else if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_APPFLAG ) ) )
                     {
                         if ( ( aSeq[i].Value >>= nAppFlag ) == sal_True )
                             ++nConvertedCount;
                     }
-                    else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_ROWDIR ) )
+                    else if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_ROWDIR ) ) )
                     {
                         if ( ( aSeq[i].Value >>= bRowDirection ) == sal_True )
                             ++nConvertedCount;
                     }
-                    else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_ALLTABLES ) )
+                    else if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_ALLTABLES ) ) )
                     {
                         if ( ( aSeq[i].Value >>= bAllTables ) == sal_True )
                             ++nConvertedCount;
                     }
-                    else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_SEARCHFILTERED ) )
+                    else if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_SEARCHFILTERED ) ) )
                     {
                         if ( ( aSeq[i].Value >>= bSearchFiltered ) == sal_True )
                             ++nConvertedCount;
                     }
-                    else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_BACKWARD ) )
+                    else if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_BACKWARD ) ) )
                     {
                         if ( ( aSeq[i].Value >>= bBackward ) == sal_True )
                             ++nConvertedCount;
                     }
-                    else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_PATTERN ) )
+                    else if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_PATTERN ) ) )
                     {
                         if ( ( aSeq[i].Value >>= bPattern ) == sal_True )
                             ++nConvertedCount;
                     }
-                    else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_CONTENT ) )
+                    else if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_CONTENT ) ) )
                     {
                         if ( ( aSeq[i].Value >>= bContent ) == sal_True )
                             ++nConvertedCount;
                     }
-                    else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_ASIANOPT ) )
+                    else if ( aSeq[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( SRCH_PARA_ASIANOPT ) ) )
                     {
                         if ( ( aSeq[i].Value >>= bAsianOptions ) == sal_True )
                             ++nConvertedCount;