[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - oox/source

[Radek Doulík]

 oox/source/drawingml/customshapegeometry.cxx |    2 +-
 oox/source/drawingml/customshapepresets1.cxx |    2 +-
 oox/source/drawingml/customshapepresets2.cxx |    4 ++--
 oox/source/drawingml/customshapepresets4.cxx |    2 +-
 oox/source/drawingml/customshapepresets6.cxx |    6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit ec2d500c094c1c64c9b0dc4e90d0943d06349e77
Author: Radek Doulik <rodo at novell.com>
Date:   Wed Jan 4 16:08:25 2012 +0100

    regenerated custom shape presets with fixed ssd* constants

diff --git a/oox/source/drawingml/customshapepresets1.cxx b/oox/source/drawingml/customshapepresets1.cxx
index faf8841..beebc82 100644
--- a/oox/source/drawingml/customshapepresets1.cxx
+++ b/oox/source/drawingml/customshapepresets1.cxx
@@ -16003,7 +16003,7 @@ void CustomShapeProperties::initializePresetsMap1()
         aStringSequence[79] = CREATE_OUSTRING ("?15 +?75 -0");
         aStringSequence[80] = CREATE_OUSTRING ("?26 +?76 -0");
         aStringSequence[81] = CREATE_OUSTRING ("?26 +0-?38 ");
-        aStringSequence[82] = CREATE_OUSTRING ("min(logwidth,logheight)/50");
+        aStringSequence[82] = CREATE_OUSTRING ("min(logwidth,logheight)/2");
         aStringSequence[83] = CREATE_OUSTRING ("logheight");
         aStringSequence[84] = CREATE_OUSTRING ("logwidth");
         aPropertyMap [PROP_Equations] <<= aStringSequence;
diff --git a/oox/source/drawingml/customshapepresets2.cxx b/oox/source/drawingml/customshapepresets2.cxx
index 2dda792..36d79b5 100644
--- a/oox/source/drawingml/customshapepresets2.cxx
+++ b/oox/source/drawingml/customshapepresets2.cxx
@@ -3433,7 +3433,7 @@ void CustomShapeProperties::initializePresetsMap2()
         aStringSequence[101] = CREATE_OUSTRING ("?17 +?97 -0");
         aStringSequence[102] = CREATE_OUSTRING ("?32 +?98 -0");
         aStringSequence[103] = CREATE_OUSTRING ("?32 +0-?48 ");
-        aStringSequence[104] = CREATE_OUSTRING ("min(logwidth,logheight)/50");
+        aStringSequence[104] = CREATE_OUSTRING ("min(logwidth,logheight)/2");
         aStringSequence[105] = CREATE_OUSTRING ("logheight");
         aStringSequence[106] = CREATE_OUSTRING ("logwidth");
         aPropertyMap [PROP_Equations] <<= aStringSequence;
@@ -17494,7 +17494,7 @@ void CustomShapeProperties::initializePresetsMap2()
     }
     {
         Sequence< OUString > aStringSequence (18);
-        aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)/54");
+        aStringSequence[0] = CREATE_OUSTRING ("min(logwidth,logheight)/6");
         aStringSequence[1] = CREATE_OUSTRING ("logwidth+0-?0 ");
         aStringSequence[2] = CREATE_OUSTRING ("logheight+0-?0 ");
         aStringSequence[3] = CREATE_OUSTRING ("?0 *29289/100000");
diff --git a/oox/source/drawingml/customshapepresets4.cxx b/oox/source/drawingml/customshapepresets4.cxx
index 185cec2..f99ad2c 100644
--- a/oox/source/drawingml/customshapepresets4.cxx
+++ b/oox/source/drawingml/customshapepresets4.cxx
@@ -7628,7 +7628,7 @@ void CustomShapeProperties::initializePresetsMap4()
         aStringSequence[4] = CREATE_OUSTRING ("logheight*?0 /100000");
         aStringSequence[5] = CREATE_OUSTRING ("?1 *?3 /100000");
         aStringSequence[6] = CREATE_OUSTRING ("logwidth+0-?5 ");
-        aStringSequence[7] = CREATE_OUSTRING ("min(logwidth,logheight)/56");
+        aStringSequence[7] = CREATE_OUSTRING ("min(logwidth,logheight)/8");
         aStringSequence[8] = CREATE_OUSTRING ("0+?7 -0");
         aStringSequence[9] = CREATE_OUSTRING ("5400000*1/14");
         aStringSequence[10] = CREATE_OUSTRING ("?7 *tan(pi*(?9 )/10800000)");
diff --git a/oox/source/drawingml/customshapepresets6.cxx b/oox/source/drawingml/customshapepresets6.cxx
index b100a29..77d7145 100644
--- a/oox/source/drawingml/customshapepresets6.cxx
+++ b/oox/source/drawingml/customshapepresets6.cxx
@@ -693,9 +693,9 @@ void CustomShapeProperties::initializePresetsMap6()
         aStringSequence[13] = CREATE_OUSTRING ("logwidth+0-?12 ");
         aStringSequence[14] = CREATE_OUSTRING ("logheight");
         aStringSequence[15] = CREATE_OUSTRING ("logwidth");
-        aStringSequence[16] = CREATE_OUSTRING ("min(logwidth,logheight)/80");
-        aStringSequence[17] = CREATE_OUSTRING ("min(logwidth,logheight)/64");
-        aStringSequence[18] = CREATE_OUSTRING ("min(logwidth,logheight)/56");
+        aStringSequence[16] = CREATE_OUSTRING ("min(logwidth,logheight)/32");
+        aStringSequence[17] = CREATE_OUSTRING ("min(logwidth,logheight)/16");
+        aStringSequence[18] = CREATE_OUSTRING ("min(logwidth,logheight)/8");
         aPropertyMap [PROP_Equations] <<= aStringSequence;
     }
     {
commit 7f1fbec21e94b4074fb53d8614c1392863e510a3
Author: Radek Doulik <rodo at novell.com>
Date:   Wed Jan 4 16:07:59 2012 +0100

    PPTX: fix ssd* constants import for drawingml formulas

diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index cd75285..6e93cdd 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -338,7 +338,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
                 nIntVal += 2;
             case XML_ssd2 :  // */ ss 1.0 2.0
             {
-                nIntVal += '2';
+                nIntVal += 2;
 
                 CustomShapeGuide aGuide;
                 aGuide.maName = rValue;