diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-05-20 09:04:43 +0200 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-12 22:06:16 -0400 |
commit | 4e323344208b98eaf4dbdd074b8ae398c308bceb (patch) | |
tree | 11ee7256f258a57d0274bd46820961b604bd0582 /writerfilter | |
parent | 6d4d984a2b72f8d6313eb6bc788d7e5130c7f18e (diff) |
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.
Reviewed-on: https://gerrit.libreoffice.org/25187
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 1b89a57aa5ac4faf59bc1e13eb1e0cad9933bacc)
Change-Id: Ib5e30dfdd9b428a6d7800cec056c3f55ca92f4a4
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/LatentStyleHandler.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/dmapper/SdtHelper.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/dmapper/TablePositionHandler.cxx | 5 | ||||
-rw-r--r-- | writerfilter/source/filter/RtfFilter.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/filter/WriterFilter.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/filter/WriterFilterDetection.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtflookahead.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfreferenceproperties.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfreferencetable.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfsprm.cxx | 10 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfsprm.hxx | 1 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtftokenizer.cxx | 5 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfvalue.cxx | 4 |
14 files changed, 13 insertions, 46 deletions
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.cxx b/writerfilter/source/dmapper/LatentStyleHandler.cxx index 0e9eb585f31d..777f063e6197 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 12cce7bf85f0..e0477cd82dde 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/TablePositionHandler.cxx b/writerfilter/source/dmapper/TablePositionHandler.cxx index 0db1efbbe4ae..4182c4fbe859 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 db58395bc109..a2ab35d4fee5 100644 --- a/writerfilter/source/filter/RtfFilter.cxx +++ b/writerfilter/source/filter/RtfFilter.cxx @@ -81,9 +81,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 af17b1bbeb2a..a203eac33fa4 100644 --- a/writerfilter/source/filter/WriterFilter.cxx +++ b/writerfilter/source/filter/WriterFilter.cxx @@ -98,7 +98,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 2624c06bd997..8c67e4b52be2 100644 --- a/writerfilter/source/filter/WriterFilterDetection.cxx +++ b/writerfilter/source/filter/WriterFilterDetection.cxx @@ -55,9 +55,7 @@ WriterFilterDetection::WriterFilterDetection(const uno::Reference<uno::XComponen { } -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 80106f105685..6b1c59885108 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -295,9 +295,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 8b05aaf5b219..8a3fc95c060c 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 e33d526bfaf5..969c1dbf6f01 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 67b6284f5385..4177b8d12ab7 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 4abb8120dcc8..39b3833741b5 100644 --- a/writerfilter/source/rtftok/rtfsprm.cxx +++ b/writerfilter/source/rtftok/rtfsprm.cxx @@ -230,21 +230,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 4f397e6d56fa..04080dc1b37b 100644 --- a/writerfilter/source/rtftok/rtfsprm.hxx +++ b/writerfilter/source/rtftok/rtfsprm.hxx @@ -63,7 +63,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 a23c181a3d3d..cdcdb1145773 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 69b5eee0e338..dbfe14cfceaa 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 { |