diff options
Diffstat (limited to 'oox/source/drawingml/customshapepresets2.cxx')
-rw-r--r-- | oox/source/drawingml/customshapepresets2.cxx | 109 |
1 files changed, 89 insertions, 20 deletions
diff --git a/oox/source/drawingml/customshapepresets2.cxx b/oox/source/drawingml/customshapepresets2.cxx index accc83071bc5..cda315bad025 100644 --- a/oox/source/drawingml/customshapepresets2.cxx +++ b/oox/source/drawingml/customshapepresets2.cxx @@ -4,6 +4,7 @@ #include "oox/drawingml/customshapeproperties.hxx" #include "oox/token/tokenmap.hxx" #include <com/sun/star/awt/Rectangle.hpp> +#include <com/sun/star/awt/Size.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> @@ -706,7 +707,7 @@ void CustomShapeProperties::initializePresetsMap2() aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False); } { - Sequence< PropertyValue > aPropSequence (3); + Sequence< PropertyValue > aPropSequence (4); { aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (4); @@ -814,7 +815,18 @@ void CustomShapeProperties::initializePresetsMap2() aPropSequence [1].Value = makeAny (aSegmentSeq); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + Sequence< awt::Size > aSizeSequence (1); + { + awt::Size aSize; + aSize.Width = 5; + aSize.Height = 5; + aSizeSequence [0] = aSize; + } + aPropSequence [2].Value = makeAny (aSizeSequence); + } + { + aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -856,7 +868,7 @@ void CustomShapeProperties::initializePresetsMap2() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -864,8 +876,8 @@ void CustomShapeProperties::initializePresetsMap2() awt::Rectangle aRectangle; aRectangle.X = 0; aRectangle.Y = 0; - aRectangle.Width = 5; - aRectangle.Height = 5; + aRectangle.Width = 0; + aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartManualOperation"); @@ -4821,7 +4833,7 @@ void CustomShapeProperties::initializePresetsMap2() aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False); } { - Sequence< PropertyValue > aPropSequence (3); + Sequence< PropertyValue > aPropSequence (4); { aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (12); @@ -5145,7 +5157,30 @@ void CustomShapeProperties::initializePresetsMap2() aPropSequence [1].Value = makeAny (aSegmentSeq); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + Sequence< awt::Size > aSizeSequence (3); + { + awt::Size aSize; + aSize.Width = 1; + aSize.Height = 1; + aSizeSequence [0] = aSize; + } + { + awt::Size aSize; + aSize.Width = 8; + aSize.Height = 8; + aSizeSequence [1] = aSize; + } + { + awt::Size aSize; + aSize.Width = 1; + aSize.Height = 1; + aSizeSequence [2] = aSize; + } + aPropSequence [2].Value = makeAny (aSizeSequence); + } + { + aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5187,7 +5222,7 @@ void CustomShapeProperties::initializePresetsMap2() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -5195,8 +5230,8 @@ void CustomShapeProperties::initializePresetsMap2() awt::Rectangle aRectangle; aRectangle.X = 0; aRectangle.Y = 0; - aRectangle.Width = 1; - aRectangle.Height = 1; + aRectangle.Width = 0; + aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartInternalStorage"); @@ -5646,7 +5681,7 @@ void CustomShapeProperties::initializePresetsMap2() aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False); } { - Sequence< PropertyValue > aPropSequence (3); + Sequence< PropertyValue > aPropSequence (4); { aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (28); @@ -6186,7 +6221,18 @@ void CustomShapeProperties::initializePresetsMap2() aPropSequence [1].Value = makeAny (aSegmentSeq); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + Sequence< awt::Size > aSizeSequence (1); + { + awt::Size aSize; + aSize.Width = 21600; + aSize.Height = 21600; + aSizeSequence [0] = aSize; + } + aPropSequence [2].Value = makeAny (aSizeSequence); + } + { + aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6228,7 +6274,7 @@ void CustomShapeProperties::initializePresetsMap2() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -6236,8 +6282,8 @@ void CustomShapeProperties::initializePresetsMap2() awt::Rectangle aRectangle; aRectangle.X = 0; aRectangle.Y = 0; - aRectangle.Width = 21600; - aRectangle.Height = 21600; + aRectangle.Width = 0; + aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-irregularSeal2"); @@ -16833,7 +16879,7 @@ void CustomShapeProperties::initializePresetsMap2() aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False); } { - Sequence< PropertyValue > aPropSequence (3); + Sequence< PropertyValue > aPropSequence (4); { aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (10); @@ -17109,7 +17155,30 @@ void CustomShapeProperties::initializePresetsMap2() aPropSequence [1].Value = makeAny (aSegmentSeq); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + Sequence< awt::Size > aSizeSequence (3); + { + awt::Size aSize; + aSize.Width = 2; + aSize.Height = 2; + aSizeSequence [0] = aSize; + } + { + awt::Size aSize; + aSize.Width = 2; + aSize.Height = 2; + aSizeSequence [1] = aSize; + } + { + awt::Size aSize; + aSize.Width = 2; + aSize.Height = 2; + aSizeSequence [2] = aSize; + } + aPropSequence [2].Value = makeAny (aSizeSequence); + } + { + aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -17151,7 +17220,7 @@ void CustomShapeProperties::initializePresetsMap2() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -17159,8 +17228,8 @@ void CustomShapeProperties::initializePresetsMap2() awt::Rectangle aRectangle; aRectangle.X = 0; aRectangle.Y = 0; - aRectangle.Width = 2; - aRectangle.Height = 2; + aRectangle.Width = 0; + aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartSort"); |