diff options
author | Andreas Bregas <ab@openoffice.org> | 2011-02-15 17:51:52 +0100 |
---|---|---|
committer | Andreas Bregas <ab@openoffice.org> | 2011-02-15 17:51:52 +0100 |
commit | baaee7e7f73d9831975ed576bea260efe0d56e21 (patch) | |
tree | bda205978c00451c589e50fb303d3d070f6ab5d7 /sw/source/filter/ascii | |
parent | b2fb361af3f67dc79cf93cfaf7e7a7bcad4b801a (diff) | |
parent | c50e8a2df2e04d9d2c225df0ea648f0501acc250 (diff) |
ab80: resync to m100
Diffstat (limited to 'sw/source/filter/ascii')
-rw-r--r-- | sw/source/filter/ascii/ascatr.cxx | 14 | ||||
-rw-r--r-- | sw/source/filter/ascii/parasc.cxx | 24 | ||||
-rw-r--r-- | sw/source/filter/ascii/wrtasc.cxx | 20 | ||||
-rw-r--r-- | sw/source/filter/ascii/wrtasc.hxx | 2 |
4 files changed, 30 insertions, 30 deletions
diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx index 68e6525d991d..590a63ea915f 100644 --- a/sw/source/filter/ascii/ascatr.cxx +++ b/sw/source/filter/ascii/ascatr.cxx @@ -67,7 +67,7 @@ public: void NextPos() { nAktSwPos = SearchNext( nAktSwPos + 1 ); } xub_StrLen WhereNext() const { return nAktSwPos; } - BOOL OutAttr( xub_StrLen nSwPos ); + sal_Bool OutAttr( xub_StrLen nSwPos ); }; @@ -88,7 +88,7 @@ xub_StrLen SwASC_AttrIter::SearchNext( xub_StrLen nStartPos ) // kann noch optimiert werden, wenn ausgenutzt wird, dass die TxtAttrs // nach der Anfangsposition geordnet sind. Dann muessten // allerdings noch 2 Indices gemerkt werden - for ( USHORT i = 0; i < pTxtAttrs->Count(); i++ ) + for ( sal_uInt16 i = 0; i < pTxtAttrs->Count(); i++ ) { const SwTxtAttr* pHt = (*pTxtAttrs)[i]; if (pHt->HasDummyChar()) @@ -107,19 +107,19 @@ xub_StrLen SwASC_AttrIter::SearchNext( xub_StrLen nStartPos ) } -BOOL SwASC_AttrIter::OutAttr( xub_StrLen nSwPos ) +sal_Bool SwASC_AttrIter::OutAttr( xub_StrLen nSwPos ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; const SwpHints* pTxtAttrs = rNd.GetpSwpHints(); if( pTxtAttrs ) { - USHORT i; + sal_uInt16 i; for( i = 0; i < pTxtAttrs->Count(); i++ ) { const SwTxtAttr* pHt = (*pTxtAttrs)[i]; if ( pHt->HasDummyChar() && nSwPos == *pHt->GetStart() ) { - bRet = TRUE; + bRet = sal_True; String sOut; switch( pHt->Which() ) { @@ -163,7 +163,7 @@ static Writer& OutASC_SwTxtNode( Writer& rWrt, SwCntntNode& rNode ) xub_StrLen nStrPos = rWrt.pCurPam->GetPoint()->nContent.GetIndex(); xub_StrLen nNodeEnde = rNd.Len(), nEnde = nNodeEnde; - BOOL bLastNd = rWrt.pCurPam->GetPoint()->nNode == rWrt.pCurPam->GetMark()->nNode; + sal_Bool bLastNd = rWrt.pCurPam->GetPoint()->nNode == rWrt.pCurPam->GetMark()->nNode; if( bLastNd ) nEnde = rWrt.pCurPam->GetMark()->nContent.GetIndex(); diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx index eb4927a828f7..b2e46cef10f9 100644 --- a/sw/source/filter/ascii/parasc.cxx +++ b/sw/source/filter/ascii/parasc.cxx @@ -67,10 +67,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: @@ -78,12 +78,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 ) { @@ -99,7 +99,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 @@ -151,7 +151,7 @@ SwASCIIParser::~SwASCIIParser() // Aufruf des Parsers -ULONG SwASCIIParser::CallParser() +sal_uLong SwASCIIParser::CallParser() { rInput.Seek(STREAM_SEEK_TO_END); rInput.ResetError(); @@ -182,7 +182,7 @@ ULONG SwASCIIParser::CallParser() pDoc->SetTxtFmtColl(*pPam, pColl); } - ULONG nError = ReadChars(); + sal_uLong nError = ReadChars(); if( pItemSet ) { @@ -263,7 +263,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; @@ -278,7 +278,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); @@ -315,7 +315,7 @@ ULONG SwASCIIParser::ReadChars() } String sWork; - ULONG nArrOffset = 0; + sal_uLong nArrOffset = 0; do { if( pStt >= pEnd ) @@ -324,7 +324,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 ))) @@ -370,7 +370,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; diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx index 92537c7b213b..ef8f58ebc462 100644 --- a/sw/source/filter/ascii/wrtasc.cxx +++ b/sw/source/filter/ascii/wrtasc.cxx @@ -99,7 +99,7 @@ SwASCWriter::SwASCWriter( const String& rFltNm ) SwASCWriter::~SwASCWriter() {} -ULONG SwASCWriter::WriteStream() +sal_uLong SwASCWriter::WriteStream() { sal_Char cLineEnd[ 3 ]; sal_Char* pCEnd = cLineEnd; @@ -125,7 +125,7 @@ ULONG SwASCWriter::WriteStream() SwPaM* pPam = pOrigPam; - BOOL bWriteSttTag = bUCS2_WithStartChar && + sal_Bool bWriteSttTag = bUCS2_WithStartChar && (RTL_TEXTENCODING_UCS2 == GetAsciiOptions().GetCharSet() || RTL_TEXTENCODING_UTF8 == GetAsciiOptions().GetCharSet()); @@ -134,7 +134,7 @@ ULONG SwASCWriter::WriteStream() // gebe alle Bereich des Pams in das ASC-File aus. do { - BOOL bTstFly = TRUE; + sal_Bool bTstFly = sal_True; while( pCurPam->GetPoint()->nNode.GetIndex() < pCurPam->GetMark()->nNode.GetIndex() || (pCurPam->GetPoint()->nNode.GetIndex() == pCurPam->GetMark()->nNode.GetIndex() && pCurPam->GetPoint()->nContent.GetIndex() <= pCurPam->GetMark()->nContent.GetIndex()) ) @@ -177,25 +177,25 @@ ULONG SwASCWriter::WriteStream() switch(GetAsciiOptions().GetCharSet()) { case RTL_TEXTENCODING_UTF8: - Strm() << BYTE(0xEF) << BYTE(0xBB) << - BYTE(0xBF); + Strm() << sal_uInt8(0xEF) << sal_uInt8(0xBB) << + sal_uInt8(0xBF); break; case RTL_TEXTENCODING_UCS2: //Strm().StartWritingUnicodeText(); - Strm().SetEndianSwap(FALSE); + Strm().SetEndianSwap(sal_False); #ifdef OSL_LITENDIAN - Strm() << BYTE(0xFF) << BYTE(0xFE); + Strm() << sal_uInt8(0xFF) << sal_uInt8(0xFE); #else - Strm() << BYTE(0xFE) << BYTE(0xFF); + Strm() << sal_uInt8(0xFE) << sal_uInt8(0xFF); #endif break; } - bWriteSttTag = FALSE; + bWriteSttTag = sal_False; } Out( aASCNodeFnTab, *pNd, *this ); } - bTstFly = FALSE; // eimal Testen reicht + bTstFly = sal_False; // eimal Testen reicht } if( !pCurPam->Move( fnMoveForward, fnGoNode ) ) diff --git a/sw/source/filter/ascii/wrtasc.hxx b/sw/source/filter/ascii/wrtasc.hxx index cbf9fe8dbda5..e1758e9c406a 100644 --- a/sw/source/filter/ascii/wrtasc.hxx +++ b/sw/source/filter/ascii/wrtasc.hxx @@ -39,7 +39,7 @@ class SwASCWriter : public Writer { String sLineEnd; - virtual ULONG WriteStream(); + virtual sal_uLong WriteStream(); public: SwASCWriter( const String& rFilterName ); |