[Libreoffice-commits] core.git: Branch 'private/moggi/screen-rendering' - chart2/source

Markus Mohrhard markus.mohrhard at collabora.co.uk
Wed Apr 16 16:31:54 PDT 2014


 chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx |    3 ++-
 chart2/source/inc/FastPropertyIdRanges.hxx                         |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 0ce6d08eed4ba3a8451053de2a3ef95405943820
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Thu Apr 17 01:28:38 2014 +0200

    fix non unique property handle
    
    Change-Id: I110feee77ab65bc8f528e85cba7c74063937b086

diff --git a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
index 20e366c..5625242 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
@@ -9,6 +9,7 @@
 
 #include "WrappedGL3DProperties.hxx"
 #include "Chart2ModelContact.hxx"
+#include "FastPropertyIdRanges.hxx"
 #include <unonames.hxx>
 #include <WrappedProperty.hxx>
 #include <DiagramHelper.hxx>
@@ -24,7 +25,7 @@ namespace {
 
 enum
 {
-    PROP_GL3DCHARTTYPE_ROUNDED_EDGE
+    PROP_GL3DCHARTTYPE_ROUNDED_EDGE = FAST_PROPERTY_ID_START_GL_3D
 };
 
 class WrappedGL3DProperty : public WrappedProperty
diff --git a/chart2/source/inc/FastPropertyIdRanges.hxx b/chart2/source/inc/FastPropertyIdRanges.hxx
index 0c24f46..d848bab 100644
--- a/chart2/source/inc/FastPropertyIdRanges.hxx
+++ b/chart2/source/inc/FastPropertyIdRanges.hxx
@@ -40,7 +40,8 @@ enum FastPropertyIdRanges
     FAST_PROPERTY_ID_START_CHART_SPLINE_PROP = FAST_PROPERTY_ID_START + 15000,
     FAST_PROPERTY_ID_START_CHART_STOCK_PROP = FAST_PROPERTY_ID_START + 16000,
     FAST_PROPERTY_ID_START_CHART_AUTOPOSITION_PROP = FAST_PROPERTY_ID_START + 17000,
-    FAST_PROPERTY_ID_START_SCALE_TEXT_PROP = FAST_PROPERTY_ID_START + 18000
+    FAST_PROPERTY_ID_START_SCALE_TEXT_PROP = FAST_PROPERTY_ID_START + 18000,
+    FAST_PROPERTY_ID_START_GL_3D = FAST_PROPERTY_ID_START + 19000
 };
 
 } //  namespace chart


More information about the Libreoffice-commits mailing list