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

4 files changed, 20 insertions, 110 deletions

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) = "application/x-starcalc"
-			FilterList(1) = "application/vnd.stardivision.calc"
-			FilterList(2) = "application/vnd.sun.xml.calc"
-			FilterList(3) = "application/vnd.oasis.opendocument.spreadsheet"
+			TypeList(0) = "calc8"
+			TypeList(1) = "calc_StarOffice_XML_Calc"
+			TypeList(2) = "calc_StarCalc_30"
+			TypeList(3) = "calc_StarCalc_40"
+			TypeList(4) = "calc_StarCalc_50"
 			If DialogModel.chkTextDocuments.State = 1 Then
-				ReDim Preserve FilterList(8) as String
-				
-				FilterList(4) = "application/x-starwriter"
-				FilterList(5) = "application/vnd.stardivision.writer"
-				FilterList(6) = "application/vnd.stardivision.writer/web"
-				FilterList(7) = "application/vnd.sun.xml.writer"
-				FilterList(8) = "application/vnd.oasis.opendocument.text"
+				ReDim Preserve TypeList(13) as String
+
+				TypeList(5) = "writer8"
+				TypeList(6) = "writerglobal8"
+				TypeList(7) = "writer_StarOffice_XML_Writer"
+				TypeList(8) = "writer_globaldocument_StarOffice_XML_Writer_GlobalDocument"
+				TypeList(9) = "writer_StarWriter_30"
+				TypeList(10) = "writer_StarWriter_40"
+				TypeList(11) = "writer_globaldocument_StarWriter_40GlobalDocument"
+				TypeList(12) = "writer_StarWriter_50"
+				TypeList(13) = "writer_globaldocument_StarWriter_50GlobalDocument"
 			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 = ""
-		If isHighContrast(DlgFormDB.getPeer) Then FNameAddOn = "_hc"
 
 		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)