[Libreoffice-commits] core.git: 3 commits - bin/fixincludeguards.sh odk/examples sw/source
Thomas Arnhold
thomas at arnhold.org
Tue Jun 3 02:19:20 PDT 2014
bin/fixincludeguards.sh | 2 +-
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.hxx | 6 +++---
odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx | 7 ++++---
odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx | 6 +++---
odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx | 7 ++++---
odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.hxx | 6 +++---
odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx | 6 +++---
odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx | 8 +++++---
odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx | 1 +
odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx | 6 +++---
odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx | 7 ++++---
odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx | 7 +++----
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.hxx | 4 ++--
odk/examples/cpp/custompanel/ctp_factory.hxx | 6 +++---
odk/examples/cpp/custompanel/ctp_panel.hxx | 6 +++---
sw/source/uibase/app/swdllimpl.hxx | 4 ++--
sw/source/uibase/docvw/AnchorOverlayObject.hxx | 4 ++--
sw/source/uibase/docvw/AnnotationMenuButton.hxx | 4 ++--
sw/source/uibase/docvw/OverlayRanges.hxx | 6 +++---
sw/source/uibase/docvw/ShadowOverlayObject.hxx | 4 ++--
sw/source/uibase/docvw/SidebarTxtControl.hxx | 4 ++--
sw/source/uibase/docvw/SidebarTxtControlAcc.hxx | 4 ++--
sw/source/uibase/docvw/SidebarWinAcc.hxx | 4 ++--
sw/source/uibase/docvw/frmsidebarwincontainer.hxx | 4 ++--
sw/source/uibase/docvw/romenu.hxx | 4 ++--
sw/source/uibase/envelp/labimp.hxx | 4 ++--
sw/source/uibase/inc/DashedLine.hxx | 4 ++--
sw/source/uibase/inc/DropDownFieldDialog.hxx | 4 ++--
sw/source/uibase/inc/FrameControl.hxx | 4 ++--
sw/source/uibase/inc/FrameControlsManager.hxx | 4 ++--
sw/source/uibase/inc/HeaderFooterWin.hxx | 4 ++--
sw/source/uibase/inc/PageBreakWin.hxx | 4 ++--
sw/source/uibase/inc/SidebarWindowsConsts.hxx | 4 ++--
sw/source/uibase/inc/SwSpellDialogChildWindow.hxx | 4 ++--
sw/source/uibase/inc/SwXFilterOptions.hxx | 4 ++--
sw/source/uibase/inc/abstract.hxx | 4 ++--
sw/source/uibase/inc/actctrl.hxx | 4 ++--
sw/source/uibase/inc/addrdlg.hxx | 4 ++--
sw/source/uibase/inc/annotsh.hxx | 4 ++--
sw/source/uibase/inc/ascfldlg.hxx | 4 ++--
sw/source/uibase/inc/autoedit.hxx | 4 ++--
sw/source/uibase/inc/barcfg.hxx | 4 ++--
sw/source/uibase/inc/basesh.hxx | 4 ++--
sw/source/uibase/inc/beziersh.hxx | 4 ++--
sw/source/uibase/inc/bmpwin.hxx | 4 ++--
sw/source/uibase/inc/bookctrl.hxx | 4 ++--
sw/source/uibase/inc/bookmark.hxx | 4 ++--
sw/source/uibase/inc/break.hxx | 4 ++--
sw/source/uibase/inc/caption.hxx | 4 ++--
sw/source/uibase/inc/cfgid.h | 4 ++--
sw/source/uibase/inc/cfgitems.hxx | 4 ++--
sw/source/uibase/inc/changedb.hxx | 4 ++--
sw/source/uibase/inc/chartins.hxx | 6 +++---
sw/source/uibase/inc/chldwrap.hxx | 4 ++--
sw/source/uibase/inc/chrdlg.hxx | 4 ++--
sw/source/uibase/inc/chrdlgmodes.hxx | 6 +++---
sw/source/uibase/inc/cnttab.hxx | 4 ++--
sw/source/uibase/inc/colex.hxx | 6 +++---
sw/source/uibase/inc/colmgr.hxx | 4 ++--
sw/source/uibase/inc/column.hxx | 4 ++--
sw/source/uibase/inc/conarc.hxx | 6 +++---
sw/source/uibase/inc/concustomshape.hxx | 6 +++---
sw/source/uibase/inc/condedit.hxx | 4 ++--
sw/source/uibase/inc/conform.hxx | 4 ++--
sw/source/uibase/inc/conpoly.hxx | 6 +++---
sw/source/uibase/inc/conrect.hxx | 6 +++---
sw/source/uibase/inc/content.hxx | 4 ++--
sw/source/uibase/inc/conttree.hxx | 4 ++--
sw/source/uibase/inc/convert.hxx | 4 ++--
sw/source/uibase/inc/cption.hxx | 4 ++--
sw/source/uibase/inc/dbconfig.hxx | 4 ++--
sw/source/uibase/inc/dbinsdlg.hxx | 4 ++--
sw/source/uibase/inc/dbtree.hxx | 4 ++--
sw/source/uibase/inc/dbui.hxx | 4 ++--
sw/source/uibase/inc/dialmgr.hxx | 4 ++--
sw/source/uibase/inc/docfnote.hxx | 4 ++--
sw/source/uibase/inc/docstdlg.hxx | 4 ++--
sw/source/uibase/inc/drawbase.hxx | 6 +++---
sw/source/uibase/inc/drawsh.hxx | 4 ++--
sw/source/uibase/inc/drformsh.hxx | 4 ++--
sw/source/uibase/inc/drpcps.hxx | 4 ++--
sw/source/uibase/inc/drwbassh.hxx | 4 ++--
sw/source/uibase/inc/drwtxtsh.hxx | 4 ++--
sw/source/uibase/inc/dselect.hxx | 6 +++---
sw/source/uibase/inc/edtwin.hxx | 4 ++--
sw/source/uibase/inc/envimg.hxx | 4 ++--
sw/source/uibase/inc/envlop.hxx | 4 ++--
sw/source/uibase/inc/fldedt.hxx | 4 ++--
sw/source/uibase/inc/fldmgr.hxx | 4 ++--
sw/source/uibase/inc/fldtdlg.hxx | 4 ++--
sw/source/uibase/inc/fldwrap.hxx | 4 ++--
sw/source/uibase/inc/fontcfg.hxx | 4 ++--
sw/source/uibase/inc/formatclipboard.hxx | 4 ++--
sw/source/uibase/inc/formedt.hxx | 4 ++--
sw/source/uibase/inc/frmdlg.hxx | 6 +++---
sw/source/uibase/inc/frmmgr.hxx | 4 ++--
sw/source/uibase/inc/frmpage.hxx | 6 +++---
sw/source/uibase/inc/frmsh.hxx | 4 ++--
sw/source/uibase/inc/globals.h | 4 ++--
sw/source/uibase/inc/glosbib.hxx | 4 ++--
sw/source/uibase/inc/glosdoc.hxx | 6 +++---
sw/source/uibase/inc/gloshdl.hxx | 6 +++---
sw/source/uibase/inc/gloslst.hxx | 4 ++--
sw/source/uibase/inc/glossary.hxx | 4 ++--
sw/source/uibase/inc/glshell.hxx | 4 ++--
sw/source/uibase/inc/grfsh.hxx | 4 ++--
sw/source/uibase/inc/hyp.hxx | 4 ++--
sw/source/uibase/inc/idxmrk.hxx | 6 +++---
sw/source/uibase/inc/imaildsplistener.hxx | 4 ++--
sw/source/uibase/inc/initui.hxx | 4 ++--
sw/source/uibase/inc/inpdlg.hxx | 4 ++--
sw/source/uibase/inc/inputwin.hxx | 4 ++--
sw/source/uibase/inc/insfnote.hxx | 4 ++--
sw/source/uibase/inc/instable.hxx | 4 ++--
sw/source/uibase/inc/javaedit.hxx | 4 ++--
sw/source/uibase/inc/label.hxx | 4 ++--
sw/source/uibase/inc/labelcfg.hxx | 4 ++--
sw/source/uibase/inc/labimg.hxx | 4 ++--
sw/source/uibase/inc/langhelper.hxx | 4 ++--
sw/source/uibase/inc/linenum.hxx | 4 ++--
sw/source/uibase/inc/listsh.hxx | 4 ++--
sw/source/uibase/inc/macassgn.hxx | 4 ++--
sw/source/uibase/inc/mailconfigpage.hxx | 4 ++--
sw/source/uibase/inc/maildispatcher.hxx | 6 +++---
sw/source/uibase/inc/mailmergechildwindow.hxx | 4 ++--
sw/source/uibase/inc/mailmergehelper.hxx | 4 ++--
sw/source/uibase/inc/mailmergewizard.hxx | 4 ++--
sw/source/uibase/inc/mailmrge.hxx | 4 ++--
sw/source/uibase/inc/mediash.hxx | 4 ++--
sw/source/uibase/inc/mergetbl.hxx | 4 ++--
sw/source/uibase/inc/mmconfigitem.hxx | 4 ++--
sw/source/uibase/inc/multmrk.hxx | 6 +++---
sw/source/uibase/inc/navicfg.hxx | 4 ++--
sw/source/uibase/inc/navicont.hxx | 4 ++--
sw/source/uibase/inc/navipi.hxx | 4 ++--
sw/source/uibase/inc/navmgr.hxx | 4 ++--
sw/source/uibase/inc/navsh.hxx | 4 ++--
sw/source/uibase/inc/num.hxx | 6 +++---
sw/source/uibase/inc/numberingtypelistbox.hxx | 4 ++--
sw/source/uibase/inc/numfmtlb.hxx | 4 ++--
sw/source/uibase/inc/numpara.hxx | 4 ++--
sw/source/uibase/inc/numprevw.hxx | 4 ++--
sw/source/uibase/inc/olesh.hxx | 4 ++--
sw/source/uibase/inc/olmenu.hxx | 4 ++--
sw/source/uibase/inc/optcomp.hxx | 4 ++--
sw/source/uibase/inc/optload.hxx | 4 ++--
sw/source/uibase/inc/optpage.hxx | 4 ++--
sw/source/uibase/inc/outline.hxx | 4 ++--
sw/source/uibase/inc/pardlg.hxx | 4 ++--
sw/source/uibase/inc/pattern.hxx | 4 ++--
sw/source/uibase/inc/pgfnote.hxx | 4 ++--
sw/source/uibase/inc/pggrid.hxx | 4 ++--
sw/source/uibase/inc/popbox.hxx | 4 ++--
sw/source/uibase/inc/prcntfld.hxx | 6 +++---
sw/source/uibase/inc/pview.hxx | 4 ++--
sw/source/uibase/inc/redlndlg.hxx | 4 ++--
sw/source/uibase/inc/regionsw.hxx | 4 ++--
sw/source/uibase/inc/rowht.hxx | 4 ++--
sw/source/uibase/inc/scroll.hxx | 4 ++--
sw/source/uibase/inc/selglos.hxx | 4 ++--
sw/source/uibase/inc/sharedconnection.hxx | 6 +++---
sw/source/uibase/inc/shdwcrsr.hxx | 4 ++--
sw/source/uibase/inc/splittbl.hxx | 4 ++--
sw/source/uibase/inc/srcedtw.hxx | 4 ++--
sw/source/uibase/inc/srcview.hxx | 4 ++--
sw/source/uibase/inc/srtdlg.hxx | 4 ++--
sw/source/uibase/inc/stmenu.hxx | 4 ++--
sw/source/uibase/inc/swcont.hxx | 4 ++--
sw/source/uibase/inc/swdtflvr.hxx | 4 ++--
sw/source/uibase/inc/swlbox.hxx | 6 +++---
sw/source/uibase/inc/swmodalredlineacceptdlg.hxx | 4 ++--
sw/source/uibase/inc/swrenamexnameddlg.hxx | 4 ++--
sw/source/uibase/inc/swruler.hxx | 4 ++--
sw/source/uibase/inc/swtablerep.hxx | 4 ++--
sw/source/uibase/inc/swuiccoll.hxx | 4 ++--
sw/source/uibase/inc/swuicnttab.hxx | 6 +++---
sw/source/uibase/inc/swuiidxmrk.hxx | 6 +++---
sw/source/uibase/inc/swuipardlg.hxx | 4 ++--
sw/source/uibase/inc/swvset.hxx | 4 ++--
sw/source/uibase/inc/swwrtshitem.hxx | 4 ++--
sw/source/uibase/inc/syncbtn.hxx | 4 ++--
sw/source/uibase/inc/tabledlg.hxx | 4 ++--
sw/source/uibase/inc/tablemgr.hxx | 4 ++--
sw/source/uibase/inc/tabsh.hxx | 4 ++--
sw/source/uibase/inc/tautofmt.hxx | 4 ++--
sw/source/uibase/inc/tblctrl.hxx | 4 ++--
sw/source/uibase/inc/tblnumfm.hxx | 4 ++--
sw/source/uibase/inc/tbxanchr.hxx | 4 ++--
sw/source/uibase/inc/textsh.hxx | 4 ++--
sw/source/uibase/inc/titlepage.hxx | 4 ++--
sw/source/uibase/inc/tmpdlg.hxx | 4 ++--
sw/source/uibase/inc/tmplctrl.hxx | 4 ++--
sw/source/uibase/inc/toxmgr.hxx | 4 ++--
sw/source/uibase/inc/uiborder.hxx | 4 ++--
sw/source/uibase/inc/uiitems.hxx | 6 +++---
sw/source/uibase/inc/uinums.hxx | 4 ++--
sw/source/uibase/inc/uitool.hxx | 6 +++---
sw/source/uibase/inc/uivwimp.hxx | 4 ++--
sw/source/uibase/inc/unoatxt.hxx | 4 ++--
sw/source/uibase/inc/unodispatch.hxx | 4 ++--
sw/source/uibase/inc/unomailmerge.hxx | 4 ++--
sw/source/uibase/inc/unomod.hxx | 4 ++--
sw/source/uibase/inc/unotools.hxx | 4 ++--
sw/source/uibase/inc/unotxvw.hxx | 4 ++--
sw/source/uibase/inc/usrpref.hxx | 4 ++--
sw/source/uibase/inc/view.hxx | 4 ++--
sw/source/uibase/inc/viewlayoutctrl.hxx | 4 ++--
sw/source/uibase/inc/wformsh.hxx | 4 ++--
sw/source/uibase/inc/wfrmsh.hxx | 4 ++--
sw/source/uibase/inc/wgrfsh.hxx | 4 ++--
sw/source/uibase/inc/wlistsh.hxx | 4 ++--
sw/source/uibase/inc/wolesh.hxx | 4 ++--
sw/source/uibase/inc/wordcountctrl.hxx | 4 ++--
sw/source/uibase/inc/wordcountdialog.hxx | 4 ++--
sw/source/uibase/inc/workctrl.hxx | 4 ++--
sw/source/uibase/inc/wrap.hxx | 4 ++--
sw/source/uibase/inc/wrtsh.hxx | 4 ++--
sw/source/uibase/inc/wtabsh.hxx | 4 ++--
sw/source/uibase/inc/wtextsh.hxx | 4 ++--
sw/source/uibase/inc/wview.hxx | 4 ++--
sw/source/uibase/inc/zoomctrl.hxx | 4 ++--
sw/source/uibase/lingu/sdrhhcwrap.hxx | 4 ++--
sw/source/uibase/sidebar/PageColumnControl.hxx | 4 ++--
sw/source/uibase/sidebar/PageMarginControl.hxx | 4 ++--
sw/source/uibase/sidebar/PageOrientationControl.hxx | 4 ++--
sw/source/uibase/sidebar/PagePropertyPanel.hxx | 4 ++--
sw/source/uibase/sidebar/PageSizeControl.hxx | 4 ++--
sw/source/uibase/sidebar/WrapPropertyPanel.hxx | 4 ++--
sw/source/uibase/table/tablepg.hxx | 4 ++--
sw/source/uibase/uiview/viewfunc.hxx | 4 ++--
sw/source/uibase/uno/SwXDocumentSettings.hxx | 4 ++--
sw/source/uibase/uno/unodefaults.hxx | 4 ++--
sw/source/uibase/uno/unomodule.hxx | 4 ++--
233 files changed, 506 insertions(+), 501 deletions(-)
New commits:
commit 3b8402c771faa9ee85904346b76266f5d2d09d3c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jun 3 11:11:36 2014 +0200
odk/examples: pretty up
Change-Id: Id157616660253913ef0ef94c17a680bddacb0660
diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.hxx b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.hxx
index 9568aea..442b257 100644
--- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.hxx
+++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.hxx
@@ -33,8 +33,8 @@
*
*************************************************************************/
-#ifndef _Addon_HXX
-#define _Addon_HXX
+#ifndef INCLUDED_COMPONENTS_ADDONS_PROTOCOLHANDLERADDON_CPP_ADDON_HXX
+#define INCLUDED_COMPONENTS_ADDONS_PROTOCOLHANDLERADDON_CPP_ADDON_HXX
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
@@ -127,6 +127,6 @@ sal_Bool SAL_CALL Addon_supportsService( const ::rtl::OUString& ServiceName )
SAL_CALL Addon_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rContext)
throw ( ::com::sun::star::uno::Exception );
-#endif // _Addon_HXX
+#endif // INCLUDED_COMPONENTS_ADDONS_PROTOCOLHANDLERADDON_CPP_ADDON_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx
index c979408..9a2d286 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx
@@ -33,8 +33,8 @@
*
*************************************************************************/
-#ifndef _CONNECTIVITY_OSUBCOMPONENT_HXX_
-#define _CONNECTIVITY_OSUBCOMPONENT_HXX_
+#ifndef INCLUDED_DATABASE_DRIVERSKELETON_OSUBCOMPONENT_HXX
+#define INCLUDED_DATABASE_DRIVERSKELETON_OSUBCOMPONENT_HXX
#include <com/sun/star/lang/DisposedException.hpp>
#include <cppuhelper/interfacecontainer.h>
@@ -237,6 +237,7 @@ namespace connectivity
}
}
-#endif // _CONNECTIVITY_OSUBCOMPONENT_HXX_
+
+#endif // INCLUDED_DATABASE_DRIVERSKELETON_OSUBCOMPONENT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx
index c4d67d5..58ee806 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx
@@ -33,8 +33,8 @@
*
*************************************************************************/
-#ifndef _CONNECTIVITY_OTYPEINFO_HXX_
-#define _CONNECTIVITY_OTYPEINFO_HXX_
+#ifndef INCLUDED_DATABASE_DRIVERSKELETON_OTYPEINFO_HXX
+#define INCLUDED_DATABASE_DRIVERSKELETON_OTYPEINFO_HXX
#include <com/sun/star/sdbc/ColumnSearch.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
@@ -94,7 +94,7 @@ namespace connectivity
inline ::rtl::OUString getDBName() const { return aTypeName; }
};
}
-#endif // _CONNECTIVITY_OTYPEINFO_HXX_
+#endif // INCLUDED_DATABASE_DRIVERSKELETON_OTYPEINFO_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx
index 9aa7040..e94a228 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.hxx
@@ -33,8 +33,8 @@
*
*************************************************************************/
-#ifndef CONNECTIVITY_SCONNECTION_HXX
-#define CONNECTIVITY_SCONNECTION_HXX
+#ifndef INCLUDED_DATABASE_DRIVERSKELETON_SCONNECTION_HXX
+#define INCLUDED_DATABASE_DRIVERSKELETON_SCONNECTION_HXX
#include <com/sun/star/sdbc/SQLWarning.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -152,6 +152,7 @@ namespace connectivity
};
}
}
-#endif // CONNECTIVITY_SCONNECTION_HXX
+
+#endif // INCLUDED_DATABASE_DRIVERSKELETON_SCONNECTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.hxx
index f7d2948..5f88f9b 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.hxx
@@ -33,8 +33,8 @@
*
*************************************************************************/
-#ifndef CONNECTIVITY_SDATABASEMETADATA_HXX
-#define CONNECTIVITY_SDATABASEMETADATA_HXX
+#ifndef INCLUDED_DATABASE_DRIVERSKELETON_SDATABASEMETADATA_HXX
+#define INCLUDED_DATABASE_DRIVERSKELETON_SDATABASEMETADATA_HXX
#include "SConnection.hxx"
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
@@ -216,6 +216,6 @@ namespace connectivity
}
}
-#endif // CONNECTIVITY_SDATABASEMETADATA_HXX
+#endif // INCLUDED_DATABASE_DRIVERSKELETON_SDATABASEMETADATA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx
index 36d50a4..43fbf68 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.hxx
@@ -33,8 +33,8 @@
*
*************************************************************************/
-#ifndef CONNECTIVITY_SDRIVER_HXX
-#define CONNECTIVITY_SDRIVER_HXX
+#ifndef INCLUDED_DATABASE_DRIVERSKELETON_SDRIVER_HXX
+#define INCLUDED_DATABASE_DRIVERSKELETON_SDRIVER_HXX
#include <com/sun/star/sdbc/XDriver.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -83,6 +83,6 @@ namespace connectivity
}
-#endif // CONNECTIVITY_SDRIVER_HXX
+#endif // INCLUDED_DATABASE_DRIVERSKELETON_SDRIVER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx
index 0914e5c..6670d56 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx
@@ -33,8 +33,9 @@
*
*************************************************************************/
-#ifndef CONNECTIVITY_SPREPAREDSTATEMENT_HXX
-#define CONNECTIVITY_SPREPAREDSTATEMENT_HXX
+#ifndef INCLUDED_DATABASE_DRIVERSKELETON_SPREPAREDSTATEMENT_HXX
+#define INCLUDED_DATABASE_DRIVERSKELETON_SPREPAREDSTATEMENT_HXX
+
#include "SStatement.hxx"
#include <com/sun/star/sdbc/XPreparedStatement.hpp>
#include <com/sun/star/sdbc/XParameters.hpp>
@@ -144,6 +145,7 @@ namespace connectivity
};
}
}
-#endif // CONNECTIVITY_SPREPAREDSTATEMENT_HXX
+
+#endif // INCLUDED_DATABASE_DRIVERSKELETON_SPREPAREDSTATEMENT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx
index 9a10241..9440dbb 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx
@@ -216,6 +216,7 @@ namespace connectivity
};
}
}
+
#endif // CONNECTIVITY_SRESULTSET_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx
index 1c78c6e..3f8886f 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx
@@ -33,8 +33,8 @@
*
*************************************************************************/
-#ifndef CONNECTIVITY_SRESULSETMETADATA_HXX
-#define CONNECTIVITY_SRESULSETMETADATA_HXX
+#ifndef INCLUDED_DATABASE_DRIVERSKELETON_SRESULTSETMETADATA_HXX
+#define INCLUDED_DATABASE_DRIVERSKELETON_SRESULTSETMETADATA_HXX
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
#include <cppuhelper/implbase1.hxx>
@@ -88,6 +88,6 @@ namespace connectivity
}
}
-#endif // CONNECTIVITY_SRESULSETMETADATA_HXX
+#endif // INCLUDED_DATABASE_DRIVERSKELETON_SRESULTSETMETADATA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx
index 1e3d06c..9122597 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.hxx
@@ -33,8 +33,8 @@
*
*************************************************************************/
-#ifndef CONNECTIVITY_SSTATEMENT_HXX
-#define CONNECTIVITY_SSTATEMENT_HXX
+#ifndef INCLUDED_DATABASE_DRIVERSKELETON_SSTATEMENT_HXX
+#define INCLUDED_DATABASE_DRIVERSKELETON_SSTATEMENT_HXX
#include <com/sun/star/sdbc/XStatement.hpp>
#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
@@ -173,6 +173,7 @@ namespace connectivity
};
}
}
-#endif // CONNECTIVITY_SSTATEMENT_HXX
+
+#endif // INCLUDED_DATABASE_DRIVERSKELETON_SSTATEMENT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx
index 7c6615c..880f595 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.hxx
@@ -33,8 +33,8 @@
*
*************************************************************************/
-#ifndef _CONNECTIVITY_PROPERTYIDS_HXX_
-#define _CONNECTIVITY_PROPERTYIDS_HXX_
+#ifndef INCLUDED_DATABASE_DRIVERSKELETON_PROPERTYIDS_HXX
+#define INCLUDED_DATABASE_DRIVERSKELETON_PROPERTYIDS_HXX
// this define has to be set to split the names into different dll's or so's
// every dll has his own set of property names
@@ -141,7 +141,6 @@ namespace skeleton
#define PROPERTY_ID_PRIVILEGES 50
-#endif // _CONNECTIVITY_PROPERTYIDS_HXX_
-
+#endif // INCLUDED_DATABASE_DRIVERSKELETON_PROPERTYIDS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.hxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.hxx
index f3b0382..20a9506 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.hxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.hxx
@@ -33,8 +33,8 @@
*
*************************************************************************/
-#ifndef _FILTERDETECT_HXX
-#define _FILTERDETECT_HXX
+#ifndef INCLUDED_OFFICEDEV_FILTERDEVELOPMENT_FLATXMLFILTERDETECTION_FILTERDETECT_HXX
+#define INCLUDED_OFFICEDEV_FILTERDEVELOPMENT_FLATXMLFILTERDETECTION_FILTERDETECT_HXX
#include <com/sun/star/document/XFilter.hpp>
diff --git a/odk/examples/cpp/custompanel/ctp_factory.hxx b/odk/examples/cpp/custompanel/ctp_factory.hxx
index f38b933..e5fbea1 100644
--- a/odk/examples/cpp/custompanel/ctp_factory.hxx
+++ b/odk/examples/cpp/custompanel/ctp_factory.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SD_WORKBENCH_CTP_FACTORY_HXX
-#define SD_WORKBENCH_CTP_FACTORY_HXX
+#ifndef INCLUDED_CUSTOMPANEL_CTP_FACTORY_HXX
+#define INCLUDED_CUSTOMPANEL_CTP_FACTORY_HXX
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/ui/XUIElementFactory.hpp>
@@ -69,6 +69,6 @@ namespace sd { namespace colortoolpanel
} } // namespace sd::colortoolpanel
-#endif // SD_WORKBENCH_CTP_FACTORY_HXX
+#endif // INCLUDED_CUSTOMPANEL_CTP_FACTORY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/cpp/custompanel/ctp_panel.hxx b/odk/examples/cpp/custompanel/ctp_panel.hxx
index 1e95669..e0ec084 100644
--- a/odk/examples/cpp/custompanel/ctp_panel.hxx
+++ b/odk/examples/cpp/custompanel/ctp_panel.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SD_WORKBENCH_CTP_PANEL_HXX
-#define SD_WORKBENCH_CTP_PANEL_HXX
+#ifndef INCLUDED_CUSTOMPANEL_CTP_PANEL_HXX
+#define INCLUDED_CUSTOMPANEL_CTP_PANEL_HXX
#include <com/sun/star/ui/XToolPanel.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
@@ -111,6 +111,6 @@ namespace sd { namespace colortoolpanel
} } // namespace sd::colortoolpanel
-#endif // SD_WORKBENCH_CTP_PANEL_HXX
+#endif // INCLUDED_CUSTOMPANEL_CTP_PANEL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit ee7f28ed041542c76096777a85932be65e4cdf60
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jun 3 11:11:03 2014 +0200
fix-includeguards.pl: handle odk/examples/DevelopersGuide
Change-Id: Ibdefb876d39419ff622917fcef427b33e3942ae4
diff --git a/bin/fixincludeguards.sh b/bin/fixincludeguards.sh
index 6bdb59e..1dfceaa 100755
--- a/bin/fixincludeguards.sh
+++ b/bin/fixincludeguards.sh
@@ -28,7 +28,7 @@ for fn in "$@"; do
# global header in include/ top level dir:
# drop the project dir
- fnfixed=`echo $fn | sed 's/\(include\|odk\/examples\/cpp\)\///g'`
+ fnfixed=`echo $fn | sed 's,\(include\|odk/examples/cpp\|odk/examples/DevelopersGuide\)/,,g'`
# convert file path to header guard
guard=`echo "$fnfixed" | sed 's/[\/\.-]/_/g' | tr 'a-z' 'A-Z'`
commit cebb96ec3a22d9023fb8a8d91f6c766a8a3866af
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jun 3 10:01:18 2014 +0200
sw: fix include guards
after the latest file move
Change-Id: I105eb04ad98d1bf71eddec4528657c248fcc4348
diff --git a/sw/source/uibase/app/swdllimpl.hxx b/sw/source/uibase/app/swdllimpl.hxx
index 34eb956..f5d7e2d 100644
--- a/sw/source/uibase/app/swdllimpl.hxx
+++ b/sw/source/uibase/app/swdllimpl.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_APP_SWDLLIMPL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_APP_SWDLLIMPL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_APP_SWDLLIMPL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_APP_SWDLLIMPL_HXX
#include <sal/config.h>
diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.hxx b/sw/source/uibase/docvw/AnchorOverlayObject.hxx
index c4b4c1c..8298abc 100644
--- a/sw/source/uibase/docvw/AnchorOverlayObject.hxx
+++ b/sw/source/uibase/docvw/AnchorOverlayObject.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_ANCHOROVERLAYOBJECT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_ANCHOROVERLAYOBJECT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_ANCHOROVERLAYOBJECT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_ANCHOROVERLAYOBJECT_HXX
#include <svx/sdr/overlay/overlayobject.hxx>
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.hxx b/sw/source/uibase/docvw/AnnotationMenuButton.hxx
index b90dea4d..06731b6 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.hxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_ANNOTATIONMENUBUTTON_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_ANNOTATIONMENUBUTTON_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_ANNOTATIONMENUBUTTON_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_ANNOTATIONMENUBUTTON_HXX
#include <vcl/menubtn.hxx>
diff --git a/sw/source/uibase/docvw/OverlayRanges.hxx b/sw/source/uibase/docvw/OverlayRanges.hxx
index 4458af4..7cdb872 100644
--- a/sw/source/uibase/docvw/OverlayRanges.hxx
+++ b/sw/source/uibase/docvw/OverlayRanges.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_OVERLAYRANGES_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_OVERLAYRANGES_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_OVERLAYRANGES_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_OVERLAYRANGES_HXX
#include <svx/sdr/overlay/overlayobject.hxx>
#include <basegfx/range/b2drange.hxx>
@@ -73,6 +73,6 @@ namespace sw
} // end of namespace overlay
} // end of namespace sw
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_OVERLAYRANGES_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_DOCVW_OVERLAYRANGES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.hxx b/sw/source/uibase/docvw/ShadowOverlayObject.hxx
index a675182..82ba708 100644
--- a/sw/source/uibase/docvw/ShadowOverlayObject.hxx
+++ b/sw/source/uibase/docvw/ShadowOverlayObject.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SHADOWOVERLAYOBJECT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SHADOWOVERLAYOBJECT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_SHADOWOVERLAYOBJECT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_SHADOWOVERLAYOBJECT_HXX
#include <svx/sdr/overlay/overlayobject.hxx>
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.hxx b/sw/source/uibase/docvw/SidebarTxtControl.hxx
index d98503d..f145020 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.hxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SIDEBARTXTCONTROL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SIDEBARTXTCONTROL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_SIDEBARTXTCONTROL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_SIDEBARTXTCONTROL_HXX
#include <vcl/ctrl.hxx>
diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx
index 7ac2596..38064ff 100644
--- a/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx
+++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SIDEBARTXTCONTROLACC_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SIDEBARTXTCONTROLACC_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_SIDEBARTXTCONTROLACC_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_SIDEBARTXTCONTROLACC_HXX
#include <toolkit/awt/vclxwindow.hxx>
diff --git a/sw/source/uibase/docvw/SidebarWinAcc.hxx b/sw/source/uibase/docvw/SidebarWinAcc.hxx
index 9d4dc49..a07fac78 100644
--- a/sw/source/uibase/docvw/SidebarWinAcc.hxx
+++ b/sw/source/uibase/docvw/SidebarWinAcc.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SIDEBARWINACC_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SIDEBARWINACC_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_SIDEBARWINACC_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_SIDEBARWINACC_HXX
#include <toolkit/awt/vclxwindow.hxx>
diff --git a/sw/source/uibase/docvw/frmsidebarwincontainer.hxx b/sw/source/uibase/docvw/frmsidebarwincontainer.hxx
index 2253993..f0fa3fa 100644
--- a/sw/source/uibase/docvw/frmsidebarwincontainer.hxx
+++ b/sw/source/uibase/docvw/frmsidebarwincontainer.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 INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_FRMSIDEBARWINCONTAINER_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_FRMSIDEBARWINCONTAINER_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_FRMSIDEBARWINCONTAINER_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_FRMSIDEBARWINCONTAINER_HXX
#include <sal/types.h>
#include <vector>
diff --git a/sw/source/uibase/docvw/romenu.hxx b/sw/source/uibase/docvw/romenu.hxx
index eae84d5..7bf0bd2 100644
--- a/sw/source/uibase/docvw/romenu.hxx
+++ b/sw/source/uibase/docvw/romenu.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 INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_ROMENU_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_ROMENU_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_ROMENU_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_ROMENU_HXX
#include <vcl/graph.hxx>
#include <vcl/menu.hxx>
diff --git a/sw/source/uibase/envelp/labimp.hxx b/sw/source/uibase/envelp/labimp.hxx
index 0f123ea..caaf606 100644
--- a/sw/source/uibase/envelp/labimp.hxx
+++ b/sw/source/uibase/envelp/labimp.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 INCLUDED_SW_SOURCE_CORE_UIBASE_ENVELP_LABIMP_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_ENVELP_LABIMP_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_ENVELP_LABIMP_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_ENVELP_LABIMP_HXX
#include <sfx2/tabdlg.hxx>
#include <vcl/lstbox.hxx>
diff --git a/sw/source/uibase/inc/DashedLine.hxx b/sw/source/uibase/inc/DashedLine.hxx
index 05e3268..a16899b 100644
--- a/sw/source/uibase/inc/DashedLine.hxx
+++ b/sw/source/uibase/inc/DashedLine.hxx
@@ -6,8 +6,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DASHEDLINE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DASHEDLINE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DASHEDLINE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DASHEDLINE_HXX
#include <basegfx/color/bcolor.hxx>
#include <vcl/fixed.hxx>
diff --git a/sw/source/uibase/inc/DropDownFieldDialog.hxx b/sw/source/uibase/inc/DropDownFieldDialog.hxx
index a6eab56..1787726 100644
--- a/sw/source/uibase/inc/DropDownFieldDialog.hxx
+++ b/sw/source/uibase/inc/DropDownFieldDialog.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DROPDOWNFIELDDIALOG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DROPDOWNFIELDDIALOG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DROPDOWNFIELDDIALOG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DROPDOWNFIELDDIALOG_HXX
#include <svx/stddlg.hxx>
#include <vcl/fixed.hxx>
diff --git a/sw/source/uibase/inc/FrameControl.hxx b/sw/source/uibase/inc/FrameControl.hxx
index 3fc14ac..0235084 100644
--- a/sw/source/uibase/inc/FrameControl.hxx
+++ b/sw/source/uibase/inc/FrameControl.hxx
@@ -6,8 +6,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRAMECONTROL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRAMECONTROL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FRAMECONTROL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FRAMECONTROL_HXX
class SwEditWin;
class SwFrm;
diff --git a/sw/source/uibase/inc/FrameControlsManager.hxx b/sw/source/uibase/inc/FrameControlsManager.hxx
index 4cf05e4..75585ea 100644
--- a/sw/source/uibase/inc/FrameControlsManager.hxx
+++ b/sw/source/uibase/inc/FrameControlsManager.hxx
@@ -6,8 +6,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRAMECONTROLSMANAGER_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRAMECONTROLSMANAGER_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FRAMECONTROLSMANAGER_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FRAMECONTROLSMANAGER_HXX
#include <viewsh.hxx>
#include <FrameControl.hxx>
diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx
index 6fee20a..efe7d13 100644
--- a/sw/source/uibase/inc/HeaderFooterWin.hxx
+++ b/sw/source/uibase/inc/HeaderFooterWin.hxx
@@ -6,8 +6,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_HEADERFOOTERWIN_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_HEADERFOOTERWIN_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_HEADERFOOTERWIN_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_HEADERFOOTERWIN_HXX
#include <FrameControl.hxx>
diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx
index 4839c6c..321cb17 100644
--- a/sw/source/uibase/inc/PageBreakWin.hxx
+++ b/sw/source/uibase/inc/PageBreakWin.hxx
@@ -6,8 +6,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PAGEBREAKWIN_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PAGEBREAKWIN_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_PAGEBREAKWIN_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_PAGEBREAKWIN_HXX
#include <FrameControl.hxx>
diff --git a/sw/source/uibase/inc/SidebarWindowsConsts.hxx b/sw/source/uibase/inc/SidebarWindowsConsts.hxx
index a96e192..a7bd919 100644
--- a/sw/source/uibase/inc/SidebarWindowsConsts.hxx
+++ b/sw/source/uibase/inc/SidebarWindowsConsts.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SIDEBARWINDOWSCONSTS_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SIDEBARWINDOWSCONSTS_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SIDEBARWINDOWSCONSTS_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SIDEBARWINDOWSCONSTS_HXX
namespace sw { namespace sidebarwindows {
diff --git a/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx b/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx
index d1d5271..b82d9d4 100644
--- a/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx
+++ b/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWSPELLDIALOGCHILDWINDOW_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWSPELLDIALOGCHILDWINDOW_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWSPELLDIALOGCHILDWINDOW_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SWSPELLDIALOGCHILDWINDOW_HXX
#include <svx/SpellDialogChildWindow.hxx>
#include <view.hxx>
diff --git a/sw/source/uibase/inc/SwXFilterOptions.hxx b/sw/source/uibase/inc/SwXFilterOptions.hxx
index 1cca096..02ae7d2 100644
--- a/sw/source/uibase/inc/SwXFilterOptions.hxx
+++ b/sw/source/uibase/inc/SwXFilterOptions.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWXFILTEROPTIONS_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWXFILTEROPTIONS_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWXFILTEROPTIONS_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SWXFILTEROPTIONS_HXX
#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
diff --git a/sw/source/uibase/inc/abstract.hxx b/sw/source/uibase/inc/abstract.hxx
index 5307637..1a40fd8 100644
--- a/sw/source/uibase/inc/abstract.hxx
+++ b/sw/source/uibase/inc/abstract.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ABSTRACT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ABSTRACT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_ABSTRACT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_ABSTRACT_HXX
#include <sfx2/basedlgs.hxx>
diff --git a/sw/source/uibase/inc/actctrl.hxx b/sw/source/uibase/inc/actctrl.hxx
index 2ee6a63..0ff4737 100644
--- a/sw/source/uibase/inc/actctrl.hxx
+++ b/sw/source/uibase/inc/actctrl.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ACTCTRL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ACTCTRL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_ACTCTRL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_ACTCTRL_HXX
#include <vcl/field.hxx>
#include "swdllapi.h"
diff --git a/sw/source/uibase/inc/addrdlg.hxx b/sw/source/uibase/inc/addrdlg.hxx
index 6ddf6d1..43e02f5 100644
--- a/sw/source/uibase/inc/addrdlg.hxx
+++ b/sw/source/uibase/inc/addrdlg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ADDRDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ADDRDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_ADDRDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_ADDRDLG_HXX
#include <sfx2/basedlgs.hxx>
diff --git a/sw/source/uibase/inc/annotsh.hxx b/sw/source/uibase/inc/annotsh.hxx
index 32aee68..8b3bea7 100644
--- a/sw/source/uibase/inc/annotsh.hxx
+++ b/sw/source/uibase/inc/annotsh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ANNOTSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ANNOTSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_ANNOTSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_ANNOTSH_HXX
#include <sfx2/shell.hxx>
#include "shellid.hxx"
diff --git a/sw/source/uibase/inc/ascfldlg.hxx b/sw/source/uibase/inc/ascfldlg.hxx
index 2ccabf9..b4a5d62 100644
--- a/sw/source/uibase/inc/ascfldlg.hxx
+++ b/sw/source/uibase/inc/ascfldlg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ASCFLDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ASCFLDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_ASCFLDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_ASCFLDLG_HXX
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/uibase/inc/autoedit.hxx b/sw/source/uibase/inc/autoedit.hxx
index 78ed260..53ba312 100644
--- a/sw/source/uibase/inc/autoedit.hxx
+++ b/sw/source/uibase/inc/autoedit.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_AUTOEDIT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_AUTOEDIT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_AUTOEDIT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_AUTOEDIT_HXX
#include <vcl/edit.hxx>
diff --git a/sw/source/uibase/inc/barcfg.hxx b/sw/source/uibase/inc/barcfg.hxx
index d078d69..1d7507c 100644
--- a/sw/source/uibase/inc/barcfg.hxx
+++ b/sw/source/uibase/inc/barcfg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BARCFG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BARCFG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_BARCFG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_BARCFG_HXX
#include <unotools/configitem.hxx>
class SwToolbarConfigItem : public utl::ConfigItem
diff --git a/sw/source/uibase/inc/basesh.hxx b/sw/source/uibase/inc/basesh.hxx
index 9d04cc6..68b4db1 100644
--- a/sw/source/uibase/inc/basesh.hxx
+++ b/sw/source/uibase/inc/basesh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BASESH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BASESH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_BASESH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_BASESH_HXX
#include <shellid.hxx>
diff --git a/sw/source/uibase/inc/beziersh.hxx b/sw/source/uibase/inc/beziersh.hxx
index 69e57cc..2116c1b 100644
--- a/sw/source/uibase/inc/beziersh.hxx
+++ b/sw/source/uibase/inc/beziersh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BEZIERSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BEZIERSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_BEZIERSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_BEZIERSH_HXX
#include "basesh.hxx"
diff --git a/sw/source/uibase/inc/bmpwin.hxx b/sw/source/uibase/inc/bmpwin.hxx
index 1fe60bb..070656f 100644
--- a/sw/source/uibase/inc/bmpwin.hxx
+++ b/sw/source/uibase/inc/bmpwin.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BMPWIN_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BMPWIN_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_BMPWIN_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_BMPWIN_HXX
#include <vcl/graph.hxx>
#include <vcl/bitmapex.hxx>
diff --git a/sw/source/uibase/inc/bookctrl.hxx b/sw/source/uibase/inc/bookctrl.hxx
index fd291e3..8d73b0c 100644
--- a/sw/source/uibase/inc/bookctrl.hxx
+++ b/sw/source/uibase/inc/bookctrl.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BOOKCTRL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BOOKCTRL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_BOOKCTRL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_BOOKCTRL_HXX
#include <rtl/ustring.hxx>
#include <sfx2/stbitem.hxx>
diff --git a/sw/source/uibase/inc/bookmark.hxx b/sw/source/uibase/inc/bookmark.hxx
index 34ca620..3130310 100644
--- a/sw/source/uibase/inc/bookmark.hxx
+++ b/sw/source/uibase/inc/bookmark.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BOOKMARK_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BOOKMARK_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_BOOKMARK_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_BOOKMARK_HXX
#include <svx/stddlg.hxx>
#include <vcl/fixed.hxx>
diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx
index 089fe9e..5d939e6 100644
--- a/sw/source/uibase/inc/break.hxx
+++ b/sw/source/uibase/inc/break.hxx
@@ -17,8 +17,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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BREAK_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BREAK_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_BREAK_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_BREAK_HXX
#include <svx/stddlg.hxx>
diff --git a/sw/source/uibase/inc/caption.hxx b/sw/source/uibase/inc/caption.hxx
index dddaee3..ff2760f 100644
--- a/sw/source/uibase/inc/caption.hxx
+++ b/sw/source/uibase/inc/caption.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CAPTION_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CAPTION_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CAPTION_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CAPTION_HXX
#include <rtl/ustring.hxx>
#include <tools/globname.hxx>
diff --git a/sw/source/uibase/inc/cfgid.h b/sw/source/uibase/inc/cfgid.h
index d8a7fad..ed7c0a5 100644
--- a/sw/source/uibase/inc/cfgid.h
+++ b/sw/source/uibase/inc/cfgid.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CFGID_H
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CFGID_H
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CFGID_H
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CFGID_H
#include <sfx2/sfx.hrc>
diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx
index bdd78ce..8bedf3f 100644
--- a/sw/source/uibase/inc/cfgitems.hxx
+++ b/sw/source/uibase/inc/cfgitems.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CFGITEMS_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CFGITEMS_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CFGITEMS_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CFGITEMS_HXX
#include <tools/color.hxx>
#include <svl/poolitem.hxx>
diff --git a/sw/source/uibase/inc/changedb.hxx b/sw/source/uibase/inc/changedb.hxx
index a6e1cd5..128d7aa 100644
--- a/sw/source/uibase/inc/changedb.hxx
+++ b/sw/source/uibase/inc/changedb.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHANGEDB_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHANGEDB_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CHANGEDB_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CHANGEDB_HXX
#include <vcl/bitmap.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/uibase/inc/chartins.hxx b/sw/source/uibase/inc/chartins.hxx
index 5f5ea62..f520fe0 100644
--- a/sw/source/uibase/inc/chartins.hxx
+++ b/sw/source/uibase/inc/chartins.hxx
@@ -16,12 +16,12 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHARTINS_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHARTINS_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX
Point SwGetChartDialogPos( const Window *pParentWin, const Size& rDialogSize, const Rectangle& rLogicChart );
void SwInsertChart( Window *pParent, SfxBindings *pBindings );
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHARTINS_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/chldwrap.hxx b/sw/source/uibase/inc/chldwrap.hxx
index 26f20c2..142b689 100644
--- a/sw/source/uibase/inc/chldwrap.hxx
+++ b/sw/source/uibase/inc/chldwrap.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHLDWRAP_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHLDWRAP_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CHLDWRAP_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CHLDWRAP_HXX
#include <sfx2/childwin.hxx>
#include <vcl/timer.hxx>
diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx
index b84b720..50770d7 100644
--- a/sw/source/uibase/inc/chrdlg.hxx
+++ b/sw/source/uibase/inc/chrdlg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHRDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHRDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CHRDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CHRDLG_HXX
#include <sfx2/tabdlg.hxx>
#include <vcl/group.hxx>
diff --git a/sw/source/uibase/inc/chrdlgmodes.hxx b/sw/source/uibase/inc/chrdlgmodes.hxx
index d11d98a..e4b9fb3 100644
--- a/sw/source/uibase/inc/chrdlgmodes.hxx
+++ b/sw/source/uibase/inc/chrdlgmodes.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHRDLGMODES_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHRDLGMODES_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CHRDLGMODES_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CHRDLGMODES_HXX
// DialogModes for SwCharDlg
#define DLG_CHAR_STD 0
@@ -16,6 +16,6 @@
#define DLG_CHAR_ENV 2
#define DLG_CHAR_ANN 3
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHRDLGMODES_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_CHRDLGMODES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/cnttab.hxx b/sw/source/uibase/inc/cnttab.hxx
index 034ffd8..1fd1e18 100644
--- a/sw/source/uibase/inc/cnttab.hxx
+++ b/sw/source/uibase/inc/cnttab.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CNTTAB_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CNTTAB_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CNTTAB_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CNTTAB_HXX
#include <svx/stddlg.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx
index fe4d569..1bc29f9 100644
--- a/sw/source/uibase/inc/colex.hxx
+++ b/sw/source/uibase/inc/colex.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_COLEX_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_COLEX_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_COLEX_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_COLEX_HXX
#include <svx/pagectrl.hxx>
#include <editeng/paperinf.hxx>
@@ -104,6 +104,6 @@ public:
virtual Size GetOptimalSize() const SAL_OVERRIDE;
};
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_COLEX_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_COLEX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/colmgr.hxx b/sw/source/uibase/inc/colmgr.hxx
index 1f30dfa..e63b3f0 100644
--- a/sw/source/uibase/inc/colmgr.hxx
+++ b/sw/source/uibase/inc/colmgr.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_COLMGR_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_COLMGR_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_COLMGR_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_COLMGR_HXX
#include "swdllapi.h"
#include <fmtclds.hxx>
diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx
index c223660..84c4284 100644
--- a/sw/source/uibase/inc/column.hxx
+++ b/sw/source/uibase/inc/column.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_COLUMN_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_COLUMN_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_COLUMN_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_COLUMN_HXX
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
diff --git a/sw/source/uibase/inc/conarc.hxx b/sw/source/uibase/inc/conarc.hxx
index 3d05c3e..ca63894 100644
--- a/sw/source/uibase/inc/conarc.hxx
+++ b/sw/source/uibase/inc/conarc.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONARC_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONARC_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONARC_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CONARC_HXX
#include "drawbase.hxx"
@@ -38,6 +38,6 @@ public:
virtual void Deactivate() SAL_OVERRIDE;
};
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONARC_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_CONARC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/concustomshape.hxx b/sw/source/uibase/inc/concustomshape.hxx
index 5b4e8a4..f082cc4 100644
--- a/sw/source/uibase/inc/concustomshape.hxx
+++ b/sw/source/uibase/inc/concustomshape.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONCUSTOMSHAPE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONCUSTOMSHAPE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONCUSTOMSHAPE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CONCUSTOMSHAPE_HXX
#include <rtl/ustring.hxx>
#include "drawbase.hxx"
@@ -53,6 +53,6 @@ class ConstCustomShape : public SwDrawBase
virtual bool doConstructOrthogonal() const SAL_OVERRIDE;
};
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONCUSTOMSHAPE_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_CONCUSTOMSHAPE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/condedit.hxx b/sw/source/uibase/inc/condedit.hxx
index f82c87e..d8c0a41 100644
--- a/sw/source/uibase/inc/condedit.hxx
+++ b/sw/source/uibase/inc/condedit.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONDEDIT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONDEDIT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONDEDIT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CONDEDIT_HXX
#include <vcl/edit.hxx>
#include <svtools/transfer.hxx>
diff --git a/sw/source/uibase/inc/conform.hxx b/sw/source/uibase/inc/conform.hxx
index d3ebbec..bd116eb 100644
--- a/sw/source/uibase/inc/conform.hxx
+++ b/sw/source/uibase/inc/conform.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONFORM_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONFORM_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONFORM_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CONFORM_HXX
#include "drawbase.hxx"
diff --git a/sw/source/uibase/inc/conpoly.hxx b/sw/source/uibase/inc/conpoly.hxx
index ea35377..ceabd6f 100644
--- a/sw/source/uibase/inc/conpoly.hxx
+++ b/sw/source/uibase/inc/conpoly.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONPOLY_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONPOLY_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONPOLY_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CONPOLY_HXX
#include "drawbase.hxx"
@@ -37,6 +37,6 @@ public:
virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function
};
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONPOLY_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_CONPOLY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/conrect.hxx b/sw/source/uibase/inc/conrect.hxx
index b5b8e3e..11ffecd 100644
--- a/sw/source/uibase/inc/conrect.hxx
+++ b/sw/source/uibase/inc/conrect.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONRECT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONRECT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONRECT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CONRECT_HXX
#include "drawbase.hxx"
@@ -41,6 +41,6 @@ class ConstRectangle : public SwDrawBase
virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function
};
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONRECT_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_CONRECT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx
index aaf2ff2..880633d 100644
--- a/sw/source/uibase/inc/content.hxx
+++ b/sw/source/uibase/inc/content.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONTENT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONTENT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONTENT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CONTENT_HXX
#include <limits.h>
#include "swcont.hxx"
diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx
index 850422f..df1981d 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONTTREE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONTTREE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONTTREE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CONTTREE_HXX
#include <svtools/treelistbox.hxx>
#include <svtools/svlbitm.hxx>
diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx
index b03d9c6..8b803bf 100644
--- a/sw/source/uibase/inc/convert.hxx
+++ b/sw/source/uibase/inc/convert.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONVERT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONVERT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONVERT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CONVERT_HXX
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx
index 4d96cda..98781e1 100644
--- a/sw/source/uibase/inc/cption.hxx
+++ b/sw/source/uibase/inc/cption.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CPTION_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CPTION_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CPTION_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CPTION_HXX
#include <svx/stddlg.hxx>
diff --git a/sw/source/uibase/inc/dbconfig.hxx b/sw/source/uibase/inc/dbconfig.hxx
index f3e2b43..16f0481 100644
--- a/sw/source/uibase/inc/dbconfig.hxx
+++ b/sw/source/uibase/inc/dbconfig.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBCONFIG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBCONFIG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DBCONFIG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DBCONFIG_HXX
#include <unotools/configitem.hxx>
#include "swdllapi.h"
diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx
index e77e77a..f156ebe 100644
--- a/sw/source/uibase/inc/dbinsdlg.hxx
+++ b/sw/source/uibase/inc/dbinsdlg.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBINSDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBINSDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DBINSDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DBINSDLG_HXX
#include <vcl/button.hxx>
#include <vcl/group.hxx>
diff --git a/sw/source/uibase/inc/dbtree.hxx b/sw/source/uibase/inc/dbtree.hxx
index 9b229e4..e4ea132 100644
--- a/sw/source/uibase/inc/dbtree.hxx
+++ b/sw/source/uibase/inc/dbtree.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBTREE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBTREE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DBTREE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DBTREE_HXX
#include <svtools/treelistbox.hxx>
#include <com/sun/star/uno/Reference.h>
diff --git a/sw/source/uibase/inc/dbui.hxx b/sw/source/uibase/inc/dbui.hxx
index 1dbbccd..9f4022f 100644
--- a/sw/source/uibase/inc/dbui.hxx
+++ b/sw/source/uibase/inc/dbui.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBUI_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBUI_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DBUI_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DBUI_HXX
#include <svx/stddlg.hxx>
diff --git a/sw/source/uibase/inc/dialmgr.hxx b/sw/source/uibase/inc/dialmgr.hxx
index 58e3554..91695bd 100644
--- a/sw/source/uibase/inc/dialmgr.hxx
+++ b/sw/source/uibase/inc/dialmgr.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DIALMGR_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DIALMGR_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DIALMGR_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DIALMGR_HXX
#include <tools/resid.hxx>
diff --git a/sw/source/uibase/inc/docfnote.hxx b/sw/source/uibase/inc/docfnote.hxx
index f084ada..6878450 100644
--- a/sw/source/uibase/inc/docfnote.hxx
+++ b/sw/source/uibase/inc/docfnote.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DOCFNOTE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DOCFNOTE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DOCFNOTE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DOCFNOTE_HXX
#include <sfx2/tabdlg.hxx>
diff --git a/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx
index 6609d07..ec28d0d 100644
--- a/sw/source/uibase/inc/docstdlg.hxx
+++ b/sw/source/uibase/inc/docstdlg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DOCSTDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DOCSTDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DOCSTDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DOCSTDLG_HXX
#include <sfx2/tabdlg.hxx>
diff --git a/sw/source/uibase/inc/drawbase.hxx b/sw/source/uibase/inc/drawbase.hxx
index 0cec957..8aaf444 100644
--- a/sw/source/uibase/inc/drawbase.hxx
+++ b/sw/source/uibase/inc/drawbase.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRAWBASE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRAWBASE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DRAWBASE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DRAWBASE_HXX
#include <tools/gen.hxx>
@@ -69,6 +69,6 @@ public:
virtual bool doConstructOrthogonal() const;
};
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRAWBASE_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_DRAWBASE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/drawsh.hxx b/sw/source/uibase/inc/drawsh.hxx
index 81af808..c955050 100644
--- a/sw/source/uibase/inc/drawsh.hxx
+++ b/sw/source/uibase/inc/drawsh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRAWSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRAWSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DRAWSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DRAWSH_HXX
#include "drwbassh.hxx"
diff --git a/sw/source/uibase/inc/drformsh.hxx b/sw/source/uibase/inc/drformsh.hxx
index f810dbd..1906334 100644
--- a/sw/source/uibase/inc/drformsh.hxx
+++ b/sw/source/uibase/inc/drformsh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRFORMSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRFORMSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DRFORMSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DRFORMSH_HXX
#include "drwbassh.hxx"
diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx
index 2758e2a..a906419 100644
--- a/sw/source/uibase/inc/drpcps.hxx
+++ b/sw/source/uibase/inc/drpcps.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRPCPS_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRPCPS_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DRPCPS_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DRPCPS_HXX
#include <sfx2/basedlgs.hxx>
#include <sfx2/tabdlg.hxx>
diff --git a/sw/source/uibase/inc/drwbassh.hxx b/sw/source/uibase/inc/drwbassh.hxx
index 16237b3..77ed33b 100644
--- a/sw/source/uibase/inc/drwbassh.hxx
+++ b/sw/source/uibase/inc/drwbassh.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRWBASSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRWBASSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DRWBASSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DRWBASSH_HXX
#include "basesh.hxx"
diff --git a/sw/source/uibase/inc/drwtxtsh.hxx b/sw/source/uibase/inc/drwtxtsh.hxx
index c32d3d2..1431992 100644
--- a/sw/source/uibase/inc/drwtxtsh.hxx
+++ b/sw/source/uibase/inc/drwtxtsh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRWTXTSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRWTXTSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DRWTXTSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DRWTXTSH_HXX
#include <sfx2/shell.hxx>
#include "shellid.hxx"
diff --git a/sw/source/uibase/inc/dselect.hxx b/sw/source/uibase/inc/dselect.hxx
index 85ef2c6..49bd1fd 100644
--- a/sw/source/uibase/inc/dselect.hxx
+++ b/sw/source/uibase/inc/dselect.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DSELECT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DSELECT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DSELECT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DSELECT_HXX
#include "drawbase.hxx"
@@ -33,6 +33,6 @@ class DrawSelection : public SwDrawBase
virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function
};
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DSELECT_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_DSELECT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index ddd1ce3..bfe89ad 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_EDTWIN_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_EDTWIN_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_EDTWIN_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_EDTWIN_HXX
#include <FrameControlsManager.hxx>
diff --git a/sw/source/uibase/inc/envimg.hxx b/sw/source/uibase/inc/envimg.hxx
index 2d10be7..40fe1e4 100644
--- a/sw/source/uibase/inc/envimg.hxx
+++ b/sw/source/uibase/inc/envimg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ENVIMG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ENVIMG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_ENVIMG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_ENVIMG_HXX
#include <svl/poolitem.hxx>
#include <unotools/configitem.hxx>
diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx
index dba8a15..9af6f3e 100644
--- a/sw/source/uibase/inc/envlop.hxx
+++ b/sw/source/uibase/inc/envlop.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ENVLOP_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ENVLOP_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_ENVLOP_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_ENVLOP_HXX
#include <svtools/svmedit.hxx>
#include <sfx2/tabdlg.hxx>
diff --git a/sw/source/uibase/inc/fldedt.hxx b/sw/source/uibase/inc/fldedt.hxx
index fdaab14..0c859e9 100644
--- a/sw/source/uibase/inc/fldedt.hxx
+++ b/sw/source/uibase/inc/fldedt.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDEDT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDEDT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FLDEDT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FLDEDT_HXX
#include <sfx2/basedlgs.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx
index 1dac07f..46b0437 100644
--- a/sw/source/uibase/inc/fldmgr.hxx
+++ b/sw/source/uibase/inc/fldmgr.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDMGR_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDMGR_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FLDMGR_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FLDMGR_HXX
#include "swdllapi.h"
#include "swtypes.hxx"
diff --git a/sw/source/uibase/inc/fldtdlg.hxx b/sw/source/uibase/inc/fldtdlg.hxx
index 073da94..da57ade 100644
--- a/sw/source/uibase/inc/fldtdlg.hxx
+++ b/sw/source/uibase/inc/fldtdlg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDTDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDTDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FLDTDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FLDTDLG_HXX
#include <sfx2/tabdlg.hxx>
class SfxBindings;
diff --git a/sw/source/uibase/inc/fldwrap.hxx b/sw/source/uibase/inc/fldwrap.hxx
index 3d0478d..ecc67a0 100644
--- a/sw/source/uibase/inc/fldwrap.hxx
+++ b/sw/source/uibase/inc/fldwrap.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDWRAP_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDWRAP_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FLDWRAP_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FLDWRAP_HXX
#include "chldwrap.hxx"
class AbstractSwFldDlg;
diff --git a/sw/source/uibase/inc/fontcfg.hxx b/sw/source/uibase/inc/fontcfg.hxx
index 1730f82..8bd7844 100644
--- a/sw/source/uibase/inc/fontcfg.hxx
+++ b/sw/source/uibase/inc/fontcfg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FONTCFG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FONTCFG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FONTCFG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FONTCFG_HXX
#include <rtl/ustring.hxx>
#include <unotools/configitem.hxx>
diff --git a/sw/source/uibase/inc/formatclipboard.hxx b/sw/source/uibase/inc/formatclipboard.hxx
index 4c90ed2..87713da 100644
--- a/sw/source/uibase/inc/formatclipboard.hxx
+++ b/sw/source/uibase/inc/formatclipboard.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FORMATCLIPBOARD_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FORMATCLIPBOARD_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FORMATCLIPBOARD_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FORMATCLIPBOARD_HXX
#include <wrtsh.hxx>
#include <svl/itemset.hxx>
diff --git a/sw/source/uibase/inc/formedt.hxx b/sw/source/uibase/inc/formedt.hxx
index 0aeea6a..7489506 100644
--- a/sw/source/uibase/inc/formedt.hxx
+++ b/sw/source/uibase/inc/formedt.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FORMEDT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FORMEDT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FORMEDT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FORMEDT_HXX
#include <svx/stddlg.hxx>
diff --git a/sw/source/uibase/inc/frmdlg.hxx b/sw/source/uibase/inc/frmdlg.hxx
index d2af253..8a1066d 100644
--- a/sw/source/uibase/inc/frmdlg.hxx
+++ b/sw/source/uibase/inc/frmdlg.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FRMDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FRMDLG_HXX
#include "globals.hrc"
#include <sfx2/tabdlg.hxx>
@@ -63,6 +63,6 @@ public:
SwWrtShell* GetWrtShell() { return m_pWrtShell; }
};
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMDLG_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_FRMDLG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/frmmgr.hxx b/sw/source/uibase/inc/frmmgr.hxx
index 548a68e..a28d2ff 100644
--- a/sw/source/uibase/inc/frmmgr.hxx
+++ b/sw/source/uibase/inc/frmmgr.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMMGR_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMMGR_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FRMMGR_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FRMMGR_HXX
#include "swtypes.hxx"
#include "frmatr.hxx"
diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx
index 92fd3a0..edffb7e 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMPAGE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMPAGE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FRMPAGE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FRMPAGE_HXX
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
@@ -321,6 +321,6 @@ public:
};
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMPAGE_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_FRMPAGE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/frmsh.hxx b/sw/source/uibase/inc/frmsh.hxx
index 0b8f7cb..97ced56 100644
--- a/sw/source/uibase/inc/frmsh.hxx
+++ b/sw/source/uibase/inc/frmsh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FRMSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FRMSH_HXX
#include "basesh.hxx"
diff --git a/sw/source/uibase/inc/globals.h b/sw/source/uibase/inc/globals.h
index 821eeea..8617d79 100644
--- a/sw/source/uibase/inc/globals.h
+++ b/sw/source/uibase/inc/globals.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOBALS_H
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOBALS_H
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_GLOBALS_H
+#define INCLUDED_SW_SOURCE_UIBASE_INC_GLOBALS_H
enum SwChangeState
{
diff --git a/sw/source/uibase/inc/glosbib.hxx b/sw/source/uibase/inc/glosbib.hxx
index 1a154aa..e744c6b 100644
--- a/sw/source/uibase/inc/glosbib.hxx
+++ b/sw/source/uibase/inc/glosbib.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSBIB_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSBIB_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_GLOSBIB_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_GLOSBIB_HXX
#include <vcl/edit.hxx>
#include <svx/stddlg.hxx>
diff --git a/sw/source/uibase/inc/glosdoc.hxx b/sw/source/uibase/inc/glosdoc.hxx
index 49c1493..b075882 100644
--- a/sw/source/uibase/inc/glosdoc.hxx
+++ b/sw/source/uibase/inc/glosdoc.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSDOC_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSDOC_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_GLOSDOC_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_GLOSDOC_HXX
#include <rtl/ustring.hxx>
#include <com/sun/star/text/XAutoTextGroup.hpp>
@@ -129,6 +129,6 @@ public:
std::vector<OUString> const& GetPathArray() const { return m_PathArr; }
};
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSDOC_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_GLOSDOC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/gloshdl.hxx b/sw/source/uibase/inc/gloshdl.hxx
index 6070811..aa4e0c9 100644
--- a/sw/source/uibase/inc/gloshdl.hxx
+++ b/sw/source/uibase/inc/gloshdl.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSHDL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSHDL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_GLOSHDL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_GLOSHDL_HXX
#include <rtl/ustring.hxx>
#include "swdllapi.h"
@@ -98,6 +98,6 @@ public:
~SwGlossaryHdl();
};
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSHDL_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_GLOSHDL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/gloslst.hxx b/sw/source/uibase/inc/gloslst.hxx
index 735c27b..8bac071 100644
--- a/sw/source/uibase/inc/gloslst.hxx
+++ b/sw/source/uibase/inc/gloslst.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSLST_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSLST_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_GLOSLST_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_GLOSLST_HXX
#include <rtl/ustring.hxx>
#include <tools/datetime.hxx>
diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx
index aead0c1e..c34dee5 100644
--- a/sw/source/uibase/inc/glossary.hxx
+++ b/sw/source/uibase/inc/glossary.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSSARY_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSSARY_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_GLOSSARY_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_GLOSSARY_HXX
#include <vcl/edit.hxx>
#include <svtools/treelistbox.hxx>
diff --git a/sw/source/uibase/inc/glshell.hxx b/sw/source/uibase/inc/glshell.hxx
index 33a9a6f..e7e3674 100644
--- a/sw/source/uibase/inc/glshell.hxx
+++ b/sw/source/uibase/inc/glshell.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLSHELL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLSHELL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_GLSHELL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_GLSHELL_HXX
#include "wdocsh.hxx"
class SwGlosDocShell : public SwDocShell
diff --git a/sw/source/uibase/inc/grfsh.hxx b/sw/source/uibase/inc/grfsh.hxx
index bfbdaed..75c1ab0 100644
--- a/sw/source/uibase/inc/grfsh.hxx
+++ b/sw/source/uibase/inc/grfsh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GRFSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GRFSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_GRFSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_GRFSH_HXX
#include "frmsh.hxx"
diff --git a/sw/source/uibase/inc/hyp.hxx b/sw/source/uibase/inc/hyp.hxx
index ca7642a..6d7be06 100644
--- a/sw/source/uibase/inc/hyp.hxx
+++ b/sw/source/uibase/inc/hyp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_HYP_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_HYP_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_HYP_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_HYP_HXX
#include <tools/link.hxx>
#include <editeng/splwrap.hxx>
diff --git a/sw/source/uibase/inc/idxmrk.hxx b/sw/source/uibase/inc/idxmrk.hxx
index 7518c5b..0115e77 100644
--- a/sw/source/uibase/inc/idxmrk.hxx
+++ b/sw/source/uibase/inc/idxmrk.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_IDXMRK_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_IDXMRK_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_IDXMRK_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_IDXMRK_HXX
#include <sfx2/childwin.hxx>
@@ -55,6 +55,6 @@ public:
void ReInitDlg(SwWrtShell& rWrtShell);
};
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_IDXMRK_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_IDXMRK_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/imaildsplistener.hxx b/sw/source/uibase/inc/imaildsplistener.hxx
index a0ab9ba..b8e51dd 100644
--- a/sw/source/uibase/inc/imaildsplistener.hxx
+++ b/sw/source/uibase/inc/imaildsplistener.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_IMAILDSPLISTENER_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_IMAILDSPLISTENER_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_IMAILDSPLISTENER_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_IMAILDSPLISTENER_HXX
#include <com/sun/star/mail/XMailMessage.hpp>
#include <salhelper/refobj.hxx>
diff --git a/sw/source/uibase/inc/initui.hxx b/sw/source/uibase/inc/initui.hxx
index d917bff..462fdd5 100644
--- a/sw/source/uibase/inc/initui.hxx
+++ b/sw/source/uibase/inc/initui.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INITUI_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INITUI_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_INITUI_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_INITUI_HXX
#include <tools/solar.h>
#include "swdllapi.h"
diff --git a/sw/source/uibase/inc/inpdlg.hxx b/sw/source/uibase/inc/inpdlg.hxx
index d21209e..510e28c 100644
--- a/sw/source/uibase/inc/inpdlg.hxx
+++ b/sw/source/uibase/inc/inpdlg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INPDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INPDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_INPDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_INPDLG_HXX
#include <svx/stddlg.hxx>
diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx
index 0822743..3db10af 100644
--- a/sw/source/uibase/inc/inputwin.hxx
+++ b/sw/source/uibase/inc/inputwin.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INPUTWIN_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INPUTWIN_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_INPUTWIN_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_INPUTWIN_HXX
#include <vcl/edit.hxx>
#include <vcl/menu.hxx>
diff --git a/sw/source/uibase/inc/insfnote.hxx b/sw/source/uibase/inc/insfnote.hxx
index 79b1589..86cb313 100644
--- a/sw/source/uibase/inc/insfnote.hxx
+++ b/sw/source/uibase/inc/insfnote.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INSFNOTE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INSFNOTE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_INSFNOTE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_INSFNOTE_HXX
#include <svx/stddlg.hxx>
diff --git a/sw/source/uibase/inc/instable.hxx b/sw/source/uibase/inc/instable.hxx
index a5e4c12..ce47d8d 100644
--- a/sw/source/uibase/inc/instable.hxx
+++ b/sw/source/uibase/inc/instable.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INSTABLE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INSTABLE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_INSTABLE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_INSTABLE_HXX
#include <rtl/ustring.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/uibase/inc/javaedit.hxx b/sw/source/uibase/inc/javaedit.hxx
index b17f0f7..506b6cf 100644
--- a/sw/source/uibase/inc/javaedit.hxx
+++ b/sw/source/uibase/inc/javaedit.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_JAVAEDIT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_JAVAEDIT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_JAVAEDIT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_JAVAEDIT_HXX
#include <svx/stddlg.hxx>
#include <vcl/fixed.hxx>
diff --git a/sw/source/uibase/inc/label.hxx b/sw/source/uibase/inc/label.hxx
index cb7dae2..a2f22a3 100644
--- a/sw/source/uibase/inc/label.hxx
+++ b/sw/source/uibase/inc/label.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LABEL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LABEL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_LABEL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_LABEL_HXX
#include <sfx2/tabdlg.hxx>
#include <com/sun/star/frame/XModel.hpp>
diff --git a/sw/source/uibase/inc/labelcfg.hxx b/sw/source/uibase/inc/labelcfg.hxx
index 9789d86..40bd8ce 100644
--- a/sw/source/uibase/inc/labelcfg.hxx
+++ b/sw/source/uibase/inc/labelcfg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LABELCFG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LABELCFG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_LABELCFG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_LABELCFG_HXX
#include <unotools/configitem.hxx>
#include "swdllapi.h"
diff --git a/sw/source/uibase/inc/labimg.hxx b/sw/source/uibase/inc/labimg.hxx
index 20f355d..dad4ae7 100644
--- a/sw/source/uibase/inc/labimg.hxx
+++ b/sw/source/uibase/inc/labimg.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LABIMG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LABIMG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_LABIMG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_LABIMG_HXX
#include <svl/poolitem.hxx>
#include <unotools/configitem.hxx>
diff --git a/sw/source/uibase/inc/langhelper.hxx b/sw/source/uibase/inc/langhelper.hxx
index 668d27d..b4f1ebe 100644
--- a/sw/source/uibase/inc/langhelper.hxx
+++ b/sw/source/uibase/inc/langhelper.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LANGHELPER_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LANGHELPER_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_LANGHELPER_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_LANGHELPER_HXX
class SwWrtShell;
class SwView;
diff --git a/sw/source/uibase/inc/linenum.hxx b/sw/source/uibase/inc/linenum.hxx
index d6ac4d4..c9809c9 100644
--- a/sw/source/uibase/inc/linenum.hxx
+++ b/sw/source/uibase/inc/linenum.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LINENUM_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LINENUM_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_LINENUM_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_LINENUM_HXX
#include <sfx2/basedlgs.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/uibase/inc/listsh.hxx b/sw/source/uibase/inc/listsh.hxx
index 7230a75..733d26c 100644
--- a/sw/source/uibase/inc/listsh.hxx
+++ b/sw/source/uibase/inc/listsh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LISTSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LISTSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_LISTSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_LISTSH_HXX
#include "basesh.hxx"
diff --git a/sw/source/uibase/inc/macassgn.hxx b/sw/source/uibase/inc/macassgn.hxx
index 92f3491..8282033 100644
--- a/sw/source/uibase/inc/macassgn.hxx
+++ b/sw/source/uibase/inc/macassgn.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MACASSGN_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MACASSGN_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MACASSGN_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_MACASSGN_HXX
#include <sfx2/evntconf.hxx>
diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx
index 2aad6d2..4872c61 100644
--- a/sw/source/uibase/inc/mailconfigpage.hxx
+++ b/sw/source/uibase/inc/mailconfigpage.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILCONFIGPAGE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILCONFIGPAGE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MAILCONFIGPAGE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_MAILCONFIGPAGE_HXX
#include <sfx2/tabdlg.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/uibase/inc/maildispatcher.hxx b/sw/source/uibase/inc/maildispatcher.hxx
index 4da0e5d..4cbe6cd 100644
--- a/sw/source/uibase/inc/maildispatcher.hxx
+++ b/sw/source/uibase/inc/maildispatcher.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILDISPATCHER_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILDISPATCHER_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MAILDISPATCHER_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_MAILDISPATCHER_HXX
#include <com/sun/star/mail/XSmtpService.hpp>
#include <com/sun/star/mail/XMailMessage.hpp>
@@ -153,6 +153,6 @@ private:
bool shutdown_requested_;
};
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILDISPATCHER_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_MAILDISPATCHER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/mailmergechildwindow.hxx b/sw/source/uibase/inc/mailmergechildwindow.hxx
index 8ceea7c..30dc88e 100644
--- a/sw/source/uibase/inc/mailmergechildwindow.hxx
+++ b/sw/source/uibase/inc/mailmergechildwindow.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMERGECHILDWINDOW_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMERGECHILDWINDOW_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MAILMERGECHILDWINDOW_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_MAILMERGECHILDWINDOW_HXX
#include <sfx2/childwin.hxx>
#include <sfx2/basedlgs.hxx>
#include <vcl/toolbox.hxx>
diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx
index 6c57fbb..1a07a48 100644
--- a/sw/source/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/uibase/inc/mailmergehelper.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMERGEHELPER_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMERGEHELPER_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MAILMERGEHELPER_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_MAILMERGEHELPER_HXX
#include <svtools/stdctrl.hxx>
#include <unotools/configitem.hxx>
diff --git a/sw/source/uibase/inc/mailmergewizard.hxx b/sw/source/uibase/inc/mailmergewizard.hxx
index 8154aac..5287ca3 100644
--- a/sw/source/uibase/inc/mailmergewizard.hxx
+++ b/sw/source/uibase/inc/mailmergewizard.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMERGEWIZARD_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMERGEWIZARD_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MAILMERGEWIZARD_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_MAILMERGEWIZARD_HXX
#include <svtools/roadmapwizard.hxx>
#include <rtl/ustring.hxx>
diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx
index e61e3bc..29ee649 100644
--- a/sw/source/uibase/inc/mailmrge.hxx
+++ b/sw/source/uibase/inc/mailmrge.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMRGE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMRGE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MAILMRGE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_MAILMRGE_HXX
#include <svx/stddlg.hxx>
diff --git a/sw/source/uibase/inc/mediash.hxx b/sw/source/uibase/inc/mediash.hxx
index f6796bd..eb9897a 100644
--- a/sw/source/uibase/inc/mediash.hxx
+++ b/sw/source/uibase/inc/mediash.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MEDIASH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MEDIASH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MEDIASH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_MEDIASH_HXX
#include "frmsh.hxx"
diff --git a/sw/source/uibase/inc/mergetbl.hxx b/sw/source/uibase/inc/mergetbl.hxx
index da889f3..588efaf 100644
--- a/sw/source/uibase/inc/mergetbl.hxx
+++ b/sw/source/uibase/inc/mergetbl.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MERGETBL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MERGETBL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MERGETBL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_MERGETBL_HXX
#include <vcl/button.hxx>
diff --git a/sw/source/uibase/inc/mmconfigitem.hxx b/sw/source/uibase/inc/mmconfigitem.hxx
index b40e189..f930064 100644
--- a/sw/source/uibase/inc/mmconfigitem.hxx
+++ b/sw/source/uibase/inc/mmconfigitem.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MMCONFIGITEM_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MMCONFIGITEM_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MMCONFIGITEM_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_MMCONFIGITEM_HXX
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Reference.hxx>
diff --git a/sw/source/uibase/inc/multmrk.hxx b/sw/source/uibase/inc/multmrk.hxx
index e120905..b163c55 100644
--- a/sw/source/uibase/inc/multmrk.hxx
+++ b/sw/source/uibase/inc/multmrk.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MULTMRK_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MULTMRK_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MULTMRK_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_MULTMRK_HXX
#include <svx/stddlg.hxx>
#include <vcl/fixed.hxx>
@@ -44,6 +44,6 @@ public:
virtual ~SwMultiTOXMarkDlg();
};
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MULTMRK_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_MULTMRK_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/navicfg.hxx b/sw/source/uibase/inc/navicfg.hxx
index 9dac0c8..1a3a6fa 100644
--- a/sw/source/uibase/inc/navicfg.hxx
+++ b/sw/source/uibase/inc/navicfg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVICFG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVICFG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NAVICFG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_NAVICFG_HXX
#include <unotools/configitem.hxx>
diff --git a/sw/source/uibase/inc/navicont.hxx b/sw/source/uibase/inc/navicont.hxx
index b1d168e..15b32c4 100644
--- a/sw/source/uibase/inc/navicont.hxx
+++ b/sw/source/uibase/inc/navicont.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVICONT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVICONT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NAVICONT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_NAVICONT_HXX
#include <rtl/ustring.hxx>
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index c5a9f32..02496e2 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVIPI_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVIPI_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NAVIPI_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_NAVIPI_HXX
#include <vcl/lstbox.hxx>
#include <svl/lstner.hxx>
diff --git a/sw/source/uibase/inc/navmgr.hxx b/sw/source/uibase/inc/navmgr.hxx
index addb172..5e33371 100644
--- a/sw/source/uibase/inc/navmgr.hxx
+++ b/sw/source/uibase/inc/navmgr.hxx
@@ -6,8 +6,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVMGR_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVMGR_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NAVMGR_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_NAVMGR_HXX
#include <vector>
diff --git a/sw/source/uibase/inc/navsh.hxx b/sw/source/uibase/inc/navsh.hxx
index 604f370..940a124 100644
--- a/sw/source/uibase/inc/navsh.hxx
+++ b/sw/source/uibase/inc/navsh.hxx
@@ -6,8 +6,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NAVSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_NAVSH_HXX
#include "frmsh.hxx"
diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx
index ba36e48..63a8a6d 100644
--- a/sw/source/uibase/inc/num.hxx
+++ b/sw/source/uibase/inc/num.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUM_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUM_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NUM_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_NUM_HXX
#include <sfx2/tabdlg.hxx>
#include <vcl/menubtn.hxx>
@@ -161,6 +161,6 @@ class SwSvxNumBulletTabDialog : public SfxTabDialog
SwWrtShell &);
virtual ~SwSvxNumBulletTabDialog();
};
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUM_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_NUM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/numberingtypelistbox.hxx b/sw/source/uibase/inc/numberingtypelistbox.hxx
index bf98544..20e85b8 100644
--- a/sw/source/uibase/inc/numberingtypelistbox.hxx
+++ b/sw/source/uibase/inc/numberingtypelistbox.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMBERINGTYPELISTBOX_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMBERINGTYPELISTBOX_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NUMBERINGTYPELISTBOX_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_NUMBERINGTYPELISTBOX_HXX
#include <vcl/lstbox.hxx>
#include "swdllapi.h"
diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx
index 3080619..a2abdfd 100644
--- a/sw/source/uibase/inc/numfmtlb.hxx
+++ b/sw/source/uibase/inc/numfmtlb.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMFMTLB_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMFMTLB_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NUMFMTLB_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_NUMFMTLB_HXX
#include <vcl/lstbox.hxx>
#include <svl/zforlist.hxx>
diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx
index 910dfcf..872c015 100644
--- a/sw/source/uibase/inc/numpara.hxx
+++ b/sw/source/uibase/inc/numpara.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMPARA_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMPARA_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NUMPARA_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_NUMPARA_HXX
#include <sfx2/tabdlg.hxx>
#include <vcl/lstbox.hxx>
diff --git a/sw/source/uibase/inc/numprevw.hxx b/sw/source/uibase/inc/numprevw.hxx
index 4c29324..f70b9bc 100644
--- a/sw/source/uibase/inc/numprevw.hxx
+++ b/sw/source/uibase/inc/numprevw.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMPREVW_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMPREVW_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NUMPREVW_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_NUMPREVW_HXX
#include <vcl/window.hxx>
diff --git a/sw/source/uibase/inc/olesh.hxx b/sw/source/uibase/inc/olesh.hxx
index 04e3053..3097902 100644
--- a/sw/source/uibase/inc/olesh.hxx
+++ b/sw/source/uibase/inc/olesh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OLESH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OLESH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_OLESH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_OLESH_HXX
#include "frmsh.hxx"
diff --git a/sw/source/uibase/inc/olmenu.hxx b/sw/source/uibase/inc/olmenu.hxx
index 084c4a5..5e13ee6 100644
--- a/sw/source/uibase/inc/olmenu.hxx
+++ b/sw/source/uibase/inc/olmenu.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OLMENU_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OLMENU_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_OLMENU_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_OLMENU_HXX
#include <com/sun/star/linguistic2/XDictionary.hpp>
#include <com/sun/star/linguistic2/XSpellAlternatives.hpp>
diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx
index 8851617f..2cd02b6 100644
--- a/sw/source/uibase/inc/optcomp.hxx
+++ b/sw/source/uibase/inc/optcomp.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OPTCOMP_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OPTCOMP_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_OPTCOMP_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_OPTCOMP_HXX
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx
index 2c1f739..e6a09bb 100644
--- a/sw/source/uibase/inc/optload.hxx
+++ b/sw/source/uibase/inc/optload.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OPTLOAD_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OPTLOAD_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_OPTLOAD_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_OPTLOAD_HXX
#include <sfx2/tabdlg.hxx>
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index 5ca74da..17dc981 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OPTPAGE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OPTPAGE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_OPTPAGE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_OPTPAGE_HXX
#include <sfx2/tabdlg.hxx>
#include <vcl/group.hxx>
diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx
index f224a38..41bbd0a 100644
--- a/sw/source/uibase/inc/outline.hxx
+++ b/sw/source/uibase/inc/outline.hxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list