#105421# Resources added to common.src, inserted in Dialog

3 files changed, 28 insertions, 12 deletions

diff --git a/wizards/source/tools/DlgOverwriteAll.xdl b/wizards/source/tools/DlgOverwriteAll.xdl
index 8cef0d04b55b..6066e1b04b9d 100644
--- a/wizards/source/tools/DlgOverwriteAll.xdl
+++ b/wizards/source/tools/DlgOverwriteAll.xdl
@@ -1,17 +1,17 @@
 <?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="DlgOverwriteAll" dlg:left="138" dlg:top="75" dlg:width="230" dlg:height="69" dlg:closeable="true" dlg:moveable="true">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="DlgOverwriteAll" dlg:left="138" dlg:top="75" dlg:width="230" dlg:height="64" dlg:closeable="true" dlg:moveable="true">
  <dlg:bulletinboard>
-  <dlg:text dlg:id="lblQueryforSave" dlg:tab-index="0" dlg:left="6" dlg:top="6" dlg:width="218" dlg:height="35" dlg:value="lblQueryforSave" dlg:multiline="true"/>
-  <dlg:button dlg:id="cmdYes" dlg:tab-index="1" dlg:left="6" dlg:top="49" dlg:width="50" dlg:height="14" dlg:value="cmdYes">
+  <dlg:text dlg:id="lblQueryforSave" dlg:tab-index="0" dlg:left="6" dlg:top="6" dlg:width="218" dlg:height="36" dlg:value="lblQueryforSave" dlg:multiline="true"/>
+  <dlg:button dlg:id="cmdYes" dlg:tab-index="1" dlg:left="6" dlg:top="43" dlg:width="50" dlg:height="14" dlg:value="cmdYes">
    <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Tools.ModuleControls.SetOVERWRITEToQuery" script:language="StarBasic"/>
   </dlg:button>
-  <dlg:button dlg:id="cmdYesToAll" dlg:tab-index="2" dlg:left="62" dlg:top="49" dlg:width="50" dlg:height="14" dlg:value="cmdYesToAll">
+  <dlg:button dlg:id="cmdYesToAll" dlg:tab-index="2" dlg:left="62" dlg:top="43" dlg:width="50" dlg:height="14" dlg:value="cmdYesToAll">
    <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Tools.ModuleControls.SetOVERWRITEToAlways" script:language="StarBasic"/>
   </dlg:button>
-  <dlg:button dlg:id="cmdNo" dlg:tab-index="3" dlg:left="118" dlg:top="49" dlg:width="50" dlg:height="14" dlg:value="cmdNo">
+  <dlg:button dlg:id="cmdNo" dlg:tab-index="3" dlg:left="118" dlg:top="43" dlg:width="50" dlg:height="14" dlg:default="true" dlg:value="cmdNo">
    <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Tools.ModuleControls.SetOVERWRITEToNever" script:language="StarBasic"/>
   </dlg:button>
-  <dlg:button dlg:id="cmdCancel" dlg:tab-index="4" dlg:left="174" dlg:top="49" dlg:width="50" dlg:height="14" dlg:value="cmdCancel" dlg:button-type="cancel"/>
+  <dlg:button dlg:id="cmdCancel" dlg:tab-index="4" dlg:left="174" dlg:top="43" dlg:width="50" dlg:height="14" dlg:value="cmdCancel" dlg:button-type="cancel"/>
  </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 a94f0a9977af..4b211370961b 100644
--- a/wizards/source/tools/ModuleControls.xba
+++ b/wizards/source/tools/ModuleControls.xba
@@ -313,13 +313,29 @@ End Sub
 Sub ShowOverwriteAllDialog(FilePath as String, sTitle as String)
 Dim QueryString as String
 Dim LocRetValue as Integer
+Dim lblYes as String
+Dim lblNo as String
+Dim lblYesToAll as String
+Dim lblCancel as String
+Dim OverwriteModel as Object
 	If InitResources(&quot;&quot;, &quot;com&quot;) Then
-		DlgOverwrite = LoadDialog(&quot;Tools&quot;, &quot;DlgOverwriteAll&quot;)
-		DlgOverwrite.Title = sTitle
-		QueryString = &quot;Das Dokument &apos;&lt;PATH&gt;&apos; existiert bereits.&lt;BR&gt;&lt;BR&gt;Möchten Sie Datei(en) überschreiben?&quot;
+		QueryString = GetResText(1007)
 		QueryString = ReplaceString(QueryString, ConvertFromUrl(FilePath), &quot;&lt;PATH&gt;&quot;)
 		QueryString = ReplaceString(QueryString, chr(13), &quot;&lt;BR&gt;&quot;)
-		DlgOverwrite.Model.lblQueryforSave.Label = QueryString
+		lblYes = GetResText(1008)
+		lblYesToAll = GetResText(1009)
+		lblNo = GetResText(1010)
+		lblCancel = GetResText(1011)
+		DlgOverwrite = LoadDialog(&quot;Tools&quot;, &quot;DlgOverwriteAll&quot;)
+		DlgOverwrite.Title = sTitle
+		OverwriteModel = DlgOverwrite.Model
+		OverwriteModel.cmdYes.Label = lblYes
+		OverwriteModel.cmdYesToAll.Label = lblYesToAll
+		OverwriteModel.cmdNo.Label = lblNo
+		OverwriteModel.cmdCancel.Label = lblCancel
+		OverwriteModel.lblQueryforSave.Label = QueryString
+		OverwriteModel.cmdNo.DefaultButton = True
+		DlgOverwrite.GetControl(&quot;cmdNo&quot;).SetFocus()		
 		LocRetValue = DlgOverwrite.execute()
 		If LocRetValue = 0 Then
 			iGeneralOverwrite = SBOVERWRITECANCEL
diff --git a/wizards/source/tools/script.xlb b/wizards/source/tools/script.xlb
index 7e46dfbe680c..c107f2c9bfb6 100644
--- a/wizards/source/tools/script.xlb
+++ b/wizards/source/tools/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="Tools" library:readonly="false" library:passwordprotected="false">
+<library:library xmlns:library="http://openoffice.org/2000/library" library:name="Tools" library:readonly="true" library:passwordprotected="false">
  <library:element library:name="ModuleControls"/>
  <library:element library:name="Strings"/>
  <library:element library:name="Misc"/>
  <library:element library:name="UCB"/>
  <library:element library:name="Listbox"/>
  <library:element library:name="Debug"/>
-</library:library>
\ No newline at end of file
+</library:library>