diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-09-14 17:01:50 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-09-15 12:01:11 +0200 |
| commit | b647996a9babbee7b33cf45192e57df6a124628b (patch) | |
| tree | ddc6dfe8a62ec53fbacc4eeccfeb20019f3ef4f0 /lotuswordpro | |
| parent | a19a67e20e847a42063559694ec5beec71abcfb3 (diff) | |
replace sal_Size with std::size_t (or sal_uInt64 for SvStream pos)
... except in include/rtl, include/sal, include/uno, where sal_Size is
retained for compatibility, and where callers of rtl functions pass in
pointers that are incompatible on MSVC.
Change-Id: I8344453780689f5120ba0870e44965b6d292450c
Diffstat (limited to 'lotuswordpro')
| -rw-r--r-- | lotuswordpro/source/filter/bento.hxx | 4 | ||||
| -rw-r--r-- | lotuswordpro/source/filter/utbenvs.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx index 382ca0967b7f..1870c97af679 100644 --- a/lotuswordpro/source/filter/bento.hxx +++ b/lotuswordpro/source/filter/bento.hxx @@ -181,8 +181,8 @@ public: // Overridden methods sal_uLong GetSize() { return m_ulValueLength; }; protected: // Overridden methods - virtual sal_uLong GetData( void* pData, sal_uLong nSize ) override; - virtual sal_uLong PutData( const void* pData, sal_uLong nSize ) override; + virtual std::size_t GetData(void* pData, std::size_t nSize) override; + virtual std::size_t PutData(const void* pData, std::size_t nSize) override; virtual sal_uInt64 SeekPos( sal_uInt64 nPos ) override; virtual void SetSize( sal_uInt64 nSize ) override; virtual void FlushData() override; diff --git a/lotuswordpro/source/filter/utbenvs.cxx b/lotuswordpro/source/filter/utbenvs.cxx index 393e479a9fa1..c2faa3bdb716 100644 --- a/lotuswordpro/source/filter/utbenvs.cxx +++ b/lotuswordpro/source/filter/utbenvs.cxx @@ -63,7 +63,7 @@ namespace OpenStormBento * @param number of bytes to be read * @return number of bytes read */ -sal_uLong LtcUtBenValueStream::GetData( void* pData, sal_uLong nSize ) +std::size_t LtcUtBenValueStream::GetData(void* pData, std::size_t nSize) { //unsigned long AmtLeft; unsigned long AmtRead; @@ -82,7 +82,7 @@ sal_uLong LtcUtBenValueStream::GetData( void* pData, sal_uLong nSize ) * @param size of buffer to be written * @return number of bytes written into value stream */ -sal_uLong LtcUtBenValueStream::PutData( const void* /*pData*/, sal_uLong nSize ) +std::size_t LtcUtBenValueStream::PutData(const void* /*pData*/, std::size_t nSize) { /* Because we only support IMPORT filter, PutData implementation is ignored It won't bring negative influence to read-only stream object */ |