Skip to content

C
core
Kaydet (Commit) e8acb5c4 authored tarafından Muthu Subramanian's avatar Muthu Subramanian
Dosyalara gözat
Seçenekler

n#657909: Fixed import of free drawn curves.

üst 37e5910c
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
oox/source/drawingml/customshapegeometry.cxx
Dosyayı görüntüle @ e8acb5c4
...@@ -231,7 +231,7 @@ rtl::OUString GetFormulaParameter( const EnhancedCustomShapeParameter& rParamete ...@@ -231,7 +231,7 @@ rtl::OUString GetFormulaParameter( const EnhancedCustomShapeParameter& rParamete
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCustomShapeProperties, const::rtl::OUString& rValue, sal_Bool bNoSymbols ) static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCustomShapeProperties, const::rtl::OUString& rValue, sal_Bool bNoSymbols, bool bAbs = false )
{ {
com::sun::star::drawing::EnhancedCustomShapeParameter aRet; com::sun::star::drawing::EnhancedCustomShapeParameter aRet;
if ( rValue.getLength() ) if ( rValue.getLength() )
...@@ -401,7 +401,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu ...@@ -401,7 +401,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
} }
if ( ( n >= '0' ) && ( n <= '9' ) ) if ( ( n >= '0' ) && ( n <= '9' ) )
{ // seems to be a ST_Coordinate { // seems to be a ST_Coordinate
aRet.Value = Any( (sal_Int32)(rValue.toInt32() / 5) ); aRet.Value = Any( (sal_Int32)(rValue.toInt32() / ( bAbs ? 1 : 5 ) ) );
aRet.Type = EnhancedCustomShapeParameterType::NORMAL; aRet.Type = EnhancedCustomShapeParameterType::NORMAL;
} }
else else
...@@ -657,8 +657,8 @@ public: ...@@ -657,8 +657,8 @@ public:
AdjPoint2DContext::AdjPoint2DContext( ContextHandler& rParent, const Reference< XFastAttributeList >& xAttribs, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair& rAdjPoint2D ) AdjPoint2DContext::AdjPoint2DContext( ContextHandler& rParent, const Reference< XFastAttributeList >& xAttribs, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair& rAdjPoint2D )
: ContextHandler( rParent ) : ContextHandler( rParent )
{ {
rAdjPoint2D.First = GetAdjCoordinate( rCustomShapeProperties, xAttribs->getOptionalValue( XML_x ), sal_True ); rAdjPoint2D.First = GetAdjCoordinate( rCustomShapeProperties, xAttribs->getOptionalValue( XML_x ), sal_True, true );
rAdjPoint2D.Second = GetAdjCoordinate( rCustomShapeProperties, xAttribs->getOptionalValue( XML_y ), sal_True ); rAdjPoint2D.Second = GetAdjCoordinate( rCustomShapeProperties, xAttribs->getOptionalValue( XML_y ), sal_True, true );
} }
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment