removetooltypes01: #i112600# remove tooltypes from sc

1 files changed, 10 insertions, 10 deletions

diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 42f2a2d86933..abbda7b995e7 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -322,12 +322,12 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
     {
         Seek( 0 );
         mpDatStream->StartReadingUnicodeText();
-        ULONG nUniPos = mpDatStream->Tell();
+        sal_uLong nUniPos = mpDatStream->Tell();
         if ( nUniPos > 0 )
-            bPreselectUnicode = TRUE;   // read 0xfeff/0xfffe
+            bPreselectUnicode = sal_True;   // read 0xfeff/0xfffe
         else
         {
-            UINT16 n;
+            sal_uInt16 n;
             *mpDatStream >> n;
             // Assume that normal ASCII/ANSI/ISO/etc. text doesn't start with
             // control characters except CR,LF,TAB
@@ -340,7 +340,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
                     case 0x0d00 :
                     break;
                     default:
-                        bPreselectUnicode = TRUE;
+                        bPreselectUnicode = sal_True;
                 }
             }
             mpDatStream->Seek(0);
@@ -369,7 +369,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
 
     // *** text encoding ListBox ***
     // all encodings allowed, including Unicode, but subsets are excluded
-    aLbCharSet.FillFromTextEncodingTable( TRUE );
+    aLbCharSet.FillFromTextEncodingTable( sal_True );
     // Insert one "SYSTEM" entry for compatibility in AsciiOptions and system
     // independent document linkage.
     aLbCharSet.InsertTextEncoding( RTL_TEXTENCODING_DONTKNOW, aCharSetUser );
@@ -377,7 +377,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
         RTL_TEXTENCODING_UNICODE : gsl_getSystemTextEncoding() );
 
     if( nCharSet >= 0 )
-        aLbCharSet.SelectEntryPos( static_cast<USHORT>(nCharSet) );
+        aLbCharSet.SelectEntryPos( static_cast<sal_uInt16>(nCharSet) );
 
     SetSelectedCharSet();
     aLbCharSet.SetSelectHdl( LINK( this, ScImportAsciiDlg, CharSetHdl ) );
@@ -421,7 +421,7 @@ ScImportAsciiDlg::~ScImportAsciiDlg()
 
 // ----------------------------------------------------------------------------
 
-bool ScImportAsciiDlg::GetLine( ULONG nLine, String &rText )
+bool ScImportAsciiDlg::GetLine( sal_uLong nLine, String &rText )
 {
     if (nLine >= ASCIIDLG_MAXROWS || !mpDatStream)
         return false;
@@ -430,7 +430,7 @@ bool ScImportAsciiDlg::GetLine( ULONG nLine, String &rText )
     bool bFixed = aRbFixed.IsChecked();
 
     if (!mpRowPosArray)
-        mpRowPosArray = new ULONG[ASCIIDLG_MAXROWS + 2];
+        mpRowPosArray = new sal_uLong[ASCIIDLG_MAXROWS + 2];
 
     if (!mnRowPosCount) // complete re-fresh
     {
@@ -568,7 +568,7 @@ String ScImportAsciiDlg::GetSeparators() const
 
 void ScImportAsciiDlg::SetupSeparatorCtrls()
 {
-    BOOL bEnable = aRbSeparated.IsChecked();
+    sal_Bool bEnable = aRbSeparated.IsChecked();
     aCkbTab.Enable( bEnable );
     aCkbSemicolon.Enable( bEnable );
     aCkbComma.Enable( bEnable );
@@ -688,7 +688,7 @@ IMPL_LINK( ScImportAsciiDlg, UpdateTextHdl, ScCsvTableBox*, EMPTYARG )
         maPreviewLine[i].Erase();
 
     maTableBox.Execute( CSVCMD_SETLINECOUNT, mnRowPosCount);
-    bool bMergeSep = (aCkbAsOnce.IsChecked() == TRUE);
+    bool bMergeSep = (aCkbAsOnce.IsChecked() == sal_True);
     maTableBox.SetUniStrings( maPreviewLine, maFieldSeparators, mcTextSep, bMergeSep);
 
     return 0;