[Libreoffice-commits] .: vcl/unx

[Caolán McNamara]

 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |    2 +-
 vcl/unx/source/plugadapt/salplug.cxx     |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8a43a311823278b93dc21b9a8e49d70c65098698
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jan 15 16:51:27 2011 +0000

    equalsAsciiL faster than equalsAscii when length available

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 09efe7a..41274c7 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -425,7 +425,7 @@ void GtkData::initNWF( void )
             (char *)NULL);
     pSVData->maNWFData.mnMenuFormatExtraBorder = horizontal_padding;
 
-    if( SalGetDesktopEnvironment().equalsAscii( "KDE" ) )
+    if( SalGetDesktopEnvironment().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("KDE")) )
     {
         // #i97196# ensure a widget exists and the style engine was loaded
         NWEnsureGTKButton( 0 );
diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/source/plugadapt/salplug.cxx
index ba6bf4a..6b8c20e 100644
--- a/vcl/unx/source/plugadapt/salplug.cxx
+++ b/vcl/unx/source/plugadapt/salplug.cxx
@@ -95,7 +95,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase )
                  * So make sure libgtk+ & co are still mapped into memory when 
                  * atk-bridge's atexit handler gets called.
                  */
-                if( rModuleBase.equalsAscii("gtk") )
+                if( rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("gtk")) )
                 {
                     pCloseModule = NULL;
                 }
@@ -103,7 +103,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase )
                  * #i109007# KDE3 seems to have the same problem; an atexit cleanup
                  * handler, which cannot be resolved anymore if the plugin is already unloaded.
                  */
-                else if( rModuleBase.equalsAscii("kde") )
+                else if( rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("kde")) )
                 {
                     pCloseModule = NULL;
                 }
@@ -214,7 +214,7 @@ static SalInstance* check_headless_plugin()
     for( int i = 0; i < nParams; i++ )
     {
         osl_getCommandArg( i, &aParam.pData );
-        if( aParam.equalsAscii( "-headless" ) )
+        if( aParam.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("-headless")) )
             return tryInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "svp" ) ) );
     }
     return NULL;