diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-13 22:11:04 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-14 08:47:15 +0100 |
| commit | fa7389b430f242706b1bcea430f82fffa112fb9b (patch) | |
| tree | 301146f407b840044b0c660cc9652a62a114527c /vcl/headless | |
| parent | a4d770731f4e5228ef1101c286d1815cf94a1fd9 (diff) | |
iOS+Android+SVP "merge" all SalData instances
It's always the same code.
Change-Id: I2385d0bda24939b964306e27a3df99ea44356eac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128401
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/headless')
| -rw-r--r-- | vcl/headless/headlessinst.cxx | 12 | ||||
| -rw-r--r-- | vcl/headless/svpdata.cxx | 14 |
2 files changed, 3 insertions, 23 deletions
diff --git a/vcl/headless/headlessinst.cxx b/vcl/headless/headlessinst.cxx index 913403041e2f..f0692e3e7273 100644 --- a/vcl/headless/headlessinst.cxx +++ b/vcl/headless/headlessinst.cxx @@ -8,7 +8,7 @@ */ #include <headless/svpinst.hxx> #include <headless/svpdummies.hxx> -#include <unx/gendata.hxx> +#include <headless/svpdata.hxx> #include <unistd.h> class HeadlessSalInstance : public SvpSalInstance @@ -45,14 +45,6 @@ SalSystem *HeadlessSalInstance::CreateSalSystem() return new HeadlessSalSystem(); } -class HeadlessSalData : public GenericUnixSalData -{ -public: - explicit HeadlessSalData(SalInstance *pInstance) : GenericUnixSalData(pInstance) {} - virtual void ErrorTrapPush() override {} - virtual bool ErrorTrapPop( bool ) override { return false; } -}; - void SalAbort( const OUString& rErrorText, bool bDumpCore ) { OUString aError( rErrorText ); @@ -88,7 +80,7 @@ SalData::~SalData() SalInstance *CreateSalInstance() { HeadlessSalInstance* pInstance = new HeadlessSalInstance(std::make_unique<SvpSalYieldMutex>()); - new HeadlessSalData( pInstance ); + new SvpSalData(pInstance); pInstance->AcquireYieldMutex(); return pInstance; } diff --git a/vcl/headless/svpdata.cxx b/vcl/headless/svpdata.cxx index f30f0f5728c8..ab9fa5e22f0a 100644 --- a/vcl/headless/svpdata.cxx +++ b/vcl/headless/svpdata.cxx @@ -7,21 +7,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <unx/gendata.hxx> +#include <headless/svpdata.hxx> #include <headless/svpinst.hxx> -namespace { - -class SvpSalData : public GenericUnixSalData -{ -public: - explicit SvpSalData(SalInstance *pInstance) : GenericUnixSalData(pInstance) {} - virtual void ErrorTrapPush() override {} - virtual bool ErrorTrapPop( bool /*bIgnoreError*/ = true ) override { return false; } -}; - -} - // plugin factory function SalInstance* svp_create_SalInstance() { |