Skip to content

Commit

Permalink
ios: Rule out LIBO_VERSION checking on master
Browse files Browse the repository at this point in the history
Signed-off-by: Yunusemre Şentürk <yunusemre@collabora.com>
Change-Id: I28cdba1b82d391cf4d847c6e2e40f8e08d928519
  • Loading branch information
Yunusemre Şentürk authored and tml1024 committed Sep 8, 2022
1 parent 64b0355 commit 796925d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 9 deletions.
5 changes: 0 additions & 5 deletions ios/Mobile/L10n.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,11 @@

#define _(id, catalog) app_translate(id, catalog)

#if (LIBO_VERSION_MAJOR > 7 && LIBO_VERSION_MAJOR < 21) || (LIBO_VERSION_MAJOR >= 22) || (LIBO_VERSION_MAJOR == 7 && LIBO_VERSION_MINOR >= 3)

#define LIBO_INTERNAL_ONLY

#import <rtl/string.hxx>
#import <unotools/resmgr.hxx>

char *app_translate(TranslateId id, const char *catalog);
#else
char *app_translate(const char *id, const char *catalog);
#endif

// vim:set shiftwidth=4 softtabstop=4 expandtab:
4 changes: 0 additions & 4 deletions ios/Mobile/L10n.mm
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@
#import "L10n.h"

char *app_translate(
#if (LIBO_VERSION_MAJOR > 7 && LIBO_VERSION_MAJOR < 21) || (LIBO_VERSION_MAJOR >= 22) || (LIBO_VERSION_MAJOR == 7 && LIBO_VERSION_MINOR >= 3)
TranslateId id,
#else
const char *id,
#endif
const char *catalog)
{
LanguageTag tag(OUString::fromUtf8([app_locale UTF8String]));
Expand Down

0 comments on commit 796925d

Please sign in to comment.