[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - 2 commits - fpicker/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Dec 10 10:54:20 UTC 2018
fpicker/source/win32/VistaFilePicker.cxx | 19 +------------
fpicker/source/win32/VistaFilePickerImpl.cxx | 39 +++------------------------
fpicker/source/win32/VistaFilePickerImpl.hxx | 2 -
3 files changed, 7 insertions(+), 53 deletions(-)
New commits:
commit b836f8241d6eaf0a4969341084fa8bfe3bdf0586
Author: Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Thu Dec 6 00:57:38 2018 +0300
Commit: Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Mon Dec 10 11:54:06 2018 +0100
Revert "tdf#119747 FileSaveDialog: Windows dialog shows only one extension."
This reverts commit 1b50fa88b148739a7b192ba70f08af2c6e326fd2.
Change-Id: Ide94c1be6a265cee2e70c319578d816efa1d2eb9
Reviewed-on: https://gerrit.libreoffice.org/64655
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
Tested-by: Mike Kaganski <mike.kaganski at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/64839
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
diff --git a/fpicker/source/win32/VistaFilePicker.cxx b/fpicker/source/win32/VistaFilePicker.cxx
index e1eb66a9ce83..0737100d07e6 100644
--- a/fpicker/source/win32/VistaFilePicker.cxx
+++ b/fpicker/source/win32/VistaFilePicker.cxx
@@ -119,7 +119,7 @@ void SAL_CALL VistaFilePicker::appendFilter(const OUString& sTitle ,
{
RequestRef rRequest(new Request());
rRequest->setRequest (VistaFilePickerImpl::E_APPEND_FILTER);
- 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);
diff --git a/fpicker/source/win32/VistaFilePickerImpl.cxx b/fpicker/source/win32/VistaFilePickerImpl.cxx
index aa33dcdacbdb..ff0cf2c27956 100644
--- a/fpicker/source/win32/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/VistaFilePickerImpl.cxx
@@ -360,22 +360,11 @@ void VistaFilePickerImpl::impl_sta_appendFilter(const RequestRef& rRequest)
{
const OUString sTitle = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, OUString());
const OUString sFilter = rRequest->getArgumentOrDefault(PROP_FILTER_VALUE, OUString());
+
// SYNCHRONIZED->
::osl::ResettableMutexGuard aLock(m_aMutex);
- const sal_Int32 idx = sTitle.indexOf("(.");
- if (idx > 0)
- {
- const OUString sTitle_ = sTitle.copy(0, idx);
- m_mapRealFilter[sTitle_] = std::make_pair(sTitle, sFilter);
- m_lFilters.addFilter(sTitle_, sFilter);
- }
- else
- {
- m_mapRealFilter[sTitle] = std::make_pair(sTitle, sFilter);
- m_lFilters.addFilter(sTitle, sFilter);
- }
-
+ m_lFilters.addFilter(sTitle, sFilter);
}
@@ -395,20 +384,7 @@ void VistaFilePickerImpl::impl_sta_appendFilterGroup(const RequestRef& rRequest)
for (i=0; i<c; ++i)
{
const css::beans::StringPair& rFilter = aFilterGroup[i];
- const OUString sTitle = rFilter.First;
- const OUString sFilter = rFilter.Second;
- const sal_Int32 idx = sTitle.indexOf("(.");
- if (idx > 0)
- {
- const OUString sTitle_ = sTitle.copy(0, idx);
- m_mapRealFilter[sTitle_] = std::make_pair(sTitle, sFilter);
- m_lFilters.addFilter(sTitle_, sFilter);
- }
- else
- {
- m_mapRealFilter[sTitle] = std::make_pair(sTitle, sFilter);
- m_lFilters.addFilter(sTitle, sFilter);
- }
+ m_lFilters.addFilter(rFilter.First, rFilter.Second);
}
}
@@ -441,15 +417,10 @@ void VistaFilePickerImpl::impl_sta_getCurrentFilter(const RequestRef& rRequest)
OUString sTitle;
::sal_Int32 nRealIndex = (nIndex-1); // COM dialog base on 1 ... filter container on 0 .-)
if (
- (nRealIndex >= 0) &&
+ (nRealIndex >= 0 ) &&
(m_lFilters.getFilter(nRealIndex, sTitle))
- )
- {
- if (m_mapRealFilter.find(sTitle) != m_mapRealFilter.end())
- sTitle = m_mapRealFilter[sTitle].first;
-
+ )
rRequest->setArgument(PROP_FILTER_TITLE, sTitle);
- }
else if ( nRealIndex == -1 ) // Dialog not visible yet
{
sTitle = m_lFilters.getCurrentFilter();
diff --git a/fpicker/source/win32/VistaFilePickerImpl.hxx b/fpicker/source/win32/VistaFilePickerImpl.hxx
index 460136a73b48..9cce75b5714f 100644
--- a/fpicker/source/win32/VistaFilePickerImpl.hxx
+++ b/fpicker/source/win32/VistaFilePickerImpl.hxx
@@ -37,7 +37,6 @@
#include <osl/thread.hxx>
#include <osl/conditn.hxx>
#include <rtl/ustring.hxx>
-#include <map>
namespace fpicker{
namespace win32{
@@ -306,7 +305,6 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex
/// @todo document me
CFilterContainer m_lFilters;
- std::map<OUString, std::pair<OUString, OUString>> m_mapRealFilter;
/** help us to handle dialog events and provide them to interested office
commit 3b03604d1bb48fc1c1337307d0ba259dca9fbf1e
Author: Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Thu Dec 6 00:56:15 2018 +0300
Commit: Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Mon Dec 10 11:53:59 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.kaganski at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/64838
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
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;
}
More information about the Libreoffice-commits
mailing list