summaryrefslogtreecommitdiff
path: root/xmloff/source/chart
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff/source/chart')
-rw-r--r--xmloff/source/chart/SchXMLAxisContext.cxx64
-rw-r--r--xmloff/source/chart/SchXMLChartContext.cxx28
-rw-r--r--xmloff/source/chart/SchXMLExport.cxx26
-rw-r--r--xmloff/source/chart/SchXMLLegendContext.cxx8
-rw-r--r--xmloff/source/chart/SchXMLPlotAreaContext.cxx44
-rw-r--r--xmloff/source/chart/SchXMLSeries2Context.cxx44
6 files changed, 107 insertions, 107 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 & )
{
generated by cgit (git 2.34.1) at 2024-07-25 07:25:33 +0000