diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-06 09:38:44 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-06 09:38:44 +0100 |
commit | 41a000b7428ea111f99acf1ce00c1d34747e987e (patch) | |
tree | a5f95de375ef3b9c63f65e1aaaf83a66f068d4d1 /xmloff | |
parent | fd80fa38db85129934326e7e31f249a967c5ec04 (diff) |
loplugin:stringconstant: elide explicit ctor usage (automatic rewrite)
Change-Id: Ibb9372bc45a0bc0b9083ad0e405440bbbe5ef678
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/chart/SchXMLAxisContext.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLChartContext.cxx | 10 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLExport.cxx | 16 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLPlotAreaContext.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLSeries2Context.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/chart/SchXMLTableContext.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/chart/XMLChartStyleContext.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/core/xmlimp.cxx | 64 | ||||
-rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 10 | ||||
-rw-r--r-- | xmloff/source/forms/elementexport.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/forms/elementimport.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/text/txtfldi.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/txtparai.cxx | 10 | ||||
-rw-r--r-- | xmloff/source/text/txtvfldi.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/transform/EventOASISTContext.cxx | 4 |
15 files changed, 72 insertions, 74 deletions
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx index c480081568f3..9f8a0dea35c3 100644 --- a/xmloff/source/chart/SchXMLAxisContext.cxx +++ b/xmloff/source/chart/SchXMLAxisContext.cxx @@ -567,7 +567,7 @@ void SchXMLAxisContext::CreateAxis() } m_rbAxisPositionAttributeImported = m_rbAxisPositionAttributeImported || SchXMLTools::getPropertyFromContext( - OUString("CrossoverPosition"), pPropStyleContext, pStylesCtxt ).hasValue(); + "CrossoverPosition", pPropStyleContext, pStylesCtxt ).hasValue(); } } } diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index b33438aa6c1c..0637caa9285c 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -957,27 +957,27 @@ void SchXMLChartContext::MergeSeriesForStockChart() if( bHasJapaneseCandlestick ) { // open values - lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], OUString( "values-first" )); + lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], "values-first"); aNewSeries[i] = aSeriesSeq[ nSeriesIndex ]; // low values lcl_MoveDataToCandleStickSeries( uno::Reference< chart2::data::XDataSource >( aSeriesSeq[ ++nSeriesIndex ], uno::UNO_QUERY_THROW ), - aNewSeries[i], OUString( "values-min" )); + aNewSeries[i], "values-min"); } else { // low values - lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], OUString( "values-min" )); + lcl_setRoleAtFirstSequence( aSeriesSeq[ nSeriesIndex ], "values-min"); aNewSeries[i] = aSeriesSeq[ nSeriesIndex ]; } // high values lcl_MoveDataToCandleStickSeries( uno::Reference< chart2::data::XDataSource >( aSeriesSeq[ ++nSeriesIndex ], uno::UNO_QUERY_THROW ), - aNewSeries[i], OUString( "values-max" )); + aNewSeries[i], "values-max"); // close values lcl_MoveDataToCandleStickSeries( uno::Reference< chart2::data::XDataSource >( aSeriesSeq[ ++nSeriesIndex ], uno::UNO_QUERY_THROW ), - aNewSeries[i], OUString( "values-last" )); + aNewSeries[i], "values-last"); } xDSContainer->setDataSeries( aNewSeries ); } diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 527be5994144..01a9b21141e8 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -432,7 +432,7 @@ Reference< chart2::data::XDataSource > lcl_pressUsedDataIntoRectangularFormat( c //the first x-values is always the next sequence //todo ... other x-values get lost for old format Reference< chart2::data::XLabeledDataSequence > xXValues( - lcl_getDataSequenceByRole( aSeriesSeqVector, OUString( "values-x" ) ) ); + lcl_getDataSequenceByRole( aSeriesSeqVector, "values-x" ) ); if( xXValues.is() ) aLabeledSeqVector.push_back( xXValues ); @@ -2768,7 +2768,7 @@ void SchXMLExportHelper_Impl::exportSeries( Reference< chart2::data::XDataSequence > xYValuesForBubbleChart; if( bIsBubbleChart ) { - Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString( "values-y" ) ) ); + Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, "values-y" ) ); if( xSequence.is() ) { xYValuesForBubbleChart = xSequence->getValues(); @@ -2778,7 +2778,7 @@ void SchXMLExportHelper_Impl::exportSeries( } if( bIsScatterChart || bIsBubbleChart ) { - Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, OUString( "values-x" ) ) ); + Reference< chart2::data::XLabeledDataSequence > xSequence( lcl_getDataSequenceByRole( aSeqCnt, "values-x" ) ); if( xSequence.is() ) { Reference< chart2::data::XDataSequence > xValues( xSequence->getValues() ); @@ -3139,7 +3139,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries( xSource->getDataSequences()); sal_Int32 nSeriesLength = - lcl_getSequenceLengthByRole( aSeqCnt, OUString( "values-last" )); + lcl_getSequenceLengthByRole( aSeqCnt, "values-last"); if( bExportContent ) { @@ -3151,7 +3151,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries( if( bJapaneseCandleSticks ) { tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole( - aSeqCnt, OUString( "values-first" ), xNewDoc, m_aDataSequencesToExport )); + aSeqCnt, "values-first", xNewDoc, m_aDataSequencesToExport )); if( !aRanges.second.isEmpty()) mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second ); if( !aRanges.first.isEmpty()) @@ -3168,7 +3168,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries( // low { tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole( - aSeqCnt, OUString( "values-min" ), xNewDoc, m_aDataSequencesToExport )); + aSeqCnt, "values-min", xNewDoc, m_aDataSequencesToExport )); if( !aRanges.second.isEmpty()) mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second ); if( !aRanges.first.isEmpty()) @@ -3185,7 +3185,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries( // high { tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole( - aSeqCnt, OUString( "values-max" ), xNewDoc, m_aDataSequencesToExport )); + aSeqCnt, "values-max", xNewDoc, m_aDataSequencesToExport )); if( !aRanges.second.isEmpty()) mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second ); if( !aRanges.first.isEmpty()) @@ -3202,7 +3202,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries( // close { tLabelAndValueRange aRanges( lcl_getLabelAndValueRangeByRole( - aSeqCnt, OUString( "values-last" ), xNewDoc, m_aDataSequencesToExport )); + aSeqCnt, "values-last", xNewDoc, m_aDataSequencesToExport )); if( !aRanges.second.isEmpty()) mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_VALUES_CELL_RANGE_ADDRESS, aRanges.second ); if( !aRanges.first.isEmpty()) diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index 6b5a4a22ccaa..9f5b9c0d79b7 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -322,7 +322,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri //lines on/off //this old property is not supported fully anymore with the new chart, so we need to get the information a little bit different from similar properties mrSeriesDefaultsAndStyles.maLinesOnProperty = SchXMLTools::getPropertyFromContext( - OUString("Lines"), pPropStyleContext, pStylesCtxt ); + "Lines", pPropStyleContext, pStylesCtxt ); //handle automatic position and size m_aOuterPositioning.readAutomaticPositioningProperties( pPropStyleContext, pStylesCtxt ); @@ -736,9 +736,9 @@ void SchXMLPositonAttributesHelper::readAutomaticPositioningProperties( XMLPropS { //handle automatic position and size SchXMLTools::getPropertyFromContext( - OUString("AutomaticSize"), pPropStyleContext, pStylesCtxt ) >>= m_bAutoSize; + "AutomaticSize", pPropStyleContext, pStylesCtxt ) >>= m_bAutoSize; SchXMLTools::getPropertyFromContext( - OUString("AutomaticPosition"), pPropStyleContext, pStylesCtxt ) >>= m_bAutoPosition; + "AutomaticPosition", pPropStyleContext, pStylesCtxt ) >>= m_bAutoPosition; } } diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index fcb0a910ca26..871797e34052 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -172,7 +172,7 @@ void lcl_setSymbolSizeIfNeeded( const uno::Reference< beans::XPropertySet >& xSe void lcl_resetSymbolSizeForPointsIfNecessary( const uno::Reference< beans::XPropertySet >& xPointProp, const SvXMLImport& rImport , const XMLPropStyleContext * pPropStyleContext, const SvXMLStylesContext* pStylesCtxt ) { - uno::Any aASymbolSize( SchXMLTools::getPropertyFromContext( OUString("SymbolSize"), pPropStyleContext, pStylesCtxt ) ); + uno::Any aASymbolSize( SchXMLTools::getPropertyFromContext( "SymbolSize", pPropStyleContext, pStylesCtxt ) ); if( !aASymbolSize.hasValue() ) lcl_setSymbolSizeIfNeeded( xPointProp, rImport ); } @@ -481,7 +481,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib const XMLPropStyleContext* pPropStyleContext = dynamic_cast< const XMLPropStyleContext * >( pStyle ); - uno::Any aASymbolSize( SchXMLTools::getPropertyFromContext( OUString("SymbolSize") + uno::Any aASymbolSize( SchXMLTools::getPropertyFromContext( "SymbolSize" , pPropStyleContext, pStylesCtxt ) ); mbSymbolSizeIsMissingInFile = !aASymbolSize.hasValue(); } diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx index 409e1f623884..dea1a00f6a06 100644 --- a/xmloff/source/chart/SchXMLTableContext.cxx +++ b/xmloff/source/chart/SchXMLTableContext.cxx @@ -954,7 +954,7 @@ void SchXMLTableHelper::switchRangesFromOuterToInternalIfNecessary( if( ! bCategoriesApplied ) { SchXMLTools::CreateCategories( - xDataProv, xChartDoc, OUString("categories"), + xDataProv, xChartDoc, "categories", 0 /* nCooSysIndex */, 0 /* nDimension */ ); } diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx index ca3f36b9bedd..b308c6597280 100644 --- a/xmloff/source/chart/XMLChartStyleContext.cxx +++ b/xmloff/source/chart/XMLChartStyleContext.cxx @@ -106,8 +106,8 @@ void XMLChartStyleContext::FillPropertySet( DBG_ASSERT( false, "unknown property exception -> shape style not completely imported for chart style" ); } - lcl_NumberFormatStyleToProperty( msDataStyleName, OUString( "NumberFormat" ), mrStyles, rPropSet ); - lcl_NumberFormatStyleToProperty( msPercentageDataStyleName, OUString( "PercentageNumberFormat" ), mrStyles, rPropSet ); + lcl_NumberFormatStyleToProperty( msDataStyleName, "NumberFormat", mrStyles, rPropSet ); + lcl_NumberFormatStyleToProperty( msPercentageDataStyleName, "PercentageNumberFormat", mrStyles, rPropSet ); } SvXMLImportContext *XMLChartStyleContext::CreateChildContext( diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 7b7c36cae79c..7998494d18f5 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -358,38 +358,38 @@ void SvXMLImport::_InitCtor() { // implicit "xml" namespace prefix mpNamespaceMap->Add( GetXMLToken(XML_XML), GetXMLToken(XML_N_XML), XML_NAMESPACE_XML ); - mpNamespaceMap->Add( OUString( sXML_np__office ), GetXMLToken(XML_N_OFFICE), XML_NAMESPACE_OFFICE ); - mpNamespaceMap->Add( OUString( sXML_np__office_ext ), GetXMLToken(XML_N_OFFICE_EXT), XML_NAMESPACE_OFFICE_EXT ); - mpNamespaceMap->Add( OUString( sXML_np__ooo ), GetXMLToken(XML_N_OOO), XML_NAMESPACE_OOO ); - mpNamespaceMap->Add( OUString( sXML_np__style ), GetXMLToken(XML_N_STYLE), XML_NAMESPACE_STYLE ); - mpNamespaceMap->Add( OUString( sXML_np__text ), GetXMLToken(XML_N_TEXT), XML_NAMESPACE_TEXT ); - mpNamespaceMap->Add( OUString( sXML_np__table ), GetXMLToken(XML_N_TABLE), XML_NAMESPACE_TABLE ); - mpNamespaceMap->Add( OUString( sXML_np__table_ext ), GetXMLToken(XML_N_TABLE_EXT), XML_NAMESPACE_TABLE_EXT ); - mpNamespaceMap->Add( OUString( sXML_np__draw ), GetXMLToken(XML_N_DRAW), XML_NAMESPACE_DRAW ); - mpNamespaceMap->Add( OUString( sXML_np__draw_ext ), GetXMLToken(XML_N_DRAW_EXT), XML_NAMESPACE_DRAW_EXT ); - mpNamespaceMap->Add( OUString( sXML_np__dr3d ), GetXMLToken(XML_N_DR3D), XML_NAMESPACE_DR3D ); - mpNamespaceMap->Add( OUString( sXML_np__fo ), GetXMLToken(XML_N_FO_COMPAT), XML_NAMESPACE_FO ); - mpNamespaceMap->Add( OUString( sXML_np__xlink ), GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK ); - mpNamespaceMap->Add( OUString( sXML_np__dc ), GetXMLToken(XML_N_DC), XML_NAMESPACE_DC ); - mpNamespaceMap->Add( OUString( sXML_np__dom ), GetXMLToken(XML_N_DOM), XML_NAMESPACE_DOM ); - mpNamespaceMap->Add( OUString( sXML_np__meta ), GetXMLToken(XML_N_META), XML_NAMESPACE_META ); - mpNamespaceMap->Add( OUString( sXML_np__number ), GetXMLToken(XML_N_NUMBER), XML_NAMESPACE_NUMBER ); - mpNamespaceMap->Add( OUString( sXML_np__svg ), GetXMLToken(XML_N_SVG_COMPAT), XML_NAMESPACE_SVG ); - mpNamespaceMap->Add( OUString( sXML_np__chart ), GetXMLToken(XML_N_CHART), XML_NAMESPACE_CHART ); - mpNamespaceMap->Add( OUString( sXML_np__math ), GetXMLToken(XML_N_MATH), XML_NAMESPACE_MATH ); - mpNamespaceMap->Add(OUString( sXML_np__form ), GetXMLToken(XML_N_FORM), XML_NAMESPACE_FORM ); - mpNamespaceMap->Add( OUString( sXML_np__script ), GetXMLToken(XML_N_SCRIPT), XML_NAMESPACE_SCRIPT ); - mpNamespaceMap->Add( OUString( sXML_np__config ), GetXMLToken(XML_N_CONFIG), XML_NAMESPACE_CONFIG ); - mpNamespaceMap->Add( OUString( sXML_np__xforms ), GetXMLToken(XML_N_XFORMS_1_0), XML_NAMESPACE_XFORMS ); - mpNamespaceMap->Add( OUString( sXML_np__formx ), GetXMLToken( XML_N_FORMX ), XML_NAMESPACE_FORMX ); - mpNamespaceMap->Add( OUString( sXML_np__xsd ), GetXMLToken(XML_N_XSD), XML_NAMESPACE_XSD ); - mpNamespaceMap->Add( OUString( sXML_np__xsi ), GetXMLToken(XML_N_XSI), XML_NAMESPACE_XFORMS ); - mpNamespaceMap->Add( OUString( sXML_np__ooow ), GetXMLToken(XML_N_OOOW), XML_NAMESPACE_OOOW ); - mpNamespaceMap->Add( OUString( sXML_np__oooc ), GetXMLToken(XML_N_OOOC), XML_NAMESPACE_OOOC ); - mpNamespaceMap->Add( OUString( sXML_np__field ), GetXMLToken(XML_N_FIELD), XML_NAMESPACE_FIELD ); - mpNamespaceMap->Add( OUString( sXML_np__of ), GetXMLToken(XML_N_OF), XML_NAMESPACE_OF ); - mpNamespaceMap->Add( OUString( sXML_np__xhtml ), GetXMLToken(XML_N_XHTML), XML_NAMESPACE_XHTML ); - mpNamespaceMap->Add( OUString( sXML_np__css3text ), GetXMLToken(XML_N_CSS3TEXT), XML_NAMESPACE_CSS3TEXT ); + mpNamespaceMap->Add( sXML_np__office, GetXMLToken(XML_N_OFFICE), XML_NAMESPACE_OFFICE ); + mpNamespaceMap->Add( sXML_np__office_ext, GetXMLToken(XML_N_OFFICE_EXT), XML_NAMESPACE_OFFICE_EXT ); + mpNamespaceMap->Add( sXML_np__ooo, GetXMLToken(XML_N_OOO), XML_NAMESPACE_OOO ); + mpNamespaceMap->Add( sXML_np__style, GetXMLToken(XML_N_STYLE), XML_NAMESPACE_STYLE ); + mpNamespaceMap->Add( sXML_np__text, GetXMLToken(XML_N_TEXT), XML_NAMESPACE_TEXT ); + mpNamespaceMap->Add( sXML_np__table, GetXMLToken(XML_N_TABLE), XML_NAMESPACE_TABLE ); + mpNamespaceMap->Add( sXML_np__table_ext, GetXMLToken(XML_N_TABLE_EXT), XML_NAMESPACE_TABLE_EXT ); + mpNamespaceMap->Add( sXML_np__draw, GetXMLToken(XML_N_DRAW), XML_NAMESPACE_DRAW ); + mpNamespaceMap->Add( sXML_np__draw_ext, GetXMLToken(XML_N_DRAW_EXT), XML_NAMESPACE_DRAW_EXT ); + mpNamespaceMap->Add( sXML_np__dr3d, GetXMLToken(XML_N_DR3D), XML_NAMESPACE_DR3D ); + mpNamespaceMap->Add( sXML_np__fo, GetXMLToken(XML_N_FO_COMPAT), XML_NAMESPACE_FO ); + mpNamespaceMap->Add( sXML_np__xlink, GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK ); + mpNamespaceMap->Add( sXML_np__dc, GetXMLToken(XML_N_DC), XML_NAMESPACE_DC ); + mpNamespaceMap->Add( sXML_np__dom, GetXMLToken(XML_N_DOM), XML_NAMESPACE_DOM ); + mpNamespaceMap->Add( sXML_np__meta, GetXMLToken(XML_N_META), XML_NAMESPACE_META ); + mpNamespaceMap->Add( sXML_np__number, GetXMLToken(XML_N_NUMBER), XML_NAMESPACE_NUMBER ); + mpNamespaceMap->Add( sXML_np__svg, GetXMLToken(XML_N_SVG_COMPAT), XML_NAMESPACE_SVG ); + mpNamespaceMap->Add( sXML_np__chart, GetXMLToken(XML_N_CHART), XML_NAMESPACE_CHART ); + mpNamespaceMap->Add( sXML_np__math, GetXMLToken(XML_N_MATH), XML_NAMESPACE_MATH ); + mpNamespaceMap->Add(sXML_np__form, GetXMLToken(XML_N_FORM), XML_NAMESPACE_FORM ); + mpNamespaceMap->Add( sXML_np__script, GetXMLToken(XML_N_SCRIPT), XML_NAMESPACE_SCRIPT ); + mpNamespaceMap->Add( sXML_np__config, GetXMLToken(XML_N_CONFIG), XML_NAMESPACE_CONFIG ); + mpNamespaceMap->Add( sXML_np__xforms, GetXMLToken(XML_N_XFORMS_1_0), XML_NAMESPACE_XFORMS ); + mpNamespaceMap->Add( sXML_np__formx, GetXMLToken( XML_N_FORMX ), XML_NAMESPACE_FORMX ); + mpNamespaceMap->Add( sXML_np__xsd, GetXMLToken(XML_N_XSD), XML_NAMESPACE_XSD ); + mpNamespaceMap->Add( sXML_np__xsi, GetXMLToken(XML_N_XSI), XML_NAMESPACE_XFORMS ); + mpNamespaceMap->Add( sXML_np__ooow, GetXMLToken(XML_N_OOOW), XML_NAMESPACE_OOOW ); + mpNamespaceMap->Add( sXML_np__oooc, GetXMLToken(XML_N_OOOC), XML_NAMESPACE_OOOC ); + mpNamespaceMap->Add( sXML_np__field, GetXMLToken(XML_N_FIELD), XML_NAMESPACE_FIELD ); + mpNamespaceMap->Add( sXML_np__of, GetXMLToken(XML_N_OF), XML_NAMESPACE_OF ); + mpNamespaceMap->Add( sXML_np__xhtml, GetXMLToken(XML_N_XHTML), XML_NAMESPACE_XHTML ); + mpNamespaceMap->Add( sXML_np__css3text, GetXMLToken(XML_N_CSS3TEXT), XML_NAMESPACE_CSS3TEXT ); mpNamespaceMap->Add( "_calc_libo", GetXMLToken(XML_N_CALC_EXT), XML_NAMESPACE_CALC_EXT); mpNamespaceMap->Add( "_office_libo", diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index e7d42ddb02be..de47927b9331 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -1267,7 +1267,7 @@ void XMLShapeExport::ExportGraphicDefaults() uno::Reference< beans::XPropertySet > xDefaults( xFact->createInstance("com.sun.star.drawing.Defaults"), uno::UNO_QUERY ); if( xDefaults.is() ) { - aStEx->exportDefaultStyle( xDefaults, OUString(XML_STYLE_FAMILY_SD_GRAPHICS_NAME), xPropertySetMapper ); + aStEx->exportDefaultStyle( xDefaults, XML_STYLE_FAMILY_SD_GRAPHICS_NAME, xPropertySetMapper ); // write graphic family styles aStEx->exportStyleFamily("graphics", OUString(XML_STYLE_FAMILY_SD_GRAPHICS_NAME), xPropertySetMapper, false, XML_STYLE_FAMILY_SD_GRAPHICS_ID); @@ -1635,7 +1635,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x OUString aEventQName( mrExport.GetNamespaceMap().GetQNameByKey( - XML_NAMESPACE_DOM, OUString( "click" ) ) ); + XML_NAMESPACE_DOM, "click" ) ); mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName ); mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_ACTION, eStrAction ); @@ -1725,10 +1725,10 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_LANGUAGE, mrExport.GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_OOO, - OUString( "starbasic" ) ) ); + "starbasic" ) ); OUString aEventQName( mrExport.GetNamespaceMap().GetQNameByKey( - XML_NAMESPACE_DOM, OUString( "click" ) ) ); + XML_NAMESPACE_DOM, "click" ) ); mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName ); if( nFound & FOUND_LIBRARY ) @@ -1759,7 +1759,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x XML_NAMESPACE_OOO, GetXMLToken(XML_SCRIPT) ) ); OUString aEventQName( mrExport.GetNamespaceMap().GetQNameByKey( - XML_NAMESPACE_DOM, OUString( "click" ) ) ); + XML_NAMESPACE_DOM, "click" ) ); mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName ); mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, aStrMacro ); mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, "simple" ); diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index a94265c4461b..31da709100b2 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -354,7 +354,7 @@ namespace xmloff // later on imported, it overwrites anything which has previously been imported for // CharStrikeout. // #i27729# - exportedProperty( OUString( "CharCrossedOut" ) ); + exportedProperty( "CharCrossedOut" ); } if ( m_eType == LISTBOX ) diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index cd10c3215559..202dab5f40cb 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -1755,9 +1755,9 @@ namespace xmloff // the label and the value const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap(); const OUString sLabelAttribute = rMap.GetQNameByKey( - GetPrefix(), OUString("label")); + GetPrefix(), "label"); const OUString sValueAttribute = rMap.GetQNameByKey( - GetPrefix(), OUString("value")); + GetPrefix(), "value"); // the label attribute OUString sValue = _rxAttrList->getValueByName(sLabelAttribute); diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index bd3370506d57..e183b4f0e3fe 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -1964,7 +1964,7 @@ void XMLUserDocInfoImportContext::ProcessAttribute( { if (!bValid) { - SetServiceName(OUString(sAPI_docinfo_custom ) ); + SetServiceName(sAPI_docinfo_custom ); aName = sAttrValue; bValid = true; } diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index 0a57b1085be3..e99e4e617ac1 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -395,10 +395,10 @@ XMLImpHyperlinkContext_Impl::XMLImpHyperlinkContext_Impl( { if( IsXMLToken( sShow, XML_NEW ) ) mpHint->SetTargetFrameName( - OUString( "_blank" ) ); + "_blank" ); else if( IsXMLToken( sShow, XML_REPLACE ) ) mpHint->SetTargetFrameName( - OUString( "_self" ) ); + "_self" ); } if ( mpHint->GetHRef().isEmpty() ) @@ -883,7 +883,7 @@ void XMLMetaImportContext::InsertMeta( const uno::Reference<rdf::XMetadatable> xMeta( XMLTextMarkImportContext::CreateAndInsertMark( GetImport(), - OUString("com.sun.star.text.InContentMetadata"), + "com.sun.star.text.InContentMetadata", OUString(), i_xInsertionRange, m_XmlId), uno::UNO_QUERY); @@ -959,7 +959,7 @@ void XMLMetaFieldImportContext::InsertMeta( const Reference<XPropertySet> xPropertySet( XMLTextMarkImportContext::CreateAndInsertMark( GetImport(), - OUString("com.sun.star.text.textfield.MetadataField"), + "com.sun.star.text.textfield.MetadataField", OUString(), i_xInsertionRange, m_XmlId), UNO_QUERY); @@ -2108,7 +2108,7 @@ XMLParaContext::~XMLParaContext() // borrow from XMLTextMarkImportContext XMLTextMarkImportContext::CreateAndInsertMark( GetImport(), - OUString( "com.sun.star.text.ReferenceMark"), + "com.sun.star.text.ReferenceMark", rRefName, xAttrCursor); } diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx index 9d75525543c5..9ee5e6933899 100644 --- a/xmloff/source/text/txtvfldi.cxx +++ b/xmloff/source/text/txtvfldi.cxx @@ -1144,8 +1144,7 @@ void XMLDatabaseDisplayImportContext::EndElement() // create and prepare field master first if (CreateField(xMaster, - OUString( - sAPI_fieldmaster_database))) + sAPI_fieldmaster_database)) { Any aAny; aAny <<= sColumnName; @@ -1157,8 +1156,7 @@ void XMLDatabaseDisplayImportContext::EndElement() // create field Reference<XPropertySet> xField; if (CreateField(xField, - OUString( - sAPI_database))) + sAPI_database)) { // attach field master Reference<XDependentTextField> xDepField(xField, UNO_QUERY); diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx index 78117a7cd03c..b7768a07621b 100644 --- a/xmloff/source/transform/EventOASISTContext.cxx +++ b/xmloff/source/transform/EventOASISTContext.cxx @@ -227,7 +227,7 @@ void XMLEventOASISTransformerContext::StartElement( GetXMLToken( XML_LANGUAGE ) ) ); pMutableAttrList->SetValueByIndex( idx, - OUString("StarBasic") ); + "StarBasic" ); OUString aLocQName( GetTransformer().GetNamespaceMap().GetQNameByKey( @@ -279,7 +279,7 @@ void XMLEventOASISTransformerContext::StartElement( GetXMLToken( XML_LANGUAGE ) ) ); pMutableAttrList->SetValueByIndex( idx, - OUString("StarBasic") ); + "StarBasic" ); OUString aLocQName( GetTransformer().GetNamespaceMap().GetQNameByKey( |