summaryrefslogtreecommitdiff
path: root/sc/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/filter')
-rw-r--r--sc/source/filter/html/htmlexp.cxx2
-rw-r--r--sc/source/filter/html/htmlexp2.cxx2
-rw-r--r--sc/source/filter/html/htmlimp.cxx2
-rw-r--r--sc/source/filter/html/htmlpars.cxx8
-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
-rw-r--r--sc/source/filter/lotus/lotread.cxx2
-rw-r--r--sc/source/filter/lotus/lotus.cxx4
-rw-r--r--sc/source/filter/rtf/eeimpars.cxx4
-rw-r--r--sc/source/filter/rtf/rtfimp.cxx2
-rw-r--r--sc/source/filter/rtf/rtfparse.cxx4
-rw-r--r--sc/source/filter/starcalc/scflt.cxx8
-rw-r--r--sc/source/filter/xml/xmlexprt.cxx2
-rw-r--r--sc/source/filter/xml/xmlexprt.hxx2
-rw-r--r--sc/source/filter/xml/xmlimprt.cxx2
-rw-r--r--sc/source/filter/xml/xmlimprt.hxx2
-rw-r--r--sc/source/filter/xml/xmlwrap.cxx14
20 files changed, 49 insertions, 49 deletions
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index ed957bbf2db0..5eef8b5a167f 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -586,7 +586,7 @@ void ScHTMLExport::WriteBody()
{
// Save graphic as (JPG) file
aGrfNm = aStreamPath;
- sal_uInt16 nErr = XOutBitmap::WriteGraphic( *pGrf, aGrfNm,
+ ErrCode nErr = XOutBitmap::WriteGraphic( *pGrf, aGrfNm,
"JPG", XOutFlags::UseNativeIfPossible );
if( !nErr ) // Contains errors, as we have nothing to output
{
diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx
index 9b751d3b7ee3..3b9179b081f4 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -185,7 +185,7 @@ void ScHTMLExport::WriteImage( OUString& rLinkName, const Graphic& rGrf,
// Save as a PNG
OUString aGrfNm( aStreamPath );
nXOutFlags |= XOutFlags::UseNativeIfPossible;
- sal_uInt16 nErr = XOutBitmap::WriteGraphic( rGrf, aGrfNm,
+ ErrCode nErr = XOutBitmap::WriteGraphic( rGrf, aGrfNm,
"PNG", nXOutFlags );
// If it worked, create a URL for the IMG tag
diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx
index 41c9d6cd0a5c..5dc06c5a8054 100644
--- a/sc/source/filter/html/htmlimp.cxx
+++ b/sc/source/filter/html/htmlimp.cxx
@@ -47,7 +47,7 @@ ErrCode ScFormatFilterPluginImpl::ScImportHTML( SvStream &rStream, const OUStrin
bool bConvertDate )
{
ScHTMLImport aImp( pDoc, rBaseURL, rRange, bCalcWidthHeight );
- ErrCode nErr = (ErrCode) aImp.Read( rStream, rBaseURL );
+ ErrCode nErr = aImp.Read( rStream, rBaseURL );
ScRange aR = aImp.GetRange();
rRange.aEnd = aR.aEnd;
aImp.WriteToDocument( true, nOutputFactor, pFormatter, bConvertDate );
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index fa3e2d8f8f51..87d444436546 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -254,7 +254,7 @@ ScHTMLLayoutParser::~ScHTMLLayoutParser()
}
}
-sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const OUString& rBaseURL )
+ErrCode ScHTMLLayoutParser::Read( SvStream& rStream, const OUString& rBaseURL )
{
Link<HtmlImportInfo&,void> aOldLink = pEdit->GetHtmlImportHdl();
pEdit->SetHtmlImportHdl( LINK( this, ScHTMLLayoutParser, HTMLImportHdl ) );
@@ -282,7 +282,7 @@ sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const OUString& rBaseURL
}
}
- sal_uLong nErr = pEdit->Read( rStream, rBaseURL, EE_FORMAT_HTML, pAttributes );
+ ErrCode nErr = pEdit->Read( rStream, rBaseURL, EE_FORMAT_HTML, pAttributes );
pEdit->SetHtmlImportHdl( aOldLink );
// Create column width
@@ -2828,7 +2828,7 @@ ScHTMLQueryParser::~ScHTMLQueryParser()
{
}
-sal_uLong ScHTMLQueryParser::Read( SvStream& rStrm, const OUString& rBaseURL )
+ErrCode ScHTMLQueryParser::Read( SvStream& rStrm, const OUString& rBaseURL )
{
SvKeyValueIteratorRef xValues;
SvKeyValueIterator* pAttributes = nullptr;
@@ -2856,7 +2856,7 @@ sal_uLong ScHTMLQueryParser::Read( SvStream& rStrm, const OUString& rBaseURL )
Link<HtmlImportInfo&,void> aOldLink = pEdit->GetHtmlImportHdl();
pEdit->SetHtmlImportHdl( LINK( this, ScHTMLQueryParser, HTMLImportHdl ) );
- sal_uLong nErr = pEdit->Read( rStrm, rBaseURL, EE_FORMAT_HTML, pAttributes );
+ ErrCode nErr = pEdit->Read( rStrm, rBaseURL, EE_FORMAT_HTML, pAttributes );
pEdit->SetHtmlImportHdl( aOldLink );
mxGlobTable->Recalc();
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();
diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx
index 003b82d7c424..9d4dfab84bb3 100644
--- a/sc/source/filter/lotus/lotread.cxx
+++ b/sc/source/filter/lotus/lotread.cxx
@@ -92,7 +92,7 @@ ErrCode ImportLotus::Read()
else
{
eAkt = S_END; // TODO: add here something for <= WK1!
- eRet = 0xFFFFFFFF;
+ eRet = ErrCode(0xFFFFFFFF);
}
}
break;
diff --git a/sc/source/filter/lotus/lotus.cxx b/sc/source/filter/lotus/lotus.cxx
index f9d6c8128765..8a7c8493225b 100644
--- a/sc/source/filter/lotus/lotus.cxx
+++ b/sc/source/filter/lotus/lotus.cxx
@@ -51,10 +51,10 @@ ErrCode ScFormatFilterPluginImpl::ScImportLotus123( SfxMedium& rMedium, ScDocume
if( bWithWK3 )
eRet = aLotusImport.Read();
else
- eRet = 0xFFFFFFFF; // force WK1 /WKS
+ eRet = ErrCode(0xFFFFFFFF); // force WK1 /WKS
// WARNING: QUICK-HACK for WK1 / WKS <-> WK3 / WK4
- if( eRet == 0xFFFFFFFF )
+ if( eRet == ErrCode(0xFFFFFFFF) )
{
pStream->Seek( 0UL );
diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx
index 0e6eab3bc56c..87b3a0426809 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -76,9 +76,9 @@ ScEEImport::~ScEEImport()
// Is guaranteed as ScEEImport is base class
}
-sal_uLong ScEEImport::Read( SvStream& rStream, const OUString& rBaseURL )
+ErrCode ScEEImport::Read( SvStream& rStream, const OUString& rBaseURL )
{
- sal_uLong nErr = mpParser->Read( rStream, rBaseURL );
+ ErrCode nErr = mpParser->Read( rStream, rBaseURL );
SCCOL nEndCol;
SCROW nEndRow;
diff --git a/sc/source/filter/rtf/rtfimp.cxx b/sc/source/filter/rtf/rtfimp.cxx
index bb269686b693..ecd86a537846 100644
--- a/sc/source/filter/rtf/rtfimp.cxx
+++ b/sc/source/filter/rtf/rtfimp.cxx
@@ -28,7 +28,7 @@
ErrCode ScFormatFilterPluginImpl::ScImportRTF( SvStream &rStream, const OUString& rBaseURL, ScDocument *pDoc, ScRange& rRange )
{
ScRTFImport aImp( pDoc, rRange );
- ErrCode nErr = (ErrCode) aImp.Read( rStream, rBaseURL );
+ ErrCode nErr = aImp.Read( rStream, rBaseURL );
ScRange aR = aImp.GetRange();
rRange.aEnd = aR.aEnd;
aImp.WriteToDocument();
diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx
index d5262fd13a16..523b2ef32c54 100644
--- a/sc/source/filter/rtf/rtfparse.cxx
+++ b/sc/source/filter/rtf/rtfparse.cxx
@@ -55,11 +55,11 @@ ScRTFParser::~ScRTFParser()
maDefaultList.clear();
}
-sal_uLong ScRTFParser::Read( SvStream& rStream, const OUString& rBaseURL )
+ErrCode ScRTFParser::Read( SvStream& rStream, const OUString& rBaseURL )
{
Link<RtfImportInfo&,void> aOldLink = pEdit->GetRtfImportHdl();
pEdit->SetRtfImportHdl( LINK( this, ScRTFParser, RTFImportHdl ) );
- sal_uLong nErr = pEdit->Read( rStream, rBaseURL, EE_FORMAT_RTF );
+ ErrCode nErr = pEdit->Read( rStream, rBaseURL, EE_FORMAT_RTF );
if ( nRtfLastToken == RTF_PAR )
{
if ( !maList.empty() )
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index bd41c17c90f7..c6b9b199a645 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -369,10 +369,10 @@ static OUString lcl_MakeOldPageStyleFormatName( sal_uInt16 i )
return aName;
}
-template < typename T > sal_uLong insert_new( ScCollection* pCollection, SvStream& rStream )
+template < typename T > ErrCode insert_new( ScCollection* pCollection, SvStream& rStream )
{
std::unique_ptr<T> pData(new (::std::nothrow) T( rStream));
- sal_uLong nError = rStream.GetError();
+ ErrCode nError = rStream.GetError();
if (pData)
{
if (!nError)
@@ -948,7 +948,7 @@ Sc10Import::~Sc10Import()
"*Sc10Import::Sc10Import(): Progressbar lebt noch!?" );
}
-sal_uLong Sc10Import::Import()
+ErrCode Sc10Import::Import()
{
pPrgrsBar = new ScfStreamProgressBar( rStream, pDoc->GetDocumentShell() );
@@ -2404,7 +2404,7 @@ ErrCode ScFormatFilterPluginImpl::ScImportStarCalc10( SvStream& rStream, ScDocum
{
rStream.Seek( 0UL );
Sc10Import aImport( rStream, pDocument );
- return ( ErrCode ) aImport.Import();
+ return aImport.Import();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 4d6c02cf7528..89fb12331df3 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -4979,7 +4979,7 @@ void ScXMLExport::IncrementProgressBar(bool bFlush, sal_Int32 nInc)
}
}
-sal_uInt32 ScXMLExport::exportDoc( enum XMLTokenEnum eClass )
+ErrCode ScXMLExport::exportDoc( enum XMLTokenEnum eClass )
{
if( getExportFlags() & (SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::STYLES|
SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::CONTENT) )
diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx
index a02a6ee3dffe..675b8183fd07 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -256,7 +256,7 @@ public:
XMLNumberFormatAttributesExportHelper* GetNumberFormatAttributesExportHelper();
// Export the document.
- virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) override;
+ virtual ErrCode exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) override;
// XExporter
virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 437264636bc8..2bcbd62b9e69 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -3424,7 +3424,7 @@ sal_Int32 ScXMLImport::GetByteOffset()
return nOffset;
}
-void ScXMLImport::SetRangeOverflowType(sal_uInt32 nType)
+void ScXMLImport::SetRangeOverflowType(ErrCode nType)
{
// #i31130# Overflow is stored in the document, because the ScXMLImport object
// isn't available in ScXMLImportWrapper::ImportFromComponent when using the
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index be204c1f8deb..d11e36cc73a5 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -1179,7 +1179,7 @@ public:
sal_Int32 GetByteOffset();
- void SetRangeOverflowType(sal_uInt32 nType);
+ void SetRangeOverflowType(ErrCode nType);
static sal_Int32 GetRangeType(const OUString& sRangeType);
void SetNamedRanges();
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 880c2f5320ea..92295e09f993 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -97,7 +97,7 @@ uno::Reference <task::XStatusIndicator> ScXMLImportWrapper::GetStatusIndicator()
return xStatusIndicator;
}
-sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const uno::Reference<uno::XComponentContext>& xContext,
+ErrCode ScXMLImportWrapper::ImportFromComponent(const uno::Reference<uno::XComponentContext>& xContext,
uno::Reference<frame::XModel>& xModel, uno::Reference<xml::sax::XParser>& xParser,
xml::sax::InputSource& aParserInput,
const OUString& sComponentName, const OUString& sDocName,
@@ -158,8 +158,8 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const uno::Reference<uno::XCo
xInfoSet->setPropertyValue( sPropName, uno::makeAny( sStream ) );
}
- sal_uInt32 nReturn = ERRCODE_NONE;
- rDoc.SetRangeOverflowType(0); // is modified by the importer if limits are exceeded
+ ErrCode nReturn = ERRCODE_NONE;
+ rDoc.SetRangeOverflowType(ERRCODE_NONE); // is modified by the importer if limits are exceeded
uno::Reference<xml::sax::XDocumentHandler> xDocHandler(
xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
@@ -415,7 +415,7 @@ bool ScXMLImportWrapper::Import( ImportFlags nMode, ErrCode& rError )
}
// #i103539#: always read meta.xml for generator
- sal_uInt32 nMetaRetval(0);
+ ErrCode nMetaRetval(ERRCODE_NONE);
if (nMode & ImportFlags::Metadata)
{
uno::Sequence<uno::Any> aMetaArgs(1);
@@ -454,7 +454,7 @@ bool ScXMLImportWrapper::Import( ImportFlags nMode, ErrCode& rError )
pStylesArgs[2] <<= xStatusIndicator;
pStylesArgs[3] <<= xObjectResolver;
- sal_uInt32 nSettingsRetval(0);
+ ErrCode nSettingsRetval(ERRCODE_NONE);
if (nMode & ImportFlags::Settings)
{
// Settings must be loaded first because of the printer setting,
@@ -475,7 +475,7 @@ bool ScXMLImportWrapper::Import( ImportFlags nMode, ErrCode& rError )
SAL_INFO( "sc.filter", "settings import end" );
}
- sal_uInt32 nStylesRetval(0);
+ ErrCode nStylesRetval(ERRCODE_NONE);
if (nMode & ImportFlags::Styles)
{
SAL_INFO( "sc.filter", "styles import start" );
@@ -489,7 +489,7 @@ bool ScXMLImportWrapper::Import( ImportFlags nMode, ErrCode& rError )
SAL_INFO( "sc.filter", "styles import end" );
}
- sal_uInt32 nDocRetval(0);
+ ErrCode nDocRetval(ERRCODE_NONE);
if (nMode & ImportFlags::Content)
{
if (mrDocShell.GetCreateMode() == SfxObjectCreateMode::INTERNAL)
generated by cgit (git 2.34.1) at 2024-07-16 14:47:52 +0000