[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - fpicker/source

[Jan-Marek Glogowski]

 fpicker/source/win32/filepicker/asyncrequests.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0898760c20c44e18278c5cb7513d11d041820d42
Author: Jan-Marek Glogowski 
Date:   Mon Mar 5 20:43:53 2018 +0100

tdf#116147 guard triggerRequestThreadAware

It didn't help putting a SolarMutexGuard into
VCLXButton::ProcessWindowEvent, which was my first suspect in my
own backtrace, as VCLXWindowImpl::OnProcessCallbacks releases it
to process the callbacks.

Since the gtk backend also guards all calls into the file picker
code, I think it's save to do the same for the Windows picker.

I have no idea where it is actually released again...

Change-Id: I3ab3b47904dc3d0033739a82f7afd91e6e80403d
Reviewed-on: https://gerrit.libreoffice.org/50783
Tested-by: Jenkins 
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 3e38b81a65ced47595e9760bdc622d9434b72cc0)
Reviewed-on: https://gerrit.libreoffice.org/50796
Reviewed-by: Michael Stahl 

diff --git a/fpicker/source/win32/filepicker/asyncrequests.cxx 
b/fpicker/source/win32/filepicker/asyncrequests.cxx
index e3e97a0e090b..766a2309d991 100644
--- a/fpicker/source/win32/filepicker/asyncrequests.cxx
+++ b/fpicker/source/win32/filepicker/asyncrequests.cxx
@@ -138,6 +138,7 @@ void AsyncRequests::triggerRequestThreadAware(const 
RequestRef& rRequest,
 {
 oslThreadIdentifier nOurThreadId= getIdentifier();
 oslThreadIdentifier nCallerThreadId = 
::osl::Thread::getCurrentIdentifier();
+SolarMutexGuard aGuard;
 if (nOurThreadId == nCallerThreadId)
 triggerRequestDirectly(rRequest);
 else if (nWait == BLOCKED)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - fpicker/source

[Andras Timar]

 fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx |   22 
 1 file changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 40b17fe38fc3c9a4d8ac9830ef2f59e930aac701
Author: Andras Timar 
Date:   Thu Nov 30 14:52:14 2017 +0100

tdf#89713 localize Windows file picker extensions

Change-Id: Ic56df1aeaeee1f027e8b11e8109dd1a3b3708697
Reviewed-on: https://gerrit.libreoffice.org/45586
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 
(cherry picked from commit c1fbc21a45859d3e8a082cf410898ccfcc124425)
Reviewed-on: https://gerrit.libreoffice.org/45635
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx 
b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 430ac9d208b1..2b0fffe337d7 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -27,6 +27,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -549,7 +551,7 @@ void 
VistaFilePickerImpl::impl_sta_enableFeatures(::sal_Int32 nFeatures, ::sal_I
 
 if ((nFeatures & FEATURE_VERSION) == FEATURE_VERSION)
 {
-iCustom->StartVisualGroup (GROUP_VERSION, L"Version");
+iCustom->StartVisualGroup (GROUP_VERSION, 
o3tl::toW(FpsResId(STR_SVT_FILEPICKER_VERSION).replaceFirst("~","").getStr()));
 iCustom->AddComboBox  
(css::ui::dialogs::ExtendedFilePickerElementIds::LISTBOX_VERSION);
 iCustom->EndVisualGroup   ();
 iCustom->MakeProminent(GROUP_VERSION);
@@ -557,7 +559,7 @@ void 
VistaFilePickerImpl::impl_sta_enableFeatures(::sal_Int32 nFeatures, ::sal_I
 
 if ((nFeatures & FEATURE_TEMPLATE) == FEATURE_TEMPLATE)
 {
-iCustom->StartVisualGroup (GROUP_TEMPLATE, L"Template");
+iCustom->StartVisualGroup (GROUP_TEMPLATE, 
o3tl::toW(FpsResId(STR_SVT_FILEPICKER_TEMPLATES).replaceFirst("~","").getStr()));
 iCustom->AddComboBox  
(css::ui::dialogs::ExtendedFilePickerElementIds::LISTBOX_TEMPLATE);
 iCustom->EndVisualGroup   ();
 iCustom->MakeProminent(GROUP_TEMPLATE);
@@ -565,7 +567,7 @@ void 
VistaFilePickerImpl::impl_sta_enableFeatures(::sal_Int32 nFeatures, ::sal_I
 
 if ((nFeatures & FEATURE_IMAGETEMPLATE) == FEATURE_IMAGETEMPLATE)
 {
-iCustom->StartVisualGroup (GROUP_IMAGETEMPLATE, L"Style");
+iCustom->StartVisualGroup (GROUP_IMAGETEMPLATE, 
o3tl::toW(FpsResId(STR_SVT_FILEPICKER_IMAGE_TEMPLATE).replaceFirst("~","").getStr()));
 iCustom->AddComboBox  
(css::ui::dialogs::ExtendedFilePickerElementIds::LISTBOX_IMAGE_TEMPLATE);
 iCustom->EndVisualGroup   ();
 iCustom->MakeProminent(GROUP_IMAGETEMPLATE);
@@ -577,42 +579,42 @@ void 
VistaFilePickerImpl::impl_sta_enableFeatures(::sal_Int32 nFeatures, ::sal_I
 if ((nFeatures & FEATURE_AUTOEXTENSION) == FEATURE_AUTOEXTENSION)
 {
 nControlId = 
css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION;
-iCustom->AddCheckButton (nControlId, L"Auto Extension", true);
+iCustom->AddCheckButton (nControlId, 
o3tl::toW(FpsResId(STR_SVT_FILEPICKER_AUTO_EXTENSION).replaceFirst("~","").getStr()),
 true);
 setLabelToControl(iCustom, nControlId);
 }
 
 if ((nFeatures & FEATURE_PASSWORD) == FEATURE_PASSWORD)
 {
 nControlId = 
css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_PASSWORD;
-iCustom->AddCheckButton (nControlId, L"Password", false);
+iCustom->AddCheckButton (nControlId, 
o3tl::toW(FpsResId(STR_SVT_FILEPICKER_PASSWORD).replaceFirst("~","").getStr()), 
false);
 setLabelToControl(iCustom, nControlId);
 }
 
 if ((nFeatures & FEATURE_READONLY) == FEATURE_READONLY)
 {
 nControlId = 
css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_READONLY;
-iCustom->AddCheckButton (nControlId, L"Readonly", false);
+iCustom->AddCheckButton (nControlId, 
o3tl::toW(FpsResId(STR_SVT_FILEPICKER_READONLY).replaceFirst("~","").getStr()), 
false);
 setLabelToControl(iCustom, nControlId);
 }
 
 if ((nFeatures & FEATURE_FILTEROPTIONS) == FEATURE_FILTEROPTIONS)
 {
 nControlId = 
css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_FILTEROPTIONS;
-iCustom->AddCheckButton (nControlId, L"Filter Options", false);
+iCustom->AddCheckButton (nControlId, 
o3tl::toW(FpsResId(STR_SVT_FILEPICKER_FILTER_OPTIONS).replaceFirst("~","").getStr()),
 false);
 setLabelToControl(iCustom, nControlId);
 }
 
 if ((nFeatures & FEATURE_LINK) == FEATURE_LINK)
 {
 nControlId = 
css::ui::dialogs::ExtendedFilePickerElementIds::CHECKBOX_LINK;
-iCustom->AddCheckButton (nControlId, L"Link", false);
+