summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
Diffstat (limited to 'chart2')
-rw-r--r--chart2/inc/DataSeriesState.hxx5
-rw-r--r--chart2/source/view/main/OpenglShapeFactory.cxx5
2 files changed, 6 insertions, 4 deletions
diff --git a/chart2/inc/DataSeriesState.hxx b/chart2/inc/DataSeriesState.hxx
index 64b27d710694..061c467cf3d4 100644
--- a/chart2/inc/DataSeriesState.hxx
+++ b/chart2/inc/DataSeriesState.hxx
@@ -17,6 +17,7 @@
#include <map>
#include <com/sun/star/uno/Any.h>
+#include <com/sun/star/chart/MissingValueTreatment.hpp>
namespace chart {
@@ -49,7 +50,7 @@ struct DataSeriesProperties
// hopefully this vector is empty most of the time
std::vector< PropertyMap > aPointProps;
- com::sun::star::chart::MissingValueTreatment eMissingValueTreatment;
+ sal_Int32 eMissingValueTreatment;
};
struct Axis
@@ -68,7 +69,7 @@ struct DataSeriesState
DataSeriesProperties aProperties;
// also contains bubble chart bubble size
// apply values to properties with functor
- std::map<OUString, DataSeries> aMappedProperties;
+ std::map<OUString, DataSequence> aMappedProperties;
Axis aXAxis;
Axis aYAxis;
};
diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx b/chart2/source/view/main/OpenglShapeFactory.cxx
index f4dc5e6e7122..24412893142b 100644
--- a/chart2/source/view/main/OpenglShapeFactory.cxx
+++ b/chart2/source/view/main/OpenglShapeFactory.cxx
@@ -54,12 +54,13 @@
using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
-using chart::dummy::DummyXShape;
-using chart::dummy::DummyXShapes;
namespace chart
{
+using dummy::DummyXShape;
+using dummy::DummyXShapes;
+
namespace opengl {
uno::Reference< drawing::XShapes > OpenglShapeFactory::getOrCreateChartRootShape(