summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-11-20 16:36:51 +0200
committerNoel Grandin <noel@peralex.com>2013-11-20 16:38:28 +0200
commitd45483489513692be77a61cf343663e839483204 (patch)
tree85d3a47fa95a529e4f6d2d12b375a438513c3e9d /vcl
parentfa604beee3e8ca26bba7c1d681bf83a44638b835 (diff)
Revert "remove RTL_CONSTASCII_STRINGPARAM in OString::equalsL calls"
This reverts commit acebbee971136e6ee0a7bc75bd57d937d6e1c295. I mistakenly converted OUString::equalsL calls to OUString::startsWith calls.
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/generic/printer/jobdata.cxx2
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx18
2 files changed, 10 insertions, 10 deletions
diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx
index 76c23b4997da..adf9d418bbdf 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.startsWith("PPDContexData"))
+ else if (aLine.equalsL(RTL_CONSTASCII_STRINGPARAM("PPDContexData")))
{
if( bPrinter )
{
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index efd8ee96695c..ed2cdea3958a 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.startsWith("OrderDependency"))
+ else if (aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("OrderDependency")))
{
parseOrderDependency( aCurrentLine );
continue;
}
- else if (aKey.startsWith("UIConstraints") ||
- aKey.startsWith("NonUIConstraints"))
+ else if (aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("UIConstraints")) ||
+ aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("NonUIConstraints")))
{
continue; // parsed in pass 2
}
- else if( aKey.startsWith("CustomPageSize") ) // currently not handled
+ else if( aKey.equalsL(RTL_CONSTASCII_STRINGPARAM("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.startsWith("ExitServer") )
+ if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("ExitServer")) )
pKey->m_eSetupType = PPDKey::ExitServer;
- else if( aSetup.startsWith("Prolog") )
+ else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("Prolog")) )
pKey->m_eSetupType = PPDKey::Prolog;
- else if( aSetup.startsWith("DocumentSetup") )
+ else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("DocumentSetup")) )
pKey->m_eSetupType = PPDKey::DocumentSetup;
- else if( aSetup.startsWith("PageSetup") )
+ else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("PageSetup")) )
pKey->m_eSetupType = PPDKey::PageSetup;
- else if( aSetup.startsWith("JCLSetup") )
+ else if( aSetup.equalsL(RTL_CONSTASCII_STRINGPARAM("JCLSetup")) )
pKey->m_eSetupType = PPDKey::JCLSetup;
else
pKey->m_eSetupType = PPDKey::AnySetup;