summaryrefslogtreecommitdiff
path: root/odk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-11-27 10:39:28 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-11-27 10:39:28 +0100
commitcc360f0a483e7c68ece7a30424f204d660d74b1c (patch)
tree0e81c30bf1805cebdd7d3b8097085bf44f0a8528 /odk
parent41f08d42696fdb1f38baaafdde63088febdfd06d (diff)
fdo#46808: Missing adaptions to XFolderPicker2
c988da288ec473a28f61ebb53aa3ff82bab11ef4 "fdo#46808, Adapt ui::dialogs::FolderPicker UNO service to new style" had left some FolderPicker implementations at XFolderPicker, so creating them caused DeploymentExceptions. Change-Id: I3463161f9bb87a69a2777c331eb5b93d487790b0
Diffstat (limited to 'odk')
-rw-r--r--odk/examples/DevelopersGuide/GUI/SystemDialog.java4
-rw-r--r--odk/examples/java/Inspector/Inspector.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/odk/examples/DevelopersGuide/GUI/SystemDialog.java b/odk/examples/DevelopersGuide/GUI/SystemDialog.java
index 541d5166bfdc..861d075a1df2 100644
--- a/odk/examples/DevelopersGuide/GUI/SystemDialog.java
+++ b/odk/examples/DevelopersGuide/GUI/SystemDialog.java
@@ -39,7 +39,7 @@ import com.sun.star.ui.dialogs.XExecutableDialog;
import com.sun.star.ui.dialogs.XFilePicker;
import com.sun.star.ui.dialogs.XFilePickerControlAccess;
import com.sun.star.ui.dialogs.XFilterManager;
-import com.sun.star.ui.dialogs.XFolderPicker;
+import com.sun.star.ui.dialogs.XFolderPicker2;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XComponentContext;
@@ -157,7 +157,7 @@ public class SystemDialog {
try {
// instantiate the folder picker and retrieve the necessary interfaces...
Object oFolderPicker = m_xMCF.createInstanceWithContext("com.sun.star.ui.dialogs.FolderPicker", m_xContext);
- XFolderPicker xFolderPicker = (XFolderPicker) UnoRuntime.queryInterface(XFolderPicker.class, oFolderPicker);
+ XFolderPicker2 xFolderPicker = UnoRuntime.queryInterface(XFolderPicker2.class, oFolderPicker);
XExecutableDialog xExecutable = (XExecutableDialog) UnoRuntime.queryInterface(XExecutableDialog.class, oFolderPicker);
xComponent = (XComponent) UnoRuntime.queryInterface(XComponent.class, oFolderPicker);
xFolderPicker.setDisplayDirectory(_sDisplayDirectory);
diff --git a/odk/examples/java/Inspector/Inspector.java b/odk/examples/java/Inspector/Inspector.java
index a2f85758c196..a9ceb1c5a3a2 100644
--- a/odk/examples/java/Inspector/Inspector.java
+++ b/odk/examples/java/Inspector/Inspector.java
@@ -50,7 +50,7 @@ import com.sun.star.lib.uno.helper.Factory;
import com.sun.star.lib.uno.helper.WeakBase;
import com.sun.star.registry.XRegistryKey;
import com.sun.star.ui.dialogs.XExecutableDialog;
-import com.sun.star.ui.dialogs.XFolderPicker;
+import com.sun.star.ui.dialogs.XFolderPicker2;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XComponentContext;
import com.sun.star.util.CloseVetoException;
@@ -154,7 +154,7 @@ public class Inspector{
try {
String sInstallationFolder = "";
Object oFolderPicker = m_xComponentContext.getServiceManager().createInstanceWithContext("com.sun.star.ui.dialogs.FolderPicker", m_xComponentContext);
- XFolderPicker xFolderPicker = UnoRuntime.queryInterface(XFolderPicker.class, oFolderPicker);
+ XFolderPicker2 xFolderPicker = UnoRuntime.queryInterface(XFolderPicker2.class, oFolderPicker);
XExecutableDialog xExecutable = UnoRuntime.queryInterface(XExecutableDialog.class, oFolderPicker);
XComponent xComponent = UnoRuntime.queryInterface(XComponent.class, oFolderPicker);
String sPath = getSDKPath();