wizards/com/sun/star/wizards/query/Finalizer.java | 2 +-
wizards/com/sun/star/wizards/report/ReportTextImplementation.java | 2 +-
wizards/com/sun/star/wizards/text/TextDocument.java | 7
++++++-
wizards/com/sun/star/wizards/ui/UnoDialog.java | 7
++++++-
4 files changed, 14 insertions(+), 4 deletions(-)
New commits:
commit efa381c59bf3539b5dba2249e692539056a4162e
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Sep 24 08:59:24 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Sep 24 18:09:38 2024 +0200
cid#1606653 PA: Public Attribute
Change-Id: Iab539e41702f0decc071be13ef02c0fb14b11e63
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173848
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/wizards/com/sun/star/wizards/query/Finalizer.java
b/wizards/com/sun/star/wizards/query/Finalizer.java
index a7c82fa55235..0f01ea5070fd 100644
--- a/wizards/com/sun/star/wizards/query/Finalizer.java
+++ b/wizards/com/sun/star/wizards/query/Finalizer.java
@@ -172,7 +172,7 @@ public class Finalizer
public String finish()
{
String queryName = getTitle();
- if ( CurDBMetaData.getSQLQueryComposer().setQueryCommand(
m_queryWizard.xWindow, true, true )
+ if ( CurDBMetaData.getSQLQueryComposer().setQueryCommand(
m_queryWizard.getWindow(), true, true )
&& CurDBMetaData.createQuery(
CurDBMetaData.getSQLQueryComposer(), queryName )
)
return queryName;
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java
b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index 837b050954e1..6f3f0cd02f4d 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -42,7 +42,7 @@ public class UnoDialog
public XControl xControl;
protected XDialog xDialog;
public XReschedule xReschedule;
- public XWindow xWindow;
+ protected XWindow xWindow;
public XComponent xComponent;
public XInterface xDialogModel;
private XInterface xUnoDialog;
@@ -151,6 +151,11 @@ public class UnoDialog
return m_oResource;
}
+ public XWindow getWindow()
+ {
+ return xWindow;
+ }
+
public void setControlProperties(String ControlName, String[]
PropertyNames, Object[] PropertyValues)
{
try
commit a9889e1aa88dbbd1fd5312d57b73eb4f2957b9c9
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Sep 24 08:57:59 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Sep 24 18:09:31 2024 +0200
cid#1606721 PA: Public Attribute
Change-Id: I62fbc3ee8fc05facb4c1542706c46266005c363f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173847
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 1584a2e54ecf..9f8e77cd05ce 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -454,7 +454,7 @@ public class ReportTextImplementation extends
ReportImplementationHelper impleme
private XMultiServiceFactory getDocumentServiceFactory()
{
- return m_aDoc.xMSFDoc;
+ return m_aDoc.getMSFDoc();
}
public void store(String _sName, int _nOpenMode) throws
com.sun.star.uno.Exception
diff --git a/wizards/com/sun/star/wizards/text/TextDocument.java
b/wizards/com/sun/star/wizards/text/TextDocument.java
index bc050b07d1b1..79b3262aaeb7 100644
--- a/wizards/com/sun/star/wizards/text/TextDocument.java
+++ b/wizards/com/sun/star/wizards/text/TextDocument.java
@@ -53,7 +53,7 @@ public class TextDocument
protected com.sun.star.task.XStatusIndicator xProgressBar;
public com.sun.star.frame.XFrame xFrame;
public XText xText;
- public XMultiServiceFactory xMSFDoc;
+ protected XMultiServiceFactory xMSFDoc;
public XMultiServiceFactory xMSF;
public com.sun.star.awt.XWindowPeer xWindowPeer;
@@ -237,6 +237,11 @@ public class TextDocument
return xProgressBar;
}
+ public XMultiServiceFactory getMSFDoc()
+ {
+ return xMSFDoc;
+ }
+
private Size getPageSize()
{
try
