diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-07-26 12:24:10 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-07-26 21:42:55 +0200 |
| commit | 1d42b3da3a0649c45ec030242668e1bc159cb37c (patch) | |
| tree | 2d465b6a418eb47652144244ce7f13b91645514e /framework | |
| parent | d4adfdf019afd2db5c281edf438066240c3a4d61 (diff) | |
framework: 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: Ia4c3442642a2db3ca365a35e56a203a955a415c4
Reviewed-on: https://gerrit.libreoffice.org/58080
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/uielement/uielement.hxx | 1 | ||||
| -rw-r--r-- | framework/source/layoutmanager/uielement.cxx | 22 | ||||
| -rw-r--r-- | framework/source/services/pathsettings.cxx | 5 |
3 files changed, 0 insertions, 28 deletions
diff --git a/framework/inc/uielement/uielement.hxx b/framework/inc/uielement/uielement.hxx index 777485ce1bc5..9e63b1c0f68f 100644 --- a/framework/inc/uielement/uielement.hxx +++ b/framework/inc/uielement/uielement.hxx @@ -82,7 +82,6 @@ struct UIElement m_nStyle( ButtonType::SYMBOLONLY ) {} bool operator< ( const UIElement& aUIElement ) const; - UIElement& operator=( const UIElement& rUIElement ); OUString m_aType; OUString m_aName; diff --git a/framework/source/layoutmanager/uielement.cxx b/framework/source/layoutmanager/uielement.cxx index 097911b16441..58218751528d 100644 --- a/framework/source/layoutmanager/uielement.cxx +++ b/framework/source/layoutmanager/uielement.cxx @@ -94,28 +94,6 @@ namespace framework } } -UIElement& UIElement::operator= ( const UIElement& rUIElement ) -{ - if (&rUIElement != this) - { - m_aType = rUIElement.m_aType; - m_aName = rUIElement.m_aName; - m_aUIName = rUIElement.m_aUIName; - m_xUIElement = rUIElement.m_xUIElement; - m_bFloating = rUIElement.m_bFloating; - m_bVisible = rUIElement.m_bVisible; - m_bUserActive = rUIElement.m_bUserActive; - m_bMasterHide = rUIElement.m_bMasterHide; - m_bContextSensitive = rUIElement.m_bContextSensitive; - m_bNoClose = rUIElement.m_bNoClose; - m_bStateRead = rUIElement.m_bStateRead; - m_nStyle = rUIElement.m_nStyle; - m_aDockedData = rUIElement.m_aDockedData; - m_aFloatingData = rUIElement.m_aFloatingData; - } - return *this; -} - } // namespace framework /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index e047ee53057e..e3466af842ba 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -102,11 +102,6 @@ class PathSettings : private cppu::BaseMutex , bIsReadonly (false) {} - PathInfo(const PathInfo& rCopy) - { - takeOver(rCopy); - } - void takeOver(const PathInfo& rCopy) { sPathName = rCopy.sPathName; |