Merge branch 'master' into feature/gnumake4

Conflicts:
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
setup_native/prj/build.lst
setup_native/prj/d.lst
wizards/Jar_query.mk
wizards/Module_wizards.mk
wizards/Zip_launcher.mk
wizards/com/sun/star/wizards/report/makefile.mk
wizards/prj/build.lst
wizards/prj/d.lst
wizards/util/target.pmk

33 files changed, 34 insertions, 275 deletions

diff --git a/wizards/Jar_query.mk b/wizards/Jar_query.mk
index a915c40069af..2183238cadb3 100644
--- a/wizards/Jar_query.mk
+++ b/wizards/Jar_query.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Jar_add_jars,query,\
 	$(OUTDIR)/bin/java_uno.jar \
 	$(OUTDIR)/bin/commonwizards.jar \
 ))
-
 $(eval $(call gb_Jar_set_manifest,query,$(SRCDIR)/wizards/com/sun/star/wizards/query/MANIFEST.MF))
 
 $(eval $(call gb_Jar_set_packageroot,query,com))
diff --git a/wizards/Zip_launcher.mk b/wizards/Zip_launcher.mk
index 20efead75f84..091b4a45e81f 100644
--- a/wizards/Zip_launcher.mk
+++ b/wizards/Zip_launcher.mk
@@ -24,13 +24,10 @@
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-
 $(eval $(call gb_Zip_Zip,basicsrvlauncher,$(SRCDIR)/wizards/source/launcher))
-
 $(eval $(call gb_Zip_add_files,basicsrvlauncher,\
 	dialog.xlb \
 	DicOOo.xba \
 	script.xlb \
 ))
-
 # vim: set noet sw=4 ts=4:
diff --git a/wizards/com/sun/star/wizards/agenda/makefile.mk b/wizards/com/sun/star/wizards/agenda/makefile.mk
index 1f07e9adfbcc..9b89c720038b 100644
--- a/wizards/com/sun/star/wizards/agenda/makefile.mk
+++ b/wizards/com/sun/star/wizards/agenda/makefile.mk
@@ -33,7 +33,6 @@ PACKAGE = com$/sun$/star$/wizards$/agenda
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 JARFILES= unoil.jar \
     jurt.jar \
diff --git a/wizards/com/sun/star/wizards/common/UCB.java b/wizards/com/sun/star/wizards/common/UCB.java
index 5d032639d5e3..5d8ddb4385e3 100644
--- a/wizards/com/sun/star/wizards/common/UCB.java
+++ b/wizards/com/sun/star/wizards/common/UCB.java
@@ -26,12 +26,6 @@
  *
  ************************************************************************/
 
-/*
- * Created on 31.10.2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
 package com.sun.star.wizards.common;
 
 import java.util.List;
diff --git a/wizards/com/sun/star/wizards/document/TimeStampControl.java b/wizards/com/sun/star/wizards/document/TimeStampControl.java
index 7c951921bde6..3f0e3609e654 100644
--- a/wizards/com/sun/star/wizards/document/TimeStampControl.java
+++ b/wizards/com/sun/star/wizards/document/TimeStampControl.java
@@ -149,14 +149,12 @@ public class TimeStampControl extends DatabaseControl
     {
         // --> TESTING
         Point aBeforePt = xShapeGroup.getPosition();
-        // <--
         xShapeGroup.setPosition(_aPoint);
 //      oDateControl.xShape.setPosition(_aPoint);
 //      Point atimepoint = new Point(oDateControl.xShape.getPosition().X + oDateControl.xShape.getSize().Width, oDateControl.xShape.getPosition().Y );
 //      oTimeControl.xShape.setPosition(atimepoint);
         // --> TESTING
         Point aAfterPt = xShapeGroup.getPosition();
-    // <--
     }
 
     public int getControlType()
diff --git a/wizards/com/sun/star/wizards/fax/makefile.mk b/wizards/com/sun/star/wizards/fax/makefile.mk
index 5cf08939263b..4ef462041f75 100644
--- a/wizards/com/sun/star/wizards/fax/makefile.mk
+++ b/wizards/com/sun/star/wizards/fax/makefile.mk
@@ -33,7 +33,6 @@ PACKAGE = com$/sun$/star$/wizards$/fax
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar java_uno_accessbridge commonwizards.jar
 
diff --git a/wizards/com/sun/star/wizards/form/makefile.mk b/wizards/com/sun/star/wizards/form/makefile.mk
index b6366607324e..abd66032dda2 100644
--- a/wizards/com/sun/star/wizards/form/makefile.mk
+++ b/wizards/com/sun/star/wizards/form/makefile.mk
@@ -33,7 +33,6 @@ PACKAGE = com$/sun$/star$/wizards$/form
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar
 CUSTOMMANIFESTFILE= MANIFEST.MF
@@ -43,10 +42,6 @@ JARTARGET		= $(TARGET).jar
 JARCLASSPATH = commonwizards.jar
 
 # --- Files --------------------------------------------------------
-#SRS2NAME =              dbwizres
-#SRC2FILES=		dbwizres.src
-#RESLIB2SRSFILES= $(SRS)$/dbwizres.srs
-#RESLIB2NAME=	dbw
 
 JAVAFILES=	\
         CallFormWizard.java 	\
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.java
index b94ac6f0c0ac..b94ac6f0c0ac 100755..100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.java
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.java
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
index a7198b6ba955..ed3161c7282d 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
@@ -1115,14 +1115,6 @@ public class LetterWizardDialogImpl extends LetterWizardDialog
         {
             PropertyNames.EMPTY_STRING, PropertyNames.EMPTY_STRING
         };
-        String[] nameList1 =
-        {
-            PropertyNames.EMPTY_STRING, PropertyNames.EMPTY_STRING
-        };
-        String[] nameList1b =
-        {
-            PropertyNames.EMPTY_STRING, PropertyNames.EMPTY_STRING
-        };
         String[] nameList2 =
         {
             PropertyNames.EMPTY_STRING, PropertyNames.EMPTY_STRING
@@ -1145,47 +1137,13 @@ public class LetterWizardDialogImpl extends LetterWizardDialog
             sMainPath = FileAccess.deleteLastSlashfromUrl(sMainPath);
 
             sLetterPath = sMainPath + sLetterSubPath;
-            //sLetterLangPackPath = FileAccess.combinePaths(xMSF, sTemplatePath, sLetterSubPath);
 
             XInterface xInterface = (XInterface) xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess");
             com.sun.star.ucb.XSimpleFileAccess xSimpleFileAccess = UnoRuntime.queryInterface(com.sun.star.ucb.XSimpleFileAccess.class, xInterface);
-            nameList1 = xSimpleFileAccess.getFolderContents(sMainPath, true);
             nameList2 = xSimpleFileAccess.getFolderContents(sLetterPath, true);
-            for (int i = 0; i < nameList1.length; i++)
-            {
-                String theFileName = FileAccess.getFilename(nameList1[i]);
-                if (!theFileName.equalsIgnoreCase("wizard"))
-                {
-                    sLocLetterPath = FileAccess.deleteLastSlashfromUrl(nameList1[i] + sLetterSubPath);
-                    try
-                    {
-                        nameList1b = xSimpleFileAccess.getFolderContents(sLocLetterPath, true);
-                        for (int j = 0; j < nameList1b.length; j++)
-                        {
-                            String theFileNameb = FileAccess.getFilename(nameList1b[j]);
-                            allPaths.add(nameList1[i] + sLetterSubPath + theFileNameb);
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        //if the path is invalid an exception is thrown - try the fallback below then
-                    }
-                }
-            }
             for (int i = 0; i < nameList2.length; i++)
             {
-                boolean found = false;
-                for (int t = 0; t < nameList1.length; t++)
-                {
-                    if (FileAccess.getFilename(nameList2[i]).equalsIgnoreCase(FileAccess.getFilename(nameList1[t])))
-                    {
-                        found = true;
-                    }
-                }
-                if (!found)
-                {
-                    allPaths.add(nameList2[i]);
-                }
+                allPaths.add(nameList2[i]);
             }
             nameList = allPaths.toArray();
 
@@ -1247,12 +1205,6 @@ public class LetterWizardDialogImpl extends LetterWizardDialog
                 NormsVector.add(cIsoCode);
                 NormsPathVector.add(nameList[i]);
                 LanguageLabelsVector.add(lc.getLanguageString(MSID));
-            /*
-            Norms[z] = cIsoCode;
-            NormPaths[z] = (String) nameList[i];
-            LanguageLabels[z] = lc.getLanguageString(MSID);
-            z++;
-             **/
             }
         }
 
@@ -1266,10 +1218,6 @@ public class LetterWizardDialogImpl extends LetterWizardDialog
         LanguageLabels = new String[LanguageLabelsVector.size()];
         LanguageLabelsVector.toArray(LanguageLabels);
 
-        //Norms = new String[nameList.length];
-        //NormPaths = new String[nameList.length];
-        //LanguageLabels = new String[Norms.length];
-
         setControlProperty("lstLetterNorm", PropertyNames.STRING_ITEM_LIST, LanguageLabels);
     }
 
diff --git a/wizards/com/sun/star/wizards/letter/LocaleCodes.java b/wizards/com/sun/star/wizards/letter/LocaleCodes.java
index 82994f40dc6b..e9849812d01a 100644
--- a/wizards/com/sun/star/wizards/letter/LocaleCodes.java
+++ b/wizards/com/sun/star/wizards/letter/LocaleCodes.java
@@ -41,7 +41,7 @@ public class LocaleCodes extends Resource
     public LocaleCodes(XMultiServiceFactory xmsf)
     {
         super(xmsf, UNIT_NAME, MODULE_NAME);
-        allLanguageStrings = getStringList(16635);  // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
+        allLanguageStrings = getStringList(16633);  // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
     }
 
     public String getLanguageString(String MSID)
@@ -158,7 +158,7 @@ public class LocaleCodes extends Resource
         Ids[94] = "Slovenian;sl;1060";
         Ids[95] = "Slovak;sk;1051";
         Ids[96] = "Sorbian;sb;1070";
-        Ids[97] = "Spanish - Spain;es-es;1034";
+        Ids[97] = "Spanish - Spain;es-es;3082";
         Ids[98] = "Spanish - Argentina;es-ar;11274";
         Ids[99] = "Spanish - Bolivia;es-bo;16394";
         Ids[100] = "Spanish - Chile;es-cl;13322";
diff --git a/wizards/com/sun/star/wizards/letter/makefile.mk b/wizards/com/sun/star/wizards/letter/makefile.mk
index ca6c750bac81..25d388346017 100644
--- a/wizards/com/sun/star/wizards/letter/makefile.mk
+++ b/wizards/com/sun/star/wizards/letter/makefile.mk
@@ -33,7 +33,6 @@ PACKAGE = com$/sun$/star$/wizards$/letter
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar java_uno_accessbridge commonwizards.jar
 
diff --git a/wizards/com/sun/star/wizards/makefile.mk b/wizards/com/sun/star/wizards/makefile.mk
index b3fb389bb551..c44b369d4ffa 100644
--- a/wizards/com/sun/star/wizards/makefile.mk
+++ b/wizards/com/sun/star/wizards/makefile.mk
@@ -32,7 +32,6 @@ PACKAGE = com$/sun$/star$/wizards
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge 
 
@@ -143,9 +142,6 @@ JAVAFILES=							\
     text$/TextTableHandler.java				\
     text$/ViewHandler.java
 
-
-#JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:s/.java/.class/))
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
diff --git a/wizards/com/sun/star/wizards/query/makefile.mk b/wizards/com/sun/star/wizards/query/makefile.mk
index 080076668ce8..7a844f475808 100644
--- a/wizards/com/sun/star/wizards/query/makefile.mk
+++ b/wizards/com/sun/star/wizards/query/makefile.mk
@@ -33,7 +33,6 @@ PACKAGE = com$/sun$/star$/wizards$/query
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar commonwizards.jar
 CUSTOMMANIFESTFILE= MANIFEST.MF
@@ -43,10 +42,6 @@ JARTARGET		= $(TARGET).jar
 JARCLASSPATH = commonwizards.jar
 
 # --- Files --------------------------------------------------------
-#SRS2NAME =              dbwizres
-#SRC2FILES=		dbwizres.src
-#RESLIB2SRSFILES= $(SRS)$/dbwizres.srs
-#RESLIB2NAME=	dbw
 
 JAVAFILES=	\
         CallQueryWizard.java \
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/makefile.mk b/wizards/com/sun/star/wizards/reportbuilder/layout/makefile.mk
index 1af9e7c53862..3781f4246acd 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/makefile.mk
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/makefile.mk
@@ -33,19 +33,13 @@ PACKAGE = com$/sun$/star$/wizards$/reportbuilder$/layout
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar report.jar
 
-# CUSTOMMANIFESTFILE= MANIFEST.MF
-
 JARCLASSDIRS	= \
     com$/sun$/star$/wizards$/reportbuilder$/layout \
     com$/sun$/star$/wizards$/report
 
-# JARTARGET	= $(TARGET).jar
-# JARCLASSPATH = commonwizards.jar report.jar
-
 # --- Files --------------------------------------------------------
 
 JAVAFILES=                     \
diff --git a/wizards/com/sun/star/wizards/table/makefile.mk b/wizards/com/sun/star/wizards/table/makefile.mk
index 4343af99d45d..fd2b09ea780a 100644
--- a/wizards/com/sun/star/wizards/table/makefile.mk
+++ b/wizards/com/sun/star/wizards/table/makefile.mk
@@ -32,7 +32,6 @@ PACKAGE = com$/sun$/star$/wizards$/table
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar
 CUSTOMMANIFESTFILE= MANIFEST.MF
@@ -42,10 +41,6 @@ JARTARGET		= $(TARGET).jar
 JARCLASSPATH = commonwizards.jar
 
 # --- Files --------------------------------------------------------
-#SRS2NAME =              dbwizres
-#SRC2FILES=		dbwizres.src
-#RESLIB2SRSFILES= $(SRS)$/dbwizres.srs
-#RESLIB2NAME=	dbw
 
 JAVAFILES=	\
         CallTableWizard.java 	\
diff --git a/wizards/com/sun/star/wizards/ui/UIConsts.java b/wizards/com/sun/star/wizards/ui/UIConsts.java
index 0d5915481943..9b1c547dbd9e 100644
--- a/wizards/com/sun/star/wizards/ui/UIConsts.java
+++ b/wizards/com/sun/star/wizards/ui/UIConsts.java
@@ -1,9 +1,4 @@
-/*
- * Created on 14.11.2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+
 package com.sun.star.wizards.ui;
 
 /**
diff --git a/wizards/com/sun/star/wizards/web/LogTaskListener.java b/wizards/com/sun/star/wizards/web/LogTaskListener.java
index 8666aaf9738e..b98ac5261e7a 100644
--- a/wizards/com/sun/star/wizards/web/LogTaskListener.java
+++ b/wizards/com/sun/star/wizards/web/LogTaskListener.java
@@ -25,12 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-/*
- * Created on 04.11.2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+
 package com.sun.star.wizards.web;
 
 import com.sun.star.wizards.common.PropertyNames;
diff --git a/wizards/com/sun/star/wizards/web/data/makefile.mk b/wizards/com/sun/star/wizards/web/data/makefile.mk
index 1bfc02cf8351..17a78f063246 100644
--- a/wizards/com/sun/star/wizards/web/data/makefile.mk
+++ b/wizards/com/sun/star/wizards/web/data/makefile.mk
@@ -34,7 +34,6 @@ PACKAGE = com$/sun$/star$/wizards$/web$/data
 
 .INCLUDE : settings.mk
 
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar 
 
 .IF "$(SYSTEM_SAXON)" == "YES"
@@ -43,9 +42,6 @@ EXTRAJARFILES = $(SAXON_JAR)
 JARFILES += saxon9.jar
 .ENDIF
 
-#JARCLASSDIRS	= com$/sun$/star$/wizards$/web
-#JARTARGET		= $(TARGET).jar
-
 # --- Files --------------------------------------------------------
 
 JAVAFILES=			\
diff --git a/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java b/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java
index de13a8c31bbe..fcc2d21f57d8 100644
--- a/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java
+++ b/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java
@@ -26,12 +26,6 @@
  *
  ************************************************************************/
 
-/*
- * Created on 31.10.2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
 package com.sun.star.wizards.web.export;
 
 import java.util.Iterator;
diff --git a/wizards/com/sun/star/wizards/web/export/CopyExporter.java b/wizards/com/sun/star/wizards/web/export/CopyExporter.java
index f620e3b106d3..c2d5501d91d0 100644
--- a/wizards/com/sun/star/wizards/web/export/CopyExporter.java
+++ b/wizards/com/sun/star/wizards/web/export/CopyExporter.java
@@ -25,12 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-/*
- * Created on 17.10.2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+
 package com.sun.star.wizards.web.export;
 
 import com.sun.star.lang.XMultiServiceFactory;
diff --git a/wizards/com/sun/star/wizards/web/export/makefile.mk b/wizards/com/sun/star/wizards/web/export/makefile.mk
index 46cd65044e81..c898fdfce964 100644
--- a/wizards/com/sun/star/wizards/web/export/makefile.mk
+++ b/wizards/com/sun/star/wizards/web/export/makefile.mk
@@ -34,7 +34,6 @@ PACKAGE = com$/sun$/star$/wizards$/web$/export
 
 .INCLUDE : settings.mk
 
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar java_uno_accessbridge commonwizards.jar 
 
 .IF "$(SYSTEM_SAXON)" == "YES"
@@ -43,9 +42,6 @@ EXTRAJARFILES = $(SAXON_JAR)
 JARFILES += saxon9.jar
 .ENDIF
 
-#JARCLASSDIRS	= com$/sun$/star$/wizards$/web
-#JARTARGET		= $(TARGET).jar
-
 # --- Files --------------------------------------------------------
 
 JAVAFILES=			\
diff --git a/wizards/com/sun/star/wizards/web/makefile.mk b/wizards/com/sun/star/wizards/web/makefile.mk
index 2e0394d2971c..e1be1497fe0f 100644
--- a/wizards/com/sun/star/wizards/web/makefile.mk
+++ b/wizards/com/sun/star/wizards/web/makefile.mk
@@ -33,7 +33,7 @@ PACKAGE = com$/sun$/star$/wizards$/web
 # --- Settings -----------------------------------------------------
 
 .INCLUDE : settings.mk
-#.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar 
 
 .IF "$(SYSTEM_SAXON)" == "YES"
diff --git a/wizards/com/sun/star/wizards/web/status/ErrorLog.java b/wizards/com/sun/star/wizards/web/status/ErrorLog.java
index d039fa5c64a3..a0448858c259 100644
--- a/wizards/com/sun/star/wizards/web/status/ErrorLog.java
+++ b/wizards/com/sun/star/wizards/web/status/ErrorLog.java
@@ -25,12 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-/*
- * Created on 04.11.2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+
 package com.sun.star.wizards.web.status;
 
 import java.util.List;
diff --git a/wizards/com/sun/star/wizards/web/status/ErrorReporter.java b/wizards/com/sun/star/wizards/web/status/ErrorReporter.java
index 4d967e24f3df..8f5eff93113c 100644
--- a/wizards/com/sun/star/wizards/web/status/ErrorReporter.java
+++ b/wizards/com/sun/star/wizards/web/status/ErrorReporter.java
@@ -25,12 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-/*
- * Created on 14.10.2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+
 package com.sun.star.wizards.web.status;
 
 /**
diff --git a/wizards/com/sun/star/wizards/web/status/LogTaskListener.java b/wizards/com/sun/star/wizards/web/status/LogTaskListener.java
index d4109da3406f..00ef6b2af3b4 100644
--- a/wizards/com/sun/star/wizards/web/status/LogTaskListener.java
+++ b/wizards/com/sun/star/wizards/web/status/LogTaskListener.java
@@ -25,12 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-/*
- * Created on 04.11.2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+
 package com.sun.star.wizards.web.status;
 
 import java.io.PrintStream;
diff --git a/wizards/com/sun/star/wizards/web/status/Task.java b/wizards/com/sun/star/wizards/web/status/Task.java
index 0fb0bf494286..ca01f9562889 100644
--- a/wizards/com/sun/star/wizards/web/status/Task.java
+++ b/wizards/com/sun/star/wizards/web/status/Task.java
@@ -25,12 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-/*
- * Created on 17.10.2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+
 package com.sun.star.wizards.web.status;
 
 import java.util.List;
diff --git a/wizards/com/sun/star/wizards/web/status/TaskEvent.java b/wizards/com/sun/star/wizards/web/status/TaskEvent.java
index dd1d06c1938a..1f86e6aa18f0 100644
--- a/wizards/com/sun/star/wizards/web/status/TaskEvent.java
+++ b/wizards/com/sun/star/wizards/web/status/TaskEvent.java
@@ -25,12 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-/*
- * Created on 04.11.2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+
 package com.sun.star.wizards.web.status;
 
 import java.util.EventObject;
diff --git a/wizards/com/sun/star/wizards/web/status/TaskListener.java b/wizards/com/sun/star/wizards/web/status/TaskListener.java
index 63745bf83a62..25d89e9d111b 100644
--- a/wizards/com/sun/star/wizards/web/status/TaskListener.java
+++ b/wizards/com/sun/star/wizards/web/status/TaskListener.java
@@ -25,12 +25,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-/*
- * Created on 04.11.2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
+
 package com.sun.star.wizards.web.status;
 
 import java.util.EventListener;
diff --git a/wizards/prj/build.lst b/wizards/prj/build.lst
index e4037a0021dd..2c2a8456d44b 100644
--- a/wizards/prj/build.lst
+++ b/wizards/prj/build.lst
@@ -1,2 +1,2 @@
-wz      wizards     :    L10N:l10n rsc javaunohelper unoil LIBXSLT:libxslt NULL
+wz      wizards     :    TRANSLATIONS:translations rsc javaunohelper unoil LIBXSLT:libxslt NULL
 wz      wizards\prj                                             nmake           -       all     wz_prj NULL
diff --git a/wizards/source/euro/AutoPilotRun.xba b/wizards/source/euro/AutoPilotRun.xba
index 6c5adb9ea64a..e1f2fe076953 100644
--- a/wizards/source/euro/AutoPilotRun.xba
+++ b/wizards/source/euro/AutoPilotRun.xba
@@ -11,7 +11,7 @@ Public Source as String
 Public SubstFile as String
 Public SubstDir as String
 Public NoArgs()
-Public FilterList(9) as String
+Public TypeList(14) as String
 Public GoOn as Boolean
 Public DoUnprotect as Integer
 Public Password as String
@@ -55,20 +55,25 @@ Dim bDisposable as Boolean
 		Else
 			SourceDir = Source
 			TargetStemDir = TargetDir
-			FilterList(0) = &quot;application/x-starcalc&quot;
-			FilterList(1) = &quot;application/vnd.stardivision.calc&quot;
-			FilterList(2) = &quot;application/vnd.sun.xml.calc&quot;
-			FilterList(3) = &quot;application/vnd.oasis.opendocument.spreadsheet&quot;
+			TypeList(0) = &quot;calc8&quot;
+			TypeList(1) = &quot;calc_StarOffice_XML_Calc&quot;
+			TypeList(2) = &quot;calc_StarCalc_30&quot;
+			TypeList(3) = &quot;calc_StarCalc_40&quot;
+			TypeList(4) = &quot;calc_StarCalc_50&quot;
 			If DialogModel.chkTextDocuments.State = 1 Then
-				ReDim Preserve FilterList(8) as String
-				
-				FilterList(4) = &quot;application/x-starwriter&quot;
-				FilterList(5) = &quot;application/vnd.stardivision.writer&quot;
-				FilterList(6) = &quot;application/vnd.stardivision.writer/web&quot;
-				FilterList(7) = &quot;application/vnd.sun.xml.writer&quot;
-				FilterList(8) = &quot;application/vnd.oasis.opendocument.text&quot;
+				ReDim Preserve TypeList(13) as String
+
+				TypeList(5) = &quot;writer8&quot;
+				TypeList(6) = &quot;writerglobal8&quot;
+				TypeList(7) = &quot;writer_StarOffice_XML_Writer&quot;
+				TypeList(8) = &quot;writer_globaldocument_StarOffice_XML_Writer_GlobalDocument&quot;
+				TypeList(9) = &quot;writer_StarWriter_30&quot;
+				TypeList(10) = &quot;writer_StarWriter_40&quot;
+				TypeList(11) = &quot;writer_globaldocument_StarWriter_40GlobalDocument&quot;
+				TypeList(12) = &quot;writer_StarWriter_50&quot;
+				TypeList(13) = &quot;writer_globaldocument_StarWriter_50GlobalDocument&quot;
 			End If
-			FilesList() = ReadDirectories(SourceDir, bRecursive, True, False, FilterList())
+			FilesList() = ReadDirectories(SourceDir, bRecursive, True, False, TypeList())
 			TotDocCount = Ubound(FilesList(),1) + 1
 		End If
 		InitializeProgressPage(DialogModel)
diff --git a/wizards/source/formwizard/Language.xba b/wizards/source/formwizard/Language.xba
index 5a2dcb1c67fe..2f2b7e3ec11f 100644
--- a/wizards/source/formwizard/Language.xba
+++ b/wizards/source/formwizard/Language.xba
@@ -112,8 +112,8 @@ Dim slblFields as String
 		.optAlign2.Label = GetResText(RID_FORM + 34)
 		.optAlign0.State = 1
 		
+                //FIXME: Remove this unused FNameAddOn through the file
 		FNameAddOn = &quot;&quot;
-		If isHighContrast(DlgFormDB.getPeer) Then FNameAddOn = &quot;_hc&quot;
 
 		IDArray = Array(36, 37, 40, 38, 39)
 		For i = 1 To 5
diff --git a/wizards/source/imagelists/imagelists.src b/wizards/source/imagelists/imagelists.src
index 830c365ca4e4..aaab54be232c 100644
--- a/wizards/source/imagelists/imagelists.src
+++ b/wizards/source/imagelists/imagelists.src
@@ -34,182 +34,86 @@ Image IMG_REPORT_ORIENTATION_PORTRAIT
     ImageBitmap = Bitmap { File = "portrait_32.png"; };
 };
 
-#define IMG_REPORT_ORIENTATION_PORTRAIT_HC      REPORTWIZARD_BASE + 1
-Image IMG_REPORT_ORIENTATION_PORTRAIT_HC
-{
-    ImageBitmap = Bitmap { File = "portrait_32_h.png"; };
-};
-
 #define IMG_REPORT_ORIENTATION_LANDSCAPE        REPORTWIZARD_BASE + 2
 Image IMG_REPORT_ORIENTATION_LANDSCAPE
 {
     ImageBitmap = Bitmap { File = "landscape_32.png"; };
 };
 
-#define IMG_REPORT_ORIENTATION_LANDSCAPE_HC     REPORTWIZARD_BASE + 3
-Image IMG_REPORT_ORIENTATION_LANDSCAPE_HC
-{
-    ImageBitmap = Bitmap { File = "landscape_32_h.png"; };
-};
-
 #define IMG_FORM_ARRANGELISTSIDE                FORMWIZARD_BASE + 0
 Image IMG_FORM_ARRANGELISTSIDE
 {
     ImageBitmap = Bitmap { File = "formarrangelistside_42.png"; };
 };
 
-#define IMG_FORM_ARRANGELISTSIDE_HC             FORMWIZARD_BASE + 1
-Image IMG_FORM_ARRANGELISTSIDE_HC
-{
-    ImageBitmap = Bitmap { File = "formarrangelistside_42_h.png"; };
-};
-
 #define IMG_FORM_ARRANGELISTTOP                 FORMWIZARD_BASE + 2
 Image IMG_FORM_ARRANGELISTTOP
 {
     ImageBitmap = Bitmap { File = "formarrangelisttop_42.png"; };
 };
 
-#define IMG_FORM_ARRANGELISTTOP_HC              FORMWIZARD_BASE + 3
-Image IMG_FORM_ARRANGELISTTOP_HC
-{
-    ImageBitmap = Bitmap { File = "formarrangelisttop_42_h.png"; };
-};
-
 #define IMG_FORM_ARRANGETABLE                   FORMWIZARD_BASE + 4
 Image IMG_FORM_ARRANGETABLE
 {
     ImageBitmap = Bitmap { File = "formarrangetable_42.png"; };
 };
 
-#define IMG_FORM_ARRANGETABLE_HC                    FORMWIZARD_BASE + 5
-Image IMG_FORM_ARRANGETABLE_HC
-{
-    ImageBitmap = Bitmap { File = "formarrangetable_42_h.png"; };
-};
-
-
 #define IMG_FORM_ARRANGEFREE                    FORMWIZARD_BASE + 6
 Image IMG_FORM_ARRANGEFREE
 {
     ImageBitmap = Bitmap { File = "formarrangefree_42.png"; };
 };
 
-#define IMG_FORM_ARRANGEFREE_HC                 FORMWIZARD_BASE + 7
-Image IMG_FORM_ARRANGEFREE_HC
-{
-    ImageBitmap = Bitmap { File = "formarrangefree_42_h.png"; };
-};
-
-
 #define IMG_WEB_LAYOUT_TABLE3                       WEBWIZARD_BASE + 0
 Image IMG_WEB_LAYOUT_TABLE3
 {
     ImageBitmap = Bitmap { File = "table_3.png"; };
 };
 
-#define IMG_WEB_LAYOUT_TABLE3_HC                        WEBWIZARD_BASE + 1
-Image IMG_WEB_LAYOUT_TABLE3_HC
-{
-    ImageBitmap = Bitmap { File = "table_3_h.png"; };
-};
-
-
 #define IMG_WEB_LAYOUT_TABLE2                       WEBWIZARD_BASE + 2
 Image IMG_WEB_LAYOUT_TABLE2
 {
     ImageBitmap = Bitmap { File = "table_2.png"; };
 };
 
-
-#define IMG_WEB_LAYOUT_TABLE2_HC                    WEBWIZARD_BASE + 3
-Image IMG_WEB_LAYOUT_TABLE2_HC
-{
-    ImageBitmap = Bitmap { File = "table_2_h.png"; };
-};
-
-
 #define IMG_WEB_LAYOUT_SIMPLE                       WEBWIZARD_BASE + 4
 Image IMG_WEB_LAYOUT_SIMPLE
 {
     ImageBitmap = Bitmap { File = "simple.png"; };
 };
 
-#define IMG_WEB_LAYOUT_SIMPLE_HC                    WEBWIZARD_BASE + 5
-Image IMG_WEB_LAYOUT_SIMPLE_HC
-{
-    ImageBitmap = Bitmap { File = "simple_h.png"; };
-};
-
 #define IMG_WEB_LAYOUT_DIAGONAL                     WEBWIZARD_BASE + 6
 Image IMG_WEB_LAYOUT_DIAGONAL
 {
     ImageBitmap = Bitmap { File = "diagonal.png"; };
 };
 
-#define IMG_WEB_LAYOUT_DIAGONAL_HC                  WEBWIZARD_BASE + 7
-Image IMG_WEB_LAYOUT_DIAGONAL_HC
-{
-    ImageBitmap = Bitmap { File = "diagonal_h.png"; };
-};
-
 #define IMG_WEB_LAYOUT_ZIGZAG                       WEBWIZARD_BASE + 8
 Image IMG_WEB_LAYOUT_ZIGZAG
 {
     ImageBitmap = Bitmap { File = "zigzag.png"; };
 };
 
-#define IMG_WEB_LAYOUT_ZIGZAG_HC                        WEBWIZARD_BASE + 9
-Image IMG_WEB_LAYOUT_ZIGZAG_HC
-{
-    ImageBitmap = Bitmap { File = "zigzag_h.png"; };
-};
-
 #define IMG_WEB_LAYOUT_FRAMELEFT                        WEBWIZARD_BASE + 10
 Image IMG_WEB_LAYOUT_FRAMELEFT
 {
     ImageBitmap = Bitmap { File = "frame_left.png"; };
 };
 
-#define IMG_WEB_LAYOUT_FRAMELEFT_HC                     WEBWIZARD_BASE + 11
-Image IMG_WEB_LAYOUT_FRAMELEFT_HC
-{
-    ImageBitmap = Bitmap { File = "frame_left_h.png"; };
-};
-
 #define IMG_WEB_LAYOUT_FRAMERIGHT                       WEBWIZARD_BASE + 12
 Image IMG_WEB_LAYOUT_FRAMERIGHT
 {
     ImageBitmap = Bitmap { File = "frame_right.png"; };
 };
 
-#define IMG_WEB_LAYOUT_FRAMERIGHT_HC                        WEBWIZARD_BASE + 13
-Image IMG_WEB_LAYOUT_FRAMERIGHT_HC
-{
-    ImageBitmap = Bitmap { File = "frame_right_h.png"; };
-};
-
 #define IMG_WEB_LAYOUT_FRAMETOP                         WEBWIZARD_BASE + 14
 Image IMG_WEB_LAYOUT_FRAMETOP
 {
     ImageBitmap = Bitmap { File = "frame_top.png"; };
 };
 
-#define IMG_WEB_LAYOUT_FRAMETOP_HC                      WEBWIZARD_BASE + 15
-Image IMG_WEB_LAYOUT_FRAMETOP_HC
-{
-    ImageBitmap = Bitmap { File = "frame_top_h.png"; };
-};
-
 #define IMG_WEB_LAYOUT_FRAMEBOTTOM                          WEBWIZARD_BASE + 16
 Image IMG_WEB_LAYOUT_FRAMEBOTTOM
 {
     ImageBitmap = Bitmap { File = "frame_bottom.png"; };
 };
-
-#define IMG_WEB_LAYOUT_FRAMEBOTTOM_HC                           WEBWIZARD_BASE + 17
-Image IMG_WEB_LAYOUT_FRAMEBOTTOM_HC
-{
-    ImageBitmap = Bitmap { File = "frame_bottom_h.png"; };
-};
-
diff --git a/wizards/source/importwizard/FilesModul.xba b/wizards/source/importwizard/FilesModul.xba
index cb999252b24c..e35e0b3a3ba9 100644
--- a/wizards/source/importwizard/FilesModul.xba
+++ b/wizards/source/importwizard/FilesModul.xba
@@ -41,6 +41,7 @@ Dim NewContentList() as String
 Dim XMLTemplateContentString as String
 Dim ApplIndex as Integer
 Dim bAssignFileName as Boolean
+Dim bInterruptSearch as Boolean
 	bInterruptSearch = False
 	For i = 0 To MaxCollectIndex
 		SearchDir = PathCollection(i,0)