diff options
| author | Gabor Kelemen <kelemeng@ubuntu.com> | 2018-10-20 12:00:50 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-10-26 15:08:18 +0200 |
| commit | 33623f3117d88683fbc9e66792e5030c0322946e (patch) | |
| tree | b817ac4b192e355de61ebff3e22187ca414cf8f2 | |
| parent | 31a8d9c711dfdbdb4b11067125d763b1d570033b (diff) | |
tdf#42949 Fix IWYU warnings in include/unotools/*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I444c43b9d549977039f25bec2b5bf666c3e15e0e
Reviewed-on: https://gerrit.libreoffice.org/62041
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
195 files changed, 335 insertions, 124 deletions
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index bc0e4c3b7ba1..ed4c9b23ba2b 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -50,6 +50,7 @@ #include <cppuhelper/implbase.hxx> #include <vector> #include <com/sun/star/reflection/theCoreReflection.hpp> +#include <unotools/charclass.hxx> namespace basctl { diff --git a/basic/source/comp/basiccharclass.cxx b/basic/source/comp/basiccharclass.cxx index e71d8ab827aa..818190b9fd72 100644 --- a/basic/source/comp/basiccharclass.cxx +++ b/basic/source/comp/basiccharclass.cxx @@ -20,6 +20,7 @@ #include <basiccharclass.hxx> #include <unotools/charclass.hxx> +#include <rtl/character.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx index 821f231aea20..02ca0f3428aa 100644 --- a/basic/source/comp/scanner.cxx +++ b/basic/source/comp/scanner.cxx @@ -25,6 +25,7 @@ #include <i18nlangtag/lang.h> #include <svl/zforlist.hxx> #include <vcl/svapp.hxx> +#include <rtl/character.hxx> SbiScanner::SbiScanner( const OUString& rBuf, StarBASIC* p ) : aBuf( rBuf ) { diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 7d881967c6df..be501d946071 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -43,6 +43,7 @@ #include <rtl/instance.hxx> #include <rtl/math.hxx> #include <rtl/ustrbuf.hxx> +#include <rtl/character.hxx> #include <svl/zforlist.hxx> diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index 97c52b174ed0..9b1e47827b03 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -25,6 +25,7 @@ #include "sbxconv.hxx" #include <unotools/syslocale.hxx> +#include <unotools/charclass.hxx> #include <stdlib.h> diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx index 4f8f1a39e95c..0100ec109da3 100644 --- a/chart2/source/controller/main/ConfigurationAccess.cxx +++ b/chart2/source/controller/main/ConfigurationAccess.cxx @@ -21,6 +21,7 @@ #include <unotools/syslocale.hxx> #include <unotools/configitem.hxx> +#include <unotools/localedatawrapper.hxx> #include <rtl/instance.hxx> namespace chart diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index bfe6824fcb12..5ae85599ecb2 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -46,6 +46,7 @@ #include <tools/diagnose_ex.h> #include <unotools/syslocale.hxx> #include <unotools/intlwrapper.hxx> +#include <unotools/collatorwrapper.hxx> #include <cstring> #include <vector> diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 8472f8c2705b..08e97f39ae73 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -41,6 +41,7 @@ #include <connectivity/dbconversion.hxx> #include <file/quotedstring.hxx> #include <unotools/syslocale.hxx> +#include <unotools/charclass.hxx> using namespace ::comphelper; using namespace connectivity; diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index fc928b7325fa..2db53def866a 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -71,7 +71,6 @@ namespace connectivity using namespace css::lang; using namespace css::embed; using namespace css::io; - using namespace css::task; using namespace css::util; using namespace css::reflection; diff --git a/connectivity/source/drivers/mork/MColumnAlias.cxx b/connectivity/source/drivers/mork/MColumnAlias.cxx index 0a4f9cddf164..b564cc93eb1e 100644 --- a/connectivity/source/drivers/mork/MColumnAlias.cxx +++ b/connectivity/source/drivers/mork/MColumnAlias.cxx @@ -20,6 +20,7 @@ #include "MColumnAlias.hxx" #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/container/XNameAccess.hpp> #include <officecfg/Office/DataAccess.hxx> #include <tools/diagnose_ex.h> diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx b/cui/source/dialogs/SignSignatureLineDialog.cxx index 72c4e5f2e6a3..a6e5ae4d6642 100644 --- a/cui/source/dialogs/SignSignatureLineDialog.cxx +++ b/cui/source/dialogs/SignSignatureLineDialog.cxx @@ -17,6 +17,7 @@ #include <comphelper/processfactory.hxx> #include <tools/stream.hxx> +#include <unotools/localedatawrapper.hxx> #include <unotools/streamwrap.hxx> #include <utility> #include <vcl/weld.hxx> diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 76ad0ef1fdbe..5a564389f590 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -20,6 +20,7 @@ #include <config_features.h> #include <osl/process.h> #include <sal/log.hxx> +#include <rtl/character.hxx> #include <vcl/layout.hxx> #include <vcl/weld.hxx> #include <vcl/svapp.hxx> diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index ee1070ab4ec3..56501b26b8d7 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -95,6 +95,7 @@ #include <svx/xpool.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/urlobj.hxx> +#include <unotools/configmgr.hxx> #include <unotools/linguprops.hxx> #include <unotools/misccfg.hxx> #include <unotools/moduleoptions.hxx> diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx index 61b7497f06ee..5bc7b86cfa71 100644 --- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx +++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx @@ -20,6 +20,9 @@ #include <sal/config.h> #include <com/sun/star/lang/IllegalAccessException.hpp> +#include <com/sun/star/lang/IllegalArgumentException.hpp> +#include <com/sun/star/container/ElementExistException.hpp> +#include <com/sun/star/container/NoSuchElementException.hpp> #include <com/sun/star/sdb/XDatabaseRegistrations.hpp> #include <cppuhelper/basemutex.hxx> diff --git a/dbaccess/source/ui/querydesign/TableWindowData.cxx b/dbaccess/source/ui/querydesign/TableWindowData.cxx index d29a7c695047..02c9204aa039 100644 --- a/dbaccess/source/ui/querydesign/TableWindowData.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowData.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/sdbcx/XKeysSupplier.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XIndexAccess.hpp> +#include <com/sun/star/lang/XComponent.hpp> using namespace dbaui; using namespace ::com::sun::star::lang; diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx index a15663ffa548..52c6378d6e09 100644 --- a/extensions/source/propctrlr/xsdvalidationhelper.cxx +++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/xforms/XDataTypeRepository.hpp> #include <unotools/syslocale.hxx> +#include <i18nlangtag/languagetag.hxx> #include <tools/diagnose_ex.h> diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 17d26b4522d8..c7b5968c8ddf 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -30,6 +30,7 @@ #include <svl/zforlist.hxx> #include <unotools/resmgr.hxx> +#include <unotools/charclass.hxx> #include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp> #include <com/sun/star/sheet/FormulaMapGroup.hpp> #include <com/sun/star/sheet/FormulaMapGroupSpecialOffset.hpp> diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx index caa384796e7e..cfa6c8439e40 100644 --- a/framework/inc/helper/statusindicatorfactory.hxx +++ b/framework/inc/helper/statusindicatorfactory.hxx @@ -42,6 +42,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/util/XUpdatable.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/supportsservice.hxx> #include <vcl/status.hxx> diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 39a4e787cea6..4bf670c7f325 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -54,6 +54,7 @@ #include <svtools/menuoptions.hxx> #include <unotools/cmdoptions.hxx> #include <svtools/miscopt.hxx> +#include <unotools/collatorwrapper.hxx> // Defines diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index f31831b9298c..0825eb8faa1a 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -232,3 +232,33 @@ blacklist: include/tools/urlobj.hxx: # Needed for template - o3tl/typed_flags_set.hxx + include/unotools/accessiblestatesethelper.hxx: + # base class has to be a complete type + - com/sun/star/accessibility/XAccessibleStateSet.hpp + include/unotools/accessiblerelationsethelper.hxx: + # base class has to be a complete type + - com/sun/star/accessibility/XAccessibleRelationSet.hpp + include/unotools/eventcfg.hxx: + # base class has to be a complete type + - com/sun/star/container/XNameReplace.hpp + - com/sun/star/document/XEventsSupplier.hpp + include/unotools/fontcfg.hxx: + # Needed for a sal_uLong enum + - tools/solar.h + include/unotools/fontcvt.hxx: + # Needed for template + - o3tl/typed_flags_set.hxx + include/unotools/fontdefs.hxx: + # Needed for template + - o3tl/typed_flags_set.hxx + include/unotools/options.hxx: + # Needed for template + - o3tl/typed_flags_set.hxx + include/unotools/readwritemutexguard.hxx: + # Needed for template + - o3tl/typed_flags_set.hxx + include/unotools/streamwrap.hxx: + # base class has to be a complete type + - com/sun/star/io/XOutputStream.hpp + - com/sun/star/io/XStream.hpp + - com/sun/star/io/XTruncate.hpp diff --git a/include/sfx2/sidebar/ResourceManager.hxx b/include/sfx2/sidebar/ResourceManager.hxx index 677391938a7b..97c8047d6a13 100644 --- a/include/sfx2/sidebar/ResourceManager.hxx +++ b/include/sfx2/sidebar/ResourceManager.hxx @@ -24,6 +24,7 @@ #include <sfx2/sidebar/Context.hxx> #include <unotools/confignode.hxx> #include <com/sun/star/frame/XController.hpp> +#include <map> #include <set> #include <svtools/miscopt.hxx> diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index 1628a5e5cae1..a288a67dcdae 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -28,6 +28,7 @@ #include <com/sun/star/i18n/NumberFormatCode.hpp> #include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/i18n/NumberFormatMapper.hpp> +#include <com/sun/star/i18n/Currency.hpp> #include <unotools/localedatawrapper.hxx> #include <tools/link.hxx> #include <svl/ondemand.hxx> diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 5e1efddc6cf5..8429ea1c74e6 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -21,6 +21,7 @@ #define INCLUDED_SVTOOLS_RULER_HXX #include <memory> +#include <map> #include <svtools/svtdllapi.h> #include <rtl/ref.hxx> #include <tools/link.hxx> diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index af146bd70c71..6025c57416ae 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -24,6 +24,7 @@ #include <svtools/headbar.hxx> #include <svtools/svtabbx.hxx> #include <unotools/intlwrapper.hxx> +#include <unotools/collatorwrapper.hxx> class SvSimpleTable; class SVT_DLLPUBLIC SvSimpleTableContainer : public Control diff --git a/include/unotools/ZipPackageHelper.hxx b/include/unotools/ZipPackageHelper.hxx index c3a7f963ba38..6f1b1700d049 100644 --- a/include/unotools/ZipPackageHelper.hxx +++ b/include/unotools/ZipPackageHelper.hxx @@ -21,12 +21,11 @@ #include <unotools/unotoolsdllapi.h> -#include <com/sun/star/container/XHierarchicalNameAccess.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XInterface.hpp> -#include <com/sun/star/io/XInputStream.hpp> + +namespace com { namespace sun { namespace star { namespace container { class XHierarchicalNameAccess; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XSingleServiceFactory; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } namespace utl { diff --git a/include/unotools/accessiblerelationsethelper.hxx b/include/unotools/accessiblerelationsethelper.hxx index 28a43f912bea..ea2fc9e8bef6 100644 --- a/include/unotools/accessiblerelationsethelper.hxx +++ b/include/unotools/accessiblerelationsethelper.hxx @@ -23,10 +23,6 @@ #include <unotools/unotoolsdllapi.h> #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> -#include <cppuhelper/weak.hxx> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XServiceName.hpp> #include <osl/mutex.hxx> #include <cppuhelper/implbase.hxx> #include <memory> diff --git a/include/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx index 38e9a3a69837..1e6ae7bc0c56 100644 --- a/include/unotools/accessiblestatesethelper.hxx +++ b/include/unotools/accessiblestatesethelper.hxx @@ -22,10 +22,6 @@ #include <unotools/unotoolsdllapi.h> #include <com/sun/star/accessibility/XAccessibleStateSet.hpp> -#include <cppuhelper/weak.hxx> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XServiceName.hpp> #include <osl/mutex.hxx> #include <cppuhelper/implbase.hxx> #include <memory> diff --git a/include/unotools/calendarwrapper.hxx b/include/unotools/calendarwrapper.hxx index edd52d8be96a..149393bb7e84 100644 --- a/include/unotools/calendarwrapper.hxx +++ b/include/unotools/calendarwrapper.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/i18n/Calendar2.hpp> -#include <com/sun/star/lang/Locale.hpp> #include <unotools/unotoolsdllapi.h> namespace com { namespace sun { namespace star { @@ -39,6 +38,8 @@ namespace com { namespace sun { namespace star { } }}} +namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } } + class UNOTOOLS_DLLPUBLIC CalendarWrapper { css::uno::Reference< css::i18n::XCalendar4 > xC; diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx index bfcf05514fd7..a916f93eb92b 100644 --- a/include/unotools/charclass.hxx +++ b/include/unotools/charclass.hxx @@ -24,13 +24,10 @@ #include <i18nlangtag/languagetag.hxx> #include <com/sun/star/i18n/DirectionProperty.hpp> #include <com/sun/star/i18n/KCharacterType.hpp> -#include <com/sun/star/i18n/KParseTokens.hpp> -#include <com/sun/star/i18n/KParseType.hpp> #include <com/sun/star/i18n/ParseResult.hpp> -#include <com/sun/star/i18n/XCharacterClassification.hpp> #include <com/sun/star/i18n/UnicodeScript.hpp> #include <osl/mutex.hxx> -#include <rtl/character.hxx> +#include <com/sun/star/uno/Reference.hxx> namespace com { namespace sun { namespace star { namespace uno { @@ -38,6 +35,8 @@ namespace com { namespace sun { namespace star { } }}} +namespace com { namespace sun { namespace star { namespace i18n { class XCharacterClassification; } } } } + const sal_Int32 nCharClassAlphaType = css::i18n::KCharacterType::UPPER | css::i18n::KCharacterType::LOWER | diff --git a/include/unotools/closeveto.hxx b/include/unotools/closeveto.hxx index 5c5adc5ac3e3..b8f6ad00d699 100644 --- a/include/unotools/closeveto.hxx +++ b/include/unotools/closeveto.hxx @@ -21,9 +21,11 @@ #define INCLUDED_UNOTOOLS_CLOSEVETO_HXX #include <unotools/unotoolsdllapi.h> -#include <com/sun/star/uno/XInterface.hpp> +#include <com/sun/star/uno/Reference.hxx> #include <memory> +namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } } + namespace utl { diff --git a/include/unotools/cmdoptions.hxx b/include/unotools/cmdoptions.hxx index 6456f74b6066..b2134a60c5de 100644 --- a/include/unotools/cmdoptions.hxx +++ b/include/unotools/cmdoptions.hxx @@ -21,12 +21,15 @@ #include <unotools/unotoolsdllapi.h> #include <sal/types.h> -#include <osl/mutex.hxx> -#include <com/sun/star/frame/XFrame.hpp> #include <rtl/ustring.hxx> #include <unotools/options.hxx> #include <memory> +namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } } + +namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } } +namespace osl { class Mutex; } + /*-************************************************************************************************************ @descr The method GetList() returns a list of property values. Use follow defines to separate values by names. diff --git a/include/unotools/collatorwrapper.hxx b/include/unotools/collatorwrapper.hxx index 77a22d63682a..12be0f6e94d2 100644 --- a/include/unotools/collatorwrapper.hxx +++ b/include/unotools/collatorwrapper.hxx @@ -21,12 +21,16 @@ #define INCLUDED_UNOTOOLS_COLLATORWRAPPER_HXX #include <unotools/unotoolsdllapi.h> -#include <com/sun/star/i18n/XCollator.hpp> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/Sequence.hxx> namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; }}}} +namespace com { namespace sun { namespace star { namespace i18n { class XCollator; } } } } +namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } } + class UNOTOOLS_DLLPUBLIC CollatorWrapper { private: diff --git a/include/unotools/compatibility.hxx b/include/unotools/compatibility.hxx index cc79b28da922..de5585313b92 100644 --- a/include/unotools/compatibility.hxx +++ b/include/unotools/compatibility.hxx @@ -19,15 +19,16 @@ #ifndef INCLUDED_UNOTOOLS_COMPATIBILITY_HXX #define INCLUDED_UNOTOOLS_COMPATIBILITY_HXX -#include <sal/types.h> -#include <osl/mutex.hxx> #include <com/sun/star/uno/Sequence.h> -#include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/uno/Any.hxx> #include <unotools/options.hxx> #include <unotools/unotoolsdllapi.h> #include <rtl/ustring.hxx> #include <memory> +namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } +namespace osl { class Mutex; } + /*-************************************************************************************************************ @descr Struct to hold information about one compatibility entry *//*-*************************************************************************************************************/ diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx index 3d445dc20386..14bf94dc8177 100644 --- a/include/unotools/configitem.hxx +++ b/include/unotools/configitem.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/uno/Reference.h> #include <unotools/unotoolsdllapi.h> #include <unotools/options.hxx> -#include <o3tl/typed_flags_set.hxx> namespace com{ namespace sun{ namespace star{ namespace uno{ @@ -50,6 +49,9 @@ enum class ConfigItemMode AllLocales = 0x02, ReleaseTree = 0x04, }; + +namespace o3tl { template <typename T> struct typed_flags; } + namespace o3tl { template<> struct typed_flags<ConfigItemMode> : is_typed_flags<ConfigItemMode, 0x07> {}; @@ -64,9 +66,6 @@ namespace utl LocalPath, // one-level relative path, for use when building paths etc. ("Item", "Typ['Q & A']") }; - class ConfigChangeListener_Impl; - class ConfigManager; - class UNOTOOLS_DLLPUBLIC ConfigItem : public ConfigurationBroadcaster { friend class ConfigChangeListener_Impl; diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx index 5bf4a1473da3..bc4937e181a7 100644 --- a/include/unotools/confignode.hxx +++ b/include/unotools/confignode.hxx @@ -20,25 +20,19 @@ #define INCLUDED_UNOTOOLS_CONFIGNODE_HXX #include <unotools/unotoolsdllapi.h> -#include <com/sun/star/container/XHierarchicalNameAccess.hpp> -#include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/util/XChangesBatch.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <unotools/eventlisteneradapter.hxx> -namespace comphelper -{ - class ComponentContext; -} +namespace com { namespace sun { namespace star { namespace container { class XHierarchicalNameAccess; } } } } +namespace com { namespace sun { namespace star { namespace container { class XNameAccess; } } } } +namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } } } } +namespace com { namespace sun { namespace star { namespace container { class XNameReplace; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com { namespace sun { namespace star { namespace util { class XChangesBatch; } } } } namespace utl { - //= OConfigurationNode - - class OConfigurationTreeRoot; /** a small wrapper around a configuration node.<p/> Nodes in the terminology used herein are <em>inner</em> nodes of a configuration tree, which means <em>no leafs</em>. diff --git a/include/unotools/configpaths.hxx b/include/unotools/configpaths.hxx index 7bb90a5c7d76..d24e8537eb75 100644 --- a/include/unotools/configpaths.hxx +++ b/include/unotools/configpaths.hxx @@ -21,7 +21,6 @@ #define INCLUDED_UNOTOOLS_CONFIGPATHS_HXX #include <unotools/unotoolsdllapi.h> -#include <sal/types.h> #include <rtl/ustring.hxx> namespace utl diff --git a/include/unotools/configvaluecontainer.hxx b/include/unotools/configvaluecontainer.hxx index 267474fce863..5d51b1e7dcaa 100644 --- a/include/unotools/configvaluecontainer.hxx +++ b/include/unotools/configvaluecontainer.hxx @@ -20,12 +20,14 @@ #define INCLUDED_UNOTOOLS_CONFIGVALUECONTAINER_HXX #include <unotools/unotoolsdllapi.h> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <osl/mutex.hxx> -#include <o3tl/typed_flags_set.hxx> +#include <com/sun/star/uno/Type.hxx> #include <memory> +namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace osl { class Mutex; } + namespace utl { diff --git a/include/unotools/datetime.hxx b/include/unotools/datetime.hxx index 088ae6baf40c..dcae945188be 100644 --- a/include/unotools/datetime.hxx +++ b/include/unotools/datetime.hxx @@ -23,12 +23,13 @@ //= conversions UNO3.TimeClass <-> Tools.TimeClass (Date/Time/DateTime) #include <unotools/unotoolsdllapi.h> -#include <com/sun/star/util/Date.hpp> -#include <com/sun/star/util/Time.hpp> -#include <com/sun/star/util/DateTime.hpp> +#include <rtl/ustring.hxx> + +namespace com { namespace sun { namespace star { namespace util { struct Date; } } } } +namespace com { namespace sun { namespace star { namespace util { struct DateTime; } } } } +namespace com { namespace sun { namespace star { namespace util { struct Time; } } } } class Date; -namespace tools { class Time; } class DateTime; namespace utl diff --git a/include/unotools/dynamicmenuoptions.hxx b/include/unotools/dynamicmenuoptions.hxx index 732278572631..4e02604add1c 100644 --- a/include/unotools/dynamicmenuoptions.hxx +++ b/include/unotools/dynamicmenuoptions.hxx @@ -21,12 +21,13 @@ #include <unotools/unotoolsdllapi.h> #include <sal/types.h> -#include <osl/mutex.hxx> #include <com/sun/star/uno/Sequence.h> -#include <com/sun/star/beans/PropertyValue.hpp> #include <unotools/options.hxx> #include <memory> +namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } +namespace osl { class Mutex; } + /*-************************************************************************************************************ @descr The method GetList() returns a list of property values. Use follow defines to separate values by names. diff --git a/include/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx index 5023f56d10ac..2353797d148f 100644 --- a/include/unotools/eventcfg.hxx +++ b/include/unotools/eventcfg.hxx @@ -20,13 +20,9 @@ #define INCLUDED_UNOTOOLS_EVENTCFG_HXX #include <unotools/unotoolsdllapi.h> -#include <unotools/configitem.hxx> #include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/container/XNameReplace.hpp> -#include <cppuhelper/weakref.hxx> #include <cppuhelper/implbase.hxx> -#include <unordered_map> -#include <vector> enum class GlobalEventId { diff --git a/include/unotools/eventlisteneradapter.hxx b/include/unotools/eventlisteneradapter.hxx index 74f608922ba4..b3eeb4d5a052 100644 --- a/include/unotools/eventlisteneradapter.hxx +++ b/include/unotools/eventlisteneradapter.hxx @@ -21,9 +21,12 @@ #define INCLUDED_UNOTOOLS_EVENTLISTENERADAPTER_HXX #include <unotools/unotoolsdllapi.h> -#include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/lang/EventObject.hpp> #include <memory> +namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XComponent; } } } } + namespace utl { diff --git a/include/unotools/extendedsecurityoptions.hxx b/include/unotools/extendedsecurityoptions.hxx index c6ca9b0d669c..1b5183d3f551 100644 --- a/include/unotools/extendedsecurityoptions.hxx +++ b/include/unotools/extendedsecurityoptions.hxx @@ -21,11 +21,11 @@ #include <unotools/unotoolsdllapi.h> #include <sal/types.h> -#include <osl/mutex.hxx> -#include <rtl/ustring.hxx> #include <unotools/options.hxx> #include <memory> +namespace osl { class Mutex; } + /*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. diff --git a/include/unotools/fontcfg.hxx b/include/unotools/fontcfg.hxx index 477187e98529..47418afdb0ab 100644 --- a/include/unotools/fontcfg.hxx +++ b/include/unotools/fontcfg.hxx @@ -19,19 +19,21 @@ #ifndef INCLUDED_UNOTOOLS_FONTCFG_HXX #define INCLUDED_UNOTOOLS_FONTCFG_HXX -#include <i18nlangtag/languagetag.hxx> #include <unotools/unotoolsdllapi.h> #include <tools/solar.h> #include <tools/fontenum.hxx> -#include <com/sun/star/lang/Locale.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/container/XNameAccess.hpp> -#include <o3tl/typed_flags_set.hxx> +#include <com/sun/star/uno/Reference.hxx> #include <unordered_map> #include <unordered_set> #include <vector> +namespace o3tl { template <typename T> struct typed_flags; } +namespace com { namespace sun { namespace star { namespace container { class XNameAccess; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } + +class LanguageTag; + enum class DefaultFontType; // If you think the below concept of classifying a font (typeface) as possibly being one or several diff --git a/include/unotools/fontcvt.hxx b/include/unotools/fontcvt.hxx index 4b7ef6e35b95..f24a5e3e48ae 100644 --- a/include/unotools/fontcvt.hxx +++ b/include/unotools/fontcvt.hxx @@ -22,7 +22,6 @@ #include <unotools/unotoolsdllapi.h> #include <rtl/ustring.hxx> -#include <tools/solar.h> #include <o3tl/typed_flags_set.hxx> diff --git a/include/unotools/fontdefs.hxx b/include/unotools/fontdefs.hxx index 3f86b37a16e6..12dfc44ba985 100644 --- a/include/unotools/fontdefs.hxx +++ b/include/unotools/fontdefs.hxx @@ -21,16 +21,9 @@ #include <unotools/unotoolsdllapi.h> #include <sal/types.h> -#include <tools/solar.h> #include <rtl/ustring.hxx> -#include <rtl/ustrbuf.hxx> #include <o3tl/typed_flags_set.hxx> -namespace utl { - class FontSubstConfiguration; - struct FontNameAttr; -} - enum class SubsFontFlags { ONLYONE = 0x01, diff --git a/include/unotools/fontoptions.hxx b/include/unotools/fontoptions.hxx index 4f5a8eb7cb63..1779b2199bfa 100644 --- a/include/unotools/fontoptions.hxx +++ b/include/unotools/fontoptions.hxx @@ -21,11 +21,11 @@ #include <unotools/unotoolsdllapi.h> #include <sal/types.h> -#include <osl/mutex.hxx> -#include <rtl/ustring.hxx> #include <unotools/options.hxx> #include <memory> +namespace osl { class Mutex; } + /*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. diff --git a/include/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx index 57b7d50da92c..8d628a67254b 100644 --- a/include/unotools/historyoptions.hxx +++ b/include/unotools/historyoptions.hxx @@ -23,11 +23,11 @@ #include <unotools/unotoolsdllapi.h> #include <sal/types.h> #include <com/sun/star/uno/Sequence.h> -#include <com/sun/star/beans/PropertyValue.hpp> #include <rtl/ustring.hxx> #include <unotools/options.hxx> #include <memory> +namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } namespace boost { template <class T> class optional; } // The method GetList() returns a list of property values. diff --git a/include/unotools/intlwrapper.hxx b/include/unotools/intlwrapper.hxx index cf1ea94682f4..47ded1a273a9 100644 --- a/include/unotools/intlwrapper.hxx +++ b/include/unotools/intlwrapper.hxx @@ -21,14 +21,16 @@ #define INCLUDED_UNOTOOLS_INTLWRAPPER_HXX #include <unotools/unotoolsdllapi.h> -#include <unotools/charclass.hxx> -#include <unotools/localedatawrapper.hxx> -#include <unotools/calendarwrapper.hxx> -#include <unotools/collatorwrapper.hxx> -#include <i18nlangtag/lang.h> +#include <com/sun/star/uno/Reference.h> + #include <i18nlangtag/languagetag.hxx> #include <memory> +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } + +class CollatorWrapper; +class LocaleDataWrapper; + /** A wrapper of I18N wrappers. Using this is more expensive than using some single wrapper classes so use it only if you must pass a single pointer diff --git a/include/unotools/itemholderbase.hxx b/include/unotools/itemholderbase.hxx index 94c20059abf9..865d45e8b4d8 100644 --- a/include/unotools/itemholderbase.hxx +++ b/include/unotools/itemholderbase.hxx @@ -21,10 +21,8 @@ #define INCLUDED_UNOTOOLS_ITEMHOLDERBASE_HXX #include <memory> -#include <vector> #include <osl/mutex.hxx> - -namespace utl { namespace detail { class Options; } } +#include <unotools/options.hxx> struct ItemHolderMutexBase { diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx index 922e00ea5cd0..3e5c7ee6b2b5 100644 --- a/include/unotools/lingucfg.hxx +++ b/include/unotools/lingucfg.hxx @@ -21,17 +21,16 @@ #define INCLUDED_UNOTOOLS_LINGUCFG_HXX #include <unotools/unotoolsdllapi.h> -#include <com/sun/star/beans/PropertyValues.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Any.h> -#include <com/sun/star/lang/Locale.hpp> -#include <com/sun/star/util/XChangesBatch.hpp> #include <rtl/ustring.hxx> -#include <unotools/configitem.hxx> #include <unotools/options.hxx> #include <i18nlangtag/lang.h> #include <vector> +namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } +namespace com { namespace sun { namespace star { namespace util { class XChangesBatch; } } } } + class SvtLinguConfigItem; struct UNOTOOLS_DLLPUBLIC SvtLinguOptions diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx index 56ee9d88e0a4..3e97eeb2b7f9 100644 --- a/include/unotools/localedatawrapper.hxx +++ b/include/unotools/localedatawrapper.hxx @@ -20,8 +20,12 @@ #ifndef INCLUDED_UNOTOOLS_LOCALEDATAWRAPPER_HXX #define INCLUDED_UNOTOOLS_LOCALEDATAWRAPPER_HXX -#include <com/sun/star/i18n/XLocaleData5.hpp> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/i18n/LocaleItem.hpp> +#include <com/sun/star/i18n/LocaleDataItem2.hpp> +#include <com/sun/star/i18n/LanguageCountryInfo.hpp> +#include <com/sun/star/i18n/ForbiddenCharacters.hpp> #include <com/sun/star/i18n/reservedWords.hpp> #include <rtl/ustring.hxx> #include <rtl/math.h> @@ -36,6 +40,13 @@ namespace com { namespace sun { namespace star { class XComponentContext; } }}} + +namespace com { namespace sun { namespace star { namespace i18n { class XLocaleData5; } } } } +namespace com { namespace sun { namespace star { namespace i18n { struct Calendar2; } } } } +namespace com { namespace sun { namespace star { namespace i18n { struct Currency2; } } } } +namespace com { namespace sun { namespace star { namespace i18n { struct FormatElement; } } } } +namespace com { namespace sun { namespace star { namespace i18n { struct CalendarItem2; } } } } + class Date; namespace tools { class Time; } class CalendarWrapper; diff --git a/include/unotools/moduleoptions.hxx b/include/unotools/moduleoptions.hxx index fce65d40f814..4366c0c69d4e 100644 --- a/include/unotools/moduleoptions.hxx +++ b/include/unotools/moduleoptions.hxx @@ -21,15 +21,16 @@ #define INCLUDED_UNOTOOLS_MODULEOPTIONS_HXX #include <unotools/unotoolsdllapi.h> -#include <salhelper/singletonref.hxx> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <rtl/ustring.hxx> #include <sal/types.h> -#include <osl/mutex.hxx> #include <unotools/options.hxx> #include <memory> +namespace osl { class Mutex; } +namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } +namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } + /*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. diff --git a/include/unotools/nativenumberwrapper.hxx b/include/unotools/nativenumberwrapper.hxx index be699f216d8b..bc0ff705635e 100644 --- a/include/unotools/nativenumberwrapper.hxx +++ b/include/unotools/nativenumberwrapper.hxx @@ -21,7 +21,8 @@ #define INCLUDED_UNOTOOLS_NATIVENUMBERWRAPPER_HXX #include <unotools/unotoolsdllapi.h> -#include <com/sun/star/i18n/XNativeNumberSupplier2.hpp> +#include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp> +#include <com/sun/star/uno/Reference.hxx> namespace com { namespace sun { namespace star { namespace uno { @@ -29,6 +30,8 @@ namespace com { namespace sun { namespace star { } }}} +namespace com { namespace sun { namespace star { namespace i18n { class XNativeNumberSupplier2; } } } } + class UNOTOOLS_DLLPUBLIC NativeNumberWrapper { css::uno::Reference< css::i18n::XNativeNumberSupplier2 > xNNS; diff --git a/include/unotools/printwarningoptions.hxx b/include/unotools/printwarningoptions.hxx index f6876dfab053..f86b0731199f 100644 --- a/include/unotools/printwarningoptions.hxx +++ b/include/unotools/printwarningoptions.hxx @@ -22,11 +22,11 @@ #include <unotools/unotoolsdllapi.h> #include <sal/types.h> -#include <osl/mutex.hxx> -#include <rtl/ustring.hxx> #include <unotools/options.hxx> #include <memory> +namespace osl { class Mutex; } + /*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. diff --git a/include/unotools/readwritemutexguard.hxx b/include/unotools/readwritemutexguard.hxx index b11ea8a1e405..a7c6d5799ae4 100644 --- a/include/unotools/readwritemutexguard.hxx +++ b/include/unotools/readwritemutexguard.hxx @@ -35,7 +35,6 @@ namespace o3tl { namespace utl { -class ReadWriteGuard; class ReadWriteMutex { friend class ReadWriteGuard; diff --git a/include/unotools/resmgr.hxx b/include/unotools/resmgr.hxx index 8da6aefac60c..400f3a74f389 100644 --- a/include/unotools/resmgr.hxx +++ b/include/unotools/resmgr.hxx @@ -21,7 +21,9 @@ #include <unotools/unotoolsdllapi.h> #include <unotools/syslocale.hxx> -#include <i18nlangtag/languagetag.hxx> +#include <rtl/ustring.hxx> + +class LanguageTag; typedef OUString (*ResHookProc)(const OUString& rStr); diff --git a/include/unotools/securityoptions.hxx b/include/unotools/securityoptions.hxx index 21382cc9505e..36f43ed0c505 100644 --- a/include/unotools/securityoptions.hxx +++ b/include/unotools/securityoptions.hxx @@ -21,12 +21,13 @@ #include <unotools/unotoolsdllapi.h> #include <sal/types.h> -#include <osl/mutex.hxx> #include <com/sun/star/uno/Sequence.h> #include <rtl/ustring.hxx> #include <unotools/options.hxx> #include <memory> +namespace osl { class Mutex; } + /*-************************************************************************************************************ @short forward declaration to our private date container implementation @descr We use these class as internal member to support small memory requirements. diff --git a/include/unotools/syslocale.hxx b/include/unotools/syslocale.hxx index 58615770f8f0..31ca65281dd6 100644 --- a/include/unotools/syslocale.hxx +++ b/include/unotools/syslocale.hxx @@ -21,12 +21,13 @@ #define INCLUDED_UNOTOOLS_SYSLOCALE_HXX #include <unotools/unotoolsdllapi.h> -#include <unotools/localedatawrapper.hxx> -#include <unotools/charclass.hxx> -#include <i18nlangtag/languagetag.hxx> -#include <sal/types.h> #include <rtl/textenc.h> +#include <memory> + +class CharClass; +class LanguageTag; +class LocaleDataWrapper; class SvtSysLocale_Impl; class SvtSysLocaleOptions; diff --git a/include/unotools/syslocaleoptions.hxx b/include/unotools/syslocaleoptions.hxx index 69a093d9bdb3..666f4d995f31 100644 --- a/include/unotools/syslocaleoptions.hxx +++ b/include/unotools/syslocaleoptions.hxx @@ -23,14 +23,13 @@ #include <unotools/unotoolsdllapi.h> #include <sal/types.h> #include <rtl/ustring.hxx> -#include <tools/solar.h> -#include <tools/link.hxx> #include <i18nlangtag/lang.h> #include <i18nlangtag/languagetag.hxx> #include <unotools/options.hxx> class SvtSysLocaleOptions_Impl; -class SvtListener; +class LinkParamNone; +template <typename Arg, typename Ret> class Link; class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtSysLocaleOptions : public utl::detail::Options { diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx index 32ec831784ea..2d609fe99ec0 100644 --- a/include/unotools/textsearch.hxx +++ b/include/unotools/textsearch.hxx @@ -24,13 +24,14 @@ #include <i18nlangtag/lang.h> #include <rtl/ustring.hxx> #include <com/sun/star/uno/Reference.h> -#include <com/sun/star/lang/Locale.hpp> -#include <com/sun/star/util/XTextSearch2.hpp> #include <ostream> class CharClass; +namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } } +namespace com { namespace sun { namespace star { namespace util { class XTextSearch2; } } } } + namespace com { namespace sun { namespace star { diff --git a/include/unotools/transliterationwrapper.hxx b/include/unotools/transliterationwrapper.hxx index 7afdbf44411e..882975bac2a5 100644 --- a/include/unotools/transliterationwrapper.hxx +++ b/include/unotools/transliterationwrapper.hxx @@ -23,7 +23,11 @@ #include <unotools/unotoolsdllapi.h> #include <rtl/ustring.hxx> #include <i18nlangtag/languagetag.hxx> -#include <com/sun/star/i18n/XExtendedTransliteration.hpp> +#include <i18nlangtag/lang.h> +#include <com/sun/star/uno/Reference.hxx> + +namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } } +namespace com { namespace sun { namespace star { namespace i18n { class XExtendedTransliteration; } } } } namespace com { namespace sun { namespace star { namespace uno { diff --git a/include/unotools/ucbhelper.hxx b/include/unotools/ucbhelper.hxx index 201f1b15722e..82f5ed5d4db1 100644 --- a/include/unotools/ucbhelper.hxx +++ b/include/unotools/ucbhelper.hxx @@ -22,8 +22,9 @@ #include <sal/config.h> -#include <sal/types.h> #include <unotools/unotoolsdllapi.h> +#include <rtl/ustring.hxx> +#include <com/sun/star/uno/Reference.hxx> namespace com { namespace sun { namespace star { namespace uno { diff --git a/include/unotools/ucbstreamhelper.hxx b/include/unotools/ucbstreamhelper.hxx index f037571fe212..fd0a8cd13bad 100644 --- a/include/unotools/ucbstreamhelper.hxx +++ b/include/unotools/ucbstreamhelper.hxx @@ -19,9 +19,6 @@ #ifndef INCLUDED_UNOTOOLS_UCBSTREAMHELPER_HXX #define INCLUDED_UNOTOOLS_UCBSTREAMHELPER_HXX -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XStream.hpp> #include <unotools/unotoolsdllapi.h> #include <tools/stream.hxx> @@ -33,10 +30,6 @@ namespace com { namespace star { - namespace task - { - class XInteractionHandler; - } namespace io { class XStream; @@ -45,11 +38,10 @@ namespace com } } } +namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } } namespace utl { - class UcbLockBytesHandler; - class UNOTOOLS_DLLPUBLIC UcbStreamHelper { public: diff --git a/include/unotools/useroptions.hxx b/include/unotools/useroptions.hxx index 60c18df65ae2..8589f4fdea9f 100644 --- a/include/unotools/useroptions.hxx +++ b/include/unotools/useroptions.hxx @@ -20,11 +20,12 @@ #define INCLUDED_UNOTOOLS_USEROPTIONS_HXX #include <unotools/unotoolsdllapi.h> -#include <unotools/configitem.hxx> -#include <osl/mutex.hxx> +#include <rtl/ustring.hxx> #include <unotools/options.hxx> #include <memory> +namespace osl { class Mutex; } + // define ---------------------------------------------------------------- enum class UserOptToken { diff --git a/include/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx index 0948925756d2..f7c1a9cd064d 100644 --- a/include/unotools/viewoptions.hxx +++ b/include/unotools/viewoptions.hxx @@ -21,14 +21,13 @@ #include <unotools/unotoolsdllapi.h> #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/beans/NamedValue.hpp> -#include <unotools/configmgr.hxx> -#include <unotools/configitem.hxx> #include <sal/types.h> -#include <osl/mutex.hxx> #include <rtl/ustring.hxx> #include <unotools/options.hxx> +namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } } } } +namespace osl { class Mutex; } + class SvtViewOptionsBase_Impl; /*-************************************************************************************************************ diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index e20678dd998b..7a86668ad39a 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -66,6 +66,7 @@ #include <com/sun/star/container/XContentEnumerationAccess.hpp> #include <com/sun/star/sheet/XDrillDownDataSupplier.hpp> +#include <unotools/charclass.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <comphelper/types.hxx> diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx index 54efc6b9e5ae..a79f5e68ff73 100644 --- a/sc/source/core/data/dpshttab.cxx +++ b/sc/source/core/data/dpshttab.cxx @@ -18,6 +18,7 @@ */ #include <svl/zforlist.hxx> +#include <unotools/charclass.hxx> #include <dpcache.hxx> #include <dpshttab.hxx> diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx index c35fce66b8e9..ffbc62913781 100644 --- a/sc/source/core/data/global2.cxx +++ b/sc/source/core/data/global2.cxx @@ -29,6 +29,7 @@ #include <svl/zforlist.hxx> #include <formula/errorcodes.hxx> #include <sal/log.hxx> +#include <rtl/character.hxx> #include <global.hxx> #include <rangeutl.hxx> diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index 7270025f0c03..32e2b5329716 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -21,6 +21,7 @@ #include <svx/algitem.hxx> #include <editeng/justifyitem.hxx> #include <unotools/textsearch.hxx> +#include <unotools/charclass.hxx> #include <sfx2/objsh.hxx> #include <attrib.hxx> diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 27149c7d1bb9..13b0228ca703 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -28,6 +28,8 @@ #include <unotools/collatorwrapper.hxx> #include <stdlib.h> #include <unotools/transliterationwrapper.hxx> +#include <com/sun/star/i18n/KParseTokens.hpp> +#include <com/sun/star/i18n/KParseType.hpp> #include <sal/log.hxx> #include <table.hxx> diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx index 47a3728b92f2..e1cbc6715f38 100644 --- a/sc/source/core/data/table6.cxx +++ b/sc/source/core/data/table6.cxx @@ -18,6 +18,7 @@ */ #include <unotools/textsearch.hxx> +#include <com/sun/star/util/SearchResult.hpp> #include <svl/srchitem.hxx> #include <editeng/editobj.hxx> #include <osl/diagnose.h> diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx index 31a9c816fd5d..730e7de022a9 100644 --- a/sc/source/core/tool/address.cxx +++ b/sc/source/core/tool/address.cxx @@ -31,6 +31,8 @@ #include <sfx2/objsh.hxx> #include <tools/urlobj.hxx> #include <sal/log.hxx> +#include <rtl/character.hxx> +#include <unotools/charclass.hxx> using namespace css; diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index b17cb016dfe0..90377fd3dfa1 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -29,12 +29,15 @@ #include <svl/sharedstringpool.hxx> #include <sal/macros.h> #include <sal/log.hxx> +#include <rtl/character.hxx> #include <tools/solar.h> #include <unotools/charclass.hxx> #include <unotools/configmgr.hxx> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp> #include <com/sun/star/sheet/FormulaLanguage.hpp> +#include <com/sun/star/i18n/KParseTokens.hpp> +#include <com/sun/star/i18n/KParseType.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <unotools/transliterationwrapper.hxx> diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index 92d6cee222ff..d2795282d910 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -21,6 +21,7 @@ #include <sal/log.hxx> #include <unotools/transliterationwrapper.hxx> +#include <unotools/charclass.hxx> #include <dbdata.hxx> #include <globalnames.hxx> diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx index 3efab692c92f..a2a464b6813f 100644 --- a/sc/source/core/tool/doubleref.cxx +++ b/sc/source/core/tool/doubleref.cxx @@ -29,6 +29,7 @@ #include <svl/sharedstringpool.hxx> #include <osl/diagnose.h> +#include <unotools/charclass.hxx> #include <memory> #include <utility> diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index e6de3b6041ef..020a9cc56b3a 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -33,6 +33,7 @@ #include <sfx2/printer.hxx> #include <unotools/collatorwrapper.hxx> #include <unotools/transliterationwrapper.hxx> +#include <rtl/character.hxx> #include <rtl/ustring.hxx> #include <sal/log.hxx> #include <unicode/uchar.h> diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index d044295ee4d3..a1eb180683db 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -35,6 +35,7 @@ #include <basic/sbuno.hxx> #include <svl/zforlist.hxx> #include <svl/sharedstringpool.hxx> +#include <unotools/charclass.hxx> #include <stdlib.h> #include <string.h> #include <signal.h> diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx index 0026f8f1377e..43439f5d0525 100644 --- a/sc/source/core/tool/interpr7.cxx +++ b/sc/source/core/tool/interpr7.cxx @@ -12,6 +12,7 @@ #include <formulacell.hxx> #include <scmatrix.hxx> #include <rtl/strbuf.hxx> +#include <rtl/character.hxx> #include <formula/errorcodes.hxx> #include <sfx2/bindings.hxx> #include <sfx2/linkmgr.hxx> diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index ecadbc761a15..69e702d38f05 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -21,6 +21,7 @@ #include <memory> #include <unotools/collatorwrapper.hxx> #include <unotools/transliterationwrapper.hxx> +#include <unotools/charclass.hxx> #include <com/sun/star/sheet/NamedRangeFlag.hpp> #include <osl/diagnose.h> #include <o3tl/make_unique.hxx> diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx index 607d4c28f0ee..5d6f74ef5b71 100644 --- a/sc/source/core/tool/rangeutl.cxx +++ b/sc/source/core/tool/rangeutl.cxx @@ -19,6 +19,7 @@ #include <memory> #include <osl/diagnose.h> +#include <unotools/charclass.hxx> #include <rangeutl.hxx> #include <document.hxx> #include <global.hxx> diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index 7f09ff16ab0d..4f3f45fafc22 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -37,6 +37,7 @@ #include <editeng/postitem.hxx> #include <editeng/colritem.hxx> #include <editeng/crossedoutitem.hxx> +#include <unotools/charclass.hxx> #include <stringutil.hxx> #include <cellform.hxx> #include <cellvalue.hxx> diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx index adaff22fd834..80488b8def97 100644 --- a/sc/source/filter/html/htmlimp.cxx +++ b/sc/source/filter/html/htmlimp.cxx @@ -20,6 +20,7 @@ #include <scitems.hxx> #include <comphelper/string.hxx> #include <editeng/eeitem.hxx> +#include <unotools/charclass.hxx> #include <editeng/lrspitem.hxx> #include <editeng/paperinf.hxx> diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx index 1099aa870232..c6302eb90988 100644 --- a/sc/source/filter/lotus/op.cxx +++ b/sc/source/filter/lotus/op.cxx @@ -18,6 +18,7 @@ */ #include <rtl/math.hxx> +#include <rtl/character.hxx> #include <string.h> #include <math.h> diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index d50f6993138c..3bed2cfd5b3d 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -72,6 +72,7 @@ #include <formulabuffer.hxx> #include <editutil.hxx> #include <editeng/editstat.hxx> +#include <unotools/charclass.hxx> #include <memory> diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index 436cf515ed1e..3dad7e282501 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -24,6 +24,7 @@ #include <xmloff/nmspmap.hxx> #include <sax/tools/converter.hxx> #include <rtl/math.hxx> +#include <osl/diagnose.h> #include "xmlexprt.hxx" #include "XMLConverter.hxx" #include <document.hxx> diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx index 3860d1f74095..11f4a27d9e61 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx @@ -43,6 +43,7 @@ #include <com/sun/star/sheet/XDatabaseRanges.hpp> #include <com/sun/star/sheet/XDatabaseRange.hpp> #include <comphelper/extract.hxx> +#include <osl/diagnose.h> #include <map> diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx index 71940997d613..55f9e7981af6 100644 --- a/sc/source/filter/xml/XMLExportIterator.cxx +++ b/sc/source/filter/xml/XMLExportIterator.cxx @@ -25,6 +25,7 @@ #include "XMLExportSharedData.hxx" #include "XMLStylesExportHelper.hxx" #include <document.hxx> +#include <osl/diagnose.h> #include <algorithm> diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index 48248c4b51d0..20e38ec157f7 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -48,6 +48,7 @@ #include <comphelper/extract.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> using namespace com::sun::star; using namespace ::xmloff::token; diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index ce7f9c301d9e..4706b8f21e22 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -48,6 +48,7 @@ #include <sfx2/printer.hxx> #include <svl/zforlist.hxx> #include <unotools/localedatawrapper.hxx> +#include <unotools/charclass.hxx> #include <vcl/help.hxx> #include <vcl/cursor.hxx> #include <vcl/settings.hxx> diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index f976ea141ea5..f4c8cfe6fecc 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -45,6 +45,7 @@ #include <vcl/settings.hxx> #include <svl/stritem.hxx> #include <o3tl/make_unique.hxx> +#include <unotools/charclass.hxx> #include <inputwin.hxx> #include <scmod.hxx> diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 0b84b18679ef..66634b542c9d 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -26,6 +26,7 @@ #include <vcl/decoview.hxx> #include <vcl/settings.hxx> #include <tools/wintypes.hxx> +#include <unotools/charclass.hxx> #include <AccessibleFilterMenu.hxx> #include <AccessibleFilterTopWindow.hxx> diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 0a5d66274437..f22bc754c47f 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -32,6 +32,7 @@ #include <stlpool.hxx> #include <tabvwsh.hxx> #include <simpleformulacalc.hxx> +#include <unotools/charclass.hxx> #include <colorformat.hxx> #include <scresid.hxx> diff --git a/sc/source/ui/dataprovider/dataprovider.cxx b/sc/source/ui/dataprovider/dataprovider.cxx index 2e01ae1c3418..6833c68cf03c 100644 --- a/sc/source/ui/dataprovider/dataprovider.cxx +++ b/sc/source/ui/dataprovider/dataprovider.cxx @@ -14,6 +14,7 @@ #include <officecfg/Office/Calc.hxx> #include <rtl/strbuf.hxx> #include <sal/log.hxx> +#include <unotools/charclass.hxx> #include "htmldataprovider.hxx" #include "xmldataprovider.hxx" diff --git a/sc/source/ui/dataprovider/datatransformation.cxx b/sc/source/ui/dataprovider/datatransformation.cxx index 4295e63d2bf7..16707f51d780 100644 --- a/sc/source/ui/dataprovider/datatransformation.cxx +++ b/sc/source/ui/dataprovider/datatransformation.cxx @@ -15,6 +15,7 @@ #include <tools/datetime.hxx> #include <svl/zforlist.hxx> #include <globalnames.hxx> +#include <unotools/charclass.hxx> namespace { diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index 7eda996e841d..dbf04283986e 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -23,6 +23,7 @@ #include <cassert> #include <comphelper/string.hxx> +#include <unotools/charclass.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index 6461f802c126..12a082d88cec 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -23,6 +23,7 @@ #include <sfx2/linkmgr.hxx> #include <svl/stritem.hxx> #include <vcl/weld.hxx> +#include <unotools/charclass.hxx> #include <arealink.hxx> diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index b374d94cd34e..b2270a2bd80c 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -25,6 +25,7 @@ #include <svx/svdpage.hxx> #include <svx/svdoole2.hxx> #include <com/sun/star/sdb/CommandType.hpp> +#include <unotools/charclass.hxx> #include <dbdocfun.hxx> #include <sc.hrc> diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 6642cffdaf16..438e97578461 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -31,6 +31,7 @@ #include <o3tl/make_unique.hxx> #include <svx/svdocapt.hxx> #include <sal/log.hxx> +#include <unotools/charclass.hxx> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/script/ModuleType.hpp> diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index e29a9ccf172c..56dde155c812 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -60,6 +60,7 @@ using namespace ::com::sun::star; #include <unotools/securityoptions.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <sal/log.hxx> +#include <unotools/charclass.hxx> #include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 01a6fe6a906b..54dbfbd115a6 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -27,6 +27,7 @@ #include <vcl/waitobj.hxx> #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> +#include <unotools/charclass.hxx> #include <com/sun/star/script/vba/XVBACompatibility.hpp> diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 23af4d5af667..8a40750ae63c 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -28,6 +28,8 @@ #include <ucbhelper/content.hxx> #include <svx/txenctab.hxx> #include <unotools/sharedunocomponent.hxx> +#include <unotools/charclass.hxx> +#include <rtl/character.hxx> #include <rtl/tencinfo.h> #include <sal/log.hxx> diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index f4ecb3879833..c7086d6b70d1 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -52,6 +52,7 @@ #include <svl/sharedstringpool.hxx> #include <sfx2/linkmgr.hxx> #include <tools/urlobj.hxx> +#include <unotools/charclass.hxx> #include <unotools/configmgr.hxx> #include <unotools/ucbhelper.hxx> #include <vcl/svapp.hxx> diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index a8e3b58130a1..5f7e6375c7c0 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -25,6 +25,7 @@ #include <sfx2/mieclip.hxx> #include <com/sun/star/i18n/CalendarFieldIndex.hpp> #include <sal/log.hxx> +#include <unotools/charclass.hxx> #include <global.hxx> #include <scerrors.hxx> diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx index 2470e3027ed0..48cf3a38a970 100644 --- a/sc/source/ui/docshell/servobj.cxx +++ b/sc/source/ui/docshell/servobj.cxx @@ -26,6 +26,7 @@ #include <brdcst.hxx> #include <rangenam.hxx> #include <sc.hrc> +#include <unotools/charclass.hxx> using namespace formula; diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index 8e9ec64643ae..ddf42b027741 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -12,6 +12,7 @@ #include <vcl/settings.hxx> #include <formula/errorcodes.hxx> #include <sfx2/app.hxx> +#include <unotools/charclass.hxx> #include <compiler.hxx> #include <document.hxx> diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index f7e9d0cd2c6d..fd3f8588c6e5 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -37,6 +37,7 @@ #include <vcl/settings.hxx> #include <formula/errorcodes.hxx> #include <o3tl/make_unique.hxx> +#include <unotools/charclass.hxx> #include <map> diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index a1841381fe4c..eb598412b177 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -20,6 +20,7 @@ #include <globalnames.hxx> #include <sfx2/app.hxx> +#include <unotools/charclass.hxx> #define ITEMID_NAME 1 #define ITEMID_RANGE 2 diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 7644e148620e..ebbdcea7f80d 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -34,6 +34,7 @@ #include <svtools/treelistentry.hxx> #include <stdlib.h> #include <sal/log.hxx> +#include <unotools/charclass.hxx> #include <content.hxx> #include <navipi.hxx> diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index f6e5d3ca626a..45047082faca 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -19,6 +19,7 @@ #include <sfx2/app.hxx> #include <svx/svdundo.hxx> +#include <unotools/charclass.hxx> #include <undodat.hxx> #include <undoutil.hxx> diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index bba8f6212d27..a268d9c264db 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -23,6 +23,7 @@ #include <svl/zforlist.hxx> #include <svl/sharedstringpool.hxx> #include <vcl/svapp.hxx> +#include <unotools/charclass.hxx> #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index b0c564daff49..f10fd52d4086 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -21,6 +21,7 @@ #include <sfx2/app.hxx> #include <svl/itemprop.hxx> #include <svl/sharedstringpool.hxx> +#include <unotools/charclass.hxx> #include <scitems.hxx> #include <funcuno.hxx> diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 61674c9751d1..0c92d9a0f7dc 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -26,6 +26,7 @@ #include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> +#include <unotools/charclass.hxx> using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index 03c5f5f4fcef..140b481868ea 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -21,6 +21,7 @@ #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> #include <vcl/weld.hxx> +#include <unotools/charclass.hxx> #include <com/sun/star/sdbc/XResultSet.hpp> diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 741e672158bf..42e4f2cfa4a1 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -55,6 +55,7 @@ #include <vcl/settings.hxx> #include <o3tl/make_unique.hxx> #include <sal/log.hxx> +#include <unotools/charclass.hxx> #include <output.hxx> #include <document.hxx> diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index b1171ef2573e..7e5c54aecd46 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -40,6 +40,7 @@ #include <vcl/wrkwin.hxx> #include <o3tl/make_unique.hxx> #include <stdlib.h> +#include <unotools/charclass.hxx> #include <viewfunc.hxx> #include <tabvwsh.hxx> diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx index 52ff6924f3a7..2fe57cea1356 100644 --- a/scaddins/source/analysis/analysis.cxx +++ b/scaddins/source/analysis/analysis.cxx @@ -31,6 +31,7 @@ #include <sal/macros.h> #include <string.h> #include <unotools/resmgr.hxx> +#include <unotools/charclass.hxx> #include <algorithm> #include <cmath> #include <float.h> diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx index ae626c9fcaf5..860b63571780 100644 --- a/scaddins/source/datefunc/datefunc.cxx +++ b/scaddins/source/datefunc/datefunc.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <rtl/ustrbuf.hxx> #include <unotools/resmgr.hxx> +#include <unotools/charclass.hxx> #include <algorithm> #include "deffuncname.hxx" diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx index 51a76f216663..58ce64fb2ce5 100644 --- a/scaddins/source/pricing/pricing.cxx +++ b/scaddins/source/pricing/pricing.cxx @@ -35,6 +35,7 @@ #include <rtl/math.hxx> #include <rtl/ustrbuf.hxx> #include <unotools/resmgr.hxx> +#include <i18nlangtag/languagetag.hxx> using namespace ::com::sun::star; using namespace sca::pricing; diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index da736e59f8ac..e610fe222875 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -30,6 +30,7 @@ #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <svtools/treelistentry.hxx> +#include <unotools/charclass.hxx> // SdCustomShowDlg SdCustomShowDlg::SdCustomShowDlg(weld::Window* pWindow, SdDrawDocument& rDrawDoc) diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index 120c3c426889..cbd70f1a325a 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -39,6 +39,7 @@ #include <fupoor.hxx> #include <vcl/svapp.hxx> #include <vcl/virdev.hxx> +#include <rtl/character.hxx> namespace sd { diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 0dad602c85b1..4fc4a651d73b 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -63,6 +63,7 @@ #include <svtools/sfxecode.hxx> #include <unotools/syslocale.hxx> +#include <unotools/charclass.hxx> #include <sfx2/sfxhelp.hxx> #include <sfx2/docfilt.hxx> diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 78d21ebeba20..54124d7bc304 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -28,6 +28,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/sequenceashashmap.hxx> #include <unotools/intlwrapper.hxx> +#include <unotools/collatorwrapper.hxx> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/shell/source/win32/simplemail/senddoc.cxx b/shell/source/win32/simplemail/senddoc.cxx index fc56630504c6..04cb153a2b4f 100644 --- a/shell/source/win32/simplemail/senddoc.cxx +++ b/shell/source/win32/simplemail/senddoc.cxx @@ -24,6 +24,7 @@ #include <rtl/bootstrap.hxx> #include <sfx2/strings.hrc> #include <unotools/resmgr.hxx> +#include <i18nlangtag/languagetag.hxx> #include <wchar.h> #define WIN32_LEAN_AND_MEAN diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx index 87e324b4eeb5..db138566f90c 100644 --- a/shell/source/win32/simplemail/smplmailclient.cxx +++ b/shell/source/win32/simplemail/smplmailclient.cxx @@ -32,6 +32,7 @@ #include <tools/urlobj.hxx> #include <unotools/pathoptions.hxx> #include <unotools/syslocale.hxx> +#include <i18nlangtag/languagetag.hxx> #define WIN32_LEAN_AND_MEAN #include <windows.h> diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 71f9a3a4dce6..a76685d757e0 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -19,6 +19,8 @@ #include <memory> #include <com/sun/star/i18n/UnicodeType.hpp> +#include <com/sun/star/i18n/KParseTokens.hpp> +#include <com/sun/star/i18n/KParseType.hpp> #include <config_global.h> #include <i18nlangtag/lang.h> #include <tools/lineend.hxx> @@ -26,6 +28,7 @@ #include <unotools/syslocale.hxx> #include <o3tl/make_unique.hxx> #include <sal/log.hxx> +#include <rtl/character.hxx> #include <parse.hxx> #include <strings.hrc> #include <smmod.hxx> diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx index abf5729fd56d..23590b2e93bd 100644 --- a/svl/source/config/languageoptions.cxx +++ b/svl/source/config/languageoptions.cxx @@ -27,6 +27,8 @@ #include <rtl/instance.hxx> #include <com/sun/star/i18n/ScriptType.hpp> #include <unotools/syslocale.hxx> +#include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/uno/Sequence.hxx> #ifdef _WIN32 #if !defined WIN32_LEAN_AND_MEAN diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index 59140e770717..63ae92c13608 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -24,6 +24,7 @@ #include <sal/log.hxx> #include <tools/date.hxx> #include <rtl/math.hxx> +#include <rtl/character.hxx> #include <unotools/charclass.hxx> #include <unotools/calendarwrapper.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 414084b4e89b..604d4226a241 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -33,6 +33,8 @@ #include <unotools/calendarwrapper.hxx> #include <com/sun/star/i18n/KNumberFormatUsage.hpp> #include <com/sun/star/i18n/KNumberFormatType.hpp> +#include <com/sun/star/i18n/FormatElement.hpp> +#include <com/sun/star/i18n/Currency2.hpp> #include <comphelper/processfactory.hxx> #include <unotools/misccfg.hxx> diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx index b84e79243485..5fd83ff7027d 100644 --- a/svtools/source/config/htmlcfg.cxx +++ b/svtools/source/config/htmlcfg.cxx @@ -30,6 +30,7 @@ #include <rtl/instance.hxx> #include <list> #include <o3tl/typed_flags_set.hxx> +#include <com/sun/star/uno/Sequence.hxx> enum class HtmlCfgFlags { NONE = 0x000, diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index d769a2321714..be2282ee9710 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -72,6 +72,7 @@ #include <salhelper/timer.hxx> #include <vcl/svapp.hxx> #include <vcl/builderfactory.hxx> +#include <unotools/collatorwrapper.hxx> #include <unotools/ucbhelper.hxx> #include <unotools/intlwrapper.hxx> #include <unotools/syslocale.hxx> diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index 5ba340c2efc3..9b2e200eebe5 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -31,6 +31,7 @@ #include <svtools/svtresid.hxx> #include <svtools/langtab.hxx> #include <unotools/syslocale.hxx> +#include <unotools/charclass.hxx> #include <tools/resary.hxx> #include <officecfg/VCL.hxx> #include <langtab.hrc> diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index ae382dbb437c..dd94023011de 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -31,6 +31,7 @@ #include <svtools/imapcirc.hxx> #include <svtools/imappoly.hxx> #include <svl/urihelper.hxx> +#include <rtl/character.hxx> #include <sstream> diff --git a/svtools/source/table/cellvalueconversion.cxx b/svtools/source/table/cellvalueconversion.cxx index ac663a61fc0a..2c821db21c09 100644 --- a/svtools/source/table/cellvalueconversion.cxx +++ b/svtools/source/table/cellvalueconversion.cxx @@ -34,6 +34,7 @@ #include <tools/time.hxx> #include <tools/diagnose_ex.h> #include <unotools/syslocale.hxx> +#include <i18nlangtag/languagetag.hxx> #include <comphelper/processfactory.hxx> #include <memory> diff --git a/svx/source/dialog/hexcolorcontrol.cxx b/svx/source/dialog/hexcolorcontrol.cxx index 71e69a5fe618..6f662565b0f7 100644 --- a/svx/source/dialog/hexcolorcontrol.cxx +++ b/svx/source/dialog/hexcolorcontrol.cxx @@ -18,6 +18,7 @@ */ #include <svx/hexcolorcontrol.hxx> +#include <rtl/character.hxx> namespace weld { diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx index 50d30afdc025..7d503519650f 100644 --- a/svx/source/form/fmcontrollayout.cxx +++ b/svx/source/form/fmcontrollayout.cxx @@ -34,6 +34,7 @@ #include <i18nlangtag/mslangid.hxx> #include <i18nlangtag/languagetag.hxx> #include <unotools/syslocale.hxx> +#include <unotools/localedatawrapper.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/debug.hxx> diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index b20982811fd9..e65524194958 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -22,6 +22,7 @@ #include <basic/sbxvar.hxx> #include <rtl/math.hxx> #include <unotools/intlwrapper.hxx> +#include <unotools/localedatawrapper.hxx> #include <com/sun/star/chart/ChartAxisArrangeOrderType.hpp> #include <float.h> diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx index d4a446a0e07c..0c1bd9f14448 100644 --- a/svx/source/sidebar/line/LineWidthPopup.cxx +++ b/svx/source/sidebar/line/LineWidthPopup.cxx @@ -18,6 +18,7 @@ */ #include <svx/sidebar/LineWidthPopup.hxx> #include <svx/sidebar/LinePropertyPanelBase.hxx> +#include <com/sun/star/beans/NamedValue.hpp> #include <svx/dialmgr.hxx> #include <svx/strings.hrc> #include <svx/xlnwtit.hxx> diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index ac7ec1328437..bf65e6f37585 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -68,6 +68,7 @@ #include <svx/xlnwtit.hxx> #include <svx/xpoly.hxx> #include <unotools/syslocale.hxx> +#include <unotools/localedatawrapper.hxx> #include <o3tl/make_unique.hxx> diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx index b62aae338eae..f0dafbba943b 100644 --- a/svx/source/svdraw/svdtrans.cxx +++ b/svx/source/svdraw/svdtrans.cxx @@ -25,6 +25,7 @@ #include <vcl/virdev.hxx> #include <tools/bigint.hxx> #include <unotools/syslocale.hxx> +#include <unotools/localedatawrapper.hxx> #include <sal/log.hxx> void MoveXPoly(XPolygon& rPoly, const Size& S) diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx index eb880bf8dba2..5295c93f641e 100644 --- a/sw/inc/AnnotationWin.hxx +++ b/sw/inc/AnnotationWin.hxx @@ -22,6 +22,7 @@ #include <basegfx/range/b2drange.hxx> #include <tools/date.hxx> +#include <tools/time.hxx> #include <vcl/builder.hxx> #include <vcl/window.hxx> diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx index 06e22ce090de..b61be8fe83aa 100644 --- a/sw/source/core/bastyp/calc.cxx +++ b/sw/source/core/bastyp/calc.cxx @@ -50,6 +50,8 @@ #include <unotools/useroptions.hxx> #include <usrfld.hxx> #include <viewsh.hxx> +#include <com/sun/star/i18n/KParseTokens.hpp> +#include <com/sun/star/i18n/KParseType.hpp> using namespace ::com::sun::star; diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx index 73f6feee297a..2804371cd724 100644 --- a/sw/source/core/crsr/findtxt.cxx +++ b/sw/source/core/crsr/findtxt.cxx @@ -20,6 +20,7 @@ #include <memory> #include <com/sun/star/util/SearchFlags.hpp> +#include <com/sun/star/util/SearchResult.hpp> #include <comphelper/lok.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index 6aadff92cf86..3766facb5cc1 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -18,6 +18,7 @@ */ #include <hintids.hxx> +#include <rtl/character.hxx> #include <vcl/vclenum.hxx> #include <editeng/crossedoutitem.hxx> #include <editeng/colritem.hxx> diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx index 5537fc36ea92..cb39faeb6eba 100644 --- a/sw/source/core/fields/usrfld.cxx +++ b/sw/source/core/fields/usrfld.cxx @@ -25,6 +25,7 @@ #include <svl/zforlist.hxx> #include <svl/zformat.hxx> +#include <unotools/charclass.hxx> #include <svx/svdmodel.hxx> diff --git a/sw/source/core/unocore/XMLRangeHelper.cxx b/sw/source/core/unocore/XMLRangeHelper.cxx index 38515ee84edb..dfc48e80a145 100644 --- a/sw/source/core/unocore/XMLRangeHelper.cxx +++ b/sw/source/core/unocore/XMLRangeHelper.cxx @@ -19,6 +19,7 @@ #include "XMLRangeHelper.hxx" #include <unotools/charclass.hxx> +#include <rtl/character.hxx> #include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index e655dd34e569..426e3c9c8d72 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -77,6 +77,7 @@ #include "htmlfly.hxx" #include <numrule.hxx> #include <rtl/strbuf.hxx> +#include <rtl/character.hxx> #include <svtools/HtmlWriter.hxx> diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 5595a31f35cc..527b9fcba0c5 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -35,6 +35,8 @@ #include <svl/zforlist.hxx> #include <svl/zformat.hxx> #include <sfx2/linkmgr.hxx> +#include <rtl/character.hxx> +#include <unotools/charclass.hxx> #include <ucbhelper/content.hxx> #include <ucbhelper/commandenvironment.hxx> diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index c9b0063d86d3..0f77186c9f6b 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -33,6 +33,7 @@ #include <ndtxt.hxx> #include <unotools/configmgr.hxx> #include <unotools/syslocaleoptions.hxx> +#include <unotools/charclass.hxx> #include <comphelper/string.hxx> diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 3d0c7c5f88ee..81af597d8951 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -113,6 +113,7 @@ #include <connectivity/dbtools.hxx> #include <connectivity/dbconversion.hxx> #include <o3tl/make_unique.hxx> +#include <unotools/charclass.hxx> #include <unomailmerge.hxx> #include <sfx2/event.hxx> diff --git a/sw/source/uibase/misc/glosdoc.cxx b/sw/source/uibase/misc/glosdoc.cxx index 8ed038e9c590..6fe5b9480fda 100644 --- a/sw/source/uibase/misc/glosdoc.cxx +++ b/sw/source/uibase/misc/glosdoc.cxx @@ -25,6 +25,7 @@ #include <vcl/errinf.hxx> #include <osl/diagnose.h> +#include <rtl/character.hxx> #include <svl/urihelper.hxx> #include <svl/fstathelper.hxx> #include <unotools/pathoptions.hxx> diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx index 956e76c9f646..13f201c69c84 100644 --- a/sw/source/uibase/uno/unoatxt.cxx +++ b/sw/source/uibase/uno/unoatxt.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <osl/diagnose.h> +#include <rtl/character.hxx> #include <vcl/svapp.hxx> #include <svtools/unoevent.hxx> #include <svl/urihelper.hxx> diff --git a/sw/source/uibase/wrtsh/delete.cxx b/sw/source/uibase/wrtsh/delete.cxx index 074cb0c23b62..d15a46db78b3 100644 --- a/sw/source/uibase/wrtsh/delete.cxx +++ b/sw/source/uibase/wrtsh/delete.cxx @@ -23,6 +23,7 @@ #include <view.hxx> #include <drawbase.hxx> #include <unobaseclass.hxx> +#include <rtl/character.hxx> inline void SwWrtShell::OpenMark() { diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index b59d4ce0e22d..a81b4a911664 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/text/WritingMode2.hpp> #include <com/sun/star/io/XMarkableStream.hpp> +#include <com/sun/star/i18n/Currency2.hpp> #include <toolkit/controls/unocontrolmodel.hxx> #include <toolkit/helper/macros.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index e7cebb526beb..41e68c4eac37 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -26,6 +26,7 @@ #include <tools/debug.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/frame/XFrame.hpp> #include <cppuhelper/weakref.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/instance.hxx> diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx index ce4ed63b8430..469a944b9e8f 100644 --- a/unotools/source/config/compatibility.cxx +++ b/unotools/source/config/compatibility.cxx @@ -25,6 +25,9 @@ #include <sal/log.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/lang/Locale.hpp> +#include <i18nlangtag/languagetag.hxx> #include "itemholder1.hxx" diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx index 66d44cdc8301..db0861b4bc2f 100644 --- a/unotools/source/config/confignode.cxx +++ b/unotools/source/config/confignode.cxx @@ -27,9 +27,12 @@ #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/util/XChangesBatch.hpp> #include <com/sun/star/util/XStringEscape.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XNamed.hpp> +#include <com/sun/star/container/XNameContainer.hpp> +#include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <comphelper/namedvaluecollection.hxx> #include <rtl/string.hxx> #if OSL_DEBUG_LEVEL > 0 diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx index 71a5e8713686..1d2d751314b4 100644 --- a/unotools/source/config/dynamicmenuoptions.cxx +++ b/unotools/source/config/dynamicmenuoptions.cxx @@ -27,6 +27,7 @@ #include <tools/debug.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/beans/PropertyValue.hpp> #include <vector> diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index 4f48ade2c34b..959d96e1e49b 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -34,6 +34,7 @@ #include "itemholder1.hxx" #include <algorithm> +#include <unordered_map> using namespace ::std; using namespace ::utl; diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx index 89f9ab5094cb..9f796ff88fc4 100644 --- a/unotools/source/config/fontcfg.cxx +++ b/unotools/source/config/fontcfg.cxx @@ -18,6 +18,7 @@ */ #include <i18nlangtag/mslangid.hxx> +#include <i18nlangtag/languagetag.hxx> #include <o3tl/any.hxx> #include <unotools/configmgr.hxx> #include <unotools/fontcfg.hxx> @@ -27,6 +28,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> +#include <com/sun/star/container/XNameAccess.hpp> #include <comphelper/propertysequence.hxx> #include <unotools/configpaths.hxx> #include <unotools/syslocale.hxx> diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx index 1f528bd428cb..6227fb2ac095 100644 --- a/unotools/source/config/historyoptions.cxx +++ b/unotools/source/config/historyoptions.cxx @@ -30,6 +30,7 @@ #include "itemholder1.hxx" +#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx index 784f2ba7b760..c0444dc9f1ec 100644 --- a/unotools/source/config/itemholder1.cxx +++ b/unotools/source/config/itemholder1.cxx @@ -45,6 +45,7 @@ #include <unotools/options.hxx> #include <unotools/syslocaleoptions.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> ItemHolder1::ItemHolder1() : ItemHolderMutexBase() diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 17749604a675..e32e2f05a47d 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -22,10 +22,12 @@ #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XNameReplace.hpp> +#include <com/sun/star/util/XChangesBatch.hpp> #include <rtl/instance.hxx> #include <sal/log.hxx> #include <osl/mutex.hxx> @@ -33,6 +35,7 @@ #include <i18nlangtag/mslangid.hxx> #include <i18nlangtag/languagetag.hxx> #include <tools/debug.hxx> +#include <unotools/configitem.hxx> #include <unotools/lingucfg.hxx> #include <unotools/linguprops.hxx> #include <sal/macros.h> diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx index 5f9b744c3d27..1876855d1008 100644 --- a/unotools/source/config/syslocaleoptions.cxx +++ b/unotools/source/config/syslocaleoptions.cxx @@ -24,6 +24,7 @@ #include <i18nlangtag/mslangid.hxx> #include <i18nlangtag/languagetag.hxx> #include <tools/debug.hxx> +#include <tools/link.hxx> #include <unotools/syslocaleoptions.hxx> #include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx index 62ede8962c24..c0aa160b4264 100644 --- a/unotools/source/config/useroptions.cxx +++ b/unotools/source/config/useroptions.cxx @@ -41,6 +41,7 @@ #include <comphelper/configurationhelper.hxx> #include <comphelper/processfactory.hxx> #include <i18nlangtag/mslangid.hxx> +#include <i18nlangtag/languagetag.hxx> #include <o3tl/enumarray.hxx> #include <tools/diagnose_ex.h> diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index 752f29e4fee6..3eb5584a6dcd 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -20,6 +20,7 @@ #include <unotools/viewoptions.hxx> #include <com/sun/star/uno/Any.hxx> +#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -28,6 +29,7 @@ #include <osl/diagnose.h> #include <sal/log.hxx> #include <unotools/configpaths.hxx> +#include <unotools/configmgr.hxx> #include <comphelper/configurationhelper.hxx> #include <comphelper/processfactory.hxx> diff --git a/unotools/source/i18n/intlwrapper.cxx b/unotools/source/i18n/intlwrapper.cxx index fb5ee4c9d0ce..bded270a5d81 100644 --- a/unotools/source/i18n/intlwrapper.cxx +++ b/unotools/source/i18n/intlwrapper.cxx @@ -18,6 +18,8 @@ */ #include <unotools/intlwrapper.hxx> +#include <unotools/collatorwrapper.hxx> +#include <unotools/localedatawrapper.hxx> #include <com/sun/star/i18n/CollatorOptions.hpp> #include <i18nlangtag/mslangid.hxx> #include <comphelper/processfactory.hxx> diff --git a/unotools/source/misc/ZipPackageHelper.cxx b/unotools/source/misc/ZipPackageHelper.cxx index 21388015a01b..f0d6a2156705 100644 --- a/unotools/source/misc/ZipPackageHelper.cxx +++ b/unotools/source/misc/ZipPackageHelper.cxx @@ -28,6 +28,9 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/util/XChangesBatch.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/container/XHierarchicalNameAccess.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <unotools/ZipPackageHelper.hxx> #include <comphelper/storagehelper.hxx> diff --git a/unotools/source/misc/eventlisteneradapter.cxx b/unotools/source/misc/eventlisteneradapter.cxx index 1a952a121532..ac3dbe9c615e 100644 --- a/unotools/source/misc/eventlisteneradapter.cxx +++ b/unotools/source/misc/eventlisteneradapter.cxx @@ -21,6 +21,7 @@ #include <vector> +#include <com/sun/star/lang/XComponent.hpp> #include <unotools/eventlisteneradapter.hxx> #include <osl/diagnose.h> #include <cppuhelper/implbase.hxx> diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx index ea49af1d0f29..8a47fdb27495 100644 --- a/unotools/source/misc/fontcvt.cxx +++ b/unotools/source/misc/fontcvt.cxx @@ -19,6 +19,7 @@ #include <sal/config.h> +#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <unotools/fontcvt.hxx> #include <unotools/fontdefs.hxx> diff --git a/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx index 98a17f063f8c..c9a11e7d817d 100644 --- a/unotools/source/misc/syslocale.cxx +++ b/unotools/source/misc/syslocale.cxx @@ -20,6 +20,8 @@ #include <sal/config.h> #include <sal/log.hxx> +#include <unotools/localedatawrapper.hxx> +#include <unotools/charclass.hxx> #include <unotools/configmgr.hxx> #include <unotools/syslocale.hxx> #include <unotools/syslocaleoptions.hxx> diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx index 9fd03b5dc683..d788d7382428 100644 --- a/vcl/source/font/PhysicalFontCollection.cxx +++ b/vcl/source/font/PhysicalFontCollection.cxx @@ -20,6 +20,7 @@ #include <memory> #include <map> +#include <i18nlangtag/languagetag.hxx> #include <i18nlangtag/mslangid.hxx> #include <unotools/configmgr.hxx> #include <unotools/fontdefs.hxx> diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx index 43db6dea1493..f4a3b7136897 100644 --- a/vcl/source/window/mnemonic.cxx +++ b/vcl/source/window/mnemonic.cxx @@ -25,6 +25,7 @@ #include <vcl/unohelp.hxx> #include <com/sun/star/i18n/XCharacterClassification.hpp> #include <i18nlangtag/mslangid.hxx> +#include <rtl/character.hxx> using namespace ::com::sun::star; diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx index 8c24155fbac6..f8d0200a1074 100644 --- a/writerfilter/source/dmapper/SdtHelper.cxx +++ b/writerfilter/source/dmapper/SdtHelper.cxx @@ -12,6 +12,8 @@ #include <com/sun/star/drawing/XControlShape.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/text/VertOrientation.hpp> +#include <com/sun/star/util/DateTime.hpp> +#include <com/sun/star/util/Date.hpp> #include <sal/log.hxx> #include <cppuhelper/exc_hlp.hxx> #include <editeng/unoprnms.hxx> diff --git a/writerperfect/source/writer/EPUBExportDialog.hxx b/writerperfect/source/writer/EPUBExportDialog.hxx index 819022531b13..6d228130adc4 100644 --- a/writerperfect/source/writer/EPUBExportDialog.hxx +++ b/writerperfect/source/writer/EPUBExportDialog.hxx @@ -11,6 +11,7 @@ #define INCLUDED_WRITERPERFECT_SOURCE_WRITER_EPUBEXPORTDIALOG_HXX #include <vcl/weld.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> namespace comphelper { diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx index 736835056b9d..5f9afe16c187 100644 --- a/xmloff/source/core/DomExport.cxx +++ b/xmloff/source/core/DomExport.cxx @@ -38,6 +38,7 @@ #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> #include <vector> diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx index 9bdd251b93f5..ea90734c99e0 100644 --- a/xmloff/source/core/RDFaExportHelper.cxx +++ b/xmloff/source/core/RDFaExportHelper.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/rdf/XDocumentRepository.hpp> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <functional> #include <algorithm> diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx index 059e0fddab70..72938424411a 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -54,6 +54,7 @@ #include <o3tl/any.hxx> #include <sax/tools/converter.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include "sdxmlexp_impl.hxx" diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx index abb2a0266622..420fb2180ab2 100644 --- a/xmloff/source/draw/animexp.cxx +++ b/xmloff/source/draw/animexp.cxx @@ -24,6 +24,7 @@ #include <sax/tools/converter.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> #include <list> #include <comphelper/extract.hxx> diff --git a/xmloff/source/draw/layerexp.cxx b/xmloff/source/draw/layerexp.cxx index 72f6b1d84635..a28599856f9f 100644 --- a/xmloff/source/draw/layerexp.cxx +++ b/xmloff/source/draw/layerexp.cxx @@ -27,6 +27,7 @@ #include <xmloff/xmlement.hxx> #include <xmloff/nmspmap.hxx> #include "layerexp.hxx" +#include <osl/diagnose.h> using ::com::sun::star::uno::Reference; diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 8163386e13b1..23f35442eae5 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -53,6 +53,7 @@ #include <com/sun/star/util/MeasureUnit.hpp> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> #include <tools/gen.hxx> #include <sax/tools/converter.hxx> #include <xmloff/xmlaustp.hxx> diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx index 23eec3b5b8e4..b10633fdb83f 100644 --- a/xmloff/source/draw/xexptran.cxx +++ b/xmloff/source/draw/xexptran.cxx @@ -20,6 +20,7 @@ #include <xexptran.hxx> #include <o3tl/make_unique.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <sax/tools/converter.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlexp.hxx> diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index 0760b917cbdd..906d0e1e6e5e 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -30,6 +30,7 @@ #include <comphelper/propertysetinfo.hxx> #include <comphelper/processfactory.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx index 6aa6b7979e0a..34f42cabc878 100644 --- a/xmloff/source/meta/xmlversion.cxx +++ b/xmloff/source/meta/xmlversion.cxx @@ -21,6 +21,7 @@ #include <unotools/streamwrap.hxx> #include <xmlversion.hxx> #include <xmloff/xmlmetae.hxx> +#include <osl/diagnose.h> #include <xmloff/xmltoken.hxx> #include <comphelper/processfactory.hxx> diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx index 72d550527bd1..f676af8e3467 100644 --- a/xmloff/source/script/XMLEventExport.cxx +++ b/xmloff/source/script/XMLEventExport.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/container/XNameReplace.hpp> #include <tools/debug.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> #include <xmloff/xmlexp.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx index db9e1d8dac6e..4e835bf68a6e 100644 --- a/xmloff/source/style/numehelp.cxx +++ b/xmloff/source/style/numehelp.cxx @@ -32,6 +32,7 @@ #include <sax/tools/converter.hxx> #include <rtl/math.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> using namespace com::sun::star; using namespace xmloff::token; diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx index be82525c4566..139e26a2182c 100644 --- a/xmloff/source/style/xmlaustp.cxx +++ b/xmloff/source/style/xmlaustp.cxx @@ -30,6 +30,7 @@ #include <xmloff/PageMasterStyleMap.hxx> #include "PageMasterExportPropMapper.hxx" #include <XMLBackgroundImageExport.hxx> +#include <osl/diagnose.h> using namespace ::std; diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index 5cb4f9b02e1d..fc05262c9845 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/beans/TolerantPropertySetResultType.hpp> #include <rtl/ustrbuf.hxx> #include <cppuhelper/weakref.hxx> +#include <osl/diagnose.h> #include <list> #include <map> diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 81df9f5262a9..14ffebb3c81d 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/lang/Locale.hpp> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> #include <tools/color.hxx> #include <sax/tools/converter.hxx> diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx index 9fde295abfee..28ae1d70d8fa 100644 --- a/xmloff/source/style/xmltabe.cxx +++ b/xmloff/source/style/xmltabe.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/style/TabStop.hpp> #include <com/sun/star/style/TabAlign.hpp> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <xmloff/nmspmap.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/text/XMLAutoTextEventExport.cxx b/xmloff/source/text/XMLAutoTextEventExport.cxx index 0853e44d78b4..f331f73bbb8f 100644 --- a/xmloff/source/text/XMLAutoTextEventExport.cxx +++ b/xmloff/source/text/XMLAutoTextEventExport.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Exception.hpp> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx index b30fc9ba0070..672eeb4f26f9 100644 --- a/xmloff/source/text/XMLRedlineExport.cxx +++ b/xmloff/source/text/XMLRedlineExport.cxx @@ -23,6 +23,7 @@ #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/UnknownPropertyException.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx index e8c3533d5a39..38248a7a1a3d 100644 --- a/xmloff/source/text/XMLSectionExport.cxx +++ b/xmloff/source/text/XMLSectionExport.cxx @@ -21,6 +21,7 @@ #include <o3tl/any.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <vector> diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx index 39cf943b4e04..6c409b5e8d58 100644 --- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx +++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx @@ -21,6 +21,7 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmlexp.hxx> +#include <osl/diagnose.h> namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index 4d1d196189ed..3d27ac07ffeb 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -26,6 +26,7 @@ #include <rtl/ustrbuf.hxx> #include <sal/types.h> #include <sal/log.hxx> +#include <osl/diagnose.h> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XEnumeration.hpp> diff --git a/xmlsecurity/source/helper/pdfsignaturehelper.cxx b/xmlsecurity/source/helper/pdfsignaturehelper.cxx index edc154f23cb7..1f11b7856f4a 100644 --- a/xmlsecurity/source/helper/pdfsignaturehelper.cxx +++ b/xmlsecurity/source/helper/pdfsignaturehelper.cxx @@ -12,6 +12,7 @@ #include <memory> #include <com/sun/star/io/XTruncate.hpp> +#include <com/sun/star/io/XStream.hpp> #include <com/sun/star/security/CertificateValidity.hpp> #include <com/sun/star/uno/SecurityException.hpp> #include <com/sun/star/security/DocumentSignatureInformation.hpp> |