wizards/com/sun/star/wizards/report/DBColumn.java | 7 ++++++-
wizards/com/sun/star/wizards/report/ReportTextDocument.java | 4 ++--
wizards/com/sun/star/wizards/ui/UnoDialog.java | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 3c3657cbabe711d057c09e8869b2751a78c34e3a
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Sep 24 08:49:48 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Sep 24 18:09:06 2024 +0200
cid#1607041 PA: Public Attribute
Change-Id: I991d0213a2f429a89e6b1431d9dc900400b60a96
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173844
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
diff --git a/wizards/com/sun/star/wizards/report/DBColumn.java
b/wizards/com/sun/star/wizards/report/DBColumn.java
index e53b0649d271..0c6e36e2219f 100644
--- a/wizards/com/sun/star/wizards/report/DBColumn.java
+++ b/wizards/com/sun/star/wizards/report/DBColumn.java
@@ -51,7 +51,7 @@ public class DBColumn
private boolean bAlignLeft;
private String CharFontName;
private PropertyState PropertyState;
- public int ValColumn = 1;
+ private int ValColumn = 1;
private int ValRow = 0;
public FieldColumn CurDBField;
private XTextTable xTextTable;
@@ -445,4 +445,9 @@ public class DBColumn
return true; //most probably this is really the Namecell!!!!
}
}
+
+ public int getValColumn()
+ {
+ return ValColumn;
+ }
}
diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java
b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
index b7f7c2a04de9..62f7391eec8b 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
@@ -491,11 +491,11 @@ class ReportTextDocument extends
com.sun.star.wizards.text.TextDocument implemen
{
DBColumn oDBColumn1 = getDBColumnByName(oFieldColumn1.getFieldName());
DBColumn oDBColumn2 = getDBColumnByName(oFieldColumn2.getFieldName());
- if (oDBColumn1.ValColumn < oDBColumn2.ValColumn)
+ if (oDBColumn1.getValColumn() < oDBColumn2.getValColumn())
{
return -1;
}
- else if (oDBColumn1.ValColumn == oDBColumn2.ValColumn)
+ else if (oDBColumn1.getValColumn() == oDBColumn2.getValColumn())
{
return 0;
}
commit a90d2bcb3d18787e3c9dec9a762d88492a9ba934
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Sep 24 08:48:04 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Sep 24 18:08:57 2024 +0200
cid#1607206 PA: Public Attribute
Change-Id: I70a2b4fbbde93f9ce839129441a17afe3d2059e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173843
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java
b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index 9e5b439fc532..837b050954e1 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -40,7 +40,7 @@ public class UnoDialog
XControlContainer xDlgContainer;
private XNameAccess m_xDlgNameAccess;
public XControl xControl;
- public XDialog xDialog;
+ protected XDialog xDialog;
public XReschedule xReschedule;
public XWindow xWindow;
public XComponent xComponent;
