[Libreoffice-commits] core.git: dbaccess/source framework/source include/sfx2 reportdesign/source uui/source xmloff/source
Julien Nabet
serval2412 at yahoo.fr
Mon Nov 25 14:03:36 PST 2013
dbaccess/source/ui/querydesign/JoinTableView.cxx | 2 -
framework/source/classes/resource.src | 4 +--
include/sfx2/sidebar/ResourceDefinitions.hrc | 4 +--
reportdesign/source/ui/dlg/CondFormat.hrc | 8 +++---
reportdesign/source/ui/dlg/CondFormat.src | 2 -
uui/source/nameclashdlg.src | 30 +++++++++++------------
xmloff/source/draw/XMLImageMapContext.cxx | 6 ++--
7 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit f74149bc2102b2d2e3066f5a7a3430aa3dc1755f
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Mon Nov 25 23:01:00 2013 +0100
Fix some typos for "height"
Change-Id: Ibe1fdd7a63ff09097cfe053279d779592d389539
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 79ef08d..d3c341b 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -521,7 +521,7 @@ void OJoinTableView::SetDefaultTabWinPosSize( OTableWindow* pTabWin )
{
DBG_CHKTHIS(OJoinTableView,NULL);
// determine position:
- // the window is divided into lines with height TABWIN_SPACING_Y+TABWIN_HEIGTH_STD.
+ // the window is divided into lines with height TABWIN_SPACING_Y+TABWIN_HEIGHT_STD.
// Then for each line is checked, if there is space for another window.
// If there is no space, the next line is checked.
Size aOutSize = GetSizePixel();
diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src
index 8b1587a..54e3cc4 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -141,7 +141,7 @@ String STR_TOOLBAR_TITLE_ADDON
#define LICENSE_ROW_5 (LICENSE_ROW_4 + FT_HEIGHT+ OFFSET )
#define LICENSE_ROW_6 (LICENSE_ROW_5 + 2*OFFSET )
-#define LICENSE_DIALOG_HEIGTH (LICENSE_ROW_6 + + PB_HEIGHT + 7)
+#define LICENSE_DIALOG_HEIGHT (LICENSE_ROW_6 + + PB_HEIGHT + 7)
#define LICENSE_COL_2 (LICENSE_COL_1 + OFFSET_IMG)
#define LICENSE_COL_3 (LICENSE_COL_2 + COL2_WIDTH +1)
@@ -159,7 +159,7 @@ ModalDialog DLG_LICENSE
OutputSize = TRUE ;
SVLook = TRUE ;
Hide = TRUE ;
- Size = MAP_APPFONT ( LICENSE_DIALOG_WIDTH , LICENSE_DIALOG_HEIGTH ) ;
+ Size = MAP_APPFONT ( LICENSE_DIALOG_WIDTH , LICENSE_DIALOG_HEIGHT ) ;
Text [ en-US ] = "License Agreement";
MultiLineEdit ML_LICENSE
diff --git a/include/sfx2/sidebar/ResourceDefinitions.hrc b/include/sfx2/sidebar/ResourceDefinitions.hrc
index b603d79..5c31112 100644
--- a/include/sfx2/sidebar/ResourceDefinitions.hrc
+++ b/include/sfx2/sidebar/ResourceDefinitions.hrc
@@ -70,9 +70,9 @@
#define TITLEBAR_CONTROL_SPACING_HORIZONTAL 3
#define FI_EXPANSION_INDICATOR_WIDTH 6
-#define FI_EXPANSION_INDICATOR_HEIGTH 6
+#define FI_EXPANSION_INDICATOR_HEIGHT 6
#define FI_EXPANSION_INDICATOR_X TITLEBAR_MARGIN_HORIZONTAL
-#define FI_EXPANSION_INDICATOR_Y (TITLEBAR_HEIGHT - FI_EXPANSION_INDICATOR_HEIGTH)/2
+#define FI_EXPANSION_INDICATOR_Y (TITLEBAR_HEIGHT - FI_EXPANSION_INDICATOR_HEIGHT)/2
#define FT_TITLE_WIDTH 85
#define FT_TITLE_HEIGHT 10
diff --git a/reportdesign/source/ui/dlg/CondFormat.hrc b/reportdesign/source/ui/dlg/CondFormat.hrc
index 5513a81..7978ab7 100644
--- a/reportdesign/source/ui/dlg/CondFormat.hrc
+++ b/reportdesign/source/ui/dlg/CondFormat.hrc
@@ -57,10 +57,10 @@
#define BTN_REMOVE_CONDITION 23
#define ROW_0_POS ( RELATED_CONTROLS )
-#define ROW_0_HEIGTH ( FIXEDTEXT_HEIGHT )
-#define ROW_1_POS ( ROW_0_POS + ROW_0_HEIGTH + UNRELATED_CONTROLS )
-#define ROW_1_HEIGTH ( EDIT_HEIGHT )
-#define ROW_2_POS ( ROW_1_POS + ROW_1_HEIGTH + UNRELATED_CONTROLS )
+#define ROW_0_HEIGHT ( FIXEDTEXT_HEIGHT )
+#define ROW_1_POS ( ROW_0_POS + ROW_0_HEIGHT + UNRELATED_CONTROLS )
+#define ROW_1_HEIGHT ( EDIT_HEIGHT )
+#define ROW_2_POS ( ROW_1_POS + ROW_1_HEIGHT + UNRELATED_CONTROLS )
#define ROW_2_HEIGHT ( 3 * FIXEDTEXT_HEIGHT )
#define ROW_3_POS ( ROW_2_POS + ROW_2_HEIGHT + RELATED_CONTROLS )
#define ROW_3_HEIGHT ( IMAGE_BUTTON_HEIGHT )
diff --git a/reportdesign/source/ui/dlg/CondFormat.src b/reportdesign/source/ui/dlg/CondFormat.src
index 47f9173..11fff9b 100644
--- a/reportdesign/source/ui/dlg/CondFormat.src
+++ b/reportdesign/source/ui/dlg/CondFormat.src
@@ -32,7 +32,7 @@ Control WIN_CONDITION
FixedLine FL_CONDITION_HEADER
{
Pos = MAP_APPFONT ( RELATED_CONTROLS, ROW_0_POS ) ;
- Size = MAP_APPFONT ( CONDITION_WIDTH - 2 * RELATED_CONTROLS, ROW_0_HEIGTH ) ;
+ Size = MAP_APPFONT ( CONDITION_WIDTH - 2 * RELATED_CONTROLS, ROW_0_HEIGHT ) ;
};
ListBox LB_COND_TYPE
diff --git a/uui/source/nameclashdlg.src b/uui/source/nameclashdlg.src
index def662b..79e23fd 100644
--- a/uui/source/nameclashdlg.src
+++ b/uui/source/nameclashdlg.src
@@ -23,25 +23,25 @@
#include "nameclashdlg.hrc"
#define DLG_WIDTH 250
-#define DLG_HEIGTH 75
+#define DLG_HEIGHT 75
#define BORDER_OFFSET 6
-#define EDIT_HEIGTH 12
+#define EDIT_HEIGHT 12
#define BTN_WIDTH 50
-#define BTN_HEIGTH 14
+#define BTN_HEIGHT 14
ModalDialog DLG_SIMPLE_NAME_CLASH
{
HelpId = HID_DLG_SIMPLE_NAME_CLASH ;
OutputSize = TRUE ;
SVLook = TRUE ;
- Size = MAP_APPFONT ( DLG_WIDTH , DLG_HEIGTH ) ;
+ Size = MAP_APPFONT ( DLG_WIDTH , DLG_HEIGHT ) ;
Moveable = TRUE ;
Text [ en-US ] = "File Exists" ;
FixedText FT_FILE_EXISTS_WARNING
{
Pos = MAP_APPFONT ( BORDER_OFFSET, BORDER_OFFSET ) ;
- Size = MAP_APPFONT ( DLG_WIDTH - 2*BORDER_OFFSET, DLG_HEIGTH - EDIT_HEIGTH - BTN_HEIGTH - 4*BORDER_OFFSET ) ;
+ Size = MAP_APPFONT ( DLG_WIDTH - 2*BORDER_OFFSET, DLG_HEIGHT - EDIT_HEIGHT - BTN_HEIGHT - 4*BORDER_OFFSET ) ;
WordBreak = TRUE ;
};
@@ -49,15 +49,15 @@ ModalDialog DLG_SIMPLE_NAME_CLASH
{
HelpID = "uui:Edit:DLG_SIMPLE_NAME_CLASH:EDIT_NEW_NAME";
Border = TRUE ;
- Pos = MAP_APPFONT ( BORDER_OFFSET, DLG_HEIGTH - EDIT_HEIGTH - BTN_HEIGTH - 2*BORDER_OFFSET ) ;
- Size = MAP_APPFONT ( DLG_WIDTH - 2*BORDER_OFFSET , EDIT_HEIGTH ) ;
+ Pos = MAP_APPFONT ( BORDER_OFFSET, DLG_HEIGHT - EDIT_HEIGHT - BTN_HEIGHT - 2*BORDER_OFFSET ) ;
+ Size = MAP_APPFONT ( DLG_WIDTH - 2*BORDER_OFFSET , EDIT_HEIGHT ) ;
};
PushButton BTN_OVERWRITE
{
HelpID = "uui:PushButton:DLG_SIMPLE_NAME_CLASH:BTN_OVERWRITE";
- Pos = MAP_APPFONT ( DLG_WIDTH - 3*(BTN_WIDTH + BORDER_OFFSET) , DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ;
- Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ;
+ Pos = MAP_APPFONT ( DLG_WIDTH - 3*(BTN_WIDTH + BORDER_OFFSET) , DLG_HEIGHT - BTN_HEIGHT - BORDER_OFFSET ) ;
+ Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGHT ) ;
TabStop = TRUE ;
Text [ en-US ] = "Replace" ;
};
@@ -65,8 +65,8 @@ ModalDialog DLG_SIMPLE_NAME_CLASH
PushButton BTN_RENAME
{
HelpID = "uui:PushButton:DLG_SIMPLE_NAME_CLASH:BTN_RENAME";
- Pos = MAP_APPFONT ( DLG_WIDTH - 2*(BTN_WIDTH + BORDER_OFFSET) , DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ;
- Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ;
+ Pos = MAP_APPFONT ( DLG_WIDTH - 2*(BTN_WIDTH + BORDER_OFFSET) , DLG_HEIGHT - BTN_HEIGHT - BORDER_OFFSET ) ;
+ Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGHT ) ;
TabStop = TRUE ;
Text [ en-US ] = "Rename" ;
DefButton = TRUE ;
@@ -74,15 +74,15 @@ ModalDialog DLG_SIMPLE_NAME_CLASH
CancelButton BTN_CANCEL
{
- Pos = MAP_APPFONT ( DLG_WIDTH - BTN_WIDTH - BORDER_OFFSET, DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ;
- Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ;
+ Pos = MAP_APPFONT ( DLG_WIDTH - BTN_WIDTH - BORDER_OFFSET, DLG_HEIGHT - BTN_HEIGHT - BORDER_OFFSET ) ;
+ Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGHT ) ;
TabStop = TRUE ;
};
HelpButton BTN_HELP
{
- Pos = MAP_APPFONT ( BORDER_OFFSET, DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ;
- Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ;
+ Pos = MAP_APPFONT ( BORDER_OFFSET, DLG_HEIGHT - BTN_HEIGHT - BORDER_OFFSET ) ;
+ Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGHT ) ;
TabStop = TRUE ;
};
};
diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx
index 5e956a7..c895efd 100644
--- a/xmloff/source/draw/XMLImageMapContext.cxx
+++ b/xmloff/source/draw/XMLImageMapContext.cxx
@@ -66,7 +66,7 @@ enum XMLImageMapToken
XML_TOK_IMAP_CENTER_X,
XML_TOK_IMAP_CENTER_Y,
XML_TOK_IMAP_WIDTH,
- XML_TOK_IMAP_HEIGTH,
+ XML_TOK_IMAP_HEIGHT,
XML_TOK_IMAP_POINTS,
XML_TOK_IMAP_VIEWBOX,
XML_TOK_IMAP_NOHREF,
@@ -85,7 +85,7 @@ static SvXMLTokenMapEntry aImageMapObjectTokenMap[] =
{ XML_NAMESPACE_SVG, XML_CX, XML_TOK_IMAP_CENTER_X },
{ XML_NAMESPACE_SVG, XML_CY, XML_TOK_IMAP_CENTER_Y },
{ XML_NAMESPACE_SVG, XML_WIDTH, XML_TOK_IMAP_WIDTH },
- { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_IMAP_HEIGTH },
+ { XML_NAMESPACE_SVG, XML_HEIGHT, XML_TOK_IMAP_HEIGHT },
{ XML_NAMESPACE_SVG, XML_R, XML_TOK_IMAP_RADIUS },
{ XML_NAMESPACE_SVG, XML_VIEWBOX, XML_TOK_IMAP_VIEWBOX },
{ XML_NAMESPACE_DRAW, XML_POINTS, XML_TOK_IMAP_POINTS },
@@ -393,7 +393,7 @@ void XMLImageMapRectangleContext::ProcessAttribute(
bWidthOK = sal_True;
}
break;
- case XML_TOK_IMAP_HEIGTH:
+ case XML_TOK_IMAP_HEIGHT:
if (GetImport().GetMM100UnitConverter().convertMeasureToCore(nTmp,
rValue))
{
More information about the Libreoffice-commits
mailing list