diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-18 10:10:48 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-18 09:25:06 +0000 |
commit | 0a840edcc19ad1b8bb1525717d91ce8ade0c0092 (patch) | |
tree | 7b868933b54e3e763bf294b463abd302be26fb4f /lotuswordpro | |
parent | starmath: fix loplugin:cppunitassertequals warnings (diff) | |
download | core-0a840edcc19ad1b8bb1525717d91ce8ade0c0092.tar.gz core-0a840edcc19ad1b8bb1525717d91ce8ade0c0092.zip |
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 'lotuswordpro')
-rw-r--r-- | lotuswordpro/source/filter/lwpbulletstylemgr.cxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpcharacterstyle.cxx | 6 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpfont.cxx | 5 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpfootnote.hxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpfoundry.cxx | 6 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpfribptr.cxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpgrfobj.cxx | 4 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwplayout.hxx | 4 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwplaypiece.hxx | 9 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpnumericfmt.hxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwppagelayout.hxx | 4 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpstory.cxx | 8 |
12 files changed, 27 insertions, 27 deletions
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx index 5bc408a29e64..2366b319153e 100644 --- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx +++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx @@ -70,6 +70,7 @@ #include "xfilter/xfstylemanager.hxx" #include "xfilter/xflist.hxx" #include "lwpglobalmgr.hxx" +#include "xfilter/xflistitem.hxx" LwpBulletStyleMgr::LwpBulletStyleMgr() : m_pFoundry(nullptr) @@ -242,7 +243,6 @@ OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara* pPara, LwpBulletOverrid } -#include "xfilter/xflistitem.hxx" //Create nested XFList and XFItems and then add it to XFContentContainer(pCont) //Return the inner XFItem created. XFContentContainer* LwpBulletStyleMgr::AddBulletList( diff --git a/lotuswordpro/source/filter/lwpcharacterstyle.cxx b/lotuswordpro/source/filter/lwpcharacterstyle.cxx index 650cf10b9276..ba4303a3326d 100644 --- a/lotuswordpro/source/filter/lwpcharacterstyle.cxx +++ b/lotuswordpro/source/filter/lwpcharacterstyle.cxx @@ -66,6 +66,9 @@ #include "lwpfont.hxx" #include "lwpfoundry.hxx" #include "lwpcharborderoverride.hxx" +#include "xfilter/xfparastyle.hxx" +#include "xfilter/xffont.hxx" + /*class LwpTextStyle*/ LwpTextStyle::LwpTextStyle(LwpObjectHeader& objHdr, LwpSvStream* pStrm) @@ -158,9 +161,6 @@ void LwpTextStyle::ReadCommon() } -#include "xfilter/xfparastyle.hxx" -#include "xfilter/xffont.hxx" - void LwpTextStyle::RegisterStyle() { if (!m_pFoundry) diff --git a/lotuswordpro/source/filter/lwpfont.cxx b/lotuswordpro/source/filter/lwpfont.cxx index 6d2bf8cdff5b..98772071362a 100644 --- a/lotuswordpro/source/filter/lwpfont.cxx +++ b/lotuswordpro/source/filter/lwpfont.cxx @@ -58,6 +58,8 @@ #include "xfilter/xfstylemanager.hxx" #include "xfilter/xffontfactory.hxx" #include "xfilter/xftextstyle.hxx" +#include "xfilter/xfdefs.hxx" +#include "xfilter/xfcolor.hxx" void LwpFontAttrEntry::Read(LwpObjectStream *pStrm) { @@ -71,7 +73,6 @@ void LwpFontAttrEntry::Read(LwpObjectStream *pStrm) pStrm->SkipExtra(); } -#include "xfilter/xfdefs.hxx" void LwpFontAttrEntry::Override( rtl::Reference<XFFont> const & pFont ) { if (IsBoldOverridden()) @@ -293,7 +294,7 @@ void LwpFontNameEntry::Read(LwpObjectStream *pStrm) m_nAltFaceName = pStrm->QuickReaduInt16(); pStrm->SkipExtra(); } -#include "xfilter/xfcolor.hxx" + void LwpFontNameEntry::Override(rtl::Reference<XFFont> const & pFont) { if (IsPointSizeOverridden()) diff --git a/lotuswordpro/source/filter/lwpfootnote.hxx b/lotuswordpro/source/filter/lwpfootnote.hxx index 54047f5c3763..5966994adc10 100644 --- a/lotuswordpro/source/filter/lwpfootnote.hxx +++ b/lotuswordpro/source/filter/lwpfootnote.hxx @@ -65,6 +65,7 @@ #include "lwpobj.hxx" #include "lwpsection.hxx" #include "lwpborderstuff.hxx" +#include "lwptable.hxx" // Footnote types are built up from these numbers #define FN_MASK_ENDNOTE 0x80 @@ -147,7 +148,6 @@ private: /** * @brief VO_FOOTNOTETABLE object */ -#include "lwptable.hxx" class LwpFootnoteTable : public LwpTable { public: diff --git a/lotuswordpro/source/filter/lwpfoundry.cxx b/lotuswordpro/source/filter/lwpfoundry.cxx index d7dde9fd06bf..6591db06beda 100644 --- a/lotuswordpro/source/filter/lwpfoundry.cxx +++ b/lotuswordpro/source/filter/lwpfoundry.cxx @@ -69,6 +69,9 @@ #include "lwpsection.hxx" #include "lwpcharacterstyle.hxx" #include "lwpglobalmgr.hxx" +#include "xfilter/xfstylemanager.hxx" +#include "lwplayout.hxx" + #include <osl/diagnose.h> @@ -170,9 +173,6 @@ void LwpFoundry::ReadStyles(LwpObjectStream *pStrm) } -#include "xfilter/xfstylemanager.hxx" -#include "lwplayout.hxx" - void LwpFoundry::RegisterAllLayouts() { if (m_bRegisteredAll) diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx b/lotuswordpro/source/filter/lwpfribptr.cxx index af7b520a3ddc..f6e6f62ab2f8 100644 --- a/lotuswordpro/source/filter/lwpfribptr.cxx +++ b/lotuswordpro/source/filter/lwpfribptr.cxx @@ -82,6 +82,7 @@ #include "xfilter/xfchange.hxx" #include "lwpchangemgr.hxx" #include "lwpglobalmgr.hxx" +#include "lwpdropcapmgr.hxx" LwpFribPtr::LwpFribPtr() : m_pFribs(nullptr),m_pXFPara(nullptr),m_pPara(nullptr) @@ -142,7 +143,6 @@ void LwpFribPtr::ReadPara(LwpObjectStream* pObjStrm) } } -#include "lwpdropcapmgr.hxx" void LwpFribPtr::XFConvert() { LwpFrib* pFrib = m_pFribs; diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx index 9d8903c8a103..882f7d2b31e1 100644 --- a/lotuswordpro/source/filter/lwpgrfobj.cxx +++ b/lotuswordpro/source/filter/lwpgrfobj.cxx @@ -68,6 +68,8 @@ #include "bento.hxx" #include "lwpglobalmgr.hxx" +#include "lwpframelayout.hxx" + #include "xfilter/xfframe.hxx" #include "xfilter/xfimage.hxx" #include "xfilter/xfimagestyle.hxx" @@ -231,8 +233,6 @@ void LwpGraphicObject::XFConvert (XFContentContainer* pCont) } } -#include "lwpframelayout.hxx" - /** * @descr judge if the graphic format is what we can support: bmp, jpg, wmf, gif, tgf(tif). other format will be filtered to * these formats by Word Pro. diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx index 70ab7cd64e56..055a0e230186 100644 --- a/lotuswordpro/source/filter/lwplayout.hxx +++ b/lotuswordpro/source/filter/lwplayout.hxx @@ -83,6 +83,8 @@ #include "xfilter/xfframe.hxx" #include "xfilter/xfbgimage.hxx" #include "lwpusewhen.hxx" +#include "lwplaypiece.hxx" + #define FIRST_LAYOUTPAGENO 0x0001 #define LAST_LAYOUTPAGENO 0xffff @@ -326,8 +328,6 @@ private: LwpAtomHolder* m_pContentStyle; }; -#include "lwplaypiece.hxx" - class LwpMiddleLayout : public LwpVirtualLayout { public: diff --git a/lotuswordpro/source/filter/lwplaypiece.hxx b/lotuswordpro/source/filter/lwplaypiece.hxx index 76ea400d1df3..0eb7f40b17b3 100644 --- a/lotuswordpro/source/filter/lwplaypiece.hxx +++ b/lotuswordpro/source/filter/lwplaypiece.hxx @@ -63,6 +63,10 @@ #include "lwppiece.hxx" #include "lwpbasetype.hxx" +#include "lwpmargins.hxx" +#include "lwpborderstuff.hxx" +#include "lwpshadow.hxx" + class LwpRotor { @@ -127,8 +131,6 @@ private: virtual ~LwpLayoutScale() override; }; -#include "lwpmargins.hxx" - class LwpLayoutMargins : public LwpVirtualPiece { public: @@ -146,7 +148,6 @@ private: virtual ~LwpLayoutMargins() override; }; -#include "lwpborderstuff.hxx" class LwpLayoutBorder : public LwpVirtualPiece { public: @@ -305,8 +306,6 @@ private: virtual ~LwpLayoutJoins() override; }; -#include "lwpshadow.hxx" - class LwpLayoutShadow : public LwpVirtualPiece { public: diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx index 890c3a4989af..3b5021f82b3b 100644 --- a/lotuswordpro/source/filter/lwpnumericfmt.hxx +++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx @@ -64,6 +64,7 @@ #include "lwpatomholder.hxx" #include "lwptblcell.hxx" #include "lwpcolor.hxx" +#include "lwppiece.hxx" //For converting to xml #include "xfilter/xfnumberstyle.hxx" @@ -295,7 +296,6 @@ LwpNumericFormat::IsNegativeOverridden() return (cFlags & NF_OVER_NEGATIVE) != 0; } -#include "lwppiece.hxx" class LwpLayoutNumerics : public LwpVirtualPiece { public: diff --git a/lotuswordpro/source/filter/lwppagelayout.hxx b/lotuswordpro/source/filter/lwppagelayout.hxx index a271ea568572..5852bc9e2a2f 100644 --- a/lotuswordpro/source/filter/lwppagelayout.hxx +++ b/lotuswordpro/source/filter/lwppagelayout.hxx @@ -58,6 +58,8 @@ #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPPAGELAYOUT_HXX #include "lwplayout.hxx" +#include "xfilter/xfmasterpage.hxx" + class LwpHeaderLayout; class LwpFooterLayout; @@ -106,8 +108,6 @@ public: LwpPara* GetPagePosition(); }; -#include "xfilter/xfmasterpage.hxx" - class LwpHeaderLayout: public LwpPlacableLayout { public: diff --git a/lotuswordpro/source/filter/lwpstory.cxx b/lotuswordpro/source/filter/lwpstory.cxx index ee7031af38a2..45827b91dd26 100644 --- a/lotuswordpro/source/filter/lwpstory.cxx +++ b/lotuswordpro/source/filter/lwpstory.cxx @@ -63,6 +63,10 @@ #include "lwpglobalmgr.hxx" #include "lwpstory.hxx" #include "xfilter/xfstylemanager.hxx" +#include "lwppara.hxx" +#include "lwpobjfactory.hxx" +#include "lwppagelayout.hxx" + LwpStory::LwpStory(LwpObjectHeader &objHdr, LwpSvStream* pStrm) : LwpContent(objHdr, pStrm) @@ -88,9 +92,6 @@ void LwpStory::Read() m_pObjStrm->SkipExtra(); } -#include "lwppara.hxx" -#include "lwpobjfactory.hxx" - /************************************************************************** * @descr: Convert all the contents in current story **************************************************************************/ @@ -148,7 +149,6 @@ void LwpStory::Parse(IXFStream* pOutputStream) m_pXFContainer = nullptr; } -#include "lwppagelayout.hxx" /************************************************************************** * @descr: Set current page layout. If pPageLayout is a mirror page layout, use odd child page layout as current page layout. |