basctl/source/basicide/basdoc.cxx | 1 +
include/editeng/editobj.hxx | 3 +--
include/sfx2/itemconnect.hxx | 1 +
include/sfx2/itemwrapper.hxx | 3 +--
include/sfx2/msg.hxx | 11 ++++++-----
include/svx/EnhancedCustomShape2d.hxx | 1 -
include/svx/fntctrl.hxx | 1 -
sc/source/filter/excel/xeescher.cxx | 1 +
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 1 +
sw/inc/SwAppletImpl.hxx | 3 ---
10 files changed, 12 insertions(+), 14 deletions(-)
New commits:
commit b4156ece74b2d3802ea64e9df85b8e1ed43e9631
Author: Jochen Nitschke <j.nitschke+loger...@ok.de>
Date: Thu Mar 16 15:32:37 2017 +0100
use forward declaration for SfxItemSet
Change-Id: I81f5d1ca22868d278662a55443e2038581dd3246
Reviewed-on: https://gerrit.libreoffice.org/35280
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/basctl/source/basicide/basdoc.cxx
b/basctl/source/basicide/basdoc.cxx
index 004d02aa2096..0e1ea3142c9e 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -27,6 +27,7 @@
#define basctl_DocShell // This CANNOT come before basdoc apparently
#include <basslots.hxx>
#include <sfx2/sfxmodelfactory.hxx>
+#include <svl/itemset.hxx>
#include <svx/svxids.hrc>
#include <tools/globname.hxx>
diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx
index da35f32d03fe..509954069b09 100644
--- a/include/editeng/editobj.hxx
+++ b/include/editeng/editobj.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_EDITENG_EDITOBJ_HXX
#include <rsc/rscsfx.hxx>
-#include <svl/itemset.hxx>
#include <svl/itempool.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/editdata.hxx>
@@ -34,7 +33,7 @@
#include <vector>
#include <memory>
-class SfxItemPool;
+class SfxItemSet;
class SfxStyleSheetPool;
class SvxFieldItem;
class SvxFieldData;
diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx
index a60d4531038d..f64fa2deff2b 100644
--- a/include/sfx2/itemconnect.hxx
+++ b/include/sfx2/itemconnect.hxx
@@ -25,6 +25,7 @@
#include <sfx2/dllapi.h>
#include <sfx2/itemwrapper.hxx>
#include <sfx2/controlwrapper.hxx>
+#include <svl/itemset.hxx>
#include <memory>
diff --git a/include/sfx2/itemwrapper.hxx b/include/sfx2/itemwrapper.hxx
index a379a1120ed7..c20f088703ce 100644
--- a/include/sfx2/itemwrapper.hxx
+++ b/include/sfx2/itemwrapper.hxx
@@ -23,10 +23,9 @@
#include <sal/config.h>
#include <sfx2/dllapi.h>
#include <svl/eitem.hxx>
-#include <svl/stritem.hxx>
#include <svl/intitem.hxx>
-#include <svl/itemset.hxx>
+class SfxItemSet;
namespace sfx {
diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx
index 12fe6e03ad32..d29e21f4b4fc 100644
--- a/include/sfx2/msg.hxx
+++ b/include/sfx2/msg.hxx
@@ -23,10 +23,14 @@
#include <rtl/string.hxx>
#include <rtl/ustring.hxx>
#include <sfx2/dllapi.h>
-#include <svl/itemset.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <functional>
+class SfxItemPool;
+class SfxItemSet;
+class SfxPoolItem;
+class SfxRequest;
+
enum class SfxSlotMode {
NONE = 0x0000L, // default
@@ -56,9 +60,6 @@ namespace o3tl
template<> struct typed_flags<SfxSlotMode> : is_typed_flags<SfxSlotMode,
0x13ec72cL> {};
}
-
-class SfxRequest;
-
#define SFX_EXEC_STUB( aShellClass, aExecMethod) \
void SfxStub##aShellClass##aExecMethod( \
SfxShell *pShell, SfxRequest& rReq) \
@@ -94,7 +95,7 @@ struct SfxTypeAttrib
sal_uInt16 nAID;
const char* pName;
};
-class SfxPoolItem;
+
template<class T> SfxPoolItem* createSfxPoolItem()
{
return T::CreateDefault();
diff --git a/include/svx/EnhancedCustomShape2d.hxx
b/include/svx/EnhancedCustomShape2d.hxx
index 6d092febb635..e0db73fdc36b 100644
--- a/include/svx/EnhancedCustomShape2d.hxx
+++ b/include/svx/EnhancedCustomShape2d.hxx
@@ -42,7 +42,6 @@
class Color;
class SdrObject;
class SdrPathObj;
-class SfxItemSet;
enum class HandleFlags
{
diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx
index 117ef5c81bf1..84afcfae62b6 100644
--- a/include/svx/fntctrl.hxx
+++ b/include/svx/fntctrl.hxx
@@ -23,7 +23,6 @@
#include <editeng/svxfont.hxx>
#include <svx/svxdllapi.h>
#include <svl/itempool.hxx>
-#include <svl/itemset.hxx>
#include <rtl/ustring.hxx>
diff --git a/sc/source/filter/excel/xeescher.cxx
b/sc/source/filter/excel/xeescher.cxx
index b66503d2f646..9c3999b9de65 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -56,6 +56,7 @@
#include "xestyle.hxx"
#include "userdat.hxx"
#include "drwlayer.hxx"
+#include <svl/itemset.hxx>
#include <svx/unoapi.hxx>
#include <svx/algitem.hxx>
#include "scitems.hxx"
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 318844aa5c70..18ed208865b3 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -18,6 +18,7 @@
*/
#include "EnhancedCustomShapeFontWork.hxx"
+#include <svl/itemset.hxx>
#include <svx/svddef.hxx>
#include <svx/svdogrp.hxx>
#include <svx/svdopath.hxx>
diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx
index 0d6d7d62fd0f..b0fdbbf77364 100644
--- a/sw/inc/SwAppletImpl.hxx
+++ b/sw/inc/SwAppletImpl.hxx
@@ -36,9 +36,6 @@ enum class SwHtmlOptType {
SIZE = 3
};
-
-class SfxItemSet;
-
#define OOO_STRING_SW_HTML_O_Hidden "HIDDEN"
class SwApplet_Impl
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
