diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-04-25 10:52:21 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-25 11:55:57 +0100 |
commit | b79f9a9bc818022a59184113cf20dd5ada29deff (patch) | |
tree | 153855cbf4e92692686687894c2908cb22e8d98d /lotuswordpro/source | |
parent | 494c7103744ded1f6f2d373a8eb194c9d34f7b82 (diff) |
LtcBenContainer::GetSize is always BenErr_OK
Change-Id: Ic14cbc70358800dab57c1a5ac0a834e257d4951a
Diffstat (limited to 'lotuswordpro/source')
-rw-r--r-- | lotuswordpro/source/filter/bencont.cxx | 10 | ||||
-rw-r--r-- | lotuswordpro/source/filter/bento.hxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/tocread.cxx | 8 |
3 files changed, 3 insertions, 17 deletions
diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx index c67610943f51..8d67e3905963 100644 --- a/lotuswordpro/source/filter/bencont.cxx +++ b/lotuswordpro/source/filter/bencont.cxx @@ -255,16 +255,6 @@ LtcUtBenValueStream * LtcBenContainer::FindValueStreamWithPropertyName(const cha { return FindNextValueStreamWithPropertyName(sPropertyName); } -/** -* <description> -* @param pointer to length of bento file -* @return BenError -*/ -BenError LtcBenContainer::GetSize(sal_uLong * pLength) -{ - *pLength = m_ulLength; - return BenErr_OK; -} sal_uInt32 GetSvStreamSize(SvStream * pStream) { diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx index 5919258ed78d..f5f2408d4036 100644 --- a/lotuswordpro/source/filter/bento.hxx +++ b/lotuswordpro/source/filter/bento.hxx @@ -223,7 +223,7 @@ public: // Internal methods LtcUtBenValueStream * FindValueStreamWithPropertyName(const char * sPropertyName); void CreateGraphicStream(SvStream * &pStream, const char *pObjectName); - BenError GetSize(sal_uLong * pLength); + sal_uLong GetSize() const { return m_ulLength; } private: // Data CUtOwningList cObjects; CUtList cNamedObjects; diff --git a/lotuswordpro/source/filter/tocread.cxx b/lotuswordpro/source/filter/tocread.cxx index c050b11a4e06..b6c32955411b 100644 --- a/lotuswordpro/source/filter/tocread.cxx +++ b/lotuswordpro/source/filter/tocread.cxx @@ -72,9 +72,7 @@ CBenTOCReader::ReadLabelAndTOC() if ((Err = ReadLabel(&TOCOffset, &cTOCSize)) != BenErr_OK) return Err; - sal_uLong nLength; - if ((Err = cpContainer->GetSize(&nLength)) != BenErr_OK) - return Err; + sal_uLong nLength = cpContainer->GetSize(); if (TOCOffset > nLength) return BenErr_ReadPastEndOfTOC; @@ -148,9 +146,7 @@ CBenTOCReader::SearchForLabel(BenByte * pLabel) { BenError Err; - sal_uLong Length; - if ((Err = cpContainer->GetSize(&Length)) != BenErr_OK) - return Err; + sal_uLong Length = cpContainer->GetSize(); // Always ready to check for MagicBytes from // CurrOffset - BEN_MAGIC_BYTES_SIZE to CurrOffset - 1 |