freebsd-ports/editors/libreoffice/files/patch-vcl_qt5_Qt5Instance.cxx
Dima Panov 1388a45360 editors/libreoffice: update to 7.2.1 release (+)
LibreOffice 7.2.1 is here, with many bugfixes and compatibility improvements.
Learn more about it: https://blog.documentfoundation.org/blog/2021/09/16/libreoffice-7-2-1-community/

* Add OPTION to build GTK4 VCL
* If both GTK3 and KF5 enabled, add GTK3_KDE5 VCL to build
* Force RUN_DEPENDS on JDK if JAVA selected to run extensions
2021-09-17 04:14:10 +10:00

20 lines
888 B
C++

--- vcl/qt5/Qt5Instance.cxx.orig 2021-09-08 17:53:20 UTC
+++ vcl/qt5/Qt5Instance.cxx
@@ -476,7 +476,7 @@ Qt5Instance::createPicker(css::uno::Reference<css::uno
{
SolarMutexGuard g;
rtl::Reference<Qt5FilePicker> pPicker;
- RunInMainThread([&, this]() { pPicker = createPicker(context, eMode); });
+ RunInMainThread([&pPicker, this, context, eMode]() { pPicker = createPicker(context, eMode); });
assert(pPicker);
return pPicker;
}
@@ -681,7 +681,7 @@ std::unique_ptr<QApplication> Qt5Instance::CreateQAppl
extern "C" {
VCLPLUG_QT5_PUBLIC SalInstance* create_SalInstance()
{
- static const bool bUseCairo = (nullptr != getenv("SAL_VCL_QT5_USE_CAIRO"));
+ static const bool bUseCairo = true; // (nullptr != getenv("SAL_VCL_QT5_USE_CAIRO"));
std::unique_ptr<char* []> pFakeArgv;
std::unique_ptr<int> pFakeArgc;