[Libreoffice-commits] core.git: 2 commits - vcl/win xmlsecurity/source

[Stephan Bergmann]

 vcl/win/gdi/winlayout.cxx                                         |    2 
 xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx |   36 +++++-----
 2 files changed, 18 insertions(+), 20 deletions(-)

New commits:
commit 6d7366c80bee15c8d00168efa30c731cead566cb
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 6 08:33:45 2016 +0200

    -Werror,-Winconsistent-missing-override
    
    Change-Id: I9e6a44fb54484aebc3f223b3c71d2de18bb5d553

diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
index e05408c..09fd6b38 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
@@ -50,33 +50,33 @@ class X509Certificate_MSCryptImpl : public ::cppu::WeakImplHelper<
         virtual ~X509Certificate_MSCryptImpl() ;
 
         //Methods from XCertificate
-        virtual sal_Int16 SAL_CALL getVersion() throw ( css::uno::RuntimeException) ;
+        virtual sal_Int16 SAL_CALL getVersion() throw ( css::uno::RuntimeException) override;
 
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSerialNumber() throw ( css::uno::RuntimeException) ;
-        virtual OUString SAL_CALL getIssuerName() throw ( css::uno::RuntimeException) ;
-        virtual OUString SAL_CALL getSubjectName() throw ( css::uno::RuntimeException) ;
-        virtual css::util::DateTime SAL_CALL getNotValidBefore() throw ( css::uno::RuntimeException) ;
-        virtual css::util::DateTime SAL_CALL getNotValidAfter() throw ( css::uno::RuntimeException) ;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getIssuerUniqueID() throw ( css::uno::RuntimeException) ;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSubjectUniqueID() throw ( css::uno::RuntimeException) ;
-        virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > > SAL_CALL getExtensions() throw ( css::uno::RuntimeException) ;
-        virtual css::uno::Reference< css::security::XCertificateExtension > SAL_CALL findCertificateExtension( const css::uno::Sequence< sal_Int8 >& oid ) throw (css::uno::RuntimeException) ;
-        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getEncoded() throw ( css::uno::RuntimeException) ;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSerialNumber() throw ( css::uno::RuntimeException) override;
+        virtual OUString SAL_CALL getIssuerName() throw ( css::uno::RuntimeException) override;
+        virtual OUString SAL_CALL getSubjectName() throw ( css::uno::RuntimeException) override;
+        virtual css::util::DateTime SAL_CALL getNotValidBefore() throw ( css::uno::RuntimeException) override;
+        virtual css::util::DateTime SAL_CALL getNotValidAfter() throw ( css::uno::RuntimeException) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getIssuerUniqueID() throw ( css::uno::RuntimeException) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSubjectUniqueID() throw ( css::uno::RuntimeException) override;
+        virtual css::uno::Sequence< css::uno::Reference< css::security::XCertificateExtension > > SAL_CALL getExtensions() throw ( css::uno::RuntimeException) override;
+        virtual css::uno::Reference< css::security::XCertificateExtension > SAL_CALL findCertificateExtension( const css::uno::Sequence< sal_Int8 >& oid ) throw (css::uno::RuntimeException) override;
+        virtual css::uno::Sequence< sal_Int8 > SAL_CALL getEncoded() throw ( css::uno::RuntimeException) override;
         virtual OUString SAL_CALL getSubjectPublicKeyAlgorithm()
-            throw ( css::uno::RuntimeException) ;
+            throw ( css::uno::RuntimeException) override;
         virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSubjectPublicKeyValue()
-            throw ( css::uno::RuntimeException) ;
+            throw ( css::uno::RuntimeException) override;
         virtual OUString SAL_CALL getSignatureAlgorithm()
-            throw ( css::uno::RuntimeException) ;
+            throw ( css::uno::RuntimeException) override;
         virtual css::uno::Sequence< sal_Int8 > SAL_CALL getSHA1Thumbprint()
-            throw ( css::uno::RuntimeException) ;
+            throw ( css::uno::RuntimeException) override;
         virtual css::uno::Sequence< sal_Int8 > SAL_CALL getMD5Thumbprint()
-            throw ( css::uno::RuntimeException) ;
+            throw ( css::uno::RuntimeException) override;
 
-        virtual sal_Int32 SAL_CALL getCertificateUsage( ) throw ( css::uno::RuntimeException) ;
+        virtual sal_Int32 SAL_CALL getCertificateUsage( ) throw ( css::uno::RuntimeException) override;
 
         //Methods from XUnoTunnel
-        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException);
+        virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException) override;
 
         /// @see xmlsecurity::Certificate::getSHA256Thumbprint().
         virtual css::uno::Sequence<sal_Int8> getSHA256Thumbprint() throw (css::uno::RuntimeException, std::exception) override;
commit 4a08f09c207821b32e6d23ea307f4c410a8ccdf6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 6 08:32:36 2016 +0200

    -Werror,-Wunused-variable
    
    Change-Id: I22ac9714e59d6bc95ef739fff4832799a2f61bbc

diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 65ebbdd..12df505 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -3896,8 +3896,6 @@ bool D2DWriteTextOutRenderer::ReleaseFont()
 // baseline, and +ve means the ink starts that many pixels below.
 std::vector<Rectangle> D2DWriteTextOutRenderer::GetGlyphInkBoxes(uint16_t * pGid, uint16_t * pGidEnd) const
 {
-    Rectangle   aExtent;
-    Point aPos;
     ptrdiff_t nGlyphs = pGidEnd - pGid;
     if (nGlyphs < 0) return std::vector<Rectangle>();