diff options
31 files changed, 73 insertions, 75 deletions
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 29ae9f82008b..7dffd57afb26 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -505,11 +505,11 @@ OUString lcl_getDiagramType( const OUString & rTemplateServiceName ) // "Area" "StackedArea" "PercentStackedArea" "ThreeDArea" // "StackedThreeDArea" "PercentStackedThreeDArea" - if( aName.indexOf( rtl::OUString("Area") ) != -1 ) + if( aName.indexOf( "Area" ) != -1 ) return rtl::OUString("com.sun.star.chart.AreaDiagram"); // "Pie" "PieAllExploded" "ThreeDPie" "ThreeDPieAllExploded" - if( aName.indexOf( rtl::OUString("Pie") ) != -1 ) + if( aName.indexOf( "Pie" ) != -1 ) return rtl::OUString("com.sun.star.chart.PieDiagram"); // "Column" "StackedColumn" "PercentStackedColumn" "ThreeDColumnDeep" @@ -518,33 +518,33 @@ OUString lcl_getDiagramType( const OUString & rTemplateServiceName ) // "PercentStackedBar" "ThreeDBarDeep" "ThreeDBarFlat" // "StackedThreeDBarFlat" "PercentStackedThreeDBarFlat" "ColumnWithLine" // "StackedColumnWithLine" - if( aName.indexOf( rtl::OUString("Column") ) != -1 || aName.indexOf( rtl::OUString("Bar") ) != -1 ) + if( aName.indexOf( "Column" ) != -1 || aName.indexOf( "Bar" ) != -1 ) return rtl::OUString( "com.sun.star.chart.BarDiagram" ); // "Donut" "DonutAllExploded" "ThreeDDonut" "ThreeDDonutAllExploded" - if( aName.indexOf( rtl::OUString("Donut") ) != -1 ) + if( aName.indexOf( "Donut" ) != -1 ) return rtl::OUString( "com.sun.star.chart.DonutDiagram" ); // "ScatterLineSymbol" "ScatterLine" "ScatterSymbol" "ThreeDScatter" - if( aName.indexOf( rtl::OUString("Scatter") ) != -1 ) + if( aName.indexOf( "Scatter" ) != -1 ) return rtl::OUString( "com.sun.star.chart.XYDiagram" ); // "FilledNet" "StackedFilledNet" "PercentStackedFilledNet" - if( aName.indexOf( rtl::OUString("FilledNet") ) != -1 ) + if( aName.indexOf( "FilledNet" ) != -1 ) return rtl::OUString( "com.sun.star.chart.FilledNetDiagram" ); // "Net" "NetSymbol" "NetLine" "StackedNet" "StackedNetSymbol" // "StackedNetLine" "PercentStackedNet" "PercentStackedNetSymbol" // "PercentStackedNetLine" - if( aName.indexOf( rtl::OUString("Net") ) != -1 ) + if( aName.indexOf( "Net" ) != -1 ) return rtl::OUString( "com.sun.star.chart.NetDiagram" ); // "StockLowHighClose" "StockOpenLowHighClose" "StockVolumeLowHighClose" // "StockVolumeOpenLowHighClose" - if( aName.indexOf( rtl::OUString("Stock") ) != -1 ) + if( aName.indexOf( "Stock" ) != -1 ) return rtl::OUString( "com.sun.star.chart.StockDiagram" ); - if( aName.indexOf( rtl::OUString("Bubble") ) != -1 ) + if( aName.indexOf( "Bubble" ) != -1 ) return rtl::OUString( "com.sun.star.chart.BubbleDiagram" ); // Note: this must be checked after Bar, Net and Scatter @@ -553,7 +553,7 @@ OUString lcl_getDiagramType( const OUString & rTemplateServiceName ) // "PercentStackedLine" "LineSymbol" "StackedLineSymbol" // "PercentStackedLineSymbol" "ThreeDLine" "StackedThreeDLine" // "PercentStackedThreeDLine" "ThreeDLineDeep" - if( aName.indexOf( rtl::OUString("Line") ) != -1 || aName.indexOf( rtl::OUString("Symbol") ) != -1 ) + if( aName.indexOf( "Line" ) != -1 || aName.indexOf( "Symbol" ) != -1 ) return rtl::OUString( "com.sun.star.chart.LineDiagram" ); OSL_FAIL( "unknown template" ); diff --git a/connectivity/source/commontools/AutoRetrievingBase.cxx b/connectivity/source/commontools/AutoRetrievingBase.cxx index 3015830a90c4..e88fe4160214 100644 --- a/connectivity/source/commontools/AutoRetrievingBase.cxx +++ b/connectivity/source/commontools/AutoRetrievingBase.cxx @@ -41,7 +41,7 @@ namespace connectivity nIndex = sStatement.indexOf(sTable,nIndex); if ( -1 != nIndex ) { // we need a table name - sal_Int32 nIntoIndex = sStmt.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INTO "))); + sal_Int32 nIntoIndex = sStmt.indexOf("INTO "); sStmt = sStmt.copy(nIntoIndex+5); do { diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx b/connectivity/source/drivers/odbcbase/OStatement.cxx index f2973b8ac41d..ce92dee3fc0f 100644 --- a/connectivity/source/drivers/odbcbase/OStatement.cxx +++ b/connectivity/source/drivers/odbcbase/OStatement.cxx @@ -269,7 +269,7 @@ sal_Bool OStatement_Base::lockIfNecessary (const ::rtl::OUString& sql) throw( SQ // Now, look for the FOR UPDATE keywords. If there is any extra white // space between the FOR and UPDATE, this will fail. - sal_Int32 index = sqlStatement.indexOf(::rtl::OUString(" FOR UPDATE")); + sal_Int32 index = sqlStatement.indexOf(" FOR UPDATE"); // We found it. Change our concurrency level to ensure that the // row can be updated. diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 7c3bb8e0f5a0..f30aca2fe41f 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -2126,7 +2126,7 @@ void OSQLParseTreeIterator::impl_appendError( IParseContext::ErrorCode _eError, sErrorMessage = sErrorMessage.replaceAt( sErrorMessage.indexOf( sPlaceHolder1 ), sPlaceHolder1.getLength(), *_pReplaceToken1 ); if ( _pReplaceToken2 ) - sErrorMessage = sErrorMessage.replaceAt( sErrorMessage.indexOf( ::rtl::OUString("#2") ), 2, *_pReplaceToken2 ); + sErrorMessage = sErrorMessage.replaceAt( sErrorMessage.indexOf( "#2" ), 2, *_pReplaceToken2 ); } impl_appendError( SQLException( diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index e2afd6a4ebff..6996638eba08 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -976,7 +976,7 @@ sal_Int16 OSQLParser::buildLikeRule(OSQLParseNode*& pAppend, OSQLParseNode*& pLi break; default: m_sErrorMessage = m_pContext->getErrorMessage(IParseContext::ERROR_VALUE_NO_LIKE); - m_sErrorMessage = m_sErrorMessage.replaceAt(m_sErrorMessage.indexOf(::rtl::OUString("#1")),2,pLiteral->getTokenValue()); + m_sErrorMessage = m_sErrorMessage.replaceAt(m_sErrorMessage.indexOf("#1"),2,pLiteral->getTokenValue()); break; } } diff --git a/cppuhelper/test/bootstrap/bootstrap.test.cxx b/cppuhelper/test/bootstrap/bootstrap.test.cxx index 0b8e78a846d7..ebbb5ca24cc6 100644 --- a/cppuhelper/test/bootstrap/bootstrap.test.cxx +++ b/cppuhelper/test/bootstrap/bootstrap.test.cxx @@ -291,7 +291,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(/*argc*/, argv) s_test__bootstrap_InitialComponentContext__purpose(); int ret; - if (s_comment.indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FAILURE"))) == -1) + if (s_comment.indexOf("FAILURE") == -1) { s_comment += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TESTS PASSED\n")); ret = 0; diff --git a/cppuhelper/test/loader/loader.test.cxx b/cppuhelper/test/loader/loader.test.cxx index 6c9d47c5cdde..466f243f52dc 100644 --- a/cppuhelper/test/loader/loader.test.cxx +++ b/cppuhelper/test/loader/loader.test.cxx @@ -182,7 +182,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(/*argc*/, argv) message += s_test__cppu_writeSharedLibComponentInfo(":affine"); message += s_test__cppu_writeSharedLibComponentInfo(""); - if (message.indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FAILED"))) == -1) + if (message.indexOf("FAILED") == -1) message += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TESTS PASSED\n")); else diff --git a/cpputools/source/registercomponent/registercomponent.cxx b/cpputools/source/registercomponent/registercomponent.cxx index 0c98cbeff159..06c38f5e7d80 100644 --- a/cpputools/source/registercomponent/registercomponent.cxx +++ b/cpputools/source/registercomponent/registercomponent.cxx @@ -74,7 +74,7 @@ OUString replacePrefix(OUString const & url, OUString const & prefix) { sal_Bool isFileUrl(const OUString& fileName) { - if (fileName.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("file://"))) == 0 ) + if (fileName.indexOf("file://") == 0 ) return sal_True; return sal_False; } diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx index 1932a08857fb..d9a92e3dd2f6 100644 --- a/cpputools/source/unoexe/unoexe.cxx +++ b/cpputools/source/unoexe/unoexe.cxx @@ -85,7 +85,7 @@ namespace unoexe static sal_Bool isFileUrl(const OUString& fileName) { - if (fileName.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("file://"))) == 0 ) + if (fileName.indexOf("file://") == 0 ) return sal_True; return sal_False; } diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index c033c758d8b5..9575d7257d28 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -256,8 +256,7 @@ generateCustomName( OUString name; OUString placeholder("%n" ); - sal_Int32 pos = prefix.indexOf( - OUString("%n" ) ); + sal_Int32 pos = prefix.indexOf( placeholder ); if ( pos != -1 ) { @@ -822,7 +821,7 @@ SvxConfigDialog::SvxConfigDialog( { OUString text = ((const SfxStringItem*)pItem)->GetValue(); - if (text.indexOf(OUString(ITEM_TOOLBAR_URL)) == 0) + if (text.indexOf( ITEM_TOOLBAR_URL ) == 0) { SetCurPageId( RID_SVXPAGE_TOOLBARS ); } @@ -3153,7 +3152,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage( if ( pItem ) { OUString text = ((const SfxStringItem*)pItem)->GetValue(); - if (text.indexOf(OUString(ITEM_TOOLBAR_URL)) == 0) + if (text.indexOf( ITEM_TOOLBAR_URL ) == 0) { m_aURLToSelect = text.copy( 0 ); } @@ -3800,7 +3799,7 @@ void ToolbarSaveInData::SetSystemStyle( const OUString& rResourceURL, sal_Int32 nStyle ) { - if ( rResourceURL.indexOf( OUString("private" ) ) == 0 && + if ( rResourceURL.indexOf( "private" ) == 0 && m_xPersistentWindowState.is() && m_xPersistentWindowState->hasByName( rResourceURL ) ) { @@ -3839,7 +3838,7 @@ sal_Int32 ToolbarSaveInData::GetSystemStyle( const OUString& rResourceURL ) { sal_Int32 result = 0; - if ( rResourceURL.indexOf( OUString("private" ) ) == 0 && + if ( rResourceURL.indexOf( "private" ) == 0 && m_xPersistentWindowState.is() && m_xPersistentWindowState->hasByName( rResourceURL ) ) { @@ -3873,7 +3872,7 @@ OUString ToolbarSaveInData::GetSystemUIName( const OUString& rResourceURL ) { OUString result; - if ( rResourceURL.indexOf( OUString("private" ) ) == 0 && + if ( rResourceURL.indexOf( "private" ) == 0 && m_xPersistentWindowState.is() && m_xPersistentWindowState->hasByName( rResourceURL ) ) { @@ -3899,7 +3898,7 @@ OUString ToolbarSaveInData::GetSystemUIName( const OUString& rResourceURL ) } } - if ( rResourceURL.indexOf( OUString(".uno" ) ) == 0 && + if ( rResourceURL.indexOf( ".uno" ) == 0 && m_xCommandToLabelMap.is() && m_xCommandToLabelMap->hasByName( rResourceURL ) ) { diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index 4eb64df3a4fd..a2684a2b6f5b 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -293,7 +293,7 @@ namespace pcr ::rtl::OUString sURL; if ( ( _rValue >>= sURL ) ) { - if ( sURL.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.GraphicObject:" ) ) ) == 0 ) + if ( sURL.indexOf( "vnd.sun.star.GraphicObject:" ) == 0 ) getTypedControlWindow()->DisplayURL( getTypedControlWindow()->GetPlaceHolder() ); else getTypedControlWindow()->DisplayURL( sURL ); diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index fd3fc8b6a51b..6acc1168ef70 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -202,8 +202,7 @@ m_rServiceFactory(r), m_bTerminated(sal_False), m_bError(sal_False) "/singletons/com.sun.star.util.theMacroExpander" )), UNO_QUERY_THROW); sExpandedUrl = xMacroExpander->expandMacros(sUrl); - sal_Int32 nPos = sExpandedUrl.indexOf(::rtl::OUString( - "vnd.sun.star.expand:" )); + sal_Int32 nPos = sExpandedUrl.indexOf( "vnd.sun.star.expand:" ); if (nPos != -1) sExpandedUrl = sExpandedUrl.copy(nPos + 20); } diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index f6b3eab3f008..ed56814c77a8 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -128,7 +128,7 @@ static const char RESOURCEURL_CUSTOM_ELEMENT[] = "custom_"; static sal_Int16 RetrieveTypeFromResourceURL( const rtl::OUString& aResourceURL ) { - if (( aResourceURL.indexOf( OUString( RESOURCEURL_PREFIX )) == 0 ) && + if (( aResourceURL.indexOf( RESOURCEURL_PREFIX ) == 0 ) && ( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE )) { OUString aTmpStr = aResourceURL.copy( RESOURCEURL_PREFIX_SIZE ); @@ -149,7 +149,7 @@ static sal_Int16 RetrieveTypeFromResourceURL( const rtl::OUString& aResourceURL static OUString RetrieveNameFromResourceURL( const rtl::OUString& aResourceURL ) { - if (( aResourceURL.indexOf( OUString( RESOURCEURL_PREFIX )) == 0 ) && + if (( aResourceURL.indexOf( RESOURCEURL_PREFIX ) == 0 ) && ( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE )) { sal_Int32 nIndex = aResourceURL.lastIndexOf( '/' ); diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 34eb8a93311b..9132b2956b9b 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -125,7 +125,7 @@ static const sal_Int32 RESOURCEURL_PREFIX_SIZE = 17; static sal_Int16 RetrieveTypeFromResourceURL( const rtl::OUString& aResourceURL ) { - if (( aResourceURL.indexOf( rtl::OUString( RESOURCEURL_PREFIX )) == 0 ) && + if (( aResourceURL.indexOf( RESOURCEURL_PREFIX ) == 0 ) && ( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE )) { rtl::OUString aTmpStr = aResourceURL.copy( RESOURCEURL_PREFIX_SIZE ); @@ -146,7 +146,7 @@ static sal_Int16 RetrieveTypeFromResourceURL( const rtl::OUString& aResourceURL static rtl::OUString RetrieveNameFromResourceURL( const rtl::OUString& aResourceURL ) { - if (( aResourceURL.indexOf( rtl::OUString( RESOURCEURL_PREFIX )) == 0 ) && + if (( aResourceURL.indexOf( RESOURCEURL_PREFIX ) == 0 ) && ( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE )) { sal_Int32 nIndex = aResourceURL.lastIndexOf( '/' ); diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 87a80a51a56a..0b728b5a0959 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -182,7 +182,7 @@ void ToolbarsMenuController::addCommand( Reference< awt::XMenuExtended > xMenuExtended( m_xPopupMenu, UNO_QUERY ); xMenuExtended->setCommand( nItemId, rCommandURL ); - bool bInternal = ( rCommandURL.indexOf( rtl::OUString( STATIC_INTERNAL_CMD_PART )) == 0); + bool bInternal = ( rCommandURL.indexOf( STATIC_INTERNAL_CMD_PART ) == 0); if ( !bInternal ) { if ( !getDispatchFromCommandURL( rCommandURL ).is() ) @@ -638,7 +638,7 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); rtl::OUString aCmd( pVCLPopupMenu->GetItemCommand( rEvent.MenuId )); - if ( aCmd.indexOf( rtl::OUString( STATIC_INTERNAL_CMD_PART )) == 0 ) + if ( aCmd.indexOf( STATIC_INTERNAL_CMD_PART ) == 0 ) { // Command to restore the visibility of all context sensitive toolbars Reference< XNameReplace > xNameReplace( xPersistentWindowState, UNO_QUERY ); @@ -719,7 +719,7 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent } } } - else if ( aCmd.indexOf( rtl::OUString( STATIC_CMD_PART )) < 0 ) + else if ( aCmd.indexOf( STATIC_CMD_PART ) < 0 ) { URL aTargetURL; Sequence<PropertyValue> aArgs; @@ -787,7 +787,7 @@ void SAL_CALL ToolbarsMenuController::activate( const css::awt::MenuEvent& ) thr const sal_uInt32 nCount = aCmdVector.size(); for ( sal_uInt32 i = 0; i < nCount; i++ ) { - bool bInternal = ( aCmdVector[i].indexOf( rtl::OUString( STATIC_INTERNAL_CMD_PART )) == 0); + bool bInternal = ( aCmdVector[i].indexOf( STATIC_INTERNAL_CMD_PART ) == 0); if ( !bInternal ) { diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx index c8d0d6d13d63..06841b59d4b8 100644 --- a/framework/source/uifactory/addonstoolboxfactory.cxx +++ b/framework/source/uifactory/addonstoolboxfactory.cxx @@ -181,7 +181,7 @@ throw ( ::com::sun::star::container::NoSuchElementException, Args[n].Value >>= aResourceURL; } - if ( aResourceURL.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/addon_" ))) != 0 ) + if ( aResourceURL.indexOf( "private:resource/toolbar/addon_" ) != 0 ) throw IllegalArgumentException(); // Identify frame and determine module identifier to look for context based buttons diff --git a/framework/source/uifactory/windowcontentfactorymanager.cxx b/framework/source/uifactory/windowcontentfactorymanager.cxx index 9d9f8fe442b9..320026c517be 100644 --- a/framework/source/uifactory/windowcontentfactorymanager.cxx +++ b/framework/source/uifactory/windowcontentfactorymanager.cxx @@ -104,7 +104,7 @@ void WindowContentFactoryManager::RetrieveTypeNameFromResourceURL( const rtl::OU const sal_Int32 RESOURCEURL_PREFIX_SIZE = 17; const char RESOURCEURL_PREFIX[] = "private:resource/"; - if (( aResourceURL.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( RESOURCEURL_PREFIX ))) == 0 ) && + if (( aResourceURL.indexOf( RESOURCEURL_PREFIX ) == 0 ) && ( aResourceURL.getLength() > RESOURCEURL_PREFIX_SIZE )) { rtl::OUString aTmpStr( aResourceURL.copy( RESOURCEURL_PREFIX_SIZE )); diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx index 28ea85e3480f..b9c19c9a3ce2 100644 --- a/package/source/zippackage/ZipPackageFolder.cxx +++ b/package/source/zippackage/ZipPackageFolder.cxx @@ -108,7 +108,7 @@ sal_Bool ZipPackageFolder::LookForUnexpectedODF12Streams( const ::rtl::OUString& if ( aPath == "META-INF/" ) { if ( rShortName != "manifest.xml" - && rShortName.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "signatures" ) ) ) == -1 ) + && rShortName.indexOf( "signatures" ) == -1 ) { // a stream from META-INF with unexpected name bHasUnexpected = sal_True; diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 6e7976715e39..1e8433ba1329 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -2234,7 +2234,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstanceWith ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); uno::Reference< uno::XInterface > xRet; - if ( aServiceSpecifier.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ImportEmbeddedObjectResolver"))) == 0 ) + if ( aServiceSpecifier.indexOf( "com.sun.star.document.ImportEmbeddedObjectResolver") == 0 ) { uno::Reference< embed::XStorage > xStorage; const uno::Any* pIter = _aArgs.getConstArray(); @@ -2257,7 +2257,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); uno::Reference< drawing::XShape > xShape; - if ( aServiceSpecifier.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.")) ) == 0 ) + if ( aServiceSpecifier.indexOf( "com.sun.star.report." ) == 0 ) { if ( aServiceSpecifier == SERVICE_SHAPE ) xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CustomShape")) ),uno::UNO_QUERY_THROW); @@ -2269,7 +2269,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co else xShape.set(SvxUnoDrawMSFactory::createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.OLE2Shape")) ),uno::UNO_QUERY_THROW); } - else if ( aServiceSpecifier.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.")) ) == 0 ) + else if ( aServiceSpecifier.indexOf( "com.sun.star.form.component." ) == 0 ) { xShape.set(m_aProps->m_xContext->getServiceManager()->createInstanceWithContext(aServiceSpecifier,m_aProps->m_xContext),uno::UNO_QUERY); } diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index 23649f5c5dfb..a70e27deba9a 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -202,9 +202,9 @@ bool ScVbaWorkbooks::isSpreadSheetFile( const rtl::OUString& sType ) { // include calc_QPro etc. ? ( not for the moment anyway ) - if ( sType.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("calc_MS"))) == 0 - || sType.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("calc8"))) == 0 - || sType.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("calc_StarOffice"))) == 0 ) + if ( sType.indexOf( "calc_MS" ) == 0 + || sType.indexOf( "calc8" ) == 0 + || sType.indexOf( "calc_StarOffice" ) == 0 ) return true; return false; } diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx index d34f494192c2..7ef545fe6c2b 100644 --- a/scripting/source/provider/URIHelper.cxx +++ b/scripting/source/provider/URIHelper.cxx @@ -146,7 +146,7 @@ ScriptingFrameworkURIHelper::initBaseURI() test = OUString("uno_packages"); uri = OUString(SHARE_UNO_PACKAGES_URI); } - else if (m_sLocation.indexOf(OUString(TDOC_SCHEME)) == 0) + else if (m_sLocation.indexOf(TDOC_SCHEME) == 0) { m_sBaseURI = m_sLocation.concat( SCRIPTS_PART ); m_sLocation = OUString(DOCUMENT ); diff --git a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx index b909d16357ea..5e7b571a0970 100644 --- a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx +++ b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx @@ -246,7 +246,7 @@ throw ( lang::IllegalArgumentException, script::CannotConvertException, RuntimeE // b) an illegal location // detect illegal location - if ( scriptURI.indexOf( OUString("location=") ) != -1 ) + if ( scriptURI.indexOf( "location=" ) != -1 ) { OSL_TRACE( "ScriptNameResolver::resolve, throwing IllegalArgException" ); diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index aa82f3b44e51..b40cee487800 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -670,7 +670,7 @@ bool lcl_isFilterNativelySupported(const SfxFilter& rFilter) return true; ::rtl::OUString aName = rFilter.GetFilterName(); - if (aName.indexOf(::rtl::OUString("MS Excel")) == 0) + if (aName.indexOf("MS Excel") == 0) // We can handle all Excel variants natively. return true; diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx index b6fd672233f2..a461b65a1be6 100644 --- a/svx/source/form/fmdmod.cxx +++ b/svx/source/form/fmdmod.cxx @@ -40,7 +40,7 @@ using namespace ::svxform; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxFmMSFactory::createInstance(const ::rtl::OUString& ServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ) { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xRet; - if ( ServiceSpecifier.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.")) ) == 0 ) + if ( ServiceSpecifier.indexOf( "com.sun.star.form.component." ) == 0 ) { xRet = ::comphelper::getProcessServiceFactory()->createInstance(ServiceSpecifier); } diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 8af35f0badbe..9cc99b17bbed 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -1090,7 +1090,7 @@ void SdrObject::TakeObjNamePlural(XubString& rName) const void SdrObject::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, rtl::OUString& rStr, sal_uInt16 nVal) const { rStr = ImpGetResStr(nStrCacheID); - sal_Int32 nPos = rStr.indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%1"))); + sal_Int32 nPos = rStr.indexOf("%1"); if (nPos >= 0) { // Replace '%1' with the object name. @@ -1099,7 +1099,7 @@ void SdrObject::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, rtl::OUString& rSt rStr = rStr.replaceAt(nPos, 2, aObjName); } - nPos = rStr.indexOf(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%2"))); + nPos = rStr.indexOf("%2"); if (nPos >= 0) // Replace '%2' with the passed value. rStr = rStr.replaceAt( diff --git a/ucb/source/ucp/package/pkguri.cxx b/ucb/source/ucp/package/pkguri.cxx index 582bde364b08..137100375e81 100644 --- a/ucb/source/ucp/package/pkguri.cxx +++ b/ucb/source/ucp/package/pkguri.cxx @@ -195,9 +195,9 @@ void PackageUri::init() const // - encoded slashes // - parent folder segments ".." // - current folder segments "." - if ( m_aPath.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "//" ) ) ) != -1 - || m_aPath.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "%2F" ) ) ) != -1 - || m_aPath.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "%2f" ) ) ) != -1 + if ( m_aPath.indexOf( "//" ) != -1 + || m_aPath.indexOf( "%2F" ) != -1 + || m_aPath.indexOf( "%2f" ) != -1 || ::comphelper::OStorageHelper::PathHasSegment( m_aPath, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".." ) ) ) || ::comphelper::OStorageHelper::PathHasSegment( m_aPath, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "." ) ) ) ) { diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx index 75251e366919..05772c178c18 100644 --- a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx @@ -207,7 +207,7 @@ rtl::OUString VbaCommandBarHelper::findToolbarByName( const css::uno::Reference< for( sal_Int32 i = 0; i < allNames.getLength(); i++ ) { sResourceUrl = allNames[i]; - if(sResourceUrl.indexOf( rtl::OUString( ITEM_TOOLBAR_URL ) ) == 0 ) + if(sResourceUrl.indexOf( ITEM_TOOLBAR_URL ) == 0 ) { if( hasToolbar( sResourceUrl, sName ) ) return sResourceUrl; diff --git a/vbahelper/source/vbahelper/vbacommandbars.cxx b/vbahelper/source/vbahelper/vbacommandbars.cxx index 10ba77115d36..051b5aa3d1ed 100644 --- a/vbahelper/source/vbahelper/vbacommandbars.cxx +++ b/vbahelper/source/vbahelper/vbacommandbars.cxx @@ -59,7 +59,7 @@ public: if( hasMoreElements() ) { rtl::OUString sResourceUrl( m_sNames[ m_nCurrentPosition++ ] ); - if( sResourceUrl.indexOf( rtl::OUString("private:resource/toolbar/") ) != -1 ) + if( sResourceUrl.indexOf( "private:resource/toolbar/" ) != -1 ) { uno::Reference< container::XIndexAccess > xCBarSetting = m_pCBarHelper->getSettings( sResourceUrl ); uno::Reference< XCommandBar > xCommandBar( new ScVbaCommandBar( m_xParent, m_xContext, m_pCBarHelper, xCBarSetting, sResourceUrl, sal_False, sal_False ) ); @@ -194,7 +194,7 @@ ScVbaCommandBars::getCount() throw(css::uno::RuntimeException) uno::Sequence< ::rtl::OUString > allNames = m_xNameAccess->getElementNames(); for( sal_Int32 i = 0; i < allNames.getLength(); i++ ) { - if(allNames[i].indexOf( rtl::OUString("private:resource/toolbar/") ) != -1 ) + if(allNames[i].indexOf( "private:resource/toolbar/" ) != -1 ) { nCount++; } diff --git a/vbahelper/source/vbahelper/vbalineformat.cxx b/vbahelper/source/vbahelper/vbalineformat.cxx index 68e203913730..4a84e38179cd 100644 --- a/vbahelper/source/vbahelper/vbalineformat.cxx +++ b/vbahelper/source/vbahelper/vbalineformat.cxx @@ -102,7 +102,7 @@ ScVbaLineFormat::getBeginArrowheadStyle() throw (uno::RuntimeException) sal_Int32 nLineType = office::MsoArrowheadStyle::msoArrowheadNone; rtl::OUString sLineName; m_xPropertySet->getPropertyValue( rtl::OUString("LineStartName") ) >>= sLineName; - if( ( sLineName.getLength() > 7 ) && ( sLineName.indexOf( rtl::OUString("msArray") ) ) != -1 ) + if( ( sLineName.getLength() > 7 ) && ( sLineName.indexOf( "msArray" ) ) != -1 ) { sal_Int32 nIndex = sLineName.indexOf( ' ' ); rtl::OUString sName = sLineName.copy( 0, nIndex ); diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index daa684d7d14a..aafea0564701 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -4866,13 +4866,13 @@ sal_Int32 PDFWriterImpl::getBestBuiltinFont( const Font& rFont ) OUString aFontName( rFont.GetName() ); aFontName = aFontName.toAsciiLowerCase(); - if( aFontName.indexOf( OUString( "times" ) ) != -1 ) + if( aFontName.indexOf( "times" ) != -1 ) nBest = 8; - else if( aFontName.indexOf( OUString( "courier" ) ) != -1 ) + else if( aFontName.indexOf( "courier" ) != -1 ) nBest = 0; - else if( aFontName.indexOf( OUString( "dingbats" ) ) != -1 ) + else if( aFontName.indexOf( "dingbats" ) != -1 ) nBest = 13; - else if( aFontName.indexOf( OUString( "symbol" ) ) != -1 ) + else if( aFontName.indexOf( "symbol" ) != -1 ) nBest = 12; if( nBest < 12 ) { diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index 86e2516f8c60..524058f42756 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -779,17 +779,17 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan3_3( const uno::Reference< frame: if( !bResult ) { ::rtl::OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) ); - if( aGenerator.indexOf( ::rtl::OUString( "OpenOffice.org_project/3" ) ) != -1 ) + if( aGenerator.indexOf( "OpenOffice.org_project/3" ) != -1 ) { - if( aGenerator.indexOf( ::rtl::OUString( "OpenOffice.org_project/300m" ) ) != -1 ) + if( aGenerator.indexOf( "OpenOffice.org_project/300m" ) != -1 ) { sal_Int32 nBuilId = lcl_getBuildIDFromGenerator( lcl_getGeneratorFromModel(xChartModel) ); if( nBuilId>0 && nBuilId<9491 ) //9491 is build id of dev300m76 bResult= true; } - else if( aGenerator.indexOf( ::rtl::OUString( "OpenOffice.org_project/310m" ) ) != -1 ) + else if( aGenerator.indexOf( "OpenOffice.org_project/310m" ) != -1 ) bResult= true; - else if( aGenerator.indexOf( ::rtl::OUString( "OpenOffice.org_project/320m" ) ) != -1 ) + else if( aGenerator.indexOf( "OpenOffice.org_project/320m" ) != -1 ) bResult= true; } } @@ -802,7 +802,7 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan3_0( const uno::Reference< frame: if( !bResult ) { ::rtl::OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) ); - if( aGenerator.indexOf( ::rtl::OUString( "OpenOffice.org_project/680m" ) ) != -1 ) + if( aGenerator.indexOf( "OpenOffice.org_project/680m" ) != -1 ) bResult= true; } return bResult; @@ -834,11 +834,11 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const uno::Reference< frame: if( xChild.is() ) { aGenerator = lcl_getGeneratorFromModel( uno::Reference< frame::XModel >( xChild->getParent(), uno::UNO_QUERY) ); - if( aGenerator.indexOf( ::rtl::OUString( "OpenOffice.org_project" ) ) != -1 ) + if( aGenerator.indexOf( "OpenOffice.org_project" ) != -1 ) { //the chart application has not created files without a meta stream since OOo 2.3 (OOo 2.3 has written a metastream already) //only the report builder extension has created some files with OOo 3.1 that do not have a meta stream - if( aGenerator.indexOf( ::rtl::OUString( "OpenOffice.org_project/31" ) ) != -1 ) + if( aGenerator.indexOf( "OpenOffice.org_project/31" ) != -1 ) bResult = false;//#i100102# probably generated with OOo 3.1 by the report designer else bResult= true; //in this case the OLE chart was created by an older version, as OLE objects are sometimes stream copied the version can differ from the parents version, so the parents version is not a reliable indicator @@ -854,11 +854,11 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan2_0( const ::com::sun::star::uno: { bool bResult = false; ::rtl::OUString aGenerator( lcl_getGeneratorFromModelOrItsParent(xChartModel) ); - if( ( aGenerator.indexOf( ::rtl::OUString( "OpenOffice.org 1" ) ) == 0 ) - || ( aGenerator.indexOf( ::rtl::OUString( "StarOffice 6" ) ) == 0 ) - || ( aGenerator.indexOf( ::rtl::OUString( "StarOffice 7" ) ) == 0 ) - || ( aGenerator.indexOf( ::rtl::OUString( "StarSuite 6" ) ) == 0 ) - || ( aGenerator.indexOf( ::rtl::OUString( "StarSuite 7" ) ) == 0 ) + if( ( aGenerator.indexOf( "OpenOffice.org 1" ) == 0 ) + || ( aGenerator.indexOf( "StarOffice 6" ) == 0 ) + || ( aGenerator.indexOf( "StarOffice 7" ) == 0 ) + || ( aGenerator.indexOf( "StarSuite 6" ) == 0 ) + || ( aGenerator.indexOf( "StarSuite 7" ) == 0 ) ) bResult= true; return bResult; |