diff options
author | Noel Grandin <noel@peralex.com> | 2013-12-13 10:54:12 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-12-17 11:49:04 +0200 |
commit | 909b27df488f3c84ab8e5be9a7513a83b7c4b0c1 (patch) | |
tree | 2d17bbce7f9fa40fca140696648ec136a12f63d1 | |
parent | 08fe82e59cbc598d2683d72877653316c1e41962 (diff) |
remove unnecessary double calls to OUString constructor
Change-Id: Ib2690e3ec9987b97363687b61fe8ddae4ace9058
26 files changed, 41 insertions, 43 deletions
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index ca012d109b0b..e208813c8d66 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -248,7 +248,6 @@ namespace OUString generateColumnNames(const Reference<XIndexAccess>& _xColumns,const Reference<XDatabaseMetaData>& _xMetaData) { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); - static const OUString sComma(OUString(",")); const OUString sQuote(_xMetaData->getIdentifierQuoteString()); OUString sSql( " (" ); @@ -259,7 +258,7 @@ namespace { if ( (_xColumns->getByIndex(i) >>= xColProp) && xColProp.is() ) sSql += ::dbtools::quoteName(sQuote,::comphelper::getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME)))) - + sComma; + + ","; } if ( nColCount ) diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx index 820c57ee1d14..5c89a7117a7f 100644 --- a/connectivity/source/commontools/formattedcolumnvalue.cxx +++ b/connectivity/source/commontools/formattedcolumnvalue.cxx @@ -156,7 +156,7 @@ namespace dbtools // get the format key of our bound field Reference< XPropertySetInfo > xPSI( _rxColumn->getPropertySetInfo(), UNO_QUERY_THROW ); bool bHaveFieldFormat = false; - const OUString sFormatKeyProperty( OUString( "FormatKey" ) ); + const OUString sFormatKeyProperty( "FormatKey" ); if ( xPSI->hasPropertyByName( sFormatKeyProperty ) ) { bHaveFieldFormat = ( _rxColumn->getPropertyValue( sFormatKeyProperty ) >>= _rData.m_nFormatKey ); diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx index 791a06b23631..f80bc1e03b02 100644 --- a/connectivity/source/commontools/statementcomposer.cxx +++ b/connectivity/source/commontools/statementcomposer.cxx @@ -169,7 +169,7 @@ namespace dbtools xComposer->setElementaryQuery( sStatement ); // the sort order - const OUString sPropOrder( OUString( "Order" ) ); + const OUString sPropOrder( "Order" ); if ( ::comphelper::hasProperty( sPropOrder, xQuery ) ) { OUString sOrder; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx index c4790a5e7eb9..77a9020a7207 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx @@ -454,12 +454,12 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp //map mailing lists as views _rStrings->push_back( aTableName ); // Table name if (!bIsMailList) { - OUString aTableType(OUString("TABLE")); + OUString aTableType("TABLE"); _rTypes->push_back( aTableType ); // Table type } else { - OUString aTableType(OUString("VIEW")); + OUString aTableType("VIEW"); _rTypes->push_back( aTableType ); // Table type } } diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index 6f13f4a66230..c99585bd5e1e 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -1747,7 +1747,7 @@ sal_Bool OSQLParseNode::addDateValue(OUStringBuffer& rString, const SQLParseNode SQL_ISTOKEN(pODBCNodeChild, T) || SQL_ISTOKEN(pODBCNodeChild, TS) )) { - OUString suQuote(OUString("'")); + OUString suQuote("'"); if (rParam.bPredicate) { if (rParam.aMetaData.shouldEscapeDateTime()) diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 1d6c9f562d18..cec9b910721a 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -107,7 +107,7 @@ void Desktop::InitApplicationServiceManager() SAL_INFO( "desktop.app", "desktop (cd100003) ::createApplicationServiceManager" ); Reference<XMultiServiceFactory> sm; #ifdef ANDROID - OUString aUnoRc( OUString( "file:///assets/program/unorc" ) ); + OUString aUnoRc( "file:///assets/program/unorc" ); sm.set( cppu::defaultBootstrap_InitialComponentContext( aUnoRc )->getServiceManager(), UNO_QUERY_THROW); diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx index 26bf5a8c7715..7a3e48515ddf 100644 --- a/sc/source/core/tool/charthelper.cxx +++ b/sc/source/core/tool/charthelper.cxx @@ -247,7 +247,7 @@ void ScChartHelper::SetChartRanges( const uno::Reference< chart2::XChartDocument try { - OUString aPropertyNameRole( OUString("Role") ); + OUString aPropertyNameRole( "Role" ); uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > aLabeledDataSequences( xDataSource->getDataSequences() ); sal_Int32 nRange=0; diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index 2f3685e12363..270386d3b6ac 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -318,7 +318,7 @@ ScVbaFormat<Ifc1>::getWrapText( ) throw (script::BasicErrorException, uno::Runt uno::Any aWrap = aNULL(); try { - OUString aPropName( OUString( SC_UNONAME_WRAP ) ); + OUString aPropName( SC_UNONAME_WRAP ); if (!isAmbiguous( aPropName )) { aWrap = mxPropertySet->getPropertyValue(aPropName); diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index e7cec074c04c..eb6de6adb57a 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -102,7 +102,7 @@ void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, sal_Bool /*bNew* if ( xDispatchProvider.is() ) { URL aTargetURL; - OUString aTarget( OUString("_default")); + OUString aTarget( "_default" ); aTargetURL.Complete = aName; diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index 57c972fbe0ed..d210c6f8756d 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -435,7 +435,7 @@ long Select_Impl( void* /*pHdl*/, void* pVoid ) xDisp = xDesktop->queryDispatch( aTargetURL, OUString(), 0 ); else { - OUString aTargetFrame( OUString("_blank") ); + OUString aTargetFrame( "_blank" ); ::framework::MenuConfiguration::Attributes* pMenuAttributes = (::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( pMenu->GetCurItemId() ); diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index 57886b7e7611..a381af91b40e 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -444,7 +444,7 @@ void SmMathConfig::ReadSymbol( SmSym &rSymbol, Sequence< OUString > aNames = lcl_GetSymbolPropertyNames(); sal_Int32 nProps = aNames.getLength(); - OUString aDelim( OUString( (sal_Unicode) '/' ) ); + OUString aDelim( "/" ); OUString *pName = aNames.getArray(); for (sal_Int32 i = 0; i < nProps; ++i) { @@ -580,7 +580,7 @@ void SmMathConfig::SetSymbols( const std::vector< SmSym > &rNewSymbols ) PropertyValue *pValues = aValues.getArray(); PropertyValue *pVal = pValues; - OUString aDelim( OUString( (sal_Unicode) '/' ) ); + OUString aDelim( "/" ); std::vector< SmSym >::const_iterator aIt( rNewSymbols.begin() ); std::vector< SmSym >::const_iterator aEnd( rNewSymbols.end() ); while (aIt != aEnd) @@ -670,7 +670,7 @@ void SmMathConfig::ReadFontFormat( SmFontFormat &rFontFormat, Sequence< OUString > aNames = lcl_GetFontPropertyNames(); sal_Int32 nProps = aNames.getLength(); - OUString aDelim( OUString( (sal_Unicode) '/' ) ); + OUString aDelim( "/" ); OUString *pName = aNames.getArray(); for (sal_Int32 i = 0; i < nProps; ++i) { @@ -746,7 +746,7 @@ void SmMathConfig::SaveFontFormatList() PropertyValue *pValues = aValues.getArray(); PropertyValue *pVal = pValues; - OUString aDelim( OUString( (sal_Unicode) '/' ) ); + OUString aDelim( "/" ); for (size_t i = 0; i < nCount; ++i) { OUString aFntFmtId( rFntFmtList.GetFontFormatId( i ) ); diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx index 31639fb60f0a..98be298326b7 100644 --- a/stoc/source/namingservice/namingservice.cxx +++ b/stoc/source/namingservice/namingservice.cxx @@ -52,7 +52,7 @@ namespace stoc_namingservice static Sequence< OUString > ns_getSupportedServiceNames() { Sequence< OUString > seqNames(1); - seqNames.getArray()[0] = OUString(SERVICENAME); + seqNames.getArray()[0] = SERVICENAME; return seqNames; } @@ -100,7 +100,7 @@ public: throw(::com::sun::star::uno::RuntimeException); static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static() { - OUString aStr( OUString(SERVICENAME) ); + OUString aStr( SERVICENAME ); return Sequence< OUString >( &aStr, 1 ); } diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 4517ef765188..edb013775d3a 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -1807,10 +1807,10 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( const ::com::sun::star::i18n if (LocaleDataWrapper::areChecksEnabled() && rCode.Index != NF_CURRENCY_1000DEC2_CCC ) { - OUString aMsg(OUString("SvNumberFormatter::ImpInsertFormat: no [$...] on currency format code, index ") + - OUString::number( rCode.Index) + - OUString(":\n") + - rCode.Code); + OUString aMsg = "SvNumberFormatter::ImpInsertFormat: no [$...] on currency format code, index " + + OUString::number( rCode.Index) + + ":\n" + + rCode.Code; LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo( aMsg)); } } @@ -1827,10 +1827,10 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( const ::com::sun::star::i18n { if (LocaleDataWrapper::areChecksEnabled()) { - OUString aMsg( OUString("SvNumberFormatter::ImpInsertFormat: bad format code, index " ) + - OUString::number( rCode.Index ) + - OUString("\n") + - rCode.Code); + OUString aMsg = "SvNumberFormatter::ImpInsertFormat: bad format code, index " + + OUString::number( rCode.Index ) + + "\n" + + rCode.Code; LocaleDataWrapper::outputCheckMessage( xLocaleData->appendLocaleInfo( aMsg)); } delete pFormat; diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index fe152ff683c4..d8f6f9fd649b 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -217,8 +217,8 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( sal_Bool bUpd pFilterOptions = new FilterConfigItem( &aFilterData ); } - const OUString sLogicalWidth(OUString("LogicalWidth")); - const OUString sLogicalHeight(OUString("LogicalHeight")); + const OUString sLogicalWidth("LogicalWidth"); + const OUString sLogicalHeight("LogicalHeight"); if ( mbIsPixelFormat ) { pFilterOptions->WriteInt32(OUString("PixelWidth"), static_cast< sal_Int32 >( maSize.Width ) ); diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx index c88ec428ed65..62ba86ace1ad 100644 --- a/svx/workben/msview/xmlconfig.cxx +++ b/svx/workben/msview/xmlconfig.cxx @@ -191,7 +191,7 @@ void SAL_CALL ConfigHandler::startElement(const OUString& aName, const Reference if( !pElement.get() ) { - OUString aMessage( OUString( "unknown config element: ") ); + OUString aMessage( "unknown config element: " ); aMessage += aName; errorThrow( aMessage ); } diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 863a71522326..f47713474fcd 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -481,7 +481,7 @@ IMPL_LINK_NOARG(SwFldDBPage, ModifyHdl) void SwFldDBPage::FillUserData() { - OUString sData(OUString(USER_DATA_VERSION)); + OUString sData(USER_DATA_VERSION); sData += ";"; sal_uInt16 nTypeSel = m_pTypeLB->GetSelectEntryPos(); diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index 528d45f11178..693a8e58f5ca 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -330,7 +330,7 @@ SwSpellPopup::SwSpellPopup( } } - OUString aIgnoreSelection( OUString( SW_RES( STR_IGNORE_SELECTION ) ) ); + OUString aIgnoreSelection( SW_RES( STR_IGNORE_SELECTION ) ); OUString aSpellingAndGrammar = RetrieveLabelFromCommand( ".uno:SpellingAndGrammarDialog" ); SetItemText( MN_SPELLING_DLG, aSpellingAndGrammar ); sal_uInt16 nItemPos = GetItemPos( MN_IGNORE_WORD ); diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx index 5ad33cc85dc3..b8b06f0d4721 100644 --- a/ucb/source/ucp/ftp/ftpurl.cxx +++ b/ucb/source/ucp/ftp/ftpurl.cxx @@ -165,8 +165,7 @@ void FTPURL::parse(const OUString& url) *p1++ = ch; *p1 = 0; - OUString aExpr(OUString(buffer,strlen(buffer), - RTL_TEXTENCODING_UTF8)); + OUString aExpr(buffer, strlen(buffer), RTL_TEXTENCODING_UTF8); sal_Int32 l = aExpr.indexOf('@'); m_aHost = aExpr.copy(1+l); diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx index 6cb59e0b4bcb..c9472bf4ce90 100644 --- a/vcl/source/filter/FilterConfigItem.cxx +++ b/vcl/source/filter/FilterConfigItem.cxx @@ -110,7 +110,7 @@ void FilterConfigItem::ImpInitTree( const OUString& rSubTree ) Reference< XMultiServiceFactory > xCfgProv = theDefaultProvider::get( xContext ); - OUString sTree(OUString("/org.openoffice.") + rSubTree); + OUString sTree = "/org.openoffice." + rSubTree; if ( ImpIsTreeAvailable(xCfgProv, sTree) ) { Any aAny; diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index fb60d44ee529..25c120aaa22f 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -2308,7 +2308,7 @@ void SchXMLExportHelper_Impl::exportAxis( bool bHasTitle, bool bHasMajorGrid, bool bHasMinorGrid, bool bExportContent ) { - static const OUString sNumFormat( OUString( "NumberFormat" )); + static const OUString sNumFormat( "NumberFormat" ); std::vector< XMLPropertyState > aPropertyStates; SvXMLElementExport* pAxis = NULL; diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index e9e3c5910bda..9f0c3e7dc9c2 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -353,7 +353,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri { if( maChartTypeServiceName == "com.sun.star.chart2.PieChartType" || maChartTypeServiceName == "com.sun.star.chart2.DonutChartType" ) { - OUString aPropName( OUString("StartingAngle") ); + OUString aPropName( "StartingAngle" ); uno::Any aAStartingAngle( SchXMLTools::getPropertyFromContext( aPropName, pPropStyleContext, pStylesCtxt ) ); if( !aAStartingAngle.hasValue() ) xProp->setPropertyValue( aPropName, uno::makeAny(sal_Int32(0)) ) ; diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx index c6e4c4d8ad0d..14458747e146 100644 --- a/xmloff/source/core/unoatrcn.cxx +++ b/xmloff/source/core/unoatrcn.cxx @@ -256,7 +256,7 @@ OUString SAL_CALL SvUnoAttributeContainer::getImplementationName(void) throw( un uno::Sequence< OUString > SvUnoAttributeContainer::getSupportedServiceNames(void) throw( uno::RuntimeException ) { - OUString aSN( OUString( "com.sun.star.xml.AttributeContainer" ) ); + OUString aSN( "com.sun.star.xml.AttributeContainer" ); uno::Sequence< OUString > aNS( &aSN, 1L ); return aNS; } diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 32ed660aae4b..ade0d57c44e5 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -4769,7 +4769,7 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape try { sal_Bool bBool = sal_False; - const OUString sAPIPropertyName( OUString(pEntry->msApiName, pEntry->nApiNameLength, RTL_TEXTENCODING_ASCII_US ) ); + const OUString sAPIPropertyName( pEntry->msApiName, pEntry->nApiNameLength, RTL_TEXTENCODING_ASCII_US ); xPropSet->getPropertyValue( sAPIPropertyName ) >>= bBool; if( bBool ) diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 14a0d081c629..866dc8c6a1bd 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -3834,7 +3834,7 @@ void SdXMLTableShapeContext::StartElement( const ::com::sun::star::uno::Referenc { try { - const OUString sAPIPropertyName( OUString(pEntry->msApiName, pEntry->nApiNameLength, RTL_TEXTENCODING_ASCII_US ) ); + const OUString sAPIPropertyName( pEntry->msApiName, pEntry->nApiNameLength, RTL_TEXTENCODING_ASCII_US ); xProps->setPropertyValue( sAPIPropertyName, Any( maTemplateStylesUsed[i] ) ); } catch(const Exception&) diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index b8ce62cfbabd..a210fee3be51 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -1219,7 +1219,7 @@ void SdXMLStylesContext::SetMasterPageStyles(SdXMLMasterPageContext& rMaster) co { uno::Reference< container::XNameAccess > xMasterPageStyles( rStyleFamilies->getByName(rMaster.GetDisplayName()), UNO_QUERY_THROW ); OUString sPrefix(rMaster.GetDisplayName()); - sPrefix += OUString('-'); + sPrefix += "-"; ImpSetGraphicStyles(xMasterPageStyles, XML_STYLE_FAMILY_SD_PRESENTATION_ID, sPrefix); } catch (const uno::Exception&) @@ -1235,7 +1235,7 @@ void SdXMLStylesContext::ImpSetGraphicStyles() const { if(GetSdImport().GetLocalDocStyleFamilies().is()) try { - const OUString sGraphicStyleName(OUString("graphics")); + const OUString sGraphicStyleName("graphics"); uno::Reference< container::XNameAccess > xGraphicPageStyles( GetSdImport().GetLocalDocStyleFamilies()->getByName(sGraphicStyleName), uno::UNO_QUERY_THROW ); ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_SD_GRAPHICS_ID, OUString()); @@ -1250,7 +1250,7 @@ void SdXMLStylesContext::ImpSetCellStyles() const { if(GetSdImport().GetLocalDocStyleFamilies().is()) try { - const OUString sCellStyleName(OUString("cell")); + const OUString sCellStyleName("cell"); uno::Reference< container::XNameAccess > xGraphicPageStyles( GetSdImport().GetLocalDocStyleFamilies()->getByName(sCellStyleName), uno::UNO_QUERY_THROW ); ImpSetGraphicStyles(xGraphicPageStyles, XML_STYLE_FAMILY_TABLE_CELL, OUString()); diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index 487ed5b3c9f0..6915862673ff 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -1374,7 +1374,7 @@ sal_Bool XMLTransformerBase::ConvertURIToOOo( OUString& rURI, if( bPackage && bSupportPackage ) { - OUString sTmp( OUString( '#' ) ); + OUString sTmp( '#' ); if( rURI.startsWith( "./" ) ) rURI = rURI.copy( 2 ); sTmp += rURI; |