summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-07-26 12:10:13 +0200
committerStephan Bergmann <sbergman@redhat.com>2018-07-26 20:42:40 +0200
commit0c457a20b1a7caa9e8631dfdaa4a41a5ee149e8d (patch)
treeb49812308fa4097bad627c2ef1075b3bf3fe2996
parent490838e438b5f6a049e6ff2ed2a89de9639585a4 (diff)
dbaccess: 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: Ie8dfa12a144b0d21c99803bf6810cc573b4880ac Reviewed-on: https://gerrit.libreoffice.org/58075 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--dbaccess/source/ui/dlg/dbfindex.hxx1
-rw-r--r--dbaccess/source/ui/inc/charsets.hxx2
-rw-r--r--dbaccess/source/ui/misc/charsets.cxx6
3 files changed, 0 insertions, 9 deletions
diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx
index 7905cda08167..dbfabbf5594a 100644
--- a/dbaccess/source/ui/dlg/dbfindex.hxx
+++ b/dbaccess/source/ui/dlg/dbfindex.hxx
@@ -40,7 +40,6 @@ private:
public:
OTableIndex() { }
- OTableIndex( const OTableIndex& _rSource) : aIndexFileName(_rSource.aIndexFileName) { }
explicit OTableIndex( const OUString& rFileName ) : aIndexFileName( rFileName ) { }
const OUString& GetIndexFileName() const { return aIndexFileName; }
diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx
index 490dcb8162c1..0556dfdfab20 100644
--- a/dbaccess/source/ui/inc/charsets.hxx
+++ b/dbaccess/source/ui/inc/charsets.hxx
@@ -93,8 +93,6 @@ namespace dbaui
base_iterator m_aPosition;
public:
- ExtendedCharsetIterator(const ExtendedCharsetIterator& _rSource);
-
CharsetDisplayDerefHelper operator*() const;
/// prefix increment
diff --git a/dbaccess/source/ui/misc/charsets.cxx b/dbaccess/source/ui/misc/charsets.cxx
index 3fe9316042ab..e068c18f98ef 100644
--- a/dbaccess/source/ui/misc/charsets.cxx
+++ b/dbaccess/source/ui/misc/charsets.cxx
@@ -101,12 +101,6 @@ namespace dbaui
OSL_ENSURE(m_pContainer, "OCharsetDisplay::ExtendedCharsetIterator::ExtendedCharsetIterator : invalid container!");
}
- OCharsetDisplay::ExtendedCharsetIterator::ExtendedCharsetIterator(const ExtendedCharsetIterator& _rSource)
- :m_pContainer( _rSource.m_pContainer )
- ,m_aPosition( _rSource.m_aPosition )
- {
- }
-
CharsetDisplayDerefHelper OCharsetDisplay::ExtendedCharsetIterator::operator*() const
{
OSL_ENSURE( m_aPosition != m_pContainer->OCharsetDisplay_Base::end(), "OCharsetDisplay::ExtendedCharsetIterator::operator* : invalid position!");