commit 3b03604d1bb48fc1c1337307d0ba259dca9fbf1e
author Mike Kaganski <mike.kaganski@collabora.com> Thu Dec 06 00:56:15 2018 +0300
committer Katarina Behrens <Katarina.Behrens@cib.de> Mon Dec 10 11:53:59 2018 +0100
tree b9dbded847c47ed455fea75101daee959186d7ec
parent b27a9058c706d70adddc71544b74b1f9607185bb

Revert "tdf#121497 "Save As": File Format Type unchanged in Windows"

This reverts commit c444eb7934d4a3c190e1d060805d9d175c1a9127.

Change-Id: I19b969572afbd0a017b8086b390611cfc04c7386
Reviewed-on: https://gerrit.libreoffice.org/64654
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/64838
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>

fpicker/source/win32/VistaFilePicker.cxx

diff --git a/fpicker/source/win32/VistaFilePicker.cxx b/fpicker/source/win32/VistaFilePicker.cxx
index 874bed2..e1eb66a 100644
--- a/fpicker/source/win32/VistaFilePicker.cxx
+++ b/fpicker/source/win32/VistaFilePicker.cxx
@@ -119,14 +119,7 @@
{
    RequestRef rRequest(new Request());
    rRequest->setRequest (VistaFilePickerImpl::E_APPEND_FILTER);
    const sal_Int32 idx = sTitle.indexOf("(.");
    if (idx > 0)
    {
        const OUString sTitle_ = sTitle.replaceAt(idx, 2, "(*.");
        rRequest->setArgument(PROP_FILTER_TITLE, sTitle_);
    }
    else
        rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
    rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
    rRequest->setArgument(PROP_FILTER_VALUE, sFilter);

    m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);
@@ -136,14 +129,7 @@
{
    RequestRef rRequest(new Request());
    rRequest->setRequest (VistaFilePickerImpl::E_SET_CURRENT_FILTER);
    const sal_Int32 idx = sTitle.indexOf("(.");
    if (idx > 0)
    {
        const OUString sTitle_ = sTitle.replaceAt(idx, 2, "(*.");
        rRequest->setArgument(PROP_FILTER_TITLE, sTitle_);
    }
    else
        rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
    rRequest->setArgument(PROP_FILTER_TITLE, sTitle);

    m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);
}
@@ -156,7 +142,6 @@
    m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::BLOCKED);

    const  OUString sTitle = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, OUString());

    return sTitle;
}