summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-11-18 10:10:48 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-11-18 09:25:06 +0000
commit0a840edcc19ad1b8bb1525717d91ce8ade0c0092 (patch)
tree7b868933b54e3e763bf294b463abd302be26fb4f /include
parent3ab9cebf45e725bbd3d7828dbcf974d3bef2c32c (diff)
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>
Diffstat (limited to 'include')
-rw-r--r--include/connectivity/IParseContext.hxx4
-rw-r--r--include/editeng/editview.hxx8
-rw-r--r--include/editeng/outliner.hxx16
-rw-r--r--include/editeng/unotext.hxx3
-rw-r--r--include/sfx2/frame.hxx12
-rw-r--r--include/sfx2/sfxdlg.hxx3
-rw-r--r--include/svx/databaselocationinput.hxx5
-rw-r--r--include/svx/svdglue.hxx10
-rw-r--r--include/svx/unoprov.hxx4
-rw-r--r--include/svx/unoshape.hxx10
-rw-r--r--include/toolkit/helper/vclunohelper.hxx19
-rw-r--r--include/vcl/svapp.hxx6
-rw-r--r--include/vcl/texteng.hxx18
-rw-r--r--include/vcl/unohelp2.hxx2
14 files changed, 58 insertions, 62 deletions
diff --git a/include/connectivity/IParseContext.hxx b/include/connectivity/IParseContext.hxx
index 5c523400ee81..53c09f5e6bb2 100644
--- a/include/connectivity/IParseContext.hxx
+++ b/include/connectivity/IParseContext.hxx
@@ -19,12 +19,12 @@
#ifndef INCLUDED_CONNECTIVITY_IPARSECONTEXT_HXX
#define INCLUDED_CONNECTIVITY_IPARSECONTEXT_HXX
-namespace connectivity { class OSQLParseNode; }
-
#include <rtl/ustring.hxx>
#include <com/sun/star/lang/Locale.hpp>
#include <connectivity/dbtoolsdllapi.hxx>
+namespace connectivity { class OSQLParseNode; }
+
namespace connectivity
{
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index 5653c4514040..361558be725d 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -31,6 +31,10 @@
#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 EditEngine;
class ImpEditEngine;
@@ -55,10 +59,6 @@ namespace vcl { class Font; }
class FontList;
class OutputDevice;
-#include <editeng/editdata.hxx>
-#include <com/sun/star/uno/Reference.h>
-#include <editeng/editengdllapi.h>
-
namespace com {
namespace sun {
namespace star {
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 25241c5c7210..dad3d11ce110 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -39,6 +39,14 @@
#include <svtools/grfmgr.hxx>
#include <LibreOfficeKit/LibreOfficeKitTypes.h>
+#include <com/sun/star/uno/Reference.h>
+
+#include <rtl/ref.hxx>
+#include <editeng/svxfont.hxx>
+#include <editeng/eedata.hxx>
+#include <editeng/paragraphdata.hxx>
+#include <o3tl/typed_flags_set.hxx>
+
#include <functional>
#include <vector>
@@ -81,14 +89,6 @@ namespace svl
class IUndoManager;
}
-#include <com/sun/star/uno/Reference.h>
-
-#include <rtl/ref.hxx>
-#include <editeng/svxfont.hxx>
-#include <editeng/eedata.hxx>
-#include <editeng/paragraphdata.hxx>
-#include <o3tl/typed_flags_set.hxx>
-
class SvxFieldData;
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 518a0bd4aaa6..fd0ecce08810 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -23,6 +23,7 @@
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/text/XTextRange.hpp>
#include <com/sun/star/text/XText.hpp>
+#include <com/sun/star/text/XTextContent.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/text/XTextRangeMover.hpp>
#include <com/sun/star/text/XTextCursor.hpp>
@@ -498,8 +499,6 @@ public:
};
-#include <com/sun/star/text/XTextContent.hpp>
-
class SvxUnoTextContent : public SvxUnoTextRangeBase,
public css::text::XTextContent,
public css::container::XEnumerationAccess,
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index e08c8bf505b8..2df3fcd830c0 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -25,6 +25,12 @@
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Any.hxx>
#include <vcl/vclptr.hxx>
+#include <comphelper/namedvaluecollection.hxx>
+#include <rtl/ustring.hxx>
+#include <svl/poolitem.hxx>
+#include <tools/ref.hxx>
+#include <vector>
+
namespace com
{
@@ -51,12 +57,6 @@ namespace com
}
}
-#include <comphelper/namedvaluecollection.hxx>
-#include <rtl/ustring.hxx>
-#include <svl/poolitem.hxx>
-#include <tools/ref.hxx>
-#include <vector>
-
class SvBorder;
class SfxWorkWindow;
namespace vcl { class Window; }
diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx
index f14f9b3ad4eb..b1ca6371665e 100644
--- a/include/sfx2/sfxdlg.hxx
+++ b/include/sfx2/sfxdlg.hxx
@@ -29,6 +29,7 @@
#include <sot/exchange.hxx>
#include <sfx2/lnkbase.hxx>
+#include <sfx2/tabdlg.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.h>
@@ -45,8 +46,6 @@ class SvObjectServerList;
class TransferableDataHelper;
struct TransferableObjectDescriptor;
-#include <sfx2/tabdlg.hxx>
-
namespace sfx2
{
class LinkManager;
diff --git a/include/svx/databaselocationinput.hxx b/include/svx/databaselocationinput.hxx
index a534f6d90198..b20846c80ce7 100644
--- a/include/svx/databaselocationinput.hxx
+++ b/include/svx/databaselocationinput.hxx
@@ -23,11 +23,10 @@
#include <svx/svxdllapi.h>
#include <com/sun/star/uno/XComponentContext.hpp>
-class PushButton;
-namespace svt { class OFileURLControl; }
-
#include <memory>
+class PushButton;
+namespace svt { class OFileURLControl; }
namespace svx
{
diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx
index 94989aeee6ee..1543e0e4ca57 100644
--- a/include/svx/svdglue.hxx
+++ b/include/svx/svdglue.hxx
@@ -20,16 +20,16 @@
#ifndef INCLUDED_SVX_SVDGLUE_HXX
#define INCLUDED_SVX_SVDGLUE_HXX
-namespace vcl { class Window; }
-class OutputDevice;
-class SvStream;
-class SdrObject;
-
#include <tools/gen.hxx>
#include <svx/svxdllapi.h>
#include <vector>
#include <o3tl/typed_flags_set.hxx>
+namespace vcl { class Window; }
+class OutputDevice;
+class SvStream;
+class SdrObject;
+
enum class SdrEscapeDirection
{
diff --git a/include/svx/unoprov.hxx b/include/svx/unoprov.hxx
index 503d439e92e7..f8795e6298ae 100644
--- a/include/svx/unoprov.hxx
+++ b/include/svx/unoprov.hxx
@@ -24,6 +24,8 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <svl/itemprop.hxx>
#include <svx/svxdllapi.h>
+#include <editeng/unoipset.hxx>
+
class SvxItemPropertySet;
class SfxItemPool;
@@ -98,8 +100,6 @@ const sal_Int16 OBJ_OLE2_PLUGIN = 101;
#define E3D_INVENTOR_FLAG (0x80000000)
-#include <editeng/unoipset.hxx>
-
/**
* class SvxPropertySetInfoPool
*/
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 4d23f15d0389..8bf31b5b34e1 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -41,6 +41,9 @@
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/beans/XMultiPropertyStates.hpp>
+#include <com/sun/star/drawing/XConnectorShape.hpp>
+#include <com/sun/star/drawing/XControlShape.hpp>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <sal/types.h>
#include <tools/weakbase.hxx>
#include <svl/lstner.hxx>
@@ -52,6 +55,7 @@
#include <svx/svxdllapi.h>
#include <rtl/ref.hxx>
#include <com/sun/star/uno/Any.hxx>
+#include <editeng/unotext.hxx>
#include <svx/svdouno.hxx>
@@ -314,8 +318,6 @@ private:
SVX_DLLPRIVATE void impl_construct();
};
-#include <editeng/unotext.hxx>
-
class SVX_DLLPUBLIC SvxShapeText : public SvxShape, public SvxUnoTextBase
{
protected:
@@ -437,7 +439,6 @@ public:
// XTypeProvider
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override;
};
-#include <com/sun/star/drawing/XConnectorShape.hpp>
/***********************************************************************
* *
@@ -474,7 +475,6 @@ public:
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override;
};
-#include <com/sun/star/drawing/XControlShape.hpp>
/***********************************************************************
* *
@@ -568,8 +568,6 @@ public:
};
-#include <basegfx/polygon/b2dpolypolygon.hxx>
-
/***********************************************************************
* *
***********************************************************************/
diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx
index bd02d6a498d0..c9b062e2d4f0 100644
--- a/include/toolkit/helper/vclunohelper.hxx
+++ b/include/toolkit/helper/vclunohelper.hxx
@@ -28,6 +28,16 @@
#include <com/sun/star/awt/FontSlant.hpp>
#include <com/sun/star/awt/MouseEvent.hpp>
+#include <vcl/bitmapex.hxx>
+#include <vcl/region.hxx>
+#include <vcl/metric.hxx>
+#include <vcl/vclptr.hxx>
+#include <vcl/window.hxx>
+#include <tools/mapunit.hxx>
+#include <tools/fldunit.hxx>
+#include <tools/poly.hxx>
+
+
namespace com { namespace sun { namespace star { namespace uno {
class XInterface;
}}}}
@@ -53,15 +63,6 @@ namespace com { namespace sun { namespace star { namespace awt {
}}}}
-#include <vcl/bitmapex.hxx>
-#include <vcl/region.hxx>
-#include <vcl/metric.hxx>
-#include <vcl/vclptr.hxx>
-#include <vcl/window.hxx>
-#include <tools/mapunit.hxx>
-#include <tools/fldunit.hxx>
-#include <tools/poly.hxx>
-
class OutputDevice;
class MouseEvent;
class KeyEvent;
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 23d6e694fa2a..271922495770 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -41,6 +41,9 @@
#include <vcl/metric.hxx>
#include <unotools/localedatawrapper.hxx>
#include <o3tl/typed_flags_set.hxx>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/connection/XConnection.hpp>
+
class BitmapEx;
class AllSettings;
@@ -61,9 +64,6 @@ class ScrollEvent;
struct ImplSVEvent;
struct ConvertData;
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/connection/XConnection.hpp>
-
namespace com {
namespace sun {
namespace star {
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index 5d180757bd08..96ac4261116e 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -21,6 +21,15 @@
#include <vcl/dllapi.h>
#include <vcl/vclptr.hxx>
+#include <rtl/ustring.hxx>
+#include <svl/SfxBroadcaster.hxx>
+#include <tools/lineend.hxx>
+#include <tools/link.hxx>
+#include <tools/gen.hxx>
+#include <vcl/font.hxx>
+
+#include <com/sun/star/lang/Locale.hpp>
+#include <com/sun/star/uno/Reference.hxx>
class TextDoc;
class TextView;
@@ -47,15 +56,6 @@ namespace svl
class TextLine;
class TETextPortion;
-#include <rtl/ustring.hxx>
-#include <svl/SfxBroadcaster.hxx>
-#include <tools/lineend.hxx>
-#include <tools/link.hxx>
-#include <tools/gen.hxx>
-#include <vcl/font.hxx>
-
-#include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/uno/Reference.hxx>
struct TEIMEInfos;
class SvtCTLOptions;
diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx
index 84d08c5d7171..0b33c1830e1f 100644
--- a/include/vcl/unohelp2.hxx
+++ b/include/vcl/unohelp2.hxx
@@ -24,11 +24,11 @@
#include <cppuhelper/weak.hxx>
#include <rtl/ustring.hxx>
#include <osl/mutex.hxx>
+#include <vcl/dllapi.h>
namespace com { namespace sun { namespace star { namespace datatransfer { namespace clipboard {
class XClipboard;
} } } } }
-#include <vcl/dllapi.h>
namespace vcl { namespace unohelper {