[Libreoffice-commits] core.git: jvmfwk/inc jvmfwk/source

[Libreoffice Gerrit user]

 jvmfwk/inc/elements.hxx    |    1 -
 jvmfwk/source/elements.cxx |    4 ----
 2 files changed, 5 deletions(-)

New commits:
commit 2b4b94e8f0b7a8484ce70c701580b5a20fd0d14d
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Jul 26 11:38:32 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Jul 26 15:26:15 2018 +0200

    jvmfwk: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
    
    ...by removing explicitly user-provided functions that do the same as their
    implicitly-defined counterparts, but may prevent implicitly declared copy
    functions from being defined as non-deleted in the future.  (Even if a dtor was
    declared non-inline in an include file, the apparently-used implicitly-defined
    copy functions are already inline, so why bother with a non-inline dtor.)
    
    Change-Id: I1330a9fd4fc7f8fe8525b3ea02f9edb9e88e6638
    Reviewed-on: https://gerrit.libreoffice.org/58059
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/jvmfwk/inc/elements.hxx b/jvmfwk/inc/elements.hxx
index eb174a4be3e9..5b540c567717 100644
--- a/jvmfwk/inc/elements.hxx
+++ b/jvmfwk/inc/elements.hxx
@@ -58,7 +58,6 @@ class CNodeJavaInfo
 {
 public:
     CNodeJavaInfo();
-    ~CNodeJavaInfo();
 
     /** if true, then javaInfo is empty. When writeToNode is called
         then all child elements are deleted.
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index ff083373f553..24c60e8379c8 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -694,10 +694,6 @@ CNodeJavaInfo::CNodeJavaInfo() :
 {
 }
 
-CNodeJavaInfo::~CNodeJavaInfo()
-{
-}
-
 void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo)
 {
     OString sExcMsg("[Java framework] Error in function NodeJavaInfo::loadFromNode "