basegfx/source/range/b2xrange.cxx | 2
chart2/source/controller/dialogs/tp_DataSource.cxx | 6 +-
chart2/source/controller/dialogs/tp_RangeChooser.cxx | 6 +-
chart2/source/view/charttypes/VSeriesPlotter.cxx | 6 +-
chart2/source/view/main/VLegend.cxx | 8 +-
filter/source/msfilter/escherex.cxx | 2
filter/source/msfilter/eschesdo.cxx | 12 ++--
filter/source/msfilter/msdffimp.cxx | 56 +++++++++----------
fpicker/source/office/OfficeFilePicker.cxx | 6 +-
include/filter/msfilter/escherex.hxx | 2
include/sfx2/templatecontaineritem.hxx | 2
include/sfx2/templateviewitem.hxx | 2
include/sfx2/thumbnailviewitem.hxx | 4 -
oox/source/vml/vmlshape.cxx | 2
rsc/source/res/rscclass.cxx | 2
sd/source/filter/eppt/epptso.cxx | 12 ++--
sfx2/source/control/templatecontaineritem.cxx | 4 -
sfx2/source/control/templateviewitem.cxx | 6 +-
sfx2/source/control/thumbnailview.cxx | 6 +-
sfx2/source/control/thumbnailviewitem.cxx | 4 -
starmath/source/node.cxx | 2
svgio/inc/svgio/svgreader/svgtools.hxx | 2
svx/source/table/svdotable.cxx | 8 +-
sw/source/ui/frmdlg/colex.cxx | 2
sw/source/ui/frmdlg/column.cxx | 2
vcl/source/filter/wmf/winmtf.cxx | 6 +-
26 files changed, 86 insertions(+), 86 deletions(-)
New commits:
commit b3c2cf2ae1644088a7fc5c325cce71f71d2b37fd
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sat Nov 23 23:21:52 2013 +0100
widht -> width
Change-Id: I661eeb167a95540a223ce72aac51789daf3767dc
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx
b/chart2/source/controller/dialogs/tp_DataSource.cxx
index c0232ae..7132f4a 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -141,11 +141,11 @@ void lcl_ShowChooserButton(
if( rChooserButton.IsVisible() != bShow )
{
rChooserButton.Show( bShow );
- sal_Int32 nWidhtDiff = 12 + 4;
+ sal_Int32 nWidthDiff = 12 + 4;
if( bShow )
- nWidhtDiff = -nWidhtDiff;
+ nWidthDiff = -nWidthDiff;
Size aSize = rChooserButton.PixelToLogic( rEditField.GetSizePixel(),
MAP_APPFONT );
- aSize.setWidth( aSize.getWidth() + nWidhtDiff );
+ aSize.setWidth( aSize.getWidth() + nWidthDiff );
rEditField.SetSizePixel( rChooserButton.LogicToPixel( aSize,
MAP_APPFONT ));
}
}
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 2eb5f5e..3514e91 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -41,11 +41,11 @@ void lcl_ShowChooserButton(
if( rChooserButton.IsVisible() != bShow )
{
rChooserButton.Show( bShow );
- sal_Int32 nWidhtDiff = 10 + 2;
+ sal_Int32 nWidthDiff = 10 + 2;
if( bShow )
- nWidhtDiff = -nWidhtDiff;
+ nWidthDiff = -nWidthDiff;
Size aSize = rChooserButton.PixelToLogic( rEditField.GetSizePixel(),
MAP_APPFONT );
- aSize.setWidth( aSize.getWidth() + nWidhtDiff );
+ aSize.setWidth( aSize.getWidth() + nWidthDiff );
rEditField.SetSizePixel( rChooserButton.LogicToPixel( aSize,
MAP_APPFONT ));
}
}
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 44e4c58..1e6c96d 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -456,14 +456,14 @@ uno::Reference< drawing::XShape >
VSeriesPlotter::createDataLabel( const uno::Re
Reference< drawing::XShape > xSymbol;
if(pLabel->ShowLegendSymbol)
{
- sal_Int32 nSymbolHeigth = static_cast< sal_Int32 >( fViewFontSize
* 0.6 );
+ sal_Int32 nSymbolHeight = static_cast< sal_Int32 >( fViewFontSize
* 0.6 );
awt::Size aCurrentRatio = this->getPreferredLegendKeyAspectRatio();
sal_Int32 nSymbolWidth = aCurrentRatio.Width;
if( aCurrentRatio.Height > 0 )
{
- nSymbolWidth = nSymbolHeigth*
aCurrentRatio.Width/aCurrentRatio.Height;
+ nSymbolWidth = nSymbolHeight*
aCurrentRatio.Width/aCurrentRatio.Height;
}
- awt::Size aMaxSymbolExtent( nSymbolWidth, nSymbolHeigth );
+ awt::Size aMaxSymbolExtent( nSymbolWidth, nSymbolHeight );
if( rDataSeries.isVaryColorsByPoint() )
xSymbol.set( VSeriesPlotter::createLegendSymbolForPoint(
aMaxSymbolExtent, rDataSeries, nPointIndex, xTarget_, m_xShapeFactory ) );
diff --git a/chart2/source/view/main/VLegend.cxx
b/chart2/source/view/main/VLegend.cxx
index cd26ecd..3cdc505 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -867,8 +867,8 @@ void VLegend::createShapes(
// create entries
double fViewFontSize = lcl_CalcViewFontSize( xLegendProp,
rPageSize );//todo
// #i109336# Improve auto positioning in chart
- sal_Int32 nSymbolHeigth = static_cast< sal_Int32 >( fViewFontSize
* 0.6 );
- sal_Int32 nSymbolWidth = static_cast< sal_Int32 >( nSymbolHeigth );
+ sal_Int32 nSymbolHeight = static_cast< sal_Int32 >( fViewFontSize
* 0.6 );
+ sal_Int32 nSymbolWidth = static_cast< sal_Int32 >( nSymbolHeight );
::std::vector< LegendEntryProvider* >::const_iterator aIter
= m_aLegendEntryProviderList.begin();
const ::std::vector< LegendEntryProvider* >::const_iterator aEnd
= m_aLegendEntryProviderList.end();
@@ -881,12 +881,12 @@ void VLegend::createShapes(
sal_Int32 nCurrentWidth = aCurrentRatio.Width;
if( aCurrentRatio.Height > 0 )
{
- nCurrentWidth = nSymbolHeigth*
aCurrentRatio.Width/aCurrentRatio.Height;
+ nCurrentWidth = nSymbolHeight*
aCurrentRatio.Width/aCurrentRatio.Height;
}
nSymbolWidth = std::max( nSymbolWidth, nCurrentWidth );
}
}
- awt::Size aMaxSymbolExtent( nSymbolWidth, nSymbolHeigth );
+ awt::Size aMaxSymbolExtent( nSymbolWidth, nSymbolHeight );
tViewLegendEntryContainer aViewEntries;
for( aIter = m_aLegendEntryProviderList.begin(); aIter != aEnd;
++aIter )
diff --git a/fpicker/source/office/OfficeFilePicker.cxx
b/fpicker/source/office/OfficeFilePicker.cxx
index 7eba162..241377b 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -893,12 +893,12 @@ sal_Int32 SAL_CALL SvtFilePicker::getAvailableHeight()
throw ( RuntimeException
checkAlive();
SolarMutexGuard aGuard;
- sal_Int32 nHeigth = 0;
+ sal_Int32 nHeight = 0;
if ( getDialog() )
- nHeigth = getDialog()->getAvailableHeight();
+ nHeight = getDialog()->getAvailableHeight();
- return nHeigth;
+ return nHeight;
}
//------------------------------------------------------------------------------------
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 7b8c9eb..731931d 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -580,7 +580,7 @@ Reference< XShape > SimpleShape::implConvertAndInsert(
const Reference< XShapes
else
{
// FIXME Setting the relative width/heigh only for everything but text
frames as
- // TextFrames already have relative widht/heigh feature... but
currently not working
+ // TextFrames already have relative width/height feature... but
currently not working
// in the way we need.
// Set the relative width / height if any
diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx
index 7e56115..0cb238a 100644
--- a/rsc/source/res/rscclass.cxx
+++ b/rsc/source/res/rscclass.cxx
@@ -612,7 +612,7 @@ void RscClass::WriteSrc( const RSCINST & rInst,
aTmpI, fOutput, pTC, nTab, RscId(), pVarName );
fprintf( fOutput, " );\n" );
}
- i += 2; //_X, _Y oder _Widht, Height ueberlesen
+ i += 2; //_X, _Y oder _Width, Height ueberlesen
}
else if( !IsDflt( rInst.pData, i )
&& !IsValueDflt( rInst.pData, i ) )
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 819bc5e..d8dac6b 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -2539,7 +2539,7 @@ void SmMatrixNode::Arrange(const OutputDevice &rDev,
const SmFormat &rFormat)
SmNode *pNode;
sal_uInt16 i, j;
- // initialize array that is to hold the maximum widhts of all
+ // initialize array that is to hold the maximum widths of all
// elements (subnodes) in that column.
long *pColWidth = new long[nNumCols];
for (j = 0; j < nNumCols; j++)
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 994076e..1cc828e 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -464,14 +464,14 @@ void SdrTableObjImpl::DragEdge( bool mbHorizontal, int
nEdge, sal_Int32 nOffset
{
if( (nEdge >= 0) && (nEdge <= getRowCount()) )
{
- sal_Int32 nHeigth = mpLayouter->getRowHeight(
(!nEdge)?nEdge:(nEdge-1) );
+ sal_Int32 nHeight = mpLayouter->getRowHeight(
(!nEdge)?nEdge:(nEdge-1) );
if(nEdge==0)
- nHeigth -= nOffset;
+ nHeight -= nOffset;
else
- nHeigth += nOffset;
+ nHeight += nOffset;
Reference< XIndexAccess > xRows( mxTable->getRows(),
UNO_QUERY_THROW );
Reference< XPropertySet > xRowSet( xRows->getByIndex(
(!nEdge)?nEdge:(nEdge-1) ), UNO_QUERY_THROW );
- xRowSet->setPropertyValue( sSize, Any( nHeigth ) );
+ xRowSet->setPropertyValue( sSize, Any( nHeight ) );
}
}
else
diff --git a/sw/source/ui/frmdlg/colex.cxx b/sw/source/ui/frmdlg/colex.cxx
index 097067a..3863764 100644
--- a/sw/source/ui/frmdlg/colex.cxx
+++ b/sw/source/ui/frmdlg/colex.cxx
@@ -228,7 +228,7 @@ void SwColExample::DrawPage( const Point& rOrg,
else
SetFillColor( GetColor() );
- // #97495# make sure that the automatic column widht's are always equal
+ // #97495# make sure that the automatic column width's are always equal
sal_Bool bAutoWidth = pColMgr->IsAutoWidth();
sal_Int32 nAutoColWidth = 0;
if(bAutoWidth)
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index d9b16fe..e4d9479 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -789,7 +789,7 @@ void SwColumnPage::Init()
if( 1 < nCols )
{
- // #97495# make sure that the automatic column widht's are always equal
+ // #97495# make sure that the automatic column width's are always equal
if(bAutoWidth)
{
nColumnWidthSum /= nCols;
commit 12be7ad5b6572e1800c3f2b7e78bbe6b5df48acf
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sat Nov 23 23:09:04 2013 +0100
emptyness -> emptiness
Change-Id: Id04bea1d07735511acb6d29c96c46d4dea222c0c
diff --git a/basegfx/source/range/b2xrange.cxx
b/basegfx/source/range/b2xrange.cxx
index ec40c25..61434bf 100644
--- a/basegfx/source/range/b2xrange.cxx
+++ b/basegfx/source/range/b2xrange.cxx
@@ -41,7 +41,7 @@ namespace basegfx
// special-casing the empty rect case (this will fail most
// of the times below, because of the DBL_MIN/MAX special
- // values denoting emptyness in the rectangle.
+ // values denoting emptiness in the rectangle.
if( a.isEmpty() )
{
o_rRanges.push_back( b );
commit 9f3aa81c5d5a15b7374768417839bc200fd06479
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Sat Nov 23 23:08:19 2013 +0100
Lenght -> Length
Change-Id: Ic338484627a1b74fba2d4d0794f8865290177464
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 7318de1..320c1b5 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 a164591..1a6e33d 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 c0db6dc..c2f7a2f 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 2ee35fc..59001c6 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 b33b394..e1236f5 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 95b0abc..0d290e3 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 6c42bdc..e36f565 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 064b120..45bf78b 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 e49cf72..2ad7b9f3 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 116a4c0..c8e65a5 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 592c8b6..8c6a961 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 791d981..9187515 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 c6ede61..0cc29fa 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 9986da9..09d847e 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 )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
