From 6a1313dd4d35c515e3b9fa4f017aeff158820caa Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 30 Sep 2010 16:41:42 +0100 Subject: #i100686# Euro converter didn't work when searching for ods in a dir --- wizards/source/euro/AutoPilotRun.xba | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) (limited to 'wizards/source') 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) -- cgit From adf7dc232d874a2670dea2dcd3805b8b2ddfdbe3 Mon Sep 17 00:00:00 2001 From: Kalman Szalai - KAMI Date: Mon, 1 Nov 2010 13:55:31 +0100 Subject: 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. --- wizards/source/euro/Init.xba | 2 +- wizards/source/formwizard/tools.xba | 2 +- wizards/source/importwizard/Main.xba | 2 +- wizards/source/schedule/CalendarMain.xba | 2 +- wizards/source/template/Samples.xba | 2 +- wizards/source/tutorials/Functions.xba | 8 ++++---- wizards/source/tutorials/ShowInfoDialog.xba | 4 ++-- wizards/source/webwizard/Language.xba | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) (limited to 'wizards/source') 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 -- cgit From 406d17aea858869e10c2e9c82665df413a211941 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Thu, 11 Nov 2010 12:58:52 +0100 Subject: Removal of Hi-contrast image definitions These definitions are only ever referenced in one place, so they can safely be removed. Found this by removing the hi-contrast icons and trying to compile. --- wizards/source/imagelists/imagelists.src | 96 -------------------------------- 1 file changed, 96 deletions(-) (limited to 'wizards/source') 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"; }; -}; - -- cgit From 85f4b6abd19eb9290bb40a9ab573c6a05945db94 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Fri, 12 Nov 2010 15:02:12 +0100 Subject: Remove two more _HC instances --- wizards/source/formwizard/Language.xba | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wizards/source') 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 -- cgit From 4327ec0deee4b5362354bd4bc0ec885a412cd071 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Wed, 2 Feb 2011 11:46:03 +0100 Subject: Clean up makefiles --- wizards/source/configshare/makefile.mk | 14 -------------- wizards/source/depot/makefile.mk | 8 -------- 2 files changed, 22 deletions(-) (limited to 'wizards/source') diff --git a/wizards/source/configshare/makefile.mk b/wizards/source/configshare/makefile.mk index c86f66fb8a76..63c8b5304296 100644 --- a/wizards/source/configshare/makefile.mk +++ b/wizards/source/configshare/makefile.mk @@ -26,27 +26,13 @@ #************************************************************************* PRJ=..$/.. - - PRJNAME=wizards TARGET=configshare .INCLUDE : settings.mk - .INCLUDE : $(PRJ)$/util$/target.pmk - - ZIP1TARGET = $(CONFIG_SHARE_TARGET) - ZIP1LIST = * -x makefile.* - - - .INCLUDE : target.mk - - - - - diff --git a/wizards/source/depot/makefile.mk b/wizards/source/depot/makefile.mk index 2049b6a173a0..9de23408e575 100644 --- a/wizards/source/depot/makefile.mk +++ b/wizards/source/depot/makefile.mk @@ -36,14 +36,6 @@ TARGET=depotall # --- Files -------------------------------------------------------- -# -# testresource. -# -# SRS2NAME = depot -# SRC2FILES= webwizar.src -# RESLIB2SRSFILES= $(SRS)$/webwizar.srs -# RESLIB2NAME= wwz - ZIP1TARGET = $(DEPOT_ALL_TARGET) ZIP1LIST = *.xdl *.xba *.xlb -- cgit From 87c5e26936baf52d878c342f8724bca2c03090d9 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Wed, 27 Apr 2011 13:55:24 +0200 Subject: wizards-source-importwizard-filesmodul-xba.diff: document converter fix document converter wizard fails when compatability is enabled (bnc#113235, i#56633) --- wizards/source/importwizard/FilesModul.xba | 1 + 1 file changed, 1 insertion(+) (limited to 'wizards/source') 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) -- cgit