|
 |
f0633d |
From 578ff4dfd6f0d63670dfb21425b6b81fdc87d852 Mon Sep 17 00:00:00 2001
|
|
|
f0633d |
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
|
|
|
f0633d |
Date: Sun, 1 Dec 2013 04:45:36 +0100
|
|
|
f0633d |
Subject: [PATCH 016/109] fix 2D vs 3D coordinatesystem regression, fdo#67300
|
|
|
f0633d |
|
|
|
f0633d |
regression from 088e86b865062dd4cc5ba0c85c6068dea62238db
|
|
|
f0633d |
|
|
|
f0633d |
Change-Id: Ifc8d5a1da328278175bbc97b4f2aad8e6d200751
|
|
|
f0633d |
Reviewed-on: https://gerrit.libreoffice.org/6880
|
|
|
f0633d |
Reviewed-by: Andras Timar <andras.timar@collabora.com>
|
|
|
f0633d |
Tested-by: Andras Timar <andras.timar@collabora.com>
|
|
|
f0633d |
---
|
|
|
f0633d |
oox/source/drawingml/chart/typegroupconverter.cxx | 4 ++--
|
|
|
f0633d |
sc/source/filter/excel/xichart.cxx | 4 ++--
|
|
|
f0633d |
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
f0633d |
|
|
|
f0633d |
diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx
|
|
|
f0633d |
index 12d086d..589fb62 100644
|
|
|
f0633d |
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
|
|
|
f0633d |
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
|
|
|
f0633d |
@@ -248,9 +248,9 @@ Reference< XCoordinateSystem > TypeGroupConverter::createCoordinateSystem()
|
|
|
f0633d |
if( maTypeInfo.mbPolarCoordSystem )
|
|
|
f0633d |
{
|
|
|
f0633d |
if( mb3dChart )
|
|
|
f0633d |
- xCoordSystem = css::chart2::PolarCoordinateSystem2d::create(xContext);
|
|
|
f0633d |
- else
|
|
|
f0633d |
xCoordSystem = css::chart2::PolarCoordinateSystem3d::create(xContext);
|
|
|
f0633d |
+ else
|
|
|
f0633d |
+ xCoordSystem = css::chart2::PolarCoordinateSystem2d::create(xContext);
|
|
|
f0633d |
}
|
|
|
f0633d |
else
|
|
|
f0633d |
{
|
|
|
f0633d |
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
|
|
|
f0633d |
index e07d1d4..10d858a 100644
|
|
|
f0633d |
--- a/sc/source/filter/excel/xichart.cxx
|
|
|
f0633d |
+++ b/sc/source/filter/excel/xichart.cxx
|
|
|
f0633d |
@@ -2328,9 +2328,9 @@ Reference< XCoordinateSystem > XclImpChType::CreateCoordSystem( bool b3dChart )
|
|
|
f0633d |
if( maTypeInfo.mbPolarCoordSystem )
|
|
|
f0633d |
{
|
|
|
f0633d |
if( b3dChart )
|
|
|
f0633d |
- xCoordSystem = css::chart2::PolarCoordinateSystem2d::create(xContext);
|
|
|
f0633d |
- else
|
|
|
f0633d |
xCoordSystem = css::chart2::PolarCoordinateSystem3d::create(xContext);
|
|
|
f0633d |
+ else
|
|
|
f0633d |
+ xCoordSystem = css::chart2::PolarCoordinateSystem2d::create(xContext);
|
|
|
f0633d |
}
|
|
|
f0633d |
else
|
|
|
f0633d |
{
|
|
|
f0633d |
--
|
|
|
f0633d |
1.8.4.2
|
|
|
f0633d |
|