#87217# new way of setting db fields in correspondence templates

7 files changed, 473 insertions, 183 deletions

diff --git a/wizards/source/template/Autotext.xba b/wizards/source/template/Autotext.xba
index d9aca4269f31..4f18ed757289 100644
--- a/wizards/source/template/Autotext.xba
+++ b/wizards/source/template/Autotext.xba
@@ -1,5 +1,5 @@
 <?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="Autotext" script:language="StarBasic">Public UserfieldDataType(14) as String
 Public oDocument as Object
 Public BulletList(7) as Integer
@@ -123,14 +123,17 @@ End Sub
 
 
 &apos; Creates a placeholder out of a string with the following structure:
-&apos;&lt;placeholder:“Showtext“:“Helptext“&gt;
+&apos;&lt;placeholder:Showtext:Helptext&gt;
 Sub	CreatePlaceholder(oCursor, sFoundContent as String)
 Dim MaxIndex as Integer
 	oPlaceholder = oDocument.CreateInstance(&quot;com.sun.star.text.TextField.JumpEdit&quot;)
 	sFoundList() = ArrayoutofString(sFoundContent, &quot;:&quot; &amp; chr(34),MaxIndex)
 	&apos; Delete The Double-quotes
-	oPlaceHolder.Hint = DeleteStr(sFoundList(1),chr(34))
-	oPlaceHolder.placeholder = 	DeleteStr(sFoundList(2),chr(34))
+	msgbox(DeleteStr(sFoundList(2),chr(34)))
+	msgbox(DeleteStr(sFoundList(1),chr(34)))
+	
+	oPlaceHolder.Hint = DeleteStr(sFoundList(2),chr(34))
+	oPlaceHolder.placeholder = 	DeleteStr(sFoundList(1),chr(34))
 	oCursor.Text.InsertTextContent(oCursor,oPlaceholder,True)
 End Sub
 
diff --git a/wizards/source/template/Correspondence.xba b/wizards/source/template/Correspondence.xba
index ce3bf788ab14..927c168da6ab 100644
--- a/wizards/source/template/Correspondence.xba
+++ b/wizards/source/template/Correspondence.xba
@@ -1,5 +1,5 @@
 <?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="Correspondence" script:language="StarBasic">Option Explicit
 
 Public msgNoTextmark$, msgError$
@@ -10,64 +10,36 @@ Public DialogExited
 Public oDocument, oText, oBookMarks, oBookMark, oBookMarkCursor, oBookText as Object
 
 Sub Main
-        BasicLibraries.LoadLibrary(&quot;Tools&quot;)
+    BasicLibraries.LoadLibrary(&quot;Tools&quot;)
 	TemplateDialog = LoadDialog(&quot;Template&quot;, &quot;TemplateDialog&quot;)
 	DialogModel = TemplateDialog.Model
 	DialogModel.Step = 2
 	DialogModel.Optmerge.State = True
-	If LoadLanguageCorrespondence() Then
-		TemplateDialog.Execute
-	End If
+	LoadLanguageCorrespondence()
+	TemplateDialog.Execute
 End Sub
 
 
 Function LoadLanguageCorrespondence() as Boolean
-Dim oDBAccess as Object
-Dim oAddressDialog as Object
-Dim oFields as Object
-
 	If InitResources(&quot;&apos;Template&apos;&quot;, &quot;tpl&quot;) Then
-		oDBAccess = GetRegistryKeyContent(&quot;org.openoffice.Office.DataAccess/AddressBook/&quot;)
-		sAddressbook = oDBAccess.DataSourceName
-		If sAddressbook = &quot;&quot; Then
-			oAddressDialog = CreateUnoService(&quot;com.sun.star.ui.AddressBookSourceDialog&quot;)
-			oAddressDialog.Execute
-			oDBAccess = GetRegistryKeyContent(&quot;org.openoffice.Office.DataAccess/AddressBook/&quot;)
-			sAddressbook = oDBAccess.DataSourceName
-			If sAddressbook = &quot;&quot; Then
-				LoadLanguageCorrespondence() = False
-				Exit Function
-			End If
-		End If
-		oFields = oDBAccess.GetByName(&quot;Fields&quot;)
-		Table = oDBAccess.GetByName(&quot;Command&quot;)
-		sCompany = GetFieldname(oFields, &quot;Company&quot;)
-		sFirstName = GetFieldname(oFields, &quot;FirstName&quot;)
-		sLastName = GetFieldname(oFields, &quot;LastName&quot;)
-		sStreet = GetFieldname(oFields, &quot;Street&quot;)
-		sPostalCode = GetFieldname(oFields, &quot;Zip&quot;)
-		sCity = GetFieldname(oFields, &quot;City&quot;)
-		sState = GetFieldname(oFields, &quot;State&quot;)
-		sInitials = GetFieldname(oFields, &quot;Code&quot;)
-		sPosition = GetFieldname(oFields, &quot;Position&quot;)
 		msgNoTextmark$ = GetResText(1303) &amp; Chr(13) &amp; Chr(10) &amp; GetResText(1301)
 		msgError$ = GetResText(1302)
-		DialogModel.Title = GetResText(1303)
+		DialogModel.Title = GetResText(1303+3)
 		DialogModel.CmdCancel.Label = GetResText(1102)
 		DialogModel.CmdCorrGoOn.Label = GetResText(1103)
 		DialogModel.OptSingle.Label = GetResText(1303 + 1)
 		DialogModel.Optmerge.Label = GetResText(1303 + 2)
+		DialogModel.FrmLetter.Label = GetResText(1303)
 		LoadLanguageCorrespondence() = True
 	Else
-&apos; Todo: Meldung, was Passiert wenn Datenbank nicht angelegt werden konnte
-		LoadLanguageCorrespondence() = False
+		msgbox(&quot;Warning: Resource could not be loaded!&quot;)
 	End If
 End Function
 
 
-Function GetFieldName(oFieldKnot as Object, GeneralFieldName as String)
-	If oFieldKnot.HasbyName(GeneralFieldName) Then
-		GetFieldName = oFieldKnot.GetbyName(GeneralFieldName).FieldName
+Function GetFieldName(oFieldKnot as Object, GeneralFieldName as String)	
+	If oFieldKnot.HasByName(GeneralFieldName) Then
+		GetFieldName = oFieldKnot.GetByName(GeneralFieldName).FieldName
 	Else
 		GetFieldName = &quot;&quot;
 	End If
@@ -77,100 +49,79 @@ End Function
 Sub OK
 Dim ParaBreak
 Dim sDocLang as String
-Dim bMerge as Boolean
-	bMerge = DialogModel.Optmerge.State
-&apos; Todo: das muss wieder rein!
-	DialogTemplate.EndExecute()
-	DialogExited = TRUE
-	If bMerge Then
-		ParaBreak = com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK
-		oDocument = StarDesktop.ActiveFrame.Controller.Model
-		oBookmarks = oDocument.Bookmarks
-		oText = oDocument.Text
-		If oBookmarks.HasbyName(&quot;Recipient&quot;)Then
-			oBookMark = oDocument.BookMarks.GetbyName(&quot;Recipient&quot;)
-		Else
-			MsgBox msgNoTextmark, 16, msgError
-			Exit Sub
-		End If
-		oBookMarkCursor = oBookMark.Anchor.Text.CreateTextCursorByRange(oBookMark.Anchor)
-		OBookText = oBookMarkCursor.Text
-		sDocLang = oDocument.CharLocale.Language
-		Select Case sDocLang
-			Case &quot;nl&quot;
-				InsertDBField(sAddressbook, Table, sCompany)
-				oBookMarkCursor.Text.insertControlCharacter(oBookMarkCursor, ParaBreak, False)
-				InsertBookMarkString(&quot;T.a.v. &quot;)
-				InsertDBField(sAddressbook, Table, sFirstName)
-				InsertBookMarkString(&quot; &quot;)
-				InsertDBField(sAddressbook, Table, sLastName)
-				oBookText.insertControlCharacter(oBookMarkCursor, ParaBreak, False)
-				InsertDBField(sAddressbook, Table, sStreet)
-				oBookText.insertControlCharacter(oBookMarkCursor, ParaBreak, False)
-				InsertDBField(sAddressbook, Table, sPostalCode)
-				InsertBookMarkString(&quot; &quot;)
-				InsertDBField(sAddressbook, Table, sCity)
-
-			Case &quot;en&quot;
-				InsertDBField(sAddressbook, Table, sCompany)
-				oBookMarkCursor.Text.insertControlCharacter(oBookMarkCursor, ParaBreak, False)
-				InsertDBField(sAddressbook, Table, sFirstName)
-				InsertBookMarkString(&quot; &quot;)
-				InsertDBField(sAddressbook, Table, sLastName)
-				oBookText.insertControlCharacter(oBookMarkCursor, ParaBreak, False)
-				InsertDBField(sAddressbook, Table, sStreet)
-				oBookText.insertControlCharacter(oBookMarkCursor, ParaBreak, False)
-				oBookText.insertControlCharacter(oBookMarkCursor, ParaBreak, False)
-				InsertDBField(sAddressbook, Table, sCity)
-				InsertBookMarkString(&quot;, &quot;)
-				InsertDBField(sAddressbook, Table, sState)
-				InsertBookMarkString(&quot; &quot;)
-				InsertDBField(sAddressbook, Table, sPostalCode)
-
-			Case &quot;sv&quot;
-				InsertDBField(sAddressbook, Table, sCompany)
-				oBookMarkCursor.Text.insertControlCharacter(oBookMarkCursor, ParaBreak, False)
-				InsertDBField(sAddressbook, Table, sFirstName)
-				InsertBookMarkString(&quot; &quot;)
-				InsertDBField(sAddressbook, Table, sLastName)
-				oBookText.insertControlCharacter(oBookMarkCursor, ParaBreak, False)
-				InsertDBField(sAddressbook, Table, sStreet)
-				oBookText.insertControlCharacter(oBookMarkCursor, ParaBreak, False)
-				oBookText.insertControlCharacter(oBookMarkCursor, ParaBreak, False)
-				InsertDBField(sAddressbook, Table, sPostalCode)
-				InsertBookMarkString(&quot;  &quot;)
-				InsertDBField(sAddressbook, Table, sCity)
+Dim bDBFields as Boolean
+Dim oSearchDesc as Object
+Dim oFoundAll as Object
+Dim oFound as Object
+Dim sFoundContent as String
+Dim sFoundString as String
+Dim sDBField as String
+Dim i as Integer
+Dim oDBAccess as Object
+Dim oAddressDialog as Object
+Dim oFields as Object
+Dim oDocSettings as Object
 
-			Case &quot;ru&quot;
-				InsertDBField(sAddressbook, Table, sPosition)
-				InsertBookMarkString(&quot; &quot;)
-				InsertDBField(sAddressbook, Table, sCompany)
-				oBookText.insertControlCharacter(oBookMarkCursor, ParaBreak, False)
-				InsertDBField(sAddressbook, Table, sLastName)
-				InsertBookMarkString(&quot; &quot;)
-				InsertDBField(sAddressbook, Table, sInitials)
-				oBookText.insertControlCharacter(oBookMarkCursor, ParaBreak, False)
-				InsertDBField(sAddressbook, Table, sPostalCode)
-				InsertBookMarkString(&quot;, &quot;)
-				InsertDBField(sAddressbook, Table, sCity)
-				oBookText.insertControlCharacter(oBookMarkCursor, ParaBreak, False)
-				InsertDBField(sAddressbook, Table, sStreet)
+	bDBFields = DialogModel.Optmerge.State  &apos;db oder PLatzhalter
+	
+	If bDBFields Then
+		oDBAccess = GetRegistryKeyContent(&quot;org.openoffice.Office.DataAccess/AddressBook/&quot;)
+		sAddressbook = oDBAccess.DataSourceName
+		If sAddressbook = &quot;&quot; Then
+			oAddressDialog = CreateUnoService(&quot;com.sun.star.ui.AddressBookSourceDialog&quot;)
+			oAddressDialog.Execute
+			oDBAccess = GetRegistryKeyContent(&quot;org.openoffice.Office.DataAccess/AddressBook/&quot;)
+			sAddressbook = oDBAccess.DataSourceName
+			If sAddressbook = &quot;&quot; Then
+				MsgBox(GetResText(1301))
+				Exit Sub
+			End If
+		End If
+		oFields = oDBAccess.GetByName(&quot;Fields&quot;)
+		Table = oDBAccess.GetByName(&quot;Command&quot;)
+	End If
 
-			Case Else
-				InsertDBField(sAddressbook, Table, sCompany)
-				oBookMarkCursor.Text.insertControlCharacter(oBookMarkCursor, ParaBreak, False)
-				InsertDBField(sAddressbook, Table, sFirstName)
-				InsertBookMarkString(&quot; &quot;)
-				InsertDBField(sAddressbook, Table, sLastName)
-				oBookText.insertControlCharacter(oBookMarkCursor, ParaBreak, False)
-				InsertDBField(sAddressbook, Table, sStreet)
-				oBookText.insertControlCharacter(oBookMarkCursor, ParaBreak, False)
-				oBookText.insertControlCharacter(oBookMarkCursor, ParaBreak, False)
-				InsertDBField(sAddressbook, Table, sPostalCode)
-				InsertBookMarkString(&quot; &quot;)
-				InsertDBField(sAddressbook, Table, sCity)
-		End Select
+	TemplateDialog.EndExecute()
+	DialogExited = TRUE
+	
+	ParaBreak = com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK
+	oDocument = StarDesktop.ActiveFrame.Controller.Model
+	If bDBFields Then
+		&apos;set the address db as current db at the document
+		oDocSettings = oDocument.createInstance(&quot;com.sun.star.document.DocumentSettings&quot;)
+		oDocSettings.CurrentDatabaseDataSource = sAddressbook
+		oDocSettings.CurrentDatabaseCommand = Table
+		oDocSettings.CurrentDatabaseCommandType = 0 
 	End If
+	oBookmarks = oDocument.Bookmarks
+	oText = oDocument.Text
+	
+	oSearchDesc = oDocument.createsearchDescriptor()
+	oSearchDesc.SearchRegularExpression = True
+	oSearchDesc.SearchWords = True
+	oSearchDesc.SearchString  = &quot;&lt;[^&gt;]+&gt;&quot;
+	oFoundall = oDocument.FindAll(oSearchDesc)
+
+	&apos;Loop over the foundings
+	For i = 0 To oFoundAll.Count - 1
+		oFound = oFoundAll.GetByIndex(i)
+		sFoundString = oFound.String
+		&apos;Extract the string inside the brackets
+		sFoundContent = FindPartString(sFoundString,&quot;&lt;&quot;,&quot;&gt;&quot;,1)
+		sFoundContent = LTrim(sFoundContent)
+		&apos; Define the Cursor and place it on the founding
+		oBookmarkCursor = oFound.Text.CreateTextCursorbyRange(oFound)
+		oBookText = oFound.Text
+		If bDBFields Then
+			sDBField = GetFieldname(oFields, sFoundContent)
+			If sDBField &lt;&gt; &quot;&quot; Then
+				InsertDBField(sAddressbook, Table, sDBField)
+			End If
+		Else
+			InsertPlaceholder(sFoundContent)
+		End If
+	Next i
+		
 End Sub
 
 
@@ -190,26 +141,78 @@ Dim oFieldMaster, oField as Object
 End Sub
 
 
-Sub InsertBookmarkString(sBookmarkString as String)
-	oBookText.InsertString(oBookMarkCursor, sBookmarkString, True)
-	oBookMarkCursor.CollapseToEnd()
-End Sub
-
-
-Sub LoadLibrary(sLibname as String)
-Dim oArg(0) as new com.sun.star.beans.PropertyValue
-Dim oUrl as new com.sun.star.util.URL
-Dim oTrans as Object
-Dim oDisp as Object
-
-	oArg(0).Name = &quot;LibraryName&quot;
-	oArg(0).Value = sLibname
-
-	oTrans = createUNOService(&quot;com.sun.star.util.URLTransformer&quot;)
-	oUrl.Complete = &quot;slot:6517&quot;
-	oTrans.parsestrict(oUrl)
-
-	oDisp = StarDesktop.currentFrame.queryDispatch(oUrl, &quot;_self&quot;, 0)
-	oDisp.dispatch(oUrl, oArg())
+Sub InsertPlaceholder(sColName as String)
+Dim oFieldMaster as Object
+	If sColname &lt;&gt; &quot;&quot; Then
+		oFieldMaster = oDocument.createInstance(&quot;com.sun.star.text.TextField.JumpEdit&quot;)
+		Select Case sColName
+			Case &quot;Company&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+1)
+			Case &quot;Department&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+2)
+			Case &quot;FirstName&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+3)
+			Case &quot;LastName&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+4)
+			Case &quot;Street&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+5)
+			Case &quot;Country&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+6)
+			Case &quot;Zip&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+7)
+			Case &quot;City&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+8)
+			Case &quot;Title&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+9)
+			Case &quot;Position&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+10)
+			Case &quot;AddrForm&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+11)
+			Case &quot;Code&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+12)
+			Case &quot;AddrFormMail&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+13)
+			Case &quot;PhonePriv&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+14)
+			Case &quot;PhoneComp&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+15)
+			Case &quot;Fax&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+16)
+			Case &quot;EMail&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+17)
+			Case &quot;URL&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+18)
+			Case &quot;Note&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+19)
+			Case &quot;Altfield1&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+20)
+			Case &quot;Altfield2&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+21)
+			Case &quot;Altfield3&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+22)
+			Case &quot;Altfield4&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+23)
+			Case &quot;Id&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+24)
+			Case &quot;State&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+25)
+			Case &quot;PhoneOffice&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+26)
+			Case &quot;Pager&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+27)
+			Case &quot;PhoneCell&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+28)
+			Case &quot;PhoneOther&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+29)
+			Case &quot;CalendarURL&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+30)
+			Case &quot;InviteParticipant&quot;
+				oFieldMaster.PlaceHolder = getResText(1350+31)
+			Case Else
+				oFieldMaster.PlaceHolder = sColName
+		End Select	
+		oFieldMaster.Hint = getResText(1350)
+		oBookText.InsertTextContent(oBookMarkCursor, oFieldMaster, True)
+	End If
 End Sub
 </script:module>
\ No newline at end of file
diff --git a/wizards/source/template/DialogStyles.xdl b/wizards/source/template/DialogStyles.xdl
index 969cc9ccb0e8..28b1cf13cabc 100644
--- a/wizards/source/template/DialogStyles.xdl
+++ b/wizards/source/template/DialogStyles.xdl
@@ -1,5 +1,5 @@
 <?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"/>
diff --git a/wizards/source/template/ModuleAgenda.xba b/wizards/source/template/ModuleAgenda.xba
index b840c05bd009..32ab286a7e73 100644
--- a/wizards/source/template/ModuleAgenda.xba
+++ b/wizards/source/template/ModuleAgenda.xba
@@ -1,5 +1,5 @@
 <?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="ModuleAgenda" script:language="StarBasic">&apos; All variables must be declared before use
 Option Explicit
 
diff --git a/wizards/source/template/Samples.xba b/wizards/source/template/Samples.xba
index b4feb5aa6b68..576f00415122 100644
--- a/wizards/source/template/Samples.xba
+++ b/wizards/source/template/Samples.xba
@@ -1,5 +1,5 @@
 <?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="Samples" script:language="StarBasic">Option Explicit
 
 Const SAMPLES = 1000
diff --git a/wizards/source/template/TemplateDialog.xdl b/wizards/source/template/TemplateDialog.xdl
index cf69f6bf2531..1022cecfdd15 100644
--- a/wizards/source/template/TemplateDialog.xdl
+++ b/wizards/source/template/TemplateDialog.xdl
@@ -1,36 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" dlg:id="TemplateDialog" dlg:style-id="0" dlg:left="170" dlg:top="93" dlg:width="160" dlg:height="62" dlg:page="1">
+<!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:bulletinboard>
-  <dlg:titledbox dlg:style-id="0" dlg:id="FrmAgenda" dlg:tab-index="0" dlg:left="5" dlg:top="5" dlg:width="85" dlg:height="47" dlg:page="1">
-   <dlg:title dlg:value="FrmAgenda"/>
-  </dlg:titledbox>
   <dlg:radiogroup>
-   <dlg:radio dlg:style-id="0" dlg:id="OptAgenda1" dlg:tab-index="1" dlg:left="11" dlg:top="16" dlg:width="74" dlg:height="14" dlg:page="1" dlg:tag="TOP2;PT1" dlg:value="OptAgenda1">
+   <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: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="2" dlg:left="11" dlg:top="33" dlg:width="73" dlg:height="14" dlg:page="1" dlg:tag="TOP1;PT2" dlg:value="OptAgenda2">
+   <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: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="3" dlg:left="100" dlg:top="16" dlg:width="50" dlg:height="13" dlg:page="2" dlg:value="CmdCorrGoOn">
+  <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: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="4" dlg:left="11" dlg:top="16" dlg:width="74" dlg:height="14" dlg:page="2" dlg:value="OptSingle"/>
-   <dlg:radio dlg:style-id="0" dlg:id="Optmerge" dlg:tab-index="5" dlg:left="11" dlg:top="33" dlg:width="73" dlg:height="14" dlg:page="2" dlg:value="Optmerge"/>
+   <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:radiogroup>
-  <dlg:titledbox dlg:style-id="0" dlg:id="FrmCorr" dlg:tab-index="6" dlg:left="5" dlg:top="5" dlg:width="85" dlg:height="47" dlg:page="2">
-   <dlg:title dlg:value="FrmCorr"/>
-  </dlg:titledbox>
-  <dlg:button dlg:style-id="0" dlg:id="CmdAgdGoon" dlg:tab-index="7" dlg:left="100" dlg:top="16" dlg:width="50" dlg:height="13" dlg:page="1" dlg:value="CmdAgdGoOn">
+  <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: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="8" dlg:left="100" dlg:top="33" dlg:width="50" dlg:height="13" dlg:value="CmdCancel">
+  <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: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:bulletinboard>
 </dlg:window>
\ No newline at end of file
diff --git a/wizards/source/template/template.src b/wizards/source/template/template.src
index 8c435c1783d2..bec017b2fbd9 100644
--- a/wizards/source/template/template.src
+++ b/wizards/source/template/template.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: template.src,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: kz $ $Date: 2001-05-17 08:41:52 $
+ *  last change: $Author: tv $ $Date: 2001-06-08 14:22:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,7 +68,9 @@
 #define CorrespondenceNoTextmark    1300
 #define CorrespondenceMsgError  1302
 #define CorrespondenceDialog    1303
+#define CorrespondenceFields    1350
 #define TextField    1400
+
 // --------------------------------------------------------------------
 String SAMPLES
 {
@@ -429,9 +431,9 @@ String CorrespondenceMsgError
 
 String CorrespondenceDialog
 {
-    Text = "Was wollen Sie schreiben?";
-    Text[English] = "What do you want to write?";
-    Text[ english_us ] = "What do you want to write?";
+    Text = "Empf�nger";
+    Text[English] = "Who will get this document?";
+    Text[ english_us ] = "Who will get this document?";
     Text[ portuguese ] = "Que deseja escrever?";
     Text[ dutch ] = "Wat wilt u schrijven?";
     Text[ french ] = "Que souhaitez-vous �crire ?";
@@ -455,9 +457,9 @@ String CorrespondenceDialog
 
 String CorrespondenceDialog+1
 {
-    Text = "Einzelnen Brief";
-    Text[English] = "Single letter";
-    Text[ english_us ] = "Single letter";
+    Text = "Ein Empf�nger";
+    Text[English] = "One Recipient";
+    Text[ english_us ] = "One Recipient";
     Text[ portuguese ] = "Carta individual";
     Text[ dutch ] = "Een enkele brief";
     Text[ french ] = "Lettre individuelle";
@@ -482,9 +484,9 @@ String CorrespondenceDialog+1
 
 String CorrespondenceDialog+2
 {
-    Text = "Serienbrief";
-    Text[English] = "Multiple letter";
-    Text[ english_us ] = "Form letter";
+    Text = "Mehrere Empf�nger (Adressdatenbank)";
+    Text[English] = "Multiple Recipients (Address Database)";
+    Text[ english_us ] = "Multiple Recipients (Address Database)";
     Text[ portuguese ] = "Carta em s�rie";
     Text[ dutch ] = "Standaardbrief";
     Text[ french ] = "Mailing";
@@ -506,6 +508,292 @@ String CorrespondenceDialog+2
     Text[ finnish ] = "Lomakekirje";
 };
 
+String CorrespondenceDialog+3
+{
+    Text = "Verwendung der Vorlage";
+    Text[English] = "Use of this template";
+    Text[ english_us ] = "Use of this template";
+};
+
+
+String CorrespondenceFields
+{
+    Text = "Platzhalter anklicken und �berschreiben";
+    Text[English] = "Click place holder and overwrite";
+    Text[ english_us ] = "Click place holder and overwrite";
+    Text[ language_user1 ] = "Platzhalter-Hinweistext";
+};
+
+String CorrespondenceFields+1
+{
+    Text = "Firma";
+    Text[English] = "Company";
+    Text[ english_us ] = "Company";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+String CorrespondenceFields+2
+{
+    Text = "Abteilung";
+    Text[English] = "Department";
+    Text[ english_us ] = "Department";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+String CorrespondenceFields+3
+{
+    Text = "Vorname";
+    Text[English] = "First Name";
+    Text[ english_us ] = "First Name";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+String CorrespondenceFields+4
+{
+    Text = "Nachname";
+    Text[English] = "Last Name";
+    Text[ english_us ] = "Last Name";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+String CorrespondenceFields+5
+{
+    Text = "Stra�e";
+    Text[English] = "Address";
+    Text[ english_us ] = "Address";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+String CorrespondenceFields+6
+{
+    Text = "Land";
+    Text[English] = "Country";
+    Text[ english_us ] = "Country";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+
+String CorrespondenceFields+7
+{
+    Text = "PLZ";
+    Text[English] = "Postal Code";
+    Text[ english_us ] = "Postal Code";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+String CorrespondenceFields+8
+{
+    Text = "Ort";
+    Text[English] = "City";
+    Text[ english_us ] = "City";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+String CorrespondenceFields+9
+{
+    Text = "Titel";
+    Text[English] = "Title";
+    Text[ english_us ] = "Title";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+
+String CorrespondenceFields+10
+{
+    Text = "Position";
+    Text[English] = "Position";
+    Text[ english_us ] = "Position";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+
+String CorrespondenceFields+11
+{
+    Text = "Anrede";
+    Text[English] = "Form of Address";
+    Text[ english_us ] = "Form of Address";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+
+String CorrespondenceFields+12
+{
+    Text = "K�rzel";
+    Text[English] = "Initials";
+    Text[ english_us ] = "Initials";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+
+String CorrespondenceFields+13
+{
+    Text = "Briefanrede";
+    Text[English] = "Salutation";
+    Text[ english_us ] = "Salutation";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+
+String CorrespondenceFields+14
+{
+    Text = "Tel. privat";
+    Text[English] = "Home Phone";
+    Text[ english_us ] = "Home Phone";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+
+String CorrespondenceFields+15
+{
+    Text = "Tel. gesch.";
+    Text[English] = "Work Phone";
+    Text[ english_us ] = "Work Phone";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+
+String CorrespondenceFields+16
+{
+    Text = "Fax";
+    Text[English] = "Fax";
+    Text[ english_us ] = "Fax";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+
+String CorrespondenceFields+17
+{
+    Text = "E-Mail";
+    Text[English] = "E-Mail";
+    Text[ english_us ] = "E-Mail";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+
+String CorrespondenceFields+18
+{
+    Text = "URL";
+    Text[English] = "URL";
+    Text[ english_us ] = "URL";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+
+String CorrespondenceFields+19
+{
+    Text = "Notiz";
+    Text[English] = "Notes";
+    Text[ english_us ] = "Notes";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+
+String CorrespondenceFields+20
+{
+    Text = "Alt. Feld 1";
+    Text[English] = "Alt. Field 1";
+    Text[ english_us ] = "Alt. Field 1";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+
+String CorrespondenceFields+21
+{
+    Text = "Alt. Feld 2";
+    Text[English] = "Alt. Field 2";
+    Text[ english_us ] = "Alt. Field 2";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+
+String CorrespondenceFields+22
+{
+    Text = "Alt. Feld 3";
+    Text[English] = "Alt. Field 3";
+    Text[ english_us ] = "Alt. Field 3";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+
+String CorrespondenceFields+23
+{
+    Text = "Alt. Feld 4";
+    Text[English] = "Alt. Field 4";
+    Text[ english_us ] = "Alt. Field 4";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+
+String CorrespondenceFields+24
+{
+    Text = "ID";
+    Text[English] = "ID";
+    Text[ english_us ] = "ID";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+
+String CorrespondenceFields+25
+{
+    Text = "Bundesland";
+    Text[English] = "State";
+    Text[ english_us ] = "State";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+
+String CorrespondenceFields+26
+{
+    Text = "Tel. B�ro";
+    Text[English] = "Office Phone";
+    Text[ english_us ] = "Office Phone";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+
+String CorrespondenceFields+27
+{
+    Text = "Pager";
+    Text[English] = "Pager";
+    Text[ english_us ] = "Pager";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+
+String CorrespondenceFields+28
+{
+    Text = "Tel. Mobil";
+    Text[English] = "Mobile Phone";
+    Text[ english_us ] = "Mobile Phone";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+
+String CorrespondenceFields+29
+{
+    Text = "Tel. Andere";
+    Text[English] = "Other Phone";
+    Text[ english_us ] = "Other Phone";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+String CorrespondenceFields+30
+{
+    Text = "Kalender URL";
+    Text[English] = "Calendar URL";
+    Text[ english_us ] = "Calendar URL";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+String CorrespondenceFields+31
+{
+    Text = "Einladen";
+    Text[English] = "Invite";
+    Text[ english_us ] = "Invite";
+    Text[ language_user1 ] = "dies ist ein Platzhalter auf einem Brief";
+};
+
+
 String TextField
 {
     Text = "Benutzerdatenfeld ist nicht definiert!";