Kaydet (Commit) 3b03604d authored tarafından Mike Kaganski's avatar Mike Kaganski Kaydeden (comit) Katarina Behrens

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

This reverts commit c444eb79.

Change-Id: I19b969572afbd0a017b8086b390611cfc04c7386
Reviewed-on: https://gerrit.libreoffice.org/64654
Tested-by: Jenkins
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/64838Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
üst b27a9058
...@@ -119,14 +119,7 @@ void SAL_CALL VistaFilePicker::appendFilter(const OUString& sTitle , ...@@ -119,14 +119,7 @@ void SAL_CALL VistaFilePicker::appendFilter(const OUString& sTitle ,
{ {
RequestRef rRequest(new Request()); RequestRef rRequest(new Request());
rRequest->setRequest (VistaFilePickerImpl::E_APPEND_FILTER); rRequest->setRequest (VistaFilePickerImpl::E_APPEND_FILTER);
const sal_Int32 idx = sTitle.indexOf("(."); rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
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_VALUE, sFilter); rRequest->setArgument(PROP_FILTER_VALUE, sFilter);
m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED); m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);
...@@ -136,14 +129,7 @@ void SAL_CALL VistaFilePicker::setCurrentFilter(const OUString& sTitle) ...@@ -136,14 +129,7 @@ void SAL_CALL VistaFilePicker::setCurrentFilter(const OUString& sTitle)
{ {
RequestRef rRequest(new Request()); RequestRef rRequest(new Request());
rRequest->setRequest (VistaFilePickerImpl::E_SET_CURRENT_FILTER); rRequest->setRequest (VistaFilePickerImpl::E_SET_CURRENT_FILTER);
const sal_Int32 idx = sTitle.indexOf("(."); rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
if (idx > 0)
{
const OUString sTitle_ = sTitle.replaceAt(idx, 2, "(*.");
rRequest->setArgument(PROP_FILTER_TITLE, sTitle_);
}
else
rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED); m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);
} }
...@@ -156,7 +142,6 @@ OUString SAL_CALL VistaFilePicker::getCurrentFilter() ...@@ -156,7 +142,6 @@ OUString SAL_CALL VistaFilePicker::getCurrentFilter()
m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::BLOCKED); m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::BLOCKED);
const OUString sTitle = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, OUString()); const OUString sTitle = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, OUString());
return sTitle; return sTitle;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment