diff options
| author | Armin Le Grand <alg@apache.org> | 2012-06-28 10:01:49 +0000 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-03-11 17:34:44 +0100 |
| commit | ded39ea57b25617071012640cbaebaaf72a05744 (patch) | |
| tree | 1d00661504e83782341f767f4e792ed47b0ffdc9 /sc | |
| parent | 224fbad7ab4cbedec53910f05e2b4a71771cfec5 (diff) | |
#119989# Support relative 3D pie chart height when importing charts.
Reported by: Yan Li
Patch by: Yan Li, Tan Li, alg
Review by: alg(cherry picked from commit 2b1cedbe547ea8f7979f91873dd6e602ebb08a7b)
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
Conflicts:
chart2/source/view/charttypes/PieChart.cxx
chart2/source/view/main/ChartView.cxx
sc/source/filter/inc/xlchart.hxx
Change-Id: Ibc6f070021c79809c651ba789409a5fb5096c185
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/xichart.cxx | 1 | ||||
| -rw-r--r-- | sc/source/filter/inc/xlchart.hxx | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index f2321bf3c61e..aa8d576f1b4c 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -2454,6 +2454,7 @@ void XclImpChChart3d::Convert( ScfPropertySet& rPropSet, bool b3dWallChart ) con } // properties + rPropSet.SetProperty( EXC_CHPROP_3DRELATIVEHEIGHT, (sal_Int32)(maData.mnRelHeight / 2)); // seems to be 200%, cange to 100% rPropSet.SetProperty( EXC_CHPROP_ROTATIONVERTICAL, nRotationY ); rPropSet.SetProperty( EXC_CHPROP_ROTATIONHORIZONTAL, nRotationX ); rPropSet.SetProperty( EXC_CHPROP_PERSPECTIVE, nPerspective ); diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index 1605f8aba05d..6afb2ed8df45 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -79,6 +79,7 @@ class XclRoot; #define EXC_CHPROP_CROSSOVERPOSITION "CrossoverPosition" #define EXC_CHPROP_CROSSOVERVALUE "CrossoverValue" #define EXC_CHPROP_CURVESTYLE "CurveStyle" +#define EXC_CHPROP_D3DCAMERAGEOMETRY "D3DCameraGeometry" #define EXC_CHPROP_D3DSCENEAMBIENTCOLOR "D3DSceneAmbientColor" #define EXC_CHPROP_D3DSCENELIGHTON1 "D3DSceneLightOn1" #define EXC_CHPROP_D3DSCENELIGHTCOLOR2 "D3DSceneLightColor2" @@ -86,14 +87,18 @@ class XclRoot; #define EXC_CHPROP_D3DSCENELIGHTON2 "D3DSceneLightOn2" #define EXC_CHPROP_D3DSCENEPERSPECTIVE "D3DScenePerspective" #define EXC_CHPROP_D3DSCENESHADEMODE "D3DSceneShadeMode" +#define EXC_CHPROP_D3DTRANSFORMMATRIX "D3DTransformMatrix" #define EXC_CHPROP_DISPLAYLABELS "DisplayLabels" #define EXC_CHPROP_ERRORBARSTYLE "ErrorBarStyle" #define EXC_CHPROP_ERRORBARX "ErrorBarX" #define EXC_CHPROP_ERRORBARY "ErrorBarY" #define EXC_CHPROP_EXPANSION "Expansion" #define EXC_CHPROP_EXPTIMEINCREMENT "ExplicitTimeIncrement" +#define EXC_CHPROP_FILLBITMAPMODE "FillBitmapMode" +#define EXC_CHPROP_FILLSTYLE "FillStyle" #define EXC_CHPROP_GAPWIDTHSEQ "GapwidthSequence" #define EXC_CHPROP_GEOMETRY3D "Geometry3D" +#define EXC_CHPROP_HASMAINTITLE "HasMainTitle" #define EXC_CHPROP_INCLUDEHIDDENCELLS "IncludeHiddenCells" #define EXC_CHPROP_JAPANESE "Japanese" #define EXC_CHPROP_LABEL "Label" @@ -118,6 +123,7 @@ class XclRoot; #define EXC_CHPROP_ROLE "Role" #define EXC_CHPROP_ROTATIONHORIZONTAL "RotationHorizontal" #define EXC_CHPROP_ROTATIONVERTICAL "RotationVertical" +#define EXC_CHPROP_3DRELATIVEHEIGHT "3DRelativeHeight" #define EXC_CHPROP_SHOW "Show" #define EXC_CHPROP_SHOWCORRELATION "ShowCorrelationCoefficient" #define EXC_CHPROP_SHOWEQUATION "ShowEquation" |