diff options
Diffstat (limited to 'wizards/source/schedule/OwnEvents.xba')
| -rw-r--r-- | wizards/source/schedule/OwnEvents.xba | 27 |
1 files changed, 11 insertions, 16 deletions
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 |