[Libreoffice-commits] core.git: 2 commits - sal/rtl sd/source

[Caolán McNamara]

 sal/rtl/alloc_global.cxx        |    1 +
 sd/source/core/text/textapi.cxx |    7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 512dd456520c10318fd65f45ec2704bdeb8c4fdb
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 5 15:09:29 2016 +0000

    cppcheck: useInitializationList
    
    Change-Id: I85488439b06fddd73074757f1149dec5d988099d
    Reviewed-on: https://gerrit.libreoffice.org/22161
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx
index 83ff45d..086a06d 100644
--- a/sd/source/core/text/textapi.cxx
+++ b/sd/source/core/text/textapi.cxx
@@ -185,11 +185,10 @@ TextApiObject* TextApiObject::getImplementation( const css::uno::Reference< css:
     return pImpl;
 }
 
-TextAPIEditSource::TextAPIEditSource( const TextAPIEditSource& rSource )
-: SvxEditSource( *this )
+TextAPIEditSource::TextAPIEditSource(const TextAPIEditSource& rSource)
+    : SvxEditSource(*this)
+    , m_xImpl(rSource.m_xImpl) // shallow copy; uses internal refcounting
 {
-    // shallow copy; uses internal refcounting
-    m_xImpl = rSource.m_xImpl;
 }
 
 SvxEditSource* TextAPIEditSource::Clone() const
commit 42294e47bbff63e01639a8a70daa5e93c3380bc4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 5 15:09:22 2016 +0000

    cppcheck-suppress sizeofwithsilentarraypointer
    
    Change-Id: I794cb2f3f31e9ce48f3568bd5a4afc52abf0f934
    Reviewed-on: https://gerrit.libreoffice.org/22160
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sal/rtl/alloc_global.cxx b/sal/rtl/alloc_global.cxx
index ca6601b..6dd24f1 100644
--- a/sal/rtl/alloc_global.cxx
+++ b/sal/rtl/alloc_global.cxx
@@ -237,6 +237,7 @@ void rtl_memory_fini()
     int i, n;
 
     /* clear g_alloc_table */
+    // cppcheck-suppress sizeofwithsilentarraypointer
     memset (g_alloc_table, 0, sizeof(g_alloc_table));
 
     /* cleanup g_alloc_caches */