diff options
| author | Behrend Cornelius <bc@openoffice.org> | 2001-12-18 10:29:57 +0000 |
|---|---|---|
| committer | Behrend Cornelius <bc@openoffice.org> | 2001-12-18 10:29:57 +0000 |
| commit | a7ecb7252973367ebabe5dbd8415a699483f8188 (patch) | |
| tree | 8bcd1d8189a1f4072e74faa68de1440214fa2237 | |
| parent | 385a7859dc4b3bacfb4e97b2bd97b22753a96280 (diff) | |
#96091# Removing of Shapes now improved
| -rw-r--r-- | wizards/source/formwizard/DBMeta.xba | 2 | ||||
| -rw-r--r-- | wizards/source/formwizard/DlgFormDB.xdl | 206 | ||||
| -rw-r--r-- | wizards/source/formwizard/FormWizard.xba | 70 | ||||
| -rw-r--r-- | wizards/source/formwizard/Language.xba | 2 | ||||
| -rw-r--r-- | wizards/source/formwizard/Layouter.xba | 8 | ||||
| -rw-r--r-- | wizards/source/formwizard/develop.xba | 7 | ||||
| -rw-r--r-- | wizards/source/formwizard/dialog.xlb | 6 | ||||
| -rw-r--r-- | wizards/source/formwizard/script.xlb | 16 | ||||
| -rw-r--r-- | wizards/source/formwizard/tools.xba | 17 |
9 files changed, 178 insertions, 156 deletions
diff --git a/wizards/source/formwizard/DBMeta.xba b/wizards/source/formwizard/DBMeta.xba index 370d95d292d1..346e7a1d9180 100644 --- a/wizards/source/formwizard/DBMeta.xba +++ b/wizards/source/formwizard/DBMeta.xba @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-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="DBMeta" script:language="StarBasic">REM ***** BASIC ***** +<script:module xmlns:script="http://openoffice.org/2000/script" script:name="DBMeta" script:language="StarBasic">REM ***** BASIC ***** Option Explicit Public sDatabaseList() diff --git a/wizards/source/formwizard/DlgFormDB.xdl b/wizards/source/formwizard/DlgFormDB.xdl index 5df9ee45be6a..f10ee29099a7 100644 --- a/wizards/source/formwizard/DlgFormDB.xdl +++ b/wizards/source/formwizard/DlgFormDB.xdl @@ -1,105 +1,105 @@ <?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" xmlns:script="http://openoffice.org/2000/script" dlg:id="DlgFormDB" dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:page="1" dlg:help-url="HID:34400"> - <dlg:bulletinboard> - <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:help-url="HID:34410" dlg:spin="true"> - <script:event script:event-name="on-itemstatechange" script:location="application" script:macro-name="FormWizard.DBMeta.GetSelectedDBMetaData" script:language="StarBasic"/> - </dlg:menulist> - <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:help-url="HID:34411" dlg:spin="true"> - <script:event script:event-name="on-itemstatechange" script:location="application" script:macro-name="FormWizard.FormWizard.FormGetFields" script:language="StarBasic"/> - </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:help-url="HID:34401" dlg:value="cmdCancel" dlg:button-type="cancel"/> - <dlg:button dlg:id="cmdHelp" dlg:tab-index="5" dlg:left="63" dlg:top="190" dlg:width="53" dlg:height="14" dlg:tag="34400" dlg:value="cmdHelp" dlg:button-type="help"/> - <dlg:button dlg:id="cmdBack" dlg:tab-index="6" dlg:left="155" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:34402" dlg:value="cmdBack"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.FormWizard.PreviousStep" script:language="StarBasic"/> - </dlg:button> - <dlg:button dlg:id="cmdGoOn" dlg:tab-index="7" dlg:left="211" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:34403" dlg:value="cmdGoOn"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.FormWizard.NextStep" script:language="StarBasic"/> - </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="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:help-url="HID:34422" dlg:value="->"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Tools.Listbox.FormMoveSelected" script:language="StarBasic"/> - </dlg:button> - <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:help-url="HID:34423" dlg:value="=>>"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Tools.Listbox.FormMoveAll" script:language="StarBasic"/> - </dlg:button> - <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:help-url="HID:34424" dlg:value="<-"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Tools.Listbox.FormRemoveSelected" script:language="StarBasic"/> - </dlg:button> - <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:help-url="HID:34425" dlg:value="<<="> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Tools.Listbox.FormRemoveAll" script:language="StarBasic"/> - </dlg:button> - <dlg:radiogroup> - <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:help-url="HID:34427" dlg:value="optIgnoreBinaries" dlg:checked="true"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.DBMeta.AddOrRemoveBinaryFieldsToWidthList" script:language="StarBasic"/> - </dlg:radio> - <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:help-url="HID:34426" dlg:value="optBinariesasGraphics"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.DBMeta.AddOrRemoveBinaryFieldsToWidthList" script:language="StarBasic"/> - </dlg:radio> - </dlg:radiogroup> - <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:help-url="HID:34420" dlg:multiselection="true"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Tools.Listbox.FormMoveSelected" script:language="StarBasic"/> - <script:event script:event-name="on-itemstatechange" script:location="application" script:macro-name="Tools.Listbox.FormSetMoveRights" script:language="StarBasic"/> - </dlg:menulist> - <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:help-url="HID:34421" dlg:multiselection="true"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Tools.Listbox.FormRemoveSelected" script:language="StarBasic"/> - <script:event script:event-name="on-itemstatechange" script:location="application" script:macro-name="Tools.Listbox.FormSetMoveRights" script:language="StarBasic"/> - </dlg:menulist> - <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:help-url="HID:34431"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.Layouter.ChangeArrangemode" script:language="StarBasic"/> - </dlg:button> - <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:help-url="HID:34432"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.Layouter.ChangeArrangemode" script:language="StarBasic"/> - </dlg:button> - <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:help-url="HID:34433"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.Layouter.ChangeArrangemode" script:language="StarBasic"/> - </dlg:button> - <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:help-url="HID:34434"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.Layouter.ChangeArrangemode" script:language="StarBasic"/> - </dlg:button> - <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:help-url="HID:34435"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.Layouter.ChangeArrangemode" script:language="StarBasic"/> - </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:help-url="HID:34443"> - <script:event script:event-name="on-itemstatechange" script:location="application" script:macro-name="FormWizard.tools.ImportStyles" script:language="StarBasic"/> - </dlg:menulist> - <dlg:radiogroup> - <dlg:radio dlg:id="optBorder0" dlg:tab-index="26" dlg:left="12" dlg:top="95" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:34438" dlg:value="optBorder0"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.Layouter.ChangeBorderLayouts" script:language="StarBasic"/> - </dlg:radio> - <dlg:radio dlg:id="optBorder1" dlg:tab-index="27" dlg:left="12" dlg:top="109" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:34439" dlg:value="optBorder1"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.Layouter.ChangeBorderLayouts" script:language="StarBasic"/> - </dlg:radio> - <dlg:radio dlg:id="optBorder2" dlg:tab-index="28" dlg:left="12" dlg:top="123" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:34440" dlg:value="optBorder2"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.Layouter.ChangeBorderLayouts" script:language="StarBasic"/> - </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="HID:34444" dlg:value="optTiled" dlg:checked="true"> - <script:event script:event-name="on-mouseup" script:location="application" script:macro-name="WebWizard.Common.SetBackGraphicStyle" script:language="StarBasic"/> - </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:help-url="HID:34445" dlg:value="optArea"> - <script:event script:event-name="on-mouseup" script:location="application" script:macro-name="WebWizard.Common.SetBackGraphicStyle" script:language="StarBasic"/> - </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:radiogroup> - <dlg:radio dlg:id="optAlign0" dlg:tab-index="36" dlg:left="12" dlg:top="154" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:34441" dlg:value="optAlign0"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.Layouter.ChangeLabelAlignments" script:language="StarBasic"/> - </dlg:radio> - <dlg:radio dlg:id="optAlign2" dlg:tab-index="37" dlg:left="12" dlg:top="168" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:34442" dlg:value="optAlign2"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.Layouter.ChangeLabelAlignments" script:language="StarBasic"/> - </dlg:radio> - </dlg:radiogroup> - <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="38" dlg:left="6" dlg:top="180" dlg:width="258" dlg:height="6"/> - </dlg:bulletinboard> - </dlg:window>
\ No newline at end of file +<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="DlgFormDB" dlg:left="96" dlg:top="28" dlg:width="270" dlg:height="210" dlg:page="2" dlg:help-url="HID:34400"> + <dlg:bulletinboard> + <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:help-url="HID:34410" dlg:spin="true"> + <script:event script:event-name="on-itemstatechange" script:location="application" script:macro-name="FormWizard.DBMeta.GetSelectedDBMetaData" script:language="StarBasic"/> + </dlg:menulist> + <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:help-url="HID:34411" dlg:spin="true"> + <script:event script:event-name="on-itemstatechange" script:location="application" script:macro-name="FormWizard.FormWizard.FormGetFields" script:language="StarBasic"/> + </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:help-url="HID:34401" dlg:value="cmdCancel" dlg:button-type="cancel"/> + <dlg:button dlg:id="cmdHelp" dlg:tab-index="5" dlg:left="63" dlg:top="190" dlg:width="53" dlg:height="14" dlg:tag="34400" dlg:value="cmdHelp" dlg:button-type="help"/> + <dlg:button dlg:id="cmdBack" dlg:tab-index="6" dlg:left="155" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:34402" dlg:value="cmdBack"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.FormWizard.PreviousStep" script:language="StarBasic"/> + </dlg:button> + <dlg:button dlg:id="cmdGoOn" dlg:tab-index="7" dlg:left="211" dlg:top="190" dlg:width="53" dlg:height="14" dlg:help-url="HID:34403" dlg:value="cmdGoOn"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.FormWizard.NextStep" script:language="StarBasic"/> + </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="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:help-url="HID:34422" dlg:value="->"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Tools.Listbox.FormMoveSelected" script:language="StarBasic"/> + </dlg:button> + <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:help-url="HID:34423" dlg:value="=>>"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Tools.Listbox.FormMoveAll" script:language="StarBasic"/> + </dlg:button> + <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:help-url="HID:34424" dlg:value="<-"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Tools.Listbox.FormRemoveSelected" script:language="StarBasic"/> + </dlg:button> + <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:help-url="HID:34425" dlg:value="<<="> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Tools.Listbox.FormRemoveAll" script:language="StarBasic"/> + </dlg:button> + <dlg:radiogroup> + <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:help-url="HID:34427" dlg:value="optIgnoreBinaries" dlg:checked="true"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.DBMeta.AddOrRemoveBinaryFieldsToWidthList" script:language="StarBasic"/> + </dlg:radio> + <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:help-url="HID:34426" dlg:value="optBinariesasGraphics"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.DBMeta.AddOrRemoveBinaryFieldsToWidthList" script:language="StarBasic"/> + </dlg:radio> + </dlg:radiogroup> + <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:help-url="HID:34420" dlg:multiselection="true"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Tools.Listbox.FormMoveSelected" script:language="StarBasic"/> + <script:event script:event-name="on-itemstatechange" script:location="application" script:macro-name="Tools.Listbox.FormSetMoveRights" script:language="StarBasic"/> + </dlg:menulist> + <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:help-url="HID:34421" dlg:multiselection="true"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Tools.Listbox.FormRemoveSelected" script:language="StarBasic"/> + <script:event script:event-name="on-itemstatechange" script:location="application" script:macro-name="Tools.Listbox.FormSetMoveRights" script:language="StarBasic"/> + </dlg:menulist> + <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:help-url="HID:34431"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.Layouter.ChangeArrangemode" script:language="StarBasic"/> + </dlg:button> + <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:help-url="HID:34432"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.Layouter.ChangeArrangemode" script:language="StarBasic"/> + </dlg:button> + <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:help-url="HID:34433"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.Layouter.ChangeArrangemode" script:language="StarBasic"/> + </dlg:button> + <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:help-url="HID:34434"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.Layouter.ChangeArrangemode" script:language="StarBasic"/> + </dlg:button> + <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:help-url="HID:34435"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.Layouter.ChangeArrangemode" script:language="StarBasic"/> + </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:help-url="HID:34443"> + <script:event script:event-name="on-itemstatechange" script:location="application" script:macro-name="FormWizard.tools.ImportStyles" script:language="StarBasic"/> + </dlg:menulist> + <dlg:radiogroup> + <dlg:radio dlg:id="optBorder0" dlg:tab-index="26" dlg:left="12" dlg:top="95" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:34438" dlg:value="optBorder0"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.Layouter.ChangeBorderLayouts" script:language="StarBasic"/> + </dlg:radio> + <dlg:radio dlg:id="optBorder1" dlg:tab-index="27" dlg:left="12" dlg:top="109" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:34439" dlg:value="optBorder1"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.Layouter.ChangeBorderLayouts" script:language="StarBasic"/> + </dlg:radio> + <dlg:radio dlg:id="optBorder2" dlg:tab-index="28" dlg:left="12" dlg:top="123" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:34440" dlg:value="optBorder2"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.Layouter.ChangeBorderLayouts" script:language="StarBasic"/> + </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="HID:34444" dlg:value="optTiled" dlg:checked="true"> + <script:event script:event-name="on-mouseup" script:location="application" script:macro-name="WebWizard.Common.SetBackGraphicStyle" script:language="StarBasic"/> + </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:help-url="HID:34445" dlg:value="optArea"> + <script:event script:event-name="on-mouseup" script:location="application" script:macro-name="WebWizard.Common.SetBackGraphicStyle" script:language="StarBasic"/> + </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:radiogroup> + <dlg:radio dlg:id="optAlign0" dlg:tab-index="36" dlg:left="12" dlg:top="154" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:34441" dlg:value="optAlign0"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.Layouter.ChangeLabelAlignments" script:language="StarBasic"/> + </dlg:radio> + <dlg:radio dlg:id="optAlign2" dlg:tab-index="37" dlg:left="12" dlg:top="168" dlg:width="131" dlg:height="10" dlg:page="2" dlg:help-url="HID:34442" dlg:value="optAlign2"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="FormWizard.Layouter.ChangeLabelAlignments" script:language="StarBasic"/> + </dlg:radio> + </dlg:radiogroup> + <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="38" 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 9e728f2efdb7..b227f0d0edd3 100644 --- a/wizards/source/formwizard/FormWizard.xba +++ b/wizards/source/formwizard/FormWizard.xba @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-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 +<script:module xmlns:script="http://openoffice.org/2000/script" script:name="FormWizard" script:language="StarBasic">Option Explicit Public DocumentName as String Public FormPath as String @@ -62,9 +62,10 @@ End Sub Sub MainWithDefault(Optional DatasourceName as String, Optional oConnection as Object, Optional CommandType as Integer, Optional sContent as String) Dim i as Integer Dim SelCount as Integer +Dim RetValue as Integer BasicLibraries.LoadLibrary("Tools") BasicLibraries.LoadLibrary("WebWizard") - bDebug = False + bDebug = False If Not bDebug Then On Local Error GoTo WIZARDERROR End If @@ -126,7 +127,7 @@ Dim SelCount as Integer DlgFormDB.GetControl("lstTables").SelectItemPos(SelIndex, True) ElseIf CommandType = com.sun.star.sdb.CommandType.TABLE Then SelIndex = IndexInArray(sContent, TableNames() - DlgFormDB.GetControl("lstTables").SelectItemPos(Ubound(QueryNames()+1 + SelIndex, True) + DlgFormDB.GetControl("lstTables").SelectItemPos(Ubound(QueryNames()+1 + SelIndex, True) End If End If CurCommandType = CommandType @@ -157,19 +158,21 @@ Dim SelCount as Integer oProgressBar.Value = 100 DlgFormDB.GetControl("lstDatabases").SetFocus() oProgressbar.End - DlgFormDB.Execute() + RetValue = DlgFormDB.Execute() DlgFormDB.Dispose() If Not IsNull(oDBConnection) Then oDBConnection.Dispose() End If If bDisposeDoc Then oDocument.Dispose() + ElseIf RetValue = 0 Then + RemoveNirwanaShapes() End If WIZARDERROR: - If Err <> 0 Then + If Err <> 0 Then Msgbox(sMsgErrMsg, 16, GetProductName()) Resume LOCERROR - LOCERROR: + LOCERROR: End If End Sub @@ -297,42 +300,45 @@ Sub ToggleDatabasePage(bDoEnable as Boolean) End Sub -Sub StoreForm() -Dim bDocIsStored as Boolean -Dim TypeNames(0,2) as String -Dim oMasterKey as Object -Dim oTypes() as Object -Dim sTargetPath as String +' This Sub is called from the Procedure "StoreDocument" in the "Tools" Library +Sub CommitLastDocumentChanges(sTargetPath as String) +Dim i as Integer Dim sBookmarkName as String Dim oDBBookmarks as Object Dim bLinkExists as Boolean -Dim i as Integer Dim sBaseBookmarkName as String + sBookmarkName = GetFileNamewithoutExtension(FileNameoutofPath(sTargetPath)) + sBaseBookmarkName = sBookmarkName + oDBBookmarks = oDataSource.GetBookmarks() + i = 1 + Do + bLinkExists = oDBBookmarks.HasbyName(sBookmarkName) + If bLinkExists Then + i = i + 1 + sBookmarkName = sBaseBookmarkName & "_" & i + Else + oDBBookmarks.insertByName(sBookmarkName, sTargetPath) + End If + Loop Until Not bLinkExists + bDisposeDoc = False + GroupShapesTogether() + ToggleDesignMode(oDocument) + oDBForm.Reload() +End Sub + + +Sub StoreForm() +Dim sTargetPath as String +Dim TypeNames(0,2) as String +Dim oMasterKey as Object +Dim oTypes() as Object oMasterKey = GetRegistryKeyContent("org.openoffice.Office.TypeDetection/") oTypes() = oMasterKey.Types TypeNames(0,0) = oTypes.GetByName("writer_StarOffice_XML_Writer").UIName TypeNames(0,1) = "*.sxw" TypeNames(0,2) = "" - sTargetPath = StoreDocument(oDocument, TypeNames(), "Form_" & sDBName & "_" & TableName & ".sxw", WorkPath) + sTargetPath = StoreDocument(oDocument, TypeNames(), "Form_" & sDBName & "_" & TableName & ".sxw", WorkPath, 1) If sTargetPath <> "" Then - sBookmarkName = GetFileNamewithoutExtension(FileNameoutofPath(sTargetPath)) - sBaseBookmarkName = sBookmarkName - oDBBookmarks = oDataSource.GetBookmarks() - i = 1 - Do - bLinkExists = oDBBookmarks.HasbyName(sBookmarkName) - If bLinkExists Then - i = i + 1 - sBookmarkName = sBaseBookmarkName & "_" & i - Else - oDBBookmarks.insertByName(sBookmarkName, sTargetPath) - End If - Loop Until Not bLinkExists - bDisposeDoc = False - GroupShapesTogether() - ToggleDesignMode(oDocument) - oDBForm.Reload() - oDocument.Store() DlgFormDB.EndExecute() End If End Sub diff --git a/wizards/source/formwizard/Language.xba b/wizards/source/formwizard/Language.xba index e090924a2c44..245cd8df4c74 100644 --- a/wizards/source/formwizard/Language.xba +++ b/wizards/source/formwizard/Language.xba @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-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="Language" script:language="StarBasic">Option Explicit +<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Language" script:language="StarBasic">Option Explicit Global Const RID_COMMON = 1000 diff --git a/wizards/source/formwizard/Layouter.xba b/wizards/source/formwizard/Layouter.xba index 155b4ef3b186..add3b0068ac2 100644 --- a/wizards/source/formwizard/Layouter.xba +++ b/wizards/source/formwizard/Layouter.xba @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-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="Layouter" script:language="StarBasic">Option Explicit +<script:module xmlns:script="http://openoffice.org/2000/script" script:name="Layouter" script:language="StarBasic">Option Explicit Public oProgressbar as Object Public ProgressValue as Integer @@ -114,7 +114,9 @@ Dim i as Integer oProgressbar = oDocument.GetCurrentController.GetFrame.CreateStatusIndicator oProgressbar.Start("", MaxIndex) If oDBForm.HasbyName("Grid1") Then - oDBForm.GetByName("Grid1").Dispose + RemoveShapes() +' PrintdbgInfo oDBForm.GetByName("Grid1") +' oDBForm.GetByName("Grid1").Dispose End If ToggleLayoutPage(False) Select Case CurArrangement @@ -203,11 +205,9 @@ Dim s as Integer If Not bDebug Then On Local Error GoTo WIZARDERROR End If - oModel = oEvent.Source.Model SwitchBorderMode(Val(Right(oModel.Name,1))) ToggleLayoutPage(False) - If CurArrangement = cTabled Then oGridModel.Border = CurBorderType Else diff --git a/wizards/source/formwizard/develop.xba b/wizards/source/formwizard/develop.xba index 00747c7db964..0fc8de89802f 100644 --- a/wizards/source/formwizard/develop.xba +++ b/wizards/source/formwizard/develop.xba @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-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="develop" script:language="StarBasic">REM ***** BASIC ***** +<script:module xmlns:script="http://openoffice.org/2000/script" script:name="develop" script:language="StarBasic">REM ***** BASIC ***** Option Explicit Public oDBShapeList() as Object @@ -298,6 +298,7 @@ Sub GetLabelDiffHeight(Index as Integer) End If End Sub + Sub CheckJustifiedPosition() Dim nLeftDist as Long Dim nRightDist as Long @@ -520,10 +521,10 @@ Dim i as Integer For i = 0 To MaxIndex oGroupShapeList(i) = CreateUnoService("com.sun.star.drawing.ShapeCollection") oGroupShapeList(i).Add(oTCShapeList(i)) -' Msgbox "Position: " & oDBShapeList(i).Position.X & ";" & oDBShapeList(i).Position.Y oGroupShapeList(i).Add(oDBShapeList(i)) oDrawPage.Group(oGroupShapeList(i)) -' Msgbox "Position: " & oDBShapeList(i).Position.X & ";" & oDBShapeList(i).Position.Y Next i + Else + RemoveNirwanaShapes() End If End Sub</script:module>
\ No newline at end of file diff --git a/wizards/source/formwizard/dialog.xlb b/wizards/source/formwizard/dialog.xlb index 821fd4a3361e..d680f29292e8 100644 --- a/wizards/source/formwizard/dialog.xlb +++ b/wizards/source/formwizard/dialog.xlb @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd"> - <library:library xmlns:library="http://openoffice.org/2000/library" library:name="FormWizard" library:readonly="true" library:passwordprotected="false"> - <library:element library:name="DlgFormDB"/> - </library:library> +<library:library xmlns:library="http://openoffice.org/2000/library" library:name="FormWizard" library:readonly="true" library:passwordprotected="false"> + <library:element library:name="DlgFormDB"/> +</library:library> diff --git a/wizards/source/formwizard/script.xlb b/wizards/source/formwizard/script.xlb index 62d42ada3541..0b79b7f078ba 100644 --- a/wizards/source/formwizard/script.xlb +++ b/wizards/source/formwizard/script.xlb @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd"> - <library:library xmlns:library="http://openoffice.org/2000/library" library:name="FormWizard" library:readonly="true" library:passwordprotected="false"> - <library:element library:name="FormWizard"/> - <library:element library:name="Layouter"/> - <library:element library:name="Language"/> - <library:element library:name="DBMeta"/> - <library:element library:name="tools"/> - <library:element library:name="develop"/> - </library:library> +<library:library xmlns:library="http://openoffice.org/2000/library" library:name="FormWizard" library:readonly="true" library:passwordprotected="false"> + <library:element library:name="FormWizard"/> + <library:element library:name="Layouter"/> + <library:element library:name="Language"/> + <library:element library:name="DBMeta"/> + <library:element library:name="tools"/> + <library:element library:name="develop"/> +</library:library> diff --git a/wizards/source/formwizard/tools.xba b/wizards/source/formwizard/tools.xba index ea108845e496..e3df429b8f84 100644 --- a/wizards/source/formwizard/tools.xba +++ b/wizards/source/formwizard/tools.xba @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-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="tools" script:language="StarBasic">REM ***** BASIC ***** +<script:module xmlns:script="http://openoffice.org/2000/script" script:name="tools" script:language="StarBasic">REM ***** BASIC ***** Option Explicit @@ -231,6 +231,21 @@ Dim oShape as Object End Sub +' Destroy all Shapes in Nirwana +Sub RemoveNirwanaShapes() +Dim n as Integer +Dim oControl as Object +Dim oShape as Object + For n = oDrawPage.Count-1 To 0 Step -1 + oShape = oDrawPage(n) + If oShape.Position.Y < -2000 Then + oDrawPage.Remove(oShape) + End If + Next n +End Sub + + + ' Note: as Shapes cannot be removed from the DrawPage without destroying ' the object we have to park them somewhere beyond the visible area of the page Sub ShapesToNirwana() |