diff options
Diffstat (limited to 'sw/source/filter/ascii/parasc.cxx')
-rw-r--r-- | sw/source/filter/ascii/parasc.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index 282551474e36..d95e4ed5a428 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -65,10 +65,10 @@ class SwASCIIParser const SwAsciiOptions& rOpt; SfxItemSet* pItemSet; long nFileSize; - USHORT nScript; + sal_uInt16 nScript; bool bNewDoc; - ULONG ReadChars(); + sal_uLong ReadChars(); void InsertText( const String& rStr ); public: @@ -76,12 +76,12 @@ public: int bReadNewDoc, const SwAsciiOptions& rOpts ); ~SwASCIIParser(); - ULONG CallParser(); + sal_uLong CallParser(); }; // Aufruf fuer die allg. Reader-Schnittstelle -ULONG AsciiReader::Read( SwDoc &rDoc, const String&, SwPaM &rPam, const String & ) +sal_uLong AsciiReader::Read( SwDoc &rDoc, const String&, SwPaM &rPam, const String & ) { if( !pStrm ) { @@ -97,7 +97,7 @@ ULONG AsciiReader::Read( SwDoc &rDoc, const String&, SwPaM &rPam, const String & SwASCIIParser* pParser = new SwASCIIParser( &rDoc, rPam, *pStrm, !bInsertMode, aOpt.GetASCIIOpts() ); - ULONG nRet = pParser->CallParser(); + sal_uLong nRet = pParser->CallParser(); delete pParser; // after Read reset the options @@ -159,7 +159,7 @@ SwASCIIParser::~SwASCIIParser() // Aufruf des Parsers -ULONG SwASCIIParser::CallParser() +sal_uLong SwASCIIParser::CallParser() { rInput.Seek(STREAM_SEEK_TO_END); rInput.ResetError(); @@ -190,7 +190,7 @@ ULONG SwASCIIParser::CallParser() pDoc->SetTxtFmtColl(*pPam, pColl); } - ULONG nError = ReadChars(); + sal_uLong nError = ReadChars(); if( pItemSet ) { @@ -271,7 +271,7 @@ ULONG SwASCIIParser::CallParser() return nError; } -ULONG SwASCIIParser::ReadChars() +sal_uLong SwASCIIParser::ReadChars() { sal_Unicode *pStt = 0, *pEnd = 0, *pLastStt = 0; long nReadCnt = 0, nLineLen = 0; @@ -286,7 +286,7 @@ ULONG SwASCIIParser::ReadChars() aEmpty.GetLanguage() == rOpt.GetLanguage() && aEmpty.GetParaFlags() == rOpt.GetParaFlags()) { - ULONG nLen, nOrig; + sal_uLong nLen, nOrig; nOrig = nLen = rInput.Read(pArr, ASC_BUFFLEN); CharSet eCharSet; bool bRet = SwIoSystem::IsDetectableText(pArr, nLen, &eCharSet, &bSwapUnicode); @@ -323,7 +323,7 @@ ULONG SwASCIIParser::ReadChars() } String sWork; - ULONG nArrOffset = 0; + sal_uLong nArrOffset = 0; do { if( pStt >= pEnd ) @@ -332,7 +332,7 @@ ULONG SwASCIIParser::ReadChars() InsertText( String( pLastStt )); // lese einen neuen Block ein - ULONG lGCount; + sal_uLong lGCount; if( SVSTREAM_OK != rInput.GetError() || 0 == (lGCount = rInput.Read( pArr + nArrOffset, ASC_BUFFLEN - nArrOffset ))) @@ -378,7 +378,7 @@ ULONG SwASCIIParser::ReadChars() if( bSwapUnicode ) { sal_Char* pF = pArr, *pN = pArr + 1; - for( ULONG n = 0; n < lGCount; n += 2, pF += 2, pN += 2 ) + for( sal_uLong n = 0; n < lGCount; n += 2, pF += 2, pN += 2 ) { sal_Char c = *pF; *pF = *pN; |