1 files changed, 21 insertions, 21 deletions

diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index 8b9debdabfae..76984b813063 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -71,18 +71,18 @@ Point aDragStartDiff;
 
 // -----------------------------------------------------------------------
 
-void lcl_CheckOle( const SdrMarkList& rMarkList, BOOL& rAnyOle, BOOL& rOneOle )
+void lcl_CheckOle( const SdrMarkList& rMarkList, sal_Bool& rAnyOle, sal_Bool& rOneOle )
 {
-    rAnyOle = rOneOle = FALSE;
-    ULONG nCount = rMarkList.GetMarkCount();
-    for (ULONG i=0; i<nCount; i++)
+    rAnyOle = rOneOle = sal_False;
+    sal_uLong nCount = rMarkList.GetMarkCount();
+    for (sal_uLong i=0; i<nCount; i++)
     {
         SdrMark* pMark = rMarkList.GetMark(i);
         SdrObject* pObj = pMark->GetMarkedSdrObj();
-        UINT16 nSdrObjKind = pObj->GetObjIdentifier();
+        sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier();
         if (nSdrObjKind == OBJ_OLE2)
         {
-            rAnyOle = TRUE;
+            rAnyOle = sal_True;
             rOneOle = (nCount == 1);
             break;
         }
@@ -94,8 +94,8 @@ void lcl_CheckOle( const SdrMarkList& rMarkList, BOOL& rAnyOle, BOOL& rOneOle )
             {
                 if ( pSubObj->GetObjIdentifier() == OBJ_OLE2 )
                 {
-                    rAnyOle = TRUE;
-                    // rOneOle remains FALSE - a group isn't treated like a single OLE object
+                    rAnyOle = sal_True;
+                    // rOneOle remains sal_False - a group isn't treated like a single OLE object
                     return;
                 }
                 pSubObj = aIter.Next();
@@ -107,7 +107,7 @@ void lcl_CheckOle( const SdrMarkList& rMarkList, BOOL& rAnyOle, BOOL& rOneOle )
 #if 0
 void lcl_RefreshChartData( SdrModel* pModel, ScDocument* pSourceDoc )
 {
-    USHORT nPages = pModel->GetPageCount();
+    sal_uInt16 nPages = pModel->GetPageCount();
     for (SCTAB nTab=0; nTab<nPages; nTab++)
     {
         SdrPage* pPage = pModel->GetPage(nTab);
@@ -142,9 +142,9 @@ void lcl_RefreshChartData( SdrModel* pModel, ScDocument* pSourceDoc )
 #endif
 
 
-BOOL ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos )
+sal_Bool ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos )
 {
-    BOOL bReturn = FALSE;
+    sal_Bool bReturn = sal_False;
 
     if ( AreObjectsMarked() )
     {
@@ -155,7 +155,7 @@ BOOL ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos )
 
         aDragStartDiff = rStartPos - aMarkedRect.TopLeft();
 
-        BOOL bAnyOle, bOneOle;
+        sal_Bool bAnyOle, bOneOle;
         const SdrMarkList& rMarkList = GetMarkedObjectList();
         lcl_CheckOle( rMarkList, bAnyOle, bOneOle );
 
@@ -197,7 +197,7 @@ BOOL ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos )
 
 void ScDrawView::DoCopy()
 {
-    BOOL bAnyOle, bOneOle;
+    sal_Bool bAnyOle, bOneOle;
     const SdrMarkList& rMarkList = GetMarkedObjectList();
     lcl_CheckOle( rMarkList, bAnyOle, bOneOle );
 
@@ -233,7 +233,7 @@ void ScDrawView::DoCopy()
 
 uno::Reference<datatransfer::XTransferable> ScDrawView::CopyToTransferable()
 {
-    BOOL bAnyOle, bOneOle;
+    sal_Bool bAnyOle, bOneOle;
     const SdrMarkList& rMarkList = GetMarkedObjectList();
     lcl_CheckOle( rMarkList, bAnyOle, bOneOle );
 
@@ -296,12 +296,12 @@ void ScDrawView::SetMarkedOriginalSize()
 
     const SdrMarkList& rMarkList = GetMarkedObjectList();
     long nDone = 0;
-    ULONG nCount = rMarkList.GetMarkCount();
-    for (ULONG i=0; i<nCount; i++)
+    sal_uLong nCount = rMarkList.GetMarkCount();
+    for (sal_uLong i=0; i<nCount; i++)
     {
         SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
-        USHORT nIdent = pObj->GetObjIdentifier();
-        BOOL bDo = FALSE;
+        sal_uInt16 nIdent = pObj->GetObjIdentifier();
+        sal_Bool bDo = sal_False;
         Size aOriginalSize;
         if (nIdent == OBJ_OLE2)
         {
@@ -315,7 +315,7 @@ void ScDrawView::SetMarkedOriginalSize()
                 {
                     MapMode aMapMode( MAP_100TH_MM );
                     aOriginalSize = ((SdrOle2Obj*)pObj)->GetOrigObjSize( &aMapMode );
-                    bDo = TRUE;
+                    bDo = sal_True;
                 }
                 else
                 {
@@ -327,7 +327,7 @@ void ScDrawView::SetMarkedOriginalSize()
                         aOriginalSize = OutputDevice::LogicToLogic(
                                             Size( aSz.Width, aSz.Height ),
                                             aUnit, MAP_100TH_MM );
-                        bDo = TRUE;
+                        bDo = sal_True;
                     } catch( embed::NoVisualAreaSizeException& )
                     {
                         OSL_ENSURE( sal_False, "Can't get the original size of the object!" );
@@ -357,7 +357,7 @@ void ScDrawView::SetMarkedOriginalSize()
                 {
                     aOriginalSize = pActWin->LogicToLogic(
                                     rGraphic.GetPrefSize(), &aSourceMap, &aDestMap );
-                    bDo = TRUE;
+                    bDo = sal_True;
                 }
             }
         }