mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cid#1608459 PA: Public Attribute

Browse Source 
Change-Id: I6dccead2abe3062558a1b87c56c6efc14cf0fb19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173589
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Caolán McNamara
2024-09-17 17:39:44 +01:00
parent 25c758df71
commit 7da920fa17
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wizards/com/sun/star/wizards/db/DBMetaData.java
View File

@@ -750,7 +750,7 @@ public class DBMetaData
Object oQuery = xSSFQueryDefs.createInstance(); //"com.sun.star.sdb.QueryDefinition" Object oQuery = xSSFQueryDefs.createInstance(); //"com.sun.star.sdb.QueryDefinition"
XPropertySet xPSet = UnoRuntime.queryInterface( XPropertySet.class, oQuery ); XPropertySet xPSet = UnoRuntime.queryInterface( XPropertySet.class, oQuery );
String s = _oSQLQueryComposer.m_xQueryAnalyzer.getQuery(); String s = _oSQLQueryComposer.getQuery();
xPSet.setPropertyValue(PropertyNames.COMMAND, s); xPSet.setPropertyValue(PropertyNames.COMMAND, s);
XNameContainer xNameCont = UnoRuntime.queryInterface( XNameContainer.class, xQueryDefs ); XNameContainer xNameCont = UnoRuntime.queryInterface( XNameContainer.class, xQueryDefs );

7
wizards/com/sun/star/wizards/db/SQLQueryComposer.java
View File

@@ -39,7 +39,7 @@ public class SQLQueryComposer
{ {
private QueryMetaData CurDBMetaData; private QueryMetaData CurDBMetaData;
public XSingleSelectQueryAnalyzer m_xQueryAnalyzer; private XSingleSelectQueryAnalyzer m_xQueryAnalyzer;
private ArrayList<CommandName> composedCommandNames = new ArrayList<CommandName>(1); private ArrayList<CommandName> composedCommandNames = new ArrayList<CommandName>(1);
private XSingleSelectQueryComposer m_queryComposer; private XSingleSelectQueryComposer m_queryComposer;
private XMultiServiceFactory xMSF; private XMultiServiceFactory xMSF;
@@ -225,6 +225,11 @@ public class SQLQueryComposer
return _filterconditions; return _filterconditions;
} }
public void setQuery(String Query) throws SQLException
{
m_xQueryAnalyzer.setQuery(Query);
}
public String getQuery() public String getQuery()
{ {
return m_xQueryAnalyzer.getQuery(); return m_xQueryAnalyzer.getQuery();

2
wizards/com/sun/star/wizards/report/ReportTextImplementation.java
View File

@@ -277,7 +277,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
{ {
return bexecute; return bexecute;
} }
getRecordParser().getSQLQueryComposer().m_xQueryAnalyzer.setQuery(getRecordParser().Command); getRecordParser().getSQLQueryComposer().setQuery(getRecordParser().Command);
getRecordParser().getSQLQueryComposer().prependSortingCriteria(); getRecordParser().getSQLQueryComposer().prependSortingCriteria();
getRecordParser().Command = getRecordParser().getSQLQueryComposer().getQuery(); getRecordParser().Command = getRecordParser().getSQLQueryComposer().getQuery();

2
wizards/com/sun/star/wizards/report/ReportWizard.java
View File

@@ -275,7 +275,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener
{ {
if (m_reportDocument instanceof ReportTextImplementation) if (m_reportDocument instanceof ReportTextImplementation)
{ {
sqlQueryComposer.m_xQueryAnalyzer.setQuery(sCommand); sqlQueryComposer.setQuery(sCommand);
sqlQueryComposer.prependSortingCriteria(); sqlQueryComposer.prependSortingCriteria();
m_reportDocument.setCommandType(CommandType.COMMAND); m_reportDocument.setCommandType(CommandType.COMMAND);
m_reportDocument.setCommand(sqlQueryComposer.getQuery()); m_reportDocument.setCommand(sqlQueryComposer.getQuery());