summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
authorTom Verbeek <tv@openoffice.org>2001-08-02 15:49:30 +0000
committerTom Verbeek <tv@openoffice.org>2001-08-02 15:49:30 +0000
commit45675069767490469f80112cf7907158b18c3c19 (patch)
tree16415ba074066c23408ea8fb0b2abca8d972f131 /wizards
parent5897a7044b67dfcbc5f1d2988c1be127dc59f739 (diff)
#90532# fixed change to new file format with the templates
Diffstat (limited to 'wizards')
-rw-r--r--wizards/source/formwizard/DBMeta.xba1
-rw-r--r--wizards/source/formwizard/FormWizard.xba2
-rw-r--r--wizards/source/template/Correspondence.xba2
-rw-r--r--wizards/source/template/DialogStyles.xdl11
-rw-r--r--wizards/source/template/TemplateDialog.xdl23
-rw-r--r--wizards/source/tools/ModuleControls.xba2
-rw-r--r--wizards/source/tools/Strings.xba12
-rw-r--r--wizards/source/webwizard/Common.xba5
-rw-r--r--wizards/source/webwizard/HtmlAutoPilotBasic.xba32
9 files changed, 49 insertions, 41 deletions
diff --git a/wizards/source/formwizard/DBMeta.xba b/wizards/source/formwizard/DBMeta.xba
index e83240f90ef1..a51e48662e0c 100644
--- a/wizards/source/formwizard/DBMeta.xba
+++ b/wizards/source/formwizard/DBMeta.xba
@@ -7,6 +7,7 @@ Public sDatabaseList()
Public iCommandTypes() as Integer
Public CurCommandType as Integer
+
Sub GetDatabaseNames()
If oDBContext.HasElements Then
sDatabaseList() = oDBContext.ElementNames()
diff --git a/wizards/source/formwizard/FormWizard.xba b/wizards/source/formwizard/FormWizard.xba
index 51415d7ee3a2..4cb509ed4188 100644
--- a/wizards/source/formwizard/FormWizard.xba
+++ b/wizards/source/formwizard/FormWizard.xba
@@ -240,7 +240,7 @@ 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
+ oFilters() = oMasterKey.Types
FilterNames(0,0) = oFilters.GetByName(&quot;writer_StarOffice_XML_Writer&quot;).UIName
FilterNames(0,1) = &quot;*.sxw&quot;
FilterNames(0,2) = &quot;&quot;
diff --git a/wizards/source/template/Correspondence.xba b/wizards/source/template/Correspondence.xba
index e9c8aa21bfe8..37b8c7fd4519 100644
--- a/wizards/source/template/Correspondence.xba
+++ b/wizards/source/template/Correspondence.xba
@@ -233,4 +233,4 @@ Dim oFieldMaster as Object
oBookText.InsertTextContent(oBookMarkCursor, oFieldMaster, True)
End If
End Sub
-</script:module>
+</script:module> \ No newline at end of file
diff --git a/wizards/source/template/DialogStyles.xdl b/wizards/source/template/DialogStyles.xdl
index 28b1cf13cabc..47970cde4871 100644
--- a/wizards/source/template/DialogStyles.xdl
+++ b/wizards/source/template/DialogStyles.xdl
@@ -1,17 +1,14 @@
<?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="DialogStyles" dlg:style-id="0" dlg:left="170" dlg:top="93" dlg:width="120" dlg:height="169">
- <dlg:styles>
- <dlg:style dlg:style-id="0"/>
- </dlg:styles>
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" dlg:id="DialogStyles" dlg:left="170" dlg:top="93" dlg:width="120" dlg:height="169">
<dlg:bulletinboard>
- <dlg:button dlg:style-id="0" dlg:id="cmdCancel" dlg:tab-index="0" dlg:left="5" dlg:top="150" dlg:width="50" dlg:height="13" dlg:value="cmdCancel">
+ <dlg:button dlg:id="cmdCancel" dlg:tab-index="0" dlg:left="5" dlg:top="150" dlg:width="50" dlg:height="13" dlg:value="cmdCancel">
<dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="Template.Samples.RestoreCurrentStyles"/>
</dlg:button>
- <dlg:button dlg:style-id="0" dlg:id="cmdOk" dlg:tab-index="1" dlg:left="65" dlg:top="150" dlg:width="50" dlg:height="12" dlg:value="cmdOk">
+ <dlg:button dlg:id="cmdOk" dlg:tab-index="1" dlg:left="65" dlg:top="150" dlg:width="50" dlg:height="12" dlg:value="cmdOk">
<dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="Template.Samples.CloseStyleDialog"/>
</dlg:button>
- <dlg:menulist dlg:style-id="0" dlg:id="lbStyles" dlg:tab-index="2" dlg:left="5" dlg:top="5" dlg:width="110" dlg:height="133">
+ <dlg:menulist dlg:id="lbStyles" dlg:tab-index="2" dlg:left="5" dlg:top="5" dlg:width="110" dlg:height="133">
<dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="Template.Samples.SelectStyle"/>
</dlg:menulist>
</dlg:bulletinboard>
diff --git a/wizards/source/template/TemplateDialog.xdl b/wizards/source/template/TemplateDialog.xdl
index 1022cecfdd15..c37917d473a2 100644
--- a/wizards/source/template/TemplateDialog.xdl
+++ b/wizards/source/template/TemplateDialog.xdl
@@ -1,32 +1,29 @@
<?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="TemplateDialog" dlg:style-id="0" dlg:left="170" dlg:top="93" dlg:width="220" dlg:height="60" dlg:page="1">
- <dlg:styles>
- <dlg:style dlg:style-id="0"/>
- </dlg:styles>
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" dlg:id="TemplateDialog" dlg:left="170" dlg:top="93" dlg:width="220" dlg:height="60" dlg:page="1">
<dlg:bulletinboard>
<dlg:radiogroup>
- <dlg:radio dlg:style-id="0" dlg:id="OptAgenda1" dlg:tab-index="0" dlg:left="12" dlg:top="20" dlg:width="144" dlg:height="10" dlg:page="1" dlg:tag="TOP2;PT1" dlg:value="OptAgenda1">
+ <dlg:radio dlg:id="OptAgenda1" dlg:tab-index="0" dlg:left="12" dlg:top="20" dlg:width="144" dlg:height="10" dlg:page="1" dlg:tag="TOP2;PT1" dlg:value="OptAgenda1">
<dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="Template.ModuleAgenda.GetOptionValues"/>
</dlg:radio>
- <dlg:radio dlg:style-id="0" dlg:id="OptAgenda2" dlg:tab-index="1" dlg:left="12" dlg:top="34" dlg:width="144" dlg:height="10" dlg:page="1" dlg:tag="TOP1;PT2" dlg:value="OptAgenda2">
+ <dlg:radio dlg:id="OptAgenda2" dlg:tab-index="1" dlg:left="12" dlg:top="34" dlg:width="144" dlg:height="10" dlg:page="1" dlg:tag="TOP1;PT2" dlg:value="OptAgenda2">
<dlg:event dlg:listener-type="com.sun.star.awt.XItemListener" dlg:event-method="itemStateChanged" dlg:script-type="StarBasic" dlg:script-code="Template.ModuleAgenda.GetOptionValues"/>
</dlg:radio>
</dlg:radiogroup>
- <dlg:button dlg:style-id="0" dlg:id="CmdCorrGoOn" dlg:tab-index="2" dlg:left="164" dlg:top="11" dlg:width="50" dlg:height="14" dlg:page="2" dlg:value="CmdCorrGoOn">
+ <dlg:button dlg:id="CmdCorrGoOn" dlg:tab-index="2" dlg:left="164" dlg:top="11" dlg:width="50" dlg:height="14" dlg:page="2" dlg:value="CmdCorrGoOn">
<dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="Template.Correspondence.OK"/>
</dlg:button>
<dlg:radiogroup>
- <dlg:radio dlg:style-id="0" dlg:id="OptSingle" dlg:tab-index="3" dlg:left="12" dlg:top="20" dlg:width="144" dlg:height="10" dlg:page="2" dlg:value="OptSingle"/>
- <dlg:radio dlg:style-id="0" dlg:id="Optmerge" dlg:tab-index="4" dlg:left="12" dlg:top="34" dlg:width="144" dlg:height="10" dlg:page="2" dlg:value="Optmerge"/>
+ <dlg:radio dlg:id="OptSingle" dlg:tab-index="3" dlg:left="12" dlg:top="20" dlg:width="144" dlg:height="10" dlg:page="2" dlg:value="OptSingle"/>
+ <dlg:radio dlg:id="Optmerge" dlg:tab-index="4" dlg:left="12" dlg:top="34" dlg:width="144" dlg:height="10" dlg:page="2" dlg:value="Optmerge"/>
</dlg:radiogroup>
- <dlg:button dlg:style-id="0" dlg:id="CmdAgdGoon" dlg:tab-index="5" dlg:left="164" dlg:top="11" dlg:width="50" dlg:height="14" dlg:page="1" dlg:value="CmdAgdGoOn">
+ <dlg:button dlg:id="CmdAgdGoon" dlg:tab-index="5" dlg:left="164" dlg:top="11" dlg:width="50" dlg:height="14" dlg:page="1" dlg:value="CmdAgdGoOn">
<dlg:event dlg:listener-type="com.sun.star.awt.XActionListener" dlg:event-method="actionPerformed" dlg:script-type="StarBasic" dlg:script-code="Template.ModuleAgenda.ModifyTemplate"/>
</dlg:button>
- <dlg:button dlg:style-id="0" dlg:id="CmdCancel" dlg:tab-index="6" dlg:left="164" dlg:top="28" dlg:width="50" dlg:height="14" dlg:value="CmdCancel">
+ <dlg:button dlg:id="CmdCancel" dlg:tab-index="6" dlg:left="164" dlg:top="28" dlg:width="50" 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="Template.ModuleAgenda.DisposeDocument"/>
</dlg:button>
- <dlg:fixedline dlg:style-id="0" dlg:id="FrmLetter" dlg:tab-index="7" dlg:left="6" dlg:top="6" dlg:width="150" dlg:height="10" dlg:page="2" dlg:value="FrmLetter"/>
- <dlg:fixedline dlg:style-id="0" dlg:id="FrmAgenda" dlg:tab-index="8" dlg:left="6" dlg:top="6" dlg:width="150" dlg:height="10" dlg:page="1" dlg:value="FrmAgenda"/>
+ <dlg:fixedline dlg:id="FrmLetter" dlg:tab-index="7" dlg:left="6" dlg:top="6" dlg:width="150" dlg:height="10" dlg:page="2" dlg:value="FrmLetter"/>
+ <dlg:fixedline dlg:id="FrmAgenda" dlg:tab-index="8" dlg:left="6" dlg:top="6" dlg:width="150" dlg:height="10" dlg:page="1" dlg:value="FrmAgenda"/>
</dlg:bulletinboard>
</dlg:window> \ No newline at end of file
diff --git a/wizards/source/tools/ModuleControls.xba b/wizards/source/tools/ModuleControls.xba
index fab31d51cf1f..390369953351 100644
--- a/wizards/source/tools/ModuleControls.xba
+++ b/wizards/source/tools/ModuleControls.xba
@@ -1,7 +1,7 @@
<?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="ModuleControls" script:language="StarBasic">Option Explicit
-
+&apos;bla
&apos; Accepts the name of a control and returns the respective control model as object
&apos; The Container can either be a whole document or a specific sheet of a Calc-Document
diff --git a/wizards/source/tools/Strings.xba b/wizards/source/tools/Strings.xba
index 2855b8c7fe42..862190dcafa8 100644
--- a/wizards/source/tools/Strings.xba
+++ b/wizards/source/tools/Strings.xba
@@ -397,7 +397,7 @@ Function BubbleSortList(ByVal SortList(),optional sort2ndValue as Boolean)
Dim t as Integer
Dim i,k as Integer
Dim bJustOneDim, bSort2nd as Boolean
- Dim DisplayDummy as String
+ Dim DisplayDummy
bJustOneDim = false
bSort2nd = false
On Local Error Goto No2ndDim
@@ -428,7 +428,11 @@ On Local Error Goto No2ndDim
DisplayDummy = SortList(t,1)
SortList(t,1) = SortList(t+1,1)
- SortList(t+1,1) = DisplayDummy
+ SortList(t+1,1) = DisplayDummy
+
+ DisplayDummy = SortList(t,2)
+ SortList(t,2) = SortList(t+1,2)
+ SortList(t+1,2) = DisplayDummy
End If
Else
If SortList(t,0) &gt; SortList(t+1,0) Then
@@ -439,6 +443,10 @@ On Local Error Goto No2ndDim
DisplayDummy = SortList(t,1)
SortList(t,1) = SortList(t+1,1)
SortList(t+1,1) = DisplayDummy
+
+ DisplayDummy = SortList(t,2)
+ SortList(t,2) = SortList(t+1,2)
+ SortList(t+1,2) = DisplayDummy
End If
End If
End If
diff --git a/wizards/source/webwizard/Common.xba b/wizards/source/webwizard/Common.xba
index 906267d5b048..287d96526fb2 100644
--- a/wizards/source/webwizard/Common.xba
+++ b/wizards/source/webwizard/Common.xba
@@ -13,7 +13,7 @@ Dim StylesOptions(0) as New com.sun.star.beans.PropertyValue
If SourceFile &lt;&gt; &quot;&quot; Then
StylesOptions(0).Name = &quot;OverwriteStyles&quot;
- StylesOptions(0).Value = true
+ StylesOptions(0).Value = True
oDocument.StyleFamilies.LoadStylesFromURL(SourceFile, StylesOptions())
End If
@@ -46,7 +46,8 @@ Dim StylesOptions(0) as New com.sun.star.beans.PropertyValue
LoadNewStyles() = bLocWithBackGraphic
ErrorOcurred:
If Err &lt;&gt; 0 Then
- MsgBox(WebWiz_gErrWhileLoadStyles$, 16, WebWiz_gWizardName$)
+ MsgBox
+ (WebWiz_gErrWhileLoadStyles$, 16, WebWiz_gWizardName$)
CancelHTMLWizard()
End If
End Function
diff --git a/wizards/source/webwizard/HtmlAutoPilotBasic.xba b/wizards/source/webwizard/HtmlAutoPilotBasic.xba
index d74b16939c7a..7ecc43c02ee7 100644
--- a/wizards/source/webwizard/HtmlAutoPilotBasic.xba
+++ b/wizards/source/webwizard/HtmlAutoPilotBasic.xba
@@ -270,10 +270,11 @@ End Function
Function FillupWebListbox(oUcb as Object, sFileFilter as String, oDialog as Object, ListboxName as String, List() as String)
Dim oDocInfo as Object
-Dim oAloneDocInfo as Object
+Dim oComp as Object
+Dim oRealDocInfo as Object
Dim oListboxControl as Object
-Dim Description as String
Dim sField as String
+Dim sDescription as String
Dim sFieldList() as String
Dim bItemFound as Boolean
Dim MaxIndex as Integer
@@ -288,9 +289,11 @@ Dim s as Integer
Dim a as Integer
Dim SelList(0) as Integer
Dim LocMaxIndex as Integer
+Dim FileProperties(0) as new com.sun.star.beans.PropertyValue
+ FileProperties(0).Name = &quot;Hidden&quot;
+ FileProperties(0).Value = True
oListboxControl = oDialog.GetControl(ListboxName)
oDocInfo = CreateUnoService(&quot;com.sun.star.document.DocumentProperties&quot;)
- oAloneDocInfo = createUnoService( &quot;com.sun.star.document.StandaloneDocumentInfo&quot; )
FilterLen = Len(sFileFilter)
bItemFound = False
TemplatePath = GetOfficeSubPath(&quot;Template&quot;, &quot;wizard/web/&quot;)
@@ -298,32 +301,33 @@ Dim LocMaxIndex as Integer
LocMaxIndex = Ubound(DirContent())
- Dim SortList(LocMaxIndex,1)
+ Dim SortList(LocMaxIndex,2)
For i = 0 to LocMaxIndex
SortList(i,0) = DirContent(i)
- SortList(i,1) = RetrieveDocTitle(oDocInfo, DirContent(i))
+ oComp = StarDesktop.LoadComponentFromURL(DirContent(i),&quot;_blank&quot;,0,FileProperties())
+ oRealDocInfo = oComp.getDocumentInfo()
+ oComp.dispose()
+ SortList(i,1) = oRealDocInfo.Title
+ SortList(i,2) = oRealDocInfo
Next i
SortList() = BubbleSortList(SortList(),True)
- For i = 0 to LocMaxIndex
- DirContent(i) = SortList(i,0)
- Next i
a = 0
For i = 0 To LocMaxIndex
- FileName = DirContent(i)
+ FileName = SortList(i,0)
If Instr(1,Filename, sFileFilter) Then
bItemFound = True
- Description = RetrieveDocTitle(oDocInfo, FileName)
- oAloneDocInfo.LoadFromUrl(FileName)
- oListboxControl.AddItem(Description,a)
+
+ sDescription = SortList(i,1)
+ oListboxControl.AddItem(sDescription,a)
a = a + 1
- List(1,i) = Description
+ List(1,i) = sDescription
If sFileFilter = &quot;/cnt&quot; Then
List(2,i) = Filename
Else
m = 2
For n = 0 To 3
- sField = oAloneDocInfo.GetUserFieldValue(n)
+ sField = SortList(i,2).GetUserFieldValue(n)
sFieldList() = ArrayoutofString(sField, &quot; &quot;, MaxIndex)
For s = 0 To MaxIndex
If m &lt; 6 Then