[Libreoffice-commits] core.git: include/oox include/registry oox/inc oox/source package/source registry/source reportdesign/source rsc/inc sal/qa sax/source
Noel Grandin
noel.grandin at collabora.co.uk
Wed Jan 25 08:16:20 UTC 2017
include/oox/drawingml/chart/modelbase.hxx | 3 ---
include/oox/drawingml/shape.hxx | 1 -
include/registry/refltype.hxx | 3 ---
oox/inc/drawingml/chart/chartcontextbase.hxx | 2 --
oox/source/core/xmlfilterbase.cxx | 5 -----
oox/source/drawingml/chart/plotareaconverter.cxx | 1 -
oox/source/drawingml/diagram/diagramlayoutatoms.hxx | 11 -----------
package/source/manifest/ManifestImport.hxx | 3 ---
package/source/xstor/xstorage.cxx | 6 ------
registry/source/reflread.cxx | 12 ------------
registry/source/reflwrit.cxx | 15 ---------------
reportdesign/source/core/api/ReportDefinition.cxx | 6 ------
reportdesign/source/core/inc/ReportDrawPage.hxx | 1 -
reportdesign/source/core/sdr/ModuleHelper.cxx | 6 ------
rsc/inc/rsclex.hxx | 1 -
sal/qa/osl/process/osl_Thread.cxx | 1 -
sal/qa/rtl/random/rtl_random.cxx | 1 -
sax/source/fastparser/fastparser.cxx | 9 ---------
sax/source/tools/CachedOutputStream.hxx | 1 -
sax/source/tools/fastserializer.hxx | 1 -
20 files changed, 89 deletions(-)
New commits:
commit ef2b4342e9f8a887bb840d8a6c875125139d433a
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Wed Jan 25 08:21:03 2017 +0200
loplugin: unnecessary destructor oox..sax
Change-Id: Ie12bfabc92bce04d702f3e77aa5896366e49245e
Reviewed-on: https://gerrit.libreoffice.org/33509
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/oox/drawingml/chart/modelbase.hxx b/include/oox/drawingml/chart/modelbase.hxx
index d27d139..312d3e3 100644
--- a/include/oox/drawingml/chart/modelbase.hxx
+++ b/include/oox/drawingml/chart/modelbase.hxx
@@ -39,7 +39,6 @@ class ModelRef : public std::shared_ptr< ModelType >
public:
ModelRef() {}
ModelRef( const std::shared_ptr< ModelType >& rxModel ) : std::shared_ptr< ModelType >( rxModel ) {}
- ~ModelRef() {}
bool is() const { return this->get() != 0; }
@@ -62,7 +61,6 @@ public:
typedef typename RefVector< ModelType >::size_type size_type;
ModelVector() {}
- ~ModelVector() {}
ModelType& create() { return append( new ModelType ); }
template< typename Param1Type >
@@ -83,7 +81,6 @@ public:
typedef typename RefMap< KeyType, ModelType >::value_type value_type;
ModelMap() {}
- ~ModelMap() {}
ModelType& create( KeyType eKey ) { return insert( eKey, new ModelType ); }
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 67f9a9b..1bc3fb7b 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -92,7 +92,6 @@ struct LinkedTxbxAttr
sal_Int32 id;
sal_Int32 seq;
LinkedTxbxAttr(): id(0),seq(0){};
- ~LinkedTxbxAttr(){};
};
class OOX_DLLPUBLIC Shape
diff --git a/include/registry/refltype.hxx b/include/registry/refltype.hxx
index 3e3beda..f2a7db2 100644
--- a/include/registry/refltype.hxx
+++ b/include/registry/refltype.hxx
@@ -53,9 +53,6 @@ public:
{
m_value.aDouble = 0.0;
}
-
- /// Destructor
- ~RTConstValue() {}
};
/** deprecated.
diff --git a/oox/inc/drawingml/chart/chartcontextbase.hxx b/oox/inc/drawingml/chart/chartcontextbase.hxx
index 2639e08..c5e194a 100644
--- a/oox/inc/drawingml/chart/chartcontextbase.hxx
+++ b/oox/inc/drawingml/chart/chartcontextbase.hxx
@@ -34,7 +34,6 @@ class ContextBase : public ::oox::core::ContextHandler2
public:
explicit ContextBase( ::oox::core::ContextHandler2Helper& rParent, ModelType& rModel ) :
::oox::core::ContextHandler2( rParent ), mrModel( rModel ) {}
- virtual ~ContextBase() override {}
protected:
ModelType& mrModel;
@@ -46,7 +45,6 @@ class FragmentBase : public ::oox::core::FragmentHandler2
public:
explicit FragmentBase( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, ModelType& rModel ) :
::oox::core::FragmentHandler2( rFilter, rFragmentPath, false ), mrModel( rModel ) {}
- virtual ~FragmentBase() override {}
protected:
ModelType& mrModel;
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 21f0b50..7d1651c 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -183,7 +183,6 @@ struct XmlFilterBaseImpl
/// @throws RuntimeException
explicit XmlFilterBaseImpl( const Reference< XComponentContext >& rxContext ) throw( RuntimeException );
- ~XmlFilterBaseImpl();
};
XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) :
@@ -195,10 +194,6 @@ XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference< XComponentContext >& rxCo
registerNamespaces(maFastParser);
}
-XmlFilterBaseImpl::~XmlFilterBaseImpl()
-{
-}
-
XmlFilterBase::XmlFilterBase( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) :
FilterBase( rxContext ),
mxImpl( new XmlFilterBaseImpl( rxContext ) ),
diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx
index 19784b3..fd444c1 100644
--- a/oox/source/drawingml/chart/plotareaconverter.cxx
+++ b/oox/source/drawingml/chart/plotareaconverter.cxx
@@ -57,7 +57,6 @@ struct AxesSetModel
AxisMap maAxes; /// All axes mapped by API axis type.
inline explicit AxesSetModel() {}
- inline ~AxesSetModel() {}
};
/** Axes set converter. This is a helper class for the plot area converter. */
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index 8601424..de8d80b 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -105,8 +105,6 @@ public:
mnRefType(-1), mnRefPointType(-1), mfFactor(1.0), mfValue(0.0), mnOperator(0)
{}
- virtual ~ConstraintAtom() override { }
-
virtual void accept( LayoutAtomVisitor& ) override;
void setFor( sal_Int32 nToken )
@@ -151,8 +149,6 @@ class AlgAtom
public:
AlgAtom() : mnType(0), maMap() {}
- virtual ~AlgAtom() override { }
-
typedef std::map<sal_Int32,sal_Int32> ParamMap;
virtual void accept( LayoutAtomVisitor& ) override;
@@ -177,8 +173,6 @@ class ForEachAtom
public:
explicit ForEachAtom(const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes);
- virtual ~ForEachAtom() override { }
-
IteratorAttr & iterator()
{ return maIter; }
virtual void accept( LayoutAtomVisitor& ) override;
@@ -194,8 +188,6 @@ class ConditionAtom
{
public:
explicit ConditionAtom(const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes);
- virtual ~ConditionAtom() override
- { }
virtual void accept( LayoutAtomVisitor& ) override;
void readElseBranch()
{ mbElse=true; }
@@ -215,8 +207,6 @@ class ChooseAtom
: public LayoutAtom
{
public:
- virtual ~ChooseAtom() override
- { }
virtual void accept( LayoutAtomVisitor& ) override;
};
@@ -240,7 +230,6 @@ public:
typedef std::array<css::uno::Any, 9> VarMap;
LayoutNode() : mnChildOrder(0) {}
- virtual ~LayoutNode() override { }
virtual void accept( LayoutAtomVisitor& ) override;
VarMap & variables()
{ return mVariables; }
diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx
index 3b2302a..1263af3 100644
--- a/package/source/manifest/ManifestImport.hxx
+++ b/package/source/manifest/ManifestImport.hxx
@@ -44,9 +44,6 @@ struct ManifestScopeEntry
, m_aNamespaces( aNamespaces )
, m_bValid( true )
{}
-
- ~ManifestScopeEntry()
- {}
};
typedef ::std::vector< ManifestScopeEntry > ManifestStack;
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index 21ac47d..e43241b 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -92,8 +92,6 @@ struct StorInternalData_Impl
, m_bReadOnlyWrap( bReadOnlyWrap )
, m_pSubElDispListener()
{}
-
- ~StorInternalData_Impl();
};
// static
@@ -158,10 +156,6 @@ uno::Reference< io::XInputStream > GetSeekableTempCopy( const uno::Reference< io
return xTempIn;
}
-StorInternalData_Impl::~StorInternalData_Impl()
-{
-}
-
SotElement_Impl::SotElement_Impl( const OUString& rName, bool bStor, bool bNew )
: m_aName( rName )
, m_aOriginalName( rName )
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index 1df3a63..97699af 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -267,8 +267,6 @@ public:
{
}
- ~ConstantPool();
-
sal_uInt32 parseIndex(); // throws std::bad_alloc
CPInfoTag readTag(sal_uInt16 index);
@@ -288,10 +286,6 @@ public:
// throws std::bad_alloc
};
-ConstantPool::~ConstantPool()
-{
-}
-
sal_uInt32 ConstantPool::parseIndex()
{
m_pIndex.reset();
@@ -891,8 +885,6 @@ public:
}
}
- ~MethodList();
-
sal_uInt32 parseIndex(); // throws std::bad_alloc
const sal_Char* getMethodName(sal_uInt16 index);
@@ -910,10 +902,6 @@ private:
sal_uInt16 calcMethodParamIndex( const sal_uInt16 index );
};
-MethodList::~MethodList()
-{
-}
-
sal_uInt16 MethodList::calcMethodParamIndex( const sal_uInt16 index )
{
return (METHOD_OFFSET_PARAM_COUNT + sizeof(sal_uInt16) + (index * m_PARAM_ENTRY_SIZE));
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index 59e712f..e0b52b0 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -430,7 +430,6 @@ public:
RTParamMode m_mode;
ParamEntry();
- ~ParamEntry();
void setData(const OString& typeName,
const OString& name,
@@ -442,10 +441,6 @@ ParamEntry::ParamEntry()
{
}
-ParamEntry::~ParamEntry()
-{
-}
-
void ParamEntry::setData(const OString& typeName,
const OString& name,
RTParamMode mode)
@@ -471,7 +466,6 @@ public:
RTFieldAccess m_access;
ReferenceEntry();
- ~ReferenceEntry();
void setData(const OString& name,
RTReferenceType refType,
@@ -485,10 +479,6 @@ ReferenceEntry::ReferenceEntry()
{
}
-ReferenceEntry::~ReferenceEntry()
-{
-}
-
void ReferenceEntry::setData(const OString& name,
RTReferenceType refType,
const OString& doku,
@@ -520,7 +510,6 @@ public:
OString m_doku;
MethodEntry();
- ~MethodEntry();
void setData(const OString& name,
const OString& returnTypeName,
@@ -544,10 +533,6 @@ MethodEntry::MethodEntry()
{
}
-MethodEntry::~MethodEntry()
-{
-}
-
void MethodEntry::setData(const OString& name,
const OString& returnTypeName,
RTMethodMode mode,
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index d096e77..2c2bb45 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -529,14 +529,8 @@ struct OReportDefinitionImpl
,m_bEscapeProcessing(true)
,m_bSetModifiedEnabled( true )
{}
-
- ~OReportDefinitionImpl();
};
-OReportDefinitionImpl::~OReportDefinitionImpl()
-{
-}
-
OReportDefinition::OReportDefinition(uno::Reference< uno::XComponentContext > const & _xContext)
: ReportDefinitionBase(m_aMutex)
,ReportDefinitionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >())
diff --git a/reportdesign/source/core/inc/ReportDrawPage.hxx b/reportdesign/source/core/inc/ReportDrawPage.hxx
index 8504803..da3ba3b 100644
--- a/reportdesign/source/core/inc/ReportDrawPage.hxx
+++ b/reportdesign/source/core/inc/ReportDrawPage.hxx
@@ -36,7 +36,6 @@ namespace reportdesign
virtual css::uno::Reference< css::drawing::XShape > CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) override;
public:
OReportDrawPage(SdrPage* pPage,const css::uno::Reference< css::report::XSection >& _xSection);
- virtual ~OReportDrawPage() throw() override {}
};
}
#endif // INCLUDED_REPORTDESIGN_SOURCE_CORE_INC_REPORTDRAWPAGE_HXX
diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx
index ca6d5a0..bb292ab 100644
--- a/reportdesign/source/core/sdr/ModuleHelper.cxx
+++ b/reportdesign/source/core/sdr/ModuleHelper.cxx
@@ -48,7 +48,6 @@ class OModuleImpl
public:
/// ctor
OModuleImpl();
- ~OModuleImpl();
/// get the manager for the resources of the module
ResMgr* getResManager();
@@ -61,11 +60,6 @@ OModuleImpl::OModuleImpl()
}
-OModuleImpl::~OModuleImpl()
-{
-}
-
-
ResMgr* OModuleImpl::getResManager()
{
// note that this method is not threadsafe, which counts for the whole class !
diff --git a/rsc/inc/rsclex.hxx b/rsc/inc/rsclex.hxx
index 0e1fcf3..1898154 100644
--- a/rsc/inc/rsclex.hxx
+++ b/rsc/inc/rsclex.hxx
@@ -30,7 +30,6 @@ class StringContainer
std::unordered_set< OString, OStringHash > m_aStrings;
public:
StringContainer() {}
- ~StringContainer() {}
const char* putString( const char* pString );
};
diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx
index 3353b2e..58d916e 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -63,7 +63,6 @@ protected:
public:
StopWatch();
- ~StopWatch() {}
void start(); // Starts time
void stop(); // Stops time
diff --git a/sal/qa/rtl/random/rtl_random.cxx b/sal/qa/rtl/random/rtl_random.cxx
index 7d887a3..a9ecf9e 100644
--- a/sal/qa/rtl/random/rtl_random.cxx
+++ b/sal/qa/rtl/random/rtl_random.cxx
@@ -169,7 +169,6 @@ public:
{
clearDispensation();
}
- ~Statistics(){}
void addValue(sal_uInt8 _nIndex, sal_Int32 _nValue)
{
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 43fa6c6..3428297 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -128,7 +128,6 @@ struct ParserData
css::lang::Locale maLocale;
ParserData();
- ~ParserData();
};
struct NamespaceDefine
@@ -190,7 +189,6 @@ struct Entity : public ParserData
explicit Entity( const ParserData& rData );
Entity( const Entity& rEntity );
- ~Entity();
void startElement( Event *pEvent );
void characters( const OUString& sChars );
void endElement();
@@ -394,9 +392,6 @@ ParserData::ParserData()
: mpTokenHandler( nullptr )
{}
-ParserData::~ParserData()
-{}
-
Entity::Entity(const ParserData& rData)
: ParserData(rData)
, mnProducedEventsSize(0)
@@ -422,10 +417,6 @@ Entity::Entity(const Entity& e)
{
}
-Entity::~Entity()
-{
-}
-
void Entity::startElement( Event *pEvent )
{
const sal_Int32& nElementToken = pEvent->mnElementToken;
diff --git a/sax/source/tools/CachedOutputStream.hxx b/sax/source/tools/CachedOutputStream.hxx
index b93abcb..a71b978 100644
--- a/sax/source/tools/CachedOutputStream.hxx
+++ b/sax/source/tools/CachedOutputStream.hxx
@@ -49,7 +49,6 @@ public:
, mbWriteToOutStream(true)
, mpForMerge(nullptr)
{}
- ~CachedOutputStream() {}
const css::uno::Reference< css::io::XOutputStream >& getOutputStream() const
{
diff --git a/sax/source/tools/fastserializer.hxx b/sax/source/tools/fastserializer.hxx
index 6f679e5..482d10d 100644
--- a/sax/source/tools/fastserializer.hxx
+++ b/sax/source/tools/fastserializer.hxx
@@ -177,7 +177,6 @@ private:
#endif
explicit ForMerge(sal_Int32 const nTag) : m_Tag(nTag) {}
- virtual ~ForMerge() override {}
virtual void setCurrentElement( ::sal_Int32 /*nToken*/ ) {}
virtual Int8Sequence& getData();
More information about the Libreoffice-commits
mailing list