summaryrefslogtreecommitdiff
path: root/sc/inc
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2014-04-18 19:10:04 +0200
committerThomas Arnhold <thomas@arnhold.org>2014-04-19 11:10:10 +0200
commit2dfd63991607cc3388cbdc1de745c34d9102804b (patch)
tree665d6d89a43dc9cf93a2a5acc90d95324d403b1e /sc/inc
parent436f9d16c4b2535ebf927e4fb56c3b7bfee9e509 (diff)
fixincludeguards.sh: sc
sorry, huge one...
Diffstat (limited to 'sc/inc')
-rw-r--r--sc/inc/AccessibleFilterMenu.hxx4
-rw-r--r--sc/inc/AccessibleFilterMenuItem.hxx4
-rw-r--r--sc/inc/AccessibleFilterTopWindow.hxx4
-rw-r--r--sc/inc/AccessibleGlobal.hxx4
-rw-r--r--sc/inc/ScPanelFactory.hxx4
-rw-r--r--sc/inc/ViewSettingsSequenceDefines.hxx4
-rw-r--r--sc/inc/addincfg.hxx4
-rw-r--r--sc/inc/addincol.hxx4
-rw-r--r--sc/inc/address.hxx6
-rw-r--r--sc/inc/addruno.hxx4
-rw-r--r--sc/inc/afmtuno.hxx4
-rw-r--r--sc/inc/appluno.hxx4
-rw-r--r--sc/inc/appoptio.hxx4
-rw-r--r--sc/inc/arealink.hxx4
-rw-r--r--sc/inc/attarray.hxx4
-rw-r--r--sc/inc/attrib.hxx4
-rw-r--r--sc/inc/autoform.hxx4
-rw-r--r--sc/inc/autonamecache.hxx4
-rw-r--r--sc/inc/bigrange.hxx4
-rw-r--r--sc/inc/brdcst.hxx4
-rw-r--r--sc/inc/calcconfig.hxx4
-rw-r--r--sc/inc/calcmacros.hxx4
-rw-r--r--sc/inc/callform.hxx4
-rw-r--r--sc/inc/cellform.hxx4
-rw-r--r--sc/inc/cellsuno.hxx4
-rw-r--r--sc/inc/cellvalue.hxx4
-rw-r--r--sc/inc/cellvalues.hxx4
-rw-r--r--sc/inc/cfgids.hxx4
-rw-r--r--sc/inc/chart2uno.hxx6
-rw-r--r--sc/inc/chartarr.hxx4
-rw-r--r--sc/inc/charthelper.hxx4
-rw-r--r--sc/inc/chartlis.hxx4
-rw-r--r--sc/inc/chartlock.hxx4
-rw-r--r--sc/inc/chartpos.hxx4
-rw-r--r--sc/inc/chartuno.hxx4
-rw-r--r--sc/inc/chgtrack.hxx4
-rw-r--r--sc/inc/chgviset.hxx4
-rw-r--r--sc/inc/clipcontext.hxx4
-rw-r--r--sc/inc/clipdata.hxx4
-rw-r--r--sc/inc/clipparam.hxx4
-rw-r--r--sc/inc/colorscale.hxx4
-rw-r--r--sc/inc/column.hxx4
-rw-r--r--sc/inc/columniterator.hxx4
-rw-r--r--sc/inc/columnset.hxx4
-rw-r--r--sc/inc/columnspanset.hxx4
-rw-r--r--sc/inc/compare.hxx4
-rw-r--r--sc/inc/compiler.hxx4
-rw-r--r--sc/inc/compressedarray.hxx6
-rw-r--r--sc/inc/conditio.hxx4
-rw-r--r--sc/inc/confuno.hxx4
-rw-r--r--sc/inc/consoli.hxx4
-rw-r--r--sc/inc/convuno.hxx4
-rw-r--r--sc/inc/cursuno.hxx4
-rw-r--r--sc/inc/dapiuno.hxx4
-rw-r--r--sc/inc/datauno.hxx4
-rw-r--r--sc/inc/dbdata.hxx4
-rw-r--r--sc/inc/dbdocutl.hxx4
-rw-r--r--sc/inc/defaultsoptions.hxx4
-rw-r--r--sc/inc/defltuno.hxx4
-rw-r--r--sc/inc/detdata.hxx4
-rw-r--r--sc/inc/detfunc.hxx4
-rw-r--r--sc/inc/dispuno.hxx4
-rw-r--r--sc/inc/dociter.hxx4
-rw-r--r--sc/inc/docoptio.hxx4
-rw-r--r--sc/inc/docparam.hxx4
-rw-r--r--sc/inc/docpool.hxx4
-rw-r--r--sc/inc/document.hxx4
-rw-r--r--sc/inc/documentimport.hxx4
-rw-r--r--sc/inc/documentlinkmgr.hxx4
-rw-r--r--sc/inc/documentstreamaccess.hxx4
-rw-r--r--sc/inc/docuno.hxx4
-rw-r--r--sc/inc/dpcache.hxx4
-rw-r--r--sc/inc/dpdimsave.hxx4
-rw-r--r--sc/inc/dpfilteredcache.hxx4
-rw-r--r--sc/inc/dpglobal.hxx4
-rw-r--r--sc/inc/dpgroup.hxx4
-rw-r--r--sc/inc/dpitemdata.hxx4
-rw-r--r--sc/inc/dpnumgroupinfo.hxx4
-rw-r--r--sc/inc/dpobject.hxx4
-rw-r--r--sc/inc/dpoutput.hxx4
-rw-r--r--sc/inc/dpoutputgeometry.hxx4
-rw-r--r--sc/inc/dpresfilter.hxx4
-rw-r--r--sc/inc/dpsave.hxx4
-rw-r--r--sc/inc/dpsdbtab.hxx4
-rw-r--r--sc/inc/dpshttab.hxx4
-rw-r--r--sc/inc/dptabdat.hxx4
-rw-r--r--sc/inc/dptabres.hxx4
-rw-r--r--sc/inc/dptabsrc.hxx4
-rw-r--r--sc/inc/dptypes.hxx4
-rw-r--r--sc/inc/dputil.hxx4
-rw-r--r--sc/inc/dragdata.hxx4
-rw-r--r--sc/inc/drawattr.hxx4
-rw-r--r--sc/inc/drawpage.hxx4
-rw-r--r--sc/inc/drdefuno.hxx4
-rw-r--r--sc/inc/drwlayer.hxx4
-rw-r--r--sc/inc/editdataarray.hxx4
-rw-r--r--sc/inc/editsrc.hxx4
-rw-r--r--sc/inc/edittextiterator.hxx4
-rw-r--r--sc/inc/editutil.hxx4
-rw-r--r--sc/inc/eventuno.hxx4
-rw-r--r--sc/inc/externalrefmgr.hxx4
-rw-r--r--sc/inc/fielduno.hxx4
-rw-r--r--sc/inc/fillinfo.hxx4
-rw-r--r--sc/inc/filter.hxx4
-rw-r--r--sc/inc/filtopt.hxx4
-rw-r--r--sc/inc/filtuno.hxx4
-rw-r--r--sc/inc/fmtuno.hxx4
-rw-r--r--sc/inc/forbiuno.hxx4
-rw-r--r--sc/inc/formulacell.hxx4
-rw-r--r--sc/inc/formulagroup.hxx4
-rw-r--r--sc/inc/formulaiter.hxx4
-rw-r--r--sc/inc/formulaopt.hxx4
-rw-r--r--sc/inc/formulaparserpool.hxx4
-rw-r--r--sc/inc/formularesult.hxx6
-rw-r--r--sc/inc/fstalgorithm.hxx4
-rw-r--r--sc/inc/funcdesc.hxx6
-rw-r--r--sc/inc/funcuno.hxx4
-rw-r--r--sc/inc/global.hxx4
-rw-r--r--sc/inc/globalnames.hxx4
-rw-r--r--sc/inc/hints.hxx4
-rw-r--r--sc/inc/importfilterdata.hxx4
-rw-r--r--sc/inc/inputopt.hxx4
-rw-r--r--sc/inc/linkuno.hxx4
-rw-r--r--sc/inc/listenercalls.hxx4
-rw-r--r--sc/inc/listenercontext.hxx4
-rw-r--r--sc/inc/lookupcache.hxx4
-rw-r--r--sc/inc/macromgr.hxx4
-rw-r--r--sc/inc/markarr.hxx4
-rw-r--r--sc/inc/markdata.hxx4
-rw-r--r--sc/inc/miscuno.hxx4
-rw-r--r--sc/inc/mtvcellfunc.hxx4
-rw-r--r--sc/inc/mtvelements.hxx4
-rw-r--r--sc/inc/mtvfunctions.hxx4
-rw-r--r--sc/inc/mutexhlp.hxx4
-rw-r--r--sc/inc/nameuno.hxx4
-rw-r--r--sc/inc/navicfg.hxx4
-rw-r--r--sc/inc/notesuno.hxx4
-rw-r--r--sc/inc/olinetab.hxx4
-rw-r--r--sc/inc/optuno.hxx4
-rw-r--r--sc/inc/optutil.hxx4
-rw-r--r--sc/inc/orcusfilters.hxx4
-rw-r--r--sc/inc/orcusxml.hxx4
-rw-r--r--sc/inc/pagepar.hxx4
-rw-r--r--sc/inc/pageuno.hxx4
-rw-r--r--sc/inc/paramisc.hxx6
-rw-r--r--sc/inc/patattr.hxx4
-rw-r--r--sc/inc/pivot.hxx4
-rw-r--r--sc/inc/platforminfo.hxx4
-rw-r--r--sc/inc/postit.hxx4
-rw-r--r--sc/inc/printopt.hxx4
-rw-r--r--sc/inc/prnsave.hxx4
-rw-r--r--sc/inc/progress.hxx4
-rw-r--r--sc/inc/queryentry.hxx4
-rw-r--r--sc/inc/queryparam.hxx4
-rw-r--r--sc/inc/rangelst.hxx4
-rw-r--r--sc/inc/rangenam.hxx4
-rw-r--r--sc/inc/rangeseq.hxx4
-rw-r--r--sc/inc/rangeutl.hxx6
-rw-r--r--sc/inc/rechead.hxx4
-rw-r--r--sc/inc/recursionhelper.hxx6
-rw-r--r--sc/inc/refdata.hxx4
-rw-r--r--sc/inc/reffind.hxx4
-rw-r--r--sc/inc/refhint.hxx4
-rw-r--r--sc/inc/refreshtimer.hxx6
-rw-r--r--sc/inc/refreshtimerprotector.hxx4
-rw-r--r--sc/inc/reftokenhelper.hxx4
-rw-r--r--sc/inc/refupdatecontext.hxx4
-rw-r--r--sc/inc/rowheightcontext.hxx4
-rw-r--r--sc/inc/scabstdlg.hxx4
-rw-r--r--sc/inc/sccommands.h4
-rw-r--r--sc/inc/scdll.hxx4
-rw-r--r--sc/inc/scdllapi.h6
-rw-r--r--sc/inc/scerrors.hxx4
-rw-r--r--sc/inc/scextopt.hxx4
-rw-r--r--sc/inc/scitems.hxx4
-rw-r--r--sc/inc/scmatrix.hxx6
-rw-r--r--sc/inc/scmod.hxx4
-rw-r--r--sc/inc/scopetools.hxx4
-rw-r--r--sc/inc/scresid.hxx4
-rw-r--r--sc/inc/scwarngs.hxx4
-rw-r--r--sc/inc/segmenttree.hxx4
-rw-r--r--sc/inc/servuno.hxx4
-rw-r--r--sc/inc/shapeuno.hxx4
-rw-r--r--sc/inc/sharedformula.hxx4
-rw-r--r--sc/inc/sheetdata.hxx4
-rw-r--r--sc/inc/sheetevents.hxx4
-rw-r--r--sc/inc/shellids.hxx4
-rw-r--r--sc/inc/simpleformulacalc.hxx4
-rw-r--r--sc/inc/simplehintids.hxx4
-rw-r--r--sc/inc/simplerangelist.hxx4
-rw-r--r--sc/inc/sortparam.hxx6
-rw-r--r--sc/inc/spellcheckcontext.hxx4
-rw-r--r--sc/inc/srchuno.hxx4
-rw-r--r--sc/inc/stlalgorithm.hxx4
-rw-r--r--sc/inc/stlpool.hxx6
-rw-r--r--sc/inc/stlsheet.hxx6
-rw-r--r--sc/inc/stringutil.hxx4
-rw-r--r--sc/inc/strload.hxx6
-rw-r--r--sc/inc/stylehelper.hxx4
-rw-r--r--sc/inc/styleuno.hxx4
-rw-r--r--sc/inc/subtotal.hxx4
-rw-r--r--sc/inc/subtotalparam.hxx4
-rw-r--r--sc/inc/tabbgcolor.hxx4
-rw-r--r--sc/inc/table.hxx4
-rw-r--r--sc/inc/tablink.hxx4
-rw-r--r--sc/inc/tabopparams.hxx4
-rw-r--r--sc/inc/tabprotection.hxx4
-rw-r--r--sc/inc/targuno.hxx4
-rw-r--r--sc/inc/textuno.hxx4
-rw-r--r--sc/inc/token.hxx4
-rw-r--r--sc/inc/tokenarray.hxx6
-rw-r--r--sc/inc/tokenstringcontext.hxx4
-rw-r--r--sc/inc/tokenuno.hxx4
-rw-r--r--sc/inc/typedstrdata.hxx4
-rw-r--r--sc/inc/types.hxx4
-rw-r--r--sc/inc/undorangename.hxx4
-rw-r--r--sc/inc/unitconv.hxx4
-rw-r--r--sc/inc/unonames.hxx4
-rw-r--r--sc/inc/unoreflist.hxx4
-rw-r--r--sc/inc/unowids.hxx4
-rw-r--r--sc/inc/userdat.hxx4
-rw-r--r--sc/inc/userlist.hxx4
-rw-r--r--sc/inc/validat.hxx4
-rw-r--r--sc/inc/viewopti.hxx4
-rw-r--r--sc/inc/viewuno.hxx4
-rw-r--r--sc/inc/waitoff.hxx4
-rw-r--r--sc/inc/warnpassword.hxx4
-rw-r--r--sc/inc/xmlwrap.hxx4
-rw-r--r--sc/inc/zforauto.hxx4
229 files changed, 474 insertions, 474 deletions
diff --git a/sc/inc/AccessibleFilterMenu.hxx b/sc/inc/AccessibleFilterMenu.hxx
index c06696450d62..f24dd1440cc2 100644
--- a/sc/inc/AccessibleFilterMenu.hxx
+++ b/sc/inc/AccessibleFilterMenu.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_ACCESSIBLEFILTERMENU_HXX
-#define SC_ACCESSIBLEFILTERMENU_HXX
+#ifndef INCLUDED_SC_INC_ACCESSIBLEFILTERMENU_HXX
+#define INCLUDED_SC_INC_ACCESSIBLEFILTERMENU_HXX
#include "AccessibleContextBase.hxx"
#include "cppuhelper/implbase1.hxx"
diff --git a/sc/inc/AccessibleFilterMenuItem.hxx b/sc/inc/AccessibleFilterMenuItem.hxx
index 12a6a2bce2a2..e01bdeca48c8 100644
--- a/sc/inc/AccessibleFilterMenuItem.hxx
+++ b/sc/inc/AccessibleFilterMenuItem.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_ACCESSIBLEFILTERMENUITEM_HXX
-#define SC_ACCESSIBLEFILTERMENUITEM_HXX
+#ifndef INCLUDED_SC_INC_ACCESSIBLEFILTERMENUITEM_HXX
+#define INCLUDED_SC_INC_ACCESSIBLEFILTERMENUITEM_HXX
#include "AccessibleContextBase.hxx"
#include "cppuhelper/implbase1.hxx"
diff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxx
index 8b1f997f5114..23039791ee8b 100644
--- a/sc/inc/AccessibleFilterTopWindow.hxx
+++ b/sc/inc/AccessibleFilterTopWindow.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_ACCESSIBLEFILTERTOPWINDOW_HXX
-#define SC_ACCESSIBLEFILTERTOPWINDOW_HXX
+#ifndef INCLUDED_SC_INC_ACCESSIBLEFILTERTOPWINDOW_HXX
+#define INCLUDED_SC_INC_ACCESSIBLEFILTERTOPWINDOW_HXX
#include "AccessibleFilterMenu.hxx"
#include "cppuhelper/implbase1.hxx"
diff --git a/sc/inc/AccessibleGlobal.hxx b/sc/inc/AccessibleGlobal.hxx
index 3421b476c0be..abcc263cf53c 100644
--- a/sc/inc/AccessibleGlobal.hxx
+++ b/sc/inc/AccessibleGlobal.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_ACCESSIBLEGLOBAL_HXX
-#define SC_ACCESSIBLEGLOBAL_HXX
+#ifndef INCLUDED_SC_INC_ACCESSIBLEGLOBAL_HXX
+#define INCLUDED_SC_INC_ACCESSIBLEGLOBAL_HXX
#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
#include "cppuhelper/implbase1.hxx"
diff --git a/sc/inc/ScPanelFactory.hxx b/sc/inc/ScPanelFactory.hxx
index 49078629e8c2..d933c1ce35e5 100644
--- a/sc/inc/ScPanelFactory.hxx
+++ b/sc/inc/ScPanelFactory.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_SIDEBAR_PANEL_FACTORY_HXX
-#define SC_SIDEBAR_PANEL_FACTORY_HXX
+#ifndef INCLUDED_SC_INC_SCPANELFACTORY_HXX
+#define INCLUDED_SC_INC_SCPANELFACTORY_HXX
#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/basemutex.hxx>
diff --git a/sc/inc/ViewSettingsSequenceDefines.hxx b/sc/inc/ViewSettingsSequenceDefines.hxx
index d1a4c5676187..c943d86c1be7 100644
--- a/sc/inc/ViewSettingsSequenceDefines.hxx
+++ b/sc/inc/ViewSettingsSequenceDefines.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SC_VIEWSETTINGSSEQUENCEDEFINES_HXX
-#define _SC_VIEWSETTINGSSEQUENCEDEFINES_HXX
+#ifndef INCLUDED_SC_INC_VIEWSETTINGSSEQUENCEDEFINES_HXX
+#define INCLUDED_SC_INC_VIEWSETTINGSSEQUENCEDEFINES_HXX
// this are the defines for the position of the settings in the
// ViewSettingsSequence
diff --git a/sc/inc/addincfg.hxx b/sc/inc/addincfg.hxx
index 2b83de55c3f9..33d7de40f5d2 100644
--- a/sc/inc/addincfg.hxx
+++ b/sc/inc/addincfg.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_ADDINCFG_HXX
-#define SC_ADDINCFG_HXX
+#ifndef INCLUDED_SC_INC_ADDINCFG_HXX
+#define INCLUDED_SC_INC_ADDINCFG_HXX
#include <unotools/configitem.hxx>
diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx
index 8c08672f0748..c6995ea32a47 100644
--- a/sc/inc/addincol.hxx
+++ b/sc/inc/addincol.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_ADDINCOL_HXX
-#define SC_ADDINCOL_HXX
+#ifndef INCLUDED_SC_INC_ADDINCOL_HXX
+#define INCLUDED_SC_INC_ADDINCOL_HXX
#include "global.hxx"
#include <com/sun/star/sheet/XVolatileResult.hpp>
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 1c03aa3c6fc5..e8f4c93f830b 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_ADDRESS_HXX
-#define SC_ADDRESS_HXX
+#ifndef INCLUDED_SC_INC_ADDRESS_HXX
+#define INCLUDED_SC_INC_ADDRESS_HXX
#include <tools/stream.hxx>
#include <rtl/ustrbuf.hxx>
@@ -913,6 +913,6 @@ inline OUString ScColToAlpha( SCCOL nCol )
/// get column number of A..IV... string
bool AlphaToCol( SCCOL& rCol, const OUString& rStr);
-#endif // SC_ADDRESS_HXX
+#endif // INCLUDED_SC_INC_ADDRESS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/addruno.hxx b/sc/inc/addruno.hxx
index 0b8204281ce6..b0df2b3b7e21 100644
--- a/sc/inc/addruno.hxx
+++ b/sc/inc/addruno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_ADDRUNO_HXX
-#define SC_ADDRUNO_HXX
+#ifndef INCLUDED_SC_INC_ADDRUNO_HXX
+#define INCLUDED_SC_INC_ADDRUNO_HXX
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx
index 8b092e77e90b..15c1e5fff20f 100644
--- a/sc/inc/afmtuno.hxx
+++ b/sc/inc/afmtuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_AFMTUNO_HXX
-#define SC_AFMTUNO_HXX
+#ifndef INCLUDED_SC_INC_AFMTUNO_HXX
+#define INCLUDED_SC_INC_AFMTUNO_HXX
#include <svl/lstner.hxx>
#include <svl/itemprop.hxx>
diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx
index 1ed690a31c16..0bf97b89a953 100644
--- a/sc/inc/appluno.hxx
+++ b/sc/inc/appluno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_APPLUNO_HXX
-#define SC_APPLUNO_HXX
+#ifndef INCLUDED_SC_INC_APPLUNO_HXX
+#define INCLUDED_SC_INC_APPLUNO_HXX
#include <svl/itemprop.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx
index 12d5c15cf2ac..5399308a4646 100644
--- a/sc/inc/appoptio.hxx
+++ b/sc/inc/appoptio.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_APPOPTIO_HXX
-#define SC_APPOPTIO_HXX
+#ifndef INCLUDED_SC_INC_APPOPTIO_HXX
+#define INCLUDED_SC_INC_APPOPTIO_HXX
#include <vcl/field.hxx>
#include <sfx2/zoomitem.hxx>
diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx
index a395f1aacf8b..b3bab58b0348 100644
--- a/sc/inc/arealink.hxx
+++ b/sc/inc/arealink.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_AREALINK_HXX
-#define SC_AREALINK_HXX
+#ifndef INCLUDED_SC_INC_AREALINK_HXX
+#define INCLUDED_SC_INC_AREALINK_HXX
#include "global.hxx"
#include "refreshtimer.hxx"
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index 5b9494d9a9eb..08e3c5a2d90c 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_ATRARR_HXX
-#define SC_ATRARR_HXX
+#ifndef INCLUDED_SC_INC_ATTARRAY_HXX
+#define INCLUDED_SC_INC_ATTARRAY_HXX
#include "global.hxx"
#include "attrib.hxx"
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index e2b45e4d488b..bb14668a045f 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_SCATTR_HXX
-#define SC_SCATTR_HXX
+#ifndef INCLUDED_SC_INC_ATTRIB_HXX
+#define INCLUDED_SC_INC_ATTRIB_HXX
#include <svl/poolitem.hxx>
#include <svl/intitem.hxx>
diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx
index 6b5e322aee75..aad0604a5433 100644
--- a/sc/inc/autoform.hxx
+++ b/sc/inc/autoform.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_AUTOFORM_HXX
-#define SC_AUTOFORM_HXX
+#ifndef INCLUDED_SC_INC_AUTOFORM_HXX
+#define INCLUDED_SC_INC_AUTOFORM_HXX
/*************************************************************************
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/sc/inc/autonamecache.hxx b/sc/inc/autonamecache.hxx
index eafd21e4c6e9..f655076a1ab6 100644
--- a/sc/inc/autonamecache.hxx
+++ b/sc/inc/autonamecache.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_AUTONAMECACHE_HXX
-#define SC_AUTONAMECACHE_HXX
+#ifndef INCLUDED_SC_INC_AUTONAMECACHE_HXX
+#define INCLUDED_SC_INC_AUTONAMECACHE_HXX
#include <vector>
#include <boost/unordered_map.hpp>
diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx
index 138cb51d7c2a..b9a8beb0a04c 100644
--- a/sc/inc/bigrange.hxx
+++ b/sc/inc/bigrange.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_BIGRANGE_HXX
-#define SC_BIGRANGE_HXX
+#ifndef INCLUDED_SC_INC_BIGRANGE_HXX
+#define INCLUDED_SC_INC_BIGRANGE_HXX
#include "global.hxx"
diff --git a/sc/inc/brdcst.hxx b/sc/inc/brdcst.hxx
index e988f694f517..77cd7fe19460 100644
--- a/sc/inc/brdcst.hxx
+++ b/sc/inc/brdcst.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SC_BRDCST_HXX
-#define _SC_BRDCST_HXX
+#ifndef INCLUDED_SC_INC_BRDCST_HXX
+#define INCLUDED_SC_INC_BRDCST_HXX
#include "global.hxx"
#include "address.hxx"
diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx
index 1c0fadf289b4..df342f5d5068 100644
--- a/sc/inc/calcconfig.hxx
+++ b/sc/inc/calcconfig.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef __SC_CALCCONFIG_HXX__
-#define __SC_CALCCONFIG_HXX__
+#ifndef INCLUDED_SC_INC_CALCCONFIG_HXX
+#define INCLUDED_SC_INC_CALCCONFIG_HXX
#include "scdllapi.h"
#include "formula/grammar.hxx"
diff --git a/sc/inc/calcmacros.hxx b/sc/inc/calcmacros.hxx
index 9516522104b4..e56712da72f6 100644
--- a/sc/inc/calcmacros.hxx
+++ b/sc/inc/calcmacros.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_CALCMACROS_HXX
-#define SC_CALCMACROS_HXX
+#ifndef INCLUDED_SC_INC_CALCMACROS_HXX
+#define INCLUDED_SC_INC_CALCMACROS_HXX
#define DEBUG_COLUMN_STORAGE 0
#define DEBUG_PIVOT_TABLE 0
diff --git a/sc/inc/callform.hxx b/sc/inc/callform.hxx
index 5caf2ec8e466..a86deaec5220 100644
--- a/sc/inc/callform.hxx
+++ b/sc/inc/callform.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_CALLFORM_HXX
-#define SC_CALLFORM_HXX
+#ifndef INCLUDED_SC_INC_CALLFORM_HXX
+#define INCLUDED_SC_INC_CALLFORM_HXX
#include <rtl/ustring.hxx>
diff --git a/sc/inc/cellform.hxx b/sc/inc/cellform.hxx
index caea246ca2c3..dd82df64b598 100644
--- a/sc/inc/cellform.hxx
+++ b/sc/inc/cellform.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_CELLFORM_HXX
-#define SC_CELLFORM_HXX
+#ifndef INCLUDED_SC_INC_CELLFORM_HXX
+#define INCLUDED_SC_INC_CELLFORM_HXX
#include <tools/solar.h>
#include "scdllapi.h"
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index c85bf55f1325..6258bbc33ac0 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_CELLSUNO_HXX
-#define SC_CELLSUNO_HXX
+#ifndef INCLUDED_SC_INC_CELLSUNO_HXX
+#define INCLUDED_SC_INC_CELLSUNO_HXX
#include "global.hxx"
#include "rangelst.hxx"
diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx
index 08cd8ce9cc7c..9f6aa8b9895e 100644
--- a/sc/inc/cellvalue.hxx
+++ b/sc/inc/cellvalue.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_CELLVALUE_HXX
-#define SC_CELLVALUE_HXX
+#ifndef INCLUDED_SC_INC_CELLVALUE_HXX
+#define INCLUDED_SC_INC_CELLVALUE_HXX
#include "global.hxx"
diff --git a/sc/inc/cellvalues.hxx b/sc/inc/cellvalues.hxx
index 8b249b4556b4..9e3d82520f6d 100644
--- a/sc/inc/cellvalues.hxx
+++ b/sc/inc/cellvalues.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_CELLVALUES_HXX
-#define SC_CELLVALUES_HXX
+#ifndef INCLUDED_SC_INC_CELLVALUES_HXX
+#define INCLUDED_SC_INC_CELLVALUES_HXX
#include <address.hxx>
diff --git a/sc/inc/cfgids.hxx b/sc/inc/cfgids.hxx
index 839268fefdf6..359ce976d81d 100644
--- a/sc/inc/cfgids.hxx
+++ b/sc/inc/cfgids.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _CFGID_HXX
-#define _CFGID_HXX
+#ifndef INCLUDED_SC_INC_CFGIDS_HXX
+#define INCLUDED_SC_INC_CFGIDS_HXX
#define SCCFG_DOC SFX_ITEMTYPE_SC_BEGIN
#define SCCFG_VIEW (SFX_ITEMTYPE_SC_BEGIN + 1)
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index e9c51217871e..534e0dc6275a 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_CHART2UNO_HXX
-#define SC_CHART2UNO_HXX
+#ifndef INCLUDED_SC_INC_CHART2UNO_HXX
+#define INCLUDED_SC_INC_CHART2UNO_HXX
#include "cellsuno.hxx"
#include "rangelst.hxx"
@@ -474,6 +474,6 @@ private:
};
-#endif // SC_CHART2UNO_HXX
+#endif // INCLUDED_SC_INC_CHART2UNO_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx
index 549e7bdcc5e3..4e48d27006ab 100644
--- a/sc/inc/chartarr.hxx
+++ b/sc/inc/chartarr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_CHARTARR_HXX
-#define SC_CHARTARR_HXX
+#ifndef INCLUDED_SC_INC_CHARTARR_HXX
+#define INCLUDED_SC_INC_CHARTARR_HXX
#include "rangelst.hxx"
#include "chartpos.hxx"
diff --git a/sc/inc/charthelper.hxx b/sc/inc/charthelper.hxx
index 659a0ba4103b..e51e9f02a35c 100644
--- a/sc/inc/charthelper.hxx
+++ b/sc/inc/charthelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_CHARTHELPER_HXX
-#define SC_CHARTHELPER_HXX
+#ifndef INCLUDED_SC_INC_CHARTHELPER_HXX
+#define INCLUDED_SC_INC_CHARTHELPER_HXX
#include "address.hxx"
#include "global.hxx"
diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx
index c9f10bb2d46f..24c1bcdc0913 100644
--- a/sc/inc/chartlis.hxx
+++ b/sc/inc/chartlis.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_CHARTLIS_HXX
-#define SC_CHARTLIS_HXX
+#ifndef INCLUDED_SC_INC_CHARTLIS_HXX
+#define INCLUDED_SC_INC_CHARTLIS_HXX
#include <vcl/timer.hxx>
#include <svl/listener.hxx>
diff --git a/sc/inc/chartlock.hxx b/sc/inc/chartlock.hxx
index 219e2f64e96a..506f2b87636a 100644
--- a/sc/inc/chartlock.hxx
+++ b/sc/inc/chartlock.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_CHARTLOCK_HXX
-#define SC_CHARTLOCK_HXX
+#ifndef INCLUDED_SC_INC_CHARTLOCK_HXX
+#define INCLUDED_SC_INC_CHARTLOCK_HXX
#include <vcl/timer.hxx>
diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx
index d947e2737db2..8b71a22c1d39 100644
--- a/sc/inc/chartpos.hxx
+++ b/sc/inc/chartpos.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_CHARTPOS_HXX
-#define SC_CHARTPOS_HXX
+#ifndef INCLUDED_SC_INC_CHARTPOS_HXX
+#define INCLUDED_SC_INC_CHARTPOS_HXX
#include "rangelst.hxx"
#include <map>
diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx
index f5c5bb65cea5..30bd965fa2a5 100644
--- a/sc/inc/chartuno.hxx
+++ b/sc/inc/chartuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_CHARTUNO_HXX
-#define SC_CHARTUNO_HXX
+#ifndef INCLUDED_SC_INC_CHARTUNO_HXX
+#define INCLUDED_SC_INC_CHARTUNO_HXX
#include "address.hxx"
#include "rangelst.hxx"
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index 8bc619e1eaa6..2b1e387afaad 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_CHGTRACK_HXX
-#define SC_CHGTRACK_HXX
+#ifndef INCLUDED_SC_INC_CHGTRACK_HXX
+#define INCLUDED_SC_INC_CHGTRACK_HXX
#include <deque>
#include <map>
diff --git a/sc/inc/chgviset.hxx b/sc/inc/chgviset.hxx
index 193f49ce7477..6ed38baeaf17 100644
--- a/sc/inc/chgviset.hxx
+++ b/sc/inc/chgviset.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_CHGVISET_HXX
-#define SC_CHGVISET_HXX
+#ifndef INCLUDED_SC_INC_CHGVISET_HXX
+#define INCLUDED_SC_INC_CHGVISET_HXX
#include <tools/datetime.hxx>
#include "rangelst.hxx"
diff --git a/sc/inc/clipcontext.hxx b/sc/inc/clipcontext.hxx
index d016410fecd9..e6e759721f59 100644
--- a/sc/inc/clipcontext.hxx
+++ b/sc/inc/clipcontext.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_CLIPCONTEXT_HXX
-#define SC_CLIPCONTEXT_HXX
+#ifndef INCLUDED_SC_INC_CLIPCONTEXT_HXX
+#define INCLUDED_SC_INC_CLIPCONTEXT_HXX
#include "address.hxx"
#include <cellvalue.hxx>
diff --git a/sc/inc/clipdata.hxx b/sc/inc/clipdata.hxx
index ac4a0c6e8a12..8c8d7dff93a2 100644
--- a/sc/inc/clipdata.hxx
+++ b/sc/inc/clipdata.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef __SC_CLIPDATA_HXX__
-#define __SC_CLIPDATA_HXX__
+#ifndef INCLUDED_SC_INC_CLIPDATA_HXX
+#define INCLUDED_SC_INC_CLIPDATA_HXX
class ScTransferObj;
class ScDrawTransferObj;
diff --git a/sc/inc/clipparam.hxx b/sc/inc/clipparam.hxx
index f0f1c3b3294e..2e5dece711e8 100644
--- a/sc/inc/clipparam.hxx
+++ b/sc/inc/clipparam.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_CLIPPARAM_HXX
-#define SC_CLIPPARAM_HXX
+#ifndef INCLUDED_SC_INC_CLIPPARAM_HXX
+#define INCLUDED_SC_INC_CLIPPARAM_HXX
#include "rangelst.hxx"
#include "rangenam.hxx"
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 47a96a40f4e7..7d89c12a5c0d 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_COLORSCALE_HXX
-#define SC_COLORSCALE_HXX
+#ifndef INCLUDED_SC_INC_COLORSCALE_HXX
+#define INCLUDED_SC_INC_COLORSCALE_HXX
#include <boost/ptr_container/ptr_vector.hpp>
#include <boost/scoped_ptr.hpp>
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 9318a77da137..44b43df863e5 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_COLUMN_HXX
-#define SC_COLUMN_HXX
+#ifndef INCLUDED_SC_INC_COLUMN_HXX
+#define INCLUDED_SC_INC_COLUMN_HXX
#include "markarr.hxx"
#include "global.hxx"
diff --git a/sc/inc/columniterator.hxx b/sc/inc/columniterator.hxx
index f15d6d564d58..daac219c587d 100644
--- a/sc/inc/columniterator.hxx
+++ b/sc/inc/columniterator.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef __SC_COLUMNITERATOR_HXX__
-#define __SC_COLUMNITERATOR_HXX__
+#ifndef INCLUDED_SC_INC_COLUMNITERATOR_HXX
+#define INCLUDED_SC_INC_COLUMNITERATOR_HXX
#include <boost/noncopyable.hpp>
diff --git a/sc/inc/columnset.hxx b/sc/inc/columnset.hxx
index 99c1d084346a..bbee5be3b233 100644
--- a/sc/inc/columnset.hxx
+++ b/sc/inc/columnset.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_COLUMNSET_HXX
-#define SC_COLUMNSET_HXX
+#ifndef INCLUDED_SC_INC_COLUMNSET_HXX
+#define INCLUDED_SC_INC_COLUMNSET_HXX
#include "address.hxx"
diff --git a/sc/inc/columnspanset.hxx b/sc/inc/columnspanset.hxx
index 60dae41f5982..ef32af7aea29 100644
--- a/sc/inc/columnspanset.hxx
+++ b/sc/inc/columnspanset.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_COLUMNSPANSET_HXX
-#define SC_COLUMNSPANSET_HXX
+#ifndef INCLUDED_SC_INC_COLUMNSPANSET_HXX
+#define INCLUDED_SC_INC_COLUMNSPANSET_HXX
#include "address.hxx"
diff --git a/sc/inc/compare.hxx b/sc/inc/compare.hxx
index 9f09e6b5d760..f072d577c7f7 100644
--- a/sc/inc/compare.hxx
+++ b/sc/inc/compare.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_COMPARE_HXX
-#define SC_COMPARE_HXX
+#ifndef INCLUDED_SC_INC_COMPARE_HXX
+#define INCLUDED_SC_INC_COMPARE_HXX
#include "queryentry.hxx"
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 3baab840b2b3..b1fa059f5f93 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_COMPILER_HXX
-#define SC_COMPILER_HXX
+#ifndef INCLUDED_SC_INC_COMPILER_HXX
+#define INCLUDED_SC_INC_COMPILER_HXX
#include <string.h>
diff --git a/sc/inc/compressedarray.hxx b/sc/inc/compressedarray.hxx
index 09968ee19354..a6dd96687d70 100644
--- a/sc/inc/compressedarray.hxx
+++ b/sc/inc/compressedarray.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_COMPRESSEDARRAY_HXX
-#define SC_COMPRESSEDARRAY_HXX
+#ifndef INCLUDED_SC_INC_COMPRESSEDARRAY_HXX
+#define INCLUDED_SC_INC_COMPRESSEDARRAY_HXX
#include <cstddef>
#include <algorithm>
@@ -202,6 +202,6 @@ void ScBitMaskCompressedArray<A,D>::OrValue( A nPos, const D& rValueToOr )
this->SetValue( nPos, rValue | rValueToOr);
}
-#endif // SC_COMPRESSEDARRAY_HXX
+#endif // INCLUDED_SC_INC_COMPRESSEDARRAY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index cb4218942833..2ded89313dbd 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_CONDITIO_HXX
-#define SC_CONDITIO_HXX
+#ifndef INCLUDED_SC_INC_CONDITIO_HXX
+#define INCLUDED_SC_INC_CONDITIO_HXX
#include "global.hxx"
#include "address.hxx"
diff --git a/sc/inc/confuno.hxx b/sc/inc/confuno.hxx
index da52405b0143..21e0d3b69ec2 100644
--- a/sc/inc/confuno.hxx
+++ b/sc/inc/confuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_CONFUNO_HXX
-#define SC_CONFUNO_HXX
+#ifndef INCLUDED_SC_INC_CONFUNO_HXX
+#define INCLUDED_SC_INC_CONFUNO_HXX
#include <svl/itemprop.hxx>
#include <svl/lstner.hxx>
diff --git a/sc/inc/consoli.hxx b/sc/inc/consoli.hxx
index 8202cb236343..ec96a6033c72 100644
--- a/sc/inc/consoli.hxx
+++ b/sc/inc/consoli.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_CONSOLI_HXX
-#define SC_CONSOLI_HXX
+#ifndef INCLUDED_SC_INC_CONSOLI_HXX
+#define INCLUDED_SC_INC_CONSOLI_HXX
#include "global.hxx"
#include "address.hxx"
diff --git a/sc/inc/convuno.hxx b/sc/inc/convuno.hxx
index 62fc803f90b9..6c2c5ec74e0c 100644
--- a/sc/inc/convuno.hxx
+++ b/sc/inc/convuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_CONVUNO_HXX
-#define SC_CONVUNO_HXX
+#ifndef INCLUDED_SC_INC_CONVUNO_HXX
+#define INCLUDED_SC_INC_CONVUNO_HXX
#include <algorithm>
#include <i18nlangtag/lang.h>
diff --git a/sc/inc/cursuno.hxx b/sc/inc/cursuno.hxx
index 70521db03d57..9d3b3b14ad27 100644
--- a/sc/inc/cursuno.hxx
+++ b/sc/inc/cursuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_CURSUNO_HXX
-#define SC_CURSUNO_HXX
+#ifndef INCLUDED_SC_INC_CURSUNO_HXX
+#define INCLUDED_SC_INC_CURSUNO_HXX
#include "cellsuno.hxx"
#include <com/sun/star/table/XCellCursor.hpp>
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index 773d2d91caa5..f35342855f4a 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DAPIUNO_HXX
-#define SC_DAPIUNO_HXX
+#ifndef INCLUDED_SC_INC_DAPIUNO_HXX
+#define INCLUDED_SC_INC_DAPIUNO_HXX
#include "global.hxx"
#include "dpobject.hxx"
diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index 70ea459b0bd6..7f650f9836c1 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DATAUNO_HXX
-#define SC_DATAUNO_HXX
+#ifndef INCLUDED_SC_INC_DATAUNO_HXX
+#define INCLUDED_SC_INC_DATAUNO_HXX
#include "global.hxx"
#include "queryparam.hxx"
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index 49a68e6327be..c42e97043541 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DBCOLECT_HXX
-#define SC_DBCOLECT_HXX
+#ifndef INCLUDED_SC_INC_DBDATA_HXX
+#define INCLUDED_SC_INC_DBDATA_HXX
#include "scdllapi.h"
#include "refreshtimer.hxx"
diff --git a/sc/inc/dbdocutl.hxx b/sc/inc/dbdocutl.hxx
index 236a9d5470b3..bf3d68da645a 100644
--- a/sc/inc/dbdocutl.hxx
+++ b/sc/inc/dbdocutl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DBDOCUTL_HXX
-#define SC_DBDOCUTL_HXX
+#ifndef INCLUDED_SC_INC_DBDOCUTL_HXX
+#define INCLUDED_SC_INC_DBDOCUTL_HXX
#include "address.hxx"
#include <com/sun/star/uno/Reference.hxx>
diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx
index 420194049ca1..c34e977953ba 100644
--- a/sc/inc/defaultsoptions.hxx
+++ b/sc/inc/defaultsoptions.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_DEFAULTSOPT_HXX
-#define SC_DEFAULTSOPT_HXX
+#ifndef INCLUDED_SC_INC_DEFAULTSOPTIONS_HXX
+#define INCLUDED_SC_INC_DEFAULTSOPTIONS_HXX
#include <svl/poolitem.hxx>
#include <unotools/configitem.hxx>
diff --git a/sc/inc/defltuno.hxx b/sc/inc/defltuno.hxx
index 4e450291f1d0..17d1f3026aba 100644
--- a/sc/inc/defltuno.hxx
+++ b/sc/inc/defltuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DEFLTUNO_HXX
-#define SC_DEFLTUNO_HXX
+#ifndef INCLUDED_SC_INC_DEFLTUNO_HXX
+#define INCLUDED_SC_INC_DEFLTUNO_HXX
#include <svl/lstner.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/sc/inc/detdata.hxx b/sc/inc/detdata.hxx
index 90cd1f2318ca..d461e96190a3 100644
--- a/sc/inc/detdata.hxx
+++ b/sc/inc/detdata.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DETDATA_HXX
-#define SC_DETDATA_HXX
+#ifndef INCLUDED_SC_INC_DETDATA_HXX
+#define INCLUDED_SC_INC_DETDATA_HXX
#include <boost/ptr_container/ptr_vector.hpp>
#include "global.hxx"
diff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxx
index 81bf34452633..57b455bbda7d 100644
--- a/sc/inc/detfunc.hxx
+++ b/sc/inc/detfunc.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DETFUNC_HXX
-#define SC_DETFUNC_HXX
+#ifndef INCLUDED_SC_INC_DETFUNC_HXX
+#define INCLUDED_SC_INC_DETFUNC_HXX
#include "address.hxx"
#include <tools/gen.hxx>
diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx
index ade13b647ca0..393445b51f7a 100644
--- a/sc/inc/dispuno.hxx
+++ b/sc/inc/dispuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DISPUNO_HXX
-#define SC_DISPUNO_HXX
+#ifndef INCLUDED_SC_INC_DISPUNO_HXX
+#define INCLUDED_SC_INC_DISPUNO_HXX
#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
#include <com/sun/star/view/XSelectionChangeListener.hpp>
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 34d568243462..cf858a0ecdf7 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DOCITER_HXX
-#define SC_DOCITER_HXX
+#ifndef INCLUDED_SC_INC_DOCITER_HXX
+#define INCLUDED_SC_INC_DOCITER_HXX
#include "address.hxx"
#include <tools/solar.h>
diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx
index a5bd10dc5c99..8d80279acc29 100644
--- a/sc/inc/docoptio.hxx
+++ b/sc/inc/docoptio.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DOCOPTIO_HXX
-#define SC_DOCOPTIO_HXX
+#ifndef INCLUDED_SC_INC_DOCOPTIO_HXX
+#define INCLUDED_SC_INC_DOCOPTIO_HXX
#include <unotools/configitem.hxx>
#include <svl/poolitem.hxx>
diff --git a/sc/inc/docparam.hxx b/sc/inc/docparam.hxx
index fce21121579b..fc0373a9a8e9 100644
--- a/sc/inc/docparam.hxx
+++ b/sc/inc/docparam.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_DOCPARAM_HXX
-#define SC_DOCPARAM_HXX
+#ifndef INCLUDED_SC_INC_DOCPARAM_HXX
+#define INCLUDED_SC_INC_DOCPARAM_HXX
#include "address.hxx"
diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx
index e7e5272d2c67..7e07d24c68b8 100644
--- a/sc/inc/docpool.hxx
+++ b/sc/inc/docpool.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_SCDOCPOL_HXX
-#define SC_SCDOCPOL_HXX
+#ifndef INCLUDED_SC_INC_DOCPOOL_HXX
+#define INCLUDED_SC_INC_DOCPOOL_HXX
#include <rtl/ustring.hxx>
#include <svl/itempool.hxx>
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index e9488395a429..df1cc2ebec52 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DOCUMENT_HXX
-#define SC_DOCUMENT_HXX
+#ifndef INCLUDED_SC_INC_DOCUMENT_HXX
+#define INCLUDED_SC_INC_DOCUMENT_HXX
#include <vcl/prntypes.hxx>
#include <vcl/timer.hxx>
diff --git a/sc/inc/documentimport.hxx b/sc/inc/documentimport.hxx
index 222908e341c6..0b2450deb7f8 100644
--- a/sc/inc/documentimport.hxx
+++ b/sc/inc/documentimport.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_DOCUMENTIMPORT_HXX
-#define SC_DOCUMENTIMPORT_HXX
+#ifndef INCLUDED_SC_INC_DOCUMENTIMPORT_HXX
+#define INCLUDED_SC_INC_DOCUMENTIMPORT_HXX
#include "scdllapi.h"
#include "address.hxx"
diff --git a/sc/inc/documentlinkmgr.hxx b/sc/inc/documentlinkmgr.hxx
index c4c4971d5c11..4c43adfe1585 100644
--- a/sc/inc/documentlinkmgr.hxx
+++ b/sc/inc/documentlinkmgr.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_DOCUMENTLINKMGR_HXX
-#define SC_DOCUMENTLINKMGR_HXX
+#ifndef INCLUDED_SC_INC_DOCUMENTLINKMGR_HXX
+#define INCLUDED_SC_INC_DOCUMENTLINKMGR_HXX
#include <boost/noncopyable.hpp>
#include <rtl/ustring.hxx>
diff --git a/sc/inc/documentstreamaccess.hxx b/sc/inc/documentstreamaccess.hxx
index 351ed9021022..52335df7735b 100644
--- a/sc/inc/documentstreamaccess.hxx
+++ b/sc/inc/documentstreamaccess.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_DOCUMENTSTREAMACCESS_HXX
-#define SC_DOCUMENTSTREAMACCESS_HXX
+#ifndef INCLUDED_SC_INC_DOCUMENTSTREAMACCESS_HXX
+#define INCLUDED_SC_INC_DOCUMENTSTREAMACCESS_HXX
#include <rtl/ustring.hxx>
#include <boost/scoped_ptr.hpp>
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 793f7b24844d..61881d4e581b 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DOCUNO_HXX
-#define SC_DOCUNO_HXX
+#ifndef INCLUDED_SC_INC_DOCUNO_HXX
+#define INCLUDED_SC_INC_DOCUNO_HXX
#include "address.hxx"
#include <sfx2/sfxbasemodel.hxx>
diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index b35fa3b1d708..6129ca401485 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DPTABLECACHE_HXX
-#define SC_DPTABLECACHE_HXX
+#ifndef INCLUDED_SC_INC_DPCACHE_HXX
+#define INCLUDED_SC_INC_DPCACHE_HXX
#include "global.hxx"
#include "dpnumgroupinfo.hxx"
diff --git a/sc/inc/dpdimsave.hxx b/sc/inc/dpdimsave.hxx
index 1a02911c4e2d..ae49102eacdf 100644
--- a/sc/inc/dpdimsave.hxx
+++ b/sc/inc/dpdimsave.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DPDIMSAVE_HXX
-#define SC_DPDIMSAVE_HXX
+#ifndef INCLUDED_SC_INC_DPDIMSAVE_HXX
+#define INCLUDED_SC_INC_DPDIMSAVE_HXX
#include <vector>
#include <map>
diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx
index d72795745b8f..64ba5027b603 100644
--- a/sc/inc/dpfilteredcache.hxx
+++ b/sc/inc/dpfilteredcache.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DPCACHETABLE_HXX
-#define SC_DPCACHETABLE_HXX
+#ifndef INCLUDED_SC_INC_DPFILTEREDCACHE_HXX
+#define INCLUDED_SC_INC_DPFILTEREDCACHE_HXX
#include "sal/types.h"
#include "osl/mutex.hxx"
diff --git a/sc/inc/dpglobal.hxx b/sc/inc/dpglobal.hxx
index 74250a649599..3bbaeab2548c 100644
--- a/sc/inc/dpglobal.hxx
+++ b/sc/inc/dpglobal.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SC_DPGLOBAL_HXX
-#define _SC_DPGLOBAL_HXX
+#ifndef INCLUDED_SC_INC_DPGLOBAL_HXX
+#define INCLUDED_SC_INC_DPGLOBAL_HXX
#define PIVOT_MAXFUNC 11
#define PIVOT_FUNC_NONE 0x0000
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx
index 068559b17ab6..cb3b130db8b3 100644
--- a/sc/inc/dpgroup.hxx
+++ b/sc/inc/dpgroup.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DPGROUP_HXX
-#define SC_DPGROUP_HXX
+#ifndef INCLUDED_SC_INC_DPGROUP_HXX
+#define INCLUDED_SC_INC_DPGROUP_HXX
#include <vector>
#include <boost/unordered_set.hpp>
diff --git a/sc/inc/dpitemdata.hxx b/sc/inc/dpitemdata.hxx
index 4c407c37ab6a..6bb2502a8b13 100644
--- a/sc/inc/dpitemdata.hxx
+++ b/sc/inc/dpitemdata.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef __SC_DPITEMDATA_HXX__
-#define __SC_DPITEMDATA_HXX__
+#ifndef INCLUDED_SC_INC_DPITEMDATA_HXX
+#define INCLUDED_SC_INC_DPITEMDATA_HXX
#include "scdllapi.h"
#include "address.hxx"
diff --git a/sc/inc/dpnumgroupinfo.hxx b/sc/inc/dpnumgroupinfo.hxx
index 6989fffd85ff..fab299e881a3 100644
--- a/sc/inc/dpnumgroupinfo.hxx
+++ b/sc/inc/dpnumgroupinfo.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef __SC_DPNUMGROUPINFO_HXX__
-#define __SC_DPNUMGROUPINFO_HXX__
+#ifndef INCLUDED_SC_INC_DPNUMGROUPINFO_HXX
+#define INCLUDED_SC_INC_DPNUMGROUPINFO_HXX
#include "scdllapi.h"
#include "calcmacros.hxx"
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 39cdd7bec171..299baa0e2e45 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DPOBJECT_HXX
-#define SC_DPOBJECT_HXX
+#ifndef INCLUDED_SC_INC_DPOBJECT_HXX
+#define INCLUDED_SC_INC_DPOBJECT_HXX
#include "scdllapi.h"
#include "global.hxx"
diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx
index 7b38c7eee227..5bac8c40ab98 100644
--- a/sc/inc/dpoutput.hxx
+++ b/sc/inc/dpoutput.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DPOUTPUT_HXX
-#define SC_DPOUTPUT_HXX
+#ifndef INCLUDED_SC_INC_DPOUTPUT_HXX
+#define INCLUDED_SC_INC_DPOUTPUT_HXX
#include <com/sun/star/sheet/XDimensionsSupplier.hpp>
#include <com/sun/star/sheet/DataResult.hpp>
diff --git a/sc/inc/dpoutputgeometry.hxx b/sc/inc/dpoutputgeometry.hxx
index e275cd87d947..7cc9297c91e0 100644
--- a/sc/inc/dpoutputgeometry.hxx
+++ b/sc/inc/dpoutputgeometry.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DPOUTPUTGEOMETRY_HXX
-#define SC_DPOUTPUTGEOMETRY_HXX
+#ifndef INCLUDED_SC_INC_DPOUTPUTGEOMETRY_HXX
+#define INCLUDED_SC_INC_DPOUTPUTGEOMETRY_HXX
#include "address.hxx"
#include <vector>
diff --git a/sc/inc/dpresfilter.hxx b/sc/inc/dpresfilter.hxx
index bc7ffc1f62b3..9f8e8e903905 100644
--- a/sc/inc/dpresfilter.hxx
+++ b/sc/inc/dpresfilter.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef __SC_DPRESFILTER_HXX__
-#define __SC_DPRESFILTER_HXX__
+#ifndef INCLUDED_SC_INC_DPRESFILTER_HXX
+#define INCLUDED_SC_INC_DPRESFILTER_HXX
#include "dpitemdata.hxx"
diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx
index 62dd9e66ff17..ff3f43827614 100644
--- a/sc/inc/dpsave.hxx
+++ b/sc/inc/dpsave.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DPSAVE_HXX
-#define SC_DPSAVE_HXX
+#ifndef INCLUDED_SC_INC_DPSAVE_HXX
+#define INCLUDED_SC_INC_DPSAVE_HXX
#include <list>
diff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxx
index d0f9f095bc82..94c85e4b8c94 100644
--- a/sc/inc/dpsdbtab.hxx
+++ b/sc/inc/dpsdbtab.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DPSDBTAB_HXX
-#define SC_DPSDBTAB_HXX
+#ifndef INCLUDED_SC_INC_DPSDBTAB_HXX
+#define INCLUDED_SC_INC_DPSDBTAB_HXX
#include <com/sun/star/uno/Reference.hxx>
diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx
index 448f3a26d427..b5b10cb3d341 100644
--- a/sc/inc/dpshttab.hxx
+++ b/sc/inc/dpshttab.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DPSHTTAB_HXX
-#define SC_DPSHTTAB_HXX
+#ifndef INCLUDED_SC_INC_DPSHTTAB_HXX
+#define INCLUDED_SC_INC_DPSHTTAB_HXX
#include "dptabdat.hxx"
#include "global.hxx"
diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx
index e9a8d3f2cd96..9981d856cbff 100644
--- a/sc/inc/dptabdat.hxx
+++ b/sc/inc/dptabdat.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DPTABDAT_HXX
-#define SC_DPTABDAT_HXX
+#ifndef INCLUDED_SC_INC_DPTABDAT_HXX
+#define INCLUDED_SC_INC_DPTABDAT_HXX
#include "address.hxx"
#include "dpoutput.hxx"
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index fce905becdc5..207e256eb25e 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DPTABRES_HXX
-#define SC_DPTABRES_HXX
+#ifndef INCLUDED_SC_INC_DPTABRES_HXX
+#define INCLUDED_SC_INC_DPTABRES_HXX
#include "global.hxx"
#include "dpfilteredcache.hxx"
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index e3a2afff5e3f..aaea244150e6 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DPTABSRC_HXX
-#define SC_DPTABSRC_HXX
+#ifndef INCLUDED_SC_INC_DPTABSRC_HXX
+#define INCLUDED_SC_INC_DPTABSRC_HXX
#include "global.hxx"
#include <com/sun/star/sheet/XDimensionsSupplier.hpp>
diff --git a/sc/inc/dptypes.hxx b/sc/inc/dptypes.hxx
index 37ca9bc2f266..cb905119b390 100644
--- a/sc/inc/dptypes.hxx
+++ b/sc/inc/dptypes.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef __SC_DPTYPES_HXX__
-#define __SC_DPTYPES_HXX__
+#ifndef INCLUDED_SC_INC_DPTYPES_HXX
+#define INCLUDED_SC_INC_DPTYPES_HXX
#include "rtl/ustring.hxx"
diff --git a/sc/inc/dputil.hxx b/sc/inc/dputil.hxx
index 9568e9591ab4..6381dd41f386 100644
--- a/sc/inc/dputil.hxx
+++ b/sc/inc/dputil.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_DPUTIL_HXX
-#define SC_DPUTIL_HXX
+#ifndef INCLUDED_SC_INC_DPUTIL_HXX
+#define INCLUDED_SC_INC_DPUTIL_HXX
#include "rtl/ustring.hxx"
#include "scdllapi.h"
diff --git a/sc/inc/dragdata.hxx b/sc/inc/dragdata.hxx
index e0352165e522..7f98a0591b47 100644
--- a/sc/inc/dragdata.hxx
+++ b/sc/inc/dragdata.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef __SC_DRAGDATA_HXX__
-#define __SC_DRAGDATA_HXX__
+#ifndef INCLUDED_SC_INC_DRAGDATA_HXX
+#define INCLUDED_SC_INC_DRAGDATA_HXX
#include "rtl/ustring.hxx"
diff --git a/sc/inc/drawattr.hxx b/sc/inc/drawattr.hxx
index d26d87ac07f9..8f9237fbc45b 100644
--- a/sc/inc/drawattr.hxx
+++ b/sc/inc/drawattr.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _IDLITEMS_HXX
-#define _IDLITEMS_HXX
+#ifndef INCLUDED_SC_INC_DRAWATTR_HXX
+#define INCLUDED_SC_INC_DRAWATTR_HXX
#include <svl/eitem.hxx>
#include <editeng/svxenum.hxx>
diff --git a/sc/inc/drawpage.hxx b/sc/inc/drawpage.hxx
index aeda08a21069..0f36a4e42ab7 100644
--- a/sc/inc/drawpage.hxx
+++ b/sc/inc/drawpage.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DRAWPAGE_HXX
-#define SC_DRAWPAGE_HXX
+#ifndef INCLUDED_SC_INC_DRAWPAGE_HXX
+#define INCLUDED_SC_INC_DRAWPAGE_HXX
#include <svx/fmpage.hxx>
diff --git a/sc/inc/drdefuno.hxx b/sc/inc/drdefuno.hxx
index 3cf9cc0b3935..ce92e04d3ee3 100644
--- a/sc/inc/drdefuno.hxx
+++ b/sc/inc/drdefuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DRDEFUNO_HXX
-#define SC_DRDEFUNO_HXX
+#ifndef INCLUDED_SC_INC_DRDEFUNO_HXX
+#define INCLUDED_SC_INC_DRDEFUNO_HXX
#include <svx/unopool.hxx>
#include <svl/lstner.hxx>
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index cc8c8f4c407e..36af4f6c26ca 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_DRWLAYER_HXX
-#define SC_DRWLAYER_HXX
+#ifndef INCLUDED_SC_INC_DRWLAYER_HXX
+#define INCLUDED_SC_INC_DRWLAYER_HXX
#include <vcl/graph.hxx>
#include <svx/fmmodel.hxx>
diff --git a/sc/inc/editdataarray.hxx b/sc/inc/editdataarray.hxx
index fdcccbdd3aae..21ecb8d49b9f 100644
--- a/sc/inc/editdataarray.hxx
+++ b/sc/inc/editdataarray.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_EDITDATAARRAY_HXX
-#define SC_EDITDATAARRAY_HXX
+#ifndef INCLUDED_SC_INC_EDITDATAARRAY_HXX
+#define INCLUDED_SC_INC_EDITDATAARRAY_HXX
#include "address.hxx"
#include "editeng/editobj.hxx"
diff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxx
index c87415ccd7d9..f5d1fca66d19 100644
--- a/sc/inc/editsrc.hxx
+++ b/sc/inc/editsrc.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_EDITSRC_HXX
-#define SC_EDITSRC_HXX
+#ifndef INCLUDED_SC_INC_EDITSRC_HXX
+#define INCLUDED_SC_INC_EDITSRC_HXX
#include "address.hxx"
#include <editeng/unoedsrc.hxx>
diff --git a/sc/inc/edittextiterator.hxx b/sc/inc/edittextiterator.hxx
index f160b63f58c3..f1ec1e982af1 100644
--- a/sc/inc/edittextiterator.hxx
+++ b/sc/inc/edittextiterator.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_EDITTEXTITERATOR_HXX
-#define SC_EDITTEXTITERATOR_HXX
+#ifndef INCLUDED_SC_INC_EDITTEXTITERATOR_HXX
+#define INCLUDED_SC_INC_EDITTEXTITERATOR_HXX
#include "address.hxx"
#include "mtvelements.hxx"
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index 399896629982..1dee434c12ff 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_EDITUTIL_HXX
-#define SC_EDITUTIL_HXX
+#ifndef INCLUDED_SC_INC_EDITUTIL_HXX
+#define INCLUDED_SC_INC_EDITUTIL_HXX
#include "scdllapi.h"
#include "address.hxx"
diff --git a/sc/inc/eventuno.hxx b/sc/inc/eventuno.hxx
index 3e6237228305..db7e160ecec0 100644
--- a/sc/inc/eventuno.hxx
+++ b/sc/inc/eventuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_EVENTUNO_HXX
-#define SC_EVENTUNO_HXX
+#ifndef INCLUDED_SC_INC_EVENTUNO_HXX
+#define INCLUDED_SC_INC_EVENTUNO_HXX
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XNameReplace.hpp>
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 6764d0353ca2..10e87a9d0709 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_EXTERNALREFMGR_HXX
-#define SC_EXTERNALREFMGR_HXX
+#ifndef INCLUDED_SC_INC_EXTERNALREFMGR_HXX
+#define INCLUDED_SC_INC_EXTERNALREFMGR_HXX
#include "global.hxx"
#include "address.hxx"
diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx
index 00172de2a304..3d76950c52a9 100644
--- a/sc/inc/fielduno.hxx
+++ b/sc/inc/fielduno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_FIELDUNO_HXX
-#define SC_FIELDUNO_HXX
+#ifndef INCLUDED_SC_INC_FIELDUNO_HXX
+#define INCLUDED_SC_INC_FIELDUNO_HXX
#include "address.hxx"
#include "mutexhlp.hxx"
diff --git a/sc/inc/fillinfo.hxx b/sc/inc/fillinfo.hxx
index 9999a89b1185..1db76d9fb2df 100644
--- a/sc/inc/fillinfo.hxx
+++ b/sc/inc/fillinfo.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_FILLINFO_HXX
-#define SC_FILLINFO_HXX
+#ifndef INCLUDED_SC_INC_FILLINFO_HXX
+#define INCLUDED_SC_INC_FILLINFO_HXX
#include <svx/framelinkarray.hxx>
#include "global.hxx"
diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx
index e2fa299e565c..db519556976e 100644
--- a/sc/inc/filter.hxx
+++ b/sc/inc/filter.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_FILTER_HXX
-#define SC_FILTER_HXX
+#ifndef INCLUDED_SC_INC_FILTER_HXX
+#define INCLUDED_SC_INC_FILTER_HXX
#include <rtl/textenc.h>
#include <rtl/ustring.hxx>
diff --git a/sc/inc/filtopt.hxx b/sc/inc/filtopt.hxx
index 05f05e6a1cfb..ed6ee85095ce 100644
--- a/sc/inc/filtopt.hxx
+++ b/sc/inc/filtopt.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_FILTOPT_HXX
-#define SC_FILTOPT_HXX
+#ifndef INCLUDED_SC_INC_FILTOPT_HXX
+#define INCLUDED_SC_INC_FILTOPT_HXX
#include <unotools/configitem.hxx>
#include "scdllapi.h"
diff --git a/sc/inc/filtuno.hxx b/sc/inc/filtuno.hxx
index dc54cf267be5..fa188ed84a7c 100644
--- a/sc/inc/filtuno.hxx
+++ b/sc/inc/filtuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_FILTUNO_HXX
-#define SC_FILTUNO_HXX
+#ifndef INCLUDED_SC_INC_FILTUNO_HXX
+#define INCLUDED_SC_INC_FILTUNO_HXX
#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx
index 3db47f6f2ffc..ca46ec6ff7e0 100644
--- a/sc/inc/fmtuno.hxx
+++ b/sc/inc/fmtuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_FMTUNO_HXX
-#define SC_FMTUNO_HXX
+#ifndef INCLUDED_SC_INC_FMTUNO_HXX
+#define INCLUDED_SC_INC_FMTUNO_HXX
#include <vector>
diff --git a/sc/inc/forbiuno.hxx b/sc/inc/forbiuno.hxx
index f52aeb82d9ae..17f03f57eb00 100644
--- a/sc/inc/forbiuno.hxx
+++ b/sc/inc/forbiuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_FORBIUNO_HXX
-#define SC_FORBIUNO_HXX
+#ifndef INCLUDED_SC_INC_FORBIUNO_HXX
+#define INCLUDED_SC_INC_FORBIUNO_HXX
#include <editeng/UnoForbiddenCharsTable.hxx>
#include <svl/lstner.hxx>
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 57f249de65f7..8c79ddae8523 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_FORMULACELL_HXX
-#define SC_FORMULACELL_HXX
+#ifndef INCLUDED_SC_INC_FORMULACELL_HXX
+#define INCLUDED_SC_INC_FORMULACELL_HXX
#include <set>
diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
index 311653a31fbd..de10a461cfbe 100644
--- a/sc/inc/formulagroup.hxx
+++ b/sc/inc/formulagroup.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_FORMULAGROUP_HXX
-#define SC_FORMULAGROUP_HXX
+#ifndef INCLUDED_SC_INC_FORMULAGROUP_HXX
+#define INCLUDED_SC_INC_FORMULAGROUP_HXX
#include "address.hxx"
#include "types.hxx"
diff --git a/sc/inc/formulaiter.hxx b/sc/inc/formulaiter.hxx
index dbde7e1b49ec..ae6880e358bf 100644
--- a/sc/inc/formulaiter.hxx
+++ b/sc/inc/formulaiter.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_FORMULAITER_HXX
-#define SC_FORMULAITER_HXX
+#ifndef INCLUDED_SC_INC_FORMULAITER_HXX
+#define INCLUDED_SC_INC_FORMULAITER_HXX
#include "address.hxx"
diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx
index 43104aa23713..4e195abbecf8 100644
--- a/sc/inc/formulaopt.hxx
+++ b/sc/inc/formulaopt.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_FORMULAOPT_HXX
-#define SC_FORMULAOPT_HXX
+#ifndef INCLUDED_SC_INC_FORMULAOPT_HXX
+#define INCLUDED_SC_INC_FORMULAOPT_HXX
#include <map>
#include <svl/poolitem.hxx>
diff --git a/sc/inc/formulaparserpool.hxx b/sc/inc/formulaparserpool.hxx
index 80a2178d7f01..ebe78c04d5e0 100644
--- a/sc/inc/formulaparserpool.hxx
+++ b/sc/inc/formulaparserpool.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_FORMULAPARSERPOOL_HXX
-#define SC_FORMULAPARSERPOOL_HXX
+#ifndef INCLUDED_SC_INC_FORMULAPARSERPOOL_HXX
+#define INCLUDED_SC_INC_FORMULAPARSERPOOL_HXX
#include <boost/unordered_map.hpp>
#include <com/sun/star/sheet/XFormulaParser.hpp>
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 31bb990f162b..78d7ae54b7f0 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_FORMULARESULT_HXX
-#define SC_FORMULARESULT_HXX
+#ifndef INCLUDED_SC_INC_FORMULARESULT_HXX
+#define INCLUDED_SC_INC_FORMULARESULT_HXX
#include "token.hxx"
#include "scdllapi.h"
@@ -213,6 +213,6 @@ public:
ScMatrixFormulaCellToken* GetMatrixFormulaCellTokenNonConst();
};
-#endif // SC_FORMULARESULT_HXX
+#endif // INCLUDED_SC_INC_FORMULARESULT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/fstalgorithm.hxx b/sc/inc/fstalgorithm.hxx
index 6b3385c5aa0d..20972ef05641 100644
--- a/sc/inc/fstalgorithm.hxx
+++ b/sc/inc/fstalgorithm.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_FSTALGORITHM_HXX
-#define SC_FSTALGORITHM_HXX
+#ifndef INCLUDED_SC_INC_FSTALGORITHM_HXX
+#define INCLUDED_SC_INC_FSTALGORITHM_HXX
#include <mdds/flat_segment_tree.hpp>
#include <vector>
diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx
index 4da003dfc7a9..e746462e426d 100644
--- a/sc/inc/funcdesc.hxx
+++ b/sc/inc/funcdesc.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_FUNCDESC_HXX
-#define SC_FUNCDESC_HXX
+#ifndef INCLUDED_SC_INC_FUNCDESC_HXX
+#define INCLUDED_SC_INC_FUNCDESC_HXX
/* Function descriptions for function wizard / autopilot */
@@ -404,6 +404,6 @@ private:
mutable ::std::vector<const ScFuncDesc*>::iterator pCurCatListEnd; /**< end of current category */
};
-#endif // SC_FUNCDESC_HXX
+#endif // INCLUDED_SC_INC_FUNCDESC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx
index 0da2cec8ffa6..25328df65b41 100644
--- a/sc/inc/funcuno.hxx
+++ b/sc/inc/funcuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_FUNCUNO_HXX
-#define SC_FUNCUNO_HXX
+#ifndef INCLUDED_SC_INC_FUNCUNO_HXX
+#define INCLUDED_SC_INC_FUNCUNO_HXX
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/sheet/XFunctionAccess.hpp>
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index d950d3439b28..3944f74ed4dd 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_SCGLOB_HXX
-#define SC_SCGLOB_HXX
+#ifndef INCLUDED_SC_INC_GLOBAL_HXX
+#define INCLUDED_SC_INC_GLOBAL_HXX
#include "address.hxx"
#include <i18nlangtag/lang.h>
diff --git a/sc/inc/globalnames.hxx b/sc/inc/globalnames.hxx
index 336bee6688f8..dd800aa9d80b 100644
--- a/sc/inc/globalnames.hxx
+++ b/sc/inc/globalnames.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef __SC_GLOBALNAMES_HXX__
-#define __SC_GLOBALNAMES_HXX__
+#ifndef INCLUDED_SC_INC_GLOBALNAMES_HXX
+#define INCLUDED_SC_INC_GLOBALNAMES_HXX
#define STR_DB_LOCAL_NONAME "__Anonymous_Sheet_DB__"
#define STR_DB_GLOBAL_NONAME "__Anonymous_DB__"
diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx
index ecfe6b920614..13bde4e5972b 100644
--- a/sc/inc/hints.hxx
+++ b/sc/inc/hints.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_HINTS_HXX
-#define SC_HINTS_HXX
+#ifndef INCLUDED_SC_INC_HINTS_HXX
+#define INCLUDED_SC_INC_HINTS_HXX
#include "global.hxx"
#include "address.hxx"
diff --git a/sc/inc/importfilterdata.hxx b/sc/inc/importfilterdata.hxx
index 23cef833d202..9144f9d4c9ef 100644
--- a/sc/inc/importfilterdata.hxx
+++ b/sc/inc/importfilterdata.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_IMPORTFILTERDATA_HXX
-#define SC_IMPORTFILTERDATA_HXX
+#ifndef INCLUDED_SC_INC_IMPORTFILTERDATA_HXX
+#define INCLUDED_SC_INC_IMPORTFILTERDATA_HXX
#include <address.hxx>
diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx
index 0fa8a270623e..bc259928c05e 100644
--- a/sc/inc/inputopt.hxx
+++ b/sc/inc/inputopt.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_INPUTOPT_HXX
-#define SC_INPUTOPT_HXX
+#ifndef INCLUDED_SC_INC_INPUTOPT_HXX
+#define INCLUDED_SC_INC_INPUTOPT_HXX
#include <unotools/configitem.hxx>
diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index ce59965f1473..76369f67a399 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_LINKUNO_HXX
-#define SC_LINKUNO_HXX
+#ifndef INCLUDED_SC_INC_LINKUNO_HXX
+#define INCLUDED_SC_INC_LINKUNO_HXX
#include <svl/lstner.hxx>
#include <svl/itemprop.hxx>
diff --git a/sc/inc/listenercalls.hxx b/sc/inc/listenercalls.hxx
index ff47be822d7e..7ef5f65a751a 100644
--- a/sc/inc/listenercalls.hxx
+++ b/sc/inc/listenercalls.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_LISTENERCALLS_HXX
-#define SC_LISTENERCALLS_HXX
+#ifndef INCLUDED_SC_INC_LISTENERCALLS_HXX
+#define INCLUDED_SC_INC_LISTENERCALLS_HXX
#include <list>
#include <com/sun/star/uno/Reference.hxx>
diff --git a/sc/inc/listenercontext.hxx b/sc/inc/listenercontext.hxx
index fdb525758d6d..0e63b8d11e20 100644
--- a/sc/inc/listenercontext.hxx
+++ b/sc/inc/listenercontext.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_LISTENERCONTEXT_HXX
-#define SC_LISTENERCONTEXT_HXX
+#ifndef INCLUDED_SC_INC_LISTENERCONTEXT_HXX
+#define INCLUDED_SC_INC_LISTENERCONTEXT_HXX
#include "address.hxx"
#include "columnspanset.hxx"
diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx
index f163bfc93721..88f5f0b954c8 100644
--- a/sc/inc/lookupcache.hxx
+++ b/sc/inc/lookupcache.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SC_LOOKUPCACHE_HXX
-#define INCLUDED_SC_LOOKUPCACHE_HXX
+#ifndef INCLUDED_SC_INC_LOOKUPCACHE_HXX
+#define INCLUDED_SC_INC_LOOKUPCACHE_HXX
#include "address.hxx"
#include "global.hxx"
diff --git a/sc/inc/macromgr.hxx b/sc/inc/macromgr.hxx
index f2229dd89522..2c7c30eba452 100644
--- a/sc/inc/macromgr.hxx
+++ b/sc/inc/macromgr.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_MACROMGR_HXX
-#define SC_MACROMGR_HXX
+#ifndef INCLUDED_SC_INC_MACROMGR_HXX
+#define INCLUDED_SC_INC_MACROMGR_HXX
#include <com/sun/star/container/XContainerListener.hpp>
diff --git a/sc/inc/markarr.hxx b/sc/inc/markarr.hxx
index 17ec61e621d3..ccfbd9eeab7b 100644
--- a/sc/inc/markarr.hxx
+++ b/sc/inc/markarr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_MARKARR_HXX
-#define SC_MARKARR_HXX
+#ifndef INCLUDED_SC_INC_MARKARR_HXX
+#define INCLUDED_SC_INC_MARKARR_HXX
#include "address.hxx"
diff --git a/sc/inc/markdata.hxx b/sc/inc/markdata.hxx
index da225f5ea926..eb374ec6d037 100644
--- a/sc/inc/markdata.hxx
+++ b/sc/inc/markdata.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_MARKDATA_HXX
-#define SC_MARKDATA_HXX
+#ifndef INCLUDED_SC_INC_MARKDATA_HXX
+#define INCLUDED_SC_INC_MARKDATA_HXX
#include "address.hxx"
#include "scdllapi.h"
diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx
index 84a9cd784360..31141bdde57a 100644
--- a/sc/inc/miscuno.hxx
+++ b/sc/inc/miscuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_MISCUNO_HXX
-#define SC_MISCUNO_HXX
+#ifndef INCLUDED_SC_INC_MISCUNO_HXX
+#define INCLUDED_SC_INC_MISCUNO_HXX
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sc/inc/mtvcellfunc.hxx b/sc/inc/mtvcellfunc.hxx
index 092dcf7a54c1..54ffc9b03067 100644
--- a/sc/inc/mtvcellfunc.hxx
+++ b/sc/inc/mtvcellfunc.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_MTVCELLFUNC_HXX
-#define SC_MTVCELLFUNC_HXX
+#ifndef INCLUDED_SC_INC_MTVCELLFUNC_HXX
+#define INCLUDED_SC_INC_MTVCELLFUNC_HXX
#include "mtvelements.hxx"
#include "mtvfunctions.hxx"
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
index 1e08c1241e2b..836e6dd1b13c 100644
--- a/sc/inc/mtvelements.hxx
+++ b/sc/inc/mtvelements.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_MTVELEMENTS_HXX
-#define SC_MTVELEMENTS_HXX
+#ifndef INCLUDED_SC_INC_MTVELEMENTS_HXX
+#define INCLUDED_SC_INC_MTVELEMENTS_HXX
#include "address.hxx"
#include "formulacell.hxx"
diff --git a/sc/inc/mtvfunctions.hxx b/sc/inc/mtvfunctions.hxx
index fdf79fa017f9..28a15d9e32b3 100644
--- a/sc/inc/mtvfunctions.hxx
+++ b/sc/inc/mtvfunctions.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_MTVFUNCTIONS_HXX
-#define SC_MTVFUNCTIONS_HXX
+#ifndef INCLUDED_SC_INC_MTVFUNCTIONS_HXX
+#define INCLUDED_SC_INC_MTVFUNCTIONS_HXX
#include <cstdlib>
#include <mdds/multi_type_vector_types.hpp>
diff --git a/sc/inc/mutexhlp.hxx b/sc/inc/mutexhlp.hxx
index 4e692d6da9bf..1cd32495e396 100644
--- a/sc/inc/mutexhlp.hxx
+++ b/sc/inc/mutexhlp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_MUTEXHLP_HXX
-#define SC_MUTEXHLP_HXX
+#ifndef INCLUDED_SC_INC_MUTEXHLP_HXX
+#define INCLUDED_SC_INC_MUTEXHLP_HXX
#include <osl/mutex.hxx>
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index e1eedd409d7d..a92f894cebfa 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_NAMEUNO_HXX
-#define SC_NAMEUNO_HXX
+#ifndef INCLUDED_SC_INC_NAMEUNO_HXX
+#define INCLUDED_SC_INC_NAMEUNO_HXX
#include <svl/lstner.hxx>
#include "address.hxx"
diff --git a/sc/inc/navicfg.hxx b/sc/inc/navicfg.hxx
index d0d8ebc8af71..8d5b3d15cb94 100644
--- a/sc/inc/navicfg.hxx
+++ b/sc/inc/navicfg.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_NAVICFG_HXX
-#define SC_NAVICFG_HXX
+#ifndef INCLUDED_SC_INC_NAVICFG_HXX
+#define INCLUDED_SC_INC_NAVICFG_HXX
#include <sal/types.h>
diff --git a/sc/inc/notesuno.hxx b/sc/inc/notesuno.hxx
index 6795481055e2..cf5c1ae0adad 100644
--- a/sc/inc/notesuno.hxx
+++ b/sc/inc/notesuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_NOTESUNO_HXX
-#define SC_NOTESUNO_HXX
+#ifndef INCLUDED_SC_INC_NOTESUNO_HXX
+#define INCLUDED_SC_INC_NOTESUNO_HXX
#include <com/sun/star/sheet/XSheetAnnotation.hpp>
#include <com/sun/star/sheet/XSheetAnnotationShapeSupplier.hpp>
diff --git a/sc/inc/olinetab.hxx b/sc/inc/olinetab.hxx
index c7de8c973f66..8a557c6c61e9 100644
--- a/sc/inc/olinetab.hxx
+++ b/sc/inc/olinetab.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_OUTLINETAB_HXX
-#define SC_OUTLINETAB_HXX
+#ifndef INCLUDED_SC_INC_OLINETAB_HXX
+#define INCLUDED_SC_INC_OLINETAB_HXX
#include "scdllapi.h"
#include "address.hxx"
diff --git a/sc/inc/optuno.hxx b/sc/inc/optuno.hxx
index 9f8c63af8ee1..b9c3fec85067 100644
--- a/sc/inc/optuno.hxx
+++ b/sc/inc/optuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_OPTUNO_HXX
-#define SC_OPTUNO_HXX
+#ifndef INCLUDED_SC_INC_OPTUNO_HXX
+#define INCLUDED_SC_INC_OPTUNO_HXX
#include "docuno.hxx"
#include "docoptio.hxx"
diff --git a/sc/inc/optutil.hxx b/sc/inc/optutil.hxx
index 044a6b6665df..a020c4c67e8c 100644
--- a/sc/inc/optutil.hxx
+++ b/sc/inc/optutil.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_OPTUTIL_HXX
-#define SC_OPTUTIL_HXX
+#ifndef INCLUDED_SC_INC_OPTUTIL_HXX
+#define INCLUDED_SC_INC_OPTUTIL_HXX
#include <unotools/configitem.hxx>
#include <tools/link.hxx>
diff --git a/sc/inc/orcusfilters.hxx b/sc/inc/orcusfilters.hxx
index 62c97591ee5a..79aec8bca486 100644
--- a/sc/inc/orcusfilters.hxx
+++ b/sc/inc/orcusfilters.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef __SC_ORCUSFILTERS_HXX__
-#define __SC_ORCUSFILTERS_HXX__
+#ifndef INCLUDED_SC_INC_ORCUSFILTERS_HXX
+#define INCLUDED_SC_INC_ORCUSFILTERS_HXX
#include "rtl/ustring.hxx"
diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx
index c8d7fdf2f0b1..6ff9190311a5 100644
--- a/sc/inc/orcusxml.hxx
+++ b/sc/inc/orcusxml.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef __SC_ORCUSXML_HXX__
-#define __SC_ORCUSXML_HXX__
+#ifndef INCLUDED_SC_INC_ORCUSXML_HXX
+#define INCLUDED_SC_INC_ORCUSXML_HXX
#include "scdllapi.h"
#include "address.hxx"
diff --git a/sc/inc/pagepar.hxx b/sc/inc/pagepar.hxx
index 9a00f184c92b..881dc4d3859d 100644
--- a/sc/inc/pagepar.hxx
+++ b/sc/inc/pagepar.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_PAGEPAR_HXX
-#define SC_PAGEPAR_HXX
+#ifndef INCLUDED_SC_INC_PAGEPAR_HXX
+#define INCLUDED_SC_INC_PAGEPAR_HXX
#include "global.hxx"
#include "address.hxx"
diff --git a/sc/inc/pageuno.hxx b/sc/inc/pageuno.hxx
index 63199b80be35..f67720cc1a2c 100644
--- a/sc/inc/pageuno.hxx
+++ b/sc/inc/pageuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_PAGEUNO_HXX
-#define SC_PAGEUNO_HXX
+#ifndef INCLUDED_SC_INC_PAGEUNO_HXX
+#define INCLUDED_SC_INC_PAGEUNO_HXX
#include <svx/fmdpage.hxx>
diff --git a/sc/inc/paramisc.hxx b/sc/inc/paramisc.hxx
index 13261822386e..0a21a1db83a6 100644
--- a/sc/inc/paramisc.hxx
+++ b/sc/inc/paramisc.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_PARAMISC_HXX
-#define SC_PARAMISC_HXX
+#ifndef INCLUDED_SC_INC_PARAMISC_HXX
+#define INCLUDED_SC_INC_PARAMISC_HXX
#include "address.hxx"
#include <sal/types.h>
@@ -63,6 +63,6 @@ struct SC_DLLPUBLIC ScTabOpParam
bool operator== ( const ScTabOpParam& r ) const;
};
-#endif // SC_PARAMISC_HXX
+#endif // INCLUDED_SC_INC_PARAMISC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx
index c076fd9e24d4..ff34b0c326ad 100644
--- a/sc/inc/patattr.hxx
+++ b/sc/inc/patattr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_SCPATATR_HXX
-#define SC_SCPATATR_HXX
+#ifndef INCLUDED_SC_INC_PATATTR_HXX
+#define INCLUDED_SC_INC_PATATTR_HXX
#include <svl/poolitem.hxx>
#include <svl/itemset.hxx>
diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx
index 6102137a88a3..a3661a4c6708 100644
--- a/sc/inc/pivot.hxx
+++ b/sc/inc/pivot.hxx
@@ -33,8 +33,8 @@
Make sure that either ColArr or RowArr contains a PivotDataField entry.
*/
-#ifndef SC_PIVOT_HXX
-#define SC_PIVOT_HXX
+#ifndef INCLUDED_SC_INC_PIVOT_HXX
+#define INCLUDED_SC_INC_PIVOT_HXX
#include "global.hxx"
#include "address.hxx"
diff --git a/sc/inc/platforminfo.hxx b/sc/inc/platforminfo.hxx
index 71206e01a94b..2c2e831fbc5a 100644
--- a/sc/inc/platforminfo.hxx
+++ b/sc/inc/platforminfo.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_PLATFORM_INFO_HXX
-#define SC_PLATFORM_INFO_HXX
+#ifndef INCLUDED_SC_INC_PLATFORMINFO_HXX
+#define INCLUDED_SC_INC_PLATFORMINFO_HXX
#include <vector>
diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index d31dcfd2b032..47a299761612 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_POSTIT_HXX
-#define SC_POSTIT_HXX
+#ifndef INCLUDED_SC_INC_POSTIT_HXX
+#define INCLUDED_SC_INC_POSTIT_HXX
#include <boost/shared_ptr.hpp>
#include <rtl/ustring.hxx>
diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx
index 0c236dbcfea3..f6372e67f403 100644
--- a/sc/inc/printopt.hxx
+++ b/sc/inc/printopt.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_PRINTOPT_HXX
-#define SC_PRINTOPT_HXX
+#ifndef INCLUDED_SC_INC_PRINTOPT_HXX
+#define INCLUDED_SC_INC_PRINTOPT_HXX
#include <svl/poolitem.hxx>
#include <unotools/configitem.hxx>
diff --git a/sc/inc/prnsave.hxx b/sc/inc/prnsave.hxx
index cb1ca8c6c66f..fbc10920eed5 100644
--- a/sc/inc/prnsave.hxx
+++ b/sc/inc/prnsave.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_PRNSAVE_HXX
-#define SC_PRNSAVE_HXX
+#ifndef INCLUDED_SC_INC_PRNSAVE_HXX
+#define INCLUDED_SC_INC_PRNSAVE_HXX
#include "address.hxx"
#include <vector>
diff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxx
index bf66d7293f3b..541d54718b76 100644
--- a/sc/inc/progress.hxx
+++ b/sc/inc/progress.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_PROGRESS_HXX
-#define SC_PROGRESS_HXX
+#ifndef INCLUDED_SC_INC_PROGRESS_HXX
+#define INCLUDED_SC_INC_PROGRESS_HXX
#include <rtl/ustring.hxx>
#include <sfx2/progress.hxx>
diff --git a/sc/inc/queryentry.hxx b/sc/inc/queryentry.hxx
index cc35b23cb2bc..a39e87e43856 100644
--- a/sc/inc/queryentry.hxx
+++ b/sc/inc/queryentry.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __SC_QUERYENTRY_HXX__
-#define __SC_QUERYENTRY_HXX__
+#ifndef INCLUDED_SC_INC_QUERYENTRY_HXX
+#define INCLUDED_SC_INC_QUERYENTRY_HXX
#include "address.hxx"
#include "global.hxx"
diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx
index 24d62b23fccd..f069abdb5dc3 100644
--- a/sc/inc/queryparam.hxx
+++ b/sc/inc/queryparam.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_QUERYPARAM_HXX
-#define SC_QUERYPARAM_HXX
+#ifndef INCLUDED_SC_INC_QUERYPARAM_HXX
+#define INCLUDED_SC_INC_QUERYPARAM_HXX
#include "global.hxx"
#include "types.hxx"
diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx
index 4a35b91e59b2..5e4d70cadc24 100644
--- a/sc/inc/rangelst.hxx
+++ b/sc/inc/rangelst.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_RANGELST_HXX
-#define SC_RANGELST_HXX
+#ifndef INCLUDED_SC_INC_RANGELST_HXX
+#define INCLUDED_SC_INC_RANGELST_HXX
#include "global.hxx"
#include "address.hxx"
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index 5d4aebea1b4f..dbf7eb47e7eb 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_RANGENAM_HXX
-#define SC_RANGENAM_HXX
+#ifndef INCLUDED_SC_INC_RANGENAM_HXX
+#define INCLUDED_SC_INC_RANGENAM_HXX
#include "global.hxx"
#include "address.hxx"
diff --git a/sc/inc/rangeseq.hxx b/sc/inc/rangeseq.hxx
index 05e21708ec97..87560eef6d1a 100644
--- a/sc/inc/rangeseq.hxx
+++ b/sc/inc/rangeseq.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_RANGESEQ_HXX
-#define SC_RANGESEQ_HXX
+#ifndef INCLUDED_SC_INC_RANGESEQ_HXX
+#define INCLUDED_SC_INC_RANGESEQ_HXX
#include <com/sun/star/uno/Any.h>
#include "types.hxx"
diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx
index e993a46ce359..8741a7c55026 100644
--- a/sc/inc/rangeutl.hxx
+++ b/sc/inc/rangeutl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_RANGEUTL_HXX
-#define SC_RANGEUTL_HXX
+#ifndef INCLUDED_SC_INC_RANGEUTL_HXX
+#define INCLUDED_SC_INC_RANGEUTL_HXX
#include "address.hxx"
#include "rangenam.hxx"
@@ -296,6 +296,6 @@ public:
bool WasDBName() const { return !bFirstPass; }
};
-#endif // SC_RANGEUTL_HXX
+#endif // INCLUDED_SC_INC_RANGEUTL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/rechead.hxx b/sc/inc/rechead.hxx
index b2f256880909..dfd5cb4e9b70 100644
--- a/sc/inc/rechead.hxx
+++ b/sc/inc/rechead.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_RECHEAD_HXX
-#define SC_RECHEAD_HXX
+#ifndef INCLUDED_SC_INC_RECHEAD_HXX
+#define INCLUDED_SC_INC_RECHEAD_HXX
#include <tools/stream.hxx>
diff --git a/sc/inc/recursionhelper.hxx b/sc/inc/recursionhelper.hxx
index 39053e49f55d..82de9c9335a7 100644
--- a/sc/inc/recursionhelper.hxx
+++ b/sc/inc/recursionhelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_RECURSIONHELPER_HXX
-#define INCLUDED_RECURSIONHELPER_HXX
+#ifndef INCLUDED_SC_INC_RECURSIONHELPER_HXX
+#define INCLUDED_SC_INC_RECURSIONHELPER_HXX
#include "formularesult.hxx"
@@ -96,6 +96,6 @@ public:
void Clear();
};
-#endif // INCLUDED_RECURSIONHELPER_HXX
+#endif // INCLUDED_SC_INC_RECURSIONHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index 8d9e5fb55892..53a356c959b5 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_REFDATA_HXX
-#define SC_REFDATA_HXX
+#ifndef INCLUDED_SC_INC_REFDATA_HXX
+#define INCLUDED_SC_INC_REFDATA_HXX
#include "global.hxx"
#include "address.hxx"
diff --git a/sc/inc/reffind.hxx b/sc/inc/reffind.hxx
index b05c3912d411..bd2096fd11ad 100644
--- a/sc/inc/reffind.hxx
+++ b/sc/inc/reffind.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_REFFIND_HXX
-#define SC_REFFIND_HXX
+#ifndef INCLUDED_SC_INC_REFFIND_HXX
+#define INCLUDED_SC_INC_REFFIND_HXX
#include "address.hxx"
diff --git a/sc/inc/refhint.hxx b/sc/inc/refhint.hxx
index ec56735faaf3..b9ddf046fb8a 100644
--- a/sc/inc/refhint.hxx
+++ b/sc/inc/refhint.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_REFHINT_HXX
-#define SC_REFHINT_HXX
+#ifndef INCLUDED_SC_INC_REFHINT_HXX
+#define INCLUDED_SC_INC_REFHINT_HXX
#include <address.hxx>
#include <simplehintids.hxx>
diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx
index 2c0b837923d9..c392b9c939a3 100644
--- a/sc/inc/refreshtimer.hxx
+++ b/sc/inc/refreshtimer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_REFRESHTIMER_HXX
-#define SC_REFRESHTIMER_HXX
+#ifndef INCLUDED_SC_INC_REFRESHTIMER_HXX
+#define INCLUDED_SC_INC_REFRESHTIMER_HXX
#include <vcl/timer.hxx>
#include <osl/mutex.hxx>
@@ -62,6 +62,6 @@ private:
void Start();
};
-#endif // SC_REFRESHTIMER_HXX
+#endif // INCLUDED_SC_INC_REFRESHTIMER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/refreshtimerprotector.hxx b/sc/inc/refreshtimerprotector.hxx
index 679586d22d46..3ca5568411a7 100644
--- a/sc/inc/refreshtimerprotector.hxx
+++ b/sc/inc/refreshtimerprotector.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_REFRESHTIMERPROTECTOR_HXX
-#define SC_REFRESHTIMERPROTECTOR_HXX
+#ifndef INCLUDED_SC_INC_REFRESHTIMERPROTECTOR_HXX
+#define INCLUDED_SC_INC_REFRESHTIMERPROTECTOR_HXX
#include <sal/config.h>
#include "scdllapi.h"
diff --git a/sc/inc/reftokenhelper.hxx b/sc/inc/reftokenhelper.hxx
index cd1c9e8112e8..6b04388685fe 100644
--- a/sc/inc/reftokenhelper.hxx
+++ b/sc/inc/reftokenhelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_REFTOKENHELPER_HXX
-#define SC_REFTOKENHELPER_HXX
+#ifndef INCLUDED_SC_INC_REFTOKENHELPER_HXX
+#define INCLUDED_SC_INC_REFTOKENHELPER_HXX
#include "token.hxx"
diff --git a/sc/inc/refupdatecontext.hxx b/sc/inc/refupdatecontext.hxx
index bd87792114ff..393a85511406 100644
--- a/sc/inc/refupdatecontext.hxx
+++ b/sc/inc/refupdatecontext.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_REFUPDATECONTEXT_HXX
-#define SC_REFUPDATECONTEXT_HXX
+#ifndef INCLUDED_SC_INC_REFUPDATECONTEXT_HXX
+#define INCLUDED_SC_INC_REFUPDATECONTEXT_HXX
#include "global.hxx"
#include "address.hxx"
diff --git a/sc/inc/rowheightcontext.hxx b/sc/inc/rowheightcontext.hxx
index 7985df372acc..50d2109a54c4 100644
--- a/sc/inc/rowheightcontext.hxx
+++ b/sc/inc/rowheightcontext.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_ROWHEIGHTCONTEXT_HXX
-#define SC_ROWHEIGHTCONTEXT_HXX
+#ifndef INCLUDED_SC_INC_ROWHEIGHTCONTEXT_HXX
+#define INCLUDED_SC_INC_ROWHEIGHTCONTEXT_HXX
#include <scdllapi.h>
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 2a067516843f..3ac772a91369 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SC_ABSTDLG_HXX
-#define _SC_ABSTDLG_HXX
+#ifndef INCLUDED_SC_INC_SCABSTDLG_HXX
+#define INCLUDED_SC_INC_SCABSTDLG_HXX
#include <tools/solar.h>
#include <sfx2/sfxdlg.hxx>
diff --git a/sc/inc/sccommands.h b/sc/inc/sccommands.h
index 7133b4275ff3..3a2fb44382c1 100644
--- a/sc/inc/sccommands.h
+++ b/sc/inc/sccommands.h
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_SCCOMMANDS_HRC
-#define SC_SCCOMMANDS_HRC
+#ifndef INCLUDED_SC_INC_SCCOMMANDS_H
+#define INCLUDED_SC_INC_SCCOMMANDS_H
#define CMD_FID_CHG_ACCEPT ".uno:AcceptChanges"
#define CMD_FID_ADD_NAME ".uno:AddName"
diff --git a/sc/inc/scdll.hxx b/sc/inc/scdll.hxx
index 6f7b16352aa5..2b8cc661f9e6 100644
--- a/sc/inc/scdll.hxx
+++ b/sc/inc/scdll.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_SCDLL_HXX
-#define SC_SCDLL_HXX
+#ifndef INCLUDED_SC_INC_SCDLL_HXX
+#define INCLUDED_SC_INC_SCDLL_HXX
class SfxMedium;
class SfxFilter;
diff --git a/sc/inc/scdllapi.h b/sc/inc/scdllapi.h
index bbd6e49e241b..83c3feafe475 100644
--- a/sc/inc/scdllapi.h
+++ b/sc/inc/scdllapi.h
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SCDLLAPI_H
-#define INCLUDED_SCDLLAPI_H
+#ifndef INCLUDED_SC_INC_SCDLLAPI_H
+#define INCLUDED_SC_INC_SCDLLAPI_H
#include "sal/types.h"
@@ -28,6 +28,6 @@
#define SC_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
-#endif /* INCLUDED_SCDLLAPI_H */
+#endif // INCLUDED_SC_INC_SCDLLAPI_H
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/scerrors.hxx b/sc/inc/scerrors.hxx
index 1a98f73aa24d..69a00d613e48 100644
--- a/sc/inc/scerrors.hxx
+++ b/sc/inc/scerrors.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SCERRORS_HXX
-#define _SCERRORS_HXX
+#ifndef INCLUDED_SC_INC_SCERRORS_HXX
+#define INCLUDED_SC_INC_SCERRORS_HXX
#include <tools/errcode.hxx>
diff --git a/sc/inc/scextopt.hxx b/sc/inc/scextopt.hxx
index bcdaa2c2a070..30b0dadc2fcc 100644
--- a/sc/inc/scextopt.hxx
+++ b/sc/inc/scextopt.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_SCEXTOPT_HXX
-#define SC_SCEXTOPT_HXX
+#ifndef INCLUDED_SC_INC_SCEXTOPT_HXX
+#define INCLUDED_SC_INC_SCEXTOPT_HXX
#include <memory>
#include <tools/gen.hxx>
diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx
index 3b92de14239d..48ee7fe2a063 100644
--- a/sc/inc/scitems.hxx
+++ b/sc/inc/scitems.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_ITEMS_HXX
-#define SC_ITEMS_HXX
+#ifndef INCLUDED_SC_INC_SCITEMS_HXX
+#define INCLUDED_SC_INC_SCITEMS_HXX
#include <svx/svxids.hrc>
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index 5214b54be79f..26bb20fb86a6 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_MATRIX_HXX
-#define SC_MATRIX_HXX
+#ifndef INCLUDED_SC_INC_SCMATRIX_HXX
+#define INCLUDED_SC_INC_SCMATRIX_HXX
#include "global.hxx"
#include "types.hxx"
@@ -396,6 +396,6 @@ inline void intrusive_ptr_release(const ScMatrix* p)
p->DecRef();
}
-#endif // SC_MATRIX_HXX
+#endif // INCLUDED_SC_INC_SCMATRIX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index db68ba765fc7..de9d9c2372ed 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_SCMOD_HXX
-#define SC_SCMOD_HXX
+#ifndef INCLUDED_SC_INC_SCMOD_HXX
+#define INCLUDED_SC_INC_SCMOD_HXX
#include "scdllapi.h"
#include "scdll.hxx"
diff --git a/sc/inc/scopetools.hxx b/sc/inc/scopetools.hxx
index f1a117471595..7f9819246aec 100644
--- a/sc/inc/scopetools.hxx
+++ b/sc/inc/scopetools.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_SCOPETOOLS_HXX
-#define SC_SCOPETOOLS_HXX
+#ifndef INCLUDED_SC_INC_SCOPETOOLS_HXX
+#define INCLUDED_SC_INC_SCOPETOOLS_HXX
#include <scdllapi.h>
diff --git a/sc/inc/scresid.hxx b/sc/inc/scresid.hxx
index 343225281e75..d74c870d8101 100644
--- a/sc/inc/scresid.hxx
+++ b/sc/inc/scresid.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_SCRESID_HXX
-#define SC_SCRESID_HXX
+#ifndef INCLUDED_SC_INC_SCRESID_HXX
+#define INCLUDED_SC_INC_SCRESID_HXX
#include <tools/resid.hxx>
#include "scdllapi.h"
diff --git a/sc/inc/scwarngs.hxx b/sc/inc/scwarngs.hxx
index 73b2a437c1b0..a9713ffaad26 100644
--- a/sc/inc/scwarngs.hxx
+++ b/sc/inc/scwarngs.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __SCWARNGS_HXX_
-#define __SCWARNGS_HXX_
+#ifndef INCLUDED_SC_INC_SCWARNGS_HXX
+#define INCLUDED_SC_INC_SCWARNGS_HXX
#define ERRCODE_SC_EXPORT_WRN_ASCII (ERRCODE_WARNING_MASK | ERRCODE_AREA_SC | ERRCODE_CLASS_WRITE | 1)
#define ERRCODE_SC_IMPORT_WRN_RNGOVRFLW (ERRCODE_WARNING_MASK | ERRCODE_AREA_SC | ERRCODE_CLASS_READ | 1)
diff --git a/sc/inc/segmenttree.hxx b/sc/inc/segmenttree.hxx
index 1285327047ef..a62e35606115 100644
--- a/sc/inc/segmenttree.hxx
+++ b/sc/inc/segmenttree.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_SEGMENTTREE_HXX
-#define SC_SEGMENTTREE_HXX
+#ifndef INCLUDED_SC_INC_SEGMENTTREE_HXX
+#define INCLUDED_SC_INC_SEGMENTTREE_HXX
#include "address.hxx"
diff --git a/sc/inc/servuno.hxx b/sc/inc/servuno.hxx
index 908ad9e15881..b88b78316b75 100644
--- a/sc/inc/servuno.hxx
+++ b/sc/inc/servuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_SERVUNO_HXX
-#define SC_SERVUNO_HXX
+#ifndef INCLUDED_SC_INC_SERVUNO_HXX
+#define INCLUDED_SC_INC_SERVUNO_HXX
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx
index e003fd3b608b..7110d0a90680 100644
--- a/sc/inc/shapeuno.hxx
+++ b/sc/inc/shapeuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_SHAPEUNO_HXX
-#define SC_SHAPEUNO_HXX
+#ifndef INCLUDED_SC_INC_SHAPEUNO_HXX
+#define INCLUDED_SC_INC_SHAPEUNO_HXX
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sc/inc/sharedformula.hxx b/sc/inc/sharedformula.hxx
index 571d73c5e2e4..840b63b9bbe4 100644
--- a/sc/inc/sharedformula.hxx
+++ b/sc/inc/sharedformula.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_SHAREDFORMULA_HXX
-#define SC_SHAREDFORMULA_HXX
+#ifndef INCLUDED_SC_INC_SHAREDFORMULA_HXX
+#define INCLUDED_SC_INC_SHAREDFORMULA_HXX
#include "formulacell.hxx"
#include "mtvelements.hxx"
diff --git a/sc/inc/sheetdata.hxx b/sc/inc/sheetdata.hxx
index 2f5c8cf89ccc..0e6e240681f3 100644
--- a/sc/inc/sheetdata.hxx
+++ b/sc/inc/sheetdata.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_SHEETDATA_HXX
-#define SC_SHEETDATA_HXX
+#ifndef INCLUDED_SC_INC_SHEETDATA_HXX
+#define INCLUDED_SC_INC_SHEETDATA_HXX
#include <xmloff/maptype.hxx>
#include <editeng/editdata.hxx>
diff --git a/sc/inc/sheetevents.hxx b/sc/inc/sheetevents.hxx
index e10fda07a90a..46549b882009 100644
--- a/sc/inc/sheetevents.hxx
+++ b/sc/inc/sheetevents.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_SHEETEVENTS_HXX
-#define SC_SHEETEVENTS_HXX
+#ifndef INCLUDED_SC_INC_SHEETEVENTS_HXX
+#define INCLUDED_SC_INC_SHEETEVENTS_HXX
#include <rtl/ustring.hxx>
diff --git a/sc/inc/shellids.hxx b/sc/inc/shellids.hxx
index d12db32a791c..f1f7283e0f88 100644
--- a/sc/inc/shellids.hxx
+++ b/sc/inc/shellids.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_SHELLIDS_HXX
-#define SC_SHELLIDS_HXX
+#ifndef INCLUDED_SC_INC_SHELLIDS_HXX
+#define INCLUDED_SC_INC_SHELLIDS_HXX
// Sfx Interface-IDs
#define SCID_APP (SFX_INTERFACE_SC_START+0)
diff --git a/sc/inc/simpleformulacalc.hxx b/sc/inc/simpleformulacalc.hxx
index 4d13c6bd7a3b..4d4e96291b77 100644
--- a/sc/inc/simpleformulacalc.hxx
+++ b/sc/inc/simpleformulacalc.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_SIMPLE_FORMULA_CALC_HXX
-#define SC_SIMPLE_FORMULA_CALC_HXX
+#ifndef INCLUDED_SC_INC_SIMPLEFORMULACALC_HXX
+#define INCLUDED_SC_INC_SIMPLEFORMULACALC_HXX
#include <boost/scoped_ptr.hpp>
#include <formula/grammar.hxx>
diff --git a/sc/inc/simplehintids.hxx b/sc/inc/simplehintids.hxx
index ecf2f9357c2d..34900c07a51b 100644
--- a/sc/inc/simplehintids.hxx
+++ b/sc/inc/simplehintids.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_SIMPLEHINTIDS_HXX
-#define SC_SIMPLEHINTIDS_HXX
+#ifndef INCLUDED_SC_INC_SIMPLEHINTIDS_HXX
+#define INCLUDED_SC_INC_SIMPLEHINTIDS_HXX
#include <svl/smplhint.hxx>
diff --git a/sc/inc/simplerangelist.hxx b/sc/inc/simplerangelist.hxx
index 2b26eed3a09b..1fcbefd9d832 100644
--- a/sc/inc/simplerangelist.hxx
+++ b/sc/inc/simplerangelist.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef __SC_SIMPLERANGELIST_HXX__
-#define __SC_SIMPLERANGELIST_HXX__
+#ifndef INCLUDED_SC_INC_SIMPLERANGELIST_HXX
+#define INCLUDED_SC_INC_SIMPLERANGELIST_HXX
#include <boost/shared_ptr.hpp>
diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx
index 82a2f5f4cc53..f566aca799f9 100644
--- a/sc/inc/sortparam.hxx
+++ b/sc/inc/sortparam.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_SORTPARAM_HXX
-#define SC_SORTPARAM_HXX
+#ifndef INCLUDED_SC_INC_SORTPARAM_HXX
+#define INCLUDED_SC_INC_SORTPARAM_HXX
#define DEFSORT 3
@@ -80,6 +80,6 @@ struct SC_DLLPUBLIC ScSortParam
};
-#endif // SC_SORTPARAM_HXX
+#endif // INCLUDED_SC_INC_SORTPARAM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/spellcheckcontext.hxx b/sc/inc/spellcheckcontext.hxx
index e3f3f74f0af8..e07e972ebd78 100644
--- a/sc/inc/spellcheckcontext.hxx
+++ b/sc/inc/spellcheckcontext.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_SPELLCHECKCONTEXT_HXX
-#define SC_SPELLCHECKCONTEXT_HXX
+#ifndef INCLUDED_SC_INC_SPELLCHECKCONTEXT_HXX
+#define INCLUDED_SC_INC_SPELLCHECKCONTEXT_HXX
#include "address.hxx"
#include "editeng/misspellrange.hxx"
diff --git a/sc/inc/srchuno.hxx b/sc/inc/srchuno.hxx
index 24cad4d454cd..f9bfc3b9d90d 100644
--- a/sc/inc/srchuno.hxx
+++ b/sc/inc/srchuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_SRCHUNO_HXX
-#define SC_SRCHUNO_HXX
+#ifndef INCLUDED_SC_INC_SRCHUNO_HXX
+#define INCLUDED_SC_INC_SRCHUNO_HXX
#include <com/sun/star/util/XReplaceDescriptor.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/sc/inc/stlalgorithm.hxx b/sc/inc/stlalgorithm.hxx
index 19945c245ef2..d7b4d517b3d3 100644
--- a/sc/inc/stlalgorithm.hxx
+++ b/sc/inc/stlalgorithm.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef __SC_STLALGORITHM_HXX__
-#define __SC_STLALGORITHM_HXX__
+#ifndef INCLUDED_SC_INC_STLALGORITHM_HXX
+#define INCLUDED_SC_INC_STLALGORITHM_HXX
#include <functional>
#include <limits>
diff --git a/sc/inc/stlpool.hxx b/sc/inc/stlpool.hxx
index c8c3fb126c9a..3144bd61e97e 100644
--- a/sc/inc/stlpool.hxx
+++ b/sc/inc/stlpool.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_STLPOOL_HXX
-#define SC_STLPOOL_HXX
+#ifndef INCLUDED_SC_INC_STLPOOL_HXX
+#define INCLUDED_SC_INC_STLPOOL_HXX
#include <svl/style.hxx>
@@ -72,6 +72,6 @@ private:
const OUString* pForceStdName;
};
-#endif // SC_STLPOOL_HXX
+#endif // INCLUDED_SC_INC_STLPOOL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx
index e302c6cc07e0..71e6a4b4c684 100644
--- a/sc/inc/stlsheet.hxx
+++ b/sc/inc/stlsheet.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_STLSHEET_HXX
-#define SC_STLSHEET_HXX
+#ifndef INCLUDED_SC_INC_STLSHEET_HXX
+#define INCLUDED_SC_INC_STLSHEET_HXX
#include <svl/style.hxx>
@@ -75,6 +75,6 @@ protected:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
};
-#endif // SC_STLSHEET_HXX
+#endif // INCLUDED_SC_INC_STLSHEET_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/stringutil.hxx b/sc/inc/stringutil.hxx
index d27500763033..0d536db87836 100644
--- a/sc/inc/stringutil.hxx
+++ b/sc/inc/stringutil.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_STRINGUTIL_HXX
-#define SC_STRINGUTIL_HXX
+#ifndef INCLUDED_SC_INC_STRINGUTIL_HXX
+#define INCLUDED_SC_INC_STRINGUTIL_HXX
#include <rtl/ustring.hxx>
#include "scdllapi.h"
diff --git a/sc/inc/strload.hxx b/sc/inc/strload.hxx
index 199ca3832923..aaff970e9697 100644
--- a/sc/inc/strload.hxx
+++ b/sc/inc/strload.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_STRLOAD_HXX
-#define SC_STRLOAD_HXX
+#ifndef INCLUDED_SC_INC_STRLOAD_HXX
+#define INCLUDED_SC_INC_STRLOAD_HXX
#include "scresid.hxx"
#include <tools/rc.hxx>
@@ -40,6 +40,6 @@ private:
#define SC_STRLOAD(resource,strid) ScRscStrLoader( resource, strid).GetString()
-#endif // SC_STRLOAD_HXX
+#endif // INCLUDED_SC_INC_STRLOAD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/stylehelper.hxx b/sc/inc/stylehelper.hxx
index 2b5444d6b5b0..1d0939acdbdf 100644
--- a/sc/inc/stylehelper.hxx
+++ b/sc/inc/stylehelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_STYLEHELPER_HXX
-#define SC_STYLEHELPER_HXX
+#ifndef INCLUDED_SC_INC_STYLEHELPER_HXX
+#define INCLUDED_SC_INC_STYLEHELPER_HXX
#include <rtl/ustring.hxx>
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx
index 164e02430149..0da518c4fe1d 100644
--- a/sc/inc/styleuno.hxx
+++ b/sc/inc/styleuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_STYLEUNO_HXX
-#define SC_STYLEUNO_HXX
+#ifndef INCLUDED_SC_INC_STYLEUNO_HXX
+#define INCLUDED_SC_INC_STYLEUNO_HXX
#include <svl/itemprop.hxx>
#include <svl/lstner.hxx>
diff --git a/sc/inc/subtotal.hxx b/sc/inc/subtotal.hxx
index 379bf10e7f0b..c7a890e2aeca 100644
--- a/sc/inc/subtotal.hxx
+++ b/sc/inc/subtotal.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_SUBTOTAL_HXX
-#define SC_SUBTOTAL_HXX
+#ifndef INCLUDED_SC_INC_SUBTOTAL_HXX
+#define INCLUDED_SC_INC_SUBTOTAL_HXX
#include "global.hxx"
diff --git a/sc/inc/subtotalparam.hxx b/sc/inc/subtotalparam.hxx
index 7d1399a14868..eaf60f61dd47 100644
--- a/sc/inc/subtotalparam.hxx
+++ b/sc/inc/subtotalparam.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef __SC_SUBTOTALPARAM_HXX__
-#define __SC_SUBTOTALPARAM_HXX__
+#ifndef INCLUDED_SC_INC_SUBTOTALPARAM_HXX
+#define INCLUDED_SC_INC_SUBTOTALPARAM_HXX
#include "global.hxx"
#include "address.hxx"
diff --git a/sc/inc/tabbgcolor.hxx b/sc/inc/tabbgcolor.hxx
index 0009b5262d04..c359301a724b 100644
--- a/sc/inc/tabbgcolor.hxx
+++ b/sc/inc/tabbgcolor.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_TABBGCOLOR_HXX
-#define SC_TABBGCOLOR_HXX
+#ifndef INCLUDED_SC_INC_TABBGCOLOR_HXX
+#define INCLUDED_SC_INC_TABBGCOLOR_HXX
#include "tools/color.hxx"
#include "address.hxx"
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 7da817718379..0544b8bbfc91 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_TABLE_HXX
-#define SC_TABLE_HXX
+#ifndef INCLUDED_SC_INC_TABLE_HXX
+#define INCLUDED_SC_INC_TABLE_HXX
#include <vector>
#include <utility>
diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx
index 94c5f026c94f..f4125f38527e 100644
--- a/sc/inc/tablink.hxx
+++ b/sc/inc/tablink.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_TABLINK_HXX
-#define SC_TABLINK_HXX
+#ifndef INCLUDED_SC_INC_TABLINK_HXX
+#define INCLUDED_SC_INC_TABLINK_HXX
#include "scdllapi.h"
#include "refreshtimer.hxx"
diff --git a/sc/inc/tabopparams.hxx b/sc/inc/tabopparams.hxx
index 3090fc479062..3f475de7aaed 100644
--- a/sc/inc/tabopparams.hxx
+++ b/sc/inc/tabopparams.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_TABOPPARAMS_HXX
-#define SC_TABOPPARAMS_HXX
+#ifndef INCLUDED_SC_INC_TABOPPARAMS_HXX
+#define INCLUDED_SC_INC_TABOPPARAMS_HXX
#include "global.hxx"
#include "address.hxx"
diff --git a/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxx
index 9a4fef125739..577716432a9d 100644
--- a/sc/inc/tabprotection.hxx
+++ b/sc/inc/tabprotection.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_TAB_PROTECTION_HXX
-#define SC_TAB_PROTECTION_HXX
+#ifndef INCLUDED_SC_INC_TABPROTECTION_HXX
+#define INCLUDED_SC_INC_TABPROTECTION_HXX
#include "sal/types.h"
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx
index 454d21dc4e00..a9e4a1f6b5c8 100644
--- a/sc/inc/targuno.hxx
+++ b/sc/inc/targuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_TARGUNO_HXX
-#define SC_TARGUNO_HXX
+#ifndef INCLUDED_SC_INC_TARGUNO_HXX
+#define INCLUDED_SC_INC_TARGUNO_HXX
#include <svl/lstner.hxx>
#include <com/sun/star/document/XLinkTargetSupplier.hpp>
diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx
index 818f638505f7..b02271124f56 100644
--- a/sc/inc/textuno.hxx
+++ b/sc/inc/textuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_TEXTSUNO_HXX
-#define SC_TEXTSUNO_HXX
+#ifndef INCLUDED_SC_INC_TEXTUNO_HXX
+#define INCLUDED_SC_INC_TEXTUNO_HXX
#include "global.hxx"
#include "address.hxx"
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index dc802e12a9ec..272a8f87cd4e 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_TOKEN_HXX
-#define SC_TOKEN_HXX
+#ifndef INCLUDED_SC_INC_TOKEN_HXX
+#define INCLUDED_SC_INC_TOKEN_HXX
#include <vector>
#include <boost/intrusive_ptr.hpp>
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index 1ea6658c2f39..c7f2242caa23 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_TOKENARRAY_HXX
-#define SC_TOKENARRAY_HXX
+#ifndef INCLUDED_SC_INC_TOKENARRAY_HXX
+#define INCLUDED_SC_INC_TOKENARRAY_HXX
#include "formula/token.hxx"
#include "scdllapi.h"
@@ -209,6 +209,6 @@ public:
#endif
};
-#endif // SC_TOKENARRAY_HXX
+#endif // INCLUDED_SC_INC_TOKENARRAY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/tokenstringcontext.hxx b/sc/inc/tokenstringcontext.hxx
index aa61adad0288..5ba1c0313a52 100644
--- a/sc/inc/tokenstringcontext.hxx
+++ b/sc/inc/tokenstringcontext.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_TOKENSTRINGCONTEXT_HXX
-#define SC_TOKENSTRINGCONTEXT_HXX
+#ifndef INCLUDED_SC_INC_TOKENSTRINGCONTEXT_HXX
+#define INCLUDED_SC_INC_TOKENSTRINGCONTEXT_HXX
#include "compiler.hxx"
diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx
index 38eb987011df..3ca6ec56b050 100644
--- a/sc/inc/tokenuno.hxx
+++ b/sc/inc/tokenuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_TOKENUNO_HXX
-#define SC_TOKENUNO_HXX
+#ifndef INCLUDED_SC_INC_TOKENUNO_HXX
+#define INCLUDED_SC_INC_TOKENUNO_HXX
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/sc/inc/typedstrdata.hxx b/sc/inc/typedstrdata.hxx
index 7d8cf4483400..aeb59153fd94 100644
--- a/sc/inc/typedstrdata.hxx
+++ b/sc/inc/typedstrdata.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef __SC_TYPEDSTRDATA_HXX__
-#define __SC_TYPEDSTRDATA_HXX__
+#ifndef INCLUDED_SC_INC_TYPEDSTRDATA_HXX
+#define INCLUDED_SC_INC_TYPEDSTRDATA_HXX
#include "rtl/ustring.hxx"
#include "scdllapi.h"
diff --git a/sc/inc/types.hxx b/sc/inc/types.hxx
index b6c4fa64bb78..045f5504cd40 100644
--- a/sc/inc/types.hxx
+++ b/sc/inc/types.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef SC_TYPES_HXX
-#define SC_TYPES_HXX
+#ifndef INCLUDED_SC_INC_TYPES_HXX
+#define INCLUDED_SC_INC_TYPES_HXX
#include "sal/types.h"
diff --git a/sc/inc/undorangename.hxx b/sc/inc/undorangename.hxx
index b9013d89ab40..a855e9994e9b 100644
--- a/sc/inc/undorangename.hxx
+++ b/sc/inc/undorangename.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef __SC_UNDORANGENAME_HXX__
-#define __SC_UNDORANGENAME_HXX__
+#ifndef INCLUDED_SC_INC_UNDORANGENAME_HXX
+#define INCLUDED_SC_INC_UNDORANGENAME_HXX
#include "undobase.hxx"
#include "rangenam.hxx"
diff --git a/sc/inc/unitconv.hxx b/sc/inc/unitconv.hxx
index 56394cb82dbc..8c6e11eddb6f 100644
--- a/sc/inc/unitconv.hxx
+++ b/sc/inc/unitconv.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_UNITCONV_HXX
-#define SC_UNITCONV_HXX
+#ifndef INCLUDED_SC_INC_UNITCONV_HXX
+#define INCLUDED_SC_INC_UNITCONV_HXX
#include <boost/noncopyable.hpp>
#include <boost/ptr_container/ptr_map.hpp>
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index ff4cf9347945..1cc71a9f9584 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_UNONAMES_HXX
-#define SC_UNONAMES_HXX
+#ifndef INCLUDED_SC_INC_UNONAMES_HXX
+#define INCLUDED_SC_INC_UNONAMES_HXX
// service names
#define SC_SERVICENAME_VALBIND "com.sun.star.table.CellValueBinding"
diff --git a/sc/inc/unoreflist.hxx b/sc/inc/unoreflist.hxx
index 940865c3f1a4..4cff74f368a9 100644
--- a/sc/inc/unoreflist.hxx
+++ b/sc/inc/unoreflist.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_UNOREFLIST_HXX
-#define SC_UNOREFLIST_HXX
+#ifndef INCLUDED_SC_INC_UNOREFLIST_HXX
+#define INCLUDED_SC_INC_UNOREFLIST_HXX
#include <list>
#include <svl/hint.hxx>
diff --git a/sc/inc/unowids.hxx b/sc/inc/unowids.hxx
index 2c5becb03a3f..c2232e6a0c74 100644
--- a/sc/inc/unowids.hxx
+++ b/sc/inc/unowids.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_UNOWIDS_HXX
-#define SC_UNOWIDS_HXX
+#ifndef INCLUDED_SC_INC_UNOWIDS_HXX
+#define INCLUDED_SC_INC_UNOWIDS_HXX
#include "scitems.hxx"
diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx
index 0fecc0200809..6f1389468878 100644
--- a/sc/inc/userdat.hxx
+++ b/sc/inc/userdat.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_USERDAT_HXX
-#define SC_USERDAT_HXX
+#ifndef INCLUDED_SC_INC_USERDAT_HXX
+#define INCLUDED_SC_INC_USERDAT_HXX
#include <svx/svdobj.hxx>
#include <svtools/imap.hxx>
diff --git a/sc/inc/userlist.hxx b/sc/inc/userlist.hxx
index 15637f386493..8cba99245fb3 100644
--- a/sc/inc/userlist.hxx
+++ b/sc/inc/userlist.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_USERLIST_HXX
-#define SC_USERLIST_HXX
+#ifndef INCLUDED_SC_INC_USERLIST_HXX
+#define INCLUDED_SC_INC_USERLIST_HXX
#include <tools/stream.hxx>
#include "scdllapi.h"
diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx
index 1d2f846f9999..532c4627effd 100644
--- a/sc/inc/validat.hxx
+++ b/sc/inc/validat.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_VALIDAT_HXX
-#define SC_VALIDAT_HXX
+#ifndef INCLUDED_SC_INC_VALIDAT_HXX
+#define INCLUDED_SC_INC_VALIDAT_HXX
#include "conditio.hxx"
#include <com/sun/star/sheet/TableValidationVisibility.hpp>
diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx
index af15e1ecbf73..3c2be51af348 100644
--- a/sc/inc/viewopti.hxx
+++ b/sc/inc/viewopti.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_VIEWOPTI_HXX
-#define SC_VIEWOPTI_HXX
+#ifndef INCLUDED_SC_INC_VIEWOPTI_HXX
+#define INCLUDED_SC_INC_VIEWOPTI_HXX
#include <svx/optgrid.hxx>
diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx
index eb5e13a42a03..dcfbb9b14f07 100644
--- a/sc/inc/viewuno.hxx
+++ b/sc/inc/viewuno.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_VIEWUNO_HXX
-#define SC_VIEWUNO_HXX
+#ifndef INCLUDED_SC_INC_VIEWUNO_HXX
+#define INCLUDED_SC_INC_VIEWUNO_HXX
#include <sfx2/sfxbasecontroller.hxx>
#include <svl/itemprop.hxx>
diff --git a/sc/inc/waitoff.hxx b/sc/inc/waitoff.hxx
index 65213bae17c7..a32c468cdde6 100644
--- a/sc/inc/waitoff.hxx
+++ b/sc/inc/waitoff.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_WAITOFF_HXX
-#define SC_WAITOFF_HXX
+#ifndef INCLUDED_SC_INC_WAITOFF_HXX
+#define INCLUDED_SC_INC_WAITOFF_HXX
#include <sal/types.h>
diff --git a/sc/inc/warnpassword.hxx b/sc/inc/warnpassword.hxx
index 998b6902b306..894ad983a142 100644
--- a/sc/inc/warnpassword.hxx
+++ b/sc/inc/warnpassword.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_WARNPASSWORD_HXX
-#define SC_WARNPASSWORD_HXX
+#ifndef INCLUDED_SC_INC_WARNPASSWORD_HXX
+#define INCLUDED_SC_INC_WARNPASSWORD_HXX
class SfxMedium;
/** Static API helper functions. */
diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx
index dda8cd275d8b..c3d44fd0b096 100644
--- a/sc/inc/xmlwrap.hxx
+++ b/sc/inc/xmlwrap.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SC_XMLWRAP_HXX
-#define SC_XMLWRAP_HXX
+#ifndef INCLUDED_SC_INC_XMLWRAP_HXX
+#define INCLUDED_SC_INC_XMLWRAP_HXX
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/sc/inc/zforauto.hxx b/sc/inc/zforauto.hxx
index f76ed1375391..4318daae3c89 100644
--- a/sc/inc/zforauto.hxx
+++ b/sc/inc/zforauto.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ZFORAUTO_HXX_
-#define _ZFORAUTO_HXX_
+#ifndef INCLUDED_SC_INC_ZFORAUTO_HXX
+#define INCLUDED_SC_INC_ZFORAUTO_HXX
#include <rtl/ustring.hxx>
#include <i18nlangtag/lang.h>