summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorGabor Kelemen <kelemen.gabor2@nisz.hu>2019-01-22 18:14:35 +0100
committerMiklos Vajna <vmiklos@collabora.com>2019-01-24 11:28:52 +0100
commit38aa12075432cc6b4e6de60de84c04c1f480768d (patch)
tree9475e961325b372412b5773fabc1f0446264ce7a /sd
parentc2216d2d7a5bb0a82f79181fbc46708d35858afe (diff)
find-unneeeded-includes: don't propose to replace o3tl/deleter.hxx
As seen while analysing sw/source/core/inc/DocumentChartDataProviderManager.hxx replacing o3tl/deleter.hxx with fw declaration does not work, it compiles only when it is transitively included. This also removes mistakenly added fw declarations and now unnecessary IwyuFilter blacklist items Change-Id: I2d631f0693dbfd0bb0e62218a525113042c9a907 Reviewed-on: https://gerrit.libreoffice.org/66750 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/IwyuFilter_sd.yaml11
-rw-r--r--sd/source/ui/inc/ViewShell.hxx3
-rw-r--r--sd/source/ui/inc/ViewShellImplementation.hxx3
-rw-r--r--sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx2
6 files changed, 5 insertions, 18 deletions
diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index 8d0edb64c426..5a3bd62b3d8c 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -110,8 +110,6 @@ blacklist:
sd/source/ui/framework/module/ToolBarModule.hxx:
# base class has to be a complete type
- com/sun/star/drawing/framework/XConfigurationChangeListener.hpp
- # Needed for template
- - o3tl/deleter.hxx
sd/source/ui/framework/module/SlideSorterModule.hxx:
# base class has to be a complete type
- com/sun/star/drawing/framework/XConfigurationChangeListener.hpp
@@ -160,9 +158,6 @@ blacklist:
sd/source/ui/inc/fupage.hxx:
# base class has to be a complete type
- vcl/weld.hxx
- sd/source/ui/inc/OutlineView.hxx:
- #std::unique_ptr deleter type has to be complete
- - o3tl/deleter.hxx
sd/source/ui/inc/slideshow.hxx:
# typedef needs a complete type
- com/sun/star/lang/XServiceInfo.hpp
@@ -174,9 +169,6 @@ blacklist:
# base class has to be a complete type
- com/sun/star/lang/XUnoTunnel.hpp
- com/sun/star/util/XReplaceDescriptor.hpp
- sd/source/ui/inc/ViewShellManager.hxx:
- #std::unique_ptr deleter type has to be complete
- - o3tl/deleter.hxx
sd/source/ui/inc/ViewTabBar.hxx:
# base class has to be a complete type
- com/sun/star/drawing/framework/XConfigurationChangeListener.hpp
@@ -232,9 +224,6 @@ blacklist:
sd/source/ui/inc/tools/SlotStateListener.hxx:
# base class has to be a complete type
- com/sun/star/frame/XStatusListener.hpp
- sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx:
- # Needed for template
- - o3tl/deleter.hxx
sd/source/ui/presenter/PresenterHelper.hxx:
# base class has to be a complete type
- com/sun/star/drawing/XPresenterHelper.hpp
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index ba6412524751..a012366e1bfa 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -24,6 +24,7 @@
#include <sfx2/viewsh.hxx>
#include <vcl/prntypes.hxx>
+#include <o3tl/deleter.hxx>
#include <pres.hxx>
#include "View.hxx"
#include "fupoor.hxx"
@@ -31,8 +32,6 @@
#include <memory>
-namespace o3tl { template <typename T> struct default_delete; }
-
class SdPage;
class SvxRuler;
class SdrOle2Obj; // for the ones, who have undefined parts of SVDRAW
diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx
index 723789d28245..77dfc3ea0ded 100644
--- a/sd/source/ui/inc/ViewShellImplementation.hxx
+++ b/sd/source/ui/inc/ViewShellImplementation.hxx
@@ -23,10 +23,9 @@
#include "ViewShell.hxx"
#include "ViewShellManager.hxx"
#include "ToolBarManager.hxx"
+#include <o3tl/deleter.hxx>
#include <memory>
-namespace o3tl { template <typename T> struct default_delete; }
-
class SvxIMapDlg;
namespace sd {
diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
index 2fb0b61747fd..00fe6aa21622 100644
--- a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
+++ b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx
@@ -22,10 +22,10 @@
#include <memory>
#include <sal/types.h>
+#include <o3tl/deleter.hxx>
namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
-namespace o3tl { template <typename T> struct default_delete; }
namespace sd {
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
index af705bd05385..a6667ef3ea57 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx
@@ -24,13 +24,13 @@
#include <canvas/elapsedtime.hxx>
#include <vcl/idle.hxx>
#include <sal/types.h>
+#include <o3tl/deleter.hxx>
#include <functional>
#include <memory>
#include <vector>
namespace sd { namespace slidesorter { class SlideSorter; } }
-namespace o3tl { template <typename T> struct default_delete; }
namespace sd { namespace slidesorter { namespace controller {
diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index 3ca03fba5d9b..e1444a586831 100644
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -24,6 +24,7 @@
#include <model/SlsSharedPageDescriptor.hxx>
#include <view/SlsLayouter.hxx>
#include <view/SlsILayerPainter.hxx>
+#include <o3tl/deleter.hxx>
#include <View.hxx>
#include <tools/gen.hxx>
@@ -38,7 +39,6 @@ namespace sd { namespace slidesorter { namespace model {
class SlideSorterModel;
} } }
-namespace o3tl { template <typename T> struct default_delete; }
namespace sd { class Window; }
namespace sd { namespace slidesorter { class SlideSorter; } }