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

[Caolán McNamara]

 vcl/unx/generic/printer/ppdparser.cxx |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 2ee1de716cd8326cd56d441019db2c32b2e10a32
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 4 17:16:00 2013 +0100

    Related: fdo#54186 show JCL options, parse JCLOpenUI the same as OpenUI
    
    Change-Id: I495583b56502f349cd789466e9daeb6528ea9048

diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 9a2f323..2092ea1 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -973,17 +973,19 @@ void PPDParser::parse( ::std::list< OString >& rLines )
             aKey = aKey.copy(0, nPos);
         aKey = aKey.copy(1); // remove the '*'
 
-        if (aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("CloseUI")) ||
-            aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("OpenGroup")) ||
-            aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("CloseGroup")) ||
-            aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("End")) ||
-            aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("OpenSubGroup")) ||
-            aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("CloseSubGroup")))
+        if ((aKey == "CloseUI") ||
+            (aKey == "JCLCloseUI") ||
+            (aKey == "OpenGroup") ||
+            (aKey == "CloseGroup") ||
+            (aKey == "End") ||
+            (aKey == "JCLEnd") ||
+            (aKey == "OpenSubGroup") ||
+            (aKey == "CloseSubGroup"))
         {
             continue;
         }
 
-        if (aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("OpenUI")))
+        if ((aKey == "OpenUI") || (aKey == "JCLOpenUI"))
         {
             parseOpenUI( aCurrentLine );
             continue;