wizards/com/sun/star/wizards/db/CommandMetaData.java | 3 +-- wizards/com/sun/star/wizards/query/QueryWizard.java | 2 +- wizards/com/sun/star/wizards/report/DBColumn.java | 7 +++++-- wizards/com/sun/star/wizards/report/ReportTextDocument.java | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-)
New commits: commit ad9d635bffc4afa32250583dc28b053aaab91501 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Sep 20 09:32:01 2024 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Sep 20 17:06:25 2024 +0200 cid#1607041 PA: Public Attribute Change-Id: I3e162e3b58f750b92c5939f3866fdcb8a148de99 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173722 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/wizards/com/sun/star/wizards/report/DBColumn.java b/wizards/com/sun/star/wizards/report/DBColumn.java index 22fe7e657e37..40c01e51490b 100644 --- a/wizards/com/sun/star/wizards/report/DBColumn.java +++ b/wizards/com/sun/star/wizards/report/DBColumn.java @@ -57,7 +57,7 @@ public class DBColumn private XTextTable xTextTable; private XTableColumns xTableColumns; private XCellRange xCellRange; - public XNamed xTableName; + private XNamed xTableName; private boolean bIsGroupColumn; private RecordParser CurDBMetaData; private RecordTable CurRecordTable; @@ -233,7 +233,10 @@ public class DBColumn oTextFieldHandler.insertUserField(xTextCursor, CurDBField.getFieldName(), CurDBField.getFieldTitle()); } - + public XNamed getTableName() + { + return xTableName; + } public void formatValueCell() { diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java index a8880d53a015..7fc9b0345957 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java +++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java @@ -315,10 +315,10 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen { String TableName = TBLGROUPSECTION + (TableIndex + 1); // Note: for some reason the table might lose its name and has to be renamed therefore - String OldTableName = CurDBColumn.xTableName.getName(); + String OldTableName = CurDBColumn.getTableName().getName(); if (OldTableName.compareTo(TableName) != 0) { - CurDBColumn.xTableName.setName(TableName); + CurDBColumn.getTableName().setName(TableName); } CurDBColumn.insertColumnData(oTextFieldHandler, this.bIsCurLandscape); CurDBColumn.setCellFont(); commit e65acc30dbaef1f21796eaf4d42e2568bb7b0b15 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Sep 20 09:29:23 2024 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Sep 20 17:06:11 2024 +0200 cid#1607131 PA: Public Attribute Change-Id: Ief73e86c6fa4459e25d98befa0dc383326f22a79 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173721 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/wizards/com/sun/star/wizards/db/CommandMetaData.java b/wizards/com/sun/star/wizards/db/CommandMetaData.java index 08b527f3ee10..64ab269eda90 100644 --- a/wizards/com/sun/star/wizards/db/CommandMetaData.java +++ b/wizards/com/sun/star/wizards/db/CommandMetaData.java @@ -34,8 +34,7 @@ import java.util.Map; public class CommandMetaData extends DBMetaData { - - public Map<String, String> FieldTitleSet = new HashMap<String, String>(); + protected Map<String, String> FieldTitleSet = new HashMap<String, String>(); public String[] m_aAllFieldNames = new String[] { }; diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java index 16a7e4cdef06..d9ef71027117 100644 --- a/wizards/com/sun/star/wizards/query/QueryWizard.java +++ b/wizards/com/sun/star/wizards/query/QueryWizard.java @@ -303,7 +303,7 @@ public class QueryWizard extends DatabaseObjectWizard m_groupFilterComponent.initialize(m_DBMetaData.GroupByFilterConditions, m_DBMetaData.getGroupFieldNames()); break; case SOTITLES_PAGE: - m_titlesComponent.initialize(m_DBMetaData.getDisplayFieldNames(), m_DBMetaData.FieldTitleSet); + m_titlesComponent.initialize(m_DBMetaData.getDisplayFieldNames(), m_DBMetaData.getFieldTitleSet()); break; case SOSUMMARY_PAGE: m_finalizer.initialize();
