extras/source/templates/presnt/Growing_Liberty/content.xml | 90 ++---
svx/source/customshapes/EnhancedCustomShapeGeometry.cxx| 18 +-
2 files changed, 54 insertions(+), 54 deletions(-)
New commits:
commit 48dffbd86ea2893c589e816bce2e974edb2cf344
Author: khushishikhu
AuthorDate: Sat Oct 28 03:25:52 2023 +0530
Commit: Ilmari Lauhakangas
CommitDate: Thu Nov 2 07:54:30 2023 +0100
tdf#157956 convert ellipses to quarter rounded circle
The change is about corner rounding of a 'Flowchart Alternate Process'
shape. The quarter circles remain circles even after stretching the shape.
Change-Id: I4ecaba9a9f39cfb797e248eb4728ed7dea844f5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158580
Tested-by: Jenkins
Reviewed-by: Regina Henschel
Tested-by: Ilmari Lauhakangas
Reviewed-by: Ilmari Lauhakangas
diff --git a/extras/source/templates/presnt/Growing_Liberty/content.xml
b/extras/source/templates/presnt/Growing_Liberty/content.xml
index 7f9072dea369..06802c9aaa31 100644
--- a/extras/source/templates/presnt/Growing_Liberty/content.xml
+++ b/extras/source/templates/presnt/Growing_Liberty/content.xml
@@ -1187,15 +1187,15 @@
Lorem ipsum dolor sit amet,
consectetuer adipiscing elit.
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -1208,15 +1208,15 @@
Lorem ipsum dolor sit amet,
consectetuer adipiscing elit.
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -1229,15 +1229,15 @@
Lorem ipsum dolor sit amet,
consectetuer adipiscing elit.
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -1250,15 +1250,15 @@
Lorem ipsum dolor sit amet,
consectetuer adipiscing elit.
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -1301,15 +1301,15 @@
Lorem ipsum dolor sit amet,
consectetuer adipiscing elit.
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index a4b991efb6a5..8e9ee89fb716 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -4957,14 +4957,14 @@ const sal_uInt16 mso_sptFlowChartAlternateProcessSegm[]
=
};
const SvxMSDffCalculationData mso_sptFlowChartAlternateProcessCalc[] =
{
-{ 0x2000, { DFF_Prop_geoLeft, 2540, 0 } },
-{ 0x2000, { DFF_Prop_geoRight, 0, 2540 } },
-{ 0x2000, { DFF_Prop_geoTop, 2540, 0 } },
-{ 0x2000, { DFF_Prop_geoBottom, 0, 2540 } },
-{ 0x2000, { DFF_Prop_geoLeft, 800, 0 } },
-{ 0x2000, { DFF_Prop_geoRight, 0, 800 } },
-{ 0x2000, { DFF_Prop_geoTop, 800, 0 } },
-{ 0x2000, { DFF_Prop_geoBottom,0, 800 } }
+{ 0x2000, { DFF_Prop_geoLeft, 3600, 0 } },
+{ 0x2000, { DFF_Prop_geoRight, 0, 3600 } },
+{ 0x2000, { DFF_Prop_geoTop, 3600, 0 } },
+{ 0x2000, { DFF_Prop_geoBottom, 0, 3600 } },
+{ 0x2000, { DFF_Prop_geoLeft, 1054, 0 } },
+{ 0x2000, { DFF_Prop_geoRight, 0, 1054 } },
+{ 0x2000, { DFF_Prop_geoTop, 1054, 0 } },
+{ 0x2000, { DFF_Prop_geoBottom,0, 1054 } }
};
const SvxMSDffTextRectangles mso_sptFlowChartAlternateProcessTextRect[] =
{
@@ -4978,7 +4978,7 @@ const mso_CustomShape msoFlowChartAlternateProcess =
nullptr,
const_cast(mso_sptFlowChartAlternateProcessTextRect),
SAL_N_ELEMENTS( mso_sptFlowChartAlternateProcessTextRect ),
21600, 21600,
-MIN_INT32, MIN_INT32,
+10800, 10800,
const_cast(mso_sptStandardGluePoints), SAL_N_ELEMENTS(
mso_sptStandardGluePoints ),
nullptr, 0 // handles
};