[Libreoffice-commits] core.git: filter/source fpicker/source offapi/com starmath/source sw/source vcl/inc vcl/unx
Tor Lillqvist
tml at iki.fi
Fri Feb 22 00:40:02 PST 2013
filter/source/graphicfilter/ipcd/ipcd.cxx | 2 +-
filter/source/graphicfilter/itiff/itiff.cxx | 2 +-
fpicker/source/win32/filepicker/helppopupwindow.cxx | 2 +-
offapi/com/sun/star/ui/dialogs/XFilePreview.idl | 2 +-
starmath/source/node.cxx | 4 ++--
sw/source/core/layout/tabfrm.cxx | 2 +-
vcl/inc/ilstbox.hxx | 2 +-
vcl/unx/gtk/window/gtkframe.cxx | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 78425b0df6462a3c63c3b0241f0d71d464bb7b0c
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Feb 22 10:14:47 2013 +0200
s/heigth/height/
Change-Id: Idfc117f3026d45845dcce64d31aad6fc0af9c00a
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx
index 4f6a334..c5ec1a7 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -59,7 +59,7 @@ private:
PCDResolution eResolution; // which resolution we want
sal_uLong nWidth; // width of the PCD picture
- sal_uLong nHeight; // heigth of the PCD picture
+ sal_uLong nHeight; // height of the PCD picture
sal_uLong nImagePos; // position of the picture within the PCD file
// temporary lLue-Green-Red-Bitmap
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index 55b7182..1a45750 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -68,7 +68,7 @@ private:
sal_uLong nNewSubFile; //
sal_uLong nSubFile; //
sal_uLong nImageWidth; // picture width in pixels
- sal_uLong nImageLength; // picture heigth in pixels
+ sal_uLong nImageLength; // picture height in pixels
sal_uLong nBitsPerSample; // bits per pixel per layer
sal_uLong nCompression; // kind of compression
sal_uLong nPhotometricInterpretation; //
diff --git a/fpicker/source/win32/filepicker/helppopupwindow.cxx b/fpicker/source/win32/filepicker/helppopupwindow.cxx
index 7b0ddf2..c0f70a7 100644
--- a/fpicker/source/win32/filepicker/helppopupwindow.cxx
+++ b/fpicker/source/win32/filepicker/helppopupwindow.cxx
@@ -123,7 +123,7 @@ void SAL_CALL CHelpPopupWindow::show( sal_Int32 x, sal_Int32 y )
{
OSL_ENSURE( NULL == m_hwnd, "method should not be called twice in sequence" );
- // we create a window with length and heigth of 0
+ // we create a window with length and height of 0
// first in order to get a device context of this
// window, then we calculate the upper left corner
// and the dimensions and resize the window
diff --git a/offapi/com/sun/star/ui/dialogs/XFilePreview.idl b/offapi/com/sun/star/ui/dialogs/XFilePreview.idl
index 10b88b6..c6d749b 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePreview.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePreview.idl
@@ -65,7 +65,7 @@ published interface XFilePreview: com::sun::star::uno::XInterface
0 will be returned.
@returns
- The heigth of the preview window in pixel.
+ The height of the preview window in pixel.
*/
long getAvailableHeight( );
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 6710666..3e0ddb2 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -2680,7 +2680,7 @@ void SmMathSymbolNode::AdaptToY(const OutputDevice &rDev, sal_uLong nHeight)
GetFont().FreezeBorderWidth();
Size aFntSize (GetFont().GetSize());
- // Since we only want to scale the heigth, we might have
+ // Since we only want to scale the height, we might have
// to determine the font width in order to keep it
if (aFntSize.Width() == 0)
{
@@ -3056,7 +3056,7 @@ void SmBlankNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat)
SmTmpDevice aTmpDev ((OutputDevice &) rDev, true);
aTmpDev.SetFont(GetFont());
- // make distance depend on the font heigth
+ // make distance depend on the font height
// (so that it increases when scaling (e.g. size *2 {a ~ b})
long nDist = GetFont().GetSize().Height() / 10L,
nSpace = nNum * nDist;
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index ac641d0..3e9a642 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -5565,7 +5565,7 @@ SwTwips SwTabFrm::CalcHeightOfFirstContentLine() const
nKeepHeight = lcl_GetHeightOfRows( GetLower(), nKeepRows );
}
- // For master tables, the height of the headlines + the heigth of the
+ // For master tables, the height of the headlines + the height of the
// keeping lines (if any) has to be considered. For follow tables, we
// only consider the height of the keeping rows without the repeated lines:
if ( !IsFollow() )
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index 93203f5..4c1b700 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -209,7 +209,7 @@ private:
long mnMaxImgWidth; // Maximum width of an image item
long mnMaxImgHeight; // Maximum height of an image item
long mnMaxWidth; // Maximum width of an entry
- long mnMaxHeight; // Maximum heigth of an entry
+ long mnMaxHeight; // Maximum height of an entry
sal_uInt16 mnCurrentPos; // Position (Focus)
sal_uInt16 mnTrackingSaveSelection; // Selection before Tracking();
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index f8f4906..249b9f6 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -1685,7 +1685,7 @@ void GtkSalFrame::Enable( sal_Bool /*bEnable*/ )
void GtkSalFrame::setMinMaxSize()
{
/* #i34504# metacity (and possibly others) do not treat
- * _NET_WM_STATE_FULLSCREEN and max_width/heigth independently;
+ * _NET_WM_STATE_FULLSCREEN and max_width/height independently;
* whether they should is undefined. So don't set the max size hint
* for a full screen window.
*/
More information about the Libreoffice-commits
mailing list