summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
authorBehrend Cornelius <bc@openoffice.org>2001-07-11 12:16:18 +0000
committerBehrend Cornelius <bc@openoffice.org>2001-07-11 12:16:18 +0000
commitd4bb12f6b023c5fc94aba9c5a85a79703798d1a2 (patch)
tree71898fc58a8ecf0c745c3a246aeef233334c3e64 /wizards
parent76fb1c425fe75727d117a6b2fe825557882031b5 (diff)
#89276# Dialog modified
Diffstat (limited to 'wizards')
-rw-r--r--wizards/source/formwizard/DBMeta.xba60
-rw-r--r--wizards/source/formwizard/DlgFormDB.xdl114
-rw-r--r--wizards/source/formwizard/FormWizard.xba65
-rw-r--r--wizards/source/formwizard/Language.xba37
-rw-r--r--wizards/source/formwizard/Layouter.xba27
-rw-r--r--wizards/source/formwizard/dbwizres.src31
-rw-r--r--wizards/source/formwizard/tools.xba21
7 files changed, 188 insertions, 167 deletions
diff --git a/wizards/source/formwizard/DBMeta.xba b/wizards/source/formwizard/DBMeta.xba
index 8043ad24599a..cea70228609f 100644
--- a/wizards/source/formwizard/DBMeta.xba
+++ b/wizards/source/formwizard/DBMeta.xba
@@ -4,7 +4,8 @@
Option Explicit
Public sDatabaseList()
-
+Public iCommandTypes() as Integer
+Public CurCommandType as Integer
Sub GetDatabaseNames()
If oDBContext.HasElements Then
@@ -23,13 +24,14 @@ Dim DBIndex as Integer
DBIndex = oDialogModel.lstDatabases.SelectedItems(0)
sDBName = sDatabaseList(DBIndex)
If GetConnection(sDBName) Then
- bGetMetaData = GetDBMetaData()
+ bGetMetaData = GetDBMetaData()
End If
If bGetMetaData Then
With oDialogModel
.lstTables.Enabled = True
.lblTables.Enabled = True
.lstTables.StringItemList() = AddListToList(TableNames(), QueryNames())
+ iCommandTypes() = CreateCommandTypeList()
.lstFields.StringItemList() = NullList()
.lstSelFields.StringItemList() = NullList()
End With
@@ -47,9 +49,9 @@ Dim bExitLoop as Boolean
Dim bGetConnection as Boolean
Dim iMsg as Integer
Dim Nulllist()
-&apos; If Not IsNull(oDBConnection) Then
-&apos; oDBConnection.Dispose()
-&apos; End If
+ If Not IsNull(oDBConnection) Then
+ oDBConnection.Dispose()
+ End If
oDatabase = oDBContext.GetByName(sDBName)
If Not oDatabase.IsPasswordRequired Then
oDBConnection = oDBContext.GetByName(sDBName).GetConnection(&quot;&quot;,&quot;&quot;)
@@ -60,7 +62,7 @@ Dim Nulllist()
On Local Error Goto NOCONNECTION
Do
bExitLoop = True
- oDBConnection = oDataSource.ConnectWithCompletion(oInteractionHandler)
+ oDBConnection = oDataSource.ConnectWithCompletion(oInteractionHandler)
NOCONNECTION:
bGetConnection = Err = 0
If bGetConnection Then
@@ -76,7 +78,7 @@ Dim Nulllist()
CLERROR:
End If
Loop Until bExitLoop
- On Local Error Goto 0
+ On Local Error Goto 0
If Not bGetConnection Then
oDialogModel.lstDatabases.SelectedItems() = Nulllist()
oDialogModel.lstTables.StringItemList() = NullList()
@@ -90,6 +92,7 @@ End Function
Function GetDBMetaData()
If oDBContext.HasElements Then
+ printdbgInfo oDBConnection
Tablenames() = oDBConnection.Tables.ElementNames()
Querynames() = oDBConnection.Queries.ElementNames()
GetDBMetaData = True
@@ -107,10 +110,9 @@ Dim Found as Boolean
Dim i as Integer
Dim sFieldName as String
Dim n as Integer
-
+Dim WidthIndex as Integer
MaxIndex = Ubound(oDialogModel.lstSelFields.StringItemList())
- Dim ColumnMap(MaxIndex)as Integer
-
+ Dim ColumnMap(MaxIndex)as Integer
FieldNames() = oDialogModel.lstSelFields.StringItemList()
&apos; Build a structure which maps the position of a selected field (within the selection) to the the column position within
@@ -132,10 +134,9 @@ Dim n as Integer
sFieldname = FieldNames(n)
iType = oColumns.GetByName(sFieldName).Type
FieldMetaValues(n,0) = iType
- &apos; Todo: Geht das nicht etwas performanter?
- FieldMetaValues(n,1) = GetValueoutofList(iType, WidthList(),1)
- FieldMetaValues(n,2) = GetValueoutofList(iType, WidthList(),2)
- FieldMetaValues(n,3) = GetValueoutofList(iType, WidthList(),4)
+ FieldMetaValues(n,1) = GetValueoutofList(iType, WidthList(),1, WidthIndex)
+ FieldMetaValues(n,2) = WidthList(WidthIndex,2)
+ FieldMetaValues(n,3) = WidthList(WidthIndex,4)
Next
ReDim oDBShapeList(MaxIndex) as Object
ReDim oTCShapeList(MaxIndex) as Object
@@ -181,11 +182,7 @@ Sub CreateDBForm()
oDBForm.Name = &quot;Standard&quot;
oDBForm.DataSourceName = sDBName
oDBForm.Command = TableName
- If bIsQuery Then
- oDBForm.CommandType = 1 &apos; Abfrage
- else
- oDBForm.CommandType = 0 &apos; Tabelle
- End If
+ oDBForm.CommandType = CurCommandType
End Sub
@@ -209,7 +206,7 @@ Dim m as Integer
Next m
s = s + 1
Next n
- FillUpFieldsListbox()
+ FillUpFieldsListbox(True)
End Sub
@@ -217,5 +214,24 @@ Sub RemoveBinaryFieldsFromWidthList()
Dim MaxIndex as Integer
MaxIndex = Ubound(WidthList(),1) - Ubound(ImgWidthList(),1) - 1
ReDim Preserve WidthList(MaxIndex, 4)
- FillUpFieldsListbox()
-End Sub</script:module> \ No newline at end of file
+ FillUpFieldsListbox(True)
+End Sub
+
+
+Function CreateCommandTypeList()
+Dim MaxTableIndex as Integer
+Dim MaxQueryIndex as Integer
+Dim i as Integer
+Dim a as Integer
+ MaxTableIndex = Ubound(TableNames()
+ MaxQueryIndex = Ubound(QueryNames()
+Dim LocCommandTypes(MaxTableIndex + MaxQueryIndex + 1)
+ For i = 0 To MaxTableIndex
+ LocCommandTypes(i) = com.sun.star.sdb.CommandType.TABLE
+ Next i
+ a = i + 1
+ For i = 0 To MaxQueryIndex
+ LocCommandTypes(a) = com.sun.star.sdb.CommandType.Query
+ Next i
+ CreateCommandTypeList() = LocCommandTypes()
+End Function</script:module> \ No newline at end of file
diff --git a/wizards/source/formwizard/DlgFormDB.xdl b/wizards/source/formwizard/DlgFormDB.xdl
index 3f2a8ace291c..eccdce438bf0 100644
--- a/wizards/source/formwizard/DlgFormDB.xdl
+++ b/wizards/source/formwizard/DlgFormDB.xdl
@@ -1,22 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" dlg:id="DlgFormDB" dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:page="1">
- <dlg:styles>
- <dlg:style dlg:style-id="0" dlg:text-color="0x0" dlg:font-name="StarSymbol" dlg:font-height="18" dlg:font-stylename="Standard" dlg:font-charset="ansi" dlg:font-weight="150.0"/>
- </dlg:styles>
<dlg:bulletinboard>
- <dlg:text dlg:id="lblSelFields" dlg:tab-index="0" dlg:left="154" dlg:top="96" dlg:width="110" dlg:height="8" dlg:page="1" dlg:value="lblSelFields"/>
+ <dlg:text dlg:id="lblSelFields" dlg:tab-index="0" dlg:left="154" dlg:top="70" dlg:width="110" dlg:height="8" dlg:page="1" dlg:value="lblSelFields"/>
<dlg:menulist dlg:id="lstDatabases" dlg:tab-index="1" dlg:left="6" dlg:top="51" dlg:width="110" dlg:height="12" dlg:page="1" dlg:spin="true">
<dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="FormWizard.DBMeta.GetSelectedDBMetaData"/>
</dlg:menulist>
- <dlg:menulist dlg:id="lstTables" dlg:tab-index="2" dlg:left="6" dlg:top="78" dlg:width="110" dlg:height="12" dlg:page="1" dlg:spin="true">
+ <dlg:menulist dlg:id="lstTables" dlg:tab-index="2" dlg:left="122" dlg:top="51" dlg:width="110" dlg:height="12" dlg:page="1" dlg:spin="true">
<dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="FormWizard.FormWizard.FormGetFields"/>
</dlg:menulist>
<dlg:img dlg:id="imgTheme" dlg:tab-index="3" dlg:left="6" dlg:top="6" dlg:width="258" dlg:height="26"/>
<dlg:button dlg:id="cmdCancel" dlg:tab-index="4" dlg:left="6" dlg:top="190" dlg:width="53" dlg:height="14" dlg:value="cmdCancel">
<dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="FormWizard.FormWizard.CancelFormWizard"/>
</dlg:button>
- <dlg:button dlg:id="cmdHelp" dlg:tab-index="5" dlg:left="63" dlg:top="190" dlg:width="53" dlg:height="14" dlg:value="cmdHelp"/>
+ <dlg:button dlg:id="cmdHelp" dlg:tab-index="5" dlg:left="63" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="vnd.sun.star.help://swriter/65888?Language=de&amp;System=WIN" dlg:value="cmdHelp"/>
<dlg:button dlg:id="cmdBack" dlg:tab-index="6" dlg:left="155" dlg:top="190" dlg:width="53" dlg:height="14" dlg:value="cmdBack">
<dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="FormWizard.FormWizard.PreviousStep"/>
</dlg:button>
@@ -24,85 +21,86 @@
<dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="FormWizard.FormWizard.NextStep"/>
</dlg:button>
<dlg:text dlg:id="lblDatabases" dlg:tab-index="8" dlg:left="6" dlg:top="40" dlg:width="74" dlg:height="8" dlg:page="1" dlg:value="lblDatabases"/>
- <dlg:text dlg:id="lblTables" dlg:tab-index="9" dlg:left="6" dlg:top="67" dlg:width="72" dlg:height="8" dlg:page="1" dlg:value="lblTables"/>
- <dlg:text dlg:id="lblFields" dlg:tab-index="10" dlg:left="6" dlg:top="96" dlg:width="109" dlg:height="8" dlg:page="1" dlg:value="lblFields"/>
- <dlg:button dlg:id="cmdMoveSelected" dlg:tab-index="11" dlg:left="122" dlg:top="112" dlg:width="25" dlg:height="14" dlg:page="1" dlg:value="-&gt;">
+ <dlg:text dlg:id="lblTables" dlg:tab-index="9" dlg:left="122" dlg:top="40" dlg:width="72" dlg:height="8" dlg:page="1" dlg:value="lblTables"/>
+ <dlg:text dlg:id="lblFields" dlg:tab-index="10" dlg:left="6" dlg:top="70" dlg:width="109" dlg:height="8" dlg:page="1" dlg:value="lblFields"/>
+ <dlg:button dlg:id="cmdMoveSelected" dlg:tab-index="11" dlg:left="122" dlg:top="84" dlg:width="25" dlg:height="14" dlg:page="1" dlg:value="-&gt;">
<dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="Tools.Listbox.FormMoveSelected"/>
</dlg:button>
- <dlg:button dlg:id="cmdMoveAll" dlg:tab-index="12" dlg:left="122" dlg:top="130" dlg:width="25" dlg:height="14" dlg:page="1" dlg:value="=&gt;&gt;">
+ <dlg:button dlg:id="cmdMoveAll" dlg:tab-index="12" dlg:left="122" dlg:top="101" dlg:width="25" dlg:height="14" dlg:page="1" dlg:value="=&gt;&gt;">
<dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="Tools.Listbox.FormMoveAll"/>
</dlg:button>
- <dlg:button dlg:id="cmdRemoveSelected" dlg:tab-index="13" dlg:left="122" dlg:top="148" dlg:width="25" dlg:height="14" dlg:page="1" dlg:value="&lt;-">
+ <dlg:button dlg:id="cmdRemoveSelected" dlg:tab-index="13" dlg:left="122" dlg:top="118" dlg:width="25" dlg:height="14" dlg:page="1" dlg:value="&lt;-">
<dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="Tools.Listbox.FormRemoveSelected"/>
</dlg:button>
- <dlg:button dlg:id="cmdRemoveAll" dlg:tab-index="14" dlg:left="122" dlg:top="166" dlg:width="25" dlg:height="14" dlg:page="1" dlg:value="&lt;&lt;=">
+ <dlg:button dlg:id="cmdRemoveAll" dlg:tab-index="14" dlg:left="122" dlg:top="135" dlg:width="25" dlg:height="14" dlg:page="1" dlg:value="&lt;&lt;=">
<dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="Tools.Listbox.FormRemoveAll"/>
</dlg:button>
<dlg:radiogroup>
- <dlg:radio dlg:id="optIgnoreBinaries" dlg:tab-index="15" dlg:left="160" dlg:top="62" dlg:width="104" dlg:height="8" dlg:page="1" dlg:value="optIgnoreBinaries">
+ <dlg:radio dlg:id="optIgnoreBinaries" dlg:tab-index="15" dlg:left="122" dlg:top="169" dlg:width="104" dlg:height="10" dlg:page="1" dlg:value="optIgnoreBinaries">
<dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="FormWizard.DBMeta.RemoveBinaryFieldsFromWidthList"/>
</dlg:radio>
- <dlg:radio dlg:id="optBinariesasGraphics" dlg:tab-index="16" dlg:left="160" dlg:top="74" dlg:width="104" dlg:height="8" dlg:page="1" dlg:value="optBinariesasGraphics">
+ <dlg:radio dlg:id="optBinariesasGraphics" dlg:tab-index="16" dlg:left="12" dlg:top="169" dlg:width="104" dlg:height="10" dlg:page="1" dlg:value="optBinariesasGraphics">
<dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="FormWizard.DBMeta.AddBinaryFieldsToWidthList"/>
</dlg:radio>
</dlg:radiogroup>
- <dlg:menulist dlg:id="lstFields" dlg:tab-index="17" dlg:left="6" dlg:top="107" dlg:width="110" dlg:height="77" dlg:page="1" dlg:multiselection="true">
+ <dlg:menulist dlg:id="lstFields" dlg:tab-index="17" dlg:left="6" dlg:top="81" dlg:width="110" dlg:height="70" dlg:page="1" dlg:multiselection="true">
<dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="Tools.Listbox.FormSetMoveRights"/>
</dlg:menulist>
- <dlg:menulist dlg:id="lstSelFields" dlg:tab-index="18" dlg:left="154" dlg:top="107" dlg:width="110" dlg:height="77" dlg:page="1" dlg:multiselection="true">
+ <dlg:menulist dlg:id="lstSelFields" dlg:tab-index="18" dlg:left="154" dlg:top="81" dlg:width="110" dlg:height="70" dlg:page="1" dlg:multiselection="true">
<dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="Tools.Listbox.FormSetMoveRights"/>
</dlg:menulist>
- <dlg:text dlg:id="lblStyles" dlg:tab-index="19" dlg:left="6" dlg:top="41" dlg:width="110" dlg:height="8" dlg:page="2" dlg:value="lblStyles"/>
- <dlg:radiogroup>
- <dlg:radio dlg:id="optTiled" dlg:tab-index="20" dlg:left="126" dlg:top="164" dlg:width="81" dlg:height="8" dlg:page="2" dlg:tag="11" dlg:value="optTiled">
- <dlg:event dlg:listener-type="com.sun.star.awt.XMouseListener" dlg:event-method="mouseReleased" dlg:script-type="StarBasic" dlg:script-code="WebWizard.Common.SetBackGraphicStyle"/>
- </dlg:radio>
- <dlg:radio dlg:id="optArea" dlg:tab-index="21" dlg:left="126" dlg:top="176" dlg:width="81" dlg:height="8" dlg:page="2" dlg:tag="10" dlg:value="optArea">
- <dlg:event dlg:listener-type="com.sun.star.awt.XMouseListener" dlg:event-method="mouseReleased" dlg:script-type="StarBasic" dlg:script-code="WebWizard.Common.SetBackGraphicStyle"/>
- </dlg:radio>
- </dlg:radiogroup>
- <dlg:menulist dlg:id="lstStyles" dlg:tab-index="22" dlg:left="6" dlg:top="51" dlg:width="110" dlg:height="135" dlg:page="2">
- <dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="FormWizard.tools.ImportStyles"/>
- </dlg:menulist>
- <dlg:fixedline dlg:id="hlnBinaries" dlg:tab-index="23" dlg:left="154" dlg:top="51" dlg:width="110" dlg:height="8" dlg:page="1" dlg:value="hlnBinaries"/>
- <dlg:button dlg:style-id="0" dlg:id="cmdSwitchHeight" dlg:tab-index="24" dlg:left="122" dlg:top="190" dlg:width="25" dlg:height="14">
- <dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="FormWizard.FormWizard.SwitchDialogHeight"/>
- </dlg:button>
- <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="25" dlg:left="154" dlg:top="84" dlg:width="110" dlg:height="8" dlg:page="1"/>
- <dlg:fixedline dlg:id="hlnBackground" dlg:tab-index="26" dlg:left="120" dlg:top="153" dlg:width="144" dlg:height="8" dlg:page="2" dlg:value="hlnBackground"/>
- <dlg:fixedline dlg:id="hlnAlign" dlg:tab-index="27" dlg:left="209" dlg:top="100" dlg:width="55" dlg:height="8" dlg:page="2" dlg:value="hlnAlign"/>
- <dlg:fixedline dlg:id="hlnBorderLayout" dlg:tab-index="28" dlg:left="120" dlg:top="100" dlg:width="81" dlg:height="8" dlg:page="2" dlg:value="hlnBorderLayout"/>
- <dlg:fixedline dlg:id="hlnArrangements" dlg:tab-index="29" dlg:left="120" dlg:top="51" dlg:width="144" dlg:height="10" dlg:page="2" dlg:value="hlnArrangements"/>
- <dlg:button dlg:id="cmdArrange1" dlg:tab-index="30" dlg:left="126" dlg:top="62" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="1">
+ <dlg:text dlg:id="lblStyles" dlg:tab-index="19" dlg:left="150" dlg:top="39" dlg:width="114" dlg:height="8" dlg:page="2" dlg:value="lblStyles"/>
+ <dlg:button dlg:id="cmdArrange1" dlg:tab-index="20" dlg:left="12" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="1">
<dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="FormWizard.Layouter.ChangeArrangemode"/>
</dlg:button>
- <dlg:button dlg:id="cmdArrange2" dlg:tab-index="31" dlg:left="152" dlg:top="62" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="2">
+ <dlg:button dlg:id="cmdArrange2" dlg:tab-index="21" dlg:left="39" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="2">
<dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="FormWizard.Layouter.ChangeArrangemode"/>
</dlg:button>
- <dlg:button dlg:id="cmdArrange3" dlg:tab-index="32" dlg:left="178" dlg:top="62" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="3">
+ <dlg:button dlg:id="cmdArrange3" dlg:tab-index="22" dlg:left="66" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="3">
<dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="FormWizard.Layouter.ChangeArrangemode"/>
</dlg:button>
- <dlg:button dlg:id="cmdArrange4" dlg:tab-index="33" dlg:left="215" dlg:top="62" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="4">
+ <dlg:button dlg:id="cmdArrange4" dlg:tab-index="23" dlg:left="93" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="4">
<dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="FormWizard.Layouter.ChangeArrangemode"/>
</dlg:button>
- <dlg:button dlg:id="cmdArrange5" dlg:tab-index="34" dlg:left="241" dlg:top="62" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="5">
+ <dlg:button dlg:id="cmdArrange5" dlg:tab-index="24" dlg:left="120" dlg:top="50" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="5">
<dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="FormWizard.Layouter.ChangeArrangemode"/>
</dlg:button>
- <dlg:button dlg:id="cmdBorder0" dlg:tab-index="35" dlg:left="126" dlg:top="111" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="0">
- <dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="FormWizard.Layouter.ChangeBorderLayouts"/>
- </dlg:button>
- <dlg:button dlg:id="cmdBorder1" dlg:tab-index="36" dlg:left="152" dlg:top="111" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="1">
- <dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="FormWizard.Layouter.ChangeBorderLayouts"/>
- </dlg:button>
- <dlg:button dlg:id="CommandButton1" dlg:tab-index="37" dlg:left="15" dlg:top="128" dlg:width="0" dlg:height="2" dlg:page="2" dlg:tag="1" dlg:value="CommandButton1"/>
- <dlg:button dlg:id="cmdBorder2" dlg:tab-index="38" dlg:left="178" dlg:top="111" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="2">
- <dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="FormWizard.Layouter.ChangeBorderLayouts"/>
- </dlg:button>
- <dlg:button dlg:id="cmdAlign0" dlg:tab-index="39" dlg:left="215" dlg:top="111" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="0">
- <dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="FormWizard.Layouter.ChangeLabelAlignments"/>
- </dlg:button>
- <dlg:button dlg:id="cmdAlign2" dlg:tab-index="40" dlg:left="241" dlg:top="111" dlg:width="23" dlg:height="25" dlg:page="2" dlg:tag="2">
- <dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="FormWizard.Layouter.ChangeLabelAlignments"/>
- </dlg:button>
+ <dlg:menulist dlg:id="lstStyles" dlg:tab-index="25" dlg:left="150" dlg:top="50" dlg:width="114" dlg:height="86" dlg:page="2">
+ <dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="FormWizard.tools.ImportStyles"/>
+ </dlg:menulist>
+ <dlg:radiogroup>
+ <dlg:radio dlg:id="optBorder0" dlg:tab-index="26" dlg:left="11" dlg:top="95" dlg:width="131" dlg:height="10" dlg:page="2" dlg:value="optBorder0">
+ <dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="FormWizard.Layouter.ChangeBorderLayouts"/>
+ </dlg:radio>
+ <dlg:radio dlg:id="optBorder1" dlg:tab-index="27" dlg:left="11" dlg:top="109" dlg:width="131" dlg:height="10" dlg:page="2" dlg:value="optBorder1">
+ <dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="FormWizard.Layouter.ChangeBorderLayouts"/>
+ </dlg:radio>
+ <dlg:radio dlg:id="optBorder2" dlg:tab-index="28" dlg:left="11" dlg:top="123" dlg:width="131" dlg:height="10" dlg:page="2" dlg:value="optBorder2">
+ <dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="FormWizard.Layouter.ChangeBorderLayouts"/>
+ </dlg:radio>
+ </dlg:radiogroup>
+ <dlg:fixedline dlg:id="hlnBinaries" dlg:tab-index="29" dlg:left="6" dlg:top="158" dlg:width="258" dlg:height="8" dlg:page="1" dlg:value="hlnBinaries"/>
+ <dlg:radiogroup>
+ <dlg:radio dlg:id="optTiled" dlg:tab-index="30" dlg:left="156" dlg:top="154" dlg:width="81" dlg:height="10" dlg:page="2" dlg:tag="11" dlg:help-url="34671" dlg:value="optTiled">
+ <dlg:event dlg:listener-type="com.sun.star.awt.XMouseListener" dlg:event-method="mouseReleased" dlg:script-type="StarBasic" dlg:script-code="WebWizard.Common.SetBackGraphicStyle"/>
+ </dlg:radio>
+ <dlg:radio dlg:id="optArea" dlg:tab-index="31" dlg:left="156" dlg:top="168" dlg:width="81" dlg:height="10" dlg:page="2" dlg:tag="10" dlg:value="optArea">
+ <dlg:event dlg:listener-type="com.sun.star.awt.XMouseListener" dlg:event-method="mouseReleased" dlg:script-type="StarBasic" dlg:script-code="WebWizard.Common.SetBackGraphicStyle"/>
+ </dlg:radio>
+ </dlg:radiogroup>
+ <dlg:fixedline dlg:id="hlnBackground" dlg:tab-index="32" dlg:left="150" dlg:top="143" dlg:width="114" dlg:height="8" dlg:page="2" dlg:value="hlnBackground"/>
+ <dlg:fixedline dlg:id="hlnAlign" dlg:tab-index="33" dlg:left="6" dlg:top="143" dlg:width="137" dlg:height="8" dlg:page="2" dlg:value="hlnAlign"/>
+ <dlg:fixedline dlg:id="hlnBorderLayout" dlg:tab-index="34" dlg:left="6" dlg:top="83" dlg:width="137" dlg:height="8" dlg:page="2" dlg:value="hlnBorderLayout"/>
+ <dlg:fixedline dlg:id="hlnArrangements" dlg:tab-index="35" dlg:left="6" dlg:top="39" dlg:width="137" dlg:height="8" dlg:page="2" dlg:value="hlnArrangements"/>
+ <dlg:button dlg:id="CommandButton1" dlg:tab-index="36" dlg:left="15" dlg:top="128" dlg:width="0" dlg:height="2" dlg:page="2" dlg:tag="1" dlg:value="CommandButton1"/>
+ <dlg:radiogroup>
+ <dlg:radio dlg:id="optAlign0" dlg:tab-index="37" dlg:left="12" dlg:top="154" dlg:width="131" dlg:height="10" dlg:page="2" dlg:value="optAlign0">
+ <dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="FormWizard.Layouter.ChangeLabelAlignments"/>
+ </dlg:radio>
+ <dlg:radio dlg:id="optAlign2" dlg:tab-index="38" dlg:left="12" dlg:top="168" dlg:width="131" dlg:height="10" dlg:page="2" dlg:value="optAlign2">
+ <dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="FormWizard.Layouter.ChangeLabelAlignments"/>
+ </dlg:radio>
+ </dlg:radiogroup>
+ <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="39" dlg:left="6" dlg:top="180" dlg:width="258" dlg:height="6"/>
</dlg:bulletinboard>
</dlg:window> \ No newline at end of file
diff --git a/wizards/source/formwizard/FormWizard.xba b/wizards/source/formwizard/FormWizard.xba
index bbe352e07386..4412bae22bc2 100644
--- a/wizards/source/formwizard/FormWizard.xba
+++ b/wizards/source/formwizard/FormWizard.xba
@@ -14,11 +14,8 @@ Public TexturePath as String
Public sQueryName as String
Public NumberofStyles as Integer
Public oDBConnection as Object
-Public s_aCurrencySymbol As String
-Public s_aPrependCurrencySymbol As Boolean
Public bNeedFieldRefresh as Boolean
-Public bIsQuery as Boolean
Public oDBForm as Object
Public oColumns() as Object
Public sDatabaseList()
@@ -34,10 +31,10 @@ Public ImgWidthList(3,4)
Public sDBName as String
Public Tablename as String
+&apos; Todo: Mit FS abschnacken, 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; Todo: &apos;Datenquelle&apos; für &apos;Datenbank&apos;
-&apos; &apos;Inhalte&apos; oder &apos;Objekte&apos; mit &apos;Tabellen und Abfragen&apos; evtl als Hilfetext für &apos;Datenquelle&apos;
-Sub MainWithDefault(Optional DatasourceName as String, Optional Contenttype as Integer, Optional sContent as String, Optional oConnection as Object)
+Sub MainWithDefault(Optional DatasourceName as String, Optional CommandType as Integer, Optional sContent as String, Optional oConnection as Object)
&apos;On Local Error Goto GlobalError
BasicLibraries.LoadLibrary(&quot;Tools&quot;)
BasicLibraries.LoadLibrary(&quot;WebWizard&quot;)
@@ -61,7 +58,7 @@ Sub MainWithDefault(Optional DatasourceName as String, Optional Contenttype as I
LoadLanguage
bNeedFieldRefresh = True
If Not IsMissing(DataSourceName) Then
- CreateForm(DatasourceName, Contenttype, sContent, oConnection)
+ CreateForm(DatasourceName, CommandType, sContent, oConnection)
Else
CreateForm()
End If
@@ -73,7 +70,7 @@ GlobalError:
End Sub
-Sub CreateForm(Optional DatasourceName as String, Optional Contenttype as Integer, Optional sContent as String, Optional oConnection as Object) as String
+Sub CreateForm(Optional DatasourceName as String, Optional CommandType as Integer, Optional sContent as String, Optional oConnection as Object) as String
Dim i as Integer
With oDialogModel
.optIgnoreBinaries.State = True
@@ -84,13 +81,27 @@ Dim i as Integer
.Step = 1
.lstDatabases.StringItemList()= sDatabaseList()&apos; = AddItem(sDatabaseList(i)
End With
+
If Not IsMissing(DataSourceName) Then
DlgFormDB.GetControl(&quot;lstDatabases&quot;).SelectItem(DataSourceName, True)
Set oDBConnection = oConnection
If GetDBMetaData() Then
- oDialogModel.lstTables.StringItemList() = AddListToList(TableNames(), QueryNames()
- DlgFormDB.GetControl(&quot;lstTables&quot;).SelectItem(sContent, True)
- FillUpFieldsListbox()
+ oDialogModel.lstTables.StringItemList() = AddListToList(TableNames(), QueryNames())
+ iCommandTypes() = CreateCommandTypeList()
+ SelCount = CountItemsInArray()
+ 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
+ If CommandType = com.sun.star.sdb.CommandType.QUERY Then
+ SelIndex = IndexInArray(sContent, QueryNames()
+ DlgFormDB.GetControl(&quot;lstTables&quot;).SelectItemPos(SelIndex, True)
+ ElseIf CommandType = com.sun.star.sdb.CommandType.TABLE Then
+ SelIndex = IndexInArray(sContent, TableNames()
+ DlgFormDB.GetControl(&quot;lstTables&quot;).SelectItemPos(Ubound(QueryNames()+1 + SelIndex, True)
+ End If
+ End If
+ CurCommandType = CommandType
+ FillUpFieldsListbox(False)
End If
Else
ToggleListboxControls(oDialogModel, False)
@@ -115,18 +126,22 @@ End Sub
Sub FormGetFields()
Dim i as Integer
ToggleDatabasePage(False)
- FillUpFieldsListbox()
+ FillUpFieldsListbox(True)
ToggleDatabasePage(True)
End Sub
-Sub FillUpFieldsListbox()
+Sub FillUpFieldsListbox(bGetCommandType as Boolean)
Dim n as Integer
+Dim SelIndex as Integer
n = Ubound(oDialogModel.lstTables.SelectedItems())
If n &lt;&gt; -1 Then
- Tablename = Tablenames(oDialogModel.lstTables.SelectedItems(0))
- bIsQuery = FieldinArray(QueryNames(), Ubound(QueryNames()), TableName)
- If (bIsQuery) Then
+ SelIndex = oDialogModel.lstTables.SelectedItems(0)
+ If bGetCommandType Then
+ CurCommandType = iCommandTypes(SelIndex)
+ End If
+ Tablename = Tablenames(SelIndex)
+ If CurCommandType = com.sun.star.sdb.CommandType.QUERY Then
oColumns = oDBConnection.Queries.GetByName(TableName).Columns
Else
oColumns = oDBConnection.Tables.GetByName(Tablename).Columns
@@ -198,17 +213,14 @@ Sub InitializeLayoutSettings()
oDialogModel.optArea.State = 1
End If
SwitchArrangementButtons(cTabled)
- SwitchAlignButtons(SBALIGNLEFT)
- SwitchBorderButtons(SB3DBORDER)
+ SwitchAlignMode(SBALIGNLEFT)
+ SwitchBorderMode(SB3DBORDER)
ToggleBorderGroup(bControlsAreCreated)
ToggleAlignGroup(bControlsAreCreated)
ArrangeControls()
If OldAlignMode &lt;&gt; 0 Then
DlgFormDB.GetControl(&quot;cmdAlign&quot; &amp; OldAlignmode).Model.State = 0
End If
- If OldAlignMode &lt;&gt; 0 Then
- DlgFormDB.GetControl(&quot;cmdAlign&quot; &amp; OldAlignmode).Model.State = 0
- End If
End Sub
@@ -222,11 +234,6 @@ Sub ToggleDatabasePage(bDoEnable as Boolean)
End Sub
-Sub SwitchDialogHeight()
- SwitchWizardDialogHeight(DlgFormDB, sReduceDialog, sHeightenDialog)
-End Sub
-
-
Sub StoreForm()
Dim bDocIsStored as Boolean
Dim FilterNames(1,2) as String
@@ -246,4 +253,10 @@ Dim oFilters() as Object
oDBConnection.Dispose
End If
End Sub
+
+
+Sub HelperDialog()
+&apos;Todo: The String &quot;start&quot; can be replaced by a HelpIndex
+ StarDesktop.LoadComponentfromUrl(&quot;vnd.sun.star.help://&quot; &amp; sDocType &amp; &quot;/start&quot;, &quot;_OFFICE_HELP&quot;, 64, NoArgs())
+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 ae424e735fc7..79dd4fbd7691 100644
--- a/wizards/source/formwizard/Language.xba
+++ b/wizards/source/formwizard/Language.xba
@@ -36,8 +36,6 @@ Dim sMsgDatetime_TimeComponent as String
Public sGoOn as String
Public sReady as String
Public sMsgNoConnection as String
-Public sReduceDialog as String
-Public sHeightenDialog as String
Public sWriterFilterName as String
Public sWriterTemplateFiltername as String
@@ -76,8 +74,8 @@ Sub SetDialogLanguage ()
.cmdHelp.Label = GetResText(RID_COMMON + 20)
sGoOn = GetResText(RID_COMMON + 3)
.cmdGoOn.Label = sGoOn
- .lblDatabases.Label = GetResText(RID_COMMON + 4)
- .lblTables.Label = GetResText(RID_FORM + 11)
+ .lblDatabases.Label = GetResText(RID_FORM + 11)
+ .lblTables.Label = GetResText(RID_FORM + 6)
.lblFields.Label = GetResText(RID_FORM + 12)
.lblSelFields.Label = GetResText(RID_FORM + 13)
@@ -99,21 +97,15 @@ Sub SetDialogLanguage ()
.optTiled.Label = GetResText(RID_FORM + 56)
.optArea.Label = GetResText(RID_FORM + 57)
- .cmdAlign0.ImageURL = FormPath &amp; &quot;Align_0.bmp&quot;
- .cmdAlign0.HelpText = GetResText(RID_FORM + 33)
-
- .cmdAlign2.ImageURL = FormPath &amp; &quot;Align_2.bmp&quot;
- .cmdAlign2.HelpText = GetResText(RID_FORM + 34)
-
- .cmdBorder0.ImageURL = FormPath &amp; &quot;Border_0.bmp&quot;
- .cmdBorder0.HelpText = GetResText(RID_FORM + 29)
-
- .cmdBorder1.ImageURL = FormPath &amp; &quot;Border_1.bmp&quot;
- .cmdBorder1.HelpText = GetResText(RID_FORM + 30)
-
- .cmdBorder2.ImageURL = FormPath &amp; &quot;Border_2.bmp&quot;
- .cmdBorder2.HelpText = GetResText(RID_FORM + 31)
-
+ .optBorder0.Label = GetResText(RID_FORM + 29)
+ .optBorder1.Label = GetResText(RID_FORM + 30)
+ .optBorder2.Label = GetResText(RID_FORM + 31)
+ .optBorder1.State = 1
+
+ .optAlign0.Label = GetResText(RID_FORM + 33)
+ .optAlign2.Label = GetResText(RID_FORM + 34)
+ .optAlign0.State = 1
+
.cmdArrange1.ImageURL = FormPath &amp; &quot;Arrange_1.bmp&quot;
.cmdArrange1.HelpText = GetResText(RID_FORM + 36)
@@ -128,12 +120,6 @@ Sub SetDialogLanguage ()
.cmdArrange5.ImageURL = FormPath &amp; &quot;Arrange_5.bmp&quot;
.cmdArrange5.HelpText = GetResText(RID_FORM + 39)
-
- sHeightenDialog = GetResText(RID_FORM + 66)
- sReduceDialog = GetResText(RID_FORM + 65)
-
- .cmdSwitchHeight.HelpText = sReduceDialog
- .cmdSwitchHeight.Label = CHR(9653)
sWriterFilterName = GetResText(RID_FORM + 70)
sWriterTemplateFilterName = GetResText(RID_FORM + 71)
@@ -240,7 +226,6 @@ Sub InitializeWidthList()
WidthList(14,3) = False
WidthList(14,4) = &quot;TimeField&quot;
-&apos; Todo: Die folgenden Felder auffüllen!
WidthList(15,0) = com.sun.star.sdbc.DataType.TIMESTAMP &apos; = 93;
WidthList(15,1) = 20
&apos; Todo: Dieses Control ist keine cDatebox sondern Kollektion aus Time und Datefield
diff --git a/wizards/source/formwizard/Layouter.xba b/wizards/source/formwizard/Layouter.xba
index b0b3f87aef1d..ffaebcc96f10 100644
--- a/wizards/source/formwizard/Layouter.xba
+++ b/wizards/source/formwizard/Layouter.xba
@@ -7,7 +7,6 @@
&apos; Was passiert, wenn Felder jenseits der Ränder positioniert werden?
&apos; Todo: Die ObjektArrays oDBShapeList() und oTCShaplist könnten 3-Dimensional sein mit dem Model und dem Control
&apos; in den anderen beiden Dimensionen
-&apos; Todo: doppelte Liste für Tabellen und Abfragen mit der Angabe des Contenttypes
Public oProgressbar as Object
Public ProgressValue as Integer
@@ -171,7 +170,7 @@ Dim oModel as Object
Dim i as Integer
Dim oCurModel as Object
oModel = oEvent.Source.Model
- SwitchBorderButtons(Val(Right(oModel.Name,1)))
+ SwitchBorderMode(Val(Right(oModel.Name,1)))
ToggleLayoutPage(False)
&apos; oDocument.LockControllers
@@ -199,7 +198,7 @@ Dim i as Integer
Dim oCurModel as Object
Dim oModel as Object
oModel = oEvent.Source.Model
- SwitchAlignButtons(Val(Right(oModel.Name,1)))
+ SwitchAlignMode(Val(Right(oModel.Name,1)))
ToggleLayoutPage(False)
&apos; oDocument.LockControllers()
If OldAlignMode &lt;&gt; CurAlignMode Then
@@ -241,9 +240,9 @@ End Sub
Sub ToggleBorderGroup(bDoEnable as Boolean)
With oDialogModel
.hlnBorderLayout.Enabled = bDoEnable
- .cmdBorder0.Enabled = bDoEnable &apos; 0: No border
- .cmdBorder1.Enabled = bDoEnable &apos; 1: 3D border
- .cmdBorder2.Enabled = bDoEnable &apos; 2: simple border
+ .optBorder0.Enabled = bDoEnable &apos; 0: No border
+ .optBorder1.Enabled = bDoEnable &apos; 1: 3D border
+ .optBorder2.Enabled = bDoEnable &apos; 2: simple border
End With
End Sub
@@ -254,8 +253,8 @@ Sub ToggleAlignGroup(ByVal bDoEnable as Boolean)
bDoEnable = CurArrangement &lt;&gt; cTabled
End If
.hlnAlign.Enabled = bDoEnable
- .cmdAlign0.Enabled = bDoEnable
- .cmdAlign2.Enabled = bDoEnable &apos;
+ .optAlign0.Enabled = bDoEnable
+ .optAlign2.Enabled = bDoEnable &apos;
End With
End Sub
@@ -307,22 +306,14 @@ Sub SwitchArrangementButtons(ByVal LocArrangement as Integer)
End Sub
-Sub SwitchBorderButtons(ByVal LocBorderType as Integer)
+Sub SwitchBorderMode(ByVal LocBorderType as Integer)
OldBorderType = CurBorderType
CurBorderType = LocBorderType
-&apos; If OldArrangement &lt;&gt; 0 Then
- DlgFormDB.GetControl(&quot;cmdBorder&quot; &amp; OldBorderType).Model.State = 0
-&apos; End If
- DlgFormDB.GetControl(&quot;cmdBorder&quot; &amp; CurBorderType).Model.State = 1
End Sub
-Sub SwitchAlignButtons(ByVal LocAlignMode as Integer)
+Sub SwitchAlignMode(ByVal LocAlignMode as Integer)
OldAlignMode = CurAlignMode
CurAlignMode = LocAlignMode
-&apos; If OldAlignMode &lt;&gt; 0 Then
- DlgFormDB.GetControl(&quot;cmdAlign&quot; &amp; OldAlignMode).Model.State = 0
-&apos; End If
- DlgFormDB.GetControl(&quot;cmdAlign&quot; &amp; CurAlignMode).Model.State = 1
End Sub
</script:module> \ No newline at end of file
diff --git a/wizards/source/formwizard/dbwizres.src b/wizards/source/formwizard/dbwizres.src
index ae99eabe9a86..da5e1b597f8f 100644
--- a/wizards/source/formwizard/dbwizres.src
+++ b/wizards/source/formwizard/dbwizres.src
@@ -2,9 +2,9 @@
*
* $RCSfile: dbwizres.src,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: kz $ $Date: 2001-06-29 02:26:14 $
+ * last change: $Author: bc $ $Date: 2001-07-11 13:16:18 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1317,9 +1317,9 @@ String RID_DB_FORM_WIZARD_START + 5
String RID_DB_FORM_WIZARD_START + 6
{
- Text = ": Tabellenauswahl";
- Text [ english_us ] = ": Table Selection";
- Text[ portuguese ] = ": Seleco de tabela";
+ Text = "Tabellen oder Abfragen";
+ Text [ english_us ] = "Tables or Queries";
+ Text[ portuguese ] = "Tables or Queries";
Text[ russian ] = ": ";
Text[ dutch ] = ": tabel selecteren";
Text[ french ] = " : Slection de table";
@@ -2017,9 +2017,9 @@ String RID_DB_FORM_WIZARD_START + 31
String RID_DB_FORM_WIZARD_START + 32
{
- Text = "Beschriftungen";
- Text [ english ] = "Alignment";
- Text [ english_us ] = "Labels";
+ Text = "Ausrichtung der Beschriftungsfelder";
+ Text [ english ] = "Alignment of the labels";
+ Text [ english_us ] = "Alignment of the labels";
Text[ portuguese ] = "Alignment";
Text[ russian ] = "";
Text[ greek ] = "Alignment";
@@ -2037,15 +2037,16 @@ String RID_DB_FORM_WIZARD_START + 32
Text[ chinese_simplified ] = "ǩ";
Text[ chinese_traditional ] = "";
Text[ turkish ] = "Alignment";
+ Text[ language_user1 ] = "berschrift einer Option Button Gruppe ";
Text[ arabic ] = "Alignment";
Text[ catalan ] = "Alignment";
};
String RID_DB_FORM_WIZARD_START + 33
{
- Text = "Beschriftungsfelder linksbndig ausrichten";
- Text [ english ] = "Align Labels on left Edge";
- Text [ english_us ] = "Align labels to left edge";
+ Text = "Linksbndig";
+ Text [ english ] = "To left edge";
+ Text [ english_us ] = "To left edge";
Text[ portuguese ] = "Align Labels on left Edge";
Text[ russian ] = " ";
Text[ greek ] = "Align Labels on left Edge";
@@ -2063,15 +2064,16 @@ String RID_DB_FORM_WIZARD_START + 33
Text[ chinese_simplified ] = "ǩֶ";
Text[ chinese_traditional ] = "a";
Text[ turkish ] = "Align Labels on left Edge";
+ Text[ language_user1 ] = "Label eines Option Buttons";
Text[ arabic ] = "Align Labels on left Edge";
Text[ catalan ] = "Align Labels on left Edge";
};
String RID_DB_FORM_WIZARD_START + 34
{
- Text = "Beschriftungsfelder rechtsbndig ausrichten";
- Text [ english ] = "Align Labels on right Edge";
- Text [ english_us ] = "Align labels to right edge";
+ Text = "Rechtsbndig";
+ Text [ english ] = "To right edge";
+ Text [ english_us ] = "To right edge";
Text[ portuguese ] = "Align Labels on right Edge";
Text[ russian ] = " ";
Text[ greek ] = "Align Labels on right Edge";
@@ -2089,6 +2091,7 @@ String RID_DB_FORM_WIZARD_START + 34
Text[ chinese_simplified ] = "ǩֶҶ";
Text[ chinese_traditional ] = "ak";
Text[ turkish ] = "Align Labels on right Edge";
+ Text[ language_user1 ] = "Label eines Option Buttons";
Text[ arabic ] = "Align Labels on right Edge";
Text[ catalan ] = "Align Labels on right Edge";
};
diff --git a/wizards/source/formwizard/tools.xba b/wizards/source/formwizard/tools.xba
index d286f117e84e..e715b07b9547 100644
--- a/wizards/source/formwizard/tools.xba
+++ b/wizards/source/formwizard/tools.xba
@@ -103,11 +103,13 @@ End Function
Sub ImportStyles()
Dim CurIndex as Integer
Dim sImportPath as String
+Dim bWithBackGraphic as Boolean
&apos; oDocument.LockControllers
CurIndex = GetCurIndex(oDialogModel.lstStyles, Styles(), NumberofStyles,8)
sImportPath = Styles(8,CurIndex)
- LoadNewStyles(oDocument, oDialogModel, CurIndex, sImportPath, Styles(), TexturePath)
+ bWithBackGraphic = LoadNewStyles(oDocument, oDialogModel, CurIndex, sImportPath, Styles(), TexturePath)
ControlCaptionsToStandardLayout()
+ ToggleOptionButtons(oDialogModel, bWithBackGraphic)
ConfigurePageStyle()
&apos; oDocument.UnlockControllers
End Sub
@@ -175,7 +177,6 @@ Dim sReturn as String
End Function
-
Function AddListtoList(FirstArray(), SecondArray(), Optional StarIndex)
Dim n as Integer
Dim m as Integer
@@ -195,4 +196,18 @@ Dim MaxIndex as Integer
Dim NullArray()
AddListToList() = NullArray()
End If
-End Function</script:module> \ No newline at end of file
+End Function
+
+
+Function CountItemsInArray(BigArray(), SearchItem)
+Dim i as Integer
+Dim MaxIndex as Integer
+Dim ResCount as Integer
+ ResCount = 0
+ For i = o To MaxIndex
+ If SearchItem = BigArray(i) Then
+ ResCount = ResCount + 1
+ End If
+ Next i
+ CountItemsInArray() = ResCount
+End Function </script:module> \ No newline at end of file