summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorRadek Doulik <rodo@novell.com>2012-01-04 16:08:25 +0100
committerRadek Doulik <rodo@novell.com>2012-01-04 16:09:48 +0100
commit737324f9097675a67d75995534aa5d9886647329 (patch)
tree759a71f63d6fd4d537db47b0e5626ddac60221a0 /oox
parent56c40a010ea0e5c0473d8e0e63e8d1f832cafb1c (diff)
regenerated custom shape presets with fixed ssd* constants
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/customshapepresets1.cxx2
-rw-r--r--oox/source/drawingml/customshapepresets2.cxx4
-rw-r--r--oox/source/drawingml/customshapepresets4.cxx2
-rw-r--r--oox/source/drawingml/customshapepresets6.cxx6
4 files changed, 7 insertions, 7 deletions
diff --git a/oox/source/drawingml/customshapepresets1.cxx b/oox/source/drawingml/customshapepresets1.cxx
index faf8841e3bbf..beebc82841bd 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 2dda7922a460..36d79b544c8f 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 185cec237ccb..f99ad2ce0cfd 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 b100a29def1c..77d71451ae9a 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;
}
{