summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
Diffstat (limited to 'wizards')
-rw-r--r--wizards/source/formwizard/DBMeta.xba3
-rw-r--r--wizards/source/formwizard/DlgFormDB.xdl85
-rw-r--r--wizards/source/formwizard/FormWizard.xba42
-rw-r--r--wizards/source/formwizard/develop.xba8
-rw-r--r--wizards/source/formwizard/tools.xba23
5 files changed, 83 insertions, 78 deletions
diff --git a/wizards/source/formwizard/DBMeta.xba b/wizards/source/formwizard/DBMeta.xba
index d4abc3974662..8043ad24599a 100644
--- a/wizards/source/formwizard/DBMeta.xba
+++ b/wizards/source/formwizard/DBMeta.xba
@@ -47,6 +47,9 @@ Dim bExitLoop as Boolean
Dim bGetConnection as Boolean
Dim iMsg as Integer
Dim Nulllist()
+' If Not IsNull(oDBConnection) Then
+' oDBConnection.Dispose()
+' End If
oDatabase = oDBContext.GetByName(sDBName)
If Not oDatabase.IsPasswordRequired Then
oDBConnection = oDBContext.GetByName(sDBName).GetConnection("","")
diff --git a/wizards/source/formwizard/DlgFormDB.xdl b/wizards/source/formwizard/DlgFormDB.xdl
index ba49384e6029..3f2a8ace291c 100644
--- a/wizards/source/formwizard/DlgFormDB.xdl
+++ b/wizards/source/formwizard/DlgFormDB.xdl
@@ -1,108 +1,107 @@
<?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:style-id="0" dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:page="1">
+<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:style dlg:style-id="1" 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: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:style-id="0" 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:menulist dlg:style-id="0" 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: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: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:style-id="0" 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="6" dlg:top="78" 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:style-id="0" dlg:id="cmdCancel" dlg:tab-index="4" dlg:left="6" dlg:top="190" dlg:width="53" dlg:height="14" dlg:value="cmdCancel">
+ <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:style-id="0" 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:style-id="0" dlg:id="cmdBack" dlg:tab-index="6" dlg:left="155" dlg:top="190" dlg:width="53" dlg:height="14" dlg:value="cmdBack">
+ <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="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>
- <dlg:button dlg:style-id="0" dlg:id="cmdGoOn" dlg:tab-index="7" dlg:left="211" dlg:top="190" dlg:width="53" dlg:height="14" dlg:value="cmdGoOn">
+ <dlg:button dlg:id="cmdGoOn" dlg:tab-index="7" dlg:left="211" dlg:top="190" dlg:width="53" dlg:height="14" dlg:value="cmdGoOn">
<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:style-id="0" 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:style-id="0" 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:style-id="0" 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:style-id="0" 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="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: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:style-id="0" 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="130" 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:style-id="0" 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="148" 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:style-id="0" 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="166" 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:style-id="0" 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="160" dlg:top="62" dlg:width="104" dlg:height="8" 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:style-id="0" 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="160" dlg:top="74" dlg:width="104" dlg:height="8" 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:style-id="0" 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="107" dlg:width="110" dlg:height="77" 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:style-id="0" 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="107" dlg:width="110" dlg:height="77" 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:style-id="0" 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: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:style-id="0" 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: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:style-id="0" 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: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:style-id="0" dlg:id="lstStyles" dlg:tab-index="22" dlg:left="6" dlg:top="51" dlg:width="110" dlg:height="135" dlg:page="2">
+ <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:style-id="0" 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="1" dlg:id="cmdSwitchHeight" dlg:tab-index="24" dlg:left="122" dlg:top="190" dlg:width="25" dlg:height="14">
+ <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:style-id="0" 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:style-id="0" 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:style-id="0" 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:style-id="0" 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:style-id="0" 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:style-id="0" 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: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: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:style-id="0" 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="31" dlg:left="152" dlg:top="62" 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:style-id="0" 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="32" dlg:left="178" dlg:top="62" 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:style-id="0" 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="33" dlg:left="215" dlg:top="62" 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:style-id="0" 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="34" dlg:left="241" dlg:top="62" 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:style-id="0" 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: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:style-id="0" 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: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:style-id="0" 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:style-id="0" 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: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:style-id="0" 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: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:style-id="0" 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: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:bulletinboard>
diff --git a/wizards/source/formwizard/FormWizard.xba b/wizards/source/formwizard/FormWizard.xba
index 41a146f5b166..bbe352e07386 100644
--- a/wizards/source/formwizard/FormWizard.xba
+++ b/wizards/source/formwizard/FormWizard.xba
@@ -145,6 +145,9 @@ Sub CancelFormWizard()
DlgFormDB.EndExecute()
DlgFormDB.Dispose()
oDocument.Dispose()
+ If Not IsNull(oDBConnection) Then
+ oDBConnection.Dispose()
+ End If
Stop
End Sub
@@ -225,31 +228,22 @@ End Sub
Sub StoreForm()
-Dim oFileDialog
-Dim iAccept as Integer
-Dim sPath as String
-Dim ListAny(0)
- ListAny(0) = com.sun.star.ui.dialogs.TemplateDescription.FILESAVE_AUTOEXTENSION_PASSWORD_FILTEROPTIONS
- oFileDialog = CreateUnoService(&quot;com.sun.star.ui.dialogs.FilePicker&quot;)
- oFileDialog.AppendFilter(sWriterFiltername, &quot;*.sxw&quot;)
- oFileDialog.AppendFilter(sWriterTemplateFiltername, &quot;*.stw&quot;)
- oFileDialog.SetCurrentFilter(&quot;Writer 6.0&quot;)
- oFileDialog.Initialize(ListAny())
- oFileDialog.SetDisplayDirectory(WorkPath)
- oFileDialog.SetDefaultName(&quot;Form_&quot; &amp; sDBName &amp; &quot;.&quot; &amp; TableName
- iAccept = oFileDialog.Execute()
- If iAccept = 1 Then
- sPath = oFileDialog.Files(0)
- If oFileDialog.GetCurrentFilter() = sWriterTemplateFiltername Then
- Dim oStoreProperties(0) as New com.sun.star.beans.PropertyValue
- oStoreProperties(0).Name = &quot;FilterName&quot;
- oStoreProperties(0).Value = &quot;swriter: writer_StarOffice_XML_Writer_Template&quot;
- oDocument.StoreAsUrl(sPath, oStoreProperties())
- Else
- Dim NoArgs() as New com.sun.star.beans.PropertyValue
- oDocument.StoreAsUrl(sPath, NoArgs())
- End If
+Dim bDocIsStored as Boolean
+Dim FilterNames(1,2) as String
+Dim oMasterKey as Object
+Dim oFilters() as Object
+ oMasterKey = GetRegistryKeyContent(&quot;org.openoffice.Office.TypeDetection/&quot;)
+ oFilters() = oMasterKey.Filters
+ FilterNames(0,0) = oFilters.GetByName(&quot;writer_StarOffice_XML_Writer&quot;).UIName
+ FilterNames(0,1) = &quot;*.sxw&quot;
+ FilterNames(0,2) = &quot;&quot;
+ FilterNames(1,0) = oFilters.GetByName(&quot;writer_StarOffice_XML_Writer_Template&quot;).UIName
+ FilterNames(1,1) = &quot;*.stw&quot;
+ FilterNames(1,2) = &quot;swriter: writer_StarOffice_XML_Writer_Template&quot;
+ bDocIsStored = StoreDocument(oDocument, FilterNames(), &quot;Form_&quot; &amp; sDBName &amp; &quot;.&quot; &amp; TableName, WorkPath)
+ If bDocIsStored Then
DlgFormDB.EndExecute()
+ oDBConnection.Dispose
End If
End Sub
</script:module> \ No newline at end of file
diff --git a/wizards/source/formwizard/develop.xba b/wizards/source/formwizard/develop.xba
index fd0f81c30cb0..7c2d0e8d511a 100644
--- a/wizards/source/formwizard/develop.xba
+++ b/wizards/source/formwizard/develop.xba
@@ -157,7 +157,9 @@ Dim aSize As New com.sun.star.awt.Size
Else
oModel = CreateUnoService(oModelService(cLabel))
&apos; oModel.Label = CurFieldName &apos; + nFieldPostfixes(i) (Todo: Was ist ein fieldPostfix?)
- oDBForm.InsertByName(oModel.Name, oModel)
+&apos; Todo: According to FS this handling should be verified. I should not rely on the shape to create a model on its
+&apos; own. therefor the model should be inserted before the shape
+&apos; oDBForm.InsertByName(oModel.Name, oModel)
aPoint = GetPoint(nXTCPos, nYTCPos)
aSize = GetSize(nTCWidth,nTCHeight)
Set oShape = InsertControl(oModel, aPoint, aSize)
@@ -219,7 +221,9 @@ Dim iColRightX as Long
SetNumerics(oDBModel)
oShape = InsertControl(oDBModel, aPoint, aSize)
Set oDBShapeList(i)= oShape
- oDBForm.InsertByName(oDBModel.Name, oDBModel)
+&apos; Todo: According to FS this handling should be verified. I should not rely on the shape to create a model on its
+&apos; own. therefor the model should be inserted before the shape
+&apos; oDBForm.InsertByName(oDBModel.Name, oDBModel)
If CurControlType = cCheckBox Then
oDBModel.Label = &quot;&quot;
End If
diff --git a/wizards/source/formwizard/tools.xba b/wizards/source/formwizard/tools.xba
index 2f5c96db43e4..d286f117e84e 100644
--- a/wizards/source/formwizard/tools.xba
+++ b/wizards/source/formwizard/tools.xba
@@ -181,13 +181,18 @@ Dim n as Integer
Dim m as Integer
Dim MaxIndex as Integer
MaxIndex = Ubound(FirstArray()) + Ubound(SecondArray()) + 1
- Dim ResultArray(MaxIndex)
- For m = 0 To Ubound(FirstArray())
- ResultArray(m) = FirstArray(m)
- Next m
- For n = 0 To Ubound(SecondArray())
- ResultArray(m) = SecondArray(n)
- m = m + 1
- Next n
- AddListToList() = ResultArray()
+ If MaxIndex &gt; -1 Then
+ Dim ResultArray(MaxIndex)
+ For m = 0 To Ubound(FirstArray())
+ ResultArray(m) = FirstArray(m)
+ Next m
+ For n = 0 To Ubound(SecondArray())
+ ResultArray(m) = SecondArray(n)
+ m = m + 1
+ Next n
+ AddListToList() = ResultArray()
+ Else
+ Dim NullArray()
+ AddListToList() = NullArray()
+ End If
End Function</script:module> \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 15:27:34 +0000