mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unnecessary virtual inheritance

Browse Source 
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.lunak@collabora.com>
This commit is contained in:
Luboš Luňák
2021-11-29 22:23:25 +01:00
parent 8883fd63e2
commit 93b0498451
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/tools/stream.hxx
View File

@@ -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;

2
unotools/source/ucbhelper/ucblockbytes.hxx
View File

@@ -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;