diff options
Diffstat (limited to 'lotuswordpro')
-rw-r--r-- | lotuswordpro/source/filter/tocread.cxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/tocread.hxx | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/lotuswordpro/source/filter/tocread.cxx b/lotuswordpro/source/filter/tocread.cxx index dff08e68e3cf..53f7e2b929f8 100644 --- a/lotuswordpro/source/filter/tocread.cxx +++ b/lotuswordpro/source/filter/tocread.cxx @@ -457,7 +457,7 @@ CBenTOCReader::ReadSegment(CBenValue * pValue, BenByte * pLookAhead) } bool -CBenTOCReader::CanGetData(unsigned long Amt) +CBenTOCReader::CanGetData(tools::ULong Amt) { return cCurr + Amt <= cTOCSize; } diff --git a/lotuswordpro/source/filter/tocread.hxx b/lotuswordpro/source/filter/tocread.hxx index b2645b0af4dd..10e3adc3272a 100644 --- a/lotuswordpro/source/filter/tocread.hxx +++ b/lotuswordpro/source/filter/tocread.hxx @@ -58,6 +58,7 @@ #include "bento.hxx" #include <memory> +#include <tools/long.hxx> namespace OpenStormBento { @@ -74,23 +75,23 @@ public: // Methods BenError ReadLabelAndTOC(); private: // Methods - BenError ReadLabel(unsigned long * pTOCOffset, unsigned long * pTOCSize); + BenError ReadLabel(tools::ULong* pTOCOffset, tools::ULong* pTOCSize); BenError SearchForLabel(BenByte * pLabel); BenError ReadTOC(); BenError ReadSegments(CBenValue * pValue, BenByte * pLookAhead); BenError ReadSegment(CBenValue * pValue, BenByte * pLookAhead); - bool CanGetData(unsigned long Amt); + bool CanGetData(tools::ULong Amt); BenError GetByte(BenByte * pByte); BenError GetDWord(BenDWord * pDWord); BenByte GetCode(); - BenError GetData(void * pBuffer, unsigned long Amt); + BenError GetData(void* pBuffer, tools::ULong Amt); private: // Data LtcBenContainer * cpContainer; std::unique_ptr<BenByte[]> cpTOC; - unsigned long cBlockSize; - unsigned long cCurr; - unsigned long cTOCSize; + tools::ULong cBlockSize; + tools::ULong cCurr; + tools::ULong cTOCSize; }; }//end namespace OpenStormBento #endif |