diff options
| author | Behrend Cornelius <bc@openoffice.org> | 2002-01-10 14:34:18 +0000 |
|---|---|---|
| committer | Behrend Cornelius <bc@openoffice.org> | 2002-01-10 14:34:18 +0000 |
| commit | ea493ae508e9a32f48b3c7b0aefa40ef58c36e92 (patch) | |
| tree | 4d184910e6e8ef58b77621f88a217aed4441c6e3 | |
| parent | ea4a6e826b01f039e0beee097ab59dbc6ac9106a (diff) | |
#96365# Now also short Monthnames with 2 characters allowed
| -rw-r--r-- | wizards/source/schedule/BankHoliday.xba | 12 | ||||
| -rw-r--r-- | wizards/source/schedule/DlgCalendar.xdl | 138 | ||||
| -rw-r--r-- | wizards/source/schedule/DlgControl.xba | 1 | ||||
| -rw-r--r-- | wizards/source/schedule/Language.xba | 1 | ||||
| -rw-r--r-- | wizards/source/schedule/LocalHolidays.xba | 27 | ||||
| -rw-r--r-- | wizards/source/schedule/OwnEvents.xba | 27 | ||||
| -rw-r--r-- | wizards/source/schedule/dialog.xlb | 6 |
7 files changed, 110 insertions, 102 deletions
diff --git a/wizards/source/schedule/BankHoliday.xba b/wizards/source/schedule/BankHoliday.xba index f2eb78ec6fcb..3446ff7ca713 100644 --- a/wizards/source/schedule/BankHoliday.xba +++ b/wizards/source/schedule/BankHoliday.xba @@ -123,11 +123,13 @@ Dim i as Integer LastIndex = Ubound(DlgCalModel.lstOwnData.StringItemList()) For i = 0 To LastIndex CurYear = CalGetYearOfEvent(i) - If (CurYear = iSelYear) Or (CurYear = 0) Then - CurMonth = CalGetMonthofEvent(i) - CurDay = CalGetDayofEvent(i) - CurEventName = CalGetNameOfEvent(i) - CalInsertBankholiday(DateSerial(CurYear, CurMonth, CurDay), CurEventName, cHolidayType_Own) + If DlgCalModel.lstOwnData.StringItemList(i) <> "" Then + If (CurYear = iSelYear) Or (CurYear = 0) Then + CurMonth = CalGetMonthofEvent(i) + CurDay = CalGetDayofEvent(i) + CurEventName = CalGetNameOfEvent(i) + CalInsertBankholiday(DateSerial(CurYear, CurMonth, CurDay), CurEventName, cHolidayType_Own) + End If End If Next End Sub diff --git a/wizards/source/schedule/DlgCalendar.xdl b/wizards/source/schedule/DlgCalendar.xdl index 2c9d3156ddc8..62e9c958aa43 100644 --- a/wizards/source/schedule/DlgCalendar.xdl +++ b/wizards/source/schedule/DlgCalendar.xdl @@ -1,71 +1,71 @@ <?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="1" dlg:help-url="HID:34700"> - <dlg:styles> - <dlg:style dlg:style-id="0" dlg:background-color="0xffffff" 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"/> - <dlg:style dlg:style-id="2" dlg:font-name="Cumberland" dlg:font-stylename="Standard" dlg:font-family="modern" dlg:font-charset="ansi"/> - </dlg:styles> - <dlg:bulletinboard> - <dlg:menulist dlg:id="lstHolidays" dlg:tab-index="0" dlg:left="6" dlg:top="17" dlg:width="95" dlg:height="12" dlg:page="1" dlg:help-url="HID:34708" dlg:spin="true"/> - <dlg:fixedline dlg:id="hlnCalendar" dlg:tab-index="1" dlg:left="6" dlg:top="36" dlg:width="95" dlg:height="8" dlg:page="1" dlg:value="hlnCalendar"/> - <dlg:radiogroup> - <dlg:radio dlg:id="optYear" dlg:tab-index="2" dlg:left="12" dlg:top="47" dlg:width="81" dlg:height="10" dlg:page="1" dlg:help-url="HID:34702" dlg:value="optYear"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Schedule.CalendarMain.CalChooseCalendar" script:language="StarBasic"/> - </dlg:radio> - <dlg:radio dlg:id="optMonth" dlg:tab-index="3" dlg:left="13" dlg:top="61" dlg:width="81" dlg:height="10" dlg:page="1" dlg:help-url="HID:34703" dlg:value="optMonth"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Schedule.CalendarMain.CalChooseCalendar" script:language="StarBasic"/> - </dlg:radio> - </dlg:radiogroup> - <dlg:text dlg:id="lblHolidays" dlg:tab-index="4" dlg:left="6" dlg:top="6" dlg:width="96" dlg:height="8" dlg:page="1" dlg:value="lblHolidays"/> - <dlg:img dlg:style-id="0" dlg:id="imgCountry" dlg:tab-index="5" dlg:left="106" dlg:top="6" dlg:width="95" dlg:height="113" dlg:page="1" dlg:help-url="HID:34701"> - <script:event script:event-name="on-mousedown" script:location="application" script:macro-name="Schedule.DlgControl.SelectState" script:language="StarBasic"/> - <script:event script:event-name="on-mouseout" script:location="application" script:macro-name="Schedule.DlgControl.MouseLeavesImage" script:language="StarBasic"/> - <script:event script:event-name="on-mousemove" script:location="application" script:macro-name="Schedule.DlgControl.CalMouseMoved" script:language="StarBasic"/> - </dlg:img> - <dlg:fixedline dlg:id="hlnTime" dlg:tab-index="6" dlg:left="5" dlg:top="78" dlg:width="95" dlg:height="8" dlg:page="1" dlg:value="hlnTime"/> - <dlg:menulist dlg:id="lstMonth" dlg:tab-index="7" dlg:left="62" dlg:top="106" dlg:width="38" dlg:height="12" dlg:page="1" dlg:help-url="HID:34705" dlg:spin="true"/> - <dlg:text dlg:id="lblYear" dlg:tab-index="8" dlg:left="12" dlg:top="91" dlg:width="46" dlg:height="8" dlg:page="1" dlg:value="lblYear"/> - <dlg:text dlg:id="lblMonth" dlg:tab-index="9" dlg:left="12" dlg:top="108" dlg:width="46" dlg:height="8" dlg:page="1" dlg:value="lblMonth"/> - <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="10" dlg:left="6" dlg:top="125" dlg:width="196" dlg:height="4"/> - <dlg:button dlg:id="cmdCancel" dlg:tab-index="11" dlg:left="6" dlg:top="136" dlg:width="50" dlg:height="14" dlg:help-url="HID:34721" dlg:value="cmdCancel"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Schedule.CalendarMain.CalcmdCancel" script:language="StarBasic"/> - </dlg:button> - <dlg:button dlg:id="cmdOwnData" dlg:tab-index="12" dlg:left="99" dlg:top="136" dlg:width="50" dlg:height="14" dlg:help-url="HID:34720" dlg:value="cmdOwnData"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Schedule.DlgControl.CalmdSwitchOwnDataOrGeneral" script:language="StarBasic"/> - </dlg:button> - <dlg:button dlg:id="cmdGoOn" dlg:tab-index="13" dlg:left="152" dlg:top="136" dlg:width="50" dlg:height="14" dlg:help-url="HID:34722" dlg:value="cmdGoOn"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Schedule.CalendarMain.CalcmdOk" script:language="StarBasic"/> - </dlg:button> - <dlg:text dlg:id="lblEvent" dlg:tab-index="14" dlg:left="12" dlg:top="17" dlg:width="67" dlg:height="8" dlg:page="2" dlg:value="lblEvent"/> - <dlg:fixedline dlg:id="hlnNewEvent" dlg:tab-index="15" dlg:left="6" dlg:top="6" dlg:width="196" dlg:height="8" dlg:page="2" dlg:value="hlnNewEvent"/> - <dlg:textfield dlg:style-id="1" dlg:id="txtEvent" dlg:tab-index="16" dlg:left="12" dlg:top="28" dlg:width="107" dlg:height="12" dlg:page="2" dlg:help-url="HID:34712"> - <script:event script:event-name="on-textchange" script:location="application" script:macro-name="Schedule.OwnEvents.CheckInsertedDates" script:language="StarBasic"/> - </dlg:textfield> - <dlg:checkbox dlg:id="chkEventOnce" dlg:tab-index="17" dlg:left="140" dlg:top="29" dlg:width="62" dlg:height="10" dlg:page="2" dlg:help-url="HID:34713" dlg:value="chkEventOnce" dlg:checked="false"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Schedule.DlgControl.ToggleYearBox" script:language="StarBasic"/> - </dlg:checkbox> - <dlg:numericfield dlg:id="txtOwnEventDay" dlg:tab-index="18" dlg:left="13" dlg:top="55" dlg:width="30" dlg:height="12" dlg:page="2" dlg:help-url="HID:34714" dlg:decimal-accuracy="0" dlg:value-min="1.0"> - <script:event script:event-name="on-textchange" script:location="application" script:macro-name="Schedule.OwnEvents.CheckInsertedDates" script:language="StarBasic"/> - </dlg:numericfield> - <dlg:menulist dlg:id="lstOwnEventMonth" dlg:tab-index="19" dlg:left="60" dlg:top="55" dlg:width="30" dlg:height="12" dlg:page="2" dlg:help-url="HID:34716" dlg:spin="true"> - <script:event script:event-name="on-itemstatechange" script:location="application" script:macro-name="Schedule.OwnEvents.GetOwnMonth" script:language="StarBasic"/> - </dlg:menulist> - <dlg:numericfield dlg:id="txtOwnEventYear" dlg:tab-index="20" dlg:left="110" dlg:top="55" dlg:width="40" dlg:height="12" dlg:page="2" dlg:help-url="HID:34718" dlg:decimal-accuracy="0" dlg:value-min="1582.0" dlg:value-max="9957.0" dlg:spin="true"> - <script:event script:event-name="on-textchange" script:location="application" script:macro-name="Schedule.OwnEvents.CheckInsertedDates" script:language="StarBasic"/> - </dlg:numericfield> - <dlg:button dlg:id="cmdInsert" dlg:tab-index="21" dlg:left="99" dlg:top="70" dlg:width="50" dlg:height="14" dlg:page="2" dlg:help-url="HID:34710" dlg:value="cmdInsert"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Schedule.OwnEvents.CalcmdInsertData" script:language="StarBasic"/> - </dlg:button> - <dlg:button dlg:id="cmdDelete" dlg:tab-index="22" dlg:left="152" dlg:top="70" dlg:width="50" dlg:height="14" dlg:page="2" dlg:help-url="HID:34711" dlg:value="cmdDelete"> - <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Schedule.DlgControl.CalcmdDeleteSelect" script:language="StarBasic"/> - </dlg:button> - <dlg:menulist dlg:style-id="2" dlg:id="lstOwnData" dlg:tab-index="23" dlg:left="12" dlg:top="86" dlg:width="190" dlg:height="34" dlg:page="2" dlg:help-url="HID:34709"> - <script:event script:event-name="on-itemstatechange" script:location="application" script:macro-name="Schedule.DlgControl.CalUpdateNewEventFrame" script:language="StarBasic"/> - </dlg:menulist> - <dlg:text dlg:id="lblEventDay" dlg:tab-index="24" dlg:left="12" dlg:top="44" dlg:width="44" dlg:height="8" dlg:page="2" dlg:value="lblEventDay"/> - <dlg:text dlg:id="lblEventMonth" dlg:tab-index="25" dlg:left="60" dlg:top="44" dlg:width="44" dlg:height="8" dlg:page="2" dlg:value="lblEventMonth"/> - <dlg:text dlg:id="lblEventYear" dlg:tab-index="26" dlg:left="110" dlg:top="44" dlg:width="59" dlg:height="8" dlg:page="2" dlg:value="lblEventYear"/> - <dlg:numericfield dlg:id="txtYear" dlg:tab-index="27" dlg:left="62" dlg:top="89" dlg:width="38" dlg:height="12" dlg:page="1" dlg:help-url="HID:34704" dlg:decimal-accuracy="0" dlg:value-min="1582.0" dlg:value-max="9957.0" dlg:spin="true"/> - </dlg:bulletinboard> - </dlg:window>
\ No newline at end of file +<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"/> + <dlg:style dlg:style-id="2" dlg:font-name="Cumberland" dlg:font-stylename="Standard" dlg:font-family="modern" dlg:font-charset="ansi"/> + </dlg:styles> + <dlg:bulletinboard> + <dlg:menulist dlg:id="lstHolidays" dlg:tab-index="0" dlg:left="6" dlg:top="17" dlg:width="95" dlg:height="12" dlg:page="1" dlg:help-url="HID:34708" dlg:spin="true"/> + <dlg:fixedline dlg:id="hlnCalendar" dlg:tab-index="1" dlg:left="6" dlg:top="36" dlg:width="95" dlg:height="8" dlg:page="1" dlg:value="hlnCalendar"/> + <dlg:radiogroup> + <dlg:radio dlg:id="optYear" dlg:tab-index="2" dlg:left="12" dlg:top="47" dlg:width="81" dlg:height="10" dlg:page="1" dlg:help-url="HID:34702" dlg:value="optYear"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Schedule.CalendarMain.CalChooseCalendar" script:language="StarBasic"/> + </dlg:radio> + <dlg:radio dlg:id="optMonth" dlg:tab-index="3" dlg:left="12" dlg:top="61" dlg:width="81" dlg:height="10" dlg:page="1" dlg:help-url="HID:34703" dlg:value="optMonth"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Schedule.CalendarMain.CalChooseCalendar" script:language="StarBasic"/> + </dlg:radio> + </dlg:radiogroup> + <dlg:text dlg:id="lblHolidays" dlg:tab-index="4" dlg:left="6" dlg:top="6" dlg:width="96" dlg:height="8" dlg:page="1" dlg:value="lblHolidays"/> + <dlg:img dlg:style-id="0" dlg:id="imgCountry" dlg:tab-index="5" dlg:left="106" dlg:top="6" dlg:width="95" dlg:height="113" dlg:page="1" dlg:help-url="HID:34701"> + <script:event script:event-name="on-mousedown" script:location="application" script:macro-name="Schedule.DlgControl.SelectState" script:language="StarBasic"/> + <script:event script:event-name="on-mouseout" script:location="application" script:macro-name="Schedule.DlgControl.MouseLeavesImage" script:language="StarBasic"/> + <script:event script:event-name="on-mousemove" script:location="application" script:macro-name="Schedule.DlgControl.CalMouseMoved" script:language="StarBasic"/> + </dlg:img> + <dlg:fixedline dlg:id="hlnTime" dlg:tab-index="6" dlg:left="5" dlg:top="78" dlg:width="95" dlg:height="8" dlg:page="1" dlg:value="hlnTime"/> + <dlg:menulist dlg:id="lstMonth" dlg:tab-index="7" dlg:left="62" dlg:top="106" dlg:width="38" dlg:height="12" dlg:page="1" dlg:help-url="HID:34705" dlg:spin="true"/> + <dlg:text dlg:id="lblYear" dlg:tab-index="8" dlg:left="12" dlg:top="91" dlg:width="46" dlg:height="8" dlg:page="1" dlg:value="lblYear"/> + <dlg:text dlg:id="lblMonth" dlg:tab-index="9" dlg:left="12" dlg:top="108" dlg:width="46" dlg:height="8" dlg:page="1" dlg:value="lblMonth"/> + <dlg:fixedline dlg:id="FixedLine1" dlg:tab-index="10" dlg:left="6" dlg:top="125" dlg:width="196" dlg:height="4"/> + <dlg:button dlg:id="cmdCancel" dlg:tab-index="11" dlg:left="6" dlg:top="136" dlg:width="50" dlg:height="14" dlg:help-url="HID:34721" dlg:value="cmdCancel"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Schedule.CalendarMain.CalcmdCancel" script:language="StarBasic"/> + </dlg:button> + <dlg:button dlg:id="cmdOwnData" dlg:tab-index="12" dlg:left="99" dlg:top="136" dlg:width="50" dlg:height="14" dlg:help-url="HID:34720" dlg:value="cmdOwnData"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Schedule.DlgControl.CalmdSwitchOwnDataOrGeneral" script:language="StarBasic"/> + </dlg:button> + <dlg:button dlg:id="cmdGoOn" dlg:tab-index="13" dlg:left="152" dlg:top="136" dlg:width="50" dlg:height="14" dlg:help-url="HID:34722" dlg:value="cmdGoOn"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Schedule.CalendarMain.CalcmdOk" script:language="StarBasic"/> + </dlg:button> + <dlg:text dlg:id="lblEvent" dlg:tab-index="14" dlg:left="12" dlg:top="17" dlg:width="67" dlg:height="8" dlg:page="2" dlg:value="lblEvent"/> + <dlg:fixedline dlg:id="hlnNewEvent" dlg:tab-index="15" dlg:left="6" dlg:top="6" dlg:width="196" dlg:height="8" dlg:page="2" dlg:value="hlnNewEvent"/> + <dlg:textfield dlg:style-id="1" dlg:id="txtEvent" dlg:tab-index="16" dlg:left="12" dlg:top="28" dlg:width="107" dlg:height="12" dlg:page="2" dlg:help-url="HID:34712"> + <script:event script:event-name="on-textchange" script:location="application" script:macro-name="Schedule.OwnEvents.CheckInsertedDates" script:language="StarBasic"/> + </dlg:textfield> + <dlg:checkbox dlg:id="chkEventOnce" dlg:tab-index="17" dlg:left="140" dlg:top="29" dlg:width="62" dlg:height="10" dlg:page="2" dlg:help-url="HID:34713" dlg:value="chkEventOnce" dlg:checked="false"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Schedule.DlgControl.ToggleYearBox" script:language="StarBasic"/> + </dlg:checkbox> + <dlg:numericfield dlg:id="txtOwnEventDay" dlg:tab-index="18" dlg:left="13" dlg:top="55" dlg:width="30" dlg:height="12" dlg:page="2" dlg:help-url="HID:34714" dlg:decimal-accuracy="0" dlg:value-min="1.0" dlg:spin="true"> + <script:event script:event-name="on-textchange" script:location="application" script:macro-name="Schedule.OwnEvents.CheckInsertedDates" script:language="StarBasic"/> + </dlg:numericfield> + <dlg:menulist dlg:id="lstOwnEventMonth" dlg:tab-index="19" dlg:left="60" dlg:top="55" dlg:width="30" dlg:height="12" dlg:page="2" dlg:help-url="HID:34716" dlg:spin="true"> + <script:event script:event-name="on-itemstatechange" script:location="application" script:macro-name="Schedule.OwnEvents.GetOwnMonth" script:language="StarBasic"/> + </dlg:menulist> + <dlg:numericfield dlg:id="txtOwnEventYear" dlg:tab-index="20" dlg:left="110" dlg:top="55" dlg:width="40" dlg:height="12" dlg:page="2" dlg:help-url="HID:34718" dlg:decimal-accuracy="0" dlg:value-min="1582.0" dlg:value-max="9957.0" dlg:spin="true"> + <script:event script:event-name="on-textchange" script:location="application" script:macro-name="Schedule.OwnEvents.CheckInsertedDates" script:language="StarBasic"/> + </dlg:numericfield> + <dlg:button dlg:id="cmdInsert" dlg:tab-index="21" dlg:left="99" dlg:top="70" dlg:width="50" dlg:height="14" dlg:page="2" dlg:help-url="HID:34710" dlg:value="cmdInsert"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Schedule.OwnEvents.CalcmdInsertData" script:language="StarBasic"/> + </dlg:button> + <dlg:button dlg:id="cmdDelete" dlg:tab-index="22" dlg:left="152" dlg:top="70" dlg:width="50" dlg:height="14" dlg:page="2" dlg:help-url="HID:34711" dlg:value="cmdDelete"> + <script:event script:event-name="on-performaction" script:location="application" script:macro-name="Schedule.DlgControl.CalcmdDeleteSelect" script:language="StarBasic"/> + </dlg:button> + <dlg:menulist dlg:style-id="2" dlg:id="lstOwnData" dlg:tab-index="23" dlg:left="12" dlg:top="86" dlg:width="190" dlg:height="34" dlg:page="2" dlg:help-url="HID:34709"> + <script:event script:event-name="on-itemstatechange" script:location="application" script:macro-name="Schedule.DlgControl.CalUpdateNewEventFrame" script:language="StarBasic"/> + </dlg:menulist> + <dlg:text dlg:id="lblEventDay" dlg:tab-index="24" dlg:left="12" dlg:top="44" dlg:width="44" dlg:height="8" dlg:page="2" dlg:value="lblEventDay"/> + <dlg:text dlg:id="lblEventMonth" dlg:tab-index="25" dlg:left="60" dlg:top="44" dlg:width="44" dlg:height="8" dlg:page="2" dlg:value="lblEventMonth"/> + <dlg:text dlg:id="lblEventYear" dlg:tab-index="26" dlg:left="110" dlg:top="44" dlg:width="59" dlg:height="8" dlg:page="2" dlg:value="lblEventYear"/> + <dlg:numericfield dlg:id="txtYear" dlg:tab-index="27" dlg:left="62" dlg:top="89" dlg:width="38" dlg:height="12" dlg:page="1" dlg:help-url="HID:34704" dlg:decimal-accuracy="0" dlg:value-min="1582.0" dlg:value-max="9957.0" dlg:spin="true"/> + </dlg:bulletinboard> +</dlg:window>
\ No newline at end of file diff --git a/wizards/source/schedule/DlgControl.xba b/wizards/source/schedule/DlgControl.xba index 5b1a6a550afd..c533d346b030 100644 --- a/wizards/source/schedule/DlgControl.xba +++ b/wizards/source/schedule/DlgControl.xba @@ -75,6 +75,7 @@ Dim ListIndex as Integer End If End Sub + Sub MouseLeavesImage bSelectbyMouseMove = True End Sub diff --git a/wizards/source/schedule/Language.xba b/wizards/source/schedule/Language.xba index eaa64d689630..d32b82f3e33e 100644 --- a/wizards/source/schedule/Language.xba +++ b/wizards/source/schedule/Language.xba @@ -83,6 +83,7 @@ Const dlgShortMonth = 1225 For i = 0 To 11 cCalLongMonthNames(i) = GetResText(dlgMonth+i) cCalShortMonthNames(i)= Left$(cCalLongMonthNames(i), 3) + cCalShortMonthNames(i)= RTrim(cCalShortMonthNames(i)) Next ' Load sheet names sCalendarTitle = GetResText(1410) diff --git a/wizards/source/schedule/LocalHolidays.xba b/wizards/source/schedule/LocalHolidays.xba index 9681d4763056..127151949612 100644 --- a/wizards/source/schedule/LocalHolidays.xba +++ b/wizards/source/schedule/LocalHolidays.xba @@ -409,12 +409,12 @@ End Function Sub FindWholeYearHolidays_CN(YearInt as Integer) CalculateChineseNewYear(YearInt) - CalInsertBankholiday(DateSerial(YearInt, 1, 1), "元旦", cHolidayType_Full) ' New Year - CalInsertBankholiday(DateSerial(YearInt, 5, 8), "妇女节", cHolidayType_Half) ' Women's Day - CalInsertBankholiday(DateSerial(YearInt, 4, 5), "清明节", cHolidayType_Half) ' Day of the deads - CalInsertBankholiday(DateSerial(YearInt, 5, 1), "劳动节", cHolidayType_Full) ' International Labour Day - CalInsertBankholiday(DateSerial(YearInt, 6, 1), "儿童节", cHolidayType_Half) ' Children's Day - CalInsertBankholiday(DateSerial(YearInt, 8, 1), "建军节", cHolidayType_Half) ' Foundation of military + CalInsertBankholiday(DateSerial(YearInt, 1, 1), "元旦", cHolidayType_Full) ' New Year + CalInsertBankholiday(DateSerial(YearInt, 5, 8), "妇女节", cHolidayType_Half) ' Women's Day + CalInsertBankholiday(DateSerial(YearInt, 4, 5), "清明节", cHolidayType_Half) ' Day of the deads + CalInsertBankholiday(DateSerial(YearInt, 5, 1), "劳动节", cHolidayType_Full) ' International Labour Day + CalInsertBankholiday(DateSerial(YearInt, 6, 1), "儿童节", cHolidayType_Half) ' Children's Day + CalInsertBankholiday(DateSerial(YearInt, 8, 1), "建军节", cHolidayType_Half) ' Foundation of military CalInsertBankholiday(DateSerial(YearInt, 10, 1), "国庆节", cHolidayType_Full) ' National festival day End Sub @@ -475,10 +475,19 @@ Dim lDate as Long lDate = DateSerial(iSelYear,2, 5) Case 2020 lDate = DateSerial(iSelYear, 1, 25) + Case Else + Exit Sub + End Select + Select Case sCurLangLocale + Case "zh" + CalInsertBankholiday(lDate-1, "春节", cHolidayType_Full) + CalInsertBankholiday(lDate, "春节", cHolidayType_Full) + CalInsertBankholiday(lDate+1, "春节", cHolidayType_Full) + Case Else + CalInsertBankholiday(lDate-1, "農曆除夕", cHolidayType_Full) + CalInsertBankholiday(lDate, "道教節", cHolidayType_Full) + CalInsertBankholiday(lDate+1, "春節", cHolidayType_Full) End Select - CalInsertBankholiday(lDate-1, "農曆除夕", cHolidayType_Full) - CalInsertBankholiday(lDate, "道教節", cHolidayType_Full) - CalInsertBankholiday(lDate+1, "春節", cHolidayType_Full) End Sub diff --git a/wizards/source/schedule/OwnEvents.xba b/wizards/source/schedule/OwnEvents.xba index 0de19ec28023..6e2f69c5a72d 100644 --- a/wizards/source/schedule/OwnEvents.xba +++ b/wizards/source/schedule/OwnEvents.xba @@ -31,17 +31,6 @@ Dim LocList() as String End Sub -Function SetFocusToControl(oTextControl as Object) - If oTextControl.Text = "" Then - Beep - oTextControl.DefaultButton = True - SetFocusToControl = True - Else - SetFocusToControl = False - End If -End Function - - Function CalCreateDateFromInput() as Date ' Generiert aus den Eingabedaten der Ereignisseite ' ein Datum im Dateserial Format, @@ -59,17 +48,23 @@ Dim EvYear as Integer End Function + Function CalCreateDateStrOfInput() as String Dim DateStr as String Dim EvMonth as Integer Dim EvDay as Integer +Dim CurMonthStr as String EvDay = DlgCalModel.txtOwnEventDay.Value If EvDay < 10 Then DateStr = "0" & EvDay & ". " Else DateStr = Cstr(EvDay) & ". " End If - DateStr = DateStr & DlgCalModel.lstOwnEventMonth.StringItemList(CurOwnMonth-1) + CurMonthStr = DlgCalModel.lstOwnEventMonth.StringItemList(CurOwnMonth-1) + If Len(CurMonthStr) = 2 Then + CurMonthStr = CurMonthStr & " " + End If + DateStr = DateStr & CurMonthStr If DlgCalModel.chkEventOnce.State = 1 And DlgCalModel.txtOwnEventYear.Value <> 0 Then DateStr = DateStr & " " + DlgCalModel.txtOwnEventYear.Value @@ -173,10 +168,7 @@ Dim CurEvDay as Integer End If End If - ' Flag zum Speichern der neuen Daten. -' If bInserted Then - bCalOwnDataChanged = True -' End If + bCalOwnDataChanged = True Call CalClearInputMask() End Sub @@ -208,6 +200,9 @@ Function CalGetMonthOfEvent(ByVal ListIndex as Integer) as Integer Dim MonthStr as String MonthStr = DlgCalModel.lstOwnData.StringItemList(ListIndex) MonthStr = Mid(MonthStr, 5, 3) + ' In chinese Short Monthnames may be only 2 characters long. + ' In this case the third character is filled up with an empty space + MonthStr = RTrim(MonthStr) CalGetMonthOfEvent = CalGetIntOfShortMonthName(MonthStr) End Function diff --git a/wizards/source/schedule/dialog.xlb b/wizards/source/schedule/dialog.xlb index f7a258bb1b7c..b1afde681e7e 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:element library:name="DlgCalendar"/> - </library:library> +<library:library xmlns:library="http://openoffice.org/2000/library" library:name="Schedule" library:readonly="true" library:passwordprotected="false"> + <library:element library:name="DlgCalendar"/> +</library:library> |