[Libreoffice-commits] core.git: include/xmloff writerfilter/source writerperfect/inc writerperfect/source xmlhelp/source xmloff/source xmlsecurity/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Jan 27 06:51:51 UTC 2017
include/xmloff/SinglePropertySetInfoCache.hxx | 1 -
writerfilter/source/dmapper/NumberingManager.hxx | 2 --
writerfilter/source/dmapper/TableData.hxx | 1 -
writerperfect/inc/ImportFilter.hxx | 4 ----
writerperfect/source/common/WPXSvInputStream.cxx | 5 -----
writerperfect/source/impress/KeynoteImportFilter.hxx | 1 -
writerperfect/source/writer/WordPerfectImportFilter.hxx | 1 -
xmlhelp/source/cxxhelp/inc/tvread.hxx | 2 --
xmlhelp/source/cxxhelp/provider/databases.hxx | 4 ----
xmloff/source/chart/SchXMLExport.cxx | 6 ------
xmloff/source/core/xmlerror.cxx | 6 ------
xmloff/source/core/xmlimp.cxx | 7 -------
xmloff/source/draw/animationexport.cxx | 5 -----
xmloff/source/style/impastpl.hxx | 4 ----
xmloff/source/style/xmlexppr.cxx | 5 -----
xmloff/source/style/xmlnumfe.cxx | 5 -----
xmloff/source/text/txtparaimphint.hxx | 1 +
xmloff/source/transform/EventOASISTContext.cxx | 5 -----
xmlsecurity/source/component/certificatecontainer.hxx | 1 -
xmlsecurity/source/framework/elementcollector.hxx | 1 -
xmlsecurity/source/helper/xsecparser.hxx | 1 -
xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx | 1 -
22 files changed, 1 insertion(+), 68 deletions(-)
New commits:
commit 4142e0a0c05c29a203799cc96630b17133ca2b40
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Jan 26 13:50:43 2017 +0200
loplugin: unnecessary destructor writerfilter..xmloff
Change-Id: I511822dc874101ed3b9850b015b746a86d26c3b5
Reviewed-on: https://gerrit.libreoffice.org/33578
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/xmloff/SinglePropertySetInfoCache.hxx b/include/xmloff/SinglePropertySetInfoCache.hxx
index 04b42fc..19e485a 100644
--- a/include/xmloff/SinglePropertySetInfoCache.hxx
+++ b/include/xmloff/SinglePropertySetInfoCache.hxx
@@ -37,7 +37,6 @@ class SinglePropertySetInfoCache
public:
inline SinglePropertySetInfoCache( const OUString& rName );
- ~SinglePropertySetInfoCache() {};
bool hasProperty(
const css::uno::Reference< css::beans::XPropertySet >& rPropSet,
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx
index 29d3f5f..1aec2a1 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -73,8 +73,6 @@ public:
,m_outline(false)
{}
- virtual ~ListLevel( ) override { }
-
// Setters for the import
void SetValue( Id nId, sal_Int32 nValue );
void SetBulletChar( const OUString& sValue ) { m_sBulletChar = sValue; };
diff --git a/writerfilter/source/dmapper/TableData.hxx b/writerfilter/source/dmapper/TableData.hxx
index 8fd385f..cd17c00 100644
--- a/writerfilter/source/dmapper/TableData.hxx
+++ b/writerfilter/source/dmapper/TableData.hxx
@@ -264,7 +264,6 @@ public:
typedef std::shared_ptr<TableData> Pointer_t;
explicit TableData(unsigned int nDepth) : mnDepth(nDepth) { newRow(); }
- ~TableData() {}
/**
End the current row.
diff --git a/writerperfect/inc/ImportFilter.hxx b/writerperfect/inc/ImportFilter.hxx
index 0993d4a..092ae9c 100644
--- a/writerperfect/inc/ImportFilter.hxx
+++ b/writerperfect/inc/ImportFilter.hxx
@@ -60,10 +60,6 @@ public:
{
}
- virtual ~ImportFilterImpl() override
- {
- }
-
const css::uno::Reference< css::uno::XComponentContext > &getXContext() const
{
return mxContext;
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx
index 2c6b062..eb54da2 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -401,7 +401,6 @@ class WPXSvInputStreamImpl
public:
explicit WPXSvInputStreamImpl(css::uno::Reference<
css::io::XInputStream > const &xStream);
- ~WPXSvInputStreamImpl();
bool isStructured();
unsigned subStreamCount();
@@ -478,10 +477,6 @@ WPXSvInputStreamImpl::WPXSvInputStreamImpl(Reference< XInputStream > const &xStr
}
}
-WPXSvInputStreamImpl::~WPXSvInputStreamImpl()
-{
-}
-
const unsigned char *WPXSvInputStreamImpl::read(unsigned long numBytes, unsigned long &numBytesRead)
{
numBytesRead = 0;
diff --git a/writerperfect/source/impress/KeynoteImportFilter.hxx b/writerperfect/source/impress/KeynoteImportFilter.hxx
index ea61a20..714402f 100644
--- a/writerperfect/source/impress/KeynoteImportFilter.hxx
+++ b/writerperfect/source/impress/KeynoteImportFilter.hxx
@@ -22,7 +22,6 @@ class KeynoteImportFilter : public writerperfect::ImportFilter<OdpGenerator>
public:
explicit KeynoteImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: writerperfect::ImportFilter<OdpGenerator>(rxContext) {}
- virtual ~KeynoteImportFilter() override {}
//XExtendedFilterDetection
virtual OUString SAL_CALL detect(css::uno::Sequence< css::beans::PropertyValue > &Descriptor) override;
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.hxx b/writerperfect/source/writer/WordPerfectImportFilter.hxx
index a34255d..7f24ef2 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.hxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.hxx
@@ -45,7 +45,6 @@ protected:
public:
explicit WordPerfectImportFilter(const css::uno::Reference< css::uno::XComponentContext > &rxContext)
: mxContext(rxContext) {}
- virtual ~WordPerfectImportFilter() override {}
// XFilter
virtual sal_Bool SAL_CALL filter(const css::uno::Sequence< css::beans::PropertyValue > &aDescriptor) override;
diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx
index 0b4e159..208ed0a 100644
--- a/xmlhelp/source/cxxhelp/inc/tvread.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx
@@ -71,8 +71,6 @@ namespace treeview {
public:
- virtual ~TVBase() override { }
-
// XNameAccess
virtual css::uno::Type SAL_CALL
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx
index 0e92ecd..da69ca4 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -75,8 +75,6 @@ namespace chelp {
{
}
- ~StaticModuleInformation() { }
-
const OUString& get_title() const { return m_aTitle; }
const OUString& get_id() const { return m_aStartId; }
const OUString& get_program() const { return m_aProgramSwitch; }
@@ -111,8 +109,6 @@ namespace chelp {
explicit KeywordInfo( const std::vector< KeywordElement >& aVector );
- ~KeywordInfo() { };
-
css::uno::Sequence< OUString >&
getKeywordList() { return listKey; }
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index fc47c6f..954ba1c 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -129,8 +129,6 @@ public:
SchXMLExportHelper_Impl( SvXMLExport& rExport,
SvXMLAutoStylePoolP& rASPool );
- ~SchXMLExportHelper_Impl();
-
SchXMLExportHelper_Impl(const SchXMLExportHelper_Impl&) = delete;
SchXMLExportHelper_Impl& operator=(const SchXMLExportHelper_Impl&) = delete;
@@ -1066,10 +1064,6 @@ SchXMLExportHelper_Impl::SchXMLExportHelper_Impl(
OUString( 'T' ));
}
-SchXMLExportHelper_Impl::~SchXMLExportHelper_Impl()
-{
-}
-
void SchXMLExportHelper_Impl::collectAutoStyles( Reference< chart::XChartDocument > const & rChartDoc )
{
parseDocument( rChartDoc, false );
diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx
index 15adb72..cf5f964 100644
--- a/xmloff/source/core/xmlerror.cxx
+++ b/xmloff/source/core/xmlerror.cxx
@@ -49,7 +49,6 @@ public:
sal_Int32 nColumn,
const OUString& rPublicId,
const OUString& rSystemId);
- ~ErrorRecord();
sal_Int32 nId; /// error ID
@@ -79,11 +78,6 @@ ErrorRecord::ErrorRecord( sal_Int32 nID, const Sequence<OUString>& rParams,
{
}
-ErrorRecord::~ErrorRecord()
-{
-}
-
-
XMLErrors::XMLErrors()
{
}
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index f7eb33c..fed34b6 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -226,9 +226,6 @@ public:
}
}
- ~DocumentInfo()
- {}
-
sal_uInt16 getGeneratorVersion() const
{
return mnGeneratorVersion;
@@ -289,10 +286,6 @@ public:
if (!mxComponentContext.is()) throw uno::RuntimeException();
}
- ~SvXMLImport_Impl()
- {
- }
-
sal_uInt16 getGeneratorVersion( const SvXMLImport& rImport )
{
if ( !mpDocumentInfo.get() )
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index c8cba9f..4c87961 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -507,7 +507,6 @@ class AnimationsExporterImpl
{
public:
AnimationsExporterImpl( SvXMLExport& rExport, const Reference< XPropertySet >& xPageProps );
- ~AnimationsExporterImpl();
void prepareNode( const Reference< XAnimationNode >& xNode );
void exportNode( const Reference< XAnimationNode >& xNode );
@@ -554,10 +553,6 @@ AnimationsExporterImpl::AnimationsExporterImpl( SvXMLExport& rExport, const Refe
mxSdPropHdlFactory = new XMLSdPropHdlFactory( mrExport.GetModel(), mrExport );
}
-AnimationsExporterImpl::~AnimationsExporterImpl()
-{
-}
-
/** split a uri hierarchy into first segment and rest */
static bool splitPath(::rtl::OUString const & i_rPath,
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index 7cded32..38222ae 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -52,10 +52,6 @@ public:
XMLAutoStylePoolProperties( XMLAutoStyleFamily& rFamilyData, const ::std::vector< XMLPropertyState >& rProperties, OUString& rParentname );
- ~XMLAutoStylePoolProperties()
- {
- }
-
const OUString& GetName() const { return msName; }
const ::std::vector< XMLPropertyState >& GetProperties() const { return maProperties; }
sal_uInt32 GetPos() const { return mnPos; }
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index 549e863..32a45aa 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -184,7 +184,6 @@ class FilterPropertiesInfo_Impl
public:
FilterPropertiesInfo_Impl();
- ~FilterPropertiesInfo_Impl();
void AddProperty(const OUString& rApiName, const sal_uInt32 nIndex);
const uno::Sequence<OUString>& GetApiNames();
@@ -204,10 +203,6 @@ FilterPropertiesInfo_Impl::FilterPropertiesInfo_Impl() :
aLastItr = aPropInfos.begin();
}
-FilterPropertiesInfo_Impl::~FilterPropertiesInfo_Impl()
-{
-}
-
void FilterPropertiesInfo_Impl::AddProperty(
const OUString& rApiName, const sal_uInt32 nIndex)
{
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 9a3344f..bb5db1b 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -97,7 +97,6 @@ class SvXMLNumUsedList_Impl
public:
SvXMLNumUsedList_Impl();
- ~SvXMLNumUsedList_Impl();
void SetUsed( sal_uInt32 nKey );
bool IsUsed( sal_uInt32 nKey ) const;
@@ -119,10 +118,6 @@ SvXMLNumUsedList_Impl::SvXMLNumUsedList_Impl() :
{
}
-SvXMLNumUsedList_Impl::~SvXMLNumUsedList_Impl()
-{
-}
-
void SvXMLNumUsedList_Impl::SetUsed( sal_uInt32 nKey )
{
if ( !IsWasUsed(nKey) )
diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx
index 22301b0..2f5f231 100644
--- a/xmloff/source/text/txtparaimphint.hxx
+++ b/xmloff/source/text/txtparaimphint.hxx
@@ -235,6 +235,7 @@ public:
return static_cast<SvXMLShapeContext*>(xContext.get())->getShape();
}
};
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx
index 7781631..ce903b6 100644
--- a/xmloff/source/transform/EventOASISTContext.cxx
+++ b/xmloff/source/transform/EventOASISTContext.cxx
@@ -44,7 +44,6 @@ class XMLTransformerOASISEventMap_Impl:
{
public:
explicit XMLTransformerOASISEventMap_Impl( XMLTransformerEventMapEntry *pInit );
- ~XMLTransformerOASISEventMap_Impl();
};
XMLTransformerOASISEventMap_Impl::XMLTransformerOASISEventMap_Impl( XMLTransformerEventMapEntry *pInit )
@@ -70,10 +69,6 @@ XMLTransformerOASISEventMap_Impl::XMLTransformerOASISEventMap_Impl( XMLTransform
}
}
-XMLTransformerOASISEventMap_Impl::~XMLTransformerOASISEventMap_Impl()
-{
-}
-
XMLEventOASISTransformerContext::XMLEventOASISTransformerContext(
XMLTransformerBase& rImp,
const OUString& rQName ) :
diff --git a/xmlsecurity/source/component/certificatecontainer.hxx b/xmlsecurity/source/component/certificatecontainer.hxx
index c1fe605..0319c29 100644
--- a/xmlsecurity/source/component/certificatecontainer.hxx
+++ b/xmlsecurity/source/component/certificatecontainer.hxx
@@ -48,7 +48,6 @@ class CertificateContainer : public ::cppu::WeakImplHelper< css::lang::XServiceI
public:
explicit CertificateContainer(const css::uno::Reference< css::lang::XMultiServiceFactory >& ) {}
- virtual ~CertificateContainer() override {}
virtual sal_Bool SAL_CALL addCertificate( const OUString & url, const OUString & certificate_name, sal_Bool trust ) override;
virtual css::security::CertificateContainerStatus SAL_CALL hasCertificate( const OUString & url, const OUString & certificate_name ) override;
diff --git a/xmlsecurity/source/framework/elementcollector.hxx b/xmlsecurity/source/framework/elementcollector.hxx
index 21ed0af..03592ac 100644
--- a/xmlsecurity/source/framework/elementcollector.hxx
+++ b/xmlsecurity/source/framework/elementcollector.hxx
@@ -68,7 +68,6 @@ public:
css::xml::crypto::sax::ElementMarkPriority nPriority,
bool bToModify,
const css::uno::Reference< css::xml::crypto::sax::XReferenceResolvedListener >& xReferenceResolvedListener);
- virtual ~ElementCollector() override {};
css::xml::crypto::sax::ElementMarkPriority getPriority() const { return m_nPriority;}
bool getModify() const { return m_bToModify;}
diff --git a/xmlsecurity/source/helper/xsecparser.hxx b/xmlsecurity/source/helper/xsecparser.hxx
index 098e41e..9c4503b 100644
--- a/xmlsecurity/source/helper/xsecparser.hxx
+++ b/xmlsecurity/source/helper/xsecparser.hxx
@@ -112,7 +112,6 @@ public:
XSecParser( XSecController* pXSecController,
const css::uno::Reference<
css::xml::sax::XDocumentHandler >& xNextHandler );
- virtual ~XSecParser() override {};
/*
* XDocumentHandler
diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
index 67a47d1..70beb87 100644
--- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
@@ -54,7 +54,6 @@ private:
public:
explicit XMLElementWrapper_XmlSecImpl(const xmlNodePtr pNode);
- virtual ~XMLElementWrapper_XmlSecImpl() override {};
/* XXMLElementWrapper */
More information about the Libreoffice-commits
mailing list