Commits

Anonymous committed d6baa0a Merge

CWS-TOOLING: integrate CWS native349

Comments (0)

Files changed (18)

scp2/source/ooo/directory_ooo.scp

     DosName = "wizard";
 End
 
+Directory gid_Dir_Share_Template_Wizard_Bitmap
+    ParentID = gid_Dir_Share_Template_Wizard;
+    DosName = "bitmap";
+End
+
 Directory gid_Dir_Share_Template_Wizard_Letter
     ParentID = gid_Dir_Share_Template_Wizard;
     DosName = "letter";
     DIR_IDENT_ALL_LANG(wizard);
 End
 
-Directory gid_Dir_Template_Wizard_Bitmap
-    ParentID = gid_Dir_Template_Wizard;
-    DIR_IDENT_ALL_LANG(bitmap);
-End
-
 Directory gid_Dir_Template_Wizard_Web
     ParentID = gid_Dir_Template_Wizard;
     DIR_IDENT_ALL_LANG(web);

scp2/source/ooo/file_extra_ooo.scp

 End
 
 File gid_File_Extra_Tplwizbitmap
-    Dir = gid_Dir_Template_Wizard_Bitmap;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_IDENT_ALL_LANG(tplwizbitmap.zip);
+    Dir = gid_Dir_Share_Template_Wizard_Bitmap;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "tplwizbitmap.zip";
 End
 
 File gid_File_Extra_Tplwizdesktop_Lang

scp2/source/ooo/module_hidden_ooo.scp

 	gid_File_Extra_Gallwwwgraf,
 	gid_File_Extra_Migration,
 	gid_File_Extra_Migration_Lang_Multi,
+	gid_File_Extra_Tplwizbitmap,
 	gid_File_Extra_Tplwizletter,
 	gid_File_Extra_Tplwizletter_en_US,
 	gid_File_Extra_Tplwizletter_de,

scp2/source/ooo/module_lang_template.scp

              gid_File_Extra_Tpllayoutimpr_Lang,
              gid_File_Extra_Tplpresntimpr_Lang,
              gid_File_Extra_Tplwizagenda_Lang,
-             gid_File_Extra_Tplwizbitmap,
              gid_File_Extra_Tplwizdesktop_Lang,
              gid_File_Extra_Tplwizfax_Lang,
              gid_File_Extra_Tplwizletter_Lang,

wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java

         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();
         }
         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();
         }

wizards/com/sun/star/wizards/common/Desktop.java

             {
                 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)
     {
         try
         {
-            String sBitmapPath = FileAccess.combinePaths(_xMSF, getTemplatePath(_xMSF), "/wizard/bitmap");
+            String sBitmapPath = FileAccess.combinePaths(_xMSF, getTemplatePath(_xMSF), "/../wizard/bitmap");
             return sBitmapPath;
         }
         catch (NoValidPathException nopathexception)

wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java

         {
             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)
         {

wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java

         {
             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)
         {

wizards/com/sun/star/wizards/web/FTPDialog.java

         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);

wizards/com/sun/star/wizards/web/WWD_Startup.java

 
         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();

wizards/source/euro/Init.xba

 	InitializeLocales(oLocale)
 	InitializeCurrencies()
 	InitializeControls()
-	BitmapDir = GetOfficeSubPath("Template", "wizard/bitmap")
+	BitmapDir = GetOfficeSubPath("Template", "../wizard/bitmap")
 	If BitmapDir = "" Then
 		Stop
 	End If

wizards/source/formwizard/tools.xba

 
 
 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

wizards/source/importwizard/Main.xba

 
 
 Function GetImportWizardPaths() as Boolean
-	SOBitmapPath = GetOfficeSubPath("Template", "wizard/bitmap")
+	SOBitmapPath = GetOfficeSubPath("Template", "../wizard/bitmap")
 	If SOBitmapPath <> "" Then
 		SOWorkPath = GetPathSettings("Work", False)
 		If SOWorkPath <> "" Then

wizards/source/schedule/CalendarMain.xba

 	DlgCalModel = DlgCalendar.Model
     LoadLanguage(sCurLangLocale)
 	CalInitGlobalVariablesDate()
-	BitmapDir = GetOfficeSubPath("Template","wizard/bitmap")
+	BitmapDir = GetOfficeSubPath("Template","../wizard/bitmap")
 	DlgCalModel.imgCountry.ImageURL = BitmapDir & sBitmapFilename
 	CalChoosenLand = -2
 	CalLoadOwnData()

wizards/source/template/Samples.xba

 			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)

wizards/source/tutorials/Functions.xba

 		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

wizards/source/tutorials/ShowInfoDialog.xba

 	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

wizards/source/webwizard/Language.xba

 				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