diff options
353 files changed, 512 insertions, 114 deletions
diff --git a/avmedia/source/framework/mediatoolbox.cxx b/avmedia/source/framework/mediatoolbox.cxx index bab89da6ce0d..8c15adbb900d 100644 --- a/avmedia/source/framework/mediatoolbox.cxx +++ b/avmedia/source/framework/mediatoolbox.cxx @@ -21,6 +21,7 @@ #include <avmedia/mediaitem.hxx> #include <mediacontrol.hxx> +#include <tools/debug.hxx> #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> diff --git a/basctl/source/basicide/IDEComboBox.cxx b/basctl/source/basicide/IDEComboBox.cxx index b10dd7479e85..4e0ce4121a05 100644 --- a/basctl/source/basicide/IDEComboBox.cxx +++ b/basctl/source/basicide/IDEComboBox.cxx @@ -28,6 +28,8 @@ #include <sfx2/frame.hxx> #include <sfx2/sfxsids.hrc> #include <svtools/langtab.hxx> +#include <vcl/svapp.hxx> +#include <vcl/event.hxx> namespace basctl { diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index d778df39a729..04dbd78e8f57 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -57,6 +57,7 @@ #include <vcl/textview.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <cassert> +#include <osl/diagnose.h> namespace basctl { diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index db2beb883100..b18ef9ab1190 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -41,11 +41,14 @@ #include <vcl/weld.hxx> #include <svl/urihelper.hxx> #include <svx/svxids.hrc> +#include <vcl/commandevent.hxx> #include <vcl/xtextedt.hxx> #include <vcl/textview.hxx> #include <vcl/txtattr.hxx> #include <vcl/settings.hxx> #include <vcl/ptrstyle.hxx> +#include <vcl/event.hxx> +#include <vcl/svapp.hxx> #include <svtools/textwindowpeer.hxx> #include <vcl/treelistentry.hxx> #include <vcl/taskpanelist.hxx> diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index a5db64351238..4d32da54f77a 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -51,8 +51,11 @@ #include <svx/svxids.hrc> #include <tools/diagnose_ex.h> #include <tools/urlobj.hxx> +#include <vcl/button.hxx> +#include <vcl/commandevent.hxx> #include <vcl/weld.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <xmlscript/xmldlg_imexp.hxx> namespace basctl diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 18675fd7245e..8ec13c090270 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/frame/XLayoutManager.hpp> #include <svl/srchdefs.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> #include <sfx2/childwin.hxx> #include <sfx2/docfac.hxx> #include <sfx2/dinfdlg.hxx> diff --git a/basctl/source/basicide/basides3.cxx b/basctl/source/basicide/basides3.cxx index b9a9e21a0fa1..dde84fc38c9c 100644 --- a/basctl/source/basicide/basides3.cxx +++ b/basctl/source/basicide/basides3.cxx @@ -25,6 +25,7 @@ #include <xmlscript/xmldlg_imexp.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/viewfrm.hxx> #include <tools/diagnose_ex.h> #include <comphelper/processfactory.hxx> diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx index 1d9500ce4dcb..acebc2328867 100644 --- a/basctl/source/basicide/basobj3.cxx +++ b/basctl/source/basicide/basobj3.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <basic/basmgr.hxx> #include <basic/sbmeth.hxx> @@ -38,6 +39,7 @@ #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> #include <svtools/ehdl.hxx> namespace basctl diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index ffb3e9d87f83..e78fbd7a7a35 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -34,6 +34,9 @@ #include <svl/intitem.hxx> #include <svl/stritem.hxx> #include <svl/srchdefs.hxx> +#include <vcl/commandevent.hxx> +#include <vcl/event.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <tools/stream.hxx> #include <boost/functional/hash.hpp> diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx index 8659031a719f..12b8c3f6a8a9 100644 --- a/basctl/source/basicide/iderdll.cxx +++ b/basctl/source/basicide/iderdll.cxx @@ -36,6 +36,7 @@ #include <unotools/resmgr.hxx> #include <vcl/settings.hxx> #include <sfx2/app.hxx> +#include <osl/diagnose.h> namespace basctl { diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx index a8bab6373484..79c124117c97 100644 --- a/basctl/source/basicide/linenumberwindow.cxx +++ b/basctl/source/basicide/linenumberwindow.cxx @@ -9,6 +9,7 @@ #include "baside2.hxx" +#include <vcl/event.hxx> #include <vcl/textview.hxx> #include <vcl/xtextedt.hxx> #include <vcl/settings.hxx> diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx index 970307c0a6dc..c0cd940e9c08 100644 --- a/basctl/source/basicide/localizationmgr.cxx +++ b/basctl/source/basicide/localizationmgr.cxx @@ -29,8 +29,10 @@ #include <com/sun/star/resource/MissingResourceException.hpp> #include <com/sun/star/resource/XStringResourceSupplier.hpp> #include <sfx2/dispatch.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/viewfrm.hxx> #include <tools/debug.hxx> +#include <osl/diagnose.h> namespace basctl { diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx index 7105ada78f78..252328fb07eb 100644 --- a/basctl/source/basicide/macrodlg.cxx +++ b/basctl/source/basicide/macrodlg.cxx @@ -38,6 +38,7 @@ #include <sfx2/request.hxx> #include <sfx2/sfxsids.hrc> #include <vcl/weld.hxx> +#include <osl/diagnose.h> #include <map> diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx index 7ad67dbe32d7..e99452c790a0 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx @@ -18,6 +18,7 @@ */ #include "tp_ErrorBars.hxx" +#include <vcl/event.hxx> #include <vcl/settings.hxx> using namespace ::com::sun::star; diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index 5437e1c4c333..100b11548a95 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -31,6 +31,7 @@ #include <svl/intitem.hxx> #include <vcl/weld.hxx> #include <svl/zformat.hxx> +#include <vcl/svapp.hxx> #include <com/sun/star/chart2/AxisType.hpp> diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx index b04051a8a63a..fcbecd9ba749 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.cxx +++ b/chart2/source/controller/dialogs/tp_Trendline.cxx @@ -18,6 +18,7 @@ */ #include "tp_Trendline.hxx" +#include <vcl/event.hxx> #include <vcl/settings.hxx> namespace chart diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index acfb1233e772..f63126747058 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -72,6 +72,8 @@ #include <svx/obj3d.hxx> #include <svx/scene3d.hxx> #include <svx/svddrgmt.hxx> +#include <vcl/commandevent.hxx> +#include <vcl/event.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/weld.hxx> diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx index bd7a3333a4e7..9b0de1b5dd71 100644 --- a/cui/source/customize/SvxToolbarConfigPage.cxx +++ b/cui/source/customize/SvxToolbarConfigPage.cxx @@ -44,6 +44,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> #include <sfx2/filedlghelper.hxx> +#include <sfx2/sfxsids.hrc> #include <svl/stritem.hxx> #include <svtools/miscopt.hxx> #include <vcl/svlbitm.hxx> diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 69cce08fbfc1..a0b14bce8720 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -46,6 +46,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> #include <sfx2/filedlghelper.hxx> +#include <sfx2/sfxsids.hrc> #include <svl/stritem.hxx> #include <vcl/svlbitm.hxx> #include <vcl/treelistentry.hxx> diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 01ee8ea62997..5fef9a64c507 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -27,6 +27,7 @@ #include "SpellAttrib.hxx" #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/viewfrm.hxx> #include <svl/undo.hxx> #include <unotools/lingucfg.hxx> diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index fe1d523b6874..6f6dbd519215 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -25,6 +25,7 @@ #include <vcl/BitmapSolarizeFilter.hxx> #include <vcl/BitmapColorQuantizationFilter.hxx> #include <vcl/builderfactory.hxx> +#include <vcl/svapp.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/objsh.hxx> diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 1e7410fe6670..474bd7af4d95 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -43,6 +43,7 @@ #include <tools/debug.hxx> #include <tools/stream.hxx> #include <svl/urihelper.hxx> +#include <vcl/image.hxx> #include <vcl/weld.hxx> #include <vcl/svapp.hxx> #include <comphelper/classids.hxx> diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index eb6c80c62f6d..346c6a1e556c 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -25,6 +25,8 @@ #include <tools/debug.hxx> #include <vcl/metric.hxx> +#include <set> + class CharClass; class CollatorWrapper; class SmartTagMgr; diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 342a34e066da..978e023b3c16 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -27,6 +27,7 @@ #include <strings.hrc> #include <bitmaps.hlst> #include <vcl/field.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <svl/eitem.hxx> #include <com/sun/star/uno/Exception.hpp> diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index 51986ce5a977..214ba17c1561 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -24,6 +24,7 @@ #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.cxx b/cui/source/options/optaboutconfig.cxx index 5947c50b7047..4bc61e9ac8a5 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -11,6 +11,7 @@ #include "optHeaderTabListbox.hxx" #include <vcl/builderfactory.hxx> +#include <vcl/event.hxx> #include <vcl/svlbitm.hxx> #include <vcl/treelistentry.hxx> #include <vcl/fixed.hxx> diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 0ddd786c71c6..e0ae146281ef 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -21,6 +21,7 @@ #include "optchart.hxx" #include <vcl/builderfactory.hxx> #include <vcl/weld.hxx> +#include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <svx/svxids.hrc> #include <osl/diagnose.h> diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 19625707f5e7..0078c029a212 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -21,6 +21,7 @@ #include <bitset> +#include <tools/debug.hxx> #include <editeng/editids.hrc> #include <svtools/colorcfg.hxx> #include <svtools/extcolorcfg.hxx> @@ -31,6 +32,7 @@ #include <svx/xtable.hxx> #include <unotools/moduleoptions.hxx> #include <unotools/pathoptions.hxx> +#include <vcl/layout.hxx> #include <vcl/settings.hxx> #include <vcl/builderfactory.hxx> #include <vcl/weld.hxx> diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index b97adf52cbbe..764614a6030e 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -24,6 +24,7 @@ #include <strings.hrc> #include <dialmgr.hxx> +#include <vcl/event.hxx> #include <vcl/svlbitm.hxx> #include <vcl/treelistentry.hxx> diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 712e99d04845..12de3f8df507 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -26,6 +26,7 @@ #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/weld.hxx> diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index e9134ef81e2b..9199ccd9a31d 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -31,6 +31,7 @@ #include <linguistic/misc.hxx> #include <sfx2/sfxuno.hxx> #include <sfx2/dispatch.hxx> +#include <sfx2/sfxsids.hrc> #include <tools/urlobj.hxx> #include <tools/diagnose_ex.h> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index e748baf8ac60..7ba962d11eea 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -21,6 +21,7 @@ #include <tools/urlobj.hxx> #include <tools/stream.hxx> #include <vcl/edit.hxx> +#include <vcl/event.hxx> #include <vcl/fixed.hxx> #include <vcl/fixedhyper.hxx> #include <vcl/weld.hxx> diff --git a/cui/source/options/tsaurls.hxx b/cui/source/options/tsaurls.hxx index c61dcfa25a00..41ceeaa37253 100644 --- a/cui/source/options/tsaurls.hxx +++ b/cui/source/options/tsaurls.hxx @@ -12,6 +12,8 @@ #include <vcl/weld.hxx> +#include <set> + class TSAURLsDialog : public weld::GenericDialogController { private: diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 116685b2d468..5b7ca72221bd 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -38,6 +38,7 @@ #include <svl/intitem.hxx> #include <sfx2/request.hxx> #include <vcl/settings.hxx> +#include <vcl/event.hxx> #define IID_BOTTOMLOCK 1 #define IID_TOPLOCK 2 diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index e8d23d237f69..963ba8480296 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -45,6 +45,7 @@ #include <com/sun/star/smarttags/XSmartTagRecognizer.hpp> #include <com/sun/star/smarttags/XSmartTagAction.hpp> #include <rtl/strbuf.hxx> +#include <osl/diagnose.h> #include <autocdlg.hxx> #include <editeng/acorrcfg.hxx> diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index cbea2186706e..dddbe7e0e985 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -24,6 +24,7 @@ #include <vcl/settings.hxx> #include <vcl/graphicfilter.hxx> #include <vcl/idle.hxx> +#include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <tools/urlobj.hxx> #include <sfx2/dialoghelper.hxx> diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index b6c177f04e75..d9cd2e4a2c2c 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -35,6 +35,7 @@ #include <svx/dlgutil.hxx> #include <dialmgr.hxx> #include <sfx2/htmlmode.hxx> +#include <vcl/event.hxx> #include <vcl/settings.hxx> #include <svx/flagsdef.hxx> #include <sfx2/request.hxx> diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index cda14818ee05..352a5a537e79 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -20,6 +20,7 @@ #include <sfx2/app.hxx> #include <sfx2/module.hxx> #include <swpossizetabpage.hxx> +#include <vcl/event.hxx> #include <vcl/settings.hxx> #include <svx/dialogs.hrc> diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 94f15b630672..7b82830dc866 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -25,6 +25,7 @@ #include <sfx2/viewsh.hxx> #include <svl/itemiter.hxx> #include <svl/languageoptions.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <unotools/configitem.hxx> #include <sfx2/htmlmode.hxx> diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 6d35e70e501f..ef1555e7c9ab 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -22,6 +22,7 @@ #include <svx/dialogs.hrc> #include <vcl/settings.hxx> #include <vcl/builderfactory.hxx> +#include <vcl/svapp.hxx> #include <editeng/lrspitem.hxx> #include <tabstpge.hxx> diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index faee1ded1ac2..78a1b49f00ce 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -38,6 +38,7 @@ #include <svl/intitem.hxx> #include <sfx2/request.hxx> #include <sfx2/opengrf.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <svx/svxdlg.hxx> #include <sfx2/viewsh.hxx> diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 1cebd3b7527c..911bbf748060 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -28,6 +28,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> #include <svtools/colrdlg.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <sfx2/filedlghelper.hxx> #include <svx/ofaitem.hxx> diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index a8b505a5c68d..8fdeb16dd5b6 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -20,6 +20,7 @@ #include <memory> #include <vcl/wrkwin.hxx> #include <tools/urlobj.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/app.hxx> diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index f70c96b0eec5..194a23bd7917 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -20,6 +20,7 @@ #include <memory> #include <tools/urlobj.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/app.hxx> diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index a36fcfa37288..8786fb71c6b0 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -19,6 +19,7 @@ #include <tools/urlobj.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/app.hxx> diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 97f6305781eb..b97636815e25 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -19,6 +19,7 @@ #include <tools/urlobj.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/app.hxx> diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index 1d77214eeb08..878c1ae8b98d 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -31,6 +31,7 @@ #include <vcl/bitmapaccess.hxx> #include <vcl/BitmapTools.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <svx/dialogs.hrc> #include <svx/strings.hrc> diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index f8f7333f127c..86e7e6fe472b 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -86,6 +86,7 @@ #include <svx/svxdlg.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <vcl/waitobj.hxx> diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index f88da7d73e38..ae5478f0b3bc 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -62,6 +62,7 @@ #include <svl/rngitem.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <vcl/svapp.hxx> #include <vcl/waitobj.hxx> #include <svl/zforlist.hxx> diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index a336a398fd7c..d3e65ff8fc69 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -32,6 +32,7 @@ #include <dsitems.hxx> #include <osl/process.h> #include <osl/diagnose.h> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <sfx2/filedlghelper.hxx> #include <dbadmin.hxx> diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 5628b3a7a050..750f37cf4b42 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -30,6 +30,7 @@ #include <svl/intitem.hxx> #include <dsitems.hxx> #include "dsnItem.hxx" +#include <vcl/layout.hxx> #include <vcl/mnemonic.hxx> #include <svl/cjkoptions.hxx> diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index abe96acbc327..1f83fe06c10e 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -31,6 +31,7 @@ #include <svl/intitem.hxx> #include <dsitems.hxx> #include "dbfindex.hxx" +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <vcl/mnemonic.hxx> #include <svl/cjkoptions.hxx> diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 167ebdfde4f8..065fd4c0096a 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -36,6 +36,7 @@ #include <strings.hxx> #include <core_resource.hxx> #include <dbadmin.hxx> +#include <vcl/layout.hxx> #include <vcl/weld.hxx> #include <sfx2/passwd.hxx> diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 517852513d51..58c8c2f95f06 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -24,6 +24,7 @@ #include <svl/eitem.hxx> #include <svl/stritem.hxx> #include <svl/intitem.hxx> +#include <vcl/svapp.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 213c3e821527..0a9104692e07 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -38,6 +38,7 @@ #include <vcl/button.hxx> #include <vcl/edit.hxx> #include <vcl/field.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <algorithm> diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index d9da7d5bc7ab..f9328b841d29 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -29,6 +29,7 @@ #include <sfx2/filedlghelper.hxx> #include <sfx2/docfilt.hxx> #include <vcl/stdtext.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <svl/stritem.hxx> #include <vcl/waitobj.hxx> diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 75c318d0787c..5c80f2acbef0 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -54,6 +54,7 @@ #include <toolkit/awt/vclxwindow.hxx> #include <vcl/stdtext.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index 2a63428abd9c..7dc617977952 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -26,6 +26,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/proparrhlp.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <vcl/svapp.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx index 7cd0d3054699..3ec72572f19f 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx @@ -23,6 +23,7 @@ #include <UserAdminDlg.hxx> #include <comphelper/processfactory.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <vcl/svapp.hxx> using namespace dbaui; diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx index b59627def0a4..0702b8c66f21 100644 --- a/dbaccess/source/ui/uno/admindlg.cxx +++ b/dbaccess/source/ui/uno/admindlg.cxx @@ -23,6 +23,7 @@ #include <dbadmin.hxx> #include <comphelper/processfactory.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <vcl/svapp.hxx> using namespace dbaui; diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index ba77d5ad10d3..7de8d605745f 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -122,6 +122,7 @@ #include <vcl/ImageTree.hxx> #include <vcl/ITiledRenderable.hxx> #include <vcl/IDialogRenderable.hxx> +#include <vcl/dialog.hxx> #include <unicode/uchar.h> #include <unotools/configmgr.hxx> #include <unotools/syslocaleoptions.hxx> diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 8e02caf8fb5d..3d02f76e256e 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -61,6 +61,7 @@ #include <com/sun/star/lang/Locale.hpp> #include <linguistic/lngprops.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <comphelper/lok.hxx> #include <sfx2/viewsh.hxx> diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index cf8a6ee5bb0b..0c7d077a3586 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -34,6 +34,7 @@ #include <svl/intitem.hxx> #include <vcl/inputctx.hxx> #include <vcl/transfer.hxx> +#include <vcl/svapp.hxx> #include <sot/exchange.hxx> #include <sot/formats.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx index 30d02947ab90..01238a5af478 100644 --- a/extensions/source/propctrlr/controlfontdialog.cxx +++ b/extensions/source/propctrlr/controlfontdialog.cxx @@ -19,8 +19,10 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> #include "controlfontdialog.hxx" #include <cppuhelper/typeprovider.hxx> +#include <vcl/svapp.hxx> #include "fontdialog.hxx" #include "formstrings.hxx" #include "pcrcommon.hxx" diff --git a/filter/source/pdf/pdfinteract.cxx b/filter/source/pdf/pdfinteract.cxx index 802c7a65d83a..2186921dc575 100644 --- a/filter/source/pdf/pdfinteract.cxx +++ b/filter/source/pdf/pdfinteract.cxx @@ -26,6 +26,7 @@ #include <comphelper/namedvaluecollection.hxx> #include <cppuhelper/supportsservice.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <vcl/svapp.hxx> PDFInteractionHandler::PDFInteractionHandler() { diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 2359fb69cbce..0400b38823fd 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -698,6 +698,9 @@ blacklist: include/sfx2/mieclip.hxx: # Needed for implicit dtor - tools/stream.hxx + include/sfx2/recentdocsview.hxx: + # Needed for struct declaration + - com/sun/star/beans/PropertyValue.hpp include/sfx2/sfxbasecontroller.hxx: # base class has to be a complete type - com/sun/star/frame/XController2.hpp @@ -799,3 +802,10 @@ blacklist: include/sfx2/sidebar/UnoSidebar.hxx: # base class has to be a complete type - com/sun/star/ui/XSidebarProvider.hpp + include/sfx2/unoctitm.hxx: + # base class has to be a complete type + - com/sun/star/frame/XNotifyingDispatch.hpp + - com/sun/star/lang/XUnoTunnel.hpp + include/sfx2/viewsh.hxx: + # Needed for macro + - class SfxViewFactory diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx index 5dd839ba07f6..fc669d723605 100644 --- a/include/editeng/editview.hxx +++ b/include/editeng/editview.hxx @@ -30,6 +30,7 @@ #include <tools/link.hxx> #include <vcl/cursor.hxx> #include <vcl/errcode.hxx> +#include <vcl/event.hxx> #include <editeng/editstat.hxx> #include <svl/languageoptions.hxx> #include <LibreOfficeKit/LibreOfficeKitTypes.h> diff --git a/include/sfx2/XmlIdRegistry.hxx b/include/sfx2/XmlIdRegistry.hxx index c728e9dd4caf..6846bfcab535 100644 --- a/include/sfx2/XmlIdRegistry.hxx +++ b/include/sfx2/XmlIdRegistry.hxx @@ -23,9 +23,10 @@ #include <sal/config.h> #include <sfx2/dllapi.h> +#include <rtl/ustring.hxx> -#include <com/sun/star/beans/StringPair.hpp> - +namespace com::sun::star::beans { struct StringPair; } +namespace com::sun::star::uno { template <typename > class Reference; } namespace com { namespace sun { namespace star { namespace rdf { class XMetadatable; diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index fbe01ba61311..4ededb6bd3fb 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -45,6 +45,8 @@ #include <boost/optional/optional.hpp> #include <memory> +namespace com::sun::star::beans { struct PropertyValue; } + namespace com { namespace sun { namespace star { namespace document { class XDocumentProperties; diff --git a/include/sfx2/lokhelper.hxx b/include/sfx2/lokhelper.hxx index e874ee256412..b45a06b95766 100644 --- a/include/sfx2/lokhelper.hxx +++ b/include/sfx2/lokhelper.hxx @@ -11,6 +11,7 @@ #define INCLUDED_SFX2_LOKHELPER_HXX #include <vcl/IDialogRenderable.hxx> +#include <vcl/event.hxx> #include <sfx2/dllapi.h> #include <sfx2/viewsh.hxx> #include <cstddef> diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx index 516c650d2b60..9469aeec14ef 100644 --- a/include/sfx2/recentdocsview.hxx +++ b/include/sfx2/recentdocsview.hxx @@ -16,6 +16,7 @@ #include <o3tl/typed_flags_set.hxx> #include <com/sun/star/util/URL.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> namespace com::sun::star::frame { class XDispatch; } diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index f74b66b2aaba..7527fa519a3b 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -25,21 +25,14 @@ #include <sfx2/basedlgs.hxx> #include <sal/types.h> #include <vcl/button.hxx> -#include <vcl/layout.hxx> #include <vcl/tabctrl.hxx> #include <vcl/tabdlg.hxx> #include <vcl/tabpage.hxx> -#include <vcl/weld.hxx> #include <svl/itempool.hxx> #include <svl/itemset.hxx> -#include <com/sun/star/frame/XFrame.hpp> #include <o3tl/typed_flags_set.hxx> -class SfxPoolItem; -class SfxTabDialog; -class SfxViewFrame; class SfxTabPage; -class SfxBindings; typedef VclPtr<SfxTabPage> (*CreateTabPage)(TabPageParent pParent, const SfxItemSet *rAttrSet); typedef const sal_uInt16* (*GetTabPageRanges)(); // provides international Which-value @@ -282,8 +275,6 @@ public: bool Apply(); }; -namespace sfx { class ItemConnectionBase; } - enum class DeactivateRC { KeepPage = 0x00, // Error handling; page does not change // 2. Fill an itemset for update diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index b309187139be..f468bfc13e76 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -23,19 +23,13 @@ #include <sal/config.h> #include <sfx2/dllapi.h> #include <sal/types.h> -#include <vcl/timer.hxx> -#include <vcl/menu.hxx> -#include <vcl/fixed.hxx> +#include <svl/poolitem.hxx> #include <vcl/floatwin.hxx> -#include <sfx2/ctrlitem.hxx> -#include <sfx2/sfxstatuslistener.hxx> #include <svtools/toolboxcontroller.hxx> -#include <svtools/framestatuslistener.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <rtl/ref.hxx> +namespace com::sun::star::frame { class XDispatchProvider; } +namespace com::sun::star::frame { class XFrame; } class SfxToolBoxControl; class SfxModule; diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index 5e8a12853419..e8ff1610caa3 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -15,25 +15,17 @@ #include <set> -#include <vcl/dialog.hxx> -#include <vcl/button.hxx> -#include <vcl/fixed.hxx> +#include <vcl/timer.hxx> #include <vcl/weld.hxx> -#include <com/sun/star/frame/XDesktop2.hpp> #include <sfx2/templatelocalview.hxx> -class Edit; -class PopupMenu; -class TemplateLocalView; class TemplateSearchView; -class ThumbnailView; class ThumbnailViewItem; -class ToolBox; namespace com { namespace sun { namespace star { namespace frame { - class XComponentLoader; + class XDesktop2; class XModel; } } } } diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx index 93282b9ae9d0..123e7f04e1e1 100644 --- a/include/sfx2/templatelocalview.hxx +++ b/include/sfx2/templatelocalview.hxx @@ -10,7 +10,6 @@ #ifndef INCLUDED_SFX2_TEMPLATELOCALVIEW_HXX #define INCLUDED_SFX2_TEMPLATELOCALVIEW_HXX -#include <vcl/menu.hxx> #include <sfx2/thumbnailview.hxx> #include <sfx2/templateproperties.hxx> #include <functional> @@ -34,13 +33,6 @@ class SfxDocumentTemplates; class TemplateContainerItem; class TemplateViewItem; -class PopupMenu; - -namespace com { - namespace sun { namespace star { namespace frame { - class XModel; - } } } -} enum class FILTER_APPLICATION { diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx index 7301a2896946..b25e09661739 100644 --- a/include/sfx2/templdlg.hxx +++ b/include/sfx2/templdlg.hxx @@ -22,13 +22,9 @@ #include <memory> #include <sal/config.h> #include <sfx2/dllapi.h> -#include <vcl/ctrl.hxx> -#include <svl/style.hxx> - -#include <sfx2/dockwin.hxx> -#include <sfx2/childwin.hxx> -#include <sfx2/basedlgs.hxx> +#include <vcl/window.hxx> +class SfxBindings; class SfxTemplateDialog_Impl; class SFX2_DLLPUBLIC SfxTemplatePanelControl : public vcl::Window diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index d1807f454583..ab19ba460363 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -16,34 +16,19 @@ #include <memory> #include <vector> -#include <sfx2/thumbnailviewitem.hxx> #include <vcl/ctrl.hxx> #include <vcl/customweld.hxx> -#include <vcl/timer.hxx> -#include <vcl/pngread.hxx> - -#include <com/sun/star/embed/ElementModes.hpp> -#include <com/sun/star/embed/XStorage.hpp> -#include <com/sun/star/embed/StorageFactory.hpp> class BitmapEx; class MouseEvent; -class TrackingEvent; -class HelpEvent; class KeyEvent; class DataChangedEvent; class ScrollBar; +class ThumbnailViewItem; typedef ::std::vector< ThumbnailViewItem* > ThumbnailValueItemList; -struct ThumbnailItemAttributes; -class ThumbnailViewAcc; -class ThumbnailViewItemAcc; -namespace drawinglayer { - namespace processor2d { - class BaseProcessor2D; - } -} +struct ThumbnailItemAttributes; /************************************************************************* diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx index 26cb96966967..1d001de2469b 100644 --- a/include/sfx2/thumbnailviewitem.hxx +++ b/include/sfx2/thumbnailviewitem.hxx @@ -22,11 +22,11 @@ #include <basegfx/vector/b2dvector.hxx> #include <drawinglayer/attribute/fontattribute.hxx> -#include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <vcl/bitmapex.hxx> #include <sfx2/dllapi.h> -#include <com/sun/star/accessibility/XAccessible.hpp> +namespace com::sun::star::accessibility { class XAccessible; } +namespace drawinglayer::primitive2d { class Primitive2DContainer; } #define THUMBNAILVIEW_ITEM_NONEITEM 0xFFFE diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx index f78c4316fc6c..014f61f0f35a 100644 --- a/include/sfx2/unoctitm.hxx +++ b/include/sfx2/unoctitm.hxx @@ -21,12 +21,7 @@ #include <memory> #include <com/sun/star/frame/XNotifyingDispatch.hpp> -#include <com/sun/star/frame/XDispatchResultListener.hpp> -#include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/frame/FeatureStateEvent.hpp> -#include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/weakref.hxx> @@ -34,9 +29,14 @@ #include <sfx2/ctrlitem.hxx> #include <osl/mutex.hxx> +namespace com::sun::star::frame { class XFrame; } +namespace com::sun::star::frame { class XNotifyingDispatch; } +namespace com::sun::star::frame { class XStatusListener; } +namespace com::sun::star::frame { struct FeatureStateEvent; } + class SfxBindings; -class SfxFrame; class SfxDispatcher; +class SfxSlot; typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString> SfxStatusDispatcher_Impl_ListenerContainer; diff --git a/include/sfx2/userinputinterception.hxx b/include/sfx2/userinputinterception.hxx index 7105b7050154..f948579785ed 100644 --- a/include/sfx2/userinputinterception.hxx +++ b/include/sfx2/userinputinterception.hxx @@ -22,10 +22,13 @@ #include <sfx2/dllapi.h> -#include <com/sun/star/awt/XUserInputInterception.hpp> - #include <memory> +namespace com::sun::star::awt { class XKeyHandler; } +namespace com::sun::star::awt { class XMouseClickHandler; } +namespace com::sun::star::uno { template <typename > class Reference; } +namespace osl { class Mutex; } + class NotifyEvent; namespace cppu { class OWeakObject; } diff --git a/include/sfx2/viewfac.hxx b/include/sfx2/viewfac.hxx index a24f436d7437..aca473f619cb 100644 --- a/include/sfx2/viewfac.hxx +++ b/include/sfx2/viewfac.hxx @@ -26,7 +26,6 @@ class SfxViewFrame; class SfxViewShell; -namespace vcl { class Window; } typedef SfxViewShell* (*SfxViewCtor)(SfxViewFrame*, SfxViewShell*); diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 6d9ef75b8ffe..de7bcaafafaf 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -24,43 +24,23 @@ #include <sfx2/dllapi.h> #include <sal/types.h> #include <svl/lstner.hxx> -#include <sfx2/module.hxx> #include <sfx2/frame.hxx> #include <sfx2/objsh.hxx> #include <sfx2/shell.hxx> -#include <sfx2/sfxsids.hrc> #include <svl/poolitem.hxx> -#include <vcl/button.hxx> - -#include <tools/svborder.hxx> +class Button; class SvBorder; class SfxDispatcher; class SfxBindings; class SfxProgress; -class SvData; class SfxViewShell; -class SystemWindow; -class Fraction; class Point; class Size; class SfxChildWindow; class SfxInfoBarWindow; enum class InfoBarType; -namespace sfx2 -{ -class SvLinkSource; -} -namespace svtools -{ - class AsynchronLink; -} -namespace basegfx -{ - class BColor; -} - class SFX2_DLLPUBLIC SfxViewFrame: public SfxShell, public SfxListener { std::unique_ptr<struct SfxViewFrame_Impl> m_pImpl; diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 297640a63441..e0240ae952b4 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -23,53 +23,46 @@ #include <memory> #include <sfx2/dllapi.h> #include <sal/types.h> -#include <com/sun/star/embed/XEmbeddedObject.hpp> -#include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/view/XRenderable.hpp> #include <com/sun/star/uno/Reference.h> #include <svl/lstner.hxx> -#include <com/sun/star/ui/XContextMenuInterceptor.hpp> -#include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp> -#include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp> -#include <cppuhelper/interfacecontainer.hxx> #include <sfx2/shell.hxx> -#include <sfx2/viewfac.hxx> -#include <tools/gen.hxx> #include <i18nlangtag/languagetag.hxx> #include <vcl/IDialogRenderable.hxx> #include <vcl/errcode.hxx> -#include <vcl/jobset.hxx> #include <o3tl/typed_flags_set.hxx> #include <vcl/vclptr.hxx> -#include <sfx2/tabdlg.hxx> +#include <vcl/tabpage.hxx> #include <LibreOfficeKit/LibreOfficeKitTypes.h> #include <editeng/outliner.hxx> #include <functional> +class SfxTabPage; class SfxBaseController; class Size; +class Point; class Fraction; -namespace vcl { class Window; } namespace weld { class Window; } class KeyEvent; -class WorkWindow; class SvBorder; class SdrView; -class SfxFrame; -class SfxMedium; class SfxModule; class SfxViewFrame; -class SfxItemPool; -class SfxFrameSetDescriptor; class Printer; class SfxPrinter; -class SfxProgress; -class SfxFrameItem; class Menu; class NotifyEvent; class SfxInPlaceClient; namespace vcl { class PrinterController; } +namespace com::sun::star::datatransfer { namespace clipboard { class XClipboardListener; } } +namespace com::sun::star::datatransfer { namespace clipboard { class XClipboardNotifier; } } +namespace com::sun::star::embed { class XEmbeddedObject; } +namespace com::sun::star::frame { class XController; } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::ui { class XContextMenuInterceptor; } +namespace com::sun::star::ui { struct ContextMenuExecuteEvent; } +namespace com::sun::star::view { class XRenderable; } + enum class SfxPrinterChangeFlags { diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx index 53605eb9ca12..668da9b6036d 100644 --- a/include/svx/colorwindow.hxx +++ b/include/svx/colorwindow.hxx @@ -29,6 +29,7 @@ #include <svx/SvxColorValueSet.hxx> #include <svx/PaletteManager.hxx> #include <vcl/lstbox.hxx> +#include <vcl/fixed.hxx> #include <functional> diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index cd907090c750..9f7345cd6b19 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -26,6 +26,7 @@ #include <vcl/field.hxx> #include <sfx2/dockwin.hxx> #include <vcl/button.hxx> +#include <vcl/layout.hxx> #include <svx/svxdllapi.h> #include <svx/f3dchild.hxx> diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index 596e70fe6ce7..c801415fd2a5 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -13,6 +13,7 @@ #include <osl/file.hxx> #include <sal/log.hxx> +#include <vcl/svapp.hxx> #include <sfx2/app.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/docfile.hxx> diff --git a/sc/qa/extras/scpdfexport.cxx b/sc/qa/extras/scpdfexport.cxx index 02f00f8fac5d..ee74b730a4a0 100644 --- a/sc/qa/extras/scpdfexport.cxx +++ b/sc/qa/extras/scpdfexport.cxx @@ -15,6 +15,7 @@ #include <com/sun/star/sheet/XSpreadsheet.hpp> #include <com/sun/star/table/XCellRange.hpp> #include <com/sun/star/util/URL.hpp> +#include <com/sun/star/view/XSelectionSupplier.hpp> #include <test/bootstrapfixture.hxx> #include <unotools/tempfile.hxx> #include <unotest/macros_test.hxx> diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index d5f291b05116..79e4be4274be 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -15,6 +15,7 @@ #include <osl/file.hxx> #include <config_features.h> +#include <vcl/svapp.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/docfile.hxx> #include <svl/stritem.hxx> diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx index 9f6304aee774..5222a64c8dbb 100644 --- a/sc/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx @@ -28,6 +28,7 @@ #include <sfx2/childwin.hxx> #include <sfx2/lokhelper.hxx> #include <svx/svdpage.hxx> +#include <vcl/svapp.hxx> #include <vcl/scheduler.hxx> #include <vcl/vclevent.hxx> #include <vcl/virdev.hxx> diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index af0100f6dde4..a118285c2533 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -38,6 +38,7 @@ #include <unotools/transliterationwrapper.hxx> #include <sal/log.hxx> +#include <vcl/svapp.hxx> #include <vcl/virdev.hxx> #include <vcl/weld.hxx> diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index bb784e589cbd..68c9af64d8c3 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -27,6 +27,7 @@ #include <sfx2/docfile.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> #include <svl/stritem.hxx> @@ -36,6 +37,7 @@ #include <vcl/settings.hxx> #include <unotools/charclass.hxx> #include <unotools/securityoptions.hxx> +#include <osl/diagnose.h> #include <i18nlangtag/mslangid.hxx> #include <comphelper/doublecheckedinit.hxx> diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx index 8e63b8f4b3d0..ca87efc2988c 100644 --- a/sc/source/filter/excel/excel.cxx +++ b/sc/source/filter/excel/excel.cxx @@ -26,6 +26,7 @@ #include <tools/globname.hxx> #include <com/sun/star/ucb/ContentCreationException.hpp> #include <unotools/streamwrap.hxx> +#include <osl/diagnose.h> #include <filter.hxx> #include <document.hxx> #include <xistream.hxx> diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 42fb49ddf6ee..6b32a27438e2 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -30,6 +30,7 @@ #include <unotools/streamwrap.hxx> #include <sot/storage.hxx> #include <tools/urlobj.hxx> +#include <vcl/svapp.hxx> #include <docuno.hxx> #include <xestream.hxx> diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index d37954e365fe..2f7eb767ec6f 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -64,6 +64,7 @@ #include <oox/core/fastparser.hxx> #include <comphelper/threadpool.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> #include <memory> diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 1ed50e0d17c0..49f62d6dc9a5 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/document/XViewDataSupplier.hpp> #include <osl/thread.h> +#include <osl/diagnose.h> #include <oox/helper/progressbar.hxx> #include <oox/helper/propertyset.hxx> #include <oox/ole/vbaproject.hxx> diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 1dc17706c224..df3a83f63126 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -19,6 +19,7 @@ #include <sal/config.h> #include <sal/log.hxx> +#include <osl/diagnose.h> #include <svl/zforlist.hxx> @@ -41,6 +42,7 @@ #include <svl/languageoptions.hxx> #include <editeng/editstat.hxx> #include <formula/errorcodes.hxx> +#include <vcl/svapp.hxx> #include <appluno.hxx> #include "xmlimprt.hxx" diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index 34ec6ccc0415..2255329151e8 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -36,6 +36,7 @@ #include <vcl/window.hxx> #include <svl/hint.hxx> +#include <svl/itemset.hxx> #include <vcl/svapp.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <svl/style.hxx> diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx index 4e06d6efeee9..b105e8b29115 100644 --- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx @@ -10,6 +10,7 @@ #include <svl/undo.hxx> #include <rtl/math.hxx> +#include <osl/time.h> #include <rangelst.hxx> #include <docsh.hxx> diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 178bd5c85e35..8805c63efe80 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/embed/XEmbedPersist.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 5e9e3ee46ee9..4308592d8d98 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -50,6 +50,7 @@ #include <vcl/help.hxx> #include <vcl/cursor.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <tools/urlobj.hxx> #include <formula/formulahelper.hxx> #include <formula/funcvarargs.h> diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 5684ba566b54..72a467845402 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -40,6 +40,7 @@ #include <vcl/help.hxx> #include <vcl/settings.hxx> #include <svl/stritem.hxx> +#include <vcl/svapp.hxx> #include <unotools/charclass.hxx> #include <inputwin.hxx> diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index e9edaffad9e1..dcae91f597b8 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -45,6 +45,7 @@ #include <svx/dialogs.hrc> #include <svl/inethist.hxx> #include <vcl/waitobj.hxx> +#include <vcl/svapp.hxx> #include <svx/svxerr.hxx> #include <tools/diagnose_ex.h> diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 404fcb535bb3..70b6e705df32 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/embed/XTransactedObject.hpp> +#include <osl/diagnose.h> #include <unotools/tempfile.hxx> #include <unotools/ucbstreamhelper.hxx> #include <comphelper/fileformat.h> diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index e3ba0a894679..b97f5e4c85d3 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -27,6 +27,9 @@ #include <set> #include <bitmaps.hlst> +#include <com/sun/star/frame/XFrame.hpp> +#include <com/sun/star/frame/XDispatchProvider.hpp> + // class ScZoomSliderControl --------------------------------------- SFX_IMPL_TOOLBOX_CONTROL( ScZoomSliderControl, SvxZoomSliderItem ); diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index bad74e8c3e7a..1449504d444e 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <osl/diagnose.h> + #include <rangeutl.hxx> #include <dbdata.hxx> #include <viewdata.hxx> diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index bd6b6ec1bbb3..060e9cd66ed6 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -36,6 +36,7 @@ #include <pfiltdlg.hxx> #include <svl/sharedstringpool.hxx> +#include <osl/diagnose.h> ScPivotFilterDlg::ScPivotFilterDlg(weld::Window* pParent, const SfxItemSet& rArgSet, SCTAB nSourceTab ) diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index e9e0016a1c33..fe0cd0b9b889 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -22,6 +22,7 @@ #include <comphelper/string.hxx> #include <svx/colorbox.hxx> #include <unotools/useroptions.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 04bb7d63e319..1bf89c164644 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -19,11 +19,13 @@ #undef SC_DLLIMPLEMENTATION +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <i18nlangtag/languagetag.hxx> #include <svtools/collatorres.hxx> #include <unotools/collatorwrapper.hxx> #include <comphelper/processfactory.hxx> +#include <osl/diagnose.h> #include <scitems.hxx> #include <uiitems.hxx> diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index 8517e28885e2..260efb9e8b90 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -33,6 +33,8 @@ #include <tpsubt.hxx> #include <memory> +#include <osl/diagnose.h> + // Subtotals group tabpage: ScTpSubTotalGroup::ScTpSubTotalGroup(TabPageParent pParent, const SfxItemSet& rArgSet) diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index cf9841808e7b..b04b0ba0cf9d 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -19,8 +19,10 @@ #include <sfx2/fcontnr.hxx> #include <sfx2/linkmgr.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <unotools/charclass.hxx> +#include <osl/diagnose.h> #include <arealink.hxx> diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx index 28374ff02029..774ea045ae21 100644 --- a/sc/source/ui/docshell/autostyl.cxx +++ b/sc/source/ui/docshell/autostyl.cxx @@ -18,6 +18,7 @@ */ #include <time.h> +#include <osl/diagnose.h> #include <address.hxx> #include <autostyl.hxx> diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index 0f7b21910127..56629391a027 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -15,6 +15,7 @@ #include <osl/time.h> #include <salhelper/thread.hxx> #include <sfx2/viewfrm.hxx> +#include <vcl/svapp.hxx> #include <docsh.hxx> #include <tabvwsh.hxx> #include <viewdata.hxx> diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index c2a80647386e..809ead0ff98f 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -18,6 +18,7 @@ */ #include <sfx2/app.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <vcl/waitobj.hxx> #include <svx/dataaccessdescriptor.hxx> diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index 73c1e00de8a3..3a250687b65b 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -20,10 +20,12 @@ #include <vcl/errinf.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/types.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <svx/dataaccessdescriptor.hxx> #include <sfx2/viewfrm.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdb/XCompletedExecution.hpp> diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 687ac5ad7ffe..dc4efe60cf8c 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -24,6 +24,7 @@ #include <editeng/editobj.hxx> #include <sfx2/linkmgr.hxx> #include <sfx2/bindings.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <vcl/waitobj.hxx> #include <svx/svdocapt.hxx> diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 4506ec13e52b..0c8e93cd857e 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -32,6 +32,7 @@ #include <sfx2/printer.hxx> #include <svx/postattr.hxx> #include <unotools/misccfg.hxx> +#include <vcl/svapp.hxx> #include <vcl/virdev.hxx> #include <vcl/weld.hxx> diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 3f03271240cd..ddb1053ef21c 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -39,6 +39,7 @@ using namespace ::com::sun::star; #include <svtools/sfxecode.hxx> #include <svx/ofaitem.hxx> #include <svl/whiter.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <vcl/waitobj.hxx> #include <svx/dataaccessdescriptor.hxx> diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index a9e9190deb67..bc7c6fcfc943 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -22,6 +22,8 @@ #include <cassert> +#include <osl/diagnose.h> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <vcl/waitobj.hxx> #include <sfx2/app.hxx> diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 268b23c3642b..bf2c490b41c9 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -32,6 +32,7 @@ #include <rtl/character.hxx> #include <rtl/tencinfo.h> #include <sal/log.hxx> +#include <osl/diagnose.h> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdbc/DataType.hpp> diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx index 7c93a4f3ab18..3540a9c99931 100644 --- a/sc/source/ui/docshell/servobj.cxx +++ b/sc/source/ui/docshell/servobj.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <osl/thread.h> +#include <osl/diagnose.h> #include <sot/exchange.hxx> #include <sot/formats.hxx> #include <sfx2/app.hxx> diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index d4fcbfddb58e..7e35a7a016c9 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -24,6 +24,8 @@ #include <tpstat.hxx> +#include <vcl/layout.hxx> + // Dokumentinfo-Tabpage: VclPtr<SfxTabPage> ScDocStatPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index c7946f956f74..4f7c591339bb 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/embed/EmbedMisc.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <editeng/eeitem.hxx> #include <editeng/sizeitem.hxx> diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 6f1771e9b19b..3cc2b4c57b15 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/embed/NoVisualAreaSizeException.hpp> #include <com/sun/star/embed/Aspects.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <toolkit/helper/vclunohelper.hxx> diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index 74b980f7319d..541ff19b76ee 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -21,6 +21,7 @@ #define INCLUDED_SC_SOURCE_UI_INC_SCUITPHFEDIT_HXX #include "tphfedit.hxx" +#include <sfx2/tabdlg.hxx> #include <vcl/menubtn.hxx> enum ScHFEntryId diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 540ccff0f291..2f18d4129796 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -23,6 +23,7 @@ #include <unotools/collatorwrapper.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/basedlgs.hxx> +#include <vcl/layout.hxx> #include <acredlin.hxx> #include <global.hxx> diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 149ba5f1c3ed..b108d4487acd 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -22,6 +22,7 @@ #include <sfx2/app.hxx> #include <sfx2/viewsh.hxx> #include <vcl/accel.hxx> +#include <vcl/layout.hxx> #include <vcl/mnemonic.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index a64104548f2b..b35300c9528d 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -31,6 +31,7 @@ #include <svl/zforlist.hxx> #include <svtools/scriptedtext.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <vcl/builderfactory.hxx> #include <vcl/virdev.hxx> #include <comphelper/processfactory.hxx> diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 3f9a5f68e2f7..4f0b8c552167 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -23,6 +23,7 @@ #include <scresid.hxx> #include <docsh.hxx> #include <crnrdlg.hxx> +#include <vcl/layout.hxx> #include <vcl/weld.hxx> #include <vcl/fixed.hxx> #include <memory> diff --git a/sc/source/ui/miscdlgs/datatableview.cxx b/sc/source/ui/miscdlgs/datatableview.cxx index 0922c1415801..4e8c8bc21cbd 100644 --- a/sc/source/ui/miscdlgs/datatableview.cxx +++ b/sc/source/ui/miscdlgs/datatableview.cxx @@ -27,6 +27,7 @@ #include <table.hxx> #include <vcl/builderfactory.hxx> +#include <vcl/scrbar.hxx> #include <vcl/seleng.hxx> #include <sal/log.hxx> diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index d59ee0713c79..c59dfc73012a 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -24,6 +24,8 @@ #include <highred.hxx> +#include <vcl/layout.hxx> + // class ScHighlightChgDlg ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent, diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index a4e2fe7b7833..303807299dc4 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -24,6 +24,7 @@ #include <sfx2/filedlghelper.hxx> #include <svtools/ehdl.hxx> #include <svtools/sfxecode.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <global.hxx> diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index ee8a93171afd..42fce41bff06 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -18,6 +18,7 @@ */ #include <osl/security.hxx> +#include <osl/diagnose.h> #include <sfx2/dialoghelper.hxx> #include <svl/sharecontrolfile.hxx> #include <unotools/useroptions.hxx> diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index fe5af2fb8f7a..6bc2fff92818 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -20,6 +20,7 @@ #include <scitems.hxx> #include <sfx2/dispatch.hxx> #include <svl/zforlist.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <uiitems.hxx> diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index 901376a7c72e..46e0d1803a5c 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -18,6 +18,7 @@ */ #include <sfx2/dispatch.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <uiitems.hxx> diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 5f294aa51d68..54734705d66f 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -19,6 +19,7 @@ #undef SC_DLLIMPLEMENTATION +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <svl/zforlist.hxx> diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 5ede955f67b4..b67fb3e9fbec 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -20,6 +20,7 @@ #undef SC_DLLIMPLEMENTATION #include <comphelper/string.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <global.hxx> diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 25552871e396..22c6bdfc7d14 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -21,6 +21,7 @@ #include <sfx2/dispatch.hxx> #include <svl/stritem.hxx> +#include <vcl/layout.hxx> #include <vcl/weld.hxx> #include <unotools/charclass.hxx> diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 9e4067010aec..6065acfac08c 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -23,6 +23,7 @@ #include <sfx2/basedlgs.hxx> #include <sfx2/sfxdlg.hxx> #include <svl/style.hxx> +#include <vcl/layout.hxx> #include <vcl/svapp.hxx> #include <attrib.hxx> diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index b537908adc09..5372fa9ca3bf 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -21,6 +21,7 @@ #include <scitems.hxx> +#include <vcl/event.hxx> #include <vcl/settings.hxx> #include <osl/diagnose.h> diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx index 1a868c330c8b..86bfdd09835d 100644 --- a/sc/source/ui/undo/undostyl.cxx +++ b/sc/source/ui/undo/undostyl.cxx @@ -19,6 +19,7 @@ #include <svl/itemset.hxx> #include <vcl/virdev.hxx> +#include <osl/diagnose.h> #include <undostyl.hxx> #include <docsh.hxx> diff --git a/sc/source/ui/unoobj/PivotTableDataSequence.cxx b/sc/source/ui/unoobj/PivotTableDataSequence.cxx index ccbcd70dbbe0..7c5b12321dc9 100644 --- a/sc/source/ui/unoobj/PivotTableDataSequence.cxx +++ b/sc/source/ui/unoobj/PivotTableDataSequence.cxx @@ -13,6 +13,9 @@ #include <sal/config.h> #include <sal/log.hxx> +#include <osl/diagnose.h> +#include <vcl/svapp.hxx> + #include <miscuno.hxx> #include <document.hxx> #include <docsh.hxx> diff --git a/sc/source/ui/unoobj/PivotTableDataSource.cxx b/sc/source/ui/unoobj/PivotTableDataSource.cxx index dcc0e3547fd3..667599dc52cf 100644 --- a/sc/source/ui/unoobj/PivotTableDataSource.cxx +++ b/sc/source/ui/unoobj/PivotTableDataSource.cxx @@ -15,6 +15,7 @@ #include <docsh.hxx> #include <comphelper/sequence.hxx> +#include <vcl/svapp.hxx> using namespace css; diff --git a/sc/source/ui/unoobj/TablePivotChart.cxx b/sc/source/ui/unoobj/TablePivotChart.cxx index 5f0448cdb5fd..e6e1ca29e6ba 100644 --- a/sc/source/ui/unoobj/TablePivotChart.cxx +++ b/sc/source/ui/unoobj/TablePivotChart.cxx @@ -9,9 +9,11 @@ #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <svx/charthelper.hxx> #include <svx/svdoole2.hxx> #include <svtools/embedhlp.hxx> +#include <vcl/svapp.hxx> #include <miscuno.hxx> #include <docsh.hxx> diff --git a/sc/source/ui/unoobj/TablePivotCharts.cxx b/sc/source/ui/unoobj/TablePivotCharts.cxx index 8b9fa6cdaa4f..aeaacb64d7b7 100644 --- a/sc/source/ui/unoobj/TablePivotCharts.cxx +++ b/sc/source/ui/unoobj/TablePivotCharts.cxx @@ -9,6 +9,7 @@ #include <memory> #include <com/sun/star/embed/Aspects.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/chart/ChartDataRowSource.hpp> #include <com/sun/star/chart2/data/XDataReceiver.hpp> @@ -29,6 +30,7 @@ #include <tools/globname.hxx> #include <svtools/embedhlp.hxx> #include <comphelper/sequence.hxx> +#include <vcl/svapp.hxx> #include <TablePivotChart.hxx> #include <TablePivotCharts.hxx> diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx index 8878b33ea25a..1feedee5934f 100644 --- a/sc/source/ui/unoobj/addruno.cxx +++ b/sc/source/ui/unoobj/addruno.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/table/CellRangeAddress.hpp> #include <cppuhelper/supportsservice.hxx> +#include <osl/diagnose.h> #include <svl/itemprop.hxx> #include <vcl/svapp.hxx> diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index e1c0eb5dd941..aa2dd94ec39d 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -21,6 +21,7 @@ #include <editeng/eeitem.hxx> #include <svx/svdpool.hxx> +#include <vcl/svapp.hxx> #include <svx/algitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/brushitem.hxx> diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 4bc3931e0cac..7485ea3effd6 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/embed/Aspects.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart2/data/XDataReceiver.hpp> @@ -26,6 +27,7 @@ #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/table/CellRangeAddress.hpp> +#include <osl/diagnose.h> #include <svx/svditer.hxx> #include <svx/svdoole2.hxx> #include <svx/svdpage.hxx> @@ -37,6 +39,7 @@ #include <tools/globname.hxx> #include <svx/charthelper.hxx> #include <svtools/embedhlp.hxx> +#include <vcl/svapp.hxx> #include <ChartTools.hxx> #include <chartuno.hxx> diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index 2911132562b8..8130d1ce6556 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -37,12 +37,14 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/document/LinkUpdateModes.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <cppuhelper/supportsservice.hxx> #include <formula/grammar.hxx> #include <sfx2/printer.hxx> #include <xmloff/xmluconv.hxx> #include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> +#include <osl/diagnose.h> using namespace com::sun::star; diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index f04bd72d4554..cafc2522bb07 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -24,6 +24,7 @@ #include <svl/sharedstringpool.hxx> #include <vcl/svapp.hxx> #include <unotools/charclass.hxx> +#include <osl/diagnose.h> #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx index bec8a82e0429..60a7a839391c 100644 --- a/sc/source/ui/unoobj/defltuno.cxx +++ b/sc/source/ui/unoobj/defltuno.cxx @@ -24,6 +24,7 @@ #include <svx/unomid.hxx> #include <vcl/svapp.hxx> #include <i18nlangtag/languagetag.hxx> +#include <osl/diagnose.h> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 0f044477dae1..6712e11f9a2c 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -45,6 +45,7 @@ #include <sfx2/viewfrm.hxx> #include <vcl/commandevent.hxx> #include <vcl/pdfextoutdevdata.hxx> +#include <vcl/svapp.hxx> #include <vcl/waitobj.hxx> #include <unotools/charclass.hxx> #include <tools/multisel.hxx> diff --git a/sc/source/ui/unoobj/drdefuno.cxx b/sc/source/ui/unoobj/drdefuno.cxx index 60aa6c3bc3c6..8bff0a41f706 100644 --- a/sc/source/ui/unoobj/drdefuno.cxx +++ b/sc/source/ui/unoobj/drdefuno.cxx @@ -21,6 +21,8 @@ #include <docsh.hxx> #include <drwlayer.hxx> +#include <vcl/svapp.hxx> + using namespace ::com::sun::star; ScDrawDefaultsObj::ScDrawDefaultsObj(ScDocShell* pDocSh) : diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index 2de9e1d5b190..46900fce90a3 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -22,6 +22,7 @@ #include <vcl/svapp.hxx> #include <unotools/ucbstreamhelper.hxx> #include <connectivity/dbtools.hxx> +#include <osl/diagnose.h> #include <editutil.hxx> #include <filtuno.hxx> diff --git a/sc/source/ui/unoobj/forbiuno.cxx b/sc/source/ui/unoobj/forbiuno.cxx index 79b769178133..0928170c550b 100644 --- a/sc/source/ui/unoobj/forbiuno.cxx +++ b/sc/source/ui/unoobj/forbiuno.cxx @@ -19,6 +19,7 @@ #include <editeng/forbiddencharacterstable.hxx> #include <comphelper/processfactory.hxx> +#include <vcl/svapp.hxx> #include <forbiuno.hxx> #include <docsh.hxx> diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 07a7162e1280..666df526d95d 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -27,6 +27,7 @@ #include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <unotools/charclass.hxx> +#include <osl/diagnose.h> using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 2260f93295a2..a066d65eed72 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -23,6 +23,7 @@ #include <sal/macros.h> #include <svtools/unoimap.hxx> #include <svx/unofill.hxx> +#include <vcl/svapp.hxx> #include <editeng/unonrule.hxx> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index 92923e8a296f..177c0453f5ee 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -22,6 +22,7 @@ #include <vcl/svapp.hxx> #include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> +#include <osl/diagnose.h> #include <srchuno.hxx> #include <docsh.hxx> diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 4f8512558e8b..add1d156cebf 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -44,6 +44,7 @@ #include <svl/intitem.hxx> #include <svl/zformat.hxx> #include <tools/fract.hxx> +#include <osl/diagnose.h> #include <com/sun/star/table/BorderLine.hpp> #include <com/sun/star/table/CellVertJustify2.hpp> diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index 7a6fd5f0167b..88fc3e6360b1 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -24,6 +24,7 @@ #include <svl/hint.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> +#include <osl/diagnose.h> #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index 78df3e9d606d..acb43d707de9 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -32,6 +32,7 @@ #include <svl/itemprop.hxx> #include <vcl/svapp.hxx> +#include <osl/diagnose.h> #include <miscuno.hxx> #include <convuno.hxx> diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 77d94f0a7b8e..422b22c72777 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -70,6 +70,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/app.hxx> +#include <vcl/svapp.hxx> #include <toolkit/awt/vclxwindow.hxx> diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index 94f23c437c20..b751a8dd893f 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -35,6 +35,7 @@ #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <vcl/EnumContext.hxx> +#include <vcl/svapp.hxx> #include <svx/clipfmtitem.hxx> #include <svx/sidebar/ContextChangeEventMultiplexer.hxx> #include <editeng/langitem.hxx> diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index 2cf985c02e2d..b8e754af336b 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -25,6 +25,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> #include <svl/stritem.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <sfx2/app.hxx> #include <globstr.hrc> diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index dd40b374f762..d5064b41ae0d 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -20,6 +20,7 @@ #include <scitems.hxx> #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <unotools/charclass.hxx> diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index b993fa8c6c50..f5d91a286dee 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/embed/EmbedStates.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <svx/svditer.hxx> #include <svx/svdograf.hxx> diff --git a/sc/source/ui/view/pfuncache.cxx b/sc/source/ui/view/pfuncache.cxx index 3f61a68b2960..1d56bf3f3dfe 100644 --- a/sc/source/ui/view/pfuncache.cxx +++ b/sc/source/ui/view/pfuncache.cxx @@ -18,6 +18,7 @@ */ #include <tools/multisel.hxx> +#include <osl/diagnose.h> #include <pfuncache.hxx> #include <printfun.hxx> diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 154fa59aa835..66887ce09624 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -36,10 +36,12 @@ #include <svl/whiter.hxx> #include <vcl/help.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <tools/urlobj.hxx> #include <sfx2/docfile.hxx> #include <sfx2/printer.hxx> #include <sfx2/viewfrm.hxx> +#include <sfx2/viewfac.hxx> #include <drwlayer.hxx> #include <prevwsh.hxx> diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index b868c29280c3..d207c7cf1275 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -25,6 +25,7 @@ #include <vcl/help.hxx> #include <vcl/settings.hxx> #include <sal/log.hxx> +#include <tools/svborder.hxx> #include <pagedata.hxx> #include <tabview.hxx> diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx index c47cc31501bb..1551678717e9 100644 --- a/sc/source/ui/view/tabview2.cxx +++ b/sc/source/ui/view/tabview2.cxx @@ -20,6 +20,7 @@ #include <scitems.hxx> #include <editeng/eeitem.hxx> #include <vcl/timer.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <sfx2/app.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx index a193d20431f4..8d7d6fdc5191 100644 --- a/sc/source/ui/view/tabvwsh.cxx +++ b/sc/source/ui/view/tabvwsh.cxx @@ -28,6 +28,7 @@ #include <sfx2/app.hxx> #include <sfx2/infobar.hxx> #include <sfx2/sidebar/SidebarChildWindow.hxx> +#include <sfx2/viewfac.hxx> #include <cellvalue.hxx> #include <docoptio.hxx> diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index af90ce16e2aa..e7397c77beb7 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -39,6 +39,7 @@ #include <unotools/moduleoptions.hxx> #include <tools/urlobj.hxx> #include <sfx2/docfile.hxx> +#include <tools/svborder.hxx> #include <tabvwsh.hxx> #include <sc.hrc> diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index eb1dd71c30be..cc7492d8a17a 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/embed/EmbedMisc.hpp> #include <com/sun/star/embed/EmbedStates.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <vcl/errinf.hxx> #include <sfx2/app.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx index a91585c13e25..5de00a5f2a1f 100644 --- a/sc/source/ui/view/tabvwshh.cxx +++ b/sc/source/ui/view/tabvwshh.cxx @@ -28,6 +28,7 @@ #include <sfx2/request.hxx> #include <basic/sbxcore.hxx> #include <svl/whiter.hxx> +#include <vcl/svapp.hxx> #include <tabvwsh.hxx> #include <client.hxx> diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index bf7b8382dcba..84cbdcfe9a5e 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -31,6 +31,7 @@ #include <sot/formats.hxx> #include <sot/storage.hxx> #include <vcl/graph.hxx> +#include <vcl/svapp.hxx> #include <vcl/virdev.hxx> #include <vcl/weld.hxx> #include <tools/urlobj.hxx> diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index db36cb004402..938571650805 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -42,6 +42,7 @@ #include <vcl/transfer.hxx> #include <svl/urlbmk.hxx> #include <svl/sharedstringpool.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <avmedia/mediawindow.hxx> diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 7e030c828e22..e65148fbee37 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -42,6 +42,7 @@ #include <svl/stritem.hxx> #include <vcl/transfer.hxx> #include <vcl/graph.hxx> +#include <osl/thread.h> #include <comphelper/automationinvokedzone.hxx> #include <comphelper/lok.hxx> diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx index 39c6fa9c7db3..3466beca42d1 100644 --- a/sc/source/ui/view/viewfun7.cxx +++ b/sc/source/ui/view/viewfun7.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/embed/NoVisualAreaSizeException.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <svx/svditer.hxx> #include <svx/svdograf.hxx> diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 00c0678ba32c..9fa34128fedc 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -34,6 +34,7 @@ #include <sfx2/bindings.hxx> #include <svl/zforlist.hxx> #include <svl/zformat.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <vcl/virdev.hxx> #include <vcl/waitobj.hxx> diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx index ac6f1b91ecab..673dc46bb704 100644 --- a/sc/source/ui/view/viewutil.cxx +++ b/sc/source/ui/view/viewutil.cxx @@ -36,6 +36,7 @@ #include <sfx2/viewfrm.hxx> #include <svl/stritem.hxx> #include <svl/eitem.hxx> +#include <osl/diagnose.h> #include <viewutil.hxx> #include <global.hxx> diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index 5ecd310d54f8..bdfdaef19daf 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -26,6 +26,9 @@ #include <svl/itemset.hxx> #include <tools/solar.h> #include <vcl/abstdlg.hxx> + +#include <com/sun/star/beans/PropertyValue.hpp> + #include "prlayout.hxx" #include "pres.hxx" #include "sddllapi.h" diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 1ff77f1283c3..8647f74846ad 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -76,6 +76,7 @@ #include <sdundogr.hxx> #include <undopage.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <unokywds.hxx> namespace com { namespace sun { namespace star { namespace linguistic2 { class XHyphenator; } } } } diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 8f9f335bb837..2bd0c59acc38 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -29,6 +29,8 @@ #include <svl/style.hxx> #include <svx/svdpagv.hxx> #include <svx/svdundo.hxx> +#include <vcl/button.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <xmloff/autolayout.hxx> diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index e529d63713b1..d9179514cccc 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -33,6 +33,7 @@ #include <comphelper/processfactory.hxx> #include <vcl/graphicfilter.hxx> +#include <vcl/svapp.hxx> #include <sdpage.hxx> #include <drawdoc.hxx> diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index da7b9d0c8d1e..cb16a3d6685d 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/view/XSelectionSupplier.hpp> #include <cppuhelper/queryinterface.hxx> #include <comphelper/processfactory.hxx> #include <sal/log.hxx> diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 51dc4fdc692d..fe8ee55e3344 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -35,6 +35,7 @@ #include <sal/log.hxx> #include <svx/gallery.hxx> +#include <vcl/layout.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <tools/urlobj.hxx> diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index bcde3fdb6e5d..aa56364c8889 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -27,6 +27,7 @@ #include <vcl/commandinfoprovider.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <vcl/menu.hxx> #include <vcl/weld.hxx> diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 643cda7ec5fe..4a112b0d6c7f 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/geometry/RealPoint2D.hpp> #include <com/sun/star/office/XAnnotation.hpp> +#include <vcl/commandevent.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 56d43b7935fc..6c566287cd41 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -36,6 +36,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> +#include <vcl/commandevent.hxx> #include <vcl/vclenum.hxx> #include <vcl/scrbar.hxx> #include <vcl/svapp.hxx> diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index 521059b0dafd..7567478a6613 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -21,7 +21,9 @@ #include <unotools/ucbstreamhelper.hxx> #include <unotools/resmgr.hxx> #include <tools/urlobj.hxx> +#include <vcl/commandevent.hxx> #include <vcl/virdev.hxx> +#include <vcl/svapp.hxx> #include <svl/intitem.hxx> #include <sfx2/msg.hxx> #include <sfx2/objface.hxx> diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index f60e2ee4d0b8..20c60e5f87c4 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -23,6 +23,8 @@ #include <unotools/moduleoptions.hxx> #include <framework/FrameworkHelper.hxx> +#include <vcl/commandevent.hxx> +#include <vcl/svapp.hxx> #include <vcl/errinf.hxx> #include <editeng/langitem.hxx> #include <vcl/weld.hxx> diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx index c662ab0e4c63..2c27db05bafb 100644 --- a/sd/source/ui/app/tmplctrl.cxx +++ b/sd/source/ui/app/tmplctrl.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <vcl/commandevent.hxx> #include <vcl/menu.hxx> #include <vcl/status.hxx> #include <svl/stritem.hxx> diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index 76c8e22e7551..c37aa9637885 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -20,6 +20,7 @@ #include <LayerTabBar.hxx> #include <svx/svdlayer.hxx> #include <svx/svdpagv.hxx> +#include <vcl/commandevent.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <sfx2/dispatch.hxx> diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx index db2c534e26f4..cc8dd8761501 100644 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -26,6 +26,9 @@ #include <sdresid.hxx> #include <app.hrc> +#include <com/sun/star/frame/XDispatchProvider.hpp> +#include <com/sun/star/frame/XFrame.hpp> + using namespace ::com::sun::star; SFX_IMPL_TOOLBOX_CONTROL( SdTbxCtlDiaPages, SfxUInt16Item ) diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx index 26227ff9dfb7..9f2b9e7f3334 100644 --- a/sd/source/ui/dlg/gluectrl.cxx +++ b/sd/source/ui/dlg/gluectrl.cxx @@ -26,6 +26,9 @@ #include <sdresid.hxx> #include <app.hrc> +#include <com/sun/star/frame/XDispatchProvider.hpp> +#include <com/sun/star/frame/XFrame.hpp> + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 5af508c01fa1..723c5dc70e8f 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/embed/NeedsRunningStateException.hpp> #include <com/sun/star/embed/VerbDescriptor.hpp> #include <com/sun/star/embed/EmbedStates.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <comphelper/string.hxx> #include <com/sun/star/embed/VerbAttributes.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index f5c45fab0a6b..237e6f04e43e 100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -24,6 +24,7 @@ #include <facreg.hxx> #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XView.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/compbase.hxx> #include <tools/diagnose_ex.h> #include <slideshow.hxx> diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 142188e5414c..4d847373fbd3 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -20,6 +20,7 @@ #include <sal/config.h> #include <editeng/eeitem.hxx> +#include <vcl/svapp.hxx> #include <vcl/waitobj.hxx> #include <vcl/ptrstyle.hxx> #include <editeng/flditem.hxx> diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx index 76ef9eba7b92..eb54b73af5ad 100644 --- a/sd/source/ui/func/fuhhconv.cxx +++ b/sd/source/ui/func/fuhhconv.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <comphelper/propertysequence.hxx> diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index b7b1482bbdfb..cd7860b48c4b 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/embed/NoVisualAreaSizeException.hpp> #include <com/sun/star/embed/XComponentSupplier.hpp> #include <com/sun/star/embed/Aspects.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/drawing/FillStyle.hpp> diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 2beb768db539..05b5c5ff36de 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -18,6 +18,7 @@ */ #include <fuinsfil.hxx> +#include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> #include <sfx2/progress.hxx> #include <editeng/outliner.hxx> diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx index 5db90338d3bd..397c2f17f383 100644 --- a/sd/source/ui/func/smarttag.cxx +++ b/sd/source/ui/func/smarttag.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <vcl/commandevent.hxx> + #include <ViewShell.hxx> #include <smarttag.hxx> #include <Window.hxx> diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index a012366e1bfa..8b7707504173 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -24,6 +24,7 @@ #include <sfx2/viewsh.hxx> #include <vcl/prntypes.hxx> +#include <vcl/scrbar.hxx> #include <o3tl/deleter.hxx> #include <pres.hxx> #include "View.hxx" diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index 067a394a024b..18e1fd08d5ad 100644 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -21,6 +21,7 @@ #define INCLUDED_SD_SOURCE_UI_INC_PRNTOPTS_HXX #include <vcl/button.hxx> +#include <vcl/layout.hxx> #include <sfx2/tabdlg.hxx> class SdPrintOptions : public SfxTabPage diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index 464fbba9d1f6..6bfda966f217 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_TPOPTION_HXX #define INCLUDED_SD_SOURCE_UI_INC_TPOPTION_HXX +#include <vcl/layout.hxx> #include <vcl/lstbox.hxx> #include <vcl/fixed.hxx> #include <vcl/field.hxx> diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index eb81998a3a37..f7d648108d77 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -49,6 +49,7 @@ #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <svl/languageoptions.hxx> +#include <vcl/commandevent.hxx> #include <vcl/image.hxx> #include <vcl/floatwin.hxx> #include <xmloff/autolayout.hxx> diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index 0f155af823d4..78c85363ca21 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -39,6 +39,7 @@ #include <ViewShellBase.hxx> #include <sfx2/objface.hxx> #include <drawview.hxx> +#include <vcl/commandevent.hxx> #include <vcl/image.hxx> #include <vcl/floatwin.hxx> #include <svl/languageoptions.hxx> diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx index 59adf72fc7af..8e6e65eef727 100644 --- a/sd/source/ui/sidebar/SlideBackground.hxx +++ b/sd/source/ui/sidebar/SlideBackground.hxx @@ -24,6 +24,7 @@ #include <vcl/lstbox.hxx> #include <vcl/fixed.hxx> #include <vcl/button.hxx> +#include <vcl/layout.hxx> #include <svx/sidebar/PanelLayout.hxx> #include <svx/itemwin.hxx> #include <sfx2/sidebar/ControllerItem.hxx> diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 1b458f4ba98f..564e23f1e844 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -25,6 +25,7 @@ #include <unotools/localedatawrapper.hxx> #include <unotools/syslocale.hxx> #include <sfx2/viewfrm.hxx> +#include <sfx2/sfxsids.hrc> #include <slideshow.hxx> diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index ccb2924e7a08..a358bbfee73f 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -33,6 +33,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> +#include <sfx2/sfxsids.hrc> #include <svx/unoprov.hxx> diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 2cbc9e0a67d1..670a9eb2cd2a 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -72,10 +72,13 @@ #include <bitmaps.hlst> #include <vcl/canvastools.hxx> +#include <vcl/commandevent.hxx> #include <vcl/commandinfoprovider.hxx> + #include <vcl/settings.hxx> #include <vcl/scheduler.hxx> - +#include <vcl/svapp.hxx> +#include <vcl/help.hxx> #include <comphelper/anytostring.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 3e730ac129e5..bb4f44ce0649 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -71,6 +71,7 @@ #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> +#include <vcl/commandevent.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index ee836281e3ba..ec35f545448b 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/UnknownPropertyException.hpp> +#include <com/sun/star/frame/XController.hpp> #include <ViewShellBase.hxx> #include <DrawViewShell.hxx> diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index 39d3898ef91a..71a9c0130085 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -58,6 +58,7 @@ #include <comphelper/serviceinfohelper.hxx> #include <svx/svdogrp.hxx> #include <o3tl/typed_flags_set.hxx> +#include <vcl/svapp.hxx> #include <anminfo.hxx> #include "unoobj.hxx" diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 6c537dce7b81..2f69f26a9f74 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -21,6 +21,7 @@ #include <boost/property_tree/json_parser.hpp> #include <vcl/wrkwin.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <svl/srchitem.hxx> #include <editeng/colritem.hxx> diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index adb91f6d400a..1f0498f4aca3 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -43,6 +43,7 @@ #include <svx/extrusionbar.hxx> #include <svx/fontworkbar.hxx> #include <tools/link.hxx> +#include <vcl/svapp.hxx> #include <map> #include <utility> diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 4bc8cc834387..84ba981029a1 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -72,6 +72,7 @@ #include <svl/whiter.hxx> #include <vcl/commandinfoprovider.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <sfx2/notebookbar/SfxNotebookBar.hxx> @@ -79,6 +80,7 @@ #include <sfx2/lokhelper.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <editeng/editview.hxx> +#include <tools/svborder.hxx> #include <fubullet.hxx> #include <drawview.hxx> diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 409df6ebd933..ee999b73926b 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -44,6 +44,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/viewfrm.hxx> #include <sfx2/sidebar/Sidebar.hxx> #include <svl/aeitem.hxx> @@ -51,6 +52,7 @@ #include <basic/sbstar.hxx> #include <basic/sberrors.hxx> #include <xmloff/autolayout.hxx> +#include <vcl/svapp.hxx> #include <undo/undoobjects.hxx> diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 91839c6a69c8..a86f49a010e3 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -18,6 +18,7 @@ */ #include <sfx2/dispatch.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <svx/svdpagv.hxx> #include <sfx2/request.hxx> diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 8843043fb4a9..1ac63a5029a9 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -22,6 +22,7 @@ #include <DrawController.hxx> #include <com/sun/star/embed/EmbedStates.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <comphelper/anytostring.hxx> #include <comphelper/scopeguard.hxx> diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index 30d36ce8ee68..fee45c5cedca 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <DrawViewShell.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <svl/urlbmk.hxx> #include <svx/svdpagv.hxx> @@ -38,6 +39,7 @@ #include <sfx2/viewfrm.hxx> #include <editeng/editview.hxx> #include <vcl/cursor.hxx> +#include <vcl/commandevent.hxx> #include <app.hrc> #include <strings.hrc> diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 78330fcd6be8..8bcab029e914 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -23,6 +23,7 @@ #include <vcl/metaact.hxx> #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <sfx2/viewfrm.hxx> #include <svx/svdograf.hxx> diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 456cc5ce176d..57596bc0cb49 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -45,6 +45,7 @@ #include <svx/fmshell.hxx> #include <svl/eitem.hxx> #include <svl/aeitem.hxx> +#include <svl/itempool.hxx> #include <svl/itemset.hxx> #include <svl/stritem.hxx> #include <svl/visitem.hxx> diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index eb50712db032..c38a82d385f7 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -33,6 +33,7 @@ #include <svl/aeitem.hxx> #include <editeng/editstat.hxx> #include <editeng/outlobj.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <svl/urlbmk.hxx> #include <svx/svdpagv.hxx> diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx index f0c32d1bf830..d43c40cd764f 100644 --- a/sd/source/ui/view/drviewsj.cxx +++ b/sd/source/ui/view/drviewsj.cxx @@ -19,6 +19,7 @@ #include <DrawViewShell.hxx> #include <com/sun/star/embed/EmbedMisc.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <svl/aeitem.hxx> #include <svx/svxids.hrc> #include <svx/globl3d.hxx> diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx index 8243d15768ee..f05d5fc40214 100644 --- a/sd/source/ui/view/frmview.cxx +++ b/sd/source/ui/view/frmview.cxx @@ -26,6 +26,7 @@ #include <rtl/ustrbuf.hxx> #include <unokywds.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <vector> #include <ViewShell.hxx> diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 73812a86541f..7f6e58798ac3 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -42,6 +42,7 @@ #include <svx/svdotext.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> +#include <vcl/commandevent.hxx> #include <vcl/scrbar.hxx> #include <vcl/settings.hxx> diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 1b8b91e0804a..9cfb5ae72c94 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -21,6 +21,7 @@ #include <editeng/forbiddencharacterstable.hxx> #include <sfx2/progress.hxx> #include <vcl/commandinfoprovider.hxx> +#include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> #include <svx/svxids.hrc> #include <editeng/outliner.hxx> @@ -51,6 +52,8 @@ #include <editeng/svxfont.hxx> #include <editeng/fhgtitem.hxx> +#include <com/sun/star/frame/XFrame.hpp> + #include <DrawDocShell.hxx> #include <drawdoc.hxx> #include <Window.hxx> diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index 8bd4a9bb4e7c..60600b301afc 100644 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -23,6 +23,7 @@ #include <svx/svxids.hrc> #include <sfx2/ctrlitem.hxx> #include <sfx2/bindings.hxx> +#include <vcl/commandevent.hxx> #include <View.hxx> #include <DrawViewShell.hxx> diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 088311eb4634..cd929d32a36a 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/embed/NoVisualAreaSizeException.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/linguistic2/XSpellChecker1.hpp> #include <View.hxx> diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 073104776c6a..5e46e0579bc8 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -28,6 +28,7 @@ #include <sfx2/fcontnr.hxx> #include <sfx2/docfile.hxx> #include <sfx2/sfxsids.hrc> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <svl/urlbmk.hxx> #include <svx/svdpagv.hxx> @@ -60,6 +61,7 @@ #include <com/sun/star/embed/XEmbedPersist.hpp> #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/NoVisualAreaSizeException.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <svtools/soerr.hxx> #include <sfx2/ipclient.hxx> #include <svx/svdoashp.hxx> diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 2dcc85ded9fe..b37d113b40f7 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -43,6 +43,7 @@ #include <uiobject.hxx> #include <sal/log.hxx> +#include <vcl/commandevent.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index c8e25b86d3dd..add49a87292c 100644 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -23,6 +23,7 @@ #include <svx/svdlayer.hxx> #include <svx/svdpagv.hxx> #include <sfx2/dispatch.hxx> +#include <vcl/commandevent.hxx> #include <sdattr.hxx> #include <sdmod.hxx> diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 6cc9e6bf48d9..74262f5cf04a 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -28,6 +28,7 @@ #include <vcl/help.hxx> #include <vcl/lazydelete.hxx> #include <vcl/ptrstyle.hxx> +#include <vcl/svapp.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/sdrpaintwindow.hxx> diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 7c44ab0e99d3..f5e511d21a0e 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/embed/EmbedVerbs.hpp> #include <com/sun/star/embed/NoVisualAreaSizeException.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/drawing/FillStyle.hpp> diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 4f321bd7134b..75fcbc469c32 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -32,6 +32,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> +#include <vcl/commandevent.hxx> #include <vcl/scrbar.hxx> #include <svl/eitem.hxx> #include <svx/ruler.hxx> @@ -66,6 +67,7 @@ #include <svx/fontworkbar.hxx> #include <svx/svdoutl.hxx> #include <tools/diagnose_ex.h> +#include <tools/svborder.hxx> #include <comphelper/lok.hxx> #include <svl/slstitm.hxx> diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 42c7f848e392..7fe75421ecfc 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -60,6 +60,7 @@ #include <sfx2/minfitem.hxx> #include <sfx2/evntconf.hxx> #include <sfx2/request.hxx> +#include <sfx2/sfxsids.hrc> #include <appdata.hxx> #include <sfx2/sfxhelp.hxx> #include <basic/basmgr.hxx> diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx index d122a2082e49..a3e786b4033c 100644 --- a/sfx2/source/appl/appdata.cxx +++ b/sfx2/source/appl/appdata.cxx @@ -36,6 +36,7 @@ #include <arrdecl.hxx> #include <sfx2/docfac.hxx> #include <sfx2/docfile.hxx> +#include <sfx2/module.hxx> #include <sfx2/request.hxx> #include <sfx2/sidebar/Theme.hxx> #include <sfx2/unoctitm.hxx> diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index c9b6da55d3ea..7e29627c9b69 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -21,6 +21,7 @@ #include <vcl/canvastools.hxx> #include <vcl/status.hxx> +#include <vcl/svapp.hxx> #include <svl/whiter.hxx> #include <svl/stritem.hxx> #include <svl/intitem.hxx> @@ -58,6 +59,7 @@ #include <sfx2/templdlg.hxx> #include <sfx2/module.hxx> #include <sfx2/msgpool.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/viewfrm.hxx> #include <openflag.hxx> #include <sfx2/viewsh.hxx> diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index ec7aa6e80612..592fd4b28a16 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -93,6 +93,7 @@ #include <sfx2/docfac.hxx> #include <sfx2/event.hxx> #include <sfx2/templatedlg.hxx> +#include <sfx2/sfxsids.hrc> #include <openuriexternally.hxx> #include <officecfg/Office/ProtocolHandler.hxx> diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index f208b5ae0686..cd0070f6cd49 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -29,6 +29,7 @@ #include <sfx2/objface.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/tabdlg.hxx> +#include <sfx2/sfxsids.hrc> #include <svl/intitem.hxx> #include <tools/diagnose_ex.h> #include <rtl/strbuf.hxx> diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index a4e281e67c83..b3f472ac3f81 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -35,15 +35,18 @@ #include <childwinimpl.hxx> #include <sfx2/msgpool.hxx> #include <sfx2/request.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/toolbarids.hxx> #include <vcl/taskpanelist.hxx> #include <vcl/toolbox.hxx> +#include <vcl/svapp.hxx> #include <tools/diagnose_ex.h> #include <svl/itempool.hxx> #include <svl/itemiter.hxx> #include <svl/whiter.hxx> #include <svl/intitem.hxx> #include <svl/eitem.hxx> +#include <tools/svborder.hxx> #include <unotools/moduleoptions.hxx> #include <com/sun/star/ui/XUIElement.hpp> #include <com/sun/star/frame/LayoutManagerEvents.hpp> diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 271584a0ceff..f8772610617d 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -81,6 +81,7 @@ #include <sfx2/doctempl.hxx> #include <sfx2/frame.hxx> #include <sfx2/dispatch.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/viewfrm.hxx> #include <helper.hxx> #include "fltlst.hxx" diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index e67be00fef5f..858ce7e45ae8 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -38,6 +38,7 @@ #include <sfx2/dispatch.hxx> #include <sfxtypes.hxx> #include <sfx2/docfile.hxx> +#include <sfx2/sfxsids.hrc> #include <workwin.hxx> #include <sfx2/msg.hxx> #include <sfxslots.hxx> diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 2c8e71e96dee..ffe006d7259a 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -44,6 +44,7 @@ #include <sfx2/ctrlitem.hxx> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> +#include <sfx2/module.hxx> #include <sfx2/request.hxx> #include <sfx2/objface.hxx> #include <sfxtypes.hxx> diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 840ad03bd814..6362252d4bd7 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/ui/ContextMenuExecuteEvent.hpp> #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <comphelper/lok.hxx> @@ -54,6 +55,7 @@ #include <sfx2/objface.hxx> #include <sfx2/request.hxx> #include <sfx2/sfxhelp.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/sfxuno.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index 1a0acba533eb..3156d66ca0b8 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -35,6 +35,9 @@ #include <tools/urlobj.hxx> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/embed/StorageFactory.hpp> +#include <com/sun/star/embed/ElementModes.hpp> +#include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XFrame.hpp> diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 47ad3b43efb9..52c59572daa7 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -23,6 +23,7 @@ #include <officecfg/Office/Common.hxx> #include <rtl/ustring.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> #include <svl/itempool.hxx> #include <svl/undo.hxx> #include <itemdel.hxx> @@ -39,6 +40,7 @@ #include <sfx2/viewsh.hxx> #include <sfxtypes.hxx> #include <sfx2/request.hxx> +#include <sfx2/sfxsids.hrc> #include <statcach.hxx> #include <sfx2/msgpool.hxx> #include <sidebar/ContextChangeBroadcaster.hxx> diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 9c4986a16220..b3a2d9f141b9 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -40,9 +40,13 @@ #include <vcl/settings.hxx> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> +#include <vcl/pngread.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> +#include <com/sun/star/embed/ElementModes.hpp> +#include <com/sun/star/embed/StorageFactory.hpp> +#include <com/sun/star/embed/XStorage.hpp> #include <memory> diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 928616f99e13..e7d31019e4b2 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -31,6 +31,8 @@ #include <svl/itempool.hxx> #include <tools/urlobj.hxx> #include <com/sun/star/awt/FontDescriptor.hpp> +#include <com/sun/star/awt/Point.hpp> +#include <com/sun/star/awt/Size.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/Desktop.hpp> diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index 962f706775a8..abf5ca90bada 100644 --- a/sfx2/source/dialog/backingcomp.cxx +++ b/sfx2/source/dialog/backingcomp.cxx @@ -40,10 +40,12 @@ #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/lang/XTypeProvider.hpp> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/weak.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/keycod.hxx> #include <vcl/wrkwin.hxx> diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index a3d0fedd6531..a668917dd7bf 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -66,6 +66,7 @@ #include <sfx2/passwd.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/dinfdlg.hxx> +#include <sfx2/sfxsids.hrc> #include <helper.hxx> #include <sfx2/objsh.hxx> #include <sfx2/docfile.hxx> diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 233c66293c33..4dc669dd6cf2 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -18,7 +18,9 @@ */ #include <svl/eitem.hxx> +#include <vcl/event.hxx> #include <vcl/decoview.hxx> +#include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/timer.hxx> @@ -32,6 +34,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> +#include <sfx2/sfxsids.hrc> #include <workwin.hxx> #include <splitwin.hxx> #include <sfx2/viewsh.hxx> diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index d90442d11838..afc71404b6c8 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -18,6 +18,7 @@ #include <sfx2/infobar.hxx> #include <sfx2/objface.hxx> #include <sfx2/objsh.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> #include <vcl/svapp.hxx> diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index 409447c600bb..bfc6d1196488 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -29,6 +29,7 @@ #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index c73265b406d5..d1f9426aff2b 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -37,7 +37,9 @@ #include <unotools/viewoptions.hxx> #include <vcl/builder.hxx> #include <vcl/IDialogRenderable.hxx> +#include <vcl/layout.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> #include <sfx2/strings.hrc> #include <helpids.h> diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index f3d4fb3024fc..bcd013dda8be 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -20,6 +20,7 @@ #include <memory> #include <vcl/commandinfoprovider.hxx> +#include <vcl/event.hxx> #include <vcl/menu.hxx> #include <vcl/settings.hxx> #include <svl/intitem.hxx> @@ -37,6 +38,7 @@ #include <officecfg/Office/Common.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> #include <sfx2/sfxhelp.hxx> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> @@ -52,6 +54,7 @@ #include <sfx2/tplpitem.hxx> #include <sfx2/sfxresid.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/strings.hrc> #include <arrdecl.hxx> #include <sfx2/docfilt.hxx> diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx index 33498cfd666b..68cefec38e1f 100644 --- a/sfx2/source/doc/docundomanager.cxx +++ b/sfx2/source/doc/docundomanager.cxx @@ -24,6 +24,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/bindings.hxx> +#include <sfx2/sfxsids.hrc> #include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/lang/NotInitializedException.hpp> #include <svl/undo.hxx> diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 02834f8fb98c..709d03d4ae8e 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -67,6 +67,7 @@ #include <basic/basmgr.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/doctempl.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/strings.hrc> #include <sfx2/sfxbasemodel.hxx> #include <sfx2/docfile.hxx> diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 882908f3fc82..a176a82ddf37 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/document/XScriptInvocationContext.hpp> #include <com/sun/star/embed/EmbedStates.hpp> #include <com/sun/star/embed/XEmbedPersist.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/script/provider/theMasterScriptProviderFactory.hpp> #include <com/sun/star/script/provider/XScript.hpp> #include <com/sun/star/script/provider/XScriptProvider.hpp> @@ -104,6 +105,7 @@ #include <sfx2/module.hxx> #include <sfx2/docfac.hxx> #include <helper.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/strings.hrc> #include <workwin.hxx> #include <sfx2/sfxdlg.hxx> diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 3f59ecb9a3e3..cd8bdd0ced85 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -98,11 +98,13 @@ #include <sfx2/checkin.hxx> #include <sfx2/infobar.hxx> #include <sfx2/sfxuno.hxx> +#include <sfx2/sfxsids.hrc> #include <SfxRedactionHelper.hxx> #include <com/sun/star/document/XDocumentSubStorageSupplier.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/util/XCloneable.hpp> +#include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/text/XPageCursor.hpp> #include <com/sun/star/text/XTextViewCursorSupplier.hpp> diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index 6d39bfad10c0..5588fb983bf7 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -47,6 +47,7 @@ #include <osl/mutex.hxx> #include <cppuhelper/implbase.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 67c6a009f090..3cdc669a1f62 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -76,6 +76,7 @@ #include <basic/sbuno.hxx> #include <tools/urlobj.hxx> #include <tools/diagnose_ex.h> +#include <tools/svborder.hxx> #include <unotools/tempfile.hxx> #include <osl/mutex.hxx> #include <vcl/errcode.hxx> @@ -109,12 +110,14 @@ #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/dispatch.hxx> +#include <sfx2/module.hxx> #include <sfx2/request.hxx> #include <sfx2/printer.hxx> #include <basic/basmgr.hxx> #include <sfx2/event.hxx> #include <eventsupplier.hxx> #include <sfx2/evntconf.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/strings.hrc> #include <sfx2/app.hxx> #include <appdata.hxx> diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index 64bc24956e17..a0eb228f5dfb 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -41,6 +41,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/objsh.hxx> +#include <sfx2/sfxsids.hrc> #include <sfxtypes.hxx> #include <helper.hxx> diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx index 222e0f2f7e6f..0090cb1de1bd 100644 --- a/sfx2/source/notebookbar/SfxNotebookBar.cxx +++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx @@ -16,6 +16,7 @@ #include <vcl/syswin.hxx> #include <vcl/tabctrl.hxx> #include <sfx2/viewfrm.hxx> +#include <sfx2/sfxsids.hrc> #include <comphelper/processfactory.hxx> #include <com/sun/star/frame/UnknownModuleException.hpp> #include <com/sun/star/ui/ContextChangeEventMultiplexer.hpp> diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index dd8eac28bcac..f041c7a705e9 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XController.hpp> +#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/frame/status/ItemStatus.hpp> #include <com/sun/star/frame/status/ItemState.hpp> diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 1501c3a07708..50db8dd17ab7 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -53,6 +53,7 @@ #include <unotools/moduleoptions.hxx> #include <svtools/imagemgr.hxx> +#include <svtools/framestatuslistener.hxx> #include <comphelper/processfactory.hxx> #include <framework/addonmenu.hxx> #include <framework/addonsoptions.hxx> diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index d50ca359bc8d..5d341803996c 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/container/XChild.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <vcl/menu.hxx> #include <svl/intitem.hxx> @@ -33,6 +34,7 @@ #include <svl/eitem.hxx> #include <svl/stritem.hxx> #include <tools/globname.hxx> +#include <tools/svborder.hxx> #include <com/sun/star/awt/PosSize.hpp> #include <appdata.hxx> @@ -47,6 +49,7 @@ #include <sfx2/docfilt.hxx> #include <sfx2/frmdescr.hxx> #include <openflag.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/viewsh.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/request.hxx> diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index f55359981ced..804440a4f24f 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -31,6 +31,7 @@ #include <sfx2/event.hxx> #include <sfx2/objface.hxx> #include <sfx2/request.hxx> +#include <sfx2/sfxsids.hrc> #include <com/sun/star/awt/XWindow2.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -48,6 +49,7 @@ #include <svl/stritem.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> +#include <vcl/event.hxx> #include <vcl/syswin.hxx> #include <sal/log.hxx> diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index 8d79c52ebc0b..9d609cd6a039 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -50,6 +50,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/util/XCloseable.hpp> #include <comphelper/interaction.hxx> #include <comphelper/namedvaluecollection.hxx> @@ -69,6 +70,7 @@ #include <svl/stritem.hxx> #include <tools/diagnose_ex.h> #include <ucbhelper/simpleinteractionrequest.hxx> +#include <vcl/svapp.hxx> using namespace com::sun::star; using ::com::sun::star::beans::PropertyValue; diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx index b5f3413d2894..79ab640c362b 100644 --- a/sfx2/source/view/impframe.hxx +++ b/sfx2/source/view/impframe.hxx @@ -28,6 +28,7 @@ class SfxViewFrame; #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/PosSize.hpp> #include <cppuhelper/weak.hxx> +#include <tools/svborder.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/sfxuno.hxx> diff --git a/sfx2/source/view/impviewframe.hxx b/sfx2/source/view/impviewframe.hxx index 830035587965..60c8c5b575f8 100644 --- a/sfx2/source/view/impviewframe.hxx +++ b/sfx2/source/view/impviewframe.hxx @@ -23,6 +23,7 @@ #include <sfx2/viewfrm.hxx> #include <svtools/asynclink.hxx> +#include <tools/svborder.hxx> #include <vcl/window.hxx> #include <boost/optional.hpp> diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index a7d8ac8850f4..47064b004004 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/embed/XEmbedPersist.hpp> #include <com/sun/star/embed/EmbedVerbs.hpp> #include <com/sun/star/embed/XEmbeddedOleObject.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx index 581b78f87c5b..9e9b9ab53e82 100644 --- a/sfx2/source/view/lokhelper.cxx +++ b/sfx2/source/view/lokhelper.cxx @@ -13,9 +13,11 @@ #include <comphelper/processfactory.hxx> #include <vcl/svapp.hxx> +#include <vcl/commandevent.hxx> #include <sfx2/app.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/request.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/viewfrm.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <comphelper/lok.hxx> diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 8647dd7ea686..6f5671223e79 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -73,6 +73,8 @@ #include <toolkit/helper/convert.hxx> #include <framework/titlehelper.hxx> #include <comphelper/processfactory.hxx> +#include <vcl/svapp.hxx> +#include <tools/svborder.hxx> #include <sfx2/event.hxx> #include <sfx2/viewfac.hxx> diff --git a/sfx2/source/view/userinputinterception.cxx b/sfx2/source/view/userinputinterception.cxx index 7c68dd93add9..7be578aecca4 100644 --- a/sfx2/source/view/userinputinterception.cxx +++ b/sfx2/source/view/userinputinterception.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/awt/MouseButton.hpp> #include <com/sun/star/awt/KeyModifier.hpp> +#include <com/sun/star/awt/XUserInputInterception.hpp> #include <comphelper/interfacecontainer2.hxx> #include <cppuhelper/weak.hxx> diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 91092303671b..abff96219425 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -21,6 +21,7 @@ #include <osl/file.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/infobar.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/viewfrm.hxx> #include <sfx2/classificationhelper.hxx> #include <sfx2/notebookbar/SfxNotebookBar.hxx> diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index a32995957ab6..eb226aff59bd 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -32,10 +32,12 @@ #include <sfx2/objitem.hxx> #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> #include <com/sun/star/util/CloseVetoException.hpp> #include <com/sun/star/util/XCloseable.hpp> +#include <com/sun/star/embed/VerbDescriptor.hpp> #include <svtools/asynclink.hxx> #include <svl/eitem.hxx> diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 8cf03f6daffc..243136eef9bc 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/view/XRenderable.hpp> +#include <com/sun/star/view/XSelectionSupplier.hpp> #include <sal/log.hxx> #include <svl/itempool.hxx> @@ -48,8 +49,10 @@ #include <sfx2/event.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/strings.hrc> #include <sfx2/sfxuno.hxx> +#include <sfx2/tabdlg.hxx> #include <toolkit/awt/vclxdevice.hxx> diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 029f12d15765..57677b689784 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -24,6 +24,7 @@ #include <svl/eitem.hxx> #include <svl/whiter.hxx> #include <vcl/toolbox.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <svl/intitem.hxx> #include <svtools/langhelp.hxx> @@ -35,10 +36,14 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/embed/EmbedStates.hpp> #include <com/sun/star/embed/EmbedMisc.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/container/XContainerQuery.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp> +#include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp> +#include <com/sun/star/view/XRenderable.hpp> #include <cppuhelper/implbase.hxx> #include <osl/file.hxx> @@ -48,6 +53,7 @@ #include <svtools/miscopt.hxx> #include <svtools/soerr.hxx> #include <svtools/embedhlp.hxx> +#include <tools/svborder.hxx> #include <basic/basmgr.hxx> #include <basic/sbuno.hxx> @@ -80,6 +86,7 @@ #include <sfx2/event.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/ipclient.hxx> +#include <sfx2/sfxsids.hrc> #include <workwin.hxx> #include <sfx2/objface.hxx> #include <sfx2/docfilt.hxx> diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index c0457b5184e8..bb15c28d11a4 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -33,6 +33,7 @@ #include <svl/stritem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/sfxmodelfactory.hxx> +#include <vcl/event.hxx> #include <vcl/help.hxx> #include <vcl/settings.hxx> #include <vcl/uitest/logger.hxx> diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx index f3c451528565..538a4f26bf94 100644 --- a/starmath/source/cursor.cxx +++ b/starmath/source/cursor.cxx @@ -13,6 +13,7 @@ #include <view.hxx> #include <comphelper/string.hxx> #include <editeng/editeng.hxx> +#include <osl/diagnose.h> #include <cassert> void SmCursor::Move(OutputDevice* pDev, SmMovementDirection direction, bool bMoveAnchor){ diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index a9b77d1ca40b..5fdaeda48636 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -27,6 +27,7 @@ #include <svl/intitem.hxx> #include <svl/stritem.hxx> #include <vcl/combobox.hxx> +#include <vcl/svapp.hxx> #include <vcl/virdev.hxx> #include <vcl/weld.hxx> #include <svtools/ctrltool.hxx> diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index d28eb79cd1c0..f6bc36c7d325 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -53,6 +53,7 @@ #include <editeng/fhgtitem.hxx> #include <editeng/fontitem.hxx> #include <vcl/mapmod.hxx> +#include <vcl/svapp.hxx> #include <vcl/virdev.hxx> #include <tools/mapunit.hxx> #include <vcl/settings.hxx> diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index 06eff8e5e37e..891c14c7129b 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -20,15 +20,18 @@ #include <starmath.hrc> #include <helpids.h> +#include <vcl/commandevent.hxx> #include <vcl/settings.hxx> #include <editeng/editview.hxx> #include <editeng/editeng.hxx> #include <sfx2/dispatch.hxx> +#include <sfx2/sfxsids.hrc> #include <svl/stritem.hxx> #include <sfx2/viewfrm.hxx> #include <svx/AccessibleTextHelper.hxx> #include <svtools/colorcfg.hxx> +#include <osl/diagnose.h> #include <edit.hxx> #include <smmod.hxx> diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 56d422f5d268..eb1d6d569a96 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -24,6 +24,7 @@ #include <o3tl/any.hxx> #include <sfx2/printer.hxx> +#include <svl/itemset.hxx> #include <vcl/svapp.hxx> #include <unotools/localedatawrapper.hxx> #include <vcl/settings.hxx> diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index f86530dc4252..d94e1a8e55f6 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -37,6 +37,7 @@ #include <sfx2/objface.hxx> #include <sfx2/printer.hxx> #include <sfx2/request.hxx> +#include <sfx2/viewfac.hxx> #include <svl/eitem.hxx> #include <svl/itemset.hxx> #include <svl/poolitem.hxx> @@ -50,11 +51,13 @@ #include <editeng/editview.hxx> #include <svx/svxdlg.hxx> #include <sfx2/zoomitem.hxx> +#include <vcl/commandevent.hxx> #include <vcl/decoview.hxx> #include <vcl/menu.hxx> #include <vcl/settings.hxx> #include <vcl/virdev.hxx> #include <sal/log.hxx> +#include <tools/svborder.hxx> #include <unotools/streamwrap.hxx> diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 4f2ea66ce46f..8e44a2574cc6 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -32,7 +32,8 @@ #include <tools/debug.hxx> #include <tools/gen.hxx> #include <sal/log.hxx> - +#include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <svx/strings.hrc> #include <svx/dlgctrl.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index c44e761490e1..40ce126c1d3e 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <vcl/event.hxx> #include <vcl/wrkwin.hxx> #include <vcl/metaact.hxx> #include <vcl/field.hxx> diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index fbd186bcc893..7e1254899eb7 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -24,6 +24,7 @@ #include <svl/eitem.hxx> #include <sfx2/ctrlitem.hxx> #include <sfx2/dispatch.hxx> +#include <sfx2/module.hxx> #include <sfx2/viewfrm.hxx> #include <svtools/miscopt.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 7411da47517d..8b280e334051 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -21,6 +21,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/virdev.hxx> +#include <vcl/event.hxx> #include <sfx2/dialoghelper.hxx> #include <svx/xtable.hxx> #include <svx/xpool.hxx> diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index b1a14c7961b2..df17f406d294 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -21,6 +21,7 @@ #include <sfx2/viewsh.hxx> #include <sfx2/printer.hxx> #include <vcl/builderfactory.hxx> +#include <vcl/event.hxx> #include <vcl/metric.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx index 3e8bf8e093ef..ac59aa746460 100644 --- a/svx/source/dialog/grfflt.cxx +++ b/svx/source/dialog/grfflt.cxx @@ -27,6 +27,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> +#include <osl/diagnose.h> #include <svx/grfflt.hxx> #include <svx/svxids.hrc> #include <svx/svxdlg.hxx> diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 487826351b79..6aa691e4b044 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -20,6 +20,7 @@ #include <tools/urlobj.hxx> #include <vcl/help.hxx> #include <sfx2/sfxsids.hrc> +#include <vcl/commandevent.hxx> #include <vcl/imaprect.hxx> #include <vcl/imapcirc.hxx> #include <vcl/imappoly.hxx> diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 674c7169b237..ee9d7d153e9d 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -25,6 +25,7 @@ #include <svx/rubydialog.hxx> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> #include <svl/eitem.hxx> diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 6cc6b809c348..5ba428cf433c 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -18,6 +18,7 @@ */ #include <sal/macros.h> +#include <osl/diagnose.h> #include <vcl/wrkwin.hxx> #include <vcl/timer.hxx> #include <svl/slstitm.hxx> diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 7665142d34c9..4f5ddf20c38b 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -60,7 +60,9 @@ #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <svl/eitem.hxx> +#include <vcl/commandevent.hxx> #include <vcl/fmtfield.hxx> +#include <vcl/svapp.hxx> #include <svl/numuno.hxx> #include <tools/debug.hxx> #include <tools/multisel.hxx> diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 3b8187cba8f9..5d0408b1e74d 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -36,6 +36,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/awt/XTabControllerModel.hpp> #include <sfx2/viewfrm.hxx> +#include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <vcl/wrkwin.hxx> #include <svl/whiter.hxx> diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 171621ce0310..162a5eb1ec96 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -96,6 +96,7 @@ #include <vcl/weld.hxx> #include <vcl/waitobj.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <algorithm> #include <functional> diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index f5eddefd23d5..5e0addf5542a 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/awt/XFocusListener.hpp> #include <com/sun/star/awt/XMouseListener.hpp> +#include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <comphelper/processfactory.hxx> @@ -60,6 +61,7 @@ #include <tools/diagnose_ex.h> #include <sal/log.hxx> #include <vcl/outdev.hxx> +#include <vcl/svapp.hxx> #include <memory> diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index bbe61c0e4e3c..e73c2ccf662d 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -34,6 +34,7 @@ #include <fmobj.hxx> #include <fmprop.hxx> #include <sal/log.hxx> +#include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/dispatch.hxx> @@ -53,6 +54,7 @@ #include <svx/strings.hrc> #include <bitmaps.hlst> #include <vcl/treelistentry.hxx> +#include <vcl/commandevent.hxx> namespace svxform { diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 87a89350ed23..ab80e13aa4ba 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -22,6 +22,7 @@ #include <svl/eitem.hxx> #include <svl/stritem.hxx> #include <sfx2/dispatch.hxx> +#include <vcl/event.hxx> #include <vcl/toolbox.hxx> #include <vcl/fixed.hxx> #include <vcl/settings.hxx> diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 8c54ac56de4b..6754f8feab42 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -22,6 +22,8 @@ #include <comphelper/processfactory.hxx> #include <tools/datetime.hxx> #include <unotools/datetime.hxx> +#include <vcl/commandevent.hxx> +#include <vcl/event.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index b01e292402bb..d73deb101915 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -22,6 +22,7 @@ #include <vcl/svapp.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> +#include <sfx2/sfxsids.hrc> #include <avmedia/mediaplayer.hxx> #include <helpids.h> #include <galbrws2.hxx> diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index 6d5c2e9fe25b..f24401e134aa 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -24,6 +24,7 @@ #include <svl/intitem.hxx> #include <sot/exchange.hxx> #include <svl/eitem.hxx> +#include <vcl/menu.hxx> #include <vcl/toolbox.hxx> #include <svx/clipboardctl.hxx> #include <svx/clipfmtitem.hxx> diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx index eaf6d2d7fcff..e3c0ae31c9f4 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx @@ -18,6 +18,7 @@ */ #include <sfx2/app.hxx> +#include <vcl/layout.hxx> #include <svx/sidebar/AreaTransparencyGradientPopup.hxx> #include <svx/sidebar/AreaPropertyPanelBase.hxx> #include <svx/xflftrit.hxx> diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index 45377297535e..7bd655740926 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -23,9 +23,12 @@ #include <editeng/kernitem.hxx> #include <editeng/lspcitem.hxx> #include <sfx2/dispatch.hxx> +#include <sfx2/module.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/viewfrm.hxx> #include <svtools/unitconv.hxx> #include <vcl/button.hxx> +#include <vcl/fixed.hxx> #define DEFAULT_LINE_SPACING 200 #define FIX_DIST_DEF 283 diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index 4a4e37f41cbc..435247c69cd8 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -19,6 +19,7 @@ #include "ParaPropertyPanel.hxx" #include <sfx2/sidebar/Tools.hxx> #include <sfx2/dispatch.hxx> +#include <sfx2/module.hxx> #include <sfx2/viewfrm.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> diff --git a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx index d40c1bb200d4..6b402c3b9765 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx @@ -29,6 +29,8 @@ #include <svl/intitem.hxx> #include <comphelper/processfactory.hxx> +#include <com/sun/star/frame/XFrame.hpp> + using namespace svx; SFX_IMPL_TOOLBOX_CONTROL(ParaAboveSpacingControl, SvxULSpaceItem); diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index 087dbf920654..cb7dbadc942d 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -27,12 +27,14 @@ #include <svx/svxids.hrc> #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> +#include <sfx2/module.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/objsh.hxx> #include <sfx2/viewfrm.hxx> #include <svx/dlgutil.hxx> #include <unotools/localedatawrapper.hxx> #include <unotools/viewoptions.hxx> +#include <vcl/button.hxx> #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> #include <vcl/field.hxx> diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx index 5f48559de63f..e17c13476c6d 100644 --- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx +++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx @@ -8,6 +8,8 @@ */ #include "ShadowPropertyPanel.hxx" +#include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <sfx2/sidebar/ControlFactory.hxx> #include <svx/colorbox.hxx> #include <svx/svxids.hrc> diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 47cd3a0939be..c6106ad321fa 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -22,6 +22,7 @@ #include <svx/svdedxv.hxx> #include <svl/solar.hrc> #include <svl/itemiter.hxx> +#include <vcl/commandevent.hxx> #include <vcl/weld.hxx> #include <vcl/hatch.hxx> #include <svl/whiter.hxx> diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index f193a9d0f123..c6a8c35310b4 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -25,6 +25,7 @@ #include <sfx2/viewsh.hxx> #include <sfx2/sidebar/SidebarToolBox.hxx> #include <rtl/ustring.hxx> +#include <vcl/event.hxx> #include <vcl/settings.hxx> #include <vcl/toolbox.hxx> #include <svx/svxids.hrc> diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index db7a5a3ead5f..4ca126056278 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -24,6 +24,7 @@ #include <vcl/field.hxx> #include <vcl/fixed.hxx> #include <vcl/idle.hxx> +#include <vcl/svapp.hxx> #include <svl/intitem.hxx> #include <svl/eitem.hxx> #include <svl/whiter.hxx> @@ -53,6 +54,8 @@ #include <svx/tbxcolor.hxx> #include <bitmaps.hlst> +#include <com/sun/star/frame/XDispatchProvider.hpp> + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::util; diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index e4d82364228f..fff5aff167e3 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -18,6 +18,8 @@ */ #include <com/sun/star/drawing/FillStyle.hpp> +#include <com/sun/star/frame/XDispatchProvider.hpp> +#include <com/sun/star/frame/XFrame.hpp> #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> @@ -25,6 +27,7 @@ #include <sfx2/module.hxx> #include <tools/urlobj.hxx> +#include <vcl/event.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/builderfactory.hxx> diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 14dc309e4a6c..0858cd211e18 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -34,6 +34,8 @@ #include <comphelper/processfactory.hxx> #include <svtools/colorcfg.hxx> #include <com/sun/star/util/URLTransformer.hpp> +#include <com/sun/star/frame/XDispatchProvider.hpp> +#include <com/sun/star/frame/XFrame.hpp> // namespaces using namespace ::com::sun::star::uno; diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index bebcbd8b36d0..1843e0490fc6 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -27,6 +27,7 @@ #include <svl/eitem.hxx> #include <svl/itemset.hxx> #include <vcl/commandinfoprovider.hxx> +#include <vcl/event.hxx> #include <vcl/toolbox.hxx> #include <vcl/bitmapaccess.hxx> #include <vcl/menubtn.hxx> @@ -60,6 +61,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> +#include <com/sun/star/frame/XDispatchProvider.hpp> #include <svx/strings.hrc> #include <svx/svxitems.hrc> #include <svx/svxids.hrc> diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index e39564cc2dca..6d2841fc6be3 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -21,6 +21,7 @@ #include <doc.hxx> #include <com/sun/star/script/vba/XVBAEventProcessor.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <DocumentFieldsManager.hxx> #include <DocumentSettingManager.hxx> #include <DocumentDrawModelManager.hxx> diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index c570d094fe3a..2b35ad3ffe7e 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -102,6 +102,7 @@ #include <com/sun/star/embed/EmbedMisc.hpp> #include <com/sun/star/embed/Aspects.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <svx/srchdlg.hxx> diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index afee3575fb06..f0e14faa4471 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -29,6 +29,7 @@ #include <sfx2/request.hxx> #include <sfx2/docfile.hxx> #include <sfx2/event.hxx> +#include <sfx2/sfxsids.hrc> #include <sfx2/viewfrm.hxx> #include <editeng/lrspitem.hxx> #include <editeng/ulspitem.hxx> diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index f9648fdd83fa..bdde9b8cd9d6 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -49,6 +49,7 @@ #include <com/sun/star/sdb/XResultSetAccess.hpp> #include <com/sun/star/sdbc/XDataSource.hpp> #include <com/sun/star/ui/dialogs/FolderPicker.hpp> +#include <com/sun/star/view/XSelectionSupplier.hpp> #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/implbase.hxx> diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index c5564ac48163..d83066cd4737 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/EmbedMisc.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <cmdid.h> #include <hintids.hxx> diff --git a/sw/source/uibase/app/swwait.cxx b/sw/source/uibase/app/swwait.cxx index dcffdb0c3b96..f76b79d0bc70 100644 --- a/sw/source/uibase/app/swwait.cxx +++ b/sw/source/uibase/app/swwait.cxx @@ -23,6 +23,8 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> +#include <vcl/window.hxx> + SwWait::SwWait( SwDocShell &rDocShell, const bool bLockUnlockDispatcher ) diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index 930c5631864c..416b68b8dae8 100644 --- a/sw/source/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/uibase/dbui/mmconfigitem.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> +#include <com/sun/star/view/XSelectionSupplier.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/types.hxx> #include <com/sun/star/sdb/CommandType.hpp> diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx index 34be32bb86d3..66efdf9c2a8d 100644 --- a/sw/source/uibase/docvw/AnnotationWin.cxx +++ b/sw/source/uibase/docvw/AnnotationWin.cxx @@ -26,6 +26,7 @@ #include <cmdid.h> #include <vcl/menu.hxx> +#include <vcl/scrbar.hxx> #include <svl/undo.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx index 4e4edeff75b6..ef1f9f915977 100644 --- a/sw/source/uibase/docvw/SidebarTxtControl.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx @@ -35,6 +35,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> +#include <vcl/commandevent.hxx> #include <vcl/svapp.hxx> #include <vcl/help.hxx> #include <vcl/weld.hxx> diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx index 9c5413a85aad..2a4fdb2eb9e9 100644 --- a/sw/source/uibase/docvw/edtdd.cxx +++ b/sw/source/uibase/docvw/edtdd.cxx @@ -25,6 +25,7 @@ #include <sot/exchange.hxx> #include <sot/formats.hxx> #include <sfx2/bindings.hxx> +#include <vcl/commandevent.hxx> #include <sfx2/viewfrm.hxx> #include <fmturl.hxx> diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 06dcaa126e8b..59b0114e5707 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/i18n/UnicodeScript.hpp> #include <com/sun/star/i18n/CalendarFieldIndex.hpp> +#include <com/sun/star/ui/ContextMenuExecuteEvent.hpp> #include <vcl/inputctx.hxx> #include <vcl/help.hxx> diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 68353b9f4d2f..cc0793e372e6 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -28,6 +28,9 @@ #include <officecfg/Office/Common.hxx> #include <rtl/ustring.hxx> #include <sal/log.hxx> +#include <vcl/commandevent.hxx> +#include <vcl/event.hxx> +#include <vcl/svapp.hxx> #include <vcl/textview.hxx> #include <svx/svxids.hrc> #include <vcl/scrbar.hxx> diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index 17b86aada357..95025b428ad9 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NAVIPI_HXX #define INCLUDED_SW_SOURCE_UIBASE_INC_NAVIPI_HXX +#include <vcl/layout.hxx> #include <vcl/lstbox.hxx> #include <vcl/toolbox.hxx> #include <vcl/idle.hxx> diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index b95222cd095a..f6d838024ec2 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -21,6 +21,7 @@ #include <sfx2/tabdlg.hxx> #include <vcl/button.hxx> +#include <vcl/layout.hxx> #include <vcl/lstbox.hxx> #include <vcl/field.hxx> #include <vcl/fixed.hxx> diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index acf893bcac0a..6e5cbc4b0fdd 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -79,6 +79,7 @@ #include <map> #include <com/sun/star/document/XDocumentLanguages.hpp> +#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/i18n/ScriptType.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 2eaaecee0eb7..71bcf99cc62b 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -44,6 +44,7 @@ #include <vector> #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> +#include <vcl/layout.hxx> #include <vcl/lstbox.hxx> #include <bitmaps.hlst> diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx index 03acdf57c3ca..f9aeac807745 100644 --- a/sw/source/uibase/misc/swruler.cxx +++ b/sw/source/uibase/misc/swruler.cxx @@ -20,6 +20,7 @@ #include <view.hxx> #include <cmdid.h> #include <sfx2/request.hxx> +#include <vcl/commandevent.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/settings.hxx> diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 5828a4997eff..8a331f173687 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -40,6 +40,7 @@ #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <svl/imageitm.hxx> +#include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> #include <vcl/settings.hxx> #include <rtl/ustring.hxx> @@ -53,6 +54,8 @@ #include <toolkit/helper/vclunohelper.hxx> #include <svx/srchdlg.hxx> #include <com/sun/star/util/XURLTransformer.hpp> +#include <com/sun/star/frame/XDispatchProvider.hpp> +#include <com/sun/star/frame/XFrame.hpp> // Size check #define NAVI_ENTRIES 20 diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index dbf9df01a536..1132b2da61ab 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/i18n/TextConversionOption.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> +#include <com/sun/star/awt/XWindow.hpp> #include <i18nlangtag/mslangid.hxx> #include <i18nutil/transliteration.hxx> diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx index 768efcb4db2b..9bc1292501ee 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -44,6 +44,7 @@ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/awt/XWindow.hpp> #include <comphelper/propertysequence.hxx> #include <swtypes.hxx> #include <view.hxx> diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index 3045978009be..3b7b5d41d57e 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -53,6 +53,7 @@ #include <sfx2/htmlmode.hxx> #include <svtools/htmlcfg.hxx> #include <com/sun/star/embed/Aspects.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <comphelper/classids.hxx> #include <editeng/acorrcfg.hxx> diff --git a/sw/source/uibase/sidebar/PageFormatPanel.cxx b/sw/source/uibase/sidebar/PageFormatPanel.cxx index 97754775ab3d..701f801c8f5e 100644 --- a/sw/source/uibase/sidebar/PageFormatPanel.cxx +++ b/sw/source/uibase/sidebar/PageFormatPanel.cxx @@ -31,6 +31,7 @@ #include <sfx2/sidebar/ControlFactory.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> +#include <sfx2/module.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/objsh.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx index a42ede147425..9b0e66da58dc 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.cxx +++ b/sw/source/uibase/sidebar/PageMarginControl.cxx @@ -28,6 +28,7 @@ #include <editeng/sizeitem.hxx> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> +#include <sfx2/module.hxx> #include <sfx2/viewfrm.hxx> #include <svx/svxids.hrc> #include <svx/pageitem.hxx> @@ -39,6 +40,7 @@ #include <com/sun/star/document/XUndoManagerSupplier.hpp> #include <com/sun/star/beans/NamedValue.hpp> +#include <com/sun/star/frame/XFrame.hpp> #include <vcl/settings.hxx> diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx b/sw/source/uibase/sidebar/PageOrientationControl.cxx index c553d04ce914..f6eba0d97e2d 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.cxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx @@ -21,6 +21,7 @@ #include "PageMarginControl.hxx" #include <com/sun/star/document/XUndoManager.hpp> #include <com/sun/star/document/XUndoManagerSupplier.hpp> +#include <com/sun/star/frame/XFrame.hpp> #include <swtypes.hxx> #include <sfx2/viewsh.hxx> diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx index 7afe30a4d859..c5c7a9bbda73 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.cxx +++ b/sw/source/uibase/sidebar/PageSizeControl.cxx @@ -32,6 +32,7 @@ #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> +#include <sfx2/module.hxx> #include <sfx2/viewfrm.hxx> #include <vcl/settings.hxx> diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx index 659df9f73d6a..f296fe1cb3e4 100644 --- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx +++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx @@ -20,6 +20,7 @@ #include <svx/dlgutil.hxx> #include <svx/rulritem.hxx> #include <vcl/virdev.hxx> +#include <vcl/svapp.hxx> #include <sfx2/sidebar/ControlFactory.hxx> #include <sfx2/dispatch.hxx> diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx index 84883940a290..39d4c4800654 100644 --- a/sw/source/uibase/sidebar/ThemePanel.cxx +++ b/sw/source/uibase/sidebar/ThemePanel.cxx @@ -31,6 +31,7 @@ #include <editeng/fontitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/borderline.hxx> +#include <vcl/svapp.hxx> #include <vcl/virdev.hxx> #include <charatr.hxx> #include <charfmt.hxx> diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx index e05cf11fc238..8d3ad82cf38f 100644 --- a/sw/source/uibase/table/chartins.cxx +++ b/sw/source/uibase/table/chartins.cxx @@ -47,7 +47,10 @@ #include <cppuhelper/bootstrap.hxx> #include <cppuhelper/component_context.hxx> #include <comphelper/propertysequence.hxx> +#include <com/sun/star/awt/Point.hpp> +#include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/chart2/data/XDataProvider.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx index da16e077bad8..882f4f99329d 100644 --- a/sw/source/uibase/table/tablemgr.cxx +++ b/sw/source/uibase/table/tablemgr.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/beans/PropertyState.hpp> #include <com/sun/star/embed/EmbedVerbs.hpp> +#include <com/sun/star/embed/XComponentSupplier.hpp> #include <sot/storage.hxx> #include <comphelper/classids.hxx> diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index b94b017c2ad4..681557a9edc6 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -40,6 +40,7 @@ #include <svx/dlgutil.hxx> #include <svx/zoomslideritem.hxx> #include <svx/svxids.hrc> +#include <tools/svborder.hxx> #include <swwait.hxx> #include <globdoc.hxx> diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx index 388406d7ce22..d96b18fb6972 100644 --- a/sw/source/uibase/uiview/srcview.cxx +++ b/sw/source/uibase/uiview/srcview.cxx @@ -18,6 +18,7 @@ */ #include <rtl/tencinfo.h> +#include <osl/diagnose.h> #include <hintids.hxx> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <unotools/tempfile.hxx> @@ -28,6 +29,7 @@ #include <vcl/wrkwin.hxx> #include <vcl/metric.hxx> #include <vcl/textview.hxx> +#include <vcl/svapp.hxx> #include <svtools/ctrltool.hxx> #include <svl/intitem.hxx> #include <svl/stritem.hxx> diff --git a/sw/source/uibase/uiview/swcli.cxx b/sw/source/uibase/uiview/swcli.cxx index 4d896b52792b..bd0692cb10ad 100644 --- a/sw/source/uibase/uiview/swcli.cxx +++ b/sw/source/uibase/uiview/swcli.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/embed/NoVisualAreaSizeException.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <wrtsh.hxx> #include <doc.hxx> #include <IDocumentSettingAccess.hxx> diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 3ac2ebcadd3e..9e9d30b09f0b 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -66,6 +66,7 @@ #include <hhcwrp.hxx> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> +#include <com/sun/star/ui/ContextMenuExecuteEvent.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx index 1e20b2caa231..09697b2c96ed 100644 --- a/sw/source/uibase/uiview/viewport.cxx +++ b/sw/source/uibase/uiview/viewport.cxx @@ -21,6 +21,7 @@ #include <hintids.hxx> +#include <vcl/commandevent.hxx> #include <vcl/help.hxx> #include <vcl/settings.hxx> @@ -50,6 +51,7 @@ #include <basegfx/utils/zoomtools.hxx> #include <comphelper/lok.hxx> #include <vcl/weld.hxx> +#include <tools/svborder.hxx> #include "viewfunc.hxx" diff --git a/sw/source/uibase/uno/unodispatch.cxx b/sw/source/uibase/uno/unodispatch.cxx index c97431bc9c45..0d4db10ab71a 100644 --- a/sw/source/uibase/uno/unodispatch.cxx +++ b/sw/source/uibase/uno/unodispatch.cxx @@ -19,6 +19,8 @@ #include <config_features.h> +#include <com/sun/star/view/XSelectionSupplier.hpp> + #include <vcl/svapp.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> diff --git a/sw/source/uibase/utlui/tmplctrl.cxx b/sw/source/uibase/utlui/tmplctrl.cxx index 43b046c698d8..11b304d660be 100644 --- a/sw/source/uibase/utlui/tmplctrl.cxx +++ b/sw/source/uibase/utlui/tmplctrl.cxx @@ -22,6 +22,7 @@ #include <svl/stritem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> +#include <vcl/commandevent.hxx> #include <vcl/status.hxx> #include <swtypes.hxx> diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 0c15bb670561..28459c87db78 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -47,6 +47,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/app.hxx> +#include <sfx2/sfxsids.hrc> #include <svl/stritem.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> @@ -68,6 +69,7 @@ #include <sal/log.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/syswin.hxx> #include <tools/diagnose_ex.h> |