[Libreoffice-commits] core.git: cppcanvas/source drawinglayer/source editeng/source filter/source include/editeng include/filter
Noel Grandin
noel.grandin at collabora.co.uk
Tue Jan 24 11:03:13 UTC 2017
cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx | 1 -
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 4 ----
editeng/source/accessibility/AccessibleStaticTextBase.cxx | 5 -----
editeng/source/misc/SvXMLAutoCorrectExport.hxx | 2 --
editeng/source/uno/unoedprx.cxx | 1 -
filter/source/graphicfilter/egif/egif.cxx | 1 -
filter/source/graphicfilter/eps/eps.cxx | 5 -----
filter/source/graphicfilter/etiff/etiff.cxx | 6 ------
filter/source/graphicfilter/icgm/bundles.hxx | 2 --
filter/source/graphicfilter/ipbm/ipbm.cxx | 5 -----
filter/source/graphicfilter/ipcx/ipcx.cxx | 5 -----
filter/source/graphicfilter/iras/iras.cxx | 6 ------
filter/source/graphicfilter/itiff/itiff.cxx | 4 ----
filter/source/msfilter/viscache.hxx | 3 ---
filter/source/placeware/exporter.cxx | 5 -----
filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx | 3 ---
filter/source/xmlfilterdetect/filterdetect.hxx | 2 --
include/editeng/forbiddencharacterstable.hxx | 1 -
include/editeng/svxrtf.hxx | 1 -
include/filter/msfilter/mstoolbar.hxx | 8 --------
20 files changed, 70 deletions(-)
New commits:
commit 1d7c589d502fb7f0d874c13e30011ca33a3fb6e4
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Jan 24 11:29:05 2017 +0200
loplugin: unnecessary destructor cppcanvas..filter
Change-Id: I009cdd60869a67d210edf879ddb451663a7b8676
Reviewed-on: https://gerrit.libreoffice.org/33491
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
index 86568ec..68e5649 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
@@ -61,7 +61,6 @@ namespace cppcanvas
*/
CachedPrimitiveBase( const CanvasSharedPtr& rCanvas,
bool bOnlyRedrawWithSameTransform );
- virtual ~CachedPrimitiveBase() override {}
CachedPrimitiveBase(const CachedPrimitiveBase&) = delete;
const CachedPrimitiveBase& operator=(const CachedPrimitiveBase&) = delete;
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index fbc15f5..6c3cfe9 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -127,10 +127,6 @@ namespace
{
}
- ~PropertyHolder()
- {
- }
-
/// read/write accesses
const basegfx::B2DHomMatrix& getTransformation() const { return maTransformation; }
void setTransformation(const basegfx::B2DHomMatrix& rNew) { if(rNew != maTransformation) maTransformation = rNew; }
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 93a4358..c4804cf 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -109,7 +109,6 @@ namespace accessibility
// receive pointer to our frontend class and view window
AccessibleStaticTextBase_Impl();
- ~AccessibleStaticTextBase_Impl();
void SetEditSource( ::std::unique_ptr< SvxEditSource > && pEditSource );
@@ -190,10 +189,6 @@ namespace accessibility
// now the maTextParagraph has an empty parent reference set
}
- AccessibleStaticTextBase_Impl::~AccessibleStaticTextBase_Impl()
- {
- }
-
void AccessibleStaticTextBase_Impl::SetEditSource( ::std::unique_ptr< SvxEditSource > && pEditSource )
{
diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.hxx b/editeng/source/misc/SvXMLAutoCorrectExport.hxx
index 3b3de1d..53ddb2b 100644
--- a/editeng/source/misc/SvXMLAutoCorrectExport.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectExport.hxx
@@ -36,7 +36,6 @@ public:
const OUString &rFileName,
css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler);
- virtual ~SvXMLAutoCorrectExport() override {}
sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID) override;
void ExportAutoStyles_() override {}
void ExportMasterStyles_ () override {}
@@ -56,7 +55,6 @@ public:
const OUString &rFileName,
css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler);
- virtual ~SvXMLExceptionListExport() override {}
sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID) override;
void ExportAutoStyles_() override {}
void ExportMasterStyles_ () override {}
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 5a47cb2..b5e94f5 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -58,7 +58,6 @@ public:
mnBulletOffset(0),
mnBulletLen(0),
mbInBullet(false) {};
- ~SvxAccessibleTextIndex() {};
// Get/Set current paragraph
void SetParagraph( sal_Int32 nPara )
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index 29a75ab..1cf1ad2 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -66,7 +66,6 @@ class GIFWriter
public:
explicit GIFWriter(SvStream &rStream);
- ~GIFWriter() {}
bool WriteGIF( const Graphic& rGraphic, FilterConfigItem* pConfigItem );
};
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 7620e19..c6e6721 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -224,7 +224,6 @@ private:
public:
bool WritePS( const Graphic& rGraphic, SvStream& rTargetStream, FilterConfigItem* );
PSWriter();
- ~PSWriter();
};
//========================== methods from PSWriter ==========================
@@ -277,10 +276,6 @@ PSWriter::PSWriter()
{
}
-PSWriter::~PSWriter()
-{
-}
-
bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, FilterConfigItem* pFilterConfigItem )
{
sal_uInt32 nStreamPosition = 0, nPSPosition = 0; // -Wall warning, unset, check
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index ed955cf..d5251b7 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -106,7 +106,6 @@ private:
public:
explicit TIFFWriter(SvStream &rStream);
- ~TIFFWriter();
bool WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem );
};
@@ -145,11 +144,6 @@ TIFFWriter::TIFFWriter(SvStream &rStream)
}
-TIFFWriter::~TIFFWriter()
-{
-}
-
-
bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem)
{
if ( pFilterConfigItem )
diff --git a/filter/source/graphicfilter/icgm/bundles.hxx b/filter/source/graphicfilter/icgm/bundles.hxx
index 929c926..01e8de5 100644
--- a/filter/source/graphicfilter/icgm/bundles.hxx
+++ b/filter/source/graphicfilter/icgm/bundles.hxx
@@ -81,7 +81,6 @@ public:
virtual Bundle* Clone() override { return new MarkerBundle( *this ); } ;
MarkerBundle& operator=( const MarkerBundle& rMarkerBundle );
- virtual ~MarkerBundle() override {};
};
@@ -119,7 +118,6 @@ public:
virtual Bundle* Clone() override { return new TextBundle( *this ); } ;
TextBundle& operator=( const TextBundle& rTextBundle );
- virtual ~TextBundle() override {};
};
diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx
index 4a2961e..13241aa 100644
--- a/filter/source/graphicfilter/ipbm/ipbm.cxx
+++ b/filter/source/graphicfilter/ipbm/ipbm.cxx
@@ -45,7 +45,6 @@ private:
public:
explicit PBMReader(SvStream & rPBM);
- ~PBMReader();
bool ReadPBM(Graphic & rGraphic );
};
@@ -65,10 +64,6 @@ PBMReader::PBMReader(SvStream & rPBM)
{
}
-PBMReader::~PBMReader()
-{
-}
-
bool PBMReader::ReadPBM(Graphic & rGraphic )
{
sal_uInt16 i;
diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx
index ecd51de..4bb500d 100644
--- a/filter/source/graphicfilter/ipcx/ipcx.cxx
+++ b/filter/source/graphicfilter/ipcx/ipcx.cxx
@@ -53,7 +53,6 @@ private:
public:
explicit PCXReader(SvStream &rStream);
- ~PCXReader();
bool ReadPCX(Graphic & rGraphic );
// Reads a PCX file from the stream and fills the GDIMetaFile
};
@@ -78,10 +77,6 @@ PCXReader::PCXReader(SvStream &rStream)
{
}
-PCXReader::~PCXReader()
-{
-}
-
bool PCXReader::ReadPCX(Graphic & rGraphic)
{
if ( m_rPCX.GetError() )
diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx
index 19139a8..93b7fe2 100644
--- a/filter/source/graphicfilter/iras/iras.cxx
+++ b/filter/source/graphicfilter/iras/iras.cxx
@@ -58,7 +58,6 @@ private:
public:
explicit RASReader(SvStream &rRAS);
- ~RASReader();
bool ReadRAS(Graphic & rGraphic);
};
@@ -82,11 +81,6 @@ RASReader::RASReader(SvStream &rRAS)
{
}
-RASReader::~RASReader()
-{
-}
-
-
bool RASReader::ReadRAS(Graphic & rGraphic)
{
sal_uInt32 nMagicNumber;
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index ccd7566..d5067eb 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -170,10 +170,6 @@ public:
pMap[ 0 ] = pMap[ 1 ] = pMap[ 2 ] = pMap[ 3 ] = nullptr;
}
- ~TIFFReader()
- {
- }
-
sal_uLong GetRowsPerStrip() const
{
//Rows Per Strip:
diff --git a/filter/source/msfilter/viscache.hxx b/filter/source/msfilter/viscache.hxx
index 9ffb16a..81b60d6 100644
--- a/filter/source/msfilter/viscache.hxx
+++ b/filter/source/msfilter/viscache.hxx
@@ -41,9 +41,6 @@ public:
, pMtf( nullptr )
, nAdvFlags( 0x2 ) // in Dokument gefunden
{}
- ~Impl_OlePres()
- {
- }
void SetMtf( const GDIMetaFile & rMtf )
{
pMtf.reset( new GDIMetaFile( rMtf ) );
diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx
index b9cbabb..5c46dc0 100644
--- a/filter/source/placeware/exporter.cxx
+++ b/filter/source/placeware/exporter.cxx
@@ -76,7 +76,6 @@ private:
public:
PageEntry();
- ~PageEntry();
OUString getTempURL() { return maTempFile.getFileURL(); }
@@ -98,10 +97,6 @@ PageEntry::PageEntry()
{
}
-PageEntry::~PageEntry()
-{
-}
-
/// @throws css::uno::Exception
static void encodeFile( osl::File& rSourceFile, Reference< XOutputStream > const & xOutputStream ) throw( css::uno::Exception )
{
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
index bc4f3e5..23a2406 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
@@ -77,9 +77,6 @@ public:
{
}
- virtual ~XmlFilterAdaptor() override {}
-
-
// XFilter
virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor )
diff --git a/filter/source/xmlfilterdetect/filterdetect.hxx b/filter/source/xmlfilterdetect/filterdetect.hxx
index 9f78158..aaacf0b 100644
--- a/filter/source/xmlfilterdetect/filterdetect.hxx
+++ b/filter/source/xmlfilterdetect/filterdetect.hxx
@@ -43,8 +43,6 @@ public:
explicit FilterDetect( const css::uno::Reference< css::uno::XComponentContext > &rxCtx)
: mxCtx( rxCtx ) {}
- virtual ~FilterDetect() override {}
-
//XExtendedFilterDetection
virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor )
throw( css::uno::RuntimeException, std::exception ) override;
diff --git a/include/editeng/forbiddencharacterstable.hxx b/include/editeng/forbiddencharacterstable.hxx
index bd5c7cc..8c58a55 100644
--- a/include/editeng/forbiddencharacterstable.hxx
+++ b/include/editeng/forbiddencharacterstable.hxx
@@ -43,7 +43,6 @@ private:
public:
SvxForbiddenCharactersTable( const css::uno::Reference< css::uno::XComponentContext >& rxContext);
- virtual ~SvxForbiddenCharactersTable() override {}
Map& GetMap() { return maMap; }
const css::i18n::ForbiddenCharacters* GetForbiddenCharacters( sal_uInt16 nLanguage, bool bGetDefault );
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 2698699..d73b960 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -60,7 +60,6 @@ class EditNodeIdx
{
public:
EditNodeIdx(EditEngine* pEE, ContentNode* pNd);
- ~EditNodeIdx() {}
sal_Int32 GetIdx() const;
EditNodeIdx* Clone() const; // Cloning itself
ContentNode* GetNode() { return mpNode; }
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index ab3143a..8eeb8a6 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -112,7 +112,6 @@ class MSFILTER_DLLPUBLIC WString : public TBBase
public:
WString(){};
- virtual ~WString() override {};
bool Read(SvStream &rS) override;
const OUString& getString(){ return sString; }
};
@@ -131,7 +130,6 @@ class MSFILTER_DLLPUBLIC TBCExtraInfo : public TBBase
TBCExtraInfo& operator = ( const TBCExtraInfo&) = delete;
public:
TBCExtraInfo();
- virtual ~TBCExtraInfo() override {}
bool Read(SvStream &rS) override;
#ifdef DEBUG_FILTER_MSTOOLBAR
virtual void Print( FILE* ) override;
@@ -149,7 +147,6 @@ class MSFILTER_DLLPUBLIC TBCGeneralInfo : public TBBase
public:
TBCGeneralInfo();
- virtual ~TBCGeneralInfo() override {}
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
virtual void Print( FILE* ) override;
@@ -180,7 +177,6 @@ class MSFILTER_DLLPUBLIC TBCMenuSpecific : public TBBase
std::shared_ptr< WString > name; //exist only if tbid equals 0x00000001
public:
TBCMenuSpecific();
- virtual ~TBCMenuSpecific() override {}
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
virtual void Print( FILE* ) override;
@@ -228,7 +224,6 @@ class TBCBSpecific : public TBBase
public:
TBCBSpecific();
- virtual ~TBCBSpecific() override {}
bool Read(SvStream &rS) override;
#if OSL_DEBUG_LEVEL > 1
virtual void Print( FILE* ) override;
@@ -295,7 +290,6 @@ class MSFILTER_DLLPUBLIC TBCData : public TBBase
TBCData& operator = ( const TBCData&) = delete;
public:
TBCData( const TBCHeader& Header );
- virtual ~TBCData() override {}
bool Read(SvStream &rS) override;
#ifdef DEBUG_FILTER_MSTOOLBAR
virtual void Print( FILE* ) override;
@@ -317,7 +311,6 @@ class MSFILTER_DLLPUBLIC TB : public TBBase
WString name; //Structure of type WString that specifies the toolbar name
public:
TB();
- virtual ~TB() override {}
bool Read(SvStream &rS) override;
#ifdef DEBUG_FILTER_MSTOOLBAR
virtual void Print( FILE* ) override;
@@ -355,7 +348,6 @@ class MSFILTER_DLLPUBLIC TBVisualData : public TBBase
public:
TBVisualData();
- virtual ~TBVisualData() override {}
bool Read(SvStream &rS) override;
#ifdef DEBUG_FILTER_MSTOOLBAR
virtual void Print( FILE* ) override;
More information about the Libreoffice-commits
mailing list