[Libreoffice-commits] core.git: sd/inc sd/IwyuFilter_sd.yaml sd/source
Gabor Kelemen
kelemeng at ubuntu.com
Thu May 24 07:04:51 UTC 2018
sd/IwyuFilter_sd.yaml | 67 ++++++++++
sd/inc/CustomAnimationEffect.hxx | 1
sd/inc/CustomAnimationPreset.hxx | 1
sd/inc/DocumentRenderer.hrc | 2
sd/inc/EffectMigration.hxx | 1
sd/inc/SdShapeTypes.hxx | 4
sd/inc/TransitionPreset.hxx | 2
sd/inc/anminfo.hxx | 3
sd/inc/cusshow.hxx | 1
sd/inc/glob.hxx | 3
sd/inc/helpids.h | 3
sd/inc/imapinfo.hxx | 1
sd/inc/sdattr.hxx | 4
sd/inc/stlfamily.hxx | 4
sd/inc/stlpool.hxx | 6
sd/inc/stlsheet.hxx | 3
sd/inc/textapi.hxx | 5
sd/inc/undo/undomanager.hxx | 3
sd/inc/undo/undoobjects.hxx | 3
sd/source/core/text/textapi.cxx | 3
sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx | 1
sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx | 1
sd/source/ui/accessibility/AccessiblePresentationShape.cxx | 1
sd/source/ui/accessibility/SdShapeTypes.cxx | 1
sd/source/ui/dlg/present.cxx | 1
sd/source/ui/view/drviews5.cxx | 1
sd/source/ui/view/drviewsa.cxx | 1
27 files changed, 79 insertions(+), 48 deletions(-)
New commits:
commit 23d51ad9343f9be1bac30e0bb2b21963699fdade
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date: Mon May 21 11:03:04 2018 +0200
tdf#42949 Fix IWYU warnings in sd/inc/*
Found with bin/find-unneeded-includes
Removal proposals are dealt with here
With fallout management as necessary
Change-Id: Iaef9eec626334c480dd5a2def63bb476350ceebb
Reviewed-on: https://gerrit.libreoffice.org/54617
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
new file mode 100644
index 000000000000..106f91d4aa6f
--- /dev/null
+++ b/sd/IwyuFilter_sd.yaml
@@ -0,0 +1,67 @@
+---
+assumeFilename: sd/source/core/drawdoc.cxx
+blacklist:
+ sd/inc/createpresentation.hxx:
+ # base class has to be a complete type
+ - com/sun/star/uno/Reference.hxx
+ sd/inc/createunopageimpl.hxx:
+ # base class has to be a complete type
+ - com/sun/star/uno/Reference.hxx
+ sd/inc/createunocustomshow.hxx:
+ # base class has to be a complete type
+ - com/sun/star/uno/Reference.hxx
+ sd/inc/CustomAnimationCloner.hxx:
+ # base class has to be a complete type
+ - com/sun/star/animations/XAnimationNode.hpp
+ sd/inc/CustomAnimationPreset.hxx:
+ # base class has to be a complete type
+ - com/sun/star/lang/XMultiServiceFactory.hpp
+ sd/inc/CustomAnimationEffect.hxx:
+ # base class has to be a complete type
+ - com/sun/star/animations/XAnimationNode.hpp
+ - com/sun/star/animations/XAudio.hpp
+ - com/sun/star/animations/XTimeContainer.hpp
+ - com/sun/star/drawing/XShape.hpp
+ - com/sun/star/util/XChangesListener.hpp
+ sd/inc/OutlinerIterator.hxx:
+ # base class has to be a complete type
+ - svx/svdobj.hxx
+ sd/inc/sderror.hxx:
+ # needed for defines
+ - vcl/errcode.hxx
+ sd/inc/stlfamily.hxx:
+ # base class has to be a complete type
+ - com/sun/star/beans/XPropertySet.hpp
+ - com/sun/star/container/XIndexAccess.hpp
+ - com/sun/star/container/XNameContainer.hpp
+ - com/sun/star/lang/XComponent.hpp
+ - com/sun/star/container/XNamed.hpp
+ - com/sun/star/lang/XServiceInfo.hpp
+ - com/sun/star/lang/XSingleServiceFactory.hpp
+ - com/sun/star/uno/Any.hxx
+ sd/inc/stlpool.hxx:
+ # base class has to be a complete type
+ - com/sun/star/lang/XServiceInfo.hpp
+ - com/sun/star/container/XIndexAccess.hpp
+ - com/sun/star/lang/XComponent.hpp
+ sd/inc/stlsheet.hxx:
+ # base class has to be a complete type
+ - com/sun/star/beans/XPropertySet.hpp
+ - com/sun/star/beans/XPropertyState.hpp
+ - com/sun/star/lang/XComponent.hpp
+ - com/sun/star/lang/XServiceInfo.hpp
+ - com/sun/star/style/XStyle.hpp
+ - com/sun/star/util/XModifyBroadcaster.hpp
+ sd/inc/textapi.hxx:
+ # base class has to be a complete type
+ - editeng/outliner.hxx
+ sd/inc/TransitionPreset.hxx:
+ # base class has to be a complete type
+ - com/sun/star/lang/XMultiServiceFactory.hpp
+ - memory
+ sd/inc/undoanim.hxx:
+ # base class has to be a complete type
+ - com/sun/star/animations/XAnimationNode.hpp
+ sd/inc/undo/undoobjects.hxx:
+ # base class has to be a complete type
+ - tools/weakbase.hxx
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index 53e08b70c4af..91dc355b8cc7 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -30,7 +30,6 @@
#include <list>
#include <vector>
#include <map>
-#include <memory>
class SdrPathObj;
class SdrModel;
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index b5d9b4d60008..2685dd2be4d3 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -22,7 +22,6 @@
#include <sal/config.h>
-#include <memory>
#include <vector>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/sd/inc/DocumentRenderer.hrc b/sd/inc/DocumentRenderer.hrc
index 03c83f0f903f..137f406e35d5 100644
--- a/sd/inc/DocumentRenderer.hrc
+++ b/sd/inc/DocumentRenderer.hrc
@@ -20,8 +20,6 @@
#ifndef INCLUDED_SD_INC_DOCUMENTRENDERER_HRC
#define INCLUDED_SD_INC_DOCUMENTRENDERER_HRC
-#include <utility>
-
#define NC_(Context, String) (Context "\004" u8##String)
const char* STR_IMPRESS_PRINT_UI_CONTENT_CHOICES[] =
diff --git a/sd/inc/EffectMigration.hxx b/sd/inc/EffectMigration.hxx
index 9dc388c0ecb2..adc8bbd4eaa3 100644
--- a/sd/inc/EffectMigration.hxx
+++ b/sd/inc/EffectMigration.hxx
@@ -28,7 +28,6 @@ class SdDrawDocument;
class SdPage;
class SvxShape;
class SdAnimationInfo;
-class SdrObject;
class SdrPathObj;
class SdrObjGroup;
diff --git a/sd/inc/SdShapeTypes.hxx b/sd/inc/SdShapeTypes.hxx
index 6fbcc3de2c13..df89b4499f44 100644
--- a/sd/inc/SdShapeTypes.hxx
+++ b/sd/inc/SdShapeTypes.hxx
@@ -20,10 +20,6 @@
#ifndef INCLUDED_SD_INC_SDSHAPETYPES_HXX
#define INCLUDED_SD_INC_SDSHAPETYPES_HXX
-#include <svx/ShapeTypeHandler.hxx>
-#include <svx/AccessibleShape.hxx>
-#include <com/sun/star/accessibility/XAccessible.hpp>
-
namespace accessibility {
/** Register the SD presentation shape types with the ShapeTypeHandler singleton.
diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx
index 623989f8e93a..d4c5381c7039 100644
--- a/sd/inc/TransitionPreset.hxx
+++ b/sd/inc/TransitionPreset.hxx
@@ -31,8 +31,6 @@ namespace com { namespace sun { namespace star {
namespace uno { template<class X> class Reference; }
} } }
-class SdPage;
-
namespace sd {
class TransitionPreset;
diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx
index 0fe0f2993f7d..03dd4fce8783 100644
--- a/sd/inc/anminfo.hxx
+++ b/sd/inc/anminfo.hxx
@@ -28,9 +28,6 @@
#include <tools/color.hxx>
#include "sddllapi.h"
-class SdrObject;
-class SdrPathObj;
-
class SD_DLLPUBLIC SdAnimationInfo : public SdrObjUserData
{
public:
diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx
index a4ab36d38f52..612798bdc473 100644
--- a/sd/inc/cusshow.hxx
+++ b/sd/inc/cusshow.hxx
@@ -24,7 +24,6 @@
#include <cppuhelper/weakref.hxx>
#include "sddllapi.h"
-class SdDrawDocument;
class SdPage;
class SD_DLLPUBLIC SdCustomShow final
diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx
index 32e2d7f54d2f..4708196316d0 100644
--- a/sd/inc/glob.hxx
+++ b/sd/inc/glob.hxx
@@ -20,9 +20,6 @@
#ifndef INCLUDED_SD_INC_GLOB_HXX
#define INCLUDED_SD_INC_GLOB_HXX
-#include <svl/style.hxx>
-#include <sal/types.h>
-
#define SD_IF_SDAPP SFX_INTERFACE_SD_START + SfxInterfaceId(0)
#define SD_IF_SDDRAWDOCSHELL SFX_INTERFACE_SD_START + SfxInterfaceId(1)
#define SD_IF_SDDRAWVIEWSHELL SFX_INTERFACE_SD_START + SfxInterfaceId(3)
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index 64678d7733ad..0b2622f4c4c3 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -20,9 +20,6 @@
#ifndef INCLUDED_SD_INC_HELPIDS_H
#define INCLUDED_SD_INC_HELPIDS_H
-#include <svx/svxcommands.h>
-#include "sdcommands.h"
-
#define HID_SDDRAWVIEWSHELL "SD_HID_SDDRAWVIEWSHELL"
#define HID_SDGRAPHICVIEWSHELL "SD_HID_SDGRAPHICVIEWSHELL"
#define HID_SDOUTLINEVIEWSHELL "SD_HID_SDOUTLINEVIEWSHELL"
diff --git a/sd/inc/imapinfo.hxx b/sd/inc/imapinfo.hxx
index 77c6c203b43f..2db510b2dc20 100644
--- a/sd/inc/imapinfo.hxx
+++ b/sd/inc/imapinfo.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SD_INC_IMAPINFO_HXX
#define INCLUDED_SD_INC_IMAPINFO_HXX
-#include "sdiocmpt.hxx"
#include "glob.hxx"
#include <svx/svdobj.hxx>
#include <svtools/imap.hxx>
diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx
index adbcd403646a..a7b0614114e2 100644
--- a/sd/inc/sdattr.hxx
+++ b/sd/inc/sdattr.hxx
@@ -20,14 +20,10 @@
#ifndef INCLUDED_SD_INC_SDATTR_HXX
#define INCLUDED_SD_INC_SDATTR_HXX
-#include <svl/intitem.hxx>
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
#include "sdattr.hrc"
-#include "glob.hxx"
-#include "fadedef.h"
-#include "diadef.h"
// layer attributes
inline SfxStringItem makeSdAttrLayerName( const OUString& aStr )
diff --git a/sd/inc/stlfamily.hxx b/sd/inc/stlfamily.hxx
index 3367b49a2d44..fbaa825505cc 100644
--- a/sd/inc/stlfamily.hxx
+++ b/sd/inc/stlfamily.hxx
@@ -22,10 +22,8 @@
#include <memory>
#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/style/XStyle.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
@@ -38,8 +36,6 @@
#include <svl/style.hxx>
-#include <editeng/unoipset.hxx>
-
class SdStyleSheet;
class SdPage;
struct SdStyleFamilyImpl;
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
index 506d4d47eb11..cfe639038f9a 100644
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
@@ -22,11 +22,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <cppuhelper/implbase.hxx>
#include <map>
@@ -37,10 +33,8 @@
#include "sddllapi.h"
-class SdStyleSheet;
class SdDrawDocument;
class SdPage;
-class SfxStyleSheetBase;
class SvxNumberFormat;
typedef std::map< const SdPage*, SdStyleFamilyRef > SdStyleFamilyMap;
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index b6b1d599a71c..b86314383ca5 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -35,13 +35,12 @@
#include <svl/style.hxx>
-#include <editeng/unoipset.hxx>
-
#include <memory>
#include "prlayout.hxx"
class ModifyListenerForewarder;
+struct SfxItemPropertySimpleEntry;
typedef cppu::ImplInheritanceHelper< SfxUnoStyleSheet,
css::beans::XPropertySet,
diff --git a/sd/inc/textapi.hxx b/sd/inc/textapi.hxx
index 6906ffa2112e..df771dc55e50 100644
--- a/sd/inc/textapi.hxx
+++ b/sd/inc/textapi.hxx
@@ -20,14 +20,9 @@
#ifndef INCLUDED_SD_INC_TEXTAPI_HXX
#define INCLUDED_SD_INC_TEXTAPI_HXX
-#include <editeng/unoedsrc.hxx>
#include <editeng/unotext.hxx>
-#include <editeng/eeitem.hxx>
#include <rtl/ref.hxx>
#include <editeng/outliner.hxx>
-#include <editeng/unoprnms.hxx>
-#include <editeng/unoforou.hxx>
-#include <editeng/unoipset.hxx>
class SdDrawDocument;
diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx
index ea996f258e9f..d2519a7b0b6d 100644
--- a/sd/inc/undo/undomanager.hxx
+++ b/sd/inc/undo/undomanager.hxx
@@ -20,12 +20,9 @@
#ifndef INCLUDED_SD_INC_UNDO_UNDOMANAGER_HXX
#define INCLUDED_SD_INC_UNDO_UNDOMANAGER_HXX
-#include <misc/scopelock.hxx>
#include <svx/sdrundomanager.hxx>
#include <sddllapi.h>
-class SfxViewShell;
-
namespace sd
{
diff --git a/sd/inc/undo/undoobjects.hxx b/sd/inc/undo/undoobjects.hxx
index 59c120816415..15ae5c6c1d4b 100644
--- a/sd/inc/undo/undoobjects.hxx
+++ b/sd/inc/undo/undoobjects.hxx
@@ -22,9 +22,8 @@
#include <memory>
#include <svx/svdundo.hxx>
-#include <svx/svdpage.hxx>
-#include <svx/svdobj.hxx>
#include <pres.hxx>
+#include <tools/weakbase.hxx>
class SdrObjUserCall;
class SdPage;
diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx
index 785bd0d9bca7..a4bdb23e46bc 100644
--- a/sd/source/core/text/textapi.cxx
+++ b/sd/source/core/text/textapi.cxx
@@ -26,6 +26,9 @@
#include <editeng/eeitem.hxx>
#include <editeng/editeng.hxx>
#include <editeng/outlobj.hxx>
+#include <editeng/unoforou.hxx>
+#include <editeng/unoprnms.hxx>
+#include <editeng/unoipset.hxx>
#include <Outliner.hxx>
#include <svx/svdpool.hxx>
diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
index 90a1734dcff3..f4a4faa0ab7e 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx
@@ -22,6 +22,7 @@
#include <SdShapeTypes.hxx>
#include <svx/DescriptionGenerator.hxx>
+#include <svx/ShapeTypeHandler.hxx>
#include <rtl/ustring.h>
using namespace ::com::sun::star;
diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
index 7a8d78fc2e3b..9a96e14724bb 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx
@@ -22,6 +22,7 @@
#include <SdShapeTypes.hxx>
#include <svx/DescriptionGenerator.hxx>
+#include <svx/ShapeTypeHandler.hxx>
#include <rtl/ustring.h>
using namespace ::com::sun::star;
diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
index 799968cdc55b..12e95e320194 100644
--- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx
@@ -24,6 +24,7 @@
#include <strings.hrc>
#include <sdresid.hxx>
#include <svx/DescriptionGenerator.hxx>
+#include <svx/ShapeTypeHandler.hxx>
#include <rtl/ustring.h>
using namespace ::com::sun::star;
diff --git a/sd/source/ui/accessibility/SdShapeTypes.cxx b/sd/source/ui/accessibility/SdShapeTypes.cxx
index f4430ac7cff4..835ef4a08828 100644
--- a/sd/source/ui/accessibility/SdShapeTypes.cxx
+++ b/sd/source/ui/accessibility/SdShapeTypes.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <svx/ShapeTypeHandler.hxx>
#include <SdShapeTypes.hxx>
#include <AccessiblePresentationShape.hxx>
#include <AccessiblePresentationGraphicShape.hxx>
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 0c64fee760f9..16f0becb0266 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -21,6 +21,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <svl/itemset.hxx>
+#include <svl/intitem.hxx>
#include <vcl/svapp.hxx>
#include <sdattr.hxx>
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 54fa8b8dc2f5..d9a7dca7fb78 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -26,6 +26,7 @@
#include <svx/svdpagv.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/settings.hxx>
+#include <sdcommands.h>
#include <tools/poly.hxx>
#include <svx/fmshell.hxx>
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 948e20312d52..f894b074bd8f 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -34,6 +34,7 @@
#include <svx/zoomslideritem.hxx>
#include <svl/eitem.hxx>
+#include <sdcommands.h>
#include <svx/dialogs.hrc>
#include <svx/extrusionbar.hxx>
#include <svx/fontworkbar.hxx>
More information about the Libreoffice-commits
mailing list