includes should be at the top of the file

not randomly scattered through the code

found with something like:
   git ls-files *.cpp | xargs grep -Pzl "(?s){.*#include"

Change-Id: I9c242fa4ef99e8677f2800d7ec9f16d16e488351
Reviewed-on: https://gerrit.libreoffice.org/30952
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

7 files changed, 18 insertions, 23 deletions

diff --git a/sd/inc/sdiocmpt.hxx b/sd/inc/sdiocmpt.hxx
index 4016b5796cac..d91c339ba0ce 100644
--- a/sd/inc/sdiocmpt.hxx
+++ b/sd/inc/sdiocmpt.hxx
@@ -21,6 +21,8 @@
 #define INCLUDED_SD_INC_SDIOCMPT_HXX
 
 #include <tools/stream.hxx>
+#include "sddllapi.h"
+
 
 class old_SdrDownCompat
 {
@@ -41,8 +43,6 @@ public:
     void  CloseSubRecord();
 };
 
-#include "sddllapi.h"
-
 #define SDIOCOMPAT_VERSIONDONTKNOW (sal_uInt16)0xffff
 
 class SD_DLLPUBLIC SdIOCompat : public old_SdrDownCompat
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index ba187e8059d4..fe40b863098b 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -44,13 +44,13 @@
 #include "View.hxx"
 #include "AccessibleOutlineView.hxx"
 #include "AccessibleOutlineEditSource.hxx"
-
-#include <memory>
-
+#include <drawdoc.hxx>
 #include "accessibility.hrc"
 #include "sdresid.hxx"
 #include <osl/mutex.hxx>
 
+#include <memory>
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
 
@@ -131,8 +131,6 @@ uno::Reference<XAccessible> SAL_CALL
     return maTextHelper.GetChild(nIndex);
 }
 
-#include <drawdoc.hxx>
-
 OUString SAL_CALL
     AccessibleOutlineView::getAccessibleName()
     throw (css::uno::RuntimeException, std::exception)
diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx
index 12a59ecc8fb6..ca88b379c6f2 100644
--- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx
+++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx
@@ -20,11 +20,6 @@
 #include "SpellDialogChildWindow.hxx"
 #include <svx/svxids.hrc>
 
-namespace sd{
-
-SFX_IMPL_CHILDWINDOW_WITHID(SpellDialogChildWindow, SID_SPELL_DIALOG)
-}
-
 #include "ViewShell.hxx"
 #include "ViewShellBase.hxx"
 #include "DrawViewShell.hxx"
@@ -34,6 +29,8 @@ SFX_IMPL_CHILDWINDOW_WITHID(SpellDialogChildWindow, SID_SPELL_DIALOG)
 
 namespace sd {
 
+SFX_IMPL_CHILDWINDOW_WITHID(SpellDialogChildWindow, SID_SPELL_DIALOG)
+
 SpellDialogChildWindow::SpellDialogChildWindow (
     vcl::Window* _pParent,
     sal_uInt16 nId,
diff --git a/sd/source/ui/inc/unopage.hxx b/sd/source/ui/inc/unopage.hxx
index d6dc3028d87f..f0b983dd353e 100644
--- a/sd/source/ui/inc/unopage.hxx
+++ b/sd/source/ui/inc/unopage.hxx
@@ -35,6 +35,7 @@
 #include <svx/svdpool.hxx>
 
 #include <comphelper/servicehelper.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include "unosrch.hxx"
 
@@ -285,7 +286,6 @@ public:
 /***********************************************************************
 *                                                                      *
 ***********************************************************************/
-#include <cppuhelper/implbase.hxx>
 
 class SdPageLinkTargets : public ::cppu::WeakImplHelper< css::container::XNameAccess,
                                                   css::lang::XServiceInfo >
diff --git a/sd/source/ui/unoidl/sddetect.hxx b/sd/source/ui/unoidl/sddetect.hxx
index 49beceb6795c..e8c1cd9035ff 100644
--- a/sd/source/ui/unoidl/sddetect.hxx
+++ b/sd/source/ui/unoidl/sddetect.hxx
@@ -28,6 +28,8 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <cppuhelper/factory.hxx>
+#include <sfx2/sfxuno.hxx>
+
 
 namespace com
 {
@@ -47,8 +49,6 @@ namespace com
     }
 }
 
-#include <sfx2/sfxuno.hxx>
-
 class SdFilterDetect : public ::cppu::WeakImplHelper< css::document::XExtendedFilterDetection, css::lang::XServiceInfo >
 {
 public:
diff --git a/sd/source/ui/unoidl/unocpres.hxx b/sd/source/ui/unoidl/unocpres.hxx
index c04ebb7f6a62..64f6c1f7591e 100644
--- a/sd/source/ui/unoidl/unocpres.hxx
+++ b/sd/source/ui/unoidl/unocpres.hxx
@@ -29,6 +29,12 @@
 
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/servicehelper.hxx>
+#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+
+#include "unomodel.hxx"
+#include "drawdoc.hxx"
+
 
 class SdXImpressDocument;
 class SdCustomShow;
@@ -91,12 +97,6 @@ public:
     virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override;
 };
 
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-
-#include "unomodel.hxx"
-#include "drawdoc.hxx"
-
 class List;
 
 class SdXCustomPresentationAccess : public ::cppu::WeakImplHelper< css::container::XNameContainer,
diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx
index f7416f5a6884..7da13920730f 100644
--- a/sd/source/ui/view/unmodpg.cxx
+++ b/sd/source/ui/view/unmodpg.cxx
@@ -20,6 +20,8 @@
 #include <svx/svdlayer.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <svx/svdviter.hxx>
+#include <svx/svdview.hxx>
 
 #include "strings.hrc"
 #include "glob.hxx"
@@ -71,8 +73,6 @@ ModifyPageUndoAction::ModifyPageUndoAction(
     maComment = SD_RESSTR(STR_UNDO_MODIFY_PAGE);
 }
 
-#include <svx/svdviter.hxx>
-#include <svx/svdview.hxx>
 void ModifyPageUndoAction::Undo()
 {
     // invalidate Selection, there could be objects deleted in this UNDO