summaryrefslogtreecommitdiff
path: root/sw/source/filter/ascii
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/ascii')
-rw-r--r--sw/source/filter/ascii/parasc.cxx16
-rw-r--r--sw/source/filter/ascii/wrtasc.cxx2
-rw-r--r--sw/source/filter/ascii/wrtasc.hxx2
3 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index e03ae3921ae0..ab5512b7976d 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -60,7 +60,7 @@ class SwASCIIParser
SvtScriptType nScript;
bool bNewDoc;
- sal_uLong ReadChars();
+ ErrCode ReadChars();
void InsertText( const OUString& rStr );
SwASCIIParser(const SwASCIIParser&) = delete;
@@ -71,11 +71,11 @@ public:
bool bReadNewDoc, const SwAsciiOptions& rOpts );
~SwASCIIParser();
- sal_uLong CallParser();
+ ErrCode CallParser();
};
// Call for the general reader interface
-sal_uLong AsciiReader::Read( SwDoc &rDoc, const OUString&, SwPaM &rPam, const OUString & )
+ErrCode AsciiReader::Read( SwDoc &rDoc, const OUString&, SwPaM &rPam, const OUString & )
{
if( !pStrm )
{
@@ -85,7 +85,7 @@ sal_uLong AsciiReader::Read( SwDoc &rDoc, const OUString&, SwPaM &rPam, const OU
SwASCIIParser* pParser = new SwASCIIParser( &rDoc, rPam, *pStrm,
!bInsertMode, aOpt.GetASCIIOpts() );
- sal_uLong nRet = pParser->CallParser();
+ ErrCode nRet = pParser->CallParser();
delete pParser;
// after Read reset the options
@@ -138,7 +138,7 @@ SwASCIIParser::~SwASCIIParser()
}
// Calling the parser
-sal_uLong SwASCIIParser::CallParser()
+ErrCode SwASCIIParser::CallParser()
{
rInput.Seek(STREAM_SEEK_TO_END);
rInput.ResetError();
@@ -169,7 +169,7 @@ sal_uLong SwASCIIParser::CallParser()
pDoc->SetTextFormatColl(*pPam, pColl);
}
- sal_uLong nError = ReadChars();
+ ErrCode nError = ReadChars();
if( pItemSet )
{
@@ -249,7 +249,7 @@ sal_uLong SwASCIIParser::CallParser()
return nError;
}
-sal_uLong SwASCIIParser::ReadChars()
+ErrCode SwASCIIParser::ReadChars()
{
sal_Unicode *pStt = nullptr, *pEnd = nullptr, *pLastStt = nullptr;
long nReadCnt = 0, nLineLen = 0;
@@ -291,7 +291,7 @@ sal_uLong SwASCIIParser::ReadChars()
hConverter = rtl_createTextToUnicodeConverter( currentCharSet );
OSL_ENSURE( hConverter, "no string convert available" );
if (!hConverter)
- return ERROR_SW_READ_BASE;
+ return ErrCode(ERROR_SW_READ_BASE);
bSwapUnicode = false;
hContext = rtl_createTextToUnicodeContext( hConverter );
}
diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx
index 00ed3e928fbd..7a23d1970fba 100644
--- a/sw/source/filter/ascii/wrtasc.cxx
+++ b/sw/source/filter/ascii/wrtasc.cxx
@@ -83,7 +83,7 @@ SwASCWriter::SwASCWriter( const OUString& rFltNm )
SwASCWriter::~SwASCWriter() {}
-sal_uLong SwASCWriter::WriteStream()
+ErrCode SwASCWriter::WriteStream()
{
if( bASCII_ParaAsCR ) // If predefined
m_sLineEnd = "\015";
diff --git a/sw/source/filter/ascii/wrtasc.hxx b/sw/source/filter/ascii/wrtasc.hxx
index 82d2b108f498..cb0fdc191bb2 100644
--- a/sw/source/filter/ascii/wrtasc.hxx
+++ b/sw/source/filter/ascii/wrtasc.hxx
@@ -30,7 +30,7 @@ class SwASCWriter : public Writer
{
OUString m_sLineEnd;
- virtual sal_uLong WriteStream() override;
+ virtual ErrCode WriteStream() override;
public:
SwASCWriter( const OUString& rFilterName );