summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-07-04 17:16:00 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-07-04 17:18:09 +0100
commit2ee1de716cd8326cd56d441019db2c32b2e10a32 (patch)
treea601dc9f148717c811739b51fc64708e12bfcf1c
parent8dc5b9d6a2f451829b3b6df8a026e98edc046f53 (diff)
Related: fdo#54186 show JCL options, parse JCLOpenUI the same as OpenUI
Change-Id: I495583b56502f349cd789466e9daeb6528ea9048
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx16
1 files changed, 9 insertions, 7 deletions
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 9a2f3234026e..2092ea15549d 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;