summaryrefslogtreecommitdiff
path: root/sc/source/filter/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/filter/inc')
-rw-r--r--sc/source/filter/inc/eeimport.hxx2
-rw-r--r--sc/source/filter/inc/eeparser.hxx2
-rw-r--r--sc/source/filter/inc/htmlpars.hxx6
-rw-r--r--sc/source/filter/inc/rtfparse.hxx2
-rw-r--r--sc/source/filter/inc/scflt.hxx26
5 files changed, 19 insertions, 19 deletions
diff --git a/sc/source/filter/inc/eeimport.hxx b/sc/source/filter/inc/eeimport.hxx
index 75ac0902ca58..c65db788e7d7 100644
--- a/sc/source/filter/inc/eeimport.hxx
+++ b/sc/source/filter/inc/eeimport.hxx
@@ -54,7 +54,7 @@ public:
ScEEImport( ScDocument* pDoc, const ScRange& rRange );
virtual ~ScEEImport() override;
- virtual sal_uLong Read( SvStream& rStream, const OUString& rBaseURL ) override;
+ virtual ErrCode Read( SvStream& rStream, const OUString& rBaseURL ) override;
virtual ScRange GetRange() override { return maRange; }
virtual void WriteToDocument( bool bSizeColsRows = false,
double nOutputFactor = 1.0,
diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx
index b60e633fd9ba..2b19f41672c0 100644
--- a/sc/source/filter/inc/eeparser.hxx
+++ b/sc/source/filter/inc/eeparser.hxx
@@ -118,7 +118,7 @@ public:
ScEEParser( EditEngine* );
virtual ~ScEEParser();
- virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ) = 0;
+ virtual ErrCode Read( SvStream&, const OUString& rBaseURL ) = 0;
const ColWidthsMap& GetColWidths() const { return maColWidths; }
ColWidthsMap& GetColWidths() { return maColWidths; }
diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx
index f807c06ee604..1598f7d5daae 100644
--- a/sc/source/filter/inc/htmlpars.hxx
+++ b/sc/source/filter/inc/htmlpars.hxx
@@ -85,7 +85,7 @@ public:
explicit ScHTMLParser( EditEngine* pEditEngine, ScDocument* pDoc );
virtual ~ScHTMLParser() override;
- virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) override = 0;
+ virtual ErrCode Read( SvStream& rStrm, const OUString& rBaseURL ) override = 0;
ScHTMLStyles& GetStyles() { return maStyles;}
ScDocument& GetDoc() { return *mpDoc;}
@@ -214,7 +214,7 @@ private:
public:
ScHTMLLayoutParser( EditEngine*, const OUString& rBaseURL, const Size& aPageSize, ScDocument* );
virtual ~ScHTMLLayoutParser() override;
- virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ) override;
+ virtual ErrCode Read( SvStream&, const OUString& rBaseURL ) override;
virtual const ScHTMLTable* GetGlobalTable() const override;
};
@@ -570,7 +570,7 @@ public:
explicit ScHTMLQueryParser( EditEngine* pEditEngine, ScDocument* pDoc );
virtual ~ScHTMLQueryParser() override;
- virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) override;
+ virtual ErrCode Read( SvStream& rStrm, const OUString& rBaseURL ) override;
/** Returns the "global table" which contains the entire HTML document. */
virtual const ScHTMLTable* GetGlobalTable() const override;
diff --git a/sc/source/filter/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxx
index a22d603d7a5d..9d6b052e62d5 100644
--- a/sc/source/filter/inc/rtfparse.hxx
+++ b/sc/source/filter/inc/rtfparse.hxx
@@ -73,7 +73,7 @@ private:
public:
ScRTFParser( EditEngine* );
virtual ~ScRTFParser() override;
- virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ) override;
+ virtual ErrCode Read( SvStream&, const OUString& rBaseURL ) override;
};
#endif
diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx
index b42265184a21..f1640a3ed8f4 100644
--- a/sc/source/filter/inc/scflt.hxx
+++ b/sc/source/filter/inc/scflt.hxx
@@ -26,9 +26,9 @@
#include <tools/solar.h>
// Error numbers
-#define errUnknownFormat 1
-#define errUnknownID 2
-#define errOutOfMemory 3
+#define errUnknownFormat ErrCode(1)
+#define errUnknownID ErrCode(2)
+#define errOutOfMemory ErrCode(3)
// Identifiers in FileFormat
#define ColWidthID 1
@@ -601,10 +601,10 @@ public:
class Sc10FontCollection : public ScCollection
{
protected:
- sal_uLong nError;
+ ErrCode nError;
public:
Sc10FontCollection( SvStream& rStream );
- sal_uLong GetError() { return nError; }
+ ErrCode GetError() { return nError; }
Sc10FontData* At(sal_uInt16 nIndex) { return static_cast<Sc10FontData*>(ScCollection::At(nIndex)); }
private:
using ScCollection::At;
@@ -635,10 +635,10 @@ public:
class Sc10NameCollection : public ScCollection
{
protected:
- sal_uLong nError;
+ ErrCode nError;
public:
Sc10NameCollection(SvStream& rStream);
- sal_uLong GetError() { return nError; }
+ ErrCode GetError() { return nError; }
Sc10NameData* At(sal_uInt16 nIndex) { return static_cast<Sc10NameData*>(ScCollection::At(nIndex)); }
private:
using ScCollection::At;
@@ -686,10 +686,10 @@ virtual ScDataObject* Clone() const override { return new Sc10PatternData(
class Sc10PatternCollection : public ScCollection
{
protected:
- sal_uLong nError;
+ ErrCode nError;
public:
Sc10PatternCollection(SvStream& rStream);
- sal_uLong GetError() { return nError; }
+ ErrCode GetError() { return nError; }
Sc10PatternData* At(sal_uInt16 nIndex) { return static_cast<Sc10PatternData*>(ScCollection::At(nIndex)); }
private:
using ScCollection::At;
@@ -714,11 +714,11 @@ virtual ScDataObject* Clone() const override { return new Sc10DataBaseData
class Sc10DataBaseCollection : public ScCollection
{
protected:
- sal_uLong nError;
+ ErrCode nError;
sal_Char ActName[32];
public:
Sc10DataBaseCollection(SvStream& rStream);
- sal_uLong GetError() { return nError; }
+ ErrCode GetError() { return nError; }
Sc10DataBaseData* At(sal_uInt16 nIndex) { return static_cast<Sc10DataBaseData*>(ScCollection::At(nIndex)); }
private:
using ScCollection::At;
@@ -760,7 +760,7 @@ class Sc10Import
Sc10NameCollection* pNameCollection;
Sc10PatternCollection* pPatternCollection;
Sc10DataBaseCollection* pDataBaseCollection;
- sal_uLong nError;
+ ErrCode nError;
SCTAB nShowTab;
ScViewOptions aSc30ViewOpt;
ScfStreamProgressBar* pPrgrsBar;
@@ -769,7 +769,7 @@ public:
Sc10Import( SvStream& rStr, ScDocument* pDocument );
~Sc10Import();
- sal_uLong Import();
+ ErrCode Import();
void LoadFileHeader();
void LoadFileInfo();
void LoadEditStateInfo();
generated by cgit (git 2.34.1) at 2024-07-17 02:10:09 +0000