summaryrefslogtreecommitdiff
path: root/xmloff/source/chart/SchXMLPlotAreaContext.cxx
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-06-29 21:24:12 +0200
committerThomas Arnhold <thomas@arnhold.org>2013-06-29 21:52:54 +0000
commitba0a57702cdef7a0389c06841711d7e3079d471c (patch)
tree223c0dd50de4b71cf7df9d0073f7cacca1f18c8d /xmloff/source/chart/SchXMLPlotAreaContext.cxx
parent8a7ede404ca4980f169c4ce634805ea5c1b6b56e (diff)
remove OUString wrap for string literals
For some functions and all kinds of Exceptions. CannotConvertException CloseVetoException DisposedException EmptyUndoStackException ErrorCodeIOException Exception GridInvalidDataException GridInvalidModelException IOException IllegalAccessException IllegalArgumentException IllegalTypeException IndexOutOfBoundsException NoMasterException NoSuchElementException NoSupportException PropertyVetoException RuntimeException SAXException ScannerException StorageWrappedTargetException UnsupportedFlavorException VetoException WrappedTargetException ZipIOException throwGenericSQLException throwIllegallArgumentException createInstance createInstanceWithContext forName getByName getPackageManager getPropertyValue getUnpackedValueOrDefault getValueByName hasPropertyByName openKey setName setPropertyValue supportsService bash command: for i in `cat list`; do git grep "$i\s*(\s*OUString(\s*\"" -- '*.[hc]xx' | cut -d ':' -f1 | sort -u | xargs sed -i -e "s/\(\<$i\s*(\)\s*OUString(\s*\(\"[^\")\\]*\"\)\s*)\s*/\1\2/g" -e "s/\($i.*\)\"+ /\1\" + /g"; done Change-Id: Iaf8e641b0abf28c082906014f87a183517630535 Reviewed-on: https://gerrit.libreoffice.org/4624 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'xmloff/source/chart/SchXMLPlotAreaContext.cxx')
-rw-r--r--xmloff/source/chart/SchXMLPlotAreaContext.cxx44
1 files changed, 22 insertions, 22 deletions
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" );