[Libreoffice-commits] core.git: vcl/unx

Chris chris.sherlock79 at gmail.com
Fri Mar 8 05:00:09 PST 2013


 vcl/unx/generic/plugadapt/salplug.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5745d7a08f6a0cb450b662fadb5892f168850fae
Author: Chris <chris.sherlock79 at gmail.com>
Date:   Fri Mar 8 22:05:06 2013 +1100

    Remove now obsolete RTL_CONSTASCII_(U)STRINGPARAM from salplug.cxx
    
    Change-Id: I49b77fee3864e8a389998a4e9df1054bf29b2722
    Reviewed-on: https://gerrit.libreoffice.org/2594
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index eb5f98a..3d87977 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -46,7 +46,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals
     // SAL_USE_VCLPLUGIN=gtk3 (would ideally depend on experimental mode, but
     // reading the experimental mode setting requires the UNO service manager
     // which has not yet been instantiated):
-    if (!bForce && rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("gtk3")))
+    if (!bForce && rModuleBase == "gtk3")
     {
         return NULL;
     }
@@ -207,7 +207,7 @@ static SalInstance* check_headless_plugin()
         osl_getCommandArg( i, &aParam.pData );
         if( aParam == "-headless" || aParam == "--headless" )
         {
-            return tryInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "svp" ) ) );
+            return tryInstance("svp");
         }
     }
     return NULL;


More information about the Libreoffice-commits mailing list