diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2013-03-09 22:47:20 +0100 |
---|---|---|
committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2013-03-11 11:07:09 +0100 |
commit | 937b63af3322f7f8b5e869b2c7431a2deaec3113 (patch) | |
tree | a832f6672188551a5be9538a02fb80d6e3fc8497 /vcl/unx/generic | |
parent | 5c32ac5104e9cade52c8a373033644282de9ceff (diff) |
use startsWith() instead of compareToAscii()
brain damage...
Change-Id: I4dc63c7346f724eded9ac7b82cda25c2bb60beff
Diffstat (limited to 'vcl/unx/generic')
-rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/printer/cupsmgr.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/generic/printer/printerinfomanager.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 77f0cc09ecd1..46c2910ed8fb 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -653,7 +653,7 @@ bool SelectionManager::convertData( bSuccess = true; } } - else if( aFlavor.MimeType.compareToAscii( "text/plain", 10 ) == 0 ) + else if( aFlavor.MimeType.startsWith("text/plain") ) { rtl_TextEncoding aEncoding = RTL_TEXTENCODING_DONTKNOW; bool bCompoundText = false; @@ -842,7 +842,7 @@ void SelectionManager::getNativeTypeList( const Sequence< DataFlavor >& rTypes, bool bHaveText = false; for( int i = 0; i < nFlavors; i++ ) { - if( pFlavors[i].MimeType.compareToAscii( "text/plain", 10 ) == 0) + if( pFlavors[i].MimeType.startsWith("text/plain")) bHaveText = true; else convertTypeToNative( pFlavors[i].MimeType, targetselection, nFormat, rOutTypeList ); diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index 1c58bfb63d14..102d19c7e5b8 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -438,7 +438,7 @@ const PPDParser* CUPSManager::createCUPSParser( const OUString& rPrinter ) const PPDParser* pNewParser = NULL; OUString aPrinter; - if( rPrinter.compareToAscii( "CUPS:", 5 ) == 0 ) + if( rPrinter.startsWith("CUPS:") ) aPrinter = rPrinter.copy( 5 ); else aPrinter = rPrinter; @@ -561,7 +561,7 @@ void CUPSManager::setupJobContextData( JobData& rData ) if( p_it->second.m_aInfo.m_aContext.getParser() == NULL ) { OUString aPrinter; - if( p_it->second.m_aInfo.m_aDriverName.compareToAscii( "CUPS:", 5 ) == 0 ) + if( p_it->second.m_aInfo.m_aDriverName.startsWith("CUPS:") ) aPrinter = p_it->second.m_aInfo.m_aDriverName.copy( 5 ); else aPrinter = p_it->second.m_aInfo.m_aDriverName; @@ -772,7 +772,7 @@ bool CUPSManager::addPrinter( const OUString& rName, const OUString& rDriver ) { // don't touch the CUPS printers if( m_aCUPSDestMap.find( rName ) != m_aCUPSDestMap.end() || - rDriver.compareToAscii( "CUPS:", 5 ) == 0 + rDriver.startsWith("CUPS:") ) return false; return PrinterInfoManager::addPrinter( rName, rDriver ); diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index b5a0569b272d..133a342ce282 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -411,7 +411,7 @@ void PrinterInfoManager::initialize() // set parser, merge settings // don't do this for CUPS printers as this is done // by the CUPS system itself - if( aPrinter.m_aInfo.m_aDriverName.compareToAscii( "CUPS:", 5 ) != 0 ) + if( !aPrinter.m_aInfo.m_aDriverName.startsWith( "CUPS:" ) ) { aPrinter.m_aInfo.m_pParser = PPDParser::getParser( aPrinter.m_aInfo.m_aDriverName ); aPrinter.m_aInfo.m_aContext.setParser( aPrinter.m_aInfo.m_pParser ); @@ -791,7 +791,7 @@ bool PrinterInfoManager::writePrinterConfig() aValue.append(static_cast<sal_Int32>(it->second.m_aInfo.m_nBottomMarginAdjust)); pConfig->WriteKey("MarginAdjust", aValue.makeStringAndClear()); - if( it->second.m_aInfo.m_aDriverName.compareToAscii( "CUPS:", 5 ) != 0 ) + if( ! it->second.m_aInfo.m_aDriverName.startsWith( "CUPS:" ) ) { // write PPDContext (not for CUPS) for( int i = 0; i < it->second.m_aInfo.m_aContext.countValuesModified(); i++ ) |