1 files changed, 16 insertions, 16 deletions

diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx
index c817fc2844eb..74b07b4bccc9 100644
--- a/sc/source/filter/rtf/rtfexp.cxx
+++ b/sc/source/filter/rtf/rtfexp.cxx
@@ -68,7 +68,7 @@ FltError ScFormatFilterPluginImpl::ScExportRTF( SvStream& rStrm, ScDocument* pDo
 ScRTFExport::ScRTFExport( SvStream& rStrmP, ScDocument* pDocP, const ScRange& rRangeP )
             :
             ScExportBase( rStrmP, pDocP, rRangeP ),
-            pCellX( new ULONG[ MAXCOL+2 ] )
+            pCellX( new sal_uLong[ MAXCOL+2 ] )
 {
 }
 
@@ -79,7 +79,7 @@ ScRTFExport::~ScRTFExport()
 }
 
 
-ULONG ScRTFExport::Write()
+sal_uLong ScRTFExport::Write()
 {
     rStrm << '{' << OOO_STRING_SVTOOLS_RTF_RTF;
     rStrm << OOO_STRING_SVTOOLS_RTF_ANSI << sNewLine;
@@ -106,10 +106,10 @@ ULONG ScRTFExport::Write()
     // hier kaeme die colortbl
 
     // stylesheet
-    UINT32 nFontHeight =
+    sal_uInt32 nFontHeight =
         ((const SvxFontHeightItem&)(rSetPara.Get( ATTR_FONT_HEIGHT ))).GetHeight();
     rStrm << '{' << OOO_STRING_SVTOOLS_RTF_STYLESHEET
-        << '{' << OOO_STRING_SVTOOLS_RTF_FS << String( UINT32(nFontHeight / TWIPS_PER_POINT) ).GetStr()
+        << '{' << OOO_STRING_SVTOOLS_RTF_FS << String( sal_uInt32(nFontHeight / TWIPS_PER_POINT) ).GetStr()
             << ' ' << pStyleSheet->GetName().GetStr() << ";}"
         << '}' << sNewLine;
 */
@@ -133,7 +133,7 @@ void ScRTFExport::WriteTab( SCTAB nTab )
     rStrm << '{' << sNewLine;
     if ( pDoc->HasTable( nTab ) )
     {
-        memset( &pCellX[0], 0, (MAXCOL+2) * sizeof(ULONG) );
+        memset( &pCellX[0], 0, (MAXCOL+2) * sizeof(sal_uLong) );
         SCCOL nCol;
         SCCOL nEndCol = aRange.aEnd.Col();
         for ( nCol = aRange.aStart.Col(); nCol <= nEndCol; nCol++ )
@@ -191,7 +191,7 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
     }
     rStrm << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN << OOO_STRING_SVTOOLS_RTF_INTBL << sNewLine;
 
-    ULONG nStrmPos = rStrm.Tell();
+    sal_uLong nStrmPos = rStrm.Tell();
     for ( nCol = aRange.aStart.Col(); nCol <= nEndCol; nCol++ )
     {
         WriteCell( nTab, nRow, nCol );
@@ -218,18 +218,18 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol )
 
     ScBaseCell* pCell;
     pDoc->GetCell( nCol, nRow, nTab, pCell );
-    BOOL bValueData;
+    sal_Bool bValueData;
     String aContent;
     if ( pCell )
     {
         switch ( pCell->GetCellType() )
         {
             case CELLTYPE_NOTE :
-                bValueData = FALSE;
+                bValueData = sal_False;
             break;      // nix
             case CELLTYPE_EDIT :
             {
-                bValueData = FALSE;
+                bValueData = sal_False;
                 EditEngine& rEngine = GetEditEngine();
                 const EditTextObject* pObj;
                 ((const ScEditCell*)pCell)->GetData( pObj );
@@ -243,17 +243,17 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol )
             default:
             {
                 bValueData = pCell->HasValueData();
-                ULONG nFormat = pAttr->GetNumberFormat( pFormatter );
+                sal_uLong nFormat = pAttr->GetNumberFormat( pFormatter );
                 Color* pColor;
                 ScCellFormat::GetString( pCell, nFormat, aContent, &pColor, *pFormatter );
             }
         }
     }
     else
-        bValueData = FALSE;
+        bValueData = sal_False;
 
-    BOOL bResetPar, bResetAttr;
-    bResetPar = bResetAttr = FALSE;
+    sal_Bool bResetPar, bResetAttr;
+    bResetPar = bResetAttr = sal_False;
 
     const SvxHorJustifyItem&    rHorJustifyItem = (const SvxHorJustifyItem&)pAttr->GetItem( ATTR_HOR_JUSTIFY );
     const SvxWeightItem&        rWeightItem     = (const SvxWeightItem&)    pAttr->GetItem( ATTR_FONT_WEIGHT );
@@ -278,17 +278,17 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol )
 
     if ( rWeightItem.GetWeight() >= WEIGHT_BOLD )
     {   // bold
-        bResetAttr = TRUE;
+        bResetAttr = sal_True;
         rStrm << OOO_STRING_SVTOOLS_RTF_B;
     }
     if ( rPostureItem.GetPosture() != ITALIC_NONE )
     {   // italic
-        bResetAttr = TRUE;
+        bResetAttr = sal_True;
         rStrm << OOO_STRING_SVTOOLS_RTF_I;
     }
     if ( rUnderlineItem.GetLineStyle() != UNDERLINE_NONE )
     {   // underline
-        bResetAttr = TRUE;
+        bResetAttr = sal_True;
         rStrm << OOO_STRING_SVTOOLS_RTF_UL;
     }