[Libreoffice-commits] core.git: 2 commits - connectivity/source sc/source

[Caolán McNamara (via logerrit)]

 connectivity/source/inc/odbc/OResultSetMetaData.hxx |    2 +-
 sc/source/ui/Accessibility/AccessibleDocument.cxx   |    7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit dc3d27c53e5c8149571025a031857973783a9248
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Feb 26 15:17:27 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Feb 26 20:04:29 2022 +0100

    cid#1500706 Uninitialized scalar field
    
    Change-Id: I2546ea6880ad1cdb4312ca1c1251dbf6758ff5ea
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130593
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx 
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 1d58af05fe2a..21e3d1813a77 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -258,7 +258,6 @@ private:
 
     mutable ::accessibility::AccessibleShapeTreeInfo maShapeTreeInfo;
     mutable css::uno::Reference<css::view::XSelectionSupplier> 
xSelectionSupplier;
-    mutable size_t mnSdrObjCount;
     mutable sal_uInt32 mnShapesSelected;
     ScTabViewShell* mpViewShell;
     ScAccessibleDocument* mpAccessibleDocument;
@@ -499,9 +498,9 @@ sal_Int32 ScChildrenShapes::GetCount() const
     SdrPage* pDrawPage = GetDrawPage();
     if (pDrawPage && (maZOrderedShapes.size() == 1)) // the table is always in
     {
-        mnSdrObjCount = pDrawPage->GetObjCount();
-        maZOrderedShapes.reserve(mnSdrObjCount + 1); // the table is always in
-        for (size_t i = 0; i < mnSdrObjCount; ++i)
+        size_t nSdrObjCount = pDrawPage->GetObjCount();
+        maZOrderedShapes.reserve(nSdrObjCount + 1); // the table is always in
+        for (size_t i = 0; i < nSdrObjCount; ++i)
         {
             SdrObject* pObj = pDrawPage->GetObj(i);
             if (pObj/* && (pObj->GetLayer() != SC_LAYER_INTERN)*/)
commit 10d8ba5fa6fac708c960278454ba403a95e355c3
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Feb 26 15:12:37 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Feb 26 20:04:16 2022 +0100

    cid#1500433 Using a moved object
    
    Change-Id: I150cd0f021aeb1aefe411f19dfcac111ac35b295
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130592
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx 
b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
index 6c1acc13bfb9..ea32a453e99a 100644
--- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx
+++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
@@ -62,7 +62,7 @@ namespace connectivity::odbc
                     :m_vMapping(std::move(_vMapping))
                     ,m_aStatementHandle( _pStmt )
                     ,m_pConnection(_pConnection)
-                    ,m_nColCount(_vMapping.size()-1)
+                    ,m_nColCount(m_vMapping.size()-1)
                     ,m_bUseODBC2Types(false)
             {}
             virtual ~OResultSetMetaData() override;