summaryrefslogtreecommitdiff
path: root/drawinglayer/source
diff options
context:
space:
mode:
authorArmin Weiss <aw@openoffice.org>2008-03-19 03:35:22 +0000
committerArmin Weiss <aw@openoffice.org>2008-03-19 03:35:22 +0000
commit746ce24e03faa4d4d4bc117985717d4acd329231 (patch)
tree4059c5d750cc4718aa7fd39297aadb4cd9dd2340 /drawinglayer/source
parentce2d2b93fcbea1936439f8ba5a99b5e7a0d822d6 (diff)
#i39532# chart adaptions for 3D
Diffstat (limited to 'drawinglayer/source')
-rw-r--r--drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx20
-rw-r--r--drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx8
-rw-r--r--drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx8
3 files changed, 22 insertions, 14 deletions
diff --git a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
index 486ce9ec30d8..39bba2a0800c 100644
--- a/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: sdrextrudelathetools3d.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: aw $ $Date: 2008-03-13 08:22:01 $
+ * last change: $Author: aw $ $Date: 2008-03-19 04:35:22 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -541,21 +541,25 @@ namespace drawinglayer
basegfx::B3DPolyPolygon& rLine,
const Slice3DVector& rSliceVector,
bool bClosed,
- bool bReducedLineGeometry)
+ bool bAddHorizontal,
+ bool bAddVertical)
{
const sal_uInt32 nNumSlices(rSliceVector.size());
if(nNumSlices)
{
// Slice3Ds self
- for(sal_uInt32 a(0L); a < nNumSlices; a++)
- {
- rLine.append(rSliceVector[a].getB3DPolyPolygon());
+ if(bAddVertical)
+ {
+ for(sal_uInt32 a(0L); a < nNumSlices; a++)
+ {
+ rLine.append(rSliceVector[a].getB3DPolyPolygon());
+ }
}
// horizontal
- if(!bReducedLineGeometry)
- {
+ if(bAddHorizontal)
+ {
const basegfx::B3DPolyPolygon& aFirstPolyPolygon(rSliceVector[0L].getB3DPolyPolygon());
const sal_uInt32 nPolygonCount(aFirstPolyPolygon.count());
diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
index 353b8e4f1953..6326aa6d78c8 100644
--- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: sdrextrudeprimitive3d.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: aw $ $Date: 2008-03-13 08:22:02 $
+ * last change: $Author: aw $ $Date: 2008-03-19 04:35:22 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -210,7 +210,9 @@ namespace drawinglayer
if(getSdrLFSAttribute().getLine())
{
basegfx::B3DPolyPolygon aLine;
- extractLinesFromSlice(aLine, rSliceVector, false, getSdr3DObjectAttribute().getReducedLineGeometry());
+ extractLinesFromSlice(aLine, rSliceVector, false,
+ !getSdr3DObjectAttribute().getReducedLineGeometry(),
+ true);
const Primitive3DSequence aLines(create3DPolyPolygonLinePrimitives(aLine, getTransform(), *getSdrLFSAttribute().getLine()));
appendPrimitive3DSequenceToPrimitive3DSequence(aRetval, aLines);
}
diff --git a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
index 261c13c75ebf..0bd1aafbe461 100644
--- a/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: sdrlatheprimitive3d.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: aw $ $Date: 2008-03-13 08:22:02 $
+ * last change: $Author: aw $ $Date: 2008-03-19 04:35:22 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -204,7 +204,9 @@ namespace drawinglayer
if(getSdrLFSAttribute().getLine())
{
basegfx::B3DPolyPolygon aLine;
- extractLinesFromSlice(aLine, rSliceVector, bClosedRotation, getSdr3DObjectAttribute().getReducedLineGeometry());
+ extractLinesFromSlice(aLine, rSliceVector, bClosedRotation,
+ true,
+ !getSdr3DObjectAttribute().getReducedLineGeometry());
const Primitive3DSequence aLines(create3DPolyPolygonLinePrimitives(aLine, getTransform(), *getSdrLFSAttribute().getLine()));
appendPrimitive3DSequenceToPrimitive3DSequence(aRetval, aLines);
}