Adding upstream version 4:7.4.7.upstream/4%7.4.7upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 463 insertions, 0 deletions

diff --git a/unotools/source/streaming/streamhelper.cxx b/unotools/source/streaming/streamhelper.cxx
new file mode 100644
index 000000000..b5f07e6a6
--- /dev/null
+++ b/unotools/source/streaming/streamhelper.cxx
@@ -0,0 +1,123 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <sal/config.h>
+
+#include <com/sun/star/io/BufferSizeExceededException.hpp>
+#include <com/sun/star/io/IOException.hpp>
+#include <com/sun/star/io/NotConnectedException.hpp>
+#include <o3tl/safeint.hxx>
+#include <unotools/streamhelper.hxx>
+
+namespace utl
+{
+
+sal_Int32 SAL_CALL OInputStreamHelper::readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
+{
+    if (!m_xLockBytes.is())
+        throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
+
+    if (nBytesToRead < 0)
+        throw css::io::BufferSizeExceededException(OUString(), static_cast<css::uno::XWeak*>(this));
+
+    std::scoped_lock aGuard( m_aMutex );
+    if (aData.getLength() < nBytesToRead)
+        aData.realloc(nBytesToRead);
+
+    std::size_t nRead(0);
+    ErrCode nError = m_xLockBytes->ReadAt(m_nActPos, static_cast<void*>(aData.getArray()), nBytesToRead, &nRead);
+    m_nActPos += nRead;
+
+    if (nError != ERRCODE_NONE)
+        throw css::io::IOException(OUString(), static_cast<css::uno::XWeak*>(this));
+
+    // adjust sequence if data read is lower than the desired data
+    if (nRead < o3tl::make_unsigned(aData.getLength()))
+        aData.realloc( nRead );
+
+    return nRead;
+}
+
+void SAL_CALL OInputStreamHelper::seek( sal_Int64 location )
+{
+    std::scoped_lock aGuard( m_aMutex );
+    m_nActPos = location;
+}
+
+sal_Int64 SAL_CALL OInputStreamHelper::getPosition(  )
+{
+    return m_nActPos;
+}
+
+sal_Int64 SAL_CALL OInputStreamHelper::getLength(  )
+{
+    if (!m_xLockBytes.is())
+        return 0;
+
+    std::scoped_lock aGuard( m_aMutex );
+    SvLockBytesStat aStat;
+    m_xLockBytes->Stat( &aStat );
+    return aStat.nSize;
+}
+
+sal_Int32 SAL_CALL OInputStreamHelper::readSomeBytes(css::uno::Sequence< sal_Int8 >& aData,
+                                                     sal_Int32 nMaxBytesToRead)
+{
+    // read all data desired
+    return readBytes(aData, nMaxBytesToRead);
+}
+
+void SAL_CALL OInputStreamHelper::skipBytes(sal_Int32 nBytesToSkip)
+{
+    std::scoped_lock aGuard( m_aMutex );
+    if (!m_xLockBytes.is())
+        throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
+
+    if (nBytesToSkip < 0)
+        throw css::io::BufferSizeExceededException(OUString(), static_cast<css::uno::XWeak*>(this));
+
+    m_nActPos += nBytesToSkip;
+}
+
+sal_Int32 SAL_CALL OInputStreamHelper::available()
+{
+    std::scoped_lock aGuard( m_aMutex );
+    if (!m_xLockBytes.is())
+        throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
+
+    return m_nAvailable;
+}
+
+void SAL_CALL OInputStreamHelper::closeInput()
+{
+    std::scoped_lock aGuard( m_aMutex );
+    if (!m_xLockBytes.is())
+        throw css::io::NotConnectedException(OUString(), static_cast<css::uno::XWeak*>(this));
+
+    m_xLockBytes = nullptr;
+}
+
+void SAL_CALL OInputStreamHelper::acquire() SAL_NOEXCEPT
+{
+    cppu::WeakImplHelper<css::io::XInputStream, css::io::XSeekable>::acquire();
+}
+
+} // namespace utl
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/streaming/streamwrap.cxx b/unotools/source/streaming/streamwrap.cxx
new file mode 100644
index 000000000..6a6cbbd20
--- /dev/null
+++ b/unotools/source/streaming/streamwrap.cxx
@@ -0,0 +1,340 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <sal/config.h>
+
+#include <com/sun/star/io/BufferSizeExceededException.hpp>
+#include <com/sun/star/io/NotConnectedException.hpp>
+#include <o3tl/safeint.hxx>
+#include <unotools/streamwrap.hxx>
+#include <tools/stream.hxx>
+
+namespace utl
+{
+
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::io;
+using namespace ::com::sun::star::lang;
+
+OInputStreamWrapper::OInputStreamWrapper( SvStream& _rStream )
+                 :m_pSvStream(&_rStream)
+                 ,m_bSvStreamOwner(false)
+{
+}
+
+OInputStreamWrapper::OInputStreamWrapper( SvStream* pStream, bool bOwner )
+                 :m_pSvStream( pStream )
+                 ,m_bSvStreamOwner( bOwner )
+{
+}
+
+OInputStreamWrapper::OInputStreamWrapper( std::unique_ptr<SvStream> pStream )
+                 :m_pSvStream( pStream.release() )
+                 ,m_bSvStreamOwner( true )
+{
+}
+
+OInputStreamWrapper::~OInputStreamWrapper()
+{
+    if( m_bSvStreamOwner )
+        delete m_pSvStream;
+}
+
+sal_Int32 SAL_CALL OInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
+{
+    checkConnected();
+
+    if (nBytesToRead < 0)
+        throw css::io::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this));
+
+    std::scoped_lock aGuard( m_aMutex );
+
+    if (aData.getLength() < nBytesToRead)
+        aData.realloc(nBytesToRead);
+
+    sal_uInt32 nRead = m_pSvStream->ReadBytes(static_cast<void*>(aData.getArray()), nBytesToRead);
+    checkError();
+
+    // If read characters < MaxLength, adjust css::uno::Sequence
+    if (nRead < o3tl::make_unsigned(aData.getLength()))
+        aData.realloc( nRead );
+
+    return nRead;
+}
+
+sal_Int32 OInputStreamWrapper::readSomeBytes(sal_Int8* pData, sal_Int32 nBytesToRead)
+{
+    checkConnected();
+
+    if (nBytesToRead < 0)
+        throw css::io::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this));
+
+    std::scoped_lock aGuard( m_aMutex );
+
+    sal_uInt32 nRead = m_pSvStream->ReadBytes(static_cast<void*>(pData), nBytesToRead);
+    checkError();
+
+    return nRead;
+}
+
+sal_Int32 SAL_CALL OInputStreamWrapper::readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead)
+{
+    checkError();
+
+    if (nMaxBytesToRead < 0)
+        throw css::io::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this));
+
+    if (m_pSvStream->eof())
+    {
+        aData.realloc(0);
+        return 0;
+    }
+    else
+        return readBytes(aData, nMaxBytesToRead);
+}
+
+void SAL_CALL OInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip)
+{
+    std::scoped_lock aGuard( m_aMutex );
+    checkError();
+
+    m_pSvStream->SeekRel(nBytesToSkip);
+    checkError();
+}
+
+sal_Int32 SAL_CALL OInputStreamWrapper::available()
+{
+    std::scoped_lock aGuard( m_aMutex );
+    checkConnected();
+
+    sal_Int64 nAvailable = m_pSvStream->remainingSize();
+    checkError();
+
+    return std::min<sal_Int64>(SAL_MAX_INT32, nAvailable);
+}
+
+void SAL_CALL OInputStreamWrapper::closeInput()
+{
+    std::scoped_lock aGuard( m_aMutex );
+    checkConnected();
+
+    if (m_bSvStreamOwner)
+        delete m_pSvStream;
+
+    m_pSvStream = nullptr;
+}
+
+void OInputStreamWrapper::checkConnected() const
+{
+    if (!m_pSvStream)
+        throw css::io::NotConnectedException(OUString(), const_cast<css::uno::XWeak*>(static_cast<const css::uno::XWeak*>(this)));
+}
+
+void OInputStreamWrapper::checkError() const
+{
+    checkConnected();
+
+    auto const e = m_pSvStream->SvStream::GetError();
+    if (e != ERRCODE_NONE)
+        // TODO: really evaluate the error
+        throw css::io::NotConnectedException("utl::OInputStreamWrapper error " + e.toHexString(), const_cast<css::uno::XWeak*>(static_cast<const css::uno::XWeak*>(this)));
+}
+
+sal_Int64 SAL_CALL OInputStreamWrapper::getSomething( const css::uno::Sequence< sal_Int8 >& rIdentifier )
+{
+    if (rIdentifier == comphelper::ByteReader::getUnoTunnelId())
+        return reinterpret_cast<sal_Int64>(static_cast<comphelper::ByteReader*>(this));
+    return 0;
+}
+
+
+//= OSeekableInputStreamWrapper
+
+OSeekableInputStreamWrapper::~OSeekableInputStreamWrapper() = default;
+
+OSeekableInputStreamWrapper::OSeekableInputStreamWrapper(SvStream& _rStream)
+{
+    SetStream( &_rStream, false );
+}
+
+OSeekableInputStreamWrapper::OSeekableInputStreamWrapper(SvStream* _pStream, bool _bOwner)
+{
+    SetStream( _pStream, _bOwner );
+}
+
+void SAL_CALL OSeekableInputStreamWrapper::seek( sal_Int64 _nLocation )
+{
+    std::scoped_lock aGuard( m_aMutex );
+    checkConnected();
+
+    m_pSvStream->Seek(static_cast<sal_uInt32>(_nLocation));
+    checkError();
+}
+
+sal_Int64 SAL_CALL OSeekableInputStreamWrapper::getPosition(  )
+{
+    std::scoped_lock aGuard( m_aMutex );
+    checkConnected();
+
+    sal_uInt32 nPos = m_pSvStream->Tell();
+    checkError();
+    return static_cast<sal_Int64>(nPos);
+}
+
+sal_Int64 SAL_CALL OSeekableInputStreamWrapper::getLength(  )
+{
+    std::scoped_lock aGuard( m_aMutex );
+    checkConnected();
+
+    checkError();
+
+    sal_Int64 nEndPos = m_pSvStream->TellEnd();
+
+    return nEndPos;
+}
+
+//= OOutputStreamWrapper
+
+OOutputStreamWrapper::OOutputStreamWrapper(SvStream& _rStream):
+    rStream(_rStream)
+{}
+
+OOutputStreamWrapper::~OOutputStreamWrapper() {}
+
+void SAL_CALL OOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData)
+{
+    sal_uInt32 nWritten = rStream.WriteBytes(aData.getConstArray(), aData.getLength());
+    ErrCode err = rStream.GetError();
+    if  (   (ERRCODE_NONE != err)
+        ||  (nWritten != static_cast<sal_uInt32>(aData.getLength()))
+        )
+    {
+        throw css::io::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this));
+    }
+}
+
+void SAL_CALL OOutputStreamWrapper::flush()
+{
+    rStream.FlushBuffer();
+    checkError();
+}
+
+void SAL_CALL OOutputStreamWrapper::closeOutput()
+{
+}
+
+void OOutputStreamWrapper::checkError() const
+{
+    if (rStream.GetError() != ERRCODE_NONE)
+        // TODO: really evaluate the error
+        throw css::io::NotConnectedException(OUString(), const_cast<css::uno::XWeak*>(static_cast<const css::uno::XWeak*>(this)));
+}
+
+//= OSeekableOutputStreamWrapper
+
+OSeekableOutputStreamWrapper::OSeekableOutputStreamWrapper(SvStream& _rStream)
+    :OOutputStreamWrapper(_rStream)
+{
+}
+
+OSeekableOutputStreamWrapper::~OSeekableOutputStreamWrapper() {}
+
+Any SAL_CALL OSeekableOutputStreamWrapper::queryInterface( const Type& _rType )
+{
+    Any aReturn = OOutputStreamWrapper::queryInterface(_rType);
+    if (!aReturn.hasValue())
+        aReturn = OSeekableOutputStreamWrapper_Base::queryInterface(_rType);
+    return aReturn;
+}
+
+void SAL_CALL OSeekableOutputStreamWrapper::seek( sal_Int64 _nLocation )
+{
+    rStream.Seek(static_cast<sal_uInt32>(_nLocation));
+    checkError();
+}
+
+sal_Int64 SAL_CALL OSeekableOutputStreamWrapper::getPosition(  )
+{
+    sal_uInt32 nPos = rStream.Tell();
+    checkError();
+    return static_cast<sal_Int64>(nPos);
+}
+
+sal_Int64 SAL_CALL OSeekableOutputStreamWrapper::getLength(  )
+{
+    checkError();
+
+    sal_Int64 nEndPos = rStream.TellEnd();
+
+    return nEndPos;
+}
+
+OStreamWrapper::~OStreamWrapper() = default;
+
+OStreamWrapper::OStreamWrapper(SvStream& _rStream)
+{
+    SetStream( &_rStream, false );
+}
+
+OStreamWrapper::OStreamWrapper(std::unique_ptr<SvStream> pStream)
+{
+    SetStream( pStream.release(), true );
+}
+
+css::uno::Reference< css::io::XInputStream > SAL_CALL OStreamWrapper::getInputStream(  )
+{
+    return this;
+}
+
+css::uno::Reference< css::io::XOutputStream > SAL_CALL OStreamWrapper::getOutputStream(  )
+{
+    return this;
+}
+
+void SAL_CALL OStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData)
+{
+    sal_uInt32 nWritten = m_pSvStream->WriteBytes(aData.getConstArray(), aData.getLength());
+    ErrCode err = m_pSvStream->GetError();
+    if  (   (ERRCODE_NONE != err)
+        ||  (nWritten != static_cast<sal_uInt32>(aData.getLength()))
+        )
+    {
+        throw css::io::BufferSizeExceededException(OUString(),static_cast<css::uno::XWeak*>(this));
+    }
+}
+
+void SAL_CALL OStreamWrapper::flush()
+{
+    m_pSvStream->FlushBuffer();
+    if (m_pSvStream->GetError() != ERRCODE_NONE)
+        throw css::io::NotConnectedException(OUString(),static_cast<css::uno::XWeak*>(this));
+}
+
+void SAL_CALL OStreamWrapper::closeOutput()
+{
+}
+
+void SAL_CALL OStreamWrapper::truncate()
+{
+    m_pSvStream->SetStreamSize(0);
+}
+
+} // namespace utl
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */