diff options
author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-04-13 15:10:23 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-04-15 11:48:54 +0200 |
commit | 0eaa0804085dd6e93257dd31361490720456679d (patch) | |
tree | 44877202db389fbbe6ad6dd891eab1deccef52c0 /include/editeng | |
parent | Related: tdf#97822 vcl opengl gtk2: fix missing slider widget (diff) | |
download | core-0eaa0804085dd6e93257dd31361490720456679d.tar.gz core-0eaa0804085dd6e93257dd31361490720456679d.zip |
tdf#42949 Fix IWYU warnings in include/editeng/[a-e]*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I81917d697adf79b1bd0de4cc262d3cd6bc8eb36f
Reviewed-on: https://gerrit.libreoffice.org/70710
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'include/editeng')
24 files changed, 51 insertions, 88 deletions
diff --git a/include/editeng/AccessibleComponentBase.hxx b/include/editeng/AccessibleComponentBase.hxx index 34bca5b9f2cc..50a9155933a1 100644 --- a/include/editeng/AccessibleComponentBase.hxx +++ b/include/editeng/AccessibleComponentBase.hxx @@ -22,11 +22,11 @@ #define INCLUDED_EDITENG_ACCESSIBLECOMPONENTBASE_HXX -#include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp> -#include <com/sun/star/awt/XFocusListener.hpp> #include <editeng/editengdllapi.h> +namespace com::sun::star::accessibility { class XAccessible; } + namespace accessibility { /** @descr diff --git a/include/editeng/AccessibleContextBase.hxx b/include/editeng/AccessibleContextBase.hxx index 106d5d0a064f..50f27af5cef1 100644 --- a/include/editeng/AccessibleContextBase.hxx +++ b/include/editeng/AccessibleContextBase.hxx @@ -23,22 +23,15 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> -#include <com/sun/star/accessibility/XAccessibleStateSet.hpp> -#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> -#include <com/sun/star/accessibility/AccessibleEventObject.hpp> -#include <com/sun/star/accessibility/AccessibleEventId.hpp> -#include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp> #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/lang/XComponent.hpp> -#include <cppuhelper/weak.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <com/sun/star/lang/DisposedException.hpp> #include <osl/mutex.hxx> #include <cppuhelper/compbase.hxx> #include <editeng/editengdllapi.h> +namespace com::sun::star::accessibility { class XAccessibleStateSet; } +namespace com::sun::star::accessibility { class XAccessibleRelationSet; } +namespace com::sun::star::accessibility { struct AccessibleEventObject; } namespace accessibility { diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx index b7af3caec422..d2b07f965c3d 100644 --- a/include/editeng/AccessibleEditableTextPara.hxx +++ b/include/editeng/AccessibleEditableTextPara.hxx @@ -22,11 +22,8 @@ #include <rtl/ustring.hxx> #include <tools/gen.hxx> -#include <cppuhelper/weakref.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/typeprovider.hxx> -#include <cppuhelper/interfacecontainer.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -37,13 +34,19 @@ #include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp> #include <com/sun/star/accessibility/XAccessibleHypertext.hpp> #include <com/sun/star/accessibility/XAccessibleMultiLineText.hpp> +#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> #include <comphelper/accessibletexthelper.hxx> #include <editeng/AccessibleParaManager.hxx> -#include <editeng/AccessibleImageBullet.hxx> -#include <editeng/unoedprx.hxx> +#include <editeng/editdata.hxx> #include <editeng/editengdllapi.h> +class SvxViewForwarder; +class MapMode; +class SvxAccessibleTextAdapter; +class SvxAccessibleTextEditViewAdapter; +namespace accessibility { class AccessibleImageBullet; } + namespace accessibility { typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessible, diff --git a/include/editeng/AccessibleImageBullet.hxx b/include/editeng/AccessibleImageBullet.hxx index 2cc2c12e0cf7..6bc049b7fc02 100644 --- a/include/editeng/AccessibleImageBullet.hxx +++ b/include/editeng/AccessibleImageBullet.hxx @@ -21,18 +21,18 @@ #define INCLUDED_EDITENG_ACCESSIBLEIMAGEBULLET_HXX #include <tools/gen.hxx> -#include <cppuhelper/weakref.hxx> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/interfacecontainer.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <com/sun/star/accessibility/XAccessibleComponent.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> -#include <editeng/AccessibleParaManager.hxx> -#include <editeng/unoedsrc.hxx> + +class SvxEditSource; +class SvxTextForwarder; +class SvxViewForwarder; namespace accessibility { diff --git a/include/editeng/AccessibleParaManager.hxx b/include/editeng/AccessibleParaManager.hxx index 30d02dd846dc..6c4cdf392eaf 100644 --- a/include/editeng/AccessibleParaManager.hxx +++ b/include/editeng/AccessibleParaManager.hxx @@ -21,15 +21,16 @@ #define INCLUDED_EDITENG_ACCESSIBLEPARAMANAGER_HXX #include <vector> -#include <algorithm> #include <utility> #include <tools/gen.hxx> #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/uno/Reference.hxx> #include <cppuhelper/weakref.hxx> -#include <com/sun/star/accessibility/XAccessibleContext.hpp> +#include <rtl/ref.hxx> #include <editeng/editengdllapi.h> +namespace com::sun::star::accessibility { class XAccessible; } + class SvxEditSourceAdapter; namespace accessibility diff --git a/include/editeng/AccessibleStaticTextBase.hxx b/include/editeng/AccessibleStaticTextBase.hxx index fef4cefa65f5..0ecf3021a2f4 100644 --- a/include/editeng/AccessibleStaticTextBase.hxx +++ b/include/editeng/AccessibleStaticTextBase.hxx @@ -24,15 +24,14 @@ #include <tools/gen.hxx> #include <cppuhelper/implbase2.hxx> #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleText.hpp> #include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp> #include <com/sun/star/accessibility/TextSegment.hpp> #include <editeng/editengdllapi.h> +namespace com::sun::star::accessibility { class XAccessible; } class SvxEditSource; -class SvxEditViewForwarder; namespace accessibility { diff --git a/include/editeng/CustomPropertyField.hxx b/include/editeng/CustomPropertyField.hxx index fbfc0410f727..a49eba7bad3c 100644 --- a/include/editeng/CustomPropertyField.hxx +++ b/include/editeng/CustomPropertyField.hxx @@ -14,10 +14,10 @@ #include <editeng/editengdllapi.h> #include <editeng/flditem.hxx> -#include <editeng/eeitem.hxx> #include <com/sun/star/text/textfield/Type.hpp> -#include <com/sun/star/document/XDocumentProperties.hpp> + +namespace com::sun::star::document { class XDocumentProperties; } namespace editeng diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx index 9d3eee25f460..2918bb915d7b 100644 --- a/include/editeng/adjustitem.hxx +++ b/include/editeng/adjustitem.hxx @@ -19,13 +19,11 @@ #ifndef INCLUDED_EDITENG_ADJUSTITEM_HXX #define INCLUDED_EDITENG_ADJUSTITEM_HXX -#include <svl/eitem.hxx> +#include <svl/cenumitm.hxx> +#include <svl/poolitem.hxx> #include <editeng/svxenum.hxx> -#include <editeng/eeitem.hxx> #include <editeng/editengdllapi.h> -class SvXMLUnitConverter; - // class SvxAdjustItem --------------------------------------------------- /* diff --git a/include/editeng/autokernitem.hxx b/include/editeng/autokernitem.hxx index e357b01c0d0b..ed18b8dffbed 100644 --- a/include/editeng/autokernitem.hxx +++ b/include/editeng/autokernitem.hxx @@ -22,8 +22,6 @@ #include <svl/eitem.hxx> #include <editeng/editengdllapi.h> -class SvXMLUnitConverter; - // class SvxAutoKernItem ------------------------------------------------- /* diff --git a/include/editeng/blinkitem.hxx b/include/editeng/blinkitem.hxx index 62e0f05c124e..f6058693ccf6 100644 --- a/include/editeng/blinkitem.hxx +++ b/include/editeng/blinkitem.hxx @@ -23,8 +23,6 @@ #include <svl/eitem.hxx> #include <editeng/editengdllapi.h> -class SvXMLUnitConverter; - // class SvxBlinkItem ------------------------------------------------- /* diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx index 14135e2f30d6..64d7f2c5c3cb 100644 --- a/include/editeng/borderline.hxx +++ b/include/editeng/borderline.hxx @@ -23,10 +23,12 @@ #include <com/sun/star/table/BorderLineStyle.hpp> #include <tools/color.hxx> -#include <svl/poolitem.hxx> +#include <tools/mapunit.hxx> #include <editeng/editengdllapi.h> #include <svtools/borderline.hxx> +class IntlWrapper; + // Line defaults in twips (former Writer defaults): #define DEF_LINE_WIDTH_0 1 diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx index 103967578f20..db97f78e6d0f 100644 --- a/include/editeng/boxitem.hxx +++ b/include/editeng/boxitem.hxx @@ -21,13 +21,14 @@ #define INCLUDED_EDITENG_BOXITEM_HXX #include <svl/poolitem.hxx> -#include <editeng/borderline.hxx> #include <editeng/editengdllapi.h> #include <com/sun/star/table/BorderLine2.hpp> #include <o3tl/typed_flags_set.hxx> #include <memory> +namespace editeng { class SvxBorderLine; } + // class SvxBoxItem ------------------------------------------------------ /* [Description] diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index 10cbc541bf39..952b037c937b 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -21,8 +21,6 @@ #include <tools/color.hxx> #include <svl/poolitem.hxx> -#include <vcl/wall.hxx> -#include <tools/link.hxx> #include <unotools/securityoptions.hxx> #include <editeng/editengdllapi.h> #include <memory> diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx index 411b9a7dab64..498c2910c47a 100644 --- a/include/editeng/cmapitem.hxx +++ b/include/editeng/cmapitem.hxx @@ -23,8 +23,6 @@ #include <editeng/svxenum.hxx> #include <editeng/editengdllapi.h> -class SvXMLUnitConverter; - // class SvxCaseMapItem -------------------------------------------------- /* [Description] diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx index 9821015d9a49..5e62965486ba 100644 --- a/include/editeng/colritem.hxx +++ b/include/editeng/colritem.hxx @@ -23,8 +23,6 @@ #include <tools/color.hxx> #include <editeng/editengdllapi.h> -class SvXMLUnitConverter; - #define VERSION_USEAUTOCOLOR 1 /** SvxColorItem item describes a color. diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx index f1ffb7d3ffd3..e8edcbc23258 100644 --- a/include/editeng/crossedoutitem.hxx +++ b/include/editeng/crossedoutitem.hxx @@ -19,13 +19,10 @@ #ifndef INCLUDED_EDITENG_CROSSEDOUTITEM_HXX #define INCLUDED_EDITENG_CROSSEDOUTITEM_HXX -#include <vcl/vclenum.hxx> #include <tools/fontenum.hxx> #include <svl/eitem.hxx> #include <editeng/editengdllapi.h> -class SvXMLUnitConverter; - // class SvxCrossedOutItem ----------------------------------------------- /* [Description] diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx index dc882a93d165..8d3d39591a42 100644 --- a/include/editeng/editdata.hxx +++ b/include/editeng/editdata.hxx @@ -26,11 +26,9 @@ #include <memory> #include <ostream> -class SfxItemSet; class SfxPoolItem; template<typename T> class SvParser; class SvxFieldItem; -class SvxRTFItemStackType; enum class HtmlTokenId : sal_Int16; enum class EETextFormat { Text = 0x20, Rtf, Html = 0x32, Xml }; @@ -84,13 +82,6 @@ EDITENG_DLLPUBLIC extern const size_t EE_APPEND; #define EDITUNDO_USER 200 -class EditView; -class EditEngine; -class ImpEditView; -class ImpEditEngine; -class EditTextObject; -class SfxStyleSheet; - struct EPosition { sal_Int32 nPara; diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 96ee1da89532..f585ce8b5796 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -20,22 +20,20 @@ #ifndef INCLUDED_EDITENG_EDITENG_HXX #define INCLUDED_EDITENG_EDITENG_HXX -#include <rtl/ref.hxx> #include <memory> #include <vector> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/i18n/WordType.hpp> #include <com/sun/star/i18n/CharacterIteratorMode.hpp> -#include <svl/style.hxx> #include <svl/typedwhich.hxx> #include <editeng/editdata.hxx> #include <editeng/editstat.hxx> +#include <editeng/editobj.hxx> #include <editeng/editengdllapi.h> #include <i18nlangtag/lang.h> #include <tools/lineend.hxx> -#include <tools/link.hxx> #include <editeng/eedata.hxx> #include <o3tl/typed_flags_set.hxx> @@ -44,6 +42,7 @@ #include <functional> namespace boost { template <class T> class optional; } +template <typename Arg, typename Ret> class Link; namespace com { namespace sun { namespace star { namespace linguistic2 { @@ -86,9 +85,7 @@ class Size; class Point; namespace tools { class Rectangle; } class SvStream; -class OutputDevice; namespace vcl { class Window; } -class SfxPoolItem; class SvKeyValueIterator; class SvxForbiddenCharactersTable; class SvxNumberFormat; @@ -101,13 +98,13 @@ class EditLine; class InternalEditStatus; class EditSelectionEngine; class EditDoc; -struct PasteOrDropInfos; class Range; struct EPaM; class DeletedNodeInfo; class ParaPortionList; enum class CharCompressType; enum class TransliterationFlags; +class LinkParamNone; /** values for: SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs::All ); @@ -141,7 +138,6 @@ enum class SetAttribsMode { NONE, WholeWord, Edge }; -class SdrObject; class EDITENG_DLLPUBLIC EditEngine { friend class EditView; diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx index e9e30bb195f8..46a05372b3dd 100644 --- a/include/editeng/editobj.hxx +++ b/include/editeng/editobj.hxx @@ -22,8 +22,6 @@ #include <svl/style.hxx> #include <svl/itempool.hxx> -#include <editeng/eeitem.hxx> -#include <editeng/editdata.hxx> #include <editeng/editengdllapi.h> #include <editeng/macros.hxx> #include <svl/languageoptions.hxx> @@ -36,8 +34,8 @@ class SfxItemSet; class SvxFieldItem; class SvxFieldData; -class SvStream; enum class OutlinerMode; +struct EECharAttrib; namespace editeng { diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx index d7c8c441cf29..242d179b36a5 100644 --- a/include/editeng/editstat.hxx +++ b/include/editeng/editstat.hxx @@ -21,8 +21,6 @@ #define INCLUDED_EDITENG_EDITSTAT_HXX #include <rtl/ustring.hxx> -#include <tools/solar.h> -#include <i18nlangtag/lang.h> #include <o3tl/typed_flags_set.hxx> enum class EEControlBits diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx index fc669d723605..32799f1ebdf2 100644 --- a/include/editeng/editview.hxx +++ b/include/editeng/editview.hxx @@ -23,22 +23,19 @@ #include <memory> #include <com/sun/star/i18n/WordType.hpp> -#include <svl/style.hxx> #include <i18nlangtag/lang.h> #include <tools/color.hxx> #include <tools/gen.hxx> -#include <tools/link.hxx> -#include <vcl/cursor.hxx> #include <vcl/errcode.hxx> -#include <vcl/event.hxx> +#include <vcl/vclptr.hxx> #include <editeng/editstat.hxx> #include <svl/languageoptions.hxx> -#include <LibreOfficeKit/LibreOfficeKitTypes.h> #include <editeng/editdata.hxx> #include <com/sun/star/uno/Reference.h> #include <editeng/editengdllapi.h> +class EditTextObject; class EditEngine; class ImpEditEngine; class ImpEditView; @@ -49,13 +46,11 @@ namespace vcl { class Window; } class KeyEvent; class MouseEvent; class CommandEvent; -namespace tools { class Rectangle; } -class Pair; -class Point; -class Range; class SvStream; class SvKeyValueIterator; class SfxStyleSheet; +class SfxItemSet; +namespace vcl { class Cursor; } namespace vcl { class Font; } class FontList; class OutputDevice; @@ -73,7 +68,8 @@ namespace linguistic2 { class XLanguageGuessing; } }}} -namespace basegfx { class B2DRange; } + +template <typename Arg, typename Ret> class Link; enum class ScrollRangeCheck { diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx index d1d6e3f1d184..76b36dee9ce9 100644 --- a/include/editeng/edtdlg.hxx +++ b/include/editeng/edtdlg.hxx @@ -20,12 +20,9 @@ #define INCLUDED_EDITENG_EDTDLG_HXX #include <rtl/ustring.hxx> -#include <tools/link.hxx> #include <editeng/editengdllapi.h> #include <i18nlangtag/lang.h> -#include <com/sun/star/uno/Reference.hxx> #include <vcl/abstdlg.hxx> -#include <vcl/weld.hxx> #include <editeng/hangulhanja.hxx> namespace com { namespace sun { namespace star { namespace linguistic2 @@ -34,10 +31,17 @@ namespace com { namespace sun { namespace star { namespace linguistic2 class XHyphenator; } } } } +template <typename Arg, typename Ret> class Link; + namespace vcl { class Window; } class SvxSpellWrapper; -class Button; -class CheckBox; +class LinkParamNone; + +namespace weld { class Button; } +namespace weld { class ToggleButton; } +namespace weld { class Window; } + + class AbstractThesaurusDialog : public VclAbstractDialog { diff --git a/include/editeng/emphasismarkitem.hxx b/include/editeng/emphasismarkitem.hxx index 67019d7d29c5..d9c33ab4e4a6 100644 --- a/include/editeng/emphasismarkitem.hxx +++ b/include/editeng/emphasismarkitem.hxx @@ -19,12 +19,10 @@ #ifndef INCLUDED_EDITENG_EMPHASISMARKITEM_HXX #define INCLUDED_EDITENG_EMPHASISMARKITEM_HXX -#include <vcl/vclenum.hxx> +#include <tools/fontenum.hxx> #include <svl/intitem.hxx> #include <editeng/editengdllapi.h> -class SvXMLUnitConverter; - // class SvxEmphasisMarkItem ---------------------------------------------- /* [Description] diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx index 9d28946a8465..86e148361051 100644 --- a/include/editeng/escapementitem.hxx +++ b/include/editeng/escapementitem.hxx @@ -19,12 +19,10 @@ #ifndef INCLUDED_EDITENG_ESCAPEMENTITEM_HXX #define INCLUDED_EDITENG_ESCAPEMENTITEM_HXX -#include <svl/eitem.hxx> +#include <svl/cenumitm.hxx> #include <editeng/svxenum.hxx> #include <editeng/editengdllapi.h> -class SvXMLUnitConverter; - // class SvxEscapementItem ----------------------------------------------- #define DFLT_ESC_SUPER 33 // 1/3 |