diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-02-21 00:24:19 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-21 00:24:31 +0000 |
| commit | 09e93552bef88d0842621a7c2e48684a10075df1 (patch) | |
| tree | 0da56ee20c97cacebb5edb60e8259a2ed3ed3e60 /svtools | |
| parent | 7c4dcdc43712ed494dcbd2aa6971ce22069e1fdf (diff) | |
XubString->OUString
Change-Id: Ie110963f0b54bd2235d088a886db3f16e397bd86
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/inc/svtools/calendar.hxx | 6 | ||||
| -rw-r--r-- | svtools/source/control/calendar.cxx | 13 |
2 files changed, 7 insertions, 12 deletions
diff --git a/svtools/inc/svtools/calendar.hxx b/svtools/inc/svtools/calendar.hxx index 778f37479d32..2c41ae7ed929 100644 --- a/svtools/inc/svtools/calendar.hxx +++ b/svtools/inc/svtools/calendar.hxx @@ -162,9 +162,9 @@ private: IntDateSet* mpSelectTable; IntDateSet* mpOldSelectTable; IntDateSet* mpRestoreSelectTable; - XubString* mpDayText[31]; - XubString maDayText; - XubString maWeekText; + OUString maDayTexts[31]; + OUString maDayText; + OUString maWeekText; CalendarWrapper maCalendarWrapper; Rectangle maPrevRect; Rectangle maNextRect; diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 83955ae72505..529029ee671a 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -218,7 +218,7 @@ void Calendar::ImplInit( WinBits nWinStyle ) // Tagestexte anlegen for (sal_Int32 i = 0; i < 31; ++i) - mpDayText[i] = new String(OUString::valueOf(i+1)); + maDayTexts[i] = OUString::valueOf(i+1); maDragScrollTimer.SetTimeoutHdl( STATIC_LINK( this, Calendar, ScrollHdl ) ); maDragScrollTimer.SetTimeout( GetSettings().GetMouseSettings().GetScrollRepeat() ); @@ -264,13 +264,8 @@ Calendar::~Calendar() delete mpSundayColor; delete mpSelectTable; - if ( mpOldSelectTable ) - delete mpOldSelectTable; - if ( mpRestoreSelectTable ) - delete mpRestoreSelectTable; - - for ( sal_uInt16 i = 0; i < 31; i++ ) - delete mpDayText[i]; + delete mpOldSelectTable; + delete mpRestoreSelectTable; } // ----------------------------------------------------------------------- @@ -715,7 +710,7 @@ void Calendar::ImplDrawDate( long nX, long nY, sal_Bool bBack, sal_Bool bOther, sal_uLong nToday ) { Color* pTextColor = NULL; - const String& rDay = *(mpDayText[nDay-1]); + const OUString& rDay = maDayTexts[nDay-1]; Rectangle aDateRect( nX, nY, nX+mnDayWidth-1, nY+mnDayHeight-1 ); sal_Bool bSel = sal_False; |