diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-04-23 20:51:37 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-04-23 21:50:51 +0200 |
| commit | 500c4a1442919715a504e90db592dcce0f31e1a5 (patch) | |
| tree | f333b29890cf5da10e234b5bae2073e3d05c05f1 /cppu | |
| parent | 39a1edd6fec902ef378acce8af42c4d7fba280d0 (diff) | |
Related tdf#115399: Reorder code slightly
...in preparation of a forthcoming fix for the issue
Change-Id: I6611778dfbc090eb869bf653cf7f61574a81b4f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92823
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/source/typelib/typelib.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 339f470077af..acd205ad07b2 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -1497,15 +1497,15 @@ extern "C" void SAL_CALL typelib_typedescription_register( *ppNewDescription +1, nSize - sizeof(typelib_TypeDescription) ); - pTDR->pType->bComplete = (*ppNewDescription)->bComplete; - pTDR->pType->nSize = (*ppNewDescription)->nSize; - pTDR->pType->nAlignment = (*ppNewDescription)->nAlignment; - memset( *ppNewDescription +1, 0, nSize - sizeof( typelib_TypeDescription ) ); + pTDR->pType->bComplete = (*ppNewDescription)->bComplete; + pTDR->pType->nSize = (*ppNewDescription)->nSize; + pTDR->pType->nAlignment = (*ppNewDescription)->nAlignment; + if( pTDR->pType->bOnDemand && !(*ppNewDescription)->bOnDemand ) { // switch from OnDemand to !OnDemand, so the description must be acquired |