[Libreoffice-commits] core.git: sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Dec 21 20:26:50 UTC 2018
sw/source/filter/ww8/ww8par6.cxx | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 856ea829c948dc88aa43a496c2050c608fce3430
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Dec 21 17:10:28 2018 +0100
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Dec 21 21:26:24 2018 +0100
-Werror=class-memaccess (trunk towards GCC 9)
..."error: ‘void* memset(void*, int, size_t)’ clearing an object of non-trivial
type ‘struct WW8FlyPara’; use assignment instead"
Change-Id: I31d8169ea1a4e1aaf5bff55b359c280a034ea67f
Reviewed-on: https://gerrit.libreoffice.org/65552
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index f743d11cd7cf..a178f5c788d0 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1636,8 +1636,19 @@ WW8FlyPara::WW8FlyPara(bool bIsVer67, const WW8FlyPara* pSrc /* = 0 */)
memcpy( this, pSrc, sizeof( WW8FlyPara ) ); // Copy-Ctor
else
{
- memset( this, 0, sizeof( WW8FlyPara ) ); // Default-Ctor
+ nSp26 = 0;
+ nSp27 = 0;
+ nSp45 = 0;
+ nSp28 = 0;
+ nLeMgn = 0;
+ nRiMgn = 0;
+ nUpMgn = 0;
+ nLoMgn = 0;
+ nSp29 = 0;
nSp37 = 2; // Default: wrapping
+ bBorderLines = false;
+ bGrafApo = false;
+ mbVertSet = false;
}
bVer67 = bIsVer67;
}
More information about the Libreoffice-commits
mailing list