summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/inc/fillattributes.hxx6
-rw-r--r--sw/inc/unobrushitemhelper.hxx6
-rw-r--r--sw/qa/extras/inc/bordertest.hxx4
-rw-r--r--sw/source/core/access/accfield.hxx4
-rw-r--r--sw/source/core/access/accnotexthyperlink.hxx4
-rw-r--r--sw/source/core/crsr/overlayrangesoutline.hxx6
-rw-r--r--sw/source/core/inc/annotationmark.hxx4
-rw-r--r--sw/source/core/uibase/app/swdllimpl.hxx4
-rw-r--r--sw/source/core/uibase/docvw/AnchorOverlayObject.hxx4
-rw-r--r--sw/source/core/uibase/docvw/AnnotationMenuButton.hxx4
-rw-r--r--sw/source/core/uibase/docvw/OverlayRanges.hxx6
-rw-r--r--sw/source/core/uibase/docvw/ShadowOverlayObject.hxx4
-rw-r--r--sw/source/core/uibase/docvw/SidebarTxtControl.hxx4
-rw-r--r--sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx4
-rw-r--r--sw/source/core/uibase/docvw/SidebarWinAcc.hxx4
-rw-r--r--sw/source/core/uibase/docvw/frmsidebarwincontainer.hxx4
-rw-r--r--sw/source/core/uibase/docvw/romenu.hxx4
-rw-r--r--sw/source/core/uibase/envelp/labimp.hxx4
-rw-r--r--sw/source/core/uibase/inc/DashedLine.hxx4
-rw-r--r--sw/source/core/uibase/inc/DropDownFieldDialog.hxx4
-rw-r--r--sw/source/core/uibase/inc/FrameControl.hxx4
-rw-r--r--sw/source/core/uibase/inc/FrameControlsManager.hxx4
-rw-r--r--sw/source/core/uibase/inc/HeaderFooterWin.hxx4
-rw-r--r--sw/source/core/uibase/inc/PageBreakWin.hxx4
-rw-r--r--sw/source/core/uibase/inc/SidebarWindowsConsts.hxx4
-rw-r--r--sw/source/core/uibase/inc/SwSpellDialogChildWindow.hxx4
-rw-r--r--sw/source/core/uibase/inc/SwXFilterOptions.hxx4
-rw-r--r--sw/source/core/uibase/inc/abstract.hxx4
-rw-r--r--sw/source/core/uibase/inc/actctrl.hxx4
-rw-r--r--sw/source/core/uibase/inc/addrdlg.hxx4
-rw-r--r--sw/source/core/uibase/inc/annotsh.hxx4
-rw-r--r--sw/source/core/uibase/inc/ascfldlg.hxx4
-rw-r--r--sw/source/core/uibase/inc/autoedit.hxx4
-rw-r--r--sw/source/core/uibase/inc/barcfg.hxx4
-rw-r--r--sw/source/core/uibase/inc/basesh.hxx4
-rw-r--r--sw/source/core/uibase/inc/beziersh.hxx4
-rw-r--r--sw/source/core/uibase/inc/bmpwin.hxx4
-rw-r--r--sw/source/core/uibase/inc/bookctrl.hxx4
-rw-r--r--sw/source/core/uibase/inc/bookmark.hxx4
-rw-r--r--sw/source/core/uibase/inc/break.hxx4
-rw-r--r--sw/source/core/uibase/inc/caption.hxx4
-rw-r--r--sw/source/core/uibase/inc/cfgid.h4
-rw-r--r--sw/source/core/uibase/inc/cfgitems.hxx4
-rw-r--r--sw/source/core/uibase/inc/changedb.hxx4
-rw-r--r--sw/source/core/uibase/inc/chartins.hxx6
-rw-r--r--sw/source/core/uibase/inc/chldwrap.hxx4
-rw-r--r--sw/source/core/uibase/inc/chrdlg.hxx4
-rw-r--r--sw/source/core/uibase/inc/chrdlgmodes.hxx6
-rw-r--r--sw/source/core/uibase/inc/cnttab.hxx4
-rw-r--r--sw/source/core/uibase/inc/colex.hxx6
-rw-r--r--sw/source/core/uibase/inc/colmgr.hxx4
-rw-r--r--sw/source/core/uibase/inc/column.hxx4
-rw-r--r--sw/source/core/uibase/inc/conarc.hxx6
-rw-r--r--sw/source/core/uibase/inc/concustomshape.hxx6
-rw-r--r--sw/source/core/uibase/inc/condedit.hxx4
-rw-r--r--sw/source/core/uibase/inc/conform.hxx4
-rw-r--r--sw/source/core/uibase/inc/conpoly.hxx6
-rw-r--r--sw/source/core/uibase/inc/conrect.hxx6
-rw-r--r--sw/source/core/uibase/inc/content.hxx4
-rw-r--r--sw/source/core/uibase/inc/conttree.hxx4
-rw-r--r--sw/source/core/uibase/inc/convert.hxx4
-rw-r--r--sw/source/core/uibase/inc/cption.hxx4
-rw-r--r--sw/source/core/uibase/inc/dbconfig.hxx4
-rw-r--r--sw/source/core/uibase/inc/dbinsdlg.hxx4
-rw-r--r--sw/source/core/uibase/inc/dbtree.hxx4
-rw-r--r--sw/source/core/uibase/inc/dbui.hxx4
-rw-r--r--sw/source/core/uibase/inc/dialmgr.hxx4
-rw-r--r--sw/source/core/uibase/inc/docfnote.hxx4
-rw-r--r--sw/source/core/uibase/inc/docstdlg.hxx4
-rw-r--r--sw/source/core/uibase/inc/drawbase.hxx6
-rw-r--r--sw/source/core/uibase/inc/drawsh.hxx4
-rw-r--r--sw/source/core/uibase/inc/drformsh.hxx4
-rw-r--r--sw/source/core/uibase/inc/drpcps.hxx4
-rw-r--r--sw/source/core/uibase/inc/drwbassh.hxx5
-rw-r--r--sw/source/core/uibase/inc/drwtxtsh.hxx4
-rw-r--r--sw/source/core/uibase/inc/dselect.hxx6
-rw-r--r--sw/source/core/uibase/inc/edtwin.hxx4
-rw-r--r--sw/source/core/uibase/inc/envimg.hxx4
-rw-r--r--sw/source/core/uibase/inc/envlop.hxx4
-rw-r--r--sw/source/core/uibase/inc/fldedt.hxx4
-rw-r--r--sw/source/core/uibase/inc/fldmgr.hxx4
-rw-r--r--sw/source/core/uibase/inc/fldtdlg.hxx4
-rw-r--r--sw/source/core/uibase/inc/fldwrap.hxx4
-rw-r--r--sw/source/core/uibase/inc/fontcfg.hxx4
-rw-r--r--sw/source/core/uibase/inc/formatclipboard.hxx4
-rw-r--r--sw/source/core/uibase/inc/formedt.hxx4
-rw-r--r--sw/source/core/uibase/inc/frmdlg.hxx6
-rw-r--r--sw/source/core/uibase/inc/frmmgr.hxx4
-rw-r--r--sw/source/core/uibase/inc/frmpage.hxx6
-rw-r--r--sw/source/core/uibase/inc/frmsh.hxx4
-rw-r--r--sw/source/core/uibase/inc/globals.h4
-rw-r--r--sw/source/core/uibase/inc/glosbib.hxx4
-rw-r--r--sw/source/core/uibase/inc/glosdoc.hxx6
-rw-r--r--sw/source/core/uibase/inc/gloshdl.hxx6
-rw-r--r--sw/source/core/uibase/inc/gloslst.hxx4
-rw-r--r--sw/source/core/uibase/inc/glossary.hxx4
-rw-r--r--sw/source/core/uibase/inc/glshell.hxx4
-rw-r--r--sw/source/core/uibase/inc/grfsh.hxx4
-rw-r--r--sw/source/core/uibase/inc/hyp.hxx4
-rw-r--r--sw/source/core/uibase/inc/idxmrk.hxx6
-rw-r--r--sw/source/core/uibase/inc/imaildsplistener.hxx4
-rw-r--r--sw/source/core/uibase/inc/initui.hxx4
-rw-r--r--sw/source/core/uibase/inc/inpdlg.hxx4
-rw-r--r--sw/source/core/uibase/inc/inputwin.hxx4
-rw-r--r--sw/source/core/uibase/inc/insfnote.hxx4
-rw-r--r--sw/source/core/uibase/inc/instable.hxx4
-rw-r--r--sw/source/core/uibase/inc/javaedit.hxx4
-rw-r--r--sw/source/core/uibase/inc/label.hxx4
-rw-r--r--sw/source/core/uibase/inc/labelcfg.hxx4
-rw-r--r--sw/source/core/uibase/inc/labimg.hxx4
-rw-r--r--sw/source/core/uibase/inc/langhelper.hxx4
-rw-r--r--sw/source/core/uibase/inc/linenum.hxx4
-rw-r--r--sw/source/core/uibase/inc/listsh.hxx4
-rw-r--r--sw/source/core/uibase/inc/macassgn.hxx4
-rw-r--r--sw/source/core/uibase/inc/mailconfigpage.hxx4
-rw-r--r--sw/source/core/uibase/inc/maildispatcher.hxx6
-rw-r--r--sw/source/core/uibase/inc/mailmergechildwindow.hxx4
-rw-r--r--sw/source/core/uibase/inc/mailmergehelper.hxx4
-rw-r--r--sw/source/core/uibase/inc/mailmergewizard.hxx4
-rw-r--r--sw/source/core/uibase/inc/mailmrge.hxx4
-rw-r--r--sw/source/core/uibase/inc/mediash.hxx4
-rw-r--r--sw/source/core/uibase/inc/mergetbl.hxx4
-rw-r--r--sw/source/core/uibase/inc/mmconfigitem.hxx4
-rw-r--r--sw/source/core/uibase/inc/multmrk.hxx6
-rw-r--r--sw/source/core/uibase/inc/navicfg.hxx4
-rw-r--r--sw/source/core/uibase/inc/navicont.hxx4
-rw-r--r--sw/source/core/uibase/inc/navipi.hxx4
-rw-r--r--sw/source/core/uibase/inc/navmgr.hxx4
-rw-r--r--sw/source/core/uibase/inc/navsh.hxx4
-rw-r--r--sw/source/core/uibase/inc/num.hxx6
-rw-r--r--sw/source/core/uibase/inc/numberingtypelistbox.hxx4
-rw-r--r--sw/source/core/uibase/inc/numfmtlb.hxx4
-rw-r--r--sw/source/core/uibase/inc/numpara.hxx4
-rw-r--r--sw/source/core/uibase/inc/numprevw.hxx4
-rw-r--r--sw/source/core/uibase/inc/olesh.hxx4
-rw-r--r--sw/source/core/uibase/inc/olmenu.hxx4
-rw-r--r--sw/source/core/uibase/inc/optcomp.hxx4
-rw-r--r--sw/source/core/uibase/inc/optload.hxx4
-rw-r--r--sw/source/core/uibase/inc/optpage.hxx4
-rw-r--r--sw/source/core/uibase/inc/outline.hxx4
-rw-r--r--sw/source/core/uibase/inc/pardlg.hxx4
-rw-r--r--sw/source/core/uibase/inc/pattern.hxx4
-rw-r--r--sw/source/core/uibase/inc/pgfnote.hxx4
-rw-r--r--sw/source/core/uibase/inc/pggrid.hxx4
-rw-r--r--sw/source/core/uibase/inc/popbox.hxx4
-rw-r--r--sw/source/core/uibase/inc/prcntfld.hxx6
-rw-r--r--sw/source/core/uibase/inc/pview.hxx4
-rw-r--r--sw/source/core/uibase/inc/redlndlg.hxx4
-rw-r--r--sw/source/core/uibase/inc/regionsw.hxx4
-rw-r--r--sw/source/core/uibase/inc/rowht.hxx4
-rw-r--r--sw/source/core/uibase/inc/scroll.hxx4
-rw-r--r--sw/source/core/uibase/inc/selglos.hxx4
-rw-r--r--sw/source/core/uibase/inc/sharedconnection.hxx6
-rw-r--r--sw/source/core/uibase/inc/shdwcrsr.hxx4
-rw-r--r--sw/source/core/uibase/inc/splittbl.hxx4
-rw-r--r--sw/source/core/uibase/inc/srcedtw.hxx4
-rw-r--r--sw/source/core/uibase/inc/srcview.hxx4
-rw-r--r--sw/source/core/uibase/inc/srtdlg.hxx4
-rw-r--r--sw/source/core/uibase/inc/stmenu.hxx4
-rw-r--r--sw/source/core/uibase/inc/swcont.hxx4
-rw-r--r--sw/source/core/uibase/inc/swdtflvr.hxx4
-rw-r--r--sw/source/core/uibase/inc/swlbox.hxx6
-rw-r--r--sw/source/core/uibase/inc/swmodalredlineacceptdlg.hxx4
-rw-r--r--sw/source/core/uibase/inc/swrenamexnameddlg.hxx4
-rw-r--r--sw/source/core/uibase/inc/swruler.hxx4
-rw-r--r--sw/source/core/uibase/inc/swtablerep.hxx4
-rw-r--r--sw/source/core/uibase/inc/swuiccoll.hxx4
-rw-r--r--sw/source/core/uibase/inc/swuicnttab.hxx6
-rw-r--r--sw/source/core/uibase/inc/swuiidxmrk.hxx6
-rw-r--r--sw/source/core/uibase/inc/swuipardlg.hxx4
-rw-r--r--sw/source/core/uibase/inc/swvset.hxx4
-rw-r--r--sw/source/core/uibase/inc/swwrtshitem.hxx4
-rw-r--r--sw/source/core/uibase/inc/syncbtn.hxx4
-rw-r--r--sw/source/core/uibase/inc/tabledlg.hxx4
-rw-r--r--sw/source/core/uibase/inc/tablemgr.hxx4
-rw-r--r--sw/source/core/uibase/inc/tabsh.hxx4
-rw-r--r--sw/source/core/uibase/inc/tautofmt.hxx4
-rw-r--r--sw/source/core/uibase/inc/tblctrl.hxx4
-rw-r--r--sw/source/core/uibase/inc/tblnumfm.hxx4
-rw-r--r--sw/source/core/uibase/inc/tbxanchr.hxx4
-rw-r--r--sw/source/core/uibase/inc/textsh.hxx4
-rw-r--r--sw/source/core/uibase/inc/titlepage.hxx4
-rw-r--r--sw/source/core/uibase/inc/tmpdlg.hxx4
-rw-r--r--sw/source/core/uibase/inc/tmplctrl.hxx4
-rw-r--r--sw/source/core/uibase/inc/toxmgr.hxx4
-rw-r--r--sw/source/core/uibase/inc/uiborder.hxx4
-rw-r--r--sw/source/core/uibase/inc/uiitems.hxx6
-rw-r--r--sw/source/core/uibase/inc/uinums.hxx4
-rw-r--r--sw/source/core/uibase/inc/uitool.hxx6
-rw-r--r--sw/source/core/uibase/inc/uivwimp.hxx4
-rw-r--r--sw/source/core/uibase/inc/unoatxt.hxx4
-rw-r--r--sw/source/core/uibase/inc/unodispatch.hxx4
-rw-r--r--sw/source/core/uibase/inc/unomailmerge.hxx4
-rw-r--r--sw/source/core/uibase/inc/unomod.hxx4
-rw-r--r--sw/source/core/uibase/inc/unotools.hxx4
-rw-r--r--sw/source/core/uibase/inc/unotxvw.hxx4
-rw-r--r--sw/source/core/uibase/inc/usrpref.hxx4
-rw-r--r--sw/source/core/uibase/inc/view.hxx4
-rw-r--r--sw/source/core/uibase/inc/viewlayoutctrl.hxx4
-rw-r--r--sw/source/core/uibase/inc/wformsh.hxx4
-rw-r--r--sw/source/core/uibase/inc/wfrmsh.hxx4
-rw-r--r--sw/source/core/uibase/inc/wgrfsh.hxx4
-rw-r--r--sw/source/core/uibase/inc/wlistsh.hxx4
-rw-r--r--sw/source/core/uibase/inc/wolesh.hxx4
-rw-r--r--sw/source/core/uibase/inc/wordcountctrl.hxx4
-rw-r--r--sw/source/core/uibase/inc/wordcountdialog.hxx4
-rw-r--r--sw/source/core/uibase/inc/workctrl.hxx4
-rw-r--r--sw/source/core/uibase/inc/wrap.hxx4
-rw-r--r--sw/source/core/uibase/inc/wrtsh.hxx4
-rw-r--r--sw/source/core/uibase/inc/wtabsh.hxx4
-rw-r--r--sw/source/core/uibase/inc/wtextsh.hxx4
-rw-r--r--sw/source/core/uibase/inc/wview.hxx4
-rw-r--r--sw/source/core/uibase/inc/zoomctrl.hxx4
-rw-r--r--sw/source/core/uibase/lingu/sdrhhcwrap.hxx4
-rw-r--r--sw/source/core/uibase/sidebar/PageColumnControl.hxx4
-rw-r--r--sw/source/core/uibase/sidebar/PageMarginControl.hxx4
-rw-r--r--sw/source/core/uibase/sidebar/PageOrientationControl.hxx4
-rw-r--r--sw/source/core/uibase/sidebar/PagePropertyPanel.hxx4
-rw-r--r--sw/source/core/uibase/sidebar/PageSizeControl.hxx4
-rw-r--r--sw/source/core/uibase/sidebar/WrapPropertyPanel.hxx4
-rw-r--r--sw/source/core/uibase/table/tablepg.hxx4
-rw-r--r--sw/source/core/uibase/uiview/viewfunc.hxx4
-rw-r--r--sw/source/core/uibase/uno/SwXDocumentSettings.hxx4
-rw-r--r--sw/source/core/uibase/uno/unodefaults.hxx4
-rw-r--r--sw/source/core/uibase/uno/unomodule.hxx4
225 files changed, 479 insertions, 478 deletions
diff --git a/sw/inc/fillattributes.hxx b/sw/inc/fillattributes.hxx
index ac0bb10311c6..9908f2621273 100644
--- a/sw/inc/fillattributes.hxx
+++ b/sw/inc/fillattributes.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef FILLATTRIBUTES_HXX
-#define FILLATTRIBUTES_HXX
+#ifndef INCLUDED_SW_INC_FILLATTRIBUTES_HXX
+#define INCLUDED_SW_INC_FILLATTRIBUTES_HXX
#include <drawinglayer/attribute/fillgradientattribute.hxx>
#include <drawinglayer/attribute/sdrfillattribute.hxx>
@@ -67,6 +67,6 @@ typedef boost::shared_ptr< FillAttributes > FillAttributesPtr;
//////////////////////////////////////////////////////////////////////////////
-#endif // FILLATTRIBUTES_HXX
+#endif // INCLUDED_SW_INC_FILLATTRIBUTES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/unobrushitemhelper.hxx b/sw/inc/unobrushitemhelper.hxx
index 9de560451b2d..bc8e9bb635ab 100644
--- a/sw/inc/unobrushitemhelper.hxx
+++ b/sw/inc/unobrushitemhelper.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _UNOBRUSHITEMHELPER_HXX
-#define _UNOBRUSHITEMHELPER_HXX
+#ifndef INCLUDED_SW_INC_UNOBRUSHITEMHELPER_HXX
+#define INCLUDED_SW_INC_UNOBRUSHITEMHELPER_HXX
#include <swdllapi.h>
#include <editeng/brushitem.hxx>
@@ -31,6 +31,6 @@ SW_DLLPUBLIC SvxBrushItem getSvxBrushItemFromSourceSet(const SfxItemSet& rSource
} // namespace sw
-#endif // _UNOBRUSHITEMHELPER_HXX
+#endif // INCLUDED_SW_INC_UNOBRUSHITEMHELPER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/inc/bordertest.hxx b/sw/qa/extras/inc/bordertest.hxx
index 3446cc457fae..125662165dbe 100644
--- a/sw/qa/extras/inc/bordertest.hxx
+++ b/sw/qa/extras/inc/bordertest.hxx
@@ -11,8 +11,8 @@
#include <com/sun/star/table/BorderLine.hpp>
#include <com/sun/star/text/XTextTable.hpp>
-#ifndef bordertest_hxx
-#define bordertest_hxx
+#ifndef INCLUDED_SW_QA_EXTRAS_INC_BORDERTEST_HXX
+#define INCLUDED_SW_QA_EXTRAS_INC_BORDERTEST_HXX
typedef std::map<OUString, com::sun::star::table::BorderLine> BorderLineMap;
typedef std::pair<OUString, com::sun::star::table::BorderLine> StringBorderPair;
diff --git a/sw/source/core/access/accfield.hxx b/sw/source/core/access/accfield.hxx
index fdc10f2189eb..6aea8b646a7e 100644
--- a/sw/source/core/access/accfield.hxx
+++ b/sw/source/core/access/accfield.hxx
@@ -15,8 +15,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 _ACCFIELD_HXX
-#define _ACCFIELD_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFIELD_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFIELD_HXX
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
diff --git a/sw/source/core/access/accnotexthyperlink.hxx b/sw/source/core/access/accnotexthyperlink.hxx
index 7c641c4ed4a2..c885c2901924 100644
--- a/sw/source/core/access/accnotexthyperlink.hxx
+++ b/sw/source/core/access/accnotexthyperlink.hxx
@@ -15,8 +15,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 _ACCNOTEXTHYPERLINK_HXX
-#define _ACCNOTEXTHYPERLINK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCNOTEXTHYPERLINK_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCNOTEXTHYPERLINK_HXX
#include <com/sun/star/accessibility/XAccessibleHyperlink.hpp>
#include <com/sun/star/uno/RuntimeException.hpp>
diff --git a/sw/source/core/crsr/overlayrangesoutline.hxx b/sw/source/core/crsr/overlayrangesoutline.hxx
index 0779da304af1..8d67d9ff5f2a 100644
--- a/sw/source/core/crsr/overlayrangesoutline.hxx
+++ b/sw/source/core/crsr/overlayrangesoutline.hxx
@@ -15,8 +15,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 _SW_OVERLAY_OVERLAYRANGESOUTLINE_HXX
-#define _SW_OVERLAY_OVERLAYRANGESOUTLINE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_CRSR_OVERLAYRANGESOUTLINE_HXX
+#define INCLUDED_SW_SOURCE_CORE_CRSR_OVERLAYRANGESOUTLINE_HXX
#include <svx/sdr/overlay/overlayobject.hxx>
#include <basegfx/range/b2drange.hxx>
@@ -55,6 +55,6 @@ namespace sw
} // end of namespace overlay
} // end of namespace sw
-#endif //_SW_OVERLAY_OVERLAYRANGESOUTLINE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_CRSR_OVERLAYRANGESOUTLINE_HXX
// eof
diff --git a/sw/source/core/inc/annotationmark.hxx b/sw/source/core/inc/annotationmark.hxx
index 903c0516ea5e..72feeda14b0f 100644
--- a/sw/source/core/inc/annotationmark.hxx
+++ b/sw/source/core/inc/annotationmark.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _ANNOTATIONMARK_HXX
-#define _ANNOTATIONMARK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_ANNOTATIONMARK_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_ANNOTATIONMARK_HXX
#include <bookmrk.hxx>
#include <rtl/ustring.hxx>
diff --git a/sw/source/core/uibase/app/swdllimpl.hxx b/sw/source/core/uibase/app/swdllimpl.hxx
index 6849e7fd3c00..34eb956cb45a 100644
--- a/sw/source/core/uibase/app/swdllimpl.hxx
+++ b/sw/source/core/uibase/app/swdllimpl.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SW_SOURCE_UI_APP_SWDLLIMPL_HXX
-#define INCLUDED_SW_SOURCE_UI_APP_SWDLLIMPL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_APP_SWDLLIMPL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_APP_SWDLLIMPL_HXX
#include <sal/config.h>
diff --git a/sw/source/core/uibase/docvw/AnchorOverlayObject.hxx b/sw/source/core/uibase/docvw/AnchorOverlayObject.hxx
index c53ef7a04c9b..c4b4c1c5ce16 100644
--- a/sw/source/core/uibase/docvw/AnchorOverlayObject.hxx
+++ b/sw/source/core/uibase/docvw/AnchorOverlayObject.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_DOCVW_ANCHOROVERLAYOBJECT_HXX
-#define INCLUDED_SW_SOURCE_UI_DOCVW_ANCHOROVERLAYOBJECT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_ANCHOROVERLAYOBJECT_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_ANCHOROVERLAYOBJECT_HXX
#include <svx/sdr/overlay/overlayobject.hxx>
diff --git a/sw/source/core/uibase/docvw/AnnotationMenuButton.hxx b/sw/source/core/uibase/docvw/AnnotationMenuButton.hxx
index 32c423d79494..b90dea4de951 100644
--- a/sw/source/core/uibase/docvw/AnnotationMenuButton.hxx
+++ b/sw/source/core/uibase/docvw/AnnotationMenuButton.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_DOCVW_ANNOTATIONMENUBUTTON_HXX
-#define INCLUDED_SW_SOURCE_UI_DOCVW_ANNOTATIONMENUBUTTON_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_ANNOTATIONMENUBUTTON_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_ANNOTATIONMENUBUTTON_HXX
#include <vcl/menubtn.hxx>
diff --git a/sw/source/core/uibase/docvw/OverlayRanges.hxx b/sw/source/core/uibase/docvw/OverlayRanges.hxx
index 8fd7cf46edb9..4458af4587f2 100644
--- a/sw/source/core/uibase/docvw/OverlayRanges.hxx
+++ b/sw/source/core/uibase/docvw/OverlayRanges.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _SW_OVERLAY_OVERLAYRANGES_HXX
-#define _SW_OVERLAY_OVERLAYRANGES_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_OVERLAYRANGES_HXX
+#define INCLUDED_SW_SOURCE_CORE_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 //_SW_OVERLAY_OVERLAYRANGES_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_OVERLAYRANGES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/docvw/ShadowOverlayObject.hxx b/sw/source/core/uibase/docvw/ShadowOverlayObject.hxx
index d0e57d043584..a6751824d362 100644
--- a/sw/source/core/uibase/docvw/ShadowOverlayObject.hxx
+++ b/sw/source/core/uibase/docvw/ShadowOverlayObject.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_DOCVW_SHADOWOVERLAYOBJECT_HXX
-#define INCLUDED_SW_SOURCE_UI_DOCVW_SHADOWOVERLAYOBJECT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SHADOWOVERLAYOBJECT_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SHADOWOVERLAYOBJECT_HXX
#include <svx/sdr/overlay/overlayobject.hxx>
diff --git a/sw/source/core/uibase/docvw/SidebarTxtControl.hxx b/sw/source/core/uibase/docvw/SidebarTxtControl.hxx
index edb9efd8b9d2..d98503d01519 100644
--- a/sw/source/core/uibase/docvw/SidebarTxtControl.hxx
+++ b/sw/source/core/uibase/docvw/SidebarTxtControl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_DOCVW_SIDEBARTXTCONTROL_HXX
-#define INCLUDED_SW_SOURCE_UI_DOCVW_SIDEBARTXTCONTROL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SIDEBARTXTCONTROL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SIDEBARTXTCONTROL_HXX
#include <vcl/ctrl.hxx>
diff --git a/sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx b/sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx
index b8078c7e1c84..7ac25969e787 100644
--- a/sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx
+++ b/sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_DOCVW_SIDEBARTXTCONTROLACC_HXX
-#define INCLUDED_SW_SOURCE_UI_DOCVW_SIDEBARTXTCONTROLACC_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SIDEBARTXTCONTROLACC_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SIDEBARTXTCONTROLACC_HXX
#include <toolkit/awt/vclxwindow.hxx>
diff --git a/sw/source/core/uibase/docvw/SidebarWinAcc.hxx b/sw/source/core/uibase/docvw/SidebarWinAcc.hxx
index 739865e609db..9d4dc49436b4 100644
--- a/sw/source/core/uibase/docvw/SidebarWinAcc.hxx
+++ b/sw/source/core/uibase/docvw/SidebarWinAcc.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_DOCVW_SIDEBARWINACC_HXX
-#define INCLUDED_SW_SOURCE_UI_DOCVW_SIDEBARWINACC_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SIDEBARWINACC_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SIDEBARWINACC_HXX
#include <toolkit/awt/vclxwindow.hxx>
diff --git a/sw/source/core/uibase/docvw/frmsidebarwincontainer.hxx b/sw/source/core/uibase/docvw/frmsidebarwincontainer.hxx
index 51e657a551e1..225399360248 100644
--- a/sw/source/core/uibase/docvw/frmsidebarwincontainer.hxx
+++ b/sw/source/core/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_UI_DOCVW_FRMSIDEBARWINCONTAINER_HXX
-#define INCLUDED_SW_SOURCE_UI_DOCVW_FRMSIDEBARWINCONTAINER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_FRMSIDEBARWINCONTAINER_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_FRMSIDEBARWINCONTAINER_HXX
#include <sal/types.h>
#include <vector>
diff --git a/sw/source/core/uibase/docvw/romenu.hxx b/sw/source/core/uibase/docvw/romenu.hxx
index 074c93e92a4f..900f51107ebb 100644
--- a/sw/source/core/uibase/docvw/romenu.hxx
+++ b/sw/source/core/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_UI_DOCVW_ROMENU_HXX
-#define INCLUDED_SW_SOURCE_UI_DOCVW_ROMENU_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_ROMENU_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_ROMENU_HXX
#include <vcl/graph.hxx>
#include <vcl/menu.hxx>
diff --git a/sw/source/core/uibase/envelp/labimp.hxx b/sw/source/core/uibase/envelp/labimp.hxx
index 5d4d17d7cfb3..94dccc832eff 100644
--- a/sw/source/core/uibase/envelp/labimp.hxx
+++ b/sw/source/core/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_UI_ENVELP_LABIMP_HXX
-#define INCLUDED_SW_SOURCE_UI_ENVELP_LABIMP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_ENVELP_LABIMP_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_ENVELP_LABIMP_HXX
#include <sfx2/tabdlg.hxx>
#include <vcl/lstbox.hxx>
diff --git a/sw/source/core/uibase/inc/DashedLine.hxx b/sw/source/core/uibase/inc/DashedLine.hxx
index ea0819e2b9b2..05e3268cbae0 100644
--- a/sw/source/core/uibase/inc/DashedLine.hxx
+++ b/sw/source/core/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_UI_INC_DASHEDLINE_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_DASHEDLINE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DASHEDLINE_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DASHEDLINE_HXX
#include <basegfx/color/bcolor.hxx>
#include <vcl/fixed.hxx>
diff --git a/sw/source/core/uibase/inc/DropDownFieldDialog.hxx b/sw/source/core/uibase/inc/DropDownFieldDialog.hxx
index ad8a48b8109d..ef5beea519a4 100644
--- a/sw/source/core/uibase/inc/DropDownFieldDialog.hxx
+++ b/sw/source/core/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_UI_INC_DROPDOWNFIELDDIALOG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_DROPDOWNFIELDDIALOG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DROPDOWNFIELDDIALOG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DROPDOWNFIELDDIALOG_HXX
#include <svx/stddlg.hxx>
#include <vcl/fixed.hxx>
diff --git a/sw/source/core/uibase/inc/FrameControl.hxx b/sw/source/core/uibase/inc/FrameControl.hxx
index f976efbb31c5..3fc14ac356ff 100644
--- a/sw/source/core/uibase/inc/FrameControl.hxx
+++ b/sw/source/core/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_UI_INC_FRAMECONTROL_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_FRAMECONTROL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRAMECONTROL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRAMECONTROL_HXX
class SwEditWin;
class SwFrm;
diff --git a/sw/source/core/uibase/inc/FrameControlsManager.hxx b/sw/source/core/uibase/inc/FrameControlsManager.hxx
index a9824c953b60..4cf05e446d9c 100644
--- a/sw/source/core/uibase/inc/FrameControlsManager.hxx
+++ b/sw/source/core/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_UI_INC_FRAMECONTROLSMANAGER_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_FRAMECONTROLSMANAGER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRAMECONTROLSMANAGER_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRAMECONTROLSMANAGER_HXX
#include <viewsh.hxx>
#include <FrameControl.hxx>
diff --git a/sw/source/core/uibase/inc/HeaderFooterWin.hxx b/sw/source/core/uibase/inc/HeaderFooterWin.hxx
index 7da9aa44a27d..6fee20a43b0c 100644
--- a/sw/source/core/uibase/inc/HeaderFooterWin.hxx
+++ b/sw/source/core/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_UI_INC_HEADERFOOTERWIN_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_HEADERFOOTERWIN_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_HEADERFOOTERWIN_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_HEADERFOOTERWIN_HXX
#include <FrameControl.hxx>
diff --git a/sw/source/core/uibase/inc/PageBreakWin.hxx b/sw/source/core/uibase/inc/PageBreakWin.hxx
index cb5d2fa1fab9..4839c6cf4490 100644
--- a/sw/source/core/uibase/inc/PageBreakWin.hxx
+++ b/sw/source/core/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_UI_INC_PAGEBREAKWIN_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_PAGEBREAKWIN_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PAGEBREAKWIN_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PAGEBREAKWIN_HXX
#include <FrameControl.hxx>
diff --git a/sw/source/core/uibase/inc/SidebarWindowsConsts.hxx b/sw/source/core/uibase/inc/SidebarWindowsConsts.hxx
index c2ed68276da5..a96e192a90ec 100644
--- a/sw/source/core/uibase/inc/SidebarWindowsConsts.hxx
+++ b/sw/source/core/uibase/inc/SidebarWindowsConsts.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_SIDEBARWINDOWSCONSTS_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SIDEBARWINDOWSCONSTS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SIDEBARWINDOWSCONSTS_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SIDEBARWINDOWSCONSTS_HXX
namespace sw { namespace sidebarwindows {
diff --git a/sw/source/core/uibase/inc/SwSpellDialogChildWindow.hxx b/sw/source/core/uibase/inc/SwSpellDialogChildWindow.hxx
index 4d32f2817469..d1d5271bfb20 100644
--- a/sw/source/core/uibase/inc/SwSpellDialogChildWindow.hxx
+++ b/sw/source/core/uibase/inc/SwSpellDialogChildWindow.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_SWSPELLDIALOGCHILDWINDOW_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SWSPELLDIALOGCHILDWINDOW_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWSPELLDIALOGCHILDWINDOW_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWSPELLDIALOGCHILDWINDOW_HXX
#include <svx/SpellDialogChildWindow.hxx>
#include <view.hxx>
diff --git a/sw/source/core/uibase/inc/SwXFilterOptions.hxx b/sw/source/core/uibase/inc/SwXFilterOptions.hxx
index 6a117372c5f1..f1ae68ef6d18 100644
--- a/sw/source/core/uibase/inc/SwXFilterOptions.hxx
+++ b/sw/source/core/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_UI_INC_SWXFILTEROPTIONS_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SWXFILTEROPTIONS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWXFILTEROPTIONS_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWXFILTEROPTIONS_HXX
#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
diff --git a/sw/source/core/uibase/inc/abstract.hxx b/sw/source/core/uibase/inc/abstract.hxx
index e6c80037e57b..5307637ba8fe 100644
--- a/sw/source/core/uibase/inc/abstract.hxx
+++ b/sw/source/core/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_UI_INC_ABSTRACT_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_ABSTRACT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ABSTRACT_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ABSTRACT_HXX
#include <sfx2/basedlgs.hxx>
diff --git a/sw/source/core/uibase/inc/actctrl.hxx b/sw/source/core/uibase/inc/actctrl.hxx
index cc4508d70897..46c6d3b51d68 100644
--- a/sw/source/core/uibase/inc/actctrl.hxx
+++ b/sw/source/core/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_UI_INC_ACTCTRL_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_ACTCTRL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ACTCTRL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ACTCTRL_HXX
#include <vcl/field.hxx>
#include "swdllapi.h"
diff --git a/sw/source/core/uibase/inc/addrdlg.hxx b/sw/source/core/uibase/inc/addrdlg.hxx
index 14a1f0d9929f..6ddf6d15ced7 100644
--- a/sw/source/core/uibase/inc/addrdlg.hxx
+++ b/sw/source/core/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_UI_INC_ADDRDLG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_ADDRDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ADDRDLG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ADDRDLG_HXX
#include <sfx2/basedlgs.hxx>
diff --git a/sw/source/core/uibase/inc/annotsh.hxx b/sw/source/core/uibase/inc/annotsh.hxx
index 385810330d69..40891d0d45a1 100644
--- a/sw/source/core/uibase/inc/annotsh.hxx
+++ b/sw/source/core/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_UI_INC_ANNOTSH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_ANNOTSH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ANNOTSH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ANNOTSH_HXX
#include <sfx2/shell.hxx>
#include "shellid.hxx"
diff --git a/sw/source/core/uibase/inc/ascfldlg.hxx b/sw/source/core/uibase/inc/ascfldlg.hxx
index 040485fedc08..2ccabf9ef9b5 100644
--- a/sw/source/core/uibase/inc/ascfldlg.hxx
+++ b/sw/source/core/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_UI_INC_ASCFLDLG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_ASCFLDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ASCFLDLG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ASCFLDLG_HXX
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/core/uibase/inc/autoedit.hxx b/sw/source/core/uibase/inc/autoedit.hxx
index 606489f3a2af..78ed260d435a 100644
--- a/sw/source/core/uibase/inc/autoedit.hxx
+++ b/sw/source/core/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_UI_INC_AUTOEDIT_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_AUTOEDIT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_AUTOEDIT_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_AUTOEDIT_HXX
#include <vcl/edit.hxx>
diff --git a/sw/source/core/uibase/inc/barcfg.hxx b/sw/source/core/uibase/inc/barcfg.hxx
index dcb2fa2e5350..d078d69d0e67 100644
--- a/sw/source/core/uibase/inc/barcfg.hxx
+++ b/sw/source/core/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_UI_INC_BARCFG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_BARCFG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BARCFG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BARCFG_HXX
#include <unotools/configitem.hxx>
class SwToolbarConfigItem : public utl::ConfigItem
diff --git a/sw/source/core/uibase/inc/basesh.hxx b/sw/source/core/uibase/inc/basesh.hxx
index a145bbb5b753..9d04cc698a16 100644
--- a/sw/source/core/uibase/inc/basesh.hxx
+++ b/sw/source/core/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_UI_INC_BASESH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_BASESH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BASESH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BASESH_HXX
#include <shellid.hxx>
diff --git a/sw/source/core/uibase/inc/beziersh.hxx b/sw/source/core/uibase/inc/beziersh.hxx
index 841440c9db9f..69e57ccfface 100644
--- a/sw/source/core/uibase/inc/beziersh.hxx
+++ b/sw/source/core/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_UI_INC_BEZIERSH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_BEZIERSH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BEZIERSH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BEZIERSH_HXX
#include "basesh.hxx"
diff --git a/sw/source/core/uibase/inc/bmpwin.hxx b/sw/source/core/uibase/inc/bmpwin.hxx
index a4478a286293..c4d597f502bf 100644
--- a/sw/source/core/uibase/inc/bmpwin.hxx
+++ b/sw/source/core/uibase/inc/bmpwin.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_BMPWIN_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_BMPWIN_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BMPWIN_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BMPWIN_HXX
#include <vcl/graph.hxx>
#include <vcl/bitmapex.hxx>
diff --git a/sw/source/core/uibase/inc/bookctrl.hxx b/sw/source/core/uibase/inc/bookctrl.hxx
index 44b52f790ef5..42264b2691fc 100644
--- a/sw/source/core/uibase/inc/bookctrl.hxx
+++ b/sw/source/core/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_UI_INC_BOOKCTRL_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_BOOKCTRL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BOOKCTRL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BOOKCTRL_HXX
#include <rtl/ustring.hxx>
#include <sfx2/stbitem.hxx>
diff --git a/sw/source/core/uibase/inc/bookmark.hxx b/sw/source/core/uibase/inc/bookmark.hxx
index d458fe0067c9..34ca620842a0 100644
--- a/sw/source/core/uibase/inc/bookmark.hxx
+++ b/sw/source/core/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_UI_INC_BOOKMARK_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_BOOKMARK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BOOKMARK_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BOOKMARK_HXX
#include <svx/stddlg.hxx>
#include <vcl/fixed.hxx>
diff --git a/sw/source/core/uibase/inc/break.hxx b/sw/source/core/uibase/inc/break.hxx
index 753e6f4f30e2..80414f4864e3 100644
--- a/sw/source/core/uibase/inc/break.hxx
+++ b/sw/source/core/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_UI_INC_BREAK_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_BREAK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BREAK_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BREAK_HXX
#include <svx/stddlg.hxx>
diff --git a/sw/source/core/uibase/inc/caption.hxx b/sw/source/core/uibase/inc/caption.hxx
index 5f91f6f24fae..80301ccfe90e 100644
--- a/sw/source/core/uibase/inc/caption.hxx
+++ b/sw/source/core/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_UI_INC_CAPTION_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_CAPTION_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CAPTION_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CAPTION_HXX
#include <rtl/ustring.hxx>
#include <tools/globname.hxx>
diff --git a/sw/source/core/uibase/inc/cfgid.h b/sw/source/core/uibase/inc/cfgid.h
index 20f652978fe1..d8a7fad011fe 100644
--- a/sw/source/core/uibase/inc/cfgid.h
+++ b/sw/source/core/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_UI_INC_CFGID_H
-#define INCLUDED_SW_SOURCE_UI_INC_CFGID_H
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CFGID_H
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CFGID_H
#include <sfx2/sfx.hrc>
diff --git a/sw/source/core/uibase/inc/cfgitems.hxx b/sw/source/core/uibase/inc/cfgitems.hxx
index 871252854288..7cf968d7950c 100644
--- a/sw/source/core/uibase/inc/cfgitems.hxx
+++ b/sw/source/core/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_UI_INC_CFGITEMS_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_CFGITEMS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CFGITEMS_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CFGITEMS_HXX
#include <tools/color.hxx>
#include <svl/poolitem.hxx>
diff --git a/sw/source/core/uibase/inc/changedb.hxx b/sw/source/core/uibase/inc/changedb.hxx
index a3349845e489..f85ec62fe270 100644
--- a/sw/source/core/uibase/inc/changedb.hxx
+++ b/sw/source/core/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_UI_INC_CHANGEDB_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_CHANGEDB_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHANGEDB_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHANGEDB_HXX
#include <vcl/bitmap.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/core/uibase/inc/chartins.hxx b/sw/source/core/uibase/inc/chartins.hxx
index 848653cf45f0..5f5ea628b834 100644
--- a/sw/source/core/uibase/inc/chartins.hxx
+++ b/sw/source/core/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_UI_INC_CHARTINS_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_CHARTINS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHARTINS_HXX
+#define INCLUDED_SW_SOURCE_CORE_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_UI_INC_CHARTINS_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHARTINS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/chldwrap.hxx b/sw/source/core/uibase/inc/chldwrap.hxx
index 41f771acc2f9..92484a44ec1d 100644
--- a/sw/source/core/uibase/inc/chldwrap.hxx
+++ b/sw/source/core/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_UI_INC_CHLDWRAP_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_CHLDWRAP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHLDWRAP_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHLDWRAP_HXX
#include <sfx2/childwin.hxx>
#include <vcl/timer.hxx>
diff --git a/sw/source/core/uibase/inc/chrdlg.hxx b/sw/source/core/uibase/inc/chrdlg.hxx
index 1de8e46050b6..b84b7209c51d 100644
--- a/sw/source/core/uibase/inc/chrdlg.hxx
+++ b/sw/source/core/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_UI_INC_CHRDLG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_CHRDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHRDLG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHRDLG_HXX
#include <sfx2/tabdlg.hxx>
#include <vcl/group.hxx>
diff --git a/sw/source/core/uibase/inc/chrdlgmodes.hxx b/sw/source/core/uibase/inc/chrdlgmodes.hxx
index bc7d6a2be8d0..d11d98addb1e 100644
--- a/sw/source/core/uibase/inc/chrdlgmodes.hxx
+++ b/sw/source/core/uibase/inc/chrdlgmodes.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_CHRDLGMODES_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_CHRDLGMODES_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHRDLGMODES_HXX
+#define INCLUDED_SW_SOURCE_CORE_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_UI_INC_CHRDLGMODES_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHRDLGMODES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/cnttab.hxx b/sw/source/core/uibase/inc/cnttab.hxx
index a1a6fae550a3..b9bade6a16f9 100644
--- a/sw/source/core/uibase/inc/cnttab.hxx
+++ b/sw/source/core/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_UI_INC_CNTTAB_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_CNTTAB_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CNTTAB_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CNTTAB_HXX
#include <svx/stddlg.hxx>
diff --git a/sw/source/core/uibase/inc/colex.hxx b/sw/source/core/uibase/inc/colex.hxx
index 634bfcf282f0..fe4d569e54e2 100644
--- a/sw/source/core/uibase/inc/colex.hxx
+++ b/sw/source/core/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_UI_INC_COLEX_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_COLEX_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_COLEX_HXX
+#define INCLUDED_SW_SOURCE_CORE_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_UI_INC_COLEX_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_COLEX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/colmgr.hxx b/sw/source/core/uibase/inc/colmgr.hxx
index b3f73001005a..b746438fed11 100644
--- a/sw/source/core/uibase/inc/colmgr.hxx
+++ b/sw/source/core/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_UI_INC_COLMGR_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_COLMGR_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_COLMGR_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_COLMGR_HXX
#include "swdllapi.h"
#include <fmtclds.hxx>
diff --git a/sw/source/core/uibase/inc/column.hxx b/sw/source/core/uibase/inc/column.hxx
index 9102eb102152..42d26138d4bd 100644
--- a/sw/source/core/uibase/inc/column.hxx
+++ b/sw/source/core/uibase/inc/column.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_COLUMN_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_COLUMN_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_COLUMN_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_COLUMN_HXX
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
diff --git a/sw/source/core/uibase/inc/conarc.hxx b/sw/source/core/uibase/inc/conarc.hxx
index 62ec96a421ea..675ec799040e 100644
--- a/sw/source/core/uibase/inc/conarc.hxx
+++ b/sw/source/core/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_UI_INC_CONARC_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_CONARC_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONARC_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONARC_HXX
#include "drawbase.hxx"
@@ -43,6 +43,6 @@ public:
virtual void Deactivate() SAL_OVERRIDE;
};
-#endif // INCLUDED_SW_SOURCE_UI_INC_CONARC_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONARC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/concustomshape.hxx b/sw/source/core/uibase/inc/concustomshape.hxx
index 8e38ff85caa3..c3aca8af5732 100644
--- a/sw/source/core/uibase/inc/concustomshape.hxx
+++ b/sw/source/core/uibase/inc/concustomshape.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_CONCUSTOMSHAPE_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_CONCUSTOMSHAPE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONCUSTOMSHAPE_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONCUSTOMSHAPE_HXX
#include <rtl/ustring.hxx>
#include "drawbase.hxx"
@@ -58,6 +58,6 @@ class ConstCustomShape : public SwDrawBase
virtual bool doConstructOrthogonal() const SAL_OVERRIDE;
};
-#endif // INCLUDED_SW_SOURCE_UI_INC_CONCUSTOMSHAPE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONCUSTOMSHAPE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/condedit.hxx b/sw/source/core/uibase/inc/condedit.hxx
index 0a9d386c104f..f82c87eab591 100644
--- a/sw/source/core/uibase/inc/condedit.hxx
+++ b/sw/source/core/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_UI_INC_CONDEDIT_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_CONDEDIT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONDEDIT_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONDEDIT_HXX
#include <vcl/edit.hxx>
#include <svtools/transfer.hxx>
diff --git a/sw/source/core/uibase/inc/conform.hxx b/sw/source/core/uibase/inc/conform.hxx
index 5fb041d0fa94..57541fd0b42a 100644
--- a/sw/source/core/uibase/inc/conform.hxx
+++ b/sw/source/core/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_UI_INC_CONFORM_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_CONFORM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONFORM_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONFORM_HXX
#include "drawbase.hxx"
diff --git a/sw/source/core/uibase/inc/conpoly.hxx b/sw/source/core/uibase/inc/conpoly.hxx
index 2df2d7eaeba0..2feae238d148 100644
--- a/sw/source/core/uibase/inc/conpoly.hxx
+++ b/sw/source/core/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_UI_INC_CONPOLY_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_CONPOLY_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONPOLY_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONPOLY_HXX
#include "drawbase.hxx"
@@ -42,6 +42,6 @@ public:
virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function
};
-#endif // INCLUDED_SW_SOURCE_UI_INC_CONPOLY_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONPOLY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/conrect.hxx b/sw/source/core/uibase/inc/conrect.hxx
index 3539a63099e3..02436fe1af37 100644
--- a/sw/source/core/uibase/inc/conrect.hxx
+++ b/sw/source/core/uibase/inc/conrect.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_CONRECT_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_CONRECT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONRECT_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONRECT_HXX
#include "drawbase.hxx"
@@ -46,6 +46,6 @@ class ConstRectangle : public SwDrawBase
virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function
};
-#endif // INCLUDED_SW_SOURCE_UI_INC_CONRECT_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONRECT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/content.hxx b/sw/source/core/uibase/inc/content.hxx
index 3c0bb07628ee..d5959f2901c4 100644
--- a/sw/source/core/uibase/inc/content.hxx
+++ b/sw/source/core/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_UI_INC_CONTENT_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_CONTENT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONTENT_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONTENT_HXX
#include <limits.h>
#include "swcont.hxx"
diff --git a/sw/source/core/uibase/inc/conttree.hxx b/sw/source/core/uibase/inc/conttree.hxx
index 62355243cb79..10e533d74280 100644
--- a/sw/source/core/uibase/inc/conttree.hxx
+++ b/sw/source/core/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_UI_INC_CONTTREE_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_CONTTREE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONTTREE_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONTTREE_HXX
#include <svtools/treelistbox.hxx>
#include <svtools/svlbitm.hxx>
diff --git a/sw/source/core/uibase/inc/convert.hxx b/sw/source/core/uibase/inc/convert.hxx
index ca5ec06e1f50..b03d9c637c6a 100644
--- a/sw/source/core/uibase/inc/convert.hxx
+++ b/sw/source/core/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_UI_INC_CONVERT_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_CONVERT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONVERT_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONVERT_HXX
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/core/uibase/inc/cption.hxx b/sw/source/core/uibase/inc/cption.hxx
index 0322b7b7e30c..4d96cda1113f 100644
--- a/sw/source/core/uibase/inc/cption.hxx
+++ b/sw/source/core/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_UI_INC_CPTION_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_CPTION_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CPTION_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CPTION_HXX
#include <svx/stddlg.hxx>
diff --git a/sw/source/core/uibase/inc/dbconfig.hxx b/sw/source/core/uibase/inc/dbconfig.hxx
index d569b26d1d20..f3e2b43ae59f 100644
--- a/sw/source/core/uibase/inc/dbconfig.hxx
+++ b/sw/source/core/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_UI_INC_DBCONFIG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_DBCONFIG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBCONFIG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBCONFIG_HXX
#include <unotools/configitem.hxx>
#include "swdllapi.h"
diff --git a/sw/source/core/uibase/inc/dbinsdlg.hxx b/sw/source/core/uibase/inc/dbinsdlg.hxx
index 60ad6d86186c..7b8848798c8e 100644
--- a/sw/source/core/uibase/inc/dbinsdlg.hxx
+++ b/sw/source/core/uibase/inc/dbinsdlg.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_DBINSDLG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_DBINSDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBINSDLG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBINSDLG_HXX
#include <vcl/button.hxx>
#include <vcl/group.hxx>
diff --git a/sw/source/core/uibase/inc/dbtree.hxx b/sw/source/core/uibase/inc/dbtree.hxx
index e94b1d22512c..e1504aa7263b 100644
--- a/sw/source/core/uibase/inc/dbtree.hxx
+++ b/sw/source/core/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_UI_INC_DBTREE_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_DBTREE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBTREE_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBTREE_HXX
#include <svtools/treelistbox.hxx>
#include <com/sun/star/uno/Reference.h>
diff --git a/sw/source/core/uibase/inc/dbui.hxx b/sw/source/core/uibase/inc/dbui.hxx
index 7105b2ec0199..1dbbccdb2c43 100644
--- a/sw/source/core/uibase/inc/dbui.hxx
+++ b/sw/source/core/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_UI_INC_DBUI_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_DBUI_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBUI_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBUI_HXX
#include <svx/stddlg.hxx>
diff --git a/sw/source/core/uibase/inc/dialmgr.hxx b/sw/source/core/uibase/inc/dialmgr.hxx
index 468b90402f9b..58e35543e3ac 100644
--- a/sw/source/core/uibase/inc/dialmgr.hxx
+++ b/sw/source/core/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_UI_INC_DIALMGR_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_DIALMGR_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DIALMGR_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DIALMGR_HXX
#include <tools/resid.hxx>
diff --git a/sw/source/core/uibase/inc/docfnote.hxx b/sw/source/core/uibase/inc/docfnote.hxx
index b9d2dac9318b..f084ada5f441 100644
--- a/sw/source/core/uibase/inc/docfnote.hxx
+++ b/sw/source/core/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_UI_INC_DOCFNOTE_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_DOCFNOTE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DOCFNOTE_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DOCFNOTE_HXX
#include <sfx2/tabdlg.hxx>
diff --git a/sw/source/core/uibase/inc/docstdlg.hxx b/sw/source/core/uibase/inc/docstdlg.hxx
index c6c973db3e31..8b51f9028c5c 100644
--- a/sw/source/core/uibase/inc/docstdlg.hxx
+++ b/sw/source/core/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_UI_INC_DOCSTDLG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_DOCSTDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DOCSTDLG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DOCSTDLG_HXX
#include <sfx2/tabdlg.hxx>
diff --git a/sw/source/core/uibase/inc/drawbase.hxx b/sw/source/core/uibase/inc/drawbase.hxx
index 98c111dc2a6a..d71d234b55f1 100644
--- a/sw/source/core/uibase/inc/drawbase.hxx
+++ b/sw/source/core/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_UI_INC_DRAWBASE_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_DRAWBASE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRAWBASE_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRAWBASE_HXX
#include <tools/gen.hxx>
@@ -74,6 +74,6 @@ public:
virtual bool doConstructOrthogonal() const;
};
-#endif // INCLUDED_SW_SOURCE_UI_INC_DRAWBASE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRAWBASE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/drawsh.hxx b/sw/source/core/uibase/inc/drawsh.hxx
index 44eef8be2671..81af80841d8c 100644
--- a/sw/source/core/uibase/inc/drawsh.hxx
+++ b/sw/source/core/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_UI_INC_DRAWSH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_DRAWSH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRAWSH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRAWSH_HXX
#include "drwbassh.hxx"
diff --git a/sw/source/core/uibase/inc/drformsh.hxx b/sw/source/core/uibase/inc/drformsh.hxx
index 2cdcc11cd4a8..f810dbdf52d2 100644
--- a/sw/source/core/uibase/inc/drformsh.hxx
+++ b/sw/source/core/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_UI_INC_DRFORMSH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_DRFORMSH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRFORMSH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRFORMSH_HXX
#include "drwbassh.hxx"
diff --git a/sw/source/core/uibase/inc/drpcps.hxx b/sw/source/core/uibase/inc/drpcps.hxx
index 022b68605ce4..7b315276bb15 100644
--- a/sw/source/core/uibase/inc/drpcps.hxx
+++ b/sw/source/core/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_UI_INC_DRPCPS_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_DRPCPS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRPCPS_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRPCPS_HXX
#include <sfx2/basedlgs.hxx>
#include <sfx2/tabdlg.hxx>
diff --git a/sw/source/core/uibase/inc/drwbassh.hxx b/sw/source/core/uibase/inc/drwbassh.hxx
index 1c6406a5b5e6..3d27ed62d703 100644
--- a/sw/source/core/uibase/inc/drwbassh.hxx
+++ b/sw/source/core/uibase/inc/drwbassh.hxx
@@ -16,8 +16,9 @@
* 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_UI_INC_DRWBASSH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_DRWBASSH_HXX
+
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRWBASSH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRWBASSH_HXX
#include "basesh.hxx"
diff --git a/sw/source/core/uibase/inc/drwtxtsh.hxx b/sw/source/core/uibase/inc/drwtxtsh.hxx
index 9046db46d600..d8b6d007ca99 100644
--- a/sw/source/core/uibase/inc/drwtxtsh.hxx
+++ b/sw/source/core/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_UI_INC_DRWTXTSH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_DRWTXTSH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRWTXTSH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRWTXTSH_HXX
#include <sfx2/shell.hxx>
#include "shellid.hxx"
diff --git a/sw/source/core/uibase/inc/dselect.hxx b/sw/source/core/uibase/inc/dselect.hxx
index c087fa072bf8..15da1a1b4bbd 100644
--- a/sw/source/core/uibase/inc/dselect.hxx
+++ b/sw/source/core/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_UI_INC_DSELECT_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_DSELECT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DSELECT_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DSELECT_HXX
#include "drawbase.hxx"
@@ -38,6 +38,6 @@ class DrawSelection : public SwDrawBase
virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE; // activate function
};
-#endif // INCLUDED_SW_SOURCE_UI_INC_DSELECT_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DSELECT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/edtwin.hxx b/sw/source/core/uibase/inc/edtwin.hxx
index 152f4278e744..032764743f07 100644
--- a/sw/source/core/uibase/inc/edtwin.hxx
+++ b/sw/source/core/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_UI_INC_EDTWIN_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_EDTWIN_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_EDTWIN_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_EDTWIN_HXX
#include <FrameControlsManager.hxx>
diff --git a/sw/source/core/uibase/inc/envimg.hxx b/sw/source/core/uibase/inc/envimg.hxx
index 4707eb63a098..2225fc451f20 100644
--- a/sw/source/core/uibase/inc/envimg.hxx
+++ b/sw/source/core/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_UI_INC_ENVIMG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_ENVIMG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ENVIMG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ENVIMG_HXX
#include <svl/poolitem.hxx>
#include <unotools/configitem.hxx>
diff --git a/sw/source/core/uibase/inc/envlop.hxx b/sw/source/core/uibase/inc/envlop.hxx
index 5c21d03c5517..3bfe4c8eef05 100644
--- a/sw/source/core/uibase/inc/envlop.hxx
+++ b/sw/source/core/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_UI_INC_ENVLOP_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_ENVLOP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ENVLOP_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ENVLOP_HXX
#include <svtools/svmedit.hxx>
#include <sfx2/tabdlg.hxx>
diff --git a/sw/source/core/uibase/inc/fldedt.hxx b/sw/source/core/uibase/inc/fldedt.hxx
index c4ed3bfc93cc..254f9cf65324 100644
--- a/sw/source/core/uibase/inc/fldedt.hxx
+++ b/sw/source/core/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_UI_INC_FLDEDT_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_FLDEDT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDEDT_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDEDT_HXX
#include <sfx2/basedlgs.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/core/uibase/inc/fldmgr.hxx b/sw/source/core/uibase/inc/fldmgr.hxx
index 62c4210cae3a..2749f3dfc723 100644
--- a/sw/source/core/uibase/inc/fldmgr.hxx
+++ b/sw/source/core/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_UI_INC_FLDMGR_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_FLDMGR_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDMGR_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDMGR_HXX
#include "swdllapi.h"
#include "swtypes.hxx"
diff --git a/sw/source/core/uibase/inc/fldtdlg.hxx b/sw/source/core/uibase/inc/fldtdlg.hxx
index 1dabf5c2e83c..bac006bc237d 100644
--- a/sw/source/core/uibase/inc/fldtdlg.hxx
+++ b/sw/source/core/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_UI_INC_FLDTDLG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_FLDTDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDTDLG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDTDLG_HXX
#include <sfx2/tabdlg.hxx>
class SfxBindings;
diff --git a/sw/source/core/uibase/inc/fldwrap.hxx b/sw/source/core/uibase/inc/fldwrap.hxx
index 6c43c326e21c..1b73be2f7702 100644
--- a/sw/source/core/uibase/inc/fldwrap.hxx
+++ b/sw/source/core/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_UI_INC_FLDWRAP_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_FLDWRAP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDWRAP_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDWRAP_HXX
#include "chldwrap.hxx"
class AbstractSwFldDlg;
diff --git a/sw/source/core/uibase/inc/fontcfg.hxx b/sw/source/core/uibase/inc/fontcfg.hxx
index 22afd8362231..1730f82c01c4 100644
--- a/sw/source/core/uibase/inc/fontcfg.hxx
+++ b/sw/source/core/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_UI_INC_FONTCFG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_FONTCFG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FONTCFG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FONTCFG_HXX
#include <rtl/ustring.hxx>
#include <unotools/configitem.hxx>
diff --git a/sw/source/core/uibase/inc/formatclipboard.hxx b/sw/source/core/uibase/inc/formatclipboard.hxx
index 9d9335a32147..2d61a9968cac 100644
--- a/sw/source/core/uibase/inc/formatclipboard.hxx
+++ b/sw/source/core/uibase/inc/formatclipboard.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_FORMATCLIPBOARD_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_FORMATCLIPBOARD_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FORMATCLIPBOARD_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FORMATCLIPBOARD_HXX
// header for class SwWrtShell
#include <wrtsh.hxx>
diff --git a/sw/source/core/uibase/inc/formedt.hxx b/sw/source/core/uibase/inc/formedt.hxx
index f0b8d3a2f587..7a2c9686eb05 100644
--- a/sw/source/core/uibase/inc/formedt.hxx
+++ b/sw/source/core/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_UI_INC_FORMEDT_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_FORMEDT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FORMEDT_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FORMEDT_HXX
#include <svx/stddlg.hxx>
diff --git a/sw/source/core/uibase/inc/frmdlg.hxx b/sw/source/core/uibase/inc/frmdlg.hxx
index 6475f737d3e3..885140abf8f0 100644
--- a/sw/source/core/uibase/inc/frmdlg.hxx
+++ b/sw/source/core/uibase/inc/frmdlg.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_FRMDLG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_FRMDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMDLG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMDLG_HXX
#include "globals.hrc"
#include <sfx2/tabdlg.hxx>
@@ -65,6 +65,6 @@ public:
SwWrtShell* GetWrtShell() { return m_pWrtShell; }
};
-#endif // INCLUDED_SW_SOURCE_UI_INC_FRMDLG_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMDLG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/frmmgr.hxx b/sw/source/core/uibase/inc/frmmgr.hxx
index 8ff94053f2eb..97c6f8f64157 100644
--- a/sw/source/core/uibase/inc/frmmgr.hxx
+++ b/sw/source/core/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_UI_INC_FRMMGR_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_FRMMGR_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMMGR_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMMGR_HXX
#include "swtypes.hxx"
#include "frmatr.hxx"
diff --git a/sw/source/core/uibase/inc/frmpage.hxx b/sw/source/core/uibase/inc/frmpage.hxx
index 340b710549fd..09d1d930ab1a 100644
--- a/sw/source/core/uibase/inc/frmpage.hxx
+++ b/sw/source/core/uibase/inc/frmpage.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_FRMPAGE_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_FRMPAGE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMPAGE_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMPAGE_HXX
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
@@ -323,6 +323,6 @@ public:
};
-#endif // INCLUDED_SW_SOURCE_UI_INC_FRMPAGE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMPAGE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/frmsh.hxx b/sw/source/core/uibase/inc/frmsh.hxx
index 1e43a96d784b..0b8f7cb5ee9d 100644
--- a/sw/source/core/uibase/inc/frmsh.hxx
+++ b/sw/source/core/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_UI_INC_FRMSH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_FRMSH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMSH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMSH_HXX
#include "basesh.hxx"
diff --git a/sw/source/core/uibase/inc/globals.h b/sw/source/core/uibase/inc/globals.h
index 4da432350b6f..821eeea5d00e 100644
--- a/sw/source/core/uibase/inc/globals.h
+++ b/sw/source/core/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_UI_INC_GLOBALS_H
-#define INCLUDED_SW_SOURCE_UI_INC_GLOBALS_H
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOBALS_H
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOBALS_H
enum SwChangeState
{
diff --git a/sw/source/core/uibase/inc/glosbib.hxx b/sw/source/core/uibase/inc/glosbib.hxx
index 6f93a10bcdb2..11cb06507aa3 100644
--- a/sw/source/core/uibase/inc/glosbib.hxx
+++ b/sw/source/core/uibase/inc/glosbib.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_GLOSBIB_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_GLOSBIB_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSBIB_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSBIB_HXX
#include <vcl/edit.hxx>
#include <svx/stddlg.hxx>
diff --git a/sw/source/core/uibase/inc/glosdoc.hxx b/sw/source/core/uibase/inc/glosdoc.hxx
index e2fe6ab3d04f..64dbcf7cbb22 100644
--- a/sw/source/core/uibase/inc/glosdoc.hxx
+++ b/sw/source/core/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_UI_INC_GLOSDOC_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_GLOSDOC_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSDOC_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSDOC_HXX
#include <rtl/ustring.hxx>
#include <com/sun/star/text/XAutoTextGroup.hpp>
@@ -130,6 +130,6 @@ public:
std::vector<OUString> const& GetPathArray() const { return m_PathArr; }
};
-#endif // INCLUDED_SW_SOURCE_UI_INC_GLOSDOC_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSDOC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/gloshdl.hxx b/sw/source/core/uibase/inc/gloshdl.hxx
index 2d341fd80ec0..56e4e0d231cd 100644
--- a/sw/source/core/uibase/inc/gloshdl.hxx
+++ b/sw/source/core/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_UI_INC_GLOSHDL_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_GLOSHDL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSHDL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSHDL_HXX
#include <rtl/ustring.hxx>
#include "swdllapi.h"
@@ -99,6 +99,6 @@ public:
~SwGlossaryHdl();
};
-#endif // INCLUDED_SW_SOURCE_UI_INC_GLOSHDL_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSHDL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/gloslst.hxx b/sw/source/core/uibase/inc/gloslst.hxx
index 7ed767186344..c3b0bfa66f74 100644
--- a/sw/source/core/uibase/inc/gloslst.hxx
+++ b/sw/source/core/uibase/inc/gloslst.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_GLOSLST_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_GLOSLST_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSLST_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSLST_HXX
#include <rtl/ustring.hxx>
#include <tools/datetime.hxx>
diff --git a/sw/source/core/uibase/inc/glossary.hxx b/sw/source/core/uibase/inc/glossary.hxx
index d69e1760a449..c2dcdaa12546 100644
--- a/sw/source/core/uibase/inc/glossary.hxx
+++ b/sw/source/core/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_UI_INC_GLOSSARY_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_GLOSSARY_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSSARY_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSSARY_HXX
#include <vcl/edit.hxx>
#include <svtools/treelistbox.hxx>
diff --git a/sw/source/core/uibase/inc/glshell.hxx b/sw/source/core/uibase/inc/glshell.hxx
index e5e5e735790d..0d89f521c0e5 100644
--- a/sw/source/core/uibase/inc/glshell.hxx
+++ b/sw/source/core/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_UI_INC_GLSHELL_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_GLSHELL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLSHELL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLSHELL_HXX
#include "wdocsh.hxx"
class SwGlosDocShell : public SwDocShell
diff --git a/sw/source/core/uibase/inc/grfsh.hxx b/sw/source/core/uibase/inc/grfsh.hxx
index 3c341836f3bc..bfbdaed12689 100644
--- a/sw/source/core/uibase/inc/grfsh.hxx
+++ b/sw/source/core/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_UI_INC_GRFSH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_GRFSH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GRFSH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GRFSH_HXX
#include "frmsh.hxx"
diff --git a/sw/source/core/uibase/inc/hyp.hxx b/sw/source/core/uibase/inc/hyp.hxx
index f1dd08d1b81d..12d33e9ff2d7 100644
--- a/sw/source/core/uibase/inc/hyp.hxx
+++ b/sw/source/core/uibase/inc/hyp.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_HYP_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_HYP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_HYP_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_HYP_HXX
#include <tools/link.hxx>
#include <editeng/splwrap.hxx>
diff --git a/sw/source/core/uibase/inc/idxmrk.hxx b/sw/source/core/uibase/inc/idxmrk.hxx
index 597dee285a91..7518c5b4254b 100644
--- a/sw/source/core/uibase/inc/idxmrk.hxx
+++ b/sw/source/core/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_UI_INC_IDXMRK_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_IDXMRK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_IDXMRK_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_IDXMRK_HXX
#include <sfx2/childwin.hxx>
@@ -55,6 +55,6 @@ public:
void ReInitDlg(SwWrtShell& rWrtShell);
};
-#endif // INCLUDED_SW_SOURCE_UI_INC_IDXMRK_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_IDXMRK_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/imaildsplistener.hxx b/sw/source/core/uibase/inc/imaildsplistener.hxx
index 3631ef259434..a0ab9ba6d174 100644
--- a/sw/source/core/uibase/inc/imaildsplistener.hxx
+++ b/sw/source/core/uibase/inc/imaildsplistener.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_IMAILDSPLISTENER_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_IMAILDSPLISTENER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_IMAILDSPLISTENER_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_IMAILDSPLISTENER_HXX
#include <com/sun/star/mail/XMailMessage.hpp>
#include <salhelper/refobj.hxx>
diff --git a/sw/source/core/uibase/inc/initui.hxx b/sw/source/core/uibase/inc/initui.hxx
index 425a70398bbc..d917bff51ca3 100644
--- a/sw/source/core/uibase/inc/initui.hxx
+++ b/sw/source/core/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_UI_INC_INITUI_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_INITUI_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INITUI_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INITUI_HXX
#include <tools/solar.h>
#include "swdllapi.h"
diff --git a/sw/source/core/uibase/inc/inpdlg.hxx b/sw/source/core/uibase/inc/inpdlg.hxx
index 0b7458fbff03..0eaed5fd2e2c 100644
--- a/sw/source/core/uibase/inc/inpdlg.hxx
+++ b/sw/source/core/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_UI_INC_INPDLG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_INPDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INPDLG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INPDLG_HXX
#include <svx/stddlg.hxx>
diff --git a/sw/source/core/uibase/inc/inputwin.hxx b/sw/source/core/uibase/inc/inputwin.hxx
index 160d8046bd2b..dafacfb93c59 100644
--- a/sw/source/core/uibase/inc/inputwin.hxx
+++ b/sw/source/core/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_UI_INC_INPUTWIN_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_INPUTWIN_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INPUTWIN_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INPUTWIN_HXX
#include <vcl/edit.hxx>
#include <vcl/menu.hxx>
diff --git a/sw/source/core/uibase/inc/insfnote.hxx b/sw/source/core/uibase/inc/insfnote.hxx
index d32ae7965d0d..e72df2a03d75 100644
--- a/sw/source/core/uibase/inc/insfnote.hxx
+++ b/sw/source/core/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_UI_INC_INSFNOTE_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_INSFNOTE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INSFNOTE_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INSFNOTE_HXX
#include <svx/stddlg.hxx>
diff --git a/sw/source/core/uibase/inc/instable.hxx b/sw/source/core/uibase/inc/instable.hxx
index 98d64a8c2424..a5e4c120bda8 100644
--- a/sw/source/core/uibase/inc/instable.hxx
+++ b/sw/source/core/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_UI_INC_INSTABLE_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_INSTABLE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INSTABLE_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INSTABLE_HXX
#include <rtl/ustring.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/core/uibase/inc/javaedit.hxx b/sw/source/core/uibase/inc/javaedit.hxx
index 228c90f76936..f6127b1aedb9 100644
--- a/sw/source/core/uibase/inc/javaedit.hxx
+++ b/sw/source/core/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_UI_INC_JAVAEDIT_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_JAVAEDIT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_JAVAEDIT_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_JAVAEDIT_HXX
#include <svx/stddlg.hxx>
#include <vcl/fixed.hxx>
diff --git a/sw/source/core/uibase/inc/label.hxx b/sw/source/core/uibase/inc/label.hxx
index a1505af8fbb4..7934bfabdcdf 100644
--- a/sw/source/core/uibase/inc/label.hxx
+++ b/sw/source/core/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_UI_INC_LABEL_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_LABEL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LABEL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LABEL_HXX
#include <sfx2/tabdlg.hxx>
#include <com/sun/star/frame/XModel.hpp>
diff --git a/sw/source/core/uibase/inc/labelcfg.hxx b/sw/source/core/uibase/inc/labelcfg.hxx
index 2188db5c636e..a816a01c1c2c 100644
--- a/sw/source/core/uibase/inc/labelcfg.hxx
+++ b/sw/source/core/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_UI_INC_LABELCFG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_LABELCFG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LABELCFG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LABELCFG_HXX
#include <unotools/configitem.hxx>
#include "swdllapi.h"
diff --git a/sw/source/core/uibase/inc/labimg.hxx b/sw/source/core/uibase/inc/labimg.hxx
index 69fe4a3db911..ac11a2bfb211 100644
--- a/sw/source/core/uibase/inc/labimg.hxx
+++ b/sw/source/core/uibase/inc/labimg.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_LABIMG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_LABIMG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LABIMG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LABIMG_HXX
#include <svl/poolitem.hxx>
#include <unotools/configitem.hxx>
diff --git a/sw/source/core/uibase/inc/langhelper.hxx b/sw/source/core/uibase/inc/langhelper.hxx
index c771c0040c2f..668d27d2392b 100644
--- a/sw/source/core/uibase/inc/langhelper.hxx
+++ b/sw/source/core/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_UI_INC_LANGHELPER_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_LANGHELPER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LANGHELPER_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LANGHELPER_HXX
class SwWrtShell;
class SwView;
diff --git a/sw/source/core/uibase/inc/linenum.hxx b/sw/source/core/uibase/inc/linenum.hxx
index 48d2af666a8e..d6ac4d4e0725 100644
--- a/sw/source/core/uibase/inc/linenum.hxx
+++ b/sw/source/core/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_UI_INC_LINENUM_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_LINENUM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LINENUM_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LINENUM_HXX
#include <sfx2/basedlgs.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/core/uibase/inc/listsh.hxx b/sw/source/core/uibase/inc/listsh.hxx
index 9efeee35d981..7230a75abedd 100644
--- a/sw/source/core/uibase/inc/listsh.hxx
+++ b/sw/source/core/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_UI_INC_LISTSH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_LISTSH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LISTSH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LISTSH_HXX
#include "basesh.hxx"
diff --git a/sw/source/core/uibase/inc/macassgn.hxx b/sw/source/core/uibase/inc/macassgn.hxx
index cb4cda8e0391..92f34911f2c4 100644
--- a/sw/source/core/uibase/inc/macassgn.hxx
+++ b/sw/source/core/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_UI_INC_MACASSGN_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_MACASSGN_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MACASSGN_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MACASSGN_HXX
#include <sfx2/evntconf.hxx>
diff --git a/sw/source/core/uibase/inc/mailconfigpage.hxx b/sw/source/core/uibase/inc/mailconfigpage.hxx
index 4314e25c2086..2aad6d202ab0 100644
--- a/sw/source/core/uibase/inc/mailconfigpage.hxx
+++ b/sw/source/core/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_UI_INC_MAILCONFIGPAGE_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_MAILCONFIGPAGE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILCONFIGPAGE_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILCONFIGPAGE_HXX
#include <sfx2/tabdlg.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/core/uibase/inc/maildispatcher.hxx b/sw/source/core/uibase/inc/maildispatcher.hxx
index 59732d673eb6..0c3b821c8993 100644
--- a/sw/source/core/uibase/inc/maildispatcher.hxx
+++ b/sw/source/core/uibase/inc/maildispatcher.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_MAILDISPATCHER_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_MAILDISPATCHER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILDISPATCHER_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILDISPATCHER_HXX
#include <com/sun/star/mail/XSmtpService.hpp>
#include <com/sun/star/mail/XMailMessage.hpp>
@@ -149,6 +149,6 @@ private:
bool shutdown_requested_;
};
-#endif // INCLUDED_SW_SOURCE_UI_INC_MAILDISPATCHER_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILDISPATCHER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/mailmergechildwindow.hxx b/sw/source/core/uibase/inc/mailmergechildwindow.hxx
index a4164ec9a78e..8ceea7cc9dc1 100644
--- a/sw/source/core/uibase/inc/mailmergechildwindow.hxx
+++ b/sw/source/core/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_UI_INC_MAILMERGECHILDWINDOW_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_MAILMERGECHILDWINDOW_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMERGECHILDWINDOW_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMERGECHILDWINDOW_HXX
#include <sfx2/childwin.hxx>
#include <sfx2/basedlgs.hxx>
#include <vcl/toolbox.hxx>
diff --git a/sw/source/core/uibase/inc/mailmergehelper.hxx b/sw/source/core/uibase/inc/mailmergehelper.hxx
index 85f378ce162c..df4dc4b534d2 100644
--- a/sw/source/core/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/core/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_UI_INC_MAILMERGEHELPER_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_MAILMERGEHELPER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMERGEHELPER_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMERGEHELPER_HXX
#include <svtools/stdctrl.hxx>
#include <unotools/configitem.hxx>
diff --git a/sw/source/core/uibase/inc/mailmergewizard.hxx b/sw/source/core/uibase/inc/mailmergewizard.hxx
index f3f35e680032..ab18a558eab1 100644
--- a/sw/source/core/uibase/inc/mailmergewizard.hxx
+++ b/sw/source/core/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_UI_INC_MAILMERGEWIZARD_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_MAILMERGEWIZARD_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMERGEWIZARD_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMERGEWIZARD_HXX
#include <svtools/roadmapwizard.hxx>
#include <rtl/ustring.hxx>
diff --git a/sw/source/core/uibase/inc/mailmrge.hxx b/sw/source/core/uibase/inc/mailmrge.hxx
index 54cdd694af39..e61e3bc386cc 100644
--- a/sw/source/core/uibase/inc/mailmrge.hxx
+++ b/sw/source/core/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_UI_INC_MAILMRGE_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_MAILMRGE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMRGE_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMRGE_HXX
#include <svx/stddlg.hxx>
diff --git a/sw/source/core/uibase/inc/mediash.hxx b/sw/source/core/uibase/inc/mediash.hxx
index a197cdc08279..f6796bd3c1bb 100644
--- a/sw/source/core/uibase/inc/mediash.hxx
+++ b/sw/source/core/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_UI_INC_MEDIASH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_MEDIASH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MEDIASH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MEDIASH_HXX
#include "frmsh.hxx"
diff --git a/sw/source/core/uibase/inc/mergetbl.hxx b/sw/source/core/uibase/inc/mergetbl.hxx
index ffb8568e3450..8048a0583767 100644
--- a/sw/source/core/uibase/inc/mergetbl.hxx
+++ b/sw/source/core/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_UI_INC_MERGETBL_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_MERGETBL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MERGETBL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MERGETBL_HXX
#include <vcl/button.hxx>
diff --git a/sw/source/core/uibase/inc/mmconfigitem.hxx b/sw/source/core/uibase/inc/mmconfigitem.hxx
index 8880cf610bd1..92bcee55d550 100644
--- a/sw/source/core/uibase/inc/mmconfigitem.hxx
+++ b/sw/source/core/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_UI_INC_MMCONFIGITEM_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_MMCONFIGITEM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MMCONFIGITEM_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MMCONFIGITEM_HXX
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Reference.hxx>
diff --git a/sw/source/core/uibase/inc/multmrk.hxx b/sw/source/core/uibase/inc/multmrk.hxx
index 5c83558d279e..ca918c9d855c 100644
--- a/sw/source/core/uibase/inc/multmrk.hxx
+++ b/sw/source/core/uibase/inc/multmrk.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_MULTMRK_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_MULTMRK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MULTMRK_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MULTMRK_HXX
#include <svx/stddlg.hxx>
#include <vcl/fixed.hxx>
@@ -48,6 +48,6 @@ public:
virtual ~SwMultiTOXMarkDlg();
};
-#endif // INCLUDED_SW_SOURCE_UI_INC_MULTMRK_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MULTMRK_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/navicfg.hxx b/sw/source/core/uibase/inc/navicfg.hxx
index b3c7e1a4170a..69b93c213ad6 100644
--- a/sw/source/core/uibase/inc/navicfg.hxx
+++ b/sw/source/core/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_UI_INC_NAVICFG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_NAVICFG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVICFG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVICFG_HXX
#include <unotools/configitem.hxx>
diff --git a/sw/source/core/uibase/inc/navicont.hxx b/sw/source/core/uibase/inc/navicont.hxx
index d04035ab1a72..19a86d72eb1f 100644
--- a/sw/source/core/uibase/inc/navicont.hxx
+++ b/sw/source/core/uibase/inc/navicont.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_NAVICONT_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_NAVICONT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVICONT_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVICONT_HXX
#include <rtl/ustring.hxx>
diff --git a/sw/source/core/uibase/inc/navipi.hxx b/sw/source/core/uibase/inc/navipi.hxx
index ca8af7921cb7..fa6ce3a54a2f 100644
--- a/sw/source/core/uibase/inc/navipi.hxx
+++ b/sw/source/core/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_UI_INC_NAVIPI_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_NAVIPI_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVIPI_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVIPI_HXX
// INCLUDE ---------------------------------------------------------------
diff --git a/sw/source/core/uibase/inc/navmgr.hxx b/sw/source/core/uibase/inc/navmgr.hxx
index 0ef4af93a1f6..addb172cc4c5 100644
--- a/sw/source/core/uibase/inc/navmgr.hxx
+++ b/sw/source/core/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_UI_INC_NAVMGR_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_NAVMGR_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVMGR_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVMGR_HXX
#include <vector>
diff --git a/sw/source/core/uibase/inc/navsh.hxx b/sw/source/core/uibase/inc/navsh.hxx
index 3c103e98b982..604f370b63d1 100644
--- a/sw/source/core/uibase/inc/navsh.hxx
+++ b/sw/source/core/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_UI_INC_NAVSH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_NAVSH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVSH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVSH_HXX
#include "frmsh.hxx"
diff --git a/sw/source/core/uibase/inc/num.hxx b/sw/source/core/uibase/inc/num.hxx
index fd155f4787c6..0e8ef3c93ce5 100644
--- a/sw/source/core/uibase/inc/num.hxx
+++ b/sw/source/core/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_UI_INC_NUM_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_NUM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUM_HXX
+#define INCLUDED_SW_SOURCE_CORE_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_UI_INC_NUM_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/numberingtypelistbox.hxx b/sw/source/core/uibase/inc/numberingtypelistbox.hxx
index cad1c886b297..5883148880db 100644
--- a/sw/source/core/uibase/inc/numberingtypelistbox.hxx
+++ b/sw/source/core/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_UI_INC_NUMBERINGTYPELISTBOX_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_NUMBERINGTYPELISTBOX_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMBERINGTYPELISTBOX_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMBERINGTYPELISTBOX_HXX
#include <vcl/lstbox.hxx>
#include "swdllapi.h"
diff --git a/sw/source/core/uibase/inc/numfmtlb.hxx b/sw/source/core/uibase/inc/numfmtlb.hxx
index be1e284b2980..3838f57e284c 100644
--- a/sw/source/core/uibase/inc/numfmtlb.hxx
+++ b/sw/source/core/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_UI_INC_NUMFMTLB_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_NUMFMTLB_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMFMTLB_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMFMTLB_HXX
#include <vcl/lstbox.hxx>
#include <svl/zforlist.hxx>
diff --git a/sw/source/core/uibase/inc/numpara.hxx b/sw/source/core/uibase/inc/numpara.hxx
index 1a6391633a41..37b267373c02 100644
--- a/sw/source/core/uibase/inc/numpara.hxx
+++ b/sw/source/core/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_UI_INC_NUMPARA_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_NUMPARA_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMPARA_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMPARA_HXX
#include <sfx2/tabdlg.hxx>
#include <vcl/lstbox.hxx>
diff --git a/sw/source/core/uibase/inc/numprevw.hxx b/sw/source/core/uibase/inc/numprevw.hxx
index 16d42306b9ef..d496bb387a3f 100644
--- a/sw/source/core/uibase/inc/numprevw.hxx
+++ b/sw/source/core/uibase/inc/numprevw.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_NUMPREVW_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_NUMPREVW_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMPREVW_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMPREVW_HXX
#include <vcl/window.hxx>
diff --git a/sw/source/core/uibase/inc/olesh.hxx b/sw/source/core/uibase/inc/olesh.hxx
index 15c8a2175198..04e30538803a 100644
--- a/sw/source/core/uibase/inc/olesh.hxx
+++ b/sw/source/core/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_UI_INC_OLESH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_OLESH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OLESH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OLESH_HXX
#include "frmsh.hxx"
diff --git a/sw/source/core/uibase/inc/olmenu.hxx b/sw/source/core/uibase/inc/olmenu.hxx
index 288413d5d746..f85b9febd0b3 100644
--- a/sw/source/core/uibase/inc/olmenu.hxx
+++ b/sw/source/core/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_UI_INC_OLMENU_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_OLMENU_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OLMENU_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OLMENU_HXX
#include <com/sun/star/linguistic2/XDictionary.hpp>
#include <com/sun/star/linguistic2/XSpellAlternatives.hpp>
diff --git a/sw/source/core/uibase/inc/optcomp.hxx b/sw/source/core/uibase/inc/optcomp.hxx
index 3f4204d1fb63..c974aa179dc1 100644
--- a/sw/source/core/uibase/inc/optcomp.hxx
+++ b/sw/source/core/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_UI_INC_OPTCOMP_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_OPTCOMP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OPTCOMP_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OPTCOMP_HXX
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
diff --git a/sw/source/core/uibase/inc/optload.hxx b/sw/source/core/uibase/inc/optload.hxx
index 99ecd4b0bb9d..015999942276 100644
--- a/sw/source/core/uibase/inc/optload.hxx
+++ b/sw/source/core/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_UI_INC_OPTLOAD_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_OPTLOAD_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OPTLOAD_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OPTLOAD_HXX
#include <sfx2/tabdlg.hxx>
diff --git a/sw/source/core/uibase/inc/optpage.hxx b/sw/source/core/uibase/inc/optpage.hxx
index 5e20bf405f91..00d273e3a65a 100644
--- a/sw/source/core/uibase/inc/optpage.hxx
+++ b/sw/source/core/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_UI_INC_OPTPAGE_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_OPTPAGE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OPTPAGE_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OPTPAGE_HXX
#include <sfx2/tabdlg.hxx>
#include <vcl/group.hxx>
diff --git a/sw/source/core/uibase/inc/outline.hxx b/sw/source/core/uibase/inc/outline.hxx
index ecc249976ee4..ef296383020b 100644
--- a/sw/source/core/uibase/inc/outline.hxx
+++ b/sw/source/core/uibase/inc/outline.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_UI_INC_OUTLINE_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_OUTLINE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OUTLINE_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OUTLINE_HXX
#include <sfx2/tabdlg.hxx>
diff --git a/sw/source/core/uibase/inc/pardlg.hxx b/sw/source/core/uibase/inc/pardlg.hxx
index d896350cbb85..60869db0663e 100644
--- a/sw/source/core/uibase/inc/pardlg.hxx
+++ b/sw/source/core/uibase/inc/pardlg.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_UI_INC_PARDLG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_PARDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PARDLG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PARDLG_HXX
#include <sfx2/tabdlg.hxx>
diff --git a/sw/source/core/uibase/inc/pattern.hxx b/sw/source/core/uibase/inc/pattern.hxx
index 386952247924..85cba67eab1f 100644
--- a/sw/source/core/uibase/inc/pattern.hxx
+++ b/sw/source/core/uibase/inc/pattern.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_PATTERN_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_PATTERN_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PATTERN_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PATTERN_HXX
#include <sfx2/basedlgs.hxx>
diff --git a/sw/source/core/uibase/inc/pgfnote.hxx b/sw/source/core/uibase/inc/pgfnote.hxx
index fc1261fe881f..cfcd6b13136b 100644
--- a/sw/source/core/uibase/inc/pgfnote.hxx
+++ b/sw/source/core/uibase/inc/pgfnote.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_UI_INC_PGFNOTE_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_PGFNOTE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PGFNOTE_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PGFNOTE_HXX
#include <sfx2/tabdlg.hxx>
diff --git a/sw/source/core/uibase/inc/pggrid.hxx b/sw/source/core/uibase/inc/pggrid.hxx
index d4488925711e..9d98db0f6c03 100644
--- a/sw/source/core/uibase/inc/pggrid.hxx
+++ b/sw/source/core/uibase/inc/pggrid.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_UI_INC_PGGRID_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_PGGRID_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PGGRID_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PGGRID_HXX
#include <sfx2/tabdlg.hxx>
#include <colex.hxx>
diff --git a/sw/source/core/uibase/inc/popbox.hxx b/sw/source/core/uibase/inc/popbox.hxx
index 50c5d0a5f0c8..aad89638e3c7 100644
--- a/sw/source/core/uibase/inc/popbox.hxx
+++ b/sw/source/core/uibase/inc/popbox.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_UI_INC_POPBOX_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_POPBOX_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_POPBOX_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_POPBOX_HXX
#include <vcl/toolbox.hxx>
#include <svtools/transfer.hxx>
diff --git a/sw/source/core/uibase/inc/prcntfld.hxx b/sw/source/core/uibase/inc/prcntfld.hxx
index 5e9422c03082..fe1d654315a1 100644
--- a/sw/source/core/uibase/inc/prcntfld.hxx
+++ b/sw/source/core/uibase/inc/prcntfld.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_UI_INC_PRCNTFLD_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_PRCNTFLD_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PRCNTFLD_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PRCNTFLD_HXX
#include <vcl/field.hxx>
#include "swdllapi.h"
@@ -106,6 +106,6 @@ public:
bool IsAutoCalculationLocked() const {return bLockAutoCalculation;}
};
-#endif // INCLUDED_SW_SOURCE_UI_INC_PRCNTFLD_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PRCNTFLD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/pview.hxx b/sw/source/core/uibase/inc/pview.hxx
index 4db7139ce45b..182374102de0 100644
--- a/sw/source/core/uibase/inc/pview.hxx
+++ b/sw/source/core/uibase/inc/pview.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_UI_INC_PVIEW_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_PVIEW_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PVIEW_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PVIEW_HXX
#include <tools/link.hxx>
#include <vcl/window.hxx>
diff --git a/sw/source/core/uibase/inc/redlndlg.hxx b/sw/source/core/uibase/inc/redlndlg.hxx
index 3a3b3265bb0f..c93b05ef5add 100644
--- a/sw/source/core/uibase/inc/redlndlg.hxx
+++ b/sw/source/core/uibase/inc/redlndlg.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_UI_INC_REDLNDLG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_REDLNDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_REDLNDLG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_REDLNDLG_HXX
#include "swdllapi.h"
#include "chldwrap.hxx"
#include <redline.hxx>
diff --git a/sw/source/core/uibase/inc/regionsw.hxx b/sw/source/core/uibase/inc/regionsw.hxx
index 1101bfb8fe15..3f7e3cb72931 100644
--- a/sw/source/core/uibase/inc/regionsw.hxx
+++ b/sw/source/core/uibase/inc/regionsw.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_UI_INC_REGIONSW_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_REGIONSW_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_REGIONSW_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_REGIONSW_HXX
#include <hintids.hxx>
#include <vcl/field.hxx>
diff --git a/sw/source/core/uibase/inc/rowht.hxx b/sw/source/core/uibase/inc/rowht.hxx
index aaaeeb3a9e56..2f4edc8442fb 100644
--- a/sw/source/core/uibase/inc/rowht.hxx
+++ b/sw/source/core/uibase/inc/rowht.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_UI_INC_ROWHT_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_ROWHT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ROWHT_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ROWHT_HXX
#include <svx/stddlg.hxx>
#include <vcl/field.hxx>
diff --git a/sw/source/core/uibase/inc/scroll.hxx b/sw/source/core/uibase/inc/scroll.hxx
index eb6dfcb057a3..44c4408d897c 100644
--- a/sw/source/core/uibase/inc/scroll.hxx
+++ b/sw/source/core/uibase/inc/scroll.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_UI_INC_SCROLL_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SCROLL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SCROLL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SCROLL_HXX
#include <vcl/scrbar.hxx>
class SwScrollbar: public ScrollBar
diff --git a/sw/source/core/uibase/inc/selglos.hxx b/sw/source/core/uibase/inc/selglos.hxx
index 01ade9355c4b..db698ea5725d 100644
--- a/sw/source/core/uibase/inc/selglos.hxx
+++ b/sw/source/core/uibase/inc/selglos.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_UI_INC_SELGLOS_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SELGLOS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SELGLOS_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SELGLOS_HXX
#include <vcl/dialog.hxx>
diff --git a/sw/source/core/uibase/inc/sharedconnection.hxx b/sw/source/core/uibase/inc/sharedconnection.hxx
index cf279b6e50b3..01694e0e84b6 100644
--- a/sw/source/core/uibase/inc/sharedconnection.hxx
+++ b/sw/source/core/uibase/inc/sharedconnection.hxx
@@ -17,14 +17,14 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_SHAREDCONNECTION_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SHAREDCONNECTION_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SHAREDCONNECTION_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SHAREDCONNECTION_HXX
#include <unotools/sharedunocomponent.hxx>
#include <com/sun/star/sdbc/XConnection.hpp>
typedef ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XConnection > SharedConnection;
-#endif // INCLUDED_SW_SOURCE_UI_INC_SHAREDCONNECTION_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SHAREDCONNECTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/shdwcrsr.hxx b/sw/source/core/uibase/inc/shdwcrsr.hxx
index 5fb1d9684162..35fcd95629d8 100644
--- a/sw/source/core/uibase/inc/shdwcrsr.hxx
+++ b/sw/source/core/uibase/inc/shdwcrsr.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_UI_INC_SHDWCRSR_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SHDWCRSR_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SHDWCRSR_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SHDWCRSR_HXX
#include <tools/gen.hxx>
#include <tools/color.hxx>
diff --git a/sw/source/core/uibase/inc/splittbl.hxx b/sw/source/core/uibase/inc/splittbl.hxx
index 013878e3108e..f2339a0f5955 100644
--- a/sw/source/core/uibase/inc/splittbl.hxx
+++ b/sw/source/core/uibase/inc/splittbl.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_UI_INC_SPLITTBL_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SPLITTBL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SPLITTBL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SPLITTBL_HXX
#include <svx/stddlg.hxx>
#include <vcl/fixed.hxx>
diff --git a/sw/source/core/uibase/inc/srcedtw.hxx b/sw/source/core/uibase/inc/srcedtw.hxx
index bc19a311aac1..f63e57e2c5a4 100644
--- a/sw/source/core/uibase/inc/srcedtw.hxx
+++ b/sw/source/core/uibase/inc/srcedtw.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_UI_INC_SRCEDTW_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SRCEDTW_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SRCEDTW_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SRCEDTW_HXX
#include <vcl/window.hxx>
#include <svl/lstner.hxx>
diff --git a/sw/source/core/uibase/inc/srcview.hxx b/sw/source/core/uibase/inc/srcview.hxx
index 43636d51544b..cc8b7319304a 100644
--- a/sw/source/core/uibase/inc/srcview.hxx
+++ b/sw/source/core/uibase/inc/srcview.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_UI_INC_SRCVIEW_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SRCVIEW_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SRCVIEW_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SRCVIEW_HXX
#include <sfx2/viewfac.hxx>
#include <sfx2/viewsh.hxx>
diff --git a/sw/source/core/uibase/inc/srtdlg.hxx b/sw/source/core/uibase/inc/srtdlg.hxx
index 6e0a3e0c6d4a..9dd074b0e6c4 100644
--- a/sw/source/core/uibase/inc/srtdlg.hxx
+++ b/sw/source/core/uibase/inc/srtdlg.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_UI_INC_SRTDLG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SRTDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SRTDLG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SRTDLG_HXX
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/core/uibase/inc/stmenu.hxx b/sw/source/core/uibase/inc/stmenu.hxx
index 96468dcf3996..e768470ec0c8 100644
--- a/sw/source/core/uibase/inc/stmenu.hxx
+++ b/sw/source/core/uibase/inc/stmenu.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_STMENU_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_STMENU_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_STMENU_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_STMENU_HXX
#include <vcl/menu.hxx>
diff --git a/sw/source/core/uibase/inc/swcont.hxx b/sw/source/core/uibase/inc/swcont.hxx
index 4c9294907b79..9110512420bd 100644
--- a/sw/source/core/uibase/inc/swcont.hxx
+++ b/sw/source/core/uibase/inc/swcont.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_SWCONT_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SWCONT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWCONT_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWCONT_HXX
#include <rtl/ustring.hxx>
diff --git a/sw/source/core/uibase/inc/swdtflvr.hxx b/sw/source/core/uibase/inc/swdtflvr.hxx
index 9a501a0641ca..6294969c55c1 100644
--- a/sw/source/core/uibase/inc/swdtflvr.hxx
+++ b/sw/source/core/uibase/inc/swdtflvr.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_UI_INC_SWDTFLVR_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SWDTFLVR_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWDTFLVR_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWDTFLVR_HXX
#include <sfx2/objsh.hxx>
diff --git a/sw/source/core/uibase/inc/swlbox.hxx b/sw/source/core/uibase/inc/swlbox.hxx
index aed583fb19c7..4287dd903781 100644
--- a/sw/source/core/uibase/inc/swlbox.hxx
+++ b/sw/source/core/uibase/inc/swlbox.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_UI_INC_SWLBOX_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SWLBOX_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWLBOX_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWLBOX_HXX
#include <vcl/lstbox.hxx>
#include <vcl/combobox.hxx>
@@ -81,6 +81,6 @@ public:
const SwBoxEntry& GetRemovedEntry(sal_Int32 nPos) const;
};
-#endif // INCLUDED_SW_SOURCE_UI_INC_SWLBOX_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWLBOX_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/swmodalredlineacceptdlg.hxx b/sw/source/core/uibase/inc/swmodalredlineacceptdlg.hxx
index 1f82224239d6..782d14f2aba9 100644
--- a/sw/source/core/uibase/inc/swmodalredlineacceptdlg.hxx
+++ b/sw/source/core/uibase/inc/swmodalredlineacceptdlg.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_UI_INC_SWMODALREDLINEACCEPTDLG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SWMODALREDLINEACCEPTDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWMODALREDLINEACCEPTDLG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWMODALREDLINEACCEPTDLG_HXX
#include "chldwrap.hxx"
#include <sfx2/basedlgs.hxx>
diff --git a/sw/source/core/uibase/inc/swrenamexnameddlg.hxx b/sw/source/core/uibase/inc/swrenamexnameddlg.hxx
index 1dfc4f2597a4..d5f2c22f5ad5 100644
--- a/sw/source/core/uibase/inc/swrenamexnameddlg.hxx
+++ b/sw/source/core/uibase/inc/swrenamexnameddlg.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_UI_INC_SWRENAMEXNAMEDDLG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SWRENAMEXNAMEDDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWRENAMEXNAMEDDLG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWRENAMEXNAMEDDLG_HXX
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
diff --git a/sw/source/core/uibase/inc/swruler.hxx b/sw/source/core/uibase/inc/swruler.hxx
index 589f714d77c4..44d2fbee0a9e 100644
--- a/sw/source/core/uibase/inc/swruler.hxx
+++ b/sw/source/core/uibase/inc/swruler.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_SWRULER_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SWRULER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWRULER_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWRULER_HXX
#include <svx/ruler.hxx>
diff --git a/sw/source/core/uibase/inc/swtablerep.hxx b/sw/source/core/uibase/inc/swtablerep.hxx
index 7f92bc0bc26b..bf351c976a9e 100644
--- a/sw/source/core/uibase/inc/swtablerep.hxx
+++ b/sw/source/core/uibase/inc/swtablerep.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_UI_INC_SWTABLEREP_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SWTABLEREP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWTABLEREP_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWTABLEREP_HXX
#include <sfx2/tabdlg.hxx>
#include "swdllapi.h"
diff --git a/sw/source/core/uibase/inc/swuiccoll.hxx b/sw/source/core/uibase/inc/swuiccoll.hxx
index 9e6f49588b30..3f5fd1fba7f4 100644
--- a/sw/source/core/uibase/inc/swuiccoll.hxx
+++ b/sw/source/core/uibase/inc/swuiccoll.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_UI_INC_SWUICCOLL_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SWUICCOLL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWUICCOLL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWUICCOLL_HXX
#include <tools/resary.hxx>
diff --git a/sw/source/core/uibase/inc/swuicnttab.hxx b/sw/source/core/uibase/inc/swuicnttab.hxx
index bdd17412f9e3..37ba536bb019 100644
--- a/sw/source/core/uibase/inc/swuicnttab.hxx
+++ b/sw/source/core/uibase/inc/swuicnttab.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_UI_INC_SWUICNTTAB_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SWUICNTTAB_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWUICNTTAB_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWUICNTTAB_HXX
#include <svx/stddlg.hxx>
@@ -492,6 +492,6 @@ public:
};
-#endif // INCLUDED_SW_SOURCE_UI_INC_SWUICNTTAB_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWUICNTTAB_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/swuiidxmrk.hxx b/sw/source/core/uibase/inc/swuiidxmrk.hxx
index 7f2a53977543..ce83df03d8d3 100644
--- a/sw/source/core/uibase/inc/swuiidxmrk.hxx
+++ b/sw/source/core/uibase/inc/swuiidxmrk.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_UI_INC_SWUIIDXMRK_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SWUIIDXMRK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWUIIDXMRK_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWUIIDXMRK_HXX
#include <com/sun/star/container/XNameAccess.hpp>
#include <sfx2/basedlgs.hxx>
@@ -248,6 +248,6 @@ public:
void ReInitDlg(SwWrtShell& rWrtShell);
};
-#endif // INCLUDED_SW_SOURCE_UI_INC_SWUIIDXMRK_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWUIIDXMRK_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/swuipardlg.hxx b/sw/source/core/uibase/inc/swuipardlg.hxx
index 650c973b200f..e90b2aee8315 100644
--- a/sw/source/core/uibase/inc/swuipardlg.hxx
+++ b/sw/source/core/uibase/inc/swuipardlg.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_UI_INC_SWUIPARDLG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SWUIPARDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWUIPARDLG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWUIPARDLG_HXX
#include "pardlg.hxx"
class SwParaDlg: public SfxTabDialog
diff --git a/sw/source/core/uibase/inc/swvset.hxx b/sw/source/core/uibase/inc/swvset.hxx
index 65eb43e89256..4977eab7c6d7 100644
--- a/sw/source/core/uibase/inc/swvset.hxx
+++ b/sw/source/core/uibase/inc/swvset.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_UI_INC_SWVSET_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SWVSET_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWVSET_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWVSET_HXX
#include <svx/numvset.hxx>
class SwRulerValueSet : public SvxBmpNumValueSet
diff --git a/sw/source/core/uibase/inc/swwrtshitem.hxx b/sw/source/core/uibase/inc/swwrtshitem.hxx
index 8e3974a4be05..4aa5739c937f 100644
--- a/sw/source/core/uibase/inc/swwrtshitem.hxx
+++ b/sw/source/core/uibase/inc/swwrtshitem.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_UI_INC_SWWRTSHITEM_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SWWRTSHITEM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWWRTSHITEM_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWWRTSHITEM_HXX
#include <svl/poolitem.hxx>
#include "swdllapi.h"
diff --git a/sw/source/core/uibase/inc/syncbtn.hxx b/sw/source/core/uibase/inc/syncbtn.hxx
index 9800f3faf15b..2fba52627a41 100644
--- a/sw/source/core/uibase/inc/syncbtn.hxx
+++ b/sw/source/core/uibase/inc/syncbtn.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_UI_INC_SYNCBTN_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_SYNCBTN_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SYNCBTN_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SYNCBTN_HXX
#include <sfx2/childwin.hxx>
#ifdef _SYNCDLG
diff --git a/sw/source/core/uibase/inc/tabledlg.hxx b/sw/source/core/uibase/inc/tabledlg.hxx
index 8349b4c7859c..14db904076a9 100644
--- a/sw/source/core/uibase/inc/tabledlg.hxx
+++ b/sw/source/core/uibase/inc/tabledlg.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_UI_INC_TABLEDLG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_TABLEDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TABLEDLG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TABLEDLG_HXX
#include <sfx2/tabdlg.hxx>
diff --git a/sw/source/core/uibase/inc/tablemgr.hxx b/sw/source/core/uibase/inc/tablemgr.hxx
index 4144b9b9aa09..73a117d94a15 100644
--- a/sw/source/core/uibase/inc/tablemgr.hxx
+++ b/sw/source/core/uibase/inc/tablemgr.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_UI_INC_TABLEMGR_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_TABLEMGR_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TABLEMGR_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TABLEMGR_HXX
#include "swdllapi.h"
#include "swtypes.hxx"
diff --git a/sw/source/core/uibase/inc/tabsh.hxx b/sw/source/core/uibase/inc/tabsh.hxx
index 78c23cd7ea70..7094f49a260a 100644
--- a/sw/source/core/uibase/inc/tabsh.hxx
+++ b/sw/source/core/uibase/inc/tabsh.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_UI_INC_TABSH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_TABSH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TABSH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TABSH_HXX
#include "basesh.hxx"
#include "swdllapi.h"
diff --git a/sw/source/core/uibase/inc/tautofmt.hxx b/sw/source/core/uibase/inc/tautofmt.hxx
index 5aac7016a944..a06264c637d2 100644
--- a/sw/source/core/uibase/inc/tautofmt.hxx
+++ b/sw/source/core/uibase/inc/tautofmt.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_UI_INC_TAUTOFMT_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_TAUTOFMT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TAUTOFMT_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TAUTOFMT_HXX
#include <sfx2/basedlgs.hxx>
#include <vcl/fixed.hxx>
diff --git a/sw/source/core/uibase/inc/tblctrl.hxx b/sw/source/core/uibase/inc/tblctrl.hxx
index 4becca5acf58..e678c6280400 100644
--- a/sw/source/core/uibase/inc/tblctrl.hxx
+++ b/sw/source/core/uibase/inc/tblctrl.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_UI_INC_TBLCTRL_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_TBLCTRL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TBLCTRL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TBLCTRL_HXX
#include <sfx2/tbxctrl.hxx>
diff --git a/sw/source/core/uibase/inc/tblnumfm.hxx b/sw/source/core/uibase/inc/tblnumfm.hxx
index ad8b9999f56c..f28c41055071 100644
--- a/sw/source/core/uibase/inc/tblnumfm.hxx
+++ b/sw/source/core/uibase/inc/tblnumfm.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_UI_INC_TBLNUMFM_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_TBLNUMFM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TBLNUMFM_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TBLNUMFM_HXX
#include <sfx2/basedlgs.hxx>
diff --git a/sw/source/core/uibase/inc/tbxanchr.hxx b/sw/source/core/uibase/inc/tbxanchr.hxx
index f94f63d20060..c52cfb817acb 100644
--- a/sw/source/core/uibase/inc/tbxanchr.hxx
+++ b/sw/source/core/uibase/inc/tbxanchr.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_UI_INC_TBXANCHR_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_TBXANCHR_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TBXANCHR_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TBXANCHR_HXX
#include <sfx2/tbxctrl.hxx>
diff --git a/sw/source/core/uibase/inc/textsh.hxx b/sw/source/core/uibase/inc/textsh.hxx
index 3adf8669a602..9082296bdbbf 100644
--- a/sw/source/core/uibase/inc/textsh.hxx
+++ b/sw/source/core/uibase/inc/textsh.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_TEXTSH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_TEXTSH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TEXTSH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TEXTSH_HXX
#include <basesh.hxx>
#include <unotools/caserotate.hxx>
diff --git a/sw/source/core/uibase/inc/titlepage.hxx b/sw/source/core/uibase/inc/titlepage.hxx
index 18aabae9a7b7..98292fdbcbfc 100644
--- a/sw/source/core/uibase/inc/titlepage.hxx
+++ b/sw/source/core/uibase/inc/titlepage.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_TITLEPAGE_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_TITLEPAGE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TITLEPAGE_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TITLEPAGE_HXX
#include <sfx2/basedlgs.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/core/uibase/inc/tmpdlg.hxx b/sw/source/core/uibase/inc/tmpdlg.hxx
index 759d97eb4648..52afff36dd21 100644
--- a/sw/source/core/uibase/inc/tmpdlg.hxx
+++ b/sw/source/core/uibase/inc/tmpdlg.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_UI_INC_TMPDLG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_TMPDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TMPDLG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TMPDLG_HXX
#include <sfx2/styledlg.hxx>
diff --git a/sw/source/core/uibase/inc/tmplctrl.hxx b/sw/source/core/uibase/inc/tmplctrl.hxx
index 56642a38d30e..130fd0baa08b 100644
--- a/sw/source/core/uibase/inc/tmplctrl.hxx
+++ b/sw/source/core/uibase/inc/tmplctrl.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_UI_INC_TMPLCTRL_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_TMPLCTRL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TMPLCTRL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TMPLCTRL_HXX
#include <sfx2/stbitem.hxx>
diff --git a/sw/source/core/uibase/inc/toxmgr.hxx b/sw/source/core/uibase/inc/toxmgr.hxx
index 86b2d7f5ecc5..aa247dadb80c 100644
--- a/sw/source/core/uibase/inc/toxmgr.hxx
+++ b/sw/source/core/uibase/inc/toxmgr.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_TOXMGR_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_TOXMGR_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TOXMGR_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TOXMGR_HXX
#include "swdllapi.h"
#include "tox.hxx"
diff --git a/sw/source/core/uibase/inc/uiborder.hxx b/sw/source/core/uibase/inc/uiborder.hxx
index 3327bdac3aac..a54bf5d2a22f 100644
--- a/sw/source/core/uibase/inc/uiborder.hxx
+++ b/sw/source/core/uibase/inc/uiborder.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 _UIBORDER_HXX
-#define _UIBORDER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UIBORDER_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UIBORDER_HXX
#include <sfx2/basedlgs.hxx>
class Window;
diff --git a/sw/source/core/uibase/inc/uiitems.hxx b/sw/source/core/uibase/inc/uiitems.hxx
index d1a3f36be19b..2c037b6f9802 100644
--- a/sw/source/core/uibase/inc/uiitems.hxx
+++ b/sw/source/core/uibase/inc/uiitems.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_UI_INC_UIITEMS_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_UIITEMS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UIITEMS_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UIITEMS_HXX
#include <svl/intitem.hxx>
#include "swdllapi.h"
@@ -114,6 +114,6 @@ public:
SwPaM* GetValue() const { return m_pPaM; }
};
-#endif // INCLUDED_SW_SOURCE_UI_INC_UIITEMS_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UIITEMS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/uinums.hxx b/sw/source/core/uibase/inc/uinums.hxx
index b28fd2a5222e..5fad0e8aff0e 100644
--- a/sw/source/core/uibase/inc/uinums.hxx
+++ b/sw/source/core/uibase/inc/uinums.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_UI_INC_UINUMS_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_UINUMS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UINUMS_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UINUMS_HXX
#include <numrule.hxx>
#include "swdllapi.h"
diff --git a/sw/source/core/uibase/inc/uitool.hxx b/sw/source/core/uibase/inc/uitool.hxx
index 378520e235be..597269fcd39c 100644
--- a/sw/source/core/uibase/inc/uitool.hxx
+++ b/sw/source/core/uibase/inc/uitool.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_UI_INC_UITOOL_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_UITOOL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UITOOL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UITOOL_HXX
#include <tools/wintypes.hxx>
#include <vcl/field.hxx>
@@ -104,6 +104,6 @@ OUString GetAppLangDateTimeString( const DateTime& );
// at the dispatcher if there is one, if executed return true
bool ExecuteMenuCommand( PopupMenu& rMenu, SfxViewFrame& rViewFrame, sal_uInt16 nId );
-#endif // INCLUDED_SW_SOURCE_UI_INC_UITOOL_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UITOOL_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/uibase/inc/uivwimp.hxx b/sw/source/core/uibase/inc/uivwimp.hxx
index b0e94379bebe..11ea988d519a 100644
--- a/sw/source/core/uibase/inc/uivwimp.hxx
+++ b/sw/source/core/uibase/inc/uivwimp.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_UI_INC_UIVWIMP_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_UIVWIMP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UIVWIMP_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UIVWIMP_HXX
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <view.hxx>
diff --git a/sw/source/core/uibase/inc/unoatxt.hxx b/sw/source/core/uibase/inc/unoatxt.hxx
index d3871bfa51aa..8a088d1d0a85 100644
--- a/sw/source/core/uibase/inc/unoatxt.hxx
+++ b/sw/source/core/uibase/inc/unoatxt.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_UI_INC_UNOATXT_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_UNOATXT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNOATXT_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNOATXT_HXX
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XNamed.hpp>
diff --git a/sw/source/core/uibase/inc/unodispatch.hxx b/sw/source/core/uibase/inc/unodispatch.hxx
index 8d1b32427cea..18b29cd1c0cc 100644
--- a/sw/source/core/uibase/inc/unodispatch.hxx
+++ b/sw/source/core/uibase/inc/unodispatch.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_UI_INC_UNODISPATCH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_UNODISPATCH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNODISPATCH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNODISPATCH_HXX
#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
diff --git a/sw/source/core/uibase/inc/unomailmerge.hxx b/sw/source/core/uibase/inc/unomailmerge.hxx
index 3aeaa0207963..8126d8279fed 100644
--- a/sw/source/core/uibase/inc/unomailmerge.hxx
+++ b/sw/source/core/uibase/inc/unomailmerge.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_UNOMAILMERGE_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_UNOMAILMERGE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNOMAILMERGE_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNOMAILMERGE_HXX
#include <cppuhelper/implbase6.hxx>
#include <cppuhelper/interfacecontainer.hxx>
diff --git a/sw/source/core/uibase/inc/unomod.hxx b/sw/source/core/uibase/inc/unomod.hxx
index 306045104621..3b2cc67e3495 100644
--- a/sw/source/core/uibase/inc/unomod.hxx
+++ b/sw/source/core/uibase/inc/unomod.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_UI_INC_UNOMOD_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_UNOMOD_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNOMOD_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNOMOD_HXX
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/view/XPrintSettingsSupplier.hpp>
diff --git a/sw/source/core/uibase/inc/unotools.hxx b/sw/source/core/uibase/inc/unotools.hxx
index 480590135b64..930006ebe720 100644
--- a/sw/source/core/uibase/inc/unotools.hxx
+++ b/sw/source/core/uibase/inc/unotools.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_UI_INC_UNOTOOLS_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_UNOTOOLS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNOTOOLS_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNOTOOLS_HXX
#include <vcl/button.hxx>
#include <vcl/edit.hxx>
diff --git a/sw/source/core/uibase/inc/unotxvw.hxx b/sw/source/core/uibase/inc/unotxvw.hxx
index ac55733c1cd8..fc42176cb8aa 100644
--- a/sw/source/core/uibase/inc/unotxvw.hxx
+++ b/sw/source/core/uibase/inc/unotxvw.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_UI_INC_UNOTXVW_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_UNOTXVW_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNOTXVW_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNOTXVW_HXX
#include <sfx2/sfxbasecontroller.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
diff --git a/sw/source/core/uibase/inc/usrpref.hxx b/sw/source/core/uibase/inc/usrpref.hxx
index 7a03bf80f712..5b1a0f574862 100644
--- a/sw/source/core/uibase/inc/usrpref.hxx
+++ b/sw/source/core/uibase/inc/usrpref.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_UI_INC_USRPREF_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_USRPREF_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_USRPREF_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_USRPREF_HXX
#include <unotools/configitem.hxx>
#include <fldupde.hxx>
diff --git a/sw/source/core/uibase/inc/view.hxx b/sw/source/core/uibase/inc/view.hxx
index b1b736d40a84..6d251529d1dd 100644
--- a/sw/source/core/uibase/inc/view.hxx
+++ b/sw/source/core/uibase/inc/view.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_UI_INC_VIEW_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_VIEW_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_VIEW_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_VIEW_HXX
#include <vcl/timer.hxx>
#include <vcl/field.hxx>
diff --git a/sw/source/core/uibase/inc/viewlayoutctrl.hxx b/sw/source/core/uibase/inc/viewlayoutctrl.hxx
index 42d6afc734a1..7e778a472879 100644
--- a/sw/source/core/uibase/inc/viewlayoutctrl.hxx
+++ b/sw/source/core/uibase/inc/viewlayoutctrl.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_UI_INC_VIEWLAYOUTCTRL_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_VIEWLAYOUTCTRL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_VIEWLAYOUTCTRL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_VIEWLAYOUTCTRL_HXX
#include <sfx2/stbitem.hxx>
diff --git a/sw/source/core/uibase/inc/wformsh.hxx b/sw/source/core/uibase/inc/wformsh.hxx
index 90ec9b13e17f..0414f98f79a4 100644
--- a/sw/source/core/uibase/inc/wformsh.hxx
+++ b/sw/source/core/uibase/inc/wformsh.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_UI_INC_WFORMSH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_WFORMSH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WFORMSH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WFORMSH_HXX
#include "drformsh.hxx"
diff --git a/sw/source/core/uibase/inc/wfrmsh.hxx b/sw/source/core/uibase/inc/wfrmsh.hxx
index 60286b93f638..4bda0118ce4b 100644
--- a/sw/source/core/uibase/inc/wfrmsh.hxx
+++ b/sw/source/core/uibase/inc/wfrmsh.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_WFRMSH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_WFRMSH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WFRMSH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WFRMSH_HXX
#include "frmsh.hxx"
diff --git a/sw/source/core/uibase/inc/wgrfsh.hxx b/sw/source/core/uibase/inc/wgrfsh.hxx
index 8060dbdda5ff..f722fbfedbb9 100644
--- a/sw/source/core/uibase/inc/wgrfsh.hxx
+++ b/sw/source/core/uibase/inc/wgrfsh.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_UI_INC_WGRFSH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_WGRFSH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WGRFSH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WGRFSH_HXX
#include "grfsh.hxx"
diff --git a/sw/source/core/uibase/inc/wlistsh.hxx b/sw/source/core/uibase/inc/wlistsh.hxx
index 19aede991ef9..e4f32fa24765 100644
--- a/sw/source/core/uibase/inc/wlistsh.hxx
+++ b/sw/source/core/uibase/inc/wlistsh.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_UI_INC_WLISTSH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_WLISTSH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WLISTSH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WLISTSH_HXX
#include "listsh.hxx"
diff --git a/sw/source/core/uibase/inc/wolesh.hxx b/sw/source/core/uibase/inc/wolesh.hxx
index 093cc6018f65..7378f20c0153 100644
--- a/sw/source/core/uibase/inc/wolesh.hxx
+++ b/sw/source/core/uibase/inc/wolesh.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_UI_INC_WOLESH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_WOLESH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WOLESH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WOLESH_HXX
#include "olesh.hxx"
diff --git a/sw/source/core/uibase/inc/wordcountctrl.hxx b/sw/source/core/uibase/inc/wordcountctrl.hxx
index 017aa6d2b0c6..89aaa15533b8 100644
--- a/sw/source/core/uibase/inc/wordcountctrl.hxx
+++ b/sw/source/core/uibase/inc/wordcountctrl.hxx
@@ -7,8 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_WORDCOUNTCTRL_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_WORDCOUNTCTRL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WORDCOUNTCTRL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WORDCOUNTCTRL_HXX
#include <sfx2/stbitem.hxx>
diff --git a/sw/source/core/uibase/inc/wordcountdialog.hxx b/sw/source/core/uibase/inc/wordcountdialog.hxx
index 4d8f4c34ee23..96560150f78b 100644
--- a/sw/source/core/uibase/inc/wordcountdialog.hxx
+++ b/sw/source/core/uibase/inc/wordcountdialog.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_UI_INC_WORDCOUNTDIALOG_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_WORDCOUNTDIALOG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WORDCOUNTDIALOG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WORDCOUNTDIALOG_HXX
#include <sfx2/basedlgs.hxx>
#include <svtools/stdctrl.hxx>
#include <vcl/layout.hxx>
diff --git a/sw/source/core/uibase/inc/workctrl.hxx b/sw/source/core/uibase/inc/workctrl.hxx
index a030d9f79952..d25a13c3b774 100644
--- a/sw/source/core/uibase/inc/workctrl.hxx
+++ b/sw/source/core/uibase/inc/workctrl.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_UI_INC_WORKCTRL_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_WORKCTRL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WORKCTRL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WORKCTRL_HXX
#include <sfx2/tbxctrl.hxx>
#include <vcl/toolbox.hxx>
diff --git a/sw/source/core/uibase/inc/wrap.hxx b/sw/source/core/uibase/inc/wrap.hxx
index b3c4502237d2..fac955c29bb6 100644
--- a/sw/source/core/uibase/inc/wrap.hxx
+++ b/sw/source/core/uibase/inc/wrap.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_UI_INC_WRAP_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_WRAP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WRAP_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WRAP_HXX
#include <sfx2/tabdlg.hxx>
#include <sfx2/basedlgs.hxx>
diff --git a/sw/source/core/uibase/inc/wrtsh.hxx b/sw/source/core/uibase/inc/wrtsh.hxx
index 352065bae666..a8216c351d3a 100644
--- a/sw/source/core/uibase/inc/wrtsh.hxx
+++ b/sw/source/core/uibase/inc/wrtsh.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_UI_INC_WRTSH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_WRTSH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WRTSH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WRTSH_HXX
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include "swdllapi.h"
diff --git a/sw/source/core/uibase/inc/wtabsh.hxx b/sw/source/core/uibase/inc/wtabsh.hxx
index a423b3c9d632..9376d4a900f3 100644
--- a/sw/source/core/uibase/inc/wtabsh.hxx
+++ b/sw/source/core/uibase/inc/wtabsh.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_UI_INC_WTABSH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_WTABSH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WTABSH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WTABSH_HXX
#include "tabsh.hxx"
diff --git a/sw/source/core/uibase/inc/wtextsh.hxx b/sw/source/core/uibase/inc/wtextsh.hxx
index be11aa4516f8..7f51b01f4ddc 100644
--- a/sw/source/core/uibase/inc/wtextsh.hxx
+++ b/sw/source/core/uibase/inc/wtextsh.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_INC_WTEXTSH_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_WTEXTSH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WTEXTSH_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WTEXTSH_HXX
#include "textsh.hxx"
diff --git a/sw/source/core/uibase/inc/wview.hxx b/sw/source/core/uibase/inc/wview.hxx
index 355eea993705..0b3c914bb8a8 100644
--- a/sw/source/core/uibase/inc/wview.hxx
+++ b/sw/source/core/uibase/inc/wview.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_UI_INC_WVIEW_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_WVIEW_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WVIEW_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WVIEW_HXX
#include "swdllapi.h"
#include "view.hxx"
diff --git a/sw/source/core/uibase/inc/zoomctrl.hxx b/sw/source/core/uibase/inc/zoomctrl.hxx
index 9e2031de1072..512785dd4454 100644
--- a/sw/source/core/uibase/inc/zoomctrl.hxx
+++ b/sw/source/core/uibase/inc/zoomctrl.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_UI_INC_ZOOMCTRL_HXX
-#define INCLUDED_SW_SOURCE_UI_INC_ZOOMCTRL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ZOOMCTRL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ZOOMCTRL_HXX
#include <svx/zoomctrl.hxx>
diff --git a/sw/source/core/uibase/lingu/sdrhhcwrap.hxx b/sw/source/core/uibase/lingu/sdrhhcwrap.hxx
index 868727e4c189..b6b58ca61153 100644
--- a/sw/source/core/uibase/lingu/sdrhhcwrap.hxx
+++ b/sw/source/core/uibase/lingu/sdrhhcwrap.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_UI_LINGU_SDRHHCWRAP_HXX
-#define INCLUDED_SW_SOURCE_UI_LINGU_SDRHHCWRAP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_LINGU_SDRHHCWRAP_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_LINGU_SDRHHCWRAP_HXX
#include <svx/svdoutl.hxx>
diff --git a/sw/source/core/uibase/sidebar/PageColumnControl.hxx b/sw/source/core/uibase/sidebar/PageColumnControl.hxx
index 3ff4202838df..133e002ebbf8 100644
--- a/sw/source/core/uibase/sidebar/PageColumnControl.hxx
+++ b/sw/source/core/uibase/sidebar/PageColumnControl.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_UI_SIDEBAR_PAGECOLUMNCONTROL_HXX
-#define INCLUDED_SW_SOURCE_UI_SIDEBAR_PAGECOLUMNCONTROL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_PAGECOLUMNCONTROL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_PAGECOLUMNCONTROL_HXX
#include <svx/sidebar/PopupControl.hxx>
diff --git a/sw/source/core/uibase/sidebar/PageMarginControl.hxx b/sw/source/core/uibase/sidebar/PageMarginControl.hxx
index c1fdb94f638a..32010596f4d0 100644
--- a/sw/source/core/uibase/sidebar/PageMarginControl.hxx
+++ b/sw/source/core/uibase/sidebar/PageMarginControl.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_UI_SIDEBAR_PAGEMARGINCONTROL_HXX
-#define INCLUDED_SW_SOURCE_UI_SIDEBAR_PAGEMARGINCONTROL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_PAGEMARGINCONTROL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_PAGEMARGINCONTROL_HXX
#include <svx/sidebar/PopupControl.hxx>
diff --git a/sw/source/core/uibase/sidebar/PageOrientationControl.hxx b/sw/source/core/uibase/sidebar/PageOrientationControl.hxx
index c1927fbb86f1..b6c6845397ce 100644
--- a/sw/source/core/uibase/sidebar/PageOrientationControl.hxx
+++ b/sw/source/core/uibase/sidebar/PageOrientationControl.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_UI_SIDEBAR_PAGEORIENTATIONCONTROL_HXX
-#define INCLUDED_SW_SOURCE_UI_SIDEBAR_PAGEORIENTATIONCONTROL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_PAGEORIENTATIONCONTROL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_PAGEORIENTATIONCONTROL_HXX
#include <svx/sidebar/PopupControl.hxx>
diff --git a/sw/source/core/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/core/uibase/sidebar/PagePropertyPanel.hxx
index fd534c8e37f1..fb36c8805b04 100644
--- a/sw/source/core/uibase/sidebar/PagePropertyPanel.hxx
+++ b/sw/source/core/uibase/sidebar/PagePropertyPanel.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_UI_SIDEBAR_PAGEPROPERTYPANEL_HXX
-#define INCLUDED_SW_SOURCE_UI_SIDEBAR_PAGEPROPERTYPANEL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_PAGEPROPERTYPANEL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_PAGEPROPERTYPANEL_HXX
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/document/XUndoManager.hpp>
diff --git a/sw/source/core/uibase/sidebar/PageSizeControl.hxx b/sw/source/core/uibase/sidebar/PageSizeControl.hxx
index d1e433da719f..86a3bff0b3e4 100644
--- a/sw/source/core/uibase/sidebar/PageSizeControl.hxx
+++ b/sw/source/core/uibase/sidebar/PageSizeControl.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_UI_SIDEBAR_PAGESIZECONTROL_HXX
-#define INCLUDED_SW_SOURCE_UI_SIDEBAR_PAGESIZECONTROL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_PAGESIZECONTROL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_PAGESIZECONTROL_HXX
#include <svx/sidebar/PopupControl.hxx>
diff --git a/sw/source/core/uibase/sidebar/WrapPropertyPanel.hxx b/sw/source/core/uibase/sidebar/WrapPropertyPanel.hxx
index 4a8a269bfacd..e427947a6dd7 100644
--- a/sw/source/core/uibase/sidebar/WrapPropertyPanel.hxx
+++ b/sw/source/core/uibase/sidebar/WrapPropertyPanel.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_UI_SIDEBAR_WRAPPROPERTYPANEL_HXX
-#define INCLUDED_SW_SOURCE_UI_SIDEBAR_WRAPPROPERTYPANEL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_WRAPPROPERTYPANEL_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_WRAPPROPERTYPANEL_HXX
#include <svx/sidebar/PanelLayout.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/core/uibase/table/tablepg.hxx b/sw/source/core/uibase/table/tablepg.hxx
index 3f95844371b6..c0ed364480a2 100644
--- a/sw/source/core/uibase/table/tablepg.hxx
+++ b/sw/source/core/uibase/table/tablepg.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_UI_TABLE_TABLEPG_HXX
-#define INCLUDED_SW_SOURCE_UI_TABLE_TABLEPG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_TABLE_TABLEPG_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_TABLE_TABLEPG_HXX
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
#include <vcl/button.hxx>
diff --git a/sw/source/core/uibase/uiview/viewfunc.hxx b/sw/source/core/uibase/uiview/viewfunc.hxx
index 6036509db172..9709df500ef9 100644
--- a/sw/source/core/uibase/uiview/viewfunc.hxx
+++ b/sw/source/core/uibase/uiview/viewfunc.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_UI_UIVIEW_VIEWFUNC_HXX
-#define INCLUDED_SW_SOURCE_UI_UIVIEW_VIEWFUNC_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_UIVIEW_VIEWFUNC_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_UIVIEW_VIEWFUNC_HXX
#include <tools/solar.h>
class ImageButton;
diff --git a/sw/source/core/uibase/uno/SwXDocumentSettings.hxx b/sw/source/core/uibase/uno/SwXDocumentSettings.hxx
index 0a356247b0f9..c153f2e0eb2e 100644
--- a/sw/source/core/uibase/uno/SwXDocumentSettings.hxx
+++ b/sw/source/core/uibase/uno/SwXDocumentSettings.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_UNO_SWXDOCUMENTSETTINGS_HXX
-#define INCLUDED_SW_SOURCE_UI_UNO_SWXDOCUMENTSETTINGS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_UNO_SWXDOCUMENTSETTINGS_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_UNO_SWXDOCUMENTSETTINGS_HXX
#include <comphelper/MasterPropertySet.hxx>
#include <com/sun/star/text/XTextDocument.hpp>
diff --git a/sw/source/core/uibase/uno/unodefaults.hxx b/sw/source/core/uibase/uno/unodefaults.hxx
index dc4a160596ed..450a2a5d382b 100644
--- a/sw/source/core/uibase/uno/unodefaults.hxx
+++ b/sw/source/core/uibase/uno/unodefaults.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_UI_UNO_UNODEFAULTS_HXX
-#define INCLUDED_SW_SOURCE_UI_UNO_UNODEFAULTS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_UNO_UNODEFAULTS_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_UNO_UNODEFAULTS_HXX
#include <svx/unopool.hxx>
diff --git a/sw/source/core/uibase/uno/unomodule.hxx b/sw/source/core/uibase/uno/unomodule.hxx
index 3152caa77bad..00bd74e46428 100644
--- a/sw/source/core/uibase/uno/unomodule.hxx
+++ b/sw/source/core/uibase/uno/unomodule.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_UI_UNO_UNOMODULE_HXX
-#define INCLUDED_SW_SOURCE_UI_UNO_UNOMODULE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_UNO_UNOMODULE_HXX
+#define INCLUDED_SW_SOURCE_CORE_UIBASE_UNO_UNOMODULE_HXX
#include <rtl/ustring.hxx>
#include <com/sun/star/frame/XDispatchProvider.hpp>