07295115f5
This reverts commit d2de55c93f for now, because it
appears to have caused a massive uptick in hung UITest_impress_tests
(sd/qa/uitest/impress_tests/save_readonly_with_password.py, line 95) and
UITest_writer_test6 (sw/qa/uitest/writer_tests6/save_readonly_with_password.py,
line 54) tests across Jenkins, see the comments starting at
<https://gerrit.libreoffice.org/c/core/+/117900/8#message-e439f5f2b9ed7a24d6f47fd640defe14dc392eb5>
"svp: don't directly yield in main thread".
Change-Id: Id114a0d904580024352e4acf37e2558f9f0ae6f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136250
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
55 lines
1.6 KiB
C++
55 lines
1.6 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*/
|
|
#include <headless/svpinst.hxx>
|
|
#include <headless/svpdummies.hxx>
|
|
#include <headless/svpdata.hxx>
|
|
#include <unistd.h>
|
|
|
|
class HeadlessSalInstance : public SvpSalInstance
|
|
{
|
|
public:
|
|
explicit HeadlessSalInstance(std::unique_ptr<SalYieldMutex> pMutex);
|
|
|
|
virtual SalSystem* CreateSalSystem() override;
|
|
};
|
|
|
|
HeadlessSalInstance::HeadlessSalInstance(std::unique_ptr<SalYieldMutex> pMutex)
|
|
: SvpSalInstance(std::move(pMutex))
|
|
{
|
|
}
|
|
|
|
class HeadlessSalSystem : public SvpSalSystem {
|
|
public:
|
|
HeadlessSalSystem() : SvpSalSystem() {}
|
|
virtual int ShowNativeDialog( const OUString& rTitle,
|
|
const OUString& rMessage,
|
|
const std::vector< OUString >& rButtons ) override
|
|
{
|
|
(void)rButtons;
|
|
SAL_INFO("vcl.headless",
|
|
"LibreOffice - dialog '"
|
|
<< rTitle << "': '"
|
|
<< rMessage << "'");
|
|
return 0;
|
|
}
|
|
};
|
|
|
|
SalSystem *HeadlessSalInstance::CreateSalSystem()
|
|
{
|
|
return new HeadlessSalSystem();
|
|
}
|
|
|
|
extern "C" SalInstance *create_SalInstance()
|
|
{
|
|
HeadlessSalInstance* pInstance = new HeadlessSalInstance(std::make_unique<SvpSalYieldMutex>());
|
|
new SvpSalData();
|
|
return pInstance;
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|