chart2/CppunitTest_chart2_export.mk | 1
chart2/CppunitTest_chart2_import.mk | 1
chart2/inc/unonames.hxx | 2
chart2/qa/extras/chart2export.cxx | 6
+-
chart2/qa/extras/chart2import.cxx | 8
+--
chart2/qa/extras/charttest.hxx | 2
chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx | 25
+++++-----
chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx | 5
+-
chart2/source/controller/main/ObjectHierarchy.cxx | 5
+-
chart2/source/model/main/DataPointProperties.cxx | 4
-
chart2/source/tools/DataSourceHelper.cxx | 5
+-
chart2/source/tools/ObjectIdentifier.cxx | 6
+-
chart2/source/tools/StatisticsHelper.cxx | 5
+-
chart2/source/view/main/VDataSeries.cxx | 4
-
14 files changed, 46 insertions(+), 33 deletions(-)
New commits:
commit c6da1842956ceced501858d582f7dcaded0a324a
Author: Kohei Yoshida <kohei.yosh...@collabora.com>
Date: Thu Jun 26 19:35:48 2014 -0400
Track all uses of ErrorBarX and ErrorBarY UNO property names.
Change-Id: I994424c98d977c3a8f9138cccc17348de813a9d7
diff --git a/chart2/CppunitTest_chart2_export.mk
b/chart2/CppunitTest_chart2_export.mk
index c6bf682..3b941a9 100644
--- a/chart2/CppunitTest_chart2_export.mk
+++ b/chart2/CppunitTest_chart2_export.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_export, \
))
$(eval $(call gb_CppunitTest_set_include,chart2_export,\
+ -I$(SRCDIR)/chart2/inc \
$$(INCLUDE) \
))
diff --git a/chart2/CppunitTest_chart2_import.mk
b/chart2/CppunitTest_chart2_import.mk
index 55ac39d..f925e58 100644
--- a/chart2/CppunitTest_chart2_import.mk
+++ b/chart2/CppunitTest_chart2_import.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_CppunitTest_use_libraries,chart2_import, \
))
$(eval $(call gb_CppunitTest_set_include,chart2_import,\
+ -I$(SRCDIR)/chart2/inc \
$$(INCLUDE) \
))
diff --git a/chart2/inc/unonames.hxx b/chart2/inc/unonames.hxx
index 2b5f601..4975ed4 100644
--- a/chart2/inc/unonames.hxx
+++ b/chart2/inc/unonames.hxx
@@ -19,6 +19,8 @@
#define CHART_UNONAME_CURVE_RESOLUTION "CurveResolution"
#define CHART_UNONAME_NUMFMT "NumberFormat"
#define CHART_UNONAME_LINK_TO_SRC_NUMFMT "LinkNumberFormatToSource"
+#define CHART_UNONAME_ERRORBAR_X "ErrorBarX"
+#define CHART_UNONAME_ERRORBAR_Y "ErrorBarY"
#endif
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index 80aab30..7ef8dc7 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -436,7 +436,7 @@ void Chart2ExportTest::testErrorBarXLSX()
// test that y error bars are there
Reference< beans::XPropertySet > xErrorBarYProps;
- xPropSet->getPropertyValue("ErrorBarY") >>= xErrorBarYProps;
+ xPropSet->getPropertyValue(CHART_UNONAME_ERRORBAR_Y) >>=
xErrorBarYProps;
testErrorBar(xErrorBarYProps);
}
@@ -453,7 +453,7 @@ void Chart2ExportTest::testErrorBarXLSX()
// test that y error bars are there
Reference< beans::XPropertySet > xErrorBarYProps;
- xPropSet->getPropertyValue("ErrorBarY") >>= xErrorBarYProps;
+ xPropSet->getPropertyValue(CHART_UNONAME_ERRORBAR_Y) >>=
xErrorBarYProps;
testErrorBar(xErrorBarYProps);
}
}
@@ -832,7 +832,7 @@ void Chart2ExportTest::testErrorBarDataRangeODS()
// test that y error bars are there
Reference< beans::XPropertySet > xErrorBarYProps;
- xPropSet->getPropertyValue("ErrorBarY") >>= xErrorBarYProps;
+ xPropSet->getPropertyValue(CHART_UNONAME_ERRORBAR_Y) >>= xErrorBarYProps;
uno::Any aAny = xErrorBarYProps->getPropertyValue("ErrorBarRangePositive");
CPPUNIT_ASSERT(aAny.hasValue());
OUString aPosRange;
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index d5a42a1..1f31cad 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -89,7 +89,7 @@ void Chart2ImportTest::Fdo60083()
// test that y error bars are there
Reference< beans::XPropertySet > xErrorBarYProps;
- xPropSet->getPropertyValue("ErrorBarY") >>= xErrorBarYProps;
+ xPropSet->getPropertyValue(CHART_UNONAME_ERRORBAR_Y) >>= xErrorBarYProps;
CPPUNIT_ASSERT(xErrorBarYProps.is());
{
sal_Int32 nErrorBarStyle;
@@ -121,7 +121,7 @@ void Chart2ImportTest::Fdo60083()
// test that x error bars are not imported
Reference< beans::XPropertySet > xErrorBarXProps;
- xPropSet->getPropertyValue("ErrorBarX") >>= xErrorBarXProps;
+ xPropSet->getPropertyValue(CHART_UNONAME_ERRORBAR_X) >>= xErrorBarXProps;
CPPUNIT_ASSERT(!xErrorBarXProps.is());
}
@@ -139,7 +139,7 @@ void Chart2ImportTest::testErrorBarRange()
// test that y error bars are there
Reference< beans::XPropertySet > xErrorBarYProps;
- xPropSet->getPropertyValue("ErrorBarY") >>= xErrorBarYProps;
+ xPropSet->getPropertyValue(CHART_UNONAME_ERRORBAR_Y) >>= xErrorBarYProps;
CPPUNIT_ASSERT(xErrorBarYProps.is());
sal_Int32 nErrorBarStyle;
@@ -169,7 +169,7 @@ void Chart2ImportTest::testErrorBarFormatting()
// test that y error bars are there
Reference< beans::XPropertySet > xErrorBarYProps;
- xPropSet->getPropertyValue("ErrorBarY") >>= xErrorBarYProps;
+ xPropSet->getPropertyValue(CHART_UNONAME_ERRORBAR_Y) >>= xErrorBarYProps;
CPPUNIT_ASSERT(xErrorBarYProps.is());
util::Color aColor(0);
diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index e0969f4..97284542 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -49,6 +49,8 @@
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/util/NumberFormat.hpp>
+#include <unonames.hxx>
+
#include <iostream>
#include <libxml/xmlwriter.h>
diff --git
a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index c7d808c..8dd0f80 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -25,6 +25,7 @@
#include "DiagramHelper.hxx"
#include "ErrorBar.hxx"
#include "StatisticsHelper.hxx"
+#include <unonames.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/chart/ChartErrorCategory.hpp>
@@ -184,7 +185,7 @@ protected:
if(!xSeriesPropertySet.is())
return 0;
uno::Reference< beans::XPropertySet > xErrorBarProperties;
- xSeriesPropertySet->getPropertyValue( "ErrorBarY" ) >>=
xErrorBarProperties;
+ xSeriesPropertySet->getPropertyValue( CHART_UNONAME_ERRORBAR_Y ) >>=
xErrorBarProperties;
if( !xErrorBarProperties.is() )
{
// todo: use a valid context
@@ -193,7 +194,7 @@ protected:
xErrorBarProperties->setPropertyValue( "ShowPositiveError" ,
uno::makeAny(false) );
xErrorBarProperties->setPropertyValue( "ShowNegativeError" ,
uno::makeAny(false) );
xErrorBarProperties->setPropertyValue( "ErrorBarStyle" ,
uno::makeAny(::com::sun::star::chart::ErrorBarStyle::NONE) );
- xSeriesPropertySet->setPropertyValue( "ErrorBarY" , uno::makeAny(
xErrorBarProperties ) );
+ xSeriesPropertySet->setPropertyValue( CHART_UNONAME_ERRORBAR_Y ,
uno::makeAny( xErrorBarProperties ) );
}
return xErrorBarProperties;
}
@@ -231,7 +232,7 @@ double WrappedConstantErrorLowProperty::getValueFromSeries(
const Reference< bea
double aRet = 0.0;
m_aDefaultValue >>= aRet;
uno::Reference< beans::XPropertySet > xErrorBarProperties;
- if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue(
"ErrorBarY" ) >>= xErrorBarProperties ) && xErrorBarProperties.is())
+ if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue(
CHART_UNONAME_ERRORBAR_Y ) >>= xErrorBarProperties ) &&
xErrorBarProperties.is())
{
if( ::com::sun::star::chart::ErrorBarStyle::ABSOLUTE ==
lcl_getErrorBarStyle( xErrorBarProperties ) )
xErrorBarProperties->getPropertyValue( "NegativeError" ) >>= aRet;
@@ -285,7 +286,7 @@ double
WrappedConstantErrorHighProperty::getValueFromSeries( const Reference< be
double aRet = 0.0;
m_aDefaultValue >>= aRet;
uno::Reference< beans::XPropertySet > xErrorBarProperties;
- if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue(
"ErrorBarY" ) >>= xErrorBarProperties ) && xErrorBarProperties.is())
+ if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue(
CHART_UNONAME_ERRORBAR_Y ) >>= xErrorBarProperties ) &&
xErrorBarProperties.is())
{
if( ::com::sun::star::chart::ErrorBarStyle::ABSOLUTE ==
lcl_getErrorBarStyle( xErrorBarProperties ) )
xErrorBarProperties->getPropertyValue( "PositiveError" ) >>= aRet;
@@ -380,7 +381,7 @@
WrappedErrorCategoryProperty::~WrappedErrorCategoryProperty()
::com::sun::star::chart::ChartErrorCategory aRet =
::com::sun::star::chart::ChartErrorCategory_NONE;
m_aDefaultValue >>= aRet;
uno::Reference< beans::XPropertySet > xErrorBarProperties;
- if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue(
"ErrorBarY" ) >>= xErrorBarProperties ) && xErrorBarProperties.is())
+ if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue(
CHART_UNONAME_ERRORBAR_Y ) >>= xErrorBarProperties ) &&
xErrorBarProperties.is())
{
sal_Int32 nStyle = ::com::sun::star::chart::ErrorBarStyle::NONE;
xErrorBarProperties->getPropertyValue( "ErrorBarStyle" ) >>= nStyle;
@@ -481,7 +482,7 @@ double WrappedPercentageErrorProperty::getValueFromSeries(
const Reference< bean
double aRet = 0.0;
m_aDefaultValue >>= aRet;
uno::Reference< beans::XPropertySet > xErrorBarProperties;
- if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue(
"ErrorBarY" ) >>= xErrorBarProperties ) && xErrorBarProperties.is())
+ if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue(
CHART_UNONAME_ERRORBAR_Y ) >>= xErrorBarProperties ) &&
xErrorBarProperties.is())
{
if( ::com::sun::star::chart::ErrorBarStyle::RELATIVE ==
lcl_getErrorBarStyle( xErrorBarProperties ) )
xErrorBarProperties->getPropertyValue( "PositiveError" ) >>= aRet;
@@ -535,7 +536,7 @@ double WrappedErrorMarginProperty::getValueFromSeries(
const Reference< beans::X
double aRet = 0.0;
m_aDefaultValue >>= aRet;
uno::Reference< beans::XPropertySet > xErrorBarProperties;
- if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue(
"ErrorBarY" ) >>= xErrorBarProperties ) && xErrorBarProperties.is())
+ if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue(
CHART_UNONAME_ERRORBAR_Y ) >>= xErrorBarProperties ) &&
xErrorBarProperties.is())
{
if( ::com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN ==
lcl_getErrorBarStyle( xErrorBarProperties ) )
xErrorBarProperties->getPropertyValue( "PositiveError" ) >>= aRet;
@@ -586,7 +587,7 @@
WrappedErrorIndicatorProperty::~WrappedErrorIndicatorProperty()
::com::sun::star::chart::ChartErrorIndicatorType aRet =
::com::sun::star::chart::ChartErrorIndicatorType_NONE;
m_aDefaultValue >>= aRet;
uno::Reference< beans::XPropertySet > xErrorBarProperties;
- if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue(
"ErrorBarY" ) >>= xErrorBarProperties ) && xErrorBarProperties.is())
+ if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue(
CHART_UNONAME_ERRORBAR_Y ) >>= xErrorBarProperties ) &&
xErrorBarProperties.is())
{
bool bPositive = false;
bool bNegative = false;
@@ -659,7 +660,7 @@ sal_Int32 WrappedErrorBarStyleProperty::getValueFromSeries(
const Reference< bea
sal_Int32 nRet = ::com::sun::star::chart::ErrorBarStyle::NONE;
m_aDefaultValue >>= nRet;
uno::Reference< beans::XPropertySet > xErrorBarProperties;
- if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue(
"ErrorBarY" ) >>= xErrorBarProperties ) && xErrorBarProperties.is())
+ if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue(
CHART_UNONAME_ERRORBAR_Y ) >>= xErrorBarProperties ) &&
xErrorBarProperties.is())
{
xErrorBarProperties->getPropertyValue( "ErrorBarStyle" ) >>= nRet;
}
@@ -709,7 +710,7 @@ OUString
WrappedErrorBarRangePositiveProperty::getValueFromSeries( const Referen
m_aDefaultValue >>= aRet;
uno::Reference< chart2::data::XDataSource > xErrorBarDataSource;
if( xSeriesPropertySet.is() &&
- ( xSeriesPropertySet->getPropertyValue( "ErrorBarY" ) >>=
xErrorBarDataSource ) &&
+ ( xSeriesPropertySet->getPropertyValue( CHART_UNONAME_ERRORBAR_Y ) >>=
xErrorBarDataSource ) &&
xErrorBarDataSource.is())
{
uno::Reference< chart2::data::XDataSequence > xSeq(
@@ -776,7 +777,7 @@ OUString
WrappedErrorBarRangeNegativeProperty::getValueFromSeries( const Referen
m_aDefaultValue >>= aRet;
uno::Reference< chart2::data::XDataSource > xErrorBarDataSource;
if( xSeriesPropertySet.is() &&
- ( xSeriesPropertySet->getPropertyValue( "ErrorBarY" ) >>=
xErrorBarDataSource ) &&
+ ( xSeriesPropertySet->getPropertyValue( CHART_UNONAME_ERRORBAR_Y ) >>=
xErrorBarDataSource ) &&
xErrorBarDataSource.is())
{
uno::Reference< chart2::data::XDataSequence > xSeq(
@@ -920,7 +921,7 @@ Reference< beans::XPropertySet >
WrappedStatisticPropertySetProperty::getValueFr
break;
case PROPERTY_SET_TYPE_ERROR_BAR:
if( xSeriesPropertySet.is())
- xSeriesPropertySet->getPropertyValue( "ErrorBarY" ) >>=
xResult;
+ xSeriesPropertySet->getPropertyValue( CHART_UNONAME_ERRORBAR_Y
) >>= xResult;
break;
case PROPERTY_SET_TYPE_MEAN_VALUE:
if( xRegCnt.is() )
diff --git
a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index e5a9f35..1f24e8b 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -29,6 +29,7 @@
#include "StatisticsHelper.hxx"
#include "GraphicPropertyItemConverter.hxx"
+#include <unonames.hxx>
#include <svl/stritem.hxx>
#include <svx/chrtitem.hxx>
@@ -57,7 +58,7 @@ uno::Reference< beans::XPropertySet > lcl_GetErrorBar(
if( xProp.is())
try
{
- ( xProp->getPropertyValue( bYError ? OUString( "ErrorBarY" ) :
OUString("ErrorBarX") ) >>= xResult );
+ ( xProp->getPropertyValue( bYError ?
OUString(CHART_UNONAME_ERRORBAR_Y) : OUString(CHART_UNONAME_ERRORBAR_X) ) >>=
xResult );
}
catch( const uno::Exception & ex )
{
@@ -368,7 +369,7 @@ bool StatisticsItemConverter::ApplySpecialItem(
if( !xErrorBarProp.is() )
{
xErrorBarProp = lcl_GetDefaultErrorBar();
- GetPropertySet()->setPropertyValue( bYError ? OUString(
"ErrorBarY" ) : OUString("ErrorBarX"),
+ GetPropertySet()->setPropertyValue( bYError ?
OUString(CHART_UNONAME_ERRORBAR_Y) : OUString(CHART_UNONAME_ERRORBAR_X),
uno::makeAny(
xErrorBarProp ));
}
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx
b/chart2/source/controller/main/ObjectHierarchy.cxx
index 26caf6e..9498d37 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -30,6 +30,7 @@
#include "DataSeriesHelper.hxx"
#include "LegendHelper.hxx"
#include "chartview/DrawModelWrapper.hxx"
+#include <unonames.hxx>
#include <map>
#include <algorithm>
@@ -468,7 +469,7 @@ void ImplObjectHierarchy::createDataSeriesTree(
Reference< beans::XPropertySet > xSeriesProp(
xSeries, uno::UNO_QUERY );
Reference< beans::XPropertySet > xErrorBarProp;
if( xSeriesProp.is() &&
- (xSeriesProp->getPropertyValue( "ErrorBarY")
>>= xErrorBarProp) &&
+ (xSeriesProp->getPropertyValue(
CHART_UNONAME_ERRORBAR_Y) >>= xErrorBarProp) &&
xErrorBarProp.is())
{
sal_Int32 nStyle =
::com::sun::star::chart::ErrorBarStyle::NONE;
@@ -482,7 +483,7 @@ void ImplObjectHierarchy::createDataSeriesTree(
}
if( xSeriesProp.is() &&
- (xSeriesProp->getPropertyValue( "ErrorBarX")
>>= xErrorBarProp) &&
+
(xSeriesProp->getPropertyValue(CHART_UNONAME_ERRORBAR_X) >>= xErrorBarProp) &&
xErrorBarProp.is())
{
sal_Int32 nStyle =
::com::sun::star::chart::ErrorBarStyle::NONE;
diff --git a/chart2/source/model/main/DataPointProperties.cxx
b/chart2/source/model/main/DataPointProperties.cxx
index e145d42..c2cb375 100644
--- a/chart2/source/model/main/DataPointProperties.cxx
+++ b/chart2/source/model/main/DataPointProperties.cxx
@@ -322,14 +322,14 @@ void DataPointProperties::AddPropertiesToVector(
// statistics
rOutProperties.push_back(
- Property( "ErrorBarX",
+ Property( CHART_UNONAME_ERRORBAR_X,
PROP_DATAPOINT_ERROR_BAR_X,
// XPropertySet supporting service ErrorBar
cppu::UnoType<beans::XPropertySet>::get(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
- Property( "ErrorBarY",
+ Property( CHART_UNONAME_ERRORBAR_Y,
PROP_DATAPOINT_ERROR_BAR_Y,
// XPropertySet supporting service ErrorBar
cppu::UnoType<beans::XPropertySet>::get(),
diff --git a/chart2/source/tools/DataSourceHelper.cxx
b/chart2/source/tools/DataSourceHelper.cxx
index aad3aae..bb30a26 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -28,6 +28,7 @@
#include "PropertyHelper.hxx"
#include "CachedDataSequence.hxx"
#include "LabeledDataSequence.hxx"
+#include <unonames.hxx>
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart2/data/XDataSource.hpp>
@@ -81,7 +82,7 @@ void lcl_addErrorBarRanges(
try
{
uno::Reference< beans::XPropertySet > xErrorBarProp;
- if( ( xSeriesProp->getPropertyValue( "ErrorBarY") >>= xErrorBarProp )
&&
+ if( ( xSeriesProp->getPropertyValue( CHART_UNONAME_ERRORBAR_Y) >>=
xErrorBarProp ) &&
xErrorBarProp.is())
{
sal_Int32 eStyle = ::com::sun::star::chart::ErrorBarStyle::NONE;
@@ -94,7 +95,7 @@ void lcl_addErrorBarRanges(
}
}
- if( ( xSeriesProp->getPropertyValue("ErrorBarX") >>= xErrorBarProp )
&& xErrorBarProp.is())
+ if( ( xSeriesProp->getPropertyValue(CHART_UNONAME_ERRORBAR_X) >>=
xErrorBarProp ) && xErrorBarProp.is())
{
sal_Int32 eStyle = ::com::sun::star::chart::ErrorBarStyle::NONE;
if( ( xErrorBarProp->getPropertyValue("ErrorBarStyle") >>= eStyle
) &&
diff --git a/chart2/source/tools/ObjectIdentifier.cxx
b/chart2/source/tools/ObjectIdentifier.cxx
index 0ab0874..b0aee8b 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -25,6 +25,8 @@
#include "servicenames_charttypes.hxx"
#include "DiagramHelper.hxx"
#include "AxisIndexDefines.hxx"
+#include <unonames.hxx>
+
#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart2/XChartTypeContainer.hpp>
@@ -1363,9 +1365,9 @@ Reference< beans::XPropertySet >
ObjectIdentifier::getObjectPropertySet(
OUString errorBar;
if ( eObjectType == OBJECTTYPE_DATA_ERRORS_X)
- errorBar = "ErrorBarX";
+ errorBar = CHART_UNONAME_ERRORBAR_X;
else if (eObjectType == OBJECTTYPE_DATA_ERRORS_Y)
- errorBar = "ErrorBarY";
+ errorBar = CHART_UNONAME_ERRORBAR_Y;
else
errorBar = "ErrorBarZ";
diff --git a/chart2/source/tools/StatisticsHelper.cxx
b/chart2/source/tools/StatisticsHelper.cxx
index 724e01c..cbabbf1 100644
--- a/chart2/source/tools/StatisticsHelper.cxx
+++ b/chart2/source/tools/StatisticsHelper.cxx
@@ -21,6 +21,7 @@
#include "DataSeriesHelper.hxx"
#include "ErrorBar.hxx"
#include "macros.hxx"
+#include <unonames.hxx>
#include <rtl/math.hxx>
#include <rtl/ustrbuf.hxx>
@@ -307,7 +308,7 @@ Reference< beans::XPropertySet >
StatisticsHelper::addErrorBars(
return xErrorBar;
const OUString aPropName(
- (bYError) ? OUString("ErrorBarY") : OUString("ErrorBarX"));
+ (bYError) ? OUString(CHART_UNONAME_ERRORBAR_Y) :
OUString(CHART_UNONAME_ERRORBAR_X));
if( !( xSeriesProp->getPropertyValue( aPropName ) >>= xErrorBar ) ||
!xErrorBar.is())
{
@@ -332,7 +333,7 @@ Reference< beans::XPropertySet >
StatisticsHelper::getErrorBars(
Reference< beans::XPropertySet > xSeriesProp( xDataSeries, uno::UNO_QUERY
);
Reference< beans::XPropertySet > xErrorBar;
const OUString aPropName(
- (bYError) ? OUString("ErrorBarY") : OUString("ErrorBarX"));
+ (bYError) ? OUString(CHART_UNONAME_ERRORBAR_Y) :
OUString(CHART_UNONAME_ERRORBAR_X));
if ( xSeriesProp.is())
xSeriesProp->getPropertyValue( aPropName ) >>= xErrorBar;
diff --git a/chart2/source/view/main/VDataSeries.cxx
b/chart2/source/view/main/VDataSeries.cxx
index e799f22..73f8956 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -831,7 +831,7 @@ uno::Reference< beans::XPropertySet >
VDataSeries::getXErrorBarProperties( sal_I
uno::Reference< beans::XPropertySet > xPointProp(
this->getPropertiesOfPoint( index ));
if( xPointProp.is() )
- xPointProp->getPropertyValue("ErrorBarX") >>= xErrorBarProp;
+ xPointProp->getPropertyValue(CHART_UNONAME_ERRORBAR_X) >>=
xErrorBarProp;
return xErrorBarProp;
}
@@ -841,7 +841,7 @@ uno::Reference< beans::XPropertySet >
VDataSeries::getYErrorBarProperties( sal_I
uno::Reference< beans::XPropertySet > xPointProp(
this->getPropertiesOfPoint( index ));
if( xPointProp.is() )
- xPointProp->getPropertyValue("ErrorBarY") >>= xErrorBarProp;
+ xPointProp->getPropertyValue(CHART_UNONAME_ERRORBAR_Y) >>=
xErrorBarProp;
return xErrorBarProp;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
