sd/source/filter/ppt/propread.cxx |
4 +--
sw/source/core/fields/cellfml.cxx |
2 -
wizards/com/sun/star/wizards/db/CommandMetaData.java |
12 +++++++++-
wizards/com/sun/star/wizards/form/FormControlArranger.java |
2 -
wizards/com/sun/star/wizards/form/FormDocument.java |
8 +++++-
wizards/com/sun/star/wizards/query/QueryWizard.java |
4 +--
wizards/com/sun/star/wizards/report/ReportTextDocument.java |
4 +--
wizards/com/sun/star/wizards/report/ReportTextImplementation.java |
2 -
wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java |
4 +--
wizards/com/sun/star/wizards/ui/FieldSelection.java |
7 +++++
10 files changed, 34 insertions(+), 15 deletions(-)
New commits:
commit a48511a90ccbb1c04c97e278490c4fb713b60254
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Sep 22 19:33:35 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Sep 22 22:29:32 2024 +0200
cid#1607483 PA: Public Attribute
Change-Id: Ib31c45ffb51db8ec7b3a8c8809b212515cee0437
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173777
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java
b/wizards/com/sun/star/wizards/query/QueryWizard.java
index d9ef71027117..4ecb47072c45 100644
--- a/wizards/com/sun/star/wizards/query/QueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/QueryWizard.java
@@ -445,11 +445,11 @@ public class QueryWizard extends DatabaseObjectWizard
{
showMessageBox("ErrorBox", VclWindowPeerAttribute.OK,
resmsgNonNumericAsGroupBy);
m_groupFieldSelection.xSelectedFieldsListBox.addItems(SelItems,
m_groupFieldSelection.xSelectedFieldsListBox.getItemCount());
- String FieldList[] =
m_groupFieldSelection.xFieldsListBox.getItems();
+ String FieldList[] =
m_groupFieldSelection.getFieldsListBox().getItems();
int index = JavaTools.FieldInList(FieldList,
CurDisplayFieldName);
if (index > -1)
{
-
m_groupFieldSelection.xFieldsListBox.removeItems((short) index, (short) 1);
+
m_groupFieldSelection.getFieldsListBox().removeItems((short) index, (short) 1);
}
}
else
diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java
b/wizards/com/sun/star/wizards/ui/FieldSelection.java
index dc9f83dbec7c..7c4e912539b8 100644
--- a/wizards/com/sun/star/wizards/ui/FieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java
@@ -25,7 +25,7 @@ import java.util.*;
public class FieldSelection
{
- public XListBox xFieldsListBox; // Left ListBox
+ protected XListBox xFieldsListBox; // Left ListBox
public XListBox xSelectedFieldsListBox; // right (selected) ListBox
protected UnoDialog CurUnoDialog;
@@ -623,6 +623,11 @@ public class FieldSelection
CurUnoDialog.setControlProperty("lstFields" + sIncSuffix,
PropertyNames.STRING_ITEM_LIST, sleftboxfieldnames);
}
+ public XListBox getFieldsListBox()
+ {
+ return xFieldsListBox;
+ }
+
public void setModified(boolean _bModified)
{
bisModified = _bModified;
commit 77e1eadff7a221d0c26cf1021d3a896a9c6ccfe4
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Sep 22 19:30:54 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Sep 22 22:29:25 2024 +0200
cid#1608290 PA: Public Attribute
Change-Id: Id4afe36a78851205d79850800407966387cc43fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173776
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/wizards/com/sun/star/wizards/db/CommandMetaData.java
b/wizards/com/sun/star/wizards/db/CommandMetaData.java
index 60d555d94066..32a7a4f4be95 100644
--- a/wizards/com/sun/star/wizards/db/CommandMetaData.java
+++ b/wizards/com/sun/star/wizards/db/CommandMetaData.java
@@ -38,7 +38,7 @@ public class CommandMetaData extends DBMetaData
protected String[] m_aAllFieldNames = new String[]
{
};
- public FieldColumn[] FieldColumns = new FieldColumn[]
+ protected FieldColumn[] FieldColumns = new FieldColumn[]
{
};
private String[] GroupFieldNames = new String[]
@@ -261,6 +261,16 @@ public class CommandMetaData extends DBMetaData
throw new com.sun.star.uno.RuntimeException();
}
+ public FieldColumn[] getFieldColumns()
+ {
+ return FieldColumns;
+ }
+
+ public void setFieldColumns(FieldColumn[] _fieldColumns)
+ {
+ FieldColumns = _fieldColumns;
+ }
+
public boolean getFieldNamesOfCommand(String _commandname, int
_commandtype)
{
try
diff --git a/wizards/com/sun/star/wizards/form/FormControlArranger.java
b/wizards/com/sun/star/wizards/form/FormControlArranger.java
index 93becab45604..fdbdcc3369f2 100644
--- a/wizards/com/sun/star/wizards/form/FormControlArranger.java
+++ b/wizards/com/sun/star/wizards/form/FormControlArranger.java
@@ -80,7 +80,7 @@ public class FormControlArranger
public FormControlArranger(FormHandler _oFormHandler, XNameContainer
_xFormName, CommandMetaData oDBMetaData, XStatusIndicator _xProgressBar, Point
_StartPoint, Size _FormSize)
{
- FieldColumns = oDBMetaData.FieldColumns;
+ FieldColumns = oDBMetaData.getFieldColumns();
xMSF = oDBMetaData.xMSF;
xFormName = _xFormName;
xProgressBar = _xProgressBar;
diff --git a/wizards/com/sun/star/wizards/form/FormDocument.java
b/wizards/com/sun/star/wizards/form/FormDocument.java
index e2241b1a3215..cec2358658c6 100644
--- a/wizards/com/sun/star/wizards/form/FormDocument.java
+++ b/wizards/com/sun/star/wizards/form/FormDocument.java
@@ -513,11 +513,15 @@ public class FormDocument extends TextDocument
curArrangement = FormWizard.AS_GRID;
if (Name.equals(SOMAINFORM))
{
- oGridControl = new GridControl(xMSF, Name + "_Grid",
oFormHandler, xFormContainer, oDBMetaData.FieldColumns, aStartPoint,
getMainFormSize(FormWizard.AS_GRID));
+ oGridControl = new GridControl(xMSF, Name + "_Grid",
oFormHandler, xFormContainer,
+
oDBMetaData.getFieldColumns(), aStartPoint,
+
getMainFormSize(FormWizard.AS_GRID));
}
else
{
- oGridControl = new GridControl(xMSF, Name + "_Grid",
oFormHandler, xFormContainer, oDBMetaData.FieldColumns, aStartPoint,
getSubFormSize());
+ oGridControl = new GridControl(xMSF, Name + "_Grid",
oFormHandler, xFormContainer,
+
oDBMetaData.getFieldColumns(), aStartPoint,
+ getSubFormSize());
}
oGridControl.xPropertySet.setPropertyValue(PropertyNames.PROPERTY_BORDER,
_NBorderType);
}
diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java
b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
index 7fc9b0345957..9d2fa7434b2c 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
@@ -434,7 +434,7 @@ class ReportTextDocument extends
com.sun.star.wizards.text.TextDocument implemen
try
{
DBColumn CurDBColumn;
- for (int i = 0; i < CurDBMetaData.FieldColumns.length; i++)
+ for (int i = 0; i < CurDBMetaData.getFieldColumns().length; i++)
{
if (i < CurDBMetaData.getGroupFieldNames().length)
{
@@ -473,7 +473,7 @@ class ReportTextDocument extends
com.sun.star.wizards.text.TextDocument implemen
});
CurDBMetaData.setRecordFieldNames(aNewList);
CurDBMetaData.RecordFieldColumns =
removeFieldColumnByFieldName(DelFieldName, CurDBMetaData.RecordFieldColumns);
- CurDBMetaData.FieldColumns =
removeFieldColumnByFieldName(DelFieldName, CurDBMetaData.FieldColumns);
+
CurDBMetaData.setFieldColumns(removeFieldColumnByFieldName(DelFieldName,
CurDBMetaData.getFieldColumns()));
}
i--;
diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 107b9bf08129..1584a2e54ecf 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -331,7 +331,7 @@ public class ReportTextImplementation extends
ReportImplementationHelper impleme
addTextSectionCopies();
getDoc().getallDBColumns();
int GroupFieldCount =
getRecordParser().getGroupFieldNames().length;
- int FieldCount = getRecordParser().FieldColumns.length;
+ int FieldCount = getRecordParser().getFieldColumns().length;
Object[] OldGroupFieldValues = new Object[GroupFieldCount];
int RecordFieldCount = FieldCount - GroupFieldCount;
XTextDocument xTextDocument = getDoc().getTextDocument();
diff --git
a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
index 1c7a90ba3223..fa171abc9b40 100644
---
a/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
+++
b/wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java
@@ -454,8 +454,8 @@ public class ReportBuilderImplementation extends
ReportImplementationHelper
int[] FieldWidths = new int[FieldNames.length];
for (int i = 0; i < FieldNames.length; i++)
{
- FieldTypes[i] = a.FieldColumns[i].getFieldType();
- FieldWidths[i] = a.FieldColumns[i].getFieldWidth();
+ FieldTypes[i] = a.getFieldColumns()[i].getFieldType();
+ FieldWidths[i] = a.getFieldColumns()[i].getFieldWidth();
}
getReportBuilderLayouter().setTableName(_nType, TableName);
getReportBuilderLayouter().insertFieldNames(FieldNames);
commit fdb4575214d0232be2d16b140d7c761b61ac4eb8
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Sep 20 20:53:39 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Sep 22 22:29:18 2024 +0200
cid#1607710 silence Overflowed constant
and
cid#1607916 Overflowed constant
Change-Id: I54d59d9b4afbc3af2039b049a6e23111861204db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173775
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sd/source/filter/ppt/propread.cxx
b/sd/source/filter/ppt/propread.cxx
index 5c5da4255fc6..436c80cc4d0e 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -92,7 +92,7 @@ bool PropItem::Read( OUString& rString, sal_uInt32
nStringType, bool bAlign )
{
case VT_LPSTR :
{
- if (nItemSize)
+ if (nItemSize > 0)
{
auto nMaxSizePossible = remainingSize();
if (nItemSize > nMaxSizePossible)
@@ -102,7 +102,7 @@ bool PropItem::Read( OUString& rString, sal_uInt32
nStringType, bool bAlign )
}
}
- if (nItemSize)
+ if (nItemSize > 0)
{
try
{
diff --git a/sw/source/core/fields/cellfml.cxx
b/sw/source/core/fields/cellfml.cxx
index 14558c8a35c4..ce49bb4a0006 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -852,7 +852,7 @@ static const SwTableBox* lcl_RelToBox( const SwTable&
rTable,
{
nSttBox = SwTable::GetBoxNum( sGetName );
pLines = &pBox->GetTabLines();
- if( nSttBox )
+ if (nSttBox > 0)
--nSttBox;
nSttLine = SwTable::GetBoxNum( sGetName );
