summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-08-28 17:07:16 +0200
committerJan Holesovsky <kendy@collabora.com>2019-01-25 16:35:08 +0100
commit4627da3af6ff6664c4124362743b50caa0aa3a3a (patch)
tree87e382dfecc3ac2f21dbf082e5b1b4e43c93b49e /editeng
parent2ed43bb5873f595c920603c1c01e89e969771a46 (diff)
Silence bogus -Werror=redundant-move (GCC 9)
Change-Id: Ia078fb8e1e497edfa08e2a61d1659100461fc52e Reviewed-on: https://gerrit.libreoffice.org/59720 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/66914 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/editeng/editeng.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 6116d702242b..01b00ece1297 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -19,6 +19,7 @@
#include <memory>
#include <comphelper/lok.hxx>
+#include <config_global.h>
#include <vcl/wrkwin.hxx>
#include <vcl/dialog.hxx>
#include <vcl/msgbox.hxx>
@@ -2624,7 +2625,11 @@ vcl::Font EditEngine::CreateFontFromItemSet( const SfxItemSet& rItemSet, SvtScri
{
SvxFont aFont;
CreateFont( aFont, rItemSet, true, nScriptType );
+#if HAVE_GCC_BUG_87150
+ return aFont;
+#else
return std::move(aFont);
+#endif
}
SvxFont EditEngine::CreateSvxFontFromItemSet( const SfxItemSet& rItemSet )