#94903# Now label controls positioned correctly

6 files changed, 122 insertions, 74 deletions

diff --git a/wizards/source/formwizard/DBMeta.xba b/wizards/source/formwizard/DBMeta.xba
index f1740f780caa..38517b979c42 100644
--- a/wizards/source/formwizard/DBMeta.xba
+++ b/wizards/source/formwizard/DBMeta.xba
@@ -6,7 +6,7 @@ Option Explicit
 Public sDatabaseList()
 Public iCommandTypes() as Integer
 Public CurCommandType as Integer
-Dim oDataSource as Object
+Public oDataSource as Object
 Public bEnableBinaryOptionGroup as Boolean
 
 
@@ -140,6 +140,7 @@ Dim oField as Object
 	ReDim oDBShapeList(MaxIndex) as Object
 	ReDim oTCShapeList(MaxIndex) as Object
 	ReDim oDBModelList(MaxIndex) as Object
+'	ReDim oGroupShapeList(MaxIndex) as Object
 End Sub
 
 
@@ -227,7 +228,11 @@ Dim m as Integer
 		RemoveListItems(oDialogModel.lstFields(), oDialogModel.lstSelFields(), ImgFieldNames())
 	End If
 WIZARDERROR:
-	ShowErrorMessage(True)
+	If Err <> 0 Then	
+		Msgbox(sMsgErrMsg, 16, GetProductName())
+		Resume LOCERROR
+		LOCERROR:		
+	End If
 End Sub
 
 
diff --git a/wizards/source/formwizard/FormWizard.xba b/wizards/source/formwizard/FormWizard.xba
index fd0f7c40601a..f2ca54e82353 100644
--- a/wizards/source/formwizard/FormWizard.xba
+++ b/wizards/source/formwizard/FormWizard.xba
@@ -2,11 +2,8 @@
 <!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
 <script:module xmlns:script="http://openoffice.org/2000/script" script:name="FormWizard" script:language="StarBasic">Option Explicit
 
-&apos; Todo: Gruppieren der DBControls mit den Textfeldern einbinden
-&apos; Evtl könnte dies auch am Ende geschehen
 Public DocumentName as String
-Public FormPath$, FormDBName$, FormReturnValue$
-Public TemplatePath$
+Public FormPath as String
 Public WizardPath as String
 Public WebWizardPath as String
 Public WorkPath as String
@@ -33,8 +30,6 @@ Public Tablename as String
 Public Const SBSIZETEXT = &quot;The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.&quot;
 Public bDisposeDoc as Boolean
 Public bDebug as Boolean
-&apos; Todo: Mit FS absprechen, dass als CommandType Nur Queries und Tables zugelassen sind. Dabei müsste noch abgklärt werden
-&apos; wann ein Content ein &apos;Command&apos; ist.
 
 
 &apos; The macro can be called in 4 possible scenarios:
@@ -74,6 +69,7 @@ Dim SelCount as Integer
 	If Not bDebug Then
 		On Local Error GoTo WIZARDERROR
 	End If
+	OpenFormDocument()
 	CurArrangement = 0
 	bControlsareCreated = False
 	bEnableBinaryOptionGroup = False
@@ -89,11 +85,15 @@ Dim SelCount as Integer
 	WizardPath = GetOfficeSubPath(&quot;Template&quot;,&quot;wizard/&quot;)
 	TexturePath = GetOfficeSubPath(&quot;Gallery&quot;, &quot;www-back/&quot;)
 	WorkPath = GetPathSettings(&quot;Work&quot;)
-	OpenFormDocument()
 	ToggleWindow(False)
+	oProgressBar.Value = 5
 	GetDatabaseNames()
+	oProgressBar.Value = 10
 	InitializeWidthList()
+	oProgressBar.Value = 20
 	LoadLanguage
+	InitializeLabelValues()
+	oProgressBar.Value = 30
 	bNeedFieldRefresh = True
 	With oDialogModel
 		.cmdBack.Enabled = False
@@ -121,7 +121,7 @@ Dim SelCount as Integer
 					SelCount = CountItemsInArray(oDialogModel.lstTables.StringItemList(), sContent)
 					If SelCount = 1 Then
 						DlgFormDB.GetControl(&quot;lstTables&quot;).SelectItem(sContent, True)
-					Else 		&apos; Note: Here is no Error Handling in case that no valid content is transferred
+					Else
 						If CommandType = com.sun.star.sdb.CommandType.QUERY Then
 							SelIndex = IndexInArray(sContent, QueryNames()
 							DlgFormDB.GetControl(&quot;lstTables&quot;).SelectItemPos(SelIndex, True)
@@ -142,17 +142,24 @@ Dim SelCount as Integer
 		&apos; Scenario 1: No parameters are given
 		ToggleListboxControls(oDialogModel, False)
 	End If
+	oProgressBar.Value = 50
 	DlgFormDB.Title = WizardTitle(1)
 	NumberofStyles = FillupWebListbox(oUcb, &quot;/stl&quot;, DlgFormDB, &quot;lstStyles&quot;, Styles())
+	oProgressBar.Value = 60
 	CurIndex = GetCurIndex(oDialogModel.lstStyles, Styles(), NumberofStyles,8)
 	SetImportStyle()
+	oProgressBar.Value = 70
 	ConfigurePageStyle()
+	oProgressBar.Value = 80
 	ToggleWindow(True)
+	oProgressBar.Value = 90
 	oDialogModel.imgTheme.ImageURL = FormPath &amp; &quot;FormWizard_1.bmp&quot;
 	ToggleDatabasePage(True)
+	oProgressBar.Value = 100
 	DlgFormDB.GetControl(&quot;lstDatabases&quot;).SetFocus()
+	oProgressbar.End
 	DlgFormDB.Execute()
-	DlgFormDB.Dispose
+	DlgFormDB.Dispose()
 	If Not IsNull(oDBConnection) Then
 		oDBConnection.Dispose()
 	End If
@@ -160,7 +167,11 @@ Dim SelCount as Integer
 		oDocument.Dispose()
 	End If
 WIZARDERROR:
-	ShowErrorMessage(True)
+	If Err &lt;&gt; 0 Then	
+		Msgbox(sMsgErrMsg, 16, GetProductName())
+		Resume LOCERROR
+		LOCERROR:		
+	End If
 End Sub
 
 
@@ -208,7 +219,6 @@ Sub PreviousStep()
 	If Not bDebug Then
 		On Local Error GoTo WIZARDERROR
 	End If
-
 	With oDialogModel
 		.Step = 1
 		.cmdBack.Enabled = False
@@ -218,7 +228,11 @@ Sub PreviousStep()
 		.imgTheme.ImageUrl = FormPath &amp; &quot;FormWizard_1.bmp&quot;
 	End With
 WIZARDERROR:
-	ShowErrorMessage(True)
+	If Err &lt;&gt; 0 Then	
+		Msgbox(sMsgErrMsg, 16, GetProductName())
+		Resume LOCERROR
+		LOCERROR:		
+	End If
 End Sub
 
 
@@ -247,7 +261,11 @@ Sub NextStep()
 	oDialogModel.imgTheme.ImageUrl = FormPath &amp; &quot;FormWizard_&quot; &amp; oDialogModel.Step &amp; &quot;.bmp&quot;
 	DlgFormDB.Title = WizardTitle(oDialogModel.Step)
 WIZARDERROR:
-	ShowErrorMessage(True)
+	If Err &lt;&gt; 0 Then	
+		Msgbox(sMsgErrMsg, 16, GetProductName())
+		Resume LOCERROR
+		LOCERROR:		
+	End If
 End Sub
 
 
diff --git a/wizards/source/formwizard/Language.xba b/wizards/source/formwizard/Language.xba
index 2296926387f1..3253b4e53356 100644
--- a/wizards/source/formwizard/Language.xba
+++ b/wizards/source/formwizard/Language.xba
@@ -8,12 +8,12 @@ Global Const RID_FORM	= 2200
 
 Public Const SBCANCEL = 2
 Public Const SBREPEAT = 4
+Public LabelDiffHeight as Long
 
 Public WizardTitle(1 To 3) as String
 Public DlgFormDB as Object
 Public oDialogModel as Object
 
-&apos;	Global Msg
 Dim sMsgWizardName as String
 Dim sMsgErrMsg as String
 Dim sMsgErrFormOpen as String
@@ -34,7 +34,6 @@ Public sGoOn as String
 Public sReady as String
 Public sMsgNoConnection as String
 Public sWriterFilterName as String		
-Public sWriterTemplateFiltername as String		
 Public XPixelFactor as Long		
 Public YPixelFactor as Long
 
@@ -75,8 +74,6 @@ Sub SetDialogLanguage ()
 		.cmdGoOn.Label = sGoOn
 		.lblDatabases.Label = GetResText(RID_FORM + 11)
 		.lblTables.Label = GetResText(RID_FORM + 6)
-		XPixelFactor = 100000/DlgFormDB.GetControl(&quot;lstDatabases&quot;).Peer.GetInfo.PixelPerMeterX
-		YPixelFactor = 100000/DlgFormDB.GetControl(&quot;lstDatabases&quot;).Peer.GetInfo.PixelPerMeterY
 
 		.lblFields.Label = GetResText(RID_FORM + 12)
 		.lblSelFields.Label = GetResText(RID_FORM + 13)
@@ -123,7 +120,6 @@ Sub SetDialogLanguage ()
 		.cmdArrange5.HelpText = GetResText(RID_FORM + 39)
 
 		sWriterFilterName = GetResText(RID_FORM + 70)
-		sWriterTemplateFilterName = GetResText(RID_FORM + 71)
 	End With
 End Sub
 
@@ -131,7 +127,6 @@ End Sub
 
 Sub InitializeWidthList()
 
-&apos;Todo: Was ist mit Currencies? Wieso sind dafür in der API keine Feldtypen definiert?
 &apos;  &apos;Currency&apos; ist ein Flag, dass grundsätzlich an jedes Feld angehängt sein kann.
 &apos; An der Connection kann man irgendwie abfragen, ob ein bestimmter Datentyp als Währung 
 &apos; interpretiert wird. Darstellung über Numberformatter. Ist nicht konsistent über Datenbanken.
diff --git a/wizards/source/formwizard/Layouter.xba b/wizards/source/formwizard/Layouter.xba
index 5a4c23e851fa..ae9c7ae7f023 100644
--- a/wizards/source/formwizard/Layouter.xba
+++ b/wizards/source/formwizard/Layouter.xba
@@ -16,6 +16,8 @@ Public nMaxRowRightX as Long
 Public nMaxRowY as Long
 Public nSecMaxRowY as Long
 Public MaxIndex as Integer
+Public CurIndex as Integer
+
 Public Const cVertDistance = 200
 Public Const cHoriDistance = 300
 
@@ -76,7 +78,6 @@ Public oModelService(cControlCollectionCount) as String
 Public oGridModel as Object
 
 
-
 Function InsertControl(oContainer as Object, oControlObject as object, aPoint as Object, aSize as Object)
 Dim oShape as object
 	oShape = oDocument.CreateInstance (&quot;com.sun.star.drawing.ControlShape&quot;)
@@ -115,6 +116,8 @@ Sub OpenFormDocument()
 Dim NoArgs() as new com.sun.star.beans.PropertyValue
 Dim oViewSettings as Object
 	oDocument = StarDesktop.LoadComponentFromURL(&quot;private:factory/swriter&quot;, &quot;_blank&quot;, 0, NoArgs())
+	oProgressbar = oDocument.GetCurrentController.GetFrame.CreateStatusIndicator()
+	oProgressbar.Start(&quot;&quot;, 100)
 	oDocument.ApplyFormDesignMode = False
 	oController = oDocument.GetCurrentController
 	oViewSettings = oDocument.CurrentController.ViewSettings
@@ -127,6 +130,33 @@ Dim oViewSettings as Object
 End Sub
 
 
+Sub	InitializeLabelValues()
+Dim oLabelModel as Object
+Dim oTBModel as Object
+Dim oLabelShape as Object
+Dim oTBShape as Object
+Dim aTBSize As New com.sun.star.awt.Size
+Dim aLabelSize As New com.sun.star.awt.Size
+Dim aPoint As New com.sun.star.awt.Point
+Dim oLocControl as Object
+Dim oLocPeer as Object
+	oLabelModel =  CreateUnoService(&quot;com.sun.star.form.component.FixedText&quot;)
+	oTBModel =  CreateUnoService(&quot;com.sun.star.form.component.TextField&quot;)
+	Set oLabelShape = InsertControl(oDrawPage, oLabelModel, aPoint, aSize)
+	Set oTBShape = InsertControl(oDrawPage, oTBModel, aPoint, aSize)
+	oLocPeer = oController.GetControl(oLabelModel).Peer
+	XPixelFactor = 100000/oLocPeer.GetInfo.PixelPerMeterX
+	YPixelFactor = 100000/oLocPeer.GetInfo.PixelPerMeterY
+	aLabelSize = GetPeerSize(oLabelModel, oLocControl, &quot;The quick brown fox...&quot;)
+	nTCHeight = aLabelSize.Height * YPixelFactor
+	aTBSize = GetPeerSize(oTBModel, oLocControl, &quot;The quick brown fox...&quot;)
+	nDBRefHeight = aTBSize.Height * YPixelFactor
+	LabelDiffHeight = Clng((aTBSize.Height - aLabelSize.Height)/2) * YPixelFactor
+	oDrawPage.Remove(oLabelShape)
+	oDrawPage.Remove(oTBShape)
+End Sub
+
+
 Sub ConfigurePageStyle()
 Dim aPageSize As New com.sun.star.awt.Size
 Dim aSize As New com.sun.star.awt.Size
@@ -171,9 +201,11 @@ Dim sLocText as String
 		End If
 	End If
 WIZARDERROR:
-	ShowErrorMessage(True)
-	oDocument.UnlockControllers()
-	ToggleLayoutPage(True)
+	If Err &lt;&gt; 0 Then	
+		Msgbox(sMsgErrMsg, 16, GetProductName())
+		Resume LOCERROR
+		LOCERROR:		
+	End If
 End Sub
 
 
@@ -201,9 +233,13 @@ Dim oModel as Object
 		Next i
 	End If
 WIZARDERROR:
-	ShowErrorMessage(True)
-	oDocument.UnlockControllers()
-	ToggleLayoutPage(True)
+	If Err &lt;&gt; 0 Then	
+		Msgbox(sMsgErrMsg, 16, GetProductName())
+		Resume LOCERROR
+		LOCERROR:		
+	End If
+&apos;	oDocument.UnlockControllers()
+&apos;	ToggleLayoutPage(True)
 End Sub
 
 
@@ -237,7 +273,11 @@ Dim oModel as Object
 		End Select
 	End If
 WIZARDERROR:
-	ShowErrorMessage(True)
+	If Err &lt;&gt; 0 Then	
+		Msgbox(sMsgErrMsg, 16, GetProductName())
+		Resume LOCERROR
+		LOCERROR:		
+	End If
 End Sub
 
 
@@ -264,8 +304,7 @@ End Sub
 
 
 Sub ToggleLayoutPage(bDoEnable as Boolean, Optional FocusControlName as String)
-&apos; Todo: Diese Zeile wieder reinnehmen und schauen, ob alles richtig getogglet wird.
-&apos;	oDialogModel.Enabled = bDoEnable
+	oDialogModel.Enabled = bDoEnable
 	If bDoEnable Then
 		ToggleOptionButtons(oDialogModel,(bWithBackGraphic = True))
 		ToggleAlignGroup(bDoEnable)
diff --git a/wizards/source/formwizard/develop.xba b/wizards/source/formwizard/develop.xba
index 02894118a93c..ceca8a7bbca8 100644
--- a/wizards/source/formwizard/develop.xba
+++ b/wizards/source/formwizard/develop.xba
@@ -6,15 +6,13 @@ Option Explicit
 Public oDBShapeList() as Object
 Public oTCShapeList() as Object
 Public oDBModelList() as Object
+&apos;Public oGroupShapeList() as Object
+
 Public oGridShape as Object
 Public a as Integer
 Public StartA as Integer
 Public bIsFirstRun as Boolean
 Public bIsVeryFirstRun as Boolean
-
-Public bIsVeryFirstValueField as Boolean
-&apos; This boolean variable refers to the following Controltypes: cTextBox, cCheckBox, cDateBox, cTimeBox, cNumericBox, cCurrencyBox
-
 Public bControlsareCreated as Boolean
 Public nDBRefHeight as Long
 Public nXTCPos&amp;, nYTCPos&amp;, nXDBPos&amp;, nYDBPos&amp;, nTCHeight&amp;, nTCWidth&amp;, nDBHeight&amp;, nDBWidth&amp;
@@ -32,7 +30,6 @@ Dim i as Integer
 	InitializePosSizes()
 	bIsFirstRun = True
 	bIsVeryFirstRun = True
-	bIsVeryFirstValueField = True
 	a = 0
 	StartA = 0
 	nMaxRowY = 0
@@ -42,6 +39,9 @@ Dim i as Integer
 	End If
 	For i = 0 To MaxIndex
 		GetCurrentMetaValues(i)
+&apos;		oGroupShapeList(i) = oDocument.CreateInstance(&quot;com.sun.star.drawing.GroupShape&quot;)
+&apos;		oGroupShapeList(i).AnchorType = com.sun.star.text.TextContentAnchorType.AT_PARAGRAPH
+&apos;		oDrawPage.Add(oGroupShapeList(i))
 		oTCModel = InsertTextControl(i)
 		If CurFieldType = com.sun.star.sdbc.DataType.TIMESTAMP Then
 			InsertTimeStampShape(i)			
@@ -51,6 +51,8 @@ Dim i as Integer
 			oDBModelList(i).LabelControl = oTCModel
 		End If
 		ResetPosSizes(i)
+&apos;		oGroupShapeList(i).Position = GetPoint(nXTCPos, nYTCPos)
+&apos;		oGroupShapeList(i).Size = GetSize(nTCWidth + nDBWidth, nDBHeight)
 		oProgressbar.Value = i
 	Next i
 	ControlCaptionstoStandardLayout()
@@ -67,14 +69,13 @@ Sub ResetPosSizes(LastIndex as Integer)
 				nXTCPos = nMaxColRightX + 2 * cHoriDistance
 				nXDBPos = nXTCPos + cHoriDistance + nMaxTCWidth
 				nYDBPos = cYOffset
-				nYTCPos = cYOffset
 				bIsFirstRun = True
 				StartA = LastIndex + 1
 				a = 0
 			Else
 				a = a + 1
 			End If
-			nYTCPos = nYDBPos
+			nYTCPos = nYDBPos + LABELDIFFHEIGHT
 		Case cColumnarTop
 			nYTCPos = nYDBPos + nDBHeight + cVertDistance
 			If nYTCPos &gt; cYOffset + nFormHeight Then
@@ -132,11 +133,10 @@ End Sub
 
 Sub InitializePosSizes()
 	nXTCPos = cXOffset
-	nYTCPos = cYOffset
+	nYTCPos = cYOffset + LABELDIFFHEIGHT
 	nTCWidth = 2000
-	nTCHeight = 560
 	nDBWidth = 2000
-	nDBHeight = 560
+	nDBHeight = nDBRefHeight
 	iReduceWidth = 0
 	Select Case CurArrangement
 		Case cColumnarLeft, cLeftJustified
@@ -161,7 +161,6 @@ Dim aSize As New com.sun.star.awt.Size
 		Else
 			nTCWidth = oShape.Size.Width
 		End If
-		nTCHeight = oShape.Size.Height
 		oShape.Position = GetPoint(nXTCPos, nYTCPos)
 		If CurArrangement = cColumnarTop Then
 			oModel.Align = com.sun.star.awt.TextAlign.LEFT
@@ -176,7 +175,6 @@ Dim aSize As New com.sun.star.awt.Size
 		Set oShape = InsertControl(oDrawPage, oModel, aPoint, aSize)
 		Set oTCShapeList(i)= oShape
 		If bIsVeryFirstRun Then
-			nTCHeight = GetPreferredHeight(oModel, CurFieldname)
 			If CurArrangement = cColumnarTop Then
 				nYDBPos = nYTCPos + nTCHeight
 			End If
@@ -249,7 +247,6 @@ Dim aSize as New com.sun.star.awt.Size
 Dim nDateWidth as Long
 Dim nTimeWidth as Long
 Dim oGroupShape as Object
-
 	aPoint = GetPoint(nXDBPos, nYDBPos)
 	If bControlsAreCreated Then
 		oDBShapeList(i).Position = aPoint
@@ -301,7 +298,7 @@ Dim nBaseWidth as Long
 		AdjustLineWidth(StartA, a, nLeftDist, - 1)
 		If CurArrangement = cLeftjustified Then
 			nYDBPos = nMaxRowY + cVertDistance
-			nYTCPos = nYDBPos + 5
+			nYTCPos = nYDBPos + LABELDIFFHEIGHT
 			nXTCPos = cXOffset
 		Else
 			nYTCPos = nMaxRowY + cVertDistance
@@ -317,11 +314,11 @@ Dim nBaseWidth as Long
 		If CurArrangement = cLeftJustified Then
 			If nYDBPos + nDBHeight = nMaxRowY Then
 				&apos; The last Control was the highes in the row
-				nYTCPos = nSecMaxRowY + cVertDistance
+				nYDBPos = nSecMaxRowY + cVertDistance
 			Else
-				nYTCPos = nMaxRowY + cVertDistance
+				nYDBPos = nMaxRowY + cVertDistance
 			End If
-			nYDBPos = nYTCPos
+			nYTCPos = nYDBPos + LABELDIFFHEIGHT
 			nXDBPos = cXOffset + nTCWidth
 			oLocTextShape.Position = GetPoint(cXOffset, nYTCPos)
 			oLocDBShape.Position = GetPoint(nXDBPos, nYDBPos)
@@ -409,7 +406,6 @@ Sub CheckOuterPoints(nXPos, nWidth, nYPos, nHeight, bIsDBField as Boolean)
 Dim nColRightX as Long
 Dim nRowY as Long
 Dim nOldMaxRowY as Long
-
 	If CurArrangement = cLeftJustified Or CurArrangement = cTopJustified Then
 		If bIsDBField Then
 			&apos; Only at DBControls you can measure the Value of nMaxRowY
@@ -473,10 +469,8 @@ Dim aSize as New com.sun.star.awt.Size
 End Function
 
 
-
 Function SetupGridColumn(oGridModel as Object, ControlName as String, bHidden as Boolean, iLocFieldType as Integer, ColName as String) as Object
 Dim oColumn as Object
-&apos;Todo: Hier muss in der Hilfe vermittelt werden, dass Image Controls nicht dargestellt werden können
 	CurControlName = ControlName
 	oColumn = oGridModel.CreateColumn(CurControlName)
 	oColumn.Name = CalcUniqueContentName(oGridModel, CurControlName)
@@ -484,7 +478,7 @@ Dim oColumn as Object
 	SetNumerics(oColumn, iLocFieldType)
 	oColumn.DataField = CurFieldName
 	oColumn.Label = ColName 
-	oColumn.Width = 0 	&apos;Spaltenbreite richtet sich nach dem Feldnamen
+	oColumn.Width = 0 	&apos; Width of column is adjusted to Columname
 	oGridModel.insertByName(oColumn.Name, oColumn)
 End Function		
 
diff --git a/wizards/source/formwizard/tools.xba b/wizards/source/formwizard/tools.xba
index 99e92829aa8e..5af5dcb84bec 100644
--- a/wizards/source/formwizard/tools.xba
+++ b/wizards/source/formwizard/tools.xba
@@ -4,8 +4,6 @@
 Option Explicit
 
 
-Public CurIndex as Integer
-
 Function SetProgressValue(iValue as Integer)	
 	If iValue = 0 Then
 		oProgressbar.End
@@ -154,7 +152,11 @@ Dim OldIndex as Integer
 		oDocument.UnlockControllers()
 	End If
 WIZARDERROR:
-	ShowErrorMessage(True)
+	If Err &lt;&gt; 0 Then	
+		Msgbox(sMsgErrMsg, 16, GetProductName())
+		Resume LOCERROR
+		LOCERROR:		
+	End If
 End Sub
 
 
@@ -214,6 +216,7 @@ Dim oShape as Object
 	Next n
 End Sub
 
+
 &apos; Note as Shapes cannot be removed from the DrawPage without destroying
 &apos; the object we have to park them somewhere in Nirwana
 Sub ShapesToNirwana()
@@ -258,12 +261,6 @@ Function GetDBHeight(oDBModel as Object)
 	If CurControlType = cImageControl Then
 		nDBHeight = 2000
 	Else
-		If bIsVeryFirstValueField Then
-			&apos; Todo: Hier wird vereinfachend davon ausgegangen, dass alle DB-Feldern immer die selbe Höhe wie Textfelder haben
-			nDBRefHeight = GetPreferredHeight(oDBModel)
-			bIsVeryFirstValueField = False
-		End If
-		&apos;Todo: Vielleicht könnte man dieses Feld auch noch tiefer machen
 		If CurFieldType = com.sun.star.sdbc.DataType.LONGVARCHAR Then
 			oDBModel.MultiLine = True
 			nDBHeight = nDBRefHeight * 4
@@ -275,16 +272,16 @@ Function GetDBHeight(oDBModel as Object)
 End Function
 
 
-Sub ShowErrorMessage(bEndExecute as Boolean)
-	If Err &lt;&gt; 0 Then	
-		Msgbox(sMsgErrMsg, 16, GetProductName())
-		oDocument.UnlockControllers()
-		ToggleWindow(True)
-		Resume LOCERROR
-		LOCERROR:		
-		On Local Error Goto 0
-		If bEndExecute Then
-			DlgFormDB.EndExecute()	
-		End If
-	End If
-End Sub</script:module>
\ No newline at end of file
+&apos;Sub ShowErrorMessage(bEndExecute as Boolean)
+&apos;	If Err &lt;&gt; 0 Then	
+&apos;		Msgbox(sMsgErrMsg, 16, GetProductName())
+&apos;		Resume LOCERROR
+&apos;		LOCERROR:		
+&apos;		On Local Error Goto 0
+&apos;		oDocument.UnlockControllers()
+&apos;		ToggleWindow(True)
+&apos;		If bEndExecute Then
+&apos;			DlgFormDB.EndExecute()	
+&apos;		End If
+&apos;	End If
+&apos;End Sub</script:module>
\ No newline at end of file