Kaydet (Commit) c444eb79 authored tarafından Ilhan Yesil's avatar Ilhan Yesil Kaydeden (comit) Thorsten Behrens

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

Added checks for filter title, so filter titles are Windows
conform.

Change-Id: I42485c465ea58540a99b8300c5205b902cb86a92
Reviewed-on: https://gerrit.libreoffice.org/63573
Tested-by: Jenkins
Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
üst 5e8bdd92
...@@ -119,6 +119,13 @@ void SAL_CALL VistaFilePicker::appendFilter(const OUString& sTitle , ...@@ -119,6 +119,13 @@ 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("(.");
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); rRequest->setArgument(PROP_FILTER_VALUE, sFilter);
...@@ -129,6 +136,13 @@ void SAL_CALL VistaFilePicker::setCurrentFilter(const OUString& sTitle) ...@@ -129,6 +136,13 @@ 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("(.");
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); m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);
...@@ -142,6 +156,7 @@ OUString SAL_CALL VistaFilePicker::getCurrentFilter() ...@@ -142,6 +156,7 @@ 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