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/drawvie3.cxx | |
| parent | 99745dbcbb25b61437914c9782475d0b67a4b0bd (diff) | |
| parent | ce6308e4fad2281241bf4ca78280eba29f744d43 (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/source/ui/view/drawvie3.cxx')
| -rw-r--r-- | sc/source/ui/view/drawvie3.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx index 4d6c8d84b380..400384a38712 100644 --- a/sc/source/ui/view/drawvie3.cxx +++ b/sc/source/ui/view/drawvie3.cxx @@ -49,7 +49,7 @@ void ScIMapDlgSet( const Graphic& rGraphic, const ImageMap* pImageMap, const TargetList* pTargetList, void* pEditingObj ); // imapwrap -USHORT ScIMapChildWindowId(); +sal_uInt16 ScIMapChildWindowId(); // STATIC DATA ----------------------------------------------------------- @@ -61,7 +61,7 @@ ScDrawView::ScDrawView( OutputDevice* pOut, ScViewData* pData ) : nTab( pData->GetTabNo() ), pDropMarker( NULL ), pDropMarkObj( NULL ), - bInConstruct( TRUE ) + bInConstruct( true ) { // #i73602# Use default from the configuration SetBufferedOverlayAllowed(getOptionsDrawinglayer().IsOverlayBuffer_Calc()); @@ -80,8 +80,8 @@ void ScDrawView::SetPageAnchored() if( AreObjectsMarked() ) { const SdrMarkList* pMark = &GetMarkedObjectList(); - ULONG nCount = pMark->GetMarkCount(); - for( ULONG i=0; i<nCount; i++ ) + sal_uLong nCount = pMark->GetMarkCount(); + for( sal_uLong i=0; i<nCount; i++ ) { pObj = pMark->GetMark(i)->GetMarkedSdrObj(); ScDrawLayer::SetPageAnchored( *pObj ); @@ -101,8 +101,8 @@ void ScDrawView::SetCellAnchored() if( AreObjectsMarked() ) { const SdrMarkList* pMark = &GetMarkedObjectList(); - ULONG nCount = pMark->GetMarkCount(); - for( ULONG i=0; i<nCount; i++ ) + sal_uLong nCount = pMark->GetMarkCount(); + for( sal_uLong i=0; i<nCount; i++ ) { pObj = pMark->GetMark(i)->GetMarkedSdrObj(); ScDrawLayer::SetCellAnchoredFromPosition(*pObj, *pDoc, nTab); @@ -115,21 +115,21 @@ void ScDrawView::SetCellAnchored() ScAnchorType ScDrawView::GetAnchorType() const { - BOOL bPage = FALSE; - BOOL bCell = FALSE; + sal_Bool bPage = false; + sal_Bool bCell = false; const SdrObject* pObj = NULL; if( AreObjectsMarked() ) { const SdrMarkList* pMark = &GetMarkedObjectList(); - ULONG nCount = pMark->GetMarkCount(); + sal_uLong nCount = pMark->GetMarkCount(); Point p0; - for( ULONG i=0; i<nCount; i++ ) + for( sal_uLong i=0; i<nCount; i++ ) { pObj = pMark->GetMark(i)->GetMarkedSdrObj(); if( ScDrawLayer::GetAnchorType( *pObj ) == SCA_CELL ) - bCell =TRUE; + bCell =true; else - bPage = TRUE; + bPage = sal_True; } } if( bPage && !bCell ) |