[Libreoffice-commits] core.git: include/vcl sw/source writerfilter/source xmlsecurity/inc xmlsecurity/source

[Miklos Vajna]

 include/vcl/filter/pdfdocument.hxx             |    2 +-
 sw/source/filter/ww8/rtfexportfilter.cxx       |    2 +-
 sw/source/filter/ww8/rtfexportfilter.hxx       |    2 +-
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |    3 +--
 xmlsecurity/inc/certificate.hxx                |    2 +-
 xmlsecurity/source/pdfio/pdfdocument.cxx       |    2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 4b7c522208deeb80b821a294e4e76e50c78304e7
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Jul 13 21:10:52 2017 +0200

    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 at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

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.