diff options
Diffstat (limited to 'cui')
106 files changed, 121 insertions, 169 deletions
diff --git a/cui/IwyuFilter_cui.yaml b/cui/IwyuFilter_cui.yaml new file mode 100644 index 000000000000..98f2bd74a1ea --- /dev/null +++ b/cui/IwyuFilter_cui.yaml @@ -0,0 +1,2 @@ +--- +assumeFilename: cui/source/options/optgenrl.cxx diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc index 5ad0ce0ec14b..903f7411bd3f 100644 --- a/cui/inc/tipoftheday.hrc +++ b/cui/inc/tipoftheday.hrc @@ -22,6 +22,7 @@ #define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) +#include <rtl/ustring.hxx> #include <tuple> /* diff --git a/cui/inc/treeopt.hrc b/cui/inc/treeopt.hrc index a7f271a016c6..ffbfaa5e5e4b 100644 --- a/cui/inc/treeopt.hrc +++ b/cui/inc/treeopt.hrc @@ -22,6 +22,10 @@ #include <sal/types.h> #include <sfx2/pageids.hxx> +#include <svx/dialogs.hrc> +#include <svx/svxids.hrc> + +#include <utility> #define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) diff --git a/cui/inc/twolines.hrc b/cui/inc/twolines.hrc index d77f9abc264e..2e63227d25cf 100644 --- a/cui/inc/twolines.hrc +++ b/cui/inc/twolines.hrc @@ -10,6 +10,10 @@ #ifndef INCLUDED_CUI_INC_TWO_LINES_HRC #define INCLUDED_CUI_INC_TWO_LINES_HRC +#include <sal/types.h> + +#include <utility> + #define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String) #define CHRDLG_ENCLOSE_NONE 0 diff --git a/cui/source/customize/SvxConfigPageHelper.cxx b/cui/source/customize/SvxConfigPageHelper.cxx index 2a707b3f5c74..b0221ca675ef 100644 --- a/cui/source/customize/SvxConfigPageHelper.cxx +++ b/cui/source/customize/SvxConfigPageHelper.cxx @@ -19,10 +19,15 @@ #include <SvxConfigPageHelper.hxx> +#include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> +#include <com/sun/star/ui/ImageType.hpp> +#include <com/sun/star/ui/ItemType.hpp> #include <comphelper/random.hxx> #include <comphelper/processfactory.hxx> +#include <svtools/imgdef.hxx> +#include <svtools/miscopt.hxx> static sal_Int16 theImageType = css::ui::ImageType::COLOR_NORMAL | diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx b/cui/source/customize/SvxNotebookbarConfigPage.cxx index 1938e8a1835e..7f7bea847e99 100644 --- a/cui/source/customize/SvxNotebookbarConfigPage.cxx +++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx @@ -66,6 +66,7 @@ #include <unotools/configmgr.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/frame/theUICommandDescription.hpp> +#include <com/sun/star/ui/ImageType.hpp> namespace uno = com::sun::star::uno; namespace frame = com::sun::star::frame; diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index c71d0d3911ed..25defd407143 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -42,6 +42,7 @@ // include interface declarations #include <com/sun/star/awt/KeyModifier.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/embed/StorageFactory.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/embed/ElementModes.hpp> diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 4d3c1e28ad1d..c745ac57942c 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -70,6 +70,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/FileSystemStorageFactory.hpp> +#include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/UnknownModuleException.hpp> #include <com/sun/star/frame/XFrames.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx index 0b2ce1a64ea7..869ada7ebef4 100644 --- a/cui/source/customize/eventdlg.hxx +++ b/cui/source/customize/eventdlg.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CUI_SOURCE_CUSTOMIZE_EVENTDLG_HXX #define INCLUDED_CUI_SOURCE_CUSTOMIZE_EVENTDLG_HXX -#include <sfx2/evntconf.hxx> #include <vcl/weld.hxx> #include <macropg.hxx> diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 00af4cd2252d..b4e1a8b38f6c 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -34,6 +34,7 @@ #include <helpids.h> #include <headertablistbox.hxx> #include "macropg_impl.hxx" +#include <svl/macitem.hxx> #include <svx/dialogs.hrc> #include <svx/svxids.hrc> #include <strings.hrc> diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx index 4c82b378ecbf..6cc202e4de53 100644 --- a/cui/source/customize/macropg_impl.hxx +++ b/cui/source/customize/macropg_impl.hxx @@ -20,6 +20,9 @@ #ifndef INCLUDED_CUI_SOURCE_CUSTOMIZE_MACROPG_IMPL_HXX #define INCLUDED_CUI_SOURCE_CUSTOMIZE_MACROPG_IMPL_HXX +#include <svl/itemset.hxx> +#include <vcl/weld.hxx> + class SvxMacroTabPage_Impl { public: diff --git a/cui/source/dialogs/SpellAttrib.hxx b/cui/source/dialogs/SpellAttrib.hxx index a106bce963b6..26921b666e82 100644 --- a/cui/source/dialogs/SpellAttrib.hxx +++ b/cui/source/dialogs/SpellAttrib.hxx @@ -19,12 +19,10 @@ #ifndef INCLUDED_CUI_SOURCE_DIALOGS_SPELLATTRIB_HXX #define INCLUDED_CUI_SOURCE_DIALOGS_SPELLATTRIB_HXX -#include <i18nlangtag/lang.h> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/linguistic2/XProofreader.hpp> -#include <tools/color.hxx> namespace svx{ struct SpellErrorDescription diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index dc2a9b4ef83e..004079eb6b8a 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -25,6 +25,7 @@ #include <sfx2/viewfrm.hxx> #include <svl/grabbagitem.hxx> #include <svl/undo.hxx> +#include <tools/debug.hxx> #include <unotools/lingucfg.hxx> #include <editeng/colritem.hxx> #include <editeng/eeitem.hxx> @@ -51,6 +52,7 @@ #include <vcl/ptrstyle.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> +#include <vcl/texteng.hxx> #include <vcl/weld.hxx> #include <osl/file.hxx> #include <editeng/optitems.hxx> diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 1972348523e4..019ee15ddf3c 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -24,11 +24,14 @@ #include <vcl/BitmapSmoothenFilter.hxx> #include <vcl/BitmapSolarizeFilter.hxx> #include <vcl/BitmapColorQuantizationFilter.hxx> +#include <vcl/settings.hxx> #include <vcl/svapp.hxx> +#include <osl/diagnose.h> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> +#include <tools/helpers.hxx> #include <cuigrfflt.hxx> #include <svx/dialogs.hrc> diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 65e6eaba89b4..7a9ee445ad92 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -29,7 +29,9 @@ #include <hldoctp.hxx> #include <hldocntp.hxx> #include <bitmaps.hlst> +#include <sfx2/app.hxx> #include <sfx2/viewfrm.hxx> +#include <svl/eitem.hxx> #include <svx/svxids.hrc> #include <dialmgr.hxx> #include <strings.hrc> diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 9ecb6f54d3b7..facbfb8f05e1 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -22,6 +22,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/docfac.hxx> #include <sfx2/docfilt.hxx> +#include <svl/stritem.hxx> #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Sequence.h> diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 50df1eff94c0..1ddc75c42b47 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -43,6 +43,7 @@ #include <strings.hrc> #include <hlmarkwn.hxx> #include <hltpbase.hxx> +#include <hlmarkwn_def.hxx> using namespace ::com::sun::star; diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 16816d7b7d1c..cf8711073c8d 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -21,6 +21,7 @@ #include <sal/config.h> #include <osl/file.hxx> +#include <sfx2/app.hxx> #include <sfx2/event.hxx> #include <sfx2/frame.hxx> #include <sfx2/viewfrm.hxx> diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index aa8d9edb417f..fa270d7d73a0 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -28,6 +28,7 @@ #include <vcl/mnemonic.hxx> #include <vcl/i18nhelp.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <vcl/builderfactory.hxx> /********************************************************************** diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index f6e5de27d0a5..5f2d9aa9671a 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -23,6 +23,7 @@ #include <svl/intitem.hxx> #include <svl/whiter.hxx> #include <sfx2/objsh.hxx> +#include <svx/flagsdef.hxx> #include <svx/svxitems.hrc> #include <svx/strarray.hxx> #include <editeng/flstitem.hxx> diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 0badc8fffd98..68267c61a122 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -26,6 +26,39 @@ #include <tools/link.hxx> #include <com/sun/star/frame/XFrame.hpp> +#include <cfgutil.hxx> +#include <cui/cuicharmap.hxx> +#include <cuifmsearch.hxx> +#include <cuigaldlg.hxx> +#include <cuigrfflt.hxx> +#include <cuihyperdlg.hxx> +#include <cuiimapwnd.hxx> +#include <cuisrchdlg.hxx> +#include <cuitabarea.hxx> +#include <cuitbxform.hxx> +#include <dlgname.hxx> +#include <dstribut.hxx> +#include <hangulhanjadlg.hxx> +#include <hyphen.hxx> +#include <insdlg.hxx> +#include <labdlg.hxx> +#include <linkdlg.hxx> +#include <multipat.hxx> +#include <optdict.hxx> +#include <passwdomdlg.hxx> +#include <pastedlg.hxx> +#include <postdlg.hxx> +#include <screenshotannotationdlg.hxx> +#include <showcols.hxx> +#include <SignatureLineDialog.hxx> +#include <SignSignatureLineDialog.hxx> +#include <SpellDialog.hxx> +#include <srchxtra.hxx> +#include <thesdlg.hxx> +#include <tipofthedaydlg.hxx> +#include <transfrm.hxx> +#include <zoom.hxx> + class SfxSingleTabDialogController; class SfxItemPool; class FmShowColsDialog; diff --git a/cui/source/inc/CommandCategoryListBox.hxx b/cui/source/inc/CommandCategoryListBox.hxx index 63dfedead272..acc353b93a73 100644 --- a/cui/source/inc/CommandCategoryListBox.hxx +++ b/cui/source/inc/CommandCategoryListBox.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CUI_SOURCE_INC_COMMANDCATEGORYLISTBOX_HXX #define INCLUDED_CUI_SOURCE_INC_COMMANDCATEGORYLISTBOX_HXX -#include <vcl/lstbox.hxx> #include <i18nutil/searchopt.hxx> #include "cfgutil.hxx" diff --git a/cui/source/inc/CustomNotebookbarGenerator.hxx b/cui/source/inc/CustomNotebookbarGenerator.hxx index 21424d0b9248..00ebec31e7a4 100644 --- a/cui/source/inc/CustomNotebookbarGenerator.hxx +++ b/cui/source/inc/CustomNotebookbarGenerator.hxx @@ -20,7 +20,8 @@ #ifndef INCLUDED_CUI_SOURCE_INC_CUSTOMNOTEBOOKBARGENERATOR_HXX #define INCLUDED_CUI_SOURCE_INC_CUSTOMNOTEBOOKBARGENERATOR_HXX -#include "cfg.hxx" +#include <com/sun/star/uno/Sequence.hxx> +#include <rtl/ustring.hxx> using namespace css::uno; @@ -41,4 +42,4 @@ public: #endif -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/FontFeaturesDialog.hxx b/cui/source/inc/FontFeaturesDialog.hxx index 0ef242c87c90..3e4157129944 100644 --- a/cui/source/inc/FontFeaturesDialog.hxx +++ b/cui/source/inc/FontFeaturesDialog.hxx @@ -15,7 +15,6 @@ #include <vcl/weld.hxx> #include <vcl/font/Feature.hxx> #include <svx/fntctrl.hxx> -#include "chardlg.hxx" #include <memory> namespace cui diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 943d19b50dd8..7f25c3fb2e68 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -20,24 +20,12 @@ #define INCLUDED_CUI_SOURCE_INC_SPELLDIALOG_HXX #include <sfx2/basedlgs.hxx> -#include <vcl/fixed.hxx> -#include <vcl/edit.hxx> -#include <vcl/lstbox.hxx> -#include <vcl/button.hxx> -#include <vcl/menubtn.hxx> -#include <vcl/decoview.hxx> -#include <vcl/image.hxx> -#include <vcl/toolbox.hxx> #include <com/sun/star/uno/Reference.hxx> #include <svx/langbox.hxx> #include <memory> -#include <svtools/svmedit.hxx> -#include <svl/lstner.hxx> -#include <vcl/fixedhyper.hxx> -#include <vcl/xtextedt.hxx> -#include <vcl/txtattr.hxx> +#include <svl/undo.hxx> #include <vcl/customweld.hxx> #include <editeng/weldeditview.hxx> #include <editeng/SpellPortions.hxx> diff --git a/cui/source/inc/SvxConfigPageHelper.hxx b/cui/source/inc/SvxConfigPageHelper.hxx index 4d0596846bd6..e78fc10cfd87 100644 --- a/cui/source/inc/SvxConfigPageHelper.hxx +++ b/cui/source/inc/SvxConfigPageHelper.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CUI_SOURCE_INC_SVXCONFIGPAGEHELPER_HXX #define INCLUDED_CUI_SOURCE_INC_SVXCONFIGPAGEHELPER_HXX -#include <vector> +#include <com/sun/star/frame/XModuleManager2.hpp> #include "cfg.hxx" diff --git a/cui/source/inc/SvxMenuConfigPage.hxx b/cui/source/inc/SvxMenuConfigPage.hxx index 8dca571c2080..309428d41c2a 100644 --- a/cui/source/inc/SvxMenuConfigPage.hxx +++ b/cui/source/inc/SvxMenuConfigPage.hxx @@ -20,21 +20,8 @@ #define INCLUDED_CUI_SOURCE_INC_SVXMENUCONFIGPAGE_HXX #include <vcl/weld.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/ui/XUIConfigurationListener.hpp> #include <com/sun/star/ui/XUIConfigurationManager.hpp> -#include <com/sun/star/ui/XImageManager.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/lang/XSingleComponentFactory.hpp> -#include <sfx2/tabdlg.hxx> -#include <memory> -#include <vector> - -#include "cfgutil.hxx" #include "cfg.hxx" //for SvxConfigPage and SaveInData class SvxMenuConfigPage : public SvxConfigPage diff --git a/cui/source/inc/SvxNotebookbarConfigPage.hxx b/cui/source/inc/SvxNotebookbarConfigPage.hxx index 56298e4edbba..a945c4b47a86 100644 --- a/cui/source/inc/SvxNotebookbarConfigPage.hxx +++ b/cui/source/inc/SvxNotebookbarConfigPage.hxx @@ -19,24 +19,13 @@ #ifndef INCLUDED_CUI_SOURCE_INC_SVXNOTEBOOKBARCONFIGPAGE_HXX #define INCLUDED_CUI_SOURCE_INC_SVXNOTEBOOKBARCONFIGPAGE_HXX -#include <libxml/xmlmemory.h> #include <libxml/parser.h> #include <vcl/weld.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/ui/XUIConfigurationListener.hpp> #include <com/sun/star/ui/XUIConfigurationManager.hpp> -#include <com/sun/star/ui/XImageManager.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/lang/XSingleComponentFactory.hpp> -#include <sfx2/tabdlg.hxx> #include <memory> #include <vector> -//#include "cfgutil.hxx" #include "cfg.hxx" //for SvxConfigPage and SaveInData class SvxNotebookbarConfigPage : public SvxConfigPage diff --git a/cui/source/inc/SvxToolbarConfigPage.hxx b/cui/source/inc/SvxToolbarConfigPage.hxx index bd0d32f3b3ea..c7e86e6a34df 100644 --- a/cui/source/inc/SvxToolbarConfigPage.hxx +++ b/cui/source/inc/SvxToolbarConfigPage.hxx @@ -20,21 +20,10 @@ #define INCLUDED_CUI_SOURCE_INC_SVXTOOLBARCONFIGPAGE_HXX #include <vcl/weld.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/ui/XUIConfigurationListener.hpp> #include <com/sun/star/ui/XUIConfigurationManager.hpp> -#include <com/sun/star/ui/XImageManager.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/lang/XSingleComponentFactory.hpp> -#include <sfx2/tabdlg.hxx> #include <memory> -#include <vector> -//#include "cfgutil.hxx" #include "cfg.hxx" //for SvxConfigPage and SaveInData class SvxToolbarConfigPage : public SvxConfigPage diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index 7ef833a8b483..adafb7448ef0 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_CUI_SOURCE_INC_ABOUT_HXX #define INCLUDED_CUI_SOURCE_INC_ABOUT_HXX +#include <vcl/bitmapex.hxx> #include <vcl/weld.hxx> class AboutDialog : public weld::DialogController diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 5601f08406a9..e61fe5199832 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -20,19 +20,12 @@ #ifndef INCLUDED_CUI_SOURCE_INC_ACCCFG_HXX #define INCLUDED_CUI_SOURCE_INC_ACCCFG_HXX -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/ui/XUIConfigurationManager.hpp> #include <com/sun/star/ui/XAcceleratorConfiguration.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <algorithm> - #include <sfx2/tabdlg.hxx> -#include <sfx2/basedlgs.hxx> #include <i18nutil/searchopt.hxx> #include "cfgutil.hxx" diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index bcb283f154e6..8d2c9ea1c0d9 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -20,9 +20,7 @@ #define INCLUDED_CUI_SOURCE_INC_AUTOCDLG_HXX #include <sfx2/tabdlg.hxx> -#include <svtools/langtab.hxx> #include <svx/langbox.hxx> -#include <tools/debug.hxx> #include <vcl/metric.hxx> #include <set> diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index 733538499ec0..92790ea285e5 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -21,8 +21,6 @@ #include <editeng/shaditem.hxx> #include <svtools/ctrlbox.hxx> -#include <vcl/field.hxx> -#include <vcl/fixed.hxx> #include <vcl/weld.hxx> #include <svtools/valueset.hxx> #include <sfx2/tabdlg.hxx> diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 140864de6126..5d6a677f8eab 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -20,22 +20,14 @@ #define INCLUDED_CUI_SOURCE_INC_CFG_HXX #include <vcl/weld.hxx> -#include <svtools/imgdef.hxx> -#include <svtools/miscopt.hxx> #include <svtools/valueset.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/ui/XUIConfigurationListener.hpp> #include <com/sun/star/ui/XUIConfigurationManager.hpp> #include <com/sun/star/ui/XImageManager.hpp> -#include <com/sun/star/ui/ImageType.hpp> -#include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/ModuleManager.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <sfx2/tabdlg.hxx> diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index e779951f95b2..8b69238cfbaf 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -26,10 +26,9 @@ #include <com/sun/star/frame/DispatchInformation.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/script/browse/XBrowseNode.hpp> -#include <vcl/timer.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> #include <vcl/weld.hxx> class Button; diff --git a/cui/source/inc/colorpicker.hxx b/cui/source/inc/colorpicker.hxx index 53f0fa611142..d20f29f87989 100644 --- a/cui/source/inc/colorpicker.hxx +++ b/cui/source/inc/colorpicker.hxx @@ -22,12 +22,9 @@ #include <sal/config.h> -#include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <rtl/ustring.hxx> -#include <sal/types.h> namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 29ac048fca86..064bc660bb2e 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -24,11 +24,7 @@ #include <salhelper/thread.hxx> #include <tools/urlobj.hxx> -#include <vcl/graph.hxx> #include <vcl/idle.hxx> -#include <svl/slstitm.hxx> -#include <vcl/transfer.hxx> -#include <vcl/GraphicObject.hxx> #include <sfx2/tabdlg.hxx> #include <svx/galctrl.hxx> #include <svx/galmisc.hxx> diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index 31b51ca47a44..b5280467334d 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -20,10 +20,7 @@ #ifndef INCLUDED_CUI_SOURCE_INC_CUIGRFFLT_HXX #define INCLUDED_CUI_SOURCE_INC_CUIGRFFLT_HXX -#include <tools/helpers.hxx> -#include <vcl/GraphicObject.hxx> #include <vcl/timer.hxx> -#include <svx/graphctl.hxx> #include <svx/dlgctrl.hxx> #include <svx/rectenum.hxx> diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index ee5f6a675856..b7f88ef013f5 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -28,7 +28,6 @@ #include <sfx2/childwin.hxx> #include <sfx2/ctrlitem.hxx> #include <sfx2/bindings.hxx> -#include <vcl/image.hxx> #include "iconcdlg.hxx" diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index 2ea91a19eb3d..204cab1e90c7 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -21,7 +21,6 @@ // include --------------------------------------------------------------- -#include <svx/optgenrl.hxx> #include <sfx2/tabdlg.hxx> #include <vcl/weld.hxx> diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx index 9a72d9de2f71..08b18187f30f 100644 --- a/cui/source/inc/cuisrchdlg.hxx +++ b/cui/source/inc/cuisrchdlg.hxx @@ -19,9 +19,8 @@ #ifndef INCLUDED_CUI_SOURCE_INC_CUISRCHDLG_HXX #define INCLUDED_CUI_SOURCE_INC_CUISRCHDLG_HXX -#include <sfx2/childwin.hxx> +#include <i18nutil/transliteration.hxx> #include <sfx2/basedlgs.hxx> -#include <svl/srchdefs.hxx> class SvxJSearchOptionsPage; diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 7ec1b38f1680..e60e718a28ce 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -21,13 +21,11 @@ #include <svtools/valueset.hxx> #include <svx/dlgctrl.hxx> -#include <svx/xfillit0.hxx> #include <svx/xflasit.hxx> #include <svx/tabarea.hxx> #include <svx/hexcolorcontrol.hxx> #include <svx/SvxColorValueSet.hxx> #include <svx/SvxPresetListBox.hxx> -#include <svx/Palette.hxx> #include <svx/PaletteManager.hxx> #include <svx/svdview.hxx> diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 34156ada68f3..f7b123502b3a 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -21,10 +21,14 @@ #define INCLUDED_CUI_SOURCE_INC_CUITABLINE_HXX #include <vector> +#include <editeng/brushitem.hxx> +#include <sfx2/tabdlg.hxx> #include <svx/svdpage.hxx> -#include <svx/tabline.hxx> #include <svx/tabarea.hxx> #include <svx/xlnasit.hxx> +#include <svx/xtable.hxx> +#include <svx/dlgctrl.hxx> +#include <vcl/customweld.hxx> enum class PageType; class ColorListBox; diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 167090f40d0c..12fe0eff140a 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -22,9 +22,7 @@ #include <rtl/ustring.hxx> #include <sfx2/basedlgs.hxx> -#include <svl/poolitem.hxx> -#include <svtools/simptabl.hxx> -#include "optpath.hxx" +#include <sfx2/tabdlg.hxx> class SvTreeListEntry; namespace svx diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx index 19f9e263361d..f1e7dbe6f718 100644 --- a/cui/source/inc/dstribut.hxx +++ b/cui/source/inc/dstribut.hxx @@ -19,8 +19,9 @@ #ifndef INCLUDED_CUI_SOURCE_INC_DSTRIBUT_HXX #define INCLUDED_CUI_SOURCE_INC_DSTRIBUT_HXX -#include <svx/dlgctrl.hxx> +#include <sfx2/tabdlg.hxx> #include <svx/dstribut_enum.hxx> +#include <vcl/weld.hxx> class SvxDistributePage : public SfxTabPage { diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index cc7572f6cf50..9754b36b7c81 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -24,7 +24,6 @@ #include <vcl/weld.hxx> #include <editeng/hangulhanja.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <editeng/unolingu.hxx> #include <com/sun/star/linguistic2/XConversionDictionaryList.hpp> #include <svtools/valueset.hxx> diff --git a/cui/source/inc/helpids.h b/cui/source/inc/helpids.h index 5f65df49d892..3ae4404c138f 100644 --- a/cui/source/inc/helpids.h +++ b/cui/source/inc/helpids.h @@ -19,8 +19,6 @@ #ifndef INCLUDED_CUI_SOURCE_INC_HELPID_HRC #define INCLUDED_CUI_SOURCE_INC_HELPID_HRC -#include <svx/svxcommands.h> - #define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME" #define HID_OFA_FONT_SUBST_CLB "CUI_HID_OFA_FONT_SUBST_CLB" #define HID_DBPATH_CTL_PATH "CUI_HID_DBPATH_CTL_PATH" diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index 30fb8f8d230a..88020df12c54 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CUI_SOURCE_INC_HLINETTP_HXX #define INCLUDED_CUI_SOURCE_INC_HLINETTP_HXX -#include <svx/hyperdlg.hxx> #include "cuihyperdlg.hxx" #include "hltpbase.hxx" diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index 3932e05ac3d8..e45baa8572f7 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <vcl/weld.hxx> -#include "hlmarkwn_def.hxx" class SvxHyperlinkTabPageBase; //# # diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index e079a3c072bf..7c88179d1477 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -19,18 +19,13 @@ #ifndef INCLUDED_CUI_SOURCE_INC_HLTPBASE_HXX #define INCLUDED_CUI_SOURCE_INC_HLTPBASE_HXX -#include <sfx2/app.hxx> #include <sfx2/tabdlg.hxx> -#include <svl/stritem.hxx> -#include <svl/eitem.hxx> #include <vcl/transfer.hxx> #include <sfx2/dispatch.hxx> -#include <sfx2/fcontnr.hxx> #include <svtools/inettbc.hxx> #include <vcl/timer.hxx> #include <vcl/waitobj.hxx> -#include <sfx2/docfile.hxx> #include <com/sun/star/frame/XFrame.hpp> #include <svx/hlnkitem.hxx> diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 61df6b92d5ec..230c22be74c2 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -20,15 +20,7 @@ #define INCLUDED_CUI_SOURCE_INC_ICONCDLG_HXX #include <rtl/ustring.hxx> -#include <vcl/ivctrl.hxx> -#include <vcl/tabpage.hxx> -#include <vcl/dialog.hxx> -#include <vcl/button.hxx> -#include <vcl/image.hxx> -#include <vcl/layout.hxx> #include <sfx2/tabdlg.hxx> -#include <sfx2/basedlgs.hxx> -#include <vector> // forward-declarations struct IconChoicePageData; diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index 555b07700b7a..ea6428eb3a67 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -20,7 +20,7 @@ #define INCLUDED_CUI_SOURCE_INC_INSRC_HXX #include <rtl/string.hxx> -#include <rtl/ustring.hxx> +#include <svx/svxdlg.hxx> #include <vcl/weld.hxx> class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public weld::GenericDialogController diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index cf60d2ad0a49..c80f848ec759 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -24,9 +24,7 @@ #include <com/sun/star/container/XNameReplace.hpp> #include <com/sun/star/util/XModifiable.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Reference.hxx> -#include <svl/macitem.hxx> #include <rtl/ustring.hxx> #include <unordered_map> diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index 14dfd7331dbe..67832c1e8cae 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CUI_SOURCE_INC_MULTIPAT_HXX #include <vcl/weld.hxx> -#include "radiobtnbox.hxx" // define ---------------------------------------------------------------- diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 70b2806e5c61..cbce3ffbb1b1 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -23,10 +23,8 @@ #include <rtl/ustring.hxx> #include <sfx2/tabdlg.hxx> #include <svx/langbox.hxx> -#include <svx/fontlb.hxx> #include <tools/color.hxx> #include <vcl/customweld.hxx> -#include <vcl/toolbox.hxx> #include <vcl/weld.hxx> class SvxNumberFormatShell; diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 183f1d7825ac..54614209a779 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -23,7 +23,6 @@ #include <memory> #include <sfx2/tabdlg.hxx> -#include <svx/Palette.hxx> #include <editeng/numdef.hxx> #include <editeng/svxenum.hxx> #include <svtools/ctrlbox.hxx> diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index 6694f200c9fa..5921dc905490 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -19,9 +19,7 @@ #ifndef INCLUDED_CUI_SOURCE_INC_OPTDICT_HXX #define INCLUDED_CUI_SOURCE_INC_OPTDICT_HXX -#include <vcl/timer.hxx> #include <vcl/weld.hxx> -#include <com/sun/star/util/Language.hpp> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <svx/langbox.hxx> diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index 8478f9bc45e0..b214115ddb0d 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -19,17 +19,10 @@ #ifndef INCLUDED_CUI_SOURCE_INC_OPTLINGU_HXX #define INCLUDED_CUI_SOURCE_INC_OPTLINGU_HXX -#include <vcl/button.hxx> -#include <vcl/fixed.hxx> -#include <vcl/toolbox.hxx> -#include <vcl/field.hxx> -#include <vcl/fixedhyper.hxx> #include <sfx2/tabdlg.hxx> -#include <svx/checklbx.hxx> #include <svx/langbox.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> namespace com{namespace sun{namespace star{ namespace beans{ diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index a5011ae00db1..aa7209a8cd56 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -24,7 +24,6 @@ #include <svx/pagenumberlistbox.hxx> #include <svx/papersizelistbox.hxx> #include <svx/frmdirlbox.hxx> -#include <editeng/svxenum.hxx> #include <i18nutil/paper.hxx> #include <svx/flagsdef.hxx> diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 572a8af058b6..bccaefeb6cac 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -19,12 +19,10 @@ #ifndef INCLUDED_CUI_SOURCE_INC_PARAGRPH_HXX #define INCLUDED_CUI_SOURCE_INC_PARAGRPH_HXX -#include <vcl/button.hxx> #include <sfx2/tabdlg.hxx> #include <svx/relfld.hxx> #include <svx/paraprev.hxx> #include <svx/frmdirlbox.hxx> -#include <svx/flagsdef.hxx> class SvxLineSpacingItem; diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 0ed50167a0e3..3efd5df17517 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -28,6 +28,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/script/browse/XBrowseNode.hpp> #include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <unordered_map> diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx index f98a7370bbd2..36a89060802e 100644 --- a/cui/source/inc/showcols.hxx +++ b/cui/source/inc/showcols.hxx @@ -21,7 +21,6 @@ #define INCLUDED_CUI_SOURCE_INC_SHOWCOLS_HXX #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XIndexContainer.hpp> #include <vcl/weld.hxx> diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index a33f411d6915..4f5c276a6714 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CUI_SOURCE_INC_SWPOSSIZETABPAGE_HXX #include <sfx2/tabdlg.hxx> -#include <svx/swframeposstrings.hxx> #include <svx/swframeexample.hxx> #include <vcl/weld.hxx> diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index 7ba0fa48bfba..42b998ae7b32 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -21,7 +21,6 @@ #include <svx/dlgctrl.hxx> #include <svx/svdobj.hxx> -#include <sfx2/basedlgs.hxx> class SdrView; diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 403250eabe55..9afb955b8e70 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -26,7 +26,8 @@ #include <sfx2/basedlgs.hxx> #include <svtools/restartdialog.hxx> -#include <vcl/fixed.hxx> +#include <vcl/tabpage.hxx> +#include <vcl/treelistbox.hxx> class SfxModule; class SfxShell; diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index c87ff087767f..f35a7bfba16a 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.hxx @@ -21,6 +21,7 @@ #include <memory> #include <sfx2/basedlgs.hxx> +#include <svl/itemset.hxx> #include <svx/zoom_def.hxx> #include <vcl/weld.hxx> diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx index 8d28a1e84c8e..8155770129b1 100644 --- a/cui/source/options/connpoolconfig.cxx +++ b/cui/source/options/connpoolconfig.cxx @@ -22,8 +22,10 @@ #include "connpooloptions.hxx" #include <svl/itemset.hxx> +#include <svx/databaseregistrationui.hxx> #include <unotools/confignode.hxx> #include <svl/eitem.hxx> +#include <svl/solar.hrc> #include <comphelper/processfactory.hxx> #include "sdbcdriverenum.hxx" diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 0603423c63ad..204abfb8f433 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -24,6 +24,8 @@ #include <vcl/builderfactory.hxx> #include "connpoolsettings.hxx" #include <svl/eitem.hxx> +#include <svl/solar.hrc> +#include <svx/databaseregistrationui.hxx> #include <strings.hrc> #include <dialmgr.hxx> diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index cfbd148a364c..ffd8f9702d39 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -20,12 +20,10 @@ #ifndef INCLUDED_CUI_SOURCE_OPTIONS_CONNPOOLOPTIONS_HXX #define INCLUDED_CUI_SOURCE_OPTIONS_CONNPOOLOPTIONS_HXX -#include <svl/solar.hrc> #include <sfx2/tabdlg.hxx> #include <vcl/fixed.hxx> #include <vcl/button.hxx> #include <vcl/field.hxx> -#include <svx/databaseregistrationui.hxx> namespace offapp diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 638908599ab1..4d409f14fdc5 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -41,6 +41,7 @@ #include <dialmgr.hxx> #include "dbregisterednamesconfig.hxx" #include <svx/dialogs.hrc> +#include <svx/databaseregistrationui.hxx> #define TAB_WIDTH1 80 diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx index 4af9678fe40d..3123a45e0b77 100644 --- a/cui/source/options/dbregisterednamesconfig.cxx +++ b/cui/source/options/dbregisterednamesconfig.cxx @@ -20,6 +20,7 @@ #include "connpooloptions.hxx" #include "dbregisterednamesconfig.hxx" #include "dbregistersettings.hxx" +#include <svx/databaseregistrationui.hxx> #include <svx/svxids.hrc> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/sdb/DatabaseContext.hpp> diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index 69e753f9828c..0e66ebfd6b0c 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -21,7 +21,6 @@ #define INCLUDED_CUI_SOURCE_OPTIONS_DOCLINKDIALOG_HXX #include <vcl/weld.hxx> -#include <vcl/fixed.hxx> #include <svtools/inettbc.hxx> namespace svx diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 238e8b3dedcb..b80dc786dcf9 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -21,6 +21,7 @@ #include <officecfg/Office/Common.hxx> #include <svtools/ctrltool.hxx> +#include <vcl/fixed.hxx> #include <vcl/svlbitm.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index 214ba17c1561..3bbde2c4cad5 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -23,9 +23,7 @@ #include <svtools/ctrlbox.hxx> #include <svtools/simptabl.hxx> #include <vcl/treelistentry.hxx> -#include <vcl/fixed.hxx> #include <vcl/layout.hxx> -#include <vcl/toolbox.hxx> // class SvxFontSubstCheckListBox ------------------------------------------ diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index eed7400de050..5591f40e43db 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -11,12 +11,11 @@ #define INCLUDED_CUI_SOURCE_OPTIONS_OPTABOUTCONFIG_HXX #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/beans/NamedValue.hpp> #include <i18nutil/searchopt.hxx> -#include <sfx2/tabdlg.hxx> #include <svtools/simptabl.hxx> -#include <vcl/edit.hxx> +#include <vcl/dialog.hxx> +#include <vcl/weld.hxx> #include <vector> diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx index 5f4dc18206a5..359a2a286ab4 100644 --- a/cui/source/options/optaccessibility.hxx +++ b/cui/source/options/optaccessibility.hxx @@ -21,8 +21,6 @@ #include <sfx2/tabdlg.hxx> #include <vcl/button.hxx> -#include <vcl/fixed.hxx> -#include <vcl/field.hxx> class SvxAccessibilityOptionsTabPage : public SfxTabPage { diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index ea96b8bfbde6..f53e30f1b40d 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -20,6 +20,7 @@ #include <unotools/pathoptions.hxx> #include "optchart.hxx" #include <svx/SvxColorValueSet.hxx> +#include <vcl/virdev.hxx> #include <vcl/weld.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index 321fe0ee4256..ec3e8afef96b 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -21,10 +21,9 @@ #define INCLUDED_CUI_SOURCE_OPTIONS_OPTCHART_HXX #include <sfx2/tabdlg.hxx> -#include <vcl/fixed.hxx> #include <svtools/valueset.hxx> -#include <svx/dlgctrl.hxx> #include <vcl/button.hxx> +#include <vcl/lstbox.hxx> #include <svx/xtable.hxx> #include <svx/PaletteManager.hxx> diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index 173d9b1da6aa..adb0c5c08cd3 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CUI_SOURCE_OPTIONS_OPTCOLOR_HXX #include <sfx2/tabdlg.hxx> -#include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> namespace svtools {class EditableColorConfig;class EditableExtendedColorConfig;} diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx index 05106a3c2350..29db016d3369 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CUI_SOURCE_OPTIONS_OPTCTL_HXX #include <vcl/button.hxx> -#include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> #include <sfx2/tabdlg.hxx> diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index 54f00c7b99d1..eb7f638331ca 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CUI_SOURCE_OPTIONS_OPTFLTR_HXX #include <vcl/button.hxx> -#include <vcl/fixed.hxx> #include <sfx2/tabdlg.hxx> #include <svtools/simptabl.hxx> diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 3da20f8b7ffd..a1e6e777656c 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -89,6 +89,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/IconThemeInfo.hxx> +#include <vcl/toolbox.hxx> #if HAVE_FEATURE_OPENGL #include <vcl/opengl/OpenGLWrapper.hxx> #endif diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index f5c02d20da2d..c1ab0bc765af 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTGDLG_HXX #define INCLUDED_CUI_SOURCE_OPTIONS_OPTGDLG_HXX #include <memory> +#include <vcl/button.hxx> #include <vcl/lstbox.hxx> #include <vcl/field.hxx> #include <vcl/fixed.hxx> diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index e7d407874994..57a026d07fd7 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -39,6 +39,7 @@ #include <cuioptgenrl.hxx> #include <svx/dlgutil.hxx> #include <svx/svxids.hrc> +#include <svx/optgenrl.hxx> using namespace css; diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index 34cc9f2b9635..9109b50bf225 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -21,7 +21,6 @@ #include <vcl/button.hxx> #include <vcl/field.hxx> -#include <vcl/fixed.hxx> #include <sfx2/tabdlg.hxx> #include <svx/txencbox.hxx> diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index dc19ed9466a5..9d7c3596c90e 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -20,16 +20,10 @@ #define INCLUDED_CUI_SOURCE_OPTIONS_OPTINET2_HXX #include <memory> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <vcl/field.hxx> #include <vcl/fixed.hxx> #include <vcl/layout.hxx> #include <vcl/lstbox.hxx> -#include <vcl/svtabbx.hxx> #include <sfx2/tabdlg.hxx> -#include <unotools/configitem.hxx> - -#include <vcl/headbar.hxx> namespace svx { class SecurityOptionsDialog; diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 4383aed75f31..f5bcb94e0137 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -29,6 +29,7 @@ #include "optjava.hxx" #include <treeopt.hxx> #include <dialmgr.hxx> +#include <radiobtnbox.hxx> #include <officecfg/Office/Common.hxx> #include <svtools/miscopt.hxx> diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 116008567143..fdbd162914ae 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -23,19 +23,17 @@ #include <memory> #include <vector> -#include <ucbhelper/content.hxx> #include <vcl/button.hxx> #include <vcl/fixed.hxx> #include <vcl/layout.hxx> #include <vcl/timer.hxx> #include <vcl/idle.hxx> +#include <vcl/treelistbox.hxx> #include <vcl/weld.hxx> #include <sfx2/tabdlg.hxx> #include <com/sun/star/ui/dialogs/XFolderPicker2.hpp> #include <svtools/dialogclosedlistener.hxx> #include <svtools/restartdialog.hxx> -#include <svtools/simptabl.hxx> -#include <radiobtnbox.hxx> // forward --------------------------------------------------------------- diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index f2e20ebbce98..74164f87f5b0 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTJSEARCH_HXX #define INCLUDED_CUI_SOURCE_OPTIONS_OPTJSEARCH_HXX +#include <i18nutil/transliteration.hxx> #include <sfx2/tabdlg.hxx> #include <vcl/weld.hxx> diff --git a/cui/source/options/optopencl.hxx b/cui/source/options/optopencl.hxx index dc3a226bb37c..cc07698e50ca 100644 --- a/cui/source/options/optopencl.hxx +++ b/cui/source/options/optopencl.hxx @@ -22,7 +22,6 @@ #include <opencl/openclconfig.hxx> #include <sfx2/tabdlg.hxx> -#include <svtools/simptabl.hxx> #include <vcl/button.hxx> #include <vcl/fixed.hxx> diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx index dbc4cbf17798..7930016f5d62 100644 --- a/cui/source/options/personalization.hxx +++ b/cui/source/options/personalization.hxx @@ -11,10 +11,7 @@ #define INCLUDED_CUI_SOURCE_OPTIONS_PERSONALIZATION_HXX #include <sfx2/tabdlg.hxx> -#include <rtl/ref.hxx> #include <vector> -#include <array> -#include <atomic> #define MAX_DEFAULT_PERSONAS 6 // Maximum number of default personas diff --git a/cui/source/options/sdbcdriverenum.hxx b/cui/source/options/sdbcdriverenum.hxx index 46cec9736694..6dfbfd62ff12 100644 --- a/cui/source/options/sdbcdriverenum.hxx +++ b/cui/source/options/sdbcdriverenum.hxx @@ -21,7 +21,6 @@ #define INCLUDED_CUI_SOURCE_OPTIONS_SDBCDRIVERENUM_HXX -#include <sal/types.h> #include <rtl/ustring.hxx> #include <vector> diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 701f159487c8..0c33c9f720ed 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -67,6 +67,7 @@ #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/UnknownModuleException.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/loader/CannotActivateFactoryException.hpp> #include <com/sun/star/linguistic2/LinguProperties.hpp> #include <com/sun/star/setup/UpdateCheck.hpp> @@ -92,6 +93,7 @@ #include <svl/languageoptions.hxx> #include <svtools/helpopt.hxx> #include <svtools/miscopt.hxx> +#include <svx/databaseregistrationui.hxx> #include <svx/drawitem.hxx> #include <svx/xtable.hxx> #include <svx/xpool.hxx> diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 3d4b86d637ba..8edc8430f751 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -45,6 +45,7 @@ #include <com/sun/star/smarttags/XSmartTagAction.hpp> #include <rtl/strbuf.hxx> #include <osl/diagnose.h> +#include <tools/debug.hxx> #include <autocdlg.hxx> #include <editeng/acorrcfg.hxx> diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 5b70f37d88e0..c85bc63b696b 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -44,6 +44,7 @@ #include <sfx2/opengrf.hxx> #include <svx/svxerr.hxx> #include <svx/drawitem.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <dialmgr.hxx> #include <sfx2/htmlmode.hxx> diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 67e1817b1c0e..fb00c542c08c 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -25,6 +25,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/module.hxx> #include <vcl/mnemonic.hxx> +#include <svx/flagsdef.hxx> #include <svx/dialogs.hrc> #include <svx/svxids.hrc> diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index bedbecfa9fa9..1b2b6d37ee79 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -28,6 +28,7 @@ #include <sfx2/htmlmode.hxx> #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> +#include <svx/swframeposstrings.hxx> #include <svx/rectenum.hxx> #include <sal/macros.h> #include <com/sun/star/text/HoriOrientation.hpp> diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index cb83563920b2..0a9d4a13bca6 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -26,6 +26,7 @@ #include <svx/svxids.hrc> #include <svx/xpool.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflbckit.hxx> #include <svx/xtable.hxx> #include <svx/xlineit0.hxx> diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index a116b587c8c7..dfe752419dd7 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -27,6 +27,7 @@ #include <svx/svxids.hrc> #include <svx/xpool.hxx> #include <strings.hrc> +#include <svx/xfillit0.hxx> #include <svx/xflbckit.hxx> #include <svx/xtable.hxx> #include <svx/xlineit0.hxx> diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 4264f7cda73a..f8749af9c681 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <strings.hrc> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <svx/xpool.hxx> #include <svx/xtable.hxx> diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index bf437d9753f8..d68cb93dbc1f 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <strings.hrc> +#include <svx/xfillit0.hxx> #include <svx/xflgrit.hxx> #include <svx/colorbox.hxx> #include <svx/xtable.hxx> diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index d494d04d1674..b2db5a9800dc 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <strings.hrc> +#include <svx/xfillit0.hxx> #include <svx/xflhtit.hxx> #include <svx/xflclit.hxx> #include <svx/colorbox.hxx> diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index a099256d8faa..691e526d86a3 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -41,6 +41,7 @@ #include <svx/xlnedcit.hxx> +#include <svx/tabline.hxx> #include <svx/xpool.hxx> #include <svx/xtable.hxx> #include <svx/drawitem.hxx> diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index 3e6b05df32a7..8f456abd61ca 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -37,6 +37,7 @@ #include <svx/strings.hrc> #include <strings.hrc> +#include <svx/xfillit0.hxx> #include <svx/xbtmpit.hxx> #include <svx/xpool.hxx> #include <svx/xtable.hxx> diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 8b637cd5cea7..6ea0c2e18ae7 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -24,6 +24,7 @@ #include <svx/svxids.hrc> #include <svtools/unitconv.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <svx/xflgrit.hxx> #include <svx/xflhtit.hxx> diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx index f31484ad4009..785cd6f33b55 100644 --- a/cui/source/tabpages/tptrans.cxx +++ b/cui/source/tabpages/tptrans.cxx @@ -25,6 +25,7 @@ #include <svx/dialogs.hrc> #include <svx/svxids.hrc> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <svx/xflftrit.hxx> #include <svx/xflgrit.hxx> |