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

[Luboš Luňák (via logerrit)]

 include/tools/stream.hxx                   |    2 +-
 unotools/source/ucbhelper/ucblockbytes.hxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 93b04984518dbfed9e39d093b844113e81fda735
Author:     Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Mon Nov 29 22:23:25 2021 +0100
Commit:     Luboš Luňák <l.lu...@collabora.com>
CommitDate: Tue Nov 30 10:38:57 2021 +0100

    remove unnecessary virtual inheritance
    
    SvLockBytes is only inherited by UcbLockBytes, and that one is not
    inherited by anything, so there's no diamond inheritance, so there's
    no point. Probably a case of somebody not really understanding
    virtual inheritance and using it "just in case".
    
    Change-Id: I2c01f29634c4f1ff2b55d7552fc571b653878ace
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126074
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lu...@collabora.com>

diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index 884b95f07290..5e78f6d259af 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -96,7 +96,7 @@ struct SvLockBytesStat
     SvLockBytesStat() : nSize(0) {}
 };
 
-class TOOLS_DLLPUBLIC SvLockBytes: public virtual SvRefBase
+class TOOLS_DLLPUBLIC SvLockBytes: public SvRefBase
 {
     SvStream * m_pStream;
     bool m_bOwner;
diff --git a/unotools/source/ucbhelper/ucblockbytes.hxx 
b/unotools/source/ucbhelper/ucblockbytes.hxx
index 6345ead51ba7..adc6d7f7ac5b 100644
--- a/unotools/source/ucbhelper/ucblockbytes.hxx
+++ b/unotools/source/ucbhelper/ucblockbytes.hxx
@@ -59,7 +59,7 @@ namespace utl
 class UcbLockBytes;
 typedef tools::SvRef<UcbLockBytes> UcbLockBytesRef;
 
-class UcbLockBytes : public virtual SvLockBytes
+class UcbLockBytes : public SvLockBytes
 {
     osl::Condition          m_aInitialized;
     osl::Condition          m_aTerminated;