Merge commit 'f9d40c2b591215b57ece4ba6e623b7808a7ae717' into feature/gsoc2011_wizards

Conflicts:
wizards/com/sun/star/wizards/common/Resource.java

merged resolved as per:
e52421bc118e9c5f3fce5a32ba9efdcad7627d92
9e91dbca08056fc31f388f5642fdfa3d2b910990

in the old components repository merging the corresponding commit
3b4fe490441f9f77829bc6c1ae30d79a4d50255b there

8 files changed, 113 insertions, 112 deletions

diff --git a/wizards/source/euro/euro.src b/wizards/source/euro/euro.src
index 257632f8bbb4..86fd356ed175 100644
--- a/wizards/source/euro/euro.src
+++ b/wizards/source/euro/euro.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/wizards/source/formwizard/dbwizres.src b/wizards/source/formwizard/dbwizres.src
index c04d77b9fcdd..160bb08d90db 100644
--- a/wizards/source/formwizard/dbwizres.src
+++ b/wizards/source/formwizard/dbwizres.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -25,34 +25,34 @@
  *
  ************************************************************************/// common
 
-#define RID_COMMON_START                    500
-#define RID_DB_COMMON_START             1000
+#define RID_COMMON_START					500
+#define RID_DB_COMMON_START				1000
 
 // db wizards
 
-#define RID_DB_FORM_WIZARD_START            2200
-#define RID_DB_QUERY_WIZARD_START           2300
-#define RID_DB_REPORT_WIZARD_START      2400
-#define RID_DB_TABLE_WIZARD_START       2500
+#define RID_DB_FORM_WIZARD_START			2200
+#define RID_DB_QUERY_WIZARD_START			2300
+#define RID_DB_REPORT_WIZARD_START		2400
+#define RID_DB_TABLE_WIZARD_START		2500
 
 
-#define RID_LETTERWIZARDDIALOG_START        3000
-#define RID_LETTERWIZARDGREETING_START  3080
-#define RID_LETTERWIZARDSALUTATION_START    3090
-#define RID_LETTERWIZARDROADMAP_START   3100
-#define RID_LETTERWIZARDLANGUAGE_START  3110
+#define RID_LETTERWIZARDDIALOG_START		3000
+#define RID_LETTERWIZARDGREETING_START	3080
+#define RID_LETTERWIZARDSALUTATION_START	3090
+#define RID_LETTERWIZARDROADMAP_START	3100
+#define RID_LETTERWIZARDLANGUAGE_START	3110
 
 
-#define RID_FAXWIZARDDIALOG_START           3200
-#define RID_FAXWIZARDCOMMUNICATION_START    3270
-#define RID_FAXWIZARDGREETING_START     3280
-#define RID_FAXWIZARDSALUTATION_START       3290
-#define RID_FAXWIZARDROADMAP_START      3300
+#define RID_FAXWIZARDDIALOG_START			3200
+#define RID_FAXWIZARDCOMMUNICATION_START	3270
+#define RID_FAXWIZARDGREETING_START		3280
+#define RID_FAXWIZARDSALUTATION_START		3290
+#define RID_FAXWIZARDROADMAP_START		3300
 
 // web wizard
 
-#define RID_WEBWIZARDDIALOG_START           4000
-#define RID_WEBWIZARDDIALOG_FTP         4200
+#define RID_WEBWIZARDDIALOG_START			4000
+#define RID_WEBWIZARDDIALOG_FTP			4200
 
 // agenda wizard
 
@@ -1748,9 +1748,9 @@ String RID_DB_TABLE_WIZARD_START + 51
 
 
 // ============================================================================
-// ============================                       ======================
-// ======================        LETTER WIZARD RESOURCES         ================
-// ============================                       ======================
+// ============================						  ======================
+// ======================		 LETTER WIZARD RESOURCES		 ================
+// ============================						  ======================
 // ============================================================================
 
 
@@ -2110,9 +2110,9 @@ String RID_LETTERWIZARDROADMAP_START + 6
 
 
 // ============================================================================
-// ============================                       ======================
-// ======================        FAX WIZARD RESOURCES        ================
-// ============================                       ======================
+// ============================						  ======================
+// ======================		 FAX WIZARD RESOURCES		 ================
+// ============================						  ======================
 // ============================================================================
 
 
@@ -2406,9 +2406,9 @@ String RID_FAXWIZARDROADMAP_START + 5
 
 
 // ============================================================================
-// ============================                       ======================
-// ======================        WEB WIZARD RESOURCES        ================
-// ============================                       ======================
+// ============================						  ======================
+// ======================		 WEB WIZARD RESOURCES		 ================
+// ============================						  ======================
 // ============================================================================
 
 
@@ -3063,7 +3063,7 @@ String RID_WEBWIZARDDIALOG_START +152
 
 
 // ============================================================================
-// =================         WEB WIZARD FTP DIALOG RESOURCES      =============
+// =================		 WEB WIZARD FTP DIALOG RESOURCES	  =============
 // ============================================================================
 
 
@@ -3166,9 +3166,9 @@ String RID_WEBWIZARDDIALOG_FTP +18
 
 
 // ============================================================================
-// ============================                       ======================
-// ======================        AGENDA WIZARD RESOURCES         ================
-// ============================                       ======================
+// ============================						  ======================
+// ======================		 AGENDA WIZARD RESOURCES		 ================
+// ============================						  ======================
 // ============================================================================
 
 String RID_AGENDAWIZARDDIALOG_START +1
diff --git a/wizards/source/imagelists/imagelists.src b/wizards/source/imagelists/imagelists.src
index aaab54be232c..ceb14497bf36 100644
--- a/wizards/source/imagelists/imagelists.src
+++ b/wizards/source/imagelists/imagelists.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,95 +24,95 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#define REPORTWIZARD_BASE   1000
-#define FORMWIZARD_BASE     1100
-#define WEBWIZARD_BASE      1200
+#define REPORTWIZARD_BASE 	1000
+#define FORMWIZARD_BASE 	1100
+#define WEBWIZARD_BASE	    1200
 
-#define IMG_REPORT_ORIENTATION_PORTRAIT         REPORTWIZARD_BASE + 0
+#define	IMG_REPORT_ORIENTATION_PORTRAIT	   		REPORTWIZARD_BASE + 0
 Image IMG_REPORT_ORIENTATION_PORTRAIT
 {
     ImageBitmap = Bitmap { File = "portrait_32.png"; };
 };
 
-#define IMG_REPORT_ORIENTATION_LANDSCAPE        REPORTWIZARD_BASE + 2
+#define	IMG_REPORT_ORIENTATION_LANDSCAPE		REPORTWIZARD_BASE + 2
 Image IMG_REPORT_ORIENTATION_LANDSCAPE
 {
     ImageBitmap = Bitmap { File = "landscape_32.png"; };
 };
 
-#define IMG_FORM_ARRANGELISTSIDE                FORMWIZARD_BASE + 0
+#define	IMG_FORM_ARRANGELISTSIDE				FORMWIZARD_BASE + 0
 Image IMG_FORM_ARRANGELISTSIDE
 {
     ImageBitmap = Bitmap { File = "formarrangelistside_42.png"; };
 };
 
-#define IMG_FORM_ARRANGELISTTOP                 FORMWIZARD_BASE + 2
+#define	IMG_FORM_ARRANGELISTTOP					FORMWIZARD_BASE + 2
 Image IMG_FORM_ARRANGELISTTOP
 {
     ImageBitmap = Bitmap { File = "formarrangelisttop_42.png"; };
 };
 
-#define IMG_FORM_ARRANGETABLE                   FORMWIZARD_BASE + 4
+#define	IMG_FORM_ARRANGETABLE					FORMWIZARD_BASE + 4
 Image IMG_FORM_ARRANGETABLE
 {
     ImageBitmap = Bitmap { File = "formarrangetable_42.png"; };
 };
 
-#define IMG_FORM_ARRANGEFREE                    FORMWIZARD_BASE + 6
+#define	IMG_FORM_ARRANGEFREE					FORMWIZARD_BASE + 6
 Image IMG_FORM_ARRANGEFREE
 {
     ImageBitmap = Bitmap { File = "formarrangefree_42.png"; };
 };
 
-#define IMG_WEB_LAYOUT_TABLE3                       WEBWIZARD_BASE + 0
+#define	IMG_WEB_LAYOUT_TABLE3						WEBWIZARD_BASE + 0
 Image IMG_WEB_LAYOUT_TABLE3
 {
     ImageBitmap = Bitmap { File = "table_3.png"; };
 };
 
-#define IMG_WEB_LAYOUT_TABLE2                       WEBWIZARD_BASE + 2
+#define	IMG_WEB_LAYOUT_TABLE2						WEBWIZARD_BASE + 2
 Image IMG_WEB_LAYOUT_TABLE2
 {
     ImageBitmap = Bitmap { File = "table_2.png"; };
 };
 
-#define IMG_WEB_LAYOUT_SIMPLE                       WEBWIZARD_BASE + 4
+#define	IMG_WEB_LAYOUT_SIMPLE						WEBWIZARD_BASE + 4
 Image IMG_WEB_LAYOUT_SIMPLE
 {
     ImageBitmap = Bitmap { File = "simple.png"; };
 };
 
-#define IMG_WEB_LAYOUT_DIAGONAL                     WEBWIZARD_BASE + 6
+#define	IMG_WEB_LAYOUT_DIAGONAL						WEBWIZARD_BASE + 6
 Image IMG_WEB_LAYOUT_DIAGONAL
 {
     ImageBitmap = Bitmap { File = "diagonal.png"; };
 };
 
-#define IMG_WEB_LAYOUT_ZIGZAG                       WEBWIZARD_BASE + 8
+#define	IMG_WEB_LAYOUT_ZIGZAG						WEBWIZARD_BASE + 8
 Image IMG_WEB_LAYOUT_ZIGZAG
 {
     ImageBitmap = Bitmap { File = "zigzag.png"; };
 };
 
-#define IMG_WEB_LAYOUT_FRAMELEFT                        WEBWIZARD_BASE + 10
+#define	IMG_WEB_LAYOUT_FRAMELEFT						WEBWIZARD_BASE + 10
 Image IMG_WEB_LAYOUT_FRAMELEFT
 {
     ImageBitmap = Bitmap { File = "frame_left.png"; };
 };
 
-#define IMG_WEB_LAYOUT_FRAMERIGHT                       WEBWIZARD_BASE + 12
+#define	IMG_WEB_LAYOUT_FRAMERIGHT						WEBWIZARD_BASE + 12
 Image IMG_WEB_LAYOUT_FRAMERIGHT
 {
     ImageBitmap = Bitmap { File = "frame_right.png"; };
 };
 
-#define IMG_WEB_LAYOUT_FRAMETOP                         WEBWIZARD_BASE + 14
+#define	IMG_WEB_LAYOUT_FRAMETOP							WEBWIZARD_BASE + 14
 Image IMG_WEB_LAYOUT_FRAMETOP
 {
     ImageBitmap = Bitmap { File = "frame_top.png"; };
 };
 
-#define IMG_WEB_LAYOUT_FRAMEBOTTOM                          WEBWIZARD_BASE + 16
+#define	IMG_WEB_LAYOUT_FRAMEBOTTOM							WEBWIZARD_BASE + 16
 Image IMG_WEB_LAYOUT_FRAMEBOTTOM
 {
     ImageBitmap = Bitmap { File = "frame_bottom.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)
diff --git a/wizards/source/importwizard/importwi.src b/wizards/source/importwizard/importwi.src
index daddcc284642..d8cc204889a2 100644
--- a/wizards/source/importwizard/importwi.src
+++ b/wizards/source/importwizard/importwi.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -23,11 +23,11 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************/#define sHelpButton   1000
-#define sCancelButton   1001
-#define sBackButton 1002
-#define sNextButton 1003
-#define sBeginButton    1004
+ ************************************************************************/#define sHelpButton	1000
+#define sCancelButton	1001
+#define sBackButton	1002
+#define sNextButton	1003
+#define sBeginButton	1004
 #define sCloseButton    1005
 #define sWelcometextLabel1  1006
 #define sWelcometextLabel2  1007
@@ -45,9 +45,9 @@
 #define sTextImportLabel 1033
 #define sTextExportLabel 1034
 #define sGroupnameDefault   1036
-#define sProgressDesc1  1039
-#define sProgressOneDoc 1040
-#define sProgressMoreDocs   1041
+#define sProgressDesc1	1039
+#define sProgressOneDoc	1040
+#define sProgressMoreDocs	1041
 #define sProgressMoreTemplates 1042
 #define sNoDirCreation  1050
 #define sMsgDirNotThere    1051
@@ -67,8 +67,8 @@
 #define sPathErrorStarDoc_1_    1065
 #define sPathErrorStarDoc_2_    1066
 #define sPathErrorStarDoc_3_    1067
-#define sOverwriteallFiles  1070
-#define sreeditMacro    1071
+#define sOverwriteallFiles 	1070
+#define sreeditMacro 	1071
 #define scouldNotsaveDocument 1072
 #define scouldNotopenDocument 1073
 #define sPathDialogMessage  1080
@@ -95,7 +95,7 @@
 #define sCreateLogfile          2032
 #define sLogfileHelpText        2033
 #define sLogfileSummary         2034
-#define sshowLogfile            2035
+#define sshowLogfile			2035
 
 #define sSumInclusiveSubDir     3000
 #define sSumSaveDokumente       3001
diff --git a/wizards/source/schedule/schedule.src b/wizards/source/schedule/schedule.src
index beabe83cf2a4..3116f0f41131 100644
--- a/wizards/source/schedule/schedule.src
+++ b/wizards/source/schedule/schedule.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -24,53 +24,53 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/// Dialog labels start at 1000
-#define dlgCalTitle 1000
-#define dlgCalTitleBack 1001
-#define dlgCalTitleOwnData  1002
-#define dlgSchdlTitle   1003
-#define dlgOK   1004
-#define dlgCancel   1005
-#define dlgCalFrameOption   1006
-#define dlgCalOptionYear    1007
-#define dlgCalOptionMonth   1008
-#define dlgSchdlDescription 1009
-#define dlgSchdlCountry 1010
-#define dlgTime 1011
-#define dlgYear 1012
-#define dlgCalMonth 1013
-#define dlgSpecificBankholidays 1014
-#define dlgCalOwnData   1015
-#define dlgCalInsert    1016
-#define dlgCalDelete    1017
-#define dlgCalNewEvent  1018
-#define dlgCalEvent 1019
-#define dlgCalEventOnce 1020
-#define dlgCalEventDay  1021
-#define dlgCalEventMonth    1022
-#define dlgCalEventYear 1023
+#define dlgCalTitle	1000
+#define dlgCalTitleBack	1001
+#define dlgCalTitleOwnData	1002
+#define dlgSchdlTitle	1003
+#define dlgOK	1004
+#define dlgCancel	1005
+#define dlgCalFrameOption	1006
+#define dlgCalOptionYear	1007
+#define dlgCalOptionMonth	1008
+#define dlgSchdlDescription	1009
+#define dlgSchdlCountry	1010
+#define dlgTime	1011
+#define dlgYear	1012
+#define dlgCalMonth	1013
+#define dlgSpecificBankholidays	1014
+#define dlgCalOwnData	1015
+#define dlgCalInsert	1016
+#define dlgCalDelete	1017
+#define dlgCalNewEvent	1018
+#define dlgCalEvent	1019
+#define dlgCalEventOnce	1020
+#define dlgCalEventDay	1021
+#define dlgCalEventMonth	1022
+#define dlgCalEventYear	1023
 
 // Bitmap file is 1099
-#define dlgBitmapFile   1099
+#define dlgBitmapFile	1099
 
 // Names of states start at 1100
-#define dlgState    1100
+#define dlgState	1100
 
 // Months start at 1200
-#define dlgMonth    1200
+#define dlgMonth	1200
 
 // Messages start at 1300
-#define msgCalErrorTitle    1300
-#define msgCalError 1301
-#define msgCalRemoveTitle   1302
-#define msgCalRemove    1303
+#define msgCalErrorTitle	1300
+#define msgCalError	1301
+#define msgCalRemoveTitle	1302
+#define msgCalRemove	1303
 
 // Styles start at 1400
-#define stlWorkday  1400
-#define stlWeekend  1401
+#define stlWorkday	1400
+#define stlWeekend	1401
 
 // Sheet names start at 1410
-#define nameCalYear 1410
-#define nameCalMonth    1411
+#define nameCalYear	1410
+#define nameCalMonth	1411
 
 #define sProgress   1500
 
diff --git a/wizards/source/template/template.src b/wizards/source/template/template.src
index 61e57f5cc053..a063a3c30f9a 100644
--- a/wizards/source/template/template.src
+++ b/wizards/source/template/template.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -23,16 +23,16 @@
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************/#define SAMPLES       1000
-#define STYLES      1100
-#define AgendaDlgName       1200
-#define AgendaDlgNoCancel   1201
-#define AgendaDlgFrame      1202
-#define AgendaDlgButton1    1203
-#define AgendaDlgButton2    1204
-#define CorrespondenceNoTextmark    1300
-#define CorrespondenceMsgError  1302
-#define CorrespondenceDialog    1303
+ ************************************************************************/#define SAMPLES		1000
+#define STYLES		1100
+#define AgendaDlgName		1200
+#define AgendaDlgNoCancel	1201
+#define AgendaDlgFrame		1202
+#define AgendaDlgButton1	1203
+#define AgendaDlgButton2	1204
+#define CorrespondenceNoTextmark	1300
+#define CorrespondenceMsgError	1302
+#define CorrespondenceDialog	1303
 #define CorrespondenceFields    1350
 #define TextField    1400
 #define Newsletter    1450
diff --git a/wizards/source/webwizard/webwizar.src b/wizards/source/webwizard/webwizar.src
index 19d77d89f4a9..b7bb7dd3b1d2 100644
--- a/wizards/source/webwizard/webwizar.src
+++ b/wizards/source/webwizard/webwizar.src
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite