diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-08-29 10:41:51 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-08-29 11:59:08 +0200 |
| commit | b59feb122b13ec91571db774cedbf19ee73f5719 (patch) | |
| tree | d2ab2921b6d6f9e06b617985b00315e489358615 | |
| parent | 085269d25a705b656436feac47149296b4b4b35d (diff) | |
More -Werror=redundant-move
...similar to dc06c8f4989fc28d0c31ebd333e53dfe0e0f5f66 "-Werror=redundant-move
(GCC 9), take two"
Change-Id: Idb6b29d6959ff707bab820d150133a954221a29e
Reviewed-on: https://gerrit.libreoffice.org/59749
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | sc/source/filter/excel/xiescher.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 3ad8791d6101..1d7e22dd2834 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -47,6 +47,7 @@ #include <vcl/dibtools.hxx> #include <vcl/wmf.hxx> #include <comphelper/classids.hxx> +#include <config_global.h> #include <toolkit/helper/vclunohelper.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> @@ -1020,7 +1021,11 @@ SdrObjectPtr XclImpGroupObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const for( ::std::vector< XclImpDrawObjRef >::const_iterator aIt = maChildren.begin(), aEnd = maChildren.end(); aIt != aEnd; ++aIt ) rDffConv.ProcessObject( rObjList, **aIt ); rDffConv.Progress(); +#if HAVE_CXX_CWG1579_FIX + return xSdrObj; +#else return std::move(xSdrObj); +#endif } XclImpLineObj::XclImpLineObj( const XclImpRoot& rRoot ) : @@ -1455,7 +1460,11 @@ SdrObjectPtr XclImpTextObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const xSdrObj->SetMergedItem( makeSdrTextAutoGrowHeightItem( bAutoSize ) ); xSdrObj->SetMergedItem( makeSdrTextWordWrapItem( true ) ); rDffConv.Progress(); +#if HAVE_CXX_CWG1579_FIX + return xSdrObj; +#else return std::move(xSdrObj); +#endif } void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const |