wizards/com/sun/star/wizards/db/CommandMetaData.java | 7 ++++++- wizards/com/sun/star/wizards/ui/CommandFieldSelection.java | 7 ++++--- 2 files changed, 10 insertions(+), 4 deletions(-)
New commits: commit d0f7619735ede9bbed904309c119cccdc5aee040 Author: Caolán McNamara <caolan.mcnam...@collabora.com> AuthorDate: Fri Sep 20 09:35:39 2024 +0100 Commit: Caolán McNamara <caolan.mcnam...@collabora.com> CommitDate: Fri Sep 20 17:06:32 2024 +0200 cid#1606722 PA: Public Attribute Change-Id: Ideb3c4523dc6210f56c978fdab52690a54b88d1d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173723 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 64ab269eda90..60d555d94066 100644 --- a/wizards/com/sun/star/wizards/db/CommandMetaData.java +++ b/wizards/com/sun/star/wizards/db/CommandMetaData.java @@ -35,7 +35,7 @@ import java.util.Map; public class CommandMetaData extends DBMetaData { protected Map<String, String> FieldTitleSet = new HashMap<String, String>(); - public String[] m_aAllFieldNames = new String[] + protected String[] m_aAllFieldNames = new String[] { }; public FieldColumn[] FieldColumns = new FieldColumn[] @@ -110,6 +110,11 @@ public class CommandMetaData extends DBMetaData return FieldTitleSet; } + public String[] getAllFieldNames() + { + return m_aAllFieldNames; + } + public XPropertySet getColumnObjectByFieldName(String _FieldName, boolean _bgetByDisplayName) { try diff --git a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java index 6499fdbd79a8..580ea02b3d2a 100644 --- a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java @@ -223,11 +223,12 @@ public class CommandFieldSelection extends FieldSelection implements Comparator< if (binitialize) { CurDBMetaData.setCommandName(curCommandName); - if (CurDBMetaData.m_aAllFieldNames != null) + String[] allFieldNames = CurDBMetaData.getAllFieldNames(); + if (allFieldNames != null) { - if (CurDBMetaData.m_aAllFieldNames.length > 0) + if (allFieldNames.length > 0) { - initialize(CurDBMetaData.m_aAllFieldNames, AppendMode, CurDBMetaData.getMaxColumnsInSelect()); + initialize(allFieldNames, AppendMode, CurDBMetaData.getMaxColumnsInSelect()); return; } }