summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.cxx6
-rw-r--r--chart2/source/controller/dialogs/tp_RangeChooser.cxx6
-rw-r--r--chart2/source/view/charttypes/VSeriesPlotter.cxx6
-rw-r--r--chart2/source/view/main/VLegend.cxx8
-rw-r--r--fpicker/source/office/OfficeFilePicker.cxx6
-rw-r--r--oox/source/vml/vmlshape.cxx2
-rw-r--r--rsc/source/res/rscclass.cxx2
-rw-r--r--starmath/source/node.cxx2
-rw-r--r--svx/source/table/svdotable.cxx8
-rw-r--r--sw/source/ui/frmdlg/colex.cxx2
-rw-r--r--sw/source/ui/frmdlg/column.cxx2
11 files changed, 25 insertions, 25 deletions
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index c0232aef65a8..7132f4aaaf64 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 2eb5f5e465a8..3514e915a994 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 44e4c5857222..1e6c96dd4b75 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 cd26ecde2fb0..3cdc50514c95 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 7eba162c8720..241377b42fb2 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 7b8c9eb66195..731931df66ea 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 7e5611527782..0cb238a87f80 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 819bc5e318f3..d8dac6b4a941 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 994076e4f322..1cc828e2fd6c 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 097067adcc08..38637647ba30 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 d9b16fe4a764..e4d94794f5df 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;