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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Jul 27 09:37:06 UTC 2018


 include/sfx2/sidebar/ContextList.hxx     |    1 -
 sfx2/inc/preventduplicateinteraction.hxx |    7 -------
 sfx2/source/sidebar/ContextList.cxx      |    4 ----
 3 files changed, 12 deletions(-)

New commits:
commit 02dc2cafbb0364556a4145633485f3c9f082b43d
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Jul 26 13:45:04 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Jul 27 11:36:33 2018 +0200

    svx: 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: Ic8c24977a68d33a0051a74617fb4b4dcc2b664df
    Reviewed-on: https://gerrit.libreoffice.org/58094
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/sfx2/sidebar/ContextList.hxx b/include/sfx2/sidebar/ContextList.hxx
index 8e9c1ce48ef4..7db19ffeb590 100644
--- a/include/sfx2/sidebar/ContextList.hxx
+++ b/include/sfx2/sidebar/ContextList.hxx
@@ -33,7 +33,6 @@ class ContextList
 {
 public:
     ContextList();
-    ~ContextList();
 
     class Entry
     {
diff --git a/sfx2/inc/preventduplicateinteraction.hxx b/sfx2/inc/preventduplicateinteraction.hxx
index 5e1db5043aec..46e998a213e7 100644
--- a/sfx2/inc/preventduplicateinteraction.hxx
+++ b/sfx2/inc/preventduplicateinteraction.hxx
@@ -188,13 +188,6 @@ class PreventDuplicateInteraction : private ThreadHelpBase2
                     , m_nMaxCount   (nMaxCount   )
                     , m_nCallCount  (0           )
                 {}
-
-                InteractionInfo(const InteractionInfo& aCopy)
-                    : m_aInteraction(aCopy.m_aInteraction)
-                    , m_nMaxCount   (aCopy.m_nMaxCount   )
-                    , m_nCallCount  (aCopy.m_nCallCount  )
-                    , m_xRequest    (aCopy.m_xRequest    )
-                {}
         };
 
         typedef ::std::vector< InteractionInfo > InteractionList;
diff --git a/sfx2/source/sidebar/ContextList.cxx b/sfx2/source/sidebar/ContextList.cxx
index fb841f081543..12a21ca43de9 100644
--- a/sfx2/source/sidebar/ContextList.cxx
+++ b/sfx2/source/sidebar/ContextList.cxx
@@ -28,10 +28,6 @@ ContextList::ContextList()
 {
 }
 
-ContextList::~ContextList()
-{
-}
-
 const ContextList::Entry* ContextList::GetMatch (const Context& rContext) const
 {
     const ::std::vector<Entry>::const_iterator iEntry = FindBestMatch(rContext);


More information about the Libreoffice-commits mailing list