diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-16 14:37:24 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-17 12:44:39 +0100 |
| commit | 5da906d07bf88bb9c56325d03272006d5a0662c4 (patch) | |
| tree | 16763a743098db8f184bcd7cc9060ddeb8815a6f /vcl/inc/salinst.hxx | |
| parent | 6985f81b528b0e06bd3b11160c35ed2d4a999845 (diff) | |
iOS+SVP convert remaining VCL plugins to salplug
While this makes the preprocessor usage even larger, the code in
salplug.cxx is now hopefully easier to follow. I added a comment
about the main code structure at the beginning.
It also includes changes to the generic plugin list to include
gtk3_kde5 before gen, qt5 and qt6 after gen, but still skips the
headless / svp plugin.
And I explicitly excluded salplug.cxx from the externandnotdefined
compiler plugin. I could have added a dummy, but that seemed not
worth the effort. My try on a non-dummy with correct includes and
defines made the code in salplug.cxx much harder to follow.
FWIW, the iOS VCL plugin actually seems to use the osx SalData, so
I think these changes to iosinst.cxx are more correct then commit
7d990aafdc363b2a12b5db78637d7f3bef7780bd ("VCL drop m_pInstance
from *nix SalData"). But hard to tell without a compiler.
Change-Id: I0e2944d4221ca5910fb2120cc8b24def5c5b3f33
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128477
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/inc/salinst.hxx')
| -rw-r--r-- | vcl/inc/salinst.hxx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index a807d5c263f3..9dcee57bc2e6 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -224,10 +224,6 @@ void SalAbort( const OUString& rErrorText, bool bDumpCore ); const OUString& SalGetDesktopEnvironment(); -#ifdef DISABLE_DYNLOADING -extern "C" SalInstance *create_SalInstance(); -#endif - #endif // INCLUDED_VCL_INC_SALINST_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |