diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 16:55:21 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 20:21:13 -0500 |
| commit | 12343c15568dcc2c9209d8ca41fda2263122448f (patch) | |
| tree | 3212a89c6cd8ea2e0aee7103aa9669bbb8a6f307 /sc/source/ui/view/notemark.cxx | |
| parent | 99745dbcbb25b61437914c9782475d0b67a4b0bd (diff) | |
| parent | ce6308e4fad2281241bf4ca78280eba29f744d43 (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/source/ui/view/notemark.cxx')
| -rw-r--r-- | sc/source/ui/view/notemark.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index 4deb56ab61e1..f43b8e2985ab 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -49,7 +49,7 @@ ScNoteMarker::ScNoteMarker( Window* pWin, Window* pRight, Window* pBottom, Window* pDiagonal, ScDocument* pD, ScAddress aPos, const String& rUser, - const MapMode& rMap, BOOL bLeftEdge, BOOL bForce, BOOL bKeyboard ) : + const MapMode& rMap, sal_Bool bLeftEdge, sal_Bool bForce, sal_Bool bKeyboard ) : pWindow( pWin ), pRightWin( pRight ), pBottomWin( pBottom ), @@ -62,7 +62,7 @@ ScNoteMarker::ScNoteMarker( Window* pWin, Window* pRight, Window* pBottom, Windo bByKeyboard( bKeyboard ), pModel( NULL ), pObject( NULL ), - bVisible( FALSE ) + bVisible( false ) { Size aSizePixel = pWindow->GetOutputSizePixel(); if( pRightWin ) @@ -105,7 +105,7 @@ IMPL_LINK( ScNoteMarker, TimeHdl, Timer*, EMPTYARG ) rOutliner.SetRefDevice(pPrinter); } - if( SdrPage* pPage = pModel->AllocPage( FALSE ) ) + if( SdrPage* pPage = pModel->AllocPage( false ) ) { pObject = ScNoteUtil::CreateTempCaption( *pDoc, aDocPos, *pPage, aUserText, aVisRect, bLeft ); if( pObject ) @@ -115,7 +115,7 @@ IMPL_LINK( ScNoteMarker, TimeHdl, Timer*, EMPTYARG ) pModel->InsertPage( pPage ); } - bVisible = TRUE; + bVisible = sal_True; } Draw(); @@ -127,7 +127,7 @@ void lcl_DrawWin( SdrObject* pObject, Window* pWindow, const MapMode& rMap ) MapMode aOld = pWindow->GetMapMode(); pWindow->SetMapMode( rMap ); - ULONG nOldDrawMode = pWindow->GetDrawMode(); + sal_uLong nOldDrawMode = pWindow->GetDrawMode(); if ( Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) { pWindow->SetDrawMode( nOldDrawMode | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | |