[Libreoffice-commits] core.git: include/tools tools/source

[Libreoffice Gerrit user]

 include/tools/stream.hxx       |    2 +-
 tools/source/stream/stream.cxx |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 4b5e8066e230b4fcbadb39b306f7c272865b0245
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Oct 17 10:12:55 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Oct 17 12:06:31 2018 +0200

    workaround weird linking error on tb71
    
    ever since
        commit 9ec8bf8f22fe74884185492ef2576ce79b41e4f1
        add SvStream::TellEnd
    
    Change-Id: I3043459688e9cee16cdb71137c6808a3365b69f6
    Reviewed-on: https://gerrit.libreoffice.org/61869
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index dc2c926c371e..f6dc99155a1c 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -273,7 +273,7 @@ public:
     sal_uInt64      Seek( sal_uInt64 nPos );
     sal_uInt64      SeekRel( sal_Int64 nPos );
     sal_uInt64      Tell() const { return m_nBufFilePos + m_nBufActualPos;  }
-    sal_uInt64      TellEnd() { return Tell() + remainingSize();  }
+    sal_uInt64      TellEnd();
     // length between current (Tell()) pos and end of stream
     virtual sal_uInt64 remainingSize();
     void            Flush();
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index f1d7269069f9..21b317e774b9 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -1911,6 +1911,11 @@ void SvMemoryStream::SetSize(sal_uInt64 const nNewSize)
     ReAllocateMemory( nDiff );
 }
 
+sal_uInt64 SvStream::TellEnd()
+{
+    return Tell() + remainingSize();
+}
+
 //Create a OString of nLen bytes from rStream
 OString read_uInt8s_ToOString(SvStream& rStrm, std::size_t nLen)
 {