Save 1MB on wizards per language

Bitmaps are packaged as language dependent files however, no
language dependency at all in bitmaps. This patch only pack one instance
so we can save 1MB diskspace for every language in multi lang installer.

14 files changed, 20 insertions, 20 deletions

diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java
index 4701f27110cd..64be1b074e04 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java
@@ -213,7 +213,7 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
         try {
             sTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "share", "/wizard");
             sUserTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "user", "");
-            sBitmapPath = FileAccess.combinePaths(xMSF, sTemplatePath, "/wizard/bitmap");
+            sBitmapPath = FileAccess.combinePaths(xMSF, sTemplatePath, "/../wizard/bitmap");
         } catch (NoValidPathException e) {
             e.printStackTrace();
         }
@@ -302,7 +302,7 @@ public class AgendaWizardDialogImpl extends AgendaWizardDialog
         try {
 
             sUserTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "user");
-            sBitmapPath = FileAccess.combinePaths(xMSF, sTemplatePath, "/wizard/bitmap");
+            sBitmapPath = FileAccess.combinePaths(xMSF, sTemplatePath, "/../wizard/bitmap");
         } catch (NoValidPathException e) {
             e.printStackTrace();
         }
diff --git a/wizards/com/sun/star/wizards/common/Desktop.java b/wizards/com/sun/star/wizards/common/Desktop.java
index c9292b58c1b4..8902696c37b4 100644
--- a/wizards/com/sun/star/wizards/common/Desktop.java
+++ b/wizards/com/sun/star/wizards/common/Desktop.java
@@ -378,7 +378,7 @@ public class Desktop
             {
                 TemplatePath = FileAccess.getOfficePath(xMSF, "Template", "share", "/wizard");
                 UserTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "user", "");
-                BitmapPath = FileAccess.combinePaths(xMSF, TemplatePath, "/wizard/bitmap");
+                BitmapPath = FileAccess.combinePaths(xMSF, TemplatePath, "/../wizard/bitmap");
                 WorkPath = FileAccess.getOfficePath(xMSF, "Work", "", "");
             }
             catch (NoValidPathException nopathexception)
@@ -417,7 +417,7 @@ public class Desktop
     {
         try
         {
-            String sBitmapPath = FileAccess.combinePaths(_xMSF, getTemplatePath(_xMSF), "/wizard/bitmap");
+            String sBitmapPath = FileAccess.combinePaths(_xMSF, getTemplatePath(_xMSF), "/../wizard/bitmap");
             return sBitmapPath;
         }
         catch (NoValidPathException nopathexception)
diff --git a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
index dac35cabc04a..e9a39eb5d5ef 100644
--- a/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java
@@ -381,7 +381,7 @@ public class FaxWizardDialogImpl extends FaxWizardDialog
         {
             sTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "share", "/wizard");
             sUserTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "user", "");
-            sBitmapPath = FileAccess.combinePaths(xMSF, sTemplatePath, "/wizard/bitmap");
+            sBitmapPath = FileAccess.combinePaths(xMSF, sTemplatePath, "/../wizard/bitmap");
         }
         catch (NoValidPathException e)
         {
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
index 106fb68a172e..2842cf63a19c 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
@@ -1294,7 +1294,7 @@ public class LetterWizardDialogImpl extends LetterWizardDialog
         {
             sTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "share", "/wizard");
             sUserTemplatePath = FileAccess.getOfficePath(xMSF, "Template", "user", "");
-            sBitmapPath = FileAccess.combinePaths(xMSF, sTemplatePath, "/wizard/bitmap");
+            sBitmapPath = FileAccess.combinePaths(xMSF, sTemplatePath, "/../wizard/bitmap");
         }
         catch (NoValidPathException e)
         {
diff --git a/wizards/com/sun/star/wizards/web/FTPDialog.java b/wizards/com/sun/star/wizards/web/FTPDialog.java
index 1cc68ed8491f..976e57790ab2 100644
--- a/wizards/com/sun/star/wizards/web/FTPDialog.java
+++ b/wizards/com/sun/star/wizards/web/FTPDialog.java
@@ -186,7 +186,7 @@ public class FTPDialog extends UnoDialog2 implements UIConsts, WWHID
         publish = p;
 
 
-        imagesDirectory = FileAccess.connectURLs(((CGSettings) (publish.root)).soTemplateDir, "wizard/bitmap/");
+        imagesDirectory = FileAccess.connectURLs(((CGSettings) (publish.root)).soTemplateDir, "../wizard/bitmap/");
 
         //Load Resources
         resources = new FTPDialogResources(xmsf);
diff --git a/wizards/com/sun/star/wizards/web/WWD_Startup.java b/wizards/com/sun/star/wizards/web/WWD_Startup.java
index 818781cd0bf3..200f70a32383 100644
--- a/wizards/com/sun/star/wizards/web/WWD_Startup.java
+++ b/wizards/com/sun/star/wizards/web/WWD_Startup.java
@@ -241,7 +241,7 @@ public abstract class WWD_Startup extends WWD_General
 
         String soTemplateDir = FileAccess.getOfficePath(xmsf, "Template", "share", "/wizard");
 
-        String exclamationURL = FileAccess.connectURLs(soTemplateDir, "wizard/bitmap/caution_16.png");
+        String exclamationURL = FileAccess.connectURLs(soTemplateDir, "../wizard/bitmap/caution_16.png");
         this.drawNaviBar();
         this.buildStep1();
         this.buildStep2();
diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba
index 45fdafdbafe5..2de1252c7e48 100644
--- a/wizards/source/euro/Init.xba
+++ b/wizards/source/euro/Init.xba
@@ -550,7 +550,7 @@ Dim Isthere as Boolean
 	InitializeLocales(oLocale)
 	InitializeCurrencies()
 	InitializeControls()
-	BitmapDir = GetOfficeSubPath("Template", "wizard/bitmap")
+	BitmapDir = GetOfficeSubPath("Template", "../wizard/bitmap")
 	If BitmapDir = "" Then
 		Stop
 	End If
diff --git a/wizards/source/formwizard/tools.xba b/wizards/source/formwizard/tools.xba
index 174987e35971..8b40b8379c10 100644
--- a/wizards/source/formwizard/tools.xba
+++ b/wizards/source/formwizard/tools.xba
@@ -304,7 +304,7 @@ End Function
 
 
 Function GetFormWizardPaths() as Boolean
-	FormPath = GetOfficeSubPath("Template","wizard/bitmap")
+	FormPath = GetOfficeSubPath("Template","../wizard/bitmap")
 	If FormPath <> "" Then
 		WebWizardPath = GetOfficeSubPath("Template","wizard/web")
 		If WebWizardPath <> "" Then
diff --git a/wizards/source/importwizard/Main.xba b/wizards/source/importwizard/Main.xba
index 2c25c6abebd0..3415d0ee8dd8 100644
--- a/wizards/source/importwizard/Main.xba
+++ b/wizards/source/importwizard/Main.xba
@@ -274,7 +274,7 @@ End Sub
 
 
 Function GetImportWizardPaths() as Boolean
-	SOBitmapPath = GetOfficeSubPath("Template", "wizard/bitmap")
+	SOBitmapPath = GetOfficeSubPath("Template", "../wizard/bitmap")
 	If SOBitmapPath <> "" Then
 		SOWorkPath = GetPathSettings("Work", False)
 		If SOWorkPath <> "" Then
diff --git a/wizards/source/schedule/CalendarMain.xba b/wizards/source/schedule/CalendarMain.xba
index bfe49121dbd3..2deb51cca84d 100644
--- a/wizards/source/schedule/CalendarMain.xba
+++ b/wizards/source/schedule/CalendarMain.xba
@@ -82,7 +82,7 @@ Dim iThisMonth as Integer
 	DlgCalModel = DlgCalendar.Model
     LoadLanguage(sCurLangLocale)
 	CalInitGlobalVariablesDate()
-	BitmapDir = GetOfficeSubPath("Template","wizard/bitmap")
+	BitmapDir = GetOfficeSubPath("Template","../wizard/bitmap")
 	DlgCalModel.imgCountry.ImageURL = BitmapDir & sBitmapFilename
 	CalChoosenLand = -2
 	CalLoadOwnData()
diff --git a/wizards/source/template/Samples.xba b/wizards/source/template/Samples.xba
index b64ddc12db17..118fb37d0c49 100644
--- a/wizards/source/template/Samples.xba
+++ b/wizards/source/template/Samples.xba
@@ -86,7 +86,7 @@ Dim MaxIndex as Integer
 			DialogModel = StylesDialog.Model
 			TemplateDir = GetPathSettings("Template", False, 0)
 			StylesDir = GetOfficeSubPath("Template", "wizard/styles/")
-			sQueryPath = GetOfficeSubPath("Template", "wizard/bitmap/")
+			sQueryPath = GetOfficeSubPath("Template", "../wizard/bitmap/")
 			DialogModel.Title = GetResText(STYLES)
 			DialogModel.cmdCancel.Label = GetResText(STYLES+2)
 			DialogModel.cmdOk.Label = GetResText(STYLES+3)
diff --git a/wizards/source/tutorials/Functions.xba b/wizards/source/tutorials/Functions.xba
index 6524ec19338c..c1b464acaf9d 100644
--- a/wizards/source/tutorials/Functions.xba
+++ b/wizards/source/tutorials/Functions.xba
@@ -78,15 +78,15 @@ Sub setMaxMinImage(param As String)
 		iPos = InStr(templatePath,"/")
 		If(iPos > 0) Then
 			If(param = "MAX") Then
-				bitmapPath = templatePath & "/wizard/bitmap/maximize.bmp"
+				bitmapPath = templatePath & "../wizard/bitmap/maximize.bmp"
 			ElseIf(param = "MIN") Then	
-				bitmapPath = templatePath & "/wizard/bitmap/minimize.bmp"
+				bitmapPath = templatePath & "../wizard/bitmap/minimize.bmp"
 			End If
 		Else
 			If(param = "MAX") Then
-				bitmapPath = templatePath & "\wizard\bitmap\maximize.bmp"
+				bitmapPath = templatePath & "..\wizard\bitmap\maximize.bmp"
 			ElseIf(param = "MIN") Then	
-				bitmapPath = templatePath & "\wizard\bitmap\minimize.bmp"
+				bitmapPath = templatePath & "..\wizard\bitmap\minimize.bmp"
 			End If		
 		End If
 		'printdbgInfo oCommandButton.Model
diff --git a/wizards/source/tutorials/ShowInfoDialog.xba b/wizards/source/tutorials/ShowInfoDialog.xba
index 4bb0f608d9b6..61c2ed96731f 100644
--- a/wizards/source/tutorials/ShowInfoDialog.xba
+++ b/wizards/source/tutorials/ShowInfoDialog.xba
@@ -148,9 +148,9 @@ sub setImage(whatever as Object)
 	Dim bitmapPath As String
 	iPos = InStr(templatePath,"/")
 	if(iPos > 0) Then
-		bitmapPath = templatePath & "/wizard/bitmap/tutorial_background.gif"
+		bitmapPath = templatePath & "../wizard/bitmap/tutorial_background.gif"
 	Else
-		bitmapPath = templatePath & "\wizard\bitmap\tutorial_background.gif"
+		bitmapPath = templatePath & "..\wizard\bitmap\tutorial_background.gif"
 	End If
 	
 	dim props(0) as new com.sun.star.beans.PropertyValue
diff --git a/wizards/source/webwizard/Language.xba b/wizards/source/webwizard/Language.xba
index 1aa26fac30cb..1c6b8c194e98 100644
--- a/wizards/source/webwizard/Language.xba
+++ b/wizards/source/webwizard/Language.xba
@@ -30,7 +30,7 @@ Dim TemplatePath as String
 				If PhotosDir <> "" Then
 					TemplatePath = GetOfficeSubPath("Template", "wizard/web/")
 					If TemplatePath <> "" Then
-						SOBitmapPath = GetOfficeSubPath("Template", "wizard/bitmap")
+						SOBitmapPath = GetOfficeSubPath("Template", "../wizard/bitmap")
 						If SOBitmapPath <> "" Then
 							GetWebwizardPaths() = True
 							Exit Function