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

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


 connectivity/source/commontools/dbcharset.cxx   |   13 -------------
 connectivity/source/commontools/dbexception.cxx |    8 --------
 connectivity/source/parse/sqlnode.cxx           |    5 -----
 include/connectivity/dbcharset.hxx              |    3 ---
 include/connectivity/dbexception.hxx            |    2 --
 include/connectivity/sqlnode.hxx                |    1 -
 6 files changed, 32 deletions(-)

New commits:
commit 322acaa9ad58f4dc9a7025eacedd748dd2c1a1a1
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Jul 26 12:05:45 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Jul 27 08:19:22 2018 +0200

    connectivity: 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 such a
    user-provided function was declared non-inline in an include file, the
    apparently-used implicitly-defined copy functions are already inline, so why
    bother with non-inline functions.)
    
    Change-Id: Idb59d19dcf5e0873780959797daeb438cbb38ae7
    Reviewed-on: https://gerrit.libreoffice.org/58072
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/connectivity/source/commontools/dbcharset.cxx b/connectivity/source/commontools/dbcharset.cxx
index 9fc7923dbc70..ebe45c028207 100644
--- a/connectivity/source/commontools/dbcharset.cxx
+++ b/connectivity/source/commontools/dbcharset.cxx
@@ -142,19 +142,6 @@ namespace dbtools
         OSL_ENSURE( m_pContainer, "OCharsetMap::CharsetIterator::CharsetIterator : invalid container!" );
     }
 
-
-    OCharsetMap::CharsetIterator::CharsetIterator(const CharsetIterator& _rSource)
-        :m_pContainer( _rSource.m_pContainer )
-        ,m_aPos( _rSource.m_aPos )
-    {
-    }
-
-
-    OCharsetMap::CharsetIterator::~CharsetIterator()
-    {
-    }
-
-
     CharsetIteratorDerefHelper OCharsetMap::CharsetIterator::operator*() const
     {
         OSL_ENSURE( m_aPos != m_pContainer->m_aEncodings.end(), "OCharsetMap::CharsetIterator::operator*: invalid position!");
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index 961720f4bc59..718bbdf4d674 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -72,14 +72,6 @@ SQLExceptionInfo::SQLExceptionInfo( const OUString& _rSimpleErrorMessage )
     implDetermineType();
 }
 
-
-SQLExceptionInfo::SQLExceptionInfo(const SQLExceptionInfo& _rCopySource)
-    :m_aContent(_rCopySource.m_aContent)
-    ,m_eType(_rCopySource.m_eType)
-{
-}
-
-
 SQLExceptionInfo& SQLExceptionInfo::operator=(const css::sdbc::SQLException& _rError)
 {
     m_aContent <<= _rError;
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 5b0007f24011..ada5d32d4275 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -209,11 +209,6 @@ SQLParseNodeParameter::SQLParseNodeParameter( const Reference< XConnection >& _r
 {
 }
 
-
-SQLParseNodeParameter::~SQLParseNodeParameter()
-{
-}
-
 OUString OSQLParseNode::convertDateString(const SQLParseNodeParameter& rParam, const OUString& rString)
 {
     Date aDate = DBTypeConversion::toDate(rString);
diff --git a/include/connectivity/dbcharset.hxx b/include/connectivity/dbcharset.hxx
index 0830c1d00862..a4a4abe43a33 100644
--- a/include/connectivity/dbcharset.hxx
+++ b/include/connectivity/dbcharset.hxx
@@ -127,9 +127,6 @@ namespace dbtools
         OCharsetMap::TextEncBag::const_iterator m_aPos;
 
     public:
-        CharsetIterator(const CharsetIterator& _rSource);
-        ~CharsetIterator();
-
         CharsetIteratorDerefHelper operator*() const;
         // no -> operator
         // this would require us to a) store CharsetIteratorDerefHelper instances ourself so that we
diff --git a/include/connectivity/dbexception.hxx b/include/connectivity/dbexception.hxx
index e273cf8cb14c..e016e7f7e1b5 100644
--- a/include/connectivity/dbexception.hxx
+++ b/include/connectivity/dbexception.hxx
@@ -82,8 +82,6 @@ public:
     */
     SQLExceptionInfo( const OUString& _rSimpleErrorMessage );
 
-    SQLExceptionInfo(const SQLExceptionInfo& _rCopySource);
-
             // use for events got via XSQLErrorListener::errorOccured
     SQLExceptionInfo(const css::uno::Any& _rError);
             // use with the Reason member of an SQLErrorEvent or with NextElement of an SQLException
diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx
index e2198499baed..1b5ef59392c3 100644
--- a/include/connectivity/sqlnode.hxx
+++ b/include/connectivity/sqlnode.hxx
@@ -103,7 +103,6 @@ namespace connectivity
             bool _bPredicate,
             bool _bParseToSDBC
         );
-        ~SQLParseNodeParameter();
     };
 
     //= OSQLParseNode


More information about the Libreoffice-commits mailing list