diff options
Diffstat (limited to 'writerperfect')
-rw-r--r-- | writerperfect/inc/DirectoryStream.hxx | 4 | ||||
-rw-r--r-- | writerperfect/inc/WPXSvInputStream.hxx | 4 | ||||
-rw-r--r-- | writerperfect/source/calc/MSWorksCalcImportFilter.cxx | 4 | ||||
-rw-r--r-- | writerperfect/source/common/DirectoryStream.cxx | 4 | ||||
-rw-r--r-- | writerperfect/source/common/WPXSvInputStream.cxx | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/writerperfect/inc/DirectoryStream.hxx b/writerperfect/inc/DirectoryStream.hxx index 109d6cef65af..57e8380c6b22 100644 --- a/writerperfect/inc/DirectoryStream.hxx +++ b/writerperfect/inc/DirectoryStream.hxx @@ -45,8 +45,8 @@ public: virtual librevenge::RVNGInputStream* getSubStreamById(unsigned id) override; virtual const unsigned char* read(unsigned long numBytes, unsigned long& numBytesRead) override; - virtual int seek(tools::Long offset, librevenge::RVNG_SEEK_TYPE seekType) override; - virtual tools::Long tell() override; + virtual int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType) override; + virtual long tell() override; virtual bool isEnd() override; private: diff --git a/writerperfect/inc/WPXSvInputStream.hxx b/writerperfect/inc/WPXSvInputStream.hxx index becfefd1d6f5..052cf4082ed7 100644 --- a/writerperfect/inc/WPXSvInputStream.hxx +++ b/writerperfect/inc/WPXSvInputStream.hxx @@ -40,8 +40,8 @@ public: virtual librevenge::RVNGInputStream* getSubStreamById(unsigned id) override; virtual const unsigned char* read(unsigned long numBytes, unsigned long& numBytesRead) override; - virtual int seek(tools::Long offset, librevenge::RVNG_SEEK_TYPE seekType) override; - virtual tools::Long tell() override; + virtual int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType) override; + virtual long tell() override; virtual bool isEnd() override; private: diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx index 6cf948e371ce..83035d8b9926 100644 --- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx +++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx @@ -89,11 +89,11 @@ public: */ const unsigned char* read(unsigned long, unsigned long&) override { return nullptr; } //! returns actual offset position - tools::Long tell() override { return 0; } + long tell() override { return 0; } /*! \brief seeks to an offset position, from actual, beginning or ending position * \return 0 if ok */ - int seek(tools::Long, librevenge::RVNG_SEEK_TYPE) override { return 1; } + int seek(long, librevenge::RVNG_SEEK_TYPE) override { return 1; } //! returns true if we are at the end of the section/file bool isEnd() override { return true; } diff --git a/writerperfect/source/common/DirectoryStream.cxx b/writerperfect/source/common/DirectoryStream.cxx index eb275abec5e5..19ec454b293e 100644 --- a/writerperfect/source/common/DirectoryStream.cxx +++ b/writerperfect/source/common/DirectoryStream.cxx @@ -211,9 +211,9 @@ const unsigned char* DirectoryStream::read(unsigned long, unsigned long& nNumByt return nullptr; } -int DirectoryStream::seek(tools::Long, librevenge::RVNG_SEEK_TYPE) { return -1; } +int DirectoryStream::seek(long, librevenge::RVNG_SEEK_TYPE) { return -1; } -tools::Long DirectoryStream::tell() { return 0; } +long DirectoryStream::tell() { return 0; } bool DirectoryStream::isEnd() { return true; } } diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx index 40c50df8de5c..ce5ff2956966 100644 --- a/writerperfect/source/common/WPXSvInputStream.cxx +++ b/writerperfect/source/common/WPXSvInputStream.cxx @@ -882,14 +882,14 @@ const unsigned char* WPXSvInputStream::read(unsigned long numBytes, unsigned lon return mpImpl->mpReadBuffer; } -tools::Long WPXSvInputStream::tell() +long WPXSvInputStream::tell() { tools::Long retVal = mpImpl->tell(); return retVal - static_cast<tools::Long>(mpImpl->mnReadBufferLength) + static_cast<tools::Long>(mpImpl->mnReadBufferPos); } -int WPXSvInputStream::seek(tools::Long offset, librevenge::RVNG_SEEK_TYPE seekType) +int WPXSvInputStream::seek(long offset, librevenge::RVNG_SEEK_TYPE seekType) { sal_Int64 tmpOffset = offset; if (seekType == librevenge::RVNG_SEEK_CUR) |