diff options
author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-05-26 13:36:37 +0200 |
---|---|---|
committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-05-28 12:07:25 +0200 |
commit | c6b7f5555d5df13eae7aa72dbd3307ad8c9893dc (patch) | |
tree | 20b59802a2e7e1ec1e13f9f8fc04db446ca4ef86 /i18npool/inc | |
parent | b8c1f54d67c5ae90a868f9b33747c43b97c23351 (diff) |
tdf#42949 Fix IWYU warnings in i18npool/
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: Ic331c845f0a8f06c4a8f8f79b6f87e26ca7c3a7d
Reviewed-on: https://gerrit.libreoffice.org/72972
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'i18npool/inc')
25 files changed, 57 insertions, 71 deletions
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx index 909b6d138952..38fa40fe80b4 100644 --- a/i18npool/inc/breakiteratorImpl.hxx +++ b/i18npool/inc/breakiteratorImpl.hxx @@ -19,21 +19,14 @@ #ifndef INCLUDED_I18NPOOL_INC_BREAKITERATORIMPL_HXX #define INCLUDED_I18NPOOL_INC_BREAKITERATORIMPL_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/beans/PropertyValues.hpp> #include <com/sun/star/i18n/XBreakIterator.hpp> -#include <com/sun/star/i18n/WordType.hpp> -#include <com/sun/star/i18n/BreakType.hpp> -#include <com/sun/star/i18n/ScriptType.hpp> -#include <com/sun/star/i18n/CharacterIteratorMode.hpp> -#include <com/sun/star/i18n/CharType.hpp> -#include <com/sun/star/i18n/XLocaleData.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> #include <vector> +namespace com::sun::star::uno { class XComponentContext; } + namespace i18npool { diff --git a/i18npool/inc/breakiterator_th.hxx b/i18npool/inc/breakiterator_th.hxx index c2f3629d1bc8..16d6cfd15e14 100644 --- a/i18npool/inc/breakiterator_th.hxx +++ b/i18npool/inc/breakiterator_th.hxx @@ -20,7 +20,6 @@ #define INCLUDED_I18NPOOL_INC_BREAKITERATOR_TH_HXX #include "breakiterator_unicode.hxx" -#include "xdictionary.hxx" namespace i18npool { diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx index f34412d0eac4..251c4a982184 100644 --- a/i18npool/inc/breakiterator_unicode.hxx +++ b/i18npool/inc/breakiterator_unicode.hxx @@ -21,10 +21,12 @@ #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/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx index 8d8f0d3afd23..b35decb0f750 100644 --- a/i18npool/inc/calendarImpl.hxx +++ b/i18npool/inc/calendarImpl.hxx @@ -20,14 +20,11 @@ #define INCLUDED_I18NPOOL_INC_CALENDARIMPL_HXX #include <com/sun/star/i18n/XCalendar4.hpp> -#include <com/sun/star/i18n/CalendarDisplayCode.hpp> -#include <com/sun/star/i18n/CalendarFieldIndex.hpp> -#include <com/sun/star/i18n/CalendarDisplayIndex.hpp> #include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <vector> +namespace com::sun::star::uno { class XComponentContext; } // class CalendarImpl diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx index 34befe25e21e..6d343f33f28d 100644 --- a/i18npool/inc/calendar_gregorian.hxx +++ b/i18npool/inc/calendar_gregorian.hxx @@ -20,13 +20,15 @@ #define INCLUDED_I18NPOOL_INC_CALENDAR_GREGORIAN_HXX #include "calendarImpl.hxx" -#include "nativenumbersupplier.hxx" + +#include <com/sun/star/i18n/CalendarFieldIndex.hpp> #include <unicode/calendar.h> #include <rtl/ref.hxx> #include <memory> +namespace i18npool { class NativeNumberSupplierService; } // class Calendar_gregorian diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx index cd77cbea275a..3a702ca9d909 100644 --- a/i18npool/inc/cclass_unicode.hxx +++ b/i18npool/inc/cclass_unicode.hxx @@ -19,19 +19,19 @@ #ifndef INCLUDED_I18NPOOL_INC_CCLASS_UNICODE_HXX #define INCLUDED_I18NPOOL_INC_CCLASS_UNICODE_HXX -#include <com/sun/star/i18n/XNativeNumberSupplier.hpp> #include <com/sun/star/i18n/XCharacterClassification.hpp> -#include <com/sun/star/i18n/XLocaleData5.hpp> #include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> -#include "transliteration_body.hxx" #include <o3tl/typed_flags_set.hxx> #include <memory> namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com::sun::star::i18n { class XNativeNumberSupplier; } +namespace com::sun::star::i18n { class XLocaleData5; } +namespace i18npool { class Transliteration_casemapping; } /// Flag values of table. diff --git a/i18npool/inc/chaptercollator.hxx b/i18npool/inc/chaptercollator.hxx index cfc9a9a6cbea..9197c82df8f5 100644 --- a/i18npool/inc/chaptercollator.hxx +++ b/i18npool/inc/chaptercollator.hxx @@ -20,7 +20,8 @@ #define INCLUDED_I18NPOOL_INC_CHAPTERCOLLATOR_HXX #include "collatorImpl.hxx" -#include <com/sun/star/i18n/XCharacterClassification.hpp> + +namespace com::sun::star::i18n { class XCharacterClassification; } namespace i18npool { diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx index 078a31b116ba..ec71ad75c7ca 100644 --- a/i18npool/inc/characterclassificationImpl.hxx +++ b/i18npool/inc/characterclassificationImpl.hxx @@ -23,9 +23,9 @@ #include <cppuhelper/implbase.hxx> #include <vector> #include <memory> -#include <com/sun/star/i18n/KCharacterType.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> + +namespace com::sun::star::uno { class XComponentContext; } namespace i18npool { diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx index 0370c6a47124..d56554264ddb 100644 --- a/i18npool/inc/collatorImpl.hxx +++ b/i18npool/inc/collatorImpl.hxx @@ -20,17 +20,17 @@ #define INCLUDED_I18NPOOL_INC_COLLATORIMPL_HXX #include <com/sun/star/uno/Reference.h> -#include <com/sun/star/i18n/XLocaleData5.hpp> #include <com/sun/star/i18n/XCollator.hpp> #include <com/sun/star/lang/Locale.hpp> -#include <cppuhelper/weak.hxx> #include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <vector> #include <memory> +namespace com::sun::star::i18n { class XLocaleData5; } +namespace com::sun::star::uno { class XComponentContext; } + namespace i18npool { // ---------------------------------------------------- diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx index 1320b7e41a73..eb9446c7098b 100644 --- a/i18npool/inc/defaultnumberingprovider.hxx +++ b/i18npool/inc/defaultnumberingprovider.hxx @@ -23,14 +23,12 @@ #include <com/sun/star/text/XNumberingFormatter.hpp> #include <com/sun/star/text/XNumberingTypeInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/i18n/XTransliteration.hpp> -#include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <cppuhelper/implbase.hxx> #include <rtl/ref.hxx> -#include "transliterationImpl.hxx" - -#include <memory> +namespace com::sun::star::container { class XHierarchicalNameAccess; } +namespace com::sun::star::uno { class XComponentContext; } +namespace i18npool { class TransliterationImpl; } namespace i18npool { diff --git a/i18npool/inc/indexentrysupplier.hxx b/i18npool/inc/indexentrysupplier.hxx index 088ca721630c..5b711ea7684d 100644 --- a/i18npool/inc/indexentrysupplier.hxx +++ b/i18npool/inc/indexentrysupplier.hxx @@ -22,7 +22,8 @@ #include <com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp> #include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> + +namespace com::sun::star::uno { class XComponentContext; } namespace i18npool { diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx index 9eb2044506c4..6870856741a9 100644 --- a/i18npool/inc/indexentrysupplier_common.hxx +++ b/i18npool/inc/indexentrysupplier_common.hxx @@ -24,9 +24,9 @@ #include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <rtl/ref.hxx> -#include "collatorImpl.hxx" -#include <memory> +namespace com::sun::star::uno { class XComponentContext; } +namespace i18npool { class CollatorImpl; } namespace i18npool { diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx index ff7af4d49e3d..1c5f2fbf2c94 100644 --- a/i18npool/inc/inputsequencechecker.hxx +++ b/i18npool/inc/inputsequencechecker.hxx @@ -20,14 +20,14 @@ #define INCLUDED_I18NPOOL_INC_INPUTSEQUENCECHECKER_HXX #include <cppuhelper/implbase.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <vector> #include <memory> +namespace com::sun::star::uno { class XComponentContext; } + namespace i18npool { diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx index 07e6e50ab974..b707ed3596b1 100644 --- a/i18npool/inc/localedata.hxx +++ b/i18npool/inc/localedata.hxx @@ -19,24 +19,15 @@ #ifndef INCLUDED_I18NPOOL_INC_LOCALEDATA_HXX #define INCLUDED_I18NPOOL_INC_LOCALEDATA_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> - #include <com/sun/star/i18n/XLocaleData5.hpp> #include <cppuhelper/implbase.hxx> -#include <cppu/macros.hxx> -#include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/i18n/Calendar.hpp> -#include <com/sun/star/i18n/FormatElement.hpp> -#include <com/sun/star/i18n/Currency.hpp> -#include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/i18n/LocaleDataItem2.hpp> #include <com/sun/star/i18n/UnicodeScript.hpp> -#include <com/sun/star/uno/RuntimeException.hpp> -#include <com/sun/star/uno/XInterface.hpp> #include <rtl/ref.hxx> #include <rtl/ustring.hxx> #include <vector> @@ -44,15 +35,15 @@ #include <osl/module.hxx> -#include "defaultnumberingprovider.hxx" -#include <com/sun/star/style/NumberingType.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/text/HoriOrientation.hpp> - -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +namespace com::sun::star::beans { struct PropertyValue; } +namespace com::sun::star::container { class XIndexAccess; } +namespace com::sun::star::i18n { struct Currency; } +namespace com::sun::star::i18n { struct Currency2; } +namespace com::sun::star::i18n { struct FormatElement; } +namespace com::sun::star::lang { struct Locale; } + struct LocaleDataLookupTableItem; namespace i18npool { diff --git a/i18npool/inc/nativenumbersupplier.hxx b/i18npool/inc/nativenumbersupplier.hxx index 067a590b441a..9bd37854bd70 100644 --- a/i18npool/inc/nativenumbersupplier.hxx +++ b/i18npool/inc/nativenumbersupplier.hxx @@ -20,11 +20,11 @@ #define INCLUDED_I18NPOOL_INC_NATIVENUMBERSUPPLIER_HXX #include <com/sun/star/i18n/XNativeNumberSupplier2.hpp> -#include <com/sun/star/i18n/NativeNumberMode.hpp> #include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp> #include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/i18n/CharacterClassification.hpp> + +namespace com::sun::star::i18n { class XCharacterClassification; } namespace i18npool { diff --git a/i18npool/inc/numberformatcode.hxx b/i18npool/inc/numberformatcode.hxx index 35951c0c3783..8a0c306d5529 100644 --- a/i18npool/inc/numberformatcode.hxx +++ b/i18npool/inc/numberformatcode.hxx @@ -20,18 +20,19 @@ #ifndef INCLUDED_I18NPOOL_INC_NUMBERFORMATCODE_HXX #define INCLUDED_I18NPOOL_INC_NUMBERFORMATCODE_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/implbase.hxx> #include <com/sun/star/i18n/XNumberFormatCode.hpp> -#include <com/sun/star/i18n/XLocaleData5.hpp> #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <deque> #include <utility> +namespace com::sun::star::i18n { class XLocaleData5; } +namespace com::sun::star::i18n { struct FormatElement; } +namespace com::sun::star::uno { class XComponentContext; } + class NumberFormatCodeMapper : public cppu::WeakImplHelper < css::i18n::XNumberFormatCode, diff --git a/i18npool/inc/ordinalsuffix.hxx b/i18npool/inc/ordinalsuffix.hxx index 61dd4128a59f..ef7e4a49f932 100644 --- a/i18npool/inc/ordinalsuffix.hxx +++ b/i18npool/inc/ordinalsuffix.hxx @@ -23,7 +23,8 @@ #include <com/sun/star/i18n/XOrdinalSuffix.hpp> #include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/Locale.hpp> + +namespace com::sun::star::lang { struct Locale; } namespace i18npool { diff --git a/i18npool/inc/textToPronounce_zh.hxx b/i18npool/inc/textToPronounce_zh.hxx index c311b8955875..931817b9075a 100644 --- a/i18npool/inc/textToPronounce_zh.hxx +++ b/i18npool/inc/textToPronounce_zh.hxx @@ -20,7 +20,7 @@ #define INCLUDED_I18NPOOL_INC_TEXTTOPRONOUNCE_ZH_HXX #include "transliteration_Ignore.hxx" -#include "indexentrysupplier_asian.hxx" +#include <osl/module.hxx> namespace i18npool { diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx index 98e16ca623f2..cff2723615ba 100644 --- a/i18npool/inc/textconversion.hxx +++ b/i18npool/inc/textconversion.hxx @@ -19,15 +19,15 @@ #ifndef INCLUDED_I18NPOOL_INC_TEXTCONVERSION_HXX #define INCLUDED_I18NPOOL_INC_TEXTCONVERSION_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/i18n/XExtendedTextConversion.hpp> -#include <com/sun/star/linguistic2/XConversionDictionary.hpp> -#include <com/sun/star/linguistic2/XConversionDictionaryList.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> #include <osl/module.h> +namespace com::sun::star::linguistic2 { class XConversionDictionary; } +namespace com::sun::star::linguistic2 { class XConversionDictionaryList; } +namespace com::sun::star::uno { class XComponentContext; } + namespace i18npool { diff --git a/i18npool/inc/textconversionImpl.hxx b/i18npool/inc/textconversionImpl.hxx index 222e5911dce2..9cd87e8d611c 100644 --- a/i18npool/inc/textconversionImpl.hxx +++ b/i18npool/inc/textconversionImpl.hxx @@ -19,12 +19,12 @@ #ifndef INCLUDED_I18NPOOL_INC_TEXTCONVERSIONIMPL_HXX #define INCLUDED_I18NPOOL_INC_TEXTCONVERSIONIMPL_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/i18n/XExtendedTextConversion.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> +namespace com::sun::star::uno { class XComponentContext; } + namespace i18npool { diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx index 6012d41490d8..21ca033ab4b5 100644 --- a/i18npool/inc/transliterationImpl.hxx +++ b/i18npool/inc/transliterationImpl.hxx @@ -19,13 +19,14 @@ #ifndef INCLUDED_I18NPOOL_INC_TRANSLITERATIONIMPL_HXX #define INCLUDED_I18NPOOL_INC_TRANSLITERATIONIMPL_HXX -#include <com/sun/star/i18n/XLocaleData5.hpp> #include <com/sun/star/i18n/XExtendedTransliteration.hpp> #include <cppuhelper/implbase.hxx> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <sal/types.h> +namespace com::sun::star::i18n { class XLocaleData5; } +namespace com::sun::star::uno { class XComponentContext; } + namespace i18npool { class TransliterationImpl : public cppu::WeakImplHelper diff --git a/i18npool/inc/transliteration_Ignore.hxx b/i18npool/inc/transliteration_Ignore.hxx index 4f46d10131c9..f8b9a554f4b2 100644 --- a/i18npool/inc/transliteration_Ignore.hxx +++ b/i18npool/inc/transliteration_Ignore.hxx @@ -20,9 +20,10 @@ #define INCLUDED_I18NPOOL_INC_TRANSLITERATION_IGNORE_HXX #include "transliteration_commonclass.hxx" -#include <i18nutil/oneToOneMapping.hxx> #include <unicode/translit.h> +namespace i18nutil { class oneToOneMapping; } + typedef sal_Unicode (*TransFunc)(const sal_Unicode); namespace i18npool { diff --git a/i18npool/inc/transliteration_OneToOne.hxx b/i18npool/inc/transliteration_OneToOne.hxx index ae594e754377..fc45755c9f13 100644 --- a/i18npool/inc/transliteration_OneToOne.hxx +++ b/i18npool/inc/transliteration_OneToOne.hxx @@ -20,7 +20,8 @@ #define INCLUDED_I18NPOOL_INC_TRANSLITERATION_ONETOONE_HXX #include "transliteration_commonclass.hxx" -#include <i18nutil/oneToOneMapping.hxx> + +namespace i18nutil { class oneToOneMapping; } namespace i18npool { diff --git a/i18npool/inc/transliteration_commonclass.hxx b/i18npool/inc/transliteration_commonclass.hxx index 48d6688df36f..5cb7dd24b91e 100644 --- a/i18npool/inc/transliteration_commonclass.hxx +++ b/i18npool/inc/transliteration_commonclass.hxx @@ -20,10 +20,8 @@ #define INCLUDED_I18NPOOL_INC_TRANSLITERATION_COMMONCLASS_HXX #include <com/sun/star/i18n/XExtendedTransliteration.hpp> -#include <com/sun/star/i18n/TransliterationType.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase.hxx> -#include <rtl/ustrbuf.h> #include <rtl/ustring.hxx> namespace i18npool { diff --git a/i18npool/inc/xdictionary.hxx b/i18npool/inc/xdictionary.hxx index ef279ae051b5..38d5ac72e195 100644 --- a/i18npool/inc/xdictionary.hxx +++ b/i18npool/inc/xdictionary.hxx @@ -20,7 +20,6 @@ #define INCLUDED_I18NPOOL_INC_XDICTIONARY_HXX #include <sal/types.h> -#include <osl/module.h> #include <com/sun/star/i18n/Boundary.hpp> |