diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-10-20 17:22:19 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-10-25 13:41:56 +0100 |
| commit | 1bfd9b5465f1a2930210a54c285936c3ecb4bff5 (patch) | |
| tree | 8b690658e162b359607ef6a1b4a3f9a33ef54564 /vcl/headless | |
| parent | 0dc6cb349ca1246a0febfaad15e5724fef2bd264 (diff) | |
generic: fix misc. initialization problems & simplify a little
Diffstat (limited to 'vcl/headless')
| -rw-r--r-- | vcl/headless/svpinst.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx index b3e868316a58..9c0eb6ea0430 100644 --- a/vcl/headless/svpinst.cxx +++ b/vcl/headless/svpinst.cxx @@ -43,20 +43,26 @@ #include <salframe.hxx> #include <svdata.hxx> -#include <saldatabasic.hxx> +#include <generic/gendata.hxx> #include <vcl/solarmutex.hxx> // FIXME: split off into a separate, standalone module to aid linking #ifndef GTK3_INCLUDED +class SvpSalData : public SalGenericData +{ +public: + SvpSalData( SalInstance *pInstance ) : SalGenericData( SAL_DATA_SVP, pInstance ) { } + virtual void ErrorTrapPush() {} + virtual bool ErrorTrapPop( bool ) { return false; } +}; + // plugin factory function extern "C" { SAL_DLLPUBLIC_EXPORT SalInstance* create_SalInstance() { SvpSalInstance* pInstance = new SvpSalInstance( new SalYieldMutex() ); - SalData* pSalData = new SalData(); - pSalData->m_pInstance = pInstance; - SetSalData( pSalData ); + new SvpSalData( pInstance ); return pInstance; } } |