commit 2bac61013e57013bccac8c9d76482b34b5db7f69
author Thomas Arnhold <thomas@arnhold.org> Sat May 10 18:19:39 2014 +0200
committer Thomas Arnhold <thomas@arnhold.org> Sun May 11 01:55:39 2014 +0200
tree 4a4cdae419248459eae6c276152b2864138980dd
parent 2ce779cd0cc750a0e2f6a10ae7f2cb0e6fbcdab5

fix-includes.pl: sc

Change-Id: Iade3fedac5d2f8e978b7dd9c30f001d7d1564946

sc/inc/AccessibleFilterMenu.hxx

diff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxx
index a78fa20..65da10f 100644
--- a/sc/inc/AccessibleFilterMenu.hxx
+++ b/sc/inc/AccessibleFilterMenu.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SC_INC_ACCESSIBLEFILTERMENU_HXX

#include "AccessibleContextBase.hxx"
#include "cppuhelper/implbase1.hxx"
#include <cppuhelper/implbase1.hxx>

#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include <com/sun/star/accessibility/XAccessibleText.hpp>

sc/inc/AccessibleFilterMenuItem.hxx

diff --git a/sc/inc/AccessibleFilterMenuItem.hxx b/sc/inc/AccessibleFilterMenuItem.hxx
index e01bdeca..b659b47 100644
--- a/sc/inc/AccessibleFilterMenuItem.hxx
+++ b/sc/inc/AccessibleFilterMenuItem.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SC_INC_ACCESSIBLEFILTERMENUITEM_HXX

#include "AccessibleContextBase.hxx"
#include "cppuhelper/implbase1.hxx"
#include <cppuhelper/implbase1.hxx>

#include <com/sun/star/accessibility/XAccessibleAction.hpp>

sc/inc/AccessibleFilterTopWindow.hxx

diff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxx
index 2303979..5983150 100644
--- a/sc/inc/AccessibleFilterTopWindow.hxx
+++ b/sc/inc/AccessibleFilterTopWindow.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SC_INC_ACCESSIBLEFILTERTOPWINDOW_HXX

#include "AccessibleFilterMenu.hxx"
#include "cppuhelper/implbase1.hxx"
#include <cppuhelper/implbase1.hxx>

class ScCheckListMenuWindow;

sc/inc/AccessibleGlobal.hxx

diff --git a/sc/inc/AccessibleGlobal.hxx b/sc/inc/AccessibleGlobal.hxx
index abcc263..0df34de4 100644
--- a/sc/inc/AccessibleGlobal.hxx
+++ b/sc/inc/AccessibleGlobal.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SC_INC_ACCESSIBLEGLOBAL_HXX

#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
#include "cppuhelper/implbase1.hxx"
#include <cppuhelper/implbase1.hxx>

#include <set>

sc/inc/address.hxx

diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index f856f3d..7fcdee1 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -26,7 +26,7 @@

#include <limits>
#include "scdllapi.h"
#include <types.hxx>
#include "types.hxx"
#include <formula/grammar.hxx>

#include <com/sun/star/uno/Sequence.hxx>

sc/inc/brdcst.hxx

diff --git a/sc/inc/brdcst.hxx b/sc/inc/brdcst.hxx
index 77cd7fe..39c0b86 100644
--- a/sc/inc/brdcst.hxx
+++ b/sc/inc/brdcst.hxx
@@ -21,7 +21,7 @@

#include "global.hxx"
#include "address.hxx"
#include <simplehintids.hxx>
#include "simplehintids.hxx"
#include <tools/rtti.hxx>
#include <svl/hint.hxx>

sc/inc/calcconfig.hxx

diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx
index df342f5..33d31c7 100644
--- a/sc/inc/calcconfig.hxx
+++ b/sc/inc/calcconfig.hxx
@@ -11,9 +11,9 @@
#define INCLUDED_SC_INC_CALCCONFIG_HXX

#include "scdllapi.h"
#include "formula/grammar.hxx"
#include <formula/grammar.hxx>

#include "rtl/ustring.hxx"
#include <rtl/ustring.hxx>

// have to match the registry values
enum ScRecalcOptions

sc/inc/cellform.hxx

diff --git a/sc/inc/cellform.hxx b/sc/inc/cellform.hxx
index dd82df64..9798dac 100644
--- a/sc/inc/cellform.hxx
+++ b/sc/inc/cellform.hxx
@@ -22,7 +22,7 @@

#include <tools/solar.h>
#include "scdllapi.h"
#include "rtl/ustring.hxx"
#include <rtl/ustring.hxx>

class SvNumberFormatter;
class Color;

sc/inc/cellvalues.hxx

diff --git a/sc/inc/cellvalues.hxx b/sc/inc/cellvalues.hxx
index 4263250..4f4c50f 100644
--- a/sc/inc/cellvalues.hxx
+++ b/sc/inc/cellvalues.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_SC_INC_CELLVALUES_HXX
#define INCLUDED_SC_INC_CELLVALUES_HXX

#include <address.hxx>
#include "address.hxx"

class ScColumn;

sc/inc/clipcontext.hxx

diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx
index e6e7597..7791a93 100644
--- a/sc/inc/clipcontext.hxx
+++ b/sc/inc/clipcontext.hxx
@@ -11,7 +11,7 @@
#define INCLUDED_SC_INC_CLIPCONTEXT_HXX

#include "address.hxx"
#include <cellvalue.hxx>
#include "cellvalue.hxx"

#include <vector>
#include <boost/unordered_map.hpp>

sc/inc/colorscale.hxx

diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 7d89c12..6639741 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -14,7 +14,7 @@
#include <boost/scoped_ptr.hpp>
#include <formula/grammar.hxx>
#include <tools/color.hxx>
#include <rangelst.hxx>
#include "rangelst.hxx"
#include "conditio.hxx"

#include <svl/listener.hxx>

sc/inc/column.hxx

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 526c8e3..0376d5a 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -26,7 +26,7 @@
#include "rangenam.hxx"
#include "types.hxx"
#include "mtvelements.hxx"
#include "formula/types.hxx"
#include <formula/types.hxx>

#include <set>
#include <vector>

sc/inc/compare.hxx

diff --git a/sc/inc/compare.hxx b/sc/inc/compare.hxx
index f072d57..5f99ef2 100644
--- a/sc/inc/compare.hxx
+++ b/sc/inc/compare.hxx
@@ -22,7 +22,7 @@

#include "queryentry.hxx"

#include "svl/sharedstring.hxx"
#include <svl/sharedstring.hxx>

class ScDocument;

sc/inc/compiler.hxx

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index b1fa059..8ea5c77 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -26,8 +26,8 @@
#include "scdllapi.h"
#include "global.hxx"
#include "refdata.hxx"
#include "formula/token.hxx"
#include "formula/grammar.hxx"
#include <formula/token.hxx>
#include <formula/grammar.hxx>
#include <unotools/charclass.hxx>
#include <rtl/ustrbuf.hxx>
#include <com/sun/star/sheet/ExternalLinkInfo.hpp>

sc/inc/conditio.hxx

diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 2ded893..730855a 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -22,7 +22,7 @@

#include "global.hxx"
#include "address.hxx"
#include "formula/grammar.hxx"
#include <formula/grammar.hxx>
#include "scdllapi.h"
#include "rangelst.hxx"

sc/inc/datauno.hxx

diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index 7f650f9..e3196ba 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -48,8 +48,8 @@
#include <cppuhelper/implbase4.hxx>
#include <cppuhelper/implbase5.hxx>
#include <cppuhelper/implbase6.hxx>
#include "svl/itemprop.hxx"
#include "svl/lstner.hxx"
#include <svl/itemprop.hxx>
#include <svl/lstner.hxx>
#include <boost/ptr_container/ptr_vector.hpp>

class ScDBData;

sc/inc/defaultsoptions.hxx

diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx
index c34e977..e87f616 100644
--- a/sc/inc/defaultsoptions.hxx
+++ b/sc/inc/defaultsoptions.hxx
@@ -12,7 +12,7 @@

#include <svl/poolitem.hxx>
#include <unotools/configitem.hxx>
#include "formula/grammar.hxx"
#include <formula/grammar.hxx>
#include "scdllapi.h"
#include "global.hxx"

sc/inc/docoptio.hxx

diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index 8d80279..9e06437 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.hxx
@@ -27,7 +27,7 @@
#include "scmod.hxx"
#include "optutil.hxx"

#include "formula/grammar.hxx"
#include <formula/grammar.hxx>

class SC_DLLPUBLIC ScDocOptions
{

sc/inc/document.hxx

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 3d8bcda..b251690 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -31,8 +31,8 @@
#include "tabopparams.hxx"
#include "sortparam.hxx"
#include "types.hxx"
#include "formula/grammar.hxx"
#include "formula/types.hxx"
#include <formula/grammar.hxx>
#include <formula/types.hxx>
#include <com/sun/star/chart2/XChartDocument.hpp>
#include "typedstrdata.hxx"
#include "compressedarray.hxx"

sc/inc/documentimport.hxx

diff --git a/sc/inc/documentimport.hxx b/sc/inc/documentimport.hxx
index 0b2450d..4b84f0d 100644
--- a/sc/inc/documentimport.hxx
+++ b/sc/inc/documentimport.hxx
@@ -13,7 +13,7 @@
#include "scdllapi.h"
#include "address.hxx"

#include "rtl/ustring.hxx"
#include <rtl/ustring.hxx>

#include <boost/noncopyable.hpp>

sc/inc/dpcache.hxx

diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index 6129ca4..4647227 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -22,7 +22,7 @@
#include "global.hxx"
#include "dpnumgroupinfo.hxx"
#include "calcmacros.hxx"
#include "tools/date.hxx"
#include <tools/date.hxx>

#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>

sc/inc/dpfilteredcache.hxx

diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx
index 64ba502..a740a92 100644
--- a/sc/inc/dpfilteredcache.hxx
+++ b/sc/inc/dpfilteredcache.hxx
@@ -20,8 +20,8 @@
#ifndef INCLUDED_SC_INC_DPFILTEREDCACHE_HXX
#define INCLUDED_SC_INC_DPFILTEREDCACHE_HXX

#include "sal/types.h"
#include "osl/mutex.hxx"
#include <sal/types.h>
#include <osl/mutex.hxx>
#include "global.hxx"
#include "dpitemdata.hxx"
#include "calcmacros.hxx"

sc/inc/dpitemdata.hxx

diff --git a/sc/inc/dpitemdata.hxx b/sc/inc/dpitemdata.hxx
index 6bb2502a8..5ab1b1a 100644
--- a/sc/inc/dpitemdata.hxx
+++ b/sc/inc/dpitemdata.hxx
@@ -13,8 +13,8 @@
#include "scdllapi.h"
#include "address.hxx"

#include "sal/types.h"
#include "rtl/ustring.hxx"
#include <sal/types.h>
#include <rtl/ustring.hxx>
#include "calcmacros.hxx"
#include "dpglobal.hxx"

sc/inc/dptabdat.hxx

diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx
index 9981d85..bde9dd1 100644
--- a/sc/inc/dptabdat.hxx
+++ b/sc/inc/dptabdat.hxx
@@ -26,7 +26,7 @@
#include "dpcache.hxx"
#include "calcmacros.hxx"

#include "svl/zforlist.hxx"
#include <svl/zforlist.hxx>

#include <vector>
#include <set>

sc/inc/dptabsrc.hxx

diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index aaea244..6d9d73e 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -44,7 +44,7 @@
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/implbase5.hxx>
#include <cppuhelper/implbase6.hxx>
#include "rtl/ref.hxx"
#include <rtl/ref.hxx>

#include "dptabdat.hxx"
#include "dpglobal.hxx"

sc/inc/dptypes.hxx

diff --git a/sc/inc/dptypes.hxx b/sc/inc/dptypes.hxx
index cb90511..7e272ff 100644
--- a/sc/inc/dptypes.hxx
+++ b/sc/inc/dptypes.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_SC_INC_DPTYPES_HXX
#define INCLUDED_SC_INC_DPTYPES_HXX

#include "rtl/ustring.hxx"
#include <rtl/ustring.hxx>

#include <boost/unordered_set.hpp>

sc/inc/dputil.hxx

diff --git a/sc/inc/dputil.hxx b/sc/inc/dputil.hxx
index 6381dd4..002389e 100644
--- a/sc/inc/dputil.hxx
+++ b/sc/inc/dputil.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_SC_INC_DPUTIL_HXX
#define INCLUDED_SC_INC_DPUTIL_HXX

#include "rtl/ustring.hxx"
#include <rtl/ustring.hxx>
#include "scdllapi.h"
#include "global.hxx"

sc/inc/dragdata.hxx

diff --git a/sc/inc/dragdata.hxx b/sc/inc/dragdata.hxx
index 7f98a05..77f23c8 100644
--- a/sc/inc/dragdata.hxx
+++ b/sc/inc/dragdata.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_SC_INC_DRAGDATA_HXX
#define INCLUDED_SC_INC_DRAGDATA_HXX

#include "rtl/ustring.hxx"
#include <rtl/ustring.hxx>

class ScTransferObj;
class ScDrawTransferObj;

sc/inc/editdataarray.hxx

diff --git a/sc/inc/editdataarray.hxx b/sc/inc/editdataarray.hxx
index 21ecb8d..4eb57b9 100644
--- a/sc/inc/editdataarray.hxx
+++ b/sc/inc/editdataarray.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SC_INC_EDITDATAARRAY_HXX

#include "address.hxx"
#include "editeng/editobj.hxx"
#include <editeng/editobj.hxx>

#include <vector>
#include <boost/shared_ptr.hpp>

sc/inc/externalrefmgr.hxx

diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 10e87a9..00b968d 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -22,17 +22,17 @@

#include "global.hxx"
#include "address.hxx"
#include "sfx2/objsh.hxx"
#include "sfx2/lnkbase.hxx"
#include "sfx2/event.hxx"
#include "tools/time.hxx"
#include "vcl/timer.hxx"
#include "svl/zforlist.hxx"
#include "svl/lstner.hxx"
#include <sfx2/objsh.hxx>
#include <sfx2/lnkbase.hxx>
#include <sfx2/event.hxx>
#include <tools/time.hxx>
#include <vcl/timer.hxx>
#include <svl/zforlist.hxx>
#include <svl/lstner.hxx>
#include "types.hxx"
#include "rangelst.hxx"
#include "formula/token.hxx"
#include "osl/mutex.hxx"
#include <formula/token.hxx>
#include <osl/mutex.hxx>

#include <boost/unordered_map.hpp>
#include <boost/unordered_set.hpp>

sc/inc/formulagroup.hxx

diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
index de10a46..a063cdf 100644
--- a/sc/inc/formulagroup.hxx
+++ b/sc/inc/formulagroup.hxx
@@ -13,9 +13,9 @@
#include "address.hxx"
#include "types.hxx"
#include "platforminfo.hxx"
#include <stlalgorithm.hxx>
#include "stlalgorithm.hxx"

#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>

#include <vector>
#include <boost/noncopyable.hpp>

sc/inc/formulaopt.hxx

diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx
index 4e195ab..906804e 100644
--- a/sc/inc/formulaopt.hxx
+++ b/sc/inc/formulaopt.hxx
@@ -14,7 +14,7 @@
#include <svl/poolitem.hxx>
#include <unotools/configitem.hxx>
#include <unotools/localedatawrapper.hxx>
#include "formula/grammar.hxx"
#include <formula/grammar.hxx>
#include "scdllapi.h"
#include "global.hxx"
#include "calcconfig.hxx"

sc/inc/helpids.h

diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index b5303e2..2646504 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -17,8 +17,8 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

#include "sfx2/sfxcommands.h"
#include "svx/svxcommands.h"
#include <sfx2/sfxcommands.h>
#include <svx/svxcommands.h>
#include "sccommands.h"

#define HID_INSWIN_POS                                          "SC_HID_INSWIN_POS"

sc/inc/importfilterdata.hxx

diff --git a/sc/inc/importfilterdata.hxx b/sc/inc/importfilterdata.hxx
index 9144f9d..089f427 100644
--- a/sc/inc/importfilterdata.hxx
+++ b/sc/inc/importfilterdata.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_SC_INC_IMPORTFILTERDATA_HXX
#define INCLUDED_SC_INC_IMPORTFILTERDATA_HXX

#include <address.hxx>
#include "address.hxx"

#include <boost/noncopyable.hpp>
#include <boost/scoped_ptr.hpp>

sc/inc/lookupcache.hxx

diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx
index 88f5f0b..411ae6c 100644
--- a/sc/inc/lookupcache.hxx
+++ b/sc/inc/lookupcache.hxx
@@ -22,7 +22,7 @@

#include "address.hxx"
#include "global.hxx"
#include "formula/token.hxx"
#include <formula/token.hxx>
#include <svl/listener.hxx>

#include <boost/unordered_map.hpp>

sc/inc/macromgr.hxx

diff --git a/sc/inc/macromgr.hxx b/sc/inc/macromgr.hxx
index 2c7c30e..ecbf08f 100644
--- a/sc/inc/macromgr.hxx
+++ b/sc/inc/macromgr.hxx
@@ -12,7 +12,7 @@

#include <com/sun/star/container/XContainerListener.hpp>

#include "rtl/ustring.hxx"
#include <rtl/ustring.hxx>
#include "scdllapi.h"

#include <boost/unordered_map.hpp>

sc/inc/mtvelements.hxx

diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
index 836e6dd..b09f70d 100644
--- a/sc/inc/mtvelements.hxx
+++ b/sc/inc/mtvelements.hxx
@@ -12,12 +12,12 @@

#include "address.hxx"
#include "formulacell.hxx"
#include "svl/broadcast.hxx"
#include "svl/sharedstring.hxx"
#include "editeng/editobj.hxx"
#include <svl/broadcast.hxx>
#include <svl/sharedstring.hxx>
#include <editeng/editobj.hxx>
#include "calcmacros.hxx"
#include "postit.hxx"
#include "osl/mutex.hxx"
#include <osl/mutex.hxx>

#if DEBUG_COLUMN_STORAGE
#ifdef NDEBUG

sc/inc/nameuno.hxx

diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index a92f894..1c76955 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -22,7 +22,7 @@

#include <svl/lstner.hxx>
#include "address.hxx"
#include "formula/grammar.hxx"
#include <formula/grammar.hxx>
#include <com/sun/star/sheet/XLabelRange.hpp>
#include <com/sun/star/sheet/XLabelRanges.hpp>
#include <com/sun/star/sheet/XCellRangeReferrer.hpp>

sc/inc/orcusfilters.hxx

diff --git a/sc/inc/orcusfilters.hxx b/sc/inc/orcusfilters.hxx
index 79aec8b..2df40a6 100644
--- a/sc/inc/orcusfilters.hxx
+++ b/sc/inc/orcusfilters.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_SC_INC_ORCUSFILTERS_HXX
#define INCLUDED_SC_INC_ORCUSFILTERS_HXX

#include "rtl/ustring.hxx"
#include <rtl/ustring.hxx>

class ScDocument;
class SvTreeListBox;

sc/inc/orcusxml.hxx

diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx
index 6ff9190..cc41f3b 100644
--- a/sc/inc/orcusxml.hxx
+++ b/sc/inc/orcusxml.hxx
@@ -12,7 +12,7 @@

#include "scdllapi.h"
#include "address.hxx"
#include "vcl/image.hxx"
#include <vcl/image.hxx>

#include <vector>
#include <boost/ptr_container/ptr_vector.hpp>

sc/inc/pch/precompiled_sc.hxx

diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 8e32152..fec0622 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -14,104 +14,7 @@
 also fixes all possible problems, so it's usually better to use it).
*/

#include "basegfx/matrix/b2dhommatrix.hxx"
#include "basegfx/polygon/b2dpolygon.hxx"
#include "basegfx/polygon/b2dpolygontools.hxx"
#include "basegfx/range/b2drange.hxx"
#include "basic/basmgr.hxx"
#include "comphelper/processfactory.hxx"
#include "comphelper/string.hxx"
#include "cppuhelper/implbase1.hxx"
#include "drawinglayer/primitive2d/baseprimitive2d.hxx"
#include "drawinglayer/primitive2d/polypolygonprimitive2d.hxx"
#include "editeng/autokernitem.hxx"
#include "editeng/charreliefitem.hxx"
#include "editeng/charscaleitem.hxx"
#include "editeng/colritem.hxx"
#include "editeng/contouritem.hxx"
#include "editeng/crossedoutitem.hxx"
#include "editeng/editdata.hxx"
#include "editeng/editobj.hxx"
#include "editeng/editstat.hxx"
#include "editeng/eeitem.hxx"
#include "editeng/emphasismarkitem.hxx"
#include "editeng/escapementitem.hxx"
#include "editeng/fhgtitem.hxx"
#include "editeng/fieldupdater.hxx"
#include "editeng/flditem.hxx"
#include "editeng/fontitem.hxx"
#include "editeng/kernitem.hxx"
#include "editeng/langitem.hxx"
#include "editeng/misspellrange.hxx"
#include "editeng/outliner.hxx"
#include "editeng/postitem.hxx"
#include "editeng/section.hxx"
#include "editeng/shdditem.hxx"
#include "editeng/udlnitem.hxx"
#include "editeng/unoedsrc.hxx"
#include "editeng/unolingu.hxx"
#include "editeng/wghtitem.hxx"
#include "editeng/wrlmitem.hxx"
#include "editeng/xmlcnitm.hxx"
#include "formula/FormulaCompiler.hxx"
#include "formula/errorcodes.hxx"
#include "formula/grammar.hxx"
#include "formula/opcode.hxx"
#include "formula/token.hxx"
#include "formula/vectortoken.hxx"
#include "i18nlangtag/lang.h"
#include "i18nlangtag/mslangid.hxx"
#include "libxml/xpath.h"
#include "rtl/bootstrap.hxx"
#include "rtl/math.hxx"
#include "rtl/strbuf.hxx"
#include "rtl/ustring.hxx"
#include "sal/types.h"
#include "sfx2/app.hxx"
#include "sfx2/docfile.hxx"
#include "sfx2/docfilt.hxx"
#include "sfx2/fcontnr.hxx"
#include "sfx2/linkmgr.hxx"
#include "sfx2/objsh.hxx"
#include "svl/PasswordHelper.hxx"
#include "svl/broadcast.hxx"
#include "svl/intitem.hxx"
#include "svl/itemset.hxx"
#include "svl/sharedstring.hxx"
#include "svl/sharedstringpool.hxx"
#include "svl/smplhint.hxx"
#include "svl/stritem.hxx"
#include "svl/urihelper.hxx"
#include "svl/zforlist.hxx"
#include "svl/zformat.hxx"
#include "svtools/fmtfield.hxx"
#include "svtools/svlbitm.hxx"
#include "svtools/treelistbox.hxx"
#include "svtools/treelistentry.hxx"
#include "svtools/viewdataentry.hxx"
#include "svx/dataaccessdescriptor.hxx"
#include "svx/sdr/overlay/overlaymanager.hxx"
#include "svx/unoapi.hxx"
#include "tools/color.hxx"
#include "tools/fract.hxx"
#include "tools/gen.hxx"
#include "tools/urlobj.hxx"
#include "unotools/calendarwrapper.hxx"
#include "unotools/collatorwrapper.hxx"
#include "unotools/localedatawrapper.hxx"
#include "unotools/localfilehelper.hxx"
#include "unotools/pathoptions.hxx"
#include "unotools/textsearch.hxx"
#include "unotools/ucbhelper.hxx"
#include "vcl/lineinfo.hxx"
#include "vcl/msgbox.hxx"
#include "vcl/outdev.hxx"
#include "vcl/svapp.hxx"
#include "vcl/unohelp.hxx"
#include "vcl/waitobj.hxx"
#include "xmloff/nmspmap.hxx"
#include "xmloff/prstylei.hxx"
#include "xmloff/xmlnmspe.hxx"
#include <algorithm>
#include <avmedia/mediaitem.hxx>
#include <avmedia/mediaplayer.hxx>
@@ -121,6 +24,7 @@
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/range/b2drange.hxx>
#include <basegfx/tools/zoomtools.hxx>
#include <basic/basmgr.hxx>
#include <basic/sbmeth.hxx>
@@ -526,6 +430,7 @@
#include <cppuhelper/bootstrap.hxx>
#include <cppuhelper/component_context.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cstddef>
@@ -534,6 +439,8 @@
#include <cstring>
#include <ctype.h>
#include <drawinglayer/geometry/viewinformation2d.hxx>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
#include <drawinglayer/processor2d/baseprocessor2d.hxx>
#include <drawinglayer/processor2d/processorfromoutputdevice.hxx>
#include <editeng/acorrcfg.hxx>
@@ -543,6 +450,7 @@
#include <editeng/boxitem.hxx>
#include <editeng/brushitem.hxx>
#include <editeng/charreliefitem.hxx>
#include <editeng/charscaleitem.hxx>
#include <editeng/colritem.hxx>
#include <editeng/contouritem.hxx>
#include <editeng/crossedoutitem.hxx>
@@ -555,6 +463,7 @@
#include <editeng/emphasismarkitem.hxx>
#include <editeng/escapementitem.hxx>
#include <editeng/fhgtitem.hxx>
#include <editeng/fieldupdater.hxx>
#include <editeng/flditem.hxx>
#include <editeng/flstitem.hxx>
#include <editeng/fontitem.hxx>
@@ -571,6 +480,7 @@
#include <editeng/lineitem.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/lspcitem.hxx>
#include <editeng/misspellrange.hxx>
#include <editeng/numitem.hxx>
#include <editeng/orphitem.hxx>
#include <editeng/outliner.hxx>
@@ -580,6 +490,7 @@
#include <editeng/postitem.hxx>
#include <editeng/scriptspaceitem.hxx>
#include <editeng/scripttypeitem.hxx>
#include <editeng/section.hxx>
#include <editeng/shaditem.hxx>
#include <editeng/shdditem.hxx>
#include <editeng/sizeitem.hxx>
@@ -590,6 +501,7 @@
#include <editeng/udlnitem.hxx>
#include <editeng/ulspitem.hxx>
#include <editeng/unoedhlp.hxx>
#include <editeng/unoedsrc.hxx>
#include <editeng/unofield.hxx>
#include <editeng/unofored.hxx>
#include <editeng/unoipset.hxx>
@@ -603,10 +515,12 @@
#include <editeng/wrlmitem.hxx>
#include <editeng/xmlcnitm.hxx>
#include <float.h>
#include <formula/FormulaCompiler.hxx>
#include <formula/IFunctionDescription.hxx>
#include <formula/errorcodes.hxx>
#include <formula/formulahelper.hxx>
#include <formula/grammar.hxx>
#include <formula/opcode.hxx>
#include <formula/token.hxx>
#include <formula/vectortoken.hxx>
#include <functional>
@@ -638,6 +552,7 @@
#include <osl/time.h>
#include <queue>
#include <rsc/rscsfx.hxx>
#include <rtl/bootstrap.hxx>
#include <rtl/crc.h>
#include <rtl/instance.hxx>
#include <rtl/math.hxx>
@@ -739,6 +654,7 @@
#include <svl/ptitem.hxx>
#include <svl/rectitem.hxx>
#include <svl/sharecontrolfile.hxx>
#include <svl/sharedstring.hxx>
#include <svl/sharedstringpool.hxx>
#include <svl/slstitm.hxx>
#include <svl/smplhint.hxx>
@@ -758,6 +674,7 @@
#include <svtools/ehdl.hxx>
#include <svtools/embedhlp.hxx>
#include <svtools/embedtransfer.hxx>
#include <svtools/fmtfield.hxx>
#include <svtools/imapobj.hxx>
#include <svtools/inettbc.hxx>
#include <svtools/insdlg.hxx>
@@ -775,6 +692,7 @@
#include <svtools/treelistentry.hxx>
#include <svtools/unoevent.hxx>
#include <svtools/unoimap.hxx>
#include <svtools/viewdataentry.hxx>
#include <svtools/xwindowitem.hxx>
#include <svx/AccessibleControlShape.hxx>
#include <svx/AccessibleShape.hxx>
@@ -947,10 +865,12 @@
#include <toolkit/awt/vclxdevice.hxx>
#include <toolkit/helper/convert.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/color.hxx>
#include <tools/date.hxx>
#include <tools/datetime.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <tools/fract.hxx>
#include <tools/gen.hxx>
#include <tools/globname.hxx>
#include <tools/mempool.hxx>
@@ -991,6 +911,7 @@
#include <unotools/tempfile.hxx>
#include <unotools/textsearch.hxx>
#include <unotools/transliterationwrapper.hxx>
#include <unotools/ucbhelper.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <unotools/useroptions.hxx>
#include <utility>
@@ -1043,6 +964,7 @@
#include <xmloff/i18nmap.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/numehelp.hxx>
#include <xmloff/prstylei.hxx>
#include <xmloff/txtparae.hxx>
#include <xmloff/txtprmap.hxx>
#include <xmloff/xmlaustp.hxx>
@@ -1059,5 +981,4 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmltypes.hxx>
#include <xmloff/xmluconv.hxx>

/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sc/inc/pch/precompiled_scfilt.hxx

diff --git a/sc/inc/pch/precompiled_scfilt.hxx b/sc/inc/pch/precompiled_scfilt.hxx
index aaad32c..08f8d64 100644
--- a/sc/inc/pch/precompiled_scfilt.hxx
+++ b/sc/inc/pch/precompiled_scfilt.hxx
@@ -14,54 +14,7 @@
 also fixes all possible problems, so it's usually better to use it).
*/

#include "cppuhelper/factory.hxx"
#include "cppuhelper/implementationentry.hxx"
#include "editeng/editstat.hxx"
#include "formula/errorcodes.hxx"
#include "officecfg/Office/Common.hxx"
#include "oox/core/filterbase.hxx"
#include "oox/core/relations.hxx"
#include "oox/core/xmlfilterbase.hxx"
#include "oox/drawingml/chart/datasourcemodel.hxx"
#include "oox/drawingml/connectorshapecontext.hxx"
#include "oox/drawingml/fillproperties.hxx"
#include "oox/drawingml/graphicshapecontext.hxx"
#include "oox/drawingml/lineproperties.hxx"
#include "oox/drawingml/shapepropertymap.hxx"
#include "oox/drawingml/theme.hxx"
#include "oox/drawingml/themefragmenthandler.hxx"
#include "oox/helper/attributelist.hxx"
#include "oox/helper/binaryinputstream.hxx"
#include "oox/helper/binaryoutputstream.hxx"
#include "oox/helper/containerhelper.hxx"
#include "oox/helper/graphichelper.hxx"
#include "oox/helper/helper.hxx"
#include "oox/helper/progressbar.hxx"
#include "oox/helper/propertymap.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/ole/olestorage.hxx"
#include "oox/ole/vbaproject.hxx"
#include "oox/token/properties.hxx"
#include "oox/token/tokens.hxx"
#include "oox/vml/vmlshape.hxx"
#include "oox/vml/vmlshapecontainer.hxx"
#include "rtl/strbuf.hxx"
#include "sal/config.h"
#include "sal/types.h"
#include "svl/poolcach.hxx"
#include "svl/sharedstring.hxx"
#include "svl/sharedstringpool.hxx"
#include "svx/algitem.hxx"
#include "svx/sdr/properties/properties.hxx"
#include "svx/sdtaitm.hxx"
#include "svx/sxmspitm.hxx"
#include "svx/unoapi.hxx"
#include "svx/xflclit.hxx"
#include "svx/xlnstit.hxx"
#include "svx/xlnstwit.hxx"
#include "tools/urlobj.hxx"
#include "vcl/mapmod.hxx"
#include "vcl/msgbox.hxx"
#include <algorithm>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
@@ -341,7 +294,9 @@
#include <comphelper/types.hxx>
#include <config_orcus.h>
#include <cppuhelper/component_context.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cstring>
#include <ctype.h>
@@ -388,6 +343,7 @@
#include <filter/msfilter/msvbahelper.hxx>
#include <filter/msfilter/svxmsbas.hxx>
#include <filter/msfilter/util.hxx>
#include <formula/errorcodes.hxx>
#include <formula/grammar.hxx>
#include <fstream>
#include <iostream>
@@ -403,14 +359,28 @@
#include <oox/core/contexthandler.hxx>
#include <oox/core/fastparser.hxx>
#include <oox/core/filterbase.hxx>
#include <oox/core/relations.hxx>
#include <oox/core/xmlfilterbase.hxx>
#include <oox/drawingml/chart/datasourcemodel.hxx>
#include <oox/drawingml/connectorshapecontext.hxx>
#include <oox/drawingml/fillproperties.hxx>
#include <oox/drawingml/graphicshapecontext.hxx>
#include <oox/drawingml/lineproperties.hxx>
#include <oox/drawingml/shapepropertymap.hxx>
#include <oox/drawingml/theme.hxx>
#include <oox/drawingml/themefragmenthandler.hxx>
#include <oox/export/chartexport.hxx>
#include <oox/export/drawingml.hxx>
#include <oox/export/shapes.hxx>
#include <oox/export/utils.hxx>
#include <oox/export/vmlexport.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include <oox/helper/binaryoutputstream.hxx>
#include <oox/helper/containerhelper.hxx>
#include <oox/helper/graphichelper.hxx>
#include <oox/helper/helper.hxx>
#include <oox/helper/progressbar.hxx>
#include <oox/helper/propertymap.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/ole/olehelper.hxx>
@@ -418,6 +388,8 @@
#include <oox/ole/vbaproject.hxx>
#include <oox/token/properties.hxx>
#include <oox/token/tokens.hxx>
#include <oox/vml/vmlshape.hxx>
#include <oox/vml/vmlshapecontainer.hxx>
#include <osl/conditn.hxx>
#include <osl/diagnose.h>
#include <osl/endian.h>
@@ -437,6 +409,7 @@
#include <sal/log.hxx>
#include <sal/macros.h>
#include <sal/mathconf.h>
#include <sal/types.h>
#include <salhelper/thread.hxx>
#include <sax/fshelper.hxx>
#include <sax/tools/converter.hxx>
@@ -463,7 +436,9 @@
#include <svl/itempool.hxx>
#include <svl/itemset.hxx>
#include <svl/languageoptions.hxx>
#include <svl/poolcach.hxx>
#include <svl/poolitem.hxx>
#include <svl/sharedstring.hxx>
#include <svl/sharedstringpool.hxx>
#include <svl/stritem.hxx>
#include <svl/style.hxx>
@@ -488,6 +463,7 @@
#include <svx/pageitem.hxx>
#include <svx/rotmodit.hxx>
#include <svx/sdasitm.hxx>
#include <svx/sdr/properties/properties.hxx>
#include <svx/sdtaitm.hxx>
#include <svx/svdattr.hxx>
#include <svx/svditer.hxx>
@@ -505,6 +481,7 @@
#include <svx/svdpage.hxx>
#include <svx/svdpool.hxx>
#include <svx/svdxcgv.hxx>
#include <svx/sxmspitm.hxx>
#include <svx/unoapi.hxx>
#include <svx/unomid.hxx>
#include <svx/xbitmap.hxx>
@@ -515,6 +492,8 @@
#include <svx/xfltrit.hxx>
#include <svx/xlineit.hxx>
#include <svx/xlinjoit.hxx>
#include <svx/xlnstit.hxx>
#include <svx/xlnstwit.hxx>
#include <svx/xlntrit.hxx>
#include <svx/xoutbmp.hxx>
#include <toolkit/helper/vclunohelper.hxx>
@@ -546,6 +525,8 @@
#include <vcl/font.hxx>
#include <vcl/graph.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/outdev.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
@@ -553,5 +534,4 @@
#include <vcl/virdev.hxx>
#include <vcl/wmf.hxx>
#include <vector>

/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sc/inc/pch/precompiled_scopencl.hxx

diff --git a/sc/inc/pch/precompiled_scopencl.hxx b/sc/inc/pch/precompiled_scopencl.hxx
index 23d754f..8271466 100644
--- a/sc/inc/pch/precompiled_scopencl.hxx
+++ b/sc/inc/pch/precompiled_scopencl.hxx
@@ -14,14 +14,13 @@
 also fixes all possible problems, so it's usually better to use it).
*/

#include "formula/vectortoken.hxx"
#include "sal/config.h"
#include <algorithm>
#include <boost/scoped_array.hpp>
#include <boost/scoped_ptr.hpp>
#include <cmath>
#include <config_folders.h>
#include <float.h>
#include <formula/vectortoken.hxx>
#include <iostream>
#include <list>
#include <map>
@@ -31,6 +30,7 @@
#include <rtl/digest.h>
#include <rtl/strbuf.hxx>
#include <rtl/ustring.hxx>
#include <sal/config.h>
#include <sstream>
#include <stdio.h>
#include <stdlib.h>

sc/inc/pch/precompiled_scui.hxx

diff --git a/sc/inc/pch/precompiled_scui.hxx b/sc/inc/pch/precompiled_scui.hxx
index 0b69759..42b3f84 100644
--- a/sc/inc/pch/precompiled_scui.hxx
+++ b/sc/inc/pch/precompiled_scui.hxx
@@ -14,17 +14,6 @@
 also fixes all possible problems, so it's usually better to use it).
*/

#include "formula/grammar.hxx"
#include "formula/opcode.hxx"
#include "rtl/ustrbuf.hxx"
#include "sal/types.h"
#include "svl/sharedstringpool.hxx"
#include "svtools/svlbitm.hxx"
#include "svtools/treelistentry.hxx"
#include "vcl/msgbox.hxx"
#include "vcl/settings.hxx"
#include "vcl/svapp.hxx"
#include "vcl/window.hxx"
#include <basic/sbmeth.hxx>
#include <basic/sbmod.hxx>
#include <basic/sbstar.hxx>
@@ -66,12 +55,16 @@
#include <editeng/shdditem.hxx>
#include <editeng/udlnitem.hxx>
#include <editeng/wghtitem.hxx>
#include <formula/grammar.hxx>
#include <formula/opcode.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <limits.h>
#include <math.h>
#include <osl/thread.h>
#include <rtl/math.hxx>
#include <rtl/tencinfo.h>
#include <rtl/ustrbuf.hxx>
#include <sal/types.h>
#include <sfx2/app.hxx>
#include <sfx2/basedlgs.hxx>
#include <sfx2/childwin.hxx>
@@ -88,12 +81,15 @@
#include <svl/cjkoptions.hxx>
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
#include <svl/sharedstringpool.hxx>
#include <svl/stritem.hxx>
#include <svl/style.hxx>
#include <svl/zforlist.hxx>
#include <svtools/collatorres.hxx>
#include <svtools/ehdl.hxx>
#include <svtools/sfxecode.hxx>
#include <svtools/svlbitm.hxx>
#include <svtools/treelistentry.hxx>
#include <svx/algitem.hxx>
#include <svx/dlgutil.hxx>
#include <svx/drawitem.hxx>
@@ -116,6 +112,6 @@
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
#include <vcl/waitobj.hxx>
#include <vcl/window.hxx>
#include <vector>

/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sc/inc/pch/precompiled_vbaobj.hxx

diff --git a/sc/inc/pch/precompiled_vbaobj.hxx b/sc/inc/pch/precompiled_vbaobj.hxx
index 679b85d..867fec2 100644
--- a/sc/inc/pch/precompiled_vbaobj.hxx
+++ b/sc/inc/pch/precompiled_vbaobj.hxx
@@ -14,10 +14,6 @@
 also fixes all possible problems, so it's usually better to use it).
*/

#include "com/sun/star/lang/XMultiServiceFactory.hpp"
#include "com/sun/star/registry/XRegistryKey.hpp"
#include "comphelper/servicedecl.hxx"
#include "cppuhelper/implementationentry.hxx"
#include <algorithm>
#include <basic/sberrors.hxx>
#include <basic/sbmeth.hxx>
@@ -88,8 +84,10 @@
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/reflection/XIdlMethod.hpp>
#include <com/sun/star/registry/XRegistryKey.hpp>
#include <com/sun/star/script/ArrayWrapper.hpp>
#include <com/sun/star/script/BasicErrorException.hpp>
#include <com/sun/star/script/ModuleInfo.hpp>
@@ -203,6 +201,7 @@
#include <com/sun/star/xml/AttributeData.hpp>
#include <comphelper/anytostring.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/servicedecl.hxx>
#include <comphelper/servicehelper.hxx>
#include <comphelper/unwrapargs.hxx>
#include <cppuhelper/bootstrap.hxx>
@@ -210,6 +209,7 @@
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/implbase4.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <filter/msfilter/msvbahelper.hxx>
#include <filter/msfilter/util.hxx>
@@ -327,5 +327,4 @@
#include <vcl/window.hxx>
#include <vcl/wrkwin.hxx>
#include <vector>

/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sc/inc/queryentry.hxx

diff --git a/sc/inc/queryentry.hxx b/sc/inc/queryentry.hxx
index a39e87e..1c3a067 100644
--- a/sc/inc/queryentry.hxx
+++ b/sc/inc/queryentry.hxx
@@ -22,7 +22,7 @@

#include "address.hxx"
#include "global.hxx"
#include "svl/sharedstring.hxx"
#include <svl/sharedstring.hxx>

#include <vector>

sc/inc/rangenam.hxx

diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index dbf7eb4..5d782e9 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -22,7 +22,7 @@

#include "global.hxx"
#include "address.hxx"
#include "formula/grammar.hxx"
#include <formula/grammar.hxx>
#include "scdllapi.h"
#include "calcmacros.hxx"

sc/inc/refhint.hxx

diff --git a/sc/inc/refhint.hxx b/sc/inc/refhint.hxx
index 9ded863..1f92731 100644
--- a/sc/inc/refhint.hxx
+++ b/sc/inc/refhint.hxx
@@ -10,8 +10,8 @@
#ifndef INCLUDED_SC_INC_REFHINT_HXX
#define INCLUDED_SC_INC_REFHINT_HXX

#include <address.hxx>
#include <simplehintids.hxx>
#include "address.hxx"
#include "simplehintids.hxx"

namespace sc {

sc/inc/refreshtimer.hxx

diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx
index c392b9c..0c1726d 100644
--- a/sc/inc/refreshtimer.hxx
+++ b/sc/inc/refreshtimer.hxx
@@ -22,7 +22,7 @@

#include <vcl/timer.hxx>
#include <osl/mutex.hxx>
#include <scdllapi.h>
#include "scdllapi.h"

class ScRefreshTimerControl
{

sc/inc/rowheightcontext.hxx

diff --git a/sc/inc/rowheightcontext.hxx b/sc/inc/rowheightcontext.hxx
index 50d2109..21e9ee4 100644
--- a/sc/inc/rowheightcontext.hxx
+++ b/sc/inc/rowheightcontext.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_SC_INC_ROWHEIGHTCONTEXT_HXX
#define INCLUDED_SC_INC_ROWHEIGHTCONTEXT_HXX

#include <scdllapi.h>
#include "scdllapi.h"

#include <tools/fract.hxx>

sc/inc/scabstdlg.hxx

diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 3ac772a..2028a01 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -28,7 +28,7 @@
#include "sc.hrc"
#include "global.hxx"
#include "pivot.hxx"
#include "i18nlangtag/lang.h"
#include <i18nlangtag/lang.h>
#include "asciiopt.hxx"

#include <tabvwsh.hxx>

sc/inc/scdllapi.h

diff --git a/sc/inc/scdllapi.h b/sc/inc/scdllapi.h
index 83c3fea..2e88ef1 100644
--- a/sc/inc/scdllapi.h
+++ b/sc/inc/scdllapi.h
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SC_INC_SCDLLAPI_H
#define INCLUDED_SC_INC_SCDLLAPI_H

#include "sal/types.h"
#include <sal/types.h>

#if defined(SC_DLLIMPLEMENTATION)
#define SC_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT

sc/inc/scmatrix.hxx

diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index 26bb20f..1eab349 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -22,10 +22,10 @@

#include "global.hxx"
#include "types.hxx"
#include "formula/errorcodes.hxx"
#include <formula/errorcodes.hxx>
#include "scdllapi.h"
#include <rtl/ustring.hxx>
#include "svl/sharedstring.hxx"
#include <svl/sharedstring.hxx>

#include <boost/intrusive_ptr.hpp>
#include <boost/interprocess/smart_ptr/unique_ptr.hpp>

sc/inc/scopetools.hxx

diff --git a/sc/inc/scopetools.hxx b/sc/inc/scopetools.hxx
index 7f98192..443ceaf 100644
--- a/sc/inc/scopetools.hxx
+++ b/sc/inc/scopetools.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_SC_INC_SCOPETOOLS_HXX
#define INCLUDED_SC_INC_SCOPETOOLS_HXX

#include <scdllapi.h>
#include "scdllapi.h"

class ScDocument;

sc/inc/spellcheckcontext.hxx

diff --git a/sc/inc/spellcheckcontext.hxx b/sc/inc/spellcheckcontext.hxx
index e07e972..3804c37 100644
--- a/sc/inc/spellcheckcontext.hxx
+++ b/sc/inc/spellcheckcontext.hxx
@@ -11,7 +11,7 @@
#define INCLUDED_SC_INC_SPELLCHECKCONTEXT_HXX

#include "address.hxx"
#include "editeng/misspellrange.hxx"
#include <editeng/misspellrange.hxx>

#include <boost/unordered_map.hpp>

sc/inc/tabbgcolor.hxx

diff --git a/sc/inc/tabbgcolor.hxx b/sc/inc/tabbgcolor.hxx
index c359301..e93385b 100644
--- a/sc/inc/tabbgcolor.hxx
+++ b/sc/inc/tabbgcolor.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SC_INC_TABBGCOLOR_HXX
#define INCLUDED_SC_INC_TABBGCOLOR_HXX

#include "tools/color.hxx"
#include <tools/color.hxx>
#include "address.hxx"

#include <vector>

sc/inc/table.hxx

diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 16680dc..1581e72 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -31,7 +31,7 @@
#include "postit.hxx"
#include "types.hxx"
#include "cellvalue.hxx"
#include "formula/types.hxx"
#include <formula/types.hxx>
#include "calcmacros.hxx"

#include <set>

sc/inc/tabprotection.hxx

diff --git a/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxx
index 5777164..f1d2799 100644
--- a/sc/inc/tabprotection.hxx
+++ b/sc/inc/tabprotection.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SC_INC_TABPROTECTION_HXX
#define INCLUDED_SC_INC_TABPROTECTION_HXX

#include "sal/types.h"
#include <sal/types.h>
#include <com/sun/star/uno/Sequence.hxx>

#include "global.hxx"

sc/inc/textuno.hxx

diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx
index b022711..9de4988 100644
--- a/sc/inc/textuno.hxx
+++ b/sc/inc/textuno.hxx
@@ -32,7 +32,7 @@
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/implbase5.hxx>

#include "rtl/ref.hxx"
#include <rtl/ref.hxx>
#include "scdllapi.h"

#include <boost/noncopyable.hpp>

sc/inc/token.hxx

diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index ec0bfc2..6c15cbd 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -23,12 +23,12 @@
#include <vector>
#include <boost/intrusive_ptr.hpp>

#include "formula/opcode.hxx"
#include <formula/opcode.hxx>
#include "refdata.hxx"
#include <tools/mempool.hxx>
#include "scdllapi.h"
#include "formula/IFunctionDescription.hxx"
#include "formula/token.hxx"
#include <formula/IFunctionDescription.hxx>
#include <formula/token.hxx>
#include "scmatrix.hxx"
#include "calcmacros.hxx"

sc/inc/tokenarray.hxx

diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index c7ff3dc..c2191a8 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SC_INC_TOKENARRAY_HXX
#define INCLUDED_SC_INC_TOKENARRAY_HXX

#include "formula/token.hxx"
#include <formula/token.hxx>
#include "scdllapi.h"
#include "types.hxx"
#include "calcmacros.hxx"

sc/inc/typedstrdata.hxx

diff --git a/sc/inc/typedstrdata.hxx b/sc/inc/typedstrdata.hxx
index aeb5915..4e393b7 100644
--- a/sc/inc/typedstrdata.hxx
+++ b/sc/inc/typedstrdata.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_SC_INC_TYPEDSTRDATA_HXX
#define INCLUDED_SC_INC_TYPEDSTRDATA_HXX

#include "rtl/ustring.hxx"
#include <rtl/ustring.hxx>
#include "scdllapi.h"

#include <set>

sc/inc/types.hxx

diff --git a/sc/inc/types.hxx b/sc/inc/types.hxx
index 216a58d..8d37ad4 100644
--- a/sc/inc/types.hxx
+++ b/sc/inc/types.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_SC_INC_TYPES_HXX
#define INCLUDED_SC_INC_TYPES_HXX

#include "sal/types.h"
#include <sal/types.h>

#include <boost/intrusive_ptr.hpp>
#include <boost/unordered_map.hpp>

sc/inc/viewuno.hxx

diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx
index dcfbb9b..e1ebe6d 100644
--- a/sc/inc/viewuno.hxx
+++ b/sc/inc/viewuno.hxx
@@ -41,7 +41,7 @@
#include <com/sun/star/datatransfer/XTransferableSupplier.hpp>

#include "address.hxx"
#include "boost/ptr_container/ptr_vector.hpp"
#include <boost/ptr_container/ptr_vector.hpp>

class ScTabViewShell;
class ScPreviewShell;

sc/inc/xmlwrap.hxx

diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx
index c3d44fd..8bb78af 100644
--- a/sc/inc/xmlwrap.hxx
+++ b/sc/inc/xmlwrap.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/frame/XModel.hpp>
#include <importfilterdata.hxx>
#include "importfilterdata.hxx"
#include <sal/types.h>

class ScDocument;

sc/qa/unit/helper/csv_handler.hxx

diff --git a/sc/qa/unit/helper/csv_handler.hxx b/sc/qa/unit/helper/csv_handler.hxx
index 69d9ba7..787c329 100644
--- a/sc/qa/unit/helper/csv_handler.hxx
+++ b/sc/qa/unit/helper/csv_handler.hxx
@@ -20,7 +20,7 @@
#include "cellform.hxx"
#include "cellvalue.hxx"

#include "rtl/strbuf.hxx"
#include <rtl/strbuf.hxx>

#include <test/bootstrapfixture.hxx>

sc/qa/unit/helper/qahelper.cxx

diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index e97329f..951cd61 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -14,8 +14,8 @@
#include "conditio.hxx"
#include "stlsheet.hxx"
#include "formulacell.hxx"
#include "svx/svdpage.hxx"
#include "svx/svdoole2.hxx"
#include <svx/svdpage.hxx>
#include <svx/svdoole2.hxx>
#include <editeng/brushitem.hxx>
#include <editeng/justifyitem.hxx>

sc/qa/unit/helper/qahelper.hxx

diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 0b93cc4..915d167 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -23,14 +23,14 @@
#include <unotools/tempfile.hxx>
#include <comphelper/storagehelper.hxx>
#include <sfx2/docfilt.hxx>
#include "sfx2/docfile.hxx"
#include "svl/stritem.hxx"
#include "formula/grammar.hxx"
#include <sfx2/docfile.hxx>
#include <svl/stritem.hxx>
#include <formula/grammar.hxx>

#include <string>
#include <sstream>

#include "sal/types.h"
#include <sal/types.h>

#if defined(SCQAHELPER_DLLIMPLEMENTATION)
#define SCQAHELPER_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT

sc/qa/unit/subsequent_export-test.cxx

diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index cf1233b..f984e69 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -34,14 +34,14 @@
#include <postit.hxx>
#include <tokenstringcontext.hxx>

#include "svx/svdoole2.hxx"
#include <svx/svdoole2.hxx>
#include "tabprotection.hxx"
#include "editeng/wghtitem.hxx"
#include "editeng/postitem.hxx"
#include "editeng/editdata.hxx"
#include "editeng/eeitem.hxx"
#include "editeng/editobj.hxx"
#include "editeng/section.hxx"
#include <editeng/wghtitem.hxx>
#include <editeng/postitem.hxx>
#include <editeng/editdata.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/editobj.hxx>
#include <editeng/section.hxx>
#include <editeng/crossedoutitem.hxx>
#include <editeng/borderline.hxx>
#include <formula/grammar.hxx>

sc/qa/unit/subsequent_filters-test.cxx

diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 7983e4c..2b4d689 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -20,14 +20,14 @@
#include <svl/stritem.hxx>

#include "drwlayer.hxx"
#include "svx/svdpage.hxx"
#include "svx/svdoole2.hxx"
#include "editeng/wghtitem.hxx"
#include "editeng/postitem.hxx"
#include "editeng/udlnitem.hxx"
#include "editeng/editobj.hxx"
#include <svx/svdpage.hxx>
#include <svx/svdoole2.hxx>
#include <editeng/wghtitem.hxx>
#include <editeng/postitem.hxx>
#include <editeng/udlnitem.hxx>
#include <editeng/editobj.hxx>
#include <editeng/borderline.hxx>
#include "editeng/flditem.hxx"
#include <editeng/flditem.hxx>
#include <dbdata.hxx>
#include "validat.hxx"
#include "formulacell.hxx"

sc/qa/unit/ucalc.cxx

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index d442741..e433454 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -64,21 +64,21 @@
#include <globalnames.hxx>
#include <inputopt.hxx>

#include "formula/IFunctionDescription.hxx"
#include <formula/IFunctionDescription.hxx>

#include <basegfx/polygon/b2dpolygon.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/brushitem.hxx>
#include "editeng/wghtitem.hxx"
#include "editeng/postitem.hxx"
#include <editeng/wghtitem.hxx>
#include <editeng/postitem.hxx>

#include <svx/svdograf.hxx>
#include <svx/svdpage.hxx>
#include <svx/svdocirc.hxx>
#include <svx/svdopath.hxx>
#include <svx/svdocapt.hxx>
#include "svl/srchitem.hxx"
#include "svl/sharedstringpool.hxx"
#include <svl/srchitem.hxx>
#include <svl/sharedstringpool.hxx>

#include <sfx2/docfile.hxx>

sc/qa/unit/ucalc_column.cxx

diff --git a/sc/qa/unit/ucalc_column.cxx b/sc/qa/unit/ucalc_column.cxx
index 40793bd..394738d 100644
--- a/sc/qa/unit/ucalc_column.cxx
+++ b/sc/qa/unit/ucalc_column.cxx
@@ -7,7 +7,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

#include <ucalc.hxx>
#include "ucalc.hxx"
#include <editutil.hxx>
#include <cellvalue.hxx>
#include <svl/languageoptions.hxx>

sc/qa/unit/ucalc_formula.cxx

diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 3f75db8..ce508af 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -24,7 +24,7 @@
#include "tokenstringcontext.hxx"
#include "dbdata.hxx"

#include "formula/vectortoken.hxx"
#include <formula/vectortoken.hxx>

#include <boost/scoped_ptr.hpp>

sc/qa/unit/ucalc_sharedformula.cxx

diff --git a/sc/qa/unit/ucalc_sharedformula.cxx b/sc/qa/unit/ucalc_sharedformula.cxx
index a3b9049..d3fc16b 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -20,9 +20,9 @@
#include <tokenstringcontext.hxx>
#include <globalnames.hxx>

#include "svl/sharedstring.hxx"
#include <svl/sharedstring.hxx>

#include "formula/grammar.hxx"
#include <formula/grammar.hxx>

void Test::testSharedFormulas()
{

sc/source/core/data/cellvalue.cxx

diff --git a/sc/source/core/data/cellvalue.cxx b/sc/source/core/data/cellvalue.cxx
index 3155f98..797b59e 100644
--- a/sc/source/core/data/cellvalue.cxx
+++ b/sc/source/core/data/cellvalue.cxx
@@ -11,13 +11,13 @@
#include "document.hxx"
#include "column.hxx"
#include "formulacell.hxx"
#include "editeng/editobj.hxx"
#include "editeng/editstat.hxx"
#include <editeng/editobj.hxx>
#include <editeng/editstat.hxx>
#include "stringutil.hxx"
#include "editutil.hxx"
#include "tokenarray.hxx"
#include "formula/token.hxx"
#include "svl/sharedstring.hxx"
#include <formula/token.hxx>
#include <svl/sharedstring.hxx>

namespace {

sc/source/core/data/colorscale.cxx

diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx
index c3c6e45..c500149 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -16,7 +16,7 @@
#include "tokenarray.hxx"
#include "refupdatecontext.hxx"

#include "formula/token.hxx"
#include <formula/token.hxx>

#include <algorithm>

sc/source/core/data/column.cxx

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index a76e746..443d8fd 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -48,9 +48,9 @@

#include <svl/poolcach.hxx>
#include <svl/zforlist.hxx>
#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>
#include <editeng/scripttypeitem.hxx>
#include "editeng/fieldupdater.hxx"
#include <editeng/fieldupdater.hxx>

#include <cstring>
#include <map>

sc/source/core/data/column2.cxx

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 3232497..56fe643 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -62,8 +62,8 @@
#include <svl/zforlist.hxx>
#include <svl/broadcast.hxx>
#include <vcl/outdev.hxx>
#include "formula/errorcodes.hxx"
#include "formula/vectortoken.hxx"
#include <formula/errorcodes.hxx>
#include <formula/vectortoken.hxx>

#include <boost/scoped_ptr.hpp>

sc/source/core/data/column3.cxx

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 5db4625..e876982 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -26,8 +26,8 @@
#include "patattr.hxx"
#include "cellform.hxx"
#include "typedstrdata.hxx"
#include "formula/errorcodes.hxx"
#include "formula/token.hxx"
#include <formula/errorcodes.hxx>
#include <formula/token.hxx>
#include "brdcst.hxx"
#include "docoptio.hxx"
#include "subtotal.hxx"
@@ -58,8 +58,8 @@
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
#include <svl/broadcast.hxx>
#include "svl/sharedstringpool.hxx"
#include "editeng/editstat.hxx"
#include <svl/sharedstringpool.hxx>
#include <editeng/editstat.hxx>

#include <cstdio>

sc/source/core/data/dbdocutl.cxx

diff --git a/sc/source/core/data/dbdocutl.cxx b/sc/source/core/data/dbdocutl.cxx
index 147f312..2465518 100644
--- a/sc/source/core/data/dbdocutl.cxx
+++ b/sc/source/core/data/dbdocutl.cxx
@@ -24,7 +24,7 @@

#include "dbdocutl.hxx"
#include "document.hxx"
#include "formula/errorcodes.hxx"
#include <formula/errorcodes.hxx>
#include "stringutil.hxx"
#include "globalnames.hxx"

sc/source/core/data/dociter.cxx

diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 3c9d15d..d928586 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -40,9 +40,9 @@
#include "scmatrix.hxx"
#include <rowheightcontext.hxx>

#include "tools/fract.hxx"
#include "editeng/editobj.hxx"
#include "svl/sharedstring.hxx"
#include <tools/fract.hxx>
#include <editeng/editobj.hxx>
#include <svl/sharedstring.hxx>

#include <vector>

sc/source/core/data/documen2.cxx

diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 28f3ca7..e0ed474 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -36,7 +36,7 @@
#include <vcl/virdev.hxx>
#include <comphelper/processfactory.hxx>
#include <svl/PasswordHelper.hxx>
#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>
#include <tools/tenccvt.hxx>
#include <tools/urlobj.hxx>
#include <rtl/crc.h>

sc/source/core/data/documen7.cxx

diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index e79ff33..a4897d7 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -23,7 +23,7 @@
#include "brdcst.hxx"
#include "bcaslot.hxx"
#include "formulacell.hxx"
#include "formula/errorcodes.hxx"
#include <formula/errorcodes.hxx>
#include "scerrors.hxx"
#include "docoptio.hxx"
#include "refupdat.hxx"

sc/source/core/data/document.cxx

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 414abd4..d0db4bd 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -22,7 +22,7 @@

#include <editeng/boxitem.hxx>
#include <editeng/frmdiritem.hxx>
#include "editeng/editobj.hxx"
#include <editeng/editobj.hxx>
#include <svx/pageitem.hxx>
#include <editeng/editeng.hxx>
#include <svx/sdrundomanager.hxx>
@@ -98,7 +98,7 @@
#include <tokenarray.hxx>
#include <tokenstringcontext.hxx>

#include "formula/vectortoken.hxx"
#include <formula/vectortoken.hxx>

#include <map>
#include <limits>

sc/source/core/data/documentimport.cxx

diff --git a/sc/source/core/data/documentimport.cxx b/sc/source/core/data/documentimport.cxx
index 3ca06c5..32ff6fb 100644
--- a/sc/source/core/data/documentimport.cxx
+++ b/sc/source/core/data/documentimport.cxx
@@ -21,7 +21,7 @@
#include "paramisc.hxx"
#include "listenercontext.hxx"

#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>

struct ScDocumentImportImpl
{

sc/source/core/data/documentstreamaccess.cxx

diff --git a/sc/source/core/data/documentstreamaccess.cxx b/sc/source/core/data/documentstreamaccess.cxx
index 58c1e24..1eacfc9 100644
--- a/sc/source/core/data/documentstreamaccess.cxx
+++ b/sc/source/core/data/documentstreamaccess.cxx
@@ -13,7 +13,7 @@
#include "column.hxx"
#include "mtvelements.hxx"

#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>

namespace sc {

sc/source/core/data/dpitemdata.cxx

diff --git a/sc/source/core/data/dpitemdata.cxx b/sc/source/core/data/dpitemdata.cxx
index 0598379..94f6676 100644
--- a/sc/source/core/data/dpitemdata.cxx
+++ b/sc/source/core/data/dpitemdata.cxx
@@ -24,7 +24,7 @@
#include "formulacell.hxx"
#include "globstr.hrc"
#include "dptabdat.hxx"
#include "rtl/math.hxx"
#include <rtl/math.hxx>

const sal_Int32 ScDPItemData::DateFirst = -1;
const sal_Int32 ScDPItemData::DateLast  = 10000;

sc/source/core/data/dpoutput.cxx

diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index 1bae406..21e958f 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -33,7 +33,7 @@
#include "docpool.hxx"
#include "markdata.hxx"
#include "attrib.hxx"
#include "formula/errorcodes.hxx"
#include <formula/errorcodes.hxx>
#include "miscuno.hxx"
#include "globstr.hrc"
#include "stlpool.hxx"

sc/source/core/data/dpsave.cxx

diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index d26cfd8..761a369 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -27,7 +27,7 @@
#include "dputil.hxx"

#include <sal/types.h>
#include "comphelper/string.hxx"
#include <comphelper/string.hxx>

#include <com/sun/star/sheet/GeneralFunction.hpp>
#include <com/sun/star/sheet/DataPilotFieldAutoShowInfo.hpp>

sc/source/core/data/dptabsrc.cxx

diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 973f009..cd0b425 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -56,7 +56,7 @@
#include <com/sun/star/sheet/DataPilotFieldAutoShowInfo.hpp>
#include <com/sun/star/table/CellAddress.hpp>

#include "comphelper/string.hxx"
#include <comphelper/string.hxx>
#include <unotools/collatorwrapper.hxx>
#include <unotools/calendarwrapper.hxx>
#include <com/sun/star/i18n/CalendarDisplayIndex.hpp>

sc/source/core/data/dputil.cxx

diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx
index 73fc4d7..4b40107 100644
--- a/sc/source/core/data/dputil.cxx
+++ b/sc/source/core/data/dputil.cxx
@@ -13,11 +13,11 @@
#include "globalnames.hxx"
#include "globstr.hrc"

#include "comphelper/string.hxx"
#include "unotools/localedatawrapper.hxx"
#include "unotools/calendarwrapper.hxx"
#include "svl/zforlist.hxx"
#include "rtl/math.hxx"
#include <comphelper/string.hxx>
#include <unotools/localedatawrapper.hxx>
#include <unotools/calendarwrapper.hxx>
#include <svl/zforlist.hxx>
#include <rtl/math.hxx>

#include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
#include <com/sun/star/i18n/CalendarDisplayIndex.hpp>

sc/source/core/data/drwlayer.cxx

diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 57bc088..534ae82 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -74,7 +74,7 @@
#include "postit.hxx"
#include "attrib.hxx"
#include "charthelper.hxx"
#include "basegfx/matrix/b2dhommatrix.hxx"
#include <basegfx/matrix/b2dhommatrix.hxx>

#include <vcl/field.hxx>
#include <boost/scoped_array.hpp>

sc/source/core/data/formulacell.cxx

diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 2c21e4a..0c2755b 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -45,10 +45,10 @@
#include "tokenarray.hxx"
#include "clkernelthread.hxx"

#include "formula/errorcodes.hxx"
#include "formula/vectortoken.hxx"
#include "svl/intitem.hxx"
#include "rtl/strbuf.hxx"
#include <formula/errorcodes.hxx>
#include <formula/vectortoken.hxx>
#include <svl/intitem.hxx>
#include <rtl/strbuf.hxx>
#include "formulagroup.hxx"
#include "listenercontext.hxx"
#include "types.hxx"

sc/source/core/data/formulaiter.cxx

diff --git a/sc/source/core/data/formulaiter.cxx b/sc/source/core/data/formulaiter.cxx
index d055ecb..e101a79 100644
--- a/sc/source/core/data/formulaiter.cxx
+++ b/sc/source/core/data/formulaiter.cxx
@@ -21,7 +21,7 @@

#include "formulacell.hxx"
#include "tokenarray.hxx"
#include "formula/token.hxx"
#include <formula/token.hxx>

using namespace formula;

sc/source/core/data/pivot2.cxx

diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx
index a88de02..93f327e 100644
--- a/sc/source/core/data/pivot2.cxx
+++ b/sc/source/core/data/pivot2.cxx
@@ -33,7 +33,7 @@
#include "userlist.hxx"
#include "pivot.hxx"
#include "rechead.hxx"
#include "formula/errorcodes.hxx"
#include <formula/errorcodes.hxx>
#include "refupdat.hxx"
#include "stlpool.hxx"
#include "stlsheet.hxx"

sc/source/core/data/table1.cxx

diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 4827541..e603337 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -50,7 +50,7 @@
#include "refupdatecontext.hxx"
#include <rowheightcontext.hxx>

#include "formula/vectortoken.hxx"
#include <formula/vectortoken.hxx>

#include <vector>
#include <boost/scoped_array.hpp>

sc/source/core/data/table2.cxx

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 8c1842c..738d5e1 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -55,7 +55,7 @@

#include "scitems.hxx"
#include <editeng/boxitem.hxx>
#include "editeng/editobj.hxx"
#include <editeng/editobj.hxx>
#include <svl/poolcach.hxx>
#include <unotools/charclass.hxx>
#include <math.h>

sc/source/core/data/table3.cxx

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index f32d559..22a2a09 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -62,7 +62,7 @@
#include <sharedformula.hxx>
#include <refhint.hxx>

#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>

#include <vector>
#include <boost/scoped_ptr.hpp>

sc/source/core/data/table4.cxx

diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 96acd2c..f378c89 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -53,7 +53,7 @@
#include "userlist.hxx"
#include "zforauto.hxx"
#include "subtotal.hxx"
#include "formula/errorcodes.hxx"
#include <formula/errorcodes.hxx>
#include "rangenam.hxx"
#include "docpool.hxx"
#include "progress.hxx"

sc/source/core/data/tabprotection.cxx

diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx
index 9beb206..73b03c5 100644
--- a/sc/source/core/data/tabprotection.cxx
+++ b/sc/source/core/data/tabprotection.cxx
@@ -18,7 +18,7 @@
 */

#include "tabprotection.hxx"
#include "svl/PasswordHelper.hxx"
#include <svl/PasswordHelper.hxx>
#include <comphelper/docpasswordhelper.hxx>
#include "document.hxx"

sc/source/core/data/validat.cxx

diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 6ac7b1e..528f958 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -29,7 +29,7 @@

#include <basic/sbx.hxx>
#include <svl/zforlist.hxx>
#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>
#include <vcl/msgbox.hxx>
#include <rtl/math.hxx>

sc/source/core/inc/cellkeytranslator.hxx

diff --git a/sc/source/core/inc/cellkeytranslator.hxx b/sc/source/core/inc/cellkeytranslator.hxx
index e9e3add..d756a22 100644
--- a/sc/source/core/inc/cellkeytranslator.hxx
+++ b/sc/source/core/inc/cellkeytranslator.hxx
@@ -21,8 +21,8 @@
#define INCLUDED_SC_SOURCE_CORE_INC_CELLKEYTRANSLATOR_HXX

#include "global.hxx"
#include "formula/opcode.hxx"
#include "unotools/transliterationwrapper.hxx"
#include <formula/opcode.hxx>
#include <unotools/transliterationwrapper.hxx>
#include <boost/unordered_map.hpp>
#include <list>
#include <memory>

sc/source/core/inc/interpre.hxx

diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 660ecf3..0c14d32 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -23,8 +23,8 @@
#include <math.h>
#include <rtl/math.hxx>
#include <rtl/ustring.hxx>
#include "formula/errorcodes.hxx"
#include "formula/tokenarray.hxx"
#include <formula/errorcodes.hxx>
#include <formula/tokenarray.hxx>
#include "scdll.hxx"
#include "types.hxx"
#include "externalrefmgr.hxx"

sc/source/core/inc/jumpmatrix.hxx

diff --git a/sc/source/core/inc/jumpmatrix.hxx b/sc/source/core/inc/jumpmatrix.hxx
index 6ac29e9..63e2ee2 100644
--- a/sc/source/core/inc/jumpmatrix.hxx
+++ b/sc/source/core/inc/jumpmatrix.hxx
@@ -20,8 +20,8 @@
#ifndef INCLUDED_SC_SOURCE_CORE_INC_JUMPMATRIX_HXX
#define INCLUDED_SC_SOURCE_CORE_INC_JUMPMATRIX_HXX

#include "formula/token.hxx"
#include "formula/errorcodes.hxx"
#include <formula/token.hxx>
#include <formula/errorcodes.hxx>
#include <vector>
#include "types.hxx"
#include "address.hxx"

sc/source/core/inc/parclass.hxx

diff --git a/sc/source/core/inc/parclass.hxx b/sc/source/core/inc/parclass.hxx
index 188387e..881dbc2 100644
--- a/sc/source/core/inc/parclass.hxx
+++ b/sc/source/core/inc/parclass.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SC_SOURCE_CORE_INC_PARCLASS_HXX
#define INCLUDED_SC_SOURCE_CORE_INC_PARCLASS_HXX

#include "formula/opcode.hxx"
#include <formula/opcode.hxx>
#include <sys/types.h>

namespace formula

sc/source/core/inc/poolhelp.hxx

diff --git a/sc/source/core/inc/poolhelp.hxx b/sc/source/core/inc/poolhelp.hxx
index 8d7a785..6186f75 100644
--- a/sc/source/core/inc/poolhelp.hxx
+++ b/sc/source/core/inc/poolhelp.hxx
@@ -23,7 +23,7 @@
#include <rtl/ref.hxx>
#include <salhelper/simplereferenceobject.hxx>
#include "docoptio.hxx"
#include "osl/mutex.hxx"
#include <osl/mutex.hxx>

class ScDocument;
class ScDocumentPool;

sc/source/core/opencl/formulagroupcl.cxx

diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index c9b23e6..d4873b6 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -15,7 +15,7 @@
#include "tokenarray.hxx"
#include "compiler.hxx"
#include "interpre.hxx"
#include "formula/vectortoken.hxx"
#include <formula/vectortoken.hxx>
#include "scmatrix.hxx"

#include "openclwrapper.hxx"

sc/source/core/opencl/op_addin.cxx

diff --git a/sc/source/core/opencl/op_addin.cxx b/sc/source/core/opencl/op_addin.cxx
index 3f11ae9..06c4fbb 100644
--- a/sc/source/core/opencl/op_addin.cxx
+++ b/sc/source/core/opencl/op_addin.cxx
@@ -15,7 +15,7 @@
#include "tokenarray.hxx"
#include "compiler.hxx"
#include "interpre.hxx"
#include "formula/vectortoken.hxx"
#include <formula/vectortoken.hxx>
#include <sstream>

using namespace formula;

sc/source/core/opencl/op_array.cxx

diff --git a/sc/source/core/opencl/op_array.cxx b/sc/source/core/opencl/op_array.cxx
index 4311ab6..b642c3b 100644
--- a/sc/source/core/opencl/op_array.cxx
+++ b/sc/source/core/opencl/op_array.cxx
@@ -15,7 +15,7 @@
#include "tokenarray.hxx"
#include "compiler.hxx"
#include "interpre.hxx"
#include "formula/vectortoken.hxx"
#include <formula/vectortoken.hxx>
#include <sstream>

using namespace formula;

sc/source/core/opencl/op_database.cxx

diff --git a/sc/source/core/opencl/op_database.cxx b/sc/source/core/opencl/op_database.cxx
index 1c321f6..a77ce7fa 100644
--- a/sc/source/core/opencl/op_database.cxx
+++ b/sc/source/core/opencl/op_database.cxx
@@ -15,7 +15,7 @@
#include "tokenarray.hxx"
#include "compiler.hxx"
#include "interpre.hxx"
#include "formula/vectortoken.hxx"
#include <formula/vectortoken.hxx>
#include <sstream>

sc/source/core/opencl/op_financial.cxx

diff --git a/sc/source/core/opencl/op_financial.cxx b/sc/source/core/opencl/op_financial.cxx
index 3972639..ef669e7 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -15,7 +15,7 @@
#include "tokenarray.hxx"
#include "compiler.hxx"
#include "interpre.hxx"
#include "formula/vectortoken.hxx"
#include <formula/vectortoken.hxx>
#include <sstream>

using namespace formula;

sc/source/core/opencl/op_logical.cxx

diff --git a/sc/source/core/opencl/op_logical.cxx b/sc/source/core/opencl/op_logical.cxx
index b20fd09..cb80ec7 100644
--- a/sc/source/core/opencl/op_logical.cxx
+++ b/sc/source/core/opencl/op_logical.cxx
@@ -15,7 +15,7 @@
#include "tokenarray.hxx"
#include "compiler.hxx"
#include "interpre.hxx"
#include "formula/vectortoken.hxx"
#include <formula/vectortoken.hxx>
#include <sstream>

sc/source/core/opencl/op_math.cxx

diff --git a/sc/source/core/opencl/op_math.cxx b/sc/source/core/opencl/op_math.cxx
index d1b1ed6..ccd0f3d 100644
--- a/sc/source/core/opencl/op_math.cxx
+++ b/sc/source/core/opencl/op_math.cxx
@@ -15,7 +15,7 @@
#include "tokenarray.hxx"
#include "compiler.hxx"
#include "interpre.hxx"
#include "formula/vectortoken.hxx"
#include <formula/vectortoken.hxx>
#include "opinlinefun_math.hxx"
#include <sstream>

sc/source/core/opencl/op_spreadsheet.cxx

diff --git a/sc/source/core/opencl/op_spreadsheet.cxx b/sc/source/core/opencl/op_spreadsheet.cxx
index 59a6759..d2b78c9 100644
--- a/sc/source/core/opencl/op_spreadsheet.cxx
+++ b/sc/source/core/opencl/op_spreadsheet.cxx
@@ -15,7 +15,7 @@
#include "tokenarray.hxx"
#include "compiler.hxx"
#include "interpre.hxx"
#include "formula/vectortoken.hxx"
#include <formula/vectortoken.hxx>
#include <sstream>

using namespace formula;

sc/source/core/opencl/op_statistical.cxx

diff --git a/sc/source/core/opencl/op_statistical.cxx b/sc/source/core/opencl/op_statistical.cxx
index 6bbbe53..3c6b880 100644
--- a/sc/source/core/opencl/op_statistical.cxx
+++ b/sc/source/core/opencl/op_statistical.cxx
@@ -15,7 +15,7 @@
#include "tokenarray.hxx"
#include "compiler.hxx"
#include "interpre.hxx"
#include "formula/vectortoken.hxx"
#include <formula/vectortoken.hxx>
#include <sstream>
#include "opinlinefun_statistical.cxx"

sc/source/core/opencl/opbase.hxx

diff --git a/sc/source/core/opencl/opbase.hxx b/sc/source/core/opencl/opbase.hxx
index 30fcd32..6cd04a9 100644
--- a/sc/source/core/opencl/opbase.hxx
+++ b/sc/source/core/opencl/opbase.hxx
@@ -14,8 +14,8 @@

#include "clcc/clew.h"

#include "formula/token.hxx"
#include "formula/vectortoken.hxx"
#include <formula/token.hxx>
#include <formula/vectortoken.hxx>
#include <boost/shared_ptr.hpp>
#include <boost/noncopyable.hpp>
#include <set>

sc/source/core/opencl/openclwrapper.cxx

diff --git a/sc/source/core/opencl/openclwrapper.cxx b/sc/source/core/opencl/openclwrapper.cxx
index b1a8ecc..4f87644 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -17,7 +17,7 @@
#include <rtl/bootstrap.hxx>
#include <boost/scoped_array.hpp>

#include "sal/config.h"
#include <sal/config.h>
#include <osl/file.hxx>
#include "opencl_device.hxx"

sc/source/core/tool/addincol.cxx

diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 50cf2478..49b3ab2 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -43,14 +43,14 @@
#include "compiler.hxx"
#include "scmatrix.hxx"
#include "addinlis.hxx"
#include "formula/errorcodes.hxx"
#include <formula/errorcodes.hxx>
#include "scfuncs.hrc"
#include "optutil.hxx"
#include "addincfg.hxx"
#include "scmod.hxx"
#include "rangeseq.hxx"
#include "funcdesc.hxx"
#include "svl/sharedstring.hxx"
#include <svl/sharedstring.hxx>
#include "formulaopt.hxx"
#include <boost/scoped_array.hpp>

sc/source/core/tool/cellform.cxx

diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx
index 804088d..a2e0f34 100644
--- a/sc/source/core/tool/cellform.cxx
+++ b/sc/source/core/tool/cellform.cxx
@@ -22,12 +22,12 @@
#include <sfx2/objsh.hxx>
#include <svl/smplhint.hxx>
#include <svl/zforlist.hxx>
#include "svl/sharedstring.hxx"
#include <svl/sharedstring.hxx>

#include "formulacell.hxx"
#include "document.hxx"
#include "cellvalue.hxx"
#include "formula/errorcodes.hxx"
#include <formula/errorcodes.hxx>
#include "sc.hrc"
#include <editutil.hxx>

sc/source/core/tool/cellkeytranslator.cxx

diff --git a/sc/source/core/tool/cellkeytranslator.cxx b/sc/source/core/tool/cellkeytranslator.cxx
index fb2e383..8df2576 100644
--- a/sc/source/core/tool/cellkeytranslator.cxx
+++ b/sc/source/core/tool/cellkeytranslator.cxx
@@ -19,10 +19,10 @@


#include "cellkeytranslator.hxx"
#include "comphelper/processfactory.hxx"
#include "i18nlangtag/mslangid.hxx"
#include "i18nlangtag/lang.h"
#include "rtl/ustring.hxx"
#include <comphelper/processfactory.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <i18nlangtag/lang.h>
#include <rtl/ustring.hxx>

#include <com/sun/star/i18n/TransliterationModules.hpp>

sc/source/core/tool/compare.cxx

diff --git a/sc/source/core/tool/compare.cxx b/sc/source/core/tool/compare.cxx
index 8c0f1f7..6395f2f 100644
--- a/sc/source/core/tool/compare.cxx
+++ b/sc/source/core/tool/compare.cxx
@@ -22,7 +22,7 @@
#include "document.hxx"
#include "docoptio.hxx"

#include "unotools/textsearch.hxx"
#include <unotools/textsearch.hxx>

namespace sc {

sc/source/core/tool/compiler.cxx

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 884b870..888f774 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -24,7 +24,7 @@
#include <basic/sbmeth.hxx>
#include <basic/sbstar.hxx>
#include <svl/zforlist.hxx>
#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>
#include <sal/macros.h>
#include <tools/rcid.h>
#include <tools/solar.h>

sc/source/core/tool/consoli.cxx

diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx
index 5a36fba..cacd7dd 100644
--- a/sc/source/core/tool/consoli.cxx
+++ b/sc/source/core/tool/consoli.cxx
@@ -22,7 +22,7 @@
#include "olinetab.hxx"
#include "globstr.hrc"
#include "subtotal.hxx"
#include "formula/errorcodes.hxx"
#include <formula/errorcodes.hxx>
#include "formulacell.hxx"
#include "tokenarray.hxx"

sc/source/core/tool/ddelink.cxx

diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx
index 0336ce4..f7bf3cd 100644
--- a/sc/source/core/tool/ddelink.cxx
+++ b/sc/source/core/tool/ddelink.cxx
@@ -22,7 +22,7 @@
#include <sfx2/linkmgr.hxx>
#include <sfx2/bindings.hxx>
#include <svl/zforlist.hxx>
#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>

#include "ddelink.hxx"
#include "brdcst.hxx"

sc/source/core/tool/doubleref.cxx

diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx
index e6ed4e1..4b8887c 100644
--- a/sc/source/core/tool/doubleref.cxx
+++ b/sc/source/core/tool/doubleref.cxx
@@ -26,7 +26,7 @@
#include "globstr.hrc"
#include "scmatrix.hxx"

#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>

#include <memory>
#include <vector>

sc/source/core/tool/formulagroup.cxx

diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx
index d4e3710..997d8b7 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -18,8 +18,8 @@
#include "scmatrix.hxx"
#include "globalnames.hxx"

#include "formula/vectortoken.hxx"
#include "rtl/bootstrap.hxx"
#include <formula/vectortoken.hxx>
#include <rtl/bootstrap.hxx>

#include <vector>
#include <boost/scoped_array.hpp>

sc/source/core/tool/interpr1.cxx

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 2114c35..ab82fc3f 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -62,7 +62,7 @@

#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>

#include <stdlib.h>
#include <string.h>

sc/source/core/tool/interpr2.cxx

diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 949bc9f..51453dd 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -25,7 +25,7 @@
#include <sfx2/objsh.hxx>
#include <svl/stritem.hxx>
#include <svl/zforlist.hxx>
#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>
#include <sal/macros.h>

#include "attrib.hxx"

sc/source/core/tool/interpr4.cxx

diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 83197fd..e414337 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -31,7 +31,7 @@
#include <basic/sbxobj.hxx>
#include <basic/sbuno.hxx>
#include <svl/zforlist.hxx>
#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>
#include <stdlib.h>
#include <string.h>
#include <signal.h>
@@ -58,7 +58,7 @@
#include "jumpmatrix.hxx"
#include "parclass.hxx"
#include "externalrefmgr.hxx"
#include "formula/FormulaCompiler.hxx"
#include <formula/FormulaCompiler.hxx>
#include "macromgr.hxx"
#include "doubleref.hxx"
#include "queryparam.hxx"

sc/source/core/tool/interpr6.cxx

diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx
index 84d4599..9ae88f9 100644
--- a/sc/source/core/tool/interpr6.cxx
+++ b/sc/source/core/tool/interpr6.cxx
@@ -26,7 +26,7 @@
#include "dociter.hxx"
#include "mtvcellfunc.hxx"

#include "formula/token.hxx"
#include <formula/token.hxx>

using namespace formula;

sc/source/core/tool/orcusxml.cxx

diff --git a/sc/source/core/tool/orcusxml.cxx b/sc/source/core/tool/orcusxml.cxx
index b5f51b4..04de9a8 100644
--- a/sc/source/core/tool/orcusxml.cxx
+++ b/sc/source/core/tool/orcusxml.cxx
@@ -9,9 +9,9 @@

#include "orcusxml.hxx"

#include "svtools/treelistbox.hxx"
#include "svtools/treelistentry.hxx"
#include "rtl/strbuf.hxx"
#include <svtools/treelistbox.hxx>
#include <svtools/treelistentry.hxx>
#include <rtl/strbuf.hxx>

ScOrcusXMLTreeParam::EntryData::EntryData(EntryType eType)
    : mnNamespaceID(0)

sc/source/core/tool/queryparam.cxx

diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx
index 3e65c4f..26cb756 100644
--- a/sc/source/core/tool/queryparam.cxx
+++ b/sc/source/core/tool/queryparam.cxx
@@ -21,7 +21,7 @@
#include "queryentry.hxx"
#include "scmatrix.hxx"

#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>

namespace {

sc/source/core/tool/rangenam.cxx

diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index fef017f..3fb839ed 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -35,7 +35,7 @@
#include "refupdatecontext.hxx"
#include <tokenstringcontext.hxx>

#include "formula/errorcodes.hxx"
#include <formula/errorcodes.hxx>

using namespace formula;
using ::std::pair;

sc/source/core/tool/reftokenhelper.cxx

diff --git a/sc/source/core/tool/reftokenhelper.cxx b/sc/source/core/tool/reftokenhelper.cxx
index 6b13b76..770f4dc 100644
--- a/sc/source/core/tool/reftokenhelper.cxx
+++ b/sc/source/core/tool/reftokenhelper.cxx
@@ -23,9 +23,9 @@
#include "compiler.hxx"
#include "tokenarray.hxx"

#include "rtl/ustring.hxx"
#include "formula/grammar.hxx"
#include "formula/token.hxx"
#include <rtl/ustring.hxx>
#include <formula/grammar.hxx>
#include <formula/token.hxx>

#include <boost/scoped_ptr.hpp>

sc/source/core/tool/scmatrix.cxx

diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index f21baed..8b3cc25 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -20,14 +20,14 @@
#include "scmatrix.hxx"
#include "global.hxx"
#include "address.hxx"
#include "formula/errorcodes.hxx"
#include <formula/errorcodes.hxx>
#include "interpre.hxx"
#include "mtvelements.hxx"
#include "compare.hxx"

#include <boost/noncopyable.hpp>
#include <svl/zforlist.hxx>
#include "svl/sharedstring.hxx"
#include <svl/sharedstring.hxx>
#include <tools/stream.hxx>
#include <rtl/math.hxx>

sc/source/core/tool/stringutil.cxx

diff --git a/sc/source/core/tool/stringutil.cxx b/sc/source/core/tool/stringutil.cxx
index 5bdc2c2..ce83c33 100644
--- a/sc/source/core/tool/stringutil.cxx
+++ b/sc/source/core/tool/stringutil.cxx
@@ -19,7 +19,7 @@

#include "stringutil.hxx"
#include "global.hxx"
#include "svl/zforlist.hxx"
#include <svl/zforlist.hxx>

#include <rtl/ustrbuf.hxx>
#include <rtl/strbuf.hxx>

sc/source/core/tool/token.cxx

diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index f6b3741..0bc46f9 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -42,7 +42,7 @@
#include "types.hxx"
#include "globstr.hrc"
#include "addincol.hxx"
#include "svl/sharedstring.hxx"
#include <svl/sharedstring.hxx>

using ::std::vector;

sc/source/core/tool/typedstrdata.cxx

diff --git a/sc/source/core/tool/typedstrdata.cxx b/sc/source/core/tool/typedstrdata.cxx
index 2ffd773b..ad0142b 100644
--- a/sc/source/core/tool/typedstrdata.cxx
+++ b/sc/source/core/tool/typedstrdata.cxx
@@ -10,7 +10,7 @@
#include "typedstrdata.hxx"
#include "global.hxx"

#include "unotools/collatorwrapper.hxx"
#include <unotools/collatorwrapper.hxx>

bool ScTypedStrData::LessCaseSensitive::operator() (const ScTypedStrData& left, const ScTypedStrData& right) const
{

sc/source/filter/dif/difexp.cxx

diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx
index 0419c9f..e5a2fc7 100644
--- a/sc/source/filter/dif/difexp.cxx
+++ b/sc/source/filter/dif/difexp.cxx
@@ -31,7 +31,7 @@
#include <rtl/tencinfo.h>
#include "ftools.hxx"
#include "cellvalue.hxx"
#include "rtl/strbuf.hxx"
#include <rtl/strbuf.hxx>

FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rStream, ScDocument* pDoc,
    const ScAddress& rOutPos, const rtl_TextEncoding eNach, sal_uInt32 nDifOption )

sc/source/filter/excel/excform.cxx

diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index 07174ea..2610eb4 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -26,8 +26,8 @@
#include "global.hxx"
#include "scmatrix.hxx"

#include "formula/errorcodes.hxx"
#include "svl/sharedstringpool.hxx"
#include <formula/errorcodes.hxx>
#include <svl/sharedstringpool.hxx>

#include "imp_op.hxx"
#include "root.hxx"

sc/source/filter/excel/excimp8.cxx

diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index d026996..736b116 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -54,7 +54,7 @@
#include <sot/exchange.hxx>

#include <svl/stritem.hxx>
#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>

#include <rtl/math.hxx>
#include <rtl/ustring.hxx>

sc/source/filter/excel/excrecds.cxx

diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx
index 796b95ca..b7ce324 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -67,7 +67,7 @@
#include "stlsheet.hxx"
#include "stlpool.hxx"
#include "editutil.hxx"
#include "formula/errorcodes.hxx"
#include <formula/errorcodes.hxx>
#include "queryentry.hxx"
#include "queryparam.hxx"

sc/source/filter/excel/impop.cxx

diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 27cf7de..ba281b8 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -36,7 +36,7 @@
#include <svl/zforlist.hxx>

#include <sfx2/objsh.hxx>
#include "tools/urlobj.hxx"
#include <tools/urlobj.hxx>
#include "docuno.hxx"

#include "formulacell.hxx"

sc/source/filter/excel/xeescher.cxx

diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index cc45d02..c4c1abf 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -59,20 +59,20 @@
#include "xestyle.hxx"
#include "userdat.hxx"
#include "drwlayer.hxx"
#include "svx/unoapi.hxx"
#include "svx/algitem.hxx"
#include <svx/unoapi.hxx>
#include <svx/algitem.hxx>
#include "scitems.hxx"
#include <editeng/justifyitem.hxx>
#include "svx/sdtaitm.hxx"
#include <svx/sdtaitm.hxx>
#include "attrib.hxx"
#include "document.hxx"
#include <svx/svdattr.hxx>
#include "svx/sdr/properties/properties.hxx"
#include <svx/sdr/properties/properties.hxx>
#include "detfunc.hxx"
#include "svx/xflclit.hxx"
#include "svx/xlnstwit.hxx"
#include "svx/xlnstit.hxx"
#include "svx/sxmspitm.hxx"
#include <svx/xflclit.hxx>
#include <svx/xlnstwit.hxx>
#include <svx/xlnstit.hxx>
#include <svx/sxmspitm.hxx>

#include <oox/token/tokens.hxx>
#include <oox/export/drawingml.hxx>

sc/source/filter/excel/xihelper.cxx

diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx
index 6d17288..28d8ec5 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -19,7 +19,7 @@

#include "xihelper.hxx"
#include <svl/itemset.hxx>
#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>
#include <editeng/editobj.hxx>
#include <tools/urlobj.hxx>
#include "scitems.hxx"

sc/source/filter/excel/xilink.cxx

diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx
index 4891dbd..0e26d5e 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -29,7 +29,7 @@
#include "tokenarray.hxx"
#include "externalrefmgr.hxx"
#include "scmatrix.hxx"
#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>

#include <vector>
#include <boost/ptr_container/ptr_vector.hpp>

sc/source/filter/excel/xistyle.cxx

diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index a09c777..59ce92e 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -57,7 +57,7 @@

#include "root.hxx"
#include "colrowst.hxx"
#include "svl/poolcach.hxx"
#include <svl/poolcach.hxx>

#include <list>

sc/source/filter/excel/xltools.cxx

diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx
index f436152a..a3940de 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -30,7 +30,7 @@
#include "document.hxx"
#include "docuno.hxx"
#include "editutil.hxx"
#include "formula/errorcodes.hxx"
#include <formula/errorcodes.hxx>
#include "globstr.hrc"
#include "xlstyle.hxx"
#include "xlname.hxx"

sc/source/filter/inc/autofilterbuffer.hxx

diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx
index 4707d1f..b96c753 100644
--- a/sc/source/filter/inc/autofilterbuffer.hxx
+++ b/sc/source/filter/inc/autofilterbuffer.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SC_SOURCE_FILTER_INC_AUTOFILTERBUFFER_HXX

#include <com/sun/star/table/CellRangeAddress.hpp>
#include "oox/helper/refvector.hxx"
#include <oox/helper/refvector.hxx>
#include "workbookhelper.hxx"

namespace com { namespace sun { namespace star {

sc/source/filter/inc/biffcodec.hxx

diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx
index d89de5f..53acf7d 100644
--- a/sc/source/filter/inc/biffcodec.hxx
+++ b/sc/source/filter/inc/biffcodec.hxx
@@ -22,7 +22,7 @@

#include <vector>
#include <comphelper/docpasswordhelper.hxx>
#include "oox/core/binarycodec.hxx"
#include <oox/core/binarycodec.hxx>
#include "workbookhelper.hxx"

namespace oox {

sc/source/filter/inc/biffhelper.hxx

diff --git a/sc/source/filter/inc/biffhelper.hxx b/sc/source/filter/inc/biffhelper.hxx
index 826fbff..80086bd 100644
--- a/sc/source/filter/inc/biffhelper.hxx
+++ b/sc/source/filter/inc/biffhelper.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_INC_BIFFHELPER_HXX
#define INCLUDED_SC_SOURCE_FILTER_INC_BIFFHELPER_HXX

#include "oox/helper/binarystreambase.hxx"
#include <oox/helper/binarystreambase.hxx>

namespace oox { class SequenceInputStream; }

sc/source/filter/inc/biffinputstream.hxx

diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx
index 280a4ad..411f16d 100644
--- a/sc/source/filter/inc/biffinputstream.hxx
+++ b/sc/source/filter/inc/biffinputstream.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SC_SOURCE_FILTER_INC_BIFFINPUTSTREAM_HXX

#include <vector>
#include "oox/helper/binaryinputstream.hxx"
#include <oox/helper/binaryinputstream.hxx>
#include "biffhelper.hxx"
#include "biffcodec.hxx"

sc/source/filter/inc/connectionsbuffer.hxx

diff --git a/sc/source/filter/inc/connectionsbuffer.hxx b/sc/source/filter/inc/connectionsbuffer.hxx
index 5b6ad62..00cd1d0 100644
--- a/sc/source/filter/inc/connectionsbuffer.hxx
+++ b/sc/source/filter/inc/connectionsbuffer.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_INC_CONNECTIONSBUFFER_HXX
#define INCLUDED_SC_SOURCE_FILTER_INC_CONNECTIONSBUFFER_HXX

#include "oox/helper/refvector.hxx"
#include <oox/helper/refvector.hxx>
#include "workbookhelper.hxx"

namespace oox {

sc/source/filter/inc/drawingbase.hxx

diff --git a/sc/source/filter/inc/drawingbase.hxx b/sc/source/filter/inc/drawingbase.hxx
index 1a62312..31c63cc 100644
--- a/sc/source/filter/inc/drawingbase.hxx
+++ b/sc/source/filter/inc/drawingbase.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_INC_DRAWINGBASE_HXX
#define INCLUDED_SC_SOURCE_FILTER_INC_DRAWINGBASE_HXX

#include "oox/drawingml/drawingmltypes.hxx"
#include <oox/drawingml/drawingmltypes.hxx>
#include "worksheethelper.hxx"

#include <com/sun/star/drawing/XShape.hpp>

sc/source/filter/inc/drawingfragment.hxx

diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx
index 0acd9e4..58ce0ba 100644
--- a/sc/source/filter/inc/drawingfragment.hxx
+++ b/sc/source/filter/inc/drawingfragment.hxx
@@ -22,13 +22,13 @@

#include <com/sun/star/awt/Rectangle.hpp>
#include <com/sun/star/awt/Size.hpp>
#include "oox/drawingml/shapegroupcontext.hxx"
#include "oox/ole/axcontrol.hxx"
#include "oox/drawingml/shape.hxx"
#include "oox/ole/vbaproject.hxx"
#include "oox/vml/vmldrawing.hxx"
#include "oox/vml/vmldrawingfragment.hxx"
#include "oox/vml/vmltextbox.hxx"
#include <oox/drawingml/shapegroupcontext.hxx>
#include <oox/ole/axcontrol.hxx>
#include <oox/drawingml/shape.hxx>
#include <oox/ole/vbaproject.hxx>
#include <oox/vml/vmldrawing.hxx>
#include <oox/vml/vmldrawingfragment.hxx>
#include <oox/vml/vmltextbox.hxx>
#include "drawingbase.hxx"
#include "excelhandlers.hxx"

sc/source/filter/inc/excelchartconverter.hxx

diff --git a/sc/source/filter/inc/excelchartconverter.hxx b/sc/source/filter/inc/excelchartconverter.hxx
index 1f8dd6e..383c1d5 100644
--- a/sc/source/filter/inc/excelchartconverter.hxx
+++ b/sc/source/filter/inc/excelchartconverter.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_INC_EXCELCHARTCONVERTER_HXX
#define INCLUDED_SC_SOURCE_FILTER_INC_EXCELCHARTCONVERTER_HXX

#include "oox/drawingml/chart/chartconverter.hxx"
#include <oox/drawingml/chart/chartconverter.hxx>
#include "workbookhelper.hxx"

namespace oox {

sc/source/filter/inc/excelfilter.hxx

diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx
index 21d445e..4243018 100644
--- a/sc/source/filter/inc/excelfilter.hxx
+++ b/sc/source/filter/inc/excelfilter.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_INC_EXCELFILTER_HXX
#define INCLUDED_SC_SOURCE_FILTER_INC_EXCELFILTER_HXX

#include "oox/core/xmlfilterbase.hxx"
#include <oox/core/xmlfilterbase.hxx>

namespace oox {
namespace xls {

sc/source/filter/inc/excelhandlers.hxx

diff --git a/sc/source/filter/inc/excelhandlers.hxx b/sc/source/filter/inc/excelhandlers.hxx
index c52813a..581b750 100644
--- a/sc/source/filter/inc/excelhandlers.hxx
+++ b/sc/source/filter/inc/excelhandlers.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_INC_EXCELHANDLERS_HXX
#define INCLUDED_SC_SOURCE_FILTER_INC_EXCELHANDLERS_HXX

#include "oox/core/fragmenthandler2.hxx"
#include <oox/core/fragmenthandler2.hxx>
#include "worksheethelper.hxx"

namespace oox {

sc/source/filter/inc/excelvbaproject.hxx

diff --git a/sc/source/filter/inc/excelvbaproject.hxx b/sc/source/filter/inc/excelvbaproject.hxx
index 45ef150..56d41cf 100644
--- a/sc/source/filter/inc/excelvbaproject.hxx
+++ b/sc/source/filter/inc/excelvbaproject.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_INC_EXCELVBAPROJECT_HXX
#define INCLUDED_SC_SOURCE_FILTER_INC_EXCELVBAPROJECT_HXX

#include "oox/ole/vbaproject.hxx"
#include <oox/ole/vbaproject.hxx>

namespace com { namespace sun { namespace star {
        namespace sheet { class XSpreadsheetDocument; }

sc/source/filter/inc/externallinkbuffer.hxx

diff --git a/sc/source/filter/inc/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx
index a0c4472..6954f1c 100644
--- a/sc/source/filter/inc/externallinkbuffer.hxx
+++ b/sc/source/filter/inc/externallinkbuffer.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SC_SOURCE_FILTER_INC_EXTERNALLINKBUFFER_HXX

#include <com/sun/star/sheet/ExternalLinkInfo.hpp>
#include "oox/helper/containerhelper.hxx"
#include <oox/helper/containerhelper.hxx>
#include "defnamesbuffer.hxx"

namespace com { namespace sun { namespace star {

sc/source/filter/inc/formulabase.hxx

diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx
index 3745a4a2..8c2765f 100644
--- a/sc/source/filter/inc/formulabase.hxx
+++ b/sc/source/filter/inc/formulabase.hxx
@@ -26,8 +26,8 @@
#include <com/sun/star/table/CellAddress.hpp>
#include <com/sun/star/table/CellRangeAddress.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include "oox/helper/propertyset.hxx"
#include "oox/helper/refvector.hxx"
#include <oox/helper/propertyset.hxx>
#include <oox/helper/refvector.hxx>
#include "addressconverter.hxx"

namespace com { namespace sun { namespace star {

sc/source/filter/inc/formulabuffer.hxx

diff --git a/sc/source/filter/inc/formulabuffer.hxx b/sc/source/filter/inc/formulabuffer.hxx
index 9eb5ce6..7b45e89 100644
--- a/sc/source/filter/inc/formulabuffer.hxx
+++ b/sc/source/filter/inc/formulabuffer.hxx
@@ -11,10 +11,10 @@
#define INCLUDED_SC_SOURCE_FILTER_INC_FORMULABUFFER_HXX

#include <utility>
#include "oox/helper/refmap.hxx"
#include "oox/helper/refvector.hxx"
#include "salhelper/thread.hxx"
#include "osl/mutex.hxx"
#include <oox/helper/refmap.hxx>
#include <oox/helper/refvector.hxx>
#include <salhelper/thread.hxx>
#include <osl/mutex.hxx>
#include "workbookhelper.hxx"
#include <com/sun/star/table/CellAddress.hpp>
#include <com/sun/star/table/CellRangeAddress.hpp>

sc/source/filter/inc/imp_op.hxx

diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx
index d4767be..39063ff 100644
--- a/sc/source/filter/inc/imp_op.hxx
+++ b/sc/source/filter/inc/imp_op.hxx
@@ -30,7 +30,7 @@
#include "otlnbuff.hxx"
#include "colrowst.hxx"
#include "excdefs.hxx"
#include "rtl/ref.hxx"
#include <rtl/ref.hxx>

#include <boost/shared_ptr.hpp>
#include <boost/ptr_container/ptr_vector.hpp>

sc/source/filter/inc/orcusinterface.hxx

diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx
index be7ceb9..9c37aae 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -15,7 +15,7 @@

#include "sharedformulagroups.hxx"

#include "rtl/strbuf.hxx"
#include <rtl/strbuf.hxx>

#define __ORCUS_STATIC_LIB
#include <orcus/spreadsheet/import_interface.hpp>

sc/source/filter/inc/pivotcachebuffer.hxx

diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx
index b6bca83..ffac9cf 100644
--- a/sc/source/filter/inc/pivotcachebuffer.hxx
+++ b/sc/source/filter/inc/pivotcachebuffer.hxx
@@ -23,8 +23,8 @@
#include <com/sun/star/table/CellAddress.hpp>
#include <com/sun/star/table/CellRangeAddress.hpp>
#include <com/sun/star/util/DateTime.hpp>
#include "oox/helper/containerhelper.hxx"
#include "oox/helper/refvector.hxx"
#include <oox/helper/containerhelper.hxx>
#include <oox/helper/refvector.hxx>
#include "workbookhelper.hxx"

namespace com { namespace sun { namespace star {

sc/source/filter/inc/richstring.hxx

diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx
index fc1055d..d26ce76 100644
--- a/sc/source/filter/inc/richstring.hxx
+++ b/sc/source/filter/inc/richstring.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_INC_RICHSTRING_HXX
#define INCLUDED_SC_SOURCE_FILTER_INC_RICHSTRING_HXX

#include "oox/helper/refvector.hxx"
#include <oox/helper/refvector.hxx>
#include "stylesbuffer.hxx"

class EditTextObject;

sc/source/filter/inc/scenariobuffer.hxx

diff --git a/sc/source/filter/inc/scenariobuffer.hxx b/sc/source/filter/inc/scenariobuffer.hxx
index 8459350..6afad59b 100644
--- a/sc/source/filter/inc/scenariobuffer.hxx
+++ b/sc/source/filter/inc/scenariobuffer.hxx
@@ -21,8 +21,8 @@
#define INCLUDED_SC_SOURCE_FILTER_INC_SCENARIOBUFFER_HXX

#include <com/sun/star/table/CellAddress.hpp>
#include "oox/helper/refmap.hxx"
#include "oox/helper/refvector.hxx"
#include <oox/helper/refmap.hxx>
#include <oox/helper/refvector.hxx>
#include "workbookhelper.hxx"

namespace oox {

sc/source/filter/inc/stylesbuffer.hxx

diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx
index b65c134..7f3a732 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -26,10 +26,10 @@
#include <com/sun/star/table/CellVertJustify2.hpp>
#include <com/sun/star/table/BorderLine2.hpp>
#include <com/sun/star/util/CellProtection.hpp>
#include "oox/drawingml/color.hxx"
#include "oox/helper/graphichelper.hxx"
#include "oox/helper/refmap.hxx"
#include "oox/helper/refvector.hxx"
#include <oox/drawingml/color.hxx>
#include <oox/helper/graphichelper.hxx>
#include <oox/helper/refmap.hxx>
#include <oox/helper/refvector.hxx>
#include "numberformatsbuffer.hxx"
#include "patattr.hxx"
#include "stlsheet.hxx"

sc/source/filter/inc/themebuffer.hxx

diff --git a/sc/source/filter/inc/themebuffer.hxx b/sc/source/filter/inc/themebuffer.hxx
index 8657d7e..0617c21 100644
--- a/sc/source/filter/inc/themebuffer.hxx
+++ b/sc/source/filter/inc/themebuffer.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_INC_THEMEBUFFER_HXX
#define INCLUDED_SC_SOURCE_FILTER_INC_THEMEBUFFER_HXX

#include "oox/drawingml/theme.hxx"
#include <oox/drawingml/theme.hxx>
#include "workbookhelper.hxx"

namespace oox {

sc/source/filter/inc/workbookhelper.hxx

diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx
index ef3977b..8929925 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -22,8 +22,8 @@

#include <boost/shared_ptr.hpp>
#include <rtl/ref.hxx>
#include "oox/helper/storagebase.hxx"
#include "oox/drawingml/chart/chartconverter.hxx"
#include <oox/helper/storagebase.hxx>
#include <oox/drawingml/chart/chartconverter.hxx>
#include "biffhelper.hxx"
#include "rangenam.hxx"

sc/source/filter/inc/worksheetbuffer.hxx

diff --git a/sc/source/filter/inc/worksheetbuffer.hxx b/sc/source/filter/inc/worksheetbuffer.hxx
index f34ceb3..69fafa1 100644
--- a/sc/source/filter/inc/worksheetbuffer.hxx
+++ b/sc/source/filter/inc/worksheetbuffer.hxx
@@ -21,8 +21,8 @@
#define INCLUDED_SC_SOURCE_FILTER_INC_WORKSHEETBUFFER_HXX

#include <utility>
#include "oox/helper/refmap.hxx"
#include "oox/helper/refvector.hxx"
#include <oox/helper/refmap.hxx>
#include <oox/helper/refvector.hxx>
#include "workbookhelper.hxx"

namespace com { namespace sun { namespace star {

sc/source/filter/inc/worksheethelper.hxx

diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx
index 63f8890..26c6999 100644
--- a/sc/source/filter/inc/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -20,9 +20,9 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_INC_WORKSHEETHELPER_HXX
#define INCLUDED_SC_SOURCE_FILTER_INC_WORKSHEETHELPER_HXX

#include "oox/helper/containerhelper.hxx"
#include "oox/helper/progressbar.hxx"
#include "oox/ole/olehelper.hxx"
#include <oox/helper/containerhelper.hxx>
#include <oox/helper/progressbar.hxx>
#include <oox/ole/olehelper.hxx>
#include "addressconverter.hxx"
#include "formulabase.hxx"

sc/source/filter/inc/xeescher.hxx

diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx
index b58dc62..599cc5e 100644
--- a/sc/source/filter/inc/xeescher.hxx
+++ b/sc/source/filter/inc/xeescher.hxx
@@ -25,9 +25,9 @@
#include "xcl97rec.hxx"
#include "xlescher.hxx"
#include <com/sun/star/chart/XChartDocument.hpp>
#include "svx/sdtaitm.hxx"
#include <svx/sdtaitm.hxx>
#include <boost/shared_ptr.hpp>
#include "rtl/ustring.hxx"
#include <rtl/ustring.hxx>

class ScPostIt;

sc/source/filter/inc/xiescher.hxx

diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx
index fb8d778..6d2bc2e 100644
--- a/sc/source/filter/inc/xiescher.hxx
+++ b/sc/source/filter/inc/xiescher.hxx
@@ -29,7 +29,7 @@
#include "xistring.hxx"
#include <boost/shared_ptr.hpp>
#include <oox/ole/olehelper.hxx>
#include "rtl/ustring.hxx"
#include <rtl/ustring.hxx>

namespace com { namespace sun { namespace star {
    namespace drawing { class XShape; }

sc/source/filter/oox/addressconverter.cxx

diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx
index 6f9208c3..3b403e7 100644
--- a/sc/source/filter/oox/addressconverter.cxx
+++ b/sc/source/filter/oox/addressconverter.cxx
@@ -25,7 +25,7 @@
#include <osl/diagnose.h>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
#include "oox/core/filterbase.hxx"
#include <oox/core/filterbase.hxx>
#include "biffinputstream.hxx"

namespace oox {

sc/source/filter/oox/autofilterbuffer.cxx

diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx
index 40683a2..4b8fe421 100644
--- a/sc/source/filter/oox/autofilterbuffer.cxx
+++ b/sc/source/filter/oox/autofilterbuffer.cxx
@@ -26,10 +26,10 @@
#include <com/sun/star/sheet/XSheetFilterDescriptor3.hpp>
#include <com/sun/star/table/TableOrientation.hpp>
#include <rtl/ustrbuf.hxx>
#include "oox/helper/attributelist.hxx"
#include "oox/helper/containerhelper.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/token/properties.hxx"
#include <oox/helper/attributelist.hxx>
#include <oox/helper/containerhelper.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/token/properties.hxx>
#include "addressconverter.hxx"
#include "biffinputstream.hxx"
#include "defnamesbuffer.hxx"

sc/source/filter/oox/biffcodec.cxx

diff --git a/sc/source/filter/oox/biffcodec.cxx b/sc/source/filter/oox/biffcodec.cxx
index fa7b55f..382ac5f 100644
--- a/sc/source/filter/oox/biffcodec.cxx
+++ b/sc/source/filter/oox/biffcodec.cxx
@@ -21,7 +21,7 @@

#include <osl/thread.h>
#include <string.h>
#include "oox/core/filterbase.hxx"
#include <oox/core/filterbase.hxx>
#include "biffinputstream.hxx"

namespace oox {

sc/source/filter/oox/biffhelper.cxx

diff --git a/sc/source/filter/oox/biffhelper.cxx b/sc/source/filter/oox/biffhelper.cxx
index ae5fcd5..944ee8a 100644
--- a/sc/source/filter/oox/biffhelper.cxx
+++ b/sc/source/filter/oox/biffhelper.cxx
@@ -23,7 +23,7 @@
#include <rtl/tencinfo.h>
#include "biffinputstream.hxx"
#include "worksheethelper.hxx"
#include "oox/helper/binaryoutputstream.hxx"
#include <oox/helper/binaryoutputstream.hxx>

namespace oox {
namespace xls {

sc/source/filter/oox/chartsheetfragment.cxx

diff --git a/sc/source/filter/oox/chartsheetfragment.cxx b/sc/source/filter/oox/chartsheetfragment.cxx
index aae9266..dada653 100644
--- a/sc/source/filter/oox/chartsheetfragment.cxx
+++ b/sc/source/filter/oox/chartsheetfragment.cxx
@@ -19,7 +19,7 @@

#include "chartsheetfragment.hxx"

#include "oox/helper/attributelist.hxx"
#include <oox/helper/attributelist.hxx>
#include "biffinputstream.hxx"
#include "pagesettings.hxx"
#include "viewsettings.hxx"

sc/source/filter/oox/commentsbuffer.cxx

diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx
index 93555ad..dd24c4c 100644
--- a/sc/source/filter/oox/commentsbuffer.cxx
+++ b/sc/source/filter/oox/commentsbuffer.cxx
@@ -26,12 +26,12 @@
#include <com/sun/star/sheet/XSheetAnnotationShapeSupplier.hpp>
#include <com/sun/star/sheet/XSheetAnnotations.hpp>
#include <com/sun/star/sheet/XSheetAnnotationsSupplier.hpp>
#include "oox/helper/attributelist.hxx"
#include "oox/vml/vmlshape.hxx"
#include <oox/helper/attributelist.hxx>
#include <oox/vml/vmlshape.hxx>
#include "addressconverter.hxx"
#include "biffinputstream.hxx"
#include "drawingfragment.hxx"
#include "svx/sdtaitm.hxx"
#include <svx/sdtaitm.hxx>
#include "unitconverter.hxx"
#include "drawingmanager.hxx"

sc/source/filter/oox/condformatbuffer.cxx

diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index c2cb13b..ca87185 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -36,10 +36,10 @@
#include <rtl/ustrbuf.hxx>
#include <svl/intitem.hxx>
#include <svl/sharedstringpool.hxx>
#include "oox/helper/attributelist.hxx"
#include "oox/helper/containerhelper.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/token/properties.hxx"
#include <oox/helper/attributelist.hxx>
#include <oox/helper/containerhelper.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/token/properties.hxx>
#include "addressconverter.hxx"
#include "biffinputstream.hxx"
#include "stylesbuffer.hxx"

sc/source/filter/oox/connectionsbuffer.cxx

diff --git a/sc/source/filter/oox/connectionsbuffer.cxx b/sc/source/filter/oox/connectionsbuffer.cxx
index 49cbca9..e07459b 100644
--- a/sc/source/filter/oox/connectionsbuffer.cxx
+++ b/sc/source/filter/oox/connectionsbuffer.cxx
@@ -19,7 +19,7 @@

#include "connectionsbuffer.hxx"

#include "oox/helper/attributelist.hxx"
#include <oox/helper/attributelist.hxx>
#include "biffinputstream.hxx"

namespace oox {

sc/source/filter/oox/connectionsfragment.cxx

diff --git a/sc/source/filter/oox/connectionsfragment.cxx b/sc/source/filter/oox/connectionsfragment.cxx
index 4011197..416cd9b 100644
--- a/sc/source/filter/oox/connectionsfragment.cxx
+++ b/sc/source/filter/oox/connectionsfragment.cxx
@@ -19,7 +19,7 @@

#include "connectionsfragment.hxx"

#include "oox/helper/attributelist.hxx"
#include <oox/helper/attributelist.hxx>
#include "biffhelper.hxx"
#include "connectionsbuffer.hxx"

sc/source/filter/oox/defnamesbuffer.cxx

diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx
index 8aef91a..f68799f 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -27,9 +27,9 @@
#include <com/sun/star/sheet/XFormulaTokens.hpp>
#include <com/sun/star/sheet/XPrintAreas.hpp>
#include <rtl/ustrbuf.hxx>
#include "oox/helper/attributelist.hxx"
#include "oox/helper/containerhelper.hxx"
#include "oox/helper/propertyset.hxx"
#include <oox/helper/attributelist.hxx>
#include <oox/helper/containerhelper.hxx>
#include <oox/helper/propertyset.hxx>
#include "addressconverter.hxx"
#include "biffinputstream.hxx"
#include "externallinkbuffer.hxx"

sc/source/filter/oox/drawingbase.cxx

diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx
index 0b40518..2caa532 100644
--- a/sc/source/filter/oox/drawingbase.cxx
+++ b/sc/source/filter/oox/drawingbase.cxx
@@ -20,11 +20,11 @@
#include "drawingbase.hxx"

#include <com/sun/star/awt/Rectangle.hpp>
#include "oox/helper/attributelist.hxx"
#include "oox/helper/binaryinputstream.hxx"
#include <oox/helper/attributelist.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include "unitconverter.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/token/properties.hxx"
#include <oox/helper/propertyset.hxx>
#include <oox/token/properties.hxx>

namespace oox {
namespace xls {

sc/source/filter/oox/drawingfragment.cxx

diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx
index 0df6ab1..147c0be 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -29,12 +29,12 @@
#include <svx/svdobj.hxx>
#include "drwlayer.hxx"
#include "userdat.hxx"
#include "oox/drawingml/connectorshapecontext.hxx"
#include "oox/drawingml/graphicshapecontext.hxx"
#include "oox/helper/attributelist.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/vml/vmlshape.hxx"
#include "oox/vml/vmlshapecontainer.hxx"
#include <oox/drawingml/connectorshapecontext.hxx>
#include <oox/drawingml/graphicshapecontext.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/vml/vmlshape.hxx>
#include <oox/vml/vmlshapecontainer.hxx>
#include "formulaparser.hxx"
#include "stylesbuffer.hxx"
#include "themebuffer.hxx"

sc/source/filter/oox/drawingmanager.cxx

diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx
index 6c25e3f..c928aa5 100644
--- a/sc/source/filter/oox/drawingmanager.cxx
+++ b/sc/source/filter/oox/drawingmanager.cxx
@@ -24,12 +24,12 @@
#include <com/sun/star/drawing/PointSequenceSequence.hpp>
#include <com/sun/star/drawing/PolygonKind.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
#include "oox/core/filterbase.hxx"
#include "oox/drawingml/fillproperties.hxx"
#include "oox/drawingml/lineproperties.hxx"
#include "oox/drawingml/shapepropertymap.hxx"
#include "oox/helper/containerhelper.hxx"
#include "oox/token/tokens.hxx"
#include <oox/core/filterbase.hxx>
#include <oox/drawingml/fillproperties.hxx>
#include <oox/drawingml/lineproperties.hxx>
#include <oox/drawingml/shapepropertymap.hxx>
#include <oox/helper/containerhelper.hxx>
#include <oox/token/tokens.hxx>
#include "biffinputstream.hxx"
#include "unitconverter.hxx"

sc/source/filter/oox/excelchartconverter.cxx

diff --git a/sc/source/filter/oox/excelchartconverter.cxx b/sc/source/filter/oox/excelchartconverter.cxx
index 38ffb79..fe22934 100644
--- a/sc/source/filter/oox/excelchartconverter.cxx
+++ b/sc/source/filter/oox/excelchartconverter.cxx
@@ -24,9 +24,9 @@
#include <com/sun/star/chart2/data/XDataReceiver.hpp>
#include <com/sun/star/chart2/data/XSheetDataProvider.hpp>

#include "oox/core/filterbase.hxx"
#include "oox/drawingml/chart/datasourcemodel.hxx"
#include "oox/helper/containerhelper.hxx"
#include <oox/core/filterbase.hxx>
#include <oox/drawingml/chart/datasourcemodel.hxx>
#include <oox/helper/containerhelper.hxx>
#include "formulaparser.hxx"

namespace oox {

sc/source/filter/oox/excelfilter.cxx

diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx
index c6bdbc6..3da6f1c 100644
--- a/sc/source/filter/oox/excelfilter.cxx
+++ b/sc/source/filter/oox/excelfilter.cxx
@@ -21,7 +21,7 @@

#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>

#include "oox/helper/binaryinputstream.hxx"
#include <oox/helper/binaryinputstream.hxx>
#include "biffinputstream.hxx"
#include "excelchartconverter.hxx"
#include "excelvbaproject.hxx"

sc/source/filter/oox/excelhandlers.cxx

diff --git a/sc/source/filter/oox/excelhandlers.cxx b/sc/source/filter/oox/excelhandlers.cxx
index afbb141..42af3d1 100644
--- a/sc/source/filter/oox/excelhandlers.cxx
+++ b/sc/source/filter/oox/excelhandlers.cxx
@@ -19,7 +19,7 @@

#include "excelhandlers.hxx"

#include "oox/core/filterbase.hxx"
#include <oox/core/filterbase.hxx>
#include "biffinputstream.hxx"

namespace oox {

sc/source/filter/oox/excelvbaproject.cxx

diff --git a/sc/source/filter/oox/excelvbaproject.cxx b/sc/source/filter/oox/excelvbaproject.cxx
index 67bed9f..dbfaa37 100644
--- a/sc/source/filter/oox/excelvbaproject.cxx
+++ b/sc/source/filter/oox/excelvbaproject.cxx
@@ -28,9 +28,9 @@
#include <com/sun/star/script/ModuleType.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <rtl/ustrbuf.hxx>
#include "oox/helper/helper.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/token/properties.hxx"
#include <oox/helper/helper.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/token/properties.hxx>

namespace oox {
namespace xls {

sc/source/filter/oox/externallinkbuffer.cxx

diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx
index 4b86f1c..9b034e2 100644
--- a/sc/source/filter/oox/externallinkbuffer.cxx
+++ b/sc/source/filter/oox/externallinkbuffer.cxx
@@ -31,9 +31,9 @@
#include <com/sun/star/sheet/XExternalDocLink.hpp>
#include <com/sun/star/sheet/XExternalDocLinks.hpp>
#include <rtl/strbuf.hxx>
#include "oox/core/filterbase.hxx"
#include "oox/helper/attributelist.hxx"
#include "oox/token/properties.hxx"
#include <oox/core/filterbase.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/token/properties.hxx>
#include "addressconverter.hxx"
#include "biffinputstream.hxx"
#include "excelhandlers.hxx"

sc/source/filter/oox/externallinkfragment.cxx

diff --git a/sc/source/filter/oox/externallinkfragment.cxx b/sc/source/filter/oox/externallinkfragment.cxx
index 6f487f8..c31e13e 100644
--- a/sc/source/filter/oox/externallinkfragment.cxx
+++ b/sc/source/filter/oox/externallinkfragment.cxx
@@ -20,7 +20,7 @@
#include "externallinkfragment.hxx"

#include <com/sun/star/sheet/XExternalSheetCache.hpp>
#include "oox/helper/attributelist.hxx"
#include <oox/helper/attributelist.hxx>
#include "biffinputstream.hxx"
#include "defnamesbuffer.hxx"
#include "sheetdatacontext.hxx"

sc/source/filter/oox/formulabase.cxx

diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx
index 771e3b8..590384c 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -34,9 +34,9 @@
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include "oox/core/filterbase.hxx"
#include "oox/helper/containerhelper.hxx"
#include "oox/token/properties.hxx"
#include <oox/core/filterbase.hxx>
#include <oox/helper/containerhelper.hxx>
#include <oox/token/properties.hxx>
#include "biffinputstream.hxx"

namespace oox {

sc/source/filter/oox/formulabuffer.cxx

diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx
index 4e2a0aa..c4298e2 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -27,7 +27,7 @@
#include "sharedformulagroups.hxx"
#include "externalrefmgr.hxx"
#include "tokenstringcontext.hxx"
#include "oox/token/tokens.hxx"
#include <oox/token/tokens.hxx>
#include <svl/sharedstringpool.hxx>

using namespace com::sun::star;

sc/source/filter/oox/formulaparser.cxx

diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
index 6e3617a..1a9efedb 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -26,8 +26,8 @@
#include <com/sun/star/sheet/NameToken.hpp>
#include <com/sun/star/sheet/ReferenceFlags.hpp>
#include <com/sun/star/sheet/SingleReference.hpp>
#include "oox/core/filterbase.hxx"
#include "oox/token/properties.hxx"
#include <oox/core/filterbase.hxx>
#include <oox/token/properties.hxx>
#include "addressconverter.hxx"
#include "biffinputstream.hxx"
#include "defnamesbuffer.hxx"

sc/source/filter/oox/numberformatsbuffer.cxx

diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx
index 340d15c..2333e47 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -32,9 +32,9 @@
#include <osl/thread.h>
#include <rtl/ustrbuf.hxx>
#include <svl/intitem.hxx>
#include "oox/core/filterbase.hxx"
#include "oox/helper/attributelist.hxx"
#include "oox/helper/propertymap.hxx"
#include <oox/core/filterbase.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/propertymap.hxx>
#include "biffinputstream.hxx"
#include "scitems.hxx"
#include "document.hxx"

sc/source/filter/oox/pagesettings.cxx

diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx
index fdaed22..2f4d8bb 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -32,11 +32,11 @@
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
#include <sax/tools/converter.hxx>
#include "oox/core/xmlfilterbase.hxx"
#include "oox/helper/attributelist.hxx"
#include "oox/helper/graphichelper.hxx"
#include "oox/helper/propertymap.hxx"
#include "oox/helper/propertyset.hxx"
#include <oox/core/xmlfilterbase.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/graphichelper.hxx>
#include <oox/helper/propertymap.hxx>
#include <oox/helper/propertyset.hxx>
#include "biffinputstream.hxx"
#include "excelhandlers.hxx"
#include "stylesbuffer.hxx"

sc/source/filter/oox/pivotcachebuffer.cxx

diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx
index 004fe58..7ece914 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -27,11 +27,11 @@
#include <com/sun/star/sheet/DataPilotFieldGroupInfo.hpp>
#include <com/sun/star/sheet/XDataPilotFieldGrouping.hpp>
#include <rtl/ustrbuf.hxx>
#include "oox/core/filterbase.hxx"
#include "oox/helper/attributelist.hxx"
#include "oox/helper/containerhelper.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/token/properties.hxx"
#include <oox/core/filterbase.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/containerhelper.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/token/properties.hxx>
#include "biffinputstream.hxx"
#include "defnamesbuffer.hxx"
#include "excelhandlers.hxx"

sc/source/filter/oox/pivotcachefragment.cxx

diff --git a/sc/source/filter/oox/pivotcachefragment.cxx b/sc/source/filter/oox/pivotcachefragment.cxx
index 008a190e..9fc8ca2 100644
--- a/sc/source/filter/oox/pivotcachefragment.cxx
+++ b/sc/source/filter/oox/pivotcachefragment.cxx
@@ -19,7 +19,7 @@

#include "pivotcachefragment.hxx"

#include "oox/helper/attributelist.hxx"
#include <oox/helper/attributelist.hxx>
#include "addressconverter.hxx"
#include "biffinputstream.hxx"
#include "pivotcachebuffer.hxx"

sc/source/filter/oox/pivottablebuffer.cxx

diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx
index 7b18a69..9bf341e 100644
--- a/sc/source/filter/oox/pivottablebuffer.cxx
+++ b/sc/source/filter/oox/pivottablebuffer.cxx
@@ -38,10 +38,10 @@
#include <com/sun/star/sheet/XDataPilotField.hpp>
#include <com/sun/star/sheet/XDataPilotTablesSupplier.hpp>
#include <com/sun/star/sheet/XSheetOperation.hpp>
#include "oox/helper/attributelist.hxx"
#include "oox/helper/containerhelper.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/token/properties.hxx"
#include <oox/helper/attributelist.hxx>
#include <oox/helper/containerhelper.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/token/properties.hxx>
#include "addressconverter.hxx"
#include "biffinputstream.hxx"

sc/source/filter/oox/querytablebuffer.cxx

diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx
index 9952d4d..0b4fd9f 100644
--- a/sc/source/filter/oox/querytablebuffer.cxx
+++ b/sc/source/filter/oox/querytablebuffer.cxx
@@ -22,9 +22,9 @@
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/sheet/XAreaLink.hpp>
#include <com/sun/star/sheet/XAreaLinks.hpp>
#include "oox/core/filterbase.hxx"
#include "oox/helper/attributelist.hxx"
#include "oox/token/properties.hxx"
#include <oox/core/filterbase.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/token/properties.hxx>
#include "addressconverter.hxx"
#include "biffinputstream.hxx"
#include "connectionsbuffer.hxx"

sc/source/filter/oox/richstring.cxx

diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx
index 2fb062a..646ee82 100644
--- a/sc/source/filter/oox/richstring.cxx
+++ b/sc/source/filter/oox/richstring.cxx
@@ -22,8 +22,8 @@
#include <com/sun/star/text/XText.hpp>
#include <rtl/ustrbuf.hxx>
#include <editeng/editobj.hxx>
#include "oox/helper/attributelist.hxx"
#include "oox/helper/propertyset.hxx"
#include <oox/helper/attributelist.hxx>
#include <oox/helper/propertyset.hxx>
#include "biffinputstream.hxx"
#include "editutil.hxx"

sc/source/filter/oox/scenariobuffer.cxx

diff --git a/sc/source/filter/oox/scenariobuffer.cxx b/sc/source/filter/oox/scenariobuffer.cxx
index a2f4a7f..946fad9 100644
--- a/sc/source/filter/oox/scenariobuffer.cxx
+++ b/sc/source/filter/oox/scenariobuffer.cxx
@@ -25,10 +25,10 @@
#include <com/sun/star/sheet/XScenariosSupplier.hpp>
#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include "oox/helper/attributelist.hxx"
#include "oox/helper/containerhelper.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/token/properties.hxx"
#include <oox/helper/attributelist.hxx>
#include <oox/helper/containerhelper.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/token/properties.hxx>
#include "addressconverter.hxx"
#include "biffinputstream.hxx"

sc/source/filter/oox/sheetdatabuffer.cxx

diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx
index 67018af..434c07c 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -35,10 +35,10 @@
#include <editeng/boxitem.hxx>
#include <editeng/editobj.hxx>
#include <svl/eitem.hxx>
#include "oox/helper/containerhelper.hxx"
#include "oox/helper/propertymap.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/token/tokens.hxx"
#include <oox/helper/containerhelper.hxx>
#include <oox/helper/propertymap.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/token/tokens.hxx>
#include "addressconverter.hxx"
#include "biffinputstream.hxx"
#include "formulaparser.hxx"

sc/source/filter/oox/sheetdatacontext.cxx

diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx
index 9fe0331..f6ca6a4 100644
--- a/sc/source/filter/oox/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -23,8 +23,8 @@
#include <com/sun/star/table/XCell.hpp>
#include <com/sun/star/table/XCellRange.hpp>
#include <com/sun/star/text/XText.hpp>
#include "oox/helper/attributelist.hxx"
#include "oox/helper/propertyset.hxx"
#include <oox/helper/attributelist.hxx>
#include <oox/helper/propertyset.hxx>
#include "addressconverter.hxx"
#include "biffinputstream.hxx"
#include "formulaparser.hxx"

sc/source/filter/oox/stylesfragment.cxx

diff --git a/sc/source/filter/oox/stylesfragment.cxx b/sc/source/filter/oox/stylesfragment.cxx
index 979d5f8..b66b7555 100644
--- a/sc/source/filter/oox/stylesfragment.cxx
+++ b/sc/source/filter/oox/stylesfragment.cxx
@@ -19,7 +19,7 @@

#include "stylesfragment.hxx"

#include "oox/helper/attributelist.hxx"
#include <oox/helper/attributelist.hxx>

namespace oox {
namespace xls {

sc/source/filter/oox/tablebuffer.cxx

diff --git a/sc/source/filter/oox/tablebuffer.cxx b/sc/source/filter/oox/tablebuffer.cxx
index ebd10dd..23c2ed7 100644
--- a/sc/source/filter/oox/tablebuffer.cxx
+++ b/sc/source/filter/oox/tablebuffer.cxx
@@ -21,10 +21,10 @@

#include <com/sun/star/sheet/XDatabaseRange.hpp>
#include <com/sun/star/sheet/XDatabaseRanges.hpp>
#include "oox/helper/attributelist.hxx"
#include "oox/helper/binaryinputstream.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/token/properties.hxx"
#include <oox/helper/attributelist.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/token/properties.hxx>
#include "addressconverter.hxx"

namespace oox {

sc/source/filter/oox/unitconverter.cxx

diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx
index 12e164b1..dd6f555 100644
--- a/sc/source/filter/oox/unitconverter.cxx
+++ b/sc/source/filter/oox/unitconverter.cxx
@@ -26,9 +26,9 @@
#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/util/DateTime.hpp>
#include <rtl/math.hxx>
#include "oox/core/filterbase.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/token/properties.hxx"
#include <oox/core/filterbase.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/token/properties.hxx>
#include "stylesbuffer.hxx"

namespace oox {

sc/source/filter/oox/viewsettings.cxx

diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx
index 3cd23b3..8ff5c55 100644
--- a/sc/source/filter/oox/viewsettings.cxx
+++ b/sc/source/filter/oox/viewsettings.cxx
@@ -28,11 +28,11 @@
#include <com/sun/star/document/XViewDataSupplier.hpp>
#include <com/sun/star/document/NamedPropertyValues.hpp>
#include <unotools/mediadescriptor.hxx>
#include "oox/core/filterbase.hxx"
#include "oox/helper/attributelist.hxx"
#include "oox/helper/containerhelper.hxx"
#include "oox/helper/propertymap.hxx"
#include "oox/helper/propertyset.hxx"
#include <oox/core/filterbase.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/containerhelper.hxx>
#include <oox/helper/propertymap.hxx>
#include <oox/helper/propertyset.hxx>
#include "addressconverter.hxx"
#include "biffinputstream.hxx"
#include "unitconverter.hxx"

sc/source/filter/oox/workbookfragment.cxx

diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx
index 776c3d9..2814ee7 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -20,12 +20,12 @@
#include "workbookfragment.hxx"

#include <com/sun/star/table/CellAddress.hpp>
#include "oox/core/filterbase.hxx"
#include "oox/drawingml/themefragmenthandler.hxx"
#include "oox/helper/attributelist.hxx"
#include "oox/helper/progressbar.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/ole/olestorage.hxx"
#include <oox/core/filterbase.hxx>
#include <oox/drawingml/themefragmenthandler.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/progressbar.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/ole/olestorage.hxx>

#include "biffinputstream.hxx"
#include "chartsheetfragment.hxx"
@@ -62,7 +62,7 @@
#include <queue>
#include <boost/scoped_ptr.hpp>

#include "oox/ole/vbaproject.hxx"
#include <oox/ole/vbaproject.hxx>

namespace oox {
namespace xls {

sc/source/filter/oox/workbookhelper.cxx

diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index 213dd13..910d758 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -35,11 +35,11 @@
#include <com/sun/star/table/CellAddress.hpp>
#include <com/sun/star/container/XNamed.hpp>
#include <osl/thread.h>
#include "oox/drawingml/theme.hxx"
#include "oox/helper/progressbar.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/ole/vbaproject.hxx"
#include "vcl/msgbox.hxx"
#include <oox/drawingml/theme.hxx>
#include <oox/helper/progressbar.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/ole/vbaproject.hxx>
#include <vcl/msgbox.hxx>
#include "addressconverter.hxx"
#include "biffinputstream.hxx"
#include "biffcodec.hxx"
@@ -77,9 +77,9 @@
#include "globstr.hrc"

#include "formulabuffer.hxx"
#include "vcl/mapmod.hxx"
#include <vcl/mapmod.hxx>
#include "editutil.hxx"
#include "editeng/editstat.hxx"
#include <editeng/editstat.hxx>

#include <comphelper/processfactory.hxx>
#include <officecfg/Office/Calc.hxx>

sc/source/filter/oox/workbooksettings.cxx

diff --git a/sc/source/filter/oox/workbooksettings.cxx b/sc/source/filter/oox/workbooksettings.cxx
index 8be9165..2f4cd75 100644
--- a/sc/source/filter/oox/workbooksettings.cxx
+++ b/sc/source/filter/oox/workbooksettings.cxx
@@ -23,11 +23,11 @@
#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <unotools/mediadescriptor.hxx>
#include "oox/core/filterbase.hxx"
#include "oox/helper/attributelist.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/core/xmlfilterbase.hxx"
#include "oox/token/properties.hxx"
#include <oox/core/filterbase.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/core/xmlfilterbase.hxx>
#include <oox/token/properties.hxx>
#include "biffinputstream.hxx"
#include "unitconverter.hxx"

sc/source/filter/oox/worksheetbuffer.cxx

diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx
index c2dce21..2655e10 100644
--- a/sc/source/filter/oox/worksheetbuffer.cxx
+++ b/sc/source/filter/oox/worksheetbuffer.cxx
@@ -26,11 +26,11 @@
#include <com/sun/star/sheet/XSheetLinkable.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <rtl/ustrbuf.hxx>
#include "oox/core/filterbase.hxx"
#include "oox/helper/attributelist.hxx"
#include "oox/helper/containerhelper.hxx"
#include "oox/helper/propertyset.hxx"
#include "oox/token/properties.hxx"
#include <oox/core/filterbase.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/containerhelper.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/token/properties.hxx>
#include "biffinputstream.hxx"
#include "excelhandlers.hxx"

sc/source/filter/oox/worksheetfragment.cxx

diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx
index 6a37532..ab4aea7 100644
--- a/sc/source/filter/oox/worksheetfragment.cxx
+++ b/sc/source/filter/oox/worksheetfragment.cxx
@@ -19,9 +19,9 @@

#include "worksheetfragment.hxx"

#include "oox/core/filterbase.hxx"
#include "oox/core/relations.hxx"
#include "oox/helper/attributelist.hxx"
#include <oox/core/filterbase.hxx>
#include <oox/core/relations.hxx>
#include <oox/helper/attributelist.hxx>
#include "addressconverter.hxx"
#include "autofilterbuffer.hxx"
#include "autofiltercontext.hxx"

sc/source/filter/oox/worksheethelper.cxx

diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index 14b88cf..3c4cf10 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -42,8 +42,8 @@
#include <com/sun/star/text/WritingMode2.hpp>
#include <com/sun/star/text/XText.hpp>
#include <rtl/ustrbuf.hxx>
#include "oox/core/filterbase.hxx"
#include "oox/helper/propertyset.hxx"
#include <oox/core/filterbase.hxx>
#include <oox/helper/propertyset.hxx>
#include "addressconverter.hxx"
#include "autofilterbuffer.hxx"
#include "commentsbuffer.hxx"

sc/source/filter/oox/worksheetsettings.cxx

diff --git a/sc/source/filter/oox/worksheetsettings.cxx b/sc/source/filter/oox/worksheetsettings.cxx
index 18f3da5..b92958d 100644
--- a/sc/source/filter/oox/worksheetsettings.cxx
+++ b/sc/source/filter/oox/worksheetsettings.cxx
@@ -20,9 +20,9 @@
#include "worksheetsettings.hxx"

#include <com/sun/star/util/XProtectable.hpp>
#include "oox/core/filterbase.hxx"
#include "oox/helper/attributelist.hxx"
#include "oox/token/properties.hxx"
#include <oox/core/filterbase.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/token/properties.hxx>
#include "biffinputstream.hxx"
#include "pagesettings.hxx"
#include "workbooksettings.hxx"

sc/source/filter/orcus/interface.cxx

diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
index 6c05627..d7f6a0f 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -18,8 +18,8 @@
#include "globstr.hrc"
#include "compiler.hxx"

#include "formula/token.hxx"
#include "tools/datetime.hxx"
#include <formula/token.hxx>
#include <tools/datetime.hxx>
#include <svl/sharedstringpool.hxx>

#include <com/sun/star/task/XStatusIndicator.hpp>

sc/source/filter/orcus/orcusfiltersimpl.cxx

diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index c9213d6..867cddb 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -12,11 +12,11 @@

#include "document.hxx"

#include "tools/urlobj.hxx"
#include "sfx2/docfile.hxx"
#include "sfx2/frame.hxx"
#include "sfx2/sfxsids.hrc"
#include "svl/itemset.hxx"
#include <tools/urlobj.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/frame.hxx>
#include <sfx2/sfxsids.hrc>
#include <svl/itemset.hxx>

#include <orcus/spreadsheet/import_interface.hpp>
#include <orcus/orcus_csv.hpp>

sc/source/filter/orcus/xmlcontext.cxx

diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx
index ab21844..fa91fd3 100644
--- a/sc/source/filter/orcus/xmlcontext.cxx
+++ b/sc/source/filter/orcus/xmlcontext.cxx
@@ -12,9 +12,9 @@
#include "orcusxml.hxx"
#include "document.hxx"

#include "svtools/treelistbox.hxx"
#include "svtools/treelistentry.hxx"
#include "ucbhelper/content.hxx"
#include <svtools/treelistbox.hxx>
#include <svtools/treelistentry.hxx>
#include <ucbhelper/content.hxx>

#include <orcus/spreadsheet/import_interface.hpp>
#include <orcus/xml_structure_tree.hpp>

sc/source/filter/services.cxx

diff --git a/sc/source/filter/services.cxx b/sc/source/filter/services.cxx
index 8818fa1..fc27e7a 100644
--- a/sc/source/filter/services.cxx
+++ b/sc/source/filter/services.cxx
@@ -17,11 +17,11 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

#include "sal/config.h"
#include <sal/config.h>

#include "cppuhelper/factory.hxx"
#include "cppuhelper/implementationentry.hxx"
#include "sal/types.h"
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <sal/types.h>

#include "excelfilter.hxx"
#include "ooxformulaparser.hxx"

sc/source/filter/starcalc/collect.hxx

diff --git a/sc/source/filter/starcalc/collect.hxx b/sc/source/filter/starcalc/collect.hxx
index 6589a89..9f6258a 100644
--- a/sc/source/filter/starcalc/collect.hxx
+++ b/sc/source/filter/starcalc/collect.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_STARCALC_COLLECT_HXX
#define INCLUDED_SC_SOURCE_FILTER_STARCALC_COLLECT_HXX

#include "sal/types.h"
#include <sal/types.h>

class ScDataObject
{

sc/source/filter/xcl97/XclExpChangeTrack.cxx

diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 250a548..ae8fb1d 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -30,7 +30,7 @@

#include <oox/token/tokens.hxx>
#include <rtl/strbuf.hxx>
#include "svl/sharedstring.hxx"
#include <svl/sharedstring.hxx>

using namespace oox;

sc/source/filter/xcl97/XclImpChangeTrack.cxx

diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index c5b0a73..b5a6d72 100644
--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -21,7 +21,7 @@
#include "XclImpChangeTrack.hxx"
#include <sot/storage.hxx>
#include <svl/zforlist.hxx>
#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>
#include "chgviset.hxx"
#include "formulacell.hxx"
#include "chgtrack.hxx"

sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx

diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
index 624fea2..78a56e40 100644
--- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
@@ -36,7 +36,7 @@
#include <com/sun/star/util/DateTime.hpp>
#include <tools/datetime.hxx>
#include <svl/zforlist.hxx>
#include "svl/sharedstring.hxx"
#include <svl/sharedstring.hxx>

#define SC_CHANGE_ID_PREFIX "ct"

sc/source/filter/xml/XMLDDELinksContext.cxx

diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx
index 68444dd..f9996a6 100644
--- a/sc/source/filter/xml/XMLDDELinksContext.cxx
+++ b/sc/source/filter/xml/XMLDDELinksContext.cxx
@@ -25,7 +25,7 @@
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
#include <sax/tools/converter.hxx>
#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>

using namespace com::sun::star;
using namespace xmloff::token;

sc/source/filter/xml/XMLExportDataPilot.hxx

diff --git a/sc/source/filter/xml/XMLExportDataPilot.hxx b/sc/source/filter/xml/XMLExportDataPilot.hxx
index c92d799..33ef30b 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.hxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <rtl/ustring.hxx>
#include "global.hxx"
#include "xmloff/xmltoken.hxx"
#include <xmloff/xmltoken.hxx>

class ScXMLExport;
class ScDocument;

sc/source/filter/xml/XMLExportDatabaseRanges.cxx

diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index ea2b31c..a507427 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -36,7 +36,7 @@
#include "queryparam.hxx"
#include "queryentry.hxx"

#include "svx/dataaccessdescriptor.hxx"
#include <svx/dataaccessdescriptor.hxx>

#include <com/sun/star/sheet/DataImportMode.hpp>
#include <com/sun/star/table/TableSortField.hpp>

sc/source/filter/xml/XMLTrackedChangesContext.cxx

diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index 0b537de..fb13ac1 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -32,7 +32,7 @@
#include <xmloff/xmluconv.hxx>
#include <sax/tools/converter.hxx>
#include <svl/zforlist.hxx>
#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>
#include <com/sun/star/text/XTextCursor.hpp>
#include <com/sun/star/text/ControlCharacter.hpp>

sc/source/filter/xml/cachedattraccess.hxx

diff --git a/sc/source/filter/xml/cachedattraccess.hxx b/sc/source/filter/xml/cachedattraccess.hxx
index b3b66c3..548be15 100644
--- a/sc/source/filter/xml/cachedattraccess.hxx
+++ b/sc/source/filter/xml/cachedattraccess.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_XML_CACHEDATTRACCESS_HXX
#define INCLUDED_SC_SOURCE_FILTER_XML_CACHEDATTRACCESS_HXX

#include "sal/types.h"
#include <sal/types.h>

class ScDocument;

sc/source/filter/xml/celltextparacontext.cxx

diff --git a/sc/source/filter/xml/celltextparacontext.cxx b/sc/source/filter/xml/celltextparacontext.cxx
index b8740f0..0120c49 100644
--- a/sc/source/filter/xml/celltextparacontext.cxx
+++ b/sc/source/filter/xml/celltextparacontext.cxx
@@ -11,8 +11,8 @@
#include "xmlimprt.hxx"
#include "xmlcelli.hxx"

#include "xmloff/nmspmap.hxx"
#include "comphelper/string.hxx"
#include <xmloff/nmspmap.hxx>
#include <comphelper/string.hxx>

#include <com/sun/star/xml/sax/XAttributeList.hpp>

sc/source/filter/xml/editattributemap.cxx

diff --git a/sc/source/filter/xml/editattributemap.cxx b/sc/source/filter/xml/editattributemap.cxx
index decea89..e5feb6b 100644
--- a/sc/source/filter/xml/editattributemap.cxx
+++ b/sc/source/filter/xml/editattributemap.cxx
@@ -9,9 +9,9 @@

#include "editattributemap.hxx"

#include "editeng/eeitem.hxx"
#include "editeng/memberids.hrc"
#include "xmloff/xmlnmspe.hxx"
#include <editeng/eeitem.hxx>
#include <editeng/memberids.hrc>
#include <xmloff/xmlnmspe.hxx>

ScXMLEditAttributeMap::Entry aEntries[] = {

sc/source/filter/xml/editattributemap.hxx

diff --git a/sc/source/filter/xml/editattributemap.hxx b/sc/source/filter/xml/editattributemap.hxx
index bb93629..965f43e 100644
--- a/sc/source/filter/xml/editattributemap.hxx
+++ b/sc/source/filter/xml/editattributemap.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_XML_EDITATTRIBUTEMAP_HXX
#define INCLUDED_SC_SOURCE_FILTER_XML_EDITATTRIBUTEMAP_HXX

#include "rtl/ustring.hxx"
#include <rtl/ustring.hxx>

#include <boost/unordered_map.hpp>

sc/source/filter/xml/importcontext.hxx

diff --git a/sc/source/filter/xml/importcontext.hxx b/sc/source/filter/xml/importcontext.hxx
index e6acdf5..52cd8a4 100644
--- a/sc/source/filter/xml/importcontext.hxx
+++ b/sc/source/filter/xml/importcontext.hxx
@@ -10,8 +10,8 @@
#ifndef INCLUDED_SC_SOURCE_FILTER_XML_IMPORTCONTEXT_HXX
#define INCLUDED_SC_SOURCE_FILTER_XML_IMPORTCONTEXT_HXX

#include "xmloff/xmlictxt.hxx"
#include "xmloff/xmlimp.hxx"
#include <xmloff/xmlictxt.hxx>
#include <xmloff/xmlimp.hxx>

class ScXMLImport;

sc/source/filter/xml/xmlcelli.cxx

diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 364833f..b09f90c 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -62,28 +62,28 @@
#include <xmloff/families.hxx>
#include <xmloff/numehelp.hxx>
#include <xmloff/xmlnmspe.hxx>
#include "xmloff/prstylei.hxx"
#include <xmloff/prstylei.hxx>
#include <svl/zforlist.hxx>
#include <svx/svdocapt.hxx>
#include <editeng/outlobj.hxx>
#include <editeng/editobj.hxx>
#include "editeng/wghtitem.hxx"
#include "editeng/colritem.hxx"
#include "editeng/fhgtitem.hxx"
#include "editeng/postitem.hxx"
#include "editeng/fontitem.hxx"
#include "editeng/udlnitem.hxx"
#include "editeng/wrlmitem.hxx"
#include "editeng/crossedoutitem.hxx"
#include "editeng/charreliefitem.hxx"
#include "editeng/charscaleitem.hxx"
#include "editeng/contouritem.hxx"
#include "editeng/shdditem.hxx"
#include "editeng/kernitem.hxx"
#include "editeng/autokernitem.hxx"
#include "editeng/escapementitem.hxx"
#include "editeng/emphasismarkitem.hxx"
#include "editeng/langitem.hxx"
#include <editeng/wghtitem.hxx>
#include <editeng/colritem.hxx>
#include <editeng/fhgtitem.hxx>
#include <editeng/postitem.hxx>
#include <editeng/fontitem.hxx>
#include <editeng/udlnitem.hxx>
#include <editeng/wrlmitem.hxx>
#include <editeng/crossedoutitem.hxx>
#include <editeng/charreliefitem.hxx>
#include <editeng/charscaleitem.hxx>
#include <editeng/contouritem.hxx>
#include <editeng/shdditem.hxx>
#include <editeng/kernitem.hxx>
#include <editeng/autokernitem.hxx>
#include <editeng/escapementitem.hxx>
#include <editeng/emphasismarkitem.hxx>
#include <editeng/langitem.hxx>
#include <svx/unoapi.hxx>
#include <svl/languageoptions.hxx>
#include <svl/sharedstringpool.hxx>

sc/source/filter/xml/xmlcelli.hxx

diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx
index ad71a09..e5d02f8 100644
--- a/sc/source/filter/xml/xmlcelli.hxx
+++ b/sc/source/filter/xml/xmlcelli.hxx
@@ -22,10 +22,10 @@
#include "XMLDetectiveContext.hxx"
#include "XMLCellRangeSourceContext.hxx"
#include "importcontext.hxx"
#include "formula/grammar.hxx"
#include "svl/itemset.hxx"
#include "editeng/editdata.hxx"
#include "editeng/flditem.hxx"
#include <formula/grammar.hxx>
#include <svl/itemset.hxx>
#include <editeng/editdata.hxx>
#include <editeng/flditem.hxx>

#include <boost/optional.hpp>
#include <boost/scoped_ptr.hpp>

sc/source/filter/xml/xmlexprt.cxx

diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index ea2f883..b1f831d 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -76,27 +76,27 @@
#include <xmloff/families.hxx>
#include <xmloff/numehelp.hxx>
#include <xmloff/txtparae.hxx>
#include "editeng/autokernitem.hxx"
#include "editeng/charreliefitem.hxx"
#include "editeng/charscaleitem.hxx"
#include "editeng/colritem.hxx"
#include "editeng/contouritem.hxx"
#include "editeng/crossedoutitem.hxx"
#include "editeng/emphasismarkitem.hxx"
#include "editeng/escapementitem.hxx"
#include "editeng/fhgtitem.hxx"
#include "editeng/fontitem.hxx"
#include "editeng/kernitem.hxx"
#include "editeng/langitem.hxx"
#include "editeng/postitem.hxx"
#include "editeng/section.hxx"
#include "editeng/shdditem.hxx"
#include "editeng/udlnitem.hxx"
#include "editeng/wghtitem.hxx"
#include "editeng/wrlmitem.hxx"
#include "editeng/xmlcnitm.hxx"
#include "editeng/flditem.hxx"
#include "editeng/eeitem.hxx"
#include <editeng/autokernitem.hxx>
#include <editeng/charreliefitem.hxx>
#include <editeng/charscaleitem.hxx>
#include <editeng/colritem.hxx>
#include <editeng/contouritem.hxx>
#include <editeng/crossedoutitem.hxx>
#include <editeng/emphasismarkitem.hxx>
#include <editeng/escapementitem.hxx>
#include <editeng/fhgtitem.hxx>
#include <editeng/fontitem.hxx>
#include <editeng/kernitem.hxx>
#include <editeng/langitem.hxx>
#include <editeng/postitem.hxx>
#include <editeng/section.hxx>
#include <editeng/shdditem.hxx>
#include <editeng/udlnitem.hxx>
#include <editeng/wghtitem.hxx>
#include <editeng/wrlmitem.hxx>
#include <editeng/xmlcnitm.hxx>
#include <editeng/flditem.hxx>
#include <editeng/eeitem.hxx>
#include <xmloff/xmlerror.hxx>
#include <xmloff/XMLEventExport.hxx>

@@ -104,7 +104,7 @@

#include <rtl/ustring.hxx>

#include "tools/color.hxx"
#include <tools/color.hxx>
#include <rtl/math.hxx>
#include <svl/zforlist.hxx>
#include <svx/unoshape.hxx>

sc/source/filter/xml/xmlexternaltabi.hxx

diff --git a/sc/source/filter/xml/xmlexternaltabi.hxx b/sc/source/filter/xml/xmlexternaltabi.hxx
index a0bbcff..22fbd96 100644
--- a/sc/source/filter/xml/xmlexternaltabi.hxx
+++ b/sc/source/filter/xml/xmlexternaltabi.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SC_SOURCE_FILTER_XML_XMLEXTERNALTABI_HXX

#include <xmloff/xmlictxt.hxx>
#include "rtl/ustrbuf.hxx"
#include <rtl/ustrbuf.hxx>

class ScXMLImport;
struct ScXMLExternalTabData;

sc/source/filter/xml/xmlfilti.cxx

diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx
index d0aec05..75b0730 100644
--- a/sc/source/filter/xml/xmlfilti.cxx
+++ b/sc/source/filter/xml/xmlfilti.cxx
@@ -26,7 +26,7 @@
#include "queryentry.hxx"
#include "document.hxx"

#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>
#include <xmloff/xmltkmap.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/xmltoken.hxx>

sc/source/filter/xml/xmlimprt.cxx

diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 07ef3fd7..f95b2aa 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -40,7 +40,7 @@

#include <svl/zformat.hxx>
#include <svl/languageoptions.hxx>
#include "editeng/editstat.hxx"
#include <editeng/editstat.hxx>

#include "appluno.hxx"
#include "xmlimprt.hxx"

sc/source/filter/xml/xmlimprt.hxx

diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index 8e3fdb5..97c4a5c 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/util/DateTime.hpp>
#include "xmlsubti.hxx"
#include "global.hxx"
#include "formula/grammar.hxx"
#include <formula/grammar.hxx>
#include "compiler.hxx"

#include "xmlstyle.hxx"

sc/source/filter/xml/xmlstyli.cxx

diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index d1a0597..fd468ba 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -44,7 +44,7 @@
#include "unonames.hxx"
#include "document.hxx"
#include "conditio.hxx"
#include "svl/intitem.hxx"
#include <svl/intitem.hxx>
#include "rangelst.hxx"
#include "rangeutl.hxx"
#include "docfunc.hxx"

sc/source/filter/xml/xmlsubti.hxx

diff --git a/sc/source/filter/xml/xmlsubti.hxx b/sc/source/filter/xml/xmlsubti.hxx
index eafd2fe..d3656d8 100644
--- a/sc/source/filter/xml/xmlsubti.hxx
+++ b/sc/source/filter/xml/xmlsubti.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/frame/XModel.hpp>

#include "XMLTableShapeResizer.hxx"
#include "formula/grammar.hxx"
#include <formula/grammar.hxx>
#include "tabprotection.hxx"
#include "rangelst.hxx"

sc/source/ui/Accessibility/AccessibleDocument.cxx

diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index ae2b32d..c085559 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -87,7 +87,7 @@

#include "AccessibleCell.hxx"

#include "svx/unoapi.hxx"
#include <svx/unoapi.hxx>
#include "scmod.hxx"

#ifdef indices

sc/source/ui/Accessibility/AccessibleFilterMenu.cxx

diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
index 5c95acb..b239790 100644
--- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
+++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx
@@ -24,11 +24,11 @@
#include "global.hxx"
#include "docpool.hxx"

#include "tools/gen.hxx"
#include "editeng/unoedsrc.hxx"
#include "editeng/editdata.hxx"
#include "editeng/outliner.hxx"
#include "vcl/unohelp.hxx"
#include <tools/gen.hxx>
#include <editeng/unoedsrc.hxx>
#include <editeng/editdata.hxx>
#include <editeng/outliner.hxx>
#include <vcl/unohelp.hxx>
#include "checklistmenu.hxx"

#include <com/sun/star/accessibility/XAccessible.hpp>

sc/source/ui/app/drwtrans.cxx

diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index a28d4b9..40d4808 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -57,7 +57,7 @@
#include "scmod.hxx"
#include "chartlis.hxx"
#include "rangeutl.hxx"
#include "formula/grammar.hxx"
#include <formula/grammar.hxx>
#include "dragdata.hxx"
#include "clipdata.hxx"

sc/source/ui/app/inputhdl.cxx

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index ecc0e28..fd51370 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -38,7 +38,7 @@
#include <editeng/unolingu.hxx>
#include <editeng/wghtitem.hxx>
#include <editeng/justifyitem.hxx>
#include "editeng/misspellrange.hxx"
#include <editeng/misspellrange.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/dispatch.hxx>

sc/source/ui/app/scmod.cxx

diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 8e1a9c4..dc97b24 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -108,7 +108,7 @@
#include "scslots.hxx"

#include "scabstdlg.hxx"
#include "formula/errorcodes.hxx"
#include <formula/errorcodes.hxx>
#include "formulagroup.hxx"
#include <documentlinkmgr.hxx>

sc/source/ui/attrdlg/scuiexp.cxx

diff --git a/sc/source/ui/attrdlg/scuiexp.cxx b/sc/source/ui/attrdlg/scuiexp.cxx
index 01f1926..8d93952 100644
--- a/sc/source/ui/attrdlg/scuiexp.cxx
+++ b/sc/source/ui/attrdlg/scuiexp.cxx
@@ -21,7 +21,7 @@
#undef SC_DLLIMPLEMENTATION

#include "scdlgfact.hxx"
#include "sal/types.h"
#include <sal/types.h>

namespace scui
{

sc/source/ui/cctrl/checklistmenu.cxx

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 095e11b..49061fa 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -30,7 +30,7 @@

#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include "svtools/fmtfield.hxx"
#include <svtools/fmtfield.hxx>
#include "document.hxx"

using namespace com::sun::star;

sc/source/ui/condformat/condformatmgr.cxx

diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx
index 2ea6fc3..83185cd 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -12,7 +12,7 @@
#include "scresid.hxx"
#include "globstr.hrc"
#include "condformatdlg.hxx"
#include "vcl/msgbox.hxx"
#include <vcl/msgbox.hxx>
#include "document.hxx"

#define ITEMID_RANGE 1

sc/source/ui/dbgui/filtdlg.cxx

diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 3b9e968..b6ff4e1 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -37,7 +37,7 @@

#include "filtdlg.hxx"
#include <vcl/msgbox.hxx>
#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>

#include <limits>

sc/source/ui/dbgui/pfiltdlg.cxx

diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 8a097f20..2d68f0b 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -40,7 +40,7 @@
#include "pfiltdlg.hxx"
#undef _PFILTDLG_CXX
#include <svl/zforlist.hxx>
#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>

ScPivotFilterDlg::ScPivotFilterDlg(Window* pParent, const SfxItemSet& rArgSet,
    SCTAB nSourceTab )

sc/source/ui/dbgui/textimportoptions.cxx

diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx
index fc4190a..b9b3582 100644
--- a/sc/source/ui/dbgui/textimportoptions.cxx
+++ b/sc/source/ui/dbgui/textimportoptions.cxx
@@ -21,10 +21,10 @@
#undef SC_DLLIMPLEMENTATION

#include "textimportoptions.hxx"
#include "vcl/svapp.hxx"
#include "vcl/msgbox.hxx"
#include "vcl/window.hxx"
#include "vcl/settings.hxx"
#include <vcl/svapp.hxx>
#include <vcl/msgbox.hxx>
#include <vcl/window.hxx>
#include <vcl/settings.hxx>

ScTextImportOptionsDlg::ScTextImportOptionsDlg(Window* pParent)
    : ModalDialog(pParent, "TextImportOptionsDialog", "modules/scalc/ui/textimportoptions.ui")

sc/source/ui/dbgui/validate.cxx

diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 6a93378..df23c4b 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -40,7 +40,7 @@
#include "validat.hxx"
#include "validate.hxx"
#include "compiler.hxx"
#include "formula/opcode.hxx"
#include <formula/opcode.hxx>

// cell range picker
#include "tabvwsh.hxx"

sc/source/ui/docshell/docsh.cxx

diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 7958920..2cc729e 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -37,7 +37,7 @@
#include <sfx2/viewfrm.hxx>
#include <svl/documentlockfile.hxx>
#include <svl/sharecontrolfile.hxx>
#include "svl/urihelper.hxx"
#include <svl/urihelper.hxx>
#include "chgtrack.hxx"
#include "chgviset.hxx"
#include <com/sun/star/awt/Key.hpp>

sc/source/ui/docshell/docsh8.cxx

diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 90cedae..ddb2e57 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -66,8 +66,8 @@
#include "dbdocutl.hxx"
#include "dociter.hxx"
#include "globstr.hrc"
#include "svl/zformat.hxx"
#include "svl/intitem.hxx"
#include <svl/zformat.hxx>
#include <svl/intitem.hxx>
#include "patattr.hxx"
#include "scitems.hxx"
#include "docpool.hxx"

sc/source/ui/docshell/externalrefmgr.cxx

diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 2572912..25dfe63 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -33,24 +33,24 @@
#include "globstr.hrc"
#include "cellvalue.hxx"

#include "sfx2/app.hxx"
#include "sfx2/docfilt.hxx"
#include "sfx2/docfile.hxx"
#include "sfx2/fcontnr.hxx"
#include "sfx2/sfxsids.hrc"
#include "sfx2/objsh.hxx"
#include "svl/broadcast.hxx"
#include "svl/smplhint.hxx"
#include "svl/itemset.hxx"
#include "svl/stritem.hxx"
#include "svl/urihelper.hxx"
#include "svl/zformat.hxx"
#include "svl/sharedstringpool.hxx"
#include "sfx2/linkmgr.hxx"
#include "tools/urlobj.hxx"
#include "unotools/ucbhelper.hxx"
#include "unotools/localfilehelper.hxx"
#include "vcl/msgbox.hxx"
#include <sfx2/app.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/fcontnr.hxx>
#include <sfx2/sfxsids.hrc>
#include <sfx2/objsh.hxx>
#include <svl/broadcast.hxx>
#include <svl/smplhint.hxx>
#include <svl/itemset.hxx>
#include <svl/stritem.hxx>
#include <svl/urihelper.hxx>
#include <svl/zformat.hxx>
#include <svl/sharedstringpool.hxx>
#include <sfx2/linkmgr.hxx>
#include <tools/urlobj.hxx>
#include <unotools/ucbhelper.hxx>
#include <unotools/localfilehelper.hxx>
#include <vcl/msgbox.hxx>
#include "stringutil.hxx"
#include "scmatrix.hxx"

sc/source/ui/docshell/macromgr.cxx

diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx
index 6de5358..263ed4e 100644
--- a/sc/source/ui/docshell/macromgr.cxx
+++ b/sc/source/ui/docshell/macromgr.cxx
@@ -20,9 +20,9 @@
#include "macromgr.hxx"
#include "document.hxx"

#include "basic/basmgr.hxx"
#include "cppuhelper/implbase1.hxx"
#include "sfx2/objsh.hxx"
#include <basic/basmgr.hxx>
#include <cppuhelper/implbase1.hxx>
#include <sfx2/objsh.hxx>
#include "formulacell.hxx"
#include <com/sun/star/container/XContainer.hpp>

sc/source/ui/docshell/tablink.cxx

diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index e3c36033..f1af923 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -40,7 +40,7 @@
#include "global.hxx"
#include "hints.hxx"
#include "dociter.hxx"
#include "formula/opcode.hxx"
#include <formula/opcode.hxx>
#include "formulacell.hxx"
#include "formulaiter.hxx"
#include "tokenarray.hxx"

sc/source/ui/formdlg/formula.cxx

diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 621edba..7c8c444 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -46,7 +46,7 @@
#include "appoptio.hxx"
#include "docsh.hxx"
#include "funcdesc.hxx"
#include "formula/token.hxx"
#include <formula/token.hxx>
#include "tokenarray.hxx"
#include "sc.hrc"
#include "servuno.hxx"

sc/source/ui/inc/anyrefdg.hxx

diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index c5af032..dcdbc79 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -27,7 +27,7 @@
#include <sfx2/tabdlg.hxx>
#include "address.hxx"
#include "compiler.hxx"
#include "formula/funcutl.hxx"
#include <formula/funcutl.hxx>
#include "IAnyRefDialog.hxx"
#include "scresid.hxx"
#include "scmod.hxx"

sc/source/ui/inc/areasdlg.hxx

diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx
index 7b55dd1..2800ac4 100644
--- a/sc/source/ui/inc/areasdlg.hxx
+++ b/sc/source/ui/inc/areasdlg.hxx
@@ -24,7 +24,7 @@

#include <vcl/lstbox.hxx>
#include <vcl/fixed.hxx>
#include <anyrefdg.hxx>
#include "anyrefdg.hxx"

class ScDocument;
class ScViewData;

sc/source/ui/inc/asciiopt.hxx

diff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxx
index 5507332..9e4c845 100644
--- a/sc/source/ui/inc/asciiopt.hxx
+++ b/sc/source/ui/inc/asciiopt.hxx
@@ -29,7 +29,7 @@
#include <tools/stream.hxx>
#include <svx/txencbox.hxx>
#include "csvtablebox.hxx"
#include "i18nlangtag/lang.h"
#include <i18nlangtag/lang.h>

class ScAsciiOptions
{

sc/source/ui/inc/checklistmenu.hxx

diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx
index 5119c02..b98a902 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -10,11 +10,11 @@
#ifndef INCLUDED_SC_SOURCE_UI_INC_CHECKLISTMENU_HXX
#define INCLUDED_SC_SOURCE_UI_INC_CHECKLISTMENU_HXX

#include "vcl/popupmenuwindow.hxx"
#include "vcl/button.hxx"
#include "vcl/scrbar.hxx"
#include "vcl/timer.hxx"
#include "svx/checklbx.hxx"
#include <vcl/popupmenuwindow.hxx>
#include <vcl/button.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/timer.hxx>
#include <svx/checklbx.hxx>

#include <boost/unordered_map.hpp>
#include <boost/scoped_ptr.hpp>

sc/source/ui/inc/datafdlg.hxx

diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx
index 33f9e32..7847cb2 100644
--- a/sc/source/ui/inc/datafdlg.hxx
+++ b/sc/source/ui/inc/datafdlg.hxx
@@ -16,7 +16,7 @@

#include "global.hxx"

#include <tabvwsh.hxx>
#include "tabvwsh.hxx"
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>

sc/source/ui/inc/datastreamdlg.hxx

diff --git a/sc/source/ui/inc/datastreamdlg.hxx b/sc/source/ui/inc/datastreamdlg.hxx
index 851afef..947f683 100644
--- a/sc/source/ui/inc/datastreamdlg.hxx
+++ b/sc/source/ui/inc/datastreamdlg.hxx
@@ -13,7 +13,7 @@
#include <vcl/dialog.hxx>
#include <vcl/layout.hxx>

#include <datastream.hxx>
#include "datastream.hxx"

class ScDocShell;
class SvtURLBox;

sc/source/ui/inc/docfunc.hxx

diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index 1bdd027..dc0a0f2 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -22,7 +22,7 @@

#include <tools/link.hxx>
#include "global.hxx"
#include "formula/grammar.hxx"
#include <formula/grammar.hxx>
#include "tabbgcolor.hxx"
#include "token.hxx"
#include "rangenam.hxx"

sc/source/ui/inc/dpcontrol.hxx

diff --git a/sc/source/ui/inc/dpcontrol.hxx b/sc/source/ui/inc/dpcontrol.hxx
index cb48713..e574f67 100644
--- a/sc/source/ui/inc/dpcontrol.hxx
+++ b/sc/source/ui/inc/dpcontrol.hxx
@@ -20,9 +20,9 @@
#ifndef INCLUDED_SC_SOURCE_UI_INC_DPCONTROL_HXX
#define INCLUDED_SC_SOURCE_UI_INC_DPCONTROL_HXX

#include "rtl/ustring.hxx"
#include "tools/gen.hxx"
#include "tools/fract.hxx"
#include <rtl/ustring.hxx>
#include <tools/gen.hxx>
#include <tools/fract.hxx>

class OutputDevice;
class Point;

sc/source/ui/inc/formula.hxx

diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index ebeeac6..b5ad534 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -30,7 +30,7 @@

#include "compiler.hxx"

#include "formula/formula.hxx"
#include <formula/formula.hxx>
#include "IAnyRefDialog.hxx"

class ScViewData;

sc/source/ui/inc/inputhdl.hxx

diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index 9373138..0d57a2e 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -26,8 +26,8 @@

#include <tools/fract.hxx>
#include <tools/gen.hxx>
#include "tools/link.hxx"
#include "vcl/vclevent.hxx"
#include <tools/link.hxx>
#include <vcl/vclevent.hxx>
#include <editeng/svxenum.hxx>

#include <set>

sc/source/ui/inc/overlayobject.hxx

diff --git a/sc/source/ui/inc/overlayobject.hxx b/sc/source/ui/inc/overlayobject.hxx
index e1d10b2..2db52ce 100644
--- a/sc/source/ui/inc/overlayobject.hxx
+++ b/sc/source/ui/inc/overlayobject.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SC_SOURCE_UI_INC_OVERLAYOBJECT_HXX
#define INCLUDED_SC_SOURCE_UI_INC_OVERLAYOBJECT_HXX

#include "svx/sdr/overlay/overlayobject.hxx"
#include <svx/sdr/overlay/overlayobject.hxx>

class ScOverlayDashedBorder : public ::sdr::overlay::OverlayObject
{

sc/source/ui/inc/scuiasciiopt.hxx

diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx
index fae1675..23de9df 100644
--- a/sc/source/ui/inc/scuiasciiopt.hxx
+++ b/sc/source/ui/inc/scuiasciiopt.hxx
@@ -22,7 +22,7 @@


#include "asciiopt.hxx"
#include "svx/langbox.hxx"
#include <svx/langbox.hxx>

class ScImportAsciiDlg : public ModalDialog
{

sc/source/ui/inc/textimportoptions.hxx

diff --git a/sc/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx
index 635603c..0fd2f39 100644
--- a/sc/source/ui/inc/textimportoptions.hxx
+++ b/sc/source/ui/inc/textimportoptions.hxx
@@ -20,11 +20,11 @@
#ifndef INCLUDED_SC_SOURCE_UI_INC_TEXTIMPORTOPTIONS_HXX
#define INCLUDED_SC_SOURCE_UI_INC_TEXTIMPORTOPTIONS_HXX

#include "vcl/dialog.hxx"
#include "vcl/button.hxx"
#include "vcl/fixed.hxx"
#include "i18nlangtag/lang.h"
#include "svx/langbox.hxx"
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
#include <i18nlangtag/lang.h>
#include <svx/langbox.hxx>

class ScTextImportOptionsDlg : public ModalDialog
{

sc/source/ui/inc/undotab.hxx

diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx
index 9d2d67e..515e46c 100644
--- a/sc/source/ui/inc/undotab.hxx
+++ b/sc/source/ui/inc/undotab.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SC_SOURCE_UI_INC_UNDOTAB_HXX

#include "undobase.hxx"
#include "formula/grammar.hxx"
#include <formula/grammar.hxx>
#include <tools/color.hxx>
#include "tabbgcolor.hxx"

sc/source/ui/inc/xmlsourcedlg.hxx

diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx
index deaf008..c961489 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hxx
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -13,7 +13,7 @@
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
#include <vcl/layout.hxx>
#include "svtools/treelistbox.hxx"
#include <svtools/treelistbox.hxx>

#include "anyrefdg.hxx"
#include "orcusxml.hxx"

sc/source/ui/miscdlgs/datafdlg.cxx

diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx
index b4ad28d..a4d8207 100644
--- a/sc/source/ui/miscdlgs/datafdlg.cxx
+++ b/sc/source/ui/miscdlgs/datafdlg.cxx
@@ -16,7 +16,7 @@
#include "refundo.hxx"
#include "undodat.hxx"

#include "rtl/ustrbuf.hxx"
#include <rtl/ustrbuf.hxx>

#define HDL(hdl)            LINK( this, ScDataFormDlg, hdl )

sc/source/ui/miscdlgs/solveroptions.cxx

diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index ca7f83f..ad004b01 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -27,7 +27,7 @@
#include <vcl/msgbox.hxx>
#include <unotools/collatorwrapper.hxx>
#include <unotools/localedatawrapper.hxx>
#include "svtools/treelistentry.hxx"
#include <svtools/treelistentry.hxx>

#include <algorithm>

sc/source/ui/namedlg/namedlg.cxx

diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index ebddc78..4a0d4a1 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -30,7 +30,7 @@
#include "globalnames.hxx"
#include "tokenarray.hxx"

#include "sfx2/app.hxx"
#include <sfx2/app.hxx>

#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>

sc/source/ui/namedlg/namemgrtable.cxx

diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx
index 89f72e7..98d7653e 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -18,7 +18,7 @@
#include "viewdata.hxx"
#include "globalnames.hxx"

#include "sfx2/app.hxx"
#include <sfx2/app.hxx>

#define ITEMID_NAME 1
#define ITEMID_RANGE 2

sc/source/ui/optdlg/calcoptionsdlg.cxx

diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 15bc6f9..e5057af 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -11,8 +11,8 @@
#include "sc.hrc"
#include "scresid.hxx"

#include "svtools/svlbitm.hxx"
#include "svtools/treelistentry.hxx"
#include <svtools/svlbitm.hxx>
#include <svtools/treelistentry.hxx>

#if HAVE_FEATURE_OPENCL
#include "formulagroup.hxx"

sc/source/ui/optdlg/calcoptionsdlg.hxx

diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx
index 2c9ed72..9a0f579 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.hxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx
@@ -12,12 +12,12 @@

#include <config_features.h>

#include "vcl/dialog.hxx"
#include "vcl/button.hxx"
#include "vcl/fixed.hxx"
#include "vcl/lstbox.hxx"
#include "svx/checklbx.hxx"
#include "svtools/treelistbox.hxx"
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
#include <svx/checklbx.hxx>
#include <svtools/treelistbox.hxx>

#include "calcconfig.hxx"

sc/source/ui/optdlg/tpformula.cxx

diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index cfb96f69..1320081 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -26,9 +26,9 @@
#include "formulaopt.hxx"
#include "sc.hrc"
#include "scresid.hxx"
#include "formula/grammar.hxx"
#include <formula/grammar.hxx>
#include "calcoptionsdlg.hxx"
#include "vcl/msgbox.hxx"
#include <vcl/msgbox.hxx>

#include <unotools/localedatawrapper.hxx>

sc/source/ui/sidebar/AlignmentPropertyPanel.cxx

diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index 1e7ad55..d7d0d87 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -20,7 +20,7 @@
#include <sfx2/sidebar/ResourceDefinitions.hrc>
#include <sfx2/sidebar/Theme.hxx>
#include <sfx2/sidebar/ControlFactory.hxx>
#include <AlignmentPropertyPanel.hxx>
#include "AlignmentPropertyPanel.hxx"
#include <editeng/justifyitem.hxx>
#include <svx/dialmgr.hxx>
#include "sc.hrc"

sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx

diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index 66e28c3..4f2ddf9 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -20,7 +20,7 @@
#include <sfx2/sidebar/ResourceDefinitions.hrc>
#include <sfx2/sidebar/Theme.hxx>
#include <sfx2/sidebar/ControlFactory.hxx>
#include <CellAppearancePropertyPanel.hxx>
#include "CellAppearancePropertyPanel.hxx"
#include <CellAppearancePropertyPanel.hrc>
#include "sc.hrc"
#include "scresid.hxx"
@@ -38,11 +38,11 @@
#include <svx/sidebar/ColorControl.hxx>
#include <boost/bind.hpp>
#include <svx/sidebar/PopupContainer.hxx>
#include <CellLineStyleControl.hxx>
#include <CellLineStylePopup.hxx>
#include <CellBorderUpdater.hxx>
#include <CellBorderStyleControl.hxx>
#include <CellBorderStylePopup.hxx>
#include "CellLineStyleControl.hxx"
#include "CellLineStylePopup.hxx"
#include "CellBorderUpdater.hxx"
#include "CellBorderStyleControl.hxx"
#include "CellBorderStylePopup.hxx"

using namespace css;
using namespace cssu;

sc/source/ui/sidebar/CellBorderStyleControl.cxx

diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
index da14577..5330ed0 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
@@ -17,13 +17,13 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

#include <CellBorderStyleControl.hxx>
#include "CellBorderStyleControl.hxx"
#include "sc.hrc"
#include "scresid.hxx"
#include <CellAppearancePropertyPanel.hrc>
#include <editeng/boxitem.hxx>
#include <editeng/borderline.hxx>
#include <CellAppearancePropertyPanel.hxx>
#include "CellAppearancePropertyPanel.hxx"
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
#include <vcl/svapp.hxx>

sc/source/ui/sidebar/CellBorderUpdater.cxx

diff --git a/sc/source/ui/sidebar/CellBorderUpdater.cxx b/sc/source/ui/sidebar/CellBorderUpdater.cxx
index fccecb19..1eb9bf4 100644
--- a/sc/source/ui/sidebar/CellBorderUpdater.cxx
+++ b/sc/source/ui/sidebar/CellBorderUpdater.cxx
@@ -17,7 +17,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

#include <CellBorderUpdater.hxx>
#include "CellBorderUpdater.hxx"
#include <vcl/bmpacc.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>

sc/source/ui/sidebar/CellLineStyleControl.cxx

diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx
index d6f55ce..2225ffc 100644
--- a/sc/source/ui/sidebar/CellLineStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx
@@ -17,17 +17,17 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

#include <CellLineStyleControl.hxx>
#include "CellLineStyleControl.hxx"
#include "sc.hrc"
#include "scresid.hxx"
#include <CellAppearancePropertyPanel.hrc>
#include <CellLineStyleValueSet.hxx>
#include "CellLineStyleValueSet.hxx"
#include <vcl/i18nhelp.hxx>
#include <vcl/settings.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/borderline.hxx>
#include <editeng/lineitem.hxx>
#include <CellAppearancePropertyPanel.hxx>
#include "CellAppearancePropertyPanel.hxx"
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>

sc/source/ui/sidebar/CellLineStyleControl.hxx

diff --git a/sc/source/ui/sidebar/CellLineStyleControl.hxx b/sc/source/ui/sidebar/CellLineStyleControl.hxx
index 86f455f..a898703 100644
--- a/sc/source/ui/sidebar/CellLineStyleControl.hxx
+++ b/sc/source/ui/sidebar/CellLineStyleControl.hxx
@@ -21,7 +21,7 @@

#include <svx/sidebar/PopupControl.hxx>
#include <vcl/button.hxx>
#include <CellLineStyleValueSet.hxx>
#include "CellLineStyleValueSet.hxx"

namespace sc { namespace sidebar {

sc/source/ui/sidebar/CellLineStyleValueSet.cxx

diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
index 4819d0f..1472dff 100644
--- a/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleValueSet.cxx
@@ -17,7 +17,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

#include <CellLineStyleValueSet.hxx>
#include "CellLineStyleValueSet.hxx"
#include <i18nlangtag/mslangid.hxx>
#include <vcl/settings.hxx>

sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx

diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index 142bd51..145beb9 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -20,7 +20,7 @@
#include <sfx2/sidebar/ResourceDefinitions.hrc>
#include <sfx2/sidebar/Theme.hxx>
#include <sfx2/sidebar/ControlFactory.hxx>
#include <NumberFormatPropertyPanel.hxx>
#include "NumberFormatPropertyPanel.hxx"
#include "sc.hrc"
#include "scresid.hxx"
#include <sfx2/bindings.hxx>

sc/source/ui/sidebar/ScPanelFactory.cxx

diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx b/sc/source/ui/sidebar/ScPanelFactory.cxx
index 739489e..03fe29a 100644
--- a/sc/source/ui/sidebar/ScPanelFactory.cxx
+++ b/sc/source/ui/sidebar/ScPanelFactory.cxx
@@ -19,9 +19,9 @@

#include "ScPanelFactory.hxx"

#include <AlignmentPropertyPanel.hxx>
#include <CellAppearancePropertyPanel.hxx>
#include <NumberFormatPropertyPanel.hxx>
#include "AlignmentPropertyPanel.hxx"
#include "CellAppearancePropertyPanel.hxx"
#include "NumberFormatPropertyPanel.hxx"
#include <navipi.hxx>
#include <dwfunctr.hxx>
#include "sc.hrc"

sc/source/ui/undo/undocell.cxx

diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index f0e6803..1119a9e 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -23,7 +23,7 @@
#include <editeng/eeitem.hxx>
#include <editeng/editobj.hxx>
#include <svl/zforlist.hxx>
#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>
#include <sfx2/app.hxx>

#include "document.hxx"

sc/source/ui/undo/undorangename.cxx

diff --git a/sc/source/ui/undo/undorangename.cxx b/sc/source/ui/undo/undorangename.cxx
index 172f802d..db9b0e4 100644
--- a/sc/source/ui/undo/undorangename.cxx
+++ b/sc/source/ui/undo/undorangename.cxx
@@ -14,7 +14,7 @@
#include "docfunc.hxx"
#include "sc.hrc"

#include "sfx2/app.hxx"
#include <sfx2/app.hxx>

#include <memory>

sc/source/ui/unoobj/appluno.cxx

diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 7c46639..efddd0a 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -19,7 +19,7 @@


#include "appluno.hxx"
#include "sal/types.h"
#include <sal/types.h>
#include <osl/diagnose.h>
#include <cppuhelper/factory.hxx>

sc/source/ui/unoobj/cellsuno.cxx

diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 98f256c..832c06b 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -27,12 +27,12 @@
#include <editeng/editeng.hxx>
#include <editeng/flditem.hxx>
#include <editeng/justifyitem.hxx>
#include "editeng/editobj.hxx"
#include <editeng/editobj.hxx>
#include <svx/fmdpage.hxx>
#include <editeng/langitem.hxx>
#include <sfx2/linkmgr.hxx>
#include <svl/srchitem.hxx>
#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>
#include <svx/unomid.hxx>
#include <editeng/unoprnms.hxx>
#include <editeng/unotext.hxx>
@@ -116,10 +116,10 @@
#include "unowids.hxx"
#include "paramisc.hxx"
#include "queryentry.hxx"
#include "formula/errorcodes.hxx"
#include <formula/errorcodes.hxx>
#include "unoreflist.hxx"
#include "formula/grammar.hxx"
#include "editeng/escapementitem.hxx"
#include <formula/grammar.hxx>
#include <editeng/escapementitem.hxx>
#include "stringutil.hxx"
#include "formulaiter.hxx"
#include "tokenarray.hxx"

sc/source/ui/unoobj/chart2uno.cxx

diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 62d1573..29e4efa 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -39,8 +39,8 @@
#include "tokenarray.hxx"
#include "scmatrix.hxx"

#include "formula/opcode.hxx"
#include "svl/sharedstring.hxx"
#include <formula/opcode.hxx>
#include <svl/sharedstring.hxx>

#include <sfx2/objsh.hxx>
#include <vcl/svapp.hxx>

sc/source/ui/unoobj/datauno.cxx

diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 0296a25..8103bb3 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -21,7 +21,7 @@

#include <svl/smplhint.hxx>
#include <svl/zforlist.hxx>
#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>
#include <vcl/svapp.hxx>

#include <com/sun/star/awt/XBitmap.hpp>

sc/source/ui/unoobj/exceldetect.cxx

diff --git a/sc/source/ui/unoobj/exceldetect.cxx b/sc/source/ui/unoobj/exceldetect.cxx
index 525d2ac..3f56fa4 100644
--- a/sc/source/ui/unoobj/exceldetect.cxx
+++ b/sc/source/ui/unoobj/exceldetect.cxx
@@ -13,13 +13,13 @@
#include <com/sun/star/ucb/XContent.hpp>
#include <cppuhelper/supportsservice.hxx>

#include "svl/itemset.hxx"
#include "svl/eitem.hxx"
#include "sfx2/app.hxx"
#include "sfx2/docfile.hxx"
#include "sfx2/sfxsids.hrc"
#include "unotools/mediadescriptor.hxx"
#include "sot/storage.hxx"
#include <svl/itemset.hxx>
#include <svl/eitem.hxx>
#include <sfx2/app.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/sfxsids.hrc>
#include <unotools/mediadescriptor.hxx>
#include <sot/storage.hxx>

using namespace com::sun::star;
using utl::MediaDescriptor;

sc/source/ui/unoobj/filtuno.cxx

diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index 6418d606..0fa086f 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -35,7 +35,7 @@

#include "sc.hrc"
#include "scabstdlg.hxx"
#include "i18nlangtag/lang.h"
#include <i18nlangtag/lang.h>

#include <optutil.hxx>
#include <com/sun/star/uno/Any.hxx>

sc/source/ui/unoobj/funcuno.cxx

diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index 19d41cad..fe8ce61 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -29,7 +29,7 @@
#include "scdll.hxx"
#include "document.hxx"
#include "compiler.hxx"
#include "formula/errorcodes.hxx"
#include <formula/errorcodes.hxx>
#include "callform.hxx"
#include "addincol.hxx"
#include "rangeseq.hxx"

sc/source/ui/unoobj/viewuno.cxx

diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index e6b82cc..ecb51c1 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -70,7 +70,7 @@
#include <svx/sdrhittesthelper.hxx>
#include <boost/foreach.hpp>
#include "formatsh.hxx"
#include "sfx2/app.hxx"
#include <sfx2/app.hxx>

using namespace com::sun::star;

sc/source/ui/vba/service.cxx

diff --git a/sc/source/ui/vba/service.cxx b/sc/source/ui/vba/service.cxx
index 95d62219..1187ce8 100644
--- a/sc/source/ui/vba/service.cxx
+++ b/sc/source/ui/vba/service.cxx
@@ -16,10 +16,10 @@
 *   except in compliance with the License. You may obtain a copy of
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */
#include "cppuhelper/implementationentry.hxx"
#include "com/sun/star/lang/XMultiServiceFactory.hpp"
#include "com/sun/star/registry/XRegistryKey.hpp"
#include "comphelper/servicedecl.hxx"
#include <cppuhelper/implementationentry.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/registry/XRegistryKey.hpp>
#include <comphelper/servicedecl.hxx>


// component exports

sc/source/ui/view/cellsh4.cxx

diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx
index 3396ae5..a2a30f8 100644
--- a/sc/source/ui/view/cellsh4.cxx
+++ b/sc/source/ui/view/cellsh4.cxx
@@ -28,7 +28,7 @@
#include "document.hxx"
#include "sc.hrc"

#include "vcl/svapp.hxx"
#include <vcl/svapp.hxx>

void ScCellShell::ExecuteCursor( SfxRequest& rReq )
{

sc/source/ui/view/cliputil.cxx

diff --git a/sc/source/ui/view/cliputil.cxx b/sc/source/ui/view/cliputil.cxx
index 242a575..239c809 100644
--- a/sc/source/ui/view/cliputil.cxx
+++ b/sc/source/ui/view/cliputil.cxx
@@ -19,7 +19,7 @@
#include "viewutil.hxx"
#include "markdata.hxx"

#include "vcl/waitobj.hxx"
#include <vcl/waitobj.hxx>

void ScClipUtil::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTabViewShell, bool bShowDialog )
{

sc/source/ui/view/gridwin.cxx

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 9e88a0b..2082d8d 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -27,9 +27,9 @@
#include <editeng/editstat.hxx>
#include <editeng/flditem.hxx>
#include <editeng/justifyitem.hxx>
#include "editeng/unolingu.hxx"
#include "editeng/langitem.hxx"
#include "editeng/misspellrange.hxx"
#include <editeng/unolingu.hxx>
#include <editeng/langitem.hxx>
#include <editeng/misspellrange.hxx>
#include <svx/svdetc.hxx>
#include <editeng/editobj.hxx>
#include <sfx2/dispatch.hxx>
@@ -38,7 +38,7 @@
#include <svl/stritem.hxx>
#include <svtools/svtabbx.hxx>
#include <svl/urlbmk.hxx>
#include "svl/sharedstringpool.hxx"
#include <svl/sharedstringpool.hxx>
#include <vcl/cursor.hxx>
#include <vcl/graph.hxx>
#include <vcl/hatch.hxx>

sc/source/ui/view/imapwrap.cxx

diff --git a/sc/source/ui/view/imapwrap.cxx b/sc/source/ui/view/imapwrap.cxx
index 38a0026..959ada7 100644
--- a/sc/source/ui/view/imapwrap.cxx
+++ b/sc/source/ui/view/imapwrap.cxx
@@ -20,7 +20,7 @@
#include <svx/imapdlg.hxx>
#include <sfx2/viewfrm.hxx>

#include <imapwrap.hxx>
#include "imapwrap.hxx"

sal_uInt16 ScIMapChildWindowId()
{

sc/source/ui/view/overlayobject.cxx

diff --git a/sc/source/ui/view/overlayobject.cxx b/sc/source/ui/view/overlayobject.cxx
index e3ec7e7..778e44f 100644
--- a/sc/source/ui/view/overlayobject.cxx
+++ b/sc/source/ui/view/overlayobject.cxx
@@ -18,15 +18,15 @@
 */

#include "overlayobject.hxx"
#include "vcl/outdev.hxx"
#include "vcl/lineinfo.hxx"
#include "tools/fract.hxx"
#include "basegfx/range/b2drange.hxx"
#include "basegfx/polygon/b2dpolygon.hxx"
#include "basegfx/polygon/b2dpolygontools.hxx"
#include "svx/sdr/overlay/overlaymanager.hxx"
#include "drawinglayer/primitive2d/baseprimitive2d.hxx"
#include "drawinglayer/primitive2d/polypolygonprimitive2d.hxx"
#include <vcl/outdev.hxx>
#include <vcl/lineinfo.hxx>
#include <tools/fract.hxx>
#include <basegfx/range/b2drange.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <svx/sdr/overlay/overlaymanager.hxx>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>

using ::sdr::overlay::OverlayObject;
using ::sdr::overlay::OverlayManager;

sc/source/ui/view/tabview3.cxx

diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 9f002d3..c37cd4c 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -62,7 +62,7 @@
#include "client.hxx"
#include "tabprotection.hxx"
#include "markdata.hxx"
#include "formula/FormulaCompiler.hxx"
#include <formula/FormulaCompiler.hxx>

#include <com/sun/star/chart2/data/HighlightedRange.hpp>

sc/source/ui/view/tabvwsh5.cxx

diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index 56112f3..636fcfb 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -38,7 +38,7 @@
#include "editsh.hxx"
#include "hints.hxx"
#include "cellvalue.hxx"
#include "svl/sharedstring.hxx"
#include <svl/sharedstring.hxx>

void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{

sc/source/ui/view/viewfun6.cxx

diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index 7be1a70..abfb11a 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -23,8 +23,8 @@
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
#include <vcl/msgbox.hxx>
#include "svl/zforlist.hxx"
#include "svl/zformat.hxx"
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>

#include "viewfunc.hxx"
#include "detfunc.hxx"

sc/source/ui/xmlsource/xmlsourcedlg.cxx

diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 1288973..95d00d8 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -16,12 +16,12 @@
#include "reffact.hxx"
#include "tabvwsh.hxx"

#include "unotools/pathoptions.hxx"
#include "tools/urlobj.hxx"
#include "svtools/svlbitm.hxx"
#include "svtools/treelistentry.hxx"
#include "svtools/viewdataentry.hxx"
#include "sfx2/objsh.hxx"
#include <unotools/pathoptions.hxx>
#include <tools/urlobj.hxx>
#include <svtools/svlbitm.hxx>
#include <svtools/treelistentry.hxx>
#include <svtools/viewdataentry.hxx>
#include <sfx2/objsh.hxx>

#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/ui/dialogs/FilePicker.hpp>