summaryrefslogtreecommitdiff
path: root/sw/source/filter/xml
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/xml')
-rw-r--r--sw/source/filter/xml/swxml.cxx20
-rw-r--r--sw/source/filter/xml/wrtxml.cxx10
-rw-r--r--sw/source/filter/xml/wrtxml.hxx8
-rw-r--r--sw/source/filter/xml/xmlexp.cxx4
-rw-r--r--sw/source/filter/xml/xmlexp.hxx2
5 files changed, 22 insertions, 22 deletions
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index a288f7949f4b..8282b081c2e8 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -126,7 +126,7 @@ namespace
{
/// read a component (file + filter version)
-sal_Int32 ReadThroughComponent(
+ErrCode ReadThroughComponent(
uno::Reference<io::XInputStream> const & xInputStream,
uno::Reference<XComponent> const & xModelComponent,
const OUString& rStreamName,
@@ -273,11 +273,11 @@ sal_Int32 ReadThroughComponent(
}
// success!
- return 0;
+ return ERRCODE_NONE;
}
// read a component (storage version)
-sal_Int32 ReadThroughComponent(
+ErrCode ReadThroughComponent(
uno::Reference<embed::XStorage> const & xStorage,
uno::Reference<XComponent> const & xModelComponent,
const sal_Char* pStreamName,
@@ -309,7 +309,7 @@ sal_Int32 ReadThroughComponent(
// do we even have an alternative name?
if ( nullptr == pCompatibilityStreamName )
- return 0;
+ return ERRCODE_NONE;
// if so, does the stream exist?
sStreamName = OUString::createFromAscii(pCompatibilityStreamName);
@@ -322,7 +322,7 @@ sal_Int32 ReadThroughComponent(
}
if (! bContainsStream )
- return 0;
+ return ERRCODE_NONE;
}
// set Base URL
@@ -490,7 +490,7 @@ static void lcl_ConvertSdrOle2ObjsToSdrGrafObjs(SwDoc& _rDoc)
}
}
-sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, const OUString & rName )
+ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, const OUString & rName )
{
// needed for relative URLs, but in clipboard copy/paste there may be none
// and also there is the SwXMLTextBlocks special case
@@ -768,7 +768,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
}
(void)rDoc.acquire(); // prevent deletion
- sal_uInt32 nRet = 0;
+ ErrCode nRet = ERRCODE_NONE;
// save redline mode into import info property set
const OUString sShowChanges("ShowChanges");
@@ -799,7 +799,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
makeAny( bTextDocInOOoFileFormat ) );
}
- sal_uInt32 nWarnRDF = 0;
+ ErrCode nWarnRDF = ERRCODE_NONE;
if ( !(IsOrganizerMode() || IsBlockMode() || aOpt.IsFormatsOnly() ||
bInsertMode) )
{
@@ -837,13 +837,13 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
// read storage streams
// #i103539#: always read meta.xml for generator
- sal_uInt32 const nWarn = ReadThroughComponent(
+ ErrCode const nWarn = ReadThroughComponent(
xStorage, xModelComp, "meta.xml", "Meta.xml", xContext,
(bOASIS ? "com.sun.star.comp.Writer.XMLOasisMetaImporter"
: "com.sun.star.comp.Writer.XMLMetaImporter"),
aEmptyArgs, rName, false );
- sal_uInt32 nWarn2 = 0;
+ ErrCode nWarn2 = ERRCODE_NONE;
if( !(IsOrganizerMode() || IsBlockMode() || aOpt.IsFormatsOnly() ||
bInsertMode) )
{
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index f49af4ffeae3..d7690b57cae9 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -69,7 +69,7 @@ SwXMLWriter::~SwXMLWriter()
{
}
-sal_uInt32 SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& xStatusIndicator,
+ErrCode SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >& xStatusIndicator,
const OUString& aDocHierarchicalName )
{
// Get service factory
@@ -425,15 +425,15 @@ sal_uInt32 SwXMLWriter::Write_( const uno::Reference < task::XStatusIndicator >&
return WARN_SWG_FEATURES_LOST;
}
- return 0;
+ return ERRCODE_NONE;
}
-sal_uLong SwXMLWriter::WriteStorage()
+ErrCode SwXMLWriter::WriteStorage()
{
return Write_( uno::Reference < task::XStatusIndicator >(), OUString() );
}
-sal_uLong SwXMLWriter::WriteMedium( SfxMedium& aTargetMedium )
+ErrCode SwXMLWriter::WriteMedium( SfxMedium& aTargetMedium )
{
uno::Reference < task::XStatusIndicator > xStatusIndicator;
OUString aName;
@@ -449,7 +449,7 @@ sal_uLong SwXMLWriter::WriteMedium( SfxMedium& aTargetMedium )
return Write_( xStatusIndicator, aName );
}
-sal_uLong SwXMLWriter::Write( SwPaM& rPaM, SfxMedium& rMed,
+ErrCode SwXMLWriter::Write( SwPaM& rPaM, SfxMedium& rMed,
const OUString* pFileName )
{
return IsStgWriter()
diff --git a/sw/source/filter/xml/wrtxml.hxx b/sw/source/filter/xml/wrtxml.hxx
index 558b21fd4521..1dbd9f63dfa0 100644
--- a/sw/source/filter/xml/wrtxml.hxx
+++ b/sw/source/filter/xml/wrtxml.hxx
@@ -39,20 +39,20 @@ namespace com { namespace sun { namespace star {
class SwXMLWriter : public StgWriter
{
- sal_uInt32 Write_( const css::uno::Reference < css::task::XStatusIndicator>&, const OUString& );
+ ErrCode Write_( const css::uno::Reference < css::task::XStatusIndicator>&, const OUString& );
using StgWriter::Write;
protected:
- virtual sal_uLong WriteStorage() override;
- virtual sal_uLong WriteMedium( SfxMedium& aTargetMedium ) override;
+ virtual ErrCode WriteStorage() override;
+ virtual ErrCode WriteMedium( SfxMedium& aTargetMedium ) override;
public:
SwXMLWriter( const OUString& rBaseURL );
virtual ~SwXMLWriter() override;
- virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* ) override;
+ virtual ErrCode Write( SwPaM&, SfxMedium&, const OUString* ) override;
private:
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index fa7abe2d94e0..6d41045d0b8c 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -96,7 +96,7 @@ SwXMLExport::SwXMLExport(
InitItemExport();
}
-sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
+ErrCode SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
{
if( !GetModel().is() )
return ERR_SWG_WRITE_ERROR;
@@ -286,7 +286,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass )
( nRedlineFlags & RedlineFlags::ShowMask ) | RedlineFlags::ShowInsert );
}
- sal_uInt32 nRet = SvXMLExport::exportDoc( eClass );
+ ErrCode nRet = SvXMLExport::exportDoc( eClass );
// now we can restore the redline mode (if we changed it previously)
if( bSaveRedline )
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index c08b0e2b33b0..778cf20931c4 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -114,7 +114,7 @@ public:
virtual ~SwXMLExport() override;
- 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;
inline const SvXMLUnitConverter& GetTwipUnitConverter() const;
generated by cgit (git 2.34.1) at 2024-08-14 18:56:31 +0000