[Libreoffice-commits] .: filter/source framework/source package/source svl/source

[Takeshi Abe]

 filter/source/config/cache/typedetection.cxx                      |    4 ++--
 framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx |    2 +-
 framework/source/uiconfiguration/uiconfigurationmanager.cxx       |    2 +-
 package/source/xstor/xfactory.cxx                                 |    2 +-
 svl/source/fsstor/fsfactory.cxx                                   |    4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit c91ff959b0527852fde12a5f994b30121ff3c817
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Thu Feb 16 00:21:01 2012 +0900

    Use RTL_CONSTASCII_STRINGPARAM instead of bare number

diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 0a06025..af907bc 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -454,7 +454,7 @@ sal_Bool TypeDetection::impl_getPreselectionForType(const ::rtl::OUString& sPreS
     {
         // We cant check a preselected type for a given stream!
         // So we must believe, that it can work ...
-        if (aParsedURL.Complete.equalsAsciiL("private:stream", 14))
+        if (aParsedURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("private:stream")))
             bBreakDetection = sal_True;
     }
 
@@ -1092,7 +1092,7 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript
     if (
         (sURL.isEmpty()                                     ) || // "non existing file" ?
         (!xStream.is()                                         ) || // non existing file !
-        (sURL.equalsIgnoreAsciiCaseAsciiL("private:stream", 14))    // not a good idea .-)
+        (sURL.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("private:stream")))    // not a good idea .-)
        )
         return ::rtl::OUString();
 
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index c4679f5..8e4aec6 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -273,7 +273,7 @@ void ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer,
                     OUString aUIElementName( aUIElementNames[n].copy( 0, nIndex ));
 
                     if (!aUIElementName.isEmpty() &&
-                        ( aExtension.equalsIgnoreAsciiCaseAsciiL( "xml", 3 )))
+                        ( aExtension.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xml"))))
                     {
                         aUIElementData.aResourceURL = aResURLPrefix + aUIElementName;
                         aUIElementData.aName        = aUIElementNames[n];
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 0803ff0..f0caf7f 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -216,7 +216,7 @@ void UIConfigurationManager::impl_preloadUIElementTypeList( sal_Int16 nElementTy
                     rtl::OUString aUIElementName( aUIElementNames[n].copy( 0, nIndex ));
 
                     if (!aUIElementName.isEmpty() &&
-                        ( aExtension.equalsIgnoreAsciiCaseAsciiL( "xml", 3 )))
+                        ( aExtension.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("xml"))))
                     {
                         aUIElementData.aResourceURL = aResURLPrefix + aUIElementName;
                         aUIElementData.aName        = aUIElementNames[n];
diff --git a/package/source/xstor/xfactory.cxx b/package/source/xstor/xfactory.cxx
index 3602ab0..7037e61 100644
--- a/package/source/xstor/xfactory.cxx
+++ b/package/source/xstor/xfactory.cxx
@@ -156,7 +156,7 @@ uno::Reference< uno::XInterface > SAL_CALL OStorageFactory::createInstanceWithAr
             throw lang::IllegalArgumentException(); // TODO:
         }
 
-        if ( aURL.equalsIgnoreAsciiCaseAsciiL( "vnd.sun.star.pkg", 16 ) )
+        if ( aURL.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.pkg")) )
         {
             OSL_FAIL( "Packages URL's are not valid for storages!\n" ); // ???
             throw lang::IllegalArgumentException(); // TODO:
diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx
index 8e21da6..ae9427d 100644
--- a/svl/source/fsstor/fsfactory.cxx
+++ b/svl/source/fsstor/fsfactory.cxx
@@ -143,8 +143,8 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithA
 
     // allow to use other ucp's
     // if ( !isLocalNotFile_Impl( aURL ) )
-    if ( aURL.equalsIgnoreAsciiCaseAsciiL( "vnd.sun.star.pkg", 16 )
-      || aURL.equalsIgnoreAsciiCaseAsciiL( "vnd.sun.star.zip", 16 )
+    if ( aURL.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.pkg"))
+      || aURL.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("vnd.sun.star.zip"))
       || ::utl::UCBContentHelper::IsDocument( aURL ) )
     {
         OSL_FAIL( "File system storages can be based only on file URLs!\n" ); // ???