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

[Tor Lillqvist (via logerrit)]

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

New commits:
commit ba9f91a909cb52194178ac2ed78dc62bd61c1be3
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 Sep 20 13:04:56 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
    (cherry picked from commit 685e91a7aee4a4acc60e33bf1313a394fd15b1ff)
    Reviewed-on: https://gerrit.libreoffice.org/79196
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index 83b051da6b40..eab3b179d90b 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -108,7 +108,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 );