wizards/com/sun/star/wizards/db/DBMetaData.java | 2 +-
wizards/com/sun/star/wizards/db/SQLQueryComposer.java | 7
++++++-
wizards/com/sun/star/wizards/report/ReportTextImplementation.java | 2 +-
wizards/com/sun/star/wizards/report/ReportWizard.java | 2 +-
4 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 7da920fa17b4006b2d26cd3963d5cedf0a375a41
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Sep 17 17:39:44 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Wed Sep 18 14:34:44 2024 +0200
cid#1608459 PA: Public Attribute
Change-Id: I6dccead2abe3062558a1b87c56c6efc14cf0fb19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173589
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java
b/wizards/com/sun/star/wizards/db/DBMetaData.java
index 1a720b0ac3a5..6367c3800536 100644
--- a/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -750,7 +750,7 @@ public class DBMetaData
Object oQuery = xSSFQueryDefs.createInstance();
//"com.sun.star.sdb.QueryDefinition"
XPropertySet xPSet = UnoRuntime.queryInterface(
XPropertySet.class, oQuery );
- String s = _oSQLQueryComposer.m_xQueryAnalyzer.getQuery();
+ String s = _oSQLQueryComposer.getQuery();
xPSet.setPropertyValue(PropertyNames.COMMAND, s);
XNameContainer xNameCont = UnoRuntime.queryInterface(
XNameContainer.class, xQueryDefs );
diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index 17bc953affa9..9ab58f2861dd 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -39,7 +39,7 @@ public class SQLQueryComposer
{
private QueryMetaData CurDBMetaData;
- public XSingleSelectQueryAnalyzer m_xQueryAnalyzer;
+ private XSingleSelectQueryAnalyzer m_xQueryAnalyzer;
private ArrayList<CommandName> composedCommandNames = new
ArrayList<CommandName>(1);
private XSingleSelectQueryComposer m_queryComposer;
private XMultiServiceFactory xMSF;
@@ -225,6 +225,11 @@ public class SQLQueryComposer
return _filterconditions;
}
+ public void setQuery(String Query) throws SQLException
+ {
+ m_xQueryAnalyzer.setQuery(Query);
+ }
+
public String getQuery()
{
return m_xQueryAnalyzer.getQuery();
diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 590d54473861..6d81e99fc87b 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -277,7 +277,7 @@ public class ReportTextImplementation extends
ReportImplementationHelper impleme
{
return bexecute;
}
-
getRecordParser().getSQLQueryComposer().m_xQueryAnalyzer.setQuery(getRecordParser().Command);
+
getRecordParser().getSQLQueryComposer().setQuery(getRecordParser().Command);
getRecordParser().getSQLQueryComposer().prependSortingCriteria();
getRecordParser().Command =
getRecordParser().getSQLQueryComposer().getQuery();
diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java
b/wizards/com/sun/star/wizards/report/ReportWizard.java
index 1b3eff175dba..8ad2c611292d 100644
--- a/wizards/com/sun/star/wizards/report/ReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/ReportWizard.java
@@ -275,7 +275,7 @@ public class ReportWizard extends DatabaseObjectWizard
implements XTextListener
{
if (m_reportDocument instanceof ReportTextImplementation)
{
- sqlQueryComposer.m_xQueryAnalyzer.setQuery(sCommand);
+ sqlQueryComposer.setQuery(sCommand);
sqlQueryComposer.prependSortingCriteria();
m_reportDocument.setCommandType(CommandType.COMMAND);
m_reportDocument.setCommand(sqlQueryComposer.getQuery());
