tdf#42949 Fix IWYU warnings in include/sfx2/[t-z]*

Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: Ib3252828385d1dc8faf48a428b1593199647a679 Reviewed-on: https://gerrit.libreoffice.org/70383 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-04-08 11:55:43 +02:00
parent a3ee61550e
commit 4a6dc219fc
353 changed files with 512 additions and 114 deletions
@@ -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>
@@ -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
 {
@@ -57,6 +57,7 @@
 #include <vcl/textview.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <cassert>
+#include <osl/diagnose.h>

 namespace basctl
 {
@@ -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>
@@ -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
@@ -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>
@@ -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>
@@ -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
@@ -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>
@@ -36,6 +36,7 @@
 #include <unotools/resmgr.hxx>
 #include <vcl/settings.hxx>
 #include <sfx2/app.hxx>
+#include <osl/diagnose.h>

 namespace basctl
 {
@@ -9,6 +9,7 @@

 #include "baside2.hxx"

+#include <vcl/event.hxx>
 #include <vcl/textview.hxx>
 #include <vcl/xtextedt.hxx>
 #include <vcl/settings.hxx>
@@ -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
 {
@@ -38,6 +38,7 @@
 #include <sfx2/request.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <vcl/weld.hxx>
+#include <osl/diagnose.h>

 #include <map>

@@ -18,6 +18,7 @@
 */

 #include "tp_ErrorBars.hxx"
+#include <vcl/event.hxx>
 #include <vcl/settings.hxx>

 using namespace ::com::sun::star;
@@ -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>

@@ -18,6 +18,7 @@
 */

 #include "tp_Trendline.hxx"
+#include <vcl/event.hxx>
 #include <vcl/settings.hxx>

 namespace chart
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -25,6 +25,8 @@
 #include <tools/debug.hxx>
 #include <vcl/metric.hxx>

+#include <set>
+
 class CharClass;
 class CollatorWrapper;
 class SmartTagMgr;
@@ -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>
@@ -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 ------------------------------------------
@@ -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>
@@ -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>
@@ -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>
@@ -24,6 +24,7 @@
 #include <strings.hrc>
 #include <dialmgr.hxx>

+#include <vcl/event.hxx>
 #include <vcl/svlbitm.hxx>
 #include <vcl/treelistentry.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>
@@ -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>
@@ -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>
@@ -12,6 +12,8 @@

 #include <vcl/weld.hxx>

+#include <set>
+
 class TSAURLsDialog : public weld::GenericDialogController
 {
 private:
@@ -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
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>

@@ -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>
@@ -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>
@@ -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>

@@ -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>
@@ -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>

@@ -24,6 +24,7 @@
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
+#include <vcl/svapp.hxx>

 namespace dbaui
 {
@@ -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>
@@ -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>
@@ -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>
@@ -26,6 +26,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/svapp.hxx>

 namespace dbaui
 {
@@ -23,6 +23,7 @@
 #include <UserAdminDlg.hxx>
 #include <comphelper/processfactory.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/svapp.hxx>

 using namespace dbaui;

@@ -23,6 +23,7 @@
 #include <dbadmin.hxx>
 #include <comphelper/processfactory.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/svapp.hxx>

 using namespace dbaui;

@@ -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>
@@ -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>
@@ -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>
@@ -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"
@@ -26,6 +26,7 @@
 #include <comphelper/namedvaluecollection.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/svapp.hxx>

 PDFInteractionHandler::PDFInteractionHandler()
 {
@@ -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
@@ -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>
@@ -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;
@@ -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;
@@ -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>
@@ -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; }

@@ -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
@@ -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;
@@ -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;
    }   }   }
 }
@@ -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
 {
@@ -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
@@ -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;

 /*************************************************************************

@@ -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

@@ -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;
@@ -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; }
@@ -26,7 +26,6 @@

 class SfxViewFrame;
 class SfxViewShell;
-namespace vcl { class Window; }

 typedef SfxViewShell* (*SfxViewCtor)(SfxViewFrame*, SfxViewShell*);

@@ -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;
@@ -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
 {
@@ -29,6 +29,7 @@
 #include <svx/SvxColorValueSet.hxx>
 #include <svx/PaletteManager.hxx>
 #include <vcl/lstbox.hxx>
+#include <vcl/fixed.hxx>

 #include <functional>

@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -38,6 +38,7 @@
 #include <unotools/transliterationwrapper.hxx>
 #include <sal/log.hxx>

+#include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/weld.hxx>

@@ -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>
@@ -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>
@@ -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>
@@ -64,6 +64,7 @@
 #include <oox/core/fastparser.hxx>
 #include <comphelper/threadpool.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>

 #include <memory>

@@ -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>
@@ -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"
@@ -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>
@@ -10,6 +10,7 @@

 #include <svl/undo.hxx>
 #include <rtl/math.hxx>
+#include <osl/time.h>

 #include <rangelst.hxx>
 #include <docsh.hxx>
@@ -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>
@@ -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>
--- a/Show More
+++ b/Show More