From 59b072e22b0610abc7ffdbc75873ef5cbba58de7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 4 Nov 2015 08:29:36 +0200 Subject: yyyyy Change-Id: I9a947beefd2dfe21da8239e841ea3fb416bd1548 --- oox/source/core/filterdetect.cxx | 2 +- oox/source/drawingml/shape.cxx | 12 +++--- oox/source/dump/dumperbase.cxx | 2 +- oox/source/export/chartexport.cxx | 82 +++++++++++++-------------------------- 4 files changed, 36 insertions(+), 62 deletions(-) (limited to 'oox') diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx index 9c22264a4404..13f195d8ad82 100644 --- a/oox/source/core/filterdetect.cxx +++ b/oox/source/core/filterdetect.cxx @@ -154,7 +154,7 @@ void FilterDetectDocHandler::parseRelationship( const AttributeList& rAttribs ) { // use '/' to representent the root of the zip package ( and provide a 'file' scheme to // keep the XUriReference implementation happy ) - Reference< XUriReference > xBase = xFactory->parse( OUString("file:///") ); + Reference< XUriReference > xBase = xFactory->parse( "file:///" ); Reference< XUriReference > xPart = xFactory->parse( rAttribs.getString( XML_Target, OUString() ) ); Reference< XUriReference > xAbs = xFactory->makeAbsolute( xBase, xPart, sal_True, RelativeUriExcessParentSegments_RETAIN ); diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index d530701564dd..93b78a83df60 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -1124,8 +1124,8 @@ void Shape::keepDiagramCompatibilityInfo( XmlFilterBase& rFilterBase ) } else xSet->setPropertyValue( aGrabBagPropName, Any( maDiagramDoms ) ); - xSet->setPropertyValue( OUString( "MoveProtect" ), Any( sal_True ) ); - xSet->setPropertyValue( OUString( "SizeProtect" ), Any( sal_True ) ); + xSet->setPropertyValue( "MoveProtect", Any( sal_True ) ); + xSet->setPropertyValue( "SizeProtect", Any( sal_True ) ); // Replace existing shapes with a new Graphic Object rendered // from them @@ -1203,10 +1203,10 @@ Reference < XShape > Shape::renderDiagramToGraphic( XmlFilterBase& rFilterBase ) Reference < lang::XMultiServiceFactory > xServiceFact( rFilterBase.getModel(), UNO_QUERY_THROW ); xShape = Reference < XShape > ( xServiceFact->createInstance( "com.sun.star.drawing.GraphicObjectShape" ), UNO_QUERY_THROW ); Reference < XPropertySet > xPropSet( xShape, UNO_QUERY_THROW ); - xPropSet->setPropertyValue( OUString( "Graphic" ), Any( xGraphic ) ); - xPropSet->setPropertyValue( OUString( "MoveProtect" ), Any( sal_True ) ); - xPropSet->setPropertyValue( OUString( "SizeProtect" ), Any( sal_True ) ); - xPropSet->setPropertyValue( OUString( "Name" ), Any( OUString( "RenderedShapes" ) ) ); + xPropSet->setPropertyValue( "Graphic", Any( xGraphic ) ); + xPropSet->setPropertyValue( "MoveProtect", Any( sal_True ) ); + xPropSet->setPropertyValue( "SizeProtect", Any( sal_True ) ); + xPropSet->setPropertyValue( "Name", Any( OUString( "RenderedShapes" ) ) ); } catch( const Exception& e ) { diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx index 67835981bd39..0c297a2a824c 100644 --- a/oox/source/dump/dumperbase.cxx +++ b/oox/source/dump/dumperbase.cxx @@ -1510,7 +1510,7 @@ void Output::newLine() void Output::emptyLine( size_t nCount ) { for( size_t nIdx = 0; nIdx < nCount; ++nIdx ) - mxStrm->writeString( OUString( '\n' ) ); + mxStrm->writeString( OUString('\n') ); } void Output::incIndent() diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index ecf16b797d70..f823c2723698 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -144,8 +144,7 @@ public: OUString aRole; return ( xProp.is() && - (xProp->getPropertyValue( - OUString( "Role" ) ) >>= aRole ) && + (xProp->getPropertyValue( "Role" ) >>= aRole ) && m_aRole.equals( aRole )); } @@ -707,8 +706,7 @@ void ChartExport::_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()) @@ -717,8 +715,7 @@ void ChartExport::_ExportContent() try { OUString sChartAddress; - aAny = xProp->getPropertyValue( - OUString("ChartRangeAddress")); + aAny = xProp->getPropertyValue("ChartRangeAddress"); aAny >>= msChartAddress; //maExportHelper.SetChartRangeAddress( sChartAddress ); @@ -795,8 +792,7 @@ void ChartExport::exportExternalData( Reference< css::chart::XChartDocument > xC { try { - Any aAny( xDocPropSet->getPropertyValue( - OUString( "ExternalData" ))); + Any aAny( xDocPropSet->getPropertyValue( "ExternalData" )); aAny >>= externalDataPath; } catch( beans::UnknownPropertyException & ) @@ -849,14 +845,11 @@ void ChartExport::exportChart( Reference< css::chart::XChartDocument > xChartDoc try { bool bHasSubTitle = false; - Any aAny( xDocPropSet->getPropertyValue( - OUString( "HasMainTitle" ))); + Any aAny( xDocPropSet->getPropertyValue("HasMainTitle")); aAny >>= bHasMainTitle; - aAny = xDocPropSet->getPropertyValue( - OUString( "HasSubTitle" )); + aAny = xDocPropSet->getPropertyValue("HasSubTitle"); aAny >>= bHasSubTitle; - aAny = xDocPropSet->getPropertyValue( - OUString( "HasLegend" )); + aAny = xDocPropSet->getPropertyValue("HasLegend"); aAny >>= bHasLegend; } catch( beans::UnknownPropertyException & ) @@ -976,8 +969,7 @@ void ChartExport::exportLegend( Reference< css::chart::XChartDocument > xChartDo css::chart::ChartLegendPosition aLegendPos = css::chart::ChartLegendPosition_NONE; try { - Any aAny( xProp->getPropertyValue( - OUString( "Alignment" ))); + Any aAny( xProp->getPropertyValue( "Alignment" )); aAny >>= aLegendPos; } catch( beans::UnknownPropertyException & ) @@ -2424,16 +2416,13 @@ void ChartExport::InitPlotArea( ) Reference xServiceInfo (mxDiagram, uno::UNO_QUERY); if (xServiceInfo.is()) { - if (xServiceInfo->supportsService( - OUString("com.sun.star.chart.ChartAxisZSupplier"))) + if (xServiceInfo->supportsService("com.sun.star.chart.ChartAxisZSupplier")) { - xDiagramProperties->getPropertyValue( - OUString("HasZAxis")) >>= mbHasZAxis; + xDiagramProperties->getPropertyValue("HasZAxis") >>= mbHasZAxis; } } - xDiagramProperties->getPropertyValue( - OUString ("Dim3D")) >>= mbIs3DChart; + xDiagramProperties->getPropertyValue("Dim3D") >>= mbIs3DChart; Reference< chart2::XChartDocument > xNewDoc( getModel(), uno::UNO_QUERY ); if( mbHasCategoryLabels && mxNewDiagram.is()) @@ -2487,30 +2476,19 @@ void ChartExport::exportAxis(const AxisIdPair& rAxisIdPair) Reference< XPropertySet > xDiagramProperties (mxDiagram, uno::UNO_QUERY); - xDiagramProperties->getPropertyValue( - OUString ("HasXAxisTitle")) >>= bHasXAxisTitle; - xDiagramProperties->getPropertyValue( - OUString ("HasYAxisTitle")) >>= bHasYAxisTitle; - xDiagramProperties->getPropertyValue( - OUString ("HasZAxisTitle")) >>= bHasZAxisTitle; - xDiagramProperties->getPropertyValue( - OUString ("HasSecondaryXAxisTitle")) >>= bHasSecondaryXAxisTitle; - xDiagramProperties->getPropertyValue( - OUString ("HasSecondaryYAxisTitle")) >>= bHasSecondaryYAxisTitle; - - xDiagramProperties->getPropertyValue( - OUString ("HasXAxisGrid")) >>= bHasXAxisMajorGrid; - xDiagramProperties->getPropertyValue( - OUString ("HasYAxisGrid")) >>= bHasYAxisMajorGrid; - xDiagramProperties->getPropertyValue( - OUString ("HasZAxisGrid")) >>= bHasZAxisMajorGrid; - - xDiagramProperties->getPropertyValue( - OUString ("HasXAxisHelpGrid")) >>= bHasXAxisMinorGrid; - xDiagramProperties->getPropertyValue( - OUString ("HasYAxisHelpGrid")) >>= bHasYAxisMinorGrid; - xDiagramProperties->getPropertyValue( - OUString ("HasZAxisHelpGrid")) >>= bHasZAxisMinorGrid; + xDiagramProperties->getPropertyValue("HasXAxisTitle") >>= bHasXAxisTitle; + xDiagramProperties->getPropertyValue("HasYAxisTitle") >>= bHasYAxisTitle; + xDiagramProperties->getPropertyValue("HasZAxisTitle") >>= bHasZAxisTitle; + xDiagramProperties->getPropertyValue("HasSecondaryXAxisTitle") >>= bHasSecondaryXAxisTitle; + xDiagramProperties->getPropertyValue("HasSecondaryYAxisTitle") >>= bHasSecondaryYAxisTitle; + + xDiagramProperties->getPropertyValue("HasXAxisGrid") >>= bHasXAxisMajorGrid; + xDiagramProperties->getPropertyValue("HasYAxisGrid") >>= bHasYAxisMajorGrid; + xDiagramProperties->getPropertyValue("HasZAxisGrid") >>= bHasZAxisMajorGrid; + + xDiagramProperties->getPropertyValue("HasXAxisHelpGrid") >>= bHasXAxisMinorGrid; + xDiagramProperties->getPropertyValue("HasYAxisHelpGrid") >>= bHasYAxisMinorGrid; + xDiagramProperties->getPropertyValue("HasZAxisHelpGrid") >>= bHasZAxisMinorGrid; Reference< XPropertySet > xAxisProp; Reference< drawing::XShape > xAxisTitle; @@ -2691,8 +2669,7 @@ void ChartExport::_exportAxis( bool bVisible = true; if( xAxisProp.is() ) { - xAxisProp->getPropertyValue( - OUString ("Visible")) >>= bVisible; + xAxisProp->getPropertyValue("Visible") >>= bVisible; } // only export each axis only once non-deleted @@ -3160,11 +3137,9 @@ void ChartExport::exportDataPoints( Sequence< sal_Int32 > aDataPointSeq; if( xSeriesProperties.is()) { - Any aAny = xSeriesProperties->getPropertyValue( - OUString( "AttributedDataPoints" )); + Any aAny = xSeriesProperties->getPropertyValue( "AttributedDataPoints" ); aAny >>= aDataPointSeq; - xSeriesProperties->getPropertyValue( - OUString( "VaryColorsByPoint" )) >>= bVaryColorsByPoint; + xSeriesProperties->getPropertyValue( "VaryColorsByPoint" ) >>= bVaryColorsByPoint; } const sal_Int32 * pPoints = aDataPointSeq.getConstArray(); @@ -3597,8 +3572,7 @@ Reference< chart2::data::XDataSequence> getLabeledSequence( uno::Reference< chart2::data::XDataSequence > xSequence( aSequences[nI]->getValues()); uno::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 ) && aRole.indexOf(aDirection) >= 0 ) { return xSequence; -- cgit