vcl/quartz/SystemFontList.cxx | 7 -------
1 file changed, 7 deletions(-)
New commits:
commit 846d7797e91245f5ee457fc447f541bcbd233699
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Wed Jan 24 13:39:56 2024 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Thu Jan 25 12:13:00 2024 +0100
janitor: remove unnecessary conditional (macOS vs iOS)
The "no Application" comment referred to an older version of the code
that tired to get a localized name for the current LibreOffice UI
language only, but that has since been removed…
Change-Id: Iac8f4aa816aee4d7a03f5fbefedee621781f33b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162505
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/vcl/quartz/SystemFontList.cxx b/vcl/quartz/SystemFontList.cxx
index e068caf80fb6..3ca09bfcf21e 100644
--- a/vcl/quartz/SystemFontList.cxx
+++ b/vcl/quartz/SystemFontList.cxx
@@ -52,7 +52,6 @@ FontAttributes DevFontFromCTFontDescriptor(
CTFontDescriptorRef pFD, bool* bFont
rDFA.SetMicrosoftSymbolEncoded( false );
// get font name
-#ifdef MACOSX
CFStringRef pLang = nullptr;
CFStringRef pFamilyName = static_cast<CFStringRef>(
CTFontDescriptorCopyLocalizedAttribute( pFD,
kCTFontFamilyNameAttribute, &pLang ));
@@ -65,12 +64,6 @@ FontAttributes DevFontFromCTFontDescriptor(
CTFontDescriptorRef pFD, bool* bFont
}
pFamilyName = static_cast<CFStringRef>(CTFontDescriptorCopyAttribute(
pFD, kCTFontFamilyNameAttribute ));
}
-#else
- // No "Application" on iOS. And it is unclear whether this code
- // snippet will actually ever get invoked on iOS anyway. So just
- // use the old code that uses a non-localized font name.
- CFStringRef pFamilyName = (CFStringRef)CTFontDescriptorCopyAttribute( pFD,
kCTFontFamilyNameAttribute );
-#endif
rDFA.SetFamilyName( GetOUString( pFamilyName ) );
