summaryrefslogtreecommitdiff
path: root/vcl/android
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2022-01-16 14:37:24 +0100
committerJan-Marek Glogowski <glogow@fbihome.de>2022-01-17 12:44:39 +0100
commit5da906d07bf88bb9c56325d03272006d5a0662c4 (patch)
tree16763a743098db8f184bcd7cc9060ddeb8815a6f /vcl/android
parent6985f81b528b0e06bd3b11160c35ed2d4a999845 (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/android')
-rw-r--r--vcl/android/androidinst.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 8e83dae0a8dd..ca130fb1b19f 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -156,7 +156,7 @@ SalFrame *AndroidSalInstance::CreateFrame( SalFrame* pParent, SalFrameStyleFlags
// This is our main entry point:
extern "C" SalInstance *create_SalInstance()
{
- LOGI("Android: CreateSalInstance!");
+ LOGI("Android: create_SalInstance!");
AndroidSalInstance* pInstance = new AndroidSalInstance( std::make_unique<SvpSalYieldMutex>() );
new SvpSalData();
return pInstance;