[Libreoffice-commits] .: 6 commits - oox/inc oox/source svx/inc svx/source
Radek DoulÃk
rodo at kemper.freedesktop.org
Mon Nov 7 03:09:12 PST 2011
oox/inc/oox/drawingml/customshapeproperties.hxx | 2
oox/source/drawingml/customshapegeometry.cxx | 18
oox/source/drawingml/customshapepresets1.cxx | 874 +++++++++++++-------
oox/source/drawingml/customshapepresets2.cxx | 834 +++++++++++++------
oox/source/drawingml/customshapepresets3.cxx | 920 ++++++++++++++--------
oox/source/drawingml/customshapepresets4.cxx | 900 ++++++++++++++-------
oox/source/drawingml/customshapepresets5.cxx | 844 +++++++++++++-------
oox/source/drawingml/customshapepresets6.cxx | 282 ++++--
oox/source/drawingml/customshapeproperties.cxx | 21
oox/source/helper/propertymap.cxx | 3
svx/inc/svx/EnhancedCustomShape2d.hxx | 4
svx/source/customshapes/EnhancedCustomShape2d.cxx | 24
12 files changed, 3146 insertions(+), 1580 deletions(-)
New commits:
commit 41ae924469c9ec1ad76da8077014ca6598f4bd98
Author: Radek Doulik <rodo at novell.com>
Date: Mon Nov 7 11:33:41 2011 +0100
fixed remaining issues with ooxml custom shapes scaling
diff --git a/svx/inc/svx/EnhancedCustomShape2d.hxx b/svx/inc/svx/EnhancedCustomShape2d.hxx
index d2228e9..ebd7f0b 100644
--- a/svx/inc/svx/EnhancedCustomShape2d.hxx
+++ b/svx/inc/svx/EnhancedCustomShape2d.hxx
@@ -92,8 +92,6 @@ class EnhancedCustomShape2d : public SfxItemSet
double fXScale;
double fYScale;
- double fXScaleOOXML;
- double fYScaleOOXML;
double fXRatio;
double fYRatio;
@@ -136,7 +134,7 @@ class EnhancedCustomShape2d : public SfxItemSet
void AdaptObjColor(SdrPathObj& rObj, const SfxItemSet& rCustomShapeSet,
sal_uInt32& nColorIndex, sal_uInt32 nColorCount);
sal_Bool GetParameter( double& rParameterReturnValue, const com::sun::star::drawing::EnhancedCustomShapeParameter&,
- const sal_Bool bReplaceGeoWidth, const sal_Bool bReplaceGeoHeight, sal_Bool& bNormal ) const;
+ const sal_Bool bReplaceGeoWidth, const sal_Bool bReplaceGeoHeight ) const;
Point GetPoint( const com::sun::star::drawing::EnhancedCustomShapeParameterPair&,
const sal_Bool bScale = sal_True, const sal_Bool bReplaceGeoSize = sal_False ) const;
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index e91ad20..76e523e 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -798,48 +798,37 @@ EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* pAObj ) :
default:
break;
}
+
fXScale = nCoordWidth == 0 ? 0.0 : (double)aLogicRect.GetWidth() / (double)nCoordWidth;
fYScale = nCoordHeight == 0 ? 0.0 : (double)aLogicRect.GetHeight() / (double)nCoordHeight;
if ( bOOXMLShape )
{
- fXScaleOOXML = 1; //fXScale;
- fYScaleOOXML = 1; //fYScale;
- fXScale = 1.0/(double)nCoordWidth;
- fYScale = 1.0/(double)nCoordHeight;
-
- // if ( nXRef != (sal_uInt32)nXRef != 0x80000000 && nXRef != 0 )
- // {
- // fXScale *= (double)aLogicRect.GetWidth() / (double) nXRef;
- // }
- // if ( nYRef != (sal_uInt32)nYRef != 0x80000000 && nYRef != 0 )
- // {
- // fYScale *= (double)aLogicRect.GetHeight() / (double) nYRef;
- // }
- } else {
- fXScaleOOXML = 1;
- fYScaleOOXML = 1;
-
- if ( (sal_uInt32)nXRef != 0x80000000 && aLogicRect.GetHeight() )
- {
- fXRatio = (double)aLogicRect.GetWidth() / (double)aLogicRect.GetHeight();
- if ( fXRatio > 1 )
- fXScale /= fXRatio;
- else
- fXRatio = 1.0;
- }
+ OSL_TRACE("ooxml shape, path width: %d height: %d", nCoordWidth, nCoordHeight);
+ if ( nCoordWidth == 0 )
+ fXScale = 1.0;
+ if ( nCoordHeight == 0 )
+ fYScale = 1.0;
+ }
+ if ( (sal_uInt32)nXRef != 0x80000000 && aLogicRect.GetHeight() )
+ {
+ fXRatio = (double)aLogicRect.GetWidth() / (double)aLogicRect.GetHeight();
+ if ( fXRatio > 1 )
+ fXScale /= fXRatio;
else
fXRatio = 1.0;
- if ( (sal_uInt32)nYRef != 0x80000000 && aLogicRect.GetWidth() )
- {
- fYRatio = (double)aLogicRect.GetHeight() / (double)aLogicRect.GetWidth();
- if ( fYRatio > 1 )
- fYScale /= fYRatio;
- else
- fYRatio = 1.0;
- }
+ }
+ else
+ fXRatio = 1.0;
+ if ( (sal_uInt32)nYRef != 0x80000000 && aLogicRect.GetWidth() )
+ {
+ fYRatio = (double)aLogicRect.GetHeight() / (double)aLogicRect.GetWidth();
+ if ( fYRatio > 1 )
+ fYScale /= fYRatio;
else
fYRatio = 1.0;
}
+ else
+ fYRatio = 1.0;
sal_Int32 i, nLength = seqEquations.getLength();
@@ -982,7 +971,6 @@ Point EnhancedCustomShape2d::GetPoint( const com::sun::star::drawing::EnhancedCu
{
Point aRetValue;
sal_Bool bExchange = ( nFlags & DFF_CUSTOMSHAPE_EXCH ) != 0; // x <-> y
- sal_Bool bNormal;
sal_uInt32 nPass = 0;
do
{
@@ -995,13 +983,11 @@ Point EnhancedCustomShape2d::GetPoint( const com::sun::star::drawing::EnhancedCu
const EnhancedCustomShapeParameter& rParameter = nIndex ? rPair.Second : rPair.First;
if ( nPass ) // height
{
- GetParameter( fVal, rParameter, sal_False, bReplaceGeoSize, bNormal );
+ GetParameter( fVal, rParameter, sal_False, bReplaceGeoSize );
fVal -= nCoordTop;
if ( bScale )
{
fVal *= fYScale;
- if (bNormal)
- fVal *= fYScaleOOXML;
if ( nFlags & DFF_CUSTOMSHAPE_FLIP_V )
fVal = aLogicRect.GetHeight() - fVal;
@@ -1010,13 +996,11 @@ Point EnhancedCustomShape2d::GetPoint( const com::sun::star::drawing::EnhancedCu
}
else // width
{
- GetParameter( fVal, rParameter, bReplaceGeoSize, sal_False, bNormal );
+ GetParameter( fVal, rParameter, bReplaceGeoSize, sal_False );
fVal -= nCoordLeft;
if ( bScale )
{
fVal *= fXScale;
- if ( bNormal )
- fVal *= fXScaleOOXML;
if ( nFlags & DFF_CUSTOMSHAPE_FLIP_H )
fVal = aLogicRect.GetWidth() - fVal;
@@ -1029,11 +1013,10 @@ Point EnhancedCustomShape2d::GetPoint( const com::sun::star::drawing::EnhancedCu
}
sal_Bool EnhancedCustomShape2d::GetParameter( double& rRetValue, const EnhancedCustomShapeParameter& rParameter,
- const sal_Bool bReplaceGeoWidth, const sal_Bool bReplaceGeoHeight, sal_Bool& bNormal ) const
+ const sal_Bool bReplaceGeoWidth, const sal_Bool bReplaceGeoHeight ) const
{
rRetValue = 0.0;
sal_Bool bRetValue = sal_False;
- bNormal = sal_False;
switch ( rParameter.Type )
{
case EnhancedCustomShapeParameterType::ADJUSTMENT :
@@ -1080,7 +1063,6 @@ sal_Bool EnhancedCustomShape2d::GetParameter( double& rRetValue, const EnhancedC
rRetValue *= fYRatio;
}
}
- bNormal = sal_True;
}
break;
case EnhancedCustomShapeParameterType::LEFT :
@@ -1204,9 +1186,8 @@ sal_Bool EnhancedCustomShape2d::GetHandlePosition( const sal_uInt32 nIndex, Poin
double fAngle;
double fRadius;
- sal_Bool bNormal;
- GetParameter( fRadius, aHandle.aPosition.First, sal_False, sal_False, bNormal );
- GetParameter( fAngle, aHandle.aPosition.Second, sal_False, sal_False, bNormal );
+ GetParameter( fRadius, aHandle.aPosition.First, sal_False, sal_False );
+ GetParameter( fAngle, aHandle.aPosition.Second, sal_False, sal_False );
double a = ( 360.0 - fAngle ) * F_PI180;
double dx = fRadius * fXScale;
@@ -1309,12 +1290,11 @@ sal_Bool EnhancedCustomShape2d::SetHandleControllerPosition( const sal_uInt32 nI
if ( aHandle.aPosition.Second.Type == EnhancedCustomShapeParameterType::ADJUSTMENT )
aHandle.aPosition.Second.Value>>= nSecondAdjustmentValue;
- sal_Bool bNormal;
if ( aHandle.nFlags & HANDLE_FLAGS_POLAR )
{
double fXRef, fYRef, fAngle;
- GetParameter( fXRef, aHandle.aPolar.First, sal_False, sal_False, bNormal );
- GetParameter( fYRef, aHandle.aPolar.Second, sal_False, sal_False, bNormal );
+ GetParameter( fXRef, aHandle.aPolar.First, sal_False, sal_False );
+ GetParameter( fYRef, aHandle.aPolar.Second, sal_False, sal_False );
const double fDX = fPos1 - fXRef;
fAngle = -( atan2( -fPos2 + fYRef, ( ( fDX == 0.0L ) ? 0.000000001 : fDX ) ) / F_PI180 );
double fX = ( fPos1 - fXRef );
@@ -1323,14 +1303,14 @@ sal_Bool EnhancedCustomShape2d::SetHandleControllerPosition( const sal_uInt32 nI
if ( aHandle.nFlags & HANDLE_FLAGS_RADIUS_RANGE_MINIMUM )
{
double fMin;
- GetParameter( fMin, aHandle.aRadiusRangeMinimum, sal_False, sal_False, bNormal );
+ GetParameter( fMin, aHandle.aRadiusRangeMinimum, sal_False, sal_False );
if ( fRadius < fMin )
fRadius = fMin;
}
if ( aHandle.nFlags & HANDLE_FLAGS_RADIUS_RANGE_MAXIMUM )
{
double fMax;
- GetParameter( fMax, aHandle.aRadiusRangeMaximum, sal_False, sal_False, bNormal );
+ GetParameter( fMax, aHandle.aRadiusRangeMaximum, sal_False, sal_False );
if ( fRadius > fMax )
fRadius = fMax;
}
@@ -1358,14 +1338,14 @@ sal_Bool EnhancedCustomShape2d::SetHandleControllerPosition( const sal_uInt32 nI
if ( aHandle.nFlags & HANDLE_FLAGS_RANGE_X_MINIMUM ) // check if horizontal handle needs to be within a range
{
double fXMin;
- GetParameter( fXMin, aHandle.aXRangeMinimum, sal_False, sal_False, bNormal );
+ GetParameter( fXMin, aHandle.aXRangeMinimum, sal_False, sal_False );
if ( fPos1 < fXMin )
fPos1 = fXMin;
}
if ( aHandle.nFlags & HANDLE_FLAGS_RANGE_X_MAXIMUM ) // check if horizontal handle needs to be within a range
{
double fXMax;
- GetParameter( fXMax, aHandle.aXRangeMaximum, sal_False, sal_False, bNormal );
+ GetParameter( fXMax, aHandle.aXRangeMaximum, sal_False, sal_False );
if ( fPos1 > fXMax )
fPos1 = fXMax;
}
@@ -1376,14 +1356,14 @@ sal_Bool EnhancedCustomShape2d::SetHandleControllerPosition( const sal_uInt32 nI
if ( aHandle.nFlags & HANDLE_FLAGS_RANGE_Y_MINIMUM ) // check if vertical handle needs to be within a range
{
double fYMin;
- GetParameter( fYMin, aHandle.aYRangeMinimum, sal_False, sal_False, bNormal );
+ GetParameter( fYMin, aHandle.aYRangeMinimum, sal_False, sal_False );
if ( fPos2 < fYMin )
fPos2 = fYMin;
}
if ( aHandle.nFlags & HANDLE_FLAGS_RANGE_Y_MAXIMUM ) // check if vertical handle needs to be within a range
{
double fYMax;
- GetParameter( fYMax, aHandle.aYRangeMaximum, sal_False, sal_False, bNormal );
+ GetParameter( fYMax, aHandle.aYRangeMaximum, sal_False, sal_False );
if ( fPos2 > fYMax )
fPos2 = fYMax;
}
@@ -1573,14 +1553,13 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
}
case ANGLEELLIPSETO :
{
- sal_Bool bNormal;
for ( sal_uInt16 i = 0; ( i < nPntCount ) && ( ( rSrcPt + 2 ) < nCoordSize ); i++ )
{
// create a circle
Point _aCenter( GetPoint( seqCoordinates[ rSrcPt ], sal_True, sal_True ) );
double fWidth, fHeight;
- GetParameter( fWidth, seqCoordinates[ rSrcPt + 1 ].First, sal_True, sal_False, bNormal );
- GetParameter( fHeight, seqCoordinates[ rSrcPt + 1 ].Second, sal_False, sal_True, bNormal );
+ GetParameter( fWidth, seqCoordinates[ rSrcPt + 1 ].First, sal_True, sal_False );
+ GetParameter( fHeight, seqCoordinates[ rSrcPt + 1 ].Second, sal_False, sal_True );
fWidth *= fXScale;
fHeight*= fYScale;
Point aP( (sal_Int32)( _aCenter.X() - fWidth ), (sal_Int32)( _aCenter.Y() - fHeight ) );
@@ -1589,8 +1568,8 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
if ( aRect.GetWidth() && aRect.GetHeight() )
{
double fStartAngle, fEndAngle;
- GetParameter( fStartAngle, seqCoordinates[ rSrcPt + 2 ].First, sal_False, sal_False, bNormal );
- GetParameter( fEndAngle , seqCoordinates[ rSrcPt + 2 ].Second, sal_False, sal_False, bNormal );
+ GetParameter( fStartAngle, seqCoordinates[ rSrcPt + 2 ].First, sal_False, sal_False );
+ GetParameter( fEndAngle , seqCoordinates[ rSrcPt + 2 ].Second, sal_False, sal_False );
if ( ((sal_Int32)fStartAngle % 360) != ((sal_Int32)fEndAngle % 360) )
{
@@ -1716,19 +1695,14 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
case ARCANGLETO :
{
double fWR, fHR, fStartAngle, fSwingAngle;
- sal_Bool bNormal;
for ( sal_uInt16 i = 0; ( i < nPntCount ) && ( rSrcPt + 1 < nCoordSize ); i++ )
{
- GetParameter ( fWR, seqCoordinates[ (sal_uInt16)( rSrcPt ) ].First, sal_True, sal_False, bNormal );
- if ( bNormal )
- fWR *= fXScaleOOXML;
- GetParameter ( fHR, seqCoordinates[ (sal_uInt16)( rSrcPt ) ].Second, sal_False, sal_True, bNormal );
- if ( bNormal )
- fHR *= fYScaleOOXML;
-
- GetParameter ( fStartAngle, seqCoordinates[ (sal_uInt16)( rSrcPt + 1) ].First, sal_False, sal_False, bNormal );
- GetParameter ( fSwingAngle, seqCoordinates[ (sal_uInt16)( rSrcPt + 1 ) ].Second, sal_False, sal_False, bNormal );
+ GetParameter ( fWR, seqCoordinates[ (sal_uInt16)( rSrcPt ) ].First, sal_True, sal_False );
+ GetParameter ( fHR, seqCoordinates[ (sal_uInt16)( rSrcPt ) ].Second, sal_False, sal_True );
+
+ GetParameter ( fStartAngle, seqCoordinates[ (sal_uInt16)( rSrcPt + 1) ].First, sal_False, sal_False );
+ GetParameter ( fSwingAngle, seqCoordinates[ (sal_uInt16)( rSrcPt + 1 ) ].Second, sal_False, sal_False );
fWR *= fXScale;
fHR *= fYScale;
commit 959302bfd9093b89916517b6589f64bf86610128
Author: Radek Doulik <rodo at novell.com>
Date: Mon Nov 7 11:32:59 2011 +0100
fixed remaining issues with custom shapes sizing
diff --git a/oox/inc/oox/drawingml/customshapeproperties.hxx b/oox/inc/oox/drawingml/customshapeproperties.hxx
index 1b72daa..d5ae9a5 100644
--- a/oox/inc/oox/drawingml/customshapeproperties.hxx
+++ b/oox/inc/oox/drawingml/customshapeproperties.hxx
@@ -121,7 +121,7 @@ public:
void pushToPropSet( const ::oox::core::FilterBase& rFilterBase,
const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & xPropSet,
- const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > & xShape) const;
+ const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > & xShape);
sal_Int32 getShapePresetType() const { return mnShapePresetType; }
::rtl::OUString getShapePresetTypeName() const;
diff --git a/oox/source/drawingml/customshapepresets1.cxx b/oox/source/drawingml/customshapepresets1.cxx
index 0fe0dd3..cdcbf5f 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 f7ddd2a..fdb2894 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 6689ed0..1c7ad03 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 9e5f354..49c0839 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()
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list