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

[Tor Lillqvist (via logerrit)]

 vcl/ios/iosinst.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 685e91a7aee4a4acc60e33bf1313a394fd15b1ff
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Mar 29 18:08:30 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Mar 29 18:13:17 2019 +0200

    Avoid dialog headings showing up as some serif font in the iOS app
    
    Apparently the use of [UIFont systemFontOfSize:10] familyName] to get
    a default font family name is a bad idea. Presumably the return value
    from this, ".SF UI Text", is matched against the list of font family
    names enumerated from the system. (The "SF" apparently stands for "San
    Francisco".) That ".SF UI Text" is not among them, so maybe vcl
    chooses some arbitrary other font instead that happens to be a serif
    one? If we instead use "Helvetica", at least we get a sans-serif font,
    even if it doesn't match the system UI font exactly.
    
    Change-Id: I7ff39d8e7893ce3c27f3f12d227f87209bbc7952

diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index 35d1f400745f..938fb1a4c199 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -107,7 +107,7 @@ public:
     virtual void UpdateSettings( AllSettings &rSettings ) override
     {
         // Clobber the UI fonts
-        vcl::Font aFont( OUString::fromUtf8( [[[UIFont systemFontOfSize:10] familyName] UTF8String] ), Size( 0, 10 ) );
+        vcl::Font aFont( "Helvetica", Size( 0, 10 ) );
 
         StyleSettings aStyleSet = rSettings.GetStyleSettings();
         aStyleSet.SetAppFont( aFont );