[Libreoffice-commits] core.git: oox/source
Zhengqiang Wang
qiang_jsj at live.cn
Thu Jun 23 10:06:53 UTC 2016
oox/source/drawingml/customshapeproperties.cxx | 6 +++---
oox/source/drawingml/customshapes/oox-drawingml-cs-presets | 2 +-
oox/source/drawingml/customshapes/presetShapeDefinitions.xml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 45909a8e7ec2c4ef366836ab6bf975a6c2fdd007
Author: Zhengqiang Wang <qiang_jsj at live.cn>
Date: Thu Jun 2 11:35:24 2016 +0800
tdf#100153 modify noSmoking shape
*modify customshapeproperties.cxx
fix compile error : make oox dbglevel=2
The define of dumpCode() has been removed by c714b43b0137ad253f51e1c65417c9874b8509e5
*modify presetShapeDefinitions.xml
fix noSmoking shape
*modfiy oox-drawingml-cs-presets
this file is generated by presetShapeDefinitions.xml
Change-Id: I383d6b6961b546585035afd8c1a4398385a11914
Reviewed-on: https://gerrit.libreoffice.org/25801
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: jan iversen <jani at documentfoundation.org>
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index 0182102..daf178d 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -147,7 +147,7 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi
aPropertyMap = maPresetDataMap[mnShapePresetType];
#ifdef DEBUG
- aPropertyMap.dumpCode();
+ aPropertyMap.dumpCode( aPropertyMap.makePropertySet() );
#endif
}
@@ -373,10 +373,10 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi
#ifdef DEBUG
SAL_INFO("oox.cscode", "==cscode== begin");
- aPropertyMap.dumpCode();
+ aPropertyMap.dumpCode( aPropertyMap.makePropertySet() );
SAL_INFO("oox.cscode", "==cscode== end");
SAL_INFO("oox.csdata", "==csdata== begin");
- aPropertyMap.dumpData();
+ aPropertyMap.dumpData( aPropertyMap.makePropertySet() );
SAL_INFO("oox.csdata", "==csdata== end");
#endif
// converting the vector to a sequence
diff --git a/oox/source/drawingml/customshapes/oox-drawingml-cs-presets b/oox/source/drawingml/customshapes/oox-drawingml-cs-presets
index e03f33d..c4f7a34 100644
--- a/oox/source/drawingml/customshapes/oox-drawingml-cs-presets
+++ b/oox/source/drawingml/customshapes/oox-drawingml-cs-presets
@@ -2195,7 +2195,7 @@ ViewBox
AdjustmentValues
([]com.sun.star.drawing.EnhancedCustomShapeAdjustmentValue) { { Value = (any) { (long) 18750 }, State = (com.sun.star.beans.PropertyState) DIRECT_VALUE, Name = "adj" } }
Equations
-([]string) { "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))", "min(logwidth,logheight)", "?1 *?0 /100000", "logwidth/2", "?3 +0-?2 ", "logheight/2", "?5 +0-?2 ", "(10800000*atan2(logheight,logwidth))/pi", "?6 *cos(pi*(?7 )/10800000)", "?4 *sin(pi*(?7 )/10800000)", "sqrt(?8 *?8 +?9 *?9 +0*0)", "?4 *?6 /?10 ", "?2 *1/2", "(10800000*atan2(?12 ,?11 ))/pi", "?13 *2/1", "-10800000+2-0", "(10800000*atan2(logheight,logwidth))/pi", "?16 +0-?13 ", "?17 +0-10800000", "?6 *cos(pi*(?17 )/10800000)", "?4 *sin(pi*(?17 )/10800000)", "sqrt(?19 *?19 +?20 *?20 +0*0)", "?4 *?6 /?21 ", "?22 *cos(pi*(?17 )/10800000)", "?22 *sin(pi*(?17 )/10800000)", "logwidth/2", "?25 +?23 -0", "logheight/2", "?27 +?24 -0", "?25 +0-?23 ", "?27 +0-?24 ", "?3 *cos(pi*(2700000)/10800000)", "?5 *sin(pi*(2700000)/10800000)", "?25 +0-?31 ", "?25 +?31 -0", "?27 +0-?32 ", "?27 +?32 -0", "logheight", "logwidth", "(10800000)/60000.0", "(5400000)/60000.0", "(16200000)/60000.0", "(5400000)/60000.0", "(0)/60000.0", "(5400000)/60000.0", "(54000
00)/60000.0", "(5400000)/60000.0", "(?17 )/60000.0", "(?15 )/60000.0", "(?18 )/60000.0", "(?15 )/60000.0" }
+([]string) { "if(0-$0 ,0,if(50000-$0 ,$0 ,50000))", "min(logwidth,logheight)", "?1 *?0 /100000", "logwidth/2", "?3 +0-?2 ", "logheight/2", "?5 +0-?2 ", "(10800000*atan2(logheight,logwidth))/pi", "?6 *cos(pi*(?7 )/10800000)", "?4 *sin(pi*(?7 )/10800000)", "sqrt(?8 *?8 +?9 *?9 +0*0)", "?4 *?6 /?10 ", "?2 *1/2", "(10800000*atan2(?12 ,?11 ))/pi", "?13 *2/1", "-10800000+?14 -0", "(10800000*atan2(logheight,logwidth))/pi", "?16 +0-?13 ", "?17 +0-10800000", "?6 *cos(pi*(?17 )/10800000)", "?4 *sin(pi*(?17 )/10800000)", "sqrt(?19 *?19 +?20 *?20 +0*0)", "?4 *?6 /?21 ", "?22 *cos(pi*(?17 )/10800000)", "?22 *sin(pi*(?17 )/10800000)", "logwidth/2", "?25 +?23 -0", "logheight/2", "?27 +?24 -0", "?25 +0-?23 ", "?27 +0-?24 ", "?3 *cos(pi*(2700000)/10800000)", "?5 *sin(pi*(2700000)/10800000)", "?25 +0-?31 ", "?25 +?31 -0", "?27 +0-?32 ", "?27 +?32 -0", "logheight", "logwidth", "(10800000)/60000.0", "(5400000)/60000.0", "(16200000)/60000.0", "(5400000)/60000.0", "(0)/60000.0", "(5400000)/60000.0", "(54
00000)/60000.0", "(5400000)/60000.0", "(?17 )/60000.0", "(?15 )/60000.0", "(?18 )/60000.0", "(?15 )/60000.0" }
Handles
([][]com.sun.star.beans.PropertyValue) { { { Name = "Position", Handle = (long) 0, Value = (any) { (com.sun.star.drawing.EnhancedCustomShapeParameterPair) { First = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 2 }, Type = (short) 1 }, Second = (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 27 }, Type = (short) 1 } } }, State = (com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name = "RadiusRangeMaximum", Handle = (long) 0, Value = (any) { (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 50000 }, Type = (short) 0 } }, State = (com.sun.star.beans.PropertyState) DIRECT_VALUE }, { Name = "RadiusRangeMinimum", Handle = (long) 0, Value = (any) { (com.sun.star.drawing.EnhancedCustomShapeParameter) { Value = (any) { (long) 0 }, Type = (short) 0 } }, State = (com.sun.star.beans.PropertyState) DIRECT_VALUE } } }
MirroredX
diff --git a/oox/source/drawingml/customshapes/presetShapeDefinitions.xml b/oox/source/drawingml/customshapes/presetShapeDefinitions.xml
index ce44fd3..b425872 100644
--- a/oox/source/drawingml/customshapes/presetShapeDefinitions.xml
+++ b/oox/source/drawingml/customshapes/presetShapeDefinitions.xml
@@ -13768,8 +13768,8 @@
<gd name="n" fmla="*/ iwd2 ihd2 m" />
<gd name="drd2" fmla="*/ dr 1 2" />
<gd name="dang" fmla="at2 n drd2" />
- <gd name="2dang" fmla="*/ dang 2 1" />
- <gd name="swAng" fmla="+- -10800000 2dang 0" />
+ <gd name="dang2" fmla="*/ dang 2 1" />
+ <gd name="swAng" fmla="+- -10800000 dang2 0" />
<gd name="t3" fmla="at2 w h" />
<gd name="stAng1" fmla="+- t3 0 dang" />
<gd name="stAng2" fmla="+- stAng1 0 cd2" />
More information about the Libreoffice-commits
mailing list