diff options
Diffstat (limited to 'xmloff')
35 files changed, 427 insertions, 427 deletions
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx index 1a83c205df37..7844ae53bdf9 100644 --- a/xmloff/source/chart/SchXMLAxisContext.cxx +++ b/xmloff/source/chart/SchXMLAxisContext.cxx @@ -232,7 +232,7 @@ void SchXMLAxisContext::CreateGrid( OUString sAutoStyleName, bool bIsMajor ) if( xGridProp.is()) { // the line color is black as default, in the model it is a light gray - xGridProp->setPropertyValue( OUString( "LineColor" ), + xGridProp->setPropertyValue("LineColor", uno::makeAny( COL_BLACK )); if( !sAutoStyleName.isEmpty()) { @@ -456,7 +456,7 @@ void SchXMLAxisContext::CreateAxis() { try { - xDiaProp->setPropertyValue( OUString( "HasXAxis" ), uno::makeAny(sal_True) ); + xDiaProp->setPropertyValue("HasXAxis", uno::makeAny(sal_True) ); } catch( beans::UnknownPropertyException & ) { @@ -471,16 +471,16 @@ void SchXMLAxisContext::CreateAxis() uno::Any aFalseBool( uno::makeAny( sal_False )); // #i109879# the line color is black as default, in the model it is a light gray - m_xAxisProps->setPropertyValue( OUString( "LineColor" ), + m_xAxisProps->setPropertyValue("LineColor", uno::makeAny( COL_BLACK )); - m_xAxisProps->setPropertyValue( OUString( "DisplayLabels" ), aFalseBool ); + m_xAxisProps->setPropertyValue("DisplayLabels", aFalseBool ); // #88077# AutoOrigin 'on' is default - m_xAxisProps->setPropertyValue( OUString( "AutoOrigin" ), aTrueBool ); + m_xAxisProps->setPropertyValue("AutoOrigin", aTrueBool ); if( m_bAxisTypeImported ) - m_xAxisProps->setPropertyValue( OUString( "AxisType" ), uno::makeAny(m_nAxisType) ); + m_xAxisProps->setPropertyValue("AxisType", uno::makeAny(m_nAxisType) ); if( !m_aAutoStyleName.isEmpty()) { @@ -536,7 +536,7 @@ void SchXMLAxisContext::CreateAxis() Reference< beans::XPropertySet > xNewAxisProp( xAxis, uno::UNO_QUERY ); if( xNewAxisProp.is() ) { - xNewAxisProp->setPropertyValue( OUString("LineStyle") + xNewAxisProp->setPropertyValue("LineStyle" , uno::makeAny(drawing::LineStyle_NONE)); } } @@ -544,7 +544,7 @@ void SchXMLAxisContext::CreateAxis() if( m_bAdaptXAxisOrientationForOld2DBarCharts && m_aCurrentAxis.eDimension == SCH_XML_AXIS_X ) { bool bIs3DChart = false; - if( xDiaProp.is() && ( xDiaProp->getPropertyValue(OUString("Dim3D")) >>= bIs3DChart ) + if( xDiaProp.is() && ( xDiaProp->getPropertyValue("Dim3D") >>= bIs3DChart ) && !bIs3DChart ) { Reference< chart2::XChartDocument > xChart2Document( GetImport().GetModel(), uno::UNO_QUERY ); @@ -559,7 +559,7 @@ void SchXMLAxisContext::CreateAxis() bool bSwapXandYAxis = false; Reference< chart2::XCoordinateSystem > xCooSys( aCooSysSeq[0] ); Reference< beans::XPropertySet > xCooSysProp( xCooSys, uno::UNO_QUERY ); - if( xCooSysProp.is() && ( xCooSysProp->getPropertyValue( OUString("SwapXAndYAxis")) >>= bSwapXandYAxis ) + if( xCooSysProp.is() && ( xCooSysProp->getPropertyValue("SwapXAndYAxis") >>= bSwapXandYAxis ) && bSwapXandYAxis ) { Reference< chart2::XAxis > xAxis = xCooSys->getAxisByDimension( 0, m_aCurrentAxis.nAxisIndex ); @@ -598,7 +598,7 @@ void SchXMLAxisContext::SetAxisTitle() { try { - xTitleProp->setPropertyValue( OUString( "String" ), uno::makeAny(m_aCurrentAxis.aTitle) ); + xTitleProp->setPropertyValue("String", uno::makeAny(m_aCurrentAxis.aTitle) ); } catch( beans::UnknownPropertyException & ) { @@ -781,31 +781,31 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc chart2::ScaleData aMainXScale = xMainXAxis->getScaleData(); if( 0 == rChartTypeServiceName.reverseCompareTo( "com.sun.star.chart2.ScatterChartType" ) ) { - xMainYAxisProp->setPropertyValue( OUString("CrossoverPosition") + xMainYAxisProp->setPropertyValue("CrossoverPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE) ); double fCrossoverValue = 0.0; aMainXScale.Origin >>= fCrossoverValue; - xMainYAxisProp->setPropertyValue( OUString("CrossoverValue") + xMainYAxisProp->setPropertyValue("CrossoverValue" , uno::makeAny( fCrossoverValue ) ); if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE ) { - xMainYAxisProp->setPropertyValue( OUString("LabelPosition") + xMainYAxisProp->setPropertyValue("LabelPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END) ); - xMainYAxisProp->setPropertyValue( OUString("MarkPosition") + xMainYAxisProp->setPropertyValue("MarkPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) ); if( xSecondaryYAxisProp.is() ) - xSecondaryYAxisProp->setPropertyValue( OUString("CrossoverPosition") + xSecondaryYAxisProp->setPropertyValue("CrossoverPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) ); } else { - xMainYAxisProp->setPropertyValue( OUString("LabelPosition") + xMainYAxisProp->setPropertyValue("LabelPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START) ); - xMainYAxisProp->setPropertyValue( OUString("MarkPosition") + xMainYAxisProp->setPropertyValue("MarkPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) ); if( xSecondaryYAxisProp.is() ) - xSecondaryYAxisProp->setPropertyValue( OUString("CrossoverPosition") + xSecondaryYAxisProp->setPropertyValue("CrossoverPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) ); } } @@ -813,48 +813,48 @@ void SchXMLAxisContext::CorrectAxisPositions( const Reference< chart2::XChartDoc { if( aMainXScale.Orientation == chart2::AxisOrientation_REVERSE ) { - xMainYAxisProp->setPropertyValue( OUString("CrossoverPosition") + xMainYAxisProp->setPropertyValue("CrossoverPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) ); if( xSecondaryYAxisProp.is() ) - xSecondaryYAxisProp->setPropertyValue( OUString("CrossoverPosition") + xSecondaryYAxisProp->setPropertyValue("CrossoverPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) ); } else { - xMainYAxisProp->setPropertyValue( OUString("CrossoverPosition") + xMainYAxisProp->setPropertyValue("CrossoverPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) ); if( xSecondaryYAxisProp.is() ) - xSecondaryYAxisProp->setPropertyValue( OUString("CrossoverPosition") + xSecondaryYAxisProp->setPropertyValue("CrossoverPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) ); } } chart2::ScaleData aMainYScale = xMainYAxis->getScaleData(); - xMainXAxisProp->setPropertyValue( OUString("CrossoverPosition") + xMainXAxisProp->setPropertyValue("CrossoverPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_VALUE) ); double fCrossoverValue = 0.0; aMainYScale.Origin >>= fCrossoverValue; - xMainXAxisProp->setPropertyValue( OUString("CrossoverValue") + xMainXAxisProp->setPropertyValue("CrossoverValue" , uno::makeAny( fCrossoverValue ) ); if( aMainYScale.Orientation == chart2::AxisOrientation_REVERSE ) { - xMainXAxisProp->setPropertyValue( OUString("LabelPosition") + xMainXAxisProp->setPropertyValue("LabelPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_END) ); - xMainXAxisProp->setPropertyValue( OUString("MarkPosition") + xMainXAxisProp->setPropertyValue("MarkPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) ); if( xSecondaryXAxisProp.is() ) - xSecondaryXAxisProp->setPropertyValue( OUString("CrossoverPosition") + xSecondaryXAxisProp->setPropertyValue("CrossoverPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_START) ); } else { - xMainXAxisProp->setPropertyValue( OUString("LabelPosition") + xMainXAxisProp->setPropertyValue("LabelPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisLabelPosition_OUTSIDE_START) ); - xMainXAxisProp->setPropertyValue( OUString("MarkPosition") + xMainXAxisProp->setPropertyValue("MarkPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS) ); if( xSecondaryXAxisProp.is() ) - xSecondaryXAxisProp->setPropertyValue( OUString("CrossoverPosition") + xSecondaryXAxisProp->setPropertyValue("CrossoverPosition" , uno::makeAny( ::com::sun::star::chart::ChartAxisPosition_END) ); } } @@ -973,7 +973,7 @@ void DateScaleContext::StartElement( const Reference< xml::sax::XAttributeList > bool bSetNewIncrement=false; chart::TimeIncrement aIncrement; - m_xAxisProps->getPropertyValue( OUString( "TimeIncrement" )) >>= aIncrement; + m_xAxisProps->getPropertyValue("TimeIncrement") >>= aIncrement; for( sal_Int16 i = 0; i < nAttrCount; i++ ) { @@ -1030,7 +1030,7 @@ void DateScaleContext::StartElement( const Reference< xml::sax::XAttributeList > } if( bSetNewIncrement ) - m_xAxisProps->setPropertyValue( OUString( "TimeIncrement" ), uno::makeAny( aIncrement ) ); + m_xAxisProps->setPropertyValue("TimeIncrement", uno::makeAny( aIncrement ) ); } // ======================================== diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index 5aeb93bd78c2..8c6aff2c04b0 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -76,7 +76,7 @@ void lcl_setRoleAtLabeledSequence( { uno::Reference< beans::XPropertySet > xProp( xValues, uno::UNO_QUERY ); if( xProp.is()) - xProp->setPropertyValue(OUString( "Role" ), uno::makeAny( rRole )); + xProp->setPropertyValue("Role", uno::makeAny( rRole )); } } @@ -355,9 +355,9 @@ void SchXMLChartContext::StartElement( const uno::Reference< xml::sax::XAttribut { try { - xDocProp->getPropertyValue( OUString( "BaseDiagram" )) >>= aOldChartTypeName; + xDocProp->getPropertyValue("BaseDiagram") >>= aOldChartTypeName; maChartTypeServiceName = SchXMLTools::GetNewChartTypeName( aOldChartTypeName ); - xDocProp->setPropertyValue( OUString( "RefreshAddInAllowed" ) , uno::makeAny( sal_False) ); + xDocProp->setPropertyValue("RefreshAddInAllowed", uno::makeAny( sal_False) ); } catch(const uno::Exception&) { @@ -695,7 +695,7 @@ void SchXMLChartContext::EndElement() { uno::Any aAny; aAny <<= maMainTitle; - xTitleProp->setPropertyValue( OUString( "String" ), aAny ); + xTitleProp->setPropertyValue("String", aAny ); } catch(const beans::UnknownPropertyException&) { @@ -712,7 +712,7 @@ void SchXMLChartContext::EndElement() { uno::Any aAny; aAny <<= maSubTitle; - xTitleProp->setPropertyValue( OUString( "String" ), aAny ); + xTitleProp->setPropertyValue("String", aAny ); } catch(const beans::UnknownPropertyException&) { @@ -731,13 +731,13 @@ void SchXMLChartContext::EndElement() if( xDiaProp.is()) { if( maSeriesDefaultsAndStyles.maStackedDefault.hasValue()) - xDiaProp->setPropertyValue(OUString("Stacked"),maSeriesDefaultsAndStyles.maStackedDefault); + xDiaProp->setPropertyValue("Stacked",maSeriesDefaultsAndStyles.maStackedDefault); if( maSeriesDefaultsAndStyles.maPercentDefault.hasValue()) - xDiaProp->setPropertyValue(OUString("Percent"),maSeriesDefaultsAndStyles.maPercentDefault); + xDiaProp->setPropertyValue("Percent",maSeriesDefaultsAndStyles.maPercentDefault); if( maSeriesDefaultsAndStyles.maDeepDefault.hasValue()) - xDiaProp->setPropertyValue(OUString("Deep"),maSeriesDefaultsAndStyles.maDeepDefault); + xDiaProp->setPropertyValue("Deep",maSeriesDefaultsAndStyles.maDeepDefault); if( maSeriesDefaultsAndStyles.maStackedBarsConnectedDefault.hasValue()) - xDiaProp->setPropertyValue(OUString("StackedBarsConnected"),maSeriesDefaultsAndStyles.maStackedBarsConnectedDefault); + xDiaProp->setPropertyValue("StackedBarsConnected",maSeriesDefaultsAndStyles.maStackedBarsConnectedDefault); } //the OOo 2.0 implementation and older has a bug with donuts @@ -808,7 +808,7 @@ void SchXMLChartContext::EndElement() try { if( bOlderThan2_3 && xDiaProp.is() )//for older charts the hidden cells were removed by calc on the fly - xDiaProp->setPropertyValue(OUString("IncludeHiddenCells"),uno::makeAny(false)); + xDiaProp->setPropertyValue("IncludeHiddenCells",uno::makeAny(false)); // note: mbRowHasLabels means the first row contains labels, that means we have "column-descriptions", // (analogously mbColHasLabels means we have "row-descriptions") @@ -906,7 +906,7 @@ void SchXMLChartContext::EndElement() } if( xProp.is()) - xProp->setPropertyValue( OUString( "RefreshAddInAllowed" ) , uno::makeAny( sal_True) ); + xProp->setPropertyValue("RefreshAddInAllowed", uno::makeAny( sal_True) ); } void SchXMLChartContext::MergeSeriesForStockChart() @@ -934,7 +934,7 @@ void SchXMLChartContext::MergeSeriesForStockChart() { xDSContainer.set( aChartTypes[nCTIdx], uno::UNO_QUERY_THROW ); uno::Reference< beans::XPropertySet > xCTProp( aChartTypes[nCTIdx], uno::UNO_QUERY_THROW ); - xCTProp->getPropertyValue( OUString( "Japanese" )) >>= bHasJapaneseCandlestick; + xCTProp->getPropertyValue("Japanese") >>= bHasJapaneseCandlestick; break; } } @@ -1019,7 +1019,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext( { if( xProp.is()) { - xProp->setPropertyValue( OUString( "HasMainTitle" ), aTrueBool ); + xProp->setPropertyValue("HasMainTitle", aTrueBool ); } uno::Reference< drawing::XShape > xTitleShape( xDoc->getTitle(), uno::UNO_QUERY ); pContext = new SchXMLTitleContext( mrImportHelper, GetImport(), @@ -1032,7 +1032,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext( { if( xProp.is()) { - xProp->setPropertyValue( OUString( "HasSubTitle" ), aTrueBool ); + xProp->setPropertyValue("HasSubTitle", aTrueBool ); } uno::Reference< drawing::XShape > xTitleShape( xDoc->getSubTitle(), uno::UNO_QUERY ); pContext = new SchXMLTitleContext( mrImportHelper, GetImport(), diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 120070202c80..cc45d6a4300e 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -464,7 +464,7 @@ bool lcl_isSeriesAttachedToFirstAxis( sal_Int32 nAxisIndex = 0; Reference< beans::XPropertySet > xProp( xDataSeries, uno::UNO_QUERY_THROW ); if( xProp.is() ) - xProp->getPropertyValue( OUString( "AttachedAxisIndex" ) ) >>= nAxisIndex; + xProp->getPropertyValue("AttachedAxisIndex") >>= nAxisIndex; bResult = (0==nAxisIndex); } catch( const uno::Exception & ex ) @@ -630,7 +630,7 @@ uno::Sequence< OUString > lcl_DataSequenceToStringSequence( if( xProp.is() ) { OUString aRole; - xProp->getPropertyValue( OUString( "Role" ) ) >>= aRole; + xProp->getPropertyValue("Role") >>= aRole; if( aRole.match( OUString( "values-x" ) ) ) { //lcl_clearIfNoValuesButTextIsContained - replace by indices if the values are not appropriate @@ -683,7 +683,7 @@ bool lcl_SequenceHasUnhiddenData( const uno::Reference< chart2::data::XDataSeque uno::Sequence< sal_Int32 > aHiddenValues; try { - xProp->getPropertyValue( OUString( "HiddenValues" ) ) >>= aHiddenValues; + xProp->getPropertyValue("HiddenValues") >>= aHiddenValues; if( !aHiddenValues.getLength() ) return true; } @@ -1411,7 +1411,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& // export legend anchor position try { - Any aAny( xProp->getPropertyValue( OUString( "Alignment" ))); + Any aAny( xProp->getPropertyValue("Alignment")); if( SchXMLEnumConverter::getLegendPositionConverter().exportXML( msString, aAny, mrExport.GetMM100UnitConverter() ) ) mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_LEGEND_POSITION, msString ); } @@ -1432,7 +1432,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& { chart::ChartLegendExpansion nLegendExpansion = chart::ChartLegendExpansion_HIGH; OUString aExpansionString; - Any aAny( xProp->getPropertyValue( OUString( "Expansion" ))); + Any aAny( xProp->getPropertyValue("Expansion")); bool bHasExpansion = (aAny >>= nLegendExpansion); if( bHasExpansion && SchXMLEnumConverter::getLegendExpansionConverter().exportXML( aExpansionString, aAny, mrExport.GetMM100UnitConverter() ) ) { @@ -1508,7 +1508,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& // get a sequence of non-chart shapes (inserted via clipboard) try { - Any aShapesAny = xDocPropSet->getPropertyValue( OUString( "AdditionalShapes" )); + Any aShapesAny = xDocPropSet->getPropertyValue("AdditionalShapes"); aShapesAny >>= mxAdditionalShapes; } catch( const uno::Exception & rEx ) @@ -1594,7 +1594,7 @@ void SchXMLExportHelper_Impl::exportTable() { bool bProtected = false; Reference< beans::XPropertySet > xProps( mrExport.GetModel(), uno::UNO_QUERY_THROW ); - if ( ( xProps->getPropertyValue( OUString( "DisableDataTableDialog" ) ) >>= bProtected ) && + if ( ( xProps->getPropertyValue("DisableDataTableDialog") >>= bProtected ) && bProtected ) { mrExport.AddAttribute( XML_NAMESPACE_TABLE, XML_PROTECTED, XML_TRUE ); @@ -1985,7 +1985,7 @@ void SchXMLExportHelper_Impl::exportPlotArea( // 3d attributes try { - aAny = xPropSet->getPropertyValue( OUString( "Dim3D" )); + aAny = xPropSet->getPropertyValue("Dim3D"); aAny >>= bIs3DChart; if( bIs3DChart ) @@ -2213,7 +2213,7 @@ void SchXMLExportHelper_Impl::exportDateScale( const Reference< beans::XProperty return; chart::TimeIncrement aIncrement; - if( (xAxisProps->getPropertyValue( OUString( "TimeIncrement" )) >>= aIncrement) ) + if( (xAxisProps->getPropertyValue("TimeIncrement") >>= aIncrement) ) { sal_Int32 nTimeResolution = ::com::sun::star::chart::TimeUnit::DAY; if( aIncrement.TimeResolution >>= nTimeResolution ) @@ -2647,7 +2647,7 @@ void SchXMLExportHelper_Impl::exportSeries( sal_Bool bJapaneseCandleSticks = sal_False; Reference< beans::XPropertySet > xCTProp( aCTSeq[nCTIdx], uno::UNO_QUERY ); if( xCTProp.is()) - xCTProp->getPropertyValue( OUString( "Japanese" )) >>= bJapaneseCandleSticks; + xCTProp->getPropertyValue("Japanese") >>= bJapaneseCandleSticks; exportCandleStickSeries( xDSCnt->getDataSeries(), xNewDiagram, bJapaneseCandleSticks, bExportContent ); continue; @@ -2685,7 +2685,7 @@ void SchXMLExportHelper_Impl::exportSeries( { Reference< beans::XPropertySet > xSeqProp( xTempValueSeq, uno::UNO_QUERY ); if( xSeqProp.is()) - xSeqProp->getPropertyValue(OUString( "Role" )) >>= aRole; + xSeqProp->getPropertyValue("Role") >>= aRole; // "main" sequence if( aRole.equals( aLabelRole )) { @@ -2948,9 +2948,9 @@ void SchXMLExportHelper_Impl::exportRegressionCurve( aPropertyStates = mxExpPropMapper->Filter( xStatProp ); if( xEquationProperties.is()) { - xEquationProperties->getPropertyValue( OUString( "ShowEquation" )) + xEquationProperties->getPropertyValue("ShowEquation") >>= bShowEquation; - xEquationProperties->getPropertyValue( OUString( "ShowCorrelationCoefficient" )) + xEquationProperties->getPropertyValue("ShowCorrelationCoefficient") >>= bShowRSquared; bExportEquation = ( bShowEquation || bShowRSquared ); const SvtSaveOptions::ODFDefaultVersion nCurrentVersion( SvtSaveOptions().GetODFDefaultVersion() ); diff --git a/xmloff/source/chart/SchXMLLegendContext.cxx b/xmloff/source/chart/SchXMLLegendContext.cxx index 73b651fb0ffd..0d0fe40a7986 100644 --- a/xmloff/source/chart/SchXMLLegendContext.cxx +++ b/xmloff/source/chart/SchXMLLegendContext.cxx @@ -101,7 +101,7 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu { try { - xDocProp->setPropertyValue( OUString( "HasLegend" ), uno::makeAny( sal_True ) ); + xDocProp->setPropertyValue("HasLegend", uno::makeAny( sal_True ) ); } catch(const beans::UnknownPropertyException&) { @@ -147,7 +147,7 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu try { if( SchXMLEnumConverter::getLegendPositionConverter().importXML( aValue, aAny, GetImport().GetMM100UnitConverter() ) ) - xLegendProps->setPropertyValue( OUString( "Alignment" ), aAny ); + xLegendProps->setPropertyValue("Alignment", aAny ); } catch(const beans::UnknownPropertyException&) { @@ -196,12 +196,12 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu xLegendShape->setPosition( aLegendPos ); if( bHasExpansion && nLegendExpansion!= chart::ChartLegendExpansion_CUSTOM ) - xLegendProps->setPropertyValue( OUString( "Expansion" ), uno::makeAny(nLegendExpansion) ); + xLegendProps->setPropertyValue("Expansion", uno::makeAny(nLegendExpansion) ); else if( bHasHeight && bHasWidth ) xLegendShape->setSize( aLegendSize ); // the fill style has the default "none" in XML, but "solid" in the model. - xLegendProps->setPropertyValue( OUString( "FillStyle" ), uno::makeAny( drawing::FillStyle_NONE )); + xLegendProps->setPropertyValue("FillStyle", uno::makeAny( drawing::FillStyle_NONE )); // set auto-styles for Legend const SvXMLStylesContext* pStylesCtxt = mrImportHelper.GetAutoStylesContext(); diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index d8b56b2cb44b..516178d8b355 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -105,7 +105,7 @@ void SchXML3DSceneAttributesHelper::getCameraDefaultFromDiagram( const uno::Refe if( xProp.is() ) { drawing::CameraGeometry aCamGeo; - xProp->getPropertyValue( OUString( "D3DCameraGeometry" )) >>= aCamGeo; + xProp->getPropertyValue("D3DCameraGeometry") >>= aCamGeo; maVRP.setX( aCamGeo.vrp.PositionX ); maVRP.setY( aCamGeo.vrp.PositionY ); maVRP.setZ( aCamGeo.vrp.PositionZ ); @@ -221,7 +221,7 @@ SchXMLPlotAreaContext::SchXMLPlotAreaContext( uno::Any aAny; chart::ChartDataRowSource eSource = chart::ChartDataRowSource_COLUMNS; aAny <<= eSource; - xProp->setPropertyValue( OUString( "DataRowSource" ), aAny ); + xProp->setPropertyValue("DataRowSource", aAny ); } catch( const beans::UnknownPropertyException & ) { @@ -334,7 +334,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri pPropStyleContext->FillPropertySet( xProp ); // get the data row source that was set without having data - xProp->getPropertyValue( OUString( "DataRowSource" )) + xProp->getPropertyValue("DataRowSource") >>= mrDataRowSource; //lines on/off @@ -349,7 +349,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri if( SchXMLTools::isDocumentGeneratedWithOpenOfficeOlderThan3_0( GetImport().GetModel() ) ) { bool bIs3d = false; - if( xProp.is() && ( xProp->getPropertyValue(OUString("Dim3D")) >>= bIs3d ) && + if( xProp.is() && ( xProp->getPropertyValue("Dim3D") >>= bIs3d ) && bIs3d ) { if( maChartTypeServiceName == "com.sun.star.chart2.PieChartType" || maChartTypeServiceName == "com.sun.star.chart2.DonutChartType" ) @@ -371,28 +371,28 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri { try { - mrSeriesDefaultsAndStyles.maSymbolTypeDefault = xProp->getPropertyValue(OUString("SymbolType")); - mrSeriesDefaultsAndStyles.maDataCaptionDefault = xProp->getPropertyValue(OUString("DataCaption")); + mrSeriesDefaultsAndStyles.maSymbolTypeDefault = xProp->getPropertyValue("SymbolType"); + mrSeriesDefaultsAndStyles.maDataCaptionDefault = xProp->getPropertyValue("DataCaption"); - mrSeriesDefaultsAndStyles.maMeanValueDefault = xProp->getPropertyValue(OUString("MeanValue")); - mrSeriesDefaultsAndStyles.maRegressionCurvesDefault = xProp->getPropertyValue(OUString("RegressionCurves")); + mrSeriesDefaultsAndStyles.maMeanValueDefault = xProp->getPropertyValue("MeanValue"); + mrSeriesDefaultsAndStyles.maRegressionCurvesDefault = xProp->getPropertyValue("RegressionCurves"); bool bStacked = false; - mrSeriesDefaultsAndStyles.maStackedDefault = xProp->getPropertyValue(OUString("Stacked")); + mrSeriesDefaultsAndStyles.maStackedDefault = xProp->getPropertyValue("Stacked"); mrSeriesDefaultsAndStyles.maStackedDefault >>= bStacked; - mrSeriesDefaultsAndStyles.maPercentDefault = xProp->getPropertyValue(OUString("Percent")); + mrSeriesDefaultsAndStyles.maPercentDefault = xProp->getPropertyValue("Percent"); mrSeriesDefaultsAndStyles.maPercentDefault >>= mbPercentStacked; - mrSeriesDefaultsAndStyles.maStackedBarsConnectedDefault = xProp->getPropertyValue(OUString("StackedBarsConnected")); + mrSeriesDefaultsAndStyles.maStackedBarsConnectedDefault = xProp->getPropertyValue("StackedBarsConnected"); // deep - uno::Any aDeepProperty( xProp->getPropertyValue(OUString("Deep"))); + uno::Any aDeepProperty( xProp->getPropertyValue("Deep")); // #124488# old versions store a 3d area and 3D line deep chart with Deep==false => workaround for this if( ! (bStacked || mbPercentStacked )) { if( SchXMLTools::isDocumentGeneratedWithOpenOfficeOlderThan2_3( GetImport().GetModel() ) ) { bool bIs3d = false; - if( ( xProp->getPropertyValue(OUString("Dim3D")) >>= bIs3d ) && + if( ( xProp->getPropertyValue("Dim3D") >>= bIs3d ) && bIs3d ) { if( maChartTypeServiceName == "com.sun.star.chart2.AreaChartType" || maChartTypeServiceName == "com.sun.star.chart2.LineChartType" ) @@ -404,8 +404,8 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri } mrSeriesDefaultsAndStyles.maDeepDefault = aDeepProperty; - xProp->getPropertyValue(OUString("NumberOfLines")) >>= mnNumOfLinesProp; - xProp->getPropertyValue(OUString("Volume")) >>= mbStockHasVolume; + xProp->getPropertyValue("NumberOfLines") >>= mnNumOfLinesProp; + xProp->getPropertyValue("Volume") >>= mbStockHasVolume; } catch( const uno::Exception & rEx ) { @@ -431,7 +431,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri // data yet. mxNewDoc->createInternalDataProvider( false /* bCloneExistingData */ ); if( xProp.is() && mrDataRowSource!=chart::ChartDataRowSource_COLUMNS ) - xProp->setPropertyValue( OUString( "DataRowSource" ), uno::makeAny(mrDataRowSource) ); + xProp->setPropertyValue("DataRowSource", uno::makeAny(mrDataRowSource) ); } } @@ -559,7 +559,7 @@ void SchXMLPlotAreaContext::EndElement() if( xDiaProp.is()) { sal_Bool bIsThreeDim = sal_False; - uno::Any aAny = xDiaProp->getPropertyValue( OUString( "Dim3D" )); + uno::Any aAny = xDiaProp->getPropertyValue("Dim3D"); aAny >>= bIsThreeDim; // set 3d scene attributes @@ -574,7 +574,7 @@ void SchXMLPlotAreaContext::EndElement() { try { - xDiaProp->setPropertyValue( OUString( "NumberOfLines" ), + xDiaProp->setPropertyValue("NumberOfLines", uno::makeAny( mnNumOfLinesProp )); } catch( const uno::Exception & rEx ) @@ -590,7 +590,7 @@ void SchXMLPlotAreaContext::EndElement() { try { - xDiaProp->setPropertyValue( OUString( "Volume" ), + xDiaProp->setPropertyValue("Volume", uno::makeAny( true )); } catch( const uno::Exception & rEx ) @@ -1331,15 +1331,15 @@ void SchXMLEquationContext::StartElement( const uno::Reference< xml::sax::XAttri pPropStyleContext->FillPropertySet( xEqProp ); } } - xEqProp->setPropertyValue( OUString( "ShowEquation"), uno::makeAny( bShowEquation )); - xEqProp->setPropertyValue( OUString( "ShowCorrelationCoefficient"), uno::makeAny( bShowRSquare )); + xEqProp->setPropertyValue("ShowEquation", uno::makeAny( bShowEquation )); + xEqProp->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 ); - xEqProp->setPropertyValue( OUString( "RelativePosition" ), + xEqProp->setPropertyValue("RelativePosition", uno::makeAny( aRelPos )); } SAL_WARN_IF( mrRegressionStyle.meType != DataRowPointStyle::REGRESSION, "xmloff.chart", "mrRegressionStyle.meType != DataRowPointStyle::REGRESSION" ); diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index 148b7352c68f..d45774176ca1 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -120,12 +120,12 @@ void lcl_setAutomaticSymbolSize( const uno::Reference< beans::XPropertySet >& xS double fScale = 1; uno::Reference< beans::XPropertySet > xLegendProp( xChartDoc->getLegend(), uno::UNO_QUERY ); chart::ChartLegendPosition aLegendPosition = chart::ChartLegendPosition_NONE; - if( xLegendProp.is() && (xLegendProp->getPropertyValue( OUString( "Alignment" )) >>= aLegendPosition) + if( xLegendProp.is() && (xLegendProp->getPropertyValue("Alignment") >>= aLegendPosition) && chart::ChartLegendPosition_NONE != aLegendPosition ) { double fFontHeight = 6.0; - if( xLegendProp->getPropertyValue( OUString( "CharHeight" )) >>= fFontHeight ) + if( xLegendProp->getPropertyValue("CharHeight") >>= fFontHeight ) fScale = 0.75*fFontHeight/6.0; } else @@ -143,7 +143,7 @@ void lcl_setAutomaticSymbolSize( const uno::Reference< beans::XPropertySet >& xS aSymbolSize.Width = aSymbolSize.Height; } } - xSeriesOrPointProp->setPropertyValue(OUString("SymbolSize"),uno::makeAny( aSymbolSize )); + xSeriesOrPointProp->setPropertyValue("SymbolSize",uno::makeAny( aSymbolSize )); } void lcl_setSymbolSizeIfNeeded( const uno::Reference< beans::XPropertySet >& xSeriesOrPointProp, const SvXMLImport& rImport ) @@ -152,14 +152,14 @@ void lcl_setSymbolSizeIfNeeded( const uno::Reference< beans::XPropertySet >& xSe return; sal_Int32 nSymbolType = chart::ChartSymbolType::NONE; - if( xSeriesOrPointProp.is() && ( xSeriesOrPointProp->getPropertyValue(OUString("SymbolType")) >>= nSymbolType) ) + if( xSeriesOrPointProp.is() && ( xSeriesOrPointProp->getPropertyValue("SymbolType") >>= nSymbolType) ) { if(chart::ChartSymbolType::NONE!=nSymbolType) { if( chart::ChartSymbolType::BITMAPURL==nSymbolType ) { //set special size for graphics to indicate to use the bitmap size itself - xSeriesOrPointProp->setPropertyValue(OUString("SymbolSize"),uno::makeAny( awt::Size(-1,-1) )); + xSeriesOrPointProp->setPropertyValue("SymbolSize",uno::makeAny( awt::Size(-1,-1) )); } else { @@ -222,7 +222,7 @@ Reference< chart2::data::XLabeledDataSequence2 > lcl_createAndAddSequenceToSerie Reference< chart2::data::XDataSequence > xSeq = SchXMLTools::CreateDataSequence( rRange, xChartDoc ); Reference< beans::XPropertySet > xSeqProp( xSeq, uno::UNO_QUERY ); if( xSeqProp.is()) - xSeqProp->setPropertyValue(OUString( "Role" ), uno::makeAny( rRole)); + xSeqProp->setPropertyValue("Role", uno::makeAny( rRole)); xLabeledSeq->setValues( xSeq ); // add new sequence to data series / push to front to have the correct sequence order if charttype is changed afterwards @@ -390,7 +390,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib // set default color for range-line to black (before applying styles) Reference< beans::XPropertySet > xSeriesProp( m_xSeries, uno::UNO_QUERY ); if( xSeriesProp.is()) - xSeriesProp->setPropertyValue( OUString("Color"), + xSeriesProp->setPropertyValue("Color", uno::makeAny( sal_Int32( 0x000000 ))); // black } else if ( maSeriesChartTypeName == "com.sun.star.chart2.PieChartType" ) @@ -398,7 +398,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib //@todo: this property should be saved Reference< beans::XPropertySet > xSeriesProp( m_xSeries, uno::UNO_QUERY ); if( xSeriesProp.is()) - xSeriesProp->setPropertyValue( OUString("VaryColorsByPoint"), + xSeriesProp->setPropertyValue("VaryColorsByPoint", uno::makeAny( true )); } @@ -413,7 +413,7 @@ void SchXMLSeries2Context::StartElement( const uno::Reference< xml::sax::XAttrib OUString aMainRole("values-y"); if ( maSeriesChartTypeName == "com.sun.star.chart2.BubbleChartType" ) aMainRole = OUString( "values-size" ); - xSeqProp->setPropertyValue(OUString( "Role" ), uno::makeAny( aMainRole )); + xSeqProp->setPropertyValue("Role", uno::makeAny( aMainRole )); } xLabeledSeq->setValues( xSeq ); @@ -721,27 +721,27 @@ void SchXMLSeries2Context::setDefaultsToSeries( SeriesDefaultsAndStyles& rSeries continue; if( rSeriesDefaultsAndStyles.maSymbolTypeDefault.hasValue() ) - xSeries->setPropertyValue(OUString("SymbolType"),rSeriesDefaultsAndStyles.maSymbolTypeDefault); + xSeries->setPropertyValue("SymbolType",rSeriesDefaultsAndStyles.maSymbolTypeDefault); if( rSeriesDefaultsAndStyles.maDataCaptionDefault.hasValue() ) - xSeries->setPropertyValue(OUString("DataCaption"),rSeriesDefaultsAndStyles.maDataCaptionDefault); + xSeries->setPropertyValue("DataCaption",rSeriesDefaultsAndStyles.maDataCaptionDefault); if( rSeriesDefaultsAndStyles.maErrorIndicatorDefault.hasValue() ) - xSeries->setPropertyValue(OUString("ErrorIndicator"),rSeriesDefaultsAndStyles.maErrorIndicatorDefault); + xSeries->setPropertyValue("ErrorIndicator",rSeriesDefaultsAndStyles.maErrorIndicatorDefault); if( rSeriesDefaultsAndStyles.maErrorCategoryDefault.hasValue() ) - xSeries->setPropertyValue(OUString("ErrorCategory"),rSeriesDefaultsAndStyles.maErrorCategoryDefault); + xSeries->setPropertyValue("ErrorCategory",rSeriesDefaultsAndStyles.maErrorCategoryDefault); if( rSeriesDefaultsAndStyles.maConstantErrorLowDefault.hasValue() ) - xSeries->setPropertyValue(OUString("ConstantErrorLow"),rSeriesDefaultsAndStyles.maConstantErrorLowDefault); + xSeries->setPropertyValue("ConstantErrorLow",rSeriesDefaultsAndStyles.maConstantErrorLowDefault); if( rSeriesDefaultsAndStyles.maConstantErrorHighDefault.hasValue() ) - xSeries->setPropertyValue(OUString("ConstantErrorHigh"),rSeriesDefaultsAndStyles.maConstantErrorHighDefault); + xSeries->setPropertyValue("ConstantErrorHigh",rSeriesDefaultsAndStyles.maConstantErrorHighDefault); if( rSeriesDefaultsAndStyles.maPercentageErrorDefault.hasValue() ) - xSeries->setPropertyValue(OUString("PercentageError"),rSeriesDefaultsAndStyles.maPercentageErrorDefault); + xSeries->setPropertyValue("PercentageError",rSeriesDefaultsAndStyles.maPercentageErrorDefault); if( rSeriesDefaultsAndStyles.maErrorMarginDefault.hasValue() ) - xSeries->setPropertyValue(OUString("ErrorMargin"),rSeriesDefaultsAndStyles.maErrorMarginDefault); + xSeries->setPropertyValue("ErrorMargin",rSeriesDefaultsAndStyles.maErrorMarginDefault); if( rSeriesDefaultsAndStyles.maMeanValueDefault.hasValue() ) - xSeries->setPropertyValue(OUString("MeanValue"),rSeriesDefaultsAndStyles.maMeanValueDefault); + xSeries->setPropertyValue("MeanValue",rSeriesDefaultsAndStyles.maMeanValueDefault); if( rSeriesDefaultsAndStyles.maRegressionCurvesDefault.hasValue() ) - xSeries->setPropertyValue(OUString("RegressionCurves"),rSeriesDefaultsAndStyles.maRegressionCurvesDefault); + xSeries->setPropertyValue("RegressionCurves",rSeriesDefaultsAndStyles.maRegressionCurvesDefault); } catch( uno::Exception & ) { @@ -775,7 +775,7 @@ void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDe if( iStyle->mnAttachedAxis != 1 ) { - xSeriesProp->setPropertyValue( OUString( "Axis" ) + xSeriesProp->setPropertyValue("Axis" , uno::makeAny(chart::ChartAxisAssign::SECONDARY_Y) ); } @@ -995,7 +995,7 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri { //need to set this explicitly here for old files as the new api does not support this property fully anymore if( bSwitchOffLinesForScatter ) - xPointProp->setPropertyValue(OUString("Lines"),uno::makeAny(sal_False)); + xPointProp->setPropertyValue("Lines",uno::makeAny(sal_False)); } catch( const uno::Exception & ) { @@ -1044,7 +1044,7 @@ void SchXMLSeries2Context::switchSeriesLinesOff( ::std::list< DataRowPointStyle if( !xSeries.is() ) continue; - xSeries->setPropertyValue(OUString("Lines"),uno::makeAny(sal_False)); + xSeries->setPropertyValue("Lines",uno::makeAny(sal_False)); } catch( uno::Exception & ) { diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 491b58f5002a..7892901e3d23 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -656,7 +656,7 @@ void SAL_CALL SvXMLExport::setSourceDocument( const uno::Reference< lang::XCompo try { Reference < XInterface > xIfc = - xFactory->createInstance(OUString( "com.sun.star.xml.NamespaceMap") ); + xFactory->createInstance("com.sun.star.xml.NamespaceMap"); if( xIfc.is() ) { Reference< XNameAccess > xNamespaceMap( xIfc, UNO_QUERY ); @@ -1489,7 +1489,7 @@ void SvXMLExport::_ExportScripts() { Reference< beans::XPropertySet > xPSet( mxModel, UNO_QUERY ); if ( xPSet.is() ) - xPSet->getPropertyValue( OUString( "BasicLibraries" ) ); + xPSet->getPropertyValue("BasicLibraries"); } Reference < XDocumentHandler > xHdl( new XMLBasicExportFilter( mxHandler ) ); @@ -1520,7 +1520,7 @@ void SvXMLExport::_ExportStyles( sal_Bool ) // export (fill-)gradient-styles try { - uno::Reference< container::XNameAccess > xGradient( xFact->createInstance( OUString("com.sun.star.drawing.GradientTable" ) ), uno::UNO_QUERY ); + uno::Reference< container::XNameAccess > xGradient( xFact->createInstance("com.sun.star.drawing.GradientTable"), uno::UNO_QUERY ); if( xGradient.is() ) { XMLGradientStyleExport aGradientStyle( *this ); @@ -1553,7 +1553,7 @@ void SvXMLExport::_ExportStyles( sal_Bool ) // export (fill-)hatch-styles try { - uno::Reference< container::XNameAccess > xHatch( xFact->createInstance( OUString("com.sun.star.drawing.HatchTable" ) ), uno::UNO_QUERY ); + uno::Reference< container::XNameAccess > xHatch( xFact->createInstance("com.sun.star.drawing.HatchTable"), uno::UNO_QUERY ); if( xHatch.is() ) { XMLHatchStyleExport aHatchStyle( *this ); @@ -1585,7 +1585,7 @@ void SvXMLExport::_ExportStyles( sal_Bool ) // export (fill-)bitmap-styles try { - uno::Reference< container::XNameAccess > xBitmap( xFact->createInstance( OUString("com.sun.star.drawing.BitmapTable" ) ), uno::UNO_QUERY ); + uno::Reference< container::XNameAccess > xBitmap( xFact->createInstance("com.sun.star.drawing.BitmapTable"), uno::UNO_QUERY ); if( xBitmap.is() ) { XMLImageStyle aImageStyle; @@ -1618,7 +1618,7 @@ void SvXMLExport::_ExportStyles( sal_Bool ) // export transparency-gradient -styles try { - uno::Reference< container::XNameAccess > xTransGradient( xFact->createInstance( OUString("com.sun.star.drawing.TransparencyGradientTable" ) ), uno::UNO_QUERY ); + uno::Reference< container::XNameAccess > xTransGradient( xFact->createInstance("com.sun.star.drawing.TransparencyGradientTable"), uno::UNO_QUERY ); if( xTransGradient.is() ) { XMLTransGradientStyleExport aTransGradientstyle( *this ); @@ -1651,7 +1651,7 @@ void SvXMLExport::_ExportStyles( sal_Bool ) // export marker-styles try { - uno::Reference< container::XNameAccess > xMarker( xFact->createInstance( OUString("com.sun.star.drawing.MarkerTable" ) ), uno::UNO_QUERY ); + uno::Reference< container::XNameAccess > xMarker( xFact->createInstance("com.sun.star.drawing.MarkerTable"), uno::UNO_QUERY ); if( xMarker.is() ) { XMLMarkerStyleExport aMarkerStyle( *this ); @@ -1684,7 +1684,7 @@ void SvXMLExport::_ExportStyles( sal_Bool ) // export dash-styles try { - uno::Reference< container::XNameAccess > xDashes( xFact->createInstance( OUString("com.sun.star.drawing.DashTable" ) ), uno::UNO_QUERY ); + uno::Reference< container::XNameAccess > xDashes( xFact->createInstance("com.sun.star.drawing.DashTable"), uno::UNO_QUERY ); if( xDashes.is() ) { XMLDashStyleExport aDashStyle( *this ); @@ -2103,7 +2103,7 @@ sal_Bool SvXMLExport::ExportEmbeddedOwnObject( Reference< XComponent >& rComp ) new ::comphelper::PropertySetInfo( aInfoMap ))); if( bIsChart ) - xInfoProp->setPropertyValue( OUString( "ExportTableNumberList"), makeAny( true )); + xInfoProp->setPropertyValue("ExportTableNumberList", makeAny( true )); aArgs.realloc( 2 ); aArgs[1] <<= xInfoProp; diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx index fd31cca8db66..06ca5ac77757 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -571,9 +571,9 @@ void AnimationsExporterImpl::exportTransitionNode() if( mbHasTransition && mxPageProps.is() ) { sal_Int16 nTransition = 0; - mxPageProps->getPropertyValue( OUString( "TransitionType" ) ) >>= nTransition; + mxPageProps->getPropertyValue("TransitionType") >>= nTransition; - Any aSound( mxPageProps->getPropertyValue( OUString( "Sound" ) ) ); + Any aSound( mxPageProps->getPropertyValue("Sound") ); OUString sSoundURL; aSound >>= sSoundURL; sal_Bool bStopSound = sal_False; @@ -601,10 +601,10 @@ void AnimationsExporterImpl::exportTransitionNode() sal_Bool bDirection = sal_False; sal_Int32 nFadeColor = 0; double fDuration = 0.0; - mxPageProps->getPropertyValue( OUString( "TransitionSubtype" ) ) >>= nSubtype; - mxPageProps->getPropertyValue( OUString( "TransitionDirection" ) ) >>= bDirection; - mxPageProps->getPropertyValue( OUString( "TransitionFadeColor" ) ) >>= nFadeColor; - mxPageProps->getPropertyValue( OUString( "TransitionDuration" ) ) >>= fDuration; + mxPageProps->getPropertyValue("TransitionSubtype") >>= nSubtype; + mxPageProps->getPropertyValue("TransitionDirection") >>= bDirection; + mxPageProps->getPropertyValue("TransitionFadeColor") >>= nFadeColor; + mxPageProps->getPropertyValue("TransitionDuration") >>= fDuration; ::sax::Converter::convertDouble( sTmp, fDuration ); sTmp.append( sal_Unicode('s')); @@ -640,7 +640,7 @@ void AnimationsExporterImpl::exportTransitionNode() mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, mrExport.GetRelativeReference( sSoundURL ) ); sal_Bool bLoopSound = sal_False; - mxPageProps->getPropertyValue( OUString( "LoopSound" ) ) >>= bLoopSound; + mxPageProps->getPropertyValue("LoopSound") >>= bLoopSound; if( bLoopSound ) mrExport.AddAttribute( XML_NAMESPACE_SMIL, XML_REPEATCOUNT, XML_INDEFINITE ); @@ -655,14 +655,14 @@ void AnimationsExporterImpl::prepareTransitionNode() if( mxPageProps.is() ) try { sal_Int16 nTransition = 0; - mxPageProps->getPropertyValue( OUString( "TransitionType" ) ) >>= nTransition; + mxPageProps->getPropertyValue("TransitionType") >>= nTransition; sal_Bool bStopSound = sal_False; OUString sSoundURL; if( nTransition == 0 ) { - Any aSound( mxPageProps->getPropertyValue( OUString( "Sound" ) ) ); + Any aSound( mxPageProps->getPropertyValue("Sound") ); aSound >>= sSoundURL; if( !(aSound >>= bStopSound) ) diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index 12f587e3feae..f3bb2ffd872f 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -1378,14 +1378,14 @@ void AnimationNodeContext::postProcessRootNode( SvXMLImport& /*rImport*/, const Reference< XTransitionFilter > xTransFilter( xChildNode, UNO_QUERY_THROW ); - xPageProps->setPropertyValue( OUString( "TransitionType" ), Any( xTransFilter->getTransition() ) ); - xPageProps->setPropertyValue( OUString( "TransitionSubtype" ), Any( xTransFilter->getSubtype() ) ); - xPageProps->setPropertyValue( OUString( "TransitionDirection" ), Any( xTransFilter->getDirection() ) ); - xPageProps->setPropertyValue( OUString( "TransitionFadeColor" ), Any( xTransFilter->getFadeColor() ) ); + xPageProps->setPropertyValue("TransitionType", Any( xTransFilter->getTransition() ) ); + xPageProps->setPropertyValue("TransitionSubtype", Any( xTransFilter->getSubtype() ) ); + xPageProps->setPropertyValue("TransitionDirection", Any( xTransFilter->getDirection() ) ); + xPageProps->setPropertyValue("TransitionFadeColor", Any( xTransFilter->getFadeColor() ) ); double fDuration; if( xTransFilter->getDuration() >>= fDuration ) - xPageProps->setPropertyValue( OUString( "TransitionDuration" ), Any( fDuration ) ); + xPageProps->setPropertyValue("TransitionDuration", Any( fDuration ) ); } break; @@ -1395,7 +1395,7 @@ void AnimationNodeContext::postProcessRootNode( SvXMLImport& /*rImport*/, const Reference< XCommand > xCommand( xChildNode, UNO_QUERY_THROW ); if( xCommand->getCommand() == EffectCommands::STOPAUDIO ) { - xPageProps->setPropertyValue( OUString( "Sound" ), Any(sal_True) ); + xPageProps->setPropertyValue("Sound", Any(sal_True) ); } } break; @@ -1406,11 +1406,11 @@ void AnimationNodeContext::postProcessRootNode( SvXMLImport& /*rImport*/, const OUString sSoundURL; if( (xAudio->getSource() >>= sSoundURL) && !sSoundURL.isEmpty() ) { - xPageProps->setPropertyValue( OUString( "Sound" ), Any(sSoundURL) ); + xPageProps->setPropertyValue("Sound", Any(sSoundURL) ); Timing eTiming; if( (xAudio->getRepeatCount() >>= eTiming) && (eTiming == Timing_INDEFINITE) ) - xPageProps->setPropertyValue( OUString( "LoopSound" ), Any( sal_True ) ); + xPageProps->setPropertyValue("LoopSound", Any( sal_True ) ); } } break; diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx index 90cc84697499..2ea06e1b9695 100644 --- a/xmloff/source/draw/animexp.cxx +++ b/xmloff/source/draw/animexp.cxx @@ -275,7 +275,7 @@ void XMLAnimationsExporter::prepare( Reference< XShape > xShape, SvXMLExport& ) // check for presentation shape service { Reference< XServiceInfo > xServiceInfo( xShape, UNO_QUERY ); - if( !xServiceInfo.is() || !xServiceInfo->supportsService( OUString( "com.sun.star.presentation.Shape" ) ) ) + if( !xServiceInfo.is() || !xServiceInfo->supportsService("com.sun.star.presentation.Shape") ) return; } @@ -304,7 +304,7 @@ void XMLAnimationsExporter::collect( Reference< XShape > xShape, SvXMLExport& rE // check for presentation shape service { Reference< XServiceInfo > xServiceInfo( xShape, UNO_QUERY ); - if( !xServiceInfo.is() || !xServiceInfo->supportsService( OUString( "com.sun.star.presentation.Shape" ) ) ) + if( !xServiceInfo.is() || !xServiceInfo->supportsService("com.sun.star.presentation.Shape") ) return; } diff --git a/xmloff/source/draw/descriptionimp.cxx b/xmloff/source/draw/descriptionimp.cxx index 3d1417af3ca7..265918c6187d 100644 --- a/xmloff/source/draw/descriptionimp.cxx +++ b/xmloff/source/draw/descriptionimp.cxx @@ -59,11 +59,11 @@ void SdXMLDescriptionContext::EndElement() uno::Reference< beans::XPropertySet > xPropSet(mxShape, uno::UNO_QUERY_THROW); if(IsXMLToken(GetLocalName(),XML_TITLE)) { - xPropSet->setPropertyValue(OUString("Title"), Any(msText)); + xPropSet->setPropertyValue("Title", Any(msText)); } else { - xPropSet->setPropertyValue(OUString("Description"), Any(msText)); + xPropSet->setPropertyValue("Description", Any(msText)); } } catch( uno::Exception& ) diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx index dd5731775231..f0eb1494944b 100644 --- a/xmloff/source/draw/layerimp.cxx +++ b/xmloff/source/draw/layerimp.cxx @@ -125,13 +125,13 @@ void SdXMLLayerContext::EndElement() DBG_ASSERT( xLayer.is(), "xmloff::SdXMLLayerContext::EndElement(), failed to create new XLayer!" ); if( xLayer.is() ) - xLayer->setPropertyValue( OUString( "Name" ), Any( msName ) ); + xLayer->setPropertyValue("Name", Any( msName ) ); } if( xLayer.is() ) { - xLayer->setPropertyValue( OUString( "Title" ), Any( sTitleBuffer.makeStringAndClear() ) ); - xLayer->setPropertyValue( OUString( "Description" ), Any( sDescriptionBuffer.makeStringAndClear() ) ); + xLayer->setPropertyValue("Title", Any( sTitleBuffer.makeStringAndClear() ) ); + xLayer->setPropertyValue("Description", Any( sDescriptionBuffer.makeStringAndClear() ) ); } } catch( Exception& ) diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index c9149b9ae87a..328c7fd8453f 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -138,33 +138,33 @@ ImpXMLEXPPageMasterInfo::ImpXMLEXPPageMasterInfo( Any aAny; Reference< beans::XPropertySetInfo > xPropsInfo( xPropSet->getPropertySetInfo() ); - if( xPropsInfo.is() && xPropsInfo->hasPropertyByName(OUString("BorderBottom" ))) + if( xPropsInfo.is() && xPropsInfo->hasPropertyByName("BorderBottom")) { - aAny = xPropSet->getPropertyValue(OUString("BorderBottom")); + aAny = xPropSet->getPropertyValue("BorderBottom"); aAny >>= mnBorderBottom; - aAny = xPropSet->getPropertyValue(OUString("BorderLeft")); + aAny = xPropSet->getPropertyValue("BorderLeft"); aAny >>= mnBorderLeft; - aAny = xPropSet->getPropertyValue(OUString("BorderRight")); + aAny = xPropSet->getPropertyValue("BorderRight"); aAny >>= mnBorderRight; - aAny = xPropSet->getPropertyValue(OUString("BorderTop")); + aAny = xPropSet->getPropertyValue("BorderTop"); aAny >>= mnBorderTop; } - if( xPropsInfo.is() && xPropsInfo->hasPropertyByName(OUString("Width"))) + if( xPropsInfo.is() && xPropsInfo->hasPropertyByName("Width")) { - aAny = xPropSet->getPropertyValue(OUString("Width")); + aAny = xPropSet->getPropertyValue("Width"); aAny >>= mnWidth; - aAny = xPropSet->getPropertyValue(OUString("Height")); + aAny = xPropSet->getPropertyValue("Height"); aAny >>= mnHeight; } - if( xPropsInfo.is() && xPropsInfo->hasPropertyByName(OUString("Orientation"))) + if( xPropsInfo.is() && xPropsInfo->hasPropertyByName("Orientation")) { - aAny = xPropSet->getPropertyValue(OUString("Orientation")); + aAny = xPropSet->getPropertyValue("Orientation"); aAny >>= meOrientation; } } @@ -776,7 +776,7 @@ sal_Bool SdXMLExport::ImpPrepAutoLayoutInfo(const Reference<XDrawPage>& xPage, O sal_uInt16 nType = sal_uInt16(); Any aAny; - aAny = xPropSet->getPropertyValue(OUString("Layout")); + aAny = xPropSet->getPropertyValue("Layout"); if(aAny >>= nType) { if(ImpXMLAutoLayoutInfo::IsCreateNecessary(nType)) @@ -1554,8 +1554,8 @@ HeaderFooterPageSettingsImpl SdXMLExport::ImpPrepDrawPageHeaderFooterDecls( cons sal_Bool bFixed = false; sal_Int32 nFormat = 0; xSet->getPropertyValue( aStrDateTimeTextProp ) >>= aStrText; - xSet->getPropertyValue( OUString( "IsDateTimeFixed" ) ) >>= bFixed; - xSet->getPropertyValue( OUString( "DateTimeFormat" ) ) >>= nFormat; + xSet->getPropertyValue("IsDateTimeFixed") >>= bFixed; + xSet->getPropertyValue("DateTimeFormat") >>= nFormat; if( !bFixed || !aStrText.isEmpty() ) { @@ -1864,7 +1864,7 @@ void SdXMLExport::_ExportContent() try { OUString aBookmarkURL; - xProps->getPropertyValue( OUString( "BookmarkURL" ) ) >>= aBookmarkURL; + xProps->getPropertyValue("BookmarkURL") >>= aBookmarkURL; if( !aBookmarkURL.isEmpty() ) { @@ -2016,11 +2016,11 @@ void SdXMLExport::exportPresentationSettings() sal_Bool bTemp = false; // export range - xPresProps->getPropertyValue( OUString( "IsShowAll" ) ) >>= bTemp; + xPresProps->getPropertyValue("IsShowAll") >>= bTemp; if( !bTemp ) { OUString aFirstPage; - xPresProps->getPropertyValue( OUString( "FirstPage" ) ) >>= aFirstPage; + xPresProps->getPropertyValue("FirstPage") >>= aFirstPage; if( !aFirstPage.isEmpty() ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_START_PAGE, aFirstPage ); @@ -2029,7 +2029,7 @@ void SdXMLExport::exportPresentationSettings() else { OUString aCustomShow; - xPresProps->getPropertyValue( OUString( "CustomShow" ) ) >>= aCustomShow; + xPresProps->getPropertyValue("CustomShow") >>= aCustomShow; if( !aCustomShow.isEmpty() ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_SHOW, aCustomShow ); @@ -2038,14 +2038,14 @@ void SdXMLExport::exportPresentationSettings() } } - xPresProps->getPropertyValue( OUString( "IsEndless" ) ) >>= bTemp; + xPresProps->getPropertyValue("IsEndless") >>= bTemp; if( bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_ENDLESS, XML_TRUE ); bHasAttr = sal_True; sal_Int32 nPause = 0; - xPresProps->getPropertyValue( OUString( "Pause" ) ) >>= nPause; + xPresProps->getPropertyValue("Pause") >>= nPause; util::Duration aDuration; aDuration.Seconds = static_cast<sal_uInt16>(nPause); @@ -2055,63 +2055,63 @@ void SdXMLExport::exportPresentationSettings() AddAttribute(XML_NAMESPACE_PRESENTATION, XML_PAUSE, aOut.makeStringAndClear() ); } - xPresProps->getPropertyValue( OUString( "AllowAnimations" ) ) >>= bTemp; + xPresProps->getPropertyValue("AllowAnimations") >>= bTemp; if( !bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_ANIMATIONS, XML_DISABLED ); bHasAttr = sal_True; } - xPresProps->getPropertyValue( OUString( "IsAlwaysOnTop" ) ) >>= bTemp; + xPresProps->getPropertyValue("IsAlwaysOnTop") >>= bTemp; if( bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_STAY_ON_TOP, XML_TRUE ); bHasAttr = sal_True; } - xPresProps->getPropertyValue( OUString( "IsAutomatic" ) ) >>= bTemp; + xPresProps->getPropertyValue("IsAutomatic") >>= bTemp; if( bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_FORCE_MANUAL, XML_TRUE ); bHasAttr = sal_True; } - xPresProps->getPropertyValue( OUString( "IsFullScreen" ) ) >>= bTemp; + xPresProps->getPropertyValue("IsFullScreen") >>= bTemp; if( !bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_FULL_SCREEN, XML_FALSE ); bHasAttr = sal_True; } - xPresProps->getPropertyValue( OUString( "IsMouseVisible" ) ) >>= bTemp; + xPresProps->getPropertyValue("IsMouseVisible") >>= bTemp; if( !bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_MOUSE_VISIBLE, XML_FALSE ); bHasAttr = sal_True; } - xPresProps->getPropertyValue( OUString( "StartWithNavigator" ) ) >>= bTemp; + xPresProps->getPropertyValue("StartWithNavigator") >>= bTemp; if( bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_START_WITH_NAVIGATOR, XML_TRUE ); bHasAttr = sal_True; } - xPresProps->getPropertyValue( OUString( "UsePen" ) ) >>= bTemp; + xPresProps->getPropertyValue("UsePen") >>= bTemp; if( bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_MOUSE_AS_PEN, XML_TRUE ); bHasAttr = sal_True; } - xPresProps->getPropertyValue( OUString( "IsTransitionOnClick" ) ) >>= bTemp; + xPresProps->getPropertyValue("IsTransitionOnClick") >>= bTemp; if( !bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_TRANSITION_ON_CLICK, XML_DISABLED ); bHasAttr = sal_True; } - xPresProps->getPropertyValue( OUString( "IsShowLogo" ) ) >>= bTemp; + xPresProps->getPropertyValue("IsShowLogo") >>= bTemp; if( bTemp ) { AddAttribute(XML_NAMESPACE_PRESENTATION, XML_SHOW_LOGO, XML_TRUE ); @@ -2576,7 +2576,7 @@ void SdXMLExport::GetViewSettings(uno::Sequence<beans::PropertyValue>& rProps) return; awt::Rectangle aVisArea; - xPropSet->getPropertyValue( OUString( "VisibleArea" ) ) >>= aVisArea; + xPropSet->getPropertyValue("VisibleArea") >>= aVisArea; sal_uInt16 i = 0; pProps[i].Name = OUString("VisibleAreaTop"); @@ -2595,7 +2595,7 @@ void SdXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>& Reference< lang::XMultiServiceFactory > xFac( GetModel(), UNO_QUERY ); if( xFac.is() ) { - Reference< beans::XPropertySet > xProps( xFac->createInstance( OUString( "com.sun.star.document.Settings" ) ), UNO_QUERY ); + Reference< beans::XPropertySet > xProps( xFac->createInstance("com.sun.star.document.Settings"), UNO_QUERY ); if( xProps.is() ) SvXMLUnitConverter::convertPropertySet( rProps, xProps ); DocumentSettingsSerializer *pFilter; @@ -2671,7 +2671,7 @@ OUString SdXMLExport::getNavigationOrder( const Reference< XDrawPage >& xDrawPag try { Reference< XPropertySet > xSet( xDrawPage, UNO_QUERY_THROW ); - Reference< XIndexAccess > xNavOrder( xSet->getPropertyValue( OUString( "NavigationOrder" ) ), UNO_QUERY_THROW ); + Reference< XIndexAccess > xNavOrder( xSet->getPropertyValue("NavigationOrder"), UNO_QUERY_THROW ); Reference< XIndexAccess > xZOrderAccess( xDrawPage, UNO_QUERY ); @@ -2934,7 +2934,7 @@ XMLFontAutoStylePool* SdXMLExport::CreateFontAutoStylePool() Reference< beans::XPropertySet > xProps( GetModel(), UNO_QUERY ); if ( xProps.is() ) { Sequence<Any> aAnySeq; - if( xProps->getPropertyValue(OUString("Fonts")) >>= aAnySeq ) + if( xProps->getPropertyValue("Fonts") >>= aAnySeq ) { if( aAnySeq.getLength() % 5 == 0 ) { diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index 3626c784c7ba..fe4d766f9b4b 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -366,7 +366,7 @@ void SAL_CALL SdXMLImport::setTargetDocument( const uno::Reference< lang::XCompo if( !xDocServices.is() ) throw lang::IllegalArgumentException(); - mbIsDraw = !xDocServices->supportsService( OUString( "com.sun.star.presentation.PresentationDocument" ) ); + mbIsDraw = !xDocServices->supportsService("com.sun.star.presentation.PresentationDocument"); // prepare access to styles uno::Reference< style::XStyleFamiliesSupplier > xFamSup( GetModel(), uno::UNO_QUERY ); @@ -876,7 +876,7 @@ void SdXMLImport::SetViewSettings(const com::sun::star::uno::Sequence<com::sun:: try { - xPropSet->setPropertyValue( OUString( "VisibleArea" ), uno::makeAny( aVisArea ) ); + xPropSet->setPropertyValue("VisibleArea", uno::makeAny( aVisArea ) ); } catch(const com::sun::star::uno::Exception&) { @@ -893,7 +893,7 @@ void SdXMLImport::SetConfigurationSettings(const com::sun::star::uno::Sequence<c if( !xFac.is() ) return; - uno::Reference< beans::XPropertySet > xProps( xFac->createInstance( OUString( "com.sun.star.document.Settings" ) ), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xProps( xFac->createInstance("com.sun.star.document.Settings"), uno::UNO_QUERY ); if( !xProps.is() ) return; @@ -1071,7 +1071,7 @@ void SdXMLImport::NotifyEmbeddedFontRead() uno::Reference< lang::XMultiServiceFactory > xFac( GetModel(), uno::UNO_QUERY ); if( xFac.is() ) { - uno::Reference< beans::XPropertySet > xProps( xFac->createInstance( OUString( "com.sun.star.document.Settings" ) ), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xProps( xFac->createInstance("com.sun.star.document.Settings"), uno::UNO_QUERY ); if( xProps.is() ) xProps->setPropertyValue("EmbedFonts", uno::makeAny( true ) ); } diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 14ec5c8c205a..d9cf37534e7e 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -144,7 +144,7 @@ uno::Reference< drawing::XShape > XMLShapeExport::checkForCustomShapeReplacement if( xSet.is() ) { OUString aEngine; - xSet->getPropertyValue( OUString( "CustomShapeEngine" ) ) >>= aEngine; + xSet->getPropertyValue("CustomShapeEngine") >>= aEngine; if ( aEngine.isEmpty() ) { aEngine = "com.sun.star.drawing.EnhancedCustomShapeEngine"; @@ -269,8 +269,8 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap if( bObjSupportsStyle ) { - if( xPropertySetInfo.is() && xPropertySetInfo->hasPropertyByName( OUString("Style")) ) - xPropSet->getPropertyValue(OUString("Style")) >>= xStyle; + if( xPropertySetInfo.is() && xPropertySetInfo->hasPropertyByName("Style") ) + xPropSet->getPropertyValue("Style") >>= xStyle; if(xStyle.is()) { @@ -282,7 +282,7 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap if(xStylePropSet.is()) { OUString aFamilyName; - xStylePropSet->getPropertyValue(OUString("Family")) >>= aFamilyName; + xStylePropSet->getPropertyValue("Family") >>= aFamilyName; if( !aFamilyName.isEmpty() && aFamilyName != "graphics" ) aShapeInfo.mnFamily = XML_STYLE_FAMILY_SD_PRESENTATION_ID; } @@ -531,7 +531,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape if( xSet.is() && (GetExport().GetModelType() == SvtModuleOptions::E_DRAW) ) try { presentation::ClickAction eAction = presentation::ClickAction_NONE; - xSet->getPropertyValue(OUString("OnClick")) >>= eAction; + xSet->getPropertyValue("OnClick") >>= eAction; if( (eAction == presentation::ClickAction_DOCUMENT) || (eAction == presentation::ClickAction_BOOKMARK) ) @@ -667,7 +667,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape { uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY ); OUString aLayerName; - xProps->getPropertyValue( OUString( "LayerName" ) ) >>= aLayerName; + xProps->getPropertyValue("LayerName") >>= aLayerName; mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_LAYER, aLayerName ); } @@ -1079,7 +1079,7 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x if(xPropSet.is()) { OUString sCLSID; - if(xPropSet->getPropertyValue(OUString("CLSID")) >>= sCLSID) + if(xPropSet->getPropertyValue("CLSID") >>= sCLSID) { if (sCLSID.equals(mrExport.GetChartExport()->getChartCLSID()) || sCLSID.equals(OUString( SvGlobalName( SO3_RPTCH_CLASSID ).GetHexName()))) @@ -1130,7 +1130,7 @@ void XMLShapeExport::ImpCalcShapeType(const uno::Reference< drawing::XShape >& x if(xPropSet.is()) try { OUString sCLSID; - if(xPropSet->getPropertyValue(OUString("CLSID")) >>= sCLSID) + if(xPropSet->getPropertyValue("CLSID") >>= sCLSID) { if( sCLSID.equals(OUString( SvGlobalName( SO3_SC_CLASSID ).GetHexName())) ) { @@ -1235,7 +1235,7 @@ void XMLShapeExport::ExportGraphicDefaults() { try { - uno::Reference< beans::XPropertySet > xDefaults( xFact->createInstance( OUString("com.sun.star.drawing.Defaults" ) ), uno::UNO_QUERY ); + 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 ); diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx index 58cb26e03d1a..a55d70b57be2 100644 --- a/xmloff/source/draw/shapeexport2.cxx +++ b/xmloff/source/draw/shapeexport2.cxx @@ -97,11 +97,11 @@ void XMLShapeExport::ImpExportNewTrans_GetB2DHomMatrix(::basegfx::B2DHomMatrix& xPropSet->getPropertySetInfo()->hasPropertyByName( OUString("TransformationInHoriL2R")) ) { - aAny = xPropSet->getPropertyValue(OUString("TransformationInHoriL2R")); + aAny = xPropSet->getPropertyValue("TransformationInHoriL2R"); } else { - aAny = xPropSet->getPropertyValue(OUString("Transformation")); + aAny = xPropSet->getPropertyValue("Transformation"); } drawing::HomogenMatrix3 aMatrix; aAny >>= aMatrix; @@ -238,17 +238,17 @@ sal_Bool XMLShapeExport::ImpExportPresentationAttributes( const uno::Reference< sal_Bool bTemp = false; // is empty pes shape? - if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(OUString("IsEmptyPresentationObject"))) + if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName("IsEmptyPresentationObject")) { - xPropSet->getPropertyValue(OUString("IsEmptyPresentationObject")) >>= bIsEmpty; + xPropSet->getPropertyValue("IsEmptyPresentationObject") >>= bIsEmpty; if( bIsEmpty ) mrExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_PLACEHOLDER, XML_TRUE); } // is user-transformed? - if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(OUString("IsPlaceholderDependent"))) + if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName("IsPlaceholderDependent")) { - xPropSet->getPropertyValue(OUString("IsPlaceholderDependent")) >>= bTemp; + xPropSet->getPropertyValue("IsPlaceholderDependent") >>= bTemp; if(!bTemp) mrExport.AddAttribute(XML_NAMESPACE_PRESENTATION, XML_USER_TRANSFORMED, XML_TRUE); } @@ -558,8 +558,8 @@ void XMLShapeExport::ImpExportDescription( const uno::Reference< drawing::XShape OUString aDescription; uno::Reference< beans::XPropertySet > xProps( xShape, uno::UNO_QUERY_THROW ); - xProps->getPropertyValue( OUString( "Title" ) ) >>= aTitle; - xProps->getPropertyValue( OUString( "Description" ) ) >>= aDescription; + xProps->getPropertyValue("Title") >>= aTitle; + xProps->getPropertyValue("Description") >>= aDescription; if(!aTitle.isEmpty()) { @@ -694,7 +694,7 @@ void XMLShapeExport::ImpExportTextBoxShape( // evtl. corner radius? sal_Int32 nCornerRadius(0L); - xPropSet->getPropertyValue(OUString("CornerRadius")) >>= nCornerRadius; + xPropSet->getPropertyValue("CornerRadius") >>= nCornerRadius; if(nCornerRadius) { OUStringBuffer sStringBuffer; @@ -730,7 +730,7 @@ void XMLShapeExport::ImpExportRectangleShape( // evtl. corner radius? sal_Int32 nCornerRadius(0L); - xPropSet->getPropertyValue(OUString("CornerRadius")) >>= nCornerRadius; + xPropSet->getPropertyValue("CornerRadius") >>= nCornerRadius; if(nCornerRadius) { OUStringBuffer sStringBuffer; @@ -782,7 +782,7 @@ void XMLShapeExport::ImpExportLineShape( awt::Point aBasePosition(FRound(aTRTranslate.getX()), FRound(aTRTranslate.getY())); // get the two points - uno::Any aAny(xPropSet->getPropertyValue(OUString("Geometry"))); + uno::Any aAny(xPropSet->getPropertyValue("Geometry")); drawing::PointSequenceSequence* pSourcePolyPolygon = (drawing::PointSequenceSequence*)aAny.getValue(); if(pSourcePolyPolygon) @@ -883,14 +883,14 @@ void XMLShapeExport::ImpExportEllipseShape( ImpExportNewTrans(xPropSet, nFeatures, pRefPoint); drawing::CircleKind eKind = drawing::CircleKind_FULL; - xPropSet->getPropertyValue( OUString("CircleKind") ) >>= eKind; + xPropSet->getPropertyValue("CircleKind") >>= eKind; if( eKind != drawing::CircleKind_FULL ) { OUStringBuffer sStringBuffer; sal_Int32 nStartAngle = 0; sal_Int32 nEndAngle = 0; - xPropSet->getPropertyValue( OUString("CircleStartAngle") ) >>= nStartAngle; - xPropSet->getPropertyValue( OUString("CircleEndAngle") ) >>= nEndAngle; + xPropSet->getPropertyValue("CircleStartAngle") >>= nStartAngle; + xPropSet->getPropertyValue("CircleEndAngle") >>= nEndAngle; const double dStartAngle = nStartAngle / 100.0; const double dEndAngle = nEndAngle / 100.0; @@ -972,7 +972,7 @@ void XMLShapeExport::ImpExportPolygonShape( if(bBezier) { // get PolygonBezier - uno::Any aAny( xPropSet->getPropertyValue(OUString("Geometry")) ); + uno::Any aAny( xPropSet->getPropertyValue("Geometry") ); drawing::PolyPolygonBezierCoords* pSourcePolyPolygon = (drawing::PolyPolygonBezierCoords*)aAny.getValue(); @@ -1015,7 +1015,7 @@ void XMLShapeExport::ImpExportPolygonShape( else { // get non-bezier polygon - uno::Any aAny( xPropSet->getPropertyValue(OUString("Geometry")) ); + uno::Any aAny( xPropSet->getPropertyValue("Geometry") ); drawing::PointSequenceSequence* pSourcePolyPolygon = (drawing::PointSequenceSequence*)aAny.getValue(); if(pSourcePolyPolygon && pSourcePolyPolygon->getLength()) @@ -1112,7 +1112,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape( if( !bIsEmptyPresObj ) { OUString aReplacementUrl; - xPropSet->getPropertyValue( OUString("ReplacementGraphicURL")) >>= aReplacementUrl; + xPropSet->getPropertyValue("ReplacementGraphicURL") >>= aReplacementUrl; // If there is no url, then then graphic is empty if(!aReplacementUrl.isEmpty()) @@ -1137,8 +1137,8 @@ void XMLShapeExport::ImpExportGraphicObjectShape( OUString aStreamURL; OUString aStr; - xPropSet->getPropertyValue( OUString("GraphicStreamURL")) >>= aStreamURL; - xPropSet->getPropertyValue( OUString("GraphicURL")) >>= sImageURL; + xPropSet->getPropertyValue("GraphicStreamURL") >>= aStreamURL; + xPropSet->getPropertyValue("GraphicURL") >>= sImageURL; OUString aResolveURL( sImageURL ); const OUString sPackageURL( "vnd.sun.star.Package:" ); @@ -1174,7 +1174,7 @@ void XMLShapeExport::ImpExportGraphicObjectShape( // update stream URL for load on demand uno::Any aAny; aAny <<= aStreamURL; - xPropSet->setPropertyValue( OUString("GraphicStreamURL"), aAny ); + xPropSet->setPropertyValue("GraphicStreamURL", aAny ); mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); mrExport.AddAttribute(XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED ); @@ -1266,7 +1266,7 @@ void XMLShapeExport::ImpExportConnectorShape( // export connection kind drawing::ConnectorType eType = drawing::ConnectorType_STANDARD; - uno::Any aAny = xProps->getPropertyValue(OUString("EdgeKind")); + uno::Any aAny = xProps->getPropertyValue("EdgeKind"); aAny >>= eType; if( eType != drawing::ConnectorType_STANDARD ) @@ -1279,11 +1279,11 @@ void XMLShapeExport::ImpExportConnectorShape( // export line skew sal_Int32 nDelta1 = 0, nDelta2 = 0, nDelta3 = 0; - aAny = xProps->getPropertyValue(OUString("EdgeLine1Delta")); + aAny = xProps->getPropertyValue("EdgeLine1Delta"); aAny >>= nDelta1; - aAny = xProps->getPropertyValue(OUString("EdgeLine2Delta")); + aAny = xProps->getPropertyValue("EdgeLine2Delta"); aAny >>= nDelta2; - aAny = xProps->getPropertyValue(OUString("EdgeLine3Delta")); + aAny = xProps->getPropertyValue("EdgeLine3Delta"); aAny >>= nDelta3; if( nDelta1 != 0 || nDelta2 != 0 || nDelta3 != 0 ) @@ -1330,13 +1330,13 @@ void XMLShapeExport::ImpExportConnectorShape( xProps->getPropertySetInfo()->hasPropertyByName( OUString("EndPositionInHoriL2R")) ) { - xProps->getPropertyValue(OUString("StartPositionInHoriL2R")) >>= aStart; - xProps->getPropertyValue(OUString("EndPositionInHoriL2R")) >>= aEnd; + xProps->getPropertyValue("StartPositionInHoriL2R") >>= aStart; + xProps->getPropertyValue("EndPositionInHoriL2R") >>= aEnd; } else { - xProps->getPropertyValue(OUString("StartPosition")) >>= aStart; - xProps->getPropertyValue(OUString("EndPosition")) >>= aEnd; + xProps->getPropertyValue("StartPosition") >>= aStart; + xProps->getPropertyValue("EndPosition") >>= aEnd; } if( pRefPoint ) @@ -1388,13 +1388,13 @@ void XMLShapeExport::ImpExportConnectorShape( uno::Reference< uno::XInterface > xRefE; // export start connection - xProps->getPropertyValue(OUString("StartShape" ) ) >>= xRefS; + xProps->getPropertyValue("StartShape") >>= xRefS; if( xRefS.is() ) { const OUString& rShapeId = mrExport.getInterfaceToIdentifierMapper().getIdentifier( xRefS ); mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_START_SHAPE, rShapeId); - aAny = xProps->getPropertyValue(OUString("StartGluePointIndex") ); + aAny = xProps->getPropertyValue("StartGluePointIndex"); sal_Int32 nGluePointId = 0; if( aAny >>= nGluePointId ) { @@ -1406,13 +1406,13 @@ void XMLShapeExport::ImpExportConnectorShape( } // export end connection - xProps->getPropertyValue(OUString("EndShape") ) >>= xRefE; + xProps->getPropertyValue("EndShape") >>= xRefE; if( xRefE.is() ) { const OUString& rShapeId = mrExport.getInterfaceToIdentifierMapper().getIdentifier( xRefE ); mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_END_SHAPE, rShapeId); - aAny = xProps->getPropertyValue(OUString("EndGluePointIndex") ); + aAny = xProps->getPropertyValue("EndGluePointIndex"); sal_Int32 nGluePointId = 0; if( aAny >>= nGluePointId ) { @@ -1423,7 +1423,7 @@ void XMLShapeExport::ImpExportConnectorShape( } } - if( xProps->getPropertyValue( OUString( "PolyPolygonBezier" ) ) >>= aAny ) + if( xProps->getPropertyValue("PolyPolygonBezier") >>= aAny ) { // get PolygonBezier drawing::PolyPolygonBezierCoords* pSourcePolyPolygon = @@ -1522,13 +1522,13 @@ void XMLShapeExport::ImpExportMeasureShape( xProps->getPropertySetInfo()->hasPropertyByName( OUString("EndPositionInHoriL2R")) ) { - xProps->getPropertyValue(OUString("StartPositionInHoriL2R")) >>= aStart; - xProps->getPropertyValue(OUString("EndPositionInHoriL2R")) >>= aEnd; + xProps->getPropertyValue("StartPositionInHoriL2R") >>= aStart; + xProps->getPropertyValue("EndPositionInHoriL2R") >>= aEnd; } else { - xProps->getPropertyValue(OUString("StartPosition")) >>= aStart; - xProps->getPropertyValue(OUString("EndPosition")) >>= aEnd; + xProps->getPropertyValue("StartPosition") >>= aStart; + xProps->getPropertyValue("EndPosition") >>= aEnd; } if( pRefPoint ) @@ -1632,7 +1632,7 @@ void XMLShapeExport::ImpExportOLE2Shape( OUString sClassId; OUString sURL; sal_Bool bInternal = false; - xPropSet->getPropertyValue(OUString("IsInternal")) >>= bInternal; + xPropSet->getPropertyValue("IsInternal") >>= bInternal; if( !bIsEmptyPresObj ) { @@ -1641,10 +1641,10 @@ void XMLShapeExport::ImpExportOLE2Shape( { // OOo internal links have no storage persistance, URL is stored in the XML file // the result LinkURL is empty in case the object is not a link - xPropSet->getPropertyValue( OUString( "LinkURL" ) ) >>= sURL; + xPropSet->getPropertyValue("LinkURL") >>= sURL; } - xPropSet->getPropertyValue( OUString( "PersistName" ) ) >>= sPersistName; + xPropSet->getPropertyValue("PersistName") >>= sPersistName; if ( sURL.isEmpty() ) { if( !sPersistName.isEmpty() ) @@ -1655,7 +1655,7 @@ void XMLShapeExport::ImpExportOLE2Shape( } if( !bInternal ) - xPropSet->getPropertyValue(OUString("CLSID")) >>= sClassId; + xPropSet->getPropertyValue("CLSID") >>= sClassId; if( !sClassId.isEmpty() ) mrExport.AddAttribute(XML_NAMESPACE_DRAW, XML_CLASS_ID, sClassId ); @@ -1705,7 +1705,7 @@ void XMLShapeExport::ImpExportOLE2Shape( { // embedded XML uno::Reference< lang::XComponent > xComp; - xPropSet->getPropertyValue( OUString("Model" ) ) >>= xComp; + xPropSet->getPropertyValue("Model") >>= xComp; DBG_ASSERT( xComp.is(), "no xModel for own OLE format" ); mrExport.ExportEmbeddedOwnObject( xComp ); } @@ -1800,7 +1800,7 @@ void XMLShapeExport::ImpExportCaptionShape( // evtl. corner radius? sal_Int32 nCornerRadius(0L); - xPropSet->getPropertyValue(OUString("CornerRadius")) >>= nCornerRadius; + xPropSet->getPropertyValue("CornerRadius") >>= nCornerRadius; if(nCornerRadius) { OUStringBuffer sStringBuffer; @@ -1810,7 +1810,7 @@ void XMLShapeExport::ImpExportCaptionShape( } awt::Point aCaptionPoint; - xPropSet->getPropertyValue( OUString( "CaptionPoint" ) ) >>= aCaptionPoint; + xPropSet->getPropertyValue("CaptionPoint") >>= aCaptionPoint; mrExport.GetMM100UnitConverter().convertMeasureToXML(msBuffer, aCaptionPoint.X); @@ -1856,14 +1856,14 @@ void XMLShapeExport::ImpExportFrameShape( // export frame url OUString aStr; - xPropSet->getPropertyValue( OUString( "FrameURL" ) ) >>= aStr; + xPropSet->getPropertyValue("FrameURL") >>= aStr; mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(aStr) ); mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED ); mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD ); // export name - xPropSet->getPropertyValue( OUString( "FrameName" ) ) >>= aStr; + xPropSet->getPropertyValue("FrameName") >>= aStr; if( !aStr.isEmpty() ) mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_FRAME_NAME, aStr ); @@ -1892,24 +1892,24 @@ void XMLShapeExport::ImpExportAppletShape( // export frame url OUString aStr; - xPropSet->getPropertyValue( OUString( "AppletCodeBase" ) ) >>= aStr; + xPropSet->getPropertyValue("AppletCodeBase") >>= aStr; mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(aStr) ); mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED ); mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD ); // export draw:applet-name - xPropSet->getPropertyValue( OUString( "AppletName" ) ) >>= aStr; + xPropSet->getPropertyValue("AppletName") >>= aStr; if( !aStr.isEmpty() ) mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_APPLET_NAME, aStr ); // export draw:code - xPropSet->getPropertyValue( OUString( "AppletCode" ) ) >>= aStr; + xPropSet->getPropertyValue("AppletCode") >>= aStr; mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_CODE, aStr ); // export draw:may-script sal_Bool bIsScript = false; - xPropSet->getPropertyValue( OUString( "AppletIsScript" ) ) >>= bIsScript; + xPropSet->getPropertyValue("AppletIsScript") >>= bIsScript; mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MAY_SCRIPT, bIsScript ? XML_TRUE : XML_FALSE ); { @@ -1918,7 +1918,7 @@ void XMLShapeExport::ImpExportAppletShape( // export parameters uno::Sequence< beans::PropertyValue > aCommands; - xPropSet->getPropertyValue( OUString( "AppletCommands" ) ) >>= aCommands; + xPropSet->getPropertyValue("AppletCommands") >>= aCommands; const sal_Int32 nCount = aCommands.getLength(); for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ ) { @@ -1949,7 +1949,7 @@ void XMLShapeExport::ImpExportPluginShape( // export plugin url OUString aStr; - xPropSet->getPropertyValue( OUString( "PluginURL" ) ) >>= aStr; + xPropSet->getPropertyValue("PluginURL") >>= aStr; mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_HREF, GetExport().GetRelativeReference(aStr) ); mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED ); @@ -1957,7 +1957,7 @@ void XMLShapeExport::ImpExportPluginShape( // export mime-type - xPropSet->getPropertyValue( OUString( "PluginMimeType" ) ) >>= aStr; + xPropSet->getPropertyValue("PluginMimeType") >>= aStr; if(!aStr.isEmpty()) mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_MIME_TYPE, aStr ); @@ -1967,7 +1967,7 @@ void XMLShapeExport::ImpExportPluginShape( // export parameters uno::Sequence< beans::PropertyValue > aCommands; - xPropSet->getPropertyValue( OUString( "PluginCommands" ) ) >>= aCommands; + xPropSet->getPropertyValue("PluginCommands") >>= aCommands; const sal_Int32 nCount = aCommands.getLength(); for( sal_Int32 nIndex = 0; nIndex < nCount; nIndex++ ) { @@ -2082,7 +2082,7 @@ void XMLShapeExport::ImpExportMediaShape( // export media url OUString aMediaURL; - xPropSet->getPropertyValue( OUString( "MediaURL" ) ) >>= aMediaURL; + xPropSet->getPropertyValue("MediaURL") >>= aMediaURL; OUString const persistentURL = lcl_StoreMediaAndGetURL(GetExport(), xPropSet, aMediaURL); mrExport.AddAttribute ( XML_NAMESPACE_XLINK, XML_HREF, persistentURL ); @@ -2115,7 +2115,7 @@ void XMLShapeExport::ImpExportMediaShape( sal_Int16 nVolumeDB = 0; const OUString aVolumeDBStr( "VolumeDB" ); - xPropSet->getPropertyValue( OUString( "VolumeDB" ) ) >>= nVolumeDB; + xPropSet->getPropertyValue("VolumeDB") >>= nVolumeDB; mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, aVolumeDBStr ); mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_VALUE, OUString::number( nVolumeDB ) ); delete( new SvXMLElementExport( mrExport, XML_NAMESPACE_DRAW, XML_PARAM, sal_False, sal_True ) ); @@ -2123,7 +2123,7 @@ void XMLShapeExport::ImpExportMediaShape( media::ZoomLevel eZoom; const OUString aZoomStr( "Zoom" ); OUString aZoomValue; - xPropSet->getPropertyValue( OUString( "Zoom" ) ) >>= eZoom; + xPropSet->getPropertyValue("Zoom") >>= eZoom; switch( eZoom ) { case( media::ZoomLevel_ZOOM_1_TO_4 ): aZoomValue = OUString( "25%" ); break; diff --git a/xmloff/source/draw/shapeexport3.cxx b/xmloff/source/draw/shapeexport3.cxx index 2cd8574b8754..8d020ef6e4e7 100644 --- a/xmloff/source/draw/shapeexport3.cxx +++ b/xmloff/source/draw/shapeexport3.cxx @@ -104,7 +104,7 @@ void XMLShapeExport::ImpExport3DShape( OUStringBuffer sStringBuffer; // transformation (UNO_NAME_3D_TRANSFORM_MATRIX == "D3DTransformMatrix") - uno::Any aAny = xPropSet->getPropertyValue(OUString("D3DTransformMatrix")); + uno::Any aAny = xPropSet->getPropertyValue("D3DTransformMatrix"); drawing::HomogenMatrix xHomMat; aAny >>= xHomMat; SdXMLImExTransform3D aTransform; @@ -120,13 +120,13 @@ void XMLShapeExport::ImpExport3DShape( SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_CUBE, sal_True, sal_True); // minEdge - aAny = xPropSet->getPropertyValue(OUString("D3DPosition")); + aAny = xPropSet->getPropertyValue("D3DPosition"); drawing::Position3D aPosition3D; aAny >>= aPosition3D; ::basegfx::B3DVector aPos3D(aPosition3D.PositionX, aPosition3D.PositionY, aPosition3D.PositionZ); // maxEdge - aAny = xPropSet->getPropertyValue(OUString("D3DSize")); + aAny = xPropSet->getPropertyValue("D3DSize"); drawing::Direction3D aDirection3D; aAny >>= aDirection3D; ::basegfx::B3DVector aDir3D(aDirection3D.DirectionX, aDirection3D.DirectionY, aDirection3D.DirectionZ); @@ -158,13 +158,13 @@ void XMLShapeExport::ImpExport3DShape( SvXMLElementExport aOBJ(mrExport, XML_NAMESPACE_DR3D, XML_SPHERE, sal_True, sal_True); // Center - aAny = xPropSet->getPropertyValue(OUString("D3DPosition")); + aAny = xPropSet->getPropertyValue("D3DPosition"); drawing::Position3D aPosition3D; aAny >>= aPosition3D; ::basegfx::B3DVector aPos3D(aPosition3D.PositionX, aPosition3D.PositionY, aPosition3D.PositionZ); // Size - aAny = xPropSet->getPropertyValue(OUString("D3DSize")); + aAny = xPropSet->getPropertyValue("D3DSize"); drawing::Direction3D aDirection3D; aAny >>= aDirection3D; ::basegfx::B3DVector aDir3D(aDirection3D.DirectionX, aDirection3D.DirectionY, aDirection3D.DirectionZ); @@ -191,7 +191,7 @@ void XMLShapeExport::ImpExport3DShape( case XmlShapeTypeDraw3DExtrudeObject: { // write special 3DLathe/3DExtrude attributes - aAny = xPropSet->getPropertyValue(OUString("D3DPolyPolygon3D")); + aAny = xPropSet->getPropertyValue("D3DPolyPolygon3D"); drawing::PolyPolygonShape3D xPolyPolygon3D; aAny >>= xPolyPolygon3D; @@ -316,7 +316,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen OUStringBuffer sStringBuffer; // world transformation (UNO_NAME_3D_TRANSFORM_MATRIX == "D3DTransformMatrix") - uno::Any aAny = xPropSet->getPropertyValue(OUString("D3DTransformMatrix")); + uno::Any aAny = xPropSet->getPropertyValue("D3DTransformMatrix"); drawing::HomogenMatrix xHomMat; aAny >>= xHomMat; SdXMLImExTransform3D aTransform; @@ -325,7 +325,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_TRANSFORM, aTransform.GetExportString(mrExport.GetMM100UnitConverter())); // VRP, VPN, VUP - aAny = xPropSet->getPropertyValue(OUString("D3DCameraGeometry")); + aAny = xPropSet->getPropertyValue("D3DCameraGeometry"); drawing::CameraGeometry aCamGeo; aAny >>= aCamGeo; @@ -354,7 +354,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen } // projection "D3DScenePerspective" drawing::ProjectionMode - aAny = xPropSet->getPropertyValue(OUString("D3DScenePerspective")); + aAny = xPropSet->getPropertyValue("D3DScenePerspective"); drawing::ProjectionMode xPrjMode; aAny >>= xPrjMode; if(xPrjMode == drawing::ProjectionMode_PARALLEL) @@ -364,7 +364,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_PROJECTION, aStr); // distance - aAny = xPropSet->getPropertyValue(OUString("D3DSceneDistance")); + aAny = xPropSet->getPropertyValue("D3DSceneDistance"); sal_Int32 nDistance = 0; aAny >>= nDistance; mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer, @@ -373,7 +373,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_DISTANCE, aStr); // focalLength - aAny = xPropSet->getPropertyValue(OUString("D3DSceneFocalLength")); + aAny = xPropSet->getPropertyValue("D3DSceneFocalLength"); sal_Int32 nFocalLength = 0; aAny >>= nFocalLength; mrExport.GetMM100UnitConverter().convertMeasureToXML(sStringBuffer, @@ -382,7 +382,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_FOCAL_LENGTH, aStr); // shadowSlant - aAny = xPropSet->getPropertyValue(OUString("D3DSceneShadowSlant")); + aAny = xPropSet->getPropertyValue("D3DSceneShadowSlant"); sal_Int16 nShadowSlant = 0; aAny >>= nShadowSlant; ::sax::Converter::convertNumber(sStringBuffer, (sal_Int32)nShadowSlant); @@ -390,7 +390,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_SHADOW_SLANT, aStr); // shadeMode - aAny = xPropSet->getPropertyValue(OUString("D3DSceneShadeMode")); + aAny = xPropSet->getPropertyValue("D3DSceneShadeMode"); drawing::ShadeMode xShadeMode; if(aAny >>= xShadeMode) { @@ -411,7 +411,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_SHADE_MODE, aStr); // ambientColor - aAny = xPropSet->getPropertyValue(OUString("D3DSceneAmbientColor")); + aAny = xPropSet->getPropertyValue("D3DSceneAmbientColor"); sal_Int32 nAmbientColor = 0; aAny >>= nAmbientColor; ::sax::Converter::convertColor(sStringBuffer, nAmbientColor); @@ -419,7 +419,7 @@ void XMLShapeExport::export3DSceneAttributes( const com::sun::star::uno::Referen mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_AMBIENT_COLOR, aStr); // lightingMode - aAny = xPropSet->getPropertyValue(OUString("D3DSceneTwoSidedLighting")); + aAny = xPropSet->getPropertyValue("D3DSceneTwoSidedLighting"); sal_Bool bTwoSidedLighting = false; aAny >>= bTwoSidedLighting; ::sax::Converter::convertBool(sStringBuffer, bTwoSidedLighting); diff --git a/xmloff/source/draw/shapeexport4.cxx b/xmloff/source/draw/shapeexport4.cxx index b83f73e810c4..6d8b74371108 100644 --- a/xmloff/source/draw/shapeexport4.cxx +++ b/xmloff/source/draw/shapeexport4.cxx @@ -1196,7 +1196,7 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape { if( !bIsEmptyPresObj ) { - uno::Reference< container::XNamed > xTemplate( xPropSet->getPropertyValue( OUString( "TableTemplate" ) ), uno::UNO_QUERY ); + uno::Reference< container::XNamed > xTemplate( xPropSet->getPropertyValue("TableTemplate"), uno::UNO_QUERY ); if( xTemplate.is() ) { const OUString sTemplate( xTemplate->getName() ); @@ -1231,7 +1231,7 @@ void XMLShapeExport::ImpExportTableShape( const uno::Reference< drawing::XShape if( !bIsEmptyPresObj ) { - uno::Reference< graphic::XGraphic > xGraphic( xPropSet->getPropertyValue( OUString( "ReplacementGraphic" ) ), uno::UNO_QUERY ); + uno::Reference< graphic::XGraphic > xGraphic( xPropSet->getPropertyValue("ReplacementGraphic"), uno::UNO_QUERY ); if( xGraphic.is() ) try { Reference< uno::XComponentContext > xContext = GetExport().getComponentContext(); diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index da119f19dd6c..78f29da0603c 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -95,7 +95,7 @@ void SdXML3DObjectContext::StartElement(const uno::Reference< xml::sax::XAttribu { uno::Any aAny; aAny <<= mxHomMat; - xPropSet->setPropertyValue(OUString("D3DTransformMatrix"), aAny); + xPropSet->setPropertyValue("D3DTransformMatrix", aAny); } // call parent @@ -207,9 +207,9 @@ void SdXML3DCubeObjectShapeContext::StartElement(const uno::Reference< xml::sax: uno::Any aAny; aAny <<= aPosition3D; - xPropSet->setPropertyValue(OUString("D3DPosition"), aAny); + xPropSet->setPropertyValue("D3DPosition", aAny); aAny <<= aDirection3D; - xPropSet->setPropertyValue(OUString("D3DSize"), aAny); + xPropSet->setPropertyValue("D3DSize", aAny); } } } @@ -315,9 +315,9 @@ void SdXML3DSphereObjectShapeContext::StartElement(const uno::Reference< xml::sa uno::Any aAny; aAny <<= aPosition3D; - xPropSet->setPropertyValue(OUString("D3DPosition"), aAny); + xPropSet->setPropertyValue("D3DPosition", aAny); aAny <<= aDirection3D; - xPropSet->setPropertyValue(OUString("D3DSize"), aAny); + xPropSet->setPropertyValue("D3DSize", aAny); } } } @@ -433,7 +433,7 @@ void SdXML3DPolygonBasedShapeContext::StartElement(const uno::Reference< xml::sa // set poly uno::Any aAny; aAny <<= xPolyPolygon3D; - xPropSet->setPropertyValue(OUString("D3DPolyPolygon3D"), aAny); + xPropSet->setPropertyValue("D3DPolyPolygon3D", aAny); } // call parent diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx index 6eac43a8cc4e..563b21640cd9 100644 --- a/xmloff/source/draw/ximp3dscene.cxx +++ b/xmloff/source/draw/ximp3dscene.cxx @@ -362,32 +362,32 @@ void SdXML3DSceneAttributesHelper::setSceneAttributes( const com::sun::star::uno if(mbSetTransform) { aAny <<= mxHomMat; - xPropSet->setPropertyValue(OUString("D3DTransformMatrix"), aAny); + xPropSet->setPropertyValue("D3DTransformMatrix", aAny); } // distance aAny <<= mnDistance; - xPropSet->setPropertyValue(OUString("D3DSceneDistance"), aAny); + xPropSet->setPropertyValue("D3DSceneDistance", aAny); // focalLength aAny <<= mnFocalLength; - xPropSet->setPropertyValue(OUString("D3DSceneFocalLength"), aAny); + xPropSet->setPropertyValue("D3DSceneFocalLength", aAny); // shadowSlant aAny <<= (sal_Int16)mnShadowSlant; - xPropSet->setPropertyValue(OUString("D3DSceneShadowSlant"), aAny); + xPropSet->setPropertyValue("D3DSceneShadowSlant", aAny); // shadeMode aAny <<= mxShadeMode; - xPropSet->setPropertyValue(OUString("D3DSceneShadeMode"), aAny); + xPropSet->setPropertyValue("D3DSceneShadeMode", aAny); // ambientColor aAny <<= maAmbientColor; - xPropSet->setPropertyValue(OUString("D3DSceneAmbientColor"), aAny); + xPropSet->setPropertyValue("D3DSceneAmbientColor", aAny); // lightingMode aAny <<= mbLightingMode; - xPropSet->setPropertyValue(OUString("D3DSceneTwoSidedLighting"), aAny); + xPropSet->setPropertyValue("D3DSceneTwoSidedLighting", aAny); if( !maList.empty() ) { @@ -412,58 +412,58 @@ void SdXML3DSceneAttributesHelper::setSceneAttributes( const com::sun::star::uno { case 0: { - xPropSet->setPropertyValue(OUString("D3DSceneLightColor1"), aAny); - xPropSet->setPropertyValue(OUString("D3DSceneLightDirection1"), aAny2); - xPropSet->setPropertyValue(OUString("D3DSceneLightOn1"), aAny3); + xPropSet->setPropertyValue("D3DSceneLightColor1", aAny); + xPropSet->setPropertyValue("D3DSceneLightDirection1", aAny2); + xPropSet->setPropertyValue("D3DSceneLightOn1", aAny3); break; } case 1: { - xPropSet->setPropertyValue(OUString("D3DSceneLightColor2"), aAny); - xPropSet->setPropertyValue(OUString("D3DSceneLightDirection2"), aAny2); - xPropSet->setPropertyValue(OUString("D3DSceneLightOn2"), aAny3); + xPropSet->setPropertyValue("D3DSceneLightColor2", aAny); + xPropSet->setPropertyValue("D3DSceneLightDirection2", aAny2); + xPropSet->setPropertyValue("D3DSceneLightOn2", aAny3); break; } case 2: { - xPropSet->setPropertyValue(OUString("D3DSceneLightColor3"), aAny); - xPropSet->setPropertyValue(OUString("D3DSceneLightDirection3"), aAny2); - xPropSet->setPropertyValue(OUString("D3DSceneLightOn3"), aAny3); + xPropSet->setPropertyValue("D3DSceneLightColor3", aAny); + xPropSet->setPropertyValue("D3DSceneLightDirection3", aAny2); + xPropSet->setPropertyValue("D3DSceneLightOn3", aAny3); break; } case 3: { - xPropSet->setPropertyValue(OUString("D3DSceneLightColor4"), aAny); - xPropSet->setPropertyValue(OUString("D3DSceneLightDirection4"), aAny2); - xPropSet->setPropertyValue(OUString("D3DSceneLightOn4"), aAny3); + xPropSet->setPropertyValue("D3DSceneLightColor4", aAny); + xPropSet->setPropertyValue("D3DSceneLightDirection4", aAny2); + xPropSet->setPropertyValue("D3DSceneLightOn4", aAny3); break; } case 4: { - xPropSet->setPropertyValue(OUString("D3DSceneLightColor5"), aAny); - xPropSet->setPropertyValue(OUString("D3DSceneLightDirection5"), aAny2); - xPropSet->setPropertyValue(OUString("D3DSceneLightOn5"), aAny3); + xPropSet->setPropertyValue("D3DSceneLightColor5", aAny); + xPropSet->setPropertyValue("D3DSceneLightDirection5", aAny2); + xPropSet->setPropertyValue("D3DSceneLightOn5", aAny3); break; } case 5: { - xPropSet->setPropertyValue(OUString("D3DSceneLightColor6"), aAny); - xPropSet->setPropertyValue(OUString("D3DSceneLightDirection6"), aAny2); - xPropSet->setPropertyValue(OUString("D3DSceneLightOn6"), aAny3); + xPropSet->setPropertyValue("D3DSceneLightColor6", aAny); + xPropSet->setPropertyValue("D3DSceneLightDirection6", aAny2); + xPropSet->setPropertyValue("D3DSceneLightOn6", aAny3); break; } case 6: { - xPropSet->setPropertyValue(OUString("D3DSceneLightColor7"), aAny); - xPropSet->setPropertyValue(OUString("D3DSceneLightDirection7"), aAny2); - xPropSet->setPropertyValue(OUString("D3DSceneLightOn7"), aAny3); + xPropSet->setPropertyValue("D3DSceneLightColor7", aAny); + xPropSet->setPropertyValue("D3DSceneLightDirection7", aAny2); + xPropSet->setPropertyValue("D3DSceneLightOn7", aAny3); break; } case 7: { - xPropSet->setPropertyValue(OUString("D3DSceneLightColor8"), aAny); - xPropSet->setPropertyValue(OUString("D3DSceneLightDirection8"), aAny2); - xPropSet->setPropertyValue(OUString("D3DSceneLightOn8"), aAny3); + xPropSet->setPropertyValue("D3DSceneLightColor8", aAny); + xPropSet->setPropertyValue("D3DSceneLightDirection8", aAny2); + xPropSet->setPropertyValue("D3DSceneLightOn8", aAny3); break; } } @@ -482,12 +482,12 @@ void SdXML3DSceneAttributesHelper::setSceneAttributes( const com::sun::star::uno aCamGeo.vup.DirectionY = maVUP.getY(); aCamGeo.vup.DirectionZ = maVUP.getZ(); aAny <<= aCamGeo; - xPropSet->setPropertyValue(OUString("D3DCameraGeometry"), aAny); + xPropSet->setPropertyValue("D3DCameraGeometry", aAny); // #91047# set drawing::ProjectionMode AFTER camera geometry is set // projection "D3DScenePerspective" drawing::ProjectionMode aAny <<= mxPrjMode; - xPropSet->setPropertyValue(OUString("D3DScenePerspective"), aAny); + xPropSet->setPropertyValue("D3DScenePerspective", aAny); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx index 4f0ac3300fe9..434d0d5d0bfc 100644 --- a/xmloff/source/draw/ximpbody.cxx +++ b/xmloff/source/draw/ximpbody.cxx @@ -200,7 +200,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport, maHREF += aBookmarkName; } - xProps->setPropertyValue( OUString( "BookmarkURL" ), uno::makeAny( maHREF ) ); + xProps->setPropertyValue("BookmarkURL", uno::makeAny( maHREF ) ); } } diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index 3a9c5ab0db0d..3c42b2d0a48a 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -321,7 +321,7 @@ void SdXMLGenericPageContext::EndElement() OUString aDateTimeFormat; const OUString aText( GetSdImport().GetDateTimeDecl( maUseDateTimeDeclName, bFixed, aDateTimeFormat ) ); - xSet->setPropertyValue( OUString( "IsDateTimeFixed" ), + xSet->setPropertyValue("IsDateTimeFixed", makeAny( bFixed ) ); if( bFixed ) @@ -341,7 +341,7 @@ void SdXMLGenericPageContext::EndElement() if( pSdNumStyle ) { - xSet->setPropertyValue( OUString( "DateTimeFormat" ), + xSet->setPropertyValue("DateTimeFormat", makeAny( pSdNumStyle->GetDrawKey() ) ); } } @@ -518,25 +518,25 @@ void SdXMLGenericPageContext::SetPageMaster( OUString& rsPageMasterName ) uno::Any aAny; aAny <<= pPageMasterContext->GetBorderBottom(); - xPropSet->setPropertyValue(OUString("BorderBottom"), aAny); + xPropSet->setPropertyValue("BorderBottom", aAny); aAny <<= pPageMasterContext->GetBorderLeft(); - xPropSet->setPropertyValue(OUString("BorderLeft"), aAny); + xPropSet->setPropertyValue("BorderLeft", aAny); aAny <<= pPageMasterContext->GetBorderRight(); - xPropSet->setPropertyValue(OUString("BorderRight"), aAny); + xPropSet->setPropertyValue("BorderRight", aAny); aAny <<= pPageMasterContext->GetBorderTop(); - xPropSet->setPropertyValue(OUString("BorderTop"), aAny); + xPropSet->setPropertyValue("BorderTop", aAny); aAny <<= pPageMasterContext->GetWidth(); - xPropSet->setPropertyValue(OUString("Width"), aAny); + xPropSet->setPropertyValue("Width", aAny); aAny <<= pPageMasterContext->GetHeight(); - xPropSet->setPropertyValue(OUString("Height"), aAny); + xPropSet->setPropertyValue("Height", aAny); aAny <<= pPageMasterContext->GetOrientation(); - xPropSet->setPropertyValue(OUString("Orientation"), aAny); + xPropSet->setPropertyValue("Orientation", aAny); } } } @@ -622,7 +622,7 @@ void SdXMLGenericPageContext::SetNavigationOrder() } Reference< XPropertySet > xSet( mxShapes, UNO_QUERY_THROW ); - xSet->setPropertyValue( OUString( "NavigationOrder" ), Any( Reference< XIndexAccess >( new XoNavigationOrderAccess( aShapes ) ) ) ); + xSet->setPropertyValue("NavigationOrder", Any( Reference< XIndexAccess >( new XoNavigationOrderAccess( aShapes ) ) ) ); } catch(const uno::Exception&) { diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 54eb00bf55c6..4909075f490c 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -403,7 +403,7 @@ void SdXMLShapeContext::EndElement() // in draw use the Bookmark property Reference< beans::XPropertySet > xSet( mxShape, UNO_QUERY_THROW ); xSet->setPropertyValue( sBookmark, Any( msHyperlink ) ); - xSet->setPropertyValue( OUString( "OnClick" ), Any( ::com::sun::star::presentation::ClickAction_DOCUMENT ) ); + xSet->setPropertyValue("OnClick", Any( ::com::sun::star::presentation::ClickAction_DOCUMENT ) ); } } catch(const Exception&) @@ -445,10 +445,10 @@ void SdXMLShapeContext::AddShape(uno::Reference< drawing::XShape >& xShape) { uno::Reference< beans::XPropertySet > xSet( xShape, uno::UNO_QUERY_THROW ); if( !mbVisible ) - xSet->setPropertyValue( OUString( "Visible" ), uno::Any( sal_False ) ); + xSet->setPropertyValue("Visible", uno::Any( sal_False ) ); if( !mbPrintable ) - xSet->setPropertyValue( OUString( "Printable" ), uno::Any( sal_False ) ); + xSet->setPropertyValue("Printable", uno::Any( sal_False ) ); } catch(const Exception&) { @@ -502,7 +502,7 @@ void SdXMLShapeContext::AddShape(const char* pServiceName ) if ( OUString::createFromAscii(pServiceName).compareToAscii( "com.sun.star.drawing.OLE2Shape" ) == 0 && uno::Reference< text::XTextDocument >(GetImport().GetModel(), uno::UNO_QUERY).is() ) { - xShape = uno::Reference< drawing::XShape >(xServiceFact->createInstance(OUString("com.sun.star.drawing.temporaryForXMLImportOLE2Shape")), uno::UNO_QUERY); + xShape = uno::Reference< drawing::XShape >(xServiceFact->createInstance("com.sun.star.drawing.temporaryForXMLImportOLE2Shape"), uno::UNO_QUERY); } else { @@ -667,7 +667,7 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */) else { // get graphics familie - xFamilies->getByName( OUString( "graphics" ) ) >>= xFamily; + xFamilies->getByName("graphics") >>= xFamily; aStyleName = GetImport().GetStyleDisplayName( XML_STYLE_FAMILY_SD_GRAPHICS_ID, aStyleName ); @@ -691,7 +691,7 @@ void SdXMLShapeContext::SetStyle( bool bSupportsStyle /* = true */) // set style on object uno::Any aAny; aAny <<= xStyle; - xPropSet->setPropertyValue(OUString("Style"), aAny); + xPropSet->setPropertyValue("Style", aAny); } catch(const uno::Exception&) { @@ -745,7 +745,7 @@ void SdXMLShapeContext::SetLayer() uno::Any aAny; aAny <<= maLayerName; - xPropSet->setPropertyValue(OUString("LayerName"), aAny); + xPropSet->setPropertyValue("LayerName", aAny); return; } } @@ -983,7 +983,7 @@ void SdXMLRectShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib { try { - xPropSet->setPropertyValue(OUString("CornerRadius"), uno::makeAny( mnRadius ) ); + xPropSet->setPropertyValue("CornerRadius", uno::makeAny( mnRadius ) ); } catch(const uno::Exception&) { @@ -1251,13 +1251,13 @@ void SdXMLEllipseShapeContext::StartElement(const uno::Reference< xml::sax::XAtt { uno::Any aAny; aAny <<= (drawing::CircleKind)meKind; - xPropSet->setPropertyValue( OUString("CircleKind"), aAny ); + xPropSet->setPropertyValue("CircleKind", aAny ); aAny <<= mnStartAngle; - xPropSet->setPropertyValue( OUString("CircleStartAngle"), aAny ); + xPropSet->setPropertyValue("CircleStartAngle", aAny ); aAny <<= mnEndAngle; - xPropSet->setPropertyValue( OUString("CircleEndAngle"), aAny ); + xPropSet->setPropertyValue("CircleEndAngle", aAny ); } } @@ -1617,11 +1617,11 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt uno::Reference< beans::XPropertySetInfo > xPropsInfo( xProps->getPropertySetInfo() ); if( xPropsInfo.is() ) { - if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName(OUString("IsEmptyPresentationObject" ))) - xProps->setPropertyValue( OUString("IsEmptyPresentationObject" ), ::cppu::bool2any( sal_False ) ); + if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject")) + xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( sal_False ) ); - if( mbIsUserTransformed && xPropsInfo->hasPropertyByName(OUString("IsPlaceholderDependent" ))) - xProps->setPropertyValue( OUString("IsPlaceholderDependent" ), ::cppu::bool2any( sal_False ) ); + if( mbIsUserTransformed && xPropsInfo->hasPropertyByName("IsPlaceholderDependent")) + xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( sal_False ) ); } } } @@ -1653,7 +1653,7 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt { try { - xPropSet->setPropertyValue(OUString("CornerRadius"), uno::makeAny( mnRadius ) ); + xPropSet->setPropertyValue("CornerRadius", uno::makeAny( mnRadius ) ); } catch(const uno::Exception&) { @@ -1952,22 +1952,22 @@ void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XA { uno::Any aAny; aAny <<= maStart; - xProps->setPropertyValue(OUString("StartPosition"), aAny); + xProps->setPropertyValue("StartPosition", aAny); aAny <<= maEnd; - xProps->setPropertyValue(OUString("EndPosition"), aAny ); + xProps->setPropertyValue("EndPosition", aAny ); aAny <<= (drawing::ConnectorType)mnType; - xProps->setPropertyValue(OUString("EdgeKind"), aAny ); + xProps->setPropertyValue("EdgeKind", aAny ); aAny <<= mnDelta1; - xProps->setPropertyValue(OUString("EdgeLine1Delta"), aAny ); + xProps->setPropertyValue("EdgeLine1Delta", aAny ); aAny <<= mnDelta2; - xProps->setPropertyValue(OUString("EdgeLine2Delta"), aAny ); + xProps->setPropertyValue("EdgeLine2Delta", aAny ); aAny <<= mnDelta3; - xProps->setPropertyValue(OUString("EdgeLine3Delta"), aAny ); + xProps->setPropertyValue("EdgeLine3Delta", aAny ); } SetStyle(); SetLayer(); @@ -1998,7 +1998,7 @@ void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XA if ( bApplySVGD ) { - xProps->setPropertyValue( OUString("PolyPolygonBezier" ), maPath ); + xProps->setPropertyValue("PolyPolygonBezier", maPath ); } } @@ -2085,10 +2085,10 @@ void SdXMLMeasureShapeContext::StartElement(const uno::Reference< xml::sax::XAtt { uno::Any aAny; aAny <<= maStart; - xProps->setPropertyValue(OUString("StartPosition"), aAny); + xProps->setPropertyValue("StartPosition", aAny); aAny <<= maEnd; - xProps->setPropertyValue(OUString("EndPosition"), aAny ); + xProps->setPropertyValue("EndPosition", aAny ); } // delete pre created fields @@ -2179,7 +2179,7 @@ void SdXMLPageShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib GetImport().GetShapeImport()->IsPresentationShapesSupported(); uno::Reference< lang::XServiceInfo > xInfo( mxShapes, uno::UNO_QUERY ); - const sal_Bool bIsOnHandoutPage = xInfo.is() && xInfo->supportsService( OUString( "com.sun.star.presentation.HandoutMasterPage") ); + const sal_Bool bIsOnHandoutPage = xInfo.is() && xInfo->supportsService("com.sun.star.presentation.HandoutMasterPage"); if( bIsOnHandoutPage ) { @@ -2269,20 +2269,20 @@ void SdXMLCaptionShapeContext::StartElement(const uno::Reference< xml::sax::XAtt sal_Bool bIsAutoGrowWidth = sal_False; if ( xProps.is() ) { - uno::Any aAny( xProps->getPropertyValue( OUString("TextAutoGrowWidth" ) ) ); + uno::Any aAny( xProps->getPropertyValue("TextAutoGrowWidth") ); aAny >>= bIsAutoGrowWidth; if ( bIsAutoGrowWidth ) - xProps->setPropertyValue( OUString("TextAutoGrowWidth"), uno::makeAny( sal_False ) ); + xProps->setPropertyValue("TextAutoGrowWidth", uno::makeAny( sal_False ) ); } // set pos, size, shear and rotate SetTransformation(); if( xProps.is() ) - xProps->setPropertyValue(OUString("CaptionPoint"), uno::makeAny( maCaptionPoint ) ); + xProps->setPropertyValue("CaptionPoint", uno::makeAny( maCaptionPoint ) ); if ( bIsAutoGrowWidth ) - xProps->setPropertyValue( OUString("TextAutoGrowWidth"), uno::makeAny( sal_True ) ); + xProps->setPropertyValue("TextAutoGrowWidth", uno::makeAny( sal_True ) ); if(mnRadius) { @@ -2291,7 +2291,7 @@ void SdXMLCaptionShapeContext::StartElement(const uno::Reference< xml::sax::XAtt { try { - xPropSet->setPropertyValue(OUString("CornerRadius"), uno::makeAny( mnRadius ) ); + xPropSet->setPropertyValue("CornerRadius", uno::makeAny( mnRadius ) ); } catch(const uno::Exception&) { @@ -2396,16 +2396,16 @@ void SdXMLGraphicObjectShapeContext::StartElement( const ::com::sun::star::uno:: sal_Int32 nUPD, nBuildId; if( GetImport().getBuildIds( nUPD, nBuildId ) && (nUPD == 645) ) try { - xPropset->setPropertyValue( OUString("FillStyle"), Any( FillStyle_NONE ) ); - xPropset->setPropertyValue( OUString("LineStyle"), Any( LineStyle_NONE ) ); + xPropset->setPropertyValue("FillStyle", Any( FillStyle_NONE ) ); + xPropset->setPropertyValue("LineStyle", Any( LineStyle_NONE ) ); } catch(const Exception&) { } uno::Reference< beans::XPropertySetInfo > xPropsInfo( xPropset->getPropertySetInfo() ); - if( xPropsInfo.is() && xPropsInfo->hasPropertyByName(OUString("IsEmptyPresentationObject" ))) - xPropset->setPropertyValue( OUString("IsEmptyPresentationObject" ), ::cppu::bool2any( mbIsPlaceholder ) ); + if( xPropsInfo.is() && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject")) + xPropset->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( mbIsPlaceholder ) ); if( !mbIsPlaceholder ) { @@ -2415,8 +2415,8 @@ void SdXMLGraphicObjectShapeContext::StartElement( const ::com::sun::star::uno:: aAny <<= GetImport().ResolveGraphicObjectURL( maURL, GetImport().isGraphicLoadOnDemandSupported() ); try { - xPropset->setPropertyValue( OUString("GraphicURL" ), aAny ); - xPropset->setPropertyValue( OUString("GraphicStreamURL" ), aAny ); + xPropset->setPropertyValue("GraphicURL", aAny ); + xPropset->setPropertyValue("GraphicStreamURL", aAny ); } catch (const lang::IllegalArgumentException&) { @@ -2433,8 +2433,8 @@ void SdXMLGraphicObjectShapeContext::StartElement( const ::com::sun::star::uno:: uno::Reference< beans::XPropertySetInfo > xPropsInfo( xProps->getPropertySetInfo() ); if( xPropsInfo.is() ) { - if( xPropsInfo->hasPropertyByName(OUString("IsPlaceholderDependent" ))) - xProps->setPropertyValue( OUString("IsPlaceholderDependent" ), ::cppu::bool2any( sal_False ) ); + if( xPropsInfo->hasPropertyByName("IsPlaceholderDependent")) + xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( sal_False ) ); } } } @@ -2459,8 +2459,8 @@ void SdXMLGraphicObjectShapeContext::EndElement() if(xProps.is()) { const uno::Any aAny( uno::makeAny( sURL ) ); - xProps->setPropertyValue( OUString("GraphicURL" ), aAny ); - xProps->setPropertyValue( OUString("GraphicStreamURL" ), aAny ); + xProps->setPropertyValue("GraphicURL", aAny ); + xProps->setPropertyValue("GraphicStreamURL", aAny ); } } catch (const lang::IllegalArgumentException&) @@ -2553,17 +2553,17 @@ void SdXMLChartShapeContext::StartElement(const uno::Reference< xml::sax::XAttri if(xProps.is()) { uno::Reference< beans::XPropertySetInfo > xPropsInfo( xProps->getPropertySetInfo() ); - if( xPropsInfo.is() && xPropsInfo->hasPropertyByName(OUString("IsEmptyPresentationObject" ))) - xProps->setPropertyValue( OUString("IsEmptyPresentationObject" ), ::cppu::bool2any( sal_False ) ); + if( xPropsInfo.is() && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject")) + xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( sal_False ) ); uno::Any aAny; const OUString aCLSID( "12DCAE26-281F-416F-a234-c3086127382e"); aAny <<= aCLSID; - xProps->setPropertyValue( OUString("CLSID" ), aAny ); + xProps->setPropertyValue("CLSID", aAny ); - aAny = xProps->getPropertyValue( OUString("Model" ) ); + aAny = xProps->getPropertyValue("Model"); uno::Reference< frame::XModel > xChartModel; if( aAny >>= xChartModel ) { @@ -2580,8 +2580,8 @@ void SdXMLChartShapeContext::StartElement(const uno::Reference< xml::sax::XAttri uno::Reference< beans::XPropertySetInfo > xPropsInfo( xProps->getPropertySetInfo() ); if( xPropsInfo.is() ) { - if( xPropsInfo->hasPropertyByName(OUString("IsPlaceholderDependent" ))) - xProps->setPropertyValue( OUString("IsPlaceholderDependent" ), ::cppu::bool2any( sal_False ) ); + if( xPropsInfo->hasPropertyByName("IsPlaceholderDependent")) + xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( sal_False ) ); } } } @@ -2687,11 +2687,11 @@ void SdXMLObjectShapeContext::StartElement( const ::com::sun::star::uno::Referen uno::Reference< beans::XPropertySetInfo > xPropsInfo( xProps->getPropertySetInfo() ); if( xPropsInfo.is() ) { - if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName(OUString("IsEmptyPresentationObject" ))) - xProps->setPropertyValue( OUString("IsEmptyPresentationObject" ), ::cppu::bool2any( sal_False ) ); + if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject")) + xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( sal_False ) ); - if( mbIsUserTransformed && xPropsInfo->hasPropertyByName(OUString("IsPlaceholderDependent" ))) - xProps->setPropertyValue( OUString("IsPlaceholderDependent" ), ::cppu::bool2any( sal_False ) ); + if( mbIsUserTransformed && xPropsInfo->hasPropertyByName("IsPlaceholderDependent")) + xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( sal_False ) ); } } } @@ -2711,13 +2711,13 @@ void SdXMLObjectShapeContext::StartElement( const ::com::sun::star::uno::Referen if ( aPersistName.startsWith( sURL ) ) aPersistName = aPersistName.copy( sURL.getLength() ); - xProps->setPropertyValue( OUString( "PersistName" ), + xProps->setPropertyValue("PersistName", uno::makeAny( aPersistName ) ); } else { // this is OOo link object - xProps->setPropertyValue( OUString( "LinkURL" ), + xProps->setPropertyValue("LinkURL", uno::makeAny( aPersistName ) ); } } @@ -2747,8 +2747,8 @@ void SdXMLObjectShapeContext::EndElement() if( xProps.is() ) { - xProps->setPropertyValue(OUString("FillStyle"), uno::makeAny(drawing::FillStyle_NONE)); - xProps->setPropertyValue(OUString("LineStyle"), uno::makeAny(drawing::LineStyle_NONE)); + xProps->setPropertyValue("FillStyle", uno::makeAny(drawing::FillStyle_NONE)); + xProps->setPropertyValue("LineStyle", uno::makeAny(drawing::LineStyle_NONE)); } } @@ -2762,7 +2762,7 @@ void SdXMLObjectShapeContext::EndElement() uno::Reference< beans::XPropertySet > xProps(mxShape, uno::UNO_QUERY); if( xProps.is() ) - xProps->setPropertyValue( OUString( "PersistName" ), uno::makeAny( aPersistName ) ); + xProps->setPropertyValue("PersistName", uno::makeAny( aPersistName ) ); } SdXMLShapeContext::EndElement(); @@ -2819,10 +2819,10 @@ SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext( uno::Reference< beans::XPropertySet > xPropSet(mxShape, uno::UNO_QUERY); if( xPropSet.is() ) { - xPropSet->setPropertyValue( OUString("CLSID" ), uno::makeAny( maCLSID ) ); + xPropSet->setPropertyValue("CLSID", uno::makeAny( maCLSID ) ); uno::Reference< lang::XComponent > xComp; - xPropSet->getPropertyValue( OUString("Model" ) ) >>= xComp; + xPropSet->getPropertyValue("Model") >>= xComp; DBG_ASSERT( xComp.is(), "no xModel for own OLE format" ); pEContext->SetComponent( xComp ); } @@ -2916,42 +2916,42 @@ void SdXMLAppletShapeContext::EndElement() // the visual area for applet must be set on loading awt::Rectangle aRect( 0, 0, maSize.Width, maSize.Height ); aAny <<= aRect; - xProps->setPropertyValue( OUString( "VisibleArea" ), aAny ); + xProps->setPropertyValue("VisibleArea", aAny ); } if( maParams.getLength() ) { aAny <<= maParams; - xProps->setPropertyValue( OUString( "AppletCommands" ), aAny ); + xProps->setPropertyValue("AppletCommands", aAny ); } if( !maHref.isEmpty() ) { aAny <<= maHref; - xProps->setPropertyValue( OUString( "AppletCodeBase" ), aAny ); + xProps->setPropertyValue("AppletCodeBase", aAny ); } if( !maAppletName.isEmpty() ) { aAny <<= maAppletName; - xProps->setPropertyValue( OUString( "AppletName" ), aAny ); + xProps->setPropertyValue("AppletName", aAny ); } if( mbIsScript ) { aAny <<= mbIsScript; - xProps->setPropertyValue( OUString( "AppletIsScript" ), aAny ); + xProps->setPropertyValue("AppletIsScript", aAny ); } if( !maAppletCode.isEmpty() ) { aAny <<= maAppletCode; - xProps->setPropertyValue( OUString( "AppletCode" ), aAny ); + xProps->setPropertyValue("AppletCode", aAny ); } aAny <<= OUString( GetImport().GetDocumentBase() ); - xProps->setPropertyValue( OUString( "AppletDocBase" ), aAny ); + xProps->setPropertyValue("AppletDocBase", aAny ); SetThumbnail(); } @@ -3072,11 +3072,11 @@ void SdXMLPluginShapeContext::StartElement( const ::com::sun::star::uno::Referen uno::Reference< beans::XPropertySetInfo > xPropsInfo( xProps->getPropertySetInfo() ); if( xPropsInfo.is() ) { - if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName(OUString("IsEmptyPresentationObject" ))) - xProps->setPropertyValue( OUString("IsEmptyPresentationObject" ), ::cppu::bool2any( sal_False ) ); + if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject")) + xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( sal_False ) ); - if( mbIsUserTransformed && xPropsInfo->hasPropertyByName(OUString("IsPlaceholderDependent" ))) - xProps->setPropertyValue( OUString("IsPlaceholderDependent" ), ::cppu::bool2any( sal_False ) ); + if( mbIsUserTransformed && xPropsInfo->hasPropertyByName("IsPlaceholderDependent")) + xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( sal_False ) ); } } } @@ -3151,19 +3151,19 @@ void SdXMLPluginShapeContext::EndElement() if( maParams.getLength() ) { aAny <<= maParams; - xProps->setPropertyValue( OUString( "PluginCommands" ), aAny ); + xProps->setPropertyValue("PluginCommands", aAny ); } if( !maMimeType.isEmpty() ) { aAny <<= maMimeType; - xProps->setPropertyValue( OUString( "PluginMimeType" ), aAny ); + xProps->setPropertyValue("PluginMimeType", aAny ); } if( !maHref.isEmpty() ) { aAny <<= maHref; - xProps->setPropertyValue( OUString( "PluginURL" ), aAny ); + xProps->setPropertyValue("PluginURL", aAny ); } } else @@ -3181,21 +3181,21 @@ void SdXMLPluginShapeContext::EndElement() { OUString aValueStr; maParams[ nParam ].Value >>= aValueStr; - xProps->setPropertyValue( OUString( "Loop" ), + xProps->setPropertyValue("Loop", uno::makeAny( static_cast< sal_Bool >( 0 == aValueStr.compareToAscii( "true" ) ) ) ); } else if( 0 == rName.compareToAscii( "Mute" ) ) { OUString aValueStr; maParams[ nParam ].Value >>= aValueStr; - xProps->setPropertyValue( OUString( "Mute" ), + xProps->setPropertyValue("Mute", uno::makeAny( static_cast< sal_Bool >( 0 == aValueStr.compareToAscii( "true" ) ) ) ); } else if( 0 == rName.compareToAscii( "VolumeDB" ) ) { OUString aValueStr; maParams[ nParam ].Value >>= aValueStr; - xProps->setPropertyValue( OUString( "VolumeDB" ), + xProps->setPropertyValue("VolumeDB", uno::makeAny( static_cast< sal_Int16 >( aValueStr.toInt32() ) ) ); } else if( 0 == rName.compareToAscii( "Zoom" ) ) @@ -3224,7 +3224,7 @@ void SdXMLPluginShapeContext::EndElement() else eZoomLevel = media::ZoomLevel_NOT_AVAILABLE; - xProps->setPropertyValue( OUString( "Zoom" ), uno::makeAny( eZoomLevel ) ); + xProps->setPropertyValue("Zoom", uno::makeAny( eZoomLevel ) ); } } } @@ -3315,13 +3315,13 @@ void SdXMLFloatingFrameShapeContext::StartElement( const ::com::sun::star::uno:: if( !maFrameName.isEmpty() ) { aAny <<= maFrameName; - xProps->setPropertyValue( OUString( "FrameName" ), aAny ); + xProps->setPropertyValue("FrameName", aAny ); } if( !maHref.isEmpty() ) { aAny <<= maHref; - xProps->setPropertyValue( OUString( "FrameURL" ), aAny ); + xProps->setPropertyValue("FrameURL", aAny ); } } @@ -3367,7 +3367,7 @@ void SdXMLFloatingFrameShapeContext::EndElement() awt::Rectangle aRect( 0, 0, maSize.Width, maSize.Height ); uno::Any aAny; aAny <<= aRect; - xProps->setPropertyValue( OUString( "VisibleArea" ), aAny ); + xProps->setPropertyValue("VisibleArea", aAny ); } } @@ -3451,12 +3451,12 @@ OUString SdXMLFrameShapeContext::getGraphicURLFromImportContext(const SvXMLImpor if(xPropSet.is()) { - xPropSet->getPropertyValue(OUString("GraphicStreamURL")) >>= aRetval; + xPropSet->getPropertyValue("GraphicStreamURL") >>= aRetval; if(!aRetval.getLength()) { // it maybe a link, try GraphicURL - xPropSet->getPropertyValue(OUString("GraphicURL")) >>= aRetval; + xPropSet->getPropertyValue("GraphicURL") >>= aRetval; } } } @@ -3895,11 +3895,11 @@ void SdXMLTableShapeContext::StartElement( const ::com::sun::star::uno::Referenc uno::Reference< beans::XPropertySetInfo > xPropsInfo( xProps->getPropertySetInfo() ); if( xPropsInfo.is() ) { - if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName(OUString("IsEmptyPresentationObject" ))) - xProps->setPropertyValue( OUString("IsEmptyPresentationObject" ), ::cppu::bool2any( sal_False ) ); + if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject")) + xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( sal_False ) ); - if( mbIsUserTransformed && xPropsInfo->hasPropertyByName(OUString("IsPlaceholderDependent" ))) - xProps->setPropertyValue( OUString("IsPlaceholderDependent" ), ::cppu::bool2any( sal_False ) ); + if( mbIsUserTransformed && xPropsInfo->hasPropertyByName("IsPlaceholderDependent")) + xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( sal_False ) ); } } } @@ -3915,7 +3915,7 @@ void SdXMLTableShapeContext::StartElement( const ::com::sun::star::uno::Referenc const OUString sFamilyName( "table" ); Reference< XNameAccess > xTableFamily( xFamilies->getByName( sFamilyName ), UNO_QUERY_THROW ); Reference< XStyle > xTableStyle( xTableFamily->getByName( msTemplateStyleName ), UNO_QUERY_THROW ); - xProps->setPropertyValue( OUString( "TableTemplate" ), Any( xTableStyle ) ); + xProps->setPropertyValue("TableTemplate", Any( xTableStyle ) ); } catch(const Exception&) { @@ -3943,7 +3943,7 @@ void SdXMLTableShapeContext::StartElement( const ::com::sun::star::uno::Referenc if( xTableImport.is() && xProps.is() ) { uno::Reference< table::XColumnRowRange > xColumnRowRange( - xProps->getPropertyValue( OUString("Model" ) ), uno::UNO_QUERY ); + xProps->getPropertyValue("Model"), uno::UNO_QUERY ); if( xColumnRowRange.is() ) mxTableImportContext = xTableImport->CreateTableContext( GetPrefix(), GetLocalName(), xColumnRowRange ); diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx index d80c71d43ecb..17b0edf23755 100644 --- a/xmloff/source/draw/ximpshow.cxx +++ b/xmloff/source/draw/ximpshow.cxx @@ -111,7 +111,7 @@ SdXMLShowsContext::SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, c if( IsXMLToken( aLocalName, XML_START_PAGE ) ) { aAny <<= sValue; - mpImpl->mxPresProps->setPropertyValue( OUString( "FirstPage" ), aAny ); + mpImpl->mxPresProps->setPropertyValue("FirstPage", aAny ); bAll = sal_False; } else if( IsXMLToken( aLocalName, XML_SHOW ) ) @@ -128,62 +128,62 @@ SdXMLShowsContext::SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, c const sal_Int32 nMS = (aDuration.Hours * 60 + aDuration.Minutes) * 60 + aDuration.Seconds; aAny <<= nMS; - mpImpl->mxPresProps->setPropertyValue( OUString( "Pause" ), aAny ); + mpImpl->mxPresProps->setPropertyValue("Pause", aAny ); } else if( IsXMLToken( aLocalName, XML_ANIMATIONS ) ) { aAny = bool2any( IsXMLToken( sValue, XML_ENABLED ) ); - mpImpl->mxPresProps->setPropertyValue( OUString( "AllowAnimations" ), aAny ); + mpImpl->mxPresProps->setPropertyValue("AllowAnimations", aAny ); } else if( IsXMLToken( aLocalName, XML_STAY_ON_TOP ) ) { aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); - mpImpl->mxPresProps->setPropertyValue( OUString( "IsAlwaysOnTop" ), aAny ); + mpImpl->mxPresProps->setPropertyValue("IsAlwaysOnTop", aAny ); } else if( IsXMLToken( aLocalName, XML_FORCE_MANUAL ) ) { aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); - mpImpl->mxPresProps->setPropertyValue( OUString( "IsAutomatic" ), aAny ); + mpImpl->mxPresProps->setPropertyValue("IsAutomatic", aAny ); } else if( IsXMLToken( aLocalName, XML_ENDLESS ) ) { aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); - mpImpl->mxPresProps->setPropertyValue( OUString( "IsEndless" ), aAny ); + mpImpl->mxPresProps->setPropertyValue("IsEndless", aAny ); } else if( IsXMLToken( aLocalName, XML_FULL_SCREEN ) ) { aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); - mpImpl->mxPresProps->setPropertyValue( OUString( "IsFullScreen" ), aAny ); + mpImpl->mxPresProps->setPropertyValue("IsFullScreen", aAny ); } else if( IsXMLToken( aLocalName, XML_MOUSE_VISIBLE ) ) { aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); - mpImpl->mxPresProps->setPropertyValue( OUString( "IsMouseVisible" ), aAny ); + mpImpl->mxPresProps->setPropertyValue("IsMouseVisible", aAny ); } else if( IsXMLToken( aLocalName, XML_START_WITH_NAVIGATOR ) ) { aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); - mpImpl->mxPresProps->setPropertyValue( OUString( "StartWithNavigator" ), aAny ); + mpImpl->mxPresProps->setPropertyValue("StartWithNavigator", aAny ); } else if( IsXMLToken( aLocalName, XML_MOUSE_AS_PEN ) ) { aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); - mpImpl->mxPresProps->setPropertyValue( OUString( "UsePen" ), aAny ); + mpImpl->mxPresProps->setPropertyValue("UsePen", aAny ); } else if( IsXMLToken( aLocalName, XML_TRANSITION_ON_CLICK ) ) { aAny = bool2any( IsXMLToken( sValue, XML_ENABLED ) ); - mpImpl->mxPresProps->setPropertyValue( OUString( "IsTransitionOnClick" ), aAny ); + mpImpl->mxPresProps->setPropertyValue("IsTransitionOnClick", aAny ); } else if( IsXMLToken( aLocalName, XML_SHOW_LOGO ) ) { aAny = bool2any( IsXMLToken( sValue, XML_TRUE ) ); - mpImpl->mxPresProps->setPropertyValue( OUString( "IsShowLogo" ), aAny ); + mpImpl->mxPresProps->setPropertyValue("IsShowLogo", aAny ); } } } aAny = bool2any( bAll ); - mpImpl->mxPresProps->setPropertyValue( OUString( "IsShowAll" ), aAny ); + mpImpl->mxPresProps->setPropertyValue("IsShowAll", aAny ); } } @@ -193,7 +193,7 @@ SdXMLShowsContext::~SdXMLShowsContext() { uno::Any aAny; aAny <<= mpImpl->maCustomShowName; - mpImpl->mxPresProps->setPropertyValue( OUString( "CustomShow" ), aAny ); + mpImpl->mxPresProps->setPropertyValue("CustomShow", aAny ); } delete mpImpl; diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index db902df9a80a..7e3b0c84f4df 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -1243,8 +1243,8 @@ void SdXMLStylesContext::EndElement() { uno::Reference< beans::XPropertySetInfo > xInfoSetInfo( xInfoSet->getPropertySetInfo() ); - if( xInfoSetInfo->hasPropertyByName( OUString( "PageLayouts" ) ) ) - xInfoSet->setPropertyValue( OUString( "PageLayouts" ), uno::makeAny( getPageLayouts() ) ); + if( xInfoSetInfo->hasPropertyByName("PageLayouts") ) + xInfoSet->setPropertyValue("PageLayouts", uno::makeAny( getPageLayouts() ) ); } } diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx index abd5231a8d1d..e61ccd0838a4 100644 --- a/xmloff/source/meta/xmlversion.cxx +++ b/xmloff/source/meta/xmlversion.cxx @@ -402,7 +402,7 @@ uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( con if ( xProps.is() ) { try { - xProps->getPropertyValue( OUString("URL") ) >>= aParserInput.sSystemId; + xProps->getPropertyValue("URL") >>= aParserInput.sSystemId; } catch( uno::Exception& ) {} diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx index 10bdf96fe3f6..e817285f75ce 100644 --- a/xmloff/source/style/PageMasterImportContext.cxx +++ b/xmloff/source/style/PageMasterImportContext.cxx @@ -162,7 +162,7 @@ void PageStyleContext::FillPropertySet( uno::Any aPageUsage; XMLPMPropHdl_PageStyleLayout aPageUsageHdl; if (aPageUsageHdl.importXML(sPageUsage, aPageUsage, GetImport().GetMM100UnitConverter())) - rPropSet->setPropertyValue(OUString("PageStyleLayout"), aPageUsage); + rPropSet->setPropertyValue("PageStyleLayout", aPageUsage); } } diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index af11d3571cce..28553ba5ca06 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -1195,7 +1195,7 @@ void SvxXMLListStyleContext::CreateAndInsertLate( sal_Bool bOverwrite ) if( !xFactory.is() ) return; - Reference < XInterface > xIfc = xFactory->createInstance(OUString("com.sun.star.style.NumberingStyle") ); + Reference < XInterface > xIfc = xFactory->createInstance("com.sun.star.style.NumberingStyle"); if( !xIfc.is() ) return; Reference < XStyle > xTmp( xIfc, UNO_QUERY ); @@ -1272,7 +1272,7 @@ Reference < XIndexReplace > SvxXMLListStyleContext::CreateNumRule( if( !xFactory.is() ) return xNumRule; - Reference < XInterface > xIfc = xFactory->createInstance(OUString("com.sun.star.text.NumberingRules") ); + Reference < XInterface > xIfc = xFactory->createInstance("com.sun.star.text.NumberingRules"); if( !xIfc.is() ) return xNumRule; diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx index b710adefa8f7..1c5b7f0afed5 100644 --- a/xmloff/source/table/XMLTableExport.cxx +++ b/xmloff/source/table/XMLTableExport.cxx @@ -263,9 +263,9 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) // get style OUString sParentStyleName; Reference< XPropertySetInfo > xPropertySetInfo( xCellSet->getPropertySetInfo() ); - if( xPropertySetInfo.is() && xPropertySetInfo->hasPropertyByName( OUString("Style")) ) + if( xPropertySetInfo.is() && xPropertySetInfo->hasPropertyByName("Style") ) { - Reference< XStyle > xStyle( xCellSet->getPropertyValue(OUString("Style")), UNO_QUERY ); + Reference< XStyle > xStyle( xCellSet->getPropertyValue("Style"), UNO_QUERY ); if( xStyle.is() ) sParentStyleName = xStyle->getName(); } diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx index f046245f557a..9f486d3582d5 100644 --- a/xmloff/source/text/XMLTextColumnsContext.cxx +++ b/xmloff/source/text/XMLTextColumnsContext.cxx @@ -391,7 +391,7 @@ void XMLTextColumnsContext::EndElement( ) if( !xFactory.is() ) return; - Reference<XInterface> xIfc = xFactory->createInstance(OUString("com.sun.star.text.TextColumns")); + Reference<XInterface> xIfc = xFactory->createInstance("com.sun.star.text.TextColumns"); if( !xIfc.is() ) return; diff --git a/xmloff/source/text/XMLTextMasterPageContext.cxx b/xmloff/source/text/XMLTextMasterPageContext.cxx index 3f2fb301eb8c..8aedf9476f22 100644 --- a/xmloff/source/text/XMLTextMasterPageContext.cxx +++ b/xmloff/source/text/XMLTextMasterPageContext.cxx @@ -50,7 +50,7 @@ Reference < XStyle > XMLTextMasterPageContext::Create() if( xFactory.is() ) { Reference < XInterface > xIfc = - xFactory->createInstance(OUString("com.sun.star.style.PageStyle")); + xFactory->createInstance("com.sun.star.style.PageStyle"); if( xIfc.is() ) xNewStyle = Reference < XStyle >( xIfc, UNO_QUERY ); } diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx index eb89488e1054..41c1397b24d9 100644 --- a/xmloff/source/text/txtexppr.cxx +++ b/xmloff/source/text/txtexppr.cxx @@ -851,7 +851,7 @@ void XMLTextExportPropertySetMapper::ContextFilter( pAnchorTypeState->maValue >>= eAnchor; else if( bNeedsAnchor ) { - Any aAny = rPropSet->getPropertyValue( OUString( "AnchorType" ) ); + Any aAny = rPropSet->getPropertyValue("AnchorType"); aAny >>= eAnchor; } diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index cf6bc1024837..c4af925d8143 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -3959,7 +3959,7 @@ void XMLMeasureFieldImportContext::PrepareField( { Any aAny; aAny <<= mnKind; - xPropertySet->setPropertyValue(OUString("Kind"), aAny); + xPropertySet->setPropertyValue("Kind", aAny); } diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index d6b309b8edf3..6a529a8addd5 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -1515,7 +1515,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgres { Reference < XPropertySet > xSet( xTextField, UNO_QUERY ); Reference < XText > xText; - Any a = xSet->getPropertyValue( OUString("TextRange") ); + Any a = xSet->getPropertyValue("TextRange"); a >>= xText; if ( xText.is() ) { @@ -3813,7 +3813,7 @@ void XMLTextParagraphExport::PreventExportOfControlsInMuteSections( { // Reference<XPropertySet> xPropSet( xControlShape, UNO_QUERY ); // Reference<XTextContent> xTextContent; - // xPropSet->getPropertyValue( OUString( "TextRange" ) ) >>= xTextContent; + // xPropSet->getPropertyValue("TextRange") >>= xTextContent; Reference<XTextContent> xTextContent( xControlShape, UNO_QUERY ); if( xTextContent.is() ) diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index 5619a0d24da9..136f20575e5e 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -1452,9 +1452,9 @@ bool XMLTransformerBase::isWriter() const { Reference< XServiceInfo > xSI( mxModel, UNO_QUERY ); return xSI.is() && - ( xSI->supportsService( OUString( "com.sun.star.text.TextDocument" ) ) || - xSI->supportsService( OUString( "com.sun.star.text.WebDocument" ) ) || - xSI->supportsService( OUString( "com.sun.star.text.GlobalDocument" ) ) ); + ( xSI->supportsService("com.sun.star.text.TextDocument") || + xSI->supportsService("com.sun.star.text.WebDocument") || + xSI->supportsService("com.sun.star.text.GlobalDocument") ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |