[Libreoffice-commits] core.git: basic/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Tue Aug 4 13:01:02 UTC 2020
basic/source/sbx/sbxbase.cxx | 3 ---
1 file changed, 3 deletions(-)
New commits:
commit 16a3a548d4e8e1132689de5615e025d0d4b3d564
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Aug 4 11:54:42 2020 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Aug 4 15:00:24 2020 +0200
Remove dead code
As discussed at <https://gerrit.libreoffice.org/c/core/+/99724> "fix shutdown
crash in basic" the code was added in error, and at least clang-cl with latest
MSVC standard library and C++20 mode gives a helpful
> basic/source/sbx/sbxbase.cxx(53,5): error: ignoring return value of function declared with 'nodiscard' attribute [-Werror,-Wunused-result]
> std::move(m_Factories);
> ^~~~~~~~~ ~~~~~~~~~~~
now.
Change-Id: I052efe51d4415838b50de06bb308692fa937b7b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100076
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index f62949ada7ec..0e057540c8bc 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -48,9 +48,6 @@ SbxAppData::~SbxAppData()
pBasicFormater.reset();
// basic manager repository must be destroyed before factories
mrImplRepository.clear();
- // we need to move stuff out otherwise the destruction of the factories
- // calls back into SbxBase::RemoveFactory and sees partially destructed data
- std::move(m_Factories);
}
SbxBase::SbxBase()
More information about the Libreoffice-commits
mailing list