loplugin:unnecessaryvirtual

update the plugin with lessons learned from the mergeclasses plugin and
re-run it

Change-Id: I9d622eb3d05fceaf8fa764c533c8fa5dfb4c7711
Reviewed-on: https://gerrit.libreoffice.org/20015
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

4 files changed, 3 insertions, 36 deletions

diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx
index 9484d9e550dd..ab44f577178d 100644
--- a/basic/source/sbx/sbxarray.cxx
+++ b/basic/source/sbx/sbxarray.cxx
@@ -492,7 +492,7 @@ SbxVariable* SbxArray::Find( const OUString& rName, SbxClassType t )
     return p;
 }
 
-bool SbxArray::LoadData( SvStream& rStrm, sal_uInt16 nVer )
+bool SbxArray::LoadData( SvStream& rStrm, sal_uInt16 /*nVer*/ )
 {
     sal_uInt16 nElem;
     Clear();
@@ -517,8 +517,6 @@ bool SbxArray::LoadData( SvStream& rStrm, sal_uInt16 nVer )
             break;
         }
     }
-    if( bRes )
-        bRes = LoadPrivateData( rStrm, nVer );
     nFlags = f;
     return bRes;
 }
@@ -545,7 +543,7 @@ bool SbxArray::StoreData( SvStream& rStrm ) const
                 return false;
         }
     }
-    return StorePrivateData( rStrm );
+    return true;
 }
 
 // #100883 Method to set method directly to parameter array
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index b868238342c0..12bb9b7b94ec 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -290,16 +290,6 @@ bool SbxBase::StoreData( SvStream& ) const
     return false;
 }
 
-bool SbxBase::LoadPrivateData( SvStream&, sal_uInt16 )
-{
-    return true;
-}
-
-bool SbxBase::StorePrivateData( SvStream& ) const
-{
-    return true;
-}
-
 bool SbxBase::LoadCompleted()
 {
     return true;
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index dc20af6e7eb7..3704d288db93 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -606,10 +606,6 @@ bool SbxObject::LoadData( SvStream& rStrm, sal_uInt16 nVer )
     aDfltProp = read_uInt16_lenPrefixed_uInt8s_ToOUString(rStrm, RTL_TEXTENCODING_ASCII_US);
     sal_Size nPos = rStrm.Tell();
     rStrm.ReadUInt32( nSize );
-    if( !LoadPrivateData( rStrm, nVer ) )
-    {
-        return false;
-    }
     sal_Size nNewPos = rStrm.Tell();
     nPos += nSize;
     DBG_ASSERT( nPos >= nNewPos, "SBX: Loaded too much data" );
@@ -647,10 +643,6 @@ bool SbxObject::StoreData( SvStream& rStrm ) const
     write_uInt16_lenPrefixed_uInt8s_FromOUString(rStrm, aDfltProp, RTL_TEXTENCODING_ASCII_US);
     sal_Size nPos = rStrm.Tell();
     rStrm.WriteUInt32( 0L );
-    if( !StorePrivateData( rStrm ) )
-    {
-        return false;
-    }
     sal_Size nNew = rStrm.Tell();
     rStrm.Seek( nPos );
     rStrm.WriteUInt32( nNew - nPos );
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 548ce03642ac..2bbe5081044b 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -574,11 +574,6 @@ bool SbxVariable::LoadData( SvStream& rStrm, sal_uInt16 nVer )
         pInfo = new SbxInfo;
         pInfo->LoadData( rStrm, (sal_uInt16) cMark );
     }
-    // Load private data only, if it is a SbxVariable
-    if( GetClass() == SbxCLASS_VARIABLE && !LoadPrivateData( rStrm, nVer ) )
-    {
-        return false;
-    }
     Broadcast( SBX_HINT_DATACHANGED );
     nHash =  MakeHashCode( maName );
     SetModified( true );
@@ -625,15 +620,7 @@ bool SbxVariable::StoreData( SvStream& rStrm ) const
     {
         rStrm.WriteUChar( 0 );
     }
-    // Save private data only, if it is a SbxVariable
-    if( GetClass() == SbxCLASS_VARIABLE )
-    {
-        return StorePrivateData( rStrm );
-    }
-    else
-    {
-        return true;
-    }
+    return true;
 }
 
 // SbxInfo