diff options
author | Noel Grandin <noel@peralex.com> | 2015-11-04 08:37:10 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-11-04 07:34:41 +0000 |
commit | 81824d135987712b57e3c81a26f72ae4fabb4031 (patch) | |
tree | f4268731e5af7b5c2658ecab0dcb7d2caa3c2a4d /xmloff | |
parent | 62dbe2e6eb30660f252b4e2c048f4aecf28e41c6 (diff) |
loplugin:stringconstant
Change-Id: I6cc11a273902da8acdb6adbccccc31fe30ab274e
Reviewed-on: https://gerrit.libreoffice.org/19768
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/chart/SchXMLExport.cxx | 38 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLPlotAreaContext.cxx | 48 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLSeries2Context.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLTableContext.cxx | 3 | ||||
-rw-r--r-- | xmloff/source/core/xmlexp.cxx | 3 | ||||
-rw-r--r-- | xmloff/source/core/xmluconv.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/sdpropls.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/shapeimport.cxx | 10 | ||||
-rw-r--r-- | xmloff/source/draw/ximp3dobject.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 14 | ||||
-rw-r--r-- | xmloff/source/meta/MetaExportComponent.cxx | 3 | ||||
-rw-r--r-- | xmloff/source/style/XMLFontAutoStylePool.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/numehelp.cxx | 8 | ||||
-rw-r--r-- | xmloff/source/text/XMLTextListAutoStylePool.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/txtfldi.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/text/txtparai.cxx | 3 | ||||
-rw-r--r-- | xmloff/source/text/txtvfldi.cxx | 15 |
18 files changed, 60 insertions, 111 deletions
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index ed226f5d0e69..9ecdffe70b40 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -930,8 +930,7 @@ void lcl_exportNumberFormat( const OUString& rPropertyName, const Reference< bea Reference< chart2::data::XDataSequence > xSequence( aSequences[nI]->getValues()); Reference< beans::XPropertySet > xSeqProp( xSequence, uno::UNO_QUERY_THROW ); OUString aRole; - if( ( xSeqProp->getPropertyValue( - OUString( "Role" )) >>= aRole ) && + if( ( xSeqProp->getPropertyValue( "Role" ) >>= aRole ) && aRole.match( aRolePrefix )) { aResult.push_back( xSequence ); @@ -1311,8 +1310,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY ); if( xPropSet.is()) { - Any aAny( xPropSet->getPropertyValue( - OUString( "String" ))); + Any aAny( xPropSet->getPropertyValue( "String" )); OUString aText; aAny >>= aText; exportText( aText ); @@ -1353,8 +1351,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY ); if( xPropSet.is()) { - Any aAny( xPropSet->getPropertyValue( - OUString( "String" ))); + Any aAny( xPropSet->getPropertyValue( "String" )); OUString aText; aAny >>= aText; exportText( aText ); @@ -1889,11 +1886,9 @@ void SchXMLExportHelper_Impl::exportPlotArea( { bool bFirstCol = false, bFirstRow = false; - aAny = xDocProp->getPropertyValue( - OUString( "DataSourceLabelsInFirstColumn" )); + aAny = xDocProp->getPropertyValue( "DataSourceLabelsInFirstColumn" ); aAny >>= bFirstCol; - aAny = xDocProp->getPropertyValue( - OUString( "DataSourceLabelsInFirstRow" )); + aAny = xDocProp->getPropertyValue( "DataSourceLabelsInFirstRow" ); aAny >>= bFirstRow; if( bFirstCol || bFirstRow ) @@ -2182,8 +2177,7 @@ void SchXMLExportHelper_Impl::exportAxisTitle( const Reference< beans::XProperty if( bExportContent ) { OUString aText; - Any aAny( rTitleProps->getPropertyValue( - OUString( "String" ))); + Any aAny( rTitleProps->getPropertyValue( "String" )); aAny >>= aText; Reference< drawing::XShape > xShape( rTitleProps, uno::UNO_QUERY ); @@ -2666,12 +2660,10 @@ void SchXMLExportHelper_Impl::exportSeries( // determine attached axis try { - Any aAny( xPropSet->getPropertyValue( - OUString( "Axis" ))); + Any aAny( xPropSet->getPropertyValue( "Axis" )); aAny >>= nAttachedAxis; - aAny = xPropSet->getPropertyValue( - OUString( "MeanValue" )); + aAny = xPropSet->getPropertyValue( "MeanValue" ); aAny >>= bHasMeanValueLine; } catch( const beans::UnknownPropertyException & rEx ) @@ -2827,8 +2819,7 @@ void SchXMLExportHelper_Impl::exportSeries( Reference< beans::XPropertySet > xStatProp; try { - Any aPropAny( xPropSet->getPropertyValue( - OUString( "DataMeanValueProperties" ))); + Any aPropAny( xPropSet->getPropertyValue( "DataMeanValueProperties" )); aPropAny >>= xStatProp; } catch( const uno::Exception & rEx ) @@ -3009,7 +3000,7 @@ void SchXMLExportHelper_Impl::exportRegressionCurve( // export position chart2::RelativePosition aRelativePosition; - if( xEquationProperties->getPropertyValue(OUString( "RelativePosition")) >>= aRelativePosition ) + if( xEquationProperties->getPropertyValue( "RelativePosition" ) >>= aRelativePosition ) { double fX = aRelativePosition.Primary * rPageSize.Width; double fY = aRelativePosition.Secondary * rPageSize.Height; @@ -3628,8 +3619,7 @@ void SchXMLExport::_ExportContent() Reference< lang::XServiceInfo > xServ( xChartDoc, uno::UNO_QUERY ); if( xServ.is()) { - if( xServ->supportsService( - OUString( "com.sun.star.chart.ChartTableAddressSupplier" ))) + if( xServ->supportsService( "com.sun.star.chart.ChartTableAddressSupplier" )) { Reference< beans::XPropertySet > xProp( xServ, uno::UNO_QUERY ); if( xProp.is()) @@ -3638,14 +3628,12 @@ void SchXMLExport::_ExportContent() try { OUString sChartAddress; - aAny = xProp->getPropertyValue( - OUString( "ChartRangeAddress" )); + aAny = xProp->getPropertyValue( "ChartRangeAddress" ); aAny >>= sChartAddress; maExportHelper->m_pImpl->SetChartRangeAddress( sChartAddress ); OUString sTableNumberList; - aAny = xProp->getPropertyValue( - OUString( "TableNumberList" )); + aAny = xProp->getPropertyValue( "TableNumberList" ); aAny >>= sTableNumberList; maExportHelper->m_pImpl->SetTableNumberList( sTableNumberList ); diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index 58a5644294e6..6b5a4a22ccaa 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -189,32 +189,20 @@ SchXMLPlotAreaContext::SchXMLPlotAreaContext( { try { - xProp->setPropertyValue( - OUString( "HasXAxis" ), aFalseBool ); - xProp->setPropertyValue( - OUString( "HasXAxisGrid" ), aFalseBool ); - xProp->setPropertyValue( - OUString( "HasXAxisDescription" ), aFalseBool ); - xProp->setPropertyValue( - OUString( "HasSecondaryXAxis" ), aFalseBool ); - xProp->setPropertyValue( - OUString( "HasSecondaryXAxisDescription" ), aFalseBool ); - - xProp->setPropertyValue( - OUString( "HasYAxis" ), aFalseBool ); - xProp->setPropertyValue( - OUString( "HasYAxisGrid" ), aFalseBool ); - xProp->setPropertyValue( - OUString( "HasYAxisDescription" ), aFalseBool ); - xProp->setPropertyValue( - OUString( "HasSecondaryYAxis" ), aFalseBool ); - xProp->setPropertyValue( - OUString( "HasSecondaryYAxisDescription" ), aFalseBool ); - - xProp->setPropertyValue( - OUString( "HasZAxis" ), aFalseBool ); - xProp->setPropertyValue( - OUString( "HasZAxisDescription" ), aFalseBool ); + xProp->setPropertyValue("HasXAxis", aFalseBool ); + xProp->setPropertyValue("HasXAxisGrid", aFalseBool ); + xProp->setPropertyValue("HasXAxisDescription", aFalseBool ); + xProp->setPropertyValue("HasSecondaryXAxis", aFalseBool ); + xProp->setPropertyValue("HasSecondaryXAxisDescription", aFalseBool ); + + xProp->setPropertyValue("HasYAxis", aFalseBool ); + xProp->setPropertyValue("HasYAxisGrid", aFalseBool ); + xProp->setPropertyValue("HasYAxisDescription", aFalseBool ); + xProp->setPropertyValue("HasSecondaryYAxis", aFalseBool ); + xProp->setPropertyValue("HasSecondaryYAxisDescription", aFalseBool ); + + xProp->setPropertyValue("HasZAxis", aFalseBool ); + xProp->setPropertyValue("HasZAxisDescription", aFalseBool ); uno::Any aAny; chart::ChartDataRowSource eSource = chart::ChartDataRowSource_COLUMNS; @@ -296,14 +284,10 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri { uno::Any aAny; aAny <<= mrColHasLabels; - xDocProp->setPropertyValue( - OUString( "DataSourceLabelsInFirstColumn" ), - aAny ); + xDocProp->setPropertyValue("DataSourceLabelsInFirstColumn", aAny ); aAny <<= mrRowHasLabels; - xDocProp->setPropertyValue( - OUString( "DataSourceLabelsInFirstRow" ), - aAny ); + xDocProp->setPropertyValue("DataSourceLabelsInFirstRow", aAny ); } catch( const beans::UnknownPropertyException & ) { diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx index 598d89b89b63..8b723e371a9e 100644 --- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx +++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx @@ -188,15 +188,15 @@ void SchXMLEquationContext::StartElement( const uno::Reference< xml::sax::XAttri pPropStyleContext->FillPropertySet( xEqationProperties ); } } - xEqationProperties->setPropertyValue( OUString( "ShowEquation"), uno::makeAny( bShowEquation )); - xEqationProperties->setPropertyValue( OUString( "ShowCorrelationCoefficient"), uno::makeAny( bShowRSquare )); + xEqationProperties->setPropertyValue( "ShowEquation", uno::makeAny( bShowEquation )); + xEqationProperties->setPropertyValue( "ShowCorrelationCoefficient", uno::makeAny( bShowRSquare )); if( bHasXPos && bHasYPos ) { chart2::RelativePosition aRelPos; aRelPos.Primary = static_cast< double >( aPosition.X ) / static_cast< double >( maChartSize.Width ); aRelPos.Secondary = static_cast< double >( aPosition.Y ) / static_cast< double >( maChartSize.Height ); - xEqationProperties->setPropertyValue( OUString( "RelativePosition" ), uno::makeAny( aRelPos )); + xEqationProperties->setPropertyValue( "RelativePosition", uno::makeAny( aRelPos )); } mrRegressionStyle.m_xEquationProperties.set( xEqationProperties ); } diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index a7178769d7d3..fae7430bb3d3 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -985,12 +985,10 @@ void SchXMLSeries2Context::setStylesToStatisticsObjects( SeriesDefaultsAndStyles switch( iStyle->meType ) { case DataRowPointStyle::MEAN_VALUE: - xSeriesProp->getPropertyValue( - OUString( "DataMeanValueProperties" )) >>= xStatPropSet; + xSeriesProp->getPropertyValue("DataMeanValueProperties") >>= xStatPropSet; break; case DataRowPointStyle::ERROR_INDICATOR: - xSeriesProp->getPropertyValue( - OUString( "DataErrorProperties" )) >>= xStatPropSet; + xSeriesProp->getPropertyValue("DataErrorProperties") >>= xStatPropSet; break; default: break; diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx index 8b58f4cb5a70..409e1f623884 100644 --- a/xmloff/source/chart/SchXMLTableContext.cxx +++ b/xmloff/source/chart/SchXMLTableContext.cxx @@ -895,8 +895,7 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary( { Reference< beans::XPropertySet > xOldSequenceProp( aLSeqIt->second->getValues(), uno::UNO_QUERY ); Reference< chart2::data::XDataSequence > xNewSequence( - xDataProv->createDataSequenceByRangeRepresentation( - OUString("categories"))); + xDataProv->createDataSequenceByRangeRepresentation("categories")); SchXMLTools::copyProperties( xOldSequenceProp, Reference< beans::XPropertySet >( xNewSequence, uno::UNO_QUERY )); aLSeqIt->second->setValues( xNewSequence ); diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 97760c855911..1bbbb98dceae 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -1370,8 +1370,7 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ) Any aAny; aAny <<= GetXMLToken( eClass ); - xConvPropSet->setPropertyValue( - OUString("Class"), aAny ); + xConvPropSet->setPropertyValue( "Class", aAny ); Reference< XPropertySet > xPropSet = mxExportInfo.is() diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index 27562d63e362..eaded066044b 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -301,7 +301,7 @@ bool SvXMLUnitConverter::setNullDate(const com::sun::star::uno::Reference <com:: if (xNumberFormatsSupplier.is()) { const com::sun::star::uno::Reference <com::sun::star::beans::XPropertySet> xPropertySet = xNumberFormatsSupplier->getNumberFormatSettings(); - return xPropertySet.is() && (xPropertySet->getPropertyValue(OUString(XML_NULLDATE)) >>= m_pImpl->m_aNullDate); + return xPropertySet.is() && (xPropertySet->getPropertyValue(XML_NULLDATE) >>= m_pImpl->m_aNullDate); } return false; } diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index cfb5bbc7d679..4214cac4ec6e 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -997,7 +997,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy uno::Reference<ucb::XAnyCompareFactory> xCompareFac( mxModel, uno::UNO_QUERY ); uno::Reference<ucb::XAnyCompare> xCompare; if( xCompareFac.is() ) - xCompare = xCompareFac->createAnyCompareByName( OUString( "NumberingRules" ) ); + xCompare = xCompareFac->createAnyCompareByName( "NumberingRules" ); pHdl = new XMLNumRulePropHdl( xCompare ); break; diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 0c9d4644f5c7..1e4ce7c8bdf6 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -750,13 +750,11 @@ void XMLShapeImportHelper::finishShape( { if ( mrImporter.IsShapePositionInHoriL2R() && xPropSet->getPropertySetInfo()->hasPropertyByName( - OUString("PositionLayoutDir")) ) + "PositionLayoutDir") ) { uno::Any aPosLayoutDir; aPosLayoutDir <<= text::PositionLayoutDir::PositionInHoriL2R; - xPropSet->setPropertyValue( - OUString("PositionLayoutDir"), - aPosLayoutDir ); + xPropSet->setPropertyValue( "PositionLayoutDir", aPosLayoutDir ); } } } @@ -798,10 +796,10 @@ void ShapeSortContext::moveShape( sal_Int32 nSourcePos, sal_Int32 nDestPos ) uno::Reference< beans::XPropertySet > xPropSet; aAny >>= xPropSet; - if( xPropSet.is() && xPropSet->getPropertySetInfo()->hasPropertyByName( OUString("ZOrder") ) ) + if( xPropSet.is() && xPropSet->getPropertySetInfo()->hasPropertyByName( "ZOrder" ) ) { aAny <<= nDestPos; - xPropSet->setPropertyValue( OUString("ZOrder"), aAny ); + xPropSet->setPropertyValue( "ZOrder", aAny ); for( ZOrderHint& rHint : maZOrderList ) { diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index 97952fddb9b2..4a18d432bb36 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -374,7 +374,7 @@ void SdXML3DPolygonBasedShapeContext::StartElement(const uno::Reference< xml::sa // set polygon data uno::Any aAny; aAny <<= xPolyPolygon3D; - xPropSet->setPropertyValue(OUString("D3DPolyPolygon3D"), aAny); + xPropSet->setPropertyValue("D3DPolyPolygon3D", aAny); } else { diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 208129c403f0..bf05af377a0b 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -592,8 +592,7 @@ void SdXMLShapeContext::SetTransformation() aAny <<= aMatrix; - xPropSet->setPropertyValue( - OUString("Transformation"), aAny); + xPropSet->setPropertyValue("Transformation", aAny); } } } @@ -1178,8 +1177,7 @@ void SdXMLLineShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib *pInnerSequence = awt::Point( mnX2 - aTopLeft.X, mnY2 - aTopLeft.Y); aAny <<= aPolyPoly; - xPropSet->setPropertyValue( - OUString("Geometry"), aAny); + xPropSet->setPropertyValue("Geometry", aAny); } // set sizes for transformation @@ -1426,7 +1424,7 @@ void SdXMLPolygonShapeContext::StartElement(const uno::Reference< xml::sax::XAtt basegfx::tools::B2DPolyPolygonToUnoPointSequenceSequence(basegfx::B2DPolyPolygon(aPolygon), aPointSequenceSequence); aAny <<= aPointSequenceSequence; - xPropSet->setPropertyValue(OUString("Geometry"), aAny); + xPropSet->setPropertyValue("Geometry", aAny); } } } @@ -1576,7 +1574,7 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib aAny <<= aSourcePolyPolygon; } - xPropSet->setPropertyValue(OUString("Geometry"), aAny); + xPropSet->setPropertyValue("Geometry", aAny); } // set pos, size, shear and rotate @@ -3230,9 +3228,7 @@ void SdXMLPluginShapeContext::EndElement() else { // in case we have a media object - xProps->setPropertyValue( - OUString("MediaURL"), - uno::makeAny(maHref)); + xProps->setPropertyValue( "MediaURL", uno::makeAny(maHref)); xProps->setPropertyValue("MediaMimeType", uno::makeAny(maMimeType) ); diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index 2fce736e2fc4..a9e0b3e89270 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -92,8 +92,7 @@ sal_uInt32 XMLMetaExportComponent::exportDoc( enum XMLTokenEnum ) uno::Any aAny; aAny <<= GetXMLToken( XML_TEXT ); - xConvPropSet->setPropertyValue( - OUString("Class"), aAny ); + xConvPropSet->setPropertyValue("Class", aAny ); uno::Reference< beans::XPropertySet > xPropSet = getExportInfo().is() diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx index 57d1ca22db81..13bdfe845353 100644 --- a/xmloff/source/style/XMLFontAutoStylePool.cxx +++ b/xmloff/source/style/XMLFontAutoStylePool.cxx @@ -374,7 +374,7 @@ OUString XMLFontAutoStylePool::embedFontFile( const OUString& fileUrl ) return OUString(); uno::Reference< embed::XStorage > storage; - storage.set( GetExport().GetTargetStorage()->openStorageElement( OUString( "Fonts" ), + storage.set( GetExport().GetTargetStorage()->openStorageElement( "Fonts", ::embed::ElementModes::WRITE ), uno::UNO_QUERY_THROW ); int index = 0; OUString name; diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx index ca01ffeba1a8..546518a40da9 100644 --- a/xmloff/source/style/numehelp.cxx +++ b/xmloff/source/style/numehelp.cxx @@ -226,10 +226,10 @@ bool XMLNumberFormatAttributesExportHelper::GetCurrencySymbol(const sal_Int32 nN try { uno::Reference <beans::XPropertySet> xNumberPropertySet(xNumberFormats->getByKey(nNumberFormat)); - if ( xNumberPropertySet->getPropertyValue(OUString(XML_CURRENCYSYMBOL)) >>= sCurrencySymbol) + if ( xNumberPropertySet->getPropertyValue(XML_CURRENCYSYMBOL) >>= sCurrencySymbol) { OUString sCurrencyAbbreviation; - if ( xNumberPropertySet->getPropertyValue(OUString(XML_CURRENCYABBREVIATION)) >>= sCurrencyAbbreviation) + if ( xNumberPropertySet->getPropertyValue(XML_CURRENCYABBREVIATION) >>= sCurrencyAbbreviation) { if ( !sCurrencyAbbreviation.isEmpty()) sCurrencySymbol = sCurrencyAbbreviation; @@ -263,9 +263,9 @@ sal_Int16 XMLNumberFormatAttributesExportHelper::GetCellType(const sal_Int32 nNu try { uno::Reference <beans::XPropertySet> xNumberPropertySet(xNumberFormats->getByKey(nNumberFormat)); - xNumberPropertySet->getPropertyValue(OUString(XML_STANDARDFORMAT)) >>= bIsStandard; + xNumberPropertySet->getPropertyValue(XML_STANDARDFORMAT) >>= bIsStandard; sal_Int16 nNumberType = sal_Int16(); - if ( xNumberPropertySet->getPropertyValue(OUString(XML_TYPE)) >>= nNumberType ) + if ( xNumberPropertySet->getPropertyValue(XML_TYPE) >>= nNumberType ) { return nNumberType; } diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx index 66fd2231fffd..6931cda00b73 100644 --- a/xmloff/source/text/XMLTextListAutoStylePool.cxx +++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx @@ -145,7 +145,7 @@ XMLTextListAutoStylePool::XMLTextListAutoStylePool( SvXMLExport& rExp ) : { Reference<ucb::XAnyCompareFactory> xCompareFac( rExp.GetModel(), uno::UNO_QUERY ); if( xCompareFac.is() ) - mxNumRuleCompare = xCompareFac->createAnyCompareByName( OUString( "NumberingRules" ) ); + mxNumRuleCompare = xCompareFac->createAnyCompareByName( "NumberingRules" ); SvXMLExportFlags nExportFlags = rExport.getExportFlags(); bool bStylesOnly = (nExportFlags & SvXMLExportFlags::STYLES) && !(nExportFlags & SvXMLExportFlags::CONTENT); if( bStylesOnly ) diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 98a086c87db3..bd3370506d57 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -2616,9 +2616,7 @@ void XMLPageVarGetFieldImportContext::PrepareField( // display old content (#96657#) aAny <<= GetContent(); - xPropertySet->setPropertyValue( - OUString(sAPI_current_presentation), - aAny ); + xPropertySet->setPropertyValue( sAPI_current_presentation, aAny ); } diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index ca8f2461851b..0a57b1085be3 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -979,8 +979,7 @@ void XMLMetaFieldImportContext::InsertMeta( OUString("IsFixedLanguage") ); Any any; any <<= nKey; - xPropertySet->setPropertyValue( - OUString("NumberFormat"), any); + xPropertySet->setPropertyValue("NumberFormat", any); if ( xPropertySet->getPropertySetInfo()-> hasPropertyByName( sPropertyIsFixedLanguage ) ) { diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index 691712635c87..9d75525543c5 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -975,10 +975,7 @@ bool XMLVariableDeclImportContext::FindFieldMaster( Any aAny = xFieldMasterNameAccess->getByName(sVarServiceName); aAny >>= xMaster; - aAny = xMaster->getPropertyValue( - // sPropertySubType - OUString(sAPI_sub_type) - ); + aAny = xMaster->getPropertyValue(sAPI_sub_type); sal_Int16 nType = 0; aAny >>= nType; @@ -1052,10 +1049,7 @@ bool XMLVariableDeclImportContext::FindFieldMaster( // set name Any aAny; aAny <<= sName; - xMaster->setPropertyValue( - // sPropertyName - OUString(sAPI_name) - , aAny); + xMaster->setPropertyValue(sAPI_name, aAny); if (eVarType != VarTypeUserField) { // set subtype for setexp field @@ -1063,10 +1057,7 @@ bool XMLVariableDeclImportContext::FindFieldMaster( aAny <<= ((eVarType == VarTypeSimple) ? SetVariableType::VAR : SetVariableType::SEQUENCE); - xMaster->setPropertyValue( - // sPropertySubType - OUString(sAPI_sub_type) - , aAny); + xMaster->setPropertyValue(sAPI_sub_type, aAny); } // else : user field: no subtype } else { |