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>

4 files changed, 13 insertions, 12 deletions

diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 307e21873fd6..246d6854cea5 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -99,6 +99,9 @@
 #include <rtl/instance.hxx>
 #include <rtl/strbuf.hxx>
 #include <memory>
+#include <framework/sfxhelperfunctions.hxx>
+#include <sfx2/imagemgr.hxx>
+#include "fwkhelper.hxx"
 
 using namespace ::com::sun::star;
 
@@ -118,10 +121,6 @@ namespace
         : public rtl::Static<osl::Mutex, theApplicationMutex> {};
 }
 
-#include <framework/sfxhelperfunctions.hxx>
-#include <sfx2/imagemgr.hxx>
-#include "fwkhelper.hxx"
-
 SfxApplication* SfxApplication::Get()
 {
     return g_pSfxApplication;
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index f43929e676a0..4f80ffad97fb 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -24,10 +24,6 @@
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XFrame2.hpp>
 
-namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { class XBreakIterator; } } } }
-namespace com { namespace sun { namespace star { namespace text { class XTextRange; } } } }
-
 #include <vcl/window.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/toolbox.hxx>
@@ -44,6 +40,11 @@ namespace com { namespace sun { namespace star { namespace text { class XTextRan
 
 #include "srchdlg.hxx"
 
+namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
+namespace com { namespace sun { namespace star { namespace i18n { class XBreakIterator; } } } }
+namespace com { namespace sun { namespace star { namespace text { class XTextRange; } } } }
+
+
 // ContentListBox_Impl ---------------------------------------------------
 
 class ContentListBox_Impl : public SvTreeListBox
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index d6326726688e..b1127a4880a7 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -55,6 +55,7 @@
 #include <sfx2/dispatch.hxx>
 #include <comphelper/extract.hxx>
 #include <tools/urlobj.hxx>
+#include <tools/rcid.h>
 #include <osl/security.hxx>
 #include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>
@@ -305,7 +306,6 @@ void ShutdownIcon::FromTemplate()
 }
 
 
-#include <tools/rcid.h>
 OUString ShutdownIcon::GetResString( int id )
 {
     ::SolarMutexGuard aGuard;
diff --git a/sfx2/source/inc/partwnd.hxx b/sfx2/source/inc/partwnd.hxx
index 07f873ce76da..487659efaac1 100644
--- a/sfx2/source/inc/partwnd.hxx
+++ b/sfx2/source/inc/partwnd.hxx
@@ -19,6 +19,10 @@
 #ifndef INCLUDED_SFX2_SOURCE_INC_PARTWND_HXX
 #define INCLUDED_SFX2_SOURCE_INC_PARTWND_HXX
 
+#include <sfx2/childwin.hxx>
+#include <sfx2/dockwin.hxx>
+
+
 namespace com
 {
     namespace sun
@@ -33,9 +37,6 @@ namespace com
     }
 }
 
-#include <sfx2/childwin.hxx>
-#include <sfx2/dockwin.hxx>
-
 // forward ---------------------------------------------------------------
 
 // class SfxPartChildWnd_Impl -----------------------------------