diff options
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/control/calendar.cxx | 7 | ||||
| -rw-r--r-- | svtools/workben/svdem.cxx | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 46101bc413a5..b49c53ced61a 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -467,12 +467,9 @@ void Calendar::ImplFormat() sal_Int16 nDay = maCalendarWrapper.getFirstDayOfWeek(); for ( sal_Int16 nDayOfWeek = 0; nDayOfWeek < 7; nDayOfWeek++ ) { - // Use first character of full name, since the abbreviated name may - // be roman digits or similar in some locales. Proper - // implementation would need narrow one letter month names defined - // in locale data. + // Use narrow name. String aDayOfWeek( maCalendarWrapper.getDisplayName( - i18n::CalendarDisplayIndex::DAY, nDay, 1).GetChar(0)); + i18n::CalendarDisplayIndex::DAY, nDay, 2)); long nOffX = (mnDayWidth-GetTextWidth( aDayOfWeek ))/2; if ( mnWinStyle & WB_BOLDTEXT ) nOffX++; diff --git a/svtools/workben/svdem.cxx b/svtools/workben/svdem.cxx index f459ab261e8a..3352e092125d 100644 --- a/svtools/workben/svdem.cxx +++ b/svtools/workben/svdem.cxx @@ -599,8 +599,8 @@ MyCalendar::MyCalendar( Window* pParent ) : aMenuBar.SetPopupMenu( 1, &aWeekStartMenu ); aMenuBar.SetPopupMenu( 2, &aWeekCountMenu ); sal_Int16 nDays = rCal.getNumberOfDaysInWeek(); - uno::Sequence< i18n::CalendarItem> xItems = rCal.getDays(); - const i18n::CalendarItem* pArr = xItems.getArray(); + uno::Sequence< i18n::CalendarItem2> xItems = rCal.getDays(); + const i18n::CalendarItem2* pArr = xItems.getArray(); for ( sal_Int16 i = 0; i < nDays; i++ ) aWeekStartMenu.InsertItem( 10+(sal_uInt16)i, pArr[i].FullName, MIB_AUTOCHECK | MIB_RADIOCHECK ); aWeekStartMenu.CheckItem( 10+(sal_uInt16)rCal.getFirstDayOfWeek() ); |