[Libreoffice-commits] core.git: writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Fri May 20 07:35:15 UTC 2016
writerfilter/source/dmapper/LatentStyleHandler.cxx | 4 +---
writerfilter/source/dmapper/SdtHelper.cxx | 4 +---
writerfilter/source/dmapper/SmartTagHandler.cxx | 4 +---
writerfilter/source/dmapper/TablePositionHandler.cxx | 5 +----
writerfilter/source/filter/RtfFilter.cxx | 4 +---
writerfilter/source/filter/WriterFilter.cxx | 2 +-
writerfilter/source/filter/WriterFilterDetection.cxx | 4 +---
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 4 +---
writerfilter/source/rtftok/rtflookahead.cxx | 4 +---
writerfilter/source/rtftok/rtfreferenceproperties.cxx | 4 +---
writerfilter/source/rtftok/rtfreferencetable.cxx | 4 +---
writerfilter/source/rtftok/rtfsprm.cxx | 10 +---------
writerfilter/source/rtftok/rtfsprm.hxx | 1 -
writerfilter/source/rtftok/rtftokenizer.cxx | 5 +----
writerfilter/source/rtftok/rtfvalue.cxx | 4 +---
15 files changed, 14 insertions(+), 49 deletions(-)
New commits:
commit 1b89a57aa5ac4faf59bc1e13eb1e0cad9933bacc
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri May 20 09:04:43 2016 +0200
writerfilter: use '= default;'
Replace default bodies of these trivial special member functions. Also
remove RTFSprms::operator=() as it matches what the compiler would
generate anyway.
Change-Id: Ib5e30dfdd9b428a6d7800cec056c3f55ca92f4a4
Reviewed-on: https://gerrit.libreoffice.org/25187
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.cxx b/writerfilter/source/dmapper/LatentStyleHandler.cxx
index 0b6cc64..3b83bc1 100644
--- a/writerfilter/source/dmapper/LatentStyleHandler.cxx
+++ b/writerfilter/source/dmapper/LatentStyleHandler.cxx
@@ -21,9 +21,7 @@ LatentStyleHandler::LatentStyleHandler() :
{
}
-LatentStyleHandler::~LatentStyleHandler()
-{
-}
+LatentStyleHandler::~LatentStyleHandler() = default;
void LatentStyleHandler::lcl_attribute(Id rName, Value& rVal)
{
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx
index ba8410d..c096f70 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -69,9 +69,7 @@ SdtHelper::SdtHelper(DomainMapper_Impl& rDM_Impl)
{
}
-SdtHelper::~SdtHelper()
-{
-}
+SdtHelper::~SdtHelper() = default;
void SdtHelper::createDropDownControl()
{
diff --git a/writerfilter/source/dmapper/SmartTagHandler.cxx b/writerfilter/source/dmapper/SmartTagHandler.cxx
index 27f4e39..d4bff8c 100644
--- a/writerfilter/source/dmapper/SmartTagHandler.cxx
+++ b/writerfilter/source/dmapper/SmartTagHandler.cxx
@@ -42,9 +42,7 @@ SmartTagHandler::SmartTagHandler(const uno::Reference<uno::XComponentContext>& x
{
}
-SmartTagHandler::~SmartTagHandler()
-{
-}
+SmartTagHandler::~SmartTagHandler() = default;
void SmartTagHandler::lcl_attribute(Id nName, Value& rValue)
{
diff --git a/writerfilter/source/dmapper/TablePositionHandler.cxx b/writerfilter/source/dmapper/TablePositionHandler.cxx
index 0db1efb..4182c4f 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.cxx
+++ b/writerfilter/source/dmapper/TablePositionHandler.cxx
@@ -36,10 +36,7 @@ TablePositionHandler::TablePositionHandler() :
{
}
-TablePositionHandler::~TablePositionHandler()
-{
-}
-
+TablePositionHandler::~TablePositionHandler() = default;
void TablePositionHandler::lcl_attribute(Id rName, Value& rVal)
{
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index bd34e37..954a674 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -80,9 +80,7 @@ RtfFilter::RtfFilter(const uno::Reference< uno::XComponentContext >& rxContext)
{
}
-RtfFilter::~RtfFilter()
-{
-}
+RtfFilter::~RtfFilter() = default;
sal_Bool RtfFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescriptor) throw(uno::RuntimeException, std::exception)
{
diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx
index 61ad186..e93fe96 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -97,7 +97,7 @@ public:
explicit WriterFilter(const uno::Reference<uno::XComponentContext>& rxContext)
: m_xContext(rxContext)
{}
- virtual ~WriterFilter() {}
+ virtual ~WriterFilter() = default;
// XFilter
virtual sal_Bool SAL_CALL filter(const uno::Sequence<beans::PropertyValue>& rDescriptor) throw (uno::RuntimeException, std::exception) override;
diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx
index bf77004..3cd2dad 100644
--- a/writerfilter/source/filter/WriterFilterDetection.cxx
+++ b/writerfilter/source/filter/WriterFilterDetection.cxx
@@ -52,9 +52,7 @@ WriterFilterDetection::WriterFilterDetection()
{
}
-WriterFilterDetection::~WriterFilterDetection()
-{
-}
+WriterFilterDetection::~WriterFilterDetection() = default;
OUString WriterFilterDetection::detect(uno::Sequence<beans::PropertyValue>& rDescriptor) throw (uno::RuntimeException, std::exception)
{
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 24a9456..6f01330 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -293,9 +293,7 @@ RTFDocumentImpl::RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& x
m_pSdrImport.reset(new RTFSdrImport(*this, m_xDstDoc));
}
-RTFDocumentImpl::~RTFDocumentImpl()
-{
-}
+RTFDocumentImpl::~RTFDocumentImpl() = default;
SvStream& RTFDocumentImpl::Strm()
{
diff --git a/writerfilter/source/rtftok/rtflookahead.cxx b/writerfilter/source/rtftok/rtflookahead.cxx
index 8b05aaf..8a3fc95 100644
--- a/writerfilter/source/rtftok/rtflookahead.cxx
+++ b/writerfilter/source/rtftok/rtflookahead.cxx
@@ -29,9 +29,7 @@ RTFLookahead::RTFLookahead(SvStream& rStream, sal_Size nGroupStart)
m_rStream.Seek(nPos);
}
-RTFLookahead::~RTFLookahead()
-{
-}
+RTFLookahead::~RTFLookahead() = default;
RTFError RTFLookahead::dispatchDestination(RTFKeyword /*nKeyword*/)
{
diff --git a/writerfilter/source/rtftok/rtfreferenceproperties.cxx b/writerfilter/source/rtftok/rtfreferenceproperties.cxx
index e33d526..969c1db 100644
--- a/writerfilter/source/rtftok/rtfreferenceproperties.cxx
+++ b/writerfilter/source/rtftok/rtfreferenceproperties.cxx
@@ -26,9 +26,7 @@ RTFReferenceProperties::RTFReferenceProperties(RTFSprms aAttributes)
{
}
-RTFReferenceProperties::~RTFReferenceProperties()
-{
-}
+RTFReferenceProperties::~RTFReferenceProperties() = default;
void RTFReferenceProperties::resolve(Properties& rHandler)
{
diff --git a/writerfilter/source/rtftok/rtfreferencetable.cxx b/writerfilter/source/rtftok/rtfreferencetable.cxx
index 67b6284..4177b8d 100644
--- a/writerfilter/source/rtftok/rtfreferencetable.cxx
+++ b/writerfilter/source/rtftok/rtfreferencetable.cxx
@@ -19,9 +19,7 @@ RTFReferenceTable::RTFReferenceTable(Entries_t const& rEntries)
{
}
-RTFReferenceTable::~RTFReferenceTable()
-{
-}
+RTFReferenceTable::~RTFReferenceTable() = default;
void RTFReferenceTable::resolve(Table& rHandler)
{
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx
index 12d90d4..dc8f256 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -226,21 +226,13 @@ RTFSprms::RTFSprms()
{
}
-RTFSprms::~RTFSprms()
-{
-}
+RTFSprms::~RTFSprms() = default;
RTFSprms::RTFSprms(const RTFSprms& rSprms)
{
*this = rSprms;
}
-RTFSprms& RTFSprms::operator=(const RTFSprms& rOther)
-{
- m_pSprms = rOther.m_pSprms;
- return *this;
-}
-
void RTFSprms::clear()
{
if (m_pSprms->m_nRefCount == 1)
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx b/writerfilter/source/rtftok/rtfsprm.hxx
index ee7088d..9a2a52e 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/writerfilter/source/rtftok/rtfsprm.hxx
@@ -60,7 +60,6 @@ public:
RTFSprms();
RTFSprms(const RTFSprms& rSprms);
~RTFSprms();
- RTFSprms& operator=(const RTFSprms& rOther);
RTFValue::Pointer_t find(Id nKeyword, bool bFirst = true, bool bForWrite = false);
/// Does the same as ->push_back(), except that it can overwrite or ignore existing entries.
void set(Id nKeyword, RTFValue::Pointer_t pValue, RTFOverwrite eOverwrite = RTFOverwrite::YES);
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx
index a23c181..cdcdb11 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -49,10 +49,7 @@ RTFTokenizer::RTFTokenizer(RTFListener& rImport, SvStream* pInStream, uno::Refer
}
}
-RTFTokenizer::~RTFTokenizer()
-{
-}
-
+RTFTokenizer::~RTFTokenizer() = default;
RTFError RTFTokenizer::resolveParse()
{
diff --git a/writerfilter/source/rtftok/rtfvalue.cxx b/writerfilter/source/rtftok/rtfvalue.cxx
index 69b5eee..dbfe14c 100644
--- a/writerfilter/source/rtftok/rtfvalue.cxx
+++ b/writerfilter/source/rtftok/rtfvalue.cxx
@@ -154,9 +154,7 @@ RTFValue::RTFValue(const RTFShape& aShape)
{
}
-RTFValue::~RTFValue()
-{
-}
+RTFValue::~RTFValue() = default;
int RTFValue::getInt() const
{
More information about the Libreoffice-commits
mailing list