diff options
Diffstat (limited to 'wizards/source/formwizard')
| -rw-r--r-- | wizards/source/formwizard/DBMeta.xba | 1 | ||||
| -rw-r--r-- | wizards/source/formwizard/Language.xba | 2 | ||||
| -rw-r--r-- | wizards/source/formwizard/Layouter.xba | 3 | ||||
| -rw-r--r-- | wizards/source/formwizard/develop.xba | 8 | ||||
| -rw-r--r-- | wizards/source/formwizard/tools.xba | 5 |
5 files changed, 4 insertions, 15 deletions
diff --git a/wizards/source/formwizard/DBMeta.xba b/wizards/source/formwizard/DBMeta.xba index 71195992b811..2f4d929dfe79 100644 --- a/wizards/source/formwizard/DBMeta.xba +++ b/wizards/source/formwizard/DBMeta.xba @@ -281,7 +281,6 @@ Sub GetCurrentMetaValues(Index as Integer) CurDefaultValue = FieldMetaValues(Index,5) CurIsCurrency = FieldMetaValues(Index,6) CurScale = FieldMetaValues(Index,7) -' Todo: Is this really the HelpText? CurHelpText = FieldMetaValues(Index,8) CurFieldName = FieldNames(Index) End Sub</script:module>
\ No newline at end of file diff --git a/wizards/source/formwizard/Language.xba b/wizards/source/formwizard/Language.xba index 2169c5b22b02..e51e88aa0835 100644 --- a/wizards/source/formwizard/Language.xba +++ b/wizards/source/formwizard/Language.xba @@ -179,7 +179,7 @@ Sub InitializeWidthList() WidthList(8,2) = False WidthList(8,3) = "FormattedField" - WidthList(9,0) = com.sun.star.sdbc.DataType.DECIMAL ' = 3; (mit Nachkommastellen) + WidthList(9,0) = com.sun.star.sdbc.DataType.DECIMAL ' = 3; (including decimal places) WidthList(9,1) = cNumericBox WidthList(9,2) = False WidthList(9,3) = "FormattedField" diff --git a/wizards/source/formwizard/Layouter.xba b/wizards/source/formwizard/Layouter.xba index d9268c3b26cc..a6d82b8dedd9 100644 --- a/wizards/source/formwizard/Layouter.xba +++ b/wizards/source/formwizard/Layouter.xba @@ -152,12 +152,13 @@ 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 aSize As New com.sun.star.awt.Size Dim oLocControl as Object Dim oLocPeer as Object oLabelModel = CreateUnoService("com.sun.star.form.component.FixedText") oTBModel = CreateUnoService("com.sun.star.form.component.TextField") - Set oLabelShape = InsertControl(oDrawPage, oLabelModel, aPoint, aSize) + Set oLabelShape = InsertControl(oDrawPage, oLabelModel, aPoint, aLabelSize) Set oTBShape = InsertControl(oDrawPage, oTBModel, aPoint, aSize) oLocPeer = oController.GetControl(oLabelModel).Peer diff --git a/wizards/source/formwizard/develop.xba b/wizards/source/formwizard/develop.xba index 5f9169dbfca6..dfc20df2f896 100644 --- a/wizards/source/formwizard/develop.xba +++ b/wizards/source/formwizard/develop.xba @@ -163,9 +163,6 @@ Dim aSize As New com.sun.star.awt.Size End If Else oModel = CreateUnoService(oModelService(cLabel)) -' Todo: According to FS this handling should be verified. I should not rely on the shape to create a model on its -' own. therefor the model should be inserted before the shape -' oDBForm.InsertByName(oModel.Name, oModel) aPoint = GetPoint(nXTCPos, nYTCPos) aSize = GetSize(nTCWidth,nTCHeight) Set oShape = InsertControl(oDrawPage, oModel, aPoint, aSize) @@ -222,9 +219,6 @@ Dim iColRightX as Long If CurControlType = cCheckBox Then oDBModelList(i).Label = "" End If - ' Todo: According to FS this handling should be verified. I should not rely on the shape to create a model on its - ' own. therefor the model should be inserted before the shape - ' oDBForm.InsertByName(oDBModel.Name, oDBModel) oDBModelList(i).DataField = CurFieldName End If nDBHeight = GetDBHeight(oDBModelList(i)) @@ -283,7 +277,7 @@ Dim oGroupShape as Object End Function -' Note on all Controls except for the checkbox the Label has to be set +' Note: on all Controls except for the checkbox the Label has to be set ' a bit under the DBControl because its Height is also smaller Sub GetLabelDiffHeight(Index as Integer) If (CurArrangement = cLeftJustified) Or (CurArrangement = cColumnarLeft) Then diff --git a/wizards/source/formwizard/tools.xba b/wizards/source/formwizard/tools.xba index 7a945593c42a..0d5da836c9cd 100644 --- a/wizards/source/formwizard/tools.xba +++ b/wizards/source/formwizard/tools.xba @@ -179,15 +179,12 @@ Function SetNumerics(ByVal oLocObject as Object, iLocFieldType as Integer) as Ob oLocObject.EffectiveMax = 127 oLocObject.EffectiveMin = -128 Case com.sun.star.sdbc.DataType.FLOAT, com.sun.star.sdbc.DataType.REAL, com.sun.star.sdbc.DataType.DOUBLE, com.sun.star.sdbc.DataType.DECIMAL, com.sun.star.sdbc.DataType.NUMERIC -'Todo: oLocObject.DecimalAccuracy = ... oLocObject.EffectiveDefault = CurDefaultValue -' Todo: HelpText??? End Select If oLocObject.PropertySetinfo.HasPropertyByName("Width")Then ' Note: an Access AutoincrementField does not provide this property Width oLocObject.Width = CurFieldLength + CurScale + 1 End If If CurIsCurrency Then -'Todo: Wie setzt man Währungen? Msgbox "Währungsfeld: " & oLocObject.dbg_Properties End If ElseIf CurControlType = cTextBox Then 'com.sun.star.sdbc.DataType.CHAR, com.sun.star.sdbc.DataType.VARCHAR, com.sun.star.sdbc.DataType.LONGVARCHAR If oLocObject.MaxTextLen = 0 Or oLocObject.MaxTextLen > 30 Then @@ -198,10 +195,8 @@ Function SetNumerics(ByVal oLocObject as Object, iLocFieldType as Integer) as Ob End If oLocObject.DefaultText = CurDefaultValue ElseIf CurControlType = cDateBox Then -''Todo Why does this not work?: oLocObject.DefaultDate = CurDefaultValue ElseIf CurControlType = cTimeBox Then 'com.sun.star.sdbc.DataType.DATE, com.sun.star.sdbc.DataType.TIME oLocObject.DefaultTime = CurDefaultValue -' Todo: Property TimeFormat? frome where? ElseIf CurControlType = cCheckBox Then 'Todo Why does this not work?: oLocObject.DefautState = CurDefaultValue End If |