[Libreoffice-commits] core.git: fpicker/source

[Libreoffice Gerrit user]

 fpicker/source/win32/VistaFilePicker.cxx |   19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

New commits:
commit 1d427cd700704bc80378e250d3350b505e4413bd
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Dec 6 00:56:15 2018 +0300
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Dec 6 13:48:55 2018 +0100

    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.kagan...@collabora.com>

diff --git a/fpicker/source/win32/VistaFilePicker.cxx 
b/fpicker/source/win32/VistaFilePicker.cxx
index 874bed2f5c5f..e1eb66a9ce83 100644
--- a/fpicker/source/win32/VistaFilePicker.cxx
+++ b/fpicker/source/win32/VistaFilePicker.cxx
@@ -119,14 +119,7 @@ void SAL_CALL VistaFilePicker::appendFilter(const 
OUString& sTitle ,
 {
     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 @@ void SAL_CALL VistaFilePicker::setCurrentFilter(const 
OUString& sTitle)
 {
     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 @@ OUString SAL_CALL VistaFilePicker::getCurrentFilter()
     m_aAsyncExecute.triggerRequestThreadAware(rRequest, 
AsyncRequests::BLOCKED);
 
     const  OUString sTitle = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, 
OUString());
-
     return sTitle;
 }
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits