[Libreoffice-commits] core.git: qadevOOo/objdsc qadevOOo/tests sdext/source

[Julien Nabet]

 qadevOOo/objdsc/fps/com.sun.star.comp.ui.dialogs.FilePicker.csv |    1 +
 qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java            |    6 +++---
 sdext/source/minimizer/fileopendialog.cxx                       |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 3ad8f409d7658d94871aff2e709f013e8c869d98
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Oct 4 16:14:31 2015 +0200

    Prefer getSelectedFiles to getFiles (sdext+qadevOOo)
    
    Change-Id: I4827e47b7d67b0112c0f9023c0db4ce8975f06e1
    Reviewed-on: https://gerrit.libreoffice.org/19126
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/qadevOOo/objdsc/fps/com.sun.star.comp.ui.dialogs.FilePicker.csv b/qadevOOo/objdsc/fps/com.sun.star.comp.ui.dialogs.FilePicker.csv
index 40eec70..dae1067 100644
--- a/qadevOOo/objdsc/fps/com.sun.star.comp.ui.dialogs.FilePicker.csv
+++ b/qadevOOo/objdsc/fps/com.sun.star.comp.ui.dialogs.FilePicker.csv
@@ -3,6 +3,7 @@
 "FilePicker";"com::sun::star::ui::dialogs::XFilePicker";"setDisplayDirectory()"
 "FilePicker";"com::sun::star::ui::dialogs::XFilePicker";"getDisplayDirectory()"
 "FilePicker";"com::sun::star::ui::dialogs::XFilePicker";"getFiles()"
+"FilePicker";"com::sun::star::ui::dialogs::XFilePicker2";"getSelectedFiles()"
 "FilePicker";"com::sun::star::ui::dialogs::XFilePickerControlAccess#optional";"setValue()"
 "FilePicker";"com::sun::star::ui::dialogs::XFilePickerControlAccess#optional";"getValue()"
 "FilePicker";"com::sun::star::ui::dialogs::XFilePickerControlAccess#optional";"setLabel()"
diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java
index afc5ad8..3a2a71e 100644
--- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java
+++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java
@@ -20,7 +20,7 @@ package ifc.ui.dialogs;
 
 import lib.MultiMethodTest;
 
-import com.sun.star.ui.dialogs.XFilePicker;
+import com.sun.star.ui.dialogs.XFilePicker2;
 
 /**
 * Testing <code>com.sun.star.ui.XFilePicker</code>
@@ -41,7 +41,7 @@ import com.sun.star.ui.dialogs.XFilePicker;
 */
 public class _XFilePicker extends MultiMethodTest {
 
-    public XFilePicker oObj = null;
+    public XFilePicker2 oObj = null;
     private String dir = null ;
     private static final String fname = "space-metal.jpg" ;
 
@@ -133,7 +133,7 @@ public class _XFilePicker extends MultiMethodTest {
         requiredMethod("setDisplayDirectory()");
         requiredMethod("setDefaultName()");
 
-        String[] files = oObj.getFiles();
+        String[] files = oObj.getSelectedFiles();
 
         if (files.length > 0) {
             log.println("Path get : '" + files[0] + "'") ;
diff --git a/sdext/source/minimizer/fileopendialog.cxx b/sdext/source/minimizer/fileopendialog.cxx
index ad2e890..c327ea5 100644
--- a/sdext/source/minimizer/fileopendialog.cxx
+++ b/sdext/source/minimizer/fileopendialog.cxx
@@ -165,7 +165,7 @@ void FileOpenDialog::setDefaultName( const OUString& rDefaultName )
 }
 OUString FileOpenDialog::getURL() const
 {
-    Sequence< OUString > aFileSeq( mxFilePicker->getFiles() );
+    Sequence< OUString > aFileSeq( mxFilePicker->getSelectedFiles() );
     return aFileSeq.getLength() ? aFileSeq[ 0 ] : OUString();
 };
 OUString FileOpenDialog::getFilterName() const