sc/source/core/data/table3.cxx | 13 +++++++------ vcl/unx/gtk3/a11y/atkwrapper.cxx | 6 ++++++ wizards/com/sun/star/wizards/form/UIControlArranger.java | 3 +-- wizards/com/sun/star/wizards/ui/ButtonList.java | 7 ++++++- 4 files changed, 20 insertions(+), 9 deletions(-)
New commits: commit 5a0576db4b7c0e2597e71d454c87f43ffda74fd2 Author: Caolán McNamara <[email protected]> AuthorDate: Mon Aug 26 10:27:25 2024 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Aug 26 15:02:22 2024 +0200 cid#1608542 PA: Public Attribute Change-Id: Idb368b38229ae9c02172a58997591df80da2a8ea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172387 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/wizards/com/sun/star/wizards/form/UIControlArranger.java b/wizards/com/sun/star/wizards/form/UIControlArranger.java index 8f92e8ce66b5..78dc5969e518 100644 --- a/wizards/com/sun/star/wizards/form/UIControlArranger.java +++ b/wizards/com/sun/star/wizards/form/UIControlArranger.java @@ -242,9 +242,8 @@ public class UIControlArranger m_aButtonList.setShowButtons(false); // shows a button line at ''wrong'' position like |<| 1..4/4 |>| m_aButtonList.setRenderer(new LayoutRenderer()); m_aButtonList.setGap(new Size(3, 3)); -// m_aButtonList.scaleImages = Boolean.FALSE; m_aButtonList.tabIndex = curtabindex++; - m_aButtonList.helpURL = 34453 + (formindex * 4); + m_aButtonList.setHelpURL(34453 + (formindex * 4)); m_aButtonList.setListModel(model); m_aButtonList.create(CurUnoDialog); diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java index a129fe97c8fc..2fa7f4707c7e 100644 --- a/wizards/com/sun/star/wizards/ui/ButtonList.java +++ b/wizards/com/sun/star/wizards/ui/ButtonList.java @@ -61,7 +61,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener private String m_aControlName = "il"; private int m_nCurrentSelection = -1; private int pageStart = 0; - public int helpURL = 0; + private int helpURL = 0; private IRenderer renderer; private ListModel listModel; private IRenderer counterRenderer = new SimpleCounterRenderer(); @@ -72,6 +72,11 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener m_aControlName = _sName; } + public void setHelpURL(int _helpURL) + { + helpURL = _helpURL; + } + /** Setter for property m_aButtonSize. * @param imageSize New value of property m_aButtonSize. */ commit e4110d1a8056b2bd071b1efba4330d1f4fd2ef8b Author: Caolán McNamara <[email protected]> AuthorDate: Mon Aug 26 10:20:24 2024 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Aug 26 15:02:16 2024 +0200 cid#1608341 Overflowed return value Change-Id: I0deb43c8bf998f914368115f1dfd176278cfe274 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172386 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/vcl/unx/gtk3/a11y/atkwrapper.cxx b/vcl/unx/gtk3/a11y/atkwrapper.cxx index bd417f4d60d4..a16d1afe0559 100644 --- a/vcl/unx/gtk3/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk3/a11y/atkwrapper.cxx @@ -474,6 +474,12 @@ wrapper_get_n_children( AtkObject *atk_obj ) "returning max gint."); nChildCount = std::numeric_limits<gint>::max(); } + else if (nChildCount < std::numeric_limits<gint>::min()) + { + SAL_WARN("vcl.gtk", "wrapper_get_n_children: Child count exceeds minimum gint value, " + "returning min gint."); + nChildCount = std::numeric_limits<gint>::min(); + } n = nChildCount; } catch(const uno::Exception&) { commit 86afa54110d48ffcd5abd849f15ac75ab92a480e Author: Caolán McNamara <[email protected]> AuthorDate: Mon Aug 26 09:59:59 2024 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Mon Aug 26 15:02:09 2024 +0200 cid#e608033 silence bogus Overflowed array index read Change-Id: I37da01ba951cd2db0398b58627b00c0c72a2e57a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172385 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 86c709f711c4..d022ba2c4473 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -2003,7 +2003,6 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam ) SCROW nStartRow = rParam.nRow1 + 1; // Header SCCOL nEndCol = rParam.nCol2; SCROW nEndRow = rParam.nRow2; // will change - sal_uInt16 i; // Remove empty rows at the end // so that all exceeding (rDocument.MaxRow()) can be found by InsertRow (#35180#) @@ -2013,11 +2012,13 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam ) sal_uInt16 nLevelCount = 0; // Number of levels bool bDoThis = true; - for (i=0; i<MAXSUBTOTAL && bDoThis; i++) + for (sal_uInt16 i = 0; i < MAXSUBTOTAL && bDoThis; ++i) + { if (rParam.bGroupActive[i]) - nLevelCount = i+1; + nLevelCount = o3tl::sanitizing_inc(i); else bDoThis = false; + } if (nLevelCount==0) // do nothing return true; @@ -2059,7 +2060,7 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam ) if (nResCount > 0) // otherwise only sort { - for (i=0; i<=aRowEntry.nGroupNo; i++) + for (sal_uInt16 i = 0; i <= aRowEntry.nGroupNo; ++i) { aSubString = GetString( nGroupCol[i], nStartRow ); if ( bIgnoreCase ) @@ -2079,7 +2080,7 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam ) { bChanged = false; OUString aString; - for (i=0; i<=aRowEntry.nGroupNo && !bChanged; i++) + for (sal_uInt16 i = 0; i <= aRowEntry.nGroupNo && !bChanged; ++i) { aString = GetString( nGroupCol[i], nRow ); if (bIgnoreCase) @@ -2139,7 +2140,7 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam ) ++nRow; ++nEndRow; aRowEntry.nSubStartRow = nRow; - for (i=0; i<=aRowEntry.nGroupNo; i++) + for (sal_uInt16 i = 0; i <= aRowEntry.nGroupNo; ++i) { aSubString = GetString( nGroupCol[i], nRow ); if ( bIgnoreCase )
