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 | |
parent | ea6f3c09cf76932ce567e8d3250e0f665ca42c99 (diff) |
Lenght -> Length
Change-Id: Ic338484627a1b74fba2d4d0794f8865290177464
-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 | ||||
-rw-r--r-- | include/filter/msfilter/escherex.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/templatecontaineritem.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/templateviewitem.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/thumbnailviewitem.hxx | 4 | ||||
-rw-r--r-- | sd/source/filter/eppt/epptso.cxx | 12 | ||||
-rw-r--r-- | sfx2/source/control/templatecontaineritem.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/control/templateviewitem.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/control/thumbnailview.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/control/thumbnailviewitem.cxx | 4 | ||||
-rw-r--r-- | svgio/inc/svgio/svgreader/svgtools.hxx | 2 | ||||
-rw-r--r-- | vcl/source/filter/wmf/winmtf.cxx | 6 |
14 files changed, 60 insertions, 60 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 ) ); diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 2ee35fc1d856..59001c6aa072 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -609,7 +609,7 @@ enum ESCHER_LineWidth }; // size of arrowhead -enum ESCHER_LineEndLenght +enum ESCHER_LineEndLength { ESCHER_LineShortArrow, ESCHER_LineMediumLenArrow, diff --git a/include/sfx2/templatecontaineritem.hxx b/include/sfx2/templatecontaineritem.hxx index b33b3946e248..e1236f5eb6ce 100644 --- a/include/sfx2/templatecontaineritem.hxx +++ b/include/sfx2/templatecontaineritem.hxx @@ -31,7 +31,7 @@ public: const ThumbnailItemAttributes *pAttrs); virtual void calculateItemsPosition (const long nThumbnailHeight, const long nDisplayHeight, - const long nPadding, sal_uInt32 nMaxTextLenght, + const long nPadding, sal_uInt32 nMaxTextLength, const ThumbnailItemAttributes *pAttrs); bool HasMissingPreview( ); diff --git a/include/sfx2/templateviewitem.hxx b/include/sfx2/templateviewitem.hxx index 95b0abc79d51..0d290e36ac7b 100644 --- a/include/sfx2/templateviewitem.hxx +++ b/include/sfx2/templateviewitem.hxx @@ -37,7 +37,7 @@ public: const OUString& getSubTitle () const { return maSubTitle; } virtual void calculateItemsPosition (const long nThumbnailHeight, const long nDisplayHeight, - const long nPadding, sal_uInt32 nMaxTextLenght, + const long nPadding, sal_uInt32 nMaxTextLength, const ThumbnailItemAttributes *pAttrs); virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor, diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx index 6c42bdcba860..e36f5653d7c1 100644 --- a/include/sfx2/thumbnailviewitem.hxx +++ b/include/sfx2/thumbnailviewitem.hxx @@ -53,7 +53,7 @@ namespace drawinglayer { struct ThumbnailItemAttributes { - sal_uInt32 nMaxTextLenght; + sal_uInt32 nMaxTextLength; basegfx::BColor aFillColor; basegfx::BColor aHighlightColor; basegfx::B2DVector aFontSize; @@ -102,7 +102,7 @@ public: Rectangle getTextArea () const; virtual void calculateItemsPosition (const long nThumbnailHeight, const long nDisplayHeight, - const long nPadding, sal_uInt32 nMaxTextLenght, + const long nPadding, sal_uInt32 nMaxTextLength, const ThumbnailItemAttributes *pAttrs); const Point& getTextPos () const { return maTextPos; } diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 064b1204fe2a..45bf78b10647 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -2376,14 +2376,14 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a if ( nRadius ) { ImplCreateShape( ESCHER_ShpInst_RoundRectangle, 0xa00, aSolverContainer ); // Flags: Connector | HasSpt - sal_Int32 nLenght = maRect.GetWidth(); - if ( nLenght > maRect.GetHeight() ) - nLenght = maRect.GetHeight(); - nLenght >>= 1; - if ( nRadius >= nLenght ) + sal_Int32 nLength = maRect.GetWidth(); + if ( nLength > maRect.GetHeight() ) + nLength = maRect.GetHeight(); + nLength >>= 1; + if ( nRadius >= nLength ) nRadius = 0x2a30; // 0x2a30 ist PPTs maximum radius else - nRadius = ( 0x2a30 * nRadius ) / nLenght; + nRadius = ( 0x2a30 * nRadius ) / nLength; aPropOpt.AddOpt( ESCHER_Prop_adjustValue, nRadius ); } else diff --git a/sfx2/source/control/templatecontaineritem.cxx b/sfx2/source/control/templatecontaineritem.cxx index e49cf7240605..2ad7b9f3e7ee 100644 --- a/sfx2/source/control/templatecontaineritem.cxx +++ b/sfx2/source/control/templatecontaineritem.cxx @@ -39,10 +39,10 @@ TemplateContainerItem::~TemplateContainerItem () } void TemplateContainerItem::calculateItemsPosition (const long nThumbnailHeight, const long nDisplayHeight, - const long nPadding, sal_uInt32 nMaxTextLenght, + const long nPadding, sal_uInt32 nMaxTextLength, const ThumbnailItemAttributes *pAttrs) { - ThumbnailViewItem::calculateItemsPosition( nThumbnailHeight, nDisplayHeight, nPadding, nMaxTextLenght, pAttrs); + ThumbnailViewItem::calculateItemsPosition( nThumbnailHeight, nDisplayHeight, nPadding, nMaxTextLength, pAttrs); Point aPos (maDrawArea.getX() + nPadding, maDrawArea.getY() + nPadding); maThumbnailArea = Rectangle(aPos, Size(maDrawArea.GetWidth() - 2 * nPadding, nThumbnailHeight)); } diff --git a/sfx2/source/control/templateviewitem.cxx b/sfx2/source/control/templateviewitem.cxx index 116a4c0d8708..c8e65a54542d 100644 --- a/sfx2/source/control/templateviewitem.cxx +++ b/sfx2/source/control/templateviewitem.cxx @@ -40,10 +40,10 @@ TemplateViewItem::~TemplateViewItem () } void TemplateViewItem::calculateItemsPosition(const long nThumbnailHeight, const long nDisplayHeight, - const long nPadding, sal_uInt32 nMaxTextLenght, + const long nPadding, sal_uInt32 nMaxTextLength, const ThumbnailItemAttributes *pAttrs) { - ThumbnailViewItem::calculateItemsPosition(nThumbnailHeight,nDisplayHeight,nPadding,nMaxTextLenght, pAttrs); + ThumbnailViewItem::calculateItemsPosition(nThumbnailHeight,nDisplayHeight,nPadding,nMaxTextLength, pAttrs); if (!maSubTitle.isEmpty()) { @@ -59,7 +59,7 @@ void TemplateViewItem::calculateItemsPosition(const long nThumbnailHeight, const // Set subtitle position maSubTitlePos.setY(maTextPos.getY() + nSpace + aTextDev.getTextHeight()); maSubTitlePos.setX(maDrawArea.Left() + - (aRectSize.Width() - aTextDev.getTextWidth(maSubTitle,0,nMaxTextLenght)*SUBTITLE_SCALE_FACTOR)/2); + (aRectSize.Width() - aTextDev.getTextWidth(maSubTitle,0,nMaxTextLength)*SUBTITLE_SCALE_FACTOR)/2); } } diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 592c8b64daed..8c6a96107b03 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -224,7 +224,7 @@ void ThumbnailView::ImplInitSettings( bool bFont, bool bForeground, bool bBackgr mpItemAttrs->aFillColor = maColor.getBColor(); mpItemAttrs->aHighlightColor = rStyleSettings.GetHighlightColor().getBColor(); mpItemAttrs->aFontAttr = getFontAttributeFromVclFont(mpItemAttrs->aFontSize,GetFont(),false,true); - mpItemAttrs->nMaxTextLenght = -1; + mpItemAttrs->nMaxTextLength = -1; } void ThumbnailView::ImplInitScrollBar() @@ -381,7 +381,7 @@ void ThumbnailView::CalculateItemPositions () } pItem->setDrawArea(Rectangle( Point(x,y), Size(mnItemWidth, mnItemHeight) )); - pItem->calculateItemsPosition(mnThumbnailHeight,mnDisplayHeight,mnItemPadding,mpItemAttrs->nMaxTextLenght,mpItemAttrs); + pItem->calculateItemsPosition(mnThumbnailHeight,mnDisplayHeight,mnItemPadding,mpItemAttrs->nMaxTextLength,mpItemAttrs); if ( !((nCurCount+1) % mnCols) ) { @@ -1108,7 +1108,7 @@ sal_uInt16 ThumbnailView::getNextItemId() const void ThumbnailView::setItemMaxTextLength(sal_uInt32 nLength) { - mpItemAttrs->nMaxTextLenght = nLength; + mpItemAttrs->nMaxTextLength = nLength; } void ThumbnailView::setItemDimensions(long itemWidth, long thumbnailHeight, long displayHeight, int itemPadding) diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx index 791d981f157d..9187515c0e11 100644 --- a/sfx2/source/control/thumbnailviewitem.cxx +++ b/sfx2/source/control/thumbnailviewitem.cxx @@ -206,7 +206,7 @@ void ThumbnailViewItem::setDrawArea (const Rectangle &area) } void ThumbnailViewItem::calculateItemsPosition (const long nThumbnailHeight, const long, - const long nPadding, sal_uInt32 nMaxTextLenght, + const long nPadding, sal_uInt32 nMaxTextLength, const ThumbnailItemAttributes *pAttrs) { drawinglayer::primitive2d::TextLayouterDevice aTextDev; @@ -225,7 +225,7 @@ void ThumbnailViewItem::calculateItemsPosition (const long nThumbnailHeight, con // Calculate text position aPos.Y() = maDrawArea.getY() + nThumbnailHeight + nPadding * 2; - aPos.X() = maDrawArea.Left() + (aRectSize.Width() - aTextDev.getTextWidth(maTitle,0,nMaxTextLenght))/2; + aPos.X() = maDrawArea.Left() + (aRectSize.Width() - aTextDev.getTextWidth(maTitle,0,nMaxTextLength))/2; maTextPos = aPos; // Calculate the text edit max area diff --git a/svgio/inc/svgio/svgreader/svgtools.hxx b/svgio/inc/svgio/svgreader/svgtools.hxx index c6ede61a1145..0cc29fa7231a 100644 --- a/svgio/inc/svgio/svgreader/svgtools.hxx +++ b/svgio/inc/svgio/svgreader/svgtools.hxx @@ -37,7 +37,7 @@ namespace svgio void myAssert(const OUString& rMessage); #endif -// recommended value for this devise dependend unit, see CSS2 section 4.3.2 Lenghts +// recommended value for this devise dependend unit, see CSS2 section 4.3.2 Lengths #define F_SVG_PIXEL_PER_INCH 90.0 // common non-token strings diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index 9986da940437..09d847e557a6 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -1570,9 +1570,9 @@ void WinMtfOutput::DrawText( Point& rPosition, OUString& rText, sal_Int32* pDXAr if ( mnTextAlign & TA_RIGHT_CENTER ) { - double fLenght = ( ( mnTextAlign & TA_RIGHT_CENTER ) == TA_RIGHT ) ? nTextWidth : nTextWidth >> 1; - rPosition.X() -= (sal_Int32)( fLenght * cos( maFont.GetOrientation() * F_PI1800 ) ); - rPosition.Y() -= (sal_Int32)(-( fLenght * sin( maFont.GetOrientation() * F_PI1800 ) ) ); + double fLength = ( ( mnTextAlign & TA_RIGHT_CENTER ) == TA_RIGHT ) ? nTextWidth : nTextWidth >> 1; + rPosition.X() -= (sal_Int32)( fLength * cos( maFont.GetOrientation() * F_PI1800 ) ); + rPosition.Y() -= (sal_Int32)(-( fLength * sin( maFont.GetOrientation() * F_PI1800 ) ) ); } if( mnTextAlign & TA_UPDATECP ) |