diff options
| author | Behrend Cornelius <bc@openoffice.org> | 2002-01-22 11:59:16 +0000 |
|---|---|---|
| committer | Behrend Cornelius <bc@openoffice.org> | 2002-01-22 11:59:16 +0000 |
| commit | e56b734f1b4a9f0d5e3681a2a5007ab826756fa9 (patch) | |
| tree | 10a08be07647f90eb43caf992f717130630d1a63 | |
| parent | 07bfb1fd02d22df44cefabaa490ee8f7df585331 (diff) | |
#96494# Kwanzaa Holiday thrown out
| -rw-r--r-- | wizards/source/schedule/CalendarMain.xba | 2 | ||||
| -rw-r--r-- | wizards/source/schedule/DlgCalendar.xdl | 2 | ||||
| -rw-r--r-- | wizards/source/schedule/DlgControl.xba | 1 | ||||
| -rw-r--r-- | wizards/source/schedule/Language.xba | 3 | ||||
| -rw-r--r-- | wizards/source/schedule/LocalHolidays.xba | 7 | ||||
| -rw-r--r-- | wizards/source/schedule/OwnEvents.xba | 1 | ||||
| -rw-r--r-- | wizards/source/schedule/dialog.xlb | 4 | ||||
| -rw-r--r-- | wizards/source/schedule/script.xlb | 4 |
8 files changed, 7 insertions, 17 deletions
diff --git a/wizards/source/schedule/CalendarMain.xba b/wizards/source/schedule/CalendarMain.xba index e290a5d2cb15..09ffbab99779 100644 --- a/wizards/source/schedule/CalendarMain.xba +++ b/wizards/source/schedule/CalendarMain.xba @@ -115,6 +115,8 @@ Dim iThisMonth as Integer DlgCalendar.GetControl("lstHolidays").SelectItemPos(0,True) DlgCalModel.cmdGoOn.DefaultButton = True ToggleWindow(True) + DlgCalendar.GetControl("lblHolidays").Visible = sCurLangLocale = cLANGUAGE_GERMAN + DlgCalendar.GetControl("lstHolidays").Visible = sCurLangLocale = cLANGUAGE_GERMAN fHeightCorrFactor = DlgCalendar.GetControl("imgCountry").Size.Height/198 fWidthCorrFactor = DlgCalendar.GetControl("imgCountry").Size.Width/166 DlgCalendar.Execute() diff --git a/wizards/source/schedule/DlgCalendar.xdl b/wizards/source/schedule/DlgCalendar.xdl index aa1775ce1d57..62e9c958aa43 100644 --- a/wizards/source/schedule/DlgCalendar.xdl +++ b/wizards/source/schedule/DlgCalendar.xdl @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd"> -<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog1" dlg:left="160" dlg:top="81" dlg:width="208" dlg:height="156" dlg:page="2" dlg:help-url="HID:34700"> +<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog1" dlg:left="160" dlg:top="81" dlg:width="208" dlg:height="156" dlg:page="1" dlg:help-url="HID:34700"> <dlg:styles> <dlg:style dlg:style-id="0" dlg:border="none"/> <dlg:style dlg:style-id="1" dlg:font-name="Cumberland" dlg:font-stylename="Standard" dlg:font-family="modern" dlg:font-charset="ansi"/> diff --git a/wizards/source/schedule/DlgControl.xba b/wizards/source/schedule/DlgControl.xba index 6630544e24a0..ee24f4a884a9 100644 --- a/wizards/source/schedule/DlgControl.xba +++ b/wizards/source/schedule/DlgControl.xba @@ -8,7 +8,6 @@ Public fHeightCorrFactor as Double Public fWidthCorrFactor as Double -' Todo: Adjustmentlistener an der Scrollbar anmelden Sub Main() Call CalAutopilotTable() diff --git a/wizards/source/schedule/Language.xba b/wizards/source/schedule/Language.xba index d32b82f3e33e..e49cdab5467b 100644 --- a/wizards/source/schedule/Language.xba +++ b/wizards/source/schedule/Language.xba @@ -23,9 +23,6 @@ Dim i as Integer Const dlgMonth = 1200 ' Abreviated months start 1225 Const dlgShortMonth = 1225 - DlgCalendar.GetControl("lblHolidays").Visible = LangLocale = cLANGUAGE_GERMAN - DlgCalendar.GetControl("lstHolidays").Visible = LangLocale = cLANGUAGE_GERMAN - If InitResources("schedule", "cal") Then If LangLocale = cLANGUAGE_GERMAN Then diff --git a/wizards/source/schedule/LocalHolidays.xba b/wizards/source/schedule/LocalHolidays.xba index a2c092a11a8c..8ee71b1e3446 100644 --- a/wizards/source/schedule/LocalHolidays.xba +++ b/wizards/source/schedule/LocalHolidays.xba @@ -285,12 +285,6 @@ Dim lElectDate as Long CalInsertBankholiday(DateSerial(YearInt, 12, 7), "Pearl Harbor Remembrance Day", cHolidayType_Half) CalInsertBankholiday(DateSerial(YearInt, 12, 24), "Christmas Eve", cHolidayType_Half) CalInsertBankholiday(DateSerial(YearInt, 12, 25), "Christmas Day", cHolidayType_Full) - CalInsertBankholiday(DateSerial(YearInt, 12, 26), "Kwanzaa", cHolidayType_Half) - CalInsertBankholiday(DateSerial(YearInt, 12, 27), "Kwanzaa", cHolidayType_Half) - CalInsertBankholiday(DateSerial(YearInt, 12, 28), "Kwanzaa", cHolidayType_Half) - CalInsertBankholiday(DateSerial(YearInt, 12, 29), "Kwanzaa", cHolidayType_Half) - CalInsertBankholiday(DateSerial(YearInt, 12, 30), "Kwanzaa", cHolidayType_Half) - CalInsertBankholiday(DateSerial(YearInt, 12, 31), "Kwanzaa", cHolidayType_Half) CalInsertBankholiday(DateSerial(YearInt, 12, 31), "New Year's Eve", cHolidayType_Half) CalInsertBankholiday(CalEasterTable(YearInt), "Easter Sunday", cHolidayType_Half) @@ -491,7 +485,6 @@ Dim lDate as Long End Sub -' Todo: Was passiert mit den Jahren vor 1980? Function CalculateJapaneseSpringDay(iSelYear as Integer) If (iSelYear > 1979) And (iSelYear < 2100) Then CalculateJapaneseSpringDay() = Int(20.8431 + 0.242194)* (iSelYear-1980) - (Int((iSelYear-1980)/4)) diff --git a/wizards/source/schedule/OwnEvents.xba b/wizards/source/schedule/OwnEvents.xba index 2d222d9b0bf3..0fd74ebe7dd6 100644 --- a/wizards/source/schedule/OwnEvents.xba +++ b/wizards/source/schedule/OwnEvents.xba @@ -117,7 +117,6 @@ Dim CurEvDay as Integer CurEvMonth = CalGetMonthOfEvent(i) CurEvDay = CalGetDayOfEvent(i) If DateSerial(CurEvYear, CurEvMonth, CurEvDay) = NewDate Then - ' Todo: Abchecken wie das ist mit 'Ereignis einmalig' oder nicht DlgCalendar.GetControl("lstOwnData").RemoveItems(i,1) DlgCalendar.GetControl("lstOwnData").AddItem(DateStr, i) bInserted = True diff --git a/wizards/source/schedule/dialog.xlb b/wizards/source/schedule/dialog.xlb index b1afde681e7e..c2fcee2b3f3a 100644 --- a/wizards/source/schedule/dialog.xlb +++ b/wizards/source/schedule/dialog.xlb @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd"> -<library:library xmlns:library="http://openoffice.org/2000/library" library:name="Schedule" library:readonly="true" library:passwordprotected="false"> +<library:library xmlns:library="http://openoffice.org/2000/library" library:name="Schedule" library:readonly="false" library:passwordprotected="false"> <library:element library:name="DlgCalendar"/> -</library:library> +</library:library>
\ No newline at end of file diff --git a/wizards/source/schedule/script.xlb b/wizards/source/schedule/script.xlb index 96dd8da57fc1..d6617bd7697e 100644 --- a/wizards/source/schedule/script.xlb +++ b/wizards/source/schedule/script.xlb @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE library:library PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "library.dtd"> -<library:library xmlns:library="http://openoffice.org/2000/library" library:name="Schedule" library:readonly="true" library:passwordprotected="false"> +<library:library xmlns:library="http://openoffice.org/2000/library" library:name="Schedule" library:readonly="false" library:passwordprotected="false"> <library:element library:name="OwnEvents"/> <library:element library:name="CalendarMain"/> <library:element library:name="BankHoliday"/> @@ -9,4 +9,4 @@ <library:element library:name="CreateTable"/> <library:element library:name="GermanHolidays"/> <library:element library:name="LocalHolidays"/> -</library:library> +</library:library>
\ No newline at end of file |