vcl/Library_vcl.mk | 4 ++--
vcl/headless/svpframe.cxx | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 2c10ed72c9e4d53064377183b606af22a0e34383
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Thu Nov 8 17:38:34 2018 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Fri Nov 9 23:27:38 2018 +0200
No updateSettings() in AquaSalGraphics
Just ifdef out the call of it for now. This is a temporary solution,
we presumably do want dialogs to be "themed" appropriately for the iOS
app.
Change-Id: I0b14bd59ecc13037c9ff2a286405a5020081f1d5
Reviewed-on: https://gerrit.libreoffice.org/63112
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
(cherry picked from commit 237042b8c34f44d78972c8ec01fb3c140a6ce0a6)
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index f159a0cd6f86..4df5328f8cea 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -440,8 +440,9 @@ void SvpSalFrame::UpdateSettings( AllSettings& rSettings )
bFreeGraphics = true;
}
rSettings.SetStyleSettings(aStyleSettings);
+#ifndef IOS // For now...
pGraphics->updateSettings(rSettings);
-
+#endif
if (bFreeGraphics)
ReleaseGraphics(pGraphics);
}
commit ce6f42c50fed9a3749de464684342bbd858c882c
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Fri Nov 9 22:38:49 2018 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Fri Nov 9 23:27:38 2018 +0200
Don't build the CustomWidgetDraw code for iOS for now
Change-Id: I7c1500f8e5e1a1f25cbb9cd41d897a37c1402f5b
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index b08ce01c265d..965cb4bd4130 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -457,11 +457,11 @@ vcl_headless_code= \
$(if $(filter-out iOS,$(OS)), \
vcl/headless/svpbmp \
vcl/headless/svpgdi \
- vcl/headless/svpdata) \
+ vcl/headless/svpdata \
+ vcl/headless/CustomWidgetDraw) \
vcl/headless/svpdummies \
vcl/headless/svpinst \
vcl/headless/svpvd \
- vcl/headless/CustomWidgetDraw \
vcl/unx/generic/app/gendisp \
vcl/unx/generic/app/geninst \
vcl/unx/generic/app/gensys \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
