[Libreoffice-commits] core.git: 2 commits - dbaccess/source helpcontent2

[Olivier Hallot (via logerrit)]

 dbaccess/source/ui/inc/JoinTableView.hxx         |    2 +-
 dbaccess/source/ui/querydesign/JAccess.cxx       |    2 +-
 dbaccess/source/ui/querydesign/JoinTableView.cxx |    2 +-
 helpcontent2                                     |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 48e489871681ffea6c43e88cc25b5b05e26d78b1
Author:     Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Fri Oct 21 14:16:16 2022 -0300
Commit:     Gerrit Code Review <ger...@gerrit.libreoffice.org>
CommitDate: Fri Oct 21 19:16:16 2022 +0200

    Update git submodules
    
    * Update helpcontent2 from branch 'master'
      to 6deeb4a1ad63f4657abfd06cf235f43291c19d78
      - Reduce screenshot/svt to valid Help locales
    
        Change-Id: I3b8ae51dacc263ee6224b6cb1a74cbac10ed2b53
        Reviewed-on: https://gerrit.libreoffice.org/c/help/+/141639
        Tested-by: Jenkins
        Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>

diff --git a/helpcontent2 b/helpcontent2
index b8c0ef544e9e..6deeb4a1ad63 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b8c0ef544e9eddd68d1677e54f65715778029d59
+Subproject commit 6deeb4a1ad63f4657abfd06cf235f43291c19d78
commit 1f687c07878b56cd07bedf4a04790375ac881658
Author:     Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
AuthorDate: Fri Oct 21 12:35:27 2022 +0300
Commit:     Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
CommitDate: Fri Oct 21 19:16:01 2022 +0200

    Related: tdf#114441 use better types in place of recently changed ones
    
    Best to harmonise these to sal_Int64, along the lines of
    commit 206543c7bef58fc559852553a3b2faba0b604259
    Author: Michael Weghorn <m.wegh...@posteo.de>
    Date:   Fri Sep 2 13:06:08 2022 +0200
    
        [API CHANGE] tdf#150683 a11y: Switch a11y child index to 64 bit
    
    Change-Id: I3cddb192990ba87dc637cdd765d1427bc4611d2b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141621
    Tested-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
    Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>

diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx 
b/dbaccess/source/ui/inc/JoinTableView.hxx
index b0b6ece88454..9e2e2bf57e25 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -163,7 +163,7 @@ namespace dbaui
         void addConnection(OTableConnection* _pConnection,bool _bAddData = 
true);
 
         bool ScrollPane( tools::Long nDelta, bool bHoriz, bool 
bPaintScrollBars );
-        sal_uInt32 GetTabWinCount() const;
+        sal_Int64 GetTabWinCount() const;
         const Point& GetScrollOffset() const { return m_aScrollOffset; }
 
         OJoinDesignView* getDesignView() const { return m_pView; }
diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx 
b/dbaccess/source/ui/querydesign/JAccess.cxx
index e39bf4a563dd..277a6f9c3426 100644
--- a/dbaccess/source/ui/querydesign/JAccess.cxx
+++ b/dbaccess/source/ui/querydesign/JAccess.cxx
@@ -64,7 +64,7 @@ namespace dbaui
         if(i < 0 || i >= getAccessibleChildCount() || !m_pTableView)
             throw IndexOutOfBoundsException();
         // check if we should return a table window or a connection
-        sal_Int32 nTableWindowCount = m_pTableView->GetTabWinCount();
+        sal_Int64 nTableWindowCount = m_pTableView->GetTabWinCount();
         if( i < nTableWindowCount )
         {
             OJoinTableView::OTableWindowMap::const_iterator aIter = 
std::next(m_pTableView->GetTabWinMap().begin(), i);
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx 
b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 21259b590fca..2068e2a48ff2 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -236,7 +236,7 @@ void OJoinTableView::Resize()
     }
 }
 
-sal_uInt32 OJoinTableView::GetTabWinCount() const
+sal_Int64 OJoinTableView::GetTabWinCount() const
 {
     return m_aTableMap.size();
 }