[Libreoffice-commits] core.git: i18npool/inc i18npool/IwyuFilter_i18npool.yaml i18npool/source

[Michael Stahl (via logerrit)]

 i18npool/IwyuFilter_i18npool.yaml      |    5 +++++
 i18npool/inc/breakiterator_unicode.hxx |    3 +--
 i18npool/source/search/textsearch.hxx  |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit d3ef215486cfa669cc12543243c7ff5c3004a093
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue May 28 15:50:47 2019 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Tue May 28 15:50:47 2019 +0200

    i18npool: remove versioned ICU forward declarations
    
    (regression from c6b7f5555d5df13eae7aa72dbd3307ad8c9893dc)

diff --git a/i18npool/IwyuFilter_i18npool.yaml b/i18npool/IwyuFilter_i18npool.yaml
index 888e2d0a6ca4..3215ee7a4148 100644
--- a/i18npool/IwyuFilter_i18npool.yaml
+++ b/i18npool/IwyuFilter_i18npool.yaml
@@ -1,6 +1,9 @@
 ---
 assumeFilename: i18npool/source/localedata/localedata.cxx
 blacklist:
+    i18npool/inc/breakiterator_unicode.hxx:
+    # contains versioned namespace so cannot forward declare
+    - unicode/brkiter.h
     i18npool/inc/breakiteratorImpl.hxx:
     # Base class needs complete type
     - com/sun/star/i18n/XBreakIterator.hpp
@@ -84,6 +87,8 @@ blacklist:
     # Base class needs complete type
     - com/sun/star/util/XTextSearch2.hpp
     - com/sun/star/lang/XServiceInfo.hpp
+    # contains versioned namespace so cannot forward declare
+    - unicode/regex.h
     i18npool/source/breakiterator/xdictionary.cxx:
     # Used after #ifdef DICT_JA_ZH_IN_DATAFILE
     - config_folders.h
diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx
index 251c4a982184..41831c676f28 100644
--- a/i18npool/inc/breakiterator_unicode.hxx
+++ b/i18npool/inc/breakiterator_unicode.hxx
@@ -21,12 +21,11 @@
 
 #include "breakiteratorImpl.hxx"
 
+#include <unicode/brkiter.h>
 #include <unicode/utext.h>
 #include <memory>
 #include <unordered_map>
 
-namespace icu_63 { class BreakIterator; }
-
 namespace i18npool {
 
 #define LOAD_CHARACTER_BREAKITERATOR    0
diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx
index 3b58c00749ab..acc49a00ee5a 100644
--- a/i18npool/source/search/textsearch.hxx
+++ b/i18npool/source/search/textsearch.hxx
@@ -27,6 +27,7 @@
 #include <map>
 #include <memory>
 
+#include <unicode/regex.h>
 #include <unicode/unistr.h>
 #include <unicode/uversion.h>
 
@@ -34,7 +35,6 @@ namespace com::sun::star::i18n { class XBreakIterator; }
 namespace com::sun::star::i18n { class XCharacterClassification; }
 namespace com::sun::star::i18n { class XExtendedTransliteration; }
 namespace com::sun::star::uno { class XComponentContext; }
-namespace icu_63 { class RegexMatcher; }
 
 
 using namespace U_ICU_NAMESPACE;