From acebbee971136e6ee0a7bc75bd57d937d6e1c295 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Wed, 20 Nov 2013 13:18:33 +0200
Subject: remove RTL_CONSTASCII_STRINGPARAM in OString::equalsL calls

Convert code like:
    if (aByteStr.equalsL(RTL_CONSTASCII_STRINGPARAM("rem")))
to:
    if (aByteStr.startsWith("rem"))

Change-Id: I09e40b3fdc87d59a8176c2a5f39cc6aa5cf5a576
---
 vcl/unx/generic/printer/jobdata.cxx   |  2 +-
 vcl/unx/generic/printer/ppdparser.cxx | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'vcl')

diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx
index 3526138002db..4b9756b58e30 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -246,7 +246,7 @@ bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobDa
             bPDFDevice = true;
             rJobData.m_nPDFDevice = aLine.copy(RTL_CONSTASCII_LENGTH(pdfdeviceEquals)).toInt32();
         }
-        else if (aLine.equalsL(RTL_CONSTASCII_STRINGPARAM("PPDContexData")))
+        else if (aLine.startsWith("PPDContexData"))
         {
             if( bPrinter )
             {
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 8a6a0a40dcdf..35bea659309a 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -980,17 +980,17 @@ void PPDParser::parse( ::std::list< OString >& rLines )
             parseOpenUI( aCurrentLine );
             continue;
         }
-        else if (aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("OrderDependency")))
+        else if (aKey.startsWith("OrderDependency"))
         {
             parseOrderDependency( aCurrentLine );
             continue;
         }
-        else if (aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("UIConstraints")) ||
-                 aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("NonUIConstraints")))
+        else if (aKey.startsWith("UIConstraints") ||
+                 aKey.startsWith("NonUIConstraints"))
         {
             continue; // parsed in pass 2
         }
-        else if( aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("CustomPageSize")) ) // currently not handled
+        else if( aKey.startsWith("CustomPageSize") ) // currently not handled
             continue;
 
         // default values are parsed in pass 2
@@ -1278,15 +1278,15 @@ void PPDParser::parseOrderDependency(const OString& rLine)
         pKey = keyit->second;
 
     pKey->m_nOrderDependency = nOrder;
-    if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("ExitServer")) )
+    if( aSetup.startsWith("ExitServer") )
         pKey->m_eSetupType = PPDKey::ExitServer;
-    else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("Prolog")) )
+    else if( aSetup.startsWith("Prolog") )
         pKey->m_eSetupType = PPDKey::Prolog;
-    else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("DocumentSetup")) )
+    else if( aSetup.startsWith("DocumentSetup") )
         pKey->m_eSetupType = PPDKey::DocumentSetup;
-    else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("PageSetup")) )
+    else if( aSetup.startsWith("PageSetup") )
         pKey->m_eSetupType = PPDKey::PageSetup;
-    else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("JCLSetup")) )
+    else if( aSetup.startsWith("JCLSetup") )
         pKey->m_eSetupType = PPDKey::JCLSetup;
     else
         pKey->m_eSetupType = PPDKey::AnySetup;
-- 
cgit