[Libreoffice-commits] .: sw/inc sw/source

Bjoern Michaelsen bmichaelsen at kemper.freedesktop.org
Thu Jul 5 06:17:21 PDT 2012 

 sw/inc/shellres.hxx                     |    4 
 sw/source/core/bastyp/SwSmartTagMgr.cxx |    5 
 sw/source/core/bastyp/bparr.cxx         |    5 
 sw/source/core/bastyp/breakit.cxx       |   10 -
 sw/source/core/bastyp/calc.cxx          |   45 ++++----
 sw/source/core/bastyp/checkit.cxx       |    4 
 sw/source/core/bastyp/index.cxx         |    4 
 sw/source/core/bastyp/init.cxx          |  175 +++++++++++++++-----------------
 sw/source/core/bastyp/swcache.cxx       |    2 
 sw/source/core/bastyp/swrect.cxx        |    6 -
 sw/source/core/bastyp/swregion.cxx      |    2 
 sw/source/core/bastyp/swtypes.cxx       |   35 +++---
 sw/source/core/bastyp/tabcol.cxx        |    2 
 13 files changed, 150 insertions(+), 149 deletions(-)

New commits:
commit 4a9c5b336a95fd10261e8e24b22137eec2257a3f
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date:   Mon Jul 2 02:23:04 2012 +0200

    sorted all include statements alphabetically in sw/source/core/bastyp/
    
    * fixing the missing include statements in shellres.hxx (bjoern-michaelsen)
    
    Change-Id: I976586b346facf38905391bd336b7f08b218f4a4

diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index 688fe08..654a541 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -28,9 +28,11 @@
 #ifndef _SHELLRES_HXX
 #define _SHELLRES_HXX
 
+#include <svl/svstdarr.hxx>
+#include <swdllapi.h>
 #include <tools/string.hxx>
+#include <tools/rc.hxx>
 #include <vcl/bitmap.hxx>
-#include <svl/svstdarr.hxx>
 
 struct SW_DLLPUBLIC ShellResource : public Resource
 {
diff --git a/sw/source/core/bastyp/SwSmartTagMgr.cxx b/sw/source/core/bastyp/SwSmartTagMgr.cxx
index 389deac..b2caf30 100644
--- a/sw/source/core/bastyp/SwSmartTagMgr.cxx
+++ b/sw/source/core/bastyp/SwSmartTagMgr.cxx
@@ -28,11 +28,10 @@
 
 #include "SwSmartTagMgr.hxx"
 
+#include <docsh.hxx>
 #include <osl/mutex.hxx>
-#include <vcl/svapp.hxx>
 #include <swmodule.hxx>
-
-#include <docsh.hxx>
+#include <vcl/svapp.hxx>
 
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
diff --git a/sw/source/core/bastyp/bparr.cxx b/sw/source/core/bastyp/bparr.cxx
index 015a0d7..72d066e 100644
--- a/sw/source/core/bastyp/bparr.cxx
+++ b/sw/source/core/bastyp/bparr.cxx
@@ -26,10 +26,11 @@
  *
  ************************************************************************/
 
-#include <string.h>
-#include <limits.h>
 #include "bparr.hxx"
 
+#include <limits.h>
+#include <string.h>
+
 /** Resize block management by this constant.
     As a result there are approx. 20 * MAXENTRY == 20000 entries available */
 const sal_uInt16 nBlockGrowSize = 20;
diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx
index 1e4d398..805b342 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -27,15 +27,15 @@
  ************************************************************************/
 
 #include "breakit.hxx"
-#include <unicode/uchar.h>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include "swtypes.hxx"
+
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
-#include <unotools/localedatawrapper.hxx>
-
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <editeng/unolingu.hxx>
 #include <editeng/scripttypeitem.hxx>
-#include "swtypes.hxx"
+#include <unicode/uchar.h>
+#include <unotools/localedatawrapper.hxx>
 
 using namespace com::sun::star;
 
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index a4676ec..47a6f78 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -26,38 +26,39 @@
  *
  ************************************************************************/
 
-#include <cctype>
 #if defined(MACOSX)
 #include <stdlib.h>
 #endif
-#include <cstdlib>
-#include <climits>
+
+#include <calc.hxx>
+#include <cctype>
 #include <cfloat>
-#include <hintids.hxx>
-#include <osl/diagnose.hxx>
-#include <rtl/math.hxx>
-#include <editeng/langitem.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <climits>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
-#include <unotools/localedatawrapper.hxx>
-#include <unotools/charclass.hxx>
-#include <editeng/unolingu.hxx>
-#include <editeng/scripttypeitem.hxx>
-#include <unotools/useroptions.hxx>
-#include <svl/zforlist.hxx>
-#include <swmodule.hxx>
-#include <doc.hxx>
-#include <viewsh.hxx>
-#include <docstat.hxx>
-#include <calc.hxx>
-#include <shellres.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <cstdlib>
 #include <dbfld.hxx>
-#include <expfld.hxx>
-#include <usrfld.hxx>
 #include <dbmgr.hxx>
 #include <docfld.hxx>
+#include <docstat.hxx>
+#include <doc.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/scripttypeitem.hxx>
+#include <editeng/unolingu.hxx>
+#include <expfld.hxx>
+#include <hintids.hxx>
+#include <osl/diagnose.hxx>
+#include <rtl/math.hxx>
+#include <shellres.hxx>
+#include <svl/zforlist.hxx>
+#include <swmodule.hxx>
 #include <swtypes.hxx>
+#include <unotools/charclass.hxx>
+#include <unotools/localedatawrapper.hxx>
+#include <unotools/useroptions.hxx>
+#include <usrfld.hxx>
+#include <viewsh.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/bastyp/checkit.cxx b/sw/source/core/bastyp/checkit.cxx
index 93ac454..8d1881e 100644
--- a/sw/source/core/bastyp/checkit.cxx
+++ b/sw/source/core/bastyp/checkit.cxx
@@ -26,9 +26,9 @@
  *
  ************************************************************************/
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <comphelper/processfactory.hxx>
 #include <checkit.hxx>
+#include <comphelper/processfactory.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index 787d421..c9339dd 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -26,13 +26,13 @@
  *
  ************************************************************************/
 
+#include "index.hxx"
+
 #include <assert.h>
 #include <stdlib.h>
 #include <tools/solar.h>
 #include <tools/string.hxx>
 
-#include "index.hxx"
-
 TYPEINIT0(SwIndexReg);
 
 // -------
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 1bfd194..71a5a89 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -26,115 +26,112 @@
  *
  ************************************************************************/
 
-#include <hintids.hxx>
-#include <tools/globname.hxx>
-#include <vcl/mapmod.hxx>
-#include <editeng/xmlcnitm.hxx>
-#include <svl/macitem.hxx>
-#include <editeng/pbinitem.hxx>
+#include <acmplwrd.hxx>
+#include <boost/scoped_ptr.hpp>
+#include <breakit.hxx>
+#include <cellatr.hxx>
+#include <checkit.hxx>
+#include <cmdid.h>
+#include <comphelper/processfactory.hxx>
+#include <com/sun/star/i18n/CollatorOptions.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <doc.hxx>
+#include <editeng/acorrcfg.hxx>
+#include <editeng/akrnitem.hxx>
+#include <editeng/blnkitem.hxx>
+#include <editeng/brkitem.hxx>
+#include <editeng/charhiddenitem.hxx>
+#include <editeng/charreliefitem.hxx>
+#include <editeng/charrotateitem.hxx>
+#include <editeng/charscaleitem.hxx>
+#include <editeng/cmapitem.hxx>
+#include <editeng/cscoitem.hxx>
+#include <editeng/emphitem.hxx>
+#include <editeng/escpitem.hxx>
+#include <editeng/forbiddenruleitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <editeng/hngpnctitem.hxx>
+#include <editeng/hyznitem.hxx>
 #include <editeng/keepitem.hxx>
+#include <editeng/kernitem.hxx>
+#include <editeng/langitem.hxx>
+#include <editeng/lrspitem.hxx>
+#include <editeng/lspcitem.hxx>
+#include <editeng/nhypitem.hxx>
 #include <editeng/nlbkitem.hxx>
-#include <editeng/hyznitem.hxx>
+#include <editeng/opaqitem.hxx>
+#include <editeng/orphitem.hxx>
+#include <editeng/paravertalignitem.hxx>
+#include <editeng/pbinitem.hxx>
+#include <editeng/pgrditem.hxx>
+#include <editeng/prntitem.hxx>
 #include <editeng/protitem.hxx>
-#include <editeng/ulspitem.hxx>
 #include <editeng/prszitem.hxx>
-#include <editeng/opaqitem.hxx>
+#include <editeng/rsiditem.hxx>
+#include <editeng/scriptspaceitem.hxx>
 #include <editeng/shaditem.hxx>
-#include <editeng/prntitem.hxx>
-#include <editeng/brkitem.hxx>
-#include <editeng/tstpitem.hxx>
-#include <editeng/langitem.hxx>
-#include <editeng/wrlmitem.hxx>
-#include <editeng/kernitem.hxx>
-#include <editeng/escpitem.hxx>
-#include <editeng/cscoitem.hxx>
-#include <editeng/lrspitem.hxx>
-#include <editeng/orphitem.hxx>
-#include <editeng/widwitem.hxx>
-#include <editeng/nhypitem.hxx>
 #include <editeng/spltitem.hxx>
-#include <editeng/lspcitem.hxx>
-#include <editeng/blnkitem.hxx>
-#include <editeng/akrnitem.hxx>
-#include <editeng/emphitem.hxx>
-#include <editeng/twolinesitem.hxx>
-#include <editeng/scriptspaceitem.hxx>
-#include <editeng/hngpnctitem.hxx>
-#include <editeng/cmapitem.hxx>
-#include <editeng/charscaleitem.hxx>
-#include <editeng/charrotateitem.hxx>
-#include <editeng/charreliefitem.hxx>
-#include <editeng/frmdiritem.hxx>
-#include <svx/dialogs.hrc>
-#include <editeng/swafopt.hxx>
 #include <editeng/svxacorr.hxx>
-#include <unotools/charclass.hxx>
+#include <editeng/swafopt.hxx>
+#include <editeng/tstpitem.hxx>
+#include <editeng/twolinesitem.hxx>
+#include <editeng/ulspitem.hxx>
 #include <editeng/unolingu.hxx>
-#include <editeng/forbiddenruleitem.hxx>
-#include <editeng/paravertalignitem.hxx>
-#include <editeng/pgrditem.hxx>
-#include <editeng/charhiddenitem.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <comphelper/processfactory.hxx>
-#include <unotools/collatorwrapper.hxx>
-#include <unotools/syslocale.hxx>
-#include <com/sun/star/i18n/CollatorOptions.hpp>
-#include <unotools/transliterationwrapper.hxx>
-#include <editeng/acorrcfg.hxx>
-#include <vcl/svapp.hxx>
+#include <editeng/widwitem.hxx>
+#include <editeng/wrlmitem.hxx>
+#include <editeng/xmlcnitm.hxx>
+#include <editsh.hxx>
+#include <fchrfmt.hxx>
 #include <fmtanchr.hxx>
-#include <fmtornt.hxx>
-#include <fmtsrnd.hxx>
-#include <fmtfsize.hxx>
-#include <fmtfld.hxx>
-#include <fmtrfmrk.hxx>
-#include <fmtlsplt.hxx>
-#include <fmtrowsplt.hxx>
-#include <fmteiro.hxx>
+#include <fmtautofmt.hxx>
+#include <fmtclbl.hxx>
 #include <fmtclds.hxx>
-#include <fmturl.hxx>
+#include <fmtcnct.hxx>
 #include <fmtcntnt.hxx>
-#include <fmthdft.hxx>
-#include <fmtpdsc.hxx>
-#include <fmtftn.hxx>
-#include <fmtfordr.hxx>
+#include <fmteiro.hxx>
 #include <fmtflcnt.hxx>
-#include <fchrfmt.hxx>
+#include <fmtfld.hxx>
+#include <fmtfollowtextflow.hxx>
+#include <fmtfordr.hxx>
+#include <fmtfsize.hxx>
+#include <fmtftn.hxx>
+#include <fmtftntx.hxx>
+#include <fmthdft.hxx>
 #include <fmtinfmt.hxx>
-#include <fmtcnct.hxx>
 #include <fmtline.hxx>
-#include <fmtftntx.hxx>
+#include <fmtlsplt.hxx>
+#include <fmtmeta.hxx>
+#include <fmtornt.hxx>
+#include <fmtpdsc.hxx>
+#include <fmtrfmrk.hxx>
+#include <fmtrowsplt.hxx>
 #include <fmtruby.hxx>
-#include <fmtautofmt.hxx>
-#include <tgrditem.hxx>
+#include <fmtsrnd.hxx>
+#include <fmturl.hxx>
+#include <fmtwrapinfluenceonobjpos.hxx>
+#include <fntcache.hxx>
+#include <grfatr.hxx>
 #include <hfspacingitem.hxx>
-#include <editsh.hxx>
-#include <pam.hxx>
+#include <hintids.hxx>
 #include <init.hxx>
+#include <pam.hxx>
 #include <paratr.hxx>
-#include <grfatr.hxx>
-#include <tox.hxx>
-#include <cellatr.hxx>
-#include <tblafmt.hxx>
-#include <viscrs.hxx>
-#include <fntcache.hxx>
-#include <doc.hxx>
-#include <acmplwrd.hxx>
-#include <fmtclbl.hxx>
-#include <cmdid.h>
-#include <breakit.hxx>
-#include <checkit.hxx>
+#include <rtl/instance.hxx>
+#include <svl/macitem.hxx>
+#include <svx/dialogs.hrc>
 #include <swcalwrp.hxx>
 #include <SwStyleNameMapper.hxx>
-
-#include <fmtfollowtextflow.hxx>
-#include <fmtwrapinfluenceonobjpos.hxx>
-#include <editeng/rsiditem.hxx>
-
-#include <fmtmeta.hxx>
-
-#include <rtl/instance.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <tblafmt.hxx>
+#include <tgrditem.hxx>
+#include <tools/globname.hxx>
+#include <tox.hxx>
+#include <unotools/charclass.hxx>
+#include <unotools/collatorwrapper.hxx>
+#include <unotools/syslocale.hxx>
+#include <unotools/transliterationwrapper.hxx>
+#include <vcl/mapmod.hxx>
+#include <vcl/svapp.hxx>
+#include <viscrs.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx
index ab1854b..b94892d 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -26,8 +26,8 @@
  *
  ************************************************************************/
 
-#include <swcache.hxx>
 #include <rtl/strbuf.hxx>
+#include <swcache.hxx>
 
 #ifdef DBG_UTIL
 void SwCache::Check()
diff --git a/sw/source/core/bastyp/swrect.cxx b/sw/source/core/bastyp/swrect.cxx
index 12af59d..e49c31c 100644
--- a/sw/source/core/bastyp/swrect.cxx
+++ b/sw/source/core/bastyp/swrect.cxx
@@ -26,14 +26,14 @@
  *
  ************************************************************************/
 
+#include "swrect.hxx"
 
 #ifdef DBG_UTIL
 #include <tools/stream.hxx>
 #endif
-#include <stdlib.h>
-#include "swrect.hxx"
-#include <math.h>
 
+#include <math.h>
+#include <stdlib.h>
 
 SwRect::SwRect( const Rectangle &rRect ) :
     m_Point( rRect.Left(), rRect.Top() )
diff --git a/sw/source/core/bastyp/swregion.cxx b/sw/source/core/bastyp/swregion.cxx
index dc4069e..06206b8 100644
--- a/sw/source/core/bastyp/swregion.cxx
+++ b/sw/source/core/bastyp/swregion.cxx
@@ -26,9 +26,9 @@
  *
  ************************************************************************/
 
-#include "swtypes.hxx"
 #include "swrect.hxx"
 #include "swregion.hxx"
+#include "swtypes.hxx"
 
 SV_IMPL_VARARR( SwRects, SwRect );
 
diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx
index 90bf033..c0d8608 100644
--- a/sw/source/core/bastyp/swtypes.cxx
+++ b/sw/source/core/bastyp/swtypes.cxx
@@ -28,30 +28,31 @@
 
 #include "swtypes.hxx"
 #include "tools/string.hxx"
-#include <vcl/svapp.hxx>
-#include <vcl/window.hxx>
-#include <vcl/graph.hxx>
+
+#include <bodyfrm.hxx>
+#include <cellfrm.hxx>
+#include <colfrm.hxx>
 #include <editeng/unolingu.hxx>
-#include <pagefrm.hxx>
-#include <swatrset.hxx>
+#include <fntcache.hxx>
 #include <frmfmt.hxx>
 #include <frmtool.hxx>
+#include <hffrm.hxx>
 #include <ndtxt.hxx>
-#include <UndoDelete.hxx>
-#include <UndoInsert.hxx>
-#include <swtable.hxx>
-#include <viscrs.hxx>
-#include <fntcache.hxx>
+#include <pagefrm.hxx>
+#include <rowfrm.hxx>
+#include <sectfrm.hxx>
+#include <swatrset.hxx>
 #include <swfntcch.hxx>
-#include <hffrm.hxx>
-#include <colfrm.hxx>
-#include <bodyfrm.hxx>
+#include <swtable.hxx>
+#include <swtblfmt.hxx>
 #include <tabfrm.hxx>
 #include <txtfrm.hxx>
-#include <swtblfmt.hxx>
-#include <rowfrm.hxx>
-#include <cellfrm.hxx>
-#include <sectfrm.hxx>
+#include <UndoDelete.hxx>
+#include <UndoInsert.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
+#include <vcl/graph.hxx>
+#include <viscrs.hxx>
 
 using namespace com::sun::star;
 
diff --git a/sw/source/core/bastyp/tabcol.cxx b/sw/source/core/bastyp/tabcol.cxx
index 2042de0..2c93453 100644
--- a/sw/source/core/bastyp/tabcol.cxx
+++ b/sw/source/core/bastyp/tabcol.cxx
@@ -26,10 +26,10 @@
  *
  ************************************************************************/
 
-#include <osl/diagnose.h>
 #include "tabcol.hxx"
 
 #include <limits.h>
+#include <osl/diagnose.h>
 
 SwTabCols::SwTabCols( sal_uInt16 nSize ) :
     nLeftMin( 0 ),

More information about the Libreoffice-commits mailing list