diff options
| author | Radek Doulik <rodo@novell.com> | 2011-11-02 13:45:28 +0100 |
|---|---|---|
| committer | Radek Doulik <rodo@novell.com> | 2011-11-07 12:08:26 +0100 |
| commit | 5c8ce0a6f5176c76495e7de1c8e31c322e40c542 (patch) | |
| tree | 49c5d87ba9cd937d9842406e2aad7057c11921ee /svx/inc | |
| parent | f8508036d1f28765ad43055d9ba99219e1523087 (diff) | |
fix ooxml custom shapes sizing
- ooxml custom shapes width and height are in actual (logic) coordinates space
and not in "virtual" 21600x21600 space
Diffstat (limited to 'svx/inc')
| -rw-r--r-- | svx/inc/svx/EnhancedCustomShape2d.hxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/svx/inc/svx/EnhancedCustomShape2d.hxx b/svx/inc/svx/EnhancedCustomShape2d.hxx index 2aadcf895d13..d2228e90c743 100644 --- a/svx/inc/svx/EnhancedCustomShape2d.hxx +++ b/svx/inc/svx/EnhancedCustomShape2d.hxx @@ -92,9 +92,13 @@ class EnhancedCustomShape2d : public SfxItemSet double fXScale; double fYScale; + double fXScaleOOXML; + double fYScaleOOXML; double fXRatio; double fYRatio; + sal_Bool bOOXMLShape; + sal_Int32 nXRef; sal_Int32 nYRef; sal_uInt32 nFlags; @@ -132,7 +136,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 ) const; + const sal_Bool bReplaceGeoWidth, const sal_Bool bReplaceGeoHeight, sal_Bool& bNormal ) const; Point GetPoint( const com::sun::star::drawing::EnhancedCustomShapeParameterPair&, const sal_Bool bScale = sal_True, const sal_Bool bReplaceGeoSize = sal_False ) const; |