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') 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/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.java | 4 ++-- wizards/com/sun/star/wizards/common/Desktop.java | 4 ++-- wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.java | 2 +- wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 2 +- wizards/com/sun/star/wizards/web/FTPDialog.java | 2 +- wizards/com/sun/star/wizards/web/WWD_Startup.java | 2 +- 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 +- 14 files changed, 20 insertions(+), 20 deletions(-) (limited to 'wizards') 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 -- 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') 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') 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 2945b56030e35d30825b458f1ad2cbcb6bb7e5f8 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Tue, 1 Feb 2011 17:26:38 +0100 Subject: Clean up makefiles --- wizards/com/sun/star/wizards/agenda/makefile.mk | 1 - wizards/com/sun/star/wizards/fax/makefile.mk | 1 - wizards/com/sun/star/wizards/form/makefile.mk | 5 ----- wizards/com/sun/star/wizards/letter/makefile.mk | 1 - wizards/com/sun/star/wizards/makefile.mk | 4 ---- wizards/com/sun/star/wizards/query/makefile.mk | 5 ----- wizards/com/sun/star/wizards/report/makefile.mk | 1 - wizards/com/sun/star/wizards/reportbuilder/layout/makefile.mk | 6 ------ wizards/com/sun/star/wizards/reportbuilder/makefile.mk | 3 --- wizards/com/sun/star/wizards/table/makefile.mk | 5 ----- wizards/com/sun/star/wizards/web/data/makefile.mk | 4 ---- wizards/com/sun/star/wizards/web/export/makefile.mk | 4 ---- wizards/com/sun/star/wizards/web/makefile.mk | 2 +- 13 files changed, 1 insertion(+), 41 deletions(-) (limited to 'wizards') diff --git a/wizards/com/sun/star/wizards/agenda/makefile.mk b/wizards/com/sun/star/wizards/agenda/makefile.mk index 314dcf3b7da9..10c89c88aef6 100644 --- a/wizards/com/sun/star/wizards/agenda/makefile.mk +++ b/wizards/com/sun/star/wizards/agenda/makefile.mk @@ -33,7 +33,6 @@ PACKAGE = com$/sun$/star$/wizards$/agenda # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -#.INCLUDE : $(PRJ)$/util$/makefile.pmk JARFILES= unoil.jar \ jurt.jar \ diff --git a/wizards/com/sun/star/wizards/fax/makefile.mk b/wizards/com/sun/star/wizards/fax/makefile.mk index 247aaf063529..0fef6de23674 100644 --- a/wizards/com/sun/star/wizards/fax/makefile.mk +++ b/wizards/com/sun/star/wizards/fax/makefile.mk @@ -33,7 +33,6 @@ PACKAGE = com$/sun$/star$/wizards$/fax # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -#.INCLUDE : $(PRJ)$/util$/makefile.pmk JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar java_uno_accessbridge commonwizards.jar diff --git a/wizards/com/sun/star/wizards/form/makefile.mk b/wizards/com/sun/star/wizards/form/makefile.mk index 092135289fc9..0a229c96ce5e 100644 --- a/wizards/com/sun/star/wizards/form/makefile.mk +++ b/wizards/com/sun/star/wizards/form/makefile.mk @@ -33,7 +33,6 @@ PACKAGE = com$/sun$/star$/wizards$/form # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -#.INCLUDE : $(PRJ)$/util$/makefile.pmk JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar CUSTOMMANIFESTFILE= MANIFEST.MF @@ -43,10 +42,6 @@ JARTARGET = $(TARGET).jar JARCLASSPATH = commonwizards.jar # --- Files -------------------------------------------------------- -#SRS2NAME = dbwizres -#SRC2FILES= dbwizres.src -#RESLIB2SRSFILES= $(SRS)$/dbwizres.srs -#RESLIB2NAME= dbw JAVAFILES= \ CallFormWizard.java \ diff --git a/wizards/com/sun/star/wizards/letter/makefile.mk b/wizards/com/sun/star/wizards/letter/makefile.mk index 700d0b72dfb7..45af4a1de37f 100644 --- a/wizards/com/sun/star/wizards/letter/makefile.mk +++ b/wizards/com/sun/star/wizards/letter/makefile.mk @@ -33,7 +33,6 @@ PACKAGE = com$/sun$/star$/wizards$/letter # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -#.INCLUDE : $(PRJ)$/util$/makefile.pmk JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar java_uno_accessbridge commonwizards.jar diff --git a/wizards/com/sun/star/wizards/makefile.mk b/wizards/com/sun/star/wizards/makefile.mk index fb9c3e18558d..8f3b45538c21 100644 --- a/wizards/com/sun/star/wizards/makefile.mk +++ b/wizards/com/sun/star/wizards/makefile.mk @@ -32,7 +32,6 @@ PACKAGE = com$/sun$/star$/wizards # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -#.INCLUDE : $(PRJ)$/util$/makefile.pmk JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge @@ -141,9 +140,6 @@ JAVAFILES= \ text$/TextTableHandler.java \ text$/ViewHandler.java - -#JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:s/.java/.class/)) - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk diff --git a/wizards/com/sun/star/wizards/query/makefile.mk b/wizards/com/sun/star/wizards/query/makefile.mk index af5056ba5221..b80e19e3a781 100644 --- a/wizards/com/sun/star/wizards/query/makefile.mk +++ b/wizards/com/sun/star/wizards/query/makefile.mk @@ -33,7 +33,6 @@ PACKAGE = com$/sun$/star$/wizards$/query # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -#.INCLUDE : $(PRJ)$/util$/makefile.pmk JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar commonwizards.jar CUSTOMMANIFESTFILE= MANIFEST.MF @@ -43,10 +42,6 @@ JARTARGET = $(TARGET).jar JARCLASSPATH = commonwizards.jar # --- Files -------------------------------------------------------- -#SRS2NAME = dbwizres -#SRC2FILES= dbwizres.src -#RESLIB2SRSFILES= $(SRS)$/dbwizres.srs -#RESLIB2NAME= dbw JAVAFILES= \ CallQueryWizard.java \ diff --git a/wizards/com/sun/star/wizards/report/makefile.mk b/wizards/com/sun/star/wizards/report/makefile.mk index b31639d21a46..0507e10a30d1 100644 --- a/wizards/com/sun/star/wizards/report/makefile.mk +++ b/wizards/com/sun/star/wizards/report/makefile.mk @@ -33,7 +33,6 @@ PACKAGE = com$/sun$/star$/wizards$/report # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -#.INCLUDE : $(PRJ)$/util$/makefile.pmk JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/makefile.mk b/wizards/com/sun/star/wizards/reportbuilder/layout/makefile.mk index 1af9e7c53862..3781f4246acd 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/makefile.mk +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/makefile.mk @@ -33,19 +33,13 @@ PACKAGE = com$/sun$/star$/wizards$/reportbuilder$/layout # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -#.INCLUDE : $(PRJ)$/util$/makefile.pmk JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar report.jar -# CUSTOMMANIFESTFILE= MANIFEST.MF - JARCLASSDIRS = \ com$/sun$/star$/wizards$/reportbuilder$/layout \ com$/sun$/star$/wizards$/report -# JARTARGET = $(TARGET).jar -# JARCLASSPATH = commonwizards.jar report.jar - # --- Files -------------------------------------------------------- JAVAFILES= \ diff --git a/wizards/com/sun/star/wizards/reportbuilder/makefile.mk b/wizards/com/sun/star/wizards/reportbuilder/makefile.mk index d9a1a7447fe8..41e4d3cd9c79 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/makefile.mk +++ b/wizards/com/sun/star/wizards/reportbuilder/makefile.mk @@ -33,12 +33,9 @@ PACKAGE = com$/sun$/star$/wizards$/reportbuilder # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -#.INCLUDE : $(PRJ)$/util$/makefile.pmk JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar report.jar -# CUSTOMMANIFESTFILE= Manifest.mf - JARCLASSDIRS = com$/sun$/star$/wizards$/reportbuilder JARTARGET = $(TARGET).jar JARCLASSPATH = commonwizards.jar report.jar diff --git a/wizards/com/sun/star/wizards/table/makefile.mk b/wizards/com/sun/star/wizards/table/makefile.mk index c0d62baa7cac..90bb7167c0f4 100644 --- a/wizards/com/sun/star/wizards/table/makefile.mk +++ b/wizards/com/sun/star/wizards/table/makefile.mk @@ -32,7 +32,6 @@ PACKAGE = com$/sun$/star$/wizards$/table # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -#.INCLUDE : $(PRJ)$/util$/makefile.pmk JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar CUSTOMMANIFESTFILE= MANIFEST.MF @@ -42,10 +41,6 @@ JARTARGET = $(TARGET).jar JARCLASSPATH = commonwizards.jar # --- Files -------------------------------------------------------- -#SRS2NAME = dbwizres -#SRC2FILES= dbwizres.src -#RESLIB2SRSFILES= $(SRS)$/dbwizres.srs -#RESLIB2NAME= dbw JAVAFILES= \ CallTableWizard.java \ diff --git a/wizards/com/sun/star/wizards/web/data/makefile.mk b/wizards/com/sun/star/wizards/web/data/makefile.mk index 1bfc02cf8351..17a78f063246 100644 --- a/wizards/com/sun/star/wizards/web/data/makefile.mk +++ b/wizards/com/sun/star/wizards/web/data/makefile.mk @@ -34,7 +34,6 @@ PACKAGE = com$/sun$/star$/wizards$/web$/data .INCLUDE : settings.mk -#.INCLUDE : $(PRJ)$/util$/makefile.pmk JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar .IF "$(SYSTEM_SAXON)" == "YES" @@ -43,9 +42,6 @@ EXTRAJARFILES = $(SAXON_JAR) JARFILES += saxon9.jar .ENDIF -#JARCLASSDIRS = com$/sun$/star$/wizards$/web -#JARTARGET = $(TARGET).jar - # --- Files -------------------------------------------------------- JAVAFILES= \ diff --git a/wizards/com/sun/star/wizards/web/export/makefile.mk b/wizards/com/sun/star/wizards/web/export/makefile.mk index 46cd65044e81..c898fdfce964 100644 --- a/wizards/com/sun/star/wizards/web/export/makefile.mk +++ b/wizards/com/sun/star/wizards/web/export/makefile.mk @@ -34,7 +34,6 @@ PACKAGE = com$/sun$/star$/wizards$/web$/export .INCLUDE : settings.mk -#.INCLUDE : $(PRJ)$/util$/makefile.pmk JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar java_uno_accessbridge commonwizards.jar .IF "$(SYSTEM_SAXON)" == "YES" @@ -43,9 +42,6 @@ EXTRAJARFILES = $(SAXON_JAR) JARFILES += saxon9.jar .ENDIF -#JARCLASSDIRS = com$/sun$/star$/wizards$/web -#JARTARGET = $(TARGET).jar - # --- Files -------------------------------------------------------- JAVAFILES= \ diff --git a/wizards/com/sun/star/wizards/web/makefile.mk b/wizards/com/sun/star/wizards/web/makefile.mk index 9cc97e1b88ab..3601b2eb622c 100644 --- a/wizards/com/sun/star/wizards/web/makefile.mk +++ b/wizards/com/sun/star/wizards/web/makefile.mk @@ -33,7 +33,7 @@ PACKAGE = com$/sun$/star$/wizards$/web # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -#.INCLUDE : $(PRJ)$/util$/makefile.pmk + JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar .IF "$(SYSTEM_SAXON)" == "YES" -- 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 -------- wizards/util/target.pmk | 2 +- 3 files changed, 1 insertion(+), 23 deletions(-) (limited to 'wizards') 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 diff --git a/wizards/util/target.pmk b/wizards/util/target.pmk index c44093461234..59a7066d85ff 100644 --- a/wizards/util/target.pmk +++ b/wizards/util/target.pmk @@ -24,6 +24,7 @@ # for a copy of the LGPLv3 License. # #************************************************************************* + CONFIG_ALL_TARGET = basicusr CONFIG_SHARE_TARGET = basicshare EURO_ALL_TARGET = basicsrveuro @@ -38,4 +39,3 @@ DEPOT_ALL_TARGET = basicsrvdepot STANDARD_ALL_TARGET = basicsrvstandard LAUNCHER_ALL_TARGET = basicsrvlauncher TUTORIALS_ALL_TARGET = basicsrvtutorials - -- cgit From 842bfb16f710a624eb48294e5410e9944160c70d Mon Sep 17 00:00:00 2001 From: Guillaume Poussel Date: Tue, 8 Feb 2011 08:48:59 +0100 Subject: Remove useless comments in components. --- wizards/com/sun/star/wizards/common/UCB.java | 6 ------ wizards/com/sun/star/wizards/ui/UIConsts.java | 7 +------ wizards/com/sun/star/wizards/web/LogTaskListener.java | 7 +------ wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java | 6 ------ wizards/com/sun/star/wizards/web/export/CopyExporter.java | 7 +------ wizards/com/sun/star/wizards/web/status/ErrorLog.java | 7 +------ wizards/com/sun/star/wizards/web/status/ErrorReporter.java | 7 +------ wizards/com/sun/star/wizards/web/status/LogTaskListener.java | 7 +------ wizards/com/sun/star/wizards/web/status/Task.java | 7 +------ wizards/com/sun/star/wizards/web/status/TaskEvent.java | 7 +------ wizards/com/sun/star/wizards/web/status/TaskListener.java | 7 +------ 11 files changed, 9 insertions(+), 66 deletions(-) (limited to 'wizards') diff --git a/wizards/com/sun/star/wizards/common/UCB.java b/wizards/com/sun/star/wizards/common/UCB.java index 5e3ad00698df..cb7ff9e815d7 100644 --- a/wizards/com/sun/star/wizards/common/UCB.java +++ b/wizards/com/sun/star/wizards/common/UCB.java @@ -26,12 +26,6 @@ * ************************************************************************/ -/* - * Created on 31.10.2003 - * - * To change the template for this generated file go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ package com.sun.star.wizards.common; import java.util.List; diff --git a/wizards/com/sun/star/wizards/ui/UIConsts.java b/wizards/com/sun/star/wizards/ui/UIConsts.java index bac864ecd09c..3115413035b6 100644 --- a/wizards/com/sun/star/wizards/ui/UIConsts.java +++ b/wizards/com/sun/star/wizards/ui/UIConsts.java @@ -1,9 +1,4 @@ -/* - * Created on 14.11.2003 - * - * To change the template for this generated file go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ + package com.sun.star.wizards.ui; /** diff --git a/wizards/com/sun/star/wizards/web/LogTaskListener.java b/wizards/com/sun/star/wizards/web/LogTaskListener.java index f1814f9e4cb6..e384e12737cb 100644 --- a/wizards/com/sun/star/wizards/web/LogTaskListener.java +++ b/wizards/com/sun/star/wizards/web/LogTaskListener.java @@ -25,12 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -/* - * Created on 04.11.2003 - * - * To change the template for this generated file go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ + package com.sun.star.wizards.web; import java.io.PrintStream; diff --git a/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java b/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java index de13a8c31bbe..fcc2d21f57d8 100644 --- a/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java +++ b/wizards/com/sun/star/wizards/web/export/ConfiguredExporter.java @@ -26,12 +26,6 @@ * ************************************************************************/ -/* - * Created on 31.10.2003 - * - * To change the template for this generated file go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ package com.sun.star.wizards.web.export; import java.util.Iterator; diff --git a/wizards/com/sun/star/wizards/web/export/CopyExporter.java b/wizards/com/sun/star/wizards/web/export/CopyExporter.java index f620e3b106d3..c2d5501d91d0 100644 --- a/wizards/com/sun/star/wizards/web/export/CopyExporter.java +++ b/wizards/com/sun/star/wizards/web/export/CopyExporter.java @@ -25,12 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -/* - * Created on 17.10.2003 - * - * To change the template for this generated file go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ + package com.sun.star.wizards.web.export; import com.sun.star.lang.XMultiServiceFactory; diff --git a/wizards/com/sun/star/wizards/web/status/ErrorLog.java b/wizards/com/sun/star/wizards/web/status/ErrorLog.java index d039fa5c64a3..a0448858c259 100644 --- a/wizards/com/sun/star/wizards/web/status/ErrorLog.java +++ b/wizards/com/sun/star/wizards/web/status/ErrorLog.java @@ -25,12 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -/* - * Created on 04.11.2003 - * - * To change the template for this generated file go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ + package com.sun.star.wizards.web.status; import java.util.List; diff --git a/wizards/com/sun/star/wizards/web/status/ErrorReporter.java b/wizards/com/sun/star/wizards/web/status/ErrorReporter.java index 4d967e24f3df..8f5eff93113c 100644 --- a/wizards/com/sun/star/wizards/web/status/ErrorReporter.java +++ b/wizards/com/sun/star/wizards/web/status/ErrorReporter.java @@ -25,12 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -/* - * Created on 14.10.2003 - * - * To change the template for this generated file go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ + package com.sun.star.wizards.web.status; /** diff --git a/wizards/com/sun/star/wizards/web/status/LogTaskListener.java b/wizards/com/sun/star/wizards/web/status/LogTaskListener.java index d4109da3406f..00ef6b2af3b4 100644 --- a/wizards/com/sun/star/wizards/web/status/LogTaskListener.java +++ b/wizards/com/sun/star/wizards/web/status/LogTaskListener.java @@ -25,12 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -/* - * Created on 04.11.2003 - * - * To change the template for this generated file go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ + package com.sun.star.wizards.web.status; import java.io.PrintStream; diff --git a/wizards/com/sun/star/wizards/web/status/Task.java b/wizards/com/sun/star/wizards/web/status/Task.java index 0fb0bf494286..ca01f9562889 100644 --- a/wizards/com/sun/star/wizards/web/status/Task.java +++ b/wizards/com/sun/star/wizards/web/status/Task.java @@ -25,12 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -/* - * Created on 17.10.2003 - * - * To change the template for this generated file go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ + package com.sun.star.wizards.web.status; import java.util.List; diff --git a/wizards/com/sun/star/wizards/web/status/TaskEvent.java b/wizards/com/sun/star/wizards/web/status/TaskEvent.java index dd1d06c1938a..1f86e6aa18f0 100644 --- a/wizards/com/sun/star/wizards/web/status/TaskEvent.java +++ b/wizards/com/sun/star/wizards/web/status/TaskEvent.java @@ -25,12 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -/* - * Created on 04.11.2003 - * - * To change the template for this generated file go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ + package com.sun.star.wizards.web.status; import java.util.EventObject; diff --git a/wizards/com/sun/star/wizards/web/status/TaskListener.java b/wizards/com/sun/star/wizards/web/status/TaskListener.java index 63745bf83a62..25d89e9d111b 100644 --- a/wizards/com/sun/star/wizards/web/status/TaskListener.java +++ b/wizards/com/sun/star/wizards/web/status/TaskListener.java @@ -25,12 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -/* - * Created on 04.11.2003 - * - * To change the template for this generated file go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ + package com.sun.star.wizards.web.status; import java.util.EventListener; -- cgit From adad15cff931b6c56862aa1b234efd7b71fb93af Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Wed, 23 Mar 2011 19:50:53 +0100 Subject: set build depencencies against the new "translations" module --- wizards/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wizards') diff --git a/wizards/prj/build.lst b/wizards/prj/build.lst index e0d94b1c1e4d..0b8b1e0fc21f 100644 --- a/wizards/prj/build.lst +++ b/wizards/prj/build.lst @@ -1,4 +1,4 @@ -wz wizards : L10N:l10n rsc javaunohelper unoil LIBXSLT:libxslt NULL +wz wizards : TRANSLATIONS:translations rsc javaunohelper unoil LIBXSLT:libxslt NULL wz wizards\util nmake - all wz_util NULL wz wizards\source\config nmake - all wz_config NULL wz wizards\source\configshare nmake - all wz_configshare NULL -- cgit From b44c411b9f0d81cbd3397172a74010af39a568bd Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 1 Apr 2011 10:03:59 +0100 Subject: sync this with STR_ARR_SVT_LANGUAGE_TABLE to get letter wizard working --- wizards/com/sun/star/wizards/letter/LocaleCodes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wizards') diff --git a/wizards/com/sun/star/wizards/letter/LocaleCodes.java b/wizards/com/sun/star/wizards/letter/LocaleCodes.java index 82994f40dc6b..819a92c997ad 100644 --- a/wizards/com/sun/star/wizards/letter/LocaleCodes.java +++ b/wizards/com/sun/star/wizards/letter/LocaleCodes.java @@ -41,7 +41,7 @@ public class LocaleCodes extends Resource public LocaleCodes(XMultiServiceFactory xmsf) { super(xmsf, UNIT_NAME, MODULE_NAME); - allLanguageStrings = getStringList(16635); // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src + allLanguageStrings = getStringList(16633); // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src } public String getLanguageString(String MSID) -- cgit From a2c8d5f20827cf218888abe03bff343e3d9a2b95 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 4 Apr 2011 12:51:55 +0200 Subject: Change Spanish MSID from 0x040a to 0xc0a so it can appear in the language list of letter wizard 0xc0a is the preferred code anyway (see #i94435#) --- wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.java | 0 wizards/com/sun/star/wizards/letter/LocaleCodes.java | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.java (limited to 'wizards') diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.java old mode 100755 new mode 100644 diff --git a/wizards/com/sun/star/wizards/letter/LocaleCodes.java b/wizards/com/sun/star/wizards/letter/LocaleCodes.java index 819a92c997ad..e9849812d01a 100644 --- a/wizards/com/sun/star/wizards/letter/LocaleCodes.java +++ b/wizards/com/sun/star/wizards/letter/LocaleCodes.java @@ -158,7 +158,7 @@ public class LocaleCodes extends Resource Ids[94] = "Slovenian;sl;1060"; Ids[95] = "Slovak;sk;1051"; Ids[96] = "Sorbian;sb;1070"; - Ids[97] = "Spanish - Spain;es-es;1034"; + Ids[97] = "Spanish - Spain;es-es;3082"; Ids[98] = "Spanish - Argentina;es-ar;11274"; Ids[99] = "Spanish - Bolivia;es-bo;16394"; Ids[100] = "Spanish - Chile;es-cl;13322"; -- cgit From d1591756b08e5d08fa20b386ad38685db885fa6d Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Sat, 16 Apr 2011 21:58:56 +0200 Subject: do not ship Letter Wizard templates twice fdo#35722 --- .../wizards/letter/LetterWizardDialogImpl.java | 54 +--------------------- 1 file changed, 1 insertion(+), 53 deletions(-) (limited to 'wizards') diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java index 295d900bdec6..482e4a82c07d 100644 --- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java +++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java @@ -1116,14 +1116,6 @@ public class LetterWizardDialogImpl extends LetterWizardDialog { "", "" }; - String[] nameList1 = - { - "", "" - }; - String[] nameList1b = - { - "", "" - }; String[] nameList2 = { "", "" @@ -1146,47 +1138,13 @@ public class LetterWizardDialogImpl extends LetterWizardDialog sMainPath = FileAccess.deleteLastSlashfromUrl(sMainPath); sLetterPath = sMainPath + sLetterSubPath; - //sLetterLangPackPath = FileAccess.combinePaths(xMSF, sTemplatePath, sLetterSubPath); XInterface xInterface = (XInterface) xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess"); com.sun.star.ucb.XSimpleFileAccess xSimpleFileAccess = (com.sun.star.ucb.XSimpleFileAccess) UnoRuntime.queryInterface(com.sun.star.ucb.XSimpleFileAccess.class, xInterface); - nameList1 = xSimpleFileAccess.getFolderContents(sMainPath, true); nameList2 = xSimpleFileAccess.getFolderContents(sLetterPath, true); - for (int i = 0; i < nameList1.length; i++) - { - String theFileName = FileAccess.getFilename(nameList1[i]); - if (!theFileName.equalsIgnoreCase("wizard")) - { - sLocLetterPath = FileAccess.deleteLastSlashfromUrl(nameList1[i] + sLetterSubPath); - try - { - nameList1b = xSimpleFileAccess.getFolderContents(sLocLetterPath, true); - for (int j = 0; j < nameList1b.length; j++) - { - String theFileNameb = FileAccess.getFilename(nameList1b[j]); - allPaths.add(nameList1[i] + sLetterSubPath + theFileNameb); - } - } - catch (Exception e) - { - //if the path is invalid an exception is thrown - try the fallback below then - } - } - } for (int i = 0; i < nameList2.length; i++) { - boolean found = false; - for (int t = 0; t < nameList1.length; t++) - { - if (FileAccess.getFilename(nameList2[i]).equalsIgnoreCase(FileAccess.getFilename(nameList1[t]))) - { - found = true; - } - } - if (!found) - { - allPaths.add(nameList2[i]); - } + allPaths.add(nameList2[i]); } nameList = allPaths.toArray(); @@ -1248,12 +1206,6 @@ public class LetterWizardDialogImpl extends LetterWizardDialog NormsVector.add(cIsoCode); NormsPathVector.add((String) nameList[i]); LanguageLabelsVector.add(lc.getLanguageString(MSID)); - /* - Norms[z] = cIsoCode; - NormPaths[z] = (String) nameList[i]; - LanguageLabels[z] = lc.getLanguageString(MSID); - z++; - **/ } } @@ -1267,10 +1219,6 @@ public class LetterWizardDialogImpl extends LetterWizardDialog LanguageLabels = new String[LanguageLabelsVector.size()]; LanguageLabelsVector.toArray(LanguageLabels); - //Norms = new String[nameList.length]; - //NormPaths = new String[nameList.length]; - //LanguageLabels = new String[Norms.length]; - setControlProperty("lstLetterNorm", "StringItemList", LanguageLabels); } -- cgit From 0be571d9a673ab48fc7d3a94541c5720e0845016 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Sat, 16 Apr 2011 21:58:56 +0200 Subject: do not ship Letter Wizard templates twice fdo#35722 --- .../wizards/letter/LetterWizardDialogImpl.java | 54 +--------------------- 1 file changed, 1 insertion(+), 53 deletions(-) (limited to 'wizards') diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java index 295d900bdec6..482e4a82c07d 100644 --- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java +++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java @@ -1116,14 +1116,6 @@ public class LetterWizardDialogImpl extends LetterWizardDialog { "", "" }; - String[] nameList1 = - { - "", "" - }; - String[] nameList1b = - { - "", "" - }; String[] nameList2 = { "", "" @@ -1146,47 +1138,13 @@ public class LetterWizardDialogImpl extends LetterWizardDialog sMainPath = FileAccess.deleteLastSlashfromUrl(sMainPath); sLetterPath = sMainPath + sLetterSubPath; - //sLetterLangPackPath = FileAccess.combinePaths(xMSF, sTemplatePath, sLetterSubPath); XInterface xInterface = (XInterface) xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess"); com.sun.star.ucb.XSimpleFileAccess xSimpleFileAccess = (com.sun.star.ucb.XSimpleFileAccess) UnoRuntime.queryInterface(com.sun.star.ucb.XSimpleFileAccess.class, xInterface); - nameList1 = xSimpleFileAccess.getFolderContents(sMainPath, true); nameList2 = xSimpleFileAccess.getFolderContents(sLetterPath, true); - for (int i = 0; i < nameList1.length; i++) - { - String theFileName = FileAccess.getFilename(nameList1[i]); - if (!theFileName.equalsIgnoreCase("wizard")) - { - sLocLetterPath = FileAccess.deleteLastSlashfromUrl(nameList1[i] + sLetterSubPath); - try - { - nameList1b = xSimpleFileAccess.getFolderContents(sLocLetterPath, true); - for (int j = 0; j < nameList1b.length; j++) - { - String theFileNameb = FileAccess.getFilename(nameList1b[j]); - allPaths.add(nameList1[i] + sLetterSubPath + theFileNameb); - } - } - catch (Exception e) - { - //if the path is invalid an exception is thrown - try the fallback below then - } - } - } for (int i = 0; i < nameList2.length; i++) { - boolean found = false; - for (int t = 0; t < nameList1.length; t++) - { - if (FileAccess.getFilename(nameList2[i]).equalsIgnoreCase(FileAccess.getFilename(nameList1[t]))) - { - found = true; - } - } - if (!found) - { - allPaths.add(nameList2[i]); - } + allPaths.add(nameList2[i]); } nameList = allPaths.toArray(); @@ -1248,12 +1206,6 @@ public class LetterWizardDialogImpl extends LetterWizardDialog NormsVector.add(cIsoCode); NormsPathVector.add((String) nameList[i]); LanguageLabelsVector.add(lc.getLanguageString(MSID)); - /* - Norms[z] = cIsoCode; - NormPaths[z] = (String) nameList[i]; - LanguageLabels[z] = lc.getLanguageString(MSID); - z++; - **/ } } @@ -1267,10 +1219,6 @@ public class LetterWizardDialogImpl extends LetterWizardDialog LanguageLabels = new String[LanguageLabelsVector.size()]; LanguageLabelsVector.toArray(LanguageLabels); - //Norms = new String[nameList.length]; - //NormPaths = new String[nameList.length]; - //LanguageLabels = new String[Norms.length]; - setControlProperty("lstLetterNorm", "StringItemList", LanguageLabels); } -- cgit From 737ef925ccb32ff5fdba07061e4407586461832d Mon Sep 17 00:00:00 2001 From: Júlio Hoffimann Date: Fri, 22 Apr 2011 07:55:30 -0300 Subject: left arrow comments removed // <-- --- wizards/com/sun/star/wizards/document/TimeStampControl.java | 2 -- 1 file changed, 2 deletions(-) (limited to 'wizards') diff --git a/wizards/com/sun/star/wizards/document/TimeStampControl.java b/wizards/com/sun/star/wizards/document/TimeStampControl.java index 88733ee883c1..fb5c328aef23 100644 --- a/wizards/com/sun/star/wizards/document/TimeStampControl.java +++ b/wizards/com/sun/star/wizards/document/TimeStampControl.java @@ -150,14 +150,12 @@ public class TimeStampControl extends DatabaseControl { // --> TESTING Point aBeforePt = xShapeGroup.getPosition(); - // <-- xShapeGroup.setPosition(_aPoint); // oDateControl.xShape.setPosition(_aPoint); // Point atimepoint = new Point(oDateControl.xShape.getPosition().X + oDateControl.xShape.getSize().Width, oDateControl.xShape.getPosition().Y ); // oTimeControl.xShape.setPosition(atimepoint); // --> TESTING Point aAfterPt = xShapeGroup.getPosition(); - // <-- } public int getControlType() -- 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') 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 From d32db65e8ffb848e23d6521550aeaa3f210fe9de Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 3 Jun 2011 13:25:56 +0300 Subject: Drop %_EXT% which was always empty --- wizards/prj/d.lst | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'wizards') diff --git a/wizards/prj/d.lst b/wizards/prj/d.lst index f8ab876ba1c1..4b00b6ed5b45 100644 --- a/wizards/prj/d.lst +++ b/wizards/prj/d.lst @@ -1,23 +1,23 @@ -mkdir: %COMMON_DEST%\bin%_EXT%\hid -mkdir: %_DEST%\pck%_EXT% -..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid -..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip - ..\%__SRC%\bin\wzi*.res %_DEST%\bin%_EXT%\wzi*.res -..\%__SRC%\bin\dbw*.res %_DEST%\bin%_EXT%\dbw*.res -..\%__SRC%\bin\tpl*.res %_DEST%\bin%_EXT%\tpl*.res -..\%__SRC%\bin\imp*.res %_DEST%\bin%_EXT%\imp*.res -..\%__SRC%\bin\wwz*.res %_DEST%\bin%_EXT%\wwz*.res -..\%__SRC%\bin\eur*.res %_DEST%\bin%_EXT%\eur*.res -..\%__SRC%\bin\cal*.res %_DEST%\bin%_EXT%\cal*.res -..\%__SRC%\bin\com*.res %_DEST%\bin%_EXT%\com*.res -REM ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res +mkdir: %COMMON_DEST%\bin\hid +mkdir: %_DEST%\pck +..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid +..\%__SRC%\bin\*.zip %_DEST%\pck\*.zip + ..\%__SRC%\bin\wzi*.res %_DEST%\bin\wzi*.res +..\%__SRC%\bin\dbw*.res %_DEST%\bin\dbw*.res +..\%__SRC%\bin\tpl*.res %_DEST%\bin\tpl*.res +..\%__SRC%\bin\imp*.res %_DEST%\bin\imp*.res +..\%__SRC%\bin\wwz*.res %_DEST%\bin\wwz*.res +..\%__SRC%\bin\eur*.res %_DEST%\bin\eur*.res +..\%__SRC%\bin\cal*.res %_DEST%\bin\cal*.res +..\%__SRC%\bin\com*.res %_DEST%\bin\com*.res +REM ..\%__SRC%\bin\*.res %_DEST%\bin\*.res -..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar -..\%__SRC%\misc\agenda.component %_DEST%\xml%_EXT%\agenda.component -..\%__SRC%\misc\fax.component %_DEST%\xml%_EXT%\fax.component -..\%__SRC%\misc\form.component %_DEST%\xml%_EXT%\form.component -..\%__SRC%\misc\letter.component %_DEST%\xml%_EXT%\letter.component -..\%__SRC%\misc\query.component %_DEST%\xml%_EXT%\query.component -..\%__SRC%\misc\report.component %_DEST%\xml%_EXT%\report.component -..\%__SRC%\misc\table.component %_DEST%\xml%_EXT%\table.component -..\%__SRC%\misc\web.component %_DEST%\xml%_EXT%\web.component +..\%__SRC%\class\*.jar %_DEST%\bin\*.jar +..\%__SRC%\misc\agenda.component %_DEST%\xml\agenda.component +..\%__SRC%\misc\fax.component %_DEST%\xml\fax.component +..\%__SRC%\misc\form.component %_DEST%\xml\form.component +..\%__SRC%\misc\letter.component %_DEST%\xml\letter.component +..\%__SRC%\misc\query.component %_DEST%\xml\query.component +..\%__SRC%\misc\report.component %_DEST%\xml\report.component +..\%__SRC%\misc\table.component %_DEST%\xml\table.component +..\%__SRC%\misc\web.component %_DEST%\xml\web.component -- cgit