[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - vcl/headless

[Libreoffice Gerrit user]

 vcl/headless/svpframe.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 237042b8c34f44d78972c8ec01fb3c140a6ce0a6
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Nov 8 17:38:34 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Nov 8 17:33:49 2018 +0100

    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 <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index e9770392127f..623308d57303 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -438,8 +438,9 @@ void SvpSalFrame::UpdateSettings( AllSettings& rSettings )
             bFreeGraphics = true;
         }
         rSettings.SetStyleSettings(aStyleSettings);
+#ifndef IOS // For now...
         pGraphics->updateSettings(rSettings);
-
+#endif
         if (bFreeGraphics)
             ReleaseGraphics(pGraphics);
     }