summaryrefslogtreecommitdiff
path: root/oox/source
diff options
context:
space:
mode:
authorRadek Doulik <rodo@novell.com>2011-11-07 11:32:59 +0100
committerRadek Doulik <rodo@novell.com>2011-11-07 12:08:27 +0100
commit959302bfd9093b89916517b6589f64bf86610128 (patch)
tree0e0cda8df17da84b32ab4f55787d25a3162b7325 /oox/source
parent63570788fbeeb7c611528a60abc7d0af04342fa2 (diff)
fixed remaining issues with custom shapes sizing
Diffstat (limited to 'oox/source')
-rw-r--r--oox/source/drawingml/customshapepresets1.cxx296
-rw-r--r--oox/source/drawingml/customshapepresets2.cxx296
-rw-r--r--oox/source/drawingml/customshapepresets3.cxx308
-rw-r--r--oox/source/drawingml/customshapepresets4.cxx308
-rw-r--r--oox/source/drawingml/customshapepresets5.cxx312
-rw-r--r--oox/source/drawingml/customshapepresets6.cxx92
-rw-r--r--oox/source/drawingml/customshapeproperties.cxx4
-rw-r--r--oox/source/helper/propertymap.cxx3
8 files changed, 1584 insertions, 35 deletions
diff --git a/oox/source/drawingml/customshapepresets1.cxx b/oox/source/drawingml/customshapepresets1.cxx
index 0fe0dd32f897..cdcbf5f99d58 100644
--- a/oox/source/drawingml/customshapepresets1.cxx
+++ b/oox/source/drawingml/customshapepresets1.cxx
@@ -816,6 +816,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonSound");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "actionButtonSound" ) ) ) ] = aPropertyMap;
@@ -1165,6 +1173,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-borderCallout1");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "borderCallout1" ) ) ) ] = aPropertyMap;
@@ -1626,6 +1642,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-plaqueTabs");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "plaqueTabs" ) ) ) ] = aPropertyMap;
@@ -2524,6 +2548,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-curvedLeftArrow");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "curvedLeftArrow" ) ) ) ] = aPropertyMap;
@@ -2789,6 +2821,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-octagon");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "octagon" ) ) ) ] = aPropertyMap;
@@ -4038,6 +4078,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftRightRibbon");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "leftRightRibbon" ) ) ) ] = aPropertyMap;
@@ -5346,6 +5394,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonInformation");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "actionButtonInformation" ) ) ) ] = aPropertyMap;
@@ -5669,6 +5725,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-bentConnector5");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "bentConnector5" ) ) ) ] = aPropertyMap;
@@ -6251,6 +6315,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-circularArrow");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "circularArrow" ) ) ) ] = aPropertyMap;
@@ -6727,6 +6799,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-downArrowCallout");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "downArrowCallout" ) ) ) ] = aPropertyMap;
@@ -6919,6 +6999,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-mathMinus");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "mathMinus" ) ) ) ] = aPropertyMap;
@@ -8273,6 +8361,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-gear9");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "gear9" ) ) ) ] = aPropertyMap;
@@ -8516,6 +8612,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-round1Rect");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "round1Rect" ) ) ) ] = aPropertyMap;
@@ -9310,6 +9414,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-sun");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "sun" ) ) ) ] = aPropertyMap;
@@ -9693,6 +9805,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-plaque");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "plaque" ) ) ) ] = aPropertyMap;
@@ -9924,6 +10044,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-chevron");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "chevron" ) ) ) ] = aPropertyMap;
@@ -9936,13 +10064,15 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (6);
+ Sequence< OUString > aStringSequence (8);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*4/5");
aStringSequence[1] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[2] = CREATE_OUSTRING ("logheight/2");
aStringSequence[3] = CREATE_OUSTRING ("logheight");
aStringSequence[4] = CREATE_OUSTRING ("logwidth");
aStringSequence[5] = CREATE_OUSTRING ("logwidth/5");
+ aStringSequence[6] = CREATE_OUSTRING ("logwidth/10");
+ aStringSequence[7] = CREATE_OUSTRING ("logheight/10");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -10101,6 +10231,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 10;
+ aRectangle.Height = 10;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartPreparation");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartPreparation" ) ) ) ] = aPropertyMap;
@@ -10295,6 +10433,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-diagStripe");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "diagStripe" ) ) ) ] = aPropertyMap;
@@ -10475,6 +10621,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-pentagon");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "pentagon" ) ) ) ] = aPropertyMap;
@@ -10773,6 +10927,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-funnel");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "funnel" ) ) ) ] = aPropertyMap;
@@ -10785,7 +10947,9 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (0);
+ Sequence< OUString > aStringSequence (2);
+ aStringSequence[0] = CREATE_OUSTRING ("logwidth/10");
+ aStringSequence[1] = CREATE_OUSTRING ("logheight/10");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -11064,6 +11228,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 10;
+ aRectangle.Height = 10;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-chartStar");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "chartStar" ) ) ) ] = aPropertyMap;
@@ -11479,6 +11651,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-accentBorderCallout1");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "accentBorderCallout1" ) ) ) ] = aPropertyMap;
@@ -11797,6 +11977,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-notchedRightArrow");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "notchedRightArrow" ) ) ) ] = aPropertyMap;
@@ -12194,6 +12382,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-rightBracket");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "rightBracket" ) ) ) ] = aPropertyMap;
@@ -12206,12 +12402,14 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (5);
+ Sequence< OUString > aStringSequence (7);
aStringSequence[0] = CREATE_OUSTRING ("logheight*4/5");
aStringSequence[1] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[2] = CREATE_OUSTRING ("logheight/2");
aStringSequence[3] = CREATE_OUSTRING ("logheight");
aStringSequence[4] = CREATE_OUSTRING ("logwidth");
+ aStringSequence[5] = CREATE_OUSTRING ("logwidth/10");
+ aStringSequence[6] = CREATE_OUSTRING ("logheight/10");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -12352,6 +12550,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 10;
+ aRectangle.Height = 10;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartOffpageConnector");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartOffpageConnector" ) ) ) ] = aPropertyMap;
@@ -12707,6 +12913,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftRightArrow");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "leftRightArrow" ) ) ) ] = aPropertyMap;
@@ -12972,6 +13186,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-decagon");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "decagon" ) ) ) ] = aPropertyMap;
@@ -14465,6 +14687,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonHelp");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "actionButtonHelp" ) ) ) ] = aPropertyMap;
@@ -15525,6 +15755,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-star24");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "star24" ) ) ) ] = aPropertyMap;
@@ -15977,6 +16215,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-mathDivide");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "mathDivide" ) ) ) ] = aPropertyMap;
@@ -16328,6 +16574,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-curvedConnector4");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "curvedConnector4" ) ) ) ] = aPropertyMap;
@@ -16881,6 +17135,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartOr");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartOr" ) ) ) ] = aPropertyMap;
@@ -17416,6 +17678,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-borderCallout3");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "borderCallout3" ) ) ) ] = aPropertyMap;
@@ -18021,6 +18291,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-upDownArrowCallout");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "upDownArrowCallout" ) ) ) ] = aPropertyMap;
@@ -18033,7 +18311,7 @@ void CustomShapeProperties::initializePresetsMap1()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (8);
+ Sequence< OUString > aStringSequence (10);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*3/4");
aStringSequence[1] = CREATE_OUSTRING ("logheight*3/4");
aStringSequence[2] = CREATE_OUSTRING ("logwidth/2");
@@ -18042,6 +18320,8 @@ void CustomShapeProperties::initializePresetsMap1()
aStringSequence[5] = CREATE_OUSTRING ("logwidth");
aStringSequence[6] = CREATE_OUSTRING ("logwidth/4");
aStringSequence[7] = CREATE_OUSTRING ("logheight/4");
+ aStringSequence[8] = CREATE_OUSTRING ("logwidth/2");
+ aStringSequence[9] = CREATE_OUSTRING ("logheight/2");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -18164,6 +18444,14 @@ void CustomShapeProperties::initializePresetsMap1()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 2;
+ aRectangle.Height = 2;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartDecision");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartDecision" ) ) ) ] = aPropertyMap;
diff --git a/oox/source/drawingml/customshapepresets2.cxx b/oox/source/drawingml/customshapepresets2.cxx
index f7ddd2ad7362..fdb2894d64ee 100644
--- a/oox/source/drawingml/customshapepresets2.cxx
+++ b/oox/source/drawingml/customshapepresets2.cxx
@@ -620,6 +620,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftRightArrowCallout");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "leftRightArrowCallout" ) ) ) ] = aPropertyMap;
@@ -632,7 +640,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (7);
+ Sequence< OUString > aStringSequence (9);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*4/5");
aStringSequence[1] = CREATE_OUSTRING ("logwidth*9/10");
aStringSequence[2] = CREATE_OUSTRING ("logwidth/2");
@@ -640,6 +648,8 @@ void CustomShapeProperties::initializePresetsMap2()
aStringSequence[4] = CREATE_OUSTRING ("logheight/2");
aStringSequence[5] = CREATE_OUSTRING ("logheight");
aStringSequence[6] = CREATE_OUSTRING ("logwidth/5");
+ aStringSequence[7] = CREATE_OUSTRING ("logwidth/5");
+ aStringSequence[8] = CREATE_OUSTRING ("logheight/5");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -762,6 +772,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 5;
+ aRectangle.Height = 5;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartManualOperation");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartManualOperation" ) ) ) ] = aPropertyMap;
@@ -1085,6 +1103,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-snipRoundRect");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "snipRoundRect" ) ) ) ] = aPropertyMap;
@@ -1427,6 +1453,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-mathPlus");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "mathPlus" ) ) ) ] = aPropertyMap;
@@ -1908,6 +1942,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonForwardNext");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "actionButtonForwardNext" ) ) ) ] = aPropertyMap;
@@ -2482,6 +2524,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-can");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "can" ) ) ) ] = aPropertyMap;
@@ -2941,6 +2991,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-foldedCorner");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "foldedCorner" ) ) ) ] = aPropertyMap;
@@ -4311,6 +4369,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-star32");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "star32" ) ) ) ] = aPropertyMap;
@@ -4323,13 +4389,15 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (6);
+ Sequence< OUString > aStringSequence (8);
aStringSequence[0] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[1] = CREATE_OUSTRING ("logheight/2");
aStringSequence[2] = CREATE_OUSTRING ("logheight");
aStringSequence[3] = CREATE_OUSTRING ("logwidth");
aStringSequence[4] = CREATE_OUSTRING ("logwidth/8");
aStringSequence[5] = CREATE_OUSTRING ("logheight/8");
+ aStringSequence[6] = CREATE_OUSTRING ("logwidth/1");
+ aStringSequence[7] = CREATE_OUSTRING ("logheight/1");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -4662,6 +4730,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 1;
+ aRectangle.Height = 1;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartInternalStorage");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartInternalStorage" ) ) ) ] = aPropertyMap;
@@ -5018,6 +5094,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-upDownArrow");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "upDownArrow" ) ) ) ] = aPropertyMap;
@@ -5030,7 +5114,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (12);
+ Sequence< OUString > aStringSequence (14);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*9722/21600");
aStringSequence[1] = CREATE_OUSTRING ("logwidth*5372/21600");
aStringSequence[2] = CREATE_OUSTRING ("logwidth*11612/21600");
@@ -5043,6 +5127,8 @@ void CustomShapeProperties::initializePresetsMap2()
aStringSequence[9] = CREATE_OUSTRING ("logheight*15935/21600");
aStringSequence[10] = CREATE_OUSTRING ("logheight*6645/21600");
aStringSequence[11] = CREATE_OUSTRING ("logwidth");
+ aStringSequence[12] = CREATE_OUSTRING ("logwidth/21600");
+ aStringSequence[13] = CREATE_OUSTRING ("logheight/21600");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -5597,6 +5683,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 21600;
+ aRectangle.Height = 21600;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-irregularSeal2");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "irregularSeal2" ) ) ) ] = aPropertyMap;
@@ -5936,6 +6030,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-mathEqual");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "mathEqual" ) ) ) ] = aPropertyMap;
@@ -6517,6 +6619,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-star12");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "star12" ) ) ) ] = aPropertyMap;
@@ -7253,6 +7363,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-uturnArrow");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "uturnArrow" ) ) ) ] = aPropertyMap;
@@ -7682,6 +7800,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-squareTabs");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "squareTabs" ) ) ) ] = aPropertyMap;
@@ -8220,6 +8346,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftRightUpArrow");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "leftRightUpArrow" ) ) ) ] = aPropertyMap;
@@ -8431,6 +8565,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-homePlate");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "homePlate" ) ) ) ] = aPropertyMap;
@@ -8720,6 +8862,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-dodecagon");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "dodecagon" ) ) ) ] = aPropertyMap;
@@ -9196,6 +9346,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftArrowCallout");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "leftArrowCallout" ) ) ) ] = aPropertyMap;
@@ -9400,6 +9558,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-chord");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "chord" ) ) ) ] = aPropertyMap;
@@ -10263,6 +10429,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-quadArrowCallout");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "quadArrowCallout" ) ) ) ] = aPropertyMap;
@@ -11019,6 +11193,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonBeginning");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "actionButtonBeginning" ) ) ) ] = aPropertyMap;
@@ -11264,6 +11446,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-ellipse");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "ellipse" ) ) ) ] = aPropertyMap;
@@ -12020,6 +12210,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonEnd");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "actionButtonEnd" ) ) ) ] = aPropertyMap;
@@ -12343,6 +12541,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-arc");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "arc" ) ) ) ] = aPropertyMap;
@@ -13088,6 +13294,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-star16");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "star16" ) ) ) ] = aPropertyMap;
@@ -13295,6 +13509,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-parallelogram");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "parallelogram" ) ) ) ] = aPropertyMap;
@@ -14255,6 +14477,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-bevel");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "bevel" ) ) ) ] = aPropertyMap;
@@ -14638,6 +14868,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-roundRect");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "roundRect" ) ) ) ] = aPropertyMap;
@@ -15053,6 +15291,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-accentCallout1");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "accentCallout1" ) ) ) ] = aPropertyMap;
@@ -15065,7 +15311,7 @@ void CustomShapeProperties::initializePresetsMap2()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (8);
+ Sequence< OUString > aStringSequence (10);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*3/4");
aStringSequence[1] = CREATE_OUSTRING ("logheight*3/4");
aStringSequence[2] = CREATE_OUSTRING ("logwidth/2");
@@ -15074,6 +15320,8 @@ void CustomShapeProperties::initializePresetsMap2()
aStringSequence[5] = CREATE_OUSTRING ("logwidth");
aStringSequence[6] = CREATE_OUSTRING ("logwidth/4");
aStringSequence[7] = CREATE_OUSTRING ("logheight/4");
+ aStringSequence[8] = CREATE_OUSTRING ("logwidth/2");
+ aStringSequence[9] = CREATE_OUSTRING ("logheight/2");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -15358,6 +15606,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 2;
+ aRectangle.Height = 2;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartSort");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartSort" ) ) ) ] = aPropertyMap;
@@ -15785,6 +16041,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-star8");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "star8" ) ) ) ] = aPropertyMap;
@@ -16118,6 +16382,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartAlternateProcess");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartAlternateProcess" ) ) ) ] = aPropertyMap;
@@ -16363,6 +16635,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-moon");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "moon" ) ) ) ] = aPropertyMap;
@@ -16717,6 +16997,14 @@ void CustomShapeProperties::initializePresetsMap2()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-star6");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "star6" ) ) ) ] = aPropertyMap;
diff --git a/oox/source/drawingml/customshapepresets3.cxx b/oox/source/drawingml/customshapepresets3.cxx
index 6689ed0532bd..1c7ad03c4c4b 100644
--- a/oox/source/drawingml/customshapepresets3.cxx
+++ b/oox/source/drawingml/customshapepresets3.cxx
@@ -476,6 +476,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-round2SameRect");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "round2SameRect" ) ) ) ] = aPropertyMap;
@@ -727,6 +735,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-nonIsoscelesTrapezoid");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "nonIsoscelesTrapezoid" ) ) ) ] = aPropertyMap;
@@ -870,6 +886,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-diamond");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "diamond" ) ) ) ] = aPropertyMap;
@@ -2402,6 +2426,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-ellipseRibbon");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "ellipseRibbon" ) ) ) ] = aPropertyMap;
@@ -2844,6 +2876,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-callout2");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "callout2" ) ) ) ] = aPropertyMap;
@@ -3070,6 +3110,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-pie");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "pie" ) ) ) ] = aPropertyMap;
@@ -3341,6 +3389,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-star4");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "star4" ) ) ) ] = aPropertyMap;
@@ -3353,13 +3409,15 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (6);
+ Sequence< OUString > aStringSequence (8);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*7/8");
aStringSequence[1] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[2] = CREATE_OUSTRING ("logheight/2");
aStringSequence[3] = CREATE_OUSTRING ("logheight");
aStringSequence[4] = CREATE_OUSTRING ("logwidth");
aStringSequence[5] = CREATE_OUSTRING ("logwidth/8");
+ aStringSequence[6] = CREATE_OUSTRING ("logwidth/1");
+ aStringSequence[7] = CREATE_OUSTRING ("logheight/1");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -3692,6 +3750,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 1;
+ aRectangle.Height = 1;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartPredefinedProcess");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartPredefinedProcess" ) ) ) ] = aPropertyMap;
@@ -3704,7 +3770,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (15);
+ Sequence< OUString > aStringSequence (17);
aStringSequence[0] = CREATE_OUSTRING ("logheight*9/10");
aStringSequence[1] = CREATE_OUSTRING ("logheight*4/5");
aStringSequence[2] = CREATE_OUSTRING ("logwidth/2");
@@ -3720,6 +3786,8 @@ void CustomShapeProperties::initializePresetsMap3()
aStringSequence[12] = CREATE_OUSTRING ("(-10800000)/60000.0");
aStringSequence[13] = CREATE_OUSTRING ("(0)/60000.0");
aStringSequence[14] = CREATE_OUSTRING ("(10800000)/60000.0");
+ aStringSequence[15] = CREATE_OUSTRING ("logwidth/20");
+ aStringSequence[16] = CREATE_OUSTRING ("logheight/20");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -3962,6 +4030,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 20;
+ aRectangle.Height = 20;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartPunchedTape");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartPunchedTape" ) ) ) ] = aPropertyMap;
@@ -4101,6 +4177,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-curvedConnector2");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "curvedConnector2" ) ) ) ] = aPropertyMap;
@@ -4288,6 +4372,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-bentConnector3");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "bentConnector3" ) ) ) ] = aPropertyMap;
@@ -4645,6 +4737,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-cornerTabs");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "cornerTabs" ) ) ) ] = aPropertyMap;
@@ -4892,6 +4992,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-hexagon");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "hexagon" ) ) ) ] = aPropertyMap;
@@ -5137,6 +5245,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartConnector");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartConnector" ) ) ) ] = aPropertyMap;
@@ -5149,7 +5265,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (16);
+ Sequence< OUString > aStringSequence (18);
aStringSequence[0] = CREATE_OUSTRING ("logheight*5/6");
aStringSequence[1] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[2] = CREATE_OUSTRING ("logheight/3");
@@ -5166,6 +5282,8 @@ void CustomShapeProperties::initializePresetsMap3()
aStringSequence[13] = CREATE_OUSTRING ("(10800000)/60000.0");
aStringSequence[14] = CREATE_OUSTRING ("(0)/60000.0");
aStringSequence[15] = CREATE_OUSTRING ("(10800000)/60000.0");
+ aStringSequence[16] = CREATE_OUSTRING ("logwidth/6");
+ aStringSequence[17] = CREATE_OUSTRING ("logheight/6");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -5564,6 +5682,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 6;
+ aRectangle.Height = 6;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartMagneticDisk");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartMagneticDisk" ) ) ) ] = aPropertyMap;
@@ -5767,6 +5893,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-heart");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "heart" ) ) ) ] = aPropertyMap;
@@ -7628,6 +7762,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-ribbon2");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "ribbon2" ) ) ) ] = aPropertyMap;
@@ -8724,6 +8866,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-bracePair");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "bracePair" ) ) ) ] = aPropertyMap;
@@ -8736,12 +8886,14 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (5);
+ Sequence< OUString > aStringSequence (7);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*3/4");
aStringSequence[1] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[2] = CREATE_OUSTRING ("logwidth/4");
aStringSequence[3] = CREATE_OUSTRING ("logheight/2");
aStringSequence[4] = CREATE_OUSTRING ("logheight");
+ aStringSequence[5] = CREATE_OUSTRING ("logwidth/2");
+ aStringSequence[6] = CREATE_OUSTRING ("logheight/2");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -8846,6 +8998,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 2;
+ aRectangle.Height = 2;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartExtract");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartExtract" ) ) ) ] = aPropertyMap;
@@ -10164,6 +10324,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonHome");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "actionButtonHome" ) ) ) ] = aPropertyMap;
@@ -10765,6 +10933,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-accentBorderCallout3");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "accentBorderCallout3" ) ) ) ] = aPropertyMap;
@@ -10777,12 +10953,14 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (5);
+ Sequence< OUString > aStringSequence (7);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*3/4");
aStringSequence[1] = CREATE_OUSTRING ("logheight/2");
aStringSequence[2] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[3] = CREATE_OUSTRING ("logheight");
aStringSequence[4] = CREATE_OUSTRING ("logwidth/4");
+ aStringSequence[5] = CREATE_OUSTRING ("logwidth/2");
+ aStringSequence[6] = CREATE_OUSTRING ("logheight/2");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -11031,6 +11209,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 2;
+ aRectangle.Height = 2;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartOfflineStorage");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartOfflineStorage" ) ) ) ] = aPropertyMap;
@@ -11043,7 +11229,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (10);
+ Sequence< OUString > aStringSequence (12);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*4627/21600");
aStringSequence[1] = CREATE_OUSTRING ("logwidth*8485/21600");
aStringSequence[2] = CREATE_OUSTRING ("logwidth*16702/21600");
@@ -11054,6 +11240,8 @@ void CustomShapeProperties::initializePresetsMap3()
aStringSequence[7] = CREATE_OUSTRING ("logheight*13290/21600");
aStringSequence[8] = CREATE_OUSTRING ("logheight");
aStringSequence[9] = CREATE_OUSTRING ("logwidth");
+ aStringSequence[10] = CREATE_OUSTRING ("logwidth/21600");
+ aStringSequence[11] = CREATE_OUSTRING ("logheight/21600");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -11536,6 +11724,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 21600;
+ aRectangle.Height = 21600;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-irregularSeal1");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "irregularSeal1" ) ) ) ] = aPropertyMap;
@@ -12201,6 +12397,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-quadArrow");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "quadArrow" ) ) ) ] = aPropertyMap;
@@ -12863,6 +13067,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftBrace");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "leftBrace" ) ) ) ] = aPropertyMap;
@@ -13260,6 +13472,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftBracket");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "leftBracket" ) ) ) ] = aPropertyMap;
@@ -13597,6 +13817,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-blockArc");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "blockArc" ) ) ) ] = aPropertyMap;
@@ -13842,6 +14070,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-curvedConnector3");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "curvedConnector3" ) ) ) ] = aPropertyMap;
@@ -14507,6 +14743,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-wedgeRoundRectCallout");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "wedgeRoundRectCallout" ) ) ) ] = aPropertyMap;
@@ -15888,6 +16132,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonMovie");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "actionButtonMovie" ) ) ) ] = aPropertyMap;
@@ -15900,7 +16152,7 @@ void CustomShapeProperties::initializePresetsMap3()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (9);
+ Sequence< OUString > aStringSequence (11);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*5/6");
aStringSequence[1] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[2] = CREATE_OUSTRING ("logheight/2");
@@ -15910,6 +16162,8 @@ void CustomShapeProperties::initializePresetsMap3()
aStringSequence[6] = CREATE_OUSTRING ("(-10800000)/60000.0");
aStringSequence[7] = CREATE_OUSTRING ("(5400000)/60000.0");
aStringSequence[8] = CREATE_OUSTRING ("(10800000)/60000.0");
+ aStringSequence[9] = CREATE_OUSTRING ("logwidth/6");
+ aStringSequence[10] = CREATE_OUSTRING ("logheight/6");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -16104,6 +16358,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 6;
+ aRectangle.Height = 6;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartOnlineStorage");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartOnlineStorage" ) ) ) ] = aPropertyMap;
@@ -17011,6 +17273,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-gear6");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "gear6" ) ) ) ] = aPropertyMap;
@@ -17299,6 +17569,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-halfFrame");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "halfFrame" ) ) ) ] = aPropertyMap;
@@ -17620,6 +17898,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-snip2SameRect");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "snip2SameRect" ) ) ) ] = aPropertyMap;
@@ -17793,6 +18079,14 @@ void CustomShapeProperties::initializePresetsMap3()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-triangle");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "triangle" ) ) ) ] = aPropertyMap;
diff --git a/oox/source/drawingml/customshapepresets4.cxx b/oox/source/drawingml/customshapepresets4.cxx
index 9e5f354b6371..49c08398a90f 100644
--- a/oox/source/drawingml/customshapepresets4.cxx
+++ b/oox/source/drawingml/customshapepresets4.cxx
@@ -366,6 +366,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-teardrop");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "teardrop" ) ) ) ] = aPropertyMap;
@@ -378,12 +386,14 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (5);
+ Sequence< OUString > aStringSequence (7);
aStringSequence[0] = CREATE_OUSTRING ("logheight*17322/21600");
aStringSequence[1] = CREATE_OUSTRING ("logheight*20172/21600");
aStringSequence[2] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[3] = CREATE_OUSTRING ("logheight/2");
aStringSequence[4] = CREATE_OUSTRING ("logwidth");
+ aStringSequence[5] = CREATE_OUSTRING ("logwidth/21600");
+ aStringSequence[6] = CREATE_OUSTRING ("logheight/21600");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -548,6 +558,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 21600;
+ aRectangle.Height = 21600;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartDocument");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartDocument" ) ) ) ] = aPropertyMap;
@@ -1024,6 +1042,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-rightArrowCallout");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "rightArrowCallout" ) ) ) ] = aPropertyMap;
@@ -1687,6 +1713,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-rightBrace");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "rightBrace" ) ) ) ] = aPropertyMap;
@@ -1699,7 +1733,9 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (0);
+ Sequence< OUString > aStringSequence (2);
+ aStringSequence[0] = CREATE_OUSTRING ("logwidth/10");
+ aStringSequence[1] = CREATE_OUSTRING ("logheight/10");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -1930,6 +1966,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 10;
+ aRectangle.Height = 10;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-chartPlus");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "chartPlus" ) ) ) ] = aPropertyMap;
@@ -1942,13 +1986,15 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (6);
+ Sequence< OUString > aStringSequence (8);
aStringSequence[0] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[1] = CREATE_OUSTRING ("logheight/10");
aStringSequence[2] = CREATE_OUSTRING ("logheight/2");
aStringSequence[3] = CREATE_OUSTRING ("logheight");
aStringSequence[4] = CREATE_OUSTRING ("logwidth");
aStringSequence[5] = CREATE_OUSTRING ("logheight/5");
+ aStringSequence[6] = CREATE_OUSTRING ("logwidth/5");
+ aStringSequence[7] = CREATE_OUSTRING ("logheight/5");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -2071,6 +2117,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 5;
+ aRectangle.Height = 5;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartManualInput");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartManualInput" ) ) ) ] = aPropertyMap;
@@ -2083,12 +2137,14 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (5);
+ Sequence< OUString > aStringSequence (7);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*3/4");
aStringSequence[1] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[2] = CREATE_OUSTRING ("logwidth/4");
aStringSequence[3] = CREATE_OUSTRING ("logheight/2");
aStringSequence[4] = CREATE_OUSTRING ("logheight");
+ aStringSequence[5] = CREATE_OUSTRING ("logwidth/2");
+ aStringSequence[6] = CREATE_OUSTRING ("logheight/2");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -2193,6 +2249,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 2;
+ aRectangle.Height = 2;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartMerge");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartMerge" ) ) ) ] = aPropertyMap;
@@ -2288,6 +2352,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-line");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "line" ) ) ) ] = aPropertyMap;
@@ -2588,6 +2660,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-downArrow");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "downArrow" ) ) ) ] = aPropertyMap;
@@ -3517,6 +3597,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-curvedDownArrow");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "curvedDownArrow" ) ) ) ] = aPropertyMap;
@@ -5045,6 +5133,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonReturn");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "actionButtonReturn" ) ) ) ] = aPropertyMap;
@@ -5057,7 +5153,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (9);
+ Sequence< OUString > aStringSequence (11);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*2/5");
aStringSequence[1] = CREATE_OUSTRING ("logwidth*3/5");
aStringSequence[2] = CREATE_OUSTRING ("logwidth*4/5");
@@ -5067,6 +5163,8 @@ void CustomShapeProperties::initializePresetsMap4()
aStringSequence[6] = CREATE_OUSTRING ("logheight/2");
aStringSequence[7] = CREATE_OUSTRING ("logheight");
aStringSequence[8] = CREATE_OUSTRING ("logwidth/5");
+ aStringSequence[9] = CREATE_OUSTRING ("logwidth/5");
+ aStringSequence[10] = CREATE_OUSTRING ("logheight/5");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -5189,6 +5287,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 5;
+ aRectangle.Height = 5;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartInputOutput");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartInputOutput" ) ) ) ] = aPropertyMap;
@@ -5856,6 +5962,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-bracketPair");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "bracketPair" ) ) ) ] = aPropertyMap;
@@ -6355,6 +6469,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-smileyFace");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "smileyFace" ) ) ) ] = aPropertyMap;
@@ -6494,6 +6616,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonBlank");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "actionButtonBlank" ) ) ) ] = aPropertyMap;
@@ -6842,6 +6972,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-wave");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "wave" ) ) ) ] = aPropertyMap;
@@ -7207,6 +7345,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-swooshArrow");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "swooshArrow" ) ) ) ] = aPropertyMap;
@@ -7760,6 +7906,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartSummingJunction");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartSummingJunction" ) ) ) ] = aPropertyMap;
@@ -7772,7 +7926,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (16);
+ Sequence< OUString > aStringSequence (18);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*5022/21600");
aStringSequence[1] = CREATE_OUSTRING ("logwidth*8472/21600");
aStringSequence[2] = CREATE_OUSTRING ("logwidth*8757/21600");
@@ -7789,6 +7943,8 @@ void CustomShapeProperties::initializePresetsMap4()
aStringSequence[13] = CREATE_OUSTRING ("logheight*14915/21600");
aStringSequence[14] = CREATE_OUSTRING ("logwidth");
aStringSequence[15] = CREATE_OUSTRING ("logheight");
+ aStringSequence[16] = CREATE_OUSTRING ("logwidth/21600");
+ aStringSequence[17] = CREATE_OUSTRING ("logheight/21600");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -8037,6 +8193,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 21600;
+ aRectangle.Height = 21600;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-lightningBolt");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "lightningBolt" ) ) ) ] = aPropertyMap;
@@ -8049,7 +8213,7 @@ void CustomShapeProperties::initializePresetsMap4()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (8);
+ Sequence< OUString > aStringSequence (10);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*5/6");
aStringSequence[1] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[2] = CREATE_OUSTRING ("logheight/2");
@@ -8058,6 +8222,8 @@ void CustomShapeProperties::initializePresetsMap4()
aStringSequence[5] = CREATE_OUSTRING ("logwidth/6");
aStringSequence[6] = CREATE_OUSTRING ("(16200000)/60000.0");
aStringSequence[7] = CREATE_OUSTRING ("(10800000)/60000.0");
+ aStringSequence[8] = CREATE_OUSTRING ("logwidth/6");
+ aStringSequence[9] = CREATE_OUSTRING ("logheight/6");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -8228,6 +8394,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 6;
+ aRectangle.Height = 6;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartDisplay");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartDisplay" ) ) ) ] = aPropertyMap;
@@ -8709,6 +8883,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonBackPrevious");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "actionButtonBackPrevious" ) ) ) ] = aPropertyMap;
@@ -8991,6 +9173,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-frame");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "frame" ) ) ) ] = aPropertyMap;
@@ -9116,6 +9306,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-rtTriangle");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "rtTriangle" ) ) ) ] = aPropertyMap;
@@ -9404,6 +9602,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartMagneticTape");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartMagneticTape" ) ) ) ] = aPropertyMap;
@@ -10291,6 +10497,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-curvedRightArrow");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "curvedRightArrow" ) ) ) ] = aPropertyMap;
@@ -10737,6 +10951,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftUpArrow");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "leftUpArrow" ) ) ) ] = aPropertyMap;
@@ -10987,6 +11209,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-wedgeEllipseCallout");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "wedgeEllipseCallout" ) ) ) ] = aPropertyMap;
@@ -11449,6 +11679,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-doubleWave");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "doubleWave" ) ) ) ] = aPropertyMap;
@@ -11992,6 +12230,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-bentArrow");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "bentArrow" ) ) ) ] = aPropertyMap;
@@ -12503,6 +12749,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-star10");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "star10" ) ) ) ] = aPropertyMap;
@@ -12803,6 +13057,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftArrow");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "leftArrow" ) ) ) ] = aPropertyMap;
@@ -13703,6 +13965,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-curvedUpArrow");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "curvedUpArrow" ) ) ) ] = aPropertyMap;
@@ -13914,6 +14184,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-snip1Rect");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "snip1Rect" ) ) ) ] = aPropertyMap;
@@ -15474,6 +15752,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-ellipseRibbon2");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "ellipseRibbon2" ) ) ) ] = aPropertyMap;
@@ -15815,6 +16101,14 @@ void CustomShapeProperties::initializePresetsMap4()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-plus");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "plus" ) ) ) ] = aPropertyMap;
diff --git a/oox/source/drawingml/customshapepresets5.cxx b/oox/source/drawingml/customshapepresets5.cxx
index a275df75882a..af5b45ef5c2e 100644
--- a/oox/source/drawingml/customshapepresets5.cxx
+++ b/oox/source/drawingml/customshapepresets5.cxx
@@ -616,6 +616,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-accentCallout3");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "accentCallout3" ) ) ) ] = aPropertyMap;
@@ -1235,6 +1243,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftCircularArrow");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "leftCircularArrow" ) ) ) ] = aPropertyMap;
@@ -1535,6 +1551,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-rightArrow");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "rightArrow" ) ) ) ] = aPropertyMap;
@@ -1547,12 +1571,14 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (5);
+ Sequence< OUString > aStringSequence (7);
aStringSequence[0] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[1] = CREATE_OUSTRING ("logheight/2");
aStringSequence[2] = CREATE_OUSTRING ("logheight");
aStringSequence[3] = CREATE_OUSTRING ("logwidth");
aStringSequence[4] = CREATE_OUSTRING ("logheight/5");
+ aStringSequence[5] = CREATE_OUSTRING ("logwidth/5");
+ aStringSequence[6] = CREATE_OUSTRING ("logheight/5");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -1693,6 +1719,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 5;
+ aRectangle.Height = 5;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartPunchedCard");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartPunchedCard" ) ) ) ] = aPropertyMap;
@@ -2014,6 +2048,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-snip2DiagRect");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "snip2DiagRect" ) ) ) ] = aPropertyMap;
@@ -3540,6 +3582,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-verticalScroll");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "verticalScroll" ) ) ) ] = aPropertyMap;
@@ -3953,6 +4003,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-star7");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "star7" ) ) ) ] = aPropertyMap;
@@ -3965,7 +4023,9 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (0);
+ Sequence< OUString > aStringSequence (2);
+ aStringSequence[0] = CREATE_OUSTRING ("logwidth/10");
+ aStringSequence[1] = CREATE_OUSTRING ("logheight/10");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -4196,6 +4256,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 10;
+ aRectangle.Height = 10;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-chartX");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "chartX" ) ) ) ] = aPropertyMap;
@@ -4208,7 +4276,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (54);
+ Sequence< OUString > aStringSequence (56);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*2977/21600");
aStringSequence[1] = CREATE_OUSTRING ("logheight*3262/21600");
aStringSequence[2] = CREATE_OUSTRING ("logwidth*17087/21600");
@@ -4263,6 +4331,8 @@ void CustomShapeProperties::initializePresetsMap5()
aStringSequence[51] = CREATE_OUSTRING ("(739161)/60000.0");
aStringSequence[52] = CREATE_OUSTRING ("(9459261)/60000.0");
aStringSequence[53] = CREATE_OUSTRING ("(711490)/60000.0");
+ aStringSequence[54] = CREATE_OUSTRING ("logwidth/43200");
+ aStringSequence[55] = CREATE_OUSTRING ("logheight/43200");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -5465,6 +5535,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 43200;
+ aRectangle.Height = 43200;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-cloud");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "cloud" ) ) ) ] = aPropertyMap;
@@ -6103,6 +6181,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-cube");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "cube" ) ) ) ] = aPropertyMap;
@@ -6564,6 +6650,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-round2DiagRect");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "round2DiagRect" ) ) ) ] = aPropertyMap;
@@ -6576,7 +6670,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (7);
+ Sequence< OUString > aStringSequence (9);
aStringSequence[0] = CREATE_OUSTRING ("logheight*3675/21600");
aStringSequence[1] = CREATE_OUSTRING ("logheight*20782/21600");
aStringSequence[2] = CREATE_OUSTRING ("logwidth*9298/21600");
@@ -6584,6 +6678,8 @@ void CustomShapeProperties::initializePresetsMap5()
aStringSequence[4] = CREATE_OUSTRING ("logwidth*18595/21600");
aStringSequence[5] = CREATE_OUSTRING ("logheight/2");
aStringSequence[6] = CREATE_OUSTRING ("logwidth");
+ aStringSequence[7] = CREATE_OUSTRING ("logwidth/21600");
+ aStringSequence[8] = CREATE_OUSTRING ("logheight/21600");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -7912,6 +8008,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 21600;
+ aRectangle.Height = 21600;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartMultidocument");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartMultidocument" ) ) ) ] = aPropertyMap;
@@ -8667,6 +8771,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-actionButtonDocument");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "actionButtonDocument" ) ) ) ] = aPropertyMap;
@@ -8679,7 +8791,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (12);
+ Sequence< OUString > aStringSequence (14);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*1018/21600");
aStringSequence[1] = CREATE_OUSTRING ("logwidth*20582/21600");
aStringSequence[2] = CREATE_OUSTRING ("logheight*3163/21600");
@@ -8692,6 +8804,8 @@ void CustomShapeProperties::initializePresetsMap5()
aStringSequence[9] = CREATE_OUSTRING ("(10800000)/60000.0");
aStringSequence[10] = CREATE_OUSTRING ("(5400000)/60000.0");
aStringSequence[11] = CREATE_OUSTRING ("(10800000)/60000.0");
+ aStringSequence[12] = CREATE_OUSTRING ("logwidth/21600");
+ aStringSequence[13] = CREATE_OUSTRING ("logheight/21600");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -8886,6 +9000,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 21600;
+ aRectangle.Height = 21600;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartTerminator");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartTerminator" ) ) ) ] = aPropertyMap;
@@ -9064,6 +9186,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartDelay");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartDelay" ) ) ) ] = aPropertyMap;
@@ -9521,6 +9651,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-curvedConnector5");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "curvedConnector5" ) ) ) ] = aPropertyMap;
@@ -11041,6 +11179,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-horizontalScroll");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "horizontalScroll" ) ) ) ] = aPropertyMap;
@@ -11296,6 +11442,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-bentConnector4");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "bentConnector4" ) ) ) ] = aPropertyMap;
@@ -11982,6 +12136,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-leftRightCircularArrow");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "leftRightCircularArrow" ) ) ) ] = aPropertyMap;
@@ -12444,6 +12606,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-wedgeRectCallout");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "wedgeRectCallout" ) ) ) ] = aPropertyMap;
@@ -12952,6 +13122,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-accentCallout2");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "accentCallout2" ) ) ) ] = aPropertyMap;
@@ -12964,7 +13142,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (16);
+ Sequence< OUString > aStringSequence (18);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*2/3");
aStringSequence[1] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[2] = CREATE_OUSTRING ("logheight/2");
@@ -12981,6 +13159,8 @@ void CustomShapeProperties::initializePresetsMap5()
aStringSequence[13] = CREATE_OUSTRING ("(10800000)/60000.0");
aStringSequence[14] = CREATE_OUSTRING ("(5400000)/60000.0");
aStringSequence[15] = CREATE_OUSTRING ("(10800000)/60000.0");
+ aStringSequence[16] = CREATE_OUSTRING ("logwidth/6");
+ aStringSequence[17] = CREATE_OUSTRING ("logheight/6");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -13427,6 +13607,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 6;
+ aRectangle.Height = 6;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartMagneticDrum");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartMagneticDrum" ) ) ) ] = aPropertyMap;
@@ -13711,6 +13899,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-corner");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "corner" ) ) ) ] = aPropertyMap;
@@ -14153,6 +14349,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-borderCallout2");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "borderCallout2" ) ) ) ] = aPropertyMap;
@@ -14634,6 +14838,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-donut");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "donut" ) ) ) ] = aPropertyMap;
@@ -14646,7 +14858,7 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (7);
+ Sequence< OUString > aStringSequence (9);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*3/4");
aStringSequence[1] = CREATE_OUSTRING ("logheight*3/4");
aStringSequence[2] = CREATE_OUSTRING ("logwidth/2");
@@ -14654,6 +14866,8 @@ void CustomShapeProperties::initializePresetsMap5()
aStringSequence[4] = CREATE_OUSTRING ("logheight");
aStringSequence[5] = CREATE_OUSTRING ("logwidth/4");
aStringSequence[6] = CREATE_OUSTRING ("logheight/4");
+ aStringSequence[7] = CREATE_OUSTRING ("logwidth/2");
+ aStringSequence[8] = CREATE_OUSTRING ("logheight/2");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -14812,6 +15026,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 2;
+ aRectangle.Height = 2;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartCollate");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartCollate" ) ) ) ] = aPropertyMap;
@@ -15417,6 +15639,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-mathNotEqual");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "mathNotEqual" ) ) ) ] = aPropertyMap;
@@ -15536,6 +15766,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-bentConnector2");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "bentConnector2" ) ) ) ] = aPropertyMap;
@@ -15897,6 +16135,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-mathMultiply");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "mathMultiply" ) ) ) ] = aPropertyMap;
@@ -16117,6 +16363,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-heptagon");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "heptagon" ) ) ) ] = aPropertyMap;
@@ -16256,6 +16510,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-rect");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "rect" ) ) ) ] = aPropertyMap;
@@ -16764,6 +17026,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-accentBorderCallout2");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "accentBorderCallout2" ) ) ) ] = aPropertyMap;
@@ -16917,6 +17187,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-pieWedge");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "pieWedge" ) ) ) ] = aPropertyMap;
@@ -17393,6 +17671,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-upArrowCallout");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "upArrowCallout" ) ) ) ] = aPropertyMap;
@@ -17405,11 +17691,13 @@ void CustomShapeProperties::initializePresetsMap5()
aPropertyMap [PROP_AdjustmentValues] <<= aStringSequence;
}
{
- Sequence< OUString > aStringSequence (4);
+ Sequence< OUString > aStringSequence (6);
aStringSequence[0] = CREATE_OUSTRING ("logwidth/2");
aStringSequence[1] = CREATE_OUSTRING ("logheight/2");
aStringSequence[2] = CREATE_OUSTRING ("logheight");
aStringSequence[3] = CREATE_OUSTRING ("logwidth");
+ aStringSequence[4] = CREATE_OUSTRING ("logwidth/1");
+ aStringSequence[5] = CREATE_OUSTRING ("logheight/1");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -17532,6 +17820,14 @@ void CustomShapeProperties::initializePresetsMap5()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 1;
+ aRectangle.Height = 1;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-flowChartProcess");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "flowChartProcess" ) ) ) ] = aPropertyMap;
diff --git a/oox/source/drawingml/customshapepresets6.cxx b/oox/source/drawingml/customshapepresets6.cxx
index 078ad6f68de1..8aaf5ab71cb6 100644
--- a/oox/source/drawingml/customshapepresets6.cxx
+++ b/oox/source/drawingml/customshapepresets6.cxx
@@ -346,6 +346,14 @@ void CustomShapeProperties::initializePresetsMap6()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-star5");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "star5" ) ) ) ] = aPropertyMap;
@@ -441,6 +449,14 @@ void CustomShapeProperties::initializePresetsMap6()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-lineInv");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "lineInv" ) ) ) ] = aPropertyMap;
@@ -542,6 +558,14 @@ void CustomShapeProperties::initializePresetsMap6()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-straightConnector1");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "straightConnector1" ) ) ) ] = aPropertyMap;
@@ -1026,6 +1050,14 @@ void CustomShapeProperties::initializePresetsMap6()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-stripedRightArrow");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "stripedRightArrow" ) ) ) ] = aPropertyMap;
@@ -1561,6 +1593,14 @@ void CustomShapeProperties::initializePresetsMap6()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-callout3");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "callout3" ) ) ) ] = aPropertyMap;
@@ -1949,6 +1989,14 @@ void CustomShapeProperties::initializePresetsMap6()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-bentUpArrow");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "bentUpArrow" ) ) ) ] = aPropertyMap;
@@ -2412,6 +2460,14 @@ void CustomShapeProperties::initializePresetsMap6()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-noSmoking");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "noSmoking" ) ) ) ] = aPropertyMap;
@@ -2611,6 +2667,14 @@ void CustomShapeProperties::initializePresetsMap6()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-trapezoid");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "trapezoid" ) ) ) ] = aPropertyMap;
@@ -2631,7 +2695,7 @@ void CustomShapeProperties::initializePresetsMap6()
aPropertyMap [PROP_AdjustmentValues] <<= aAdjSequence;
}
{
- Sequence< OUString > aStringSequence (98);
+ Sequence< OUString > aStringSequence (100);
aStringSequence[0] = CREATE_OUSTRING ("logwidth*$0 /100000");
aStringSequence[1] = CREATE_OUSTRING ("logheight*$1 /100000");
aStringSequence[2] = CREATE_OUSTRING ("logwidth/2");
@@ -2730,6 +2794,8 @@ void CustomShapeProperties::initializePresetsMap6()
aStringSequence[95] = CREATE_OUSTRING ("(739161)/60000.0");
aStringSequence[96] = CREATE_OUSTRING ("(9459261)/60000.0");
aStringSequence[97] = CREATE_OUSTRING ("(711490)/60000.0");
+ aStringSequence[98] = CREATE_OUSTRING ("logwidth/43200");
+ aStringSequence[99] = CREATE_OUSTRING ("logheight/43200");
aPropertyMap [PROP_Equations] <<= aStringSequence;
}
{
@@ -4231,6 +4297,14 @@ void CustomShapeProperties::initializePresetsMap6()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 43200;
+ aRectangle.Height = 43200;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-cloudCallout");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "cloudCallout" ) ) ) ] = aPropertyMap;
@@ -4580,6 +4654,14 @@ void CustomShapeProperties::initializePresetsMap6()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-callout1");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "callout1" ) ) ) ] = aPropertyMap;
@@ -6427,6 +6509,14 @@ void CustomShapeProperties::initializePresetsMap6()
}
aPropertyMap [PROP_Path] <<= aPropSequence;
}
+ {
+ awt::Rectangle aRectangle;
+ aRectangle.X = 0;
+ aRectangle.Y = 0;
+ aRectangle.Width = 0;
+ aRectangle.Height = 0;
+ aPropertyMap [PROP_ViewBox] <<= aRectangle;
+ }
aPropertyMap [ PROP_Type ] <<= CREATE_OUSTRING("ooxml-ribbon");
maPresetsMap [ StaticTokenMap::get().getTokenFromUnicode( OUString( RTL_CONSTASCII_USTRINGPARAM( "ribbon" ) ) ) ] = aPropertyMap;
diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx
index f794c6f954b1..c2ab21a1f98c 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -97,7 +97,7 @@ sal_Int32 CustomShapeProperties::GetCustomShapeGuideValue( const std::vector< Cu
CustomShapeProperties::PresetsMap CustomShapeProperties::maPresetsMap;
void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFilterBase */,
- const Reference < XPropertySet >& xPropSet, const Reference < XShape > & xShape ) const
+ const Reference < XPropertySet >& xPropSet, const Reference < XShape > & xShape )
{
if ( mnShapePresetType >= 0 )
{
@@ -187,7 +187,7 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase& /* rFi
aPropertyMap[ PROP_Type ] <<= CREATE_OUSTRING( "ooxml-non-primitive" );
aPropertyMap[ PROP_MirroredX ] <<= Any( mbMirroredX );
aPropertyMap[ PROP_MirroredY ] <<= Any( mbMirroredY );
- awt::Size aSize( xShape->getSize() );
+ awt::Size aSize;
awt::Rectangle aViewBox( 0, 0, aSize.Width * 360, aSize.Height * 360 );
if ( maPath2DList.size() )
{ // TODO: each polygon may have its own size, but I think it is rather been used
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index 1877dc7f5243..ec44359b43f3 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -781,12 +781,11 @@ void PropertyMap::dumpCode( Reference< XPropertySet > rXPropSet )
Reference< XPropertySetInfo > info = rXPropSet->getPropertySetInfo ();
Sequence< Property > props = info->getProperties ();
const OUString sType = CREATE_OUSTRING( "Type" );
- const OUString sViewBox = CREATE_OUSTRING( "ViewBox" );
for (int i=0; i < props.getLength (); i++) {
// ignore Type, it is set elsewhere
- if (props[i].Name.equals (sType) || props[i].Name.equals (sViewBox))
+ if (props[i].Name.equals (sType))
continue;
OString name = OUStringToOString( props [i].Name, RTL_TEXTENCODING_UTF8);
generated by cgit (git 2.34.1) at 2025-01-30 02:22:38 +0000