accessibility/source/extended/accessibletablistboxtable.cxx | 6 ++-- external/frozen/UnpackedTarball_frozen.mk | 1 external/frozen/cid1538304_reference_ctor.0 | 16 ++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-)
New commits: commit a7181c0b3898d32bae0deaf12ebcadd3de30a50e Author: Caolán McNamara <caolan.mcnam...@collabora.com> AuthorDate: Sat Jul 22 20:27:25 2023 +0100 Commit: Caolán McNamara <caolan.mcnam...@collabora.com> CommitDate: Sun Jul 23 11:54:08 2023 +0200 cid#1538304 Big parameter passed by value and cid#1538309 Big parameter passed by value Change-Id: I6c3f86c3c57f561b71809d0193ab663d2f92a4b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154794 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com> diff --git a/external/frozen/UnpackedTarball_frozen.mk b/external/frozen/UnpackedTarball_frozen.mk index 196cf1e00fdc..b33a05c7dbd8 100644 --- a/external/frozen/UnpackedTarball_frozen.mk +++ b/external/frozen/UnpackedTarball_frozen.mk @@ -14,6 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,frozen,$(FROZEN_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,frozen,\ external/frozen/defines_h_constexpr_string.patch.0 \ external/frozen/cid1532449_use_move_ctor.0 \ + external/frozen/cid1538304_reference_ctor.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/frozen/cid1538304_reference_ctor.0 b/external/frozen/cid1538304_reference_ctor.0 new file mode 100644 index 000000000000..8ed0a7533fd4 --- /dev/null +++ b/external/frozen/cid1538304_reference_ctor.0 @@ -0,0 +1,16 @@ +--- include/frozen/map.h 2023-07-22 20:20:19.580400347 +0100 ++++ include/frozen/map.h 2023-07-22 20:25:44.893704485 +0100 +@@ -94,11 +94,11 @@ + + public: + /* constructors */ +- constexpr map(container_type items, Compare const &compare) ++ constexpr map(const container_type& items, Compare const &compare) + : less_than_{compare} + , items_{bits::quicksort(items, less_than_)} {} + +- explicit constexpr map(container_type items) ++ explicit constexpr map(const container_type& items) + : map{items, Compare{}} {} + + constexpr map(std::initializer_list<value_type> items, Compare const &compare) commit cb78012a9ba17e264605e10c49303d2bf5e1460d Author: Caolán McNamara <caolan.mcnam...@collabora.com> AuthorDate: Sat Jul 22 20:06:25 2023 +0100 Commit: Caolán McNamara <caolan.mcnam...@collabora.com> CommitDate: Sun Jul 23 11:53:59 2023 +0200 cid#1539071 Division or modulo by zero Change-Id: Icc730f5097609a845e287e580881a8466b0b128d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154793 Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com> diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx index 7157febc3ea3..fe2d51b0ee3f 100644 --- a/accessibility/source/extended/accessibletablistboxtable.cxx +++ b/accessibility/source/extended/accessibletablistboxtable.cxx @@ -320,11 +320,11 @@ namespace accessibility ensureIsAlive(); - sal_Int32 nRows = implGetSelRowCount(); - if ( nRows == 0 ) + const sal_Int32 nColCount = implGetColumnCount(); + + if (nColCount == 0) throw IndexOutOfBoundsException(); - const sal_Int32 nColCount = implGetColumnCount(); const sal_Int32 nRow = implGetSelRow(nSelectedChildIndex / nColCount); const sal_Int32 nColumn = nSelectedChildIndex % nColCount; return getAccessibleCellAt( nRow, nColumn );