wizards/com/sun/star/wizards/db/QueryMetaData.java | 2 +-
wizards/com/sun/star/wizards/db/RecordParser.java | 12 +++++++++++-
wizards/com/sun/star/wizards/db/SQLQueryComposer.java | 4 ++--
wizards/com/sun/star/wizards/query/QueryWizard.java | 6 +++---
wizards/com/sun/star/wizards/report/ReportTextDocument.java | 2 +-
wizards/com/sun/star/wizards/ui/UnoDialog.java | 2 +-
6 files changed, 19 insertions(+), 9 deletions(-)
New commits:
commit d26313ea1931be1a9224ede0f599260177ca6ad6
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Sep 25 09:05:08 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Sep 25 20:32:58 2024 +0200
cid#1607206 PA: Public Attribute
Change-Id: If140f3256a7e1afaae723147cb4870fa01b4e52e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173946
Tested-by: Jenkins
Reviewed-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 6f3f0cd02f4d..6e89d6559c50 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -41,7 +41,7 @@ public class UnoDialog
private XNameAccess m_xDlgNameAccess;
public XControl xControl;
protected XDialog xDialog;
- public XReschedule xReschedule;
+ protected XReschedule xReschedule;
protected XWindow xWindow;
public XComponent xComponent;
public XInterface xDialogModel;
commit ca4f427d021b67dfc855dcb10c1e978b278c5bd5
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Sep 25 09:04:08 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Sep 25 20:32:51 2024 +0200
cid#1608290 PA: Public Attribute
Change-Id: I46bd84741d3958cb807df4f3080426fc2afdd6fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173945
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
diff --git a/wizards/com/sun/star/wizards/db/QueryMetaData.java
b/wizards/com/sun/star/wizards/db/QueryMetaData.java
index abbc6036754c..342b0a1aa02b 100644
--- a/wizards/com/sun/star/wizards/db/QueryMetaData.java
+++ b/wizards/com/sun/star/wizards/db/QueryMetaData.java
@@ -31,7 +31,7 @@ public class QueryMetaData extends CommandMetaData
// Vector CommandNamesV;
private PropertyValue[][] m_aFilterConditions; /* = new PropertyValue[][]
{}; */
- public PropertyValue[][] GroupByFilterConditions = new PropertyValue[][]
+ private PropertyValue[][] GroupByFilterConditions = new PropertyValue[][]
{
};
public int Type = QueryType.SODETAILQUERY;
diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index b8979b31ee8b..c0d60e9b362c 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -296,9 +296,9 @@ public class SQLQueryComposer
if (_bincludeGrouping)
{
appendGroupByColumns(_baddAliasFieldNames);
- if (CurDBMetaData.GroupByFilterConditions.length > 0)
+ if (CurDBMetaData.getGroupByFilterConditions().length > 0)
{
-
m_queryComposer.setStructuredHavingClause(CurDBMetaData.GroupByFilterConditions);
+
m_queryComposer.setStructuredHavingClause(CurDBMetaData.getGroupByFilterConditions());
}
}
if (prependSortingCriteria)
diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java
b/wizards/com/sun/star/wizards/query/QueryWizard.java
index 03f033d0b451..684c21cfb59f 100644
--- a/wizards/com/sun/star/wizards/query/QueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/QueryWizard.java
@@ -164,7 +164,7 @@ public class QueryWizard extends DatabaseObjectWizard
bEnabled = false;
if (_bEnabled)
{
- bEnabled =
(m_DBMetaData.GroupByFilterConditions.length > 0);
+ bEnabled =
(m_DBMetaData.getGroupByFilterConditions().length > 0);
}
break;
@@ -281,7 +281,7 @@ public class QueryWizard extends DatabaseObjectWizard
{
m_DBMetaData.setGroupFieldNames(m_groupFieldSelection.getSelectedFieldNames());
m_DBMetaData.setGroupFieldNames(JavaTools.removeOutdatedFields(m_DBMetaData.getGroupFieldNames(),
m_DBMetaData.getNonAggregateFieldNames()));
- m_DBMetaData.GroupByFilterConditions =
JavaTools.removeOutdatedFields(m_DBMetaData.GroupByFilterConditions,
m_DBMetaData.getGroupFieldNames());
+
m_DBMetaData.setGroupByFilterConditions(JavaTools.removeOutdatedFields(m_DBMetaData.getGroupByFilterConditions(),
m_DBMetaData.getGroupFieldNames()));
}
}
switch (nNewStep)
@@ -300,7 +300,7 @@ public class QueryWizard extends DatabaseObjectWizard
case SOGROUPSELECTION_PAGE:
break;
case SOGROUPFILTER_PAGE:
-
m_groupFilterComponent.initialize(m_DBMetaData.GroupByFilterConditions,
m_DBMetaData.getGroupFieldNames());
+
m_groupFilterComponent.initialize(m_DBMetaData.getGroupByFilterConditions(),
m_DBMetaData.getGroupFieldNames());
break;
case SOTITLES_PAGE:
m_titlesComponent.initialize(m_DBMetaData.getDisplayFieldNames(),
m_DBMetaData.getFieldTitleSet());
commit 48b2bfdb2131ef4873210a01b9db513cb8046606
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Sep 25 09:02:15 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Sep 25 20:32:44 2024 +0200
cid#1608090 PA: Public Attribute
Change-Id: I9bf9de822851bbf4f28614ae686e79a9c7438aac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173944
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/RecordParser.java
b/wizards/com/sun/star/wizards/db/RecordParser.java
index 53c37032200e..ed192c1a7f65 100644
--- a/wizards/com/sun/star/wizards/db/RecordParser.java
+++ b/wizards/com/sun/star/wizards/db/RecordParser.java
@@ -45,7 +45,7 @@ public class RecordParser extends QueryMetaData
private XCompletedExecution xExecute;
private XComponent xRowSetComponent;
private XInteractionHandler xInteraction;
- public FieldColumn[] GroupFieldColumns;
+ private FieldColumn[] GroupFieldColumns;
private FieldColumn[] RecordFieldColumns;
/** Creates a new instance of RecordParser */
@@ -65,6 +65,16 @@ public class RecordParser extends QueryMetaData
RecordFieldColumns = recordFieldColumns;
}
+ public FieldColumn[] getGroupFieldColumns()
+ {
+ return GroupFieldColumns;
+ }
+
+ public void setGroupFieldColumns(FieldColumn[] groupFieldColumns)
+ {
+ GroupFieldColumns = groupFieldColumns;
+ }
+
private void getInterfaces()
{
try
diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java
b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
index 62f7391eec8b..ac8d07000ad5 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
@@ -462,7 +462,7 @@ class ReportTextDocument extends
com.sun.star.wizards.text.TextDocument implemen
{
DelFieldName
}));
- CurDBMetaData.GroupFieldColumns =
removeFieldColumnByFieldName(DelFieldName, CurDBMetaData.GroupFieldColumns);
+
CurDBMetaData.setGroupFieldColumns(removeFieldColumnByFieldName(DelFieldName,
CurDBMetaData.getGroupFieldColumns()));
}
else
{
