wizards/com/sun/star/wizards/db/DBMetaData.java | 2 +-
wizards/com/sun/star/wizards/query/QueryWizard.java | 2 +-
wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java | 2 +-
wizards/com/sun/star/wizards/ui/FieldSelection.java | 7 ++++++-
4 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit b3a14ae7efa82473998c04d9e23748c878566acf
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Sep 24 08:43:29 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Sep 24 18:08:33 2024 +0200
cid#1607483 PA: Public Attribute
Change-Id: I4712b1523cc54feb3b84b5435960e4d5707735a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173841
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 4ecb47072c45..471aa4a8594a 100644
--- a/wizards/com/sun/star/wizards/query/QueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/QueryWizard.java
@@ -444,7 +444,7 @@ public class QueryWizard extends DatabaseObjectWizard
if (JavaTools.FieldInList(m_DBMetaData.NonAggregateFieldNames,
CurDisplayFieldName) > -1)
{
showMessageBox("ErrorBox", VclWindowPeerAttribute.OK,
resmsgNonNumericAsGroupBy);
-
m_groupFieldSelection.xSelectedFieldsListBox.addItems(SelItems,
m_groupFieldSelection.xSelectedFieldsListBox.getItemCount());
+
m_groupFieldSelection.getSelectedFieldsListBox().addItems(SelItems,
m_groupFieldSelection.getSelectedFieldsListBox().getItemCount());
String FieldList[] =
m_groupFieldSelection.getFieldsListBox().getItems();
int index = JavaTools.FieldInList(FieldList,
CurDisplayFieldName);
if (index > -1)
diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java
b/wizards/com/sun/star/wizards/ui/FieldSelection.java
index 7c4e912539b8..97f19e4eb108 100644
--- a/wizards/com/sun/star/wizards/ui/FieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java
@@ -26,7 +26,7 @@ import java.util.*;
public class FieldSelection
{
protected XListBox xFieldsListBox; // Left ListBox
- public XListBox xSelectedFieldsListBox; // right (selected) ListBox
+ protected XListBox xSelectedFieldsListBox; // right (selected)
ListBox
protected UnoDialog CurUnoDialog;
protected String sIncSuffix;
@@ -628,6 +628,11 @@ public class FieldSelection
return xFieldsListBox;
}
+ public XListBox getSelectedFieldsListBox()
+ {
+ return xSelectedFieldsListBox;
+ }
+
public void setModified(boolean _bModified)
{
bisModified = _bModified;
commit 96427ee2e19479fb4a88e08ad176361aaae1a5a6
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Sep 24 08:40:34 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Sep 24 18:08:25 2024 +0200
cid#1607639 PA: Public Attribute
Change-Id: I58d91c2d89b175dc8b8c062e1e291fe9c5192017
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173840
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/db/DBMetaData.java
b/wizards/com/sun/star/wizards/db/DBMetaData.java
index d319af18285a..287d92cd4863 100644
--- a/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -132,7 +132,7 @@ public class DBMetaData
private boolean bPasswordIsRequired;
private static final int NOLIMIT = 9999999;
private static final int INVALID = 9999999;
- public TypeInspector oTypeInspector;
+ protected TypeInspector oTypeInspector;
private NumberFormatter oNumberFormatter = null;
private long lDateCorrection = INVALID;
private boolean bdisposeConnection = false;
diff --git a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
index 633eb906e841..e1280768c9a2 100644
--- a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
+++ b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
@@ -59,7 +59,7 @@ public class PrimaryKeyHandler implements
XFieldSelectionListener
{
this.CurUnoDialog = _CurUnoDialog;
curTableDescriptor = _curTableDescriptor;
- bAutoPrimaryKeysupportsAutoIncrementation =
curTableDescriptor.oTypeInspector.isAutoIncrementationSupported();
+ bAutoPrimaryKeysupportsAutoIncrementation =
curTableDescriptor.getDBDataTypeInspector().isAutoIncrementationSupported();
short curtabindex = (short) ((TableWizard.SOPRIMARYKEYPAGE * 100) -
20);
Integer IPRIMEKEYSTEP = Integer.valueOf(TableWizard.SOPRIMARYKEYPAGE);
final String sExplanations =
CurUnoDialog.getResource().getResText("RID_TABLE_26");
