[Libreoffice-commits] core.git: chart2/source dbaccess/source framework/source include/framework include/IwyuFilter_include.yaml sfx2/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Feb 19 15:29:04 UTC 2019
chart2/source/model/main/UndoManager.cxx | 1
dbaccess/source/ui/browser/genericcontroller.cxx | 1
dbaccess/source/ui/misc/dbaundomanager.cxx | 1
framework/source/fwe/classes/addonmenu.cxx | 4 ++-
framework/source/fwe/classes/addonsoptions.cxx | 2 +
framework/source/fwe/classes/framelistanalyzer.cxx | 1
framework/source/fwe/dispatch/interaction.cxx | 2 +
framework/source/fwe/helper/configimporter.cxx | 1
framework/source/fwe/helper/titlehelper.cxx | 1
framework/source/fwe/helper/undomanagerhelper.cxx | 3 ++
framework/source/fwe/xml/menudocumenthandler.cxx | 2 +
framework/source/fwe/xml/statusbardocumenthandler.cxx | 2 +
framework/source/fwe/xml/toolboxdocumenthandler.cxx | 2 +
framework/source/layoutmanager/layoutmanager.cxx | 1
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 1
framework/source/uielement/generictoolbarcontroller.cxx | 1
framework/source/uielement/popuptoolbarcontroller.cxx | 1
framework/source/uielement/resourcemenucontroller.cxx | 1
framework/source/uielement/statusbarmanager.cxx | 1
framework/source/uielement/toolbarmodemenucontroller.cxx | 1
framework/source/uielement/toolbarsmenucontroller.cxx | 1
include/IwyuFilter_include.yaml | 13 ++++++++++
include/framework/ContextChangeEventMultiplexerTunnel.hxx | 6 +++-
include/framework/actiontriggerhelper.hxx | 6 +++-
include/framework/addonmenu.hxx | 16 +++++++-----
include/framework/addonsoptions.hxx | 7 ++---
include/framework/configimporter.hxx | 12 ++++-----
include/framework/dispatchhelper.hxx | 7 +++--
include/framework/documentundoguard.hxx | 4 ++-
include/framework/framelistanalyzer.hxx | 5 +++
include/framework/interaction.hxx | 15 +++--------
include/framework/menuconfiguration.hxx | 18 ++++----------
include/framework/sfxhelperfunctions.hxx | 13 ++++++----
include/framework/statusbarconfiguration.hxx | 14 +++++-----
include/framework/titlehelper.hxx | 14 +++++-----
include/framework/toolboxconfiguration.hxx | 14 +++++-----
include/framework/undomanagerhelper.hxx | 12 ++++++---
sfx2/source/doc/docundomanager.cxx | 1
sfx2/source/view/sfxbasecontroller.cxx | 1
39 files changed, 131 insertions(+), 78 deletions(-)
New commits:
commit 58fa1889eeaa1d8e4abdf49a18660721309362ce
Author: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Tue Feb 12 21:00:26 2019 +0100
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue Feb 19 16:28:39 2019 +0100
tdf#42949 Fix IWYU warnings in include/framework/
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: Ia9616f644a68ec6da22e646ba0d919a3489a9481
Reviewed-on: https://gerrit.libreoffice.org/67745
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/chart2/source/model/main/UndoManager.cxx b/chart2/source/model/main/UndoManager.cxx
index 2e9ac941bf19..fc9abb174a04 100644
--- a/chart2/source/model/main/UndoManager.cxx
+++ b/chart2/source/model/main/UndoManager.cxx
@@ -25,6 +25,7 @@
#include <com/sun/star/lang/NoSupportException.hpp>
#include <framework/undomanagerhelper.hxx>
+#include <framework/imutex.hxx>
#include <officecfg/Office/Common.hxx>
#include <svl/undo.hxx>
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 1c6c5fec4415..3e75a0285b39 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -53,6 +53,7 @@
#include <unotools/moduleoptions.hxx>
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#include <com/sun/star/frame/status/Visibility.hpp>
+#include <com/sun/star/frame/XUntitledNumbers.hpp>
#include <com/sun/star/util/XModifiable.hpp>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
diff --git a/dbaccess/source/ui/misc/dbaundomanager.cxx b/dbaccess/source/ui/misc/dbaundomanager.cxx
index 6e9bb502400f..aff9e6cc98dd 100644
--- a/dbaccess/source/ui/misc/dbaundomanager.cxx
+++ b/dbaccess/source/ui/misc/dbaundomanager.cxx
@@ -24,6 +24,7 @@
#include <svl/undo.hxx>
#include <vcl/svapp.hxx>
#include <framework/undomanagerhelper.hxx>
+#include <framework/imutex.hxx>
namespace dbaui
{
diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx
index 861b403ffb00..ebaf190b9a4d 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -24,17 +24,19 @@
#include <services.h>
#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/util/URL.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <tools/config.hxx>
#include <vcl/commandinfoprovider.hxx>
+#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
#include <svtools/menuoptions.hxx>
#include <svl/solar.hrc>
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::beans;
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 4131a4381736..6652b1972ca5 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <com/sun/star/beans/PropertyValue.hpp>
#include <framework/addonsoptions.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/configitem.hxx>
@@ -32,6 +33,7 @@
#include <vcl/graph.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/toolbox.hxx>
+#include <vcl/svapp.hxx>
#include <algorithm>
#include <unordered_map>
diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx
index 3bb31726244a..694ebebefa8c 100644
--- a/framework/source/fwe/classes/framelistanalyzer.cxx
+++ b/framework/source/fwe/classes/framelistanalyzer.cxx
@@ -28,6 +28,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/frame/ModuleManager.hpp>
#include <com/sun/star/frame/UnknownModuleException.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
#include <comphelper/processfactory.hxx>
#include <vcl/svapp.hxx>
diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx
index 543e309495c4..fbcf9df3dc86 100644
--- a/framework/source/fwe/dispatch/interaction.cxx
+++ b/framework/source/fwe/dispatch/interaction.cxx
@@ -20,6 +20,8 @@
#include <comphelper/interaction.hxx>
#include <framework/interaction.hxx>
#include <general.h>
+#include <com/sun/star/document/XInteractionFilterSelect.hpp>
+#include <com/sun/star/document/NoSuchFilterRequest.hpp>
using namespace ::com::sun::star;
diff --git a/framework/source/fwe/helper/configimporter.cxx b/framework/source/fwe/helper/configimporter.cxx
index 48eee08384c2..d277947b8eaf 100644
--- a/framework/source/fwe/helper/configimporter.cxx
+++ b/framework/source/fwe/helper/configimporter.cxx
@@ -20,6 +20,7 @@
#include <framework/configimporter.hxx>
#include <framework/toolboxconfiguration.hxx>
#include <com/sun/star/embed/ElementModes.hpp>
+#include <com/sun/star/ui/XUIConfigurationManager2.hpp>
#include <rtl/ustrbuf.hxx>
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index 070ec79bdfe0..cd7551882e89 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/frame/UntitledNumbersConst.hpp>
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/frame/ModuleManager.hpp>
+#include <com/sun/star/frame/XUntitledNumbers.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
#include <com/sun/star/beans/XMaterialHolder.hpp>
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
index f4d5e8bee508..411d32ed7b67 100644
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -18,13 +18,16 @@
*/
#include <framework/undomanagerhelper.hxx>
+#include <framework/imutex.hxx>
#include <com/sun/star/document/EmptyUndoStackException.hpp>
#include <com/sun/star/document/UndoContextNotClosedException.hpp>
#include <com/sun/star/document/UndoFailedException.hpp>
+#include <com/sun/star/document/XUndoManager.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/util/InvalidStateException.hpp>
#include <com/sun/star/util/NotLockedException.hpp>
+#include <com/sun/star/util/XModifyListener.hpp>
#include <comphelper/interfacecontainer2.hxx>
#include <cppuhelper/exc_hlp.hxx>
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index 6bb685ae24e2..0a30b76cadec 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -19,6 +19,8 @@
#include <stdio.h>
#include <sal/macros.h>
+#include <rtl/ref.hxx>
+#include <rtl/ustrbuf.hxx>
#include <xml/menudocumenthandler.hxx>
#include <framework/menuconfiguration.hxx>
diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index b8bf232da2ce..296ba978c0c7 100644
--- a/framework/source/fwe/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -26,6 +26,8 @@
#include <com/sun/star/ui/ItemStyle.hpp>
#include <com/sun/star/ui/ItemType.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/container/XIndexContainer.hpp>
#include <vcl/svapp.hxx>
#include <vcl/status.hxx>
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index f2fbb715a6e6..e8f0fb1fde21 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -27,6 +27,8 @@
#include <com/sun/star/ui/ItemType.hpp>
#include <com/sun/star/ui/ItemStyle.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/container/XIndexContainer.hpp>
#include <sal/config.h>
#include <sal/macros.h>
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 1b60c9e82d04..0489804ed5fc 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -61,6 +61,7 @@
#include <comphelper/lok.hxx>
#include <svtools/imgdef.hxx>
#include <tools/diagnose_ex.h>
+#include <vcl/status.hxx>
#include <vcl/settings.hxx>
#include <vcl/window.hxx>
#include <vcl/wrkwin.hxx>
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 6380c4ae86ee..644eacb8d05b 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -43,6 +43,7 @@
#include <vcl/i18nhelp.hxx>
#include <vcl/dockingarea.hxx>
#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
#include <sal/log.hxx>
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index fea6f71d5f29..61ddc35a4ffc 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -33,6 +33,7 @@
#include <svtools/toolboxcontroller.hxx>
#include <vcl/svapp.hxx>
#include <vcl/mnemonic.hxx>
+#include <vcl/toolbox.hxx>
#include <tools/urlobj.hxx>
#include <strings.hrc>
#include <classes/fwkresid.hxx>
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 433f581cdc19..64117b00e18d 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -32,6 +32,7 @@
#include <tools/urlobj.hxx>
#include <unotools/moduleoptions.hxx>
#include <vcl/commandinfoprovider.hxx>
+#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
#include <vcl/toolbox.hxx>
#include <sal/log.hxx>
diff --git a/framework/source/uielement/resourcemenucontroller.cxx b/framework/source/uielement/resourcemenucontroller.cxx
index 72513cf7fe32..bc5fd7a842a1 100644
--- a/framework/source/uielement/resourcemenucontroller.cxx
+++ b/framework/source/uielement/resourcemenucontroller.cxx
@@ -11,6 +11,7 @@
#include <cppuhelper/implbase.hxx>
#include <svtools/popupmenucontrollerbase.hxx>
+#include <vcl/svapp.hxx>
#include <sal/log.hxx>
#include <com/sun/star/embed/VerbAttributes.hpp>
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index 219f54cc2016..82394d2748a9 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -43,6 +43,7 @@
#include <comphelper/processfactory.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <svtools/statusbarcontroller.hxx>
+#include <svtools/toolboxcontroller.hxx>
#include <tools/debug.hxx>
#include <vcl/commandevent.hxx>
diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx b/framework/source/uielement/toolbarmodemenucontroller.cxx
index 9770bec7ec6d..e0ff9f385682 100644
--- a/framework/source/uielement/toolbarmodemenucontroller.cxx
+++ b/framework/source/uielement/toolbarmodemenucontroller.cxx
@@ -35,6 +35,7 @@
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <vcl/EnumContext.hxx>
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <comphelper/types.hxx>
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 606300d46c27..a0e7ec353a0c 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -57,6 +57,7 @@
#include <unotools/cmdoptions.hxx>
#include <svtools/miscopt.hxx>
#include <unotools/collatorwrapper.hxx>
+#include <unotools/syslocale.hxx>
// Defines
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 4f51fbf63675..167ae3e2234d 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -539,3 +539,16 @@ blacklist:
# base class has to be a complete type
- com/sun/star/container/XNameReplace.hpp
- com/sun/star/lang/XServiceInfo.hpp
+ include/framework/dispatchhelper.hxx:
+ # base class has to be a complete type
+ - com/sun/star/frame/XDispatchHelper.hpp
+ - com/sun/star/frame/XDispatchResultListener.hpp
+ - com/sun/star/lang/XServiceInfo.hpp
+ include/framework/titlehelper.hxx:
+ # base class has to be a complete type
+ - com/sun/star/frame/XTitle.hpp
+ - com/sun/star/frame/XTitleChangeBroadcaster.hpp
+ - com/sun/star/frame/XFrameActionListener.hpp
+ - com/sun/star/document/XDocumentEventListener.hpp
+ # Don't propose hxx -> h change in URE libs
+ - cppuhelper/interfacecontainer.hxx
diff --git a/include/framework/ContextChangeEventMultiplexerTunnel.hxx b/include/framework/ContextChangeEventMultiplexerTunnel.hxx
index efa2db5988ac..9fd41166d5b4 100644
--- a/include/framework/ContextChangeEventMultiplexerTunnel.hxx
+++ b/include/framework/ContextChangeEventMultiplexerTunnel.hxx
@@ -8,9 +8,13 @@
*/
#include <framework/fwedllapi.h>
-#include <com/sun/star/ui/XContextChangeEventListener.hpp>
#include <functional>
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace com::sun::star::ui { class XContextChangeEventListener; }
+namespace com::sun::star::uno { class XInterface; }
+
namespace framework {
// this is pretty horrible, don't use it!
diff --git a/include/framework/actiontriggerhelper.hxx b/include/framework/actiontriggerhelper.hxx
index 986f3373a605..0fc57af8f4b1 100644
--- a/include/framework/actiontriggerhelper.hxx
+++ b/include/framework/actiontriggerhelper.hxx
@@ -20,9 +20,11 @@
#ifndef INCLUDED_FRAMEWORK_ACTIONTRIGGERHELPER_HXX
#define INCLUDED_FRAMEWORK_ACTIONTRIGGERHELPER_HXX
-#include <com/sun/star/container/XIndexContainer.hpp>
-#include <vcl/menu.hxx>
#include <framework/fwedllapi.h>
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace com::sun::star::container { class XIndexContainer; }
+class Menu;
namespace framework
diff --git a/include/framework/addonmenu.hxx b/include/framework/addonmenu.hxx
index 91f8dc109276..4e8c1f24f9d8 100644
--- a/include/framework/addonmenu.hxx
+++ b/include/framework/addonmenu.hxx
@@ -19,15 +19,19 @@
#ifndef INCLUDED_FRAMEWORK_ADDONMENU_HXX
#define INCLUDED_FRAMEWORK_ADDONMENU_HXX
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <rtl/ustring.hxx>
+#include <vcl/vclptr.hxx>
-#include <vcl/menu.hxx>
#include <framework/fwedllapi.h>
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::frame { class XFrame; }
+namespace com::sun::star::uno { template <class E> class Sequence; }
+namespace com::sun::star::uno { template <typename > class Reference; }
+
+class MenuBar;
+class PopupMenu;
+
#define ADDONMENU_ITEMID_START 2000
#define ADDONMENU_ITEMID_END 3000
diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx
index 2da3a8c4f4a3..66c5fca79c09 100644
--- a/include/framework/addonsoptions.hxx
+++ b/include/framework/addonsoptions.hxx
@@ -20,15 +20,14 @@
#define INCLUDED_FRAMEWORK_ADDONSOPTIONS_HXX
#include <sal/types.h>
-#include <osl/mutex.hxx>
#include <vcl/image.hxx>
-#include <vcl/bitmap.hxx>
-#include <vcl/svapp.hxx>
#include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/beans/PropertyValue.hpp>
#include <framework/fwedllapi.h>
#include <memory>
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace osl { class Mutex; }
+
/*-************************************************************************************************************
@descr The method GetAddonsMenu() returns a list of property values.
Use follow defines to separate values by names.
diff --git a/include/framework/configimporter.hxx b/include/framework/configimporter.hxx
index 3082464c28c2..ac5156b5328f 100644
--- a/include/framework/configimporter.hxx
+++ b/include/framework/configimporter.hxx
@@ -20,15 +20,15 @@
#ifndef INCLUDED_FRAMEWORK_CONFIGIMPORTER_HXX
#define INCLUDED_FRAMEWORK_CONFIGIMPORTER_HXX
-#include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/ui/XUIConfigurationManager2.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-
-#include <rtl/ustring.hxx>
#include <framework/fwedllapi.h>
#include <vector>
+namespace com::sun::star::container { class XIndexContainer; }
+namespace com::sun::star::embed { class XStorage; }
+namespace com::sun::star::ui { class XUIConfigurationManager2; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::uno { template <typename > class Reference; }
+
namespace framework
{
class FWE_DLLPUBLIC UIConfigurationImporterOOo1x
diff --git a/include/framework/dispatchhelper.hxx b/include/framework/dispatchhelper.hxx
index 8838a5c902e0..b300c8be5167 100644
--- a/include/framework/dispatchhelper.hxx
+++ b/include/framework/dispatchhelper.hxx
@@ -21,11 +21,8 @@
#define INCLUDED_FRAMEWORK_INC_SERVICES_DISPATCHHELPER_HXX
#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/frame/XDispatchHelper.hpp>
#include <com/sun/star/frame/XDispatchResultListener.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -33,6 +30,10 @@
#include <osl/conditn.hxx>
#include <framework/fwedllapi.h>
+namespace com::sun::star::lang { class XMultiServiceFactory; }
+namespace com::sun::star::lang { class XSingleServiceFactory; }
+namespace com::sun::star::uno { class XComponentContext; }
+
namespace framework{
/**
diff --git a/include/framework/documentundoguard.hxx b/include/framework/documentundoguard.hxx
index dc1fb5ff60b8..c707257a447f 100644
--- a/include/framework/documentundoguard.hxx
+++ b/include/framework/documentundoguard.hxx
@@ -22,10 +22,12 @@
#include <framework/fwedllapi.h>
-#include <com/sun/star/uno/XInterface.hpp>
+#include <com/sun/star/uno/Reference.hxx>
#include <memory>
+namespace com::sun::star::uno { class XInterface; }
+
namespace framework
{
//= DocumentUndoGuard
diff --git a/include/framework/framelistanalyzer.hxx b/include/framework/framelistanalyzer.hxx
index 8112beccf49d..f8403fcc52ba 100644
--- a/include/framework/framelistanalyzer.hxx
+++ b/include/framework/framelistanalyzer.hxx
@@ -20,12 +20,15 @@
#ifndef INCLUDED_FRAMEWORK_FRAMELISTANALYZER_HXX
#define INCLUDED_FRAMEWORK_FRAMELISTANALYZER_HXX
-#include <com/sun/star/frame/XFrame.hpp>
#include <framework/fwedllapi.h>
#include <o3tl/typed_flags_set.hxx>
+#include <com/sun/star/uno/Reference.hxx>
#include <vector>
+namespace com::sun::star::frame { class XFrame; }
+namespace com::sun::star::frame { class XFramesSupplier; }
+
/** These enums can be combined as flags to enable/disable
special search algorithm during analyze phase.
see impl_analyze() for further information.
diff --git a/include/framework/interaction.hxx b/include/framework/interaction.hxx
index e1e3c726213b..2e817bb74275 100644
--- a/include/framework/interaction.hxx
+++ b/include/framework/interaction.hxx
@@ -20,22 +20,15 @@
#ifndef INCLUDED_FRAMEWORK_INTERACTION_HXX
#define INCLUDED_FRAMEWORK_INTERACTION_HXX
-#include <com/sun/star/task/XInteractionRequest.hpp>
-#include <com/sun/star/task/XInteractionContinuation.hpp>
-#include <com/sun/star/task/XInteractionAbort.hpp>
-#include <com/sun/star/task/XInteractionApprove.hpp>
-#include <com/sun/star/task/XInteractionDisapprove.hpp>
-#include <com/sun/star/task/XInteractionRetry.hpp>
-#include <com/sun/star/document/XInteractionFilterSelect.hpp>
-#include <com/sun/star/document/NoSuchFilterRequest.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
-
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
#include <framework/fwedllapi.h>
+namespace com::sun::star::task { class XInteractionContinuation; }
+namespace com::sun::star::task { class XInteractionRequest; }
+namespace com::sun::star::uno { template <class E> class Sequence; }
+
namespace framework{
/*-************************************************************************************************************
diff --git a/include/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx
index 8cf07268a0c1..191b0e723713 100644
--- a/include/framework/menuconfiguration.hxx
+++ b/include/framework/menuconfiguration.hxx
@@ -20,21 +20,15 @@
#ifndef INCLUDED_FRAMEWORK_MENUCONFIGURATION_HXX
#define INCLUDED_FRAMEWORK_MENUCONFIGURATION_HXX
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/WrappedTargetException.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-
#include <framework/fwedllapi.h>
-#include <cppuhelper/weak.hxx>
#include <cppuhelper/weakref.hxx>
-#include <vcl/menu.hxx>
-#include <vcl/toolbox.hxx>
+
+namespace com::sun::star::container { class XIndexAccess; }
+namespace com::sun::star::frame { class XDispatchProvider; }
+namespace com::sun::star::io { class XInputStream; }
+namespace com::sun::star::io { class XOutputStream; }
+namespace com::sun::star::uno { class XComponentContext; }
const sal_uInt16 START_ITEMID_WINDOWLIST = 4600;
const sal_uInt16 END_ITEMID_WINDOWLIST = 4699;
diff --git a/include/framework/sfxhelperfunctions.hxx b/include/framework/sfxhelperfunctions.hxx
index d2362166a88e..d0ef3ff1180d 100644
--- a/include/framework/sfxhelperfunctions.hxx
+++ b/include/framework/sfxhelperfunctions.hxx
@@ -21,12 +21,15 @@
#define INCLUDED_FRAMEWORK_SFXHELPERFUNCTIONS_HXX
#include <framework/fwedllapi.h>
-#include <com/sun/star/frame/XFrame.hpp>
#include <rtl/ustring.hxx>
-#include <vcl/toolbox.hxx>
-#include <vcl/status.hxx>
-#include <svtools/toolboxcontroller.hxx>
-#include <svtools/statusbarcontroller.hxx>
+
+namespace com::sun::star::frame { class XFrame; }
+namespace com::sun::star::uno { template <typename > class Reference; }
+namespace svt { class StatusbarController; }
+namespace svt { class ToolboxController; }
+
+class StatusBar;
+class ToolBox;
typedef svt::ToolboxController* ( *pfunc_setToolBoxControllerCreator)(
const css::uno::Reference< css::frame::XFrame >& rFrame,
diff --git a/include/framework/statusbarconfiguration.hxx b/include/framework/statusbarconfiguration.hxx
index 39b45c25fffe..ff201cfee448 100644
--- a/include/framework/statusbarconfiguration.hxx
+++ b/include/framework/statusbarconfiguration.hxx
@@ -20,13 +20,13 @@
#define INCLUDED_FRAMEWORK_STATUSBARCONFIGURATION_HXX
#include <framework/fwedllapi.h>
-#include <vcl/status.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
+
+namespace com::sun::star::container { class XIndexAccess; }
+namespace com::sun::star::container { class XIndexContainer; }
+namespace com::sun::star::io { class XInputStream; }
+namespace com::sun::star::io { class XOutputStream; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::uno { template <typename > class Reference; }
namespace framework
{
diff --git a/include/framework/titlehelper.hxx b/include/framework/titlehelper.hxx
index d2dd61b8c4f8..daadbe8442ba 100644
--- a/include/framework/titlehelper.hxx
+++ b/include/framework/titlehelper.hxx
@@ -21,15 +21,8 @@
#define INCLUDED_FRAMEWORK_TITLEHELPER_HXX
#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/frame/XUntitledNumbers.hpp>
#include <com/sun/star/frame/XTitle.hpp>
#include <com/sun/star/frame/XTitleChangeBroadcaster.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XFrameActionListener.hpp>
#include <com/sun/star/document/XDocumentEventListener.hpp>
@@ -42,6 +35,13 @@
#include <framework/fwedllapi.h>
+namespace com::sun::star::frame { class XController; }
+namespace com::sun::star::frame { class XFrame; }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::frame { class XUntitledNumbers; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::uno { class XInterface; }
+
namespace framework{
diff --git a/include/framework/toolboxconfiguration.hxx b/include/framework/toolboxconfiguration.hxx
index 16bc30400bda..2362bcc60aba 100644
--- a/include/framework/toolboxconfiguration.hxx
+++ b/include/framework/toolboxconfiguration.hxx
@@ -20,13 +20,13 @@
#define INCLUDED_FRAMEWORK_TOOLBOXCONFIGURATION_HXX
#include <framework/fwedllapi.h>
-#include <vcl/bitmap.hxx>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
+
+namespace com::sun::star::container { class XIndexAccess; }
+namespace com::sun::star::container { class XIndexContainer; }
+namespace com::sun::star::io { class XInputStream; }
+namespace com::sun::star::io { class XOutputStream; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::uno { template <typename > class Reference; }
namespace framework
{
diff --git a/include/framework/undomanagerhelper.hxx b/include/framework/undomanagerhelper.hxx
index 261936a862e9..82f13cc289b5 100644
--- a/include/framework/undomanagerhelper.hxx
+++ b/include/framework/undomanagerhelper.hxx
@@ -21,13 +21,17 @@
#define INCLUDED_FRAMEWORK_UNDOMANAGERHELPER_HXX
#include <framework/fwedllapi.h>
-#include <framework/imutex.hxx>
-
-#include <com/sun/star/document/XUndoManager.hpp>
-#include <com/sun/star/util/XModifyListener.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/Reference.hxx>
#include <memory>
+namespace com::sun::star::document { class XUndoAction; }
+namespace com::sun::star::document { class XUndoManager; }
+namespace com::sun::star::document { class XUndoManagerListener; }
+namespace com::sun::star::util { class XModifyListener; }
+namespace framework { class IMutex; }
+
class SfxUndoManager;
diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx
index fe1baa263e68..9d08efcfd6a4 100644
--- a/sfx2/source/doc/docundomanager.cxx
+++ b/sfx2/source/doc/docundomanager.cxx
@@ -28,6 +28,7 @@
#include <svl/undo.hxx>
#include <tools/diagnose_ex.h>
#include <framework/undomanagerhelper.hxx>
+#include <framework/imutex.hxx>
#include <stack>
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 4fdfe8b1a67e..35411929ef53 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -37,6 +37,7 @@
#include <com/sun/star/frame/CommandGroup.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XBorderResizeListener.hpp>
+#include <com/sun/star/frame/XUntitledNumbers.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/EventObject.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
More information about the Libreoffice-commits
mailing list