svx/source/customshapes/EnhancedCustomShapeGeometry.cxx | 83 ++++++++--------
1 file changed, 43 insertions(+), 40 deletions(-)
New commits:
commit 2ec19ed78289670c90d19583ad4da7a3e3311bef
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Aug 14 20:10:02 2013 +0200
fix warning: multi-line comment [-Werror=comment]
Change-Id: Ifec7cdefb48bca1a6e025cdd3e5f0c9285c5fb95
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index 5e7b437..e1ca88f 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -388,46 +388,49 @@ static const mso_CustomShape msoTrapezoid =
(SvxMSDffHandle*)mso_sptTrapezoidHandle, SAL_N_ELEMENTS(
mso_sptTrapezoidHandle ) // handles
};
-// The side of the enclosing square for the regular (all sides the
-// same, all angles the same) octagon described below is 21600. Let's
-// call that 'a'.
-
-// The "adjustment1" is the horizontal (or vertical) distance from a
-// side of the square to the nearest vertex. Let's call that 'd'.
-
-// Let's call the side of the regular octagon 'b'.
-
-// We know a. We want d. d=(a-b)/2
-
-// Pythagoras says that b^2 = 2d^2
-
-// Solving for b, we get b = (sqrt(2)-1)a
-
-
-// !------------a=21600-------!
-//
-// !--d--!
-// x--------------x
-// / \
-// / \
-// / \
-// / \
-// / \
-// x x
-// ! !
-// ! !
-// ! !
-// ! !
-// ! !
-// ! !
-// x x
-// \ /
-// \ /
-// \ /
-// \ /
-// \ /
-// x--------------x
-//
+/*
+
+ The side of the enclosing square for the regular (all sides the
+ same, all angles the same) octagon described below is 21600. Let's
+ call that 'a'.
+
+ The "adjustment1" is the horizontal (or vertical) distance from a
+ side of the square to the nearest vertex. Let's call that 'd'.
+
+ Let's call the side of the regular octagon 'b'.
+
+ We know a. We want d. d=(a-b)/2
+
+ Pythagoras says that b^2 = 2d^2
+
+ Solving for b, we get b = (sqrt(2)-1)a
+
+
+ !------------a=21600-------!
+
+ !--d--!
+ x--------------x
+ / \
+ / \
+ / \
+ / \
+ / \
+ x x
+ ! !
+ ! !
+ ! !
+ ! !
+ ! !
+ ! !
+ x x
+ \ /
+ \ /
+ \ /
+ \ /
+ \ /
+ x--------------x
+
+*/
static const SvxMSDffVertPair mso_sptOctagonVert[] = // adjustment1 : 0
- 10800
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
