Skip to content

C
core
Kaydet (Commit) 09e93552 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

XubString->OUString 

Change-Id: Ie110963f0b54bd2235d088a886db3f16e397bd86
üst 7c4dcdc4
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 12 deletions
svtools/inc/svtools/calendar.hxx
Dosyayı görüntüle @ 09e93552
...@@ -162,9 +162,9 @@ private: ...@@ -162,9 +162,9 @@ private:
IntDateSet* mpSelectTable; IntDateSet* mpSelectTable;
IntDateSet* mpOldSelectTable; IntDateSet* mpOldSelectTable;
IntDateSet* mpRestoreSelectTable; IntDateSet* mpRestoreSelectTable;
XubString* mpDayText[31]; OUString maDayTexts[31];
XubString maDayText; OUString maDayText;
XubString maWeekText; OUString maWeekText;
CalendarWrapper maCalendarWrapper; CalendarWrapper maCalendarWrapper;
Rectangle maPrevRect; Rectangle maPrevRect;
Rectangle maNextRect; Rectangle maNextRect;
......
svtools/source/control/calendar.cxx
Dosyayı görüntüle @ 09e93552
...@@ -218,7 +218,7 @@ void Calendar::ImplInit( WinBits nWinStyle ) ...@@ -218,7 +218,7 @@ void Calendar::ImplInit( WinBits nWinStyle )
// Tagestexte anlegen // Tagestexte anlegen
for (sal_Int32 i = 0; i < 31; ++i) 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.SetTimeoutHdl( STATIC_LINK( this, Calendar, ScrollHdl ) );
maDragScrollTimer.SetTimeout( GetSettings().GetMouseSettings().GetScrollRepeat() ); maDragScrollTimer.SetTimeout( GetSettings().GetMouseSettings().GetScrollRepeat() );
...@@ -264,13 +264,8 @@ Calendar::~Calendar() ...@@ -264,13 +264,8 @@ Calendar::~Calendar()
delete mpSundayColor; delete mpSundayColor;
delete mpSelectTable; delete mpSelectTable;
if ( mpOldSelectTable ) delete mpOldSelectTable;
delete mpOldSelectTable; delete mpRestoreSelectTable;
if ( mpRestoreSelectTable )
delete mpRestoreSelectTable;
for ( sal_uInt16 i = 0; i < 31; i++ )
delete mpDayText[i];
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
...@@ -715,7 +710,7 @@ void Calendar::ImplDrawDate( long nX, long nY, ...@@ -715,7 +710,7 @@ void Calendar::ImplDrawDate( long nX, long nY,
sal_Bool bBack, sal_Bool bOther, sal_uLong nToday ) sal_Bool bBack, sal_Bool bOther, sal_uLong nToday )
{ {
Color* pTextColor = NULL; 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 ); Rectangle aDateRect( nX, nY, nX+mnDayWidth-1, nY+mnDayHeight-1 );
sal_Bool bSel = sal_False; sal_Bool bSel = sal_False;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment