diff options
author | Radek Doulik <rodo@novell.com> | 2012-01-19 09:46:11 +0100 |
---|---|---|
committer | Radek Doulik <rodo@novell.com> | 2012-01-19 09:46:53 +0100 |
commit | b342887856c3cadced2a1f57f6e829daf285955c (patch) | |
tree | f633cd6c5bb9e30405d6b93e25c54f0a151c75ec /oox | |
parent | 76049db15945284b54bd84b3503839143c387510 (diff) |
regenerated custom shapes presets
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/drawingml/customshapepresets1.cxx | 87 | ||||
-rw-r--r-- | oox/source/drawingml/customshapepresets2.cxx | 109 | ||||
-rw-r--r-- | oox/source/drawingml/customshapepresets3.cxx | 184 | ||||
-rw-r--r-- | oox/source/drawingml/customshapepresets4.cxx | 150 | ||||
-rw-r--r-- | oox/source/drawingml/customshapepresets5.cxx | 201 | ||||
-rw-r--r-- | oox/source/drawingml/customshapepresets6.cxx | 46 |
6 files changed, 628 insertions, 149 deletions
diff --git a/oox/source/drawingml/customshapepresets1.cxx b/oox/source/drawingml/customshapepresets1.cxx index 6aa00d54e6f4..34567cdb44ca 100644 --- a/oox/source/drawingml/customshapepresets1.cxx +++ b/oox/source/drawingml/customshapepresets1.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> @@ -10888,7 +10889,7 @@ void CustomShapeProperties::initializePresetsMap1() 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 (6); @@ -11032,7 +11033,18 @@ void CustomShapeProperties::initializePresetsMap1() 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 = 10; + aSize.Height = 10; + aSizeSequence [0] = aSize; + } + aPropSequence [2].Value = makeAny (aSizeSequence); + } + { + aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -11074,7 +11086,7 @@ void CustomShapeProperties::initializePresetsMap1() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -11082,8 +11094,8 @@ void CustomShapeProperties::initializePresetsMap1() awt::Rectangle aRectangle; aRectangle.X = 0; aRectangle.Y = 0; - aRectangle.Width = 10; - aRectangle.Height = 10; + aRectangle.Width = 0; + aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartPreparation"); @@ -11943,7 +11955,7 @@ void CustomShapeProperties::initializePresetsMap1() aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False); } { - Sequence< PropertyValue > aPropSequence (2); + Sequence< PropertyValue > aPropSequence (3); { aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (10); @@ -12212,14 +12224,31 @@ void CustomShapeProperties::initializePresetsMap1() } aPropSequence [1].Value = makeAny (aSegmentSeq); } + { + aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + Sequence< awt::Size > aSizeSequence (2); + { + awt::Size aSize; + aSize.Width = 10; + aSize.Height = 10; + aSizeSequence [0] = aSize; + } + { + awt::Size aSize; + aSize.Width = 10; + aSize.Height = 10; + aSizeSequence [1] = aSize; + } + aPropSequence [2].Value = makeAny (aSizeSequence); + } aPropertyMap [PROP_Path] <<= aPropSequence; } { awt::Rectangle aRectangle; aRectangle.X = 0; aRectangle.Y = 0; - aRectangle.Width = 10; - aRectangle.Height = 10; + aRectangle.Width = 0; + aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-chartStar"); @@ -13542,7 +13571,7 @@ void CustomShapeProperties::initializePresetsMap1() 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 (5); @@ -13668,7 +13697,18 @@ void CustomShapeProperties::initializePresetsMap1() 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 = 10; + aSize.Height = 10; + aSizeSequence [0] = aSize; + } + aPropSequence [2].Value = makeAny (aSizeSequence); + } + { + aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -13710,7 +13750,7 @@ void CustomShapeProperties::initializePresetsMap1() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -13718,8 +13758,8 @@ void CustomShapeProperties::initializePresetsMap1() awt::Rectangle aRectangle; aRectangle.X = 0; aRectangle.Y = 0; - aRectangle.Width = 10; - aRectangle.Height = 10; + aRectangle.Width = 0; + aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartOffpageConnector"); @@ -19926,7 +19966,7 @@ void CustomShapeProperties::initializePresetsMap1() 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); @@ -20034,7 +20074,18 @@ void CustomShapeProperties::initializePresetsMap1() 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 = 2; + aSize.Height = 2; + aSizeSequence [0] = aSize; + } + aPropSequence [2].Value = makeAny (aSizeSequence); + } + { + aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -20076,7 +20127,7 @@ void CustomShapeProperties::initializePresetsMap1() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -20084,8 +20135,8 @@ void CustomShapeProperties::initializePresetsMap1() 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-flowChartDecision"); 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"); diff --git a/oox/source/drawingml/customshapepresets3.cxx b/oox/source/drawingml/customshapepresets3.cxx index ca859635ea6e..93c0291ea63a 100644 --- a/oox/source/drawingml/customshapepresets3.cxx +++ b/oox/source/drawingml/customshapepresets3.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> @@ -3768,7 +3769,7 @@ void CustomShapeProperties::initializePresetsMap3() 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); @@ -4092,7 +4093,30 @@ void CustomShapeProperties::initializePresetsMap3() 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; @@ -4134,7 +4158,7 @@ void CustomShapeProperties::initializePresetsMap3() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -4142,8 +4166,8 @@ void CustomShapeProperties::initializePresetsMap3() 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-flowChartPredefinedProcess"); @@ -4187,7 +4211,7 @@ void CustomShapeProperties::initializePresetsMap3() 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); @@ -4415,7 +4439,18 @@ void CustomShapeProperties::initializePresetsMap3() 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 = 20; + aSize.Height = 20; + aSizeSequence [0] = aSize; + } + aPropSequence [2].Value = makeAny (aSizeSequence); + } + { + aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4457,7 +4492,7 @@ void CustomShapeProperties::initializePresetsMap3() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -4465,8 +4500,8 @@ void CustomShapeProperties::initializePresetsMap3() awt::Rectangle aRectangle; aRectangle.X = 0; aRectangle.Y = 0; - aRectangle.Width = 20; - aRectangle.Height = 20; + aRectangle.Width = 0; + aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartPunchedTape"); @@ -5951,7 +5986,7 @@ void CustomShapeProperties::initializePresetsMap3() 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 (15); @@ -6341,7 +6376,30 @@ void CustomShapeProperties::initializePresetsMap3() 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 = 6; + aSize.Height = 6; + aSizeSequence [0] = aSize; + } + { + awt::Size aSize; + aSize.Width = 6; + aSize.Height = 6; + aSizeSequence [1] = aSize; + } + { + awt::Size aSize; + aSize.Width = 6; + aSize.Height = 6; + aSizeSequence [2] = aSize; + } + aPropSequence [2].Value = makeAny (aSizeSequence); + } + { + aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -6383,7 +6441,7 @@ void CustomShapeProperties::initializePresetsMap3() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -6391,8 +6449,8 @@ void CustomShapeProperties::initializePresetsMap3() awt::Rectangle aRectangle; aRectangle.X = 0; aRectangle.Y = 0; - aRectangle.Width = 6; - aRectangle.Height = 6; + aRectangle.Width = 0; + aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartMagneticDisk"); @@ -9769,7 +9827,7 @@ void CustomShapeProperties::initializePresetsMap3() 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 (3); @@ -9859,7 +9917,18 @@ void CustomShapeProperties::initializePresetsMap3() 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 = 2; + aSize.Height = 2; + aSizeSequence [0] = aSize; + } + aPropSequence [2].Value = makeAny (aSizeSequence); + } + { + aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -9901,7 +9970,7 @@ void CustomShapeProperties::initializePresetsMap3() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -9909,8 +9978,8 @@ void CustomShapeProperties::initializePresetsMap3() 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-flowChartExtract"); @@ -11993,7 +12062,7 @@ void CustomShapeProperties::initializePresetsMap3() 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 (8); @@ -12233,7 +12302,30 @@ void CustomShapeProperties::initializePresetsMap3() 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 = 5; + aSize.Height = 5; + 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; @@ -12275,7 +12367,7 @@ void CustomShapeProperties::initializePresetsMap3() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -12283,8 +12375,8 @@ void CustomShapeProperties::initializePresetsMap3() 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-flowChartOfflineStorage"); @@ -12323,7 +12415,7 @@ void CustomShapeProperties::initializePresetsMap3() 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 (24); @@ -12791,7 +12883,18 @@ void CustomShapeProperties::initializePresetsMap3() 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; @@ -12833,7 +12936,7 @@ void CustomShapeProperties::initializePresetsMap3() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -12841,8 +12944,8 @@ void CustomShapeProperties::initializePresetsMap3() 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-irregularSeal1"); @@ -17633,7 +17736,7 @@ void CustomShapeProperties::initializePresetsMap3() 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 (7); @@ -17813,7 +17916,18 @@ void CustomShapeProperties::initializePresetsMap3() 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 = 6; + aSize.Height = 6; + aSizeSequence [0] = aSize; + } + aPropSequence [2].Value = makeAny (aSizeSequence); + } + { + aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -17855,7 +17969,7 @@ void CustomShapeProperties::initializePresetsMap3() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -17863,8 +17977,8 @@ void CustomShapeProperties::initializePresetsMap3() awt::Rectangle aRectangle; aRectangle.X = 0; aRectangle.Y = 0; - aRectangle.Width = 6; - aRectangle.Height = 6; + aRectangle.Width = 0; + aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartOnlineStorage"); diff --git a/oox/source/drawingml/customshapepresets4.cxx b/oox/source/drawingml/customshapepresets4.cxx index c62b4928da5e..9088ce3bdbb2 100644 --- a/oox/source/drawingml/customshapepresets4.cxx +++ b/oox/source/drawingml/customshapepresets4.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> @@ -450,7 +451,7 @@ void CustomShapeProperties::initializePresetsMap4() 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 (6); @@ -600,7 +601,18 @@ void CustomShapeProperties::initializePresetsMap4() 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; @@ -642,7 +654,7 @@ void CustomShapeProperties::initializePresetsMap4() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -650,8 +662,8 @@ void CustomShapeProperties::initializePresetsMap4() 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-flowChartDocument"); @@ -1931,7 +1943,7 @@ void CustomShapeProperties::initializePresetsMap4() aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False); } { - Sequence< PropertyValue > aPropSequence (2); + Sequence< PropertyValue > aPropSequence (3); { aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (8); @@ -2152,14 +2164,31 @@ void CustomShapeProperties::initializePresetsMap4() } aPropSequence [1].Value = makeAny (aSegmentSeq); } + { + aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + Sequence< awt::Size > aSizeSequence (2); + { + awt::Size aSize; + aSize.Width = 10; + aSize.Height = 10; + aSizeSequence [0] = aSize; + } + { + awt::Size aSize; + aSize.Width = 10; + aSize.Height = 10; + aSizeSequence [1] = aSize; + } + aPropSequence [2].Value = makeAny (aSizeSequence); + } aPropertyMap [PROP_Path] <<= aPropSequence; } { awt::Rectangle aRectangle; aRectangle.X = 0; aRectangle.Y = 0; - aRectangle.Width = 10; - aRectangle.Height = 10; + aRectangle.Width = 0; + aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-chartPlus"); @@ -2194,7 +2223,7 @@ void CustomShapeProperties::initializePresetsMap4() 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); @@ -2302,7 +2331,18 @@ void CustomShapeProperties::initializePresetsMap4() 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; @@ -2344,7 +2384,7 @@ void CustomShapeProperties::initializePresetsMap4() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -2352,8 +2392,8 @@ void CustomShapeProperties::initializePresetsMap4() 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-flowChartManualInput"); @@ -2387,7 +2427,7 @@ void CustomShapeProperties::initializePresetsMap4() 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 (3); @@ -2477,7 +2517,18 @@ void CustomShapeProperties::initializePresetsMap4() 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 = 2; + aSize.Height = 2; + aSizeSequence [0] = aSize; + } + aPropSequence [2].Value = makeAny (aSizeSequence); + } + { + aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -2519,7 +2570,7 @@ void CustomShapeProperties::initializePresetsMap4() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -2527,8 +2578,8 @@ void CustomShapeProperties::initializePresetsMap4() 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-flowChartMerge"); @@ -5621,7 +5672,7 @@ void CustomShapeProperties::initializePresetsMap4() 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); @@ -5729,7 +5780,18 @@ void CustomShapeProperties::initializePresetsMap4() 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; @@ -5771,7 +5833,7 @@ void CustomShapeProperties::initializePresetsMap4() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -5779,8 +5841,8 @@ void CustomShapeProperties::initializePresetsMap4() 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-flowChartInputOutput"); @@ -8738,7 +8800,7 @@ void CustomShapeProperties::initializePresetsMap4() 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 (11); @@ -8972,7 +9034,18 @@ void CustomShapeProperties::initializePresetsMap4() 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; @@ -9014,7 +9087,7 @@ void CustomShapeProperties::initializePresetsMap4() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -9022,8 +9095,8 @@ void CustomShapeProperties::initializePresetsMap4() 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-lightningBolt"); @@ -9060,7 +9133,7 @@ void CustomShapeProperties::initializePresetsMap4() 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 (6); @@ -9216,7 +9289,18 @@ void CustomShapeProperties::initializePresetsMap4() 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 = 6; + aSize.Height = 6; + aSizeSequence [0] = aSize; + } + aPropSequence [2].Value = makeAny (aSizeSequence); + } + { + aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -9258,7 +9342,7 @@ void CustomShapeProperties::initializePresetsMap4() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -9266,8 +9350,8 @@ void CustomShapeProperties::initializePresetsMap4() awt::Rectangle aRectangle; aRectangle.X = 0; aRectangle.Y = 0; - aRectangle.Width = 6; - aRectangle.Height = 6; + aRectangle.Width = 0; + aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartDisplay"); diff --git a/oox/source/drawingml/customshapepresets5.cxx b/oox/source/drawingml/customshapepresets5.cxx index 015cc6f54a05..a495162aa12d 100644 --- a/oox/source/drawingml/customshapepresets5.cxx +++ b/oox/source/drawingml/customshapepresets5.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> @@ -1725,7 +1726,7 @@ void CustomShapeProperties::initializePresetsMap5() 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 (5); @@ -1851,7 +1852,18 @@ void CustomShapeProperties::initializePresetsMap5() 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; @@ -1893,7 +1905,7 @@ void CustomShapeProperties::initializePresetsMap5() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -1901,8 +1913,8 @@ void CustomShapeProperties::initializePresetsMap5() 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-flowChartPunchedCard"); @@ -4368,7 +4380,7 @@ void CustomShapeProperties::initializePresetsMap5() aPropertyMap [PROP_MirroredY] <<= Any ((sal_Bool) sal_False); } { - Sequence< PropertyValue > aPropSequence (2); + Sequence< PropertyValue > aPropSequence (3); { aPropSequence [0].Name = CREATE_OUSTRING ("Coordinates"); Sequence< EnhancedCustomShapeParameterPair > aParameterPairSeq (8); @@ -4589,14 +4601,31 @@ void CustomShapeProperties::initializePresetsMap5() } aPropSequence [1].Value = makeAny (aSegmentSeq); } + { + aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + Sequence< awt::Size > aSizeSequence (2); + { + awt::Size aSize; + aSize.Width = 10; + aSize.Height = 10; + aSizeSequence [0] = aSize; + } + { + awt::Size aSize; + aSize.Width = 10; + aSize.Height = 10; + aSizeSequence [1] = aSize; + } + aPropSequence [2].Value = makeAny (aSizeSequence); + } aPropertyMap [PROP_Path] <<= aPropSequence; } { awt::Rectangle aRectangle; aRectangle.X = 0; aRectangle.Y = 0; - aRectangle.Width = 10; - aRectangle.Height = 10; + aRectangle.Width = 0; + aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-chartX"); @@ -4679,7 +4708,7 @@ void CustomShapeProperties::initializePresetsMap5() 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 (56); @@ -5867,7 +5896,24 @@ void CustomShapeProperties::initializePresetsMap5() aPropSequence [1].Value = makeAny (aSegmentSeq); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + Sequence< awt::Size > aSizeSequence (2); + { + awt::Size aSize; + aSize.Width = 43200; + aSize.Height = 43200; + aSizeSequence [0] = aSize; + } + { + awt::Size aSize; + aSize.Width = 43200; + aSize.Height = 43200; + aSizeSequence [1] = aSize; + } + aPropSequence [2].Value = makeAny (aSizeSequence); + } + { + aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -5909,7 +5955,7 @@ void CustomShapeProperties::initializePresetsMap5() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -5917,8 +5963,8 @@ void CustomShapeProperties::initializePresetsMap5() awt::Rectangle aRectangle; aRectangle.X = 0; aRectangle.Y = 0; - aRectangle.Width = 43200; - aRectangle.Height = 43200; + aRectangle.Width = 0; + aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-cloud"); @@ -7189,7 +7235,7 @@ void CustomShapeProperties::initializePresetsMap5() 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 (60); @@ -8515,7 +8561,30 @@ void CustomShapeProperties::initializePresetsMap5() 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 = 21600; + aSize.Height = 21600; + aSizeSequence [0] = aSize; + } + { + awt::Size aSize; + aSize.Width = 21600; + aSize.Height = 21600; + aSizeSequence [1] = aSize; + } + { + awt::Size aSize; + aSize.Width = 21600; + aSize.Height = 21600; + aSizeSequence [2] = aSize; + } + aPropSequence [2].Value = makeAny (aSizeSequence); + } + { + aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -8557,7 +8626,7 @@ void CustomShapeProperties::initializePresetsMap5() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -8565,8 +8634,8 @@ void CustomShapeProperties::initializePresetsMap5() 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-flowChartMultidocument"); @@ -9445,7 +9514,7 @@ void CustomShapeProperties::initializePresetsMap5() 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 (7); @@ -9625,7 +9694,18 @@ void CustomShapeProperties::initializePresetsMap5() 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; @@ -9667,7 +9747,7 @@ void CustomShapeProperties::initializePresetsMap5() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -9675,8 +9755,8 @@ void CustomShapeProperties::initializePresetsMap5() 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-flowChartTerminator"); @@ -14176,7 +14256,7 @@ void CustomShapeProperties::initializePresetsMap5() 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 (17); @@ -14614,7 +14694,30 @@ void CustomShapeProperties::initializePresetsMap5() 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 = 6; + aSize.Height = 6; + aSizeSequence [0] = aSize; + } + { + awt::Size aSize; + aSize.Width = 6; + aSize.Height = 6; + aSizeSequence [1] = aSize; + } + { + awt::Size aSize; + aSize.Width = 6; + aSize.Height = 6; + aSizeSequence [2] = aSize; + } + aPropSequence [2].Value = makeAny (aSizeSequence); + } + { + aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -14656,7 +14759,7 @@ void CustomShapeProperties::initializePresetsMap5() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -14664,8 +14767,8 @@ void CustomShapeProperties::initializePresetsMap5() awt::Rectangle aRectangle; aRectangle.X = 0; aRectangle.Y = 0; - aRectangle.Width = 6; - aRectangle.Height = 6; + aRectangle.Width = 0; + aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartMagneticDrum"); @@ -16067,7 +16170,7 @@ void CustomShapeProperties::initializePresetsMap5() 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 (6); @@ -16211,7 +16314,18 @@ void CustomShapeProperties::initializePresetsMap5() 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 = 2; + aSize.Height = 2; + aSizeSequence [0] = aSize; + } + aPropSequence [2].Value = makeAny (aSizeSequence); + } + { + aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -16253,7 +16367,7 @@ void CustomShapeProperties::initializePresetsMap5() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -16261,8 +16375,8 @@ void CustomShapeProperties::initializePresetsMap5() 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-flowChartCollate"); @@ -19294,7 +19408,7 @@ void CustomShapeProperties::initializePresetsMap5() 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); @@ -19402,7 +19516,18 @@ void CustomShapeProperties::initializePresetsMap5() 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 = 1; + aSize.Height = 1; + aSizeSequence [0] = aSize; + } + aPropSequence [2].Value = makeAny (aSizeSequence); + } + { + aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -19444,7 +19569,7 @@ void CustomShapeProperties::initializePresetsMap5() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -19452,8 +19577,8 @@ void CustomShapeProperties::initializePresetsMap5() 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-flowChartProcess"); diff --git a/oox/source/drawingml/customshapepresets6.cxx b/oox/source/drawingml/customshapepresets6.cxx index 1696ccde8bb1..dc59bb1c5b64 100644 --- a/oox/source/drawingml/customshapepresets6.cxx +++ b/oox/source/drawingml/customshapepresets6.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> @@ -3193,7 +3194,7 @@ void CustomShapeProperties::initializePresetsMap6() 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 (65); @@ -4615,7 +4616,42 @@ void CustomShapeProperties::initializePresetsMap6() aPropSequence [1].Value = makeAny (aSegmentSeq); } { - aPropSequence [2].Name = CREATE_OUSTRING ("TextFrames"); + aPropSequence [2].Name = CREATE_OUSTRING ("SubViewSize"); + Sequence< awt::Size > aSizeSequence (5); + { + awt::Size aSize; + aSize.Width = 43200; + aSize.Height = 43200; + aSizeSequence [0] = aSize; + } + { + awt::Size aSize; + aSize.Width = 0; + aSize.Height = 0; + aSizeSequence [1] = aSize; + } + { + awt::Size aSize; + aSize.Width = 0; + aSize.Height = 0; + aSizeSequence [2] = aSize; + } + { + awt::Size aSize; + aSize.Width = 0; + aSize.Height = 0; + aSizeSequence [3] = aSize; + } + { + awt::Size aSize; + aSize.Width = 43200; + aSize.Height = 43200; + aSizeSequence [4] = aSize; + } + aPropSequence [2].Value = makeAny (aSizeSequence); + } + { + aPropSequence [3].Name = CREATE_OUSTRING ("TextFrames"); Sequence< EnhancedCustomShapeTextFrame > aTextFrameSeq (1); { EnhancedCustomShapeTextFrame aTextFrame; @@ -4657,7 +4693,7 @@ void CustomShapeProperties::initializePresetsMap6() } aTextFrameSeq [0] = aTextFrame; } - aPropSequence [2].Value = makeAny (aTextFrameSeq); + aPropSequence [3].Value = makeAny (aTextFrameSeq); } aPropertyMap [PROP_Path] <<= aPropSequence; } @@ -4665,8 +4701,8 @@ void CustomShapeProperties::initializePresetsMap6() awt::Rectangle aRectangle; aRectangle.X = 0; aRectangle.Y = 0; - aRectangle.Width = 43200; - aRectangle.Height = 43200; + aRectangle.Width = 0; + aRectangle.Height = 0; aPropertyMap [PROP_ViewBox] <<= aRectangle; } aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-cloudCallout"); |