compilerplugins/clang/unusedmethods.results | 10 ++--- rsc/inc/rscclass.hxx | 10 ----- rsc/source/res/rscclass.cxx | 51 ---------------------------- 3 files changed, 5 insertions(+), 66 deletions(-)
New commits: commit 5503b0b79121fae89303fb00f255e57b05593930 Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Fri Apr 28 09:01:10 2017 +0200 loplugin:unusedmethods Change-Id: I8b618d791fd093ea069fdc26ed6c274e172222a4 Reviewed-on: https://gerrit.libreoffice.org/37048 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results index 6781c1492c29..e25f1c810268 100644 --- a/compilerplugins/clang/unusedmethods.results +++ b/compilerplugins/clang/unusedmethods.results @@ -460,17 +460,17 @@ sw/inc/swrect.hxx:105 class SvStream & WriteSwRect(class SvStream &,const class SwRect &) sw/qa/extras/inc/swmodeltestbase.hxx:523 class com::sun::star::uno::Reference<class com::sun::star::beans::XPropertySet> SwModelTestBase::getParagraphAnchoredObject(const int,const class com::sun::star::uno::Reference<class com::sun::star::text::XTextRange> &) const -sw/qa/extras/uiwriter/uiwriter.cxx:4592 +sw/qa/extras/uiwriter/uiwriter.cxx:4621 int main() sw/source/core/inc/flowfrm.hxx:171 class SwFlowFrame * SwFlowFrame::GetPrecede() -sw/source/core/inc/frame.hxx:1188 +sw/source/core/inc/frame.hxx:1187 class Size SwRectFnSet::GetSize(const class SwRect &) const -sw/source/core/inc/frame.hxx:1219 +sw/source/core/inc/frame.hxx:1218 long SwRectFnSet::LeftDist(const class SwRect &,long) const -sw/source/core/inc/frame.hxx:1220 +sw/source/core/inc/frame.hxx:1219 long SwRectFnSet::RightDist(const class SwRect &,long) const -sw/source/core/inc/frame.hxx:1228 +sw/source/core/inc/frame.hxx:1227 long SwRectFnSet::XInc(long,long) const sw/source/core/text/porlin.hxx:127 _Bool SwLinePortion::IsTabRightPortion() const diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx index 2e81aa24ac6a..382006c39c5d 100644 --- a/rsc/inc/rscclass.hxx +++ b/rsc/inc/rscclass.hxx @@ -89,16 +89,6 @@ public: RscTypCont * pTC, sal_uInt32 ) override; }; -class RscSysDepend : public RscClass -{ -public: - RscSysDepend( Atom nId, RESOURCE_TYPE nTypId, RscTop * pSuper ); - ERRTYPE WriteSysDependRc( const RSCINST &, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32 ); - ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32 ) override; -}; - class RscTupel : public RscClass { public: diff --git a/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx index a6922310308f..c793771d4322 100644 --- a/rsc/source/res/rscclass.cxx +++ b/rsc/source/res/rscclass.cxx @@ -618,57 +618,6 @@ ERRTYPE RscClass::WriteRc( const RSCINST & rInst, return aError; } -RscSysDepend::RscSysDepend( Atom nId, RESOURCE_TYPE nTypeId, RscTop * pSuper ) - : RscClass( nId, nTypeId, pSuper ) -{ -} - -ERRTYPE RscSysDepend::WriteSysDependRc( const RSCINST & rInst, RscWriteRc & rMem, - RscTypCont * pTC, sal_uInt32 nDeep ) -{ - ERRTYPE aError; - RSCINST aFileName; - - // retrieve instance with file name "FILENAME" - aFileName = RscClass::GetCopyVar( rInst, pHS->getID( "FILE", true ) ); - if( aFileName.IsInst() ) - { - RscWriteRc aTmpMem; - aError = aFileName.pClass->WriteRcHeader( aFileName, aTmpMem, pTC, - RscId(), nDeep ); - // Obsolete - need changes in VCL - rMem.Put( sal_uInt32(0) ); - - // write identifier - sal_uInt32 nId = 0xFFFFFFFF; - if( aTmpMem.Size() && pTC && (*aTmpMem.GetUTF8( 0 ) != '\0') ) - { - nId = pTC->PutSysName( rInst.pClass->GetTypId(), - aTmpMem.GetUTF8( 0 ) ); - } - rMem.Put( nId ); - aError = aFileName.pClass->WriteRcHeader( aFileName, rMem, pTC, - RscId(), nDeep ); - } - else - aError = ERR_ERROR; - - return aError; -} - -ERRTYPE RscSysDepend::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, - RscTypCont * pTC, sal_uInt32 nDeep ) -{ - ERRTYPE aError = RscClass::WriteRc( rInst, rMem, pTC, nDeep ); - - if( this == rInst.pClass ) - { - // only when it is own class - aError = WriteSysDependRc( rInst, rMem, pTC, nDeep ); - } - return aError; -} - RscTupel::RscTupel( Atom nId, RESOURCE_TYPE nTypeId ) : RscClass( nId, nTypeId, nullptr ) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits