summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-07-13 21:10:52 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-07-14 08:34:22 +0200
commit4b7c522208deeb80b821a294e4e76e50c78304e7 (patch)
treea2bd4ac2a53c01fd626cb544e5c5bbcc92825372
parent85ff2eafc692f6f0d33ac611600935a96058f20a (diff)
xmlsecurity pdf verify: push_back -> emplace_back
And a few other similar small cleanups. Change-Id: I91c992f33f2166d1cf27cbc9def1b69965040658 Reviewed-on: https://gerrit.libreoffice.org/39928 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--include/vcl/filter/pdfdocument.hxx2
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.cxx2
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.hxx2
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx3
-rw-r--r--xmlsecurity/inc/certificate.hxx2
-rw-r--r--xmlsecurity/source/pdfio/pdfdocument.cxx2
6 files changed, 6 insertions, 7 deletions
diff --git a/include/vcl/filter/pdfdocument.hxx b/include/vcl/filter/pdfdocument.hxx
index 6c5510ff3483..362d5e637e9e 100644
--- a/include/vcl/filter/pdfdocument.hxx
+++ b/include/vcl/filter/pdfdocument.hxx
@@ -40,7 +40,7 @@ class VCL_DLLPUBLIC PDFElement
{
public:
virtual bool Read(SvStream& rStream) = 0;
- virtual ~PDFElement() { }
+ virtual ~PDFElement() = default;
};
/// Indirect object: something with a unique ID.
diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx
index a88b17951836..226fc3667074 100644
--- a/sw/source/filter/ww8/rtfexportfilter.cxx
+++ b/sw/source/filter/ww8/rtfexportfilter.cxx
@@ -103,7 +103,7 @@ OUString RtfExport_getImplementationName()
return OUString(IMPL_NAME_RTFEXPORT);
}
-uno::Sequence< OUString > SAL_CALL RtfExport_getSupportedServiceNames() throw()
+uno::Sequence< OUString > SAL_CALL RtfExport_getSupportedServiceNames() noexcept
{
return uno::Sequence< OUString > { "com.sun.star.document.ExportFilter" };
}
diff --git a/sw/source/filter/ww8/rtfexportfilter.hxx b/sw/source/filter/ww8/rtfexportfilter.hxx
index 5b626344e900..38261b99685f 100644
--- a/sw/source/filter/ww8/rtfexportfilter.hxx
+++ b/sw/source/filter/ww8/rtfexportfilter.hxx
@@ -61,7 +61,7 @@ public:
};
OUString RtfExport_getImplementationName();
-css::uno::Sequence<OUString> SAL_CALL RtfExport_getSupportedServiceNames() throw();
+css::uno::Sequence<OUString> SAL_CALL RtfExport_getSupportedServiceNames() noexcept;
/// @throws css::uno::Exception
css::uno::Reference<css::uno::XInterface> SAL_CALL RtfExport_createInstance(const css::uno::Reference<css::uno::XComponentContext>& xCtx);
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index b02f1c96a083..3ab46124a62e 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3352,9 +3352,8 @@ RTFSprms RTFFrame::getSprms()
NS_ooxml::LN_CT_FramePr_lines
};
- for (int i = 0; i < int(SAL_N_ELEMENTS(pNames)); ++i)
+ for (Id nId : pNames)
{
- Id nId = pNames[i];
RTFValue::Pointer_t pValue;
switch (nId)
diff --git a/xmlsecurity/inc/certificate.hxx b/xmlsecurity/inc/certificate.hxx
index 19db38695c17..0698e91f422f 100644
--- a/xmlsecurity/inc/certificate.hxx
+++ b/xmlsecurity/inc/certificate.hxx
@@ -28,7 +28,7 @@ public:
virtual css::uno::Sequence<sal_Int8> getSHA256Thumbprint() = 0;
protected:
- ~Certificate() throw () {}
+ ~Certificate() noexcept = default;
};
}
diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx b/xmlsecurity/source/pdfio/pdfdocument.cxx
index 68619d7047f7..6925b41a1960 100644
--- a/xmlsecurity/source/pdfio/pdfdocument.cxx
+++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
@@ -378,7 +378,7 @@ bool ValidateSignature(SvStream& rStream, vcl::filter::PDFObjectElement* pSignat
continue;
}
size_t nByteRangeLength = pNumber->GetValue();
- aByteRanges.push_back(std::make_pair(nByteRangeOffset, nByteRangeLength));
+ aByteRanges.emplace_back(nByteRangeOffset, nByteRangeLength);
}
// Detect if the byte ranges don't cover everything, but the signature itself.