[Libreoffice-commits] .: framework/source sfx2/source

Thomas Arnhold tarnhold at kemper.freedesktop.org
Fri Jan 28 07:13:44 PST 2011


 framework/source/uielement/menubarmanager.cxx |    6 +++---
 sfx2/source/layout/factory.cxx                |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e7e601d344392d0a22c8aae6a5b0048e8116423d
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Fri Jan 28 16:09:25 2011 +0100

    Replace suitable equalsAscii calls with equalsAsciiL.

diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 53b2003..58e5d6b 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -524,9 +524,9 @@ throw ( RuntimeException )
                 // #b6673979# enable some slots hardly, because UNIX clipboard does not notify all changes
                 // Can be removed if follow up task will be fixed directly within applications.
                 if (
-                    ( pMenuItemHandler->aMenuItemURL.equalsAscii (".uno:Paste"         ) ) ||
-                    ( pMenuItemHandler->aMenuItemURL.equalsAscii (".uno:PasteSpecial"  ) ) ||
-                    ( pMenuItemHandler->aMenuItemURL.equalsAscii (".uno:PasteClipboard") )      // special for draw/impress
+                    ( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:Paste"))) ||
+                    ( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:PasteSpecial"))) ||
+                    ( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:PasteClipboard")))      // special for draw/impress
                    )
                     bEnabledItem = sal_True;
                 #endif
diff --git a/sfx2/source/layout/factory.cxx b/sfx2/source/layout/factory.cxx
index 56a0f2e..87a2453 100644
--- a/sfx2/source/layout/factory.cxx
+++ b/sfx2/source/layout/factory.cxx
@@ -58,7 +58,7 @@ SAL_DLLPUBLIC_EXPORT Window* CreateWindow (VCLXWindow** vcl, OUString const& nam
     {
         ;
     }
-    else if (name.equalsAscii ("sfxmodelessdialog"))
+    else if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("sfxmodelessdialog")))
     {
         window = new SfxModelessDialog_unprotect (parent, ImplGetWinBits (attributes, 0));
         *vcl = new layoutimpl::VCLXDialog ();


More information about the Libreoffice-commits mailing list