sc/source/filter/lotus/op.cxx | 5 +++--
wizards/com/sun/star/wizards/form/FieldLinker.java | 2 +-
wizards/com/sun/star/wizards/report/ReportLayouter.java | 2 +-
wizards/com/sun/star/wizards/ui/AggregateComponent.java | 2 +-
wizards/com/sun/star/wizards/ui/FieldSelection.java | 4 ++--
wizards/com/sun/star/wizards/ui/FilterComponent.java | 2 +-
wizards/com/sun/star/wizards/ui/SortingComponent.java | 2 +-
wizards/com/sun/star/wizards/ui/UnoDialog.java | 4 ++--
8 files changed, 12 insertions(+), 11 deletions(-)
New commits:
commit 863d4390f07c541baaf10d9d91585e7fce71cdb2
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Sep 19 13:05:29 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Sep 19 15:43:37 2024 +0200
cid#1608386 PA: Public Attribute
Change-Id: Ie82c097a6c3241a9ed3642ba4985acc77cdd7f1c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173669
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/wizards/com/sun/star/wizards/form/FieldLinker.java
b/wizards/com/sun/star/wizards/form/FieldLinker.java
index 74dc5707e10d..71b75959a7e2 100644
--- a/wizards/com/sun/star/wizards/form/FieldLinker.java
+++ b/wizards/com/sun/star/wizards/form/FieldLinker.java
@@ -297,7 +297,7 @@ public class FieldLinker extends DBLimitedFieldSelection
if (EventObject == null) {
return;
}
- int ikey = CurUnoDialog.getControlKey(EventObject.Source,
CurUnoDialog.ControlList);
+ int ikey = CurUnoDialog.getControlKey(EventObject.Source);
enableNextControlRow(ikey);
}
diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java
b/wizards/com/sun/star/wizards/report/ReportLayouter.java
index f6397ce92c09..29f7b2d1e584 100644
--- a/wizards/com/sun/star/wizards/report/ReportLayouter.java
+++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java
@@ -227,7 +227,7 @@ public class ReportLayouter
Helper.setUnoPropertyValue(CurUnoDialog.xDialogModel,
PropertyNames.PROPERTY_ENABLED, Boolean.FALSE);
// LLA: should we lock controllers here?
//
CurReportDocument.getDoc().xTextDocument.lockControllers();
- int iKey = CurUnoDialog.getControlKey(EventObject.Source,
CurUnoDialog.ControlList);
+ int iKey = CurUnoDialog.getControlKey(EventObject.Source);
switch (iKey)
{
case SOCONTENTLST:
diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java
b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
index c9f0659f385f..a4bb1fa9b5bf 100644
--- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java
+++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
@@ -152,7 +152,7 @@ public class AggregateComponent extends ControlScroller
{
try
{
- int iKey = CurUnoDialog.getControlKey(actionEvent.Source,
CurUnoDialog.ControlList);
+ int iKey = CurUnoDialog.getControlKey(actionEvent.Source);
switch (iKey)
{
case SOADDROW:
diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java
b/wizards/com/sun/star/wizards/ui/FieldSelection.java
index 2c192ca6f4aa..b9d2bba3d84b 100644
--- a/wizards/com/sun/star/wizards/ui/FieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java
@@ -60,7 +60,7 @@ public class FieldSelection
public void itemStateChanged(com.sun.star.awt.ItemEvent EventObject)
{
com.sun.star.wizards.common.Helper.setUnoPropertyValue(CurUnoDialog.xDialogModel,
PropertyNames.PROPERTY_ENABLED, Boolean.FALSE);
- int iKey = CurUnoDialog.getControlKey(EventObject.Source,
CurUnoDialog.ControlList);
+ int iKey = CurUnoDialog.getControlKey(EventObject.Source);
switch (iKey)
{
case SOFLDSLST:
@@ -90,7 +90,7 @@ public class FieldSelection
{
try
{
- int iKey = CurUnoDialog.getControlKey(actionEvent.Source,
CurUnoDialog.ControlList);
+ int iKey = CurUnoDialog.getControlKey(actionEvent.Source);
switch (iKey)
{
case SOCMDMOVESEL:
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java
b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index f70714a319b1..2a91ed124eb7 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -110,7 +110,7 @@ public class FilterComponent
return;
}
- int iKey = CurUnoDialog.getControlKey(EventObject.Source,
CurUnoDialog.ControlList);
+ int iKey = CurUnoDialog.getControlKey(EventObject.Source);
String sControlName = PropertyNames.EMPTY_STRING;
switch (iKey)
{
diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java
b/wizards/com/sun/star/wizards/ui/SortingComponent.java
index a08729fd9af5..55c0f52cb5f2 100644
--- a/wizards/com/sun/star/wizards/ui/SortingComponent.java
+++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java
@@ -51,7 +51,7 @@ public class SortingComponent
public void itemStateChanged(ItemEvent EventObject)
{
Helper.setUnoPropertyValue(CurUnoDialog.xDialogModel,
PropertyNames.PROPERTY_ENABLED, Boolean.FALSE);
- int ikey = CurUnoDialog.getControlKey(EventObject.Source,
CurUnoDialog.ControlList);
+ int ikey = CurUnoDialog.getControlKey(EventObject.Source);
enableNextSortListBox(ikey);
Helper.setUnoPropertyValue(CurUnoDialog.xDialogModel,
PropertyNames.PROPERTY_ENABLED, Boolean.TRUE);
}
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java
b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index 404f3b619bd8..68672c4d1d99 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -47,7 +47,7 @@ public class UnoDialog
public XInterface xDialogModel;
private XInterface xUnoDialog;
private XVclWindowPeer xVclWindowPeer;
- public HashMap<String, Integer> ControlList;
+ private HashMap<String, Integer> ControlList;
public Resource m_oResource;
public XWindowPeer xWindowPeer = null;
private PeerConfig m_oPeerConfig;
@@ -78,7 +78,7 @@ public class UnoDialog
}
}
- public int getControlKey(Object EventObject, HashMap<String, Integer>
ControlList)
+ public int getControlKey(Object EventObject)
{
int iKey;
XControl xContrl = UnoRuntime.queryInterface(XControl.class,
EventObject);
commit 35939de2a9f59b79edbc574a7e429708a688b750
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Sep 18 17:50:39 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Sep 19 15:43:29 2024 +0200
cid#1607067 Overflowed constant
Change-Id: I039c80f489657cc4f47727af2e95b095592d6946
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173668
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx
index f85b7ef5b639..eb2822417ec3 100644
--- a/sc/source/filter/lotus/op.cxx
+++ b/sc/source/filter/lotus/op.cxx
@@ -611,7 +611,8 @@ void OP_SheetName123(LotusContext& rContext, SvStream&
rStream, sal_uInt16 nLeng
void OP_ApplyPatternArea123(LotusContext& rContext, SvStream& rStream)
{
sal_uInt16 nOpcode, nLength;
- sal_uInt16 nCol = 0, nColCount = 0, nRow = 0, nRowCount = 0, nTab = 0,
nData, nTabCount = 0, nLevel = 0;
+ sal_uInt16 nCol = 0, nColCount = 0, nRow = 0, nRowCount = 0, nTab = 0,
nData, nTabCount = 0;
+ int nLevel = 0;
do
{
@@ -676,7 +677,7 @@ void OP_ApplyPatternArea123(LotusContext& rContext,
SvStream& rStream)
break;
}
}
- while( nLevel && rStream.good() );
+ while (nLevel > 0 && rStream.good());
rContext.aLotusPatternPool.clear();
}
