Kaydet (Commit) 572c5c6b authored tarafından Gabor Kelemen's avatar Gabor Kelemen Kaydeden (comit) Miklos Vajna

tdf#42949 Fix IWYU warnings in sw/source/core/inc/[g-S]*hxx

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: I4ebebbbbad31b29c1e63a30685493042462bb52f
Reviewed-on: https://gerrit.libreoffice.org/71832
Tested-by: Jenkins
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.com>
üst 91887a34
...@@ -262,6 +262,14 @@ blacklist: ...@@ -262,6 +262,14 @@ blacklist:
sw/source/core/inc/frame.hxx: sw/source/core/inc/frame.hxx:
# Needed for direct member access # Needed for direct member access
- com/sun/star/style/TabStop.hpp - com/sun/star/style/TabStop.hpp
sw/source/core/inc/SwXTextDefaults.hxx:
# Base class needs complete type
- com/sun/star/beans/XPropertySet.hpp
- com/sun/star/beans/XPropertyState.hpp
- com/sun/star/lang/XServiceInfo.hpp
sw/source/core/inc/swthreadjoiner.hxx:
# Needed for css shortcut
- sal/types.h
sw/qa/extras/odfexport/odfexport.cxx: sw/qa/extras/odfexport/odfexport.cxx:
# Needed for getProperty template # Needed for getProperty template
- com/sun/star/graphic/XGraphic.hpp - com/sun/star/graphic/XGraphic.hpp
......
...@@ -36,6 +36,7 @@ class SwMsgPoolItem; ...@@ -36,6 +36,7 @@ class SwMsgPoolItem;
class SwPtrMsgPoolItem; class SwPtrMsgPoolItem;
class SfxBoolItem; class SfxBoolItem;
class SvxColorItem; class SvxColorItem;
class SvxLRSpaceItem;
// For SwTextHints without end index the following char is added: // For SwTextHints without end index the following char is added:
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <cmdid.h> #include <cmdid.h>
#include <init.hxx> #include <init.hxx>
#include <svx/svdmodel.hxx> #include <svx/svdmodel.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/ulspitem.hxx> #include <editeng/ulspitem.hxx>
#include <editeng/paperinf.hxx> #include <editeng/paperinf.hxx>
#include <editeng/frmdiritem.hxx> #include <editeng/frmdiritem.hxx>
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
*/ */
#include <observablethread.hxx> #include <observablethread.hxx>
#include <ifinishedthreadlistener.hxx>
#include <memory> #include <memory>
/* class for an observable thread /* class for an observable thread
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include <vcl/menubtn.hxx> #include <vcl/menubtn.hxx>
#include <swrect.hxx> #include <swrect.hxx>
class SwFieldFormDropDownPortion;
class SwEditWin; class SwEditWin;
class FloatingWindow; class FloatingWindow;
namespace sw namespace sw
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_GETMETRICVAL_HXX #ifndef INCLUDED_SW_SOURCE_CORE_INC_GETMETRICVAL_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_GETMETRICVAL_HXX #define INCLUDED_SW_SOURCE_CORE_INC_GETMETRICVAL_HXX
#include <tools/solar.h> #include <sal/types.h>
#define CM_1 0 // 1 centimeter or 1/2 inch #define CM_1 0 // 1 centimeter or 1/2 inch
#define CM_05 1 // 0.5 centimeter or 1/4 inch #define CM_05 1 // 0.5 centimeter or 1/4 inch
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <IMark.hxx> #include <IMark.hxx>
#include <IDocumentMarkAccess.hxx> #include <IDocumentMarkAccess.hxx>
#include <unordered_set>
#include <unordered_map> #include <unordered_map>
#include <memory> #include <memory>
......
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWPORTIONHANDLER_HXX #ifndef INCLUDED_SW_SOURCE_CORE_INC_SWPORTIONHANDLER_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_SWPORTIONHANDLER_HXX #define INCLUDED_SW_SOURCE_CORE_INC_SWPORTIONHANDLER_HXX
#include <swtypes.hxx> #include <swdllapi.h>
#include <rtl/ustring.hxx>
#include "TextFrameIndex.hxx" #include "TextFrameIndex.hxx"
class SwFont; class SwFont;
......
...@@ -28,7 +28,6 @@ class SwDoc; ...@@ -28,7 +28,6 @@ class SwDoc;
class SwTextFormatColl; class SwTextFormatColl;
class SwConditionTextFormatColl; class SwConditionTextFormatColl;
class SwRewriter; class SwRewriter;
class SfxItemSet;
class SwUndoFormatCreate : public SwUndo class SwUndoFormatCreate : public SwUndo
{ {
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include <pagedesc.hxx> #include <pagedesc.hxx>
class SwDoc; class SwDoc;
class SwPageDesc;
class SwUndoPageDesc : public SwUndo class SwUndoPageDesc : public SwUndo
{ {
......
...@@ -21,13 +21,13 @@ ...@@ -21,13 +21,13 @@
#define INCLUDED_SW_SOURCE_CORE_INC_SWXMLBLOCKIMPORT_HXX #define INCLUDED_SW_SOURCE_CORE_INC_SWXMLBLOCKIMPORT_HXX
#include <xmloff/xmlimp.hxx> #include <xmloff/xmlimp.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmlnmspe.hxx> #include <xmloff/xmlnmspe.hxx>
#include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
#include <com/sun/star/xml/sax/FastToken.hpp> #include <com/sun/star/xml/sax/FastToken.hpp>
#include <sax/fastattribs.hxx> #include <sax/fastattribs.hxx>
#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase.hxx>
namespace com::sun::star::xml::sax { class XFastTokenHandler; }
using namespace css::xml::sax; using namespace css::xml::sax;
using namespace xmloff::token; using namespace xmloff::token;
......
...@@ -21,11 +21,9 @@ ...@@ -21,11 +21,9 @@
#define INCLUDED_SW_SOURCE_CORE_INC_SWXMLTEXTBLOCKS_HXX #define INCLUDED_SW_SOURCE_CORE_INC_SWXMLTEXTBLOCKS_HXX
#include <sfx2/objsh.hxx> #include <sfx2/objsh.hxx>
#include <sfx2/docfile.hxx>
#include "swblocks.hxx" #include "swblocks.hxx"
#include <o3tl/typed_flags_set.hxx> #include <o3tl/typed_flags_set.hxx>
class SwPaM;
class SwDoc; class SwDoc;
class SvxMacroTableDtor; class SvxMacroTableDtor;
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <svl/itemprop.hxx>
class SwDoc; class SwDoc;
class SfxItemPropertySet;
class SwXTextDefaults : public cppu::WeakImplHelper class SwXTextDefaults : public cppu::WeakImplHelper
< <
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include <swtypes.hxx> #include <swtypes.hxx>
#include "frame.hxx" #include "frame.hxx"
#include "swcache.hxx" #include "swcache.hxx"
#include <editeng/lrspitem.hxx>
#include <swatrset.hxx> #include <swatrset.hxx>
class SwLayoutFrame; class SwLayoutFrame;
......
...@@ -22,12 +22,14 @@ ...@@ -22,12 +22,14 @@
#include <sal/config.h> #include <sal/config.h>
#include <vcl/inputtypes.hxx> #include <vcl/inputtypes.hxx>
#include <tools/color.hxx>
#include <ctime> #include <ctime>
#include <memory>
#include <swtypes.hxx>
#include <swrect.hxx> #include <swrect.hxx>
class OutputDevice;
class SwRootFrame; class SwRootFrame;
class SwLayoutFrame; class SwLayoutFrame;
class SwPageFrame; class SwPageFrame;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_LAYCACHE_HXX #ifndef INCLUDED_SW_SOURCE_CORE_INC_LAYCACHE_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_LAYCACHE_HXX #define INCLUDED_SW_SOURCE_CORE_INC_LAYCACHE_HXX
#include <tools/solar.h> #include <sal/types.h>
#include <memory> #include <memory>
class SwDoc; class SwDoc;
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
class SwAnchoredObject; class SwAnchoredObject;
class SwContentFrame; class SwContentFrame;
class SwFlowFrame;
class SwFormatCol; class SwFormatCol;
struct SwCursorMoveState; struct SwCursorMoveState;
class SwFrameFormat; class SwFrameFormat;
......
...@@ -20,12 +20,12 @@ ...@@ -20,12 +20,12 @@
#define INCLUDED_SW_SOURCE_CORE_INC_OBSERVABLETHREAD_HXX #define INCLUDED_SW_SOURCE_CORE_INC_OBSERVABLETHREAD_HXX
#include <osl/thread.hxx> #include <osl/thread.hxx>
#include <rtl/ref.hxx>
#include <osl/interlck.h> #include <osl/interlck.h>
#include <salhelper/simplereferenceobject.hxx> #include <salhelper/simplereferenceobject.hxx>
#include "ifinishedthreadlistener.hxx"
#include <memory> #include <memory>
class IFinishedThreadListener;
/** class for an observable thread /** class for an observable thread
OD 2007-01-29 #i73788# OD 2007-01-29 #i73788#
......
...@@ -21,7 +21,9 @@ ...@@ -21,7 +21,9 @@
#define INCLUDED_SW_SOURCE_CORE_INC_PAMTYP_HXX #define INCLUDED_SW_SOURCE_CORE_INC_PAMTYP_HXX
#include <unotools/textsearch.hxx> #include <unotools/textsearch.hxx>
#include <node.hxx> #include <swdllapi.h>
#include <memory>
class SwpHints; class SwpHints;
struct SwPosition; struct SwPosition;
...@@ -30,13 +32,14 @@ class SwTextAttr; ...@@ -30,13 +32,14 @@ class SwTextAttr;
class SwFormat; class SwFormat;
class SfxPoolItem; class SfxPoolItem;
class SwRootFrame; class SwRootFrame;
class SwNode;
class SwNodeIndex;
class SwContentNode;
class SwIndex;
namespace i18nutil { namespace i18nutil {
struct SearchOptions2; struct SearchOptions2;
} }
namespace utl {
class TextSearch;
}
// function prototypes for the move/find methods of SwPaM // function prototypes for the move/find methods of SwPaM
......
...@@ -22,13 +22,13 @@ ...@@ -22,13 +22,13 @@
#include <tools/link.hxx> #include <tools/link.hxx>
#include <sal/types.h> #include <sal/types.h>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <rtl/instance.hxx>
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/io/XInputStream.hpp>
#include <map> #include <map>
#include <memory> #include <memory>
namespace com::sun::star::io { class XInputStream; }
class SwAsyncRetrieveInputStreamThreadConsumer; class SwAsyncRetrieveInputStreamThreadConsumer;
/** Singleton class to manage retrieved input stream data in Writer /** Singleton class to manage retrieved input stream data in Writer
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#define INCLUDED_SW_SOURCE_CORE_INC_RETRIEVEINPUTSTREAM_HXX #define INCLUDED_SW_SOURCE_CORE_INC_RETRIEVEINPUTSTREAM_HXX
#include "observablethread.hxx" #include "observablethread.hxx"
#include <rtl/ref.hxx>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include "retrievedinputstreamdata.hxx" #include "retrievedinputstreamdata.hxx"
......
...@@ -19,10 +19,11 @@ ...@@ -19,10 +19,11 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_RETRIEVEINPUTSTREAMCONSUMER_HXX #ifndef INCLUDED_SW_SOURCE_CORE_INC_RETRIEVEINPUTSTREAMCONSUMER_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_RETRIEVEINPUTSTREAMCONSUMER_HXX #define INCLUDED_SW_SOURCE_CORE_INC_RETRIEVEINPUTSTREAMCONSUMER_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/io/XInputStream.hpp>
#include <osl/interlck.h> #include <osl/interlck.h>
#include "retrievedinputstreamdata.hxx" #include <rtl/ustring.hxx>
namespace com::sun::star::io { class XInputStream; }
namespace com::sun::star::uno { template <typename > class Reference; }
class SwGrfNode; class SwGrfNode;
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include <vcl/keycod.hxx> #include <vcl/keycod.hxx>
#include <tox.hxx> #include <tox.hxx>
#include <SwNumberTreeTypes.hxx>
#include <IDocumentMarkAccess.hxx> #include <IDocumentMarkAccess.hxx>
#include <memory> #include <memory>
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <vector> #include <vector>
class SwContentFrame; class SwContentFrame;
class SwViewShell;
class SdrPage; class SdrPage;
class SwFrameFormat; class SwFrameFormat;
class SwPaM; class SwPaM;
......
...@@ -23,9 +23,8 @@ ...@@ -23,9 +23,8 @@
#include <vector> #include <vector>
#include <deque> #include <deque>
#include <unordered_set> #include <unordered_set>
#include <swscanner.hxx>
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#include <osl/diagnose.h> #include <i18nlangtag/lang.h>
#include "TextFrameIndex.hxx" #include "TextFrameIndex.hxx"
class SwTextNode; class SwTextNode;
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_SORTEDOBJS_HXX #ifndef INCLUDED_SW_SOURCE_CORE_INC_SORTEDOBJS_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_SORTEDOBJS_HXX #define INCLUDED_SW_SOURCE_CORE_INC_SORTEDOBJS_HXX
#include <sal/types.h>
#include <vector> #include <vector>
#include <swdllapi.h> #include <swdllapi.h>
......
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWBLOCKS_HXX #ifndef INCLUDED_SW_SOURCE_CORE_INC_SWBLOCKS_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_SWBLOCKS_HXX #define INCLUDED_SW_SOURCE_CORE_INC_SWBLOCKS_HXX
#include <tools/datetime.hxx> #include <tools/date.hxx>
#include <tools/time.hxx>
#include <o3tl/sorted_vector.hxx> #include <o3tl/sorted_vector.hxx>
#include <vcl/errcode.hxx> #include <vcl/errcode.hxx>
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
#include <rtl/ustring.hxx> #include <rtl/string.hxx>
class SwCacheObj; class SwCacheObj;
......
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
class SfxItemSet; class SfxItemSet;
class SwAttrSet; class SwAttrSet;
class SwDoCapitals; // DoCapitals class SwDoCapitals; // DoCapitals
class SwDrawTextInfo; // DrawText_
class SwScriptInfo; // GetTextSize_ class SwScriptInfo; // GetTextSize_
class SwViewShell; class SwViewShell;
class IDocumentSettingAccess; class IDocumentSettingAccess;
......
...@@ -19,7 +19,10 @@ ...@@ -19,7 +19,10 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWTHREADJOINER_HXX #ifndef INCLUDED_SW_SOURCE_CORE_INC_SWTHREADJOINER_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_SWTHREADJOINER_HXX #define INCLUDED_SW_SOURCE_CORE_INC_SWTHREADJOINER_HXX
#include <com/sun/star/util/XJobManager.hpp> #include <sal/types.h>
namespace com::sun::star::uno { template <class interface_type> class Reference; }
namespace com::sun::star::util { class XJobManager; }
/** Testing */ /** Testing */
namespace SwThreadJoiner namespace SwThreadJoiner
......
...@@ -20,10 +20,11 @@ ...@@ -20,10 +20,11 @@
#define INCLUDED_SW_SOURCE_CORE_INC_SWTHREADMANAGER_HXX #define INCLUDED_SW_SOURCE_CORE_INC_SWTHREADMANAGER_HXX
#include <osl/interlck.h> #include <osl/interlck.h>
#include <rtl/ref.hxx>
#include <memory> #include <memory>
namespace rtl { template <class reference_type> class Reference; }
class ObservableThread; class ObservableThread;
class ThreadManager; class ThreadManager;
......
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
#include <section.hxx> #include <section.hxx>
#include <calbck.hxx> #include <calbck.hxx>
#include <doc.hxx> #include <doc.hxx>
#include <swscanner.hxx>
#include <IDocumentRedlineAccess.hxx> #include <IDocumentRedlineAccess.hxx>
#include <IDocumentSettingAccess.hxx> #include <IDocumentSettingAccess.hxx>
#include <IDocumentContentOperations.hxx> #include <IDocumentContentOperations.hxx>
......
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
#include <txtfrm.hxx> #include <txtfrm.hxx>
#include <SwGrammarMarkUp.hxx> #include <SwGrammarMarkUp.hxx>
#include <rootfrm.hxx> #include <rootfrm.hxx>
#include <swscanner.hxx>
#include <breakit.hxx> #include <breakit.hxx>
#include <crstate.hxx> #include <crstate.hxx>
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <svl/itemprop.hxx>
#include <SwXTextDefaults.hxx> #include <SwXTextDefaults.hxx>
#include <SwStyleNameMapper.hxx> #include <SwStyleNameMapper.hxx>
......
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