[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - external_deps.lst fpicker/source

[Pedro Giffuni]

 external_deps.lst                                   |    2 +-
 fpicker/source/win32/filepicker/VistaFilePicker.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 08f842c93a2b61f3d92dd8dd633c45434c0b4bfa
Author: Pedro Giffuni <pfg at apache.org>
Date:   Mon Oct 17 20:04:22 2016 +0000

    More google code fallout.
    
    MDDS has moved to gitlab, which doesn't help when looking for the old
    version we need so use the Google archive instead.

diff --git a/external_deps.lst b/external_deps.lst
index 3eba2f0..931a6a14 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -57,7 +57,7 @@ if ( true )
 if (SYSTEM_MDDS != YES)
     MD5 = 0dd138efff4412c707e239290fb82d4f
     name = mdds_0.3.1.tar.bz2
-    URL1 = http://multidimalgorithm.googlecode.com/files/mdds_0.3.1.tar.bz2
+    URL1 = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/multidimalgorithm/mdds_0.3.1.tar.bz2
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
  
 if (SYSTEM_LIBTEXTCAT != YES)
commit 169403abedce4eb279d4db2baca71a00c63224ab
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Mon Oct 17 19:16:46 2016 +0000

    Read PROP_DIRECTORY instead of PROP_FILENAME in the Vista file picker's
    
    getDisplayDirectory() method.
    
    Patch by: Regina Henschel
    Review by: Damjan Jovanovic
    (see https://bz.apache.org/ooo/show_bug.cgi?id=96720#c12)

diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 486cb7b..77f3116 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -315,7 +315,7 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const ::rtl::OUString& sDirec
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_GET_DIRECTORY);
     m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);
-    const ::rtl::OUString sDirectory = rRequest->getArgumentOrDefault(PROP_FILENAME, ::rtl::OUString());
+    const ::rtl::OUString sDirectory = rRequest->getArgumentOrDefault(PROP_DIRECTORY, ::rtl::OUString());
 
     return sDirectory;
 }