Kaydet (Commit) 1d42b3da authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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: 's avatarStephan Bergmann <sbergman@redhat.com>
üst d4adfdf0
...@@ -82,7 +82,6 @@ struct UIElement ...@@ -82,7 +82,6 @@ struct UIElement
m_nStyle( ButtonType::SYMBOLONLY ) {} m_nStyle( ButtonType::SYMBOLONLY ) {}
bool operator< ( const UIElement& aUIElement ) const; bool operator< ( const UIElement& aUIElement ) const;
UIElement& operator=( const UIElement& rUIElement );
OUString m_aType; OUString m_aType;
OUString m_aName; OUString m_aName;
......
...@@ -94,28 +94,6 @@ namespace framework ...@@ -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 } // namespace framework
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -102,11 +102,6 @@ class PathSettings : private cppu::BaseMutex ...@@ -102,11 +102,6 @@ class PathSettings : private cppu::BaseMutex
, bIsReadonly (false) , bIsReadonly (false)
{} {}
PathInfo(const PathInfo& rCopy)
{
takeOver(rCopy);
}
void takeOver(const PathInfo& rCopy) void takeOver(const PathInfo& rCopy)
{ {
sPathName = rCopy.sPathName; sPathName = rCopy.sPathName;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment