[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - fpicker/source

[Regina Henschel]

 fpicker/source/win32/filepicker/VistaFilePicker.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a023cd66e74a96aec52d891508cd757292513401
Author: Regina Henschel <rb.henschel at t-online.de>
Date:   Sat Aug 29 18:05:33 2015 +0200

    tdf#93634 repair getDisplayDirectory for Windows filepicker
    
    Change wrong PROP_FILENAME to correct PROP_DIRECTORY
    
    Change-Id: Iab2e16c486f487699e1574ed508539d95884bf9b
    Reviewed-on: https://gerrit.libreoffice.org/18127
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 8775593bcc543b3d7021e20736f42fa13035870d)
    Reviewed-on: https://gerrit.libreoffice.org/18373

diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index 4774857..4b2de9d 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -246,7 +246,7 @@ OUString SAL_CALL VistaFilePicker::getDisplayDirectory()
     RequestRef rRequest(new Request());
     rRequest->setRequest (VistaFilePickerImpl::E_GET_DIRECTORY);
     m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::BLOCKED);
-    const OUString sDirectory = rRequest->getArgumentOrDefault(PROP_FILENAME, OUString());
+    const OUString sDirectory = rRequest->getArgumentOrDefault(PROP_DIRECTORY, OUString());
 
     return sDirectory;
 }