core.git: 2 commits - basctl/source svl/source

[Caolán McNamara (via logerrit)]

 basctl/source/basicide/localizationmgr.cxx |    3 +--
 svl/source/items/itemset.cxx               |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 80b5041ea5fbc0ea37fc59edddb4bb7ae90fdc9c
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Dec 25 22:22:37 2023 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Dec 26 11:53:19 2023 +0100

    cid#1545970 COPY_INSTEAD_OF_MOVE
    
    Change-Id: Ifbec5f91dd11a495fcf01ad95fcdcc867e882f70
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161293
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/basctl/source/basicide/localizationmgr.cxx 
b/basctl/source/basicide/localizationmgr.cxx
index 36e9f9818f7f..4d311741b4bb 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -434,8 +434,7 @@ sal_Int32 
LocalizationMgr::implHandleControlResourceProperties
                                 xStringResourceManager->setStringForLocale( 
aPureIdStr, aPropStr, rLocale );
                             }
 
-                            OUString aPropIdStr = aEsc + aPureIdStr;
-                            pIdStrings[i] = aPropIdStr;
+                            pIdStrings[i] = aEsc + aPureIdStr;
                         }
                         xPropertySet->setPropertyValue( aPropName, 
Any(aIdStrings) );
                     }
commit f8163aba61c6c2037deb32c61e52a8c4bd38d07f
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Dec 25 22:18:24 2023 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Dec 26 11:53:11 2023 +0100

    cid#1559882 Uninitialized scalar field
    
    and
    
    cid#1559872 Uninitialized scalar field
    
    Change-Id: Iaea583d63cd1f0a1b68c60adb57c8c1db9a26a9c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161292
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index 4cadfa6b596e..4b2442a925a7 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -74,7 +74,7 @@ SfxPoolItemHolder::SfxPoolItemHolder()
 SfxPoolItemHolder::SfxPoolItemHolder(SfxItemPool& rPool, const SfxPoolItem* 
pItem, bool bPassingOwnership)
 : m_pPool(&rPool)
 , m_pItem(pItem)
-#ifdef DBG_UTIL
+#ifndef NDEBUG
 , m_bDeleted(false)
 #endif
 {
@@ -89,7 +89,7 @@ SfxPoolItemHolder::SfxPoolItemHolder(SfxItemPool& rPool, 
const SfxPoolItem* pIte
 SfxPoolItemHolder::SfxPoolItemHolder(const SfxPoolItemHolder& rHolder)
 : m_pPool(rHolder.m_pPool)
 , m_pItem(rHolder.m_pItem)
-#ifdef DBG_UTIL
+#ifndef NDEBUG
 , m_bDeleted(false)
 #endif
 {