From 937b63af3322f7f8b5e869b2c7431a2deaec3113 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Sat, 9 Mar 2013 22:47:20 +0100 Subject: use startsWith() instead of compareToAscii() brain damage... Change-Id: I4dc63c7346f724eded9ac7b82cda25c2bb60beff --- vcl/aqua/source/dtrans/DataFlavorMapping.cxx | 2 +- vcl/aqua/source/dtrans/OSXTransferable.cxx | 2 +- vcl/generic/fontmanager/helper.cxx | 6 +++--- vcl/generic/print/genprnpsp.cxx | 10 +++++----- vcl/headless/svpprn.cxx | 2 +- vcl/source/gdi/pdfwriter_impl.cxx | 2 +- vcl/unx/generic/dtrans/X11_selection.cxx | 4 ++-- vcl/unx/generic/printer/cupsmgr.cxx | 6 +++--- vcl/unx/generic/printer/printerinfomanager.cxx | 4 ++-- vcl/unx/gtk/app/gtkinst.cxx | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) (limited to 'vcl') diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx index a338bd2dfee9..a1a69ffe15f6 100644 --- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx +++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx @@ -660,7 +660,7 @@ NSArray* DataFlavorMapper::flavorSequenceToTypesArray(const com::sun::star::uno: for (sal_uInt32 i = 0; i < nFlavors; i++) { - if( flavors[i].MimeType.compareToAscii( "image/bmp", 9 ) == 0 ) + if( flavors[i].MimeType.startsWith("image/bmp") ) { [array addObject: NSTIFFPboardType]; [array addObject: NSPICTPboardType]; diff --git a/vcl/aqua/source/dtrans/OSXTransferable.cxx b/vcl/aqua/source/dtrans/OSXTransferable.cxx index 0f6c57d06ef7..6d7ef1b8ed15 100644 --- a/vcl/aqua/source/dtrans/OSXTransferable.cxx +++ b/vcl/aqua/source/dtrans/OSXTransferable.cxx @@ -75,7 +75,7 @@ Any SAL_CALL OSXTransferable::getTransferData( const DataFlavor& aFlavor ) } NSString* sysFormat = - (aFlavor.MimeType.compareToAscii( "image/bmp", 9 ) == 0) + (aFlavor.MimeType.startsWith("image/bmp")) ? mDataFlavorMapper->openOfficeImageToSystemFlavor( mPasteboard ) : mDataFlavorMapper->openOfficeToSystemFlavor(aFlavor); DataProviderPtr_t dp; diff --git a/vcl/generic/fontmanager/helper.cxx b/vcl/generic/fontmanager/helper.cxx index 25c1c4f52c6a..7b1a5713da12 100644 --- a/vcl/generic/fontmanager/helper.cxx +++ b/vcl/generic/fontmanager/helper.cxx @@ -59,19 +59,19 @@ OUString getOfficePath( enum whichOfficePath ePath ) aBootstrap.getFrom( "UserInstallation", aUserPath ); OUString aUPath = aUserPath; - if( ! aConfigPath.compareToAscii( "file://", 7 ) ) + if( aConfigPath.startsWith( "file://" ) ) { OUString aSysPath; if( osl_getSystemPathFromFileURL( aConfigPath.pData, &aSysPath.pData ) == osl_File_E_None ) aConfigPath = aSysPath; } - if( ! aInstallationRootPath.compareToAscii( "file://", 7 ) ) + if( aInstallationRootPath.startsWith( "file://" ) ) { OUString aSysPath; if( osl_getSystemPathFromFileURL( aInstallationRootPath.pData, &aSysPath.pData ) == osl_File_E_None ) aInstallationRootPath = aSysPath; } - if( ! aUserPath.compareToAscii( "file://", 7 ) ) + if( aUserPath.startsWith( "file://" ) ) { OUString aSysPath; if( osl_getSystemPathFromFileURL( aUserPath.pData, &aSysPath.pData ) == osl_File_E_None ) diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx index f01a7cfeb3b7..583587002361 100644 --- a/vcl/generic/print/genprnpsp.cxx +++ b/vcl/generic/print/genprnpsp.cxx @@ -86,7 +86,7 @@ static rtl::OUString getPdfDir( const PrinterInfo& rInfo ) while( nIndex != -1 ) { rtl::OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) ); - if( ! aToken.compareToAscii( "pdf=", 4 ) ) + if( aToken.startsWith( "pdf=" ) ) { sal_Int32 nPos = 0; aDir = aToken.getToken( 1, '=', nPos ); @@ -924,7 +924,7 @@ sal_Bool PspSalPrinter::StartJob( while( nIndex != -1 ) { OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) ); - if( ! aToken.compareToAscii( "fax", 3 ) ) + if( aToken.startsWith( "fax" ) ) { m_bFax = true; m_aTmpFile = getTmpName(); @@ -936,11 +936,11 @@ sal_Bool PspSalPrinter::StartJob( m_aFaxNr = it->second; sal_Int32 nPos = 0; - m_bSwallowFaxNo = ! aToken.getToken( 1, '=', nPos ).compareToAscii( "swallow", 7 ) ? true : false; + m_bSwallowFaxNo = aToken.getToken( 1, '=', nPos ).startsWith( "swallow" ) ? true : false; break; } - if( ! aToken.compareToAscii( "pdf=", 4 ) ) + if( aToken.startsWith( "pdf=" ) ) { m_bPdf = true; m_aTmpFile = getTmpName(); @@ -1170,7 +1170,7 @@ sal_Bool PspSalPrinter::StartJob( const rtl::OUString* i_pFileName, const rtl::O else osl_createTempFile( NULL, NULL, &aPDFUrl.pData ); // normalize to file URL - if( aPDFUrl.compareToAscii( "file:", 5 ) != 0 ) + if( !aPDFUrl.startsWith( "file:" ) ) { // this is not a file URL, but it should // form it into a osl friendly file URL diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx index d769847512b3..b6a664839259 100644 --- a/vcl/headless/svpprn.cxx +++ b/vcl/headless/svpprn.cxx @@ -45,7 +45,7 @@ static OUString getPdfDir( const PrinterInfo& rInfo ) while( nIndex != -1 ) { OUString aToken( rInfo.m_aFeatures.getToken( 0, ',', nIndex ) ); - if( ! aToken.compareToAscii( "pdf=", 4 ) ) + if( aToken.startsWith( "pdf=" ) ) { sal_Int32 nPos = 0; aDir = aToken.getToken( 1, '=', nPos ); diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 59dcfb722fed..636cd94cdf07 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -4646,7 +4646,7 @@ we check in the following sequence: // getting the needed URL information from the current document path if( eTargetProtocol == INET_PROT_NOT_VALID ) { - if( rLink.m_aURL.getLength() > 4 && rLink.m_aURL.compareToAscii( "\\\\\\\\", 4 ) == 0) + if( rLink.m_aURL.getLength() > 4 && rLink.m_aURL.startsWith("\\\\\\\\")) { bIsUNCPath = sal_True; } 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(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++ ) diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index cc69ccb6edbb..07172468846d 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -283,7 +283,7 @@ void GtkInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const r { rtl::OString sGtkURL; rtl_TextEncoding aSystemEnc = osl_getThreadTextEncoding(); - if ((aSystemEnc == RTL_TEXTENCODING_UTF8) || (rFileUrl.compareToAscii( "file://", 7 ) != 0)) + if ((aSystemEnc == RTL_TEXTENCODING_UTF8) || !rFileUrl.startsWith( "file://" )) sGtkURL = rtl::OUStringToOString(rFileUrl, RTL_TEXTENCODING_UTF8); else { -- cgit