Kaydet (Commit) d3ef2154 authored tarafından Michael Stahl's avatar Michael Stahl

i18npool: remove versioned ICU forward declarations

(regression from c6b7f555)
üst a42291d0
--- ---
assumeFilename: i18npool/source/localedata/localedata.cxx assumeFilename: i18npool/source/localedata/localedata.cxx
blacklist: blacklist:
i18npool/inc/breakiterator_unicode.hxx:
# contains versioned namespace so cannot forward declare
- unicode/brkiter.h
i18npool/inc/breakiteratorImpl.hxx: i18npool/inc/breakiteratorImpl.hxx:
# Base class needs complete type # Base class needs complete type
- com/sun/star/i18n/XBreakIterator.hpp - com/sun/star/i18n/XBreakIterator.hpp
...@@ -84,6 +87,8 @@ blacklist: ...@@ -84,6 +87,8 @@ blacklist:
# Base class needs complete type # Base class needs complete type
- com/sun/star/util/XTextSearch2.hpp - com/sun/star/util/XTextSearch2.hpp
- com/sun/star/lang/XServiceInfo.hpp - com/sun/star/lang/XServiceInfo.hpp
# contains versioned namespace so cannot forward declare
- unicode/regex.h
i18npool/source/breakiterator/xdictionary.cxx: i18npool/source/breakiterator/xdictionary.cxx:
# Used after #ifdef DICT_JA_ZH_IN_DATAFILE # Used after #ifdef DICT_JA_ZH_IN_DATAFILE
- config_folders.h - config_folders.h
......
...@@ -21,12 +21,11 @@ ...@@ -21,12 +21,11 @@
#include "breakiteratorImpl.hxx" #include "breakiteratorImpl.hxx"
#include <unicode/brkiter.h>
#include <unicode/utext.h> #include <unicode/utext.h>
#include <memory> #include <memory>
#include <unordered_map> #include <unordered_map>
namespace icu_63 { class BreakIterator; }
namespace i18npool { namespace i18npool {
#define LOAD_CHARACTER_BREAKITERATOR 0 #define LOAD_CHARACTER_BREAKITERATOR 0
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <map> #include <map>
#include <memory> #include <memory>
#include <unicode/regex.h>
#include <unicode/unistr.h> #include <unicode/unistr.h>
#include <unicode/uversion.h> #include <unicode/uversion.h>
...@@ -34,7 +35,6 @@ namespace com::sun::star::i18n { class XBreakIterator; } ...@@ -34,7 +35,6 @@ namespace com::sun::star::i18n { class XBreakIterator; }
namespace com::sun::star::i18n { class XCharacterClassification; } namespace com::sun::star::i18n { class XCharacterClassification; }
namespace com::sun::star::i18n { class XExtendedTransliteration; } namespace com::sun::star::i18n { class XExtendedTransliteration; }
namespace com::sun::star::uno { class XComponentContext; } namespace com::sun::star::uno { class XComponentContext; }
namespace icu_63 { class RegexMatcher; }
using namespace U_ICU_NAMESPACE; using namespace U_ICU_NAMESPACE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment