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 ee84bd1178cddc8837354cbbf869df6e8357aae0 Author: Damjan Jovanovic <[email protected]> AuthorDate: Thu May 1 10:56:24 2025 +0200 Allow sw to use newer ICU versions, by only importing its C API. Patch by: me --- main/sw/source/core/text/frmcrsr.cxx | 2 ++ main/sw/source/core/text/porfld.cxx | 2 ++ main/sw/source/core/text/porlay.cxx | 2 ++ main/sw/source/filter/ww8/writerwordglue.cxx | 2 ++ 4 files changed, 8 insertions(+) diff --git a/main/sw/source/core/text/frmcrsr.cxx b/main/sw/source/core/text/frmcrsr.cxx index 2124fc15bf..a17091a222 100644 --- a/main/sw/source/core/text/frmcrsr.cxx +++ b/main/sw/source/core/text/frmcrsr.cxx @@ -43,6 +43,8 @@ #include <doc.hxx> #include <sortedobjs.hxx> +#define U_SHOW_CPLUSPLUS_API 0 +#define U_SHOW_CPLUSPLUS_HEADER_API 0 #include <unicode/ubidi.h> #include "txtcfg.hxx" diff --git a/main/sw/source/core/text/porfld.cxx b/main/sw/source/core/text/porfld.cxx index c44fe6d18c..c5d3b31635 100644 --- a/main/sw/source/core/text/porfld.cxx +++ b/main/sw/source/core/text/porfld.cxx @@ -49,6 +49,8 @@ #include <porftn.hxx> // SwFtnPortion #include <accessibilityoptions.hxx> #include <editeng/lrspitem.hxx> +#define U_SHOW_CPLUSPLUS_API 0 +#define U_SHOW_CPLUSPLUS_HEADER_API 0 #include <unicode/ubidi.h> using namespace ::com::sun::star; diff --git a/main/sw/source/core/text/porlay.cxx b/main/sw/source/core/text/porlay.cxx index fa70292457..8777129255 100644 --- a/main/sw/source/core/text/porlay.cxx +++ b/main/sw/source/core/text/porlay.cxx @@ -65,6 +65,8 @@ using namespace ::com::sun::star; using namespace i18n::ScriptType; //#ifdef BIDI +#define U_SHOW_CPLUSPLUS_API 0 +#define U_SHOW_CPLUSPLUS_HEADER_API 0 #include <unicode/ubidi.h> #include <i18nutil/unicode.hxx> //unicode::getUnicodeScriptType diff --git a/main/sw/source/filter/ww8/writerwordglue.cxx b/main/sw/source/filter/ww8/writerwordglue.cxx index 0fd291d9ab..79dacb992e 100644 --- a/main/sw/source/filter/ww8/writerwordglue.cxx +++ b/main/sw/source/filter/ww8/writerwordglue.cxx @@ -32,6 +32,8 @@ #include <algorithm> //std::find_if #include <functional> //std::unary_function +#define U_SHOW_CPLUSPLUS_API 0 +#define U_SHOW_CPLUSPLUS_HEADER_API 0 #include <unicode/ubidi.h> //ubidi_getLogicalRun # include <tools/tenccvt.hxx> //GetExtendedTextEncoding # include <i18nutil/unicode.hxx> //unicode::getUnicodeScriptType
