diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2013-11-23 23:08:19 +0100 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2013-11-23 23:22:25 +0100 |
commit | 9f3aa81c5d5a15b7374768417839bc200fd06479 (patch) | |
tree | bb91d4af77cde9cc974aef1548f438a07bbdf323 /filter | |
parent | ea6f3c09cf76932ce567e8d3250e0f665ca42c99 (diff) |
Lenght -> Length
Change-Id: Ic338484627a1b74fba2d4d0794f8865290177464
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/msfilter/escherex.cxx | 2 | ||||
-rw-r--r-- | filter/source/msfilter/eschesdo.cxx | 12 | ||||
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 56 |
3 files changed, 35 insertions, 35 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 7318de19195d..320c1b5692a2 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -880,7 +880,7 @@ sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart, { /* todo: - calculate the best option for ArrowLenght and ArrowWidth + calculate the best option for ArrowLength and ArrowWidth */ if ( aApiName == "Arrow concave" ) reLineEnd = ESCHER_LineArrowStealthEnd; diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index a164591b9629..1a6e33d01368 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -299,14 +299,14 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, { nRadius = ImplMapSize( Size( nRadius, 0 )).Width(); ADD_SHAPE( ESCHER_ShpInst_RoundRectangle, 0xa00 ); // Flags: Connector | HasSpt - sal_Int32 nLenght = rObj.GetRect().GetWidth(); - if ( nLenght > rObj.GetRect().GetHeight() ) - nLenght = rObj.GetRect().GetHeight(); - nLenght >>= 1; - if ( nRadius >= nLenght ) + sal_Int32 nLength = rObj.GetRect().GetWidth(); + if ( nLength > rObj.GetRect().GetHeight() ) + nLength = rObj.GetRect().GetHeight(); + nLength >>= 1; + if ( nRadius >= nLength ) nRadius = 0x2a30; // 0x2a30 is PPTs maximum radius else - nRadius = ( 0x2a30 * nRadius ) / nLenght; + nRadius = ( 0x2a30 * nRadius ) / nLength; aPropOpt.AddOpt( ESCHER_Prop_adjustValue, nRadius ); } else diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index c0db6dced4e1..c2f7a2f71054 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -764,7 +764,7 @@ void SvxMSDffManager::SolveSolver( const SvxMSDffSolverContainer& rSolver ) //////////////////////////////////////////////////////////////////////////////////////////////////// static basegfx::B2DPolyPolygon GetLineArrow( const sal_Int32 nLineWidth, const MSO_LineEnd eLineEnd, - const MSO_LineEndWidth eLineWidth, const MSO_LineEndLength eLineLenght, + const MSO_LineEndWidth eLineWidth, const MSO_LineEndLength eLineLength, sal_Int32& rnArrowWidth, sal_Bool& rbArrowCenter, OUString& rsArrowName, sal_Bool bScaleArrow ) { @@ -774,14 +774,14 @@ static basegfx::B2DPolyPolygon GetLineArrow( const sal_Int32 nLineWidth, const M sal_Int32 nLineWidthCritical = bScaleArrow ? 40 : 70; double fLineWidth = nLineWidth < nLineWidthCritical ? nLineWidthCritical : nLineWidth;; - double fLenghtMul, fWidthMul; + double fLengthMul, fWidthMul; sal_Int32 nLineNumber; - switch( eLineLenght ) + switch( eLineLength ) { default : - case mso_lineMediumLenArrow : fLenghtMul = 3.0; nLineNumber = 2; break; - case mso_lineShortArrow : fLenghtMul = 2.0; nLineNumber = 1; break; - case mso_lineLongArrow : fLenghtMul = 5.0; nLineNumber = 3; break; + case mso_lineMediumLenArrow : fLengthMul = 3.0; nLineNumber = 2; break; + case mso_lineShortArrow : fLengthMul = 2.0; nLineNumber = 1; break; + case mso_lineLongArrow : fLengthMul = 5.0; nLineNumber = 3; break; } switch( eLineWidth ) { @@ -799,8 +799,8 @@ static basegfx::B2DPolyPolygon GetLineArrow( const sal_Int32 nLineWidth, const M { basegfx::B2DPolygon aTriangle; aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth * 0.50, 0.0 )); - aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth, fLenghtMul * fLineWidth )); - aTriangle.append(basegfx::B2DPoint( 0.0, fLenghtMul * fLineWidth )); + aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth, fLengthMul * fLineWidth )); + aTriangle.append(basegfx::B2DPoint( 0.0, fLengthMul * fLineWidth )); aTriangle.setClosed(true); aRetPolyPoly = basegfx::B2DPolyPolygon(aTriangle); aArrowName.append("msArrowEnd "); @@ -809,12 +809,12 @@ static basegfx::B2DPolyPolygon GetLineArrow( const sal_Int32 nLineWidth, const M case mso_lineArrowOpenEnd : { - switch( eLineLenght ) + switch( eLineLength ) { default : - case mso_lineMediumLenArrow : fLenghtMul = 4.5; break; - case mso_lineShortArrow : fLenghtMul = 3.5; break; - case mso_lineLongArrow : fLenghtMul = 6.0; break; + case mso_lineMediumLenArrow : fLengthMul = 4.5; break; + case mso_lineShortArrow : fLengthMul = 3.5; break; + case mso_lineLongArrow : fLengthMul = 6.0; break; } switch( eLineWidth ) { @@ -825,11 +825,11 @@ static basegfx::B2DPolyPolygon GetLineArrow( const sal_Int32 nLineWidth, const M } basegfx::B2DPolygon aTriangle; aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth * 0.50 , 0.0 )); - aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth, fLenghtMul * fLineWidth * 0.91 )); - aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth * 0.85, fLenghtMul * fLineWidth )); - aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth * 0.50, fLenghtMul * fLineWidth * 0.36 )); - aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth * 0.15, fLenghtMul * fLineWidth )); - aTriangle.append(basegfx::B2DPoint( 0.0, fLenghtMul * fLineWidth * 0.91 )); + aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth, fLengthMul * fLineWidth * 0.91 )); + aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth * 0.85, fLengthMul * fLineWidth )); + aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth * 0.50, fLengthMul * fLineWidth * 0.36 )); + aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth * 0.15, fLengthMul * fLineWidth )); + aTriangle.append(basegfx::B2DPoint( 0.0, fLengthMul * fLineWidth * 0.91 )); aTriangle.setClosed(true); aRetPolyPoly = basegfx::B2DPolyPolygon(aTriangle); aArrowName.append("msArrowOpenEnd "); @@ -839,9 +839,9 @@ static basegfx::B2DPolyPolygon GetLineArrow( const sal_Int32 nLineWidth, const M { basegfx::B2DPolygon aTriangle; aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth * 0.50 , 0.0 )); - aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth , fLenghtMul * fLineWidth )); - aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth * 0.50 , fLenghtMul * fLineWidth * 0.60 )); - aTriangle.append(basegfx::B2DPoint( 0.0, fLenghtMul * fLineWidth )); + aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth , fLengthMul * fLineWidth )); + aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth * 0.50 , fLengthMul * fLineWidth * 0.60 )); + aTriangle.append(basegfx::B2DPoint( 0.0, fLengthMul * fLineWidth )); aTriangle.setClosed(true); aRetPolyPoly = basegfx::B2DPolyPolygon(aTriangle); aArrowName.append("msArrowStealthEnd "); @@ -851,9 +851,9 @@ static basegfx::B2DPolyPolygon GetLineArrow( const sal_Int32 nLineWidth, const M { basegfx::B2DPolygon aTriangle; aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth * 0.50 , 0.0 )); - aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth , fLenghtMul * fLineWidth * 0.50 )); - aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth * 0.50 , fLenghtMul * fLineWidth )); - aTriangle.append(basegfx::B2DPoint( 0.0, fLenghtMul * fLineWidth * 0.50 )); + aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth , fLengthMul * fLineWidth * 0.50 )); + aTriangle.append(basegfx::B2DPoint( fWidthMul * fLineWidth * 0.50 , fLengthMul * fLineWidth )); + aTriangle.append(basegfx::B2DPoint( 0.0, fLengthMul * fLineWidth * 0.50 )); aTriangle.setClosed(true); aRetPolyPoly = basegfx::B2DPolyPolygon(aTriangle); rbArrowCenter = sal_True; @@ -864,7 +864,7 @@ static basegfx::B2DPolyPolygon GetLineArrow( const sal_Int32 nLineWidth, const M { aRetPolyPoly = basegfx::B2DPolyPolygon( XPolygon( Point( (sal_Int32)( fWidthMul * fLineWidth * 0.50 ), 0 ), (sal_Int32)( fWidthMul * fLineWidth * 0.50 ), - (sal_Int32)( fLenghtMul * fLineWidth * 0.50 ), 0, 3600 ).getB2DPolygon() ); + (sal_Int32)( fLengthMul * fLineWidth * 0.50 ), 0, 3600 ).getB2DPolygon() ); rbArrowCenter = sal_True; aArrowName.append("msArrowOvalEnd "); } @@ -1013,12 +1013,12 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet& rSet, const MSO_SPT eSh { MSO_LineEnd eLineEnd = (MSO_LineEnd)GetPropertyValue( DFF_Prop_lineStartArrowhead ); MSO_LineEndWidth eWidth = (MSO_LineEndWidth)GetPropertyValue( DFF_Prop_lineStartArrowWidth, mso_lineMediumWidthArrow ); - MSO_LineEndLength eLenght = (MSO_LineEndLength)GetPropertyValue( DFF_Prop_lineStartArrowLength, mso_lineMediumLenArrow ); + MSO_LineEndLength eLength = (MSO_LineEndLength)GetPropertyValue( DFF_Prop_lineStartArrowLength, mso_lineMediumLenArrow ); sal_Int32 nArrowWidth; sal_Bool bArrowCenter; OUString aArrowName; - basegfx::B2DPolyPolygon aPolyPoly(GetLineArrow( nLineWidth, eLineEnd, eWidth, eLenght, nArrowWidth, bArrowCenter, aArrowName, bScaleArrows )); + basegfx::B2DPolyPolygon aPolyPoly(GetLineArrow( nLineWidth, eLineEnd, eWidth, eLength, nArrowWidth, bArrowCenter, aArrowName, bScaleArrows )); rSet.Put( XLineStartWidthItem( nArrowWidth ) ); rSet.Put( XLineStartItem( aArrowName, aPolyPoly) ); @@ -1031,12 +1031,12 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet& rSet, const MSO_SPT eSh { MSO_LineEnd eLineEnd = (MSO_LineEnd)GetPropertyValue( DFF_Prop_lineEndArrowhead ); MSO_LineEndWidth eWidth = (MSO_LineEndWidth)GetPropertyValue( DFF_Prop_lineEndArrowWidth, mso_lineMediumWidthArrow ); - MSO_LineEndLength eLenght = (MSO_LineEndLength)GetPropertyValue( DFF_Prop_lineEndArrowLength, mso_lineMediumLenArrow ); + MSO_LineEndLength eLength = (MSO_LineEndLength)GetPropertyValue( DFF_Prop_lineEndArrowLength, mso_lineMediumLenArrow ); sal_Int32 nArrowWidth; sal_Bool bArrowCenter; OUString aArrowName; - basegfx::B2DPolyPolygon aPolyPoly(GetLineArrow( nLineWidth, eLineEnd, eWidth, eLenght, nArrowWidth, bArrowCenter, aArrowName, bScaleArrows )); + basegfx::B2DPolyPolygon aPolyPoly(GetLineArrow( nLineWidth, eLineEnd, eWidth, eLength, nArrowWidth, bArrowCenter, aArrowName, bScaleArrows )); rSet.Put( XLineEndWidthItem( nArrowWidth ) ); rSet.Put( XLineEndItem( aArrowName, aPolyPoly ) ); |