[Libreoffice-commits] core.git: l10ntools/source wizards/com wizards/source

Julien Nabet serval2412 at yahoo.fr
Mon Feb 20 07:07:51 UTC 2017


 l10ntools/source/gRun.sh                         |    2 
 wizards/com/sun/star/wizards/common/HelpIds.java |    3 
 wizards/com/sun/star/wizards/common/HelpIds.py   |    2 
 wizards/source/formwizard/DlgFormDB.xdl          |   10 
 wizards/source/formwizard/FormWizard.xba         |    4 
 wizards/source/formwizard/dbwizres.src           |  747 -----------------------
 wizards/source/formwizard/tools.xba              |   23 
 7 files changed, 14 insertions(+), 777 deletions(-)

New commits:
commit 82d863b4a410fa78120d2efc41bd2b3b61f21cee
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Feb 18 14:02:30 2017 +0100

    Related tdf#99967: Cleanup after Web Wizard drop
    
    There are still webwizard*.xhp in help/source/text/shared/autopi/
    
    Change-Id: If54d7bfc093c8c0765fd881eeb14f62bc3517194
    Reviewed-on: https://gerrit.libreoffice.org/34402
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/l10ntools/source/gRun.sh b/l10ntools/source/gRun.sh
index fb9e3c0..5b2487b 100755
--- a/l10ntools/source/gRun.sh
+++ b/l10ntools/source/gRun.sh
@@ -76,7 +76,7 @@ ${MYCMD} --base helpcontent2/source/text/shared --files 3dsettings_toolbar.xhp f
 ${MYCMD} --base helpcontent2/source/text/shared/autokorr --files 01000000.xhp 02000000.xhp 03000000.xhp 04000000.xhp 05000000.xhp 06000000.xhp 07000000.xhp 08000000.xhp 09000000.xhp 10000000.xhp 12000000.xhp 13000000.xhp
 
 
-${MYCMD} --base helpcontent2/source/text/shared/autopi --files 01000000.xhp 01010000.xhp 01010100.xhp 01010200.xhp 01010300.xhp 01010400.xhp 01010500.xhp 01010600.xhp 01020000.xhp 01020100.xhp 01020200.xhp 01020300.xhp 01020400.xhp 01020500.xhp 01040000.xhp 01040100.xhp 01040200.xhp 01040300.xhp 01040400.xhp 01040500.xhp 01040600.xhp 01050000.xhp 01050100.xhp 01050200.xhp 01050300.xhp 01050400.xhp 01050500.xhp 01090000.xhp 01090100.xhp 01090200.xhp 01090210.xhp 01090220.xhp 01090300.xhp 01090400.xhp 01090500.xhp 01090600.xhp 01100000.xhp 01100100.xhp 01100150.xhp 01100200.xhp 01100300.xhp 01100400.xhp 01100500.xhp 01110000.xhp 01110100.xhp 01110200.xhp 01110300.xhp 01110400.xhp 01110500.xhp 01110600.xhp 01120000.xhp 01120100.xhp 01120200.xhp 01120300.xhp 01120400.xhp 01120500.xhp 01130000.xhp 01130100.xhp 01130200.xhp 01150000.xhp 01170000.xhp 01170200.xhp 01170300.xhp 01170400.xhp 01170500.xhp webwizard00.xhp webwizard01.xhp webwizard02.xhp webwizard03.xhp webwizard04.xhp webwizard
 05.xhp webwizard05bi.xhp webwizard05is.xhp webwizard06.xhp webwizard07.xhp webwizard07fc.xhp
+${MYCMD} --base helpcontent2/source/text/shared/autopi --files 01000000.xhp 01010000.xhp 01010100.xhp 01010200.xhp 01010300.xhp 01010400.xhp 01010500.xhp 01010600.xhp 01020000.xhp 01020100.xhp 01020200.xhp 01020300.xhp 01020400.xhp 01020500.xhp 01040000.xhp 01040100.xhp 01040200.xhp 01040300.xhp 01040400.xhp 01040500.xhp 01040600.xhp 01050000.xhp 01050100.xhp 01050200.xhp 01050300.xhp 01050400.xhp 01050500.xhp 01090000.xhp 01090100.xhp 01090200.xhp 01090210.xhp 01090220.xhp 01090300.xhp 01090400.xhp 01090500.xhp 01090600.xhp 01100000.xhp 01100100.xhp 01100150.xhp 01100200.xhp 01100300.xhp 01100400.xhp 01100500.xhp 01110000.xhp 01110100.xhp 01110200.xhp 01110300.xhp 01110400.xhp 01110500.xhp 01110600.xhp 01120000.xhp 01120100.xhp 01120200.xhp 01120300.xhp 01120400.xhp 01120500.xhp 01130000.xhp 01130100.xhp 01130200.xhp 01150000.xhp 01170000.xhp 01170200.xhp 01170300.xhp 01170400.xhp 01170500.xhp
 
 ${MYCMD} --base helpcontent2/source/text/shared/explorer/database --files 02000000.xhp 02000002.xhp 02010100.xhp 02010101.xhp 04000000.xhp 04030000.xhp 05000000.xhp 05000001.xhp 05000002.xhp 05000003.xhp 05010000.xhp 05010100.xhp 05020000.xhp 05020100.xhp 05030000.xhp 05030100.xhp 05030200.xhp 05030300.xhp 05030400.xhp 05040000.xhp 05040100.xhp 05040200.xhp 11000002.xhp 11020000.xhp 11030000.xhp 11030100.xhp 11080000.xhp 11090000.xhp 11150200.xhp 11170000.xhp 11170100.xhp 30000000.xhp 30100000.xhp dabaadvprop.xhp dabaadvpropdat.xhp dabaadvpropgen.xhp dabadoc.xhp dabaprop.xhp dabapropadd.xhp dabapropcon.xhp dabapropgen.xhp dabawiz00.xhp dabawiz01.xhp dabawiz02.xhp dabawiz02access.xhp dabawiz02adabas.xhp dabawiz02ado.xhp dabawiz02dbase.xhp dabawiz02jdbc.xhp dabawiz02ldap.xhp dabawiz02mysql.xhp dabawiz02odbc.xhp dabawiz02oracle.xhp dabawiz02spreadsheet.xhp dabawiz02text.xhp dabawiz03auth.xhp main.xhp menubar.xhp menuedit.xhp menufile.xhp menufilesave.xhp menuinsert.xhp menutools.xhp me
 nuview.xhp migrate_macros.xhp password.xhp querywizard00.xhp querywizard01.xhp querywizard02.xhp querywizard03.xhp querywizard04.xhp querywizard05.xhp querywizard06.xhp querywizard07.xhp querywizard08.xhp rep_datetime.xhp rep_main.xhp rep_navigator.xhp rep_pagenumbers.xhp rep_prop.xhp rep_sort.xhp tablewizard00.xhp tablewizard01.xhp tablewizard02.xhp tablewizard03.xhp tablewizard04.xhp toolbars.xhp
 
diff --git a/wizards/com/sun/star/wizards/common/HelpIds.java b/wizards/com/sun/star/wizards/common/HelpIds.java
index c106b2e..f4ec24a 100644
--- a/wizards/com/sun/star/wizards/common/HelpIds.java
+++ b/wizards/com/sun/star/wizards/common/HelpIds.java
@@ -21,7 +21,7 @@ public class HelpIds
 {
     private static String array1[] = new String[]
     {
-        "HID:WIZARDS_HID0_WEBWIZARD",    // HID:34200
+        PropertyNames.EMPTY_STRING,
         "HID:WIZARDS_HID0_HELP",    // HID:34201
         "HID:WIZARDS_HID0_NEXT",    // HID:34202
         "HID:WIZARDS_HID0_PREV",    // HID:34203
@@ -266,7 +266,6 @@ public class HelpIds
         "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK1",    // HID:34442
         "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK2",    // HID:34443
         "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK2",    // HID:34444
-        "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK3",    // HID:34445
         "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK3",    // HID:34446
         "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK4",    // HID:34447
         "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK4",    // HID:34448
diff --git a/wizards/com/sun/star/wizards/common/HelpIds.py b/wizards/com/sun/star/wizards/common/HelpIds.py
index 67a5958..6e70a1a 100644
--- a/wizards/com/sun/star/wizards/common/HelpIds.py
+++ b/wizards/com/sun/star/wizards/common/HelpIds.py
@@ -17,7 +17,6 @@
 #
 class HelpIds:
     array1 = [
-    "HID:WIZARDS_HID0_WEBWIZARD", # HID:34200
     "HID:WIZARDS_HID0_HELP", # HID:34201
     "HID:WIZARDS_HID0_NEXT", # HID:34202
     "HID:WIZARDS_HID0_PREV", # HID:34203
@@ -262,7 +261,6 @@ class HelpIds:
     "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK1", # HID:34442
     "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK2", # HID:34443
     "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK2", # HID:34444
-    "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK3", # HID:34445
     "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK3", # HID:34446
     "HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK4", # HID:34447
     "HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK4", # HID:34448
diff --git a/wizards/source/formwizard/DlgFormDB.xdl b/wizards/source/formwizard/DlgFormDB.xdl
index 788f8e4..debb8bf 100644
--- a/wizards/source/formwizard/DlgFormDB.xdl
+++ b/wizards/source/formwizard/DlgFormDB.xdl
@@ -94,14 +94,6 @@
    </dlg:radio>
   </dlg:radiogroup>
   <dlg:fixedline dlg:id="hlnBinaries" dlg:tab-index="12" 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="31" dlg:left="156" dlg:top="154" dlg:width="81" dlg:height="10" dlg:page="2" dlg:tag="11" dlg:help-url="HID:WIZARDS_HID_DLGFORM_LINKER_LSTMASTERLINK2" dlg:value="optTiled" dlg:checked="true">
-    <script:event script:event-name="on-mouseup" script:macro-name="vnd.sun.star.script:WebWizard.Common.SetBackGraphicStyle?language=Basic&location=application" script:language="Script"/>
-   </dlg:radio>
-   <dlg:radio dlg:id="optArea" dlg:tab-index="32" dlg:left="156" dlg:top="168" dlg:width="81" dlg:height="10" dlg:page="2" dlg:tag="10" dlg:help-url="HID:WIZARDS_HID_DLGFORM_LINKER_LSTSLAVELINK3" dlg:value="optArea">
-    <script:event script:event-name="on-mouseup" script:macro-name="vnd.sun.star.script:WebWizard.Common.SetBackGraphicStyle?language=Basic&location=application" script:language="Script"/>
-   </dlg:radio>
-  </dlg:radiogroup>
   <dlg:fixedline dlg:id="hlnBackground" dlg:tab-index="30" 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="27" 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="21" dlg:left="6" dlg:top="83" dlg:width="137" dlg:height="8" dlg:page="2" dlg:value="hlnBorderLayout"/>
@@ -116,4 +108,4 @@
   </dlg:radiogroup>
   <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="0" dlg:left="6" dlg:top="180" dlg:width="258" dlg:height="6"/>
  </dlg:bulletinboard>
-</dlg:window>
\ No newline at end of file
+</dlg:window>
diff --git a/wizards/source/formwizard/FormWizard.xba b/wizards/source/formwizard/FormWizard.xba
index ffc2c42..aa2dc15b 100644
--- a/wizards/source/formwizard/FormWizard.xba
+++ b/wizards/source/formwizard/FormWizard.xba
@@ -22,7 +22,6 @@
 Public DocumentName as String
 Public FormPath as String
 Public WizardPath as String
-Public WebWizardPath as String
 Public WorkPath as String
 Public TempPath as String
 Public TexturePath as String
@@ -90,7 +89,6 @@ Dim SelList(0) as Integer
 Dim LocList() as String
 	SelList(0) = 0
 	BasicLibraries.LoadLibrary("Tools")
-	BasicLibraries.LoadLibrary("WebWizard")
 	bDebug = False
 	If Not bDebug Then
 		On Local Error GoTo WIZARDERROR
@@ -441,4 +439,4 @@ dim iSelPos as Integer
 		End If
 	End If
 End Sub
-</script:module>
\ No newline at end of file
+</script:module>
diff --git a/wizards/source/formwizard/dbwizres.src b/wizards/source/formwizard/dbwizres.src
index ad34d85..05e9a8f 100644
--- a/wizards/source/formwizard/dbwizres.src
+++ b/wizards/source/formwizard/dbwizres.src
@@ -38,11 +38,6 @@
 #define RID_FAXWIZARDSALUTATION_START		3290
 #define RID_FAXWIZARDROADMAP_START		3300
 
-// web wizard
-
-#define RID_WEBWIZARDDIALOG_START			4000
-#define RID_WEBWIZARDDIALOG_FTP			4200
-
 // agenda wizard
 
 #define RID_AGENDAWIZARDDIALOG_START              5000
@@ -2470,748 +2465,6 @@ String RID_FAXWIZARDROADMAP_START + 5
     Text [ en-US] = "Name and location";
 };
 
-// WEB WIZARD RESOURCES
-String RID_WEBWIZARDDIALOG_START +1
-{
-    Text [ en-US  ] = "Web Wizard";
-};
-
-String RID_WEBWIZARDDIALOG_START +2
-{
-    Text [ en-US  ] = "This Web Wizard is to aid you in publishing documents on the Internet.\n\nIt will convert the documents so that they can be viewed by a web browser. In addition, it will generate a Table of Contents page with links for easy access to the documents. The Web Wizard will also allow you to customize the design and layout of your web site.\n\nYou will be able to keep the documents you have published on the web up-to-date and add or remove documents at any time.";
-};
-
-String RID_WEBWIZARDDIALOG_START +4
-{
-    Text [ en-US  ] = "~Delete";
-};
-
-String RID_WEBWIZARDDIALOG_START +5
-{
-    Text [ en-US  ] = "Introduction";
-};
-
-String RID_WEBWIZARDDIALOG_START +6
-{
-    Text [ en-US  ] = "Select the documents you want to publish";
-};
-
-String RID_WEBWIZARDDIALOG_START +8
-{
-    Text [ en-US  ] = "Document information ";
-};
-
-String RID_WEBWIZARDDIALOG_START +9
-{
-    Text [ en-US  ] = "~Title:";
-};
-
-String RID_WEBWIZARDDIALOG_START +10
-{
-    Text [ en-US  ] = "~Summary: ";
-};
-
-String RID_WEBWIZARDDIALOG_START +11
-{
-    Text [ en-US  ] = "Au~thor:";
-};
-
-String RID_WEBWIZARDDIALOG_START +12
-{
-    Text [ en-US  ] = "~Export to file format:";
-};
-
-String RID_WEBWIZARDDIALOG_START +13
-{
-    Text [ en-US  ] = "Enter general information for your web site";
-};
-
-String RID_WEBWIZARDDIALOG_START +14
-{
-    Text [ en-US  ] = "Title:";
-};
-
-String RID_WEBWIZARDDIALOG_START +16
-{
-    Text [ en-US  ] = "Description:";
-};
-
-String RID_WEBWIZARDDIALOG_START +18
-{
-    Text [ en-US  ] = "Created:";
-};
-
-String RID_WEBWIZARDDIALOG_START +20
-{
-    Text [ en-US  ] = "E-mail:";
-};
-
-String RID_WEBWIZARDDIALOG_START +21
-{
-    Text [ en-US  ] = "Copyright notice:";
-};
-
-String RID_WEBWIZARDDIALOG_START +22
-{
-    Text [ en-US  ] = "Modified:";
-};
-
-String RID_WEBWIZARDDIALOG_START +24
-{
-    Text [ en-US  ] = "~Preview";
-};
-
-String RID_WEBWIZARDDIALOG_START +25
-{
-    Text [ en-US  ] = "Where do you want to publish your web site?";
-};
-
-String RID_WEBWIZARDDIALOG_START +26
-{
-    Text [ en-US  ] = "Publish the new web site:";
-};
-
-String RID_WEBWIZARDDIALOG_START +27
-{
-    Text [ en-US  ] = "To a ~local folder";
-};
-
-String RID_WEBWIZARDDIALOG_START +28
-{
-    Text [ en-US  ] = "...";
-};
-
-String RID_WEBWIZARDDIALOG_START +29
-{
-    Text [ en-US  ] = "To a ~web server via FTP";
-};
-
-String RID_WEBWIZARDDIALOG_START +31
-{
-    Text [ en-US  ] = "~Configure...";
-};
-
-String RID_WEBWIZARDDIALOG_START +32
-{
-    Text [ en-US  ] = "To a ZIP ~archive";
-};
-
-String RID_WEBWIZARDDIALOG_START +33
-{
-    Text [ en-US  ] = "...";
-};
-
-String RID_WEBWIZARDDIALOG_START +34
-{
-    Text [ en-US  ] = "~Save settings (recommended)";
-};
-
-String RID_WEBWIZARDDIALOG_START +35
-{
-    Text [ en-US  ] = "Save ~as:";
-};
-
-String RID_WEBWIZARDDIALOG_START +36
-{
-    Text [ en-US  ] = "~Choose settings for the Web Wizard";
-};
-
-String RID_WEBWIZARDDIALOG_START +37
-{
-    Text [ en-US  ] = "Web site content ";
-};
-
-String RID_WEBWIZARDDIALOG_START +38
-{
-    Text [ en-US  ] = "~Add...";
-};
-
-String RID_WEBWIZARDDIALOG_START +39
-{
-    Text [ en-US  ] = "Remo~ve";
-};
-
-String RID_WEBWIZARDDIALOG_START +40
-{
-    Text [ en-US  ] = "Choose a layout for the table of contents of your web site";
-};
-
-String RID_WEBWIZARDDIALOG_START +41
-{
-    Text [ en-US  ] = "Select a style for the table of contents page";
-};
-
-String RID_WEBWIZARDDIALOG_START +42
-{
-    Text [ en-US  ] = "~Style:";
-};
-
-String RID_WEBWIZARDDIALOG_START +48
-{
-    Text [ en-US  ] = "~Layouts: ";
-};
-
-String RID_WEBWIZARDDIALOG_START +50
-{
-    Text [ en-US  ] = "~Description";
-};
-
-String RID_WEBWIZARDDIALOG_START +51
-{
-    Text [ en-US  ] = "~Author";
-};
-
-String RID_WEBWIZARDDIALOG_START +52
-{
-    Text [ en-US  ] = "Cr~eation date";
-};
-
-String RID_WEBWIZARDDIALOG_START +53
-{
-    Text [ en-US  ] = "~Last change date";
-};
-
-String RID_WEBWIZARDDIALOG_START +54
-{
-    Text [ en-US  ] = "~File name";
-};
-
-String RID_WEBWIZARDDIALOG_START +55
-{
-    Text [ en-US  ] = "File forma~t";
-};
-
-String RID_WEBWIZARDDIALOG_START +56
-{
-    Text [ en-US  ] = "File format ~icon";
-};
-
-String RID_WEBWIZARDDIALOG_START +57
-{
-    Text [ en-US  ] = "Number ~of pages";
-};
-
-String RID_WEBWIZARDDIALOG_START +58
-{
-    Text [ en-US  ] = "~Size in KB";
-};
-
-String RID_WEBWIZARDDIALOG_START +59
-{
-    Text [ en-US  ] = "Click 'Preview' to see a preview in your browser:";
-};
-
-String RID_WEBWIZARDDIALOG_START +60
-{
-    Text [ en-US  ] = "Customize the selected layout";
-};
-
-String RID_WEBWIZARDDIALOG_START +61
-{
-    Text [ en-US  ] = "Include the following information for each document in the table of contents:";
-};
-
-String RID_WEBWIZARDDIALOG_START +62
-{
-    Text [ en-US  ] = "Optimize the layout for screen resolution:";
-};
-
-String RID_WEBWIZARDDIALOG_START +64
-{
-    Text [ en-US  ] = "~640x480";
-};
-
-String RID_WEBWIZARDDIALOG_START +65
-{
-    Text [ en-US  ] = "~800x600";
-};
-
-String RID_WEBWIZARDDIALOG_START +66
-{
-    Text [ en-US  ] = "~1024x768";
-};
-
-String RID_WEBWIZARDDIALOG_START +70
-{
-    Text [ en-US  ] = "Generating Your Web Site";
-};
-
-String RID_WEBWIZARDDIALOG_START +71
-{
-    Text [ en-US  ] = "%START - %END/%TOTAL";
-};
-
-String RID_WEBWIZARDDIALOG_START +72
-{
-    Text [ en-US  ] = "myWebsite";
-};
-
-String RID_WEBWIZARDDIALOG_START +73
-{
-    Text [ en-US  ] = "FTP target '%FILENAME' is a file.";
-};
-
-String RID_WEBWIZARDDIALOG_START +74
-{
-    Text [ en-US  ] = "The local target '%FILENAME' is a file.";
-};
-
-String RID_WEBWIZARDDIALOG_START +75
-{
-    Text [ en-US  ] = "The ZIP target '%FILENAME' already exists. Do you want to overwrite the existing target? ";
-};
-
-String RID_WEBWIZARDDIALOG_START +76
-{
-    Text [ en-US  ] = "The FTP target directory '%FILENAME' is not empty. Some files might be overwritten. Do you want to continue?";
-};
-
-String RID_WEBWIZARDDIALOG_START +77
-{
-    Text [ en-US  ] = "The local target directory '%FILENAME' is not empty. Some files might be overwritten. Do you want to continue?";
-};
-
-String RID_WEBWIZARDDIALOG_START +78
-{
-    Text [ en-US  ] = "Settings already exist under the given name. Do you want to overwrite the existing settings? ";
-};
-
-String RID_WEBWIZARDDIALOG_START +79
-{
-    Text [ en-US  ] = "Exporting documents...";
-};
-
-String RID_WEBWIZARDDIALOG_START +80
-{
-    Text [ en-US  ] = "Preparing export...";
-};
-
-String RID_WEBWIZARDDIALOG_START +81
-{
-    Text [ en-US  ] = "Copying layout files...";
-};
-
-String RID_WEBWIZARDDIALOG_START +82
-{
-    Text [ en-US  ] = "Preparing table of contents generation...";
-};
-
-String RID_WEBWIZARDDIALOG_START +83
-{
-    Text [ en-US  ] = "Generating table of contents...";
-};
-
-String RID_WEBWIZARDDIALOG_START +84
-{
-    Text [ en-US  ] = "Initializing...";
-};
-
-String RID_WEBWIZARDDIALOG_START +86
-{
-    Text [ en-US  ] = "Preparing to publish...";
-};
-
-String RID_WEBWIZARDDIALOG_START +87
-{
-    Text [ en-US  ] = "Publishing to local directory...";
-};
-
-String RID_WEBWIZARDDIALOG_START +88
-{
-    Text [ en-US  ] = "Publishing to FTP destination...";
-};
-
-String RID_WEBWIZARDDIALOG_START +89
-{
-    Text [ en-US  ] = "Publishing to a ZIP archive...";
-};
-
-String RID_WEBWIZARDDIALOG_START + 90
-{
-    Text [ en-US  ] = "Finishing...";
-};
-
-String RID_WEBWIZARDDIALOG_START + 94
-{
-    Text [ en-US  ] = "Graphic files";
-};
-
-String RID_WEBWIZARDDIALOG_START + 95
-{
-    Text [ en-US  ] = "All files";
-};
-
-String RID_WEBWIZARDDIALOG_START + 96
-{
-    Text [ en-US  ] = "~ZIP archive files";
-};
-
-String RID_WEBWIZARDDIALOG_START + 98
-{
-    Text [ en-US  ] = "Background images";
-};
-
-String RID_WEBWIZARDDIALOG_START + 99
-{
-    Text [ en-US  ] = "Choose a background image: ";
-};
-
-String RID_WEBWIZARDDIALOG_START + 100
-{
-    Text [ en-US  ] = "Icon sets";
-};
-
-String RID_WEBWIZARDDIALOG_START + 101
-{
-    Text [ en-US  ] = "Choose an icon set:";
-};
-
-String RID_WEBWIZARDDIALOG_START +102
-{
-    Text [ en-US  ] = "Other...";
-};
-
-String RID_WEBWIZARDDIALOG_START +103
-{
-    Text [ en-US  ] = "None";
-};
-
-String RID_WEBWIZARDDIALOG_START +104
-{
-    Text [ en-US  ] = "Your web site was created successfully into: %FILENAME";
-};
-
-String RID_WEBWIZARDDIALOG_START +105
-{
-    Text [ en-US  ] = "One or more errors occurred when generating the web site.";
-};
-
-String RID_WEBWIZARDDIALOG_START +106
-{
-    Text [ en-US  ] = "An error occurred while generating the table of contents page(s). ";
-};
-
-String RID_WEBWIZARDDIALOG_START +107
-{
-    Text [ en-US  ] = "An error occurred while copying the layout files. ";
-};
-
-String RID_WEBWIZARDDIALOG_START +108
-{
-    Text [ en-US  ] = "An error occurred while gathering document information for '%FILENAME'. ";
-};
-
-String RID_WEBWIZARDDIALOG_START +109
-{
-    Text [ en-US  ] = "An error occurred while exporting the document '%FILENAME'.";
-};
-
-String RID_WEBWIZARDDIALOG_START +110
-{
-    Text [ en-US  ] = "An error occurred while creating a directory for exporting '%FILENAME'.";
-};
-
-String RID_WEBWIZARDDIALOG_START +111
-{
-    Text [ en-US  ] = "A security error occurred while exporting the document '%FILENAME'.";
-};
-
-String RID_WEBWIZARDDIALOG_START +112
-{
-    Text [ en-US  ] = "An input/output error occurred while exporting the document '%FILENAME'.";
-};
-
-String RID_WEBWIZARDDIALOG_START +113
-{
-    Text [ en-US  ] = "An error occurred while copying media files to the temporary directory.";
-};
-
-String RID_WEBWIZARDDIALOG_START +114
-{
-    Text [ en-US  ] = "The web site could not be copied to the following destination: %URL";
-};
-
-String RID_WEBWIZARDDIALOG_START +115
-{
-    Text [ en-US  ] = "An unexpected error occurred: %ERROR";
-};
-
-String RID_WEBWIZARDDIALOG_START +116
-{
-    Text [ en-US  ] = "An unexpected error occurred while validating the file: '%FILENAME'";
-};
-
-String RID_WEBWIZARDDIALOG_START +117
-{
-    Text [ en-US  ] = "%FILENAME' is a folder.";
-};
-
-String RID_WEBWIZARDDIALOG_START +118
-{
-    Text [ en-US  ] = "Loading Web Wizard Settings...";
-};
-
-String RID_WEBWIZARDDIALOG_START +119
-{
-    Text [ en-US  ] = "An unexpected error occurred.";
-};
-
-String RID_WEBWIZARDDIALOG_START +120
-{
-    Text [ en-US  ] = "Validating documents...";
-};
-
-String RID_WEBWIZARDDIALOG_START +121
-{
-    Text [ en-US  ] = "My Archive";
-};
-
-String RID_WEBWIZARDDIALOG_START +122
-{
-    Text [ en-US  ] = "Introduction ";
-};
-
-String RID_WEBWIZARDDIALOG_START +123
-{
-    Text [ en-US  ] = "Documents ";
-};
-
-String RID_WEBWIZARDDIALOG_START +124
-{
-    Text [ en-US  ] = "Main layout";
-};
-
-String RID_WEBWIZARDDIALOG_START +125
-{
-    Text [ en-US  ] = "Layout details";
-};
-
-String RID_WEBWIZARDDIALOG_START +126
-{
-    Text [ en-US  ] = "Style";
-};
-
-String RID_WEBWIZARDDIALOG_START +127
-{
-    Text [ en-US  ] = "Web site information";
-};
-
-String RID_WEBWIZARDDIALOG_START +128
-{
-    Text [ en-US  ] = "Preview";
-};
-
-String RID_WEBWIZARDDIALOG_START +130
-{
-    Text [ en-US  ] = "The selected settings will be deleted.\n\nDo you really want to delete these settings? ";
-};
-
-String RID_WEBWIZARDDIALOG_START +131
-{
-    Text [ en-US  ] = "%NUMBER pages";
-};
-
-String RID_WEBWIZARDDIALOG_START +132
-{
-    Text [ en-US  ] = "%NUMBER slides";
-};
-
-String RID_WEBWIZARDDIALOG_START +133
-{
-    Text [ en-US  ] = "Created: %DATE";
-};
-
-String RID_WEBWIZARDDIALOG_START +134
-{
-    Text [ en-US  ] = "Last modified: %DATE";
-};
-
-String RID_WEBWIZARDDIALOG_START +135
-{
-    Text [ en-US  ] = "Web Wizard Settings";
-};
-
-String RID_WEBWIZARDDIALOG_START +136
-{
-    Text [ en-US  ] = "Background image:";
-};
-
-String RID_WEBWIZARDDIALOG_START +137
-{
-    Text [ en-US  ] = "Icon set:";
-};
-
-String RID_WEBWIZARDDIALOG_START +138
-{
-    Text [ en-US  ] = "The icon set is used for presentations in HTML format.";
-};
-
-String RID_WEBWIZARDDIALOG_START +139
-{
-    Text [ en-US  ] = "HTML Metadata";
-};
-
-String RID_WEBWIZARDDIALOG_START +140
-{
-    Text [ en-US  ] = "Choose...";
-};
-
-String RID_WEBWIZARDDIALOG_START +141
-{
-    Text [ en-US  ] = "Choose...";
-};
-
-String RID_WEBWIZARDDIALOG_START +142
-{
-    Text [ en-US  ] = "<default>";
-};
-
-String RID_WEBWIZARDDIALOG_START +143
-{
-    Text [ en-US  ] = "Publishing via FTP Proxy is not supported.";
-};
-
-String RID_WEBWIZARDDIALOG_START +144
-{
-    Text [ en-US  ] = "<no background image>";
-};
-
-String RID_WEBWIZARDDIALOG_START +145
-{
-    Text [ en-US  ] = "<no icon set>";
-};
-
-String RID_WEBWIZARDDIALOG_START +146
-{
-    Text [ en-US  ] = "The FTP directory '%FILENAME' could not be created.";
-};
-
-String RID_WEBWIZARDDIALOG_START +147
-{
-    Text [ en-US  ] = "The FTP directory '%FILENAME' does not exist. \nCreate the directory now?";
-};
-
-String RID_WEBWIZARDDIALOG_START +148
-{
-    Text [ en-US  ] = "The Zip file '%FILENAME' cannot be created: a directory of the same name already exists.";
-};
-
-String RID_WEBWIZARDDIALOG_START +149
-{
-    Text [ en-US  ] = "The local directory '%FILENAME' cannot be created. \nPlease check your write-access.";
-};
-
-String RID_WEBWIZARDDIALOG_START +150
-{
-    Text [ en-US  ] = "The local directory '%FILENAME' does not exist. \nCreate the directory now?";
-};
-
-String RID_WEBWIZARDDIALOG_START +151
-{
-    Text [ en-US  ] = "Size: %NUMBERKB";
-};
-
-String RID_WEBWIZARDDIALOG_START +152
-{
-    Text [ en-US  ] = "File not found. Would you like to specify a new file location?";
-};
-
-// WEB WIZARD FTP DIALOG RESOURCES
-String RID_WEBWIZARDDIALOG_FTP +0
-{
-    Text [ en-US  ] = "FTP Connection";
-};
-
-String RID_WEBWIZARDDIALOG_FTP +1
-{
-    Text [ en-US  ] = "~User name:";
-};
-
-String RID_WEBWIZARDDIALOG_FTP +2
-{
-    Text [ en-US  ] = "~Password:";
-};
-
-String RID_WEBWIZARDDIALOG_FTP +3
-{
-    Text [ en-US  ] = "Connect";
-};
-
-String RID_WEBWIZARDDIALOG_FTP +4
-{
-    Text [ en-US  ] = "1. Enter FTP connection information.";
-};
-
-String RID_WEBWIZARDDIALOG_FTP +5
-{
-    Text [ en-US  ] = "~Server name or IP address:";
-};
-
-String RID_WEBWIZARDDIALOG_FTP +6
-{
-    Text [ en-US  ] = "2. Connect to the server.";
-};
-
-String RID_WEBWIZARDDIALOG_FTP +7
-{
-    Text [ en-US  ] = "3. ~Choose a remote directory (optional).";
-};
-
-String RID_WEBWIZARDDIALOG_FTP +8
-{
-    Text [ en-US  ] = "...";
-};
-
-String RID_WEBWIZARDDIALOG_FTP +9
-{
-    Text [ en-US  ] = "Connection status is unknown";
-};
-
-String RID_WEBWIZARDDIALOG_FTP +10
-{
-    Text [ en-US  ] = "Connection was established successfully";
-};
-
-String RID_WEBWIZARDDIALOG_FTP +11
-{
-    Text [ en-US  ] = "Username or password is wrong";
-};
-
-String RID_WEBWIZARDDIALOG_FTP +12
-{
-    Text [ en-US  ] = "Could not resolve server name";
-};
-
-String RID_WEBWIZARDDIALOG_FTP +13
-{
-    Text [ en-US  ] = "You do not have sufficient user rights";
-};
-
-String RID_WEBWIZARDDIALOG_FTP +14
-{
-    Text [ en-US  ] = "Cannot connect to server";
-};
-
-String RID_WEBWIZARDDIALOG_FTP +15
-{
-    Text [ en-US  ] = "Unexpected error";
-};
-
-String RID_WEBWIZARDDIALOG_FTP +16
-{
-    Text [ en-US  ] = "FTP publishing directory";
-};
-
-String RID_WEBWIZARDDIALOG_FTP +17
-{
-    Text [ en-US  ] = "This is not an FTP folder";
-};
-
-String RID_WEBWIZARDDIALOG_FTP +18
-{
-    Text [ en-US  ] = "Connecting...";
-};
-
 // AGENDA WIZARD RESOURCES
 String RID_AGENDAWIZARDDIALOG_START +1
 {
diff --git a/wizards/source/formwizard/tools.xba b/wizards/source/formwizard/tools.xba
index d6f8ed4..a7cfa16 100644
--- a/wizards/source/formwizard/tools.xba
+++ b/wizards/source/formwizard/tools.xba
@@ -323,19 +323,16 @@ End Function
 Function GetFormWizardPaths() as Boolean
 	FormPath = GetOfficeSubPath("Template","../wizard/bitmap")
 	If FormPath <> "" Then
-		WebWizardPath = GetOfficeSubPath("Template","wizard/web")
-		If WebWizardPath <> "" Then
-			WizardPath = GetOfficeSubPath("Template","wizard/")
-			If Wizardpath <> "" Then
-				TexturePath = GetOfficeSubPath("Gallery", "www-back/")
-				If TexturePath <> "" Then
-					WorkPath = GetPathSettings("Work")
-					If WorkPath <> "" Then
-						TempPath = GetPathSettings("Temp")
-						If TempPath <> "" Then
-							GetFormWizardPaths = True
-							Exit Function
-						End If
+		WizardPath = GetOfficeSubPath("Template","wizard/")
+		If Wizardpath <> "" Then
+			TexturePath = GetOfficeSubPath("Gallery", "www-back/")
+			If TexturePath <> "" Then
+				WorkPath = GetPathSettings("Work")
+				If WorkPath <> "" Then
+					TempPath = GetPathSettings("Temp")
+					If TempPath <> "" Then
+						GetFormWizardPaths = True
+						Exit Function
 					End If
 				End If
 			End If


More information about the Libreoffice-commits mailing list