Kaydet (Commit) b4156ece authored tarafından Jochen Nitschke's avatar Jochen Nitschke Kaydeden (comit) Noel Grandin

use forward declaration for SfxItemSet

Change-Id: I81f5d1ca22868d278662a55443e2038581dd3246
Reviewed-on: https://gerrit.libreoffice.org/35280Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 0ff69676
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#define basctl_DocShell // This CANNOT come before basdoc apparently #define basctl_DocShell // This CANNOT come before basdoc apparently
#include <basslots.hxx> #include <basslots.hxx>
#include <sfx2/sfxmodelfactory.hxx> #include <sfx2/sfxmodelfactory.hxx>
#include <svl/itemset.hxx>
#include <svx/svxids.hrc> #include <svx/svxids.hrc>
#include <tools/globname.hxx> #include <tools/globname.hxx>
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#define INCLUDED_EDITENG_EDITOBJ_HXX #define INCLUDED_EDITENG_EDITOBJ_HXX
#include <rsc/rscsfx.hxx> #include <rsc/rscsfx.hxx>
#include <svl/itemset.hxx>
#include <svl/itempool.hxx> #include <svl/itempool.hxx>
#include <editeng/eeitem.hxx> #include <editeng/eeitem.hxx>
#include <editeng/editdata.hxx> #include <editeng/editdata.hxx>
...@@ -34,7 +33,7 @@ ...@@ -34,7 +33,7 @@
#include <vector> #include <vector>
#include <memory> #include <memory>
class SfxItemPool; class SfxItemSet;
class SfxStyleSheetPool; class SfxStyleSheetPool;
class SvxFieldItem; class SvxFieldItem;
class SvxFieldData; class SvxFieldData;
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <sfx2/dllapi.h> #include <sfx2/dllapi.h>
#include <sfx2/itemwrapper.hxx> #include <sfx2/itemwrapper.hxx>
#include <sfx2/controlwrapper.hxx> #include <sfx2/controlwrapper.hxx>
#include <svl/itemset.hxx>
#include <memory> #include <memory>
......
...@@ -23,10 +23,9 @@ ...@@ -23,10 +23,9 @@
#include <sal/config.h> #include <sal/config.h>
#include <sfx2/dllapi.h> #include <sfx2/dllapi.h>
#include <svl/eitem.hxx> #include <svl/eitem.hxx>
#include <svl/stritem.hxx>
#include <svl/intitem.hxx> #include <svl/intitem.hxx>
#include <svl/itemset.hxx>
class SfxItemSet;
namespace sfx { namespace sfx {
......
...@@ -23,10 +23,14 @@ ...@@ -23,10 +23,14 @@
#include <rtl/string.hxx> #include <rtl/string.hxx>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <sfx2/dllapi.h> #include <sfx2/dllapi.h>
#include <svl/itemset.hxx>
#include <o3tl/typed_flags_set.hxx> #include <o3tl/typed_flags_set.hxx>
#include <functional> #include <functional>
class SfxItemPool;
class SfxItemSet;
class SfxPoolItem;
class SfxRequest;
enum class SfxSlotMode { enum class SfxSlotMode {
NONE = 0x0000L, // default NONE = 0x0000L, // default
...@@ -56,9 +60,6 @@ namespace o3tl ...@@ -56,9 +60,6 @@ namespace o3tl
template<> struct typed_flags<SfxSlotMode> : is_typed_flags<SfxSlotMode, 0x13ec72cL> {}; template<> struct typed_flags<SfxSlotMode> : is_typed_flags<SfxSlotMode, 0x13ec72cL> {};
} }
class SfxRequest;
#define SFX_EXEC_STUB( aShellClass, aExecMethod) \ #define SFX_EXEC_STUB( aShellClass, aExecMethod) \
void SfxStub##aShellClass##aExecMethod( \ void SfxStub##aShellClass##aExecMethod( \
SfxShell *pShell, SfxRequest& rReq) \ SfxShell *pShell, SfxRequest& rReq) \
...@@ -94,7 +95,7 @@ struct SfxTypeAttrib ...@@ -94,7 +95,7 @@ struct SfxTypeAttrib
sal_uInt16 nAID; sal_uInt16 nAID;
const char* pName; const char* pName;
}; };
class SfxPoolItem;
template<class T> SfxPoolItem* createSfxPoolItem() template<class T> SfxPoolItem* createSfxPoolItem()
{ {
return T::CreateDefault(); return T::CreateDefault();
......
...@@ -42,7 +42,6 @@ ...@@ -42,7 +42,6 @@
class Color; class Color;
class SdrObject; class SdrObject;
class SdrPathObj; class SdrPathObj;
class SfxItemSet;
enum class HandleFlags enum class HandleFlags
{ {
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include <editeng/svxfont.hxx> #include <editeng/svxfont.hxx>
#include <svx/svxdllapi.h> #include <svx/svxdllapi.h>
#include <svl/itempool.hxx> #include <svl/itempool.hxx>
#include <svl/itemset.hxx>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
......
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
#include "xestyle.hxx" #include "xestyle.hxx"
#include "userdat.hxx" #include "userdat.hxx"
#include "drwlayer.hxx" #include "drwlayer.hxx"
#include <svl/itemset.hxx>
#include <svx/unoapi.hxx> #include <svx/unoapi.hxx>
#include <svx/algitem.hxx> #include <svx/algitem.hxx>
#include "scitems.hxx" #include "scitems.hxx"
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
*/ */
#include "EnhancedCustomShapeFontWork.hxx" #include "EnhancedCustomShapeFontWork.hxx"
#include <svl/itemset.hxx>
#include <svx/svddef.hxx> #include <svx/svddef.hxx>
#include <svx/svdogrp.hxx> #include <svx/svdogrp.hxx>
#include <svx/svdopath.hxx> #include <svx/svdopath.hxx>
......
...@@ -36,9 +36,6 @@ enum class SwHtmlOptType { ...@@ -36,9 +36,6 @@ enum class SwHtmlOptType {
SIZE = 3 SIZE = 3
}; };
class SfxItemSet;
#define OOO_STRING_SW_HTML_O_Hidden "HIDDEN" #define OOO_STRING_SW_HTML_O_Hidden "HIDDEN"
class SwApplet_Impl class SwApplet_Impl
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment