summaryrefslogtreecommitdiff
path: root/chart2/source/view/main/ShapeFactory.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:05:12 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:05:12 +0200
commit912d939b74d4ac436d4eb7a473f8c314c34148d8 (patch)
tree9786710241c767f0f6917200c9318978b0d787dd /chart2/source/view/main/ShapeFactory.cxx
parentbc9a24765b3a6f97bda09afc07bf47151fed14e8 (diff)
recreated tag libreoffice-3.3.3.1 which had these commits:
commit 631630de93e96b82e3b94ee4b5c388e40305ff77 (tag: refs/tags/libreoffice-3.3.3.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue May 31 17:39:03 2011 +0200 Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1) commit 3152922a95e18814e32bcf8bc29c872077d05a65 Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Date: Wed May 4 09:06:08 2011 -0400 lp#775608: Libreoffice Calc's PRODUCT function doesn't calculate correctly. Signed-off-by: Kohei Yoshida <kyoshida@novell.com> sc/source/core/tool/interpr1.cxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 8f34ffa5677bfc86ef5aa33811955c577f8799c3 Author: Kohei Yoshida <kyoshida@novell.com> Date: Mon Mar 21 16:01:47 2011 -0400 Fix seg faults on sheet deletion. Sometimes a simple sheet removal causes segfault in certain types of documents. Not always reproducible, but this fix is certainly safer. (n#680272) Signed-off-by: Noel Power <nopower@novell.com> sc/source/ui/docshell/docfunc.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e54c3699db11dc1bcc7bd7fa069c9c4124715839 Author: Tibby Lickle <tibbylickle@googlemail.com> Date: Thu Mar 10 19:08:18 2011 +0000 Disabled auto-complete in Calc filter dialog - fix for bug 34898. A hyphen character caused auto-complete to kick in, changing the user's choice of conditional operator to "=". This was not changed back if auto-complete option is overridden. Signed-off-by: Kohei Yoshida <kyoshida@novell.com> sc/source/ui/dbgui/filtdlg.cxx | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
Notes
Notes: split repo tag: calc_libreoffice-3.3.3.1
Diffstat (limited to 'chart2/source/view/main/ShapeFactory.cxx')
-rw-r--r--chart2/source/view/main/ShapeFactory.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index f42036efa37f..dca76c9defa1 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -191,7 +191,7 @@ uno::Any createPolyPolygon_Cube(
const double fHeightSign = fHeight >= 0.0 ? 1.0 : -1.0;
- const double fOffset = (fWidthH * fRoundedEdge) * 1.05; // increase by 5% for safety
+ const double fOffset = (fWidthH * fRoundedEdge) * 1.05; // increase by 5% for safety
const bool bRoundEdges = fRoundedEdge && fOffset < fWidthH && 2.0 * fOffset < fHeightSign*fHeight;
const sal_Int32 nPointCount = bRoundEdges ? 13 : 5;
@@ -630,7 +630,7 @@ uno::Reference<drawing::XShape>
bool bInvertPolygon = false;
bool bInvertNormals = false;
-
+
if(bRotateZ)
{
//bars
@@ -677,7 +677,7 @@ uno::Reference<drawing::XShape>
aStripe3 = Stripe( aBottomP3, aTopP3, aTopP4, aBottomP4 );
aStripe4 = Stripe( aBottomP4, aTopP4, aTopP1, aBottomP1 );
}
-
+
Stripe aNormalsStripe1( aNormalsTopP1, aNormalsBottomP1, aNormalsBottomP2, aNormalsTopP2 );
Stripe aNormalsStripe2( aNormalsTopP2, aNormalsBottomP2, aNormalsBottomP3, aNormalsTopP3 );
Stripe aNormalsStripe3( aNormalsTopP3, aNormalsBottomP3, aNormalsBottomP4, aNormalsTopP4 );
@@ -690,12 +690,12 @@ uno::Reference<drawing::XShape>
aNormalsStripe3 = Stripe( aNormalsTopP4, aNormalsBottomP4, aNormalsBottomP3, aNormalsTopP3 );
aNormalsStripe4 = Stripe( aNormalsTopP1, aNormalsBottomP1, aNormalsBottomP4, aNormalsTopP4 );
}
-
+
aStripe1.SetManualNormal( aNormalsStripe1.getNormal() );
aStripe2.SetManualNormal( aNormalsStripe2.getNormal() );
aStripe3.SetManualNormal( aNormalsStripe3.getNormal() );
aStripe4.SetManualNormal( aNormalsStripe4.getNormal() );
-
+
const bool bFlatNormals = false;
ShapeFactory::createStripe( xGroup, aStripe1, xSourceProp, rPropertyNameMap, bDoubleSided, nRotatedTexture, bFlatNormals );
ShapeFactory::createStripe( xGroup, aStripe2, xSourceProp, rPropertyNameMap, bDoubleSided, nRotatedTexture, bFlatNormals );
@@ -730,7 +730,7 @@ uno::Reference<drawing::XShape>
m_xShapeFactory->createInstance( C2U(
"com.sun.star.drawing.Shape3DLatheObject") ), uno::UNO_QUERY );
xTarget->add(xShape);
-
+
double fWidth = rSize.DirectionX/2.0; //The depth will be corrrected within Matrix
double fRadius = fWidth; //!!!!!!!! problem in drawing layer: rotation object calculates wrong needed size -> wrong camera (it's a problem with bounding boxes)
double fHeight = rSize.DirectionY;