This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new cce2cef Fixed typo (heigth -> height)
cce2cef is described below
commit cce2cef208bfebaf840744fb58ecee51a00a1ebd
Author: mseidel <[email protected]>
AuthorDate: Thu Jan 16 15:15:36 2020 +0100
Fixed typo (heigth -> height)
---
main/UnoControls/inc/definesunocontrols.hxx | 2 +-
main/UnoControls/source/inc/progressmonitor.hxx | 2 +-
main/fpicker/source/win32/filepicker/helppopupwindow.cxx | 2 +-
main/sw/source/core/layout/tabfrm.cxx | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/main/UnoControls/inc/definesunocontrols.hxx
b/main/UnoControls/inc/definesunocontrols.hxx
index 43ede06..02841e8 100644
--- a/main/UnoControls/inc/definesunocontrols.hxx
+++ b/main/UnoControls/inc/definesunocontrols.hxx
@@ -106,7 +106,7 @@ namespace unocontrols{
#define PROGRESSMONITOR_IMPLEMENTATIONNAME
"stardiv.UnoControls.ProgressMonitor"
#define PROGRESSMONITOR_FREEBORDER
10
// border around and between the
controls
#define PROGRESSMONITOR_WIDTH_RELATION
4
// reserve 1/4 for button width and rest for
progressbar width
- #define PROGRESSMONITOR_HEIGHT_RELATION
5
// reserve 1/5 for button and progressbar
heigth and rest for text height
+ #define PROGRESSMONITOR_HEIGHT_RELATION
5
// reserve 1/5 for button and progressbar
height and rest for text height
#define PROGRESSMONITOR_FIXEDTEXT_SERVICENAME
"com.sun.star.awt.UnoControlFixedText"
#define PROGRESSMONITOR_BUTTON_SERVICENAME
"com.sun.star.awt.UnoControlButton"
#define PROGRESSMONITOR_FIXEDTEXT_MODELNAME
"com.sun.star.awt.UnoControlFixedTextModel"
diff --git a/main/UnoControls/source/inc/progressmonitor.hxx
b/main/UnoControls/source/inc/progressmonitor.hxx
index 02c9211..a2372c5 100644
--- a/main/UnoControls/source/inc/progressmonitor.hxx
+++ b/main/UnoControls/source/inc/progressmonitor.hxx
@@ -105,7 +105,7 @@ namespace unocontrols{
#define IMPLEMENTATIONNAME_PROGRESSMONITOR
"stardiv.UnoControls.ProgressMonitor"
#define FREEBORDER
10
// border around and between
the controls
#define WIDTH_RELATION
4
// reserve 1/4 for button width and
rest for progressbar width
-#define HEIGHT_RELATION
5
// reserve 1/5 for button and
progressbar heigth and rest for text height
+#define HEIGHT_RELATION
5
// reserve 1/5 for button and
progressbar height and rest for text height
#define FIXEDTEXT_SERVICENAME
"com.sun.star.awt.UnoControlFixedText"
#define BUTTON_SERVICENAME
"com.sun.star.awt.UnoControlButton"
#define FIXEDTEXT_MODELNAME
"com.sun.star.awt.UnoControlFixedTextModel"
diff --git a/main/fpicker/source/win32/filepicker/helppopupwindow.cxx
b/main/fpicker/source/win32/filepicker/helppopupwindow.cxx
index 84da9bb..ea7389a 100644
--- a/main/fpicker/source/win32/filepicker/helppopupwindow.cxx
+++ b/main/fpicker/source/win32/filepicker/helppopupwindow.cxx
@@ -138,7 +138,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/main/sw/source/core/layout/tabfrm.cxx
b/main/sw/source/core/layout/tabfrm.cxx
index ea21140..aa021df 100644
--- a/main/sw/source/core/layout/tabfrm.cxx
+++ b/main/sw/source/core/layout/tabfrm.cxx
@@ -5827,7 +5827,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() )
