[Libreoffice-commits] core.git: 2 commits - sw/source xmlsecurity/qa

[Stephan Bergmann (via logerrit)]

 sw/source/core/inc/unoevent.hxx         |    2 --
 sw/source/core/unocore/unoevent.cxx     |    3 +--
 xmlsecurity/qa/unit/signing/signing.cxx |    2 ++
 3 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 8075ef1a616da27ea1fb65e988e5ef5764d8ec11
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sat Aug 10 12:55:37 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sat Aug 10 14:42:59 2019 +0200

    loplugin:staticconstfield
    
    (no idea why that only started to show now; Clang 10 on macOS here)
    
    Change-Id: Ie9115e7c2396378f31f85ae592841711e58c6b1d
    Reviewed-on: https://gerrit.libreoffice.org/77237
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx
index 1989a6f35dae..6e533a079017 100644
--- a/sw/source/core/inc/unoevent.hxx
+++ b/sw/source/core/inc/unoevent.hxx
@@ -53,8 +53,6 @@ public:
 // All these objects are an SwXFrame, so they can use a common implementation
 class SwFrameEventDescriptor : public SvEventDescriptor
 {
-    OUString const sSwFrameEventDescriptor;
-
     SwXFrame& rFrame;
 
 public:
diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx
index 9ba8268f7fbe..0d00638da1dd 100644
--- a/sw/source/core/unocore/unoevent.cxx
+++ b/sw/source/core/unocore/unoevent.cxx
@@ -157,7 +157,6 @@ void SwHyperlinkEventDescriptor::copyMacrosFromNameReplace(
 SwFrameEventDescriptor::SwFrameEventDescriptor(
     SwXTextFrame& rFrameRef ) :
         SvEventDescriptor(static_cast<text::XTextFrame&>(rFrameRef), aFrameEvents),
-        sSwFrameEventDescriptor("SwFrameEventDescriptor"),
         rFrame(rFrameRef)
 {
 }
@@ -197,7 +196,7 @@ sal_uInt16 SwFrameEventDescriptor::getMacroItemWhich() const
 
 OUString SwFrameEventDescriptor::getImplementationName()
 {
-    return sSwFrameEventDescriptor;
+    return "SwFrameEventDescriptor";
 }
 
 SwFrameStyleEventDescriptor::SwFrameStyleEventDescriptor(
commit 3246cfff9af705399eda37997179b51c2cc12ccb
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sat Aug 10 12:53:01 2019 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sat Aug 10 14:42:45 2019 +0200

    assertDocument is only defined for HAVE_FEATURE_GPGVERIFY
    
    Change-Id: I2dbe5da48d1114703481fffcc310f775308df007
    Reviewed-on: https://gerrit.libreoffice.org/77236
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx
index 87411c7afa72..da2019c26eba 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -85,9 +85,11 @@ protected:
     uno::Reference<security::XCertificate>
     getCertificate(DocumentSignatureManager& rSignatureManager,
                    svl::crypto::SignatureMethodAlgorithm eAlgo);
+#if HAVE_FEATURE_GPGVERIFY
     SfxObjectShell* assertDocument(const ::CppUnit::SourceLine aSrcLine,
                                    const OUString& rFilterName, const SignatureState nDocSign,
                                    const SignatureState nMacroSign, const OUString& sVersion);
+#endif
 };
 
 SigningTest::SigningTest() {}