You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2025/05/04 17:32:22 UTC
(openoffice) 04/14: Allow editeng to use newer ICU versions, by only importing its C API. Also use sal_True instead of the wrong use of ICU's TRUE.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch icu-c-api
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 234403ca9bf4727a311daed6dba5cf3ba9f0fae5
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Thu May 1 10:54:48 2025 +0200
Allow editeng to use newer ICU versions, by only importing its C API.
Also use sal_True instead of the wrong use of ICU's TRUE.
Patch by: me
---
main/editeng/source/editeng/impedit2.cxx | 4 +++-
main/editeng/source/outliner/outliner.cxx | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/main/editeng/source/editeng/impedit2.cxx b/main/editeng/source/editeng/impedit2.cxx
index 18e9c6d541..3b65342d62 100644
--- a/main/editeng/source/editeng/impedit2.cxx
+++ b/main/editeng/source/editeng/impedit2.cxx
@@ -67,6 +67,8 @@
#include <sot/formats.hxx>
+#define U_SHOW_CPLUSPLUS_API 0
+#define U_SHOW_CPLUSPLUS_HEADER_API 0
#include <unicode/ubidi.h>
using namespace ::com::sun::star;
@@ -136,7 +138,7 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) :
bIsFormatting = sal_False;
bFormatted = sal_False;
bUpdate = sal_True;
- bUpdateForAcc = TRUE;
+ bUpdateForAcc = sal_True;
bUseAutoColor = sal_True;
bForceAutoColor = sal_False;
bAddExtLeading = sal_False;
diff --git a/main/editeng/source/outliner/outliner.cxx b/main/editeng/source/outliner/outliner.cxx
index 4d049a357a..8efc591f96 100644
--- a/main/editeng/source/outliner/outliner.cxx
+++ b/main/editeng/source/outliner/outliner.cxx
@@ -59,6 +59,8 @@
#include <svl/itempool.hxx>
// #101498# calculate if it's RTL or not
+#define U_SHOW_CPLUSPLUS_API 0
+#define U_SHOW_CPLUSPLUS_HEADER_API 0
#include <unicode/ubidi.h>
#define DEFAULT_SCALE 75