diff options
| author | Tor Lillqvist <tml@collabora.com> | 2021-01-17 21:29:10 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2021-01-18 08:30:44 +0100 |
| commit | 2fc4d9acb2e04a2cb868a82a394bf23239487511 (patch) | |
| tree | 781fff0cae2b6329c6dc484ed9028dcee5e8d872 /solenv | |
| parent | 2b5c42230f48f75d6e4187b1db15b249893ed46b (diff) | |
tdf#138122: Fix vcl for iOS after 1a167625314bf36b735176ed488e6ba9b5e9b675
Make vcl compile again for iOS and make the Collabora Office iOS app
work again when built against a master build of core.
For now, keep the old versions of the functions touched by
1a167625314bf36b735176ed488e6ba9b5e9b675 in vcl/ios/salios.cxx, and
move the modified versions to the new file vcl/osx/salmacos.cxx.
Keep the functions as they were except that ifdefs for MACOSX or IOS
are expanded. Keep the formatting as it was to make comparisons
easier. Thus add the new files to the clang-format exclusion list.
While at it, also move vcl/quartz/salgdiutils.cxx to vcl/osx as it is
compiled only for macOS anyway.
Change-Id: I990ef678f2263031d4a5af8cc547fffe185d17c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109480
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109501
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/clang-format/excludelist | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 7c4d0e000706..0ce9080c8b49 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -14882,6 +14882,7 @@ vcl/inc/window.h vcl/inc/wizdlg.hxx vcl/ios/dummies.cxx vcl/ios/iosinst.cxx +vcl/ios/salios.cxx vcl/null/printerinfomanager.cxx vcl/opengl/FixedTextureAtlas.cxx vcl/opengl/LineRenderUtils.cxx @@ -14923,7 +14924,9 @@ vcl/osx/documentfocuslistener.cxx vcl/osx/documentfocuslistener.hxx vcl/osx/saldata.cxx vcl/osx/salframe.cxx +vcl/osx/salgdiutils.cxx vcl/osx/salinst.cxx +vcl/osx/salmacos.cxx vcl/osx/salmenu.cxx vcl/osx/salnativewidgets.cxx vcl/osx/salobj.cxx @@ -14949,7 +14952,6 @@ vcl/quartz/ctfonts.cxx vcl/quartz/salbmp.cxx vcl/quartz/salgdi.cxx vcl/quartz/salgdicommon.cxx -vcl/quartz/salgdiutils.cxx vcl/quartz/salvd.cxx vcl/quartz/utils.cxx vcl/source/app/IconThemeInfo.cxx |