fdo#70422 Moved the linked files from sw/source/ui to a new core/uibase dir

Moved the files linked in sw/Library_sw.mk from sw/source/ui to
sw/source/core/uibase and modified the make files as per the new
directory location.

Reviewed on:
	https://gerrit.libreoffice.org/8447

Change-Id: I05f6ccdeee5e76fb0ae477d16721d9ddc6eaff32

492 files changed, 251 insertions, 241 deletions

diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index aaf690cb6955..e9ab70edf621 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -33,6 +33,11 @@ $(eval $(call gb_SrsTarget_set_include,sw/res,\
     $$(INCLUDE) \
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
+	-I$(SRCDIR)/sw/source/core/uibase/inc \
+    -I$(SRCDIR)/sw/source/core/uibase/docvw \
+    -I$(SRCDIR)/sw/source/core/uibase/envelp \
+    -I$(SRCDIR)/sw/source/core/uibase/index \
+    -I$(SRCDIR)/sw/source/core/uibase/sidebar \
     -I$(SRCDIR)/sw/source/core/undo \
     -I$(SRCDIR)/sw/source/core/unocore \
     -I$(SRCDIR)/sw/source/ui/chrdlg \
@@ -65,6 +70,20 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
     sw/source/core/layout/pagefrm.src \
     sw/source/core/undo/undo.src \
     sw/source/core/unocore/unocore.src \
+    sw/source/core/uibase/dialog/regionsw.src \
+    sw/source/core/uibase/docvw/docvw.src \
+    sw/source/core/uibase/lingu/olmenu.src \
+    sw/source/core/uibase/misc/redlndlg.src \
+    sw/source/core/uibase/ribbar/inputwin.src \
+    sw/source/core/uibase/ribbar/workctrl.src \
+    sw/source/core/uibase/smartmenu/stmenu.src \
+    sw/source/core/uibase/uiview/view.src \
+    sw/source/core/uibase/utlui/attrdesc.src \
+    sw/source/core/uibase/utlui/navipi.src \
+    sw/source/core/uibase/utlui/initui.src \
+    sw/source/core/uibase/wrtsh/wrtsh.src \
+    sw/source/core/uibase/utlui/unotools.src \
+    sw/source/core/uibase/dbui/mailmergechildwindow.src \
     sw/source/ui/app/app.src \
     sw/source/ui/app/error.src \
     sw/source/ui/app/mn.src \
@@ -74,7 +93,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
     sw/source/ui/dbui/createaddresslistdialog.src \
     sw/source/ui/dbui/dbtablepreviewdialog.src \
     sw/source/ui/dbui/dbui.src \
-    sw/source/ui/dbui/mailmergechildwindow.src \
     sw/source/ui/dbui/mailmergewizard.src \
     sw/source/ui/dbui/mmaddressblockpage.src \
     sw/source/ui/dbui/mmgreetingspage.src \
@@ -84,11 +102,9 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
     sw/source/ui/dbui/mmpreparemergepage.src \
     sw/source/ui/dbui/selectdbtabledialog.src \
     sw/source/ui/dialog/dialog.src \
-    sw/source/ui/dialog/regionsw.src \
     sw/source/ui/dochdl/dochdl.src \
     sw/source/ui/docvw/annotation.src \
     sw/source/ui/docvw/access.src \
-    sw/source/ui/docvw/docvw.src \
     sw/source/ui/envelp/envelp.src \
     sw/source/ui/envelp/label.src \
     sw/source/ui/envelp/labfmt.src \
@@ -98,29 +114,18 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
     sw/source/ui/globdoc/globdoc.src \
     sw/source/ui/index/cnttab.src \
     sw/source/ui/index/idxmrk.src \
-    sw/source/ui/lingu/olmenu.src \
     sw/source/ui/misc/glossary.src \
     sw/source/ui/misc/numberingtypelistbox.src \
-    sw/source/ui/misc/redlndlg.src \
     sw/source/ui/misc/srtdlg.src \
     sw/source/ui/misc/swruler.src \
-    sw/source/ui/ribbar/inputwin.src \
     sw/source/ui/ribbar/tbxanchr.src \
-    sw/source/ui/ribbar/workctrl.src \
     sw/source/ui/shells/shells.src \
     sw/source/ui/sidebar/PagePropertyPanel.src \
-    sw/source/ui/smartmenu/stmenu.src \
     sw/source/ui/table/table.src \
     sw/source/ui/table/tabledlg.src \
-    sw/source/ui/uiview/view.src \
-    sw/source/ui/utlui/attrdesc.src \
-    sw/source/ui/utlui/initui.src \
-    sw/source/ui/utlui/navipi.src \
     sw/source/ui/utlui/poolfmt.src \
-    sw/source/ui/utlui/unotools.src \
     sw/source/ui/utlui/utlui.src \
     sw/source/ui/web/web.src \
-    sw/source/ui/wrtsh/wrtsh.src \
 ))
 
 $(eval $(call gb_SrsTarget_add_nonlocalizable_files,sw/res,\
@@ -128,7 +133,7 @@ $(eval $(call gb_SrsTarget_add_nonlocalizable_files,sw/res,\
 ))
 
 $(eval $(call gb_SrsTarget_add_templates,sw/res,\
-    sw/source/ui/inc/redline_tmpl.hrc \
+    sw/source/core/uibase/inc/redline_tmpl.hrc \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/CppunitTest_sw_htmlexport.mk b/sw/CppunitTest_sw_htmlexport.mk
index 2da0c3f4d08c..18b4afd26752 100644
--- a/sw/CppunitTest_sw_htmlexport.mk
+++ b/sw/CppunitTest_sw_htmlexport.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_CppunitTest_set_include,sw_htmlexport,\
     -I$(SRCDIR)/sw/inc \
 	-I$(SRCDIR)/sw/source/ui/inc \
     -I$(SRCDIR)/sw/source/core/inc \
+    -I$(SRCDIR)/sw/source/core/uibase/inc \
 	-I$(SRCDIR)/sw/qa/extras/inc \
     $$(INCLUDE) \
 ))
diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk
index a37b4380fa25..e61967a533f7 100644
--- a/sw/CppunitTest_sw_odfimport.mk
+++ b/sw/CppunitTest_sw_odfimport.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_odfimport,\
 $(eval $(call gb_CppunitTest_set_include,sw_odfimport,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
+    -I$(SRCDIR)/sw/source/core/uibase/inc \
     -I$(SRCDIR)/sw/source/ui/inc \
 	-I$(SRCDIR)/sw/qa/extras/inc \
     $$(INCLUDE) \
diff --git a/sw/CppunitTest_sw_uiwriter.mk b/sw/CppunitTest_sw_uiwriter.mk
index cbe54c10ad17..376d3615ed6f 100644
--- a/sw/CppunitTest_sw_uiwriter.mk
+++ b/sw/CppunitTest_sw_uiwriter.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_use_externals,sw_uiwriter,\
 $(eval $(call gb_CppunitTest_set_include,sw_uiwriter,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
+    -I$(SRCDIR)/sw/source/core/uibase/inc \
     -I$(SRCDIR)/sw/source/ui/inc \
     -I$(SRCDIR)/sw/qa/extras/inc \
     $$(INCLUDE) \
diff --git a/sw/Executable_tiledrendering.mk b/sw/Executable_tiledrendering.mk
index e174950e2039..b66092db99ea 100644
--- a/sw/Executable_tiledrendering.mk
+++ b/sw/Executable_tiledrendering.mk
@@ -18,7 +18,7 @@ $(eval $(call gb_Executable_use_api,tiledrendering,\
 
 $(eval $(call gb_Executable_set_include,tiledrendering,\
     -I$(SRCDIR)/sw/inc \
-    -I$(SRCDIR)/sw/source/ui/inc \
+    -I$(SRCDIR)/sw/source/core/uibase/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index ff77482c3b3e..cbdb192dede9 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_Library_set_precompiled_header,sw,$(SRCDIR)/sw/inc/pch/precompi
 $(eval $(call gb_Library_set_include,sw,\
     -I$(SRCDIR)/sw/source/core/inc \
     -I$(SRCDIR)/sw/source/filter/inc \
-    -I$(SRCDIR)/sw/source/ui/inc \
+    -I$(SRCDIR)/sw/source/core/uibase/inc \
     -I$(SRCDIR)/sw/inc \
     -I$(WORKDIR)/SdiTarget/sw/sdi \
     $$(INCLUDE) \
@@ -533,219 +533,219 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
     sw/source/filter/xml/xmltext \
     sw/source/filter/xml/xmltexte \
     sw/source/filter/xml/xmltexti \
-    sw/source/ui/app/appenv \
-    sw/source/ui/app/apphdl \
-    sw/source/ui/app/applab \
-    sw/source/ui/app/appopt \
-    sw/source/ui/app/docsh \
-    sw/source/ui/app/docsh2 \
-    sw/source/ui/app/docshdrw \
-    sw/source/ui/app/docshini \
-    sw/source/ui/app/docst \
-    sw/source/ui/app/docstyle \
-    sw/source/ui/app/mainwn \
-    sw/source/ui/app/swdll \
-    sw/source/ui/app/swmodul1 \
-    sw/source/ui/app/swmodule \
-    sw/source/ui/app/swwait \
-    sw/source/ui/cctrl/actctrl \
-    sw/source/ui/cctrl/popbox \
-    sw/source/ui/cctrl/swlbox \
-    sw/source/ui/chrdlg/ccoll \
-    sw/source/ui/config/barcfg \
-    sw/source/ui/config/caption \
-    sw/source/ui/config/cfgitems \
-    sw/source/ui/config/dbconfig \
-    sw/source/ui/config/fontcfg \
-    sw/source/ui/config/modcfg \
-    sw/source/ui/config/prtopt \
-    sw/source/ui/config/uinums \
-    sw/source/ui/config/usrpref \
-    sw/source/ui/config/viewopt \
-    sw/source/ui/dialog/SwSpellDialogChildWindow \
-    sw/source/ui/dialog/regionsw \
-    sw/source/ui/dialog/swabstdlg \
-    sw/source/ui/dialog/swwrtshitem \
-    sw/source/ui/dochdl/gloshdl \
-    sw/source/ui/dochdl/swdtflvr \
-    sw/source/ui/docvw/AnchorOverlayObject \
-    sw/source/ui/docvw/AnnotationMenuButton \
-    sw/source/ui/docvw/AnnotationWin \
-    sw/source/ui/docvw/DashedLine \
-	sw/source/ui/docvw/FrameControlsManager \
-    sw/source/ui/docvw/PageBreakWin \
-    sw/source/ui/docvw/OverlayRanges \
-    sw/source/ui/docvw/PostItMgr \
-    sw/source/ui/docvw/ShadowOverlayObject \
-    sw/source/ui/docvw/SidebarTxtControl \
-    sw/source/ui/docvw/SidebarTxtControlAcc \
-    sw/source/ui/docvw/SidebarWin \
-    sw/source/ui/docvw/SidebarWinAcc \
-    sw/source/ui/docvw/HeaderFooterWin \
-    sw/source/ui/docvw/edtdd \
-    sw/source/ui/docvw/edtwin \
-    sw/source/ui/docvw/edtwin2 \
-    sw/source/ui/docvw/edtwin3 \
-    sw/source/ui/docvw/frmsidebarwincontainer \
-    sw/source/ui/docvw/romenu \
-    sw/source/ui/docvw/srcedtw \
-    sw/source/ui/envelp/envimg \
-    sw/source/ui/envelp/labelcfg \
-    sw/source/ui/envelp/labimg \
-    sw/source/ui/envelp/syncbtn \
-    sw/source/ui/fldui/fldmgr \
-    sw/source/ui/fldui/fldwrap \
-    sw/source/ui/fldui/xfldui \
-    sw/source/ui/frmdlg/colex \
-    sw/source/ui/frmdlg/colmgr \
-    sw/source/ui/frmdlg/frmmgr \
-    sw/source/ui/globdoc/globdoc \
-    sw/source/ui/index/idxmrk \
-    sw/source/ui/dialog/wordcountwrapper \
-    sw/source/ui/index/toxmgr \
-    sw/source/ui/lingu/hhcwrp \
-    sw/source/ui/lingu/hyp \
-    sw/source/ui/lingu/olmenu \
-    sw/source/ui/lingu/sdrhhcwrap \
-    sw/source/ui/misc/glosdoc \
-    sw/source/ui/misc/glshell \
-    sw/source/ui/misc/numberingtypelistbox \
-    sw/source/ui/misc/redlndlg \
-    sw/source/ui/misc/swruler \
-    sw/source/ui/ribbar/conarc \
-    sw/source/ui/ribbar/concustomshape \
-    sw/source/ui/ribbar/conform \
-    sw/source/ui/ribbar/conpoly \
-    sw/source/ui/ribbar/conrect \
-    sw/source/ui/ribbar/drawbase \
-    sw/source/ui/ribbar/dselect \
-    sw/source/ui/ribbar/inputwin \
-    sw/source/ui/ribbar/tblctrl \
-    sw/source/ui/ribbar/tbxanchr \
-    sw/source/ui/ribbar/workctrl \
-    sw/source/ui/shells/annotsh \
-    sw/source/ui/shells/basesh \
-    sw/source/ui/shells/beziersh \
-    sw/source/ui/shells/drawdlg \
-    sw/source/ui/shells/drawsh \
-    sw/source/ui/shells/drformsh \
-    sw/source/ui/shells/drwbassh \
-    sw/source/ui/shells/drwtxtex \
-    sw/source/ui/shells/drwtxtsh \
-    sw/source/ui/shells/frmsh \
-    sw/source/ui/shells/grfsh \
-    sw/source/ui/shells/grfshex \
-    sw/source/ui/shells/langhelper \
-    sw/source/ui/shells/listsh \
-    sw/source/ui/shells/mediash \
-    sw/source/ui/shells/navsh \
-    sw/source/ui/shells/olesh \
-    sw/source/ui/shells/slotadd \
-    sw/source/ui/shells/tabsh \
-    sw/source/ui/shells/textdrw \
-    sw/source/ui/shells/textfld \
-    sw/source/ui/shells/textglos \
-    sw/source/ui/shells/textidx \
-    sw/source/ui/shells/textsh \
-    sw/source/ui/shells/textsh1 \
-    sw/source/ui/shells/textsh2 \
-    sw/source/ui/shells/txtattr \
-    sw/source/ui/shells/txtcrsr \
-    sw/source/ui/shells/txtnum \
-    sw/source/ui/sidebar/PageOrientationControl \
-    sw/source/ui/sidebar/PageMarginControl \
-    sw/source/ui/sidebar/PageSizeControl \
-    sw/source/ui/sidebar/PageColumnControl \
-    sw/source/ui/sidebar/PagePropertyPanel \
-    sw/source/ui/sidebar/WrapPropertyPanel \
-    sw/source/ui/sidebar/SwPanelFactory \
-    sw/source/ui/smartmenu/stmenu \
-    sw/source/ui/table/chartins \
-    sw/source/ui/table/swtablerep \
-    sw/source/ui/table/tablemgr \
-    sw/source/ui/uiview/formatclipboard \
-    sw/source/ui/uiview/pview \
-    sw/source/ui/uiview/scroll \
-    sw/source/ui/uiview/srcview \
-    sw/source/ui/uiview/swcli \
-    sw/source/ui/uiview/uivwimp \
-    sw/source/ui/uiview/view \
-    sw/source/ui/uiview/view0 \
-    sw/source/ui/uiview/view1 \
-    sw/source/ui/uiview/view2 \
-    sw/source/ui/uiview/viewcoll \
-    sw/source/ui/uiview/viewdlg \
-    sw/source/ui/uiview/viewdlg2 \
-    sw/source/ui/uiview/viewdraw \
-    sw/source/ui/uiview/viewling \
-    sw/source/ui/uiview/viewmdi \
-    sw/source/ui/uiview/viewport \
-    sw/source/ui/uiview/viewprt \
-    sw/source/ui/uiview/viewsrch \
-    sw/source/ui/uiview/viewstat \
-    sw/source/ui/uiview/viewtab \
-    sw/source/ui/uno/SwXDocumentSettings \
-    sw/source/ui/uno/SwXFilterOptions \
-    sw/source/ui/uno/dlelstnr \
-    sw/source/ui/uno/unoatxt \
-    sw/source/ui/uno/unodefaults \
-    sw/source/ui/uno/unodispatch \
-    sw/source/ui/uno/unodoc \
-    sw/source/ui/uno/unofreg \
-    sw/source/ui/uno/unomailmerge \
-    sw/source/ui/uno/unomod \
-    sw/source/ui/uno/unomodule \
-    sw/source/ui/uno/unotxdoc \
-    sw/source/ui/uno/unotxvw \
-    sw/source/ui/utlui/attrdesc \
-    sw/source/ui/utlui/bookctrl \
-    sw/source/ui/utlui/condedit \
-    sw/source/ui/utlui/content \
-    sw/source/ui/utlui/glbltree \
-    sw/source/ui/utlui/gloslst \
-    sw/source/ui/utlui/initui \
-    sw/source/ui/utlui/navicfg \
-    sw/source/ui/utlui/navipi \
-    sw/source/ui/utlui/numfmtlb \
-    sw/source/ui/utlui/prcntfld \
-    sw/source/ui/utlui/shdwcrsr \
-    sw/source/ui/utlui/tmplctrl \
-    sw/source/ui/utlui/uiitems \
-    sw/source/ui/utlui/uitool \
-    sw/source/ui/utlui/unotools \
-    sw/source/ui/utlui/viewlayoutctrl \
-    sw/source/ui/utlui/wordcountctrl \
-    sw/source/ui/utlui/zoomctrl \
-    sw/source/ui/web/wdocsh \
-    sw/source/ui/web/wformsh \
-    sw/source/ui/web/wfrmsh \
-    sw/source/ui/web/wgrfsh \
-    sw/source/ui/web/wlistsh \
-    sw/source/ui/web/wolesh \
-    sw/source/ui/web/wtabsh \
-    sw/source/ui/web/wtextsh \
-    sw/source/ui/web/wview \
-    sw/source/ui/wrtsh/delete \
-    sw/source/ui/wrtsh/move \
-    sw/source/ui/wrtsh/navmgr \
-    sw/source/ui/wrtsh/select \
-    sw/source/ui/wrtsh/wrtsh1 \
-    sw/source/ui/wrtsh/wrtsh2 \
-    sw/source/ui/wrtsh/wrtsh3 \
-    sw/source/ui/wrtsh/wrtsh4 \
-    sw/source/ui/wrtsh/wrtundo \
+    sw/source/core/uibase/app/appenv \
+    sw/source/core/uibase/app/apphdl \
+    sw/source/core/uibase/app/applab \
+    sw/source/core/uibase/app/appopt \
+    sw/source/core/uibase/app/docsh \
+    sw/source/core/uibase/app/docsh2 \
+    sw/source/core/uibase/app/docshdrw \
+    sw/source/core/uibase/app/docshini \
+    sw/source/core/uibase/app/docst \
+    sw/source/core/uibase/app/docstyle \
+    sw/source/core/uibase/app/mainwn \
+    sw/source/core/uibase/app/swdll \
+    sw/source/core/uibase/app/swmodul1 \
+    sw/source/core/uibase/app/swmodule \
+    sw/source/core/uibase/app/swwait \
+    sw/source/core/uibase/cctrl/actctrl \
+    sw/source/core/uibase/cctrl/popbox \
+    sw/source/core/uibase/cctrl/swlbox \
+    sw/source/core/uibase/chrdlg/ccoll \
+    sw/source/core/uibase/config/barcfg \
+    sw/source/core/uibase/config/caption \
+    sw/source/core/uibase/config/cfgitems \
+    sw/source/core/uibase/config/dbconfig \
+    sw/source/core/uibase/config/fontcfg \
+    sw/source/core/uibase/config/modcfg \
+    sw/source/core/uibase/config/prtopt \
+    sw/source/core/uibase/config/uinums \
+    sw/source/core/uibase/config/usrpref \
+    sw/source/core/uibase/config/viewopt \
+    sw/source/core/uibase/dialog/SwSpellDialogChildWindow \
+    sw/source/core/uibase/dialog/regionsw \
+    sw/source/core/uibase/dialog/swabstdlg \
+    sw/source/core/uibase/dialog/swwrtshitem \
+    sw/source/core/uibase/dochdl/gloshdl \
+    sw/source/core/uibase/dochdl/swdtflvr \
+    sw/source/core/uibase/docvw/AnchorOverlayObject \
+    sw/source/core/uibase/docvw/AnnotationMenuButton \
+    sw/source/core/uibase/docvw/AnnotationWin \
+    sw/source/core/uibase/docvw/DashedLine \
+	sw/source/core/uibase/docvw/FrameControlsManager \
+    sw/source/core/uibase/docvw/PageBreakWin \
+    sw/source/core/uibase/docvw/OverlayRanges \
+    sw/source/core/uibase/docvw/PostItMgr \
+    sw/source/core/uibase/docvw/ShadowOverlayObject \
+    sw/source/core/uibase/docvw/SidebarTxtControl \
+    sw/source/core/uibase/docvw/SidebarTxtControlAcc \
+    sw/source/core/uibase/docvw/SidebarWin \
+    sw/source/core/uibase/docvw/SidebarWinAcc \
+    sw/source/core/uibase/docvw/HeaderFooterWin \
+    sw/source/core/uibase/docvw/edtdd \
+    sw/source/core/uibase/docvw/edtwin \
+    sw/source/core/uibase/docvw/edtwin2 \
+    sw/source/core/uibase/docvw/edtwin3 \
+    sw/source/core/uibase/docvw/frmsidebarwincontainer \
+    sw/source/core/uibase/docvw/romenu \
+    sw/source/core/uibase/docvw/srcedtw \
+    sw/source/core/uibase/envelp/envimg \
+    sw/source/core/uibase/envelp/labelcfg \
+    sw/source/core/uibase/envelp/labimg \
+    sw/source/core/uibase/envelp/syncbtn \
+    sw/source/core/uibase/fldui/fldmgr \
+    sw/source/core/uibase/fldui/fldwrap \
+    sw/source/core/uibase/fldui/xfldui \
+    sw/source/core/uibase/frmdlg/colex \
+    sw/source/core/uibase/frmdlg/colmgr \
+    sw/source/core/uibase/frmdlg/frmmgr \
+    sw/source/core/uibase/globdoc/globdoc \
+    sw/source/core/uibase/index/idxmrk \
+    sw/source/core/uibase/dialog/wordcountwrapper \
+    sw/source/core/uibase/index/toxmgr \
+    sw/source/core/uibase/lingu/hhcwrp \
+    sw/source/core/uibase/lingu/hyp \
+    sw/source/core/uibase/lingu/olmenu \
+    sw/source/core/uibase/lingu/sdrhhcwrap \
+    sw/source/core/uibase/misc/glosdoc \
+    sw/source/core/uibase/misc/glshell \
+    sw/source/core/uibase/misc/numberingtypelistbox \
+    sw/source/core/uibase/misc/redlndlg \
+    sw/source/core/uibase/misc/swruler \
+    sw/source/core/uibase/ribbar/conarc \
+    sw/source/core/uibase/ribbar/concustomshape \
+    sw/source/core/uibase/ribbar/conform \
+    sw/source/core/uibase/ribbar/conpoly \
+    sw/source/core/uibase/ribbar/conrect \
+    sw/source/core/uibase/ribbar/drawbase \
+    sw/source/core/uibase/ribbar/dselect \
+    sw/source/core/uibase/ribbar/inputwin \
+    sw/source/core/uibase/ribbar/tblctrl \
+    sw/source/core/uibase/ribbar/tbxanchr \
+    sw/source/core/uibase/ribbar/workctrl \
+    sw/source/core/uibase/shells/annotsh \
+    sw/source/core/uibase/shells/basesh \
+    sw/source/core/uibase/shells/beziersh \
+    sw/source/core/uibase/shells/drawdlg \
+    sw/source/core/uibase/shells/drawsh \
+    sw/source/core/uibase/shells/drformsh \
+    sw/source/core/uibase/shells/drwbassh \
+    sw/source/core/uibase/shells/drwtxtex \
+    sw/source/core/uibase/shells/drwtxtsh \
+    sw/source/core/uibase/shells/frmsh \
+    sw/source/core/uibase/shells/grfsh \
+    sw/source/core/uibase/shells/grfshex \
+    sw/source/core/uibase/shells/langhelper \
+    sw/source/core/uibase/shells/listsh \
+    sw/source/core/uibase/shells/mediash \
+    sw/source/core/uibase/shells/navsh \
+    sw/source/core/uibase/shells/olesh \
+    sw/source/core/uibase/shells/slotadd \
+    sw/source/core/uibase/shells/tabsh \
+    sw/source/core/uibase/shells/textdrw \
+    sw/source/core/uibase/shells/textfld \
+    sw/source/core/uibase/shells/textglos \
+    sw/source/core/uibase/shells/textidx \
+    sw/source/core/uibase/shells/textsh \
+    sw/source/core/uibase/shells/textsh1 \
+    sw/source/core/uibase/shells/textsh2 \
+    sw/source/core/uibase/shells/txtattr \
+    sw/source/core/uibase/shells/txtcrsr \
+    sw/source/core/uibase/shells/txtnum \
+    sw/source/core/uibase/sidebar/PageOrientationControl \
+    sw/source/core/uibase/sidebar/PageMarginControl \
+    sw/source/core/uibase/sidebar/PageSizeControl \
+    sw/source/core/uibase/sidebar/PageColumnControl \
+    sw/source/core/uibase/sidebar/PagePropertyPanel \
+    sw/source/core/uibase/sidebar/WrapPropertyPanel \
+    sw/source/core/uibase/sidebar/SwPanelFactory \
+    sw/source/core/uibase/smartmenu/stmenu \
+    sw/source/core/uibase/table/chartins \
+    sw/source/core/uibase/table/swtablerep \
+    sw/source/core/uibase/table/tablemgr \
+    sw/source/core/uibase/uiview/formatclipboard \
+    sw/source/core/uibase/uiview/pview \
+    sw/source/core/uibase/uiview/scroll \
+    sw/source/core/uibase/uiview/srcview \
+    sw/source/core/uibase/uiview/swcli \
+    sw/source/core/uibase/uiview/uivwimp \
+    sw/source/core/uibase/uiview/view \
+    sw/source/core/uibase/uiview/view0 \
+    sw/source/core/uibase/uiview/view1 \
+    sw/source/core/uibase/uiview/view2 \
+    sw/source/core/uibase/uiview/viewcoll \
+    sw/source/core/uibase/uiview/viewdlg \
+    sw/source/core/uibase/uiview/viewdlg2 \
+    sw/source/core/uibase/uiview/viewdraw \
+    sw/source/core/uibase/uiview/viewling \
+    sw/source/core/uibase/uiview/viewmdi \
+    sw/source/core/uibase/uiview/viewport \
+    sw/source/core/uibase/uiview/viewprt \
+    sw/source/core/uibase/uiview/viewsrch \
+    sw/source/core/uibase/uiview/viewstat \
+    sw/source/core/uibase/uiview/viewtab \
+    sw/source/core/uibase/uno/SwXDocumentSettings \
+    sw/source/core/uibase/uno/SwXFilterOptions \
+    sw/source/core/uibase/uno/dlelstnr \
+    sw/source/core/uibase/uno/unoatxt \
+    sw/source/core/uibase/uno/unodefaults \
+    sw/source/core/uibase/uno/unodispatch \
+    sw/source/core/uibase/uno/unodoc \
+    sw/source/core/uibase/uno/unofreg \
+    sw/source/core/uibase/uno/unomailmerge \
+    sw/source/core/uibase/uno/unomod \
+    sw/source/core/uibase/uno/unomodule \
+    sw/source/core/uibase/uno/unotxdoc \
+    sw/source/core/uibase/uno/unotxvw \
+    sw/source/core/uibase/utlui/attrdesc \
+    sw/source/core/uibase/utlui/bookctrl \
+    sw/source/core/uibase/utlui/condedit \
+    sw/source/core/uibase/utlui/content \
+    sw/source/core/uibase/utlui/glbltree \
+    sw/source/core/uibase/utlui/gloslst \
+    sw/source/core/uibase/utlui/initui \
+    sw/source/core/uibase/utlui/navicfg \
+    sw/source/core/uibase/utlui/navipi \
+    sw/source/core/uibase/utlui/numfmtlb \
+    sw/source/core/uibase/utlui/prcntfld \
+    sw/source/core/uibase/utlui/shdwcrsr \
+    sw/source/core/uibase/utlui/tmplctrl \
+    sw/source/core/uibase/utlui/uiitems \
+    sw/source/core/uibase/utlui/uitool \
+    sw/source/core/uibase/utlui/unotools \
+    sw/source/core/uibase/utlui/viewlayoutctrl \
+    sw/source/core/uibase/utlui/wordcountctrl \
+    sw/source/core/uibase/utlui/zoomctrl \
+    sw/source/core/uibase/web/wdocsh \
+    sw/source/core/uibase/web/wformsh \
+    sw/source/core/uibase/web/wfrmsh \
+    sw/source/core/uibase/web/wgrfsh \
+    sw/source/core/uibase/web/wlistsh \
+    sw/source/core/uibase/web/wolesh \
+    sw/source/core/uibase/web/wtabsh \
+    sw/source/core/uibase/web/wtextsh \
+    sw/source/core/uibase/web/wview \
+    sw/source/core/uibase/wrtsh/delete \
+    sw/source/core/uibase/wrtsh/move \
+    sw/source/core/uibase/wrtsh/navmgr \
+    sw/source/core/uibase/wrtsh/select \
+    sw/source/core/uibase/wrtsh/wrtsh1 \
+    sw/source/core/uibase/wrtsh/wrtsh2 \
+    sw/source/core/uibase/wrtsh/wrtsh3 \
+    sw/source/core/uibase/wrtsh/wrtsh4 \
+    sw/source/core/uibase/wrtsh/wrtundo \
 ))
 
 ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
 $(eval $(call gb_Library_add_exception_objects,sw,\
-    sw/source/ui/dbui/dbmgr \
-    sw/source/ui/dbui/dbtree \
-    sw/source/ui/dbui/dbui \
-    sw/source/ui/dbui/maildispatcher \
-    sw/source/ui/dbui/mailmergechildwindow \
-    sw/source/ui/dbui/mailmergehelper \
-    sw/source/ui/dbui/mmconfigitem \
-    sw/source/ui/dbui/swdbtoolsclient \
+    sw/source/core/uibase/dbui/dbmgr \
+    sw/source/core/uibase/dbui/dbtree \
+    sw/source/core/uibase/dbui/dbui \
+    sw/source/core/uibase/dbui/maildispatcher \
+    sw/source/core/uibase/dbui/mailmergechildwindow \
+    sw/source/core/uibase/dbui/mailmergehelper \
+    sw/source/core/uibase/dbui/mmconfigitem \
+    sw/source/core/uibase/dbui/swdbtoolsclient \
 ))
 endif
 
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index b6932f1cb73d..7d466a57d3d7 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_Library_Library,swui))
 $(eval $(call gb_Library_set_include,swui,\
     -I$(SRCDIR)/sw/inc \
     -I$(SRCDIR)/sw/source/core/inc \
+    -I$(SRCDIR)/sw/source/core/uibase/inc \
     -I$(SRCDIR)/sw/source/filter/inc \
     -I$(SRCDIR)/sw/source/ui/inc \
     -I$(WORKDIR)/SdiTarget/sw/sdi \
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index 0a25f7b442c6..f499f38f99a0 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_Library_set_precompiled_header,vbaswobj,$(SRCDIR)/sw/inc/pch/pr
 
 $(eval $(call gb_Library_set_include,vbaswobj,\
     -I$(SRCDIR)/sw/source/core/inc \
+    -I$(SRCDIR)/sw/source/core/uibase/inc \
     -I$(SRCDIR)/sw/source/filter/inc \
     -I$(SRCDIR)/sw/source/ui/inc \
     -I$(SRCDIR)/sw/inc \
diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx
index b5f2c94f21f7..762482e528dd 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -28,8 +28,8 @@
 #include "ndole.hxx"
 #include <doc.hxx>
 #include <docsh.hxx>
-#include <../../ui/inc/wrtsh.hxx>
-#include <../../ui/inc/view.hxx>
+#include <../uibase/inc/wrtsh.hxx>
+#include <../uibase/inc/view.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 04c3b3fc6ad2..82e9ff31f43c 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -96,7 +96,7 @@
 #include <expfld.hxx>
 #include <flddat.hxx>
 #include <fldui.hrc>
-#include "../../ui/inc/fldmgr.hxx"
+#include "../uibase/inc/fldmgr.hxx"
 #include "fldbas.hxx"      // SwField
 
 using namespace ::com::sun::star;
diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/core/uibase/app/appenv.cxx
index 50acd4ada9e2..50acd4ada9e2 100644
--- a/sw/source/ui/app/appenv.cxx
+++ b/sw/source/core/uibase/app/appenv.cxx
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/core/uibase/app/apphdl.cxx
index 60ad48006403..60ad48006403 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/core/uibase/app/apphdl.cxx
diff --git a/sw/source/ui/app/applab.cxx b/sw/source/core/uibase/app/applab.cxx
index 4118e705b98c..4118e705b98c 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/core/uibase/app/applab.cxx
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/core/uibase/app/appopt.cxx
index 3658dfa6c0d1..3658dfa6c0d1 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/core/uibase/app/appopt.cxx
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/core/uibase/app/docsh.cxx
index 875e91cc965b..875e91cc965b 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/core/uibase/app/docsh.cxx
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/core/uibase/app/docsh2.cxx
index e3830a7ba4e2..e3830a7ba4e2 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/core/uibase/app/docsh2.cxx
diff --git a/sw/source/ui/app/docshdrw.cxx b/sw/source/core/uibase/app/docshdrw.cxx
index 12f31e8006ed..12f31e8006ed 100644
--- a/sw/source/ui/app/docshdrw.cxx
+++ b/sw/source/core/uibase/app/docshdrw.cxx
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/core/uibase/app/docshini.cxx
index 968ec591f168..968ec591f168 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/core/uibase/app/docshini.cxx
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/core/uibase/app/docst.cxx
index 896062714055..896062714055 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/core/uibase/app/docst.cxx
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/core/uibase/app/docstyle.cxx
index b52bcd971f01..b52bcd971f01 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/core/uibase/app/docstyle.cxx
diff --git a/sw/source/ui/app/mainwn.cxx b/sw/source/core/uibase/app/mainwn.cxx
index 98b2e4b623b7..98b2e4b623b7 100644
--- a/sw/source/ui/app/mainwn.cxx
+++ b/sw/source/core/uibase/app/mainwn.cxx
diff --git a/sw/source/ui/app/swdll.cxx b/sw/source/core/uibase/app/swdll.cxx
index cb6d19e079e1..cb6d19e079e1 100644
--- a/sw/source/ui/app/swdll.cxx
+++ b/sw/source/core/uibase/app/swdll.cxx
diff --git a/sw/source/ui/app/swdllimpl.hxx b/sw/source/core/uibase/app/swdllimpl.hxx
index b51ab6b49ca2..b51ab6b49ca2 100644
--- a/sw/source/ui/app/swdllimpl.hxx
+++ b/sw/source/core/uibase/app/swdllimpl.hxx
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/core/uibase/app/swmodul1.cxx
index a0401dd70c5b..a0401dd70c5b 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/core/uibase/app/swmodul1.cxx
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/core/uibase/app/swmodule.cxx
index 115ab46da5cf..115ab46da5cf 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/core/uibase/app/swmodule.cxx
diff --git a/sw/source/ui/app/swwait.cxx b/sw/source/core/uibase/app/swwait.cxx
index f25f27209b1b..f25f27209b1b 100644
--- a/sw/source/ui/app/swwait.cxx
+++ b/sw/source/core/uibase/app/swwait.cxx
diff --git a/sw/source/ui/cctrl/actctrl.cxx b/sw/source/core/uibase/cctrl/actctrl.cxx
index d3d1936aea04..d3d1936aea04 100644
--- a/sw/source/ui/cctrl/actctrl.cxx
+++ b/sw/source/core/uibase/cctrl/actctrl.cxx
diff --git a/sw/source/ui/cctrl/popbox.cxx b/sw/source/core/uibase/cctrl/popbox.cxx
index 4ebf98d738df..4ebf98d738df 100644
--- a/sw/source/ui/cctrl/popbox.cxx
+++ b/sw/source/core/uibase/cctrl/popbox.cxx
diff --git a/sw/source/ui/cctrl/swlbox.cxx b/sw/source/core/uibase/cctrl/swlbox.cxx
index 384fca4f5fc0..384fca4f5fc0 100644
--- a/sw/source/ui/cctrl/swlbox.cxx
+++ b/sw/source/core/uibase/cctrl/swlbox.cxx
diff --git a/sw/source/ui/chrdlg/ccoll.cxx b/sw/source/core/uibase/chrdlg/ccoll.cxx
index 726c66974f13..726c66974f13 100644
--- a/sw/source/ui/chrdlg/ccoll.cxx
+++ b/sw/source/core/uibase/chrdlg/ccoll.cxx
diff --git a/sw/source/ui/config/barcfg.cxx b/sw/source/core/uibase/config/barcfg.cxx
index f9c4db5a81fd..f9c4db5a81fd 100644
--- a/sw/source/ui/config/barcfg.cxx
+++ b/sw/source/core/uibase/config/barcfg.cxx
diff --git a/sw/source/ui/config/caption.cxx b/sw/source/core/uibase/config/caption.cxx
index 76e1a0907b2f..76e1a0907b2f 100644
--- a/sw/source/ui/config/caption.cxx
+++ b/sw/source/core/uibase/config/caption.cxx
diff --git a/sw/source/ui/config/cfgitems.cxx b/sw/source/core/uibase/config/cfgitems.cxx
index 7272f6c7000f..7272f6c7000f 100644
--- a/sw/source/ui/config/cfgitems.cxx
+++ b/sw/source/core/uibase/config/cfgitems.cxx
diff --git a/sw/source/ui/config/dbconfig.cxx b/sw/source/core/uibase/config/dbconfig.cxx
index 19f802df42d5..19f802df42d5 100644
--- a/sw/source/ui/config/dbconfig.cxx
+++ b/sw/source/core/uibase/config/dbconfig.cxx
diff --git a/sw/source/ui/config/fontcfg.cxx b/sw/source/core/uibase/config/fontcfg.cxx
index 35d84ab36034..35d84ab36034 100644
--- a/sw/source/ui/config/fontcfg.cxx
+++ b/sw/source/core/uibase/config/fontcfg.cxx
diff --git a/sw/source/ui/config/modcfg.cxx b/sw/source/core/uibase/config/modcfg.cxx
index 211b34ad1080..211b34ad1080 100644
--- a/sw/source/ui/config/modcfg.cxx
+++ b/sw/source/core/uibase/config/modcfg.cxx
diff --git a/sw/source/ui/config/prtopt.cxx b/sw/source/core/uibase/config/prtopt.cxx
index ac3251b0d145..ac3251b0d145 100644
--- a/sw/source/ui/config/prtopt.cxx
+++ b/sw/source/core/uibase/config/prtopt.cxx
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/core/uibase/config/uinums.cxx
index 8871d2b15bc7..8871d2b15bc7 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/core/uibase/config/uinums.cxx
diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/core/uibase/config/usrpref.cxx
index 7c47d4518486..7c47d4518486 100644
--- a/sw/source/ui/config/usrpref.cxx
+++ b/sw/source/core/uibase/config/usrpref.cxx
diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/core/uibase/config/viewopt.cxx
index 688e99829e64..688e99829e64 100644
--- a/sw/source/ui/config/viewopt.cxx
+++ b/sw/source/core/uibase/config/viewopt.cxx
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/core/uibase/dbui/dbmgr.cxx
index 2905c6799529..2905c6799529 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/core/uibase/dbui/dbmgr.cxx
diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/core/uibase/dbui/dbtree.cxx
index 7eb15a02c677..7eb15a02c677 100644
--- a/sw/source/ui/dbui/dbtree.cxx
+++ b/sw/source/core/uibase/dbui/dbtree.cxx
diff --git a/sw/source/ui/dbui/dbui.cxx b/sw/source/core/uibase/dbui/dbui.cxx
index 8247f5c8bfe0..8247f5c8bfe0 100644
--- a/sw/source/ui/dbui/dbui.cxx
+++ b/sw/source/core/uibase/dbui/dbui.cxx
diff --git a/sw/source/ui/dbui/maildispatcher.cxx b/sw/source/core/uibase/dbui/maildispatcher.cxx
index 2208f1a122be..2208f1a122be 100644
--- a/sw/source/ui/dbui/maildispatcher.cxx
+++ b/sw/source/core/uibase/dbui/maildispatcher.cxx
diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/core/uibase/dbui/mailmergechildwindow.cxx
index 48761c615d2b..67966f12abf5 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.cxx
+++ b/sw/source/core/uibase/dbui/mailmergechildwindow.cxx
@@ -27,7 +27,7 @@
 #include <vcl/layout.hxx>
 #include <vcl/svapp.hxx>
 #include <mailmergechildwindow.hxx>
-#include <mmoutputpage.hxx>
+#include <../../../ui/dbui/mmoutputpage.hxx>
 #include <mmconfigitem.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
diff --git a/sw/source/ui/dbui/mailmergechildwindow.hrc b/sw/source/core/uibase/dbui/mailmergechildwindow.hrc
index 1ba778b63506..1ba778b63506 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.hrc
+++ b/sw/source/core/uibase/dbui/mailmergechildwindow.hrc
diff --git a/sw/source/ui/dbui/mailmergechildwindow.src b/sw/source/core/uibase/dbui/mailmergechildwindow.src
index 9e0961803af8..9e0961803af8 100644
--- a/sw/source/ui/dbui/mailmergechildwindow.src
+++ b/sw/source/core/uibase/dbui/mailmergechildwindow.src
diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/core/uibase/dbui/mailmergehelper.cxx
index 26e60f2537f4..26e60f2537f4 100644
--- a/sw/source/ui/dbui/mailmergehelper.cxx
+++ b/sw/source/core/uibase/dbui/mailmergehelper.cxx
diff --git a/sw/source/ui/dbui/mmconfigitem.cxx b/sw/source/core/uibase/dbui/mmconfigitem.cxx
index ad8a2393adec..ad8a2393adec 100644
--- a/sw/source/ui/dbui/mmconfigitem.cxx
+++ b/sw/source/core/uibase/dbui/mmconfigitem.cxx
diff --git a/sw/source/ui/dbui/swdbtoolsclient.cxx b/sw/source/core/uibase/dbui/swdbtoolsclient.cxx
index 9fdc6a3ce930..9fdc6a3ce930 100644
--- a/sw/source/ui/dbui/swdbtoolsclient.cxx
+++ b/sw/source/core/uibase/dbui/swdbtoolsclient.cxx
diff --git a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx b/sw/source/core/uibase/dialog/SwSpellDialogChildWindow.cxx
index a9a7c503a3e3..a9a7c503a3e3 100644
--- a/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/core/uibase/dialog/SwSpellDialogChildWindow.cxx
diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/core/uibase/dialog/regionsw.cxx
index 4085c67717f9..4085c67717f9 100644
--- a/sw/source/ui/dialog/regionsw.cxx
+++ b/sw/source/core/uibase/dialog/regionsw.cxx
diff --git a/sw/source/ui/dialog/regionsw.hrc b/sw/source/core/uibase/dialog/regionsw.hrc
index b7d45f309c8d..b7d45f309c8d 100644
--- a/sw/source/ui/dialog/regionsw.hrc
+++ b/sw/source/core/uibase/dialog/regionsw.hrc
diff --git a/sw/source/ui/dialog/regionsw.src b/sw/source/core/uibase/dialog/regionsw.src
index fa1e976bfa49..fa1e976bfa49 100644
--- a/sw/source/ui/dialog/regionsw.src
+++ b/sw/source/core/uibase/dialog/regionsw.src
diff --git a/sw/source/ui/dialog/swabstdlg.cxx b/sw/source/core/uibase/dialog/swabstdlg.cxx
index 8cf41aa5604d..8cf41aa5604d 100644
--- a/sw/source/ui/dialog/swabstdlg.cxx
+++ b/sw/source/core/uibase/dialog/swabstdlg.cxx
diff --git a/sw/source/ui/dialog/swwrtshitem.cxx b/sw/source/core/uibase/dialog/swwrtshitem.cxx
index 591a6b5403f5..591a6b5403f5 100644
--- a/sw/source/ui/dialog/swwrtshitem.cxx
+++ b/sw/source/core/uibase/dialog/swwrtshitem.cxx
diff --git a/sw/source/ui/dialog/wordcountwrapper.cxx b/sw/source/core/uibase/dialog/wordcountwrapper.cxx
index 78cf4ee95a5b..78cf4ee95a5b 100644
--- a/sw/source/ui/dialog/wordcountwrapper.cxx
+++ b/sw/source/core/uibase/dialog/wordcountwrapper.cxx
diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/core/uibase/dochdl/gloshdl.cxx
index 6aa1d5800964..6aa1d5800964 100644
--- a/sw/source/ui/dochdl/gloshdl.cxx
+++ b/sw/source/core/uibase/dochdl/gloshdl.cxx
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/core/uibase/dochdl/swdtflvr.cxx
index 9d4acca9e51c..9d4acca9e51c 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/core/uibase/dochdl/swdtflvr.cxx
diff --git a/sw/source/ui/docvw/AnchorOverlayObject.cxx b/sw/source/core/uibase/docvw/AnchorOverlayObject.cxx
index 5ea13c2cfe93..5ea13c2cfe93 100644
--- a/sw/source/ui/docvw/AnchorOverlayObject.cxx
+++ b/sw/source/core/uibase/docvw/AnchorOverlayObject.cxx
diff --git a/sw/source/ui/docvw/AnchorOverlayObject.hxx b/sw/source/core/uibase/docvw/AnchorOverlayObject.hxx
index 7c86e1abe013..7c86e1abe013 100644
--- a/sw/source/ui/docvw/AnchorOverlayObject.hxx
+++ b/sw/source/core/uibase/docvw/AnchorOverlayObject.hxx
diff --git a/sw/source/ui/docvw/AnnotationMenuButton.cxx b/sw/source/core/uibase/docvw/AnnotationMenuButton.cxx
index f54378d6d17a..f54378d6d17a 100644
--- a/sw/source/ui/docvw/AnnotationMenuButton.cxx
+++ b/sw/source/core/uibase/docvw/AnnotationMenuButton.cxx
diff --git a/sw/source/ui/docvw/AnnotationMenuButton.hxx b/sw/source/core/uibase/docvw/AnnotationMenuButton.hxx
index c1334e8e077b..c1334e8e077b 100644
--- a/sw/source/ui/docvw/AnnotationMenuButton.hxx
+++ b/sw/source/core/uibase/docvw/AnnotationMenuButton.hxx
diff --git a/sw/source/ui/docvw/AnnotationWin.cxx b/sw/source/core/uibase/docvw/AnnotationWin.cxx
index 4d8215efd400..4d8215efd400 100644
--- a/sw/source/ui/docvw/AnnotationWin.cxx
+++ b/sw/source/core/uibase/docvw/AnnotationWin.cxx
diff --git a/sw/source/ui/docvw/DashedLine.cxx b/sw/source/core/uibase/docvw/DashedLine.cxx
index e9e343b3dc27..e9e343b3dc27 100644
--- a/sw/source/ui/docvw/DashedLine.cxx
+++ b/sw/source/core/uibase/docvw/DashedLine.cxx
diff --git a/sw/source/ui/docvw/FrameControlsManager.cxx b/sw/source/core/uibase/docvw/FrameControlsManager.cxx
index 67d8006f4aa5..67d8006f4aa5 100644
--- a/sw/source/ui/docvw/FrameControlsManager.cxx
+++ b/sw/source/core/uibase/docvw/FrameControlsManager.cxx
diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx b/sw/source/core/uibase/docvw/HeaderFooterWin.cxx
index b68c59a194d8..b68c59a194d8 100644
--- a/sw/source/ui/docvw/HeaderFooterWin.cxx
+++ b/sw/source/core/uibase/docvw/HeaderFooterWin.cxx
diff --git a/sw/source/ui/docvw/OverlayRanges.cxx b/sw/source/core/uibase/docvw/OverlayRanges.cxx
index 7b44a9b3bdb9..7b44a9b3bdb9 100755
--- a/sw/source/ui/docvw/OverlayRanges.cxx
+++ b/sw/source/core/uibase/docvw/OverlayRanges.cxx
diff --git a/sw/source/ui/docvw/OverlayRanges.hxx b/sw/source/core/uibase/docvw/OverlayRanges.hxx
index ccbe668211aa..ccbe668211aa 100755
--- a/sw/source/ui/docvw/OverlayRanges.hxx
+++ b/sw/source/core/uibase/docvw/OverlayRanges.hxx
diff --git a/sw/source/ui/docvw/PageBreakWin.cxx b/sw/source/core/uibase/docvw/PageBreakWin.cxx
index 1380fdfcc469..1380fdfcc469 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/core/uibase/docvw/PageBreakWin.cxx
diff --git a/sw/source/ui/docvw/PostItMgr.cxx b/sw/source/core/uibase/docvw/PostItMgr.cxx
index 82f078c445db..82f078c445db 100644
--- a/sw/source/ui/docvw/PostItMgr.cxx
+++ b/sw/source/core/uibase/docvw/PostItMgr.cxx
diff --git a/sw/source/ui/docvw/ShadowOverlayObject.cxx b/sw/source/core/uibase/docvw/ShadowOverlayObject.cxx
index efb1a5d68e27..efb1a5d68e27 100644
--- a/sw/source/ui/docvw/ShadowOverlayObject.cxx
+++ b/sw/source/core/uibase/docvw/ShadowOverlayObject.cxx
diff --git a/sw/source/ui/docvw/ShadowOverlayObject.hxx b/sw/source/core/uibase/docvw/ShadowOverlayObject.hxx
index d692ec86a75b..d692ec86a75b 100644
--- a/sw/source/ui/docvw/ShadowOverlayObject.hxx
+++ b/sw/source/core/uibase/docvw/ShadowOverlayObject.hxx
diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/core/uibase/docvw/SidebarTxtControl.cxx
index 292950dd8c36..292950dd8c36 100644
--- a/sw/source/ui/docvw/SidebarTxtControl.cxx
+++ b/sw/source/core/uibase/docvw/SidebarTxtControl.cxx
diff --git a/sw/source/ui/docvw/SidebarTxtControl.hxx b/sw/source/core/uibase/docvw/SidebarTxtControl.hxx
index 37829b290a5a..37829b290a5a 100644
--- a/sw/source/ui/docvw/SidebarTxtControl.hxx
+++ b/sw/source/core/uibase/docvw/SidebarTxtControl.hxx
diff --git a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx b/sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx
index b833bc708570..b833bc708570 100644
--- a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx
diff --git a/sw/source/ui/docvw/SidebarTxtControlAcc.hxx b/sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx
index 051c5ecd7758..051c5ecd7758 100644
--- a/sw/source/ui/docvw/SidebarTxtControlAcc.hxx
+++ b/sw/source/core/uibase/docvw/SidebarTxtControlAcc.hxx
diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/core/uibase/docvw/SidebarWin.cxx
index 14553ad2e564..14553ad2e564 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/core/uibase/docvw/SidebarWin.cxx
diff --git a/sw/source/ui/docvw/SidebarWinAcc.cxx b/sw/source/core/uibase/docvw/SidebarWinAcc.cxx
index 99ba832a60db..99ba832a60db 100644
--- a/sw/source/ui/docvw/SidebarWinAcc.cxx
+++ b/sw/source/core/uibase/docvw/SidebarWinAcc.cxx
diff --git a/sw/source/ui/docvw/SidebarWinAcc.hxx b/sw/source/core/uibase/docvw/SidebarWinAcc.hxx
index c86516d5ce99..c86516d5ce99 100644
--- a/sw/source/ui/docvw/SidebarWinAcc.hxx
+++ b/sw/source/core/uibase/docvw/SidebarWinAcc.hxx
diff --git a/sw/source/ui/docvw/annotation.hrc b/sw/source/core/uibase/docvw/annotation.hrc
index 7daf55524899..7daf55524899 100644
--- a/sw/source/ui/docvw/annotation.hrc
+++ b/sw/source/core/uibase/docvw/annotation.hrc
diff --git a/sw/source/ui/docvw/docvw.hrc b/sw/source/core/uibase/docvw/docvw.hrc
index 7f5e5b6e9786..7f5e5b6e9786 100644
--- a/sw/source/ui/docvw/docvw.hrc
+++ b/sw/source/core/uibase/docvw/docvw.hrc
diff --git a/sw/source/ui/docvw/docvw.src b/sw/source/core/uibase/docvw/docvw.src
index ff10f368a012..ff10f368a012 100644
--- a/sw/source/ui/docvw/docvw.src
+++ b/sw/source/core/uibase/docvw/docvw.src
diff --git a/sw/source/ui/docvw/edtdd.cxx b/sw/source/core/uibase/docvw/edtdd.cxx
index da9d0fb9cc4e..da9d0fb9cc4e 100644
--- a/sw/source/ui/docvw/edtdd.cxx
+++ b/sw/source/core/uibase/docvw/edtdd.cxx
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/core/uibase/docvw/edtwin.cxx
index 10794255f42b..10794255f42b 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/core/uibase/docvw/edtwin.cxx
diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/core/uibase/docvw/edtwin2.cxx
index f2779a03262e..f2779a03262e 100644
--- a/sw/source/ui/docvw/edtwin2.cxx
+++ b/sw/source/core/uibase/docvw/edtwin2.cxx
diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/core/uibase/docvw/edtwin3.cxx
index a860d484df12..a860d484df12 100644
--- a/sw/source/ui/docvw/edtwin3.cxx
+++ b/sw/source/core/uibase/docvw/edtwin3.cxx
diff --git a/sw/source/ui/docvw/frmsidebarwincontainer.cxx b/sw/source/core/uibase/docvw/frmsidebarwincontainer.cxx
index 3760f9778446..3760f9778446 100644
--- a/sw/source/ui/docvw/frmsidebarwincontainer.cxx
+++ b/sw/source/core/uibase/docvw/frmsidebarwincontainer.cxx
diff --git a/sw/source/ui/docvw/frmsidebarwincontainer.hxx b/sw/source/core/uibase/docvw/frmsidebarwincontainer.hxx
index 51e657a551e1..51e657a551e1 100644
--- a/sw/source/ui/docvw/frmsidebarwincontainer.hxx
+++ b/sw/source/core/uibase/docvw/frmsidebarwincontainer.hxx
diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/core/uibase/docvw/romenu.cxx
index bbed8b0a7589..bbed8b0a7589 100644
--- a/sw/source/ui/docvw/romenu.cxx
+++ b/sw/source/core/uibase/docvw/romenu.cxx
diff --git a/sw/source/ui/docvw/romenu.hxx b/sw/source/core/uibase/docvw/romenu.hxx
index e0242db41504..e0242db41504 100644
--- a/sw/source/ui/docvw/romenu.hxx
+++ b/sw/source/core/uibase/docvw/romenu.hxx
diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/core/uibase/docvw/srcedtw.cxx
index 65c6f25c02c5..65c6f25c02c5 100644
--- a/sw/source/ui/docvw/srcedtw.cxx
+++ b/sw/source/core/uibase/docvw/srcedtw.cxx
diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/core/uibase/envelp/envimg.cxx
index 6bdbe02f6e31..6bdbe02f6e31 100644
--- a/sw/source/ui/envelp/envimg.cxx
+++ b/sw/source/core/uibase/envelp/envimg.cxx
diff --git a/sw/source/ui/envelp/label.hrc b/sw/source/core/uibase/envelp/label.hrc
index 702c3db94e2a..702c3db94e2a 100644
--- a/sw/source/ui/envelp/label.hrc
+++ b/sw/source/core/uibase/envelp/label.hrc
diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/core/uibase/envelp/labelcfg.cxx
index 8630ea098465..8630ea098465 100644
--- a/sw/source/ui/envelp/labelcfg.cxx
+++ b/sw/source/core/uibase/envelp/labelcfg.cxx
diff --git a/sw/source/ui/envelp/labimg.cxx b/sw/source/core/uibase/envelp/labimg.cxx
index a2006b87dda9..a2006b87dda9 100644
--- a/sw/source/ui/envelp/labimg.cxx
+++ b/sw/source/core/uibase/envelp/labimg.cxx
diff --git a/sw/source/ui/envelp/labimp.hxx b/sw/source/core/uibase/envelp/labimp.hxx
index 5d4d17d7cfb3..5d4d17d7cfb3 100644
--- a/sw/source/ui/envelp/labimp.hxx
+++ b/sw/source/core/uibase/envelp/labimp.hxx
diff --git a/sw/source/ui/envelp/syncbtn.cxx b/sw/source/core/uibase/envelp/syncbtn.cxx
index b3882f011b8e..b3882f011b8e 100644
--- a/sw/source/ui/envelp/syncbtn.cxx
+++ b/sw/source/core/uibase/envelp/syncbtn.cxx
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/core/uibase/fldui/fldmgr.cxx
index d4a0b5c4fb09..d4a0b5c4fb09 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/core/uibase/fldui/fldmgr.cxx
diff --git a/sw/source/ui/fldui/fldwrap.cxx b/sw/source/core/uibase/fldui/fldwrap.cxx
index 955978d7b8b8..955978d7b8b8 100644
--- a/sw/source/ui/fldui/fldwrap.cxx
+++ b/sw/source/core/uibase/fldui/fldwrap.cxx
diff --git a/sw/source/ui/fldui/xfldui.cxx b/sw/source/core/uibase/fldui/xfldui.cxx
index 000a5b75a54c..000a5b75a54c 100644
--- a/sw/source/ui/fldui/xfldui.cxx
+++ b/sw/source/core/uibase/fldui/xfldui.cxx
diff --git a/sw/source/ui/frmdlg/colex.cxx b/sw/source/core/uibase/frmdlg/colex.cxx
index 3137ec7565c5..3137ec7565c5 100644
--- a/sw/source/ui/frmdlg/colex.cxx
+++ b/sw/source/core/uibase/frmdlg/colex.cxx
diff --git a/sw/source/ui/frmdlg/colmgr.cxx b/sw/source/core/uibase/frmdlg/colmgr.cxx
index 8ea5563eb474..8ea5563eb474 100644
--- a/sw/source/ui/frmdlg/colmgr.cxx
+++ b/sw/source/core/uibase/frmdlg/colmgr.cxx
diff --git a/sw/source/ui/frmdlg/frmmgr.cxx b/sw/source/core/uibase/frmdlg/frmmgr.cxx
index 07f6149e0011..07f6149e0011 100644
--- a/sw/source/ui/frmdlg/frmmgr.cxx
+++ b/sw/source/core/uibase/frmdlg/frmmgr.cxx
diff --git a/sw/source/ui/globdoc/globdoc.cxx b/sw/source/core/uibase/globdoc/globdoc.cxx
index 1d72d5c16e0e..1d72d5c16e0e 100644
--- a/sw/source/ui/globdoc/globdoc.cxx
+++ b/sw/source/core/uibase/globdoc/globdoc.cxx
diff --git a/sw/source/ui/inc/DashedLine.hxx b/sw/source/core/uibase/inc/DashedLine.hxx
index 14ea2ef2507d..14ea2ef2507d 100644
--- a/sw/source/ui/inc/DashedLine.hxx
+++ b/sw/source/core/uibase/inc/DashedLine.hxx
diff --git a/sw/source/ui/inc/DropDownFieldDialog.hxx b/sw/source/core/uibase/inc/DropDownFieldDialog.hxx
index 48ee686e8fe6..48ee686e8fe6 100644
--- a/sw/source/ui/inc/DropDownFieldDialog.hxx
+++ b/sw/source/core/uibase/inc/DropDownFieldDialog.hxx
diff --git a/sw/source/ui/inc/FrameControl.hxx b/sw/source/core/uibase/inc/FrameControl.hxx
index f976efbb31c5..f976efbb31c5 100644
--- a/sw/source/ui/inc/FrameControl.hxx
+++ b/sw/source/core/uibase/inc/FrameControl.hxx
diff --git a/sw/source/ui/inc/FrameControlsManager.hxx b/sw/source/core/uibase/inc/FrameControlsManager.hxx
index a9824c953b60..a9824c953b60 100644
--- a/sw/source/ui/inc/FrameControlsManager.hxx
+++ b/sw/source/core/uibase/inc/FrameControlsManager.hxx
diff --git a/sw/source/ui/inc/HeaderFooterWin.hxx b/sw/source/core/uibase/inc/HeaderFooterWin.hxx
index 945d02de07e6..945d02de07e6 100644
--- a/sw/source/ui/inc/HeaderFooterWin.hxx
+++ b/sw/source/core/uibase/inc/HeaderFooterWin.hxx
diff --git a/sw/source/ui/inc/PageBreakWin.hxx b/sw/source/core/uibase/inc/PageBreakWin.hxx
index 9e9ed283b182..9e9ed283b182 100644
--- a/sw/source/ui/inc/PageBreakWin.hxx
+++ b/sw/source/core/uibase/inc/PageBreakWin.hxx
diff --git a/sw/source/ui/inc/SidebarWindowsConsts.hxx b/sw/source/core/uibase/inc/SidebarWindowsConsts.hxx
index c2ed68276da5..c2ed68276da5 100644
--- a/sw/source/ui/inc/SidebarWindowsConsts.hxx
+++ b/sw/source/core/uibase/inc/SidebarWindowsConsts.hxx
diff --git a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx b/sw/source/core/uibase/inc/SwSpellDialogChildWindow.hxx
index 922841304721..922841304721 100644
--- a/sw/source/ui/inc/SwSpellDialogChildWindow.hxx
+++ b/sw/source/core/uibase/inc/SwSpellDialogChildWindow.hxx
diff --git a/sw/source/ui/inc/SwXFilterOptions.hxx b/sw/source/core/uibase/inc/SwXFilterOptions.hxx
index 8e39c494f529..8e39c494f529 100644
--- a/sw/source/ui/inc/SwXFilterOptions.hxx
+++ b/sw/source/core/uibase/inc/SwXFilterOptions.hxx
diff --git a/sw/source/ui/inc/abstract.hxx b/sw/source/core/uibase/inc/abstract.hxx
index e6c80037e57b..e6c80037e57b 100644
--- a/sw/source/ui/inc/abstract.hxx
+++ b/sw/source/core/uibase/inc/abstract.hxx
diff --git a/sw/source/ui/inc/actctrl.hxx b/sw/source/core/uibase/inc/actctrl.hxx
index 0111eb1de37d..0111eb1de37d 100644
--- a/sw/source/ui/inc/actctrl.hxx
+++ b/sw/source/core/uibase/inc/actctrl.hxx
diff --git a/sw/source/ui/inc/addrdlg.hxx b/sw/source/core/uibase/inc/addrdlg.hxx
index 14a1f0d9929f..14a1f0d9929f 100644
--- a/sw/source/ui/inc/addrdlg.hxx
+++ b/sw/source/core/uibase/inc/addrdlg.hxx
diff --git a/sw/source/ui/inc/annotsh.hxx b/sw/source/core/uibase/inc/annotsh.hxx
index 7592d441b29a..7592d441b29a 100644
--- a/sw/source/ui/inc/annotsh.hxx
+++ b/sw/source/core/uibase/inc/annotsh.hxx
diff --git a/sw/source/ui/inc/app.hrc b/sw/source/core/uibase/inc/app.hrc
index c5ac3f54edfe..c5ac3f54edfe 100644
--- a/sw/source/ui/inc/app.hrc
+++ b/sw/source/core/uibase/inc/app.hrc
diff --git a/sw/source/ui/inc/ascfldlg.hxx b/sw/source/core/uibase/inc/ascfldlg.hxx
index 040485fedc08..040485fedc08 100644
--- a/sw/source/ui/inc/ascfldlg.hxx
+++ b/sw/source/core/uibase/inc/ascfldlg.hxx
diff --git a/sw/source/ui/inc/autoedit.hxx b/sw/source/core/uibase/inc/autoedit.hxx
index 94d81b771527..94d81b771527 100644
--- a/sw/source/ui/inc/autoedit.hxx
+++ b/sw/source/core/uibase/inc/autoedit.hxx
diff --git a/sw/source/ui/inc/barcfg.hxx b/sw/source/core/uibase/inc/barcfg.hxx
index f0e05c11dde9..f0e05c11dde9 100644
--- a/sw/source/ui/inc/barcfg.hxx
+++ b/sw/source/core/uibase/inc/barcfg.hxx
diff --git a/sw/source/ui/inc/basesh.hxx b/sw/source/core/uibase/inc/basesh.hxx
index 9875221d4c72..9875221d4c72 100644
--- a/sw/source/ui/inc/basesh.hxx
+++ b/sw/source/core/uibase/inc/basesh.hxx
diff --git a/sw/source/ui/inc/beziersh.hxx b/sw/source/core/uibase/inc/beziersh.hxx
index c957d083d1f8..c957d083d1f8 100644
--- a/sw/source/ui/inc/beziersh.hxx
+++ b/sw/source/core/uibase/inc/beziersh.hxx
diff --git a/sw/source/ui/inc/bmpwin.hxx b/sw/source/core/uibase/inc/bmpwin.hxx
index dcf59bb97efb..dcf59bb97efb 100644
--- a/sw/source/ui/inc/bmpwin.hxx
+++ b/sw/source/core/uibase/inc/bmpwin.hxx
diff --git a/sw/source/ui/inc/bookctrl.hxx b/sw/source/core/uibase/inc/bookctrl.hxx
index a8ce181fd7fc..a8ce181fd7fc 100644
--- a/sw/source/ui/inc/bookctrl.hxx
+++ b/sw/source/core/uibase/inc/bookctrl.hxx
diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/core/uibase/inc/bookmark.hxx
index 2c896c17d3eb..2c896c17d3eb 100644
--- a/sw/source/ui/inc/bookmark.hxx
+++ b/sw/source/core/uibase/inc/bookmark.hxx
diff --git a/sw/source/ui/inc/break.hxx b/sw/source/core/uibase/inc/break.hxx
index 00933a759b4f..00933a759b4f 100644
--- a/sw/source/ui/inc/break.hxx
+++ b/sw/source/core/uibase/inc/break.hxx
diff --git a/sw/source/ui/inc/caption.hxx b/sw/source/core/uibase/inc/caption.hxx
index 5f91f6f24fae..5f91f6f24fae 100644
--- a/sw/source/ui/inc/caption.hxx
+++ b/sw/source/core/uibase/inc/caption.hxx
diff --git a/sw/source/ui/inc/cfgid.h b/sw/source/core/uibase/inc/cfgid.h
index 20f652978fe1..20f652978fe1 100644
--- a/sw/source/ui/inc/cfgid.h
+++ b/sw/source/core/uibase/inc/cfgid.h
diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/core/uibase/inc/cfgitems.hxx
index fbcafa3c228c..fbcafa3c228c 100644
--- a/sw/source/ui/inc/cfgitems.hxx
+++ b/sw/source/core/uibase/inc/cfgitems.hxx
diff --git a/sw/source/ui/inc/changedb.hxx b/sw/source/core/uibase/inc/changedb.hxx
index 4e8e31acce58..4e8e31acce58 100644
--- a/sw/source/ui/inc/changedb.hxx
+++ b/sw/source/core/uibase/inc/changedb.hxx
diff --git a/sw/source/ui/inc/chartins.hxx b/sw/source/core/uibase/inc/chartins.hxx
index 848653cf45f0..848653cf45f0 100644
--- a/sw/source/ui/inc/chartins.hxx
+++ b/sw/source/core/uibase/inc/chartins.hxx
diff --git a/sw/source/ui/inc/chldwrap.hxx b/sw/source/core/uibase/inc/chldwrap.hxx
index 41f771acc2f9..41f771acc2f9 100644
--- a/sw/source/ui/inc/chldwrap.hxx
+++ b/sw/source/core/uibase/inc/chldwrap.hxx
diff --git a/sw/source/ui/inc/chrdlg.hxx b/sw/source/core/uibase/inc/chrdlg.hxx
index c01cc2d16357..c01cc2d16357 100644
--- a/sw/source/ui/inc/chrdlg.hxx
+++ b/sw/source/core/uibase/inc/chrdlg.hxx
diff --git a/sw/source/ui/inc/chrdlgmodes.hxx b/sw/source/core/uibase/inc/chrdlgmodes.hxx
index bc7d6a2be8d0..bc7d6a2be8d0 100644
--- a/sw/source/ui/inc/chrdlgmodes.hxx
+++ b/sw/source/core/uibase/inc/chrdlgmodes.hxx
diff --git a/sw/source/ui/inc/cnttab.hxx b/sw/source/core/uibase/inc/cnttab.hxx
index a1a6fae550a3..a1a6fae550a3 100644
--- a/sw/source/ui/inc/cnttab.hxx
+++ b/sw/source/core/uibase/inc/cnttab.hxx
diff --git a/sw/source/ui/inc/colex.hxx b/sw/source/core/uibase/inc/colex.hxx
index 748cc8db0396..748cc8db0396 100644
--- a/sw/source/ui/inc/colex.hxx
+++ b/sw/source/core/uibase/inc/colex.hxx
diff --git a/sw/source/ui/inc/colmgr.hxx b/sw/source/core/uibase/inc/colmgr.hxx
index b3f73001005a..b3f73001005a 100644
--- a/sw/source/ui/inc/colmgr.hxx
+++ b/sw/source/core/uibase/inc/colmgr.hxx
diff --git a/sw/source/ui/inc/column.hxx b/sw/source/core/uibase/inc/column.hxx
index 2593a35be19c..2593a35be19c 100644
--- a/sw/source/ui/inc/column.hxx
+++ b/sw/source/core/uibase/inc/column.hxx
diff --git a/sw/source/ui/inc/conarc.hxx b/sw/source/core/uibase/inc/conarc.hxx
index 354a625468f2..354a625468f2 100644
--- a/sw/source/ui/inc/conarc.hxx
+++ b/sw/source/core/uibase/inc/conarc.hxx
diff --git a/sw/source/ui/inc/concustomshape.hxx b/sw/source/core/uibase/inc/concustomshape.hxx
index 96d6707b9a90..96d6707b9a90 100644
--- a/sw/source/ui/inc/concustomshape.hxx
+++ b/sw/source/core/uibase/inc/concustomshape.hxx
diff --git a/sw/source/ui/inc/condedit.hxx b/sw/source/core/uibase/inc/condedit.hxx
index 514a23e58c55..514a23e58c55 100644
--- a/sw/source/ui/inc/condedit.hxx
+++ b/sw/source/core/uibase/inc/condedit.hxx
diff --git a/sw/source/ui/inc/conform.hxx b/sw/source/core/uibase/inc/conform.hxx
index a1226a21f25e..a1226a21f25e 100644
--- a/sw/source/ui/inc/conform.hxx
+++ b/sw/source/core/uibase/inc/conform.hxx
diff --git a/sw/source/ui/inc/conpoly.hxx b/sw/source/core/uibase/inc/conpoly.hxx
index d91c38e0dd6b..d91c38e0dd6b 100644
--- a/sw/source/ui/inc/conpoly.hxx
+++ b/sw/source/core/uibase/inc/conpoly.hxx
diff --git a/sw/source/ui/inc/conrect.hxx b/sw/source/core/uibase/inc/conrect.hxx
index 4791935d37ce..4791935d37ce 100644
--- a/sw/source/ui/inc/conrect.hxx
+++ b/sw/source/core/uibase/inc/conrect.hxx
diff --git a/sw/source/ui/inc/content.hxx b/sw/source/core/uibase/inc/content.hxx
index 2700bd261e83..2700bd261e83 100644
--- a/sw/source/ui/inc/content.hxx
+++ b/sw/source/core/uibase/inc/content.hxx
diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/core/uibase/inc/conttree.hxx
index d51152a344e7..d51152a344e7 100644
--- a/sw/source/ui/inc/conttree.hxx
+++ b/sw/source/core/uibase/inc/conttree.hxx
diff --git a/sw/source/ui/inc/convert.hxx b/sw/source/core/uibase/inc/convert.hxx
index e9f17a60e6e7..e9f17a60e6e7 100644
--- a/sw/source/ui/inc/convert.hxx
+++ b/sw/source/core/uibase/inc/convert.hxx
diff --git a/sw/source/ui/inc/cption.hxx b/sw/source/core/uibase/inc/cption.hxx
index 578efcdb8e1c..578efcdb8e1c 100644
--- a/sw/source/ui/inc/cption.hxx
+++ b/sw/source/core/uibase/inc/cption.hxx
diff --git a/sw/source/ui/inc/dbconfig.hxx b/sw/source/core/uibase/inc/dbconfig.hxx
index 042a719b7338..042a719b7338 100644
--- a/sw/source/ui/inc/dbconfig.hxx
+++ b/sw/source/core/uibase/inc/dbconfig.hxx
diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/core/uibase/inc/dbinsdlg.hxx
index 4d271dd41e2a..4d271dd41e2a 100644
--- a/sw/source/ui/inc/dbinsdlg.hxx
+++ b/sw/source/core/uibase/inc/dbinsdlg.hxx
diff --git a/sw/source/ui/inc/dbtree.hxx b/sw/source/core/uibase/inc/dbtree.hxx
index 7120cbf25e17..7120cbf25e17 100644
--- a/sw/source/ui/inc/dbtree.hxx
+++ b/sw/source/core/uibase/inc/dbtree.hxx
diff --git a/sw/source/ui/inc/dbui.hxx b/sw/source/core/uibase/inc/dbui.hxx
index 7105b2ec0199..7105b2ec0199 100644
--- a/sw/source/ui/inc/dbui.hxx
+++ b/sw/source/core/uibase/inc/dbui.hxx
diff --git a/sw/source/ui/inc/dialmgr.hxx b/sw/source/core/uibase/inc/dialmgr.hxx
index 468b90402f9b..468b90402f9b 100644
--- a/sw/source/ui/inc/dialmgr.hxx
+++ b/sw/source/core/uibase/inc/dialmgr.hxx
diff --git a/sw/source/ui/inc/docfnote.hxx b/sw/source/core/uibase/inc/docfnote.hxx
index c5289213d2b2..c5289213d2b2 100644
--- a/sw/source/ui/inc/docfnote.hxx
+++ b/sw/source/core/uibase/inc/docfnote.hxx
diff --git a/sw/source/ui/inc/docstdlg.hxx b/sw/source/core/uibase/inc/docstdlg.hxx
index 60275da16acd..60275da16acd 100644
--- a/sw/source/ui/inc/docstdlg.hxx
+++ b/sw/source/core/uibase/inc/docstdlg.hxx
diff --git a/sw/source/ui/inc/drawbase.hxx b/sw/source/core/uibase/inc/drawbase.hxx
index 98c111dc2a6a..98c111dc2a6a 100644
--- a/sw/source/ui/inc/drawbase.hxx
+++ b/sw/source/core/uibase/inc/drawbase.hxx
diff --git a/sw/source/ui/inc/drawsh.hxx b/sw/source/core/uibase/inc/drawsh.hxx
index 545faf748d7d..545faf748d7d 100644
--- a/sw/source/ui/inc/drawsh.hxx
+++ b/sw/source/core/uibase/inc/drawsh.hxx
diff --git a/sw/source/ui/inc/drformsh.hxx b/sw/source/core/uibase/inc/drformsh.hxx
index 8f58bae51b96..8f58bae51b96 100644
--- a/sw/source/ui/inc/drformsh.hxx
+++ b/sw/source/core/uibase/inc/drformsh.hxx
diff --git a/sw/source/ui/inc/drpcps.hxx b/sw/source/core/uibase/inc/drpcps.hxx
index dd4a37377a4b..dd4a37377a4b 100644
--- a/sw/source/ui/inc/drpcps.hxx
+++ b/sw/source/core/uibase/inc/drpcps.hxx
diff --git a/sw/source/ui/inc/drwbassh.hxx b/sw/source/core/uibase/inc/drwbassh.hxx
index 7bb62ad9076c..7bb62ad9076c 100644
--- a/sw/source/ui/inc/drwbassh.hxx
+++ b/sw/source/core/uibase/inc/drwbassh.hxx
diff --git a/sw/source/ui/inc/drwtxtsh.hxx b/sw/source/core/uibase/inc/drwtxtsh.hxx
index 9fbe1b20eee5..9fbe1b20eee5 100644
--- a/sw/source/ui/inc/drwtxtsh.hxx
+++ b/sw/source/core/uibase/inc/drwtxtsh.hxx
diff --git a/sw/source/ui/inc/dselect.hxx b/sw/source/core/uibase/inc/dselect.hxx
index d3905bc27e57..d3905bc27e57 100644
--- a/sw/source/ui/inc/dselect.hxx
+++ b/sw/source/core/uibase/inc/dselect.hxx
diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/core/uibase/inc/edtwin.hxx
index 7b6c807a6223..7b6c807a6223 100644
--- a/sw/source/ui/inc/edtwin.hxx
+++ b/sw/source/core/uibase/inc/edtwin.hxx
diff --git a/sw/source/ui/inc/envimg.hxx b/sw/source/core/uibase/inc/envimg.hxx
index 9c766e11acea..9c766e11acea 100644
--- a/sw/source/ui/inc/envimg.hxx
+++ b/sw/source/core/uibase/inc/envimg.hxx
diff --git a/sw/source/ui/inc/envlop.hxx b/sw/source/core/uibase/inc/envlop.hxx
index b7b7906ec79e..b7b7906ec79e 100644
--- a/sw/source/ui/inc/envlop.hxx
+++ b/sw/source/core/uibase/inc/envlop.hxx
diff --git a/sw/source/ui/inc/fldedt.hxx b/sw/source/core/uibase/inc/fldedt.hxx
index 89312e6421ee..89312e6421ee 100644
--- a/sw/source/ui/inc/fldedt.hxx
+++ b/sw/source/core/uibase/inc/fldedt.hxx
diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/core/uibase/inc/fldmgr.hxx
index 62c4210cae3a..62c4210cae3a 100644
--- a/sw/source/ui/inc/fldmgr.hxx
+++ b/sw/source/core/uibase/inc/fldmgr.hxx
diff --git a/sw/source/ui/inc/fldtdlg.hxx b/sw/source/core/uibase/inc/fldtdlg.hxx
index 4835a4afb054..4835a4afb054 100644
--- a/sw/source/ui/inc/fldtdlg.hxx
+++ b/sw/source/core/uibase/inc/fldtdlg.hxx
diff --git a/sw/source/ui/inc/fldwrap.hxx b/sw/source/core/uibase/inc/fldwrap.hxx
index 4a92fcf9c66d..4a92fcf9c66d 100644
--- a/sw/source/ui/inc/fldwrap.hxx
+++ b/sw/source/core/uibase/inc/fldwrap.hxx
diff --git a/sw/source/ui/inc/fontcfg.hxx b/sw/source/core/uibase/inc/fontcfg.hxx
index 49f536e8f48e..49f536e8f48e 100644
--- a/sw/source/ui/inc/fontcfg.hxx
+++ b/sw/source/core/uibase/inc/fontcfg.hxx
diff --git a/sw/source/ui/inc/formatclipboard.hxx b/sw/source/core/uibase/inc/formatclipboard.hxx
index 9d9335a32147..9d9335a32147 100644
--- a/sw/source/ui/inc/formatclipboard.hxx
+++ b/sw/source/core/uibase/inc/formatclipboard.hxx
diff --git a/sw/source/ui/inc/formedt.hxx b/sw/source/core/uibase/inc/formedt.hxx
index eb0cdb05f323..eb0cdb05f323 100644
--- a/sw/source/ui/inc/formedt.hxx
+++ b/sw/source/core/uibase/inc/formedt.hxx
diff --git a/sw/source/ui/inc/frmdlg.hxx b/sw/source/core/uibase/inc/frmdlg.hxx
index 6a985691da16..6a985691da16 100644
--- a/sw/source/ui/inc/frmdlg.hxx
+++ b/sw/source/core/uibase/inc/frmdlg.hxx
diff --git a/sw/source/ui/inc/frmmgr.hxx b/sw/source/core/uibase/inc/frmmgr.hxx
index 8ff94053f2eb..8ff94053f2eb 100644
--- a/sw/source/ui/inc/frmmgr.hxx
+++ b/sw/source/core/uibase/inc/frmmgr.hxx
diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/core/uibase/inc/frmpage.hxx
index 4f47b2c68067..4f47b2c68067 100644
--- a/sw/source/ui/inc/frmpage.hxx
+++ b/sw/source/core/uibase/inc/frmpage.hxx
diff --git a/sw/source/ui/inc/frmsh.hxx b/sw/source/core/uibase/inc/frmsh.hxx
index 031025c9a2dd..031025c9a2dd 100644
--- a/sw/source/ui/inc/frmsh.hxx
+++ b/sw/source/core/uibase/inc/frmsh.hxx
diff --git a/sw/source/ui/inc/frmui.hrc b/sw/source/core/uibase/inc/frmui.hrc
index 4e765f9c9456..4e765f9c9456 100644
--- a/sw/source/ui/inc/frmui.hrc
+++ b/sw/source/core/uibase/inc/frmui.hrc
diff --git a/sw/source/ui/inc/globals.h b/sw/source/core/uibase/inc/globals.h
index 4da432350b6f..4da432350b6f 100644
--- a/sw/source/ui/inc/globals.h
+++ b/sw/source/core/uibase/inc/globals.h
diff --git a/sw/source/ui/inc/globdoc.hrc b/sw/source/core/uibase/inc/globdoc.hrc
index 8c954b379294..8c954b379294 100644
--- a/sw/source/ui/inc/globdoc.hrc
+++ b/sw/source/core/uibase/inc/globdoc.hrc
diff --git a/sw/source/ui/inc/glosbib.hxx b/sw/source/core/uibase/inc/glosbib.hxx
index 7620f419784a..7620f419784a 100644
--- a/sw/source/ui/inc/glosbib.hxx
+++ b/sw/source/core/uibase/inc/glosbib.hxx
diff --git a/sw/source/ui/inc/glosdoc.hxx b/sw/source/core/uibase/inc/glosdoc.hxx
index a5213b1179a1..a5213b1179a1 100644
--- a/sw/source/ui/inc/glosdoc.hxx
+++ b/sw/source/core/uibase/inc/glosdoc.hxx
diff --git a/sw/source/ui/inc/gloshdl.hxx b/sw/source/core/uibase/inc/gloshdl.hxx
index 2d341fd80ec0..2d341fd80ec0 100644
--- a/sw/source/ui/inc/gloshdl.hxx
+++ b/sw/source/core/uibase/inc/gloshdl.hxx
diff --git a/sw/source/ui/inc/gloslst.hxx b/sw/source/core/uibase/inc/gloslst.hxx
index fb47656da3f2..fb47656da3f2 100644
--- a/sw/source/ui/inc/gloslst.hxx
+++ b/sw/source/core/uibase/inc/gloslst.hxx
diff --git a/sw/source/ui/inc/glossary.hxx b/sw/source/core/uibase/inc/glossary.hxx
index 98f441620528..98f441620528 100644
--- a/sw/source/ui/inc/glossary.hxx
+++ b/sw/source/core/uibase/inc/glossary.hxx
diff --git a/sw/source/ui/inc/glshell.hxx b/sw/source/core/uibase/inc/glshell.hxx
index 9e9513d22b77..9e9513d22b77 100644
--- a/sw/source/ui/inc/glshell.hxx
+++ b/sw/source/core/uibase/inc/glshell.hxx
diff --git a/sw/source/ui/inc/grfsh.hxx b/sw/source/core/uibase/inc/grfsh.hxx
index b05b5cb97d16..b05b5cb97d16 100644
--- a/sw/source/ui/inc/grfsh.hxx
+++ b/sw/source/core/uibase/inc/grfsh.hxx
diff --git a/sw/source/ui/inc/hyp.hxx b/sw/source/core/uibase/inc/hyp.hxx
index 02edf350fe63..02edf350fe63 100644
--- a/sw/source/ui/inc/hyp.hxx
+++ b/sw/source/core/uibase/inc/hyp.hxx
diff --git a/sw/source/ui/inc/idxmrk.hxx b/sw/source/core/uibase/inc/idxmrk.hxx
index 597dee285a91..597dee285a91 100644
--- a/sw/source/ui/inc/idxmrk.hxx
+++ b/sw/source/core/uibase/inc/idxmrk.hxx
diff --git a/sw/source/ui/inc/imaildsplistener.hxx b/sw/source/core/uibase/inc/imaildsplistener.hxx
index 5b7e329df0d7..5b7e329df0d7 100644
--- a/sw/source/ui/inc/imaildsplistener.hxx
+++ b/sw/source/core/uibase/inc/imaildsplistener.hxx
diff --git a/sw/source/ui/inc/initui.hxx b/sw/source/core/uibase/inc/initui.hxx
index 9d95043d3a19..9d95043d3a19 100644
--- a/sw/source/ui/inc/initui.hxx
+++ b/sw/source/core/uibase/inc/initui.hxx
diff --git a/sw/source/ui/inc/inpdlg.hxx b/sw/source/core/uibase/inc/inpdlg.hxx
index d96c59f484ad..d96c59f484ad 100644
--- a/sw/source/ui/inc/inpdlg.hxx
+++ b/sw/source/core/uibase/inc/inpdlg.hxx
diff --git a/sw/source/ui/inc/inputwin.hxx b/sw/source/core/uibase/inc/inputwin.hxx
index 2278f51c23d4..2278f51c23d4 100644
--- a/sw/source/ui/inc/inputwin.hxx
+++ b/sw/source/core/uibase/inc/inputwin.hxx
diff --git a/sw/source/ui/inc/insfnote.hxx b/sw/source/core/uibase/inc/insfnote.hxx
index 0c903a9a8341..0c903a9a8341 100644
--- a/sw/source/ui/inc/insfnote.hxx
+++ b/sw/source/core/uibase/inc/insfnote.hxx
diff --git a/sw/source/ui/inc/instable.hxx b/sw/source/core/uibase/inc/instable.hxx
index e8046d6079a1..e8046d6079a1 100644
--- a/sw/source/ui/inc/instable.hxx
+++ b/sw/source/core/uibase/inc/instable.hxx
diff --git a/sw/source/ui/inc/javaedit.hxx b/sw/source/core/uibase/inc/javaedit.hxx
index 209c39a931fc..209c39a931fc 100644
--- a/sw/source/ui/inc/javaedit.hxx
+++ b/sw/source/core/uibase/inc/javaedit.hxx
diff --git a/sw/source/ui/inc/label.hxx b/sw/source/core/uibase/inc/label.hxx
index 43eb936734e5..43eb936734e5 100644
--- a/sw/source/ui/inc/label.hxx
+++ b/sw/source/core/uibase/inc/label.hxx
diff --git a/sw/source/ui/inc/labelcfg.hxx b/sw/source/core/uibase/inc/labelcfg.hxx
index a70260010d58..a70260010d58 100644
--- a/sw/source/ui/inc/labelcfg.hxx
+++ b/sw/source/core/uibase/inc/labelcfg.hxx
diff --git a/sw/source/ui/inc/labimg.hxx b/sw/source/core/uibase/inc/labimg.hxx
index d668383efb68..d668383efb68 100644
--- a/sw/source/ui/inc/labimg.hxx
+++ b/sw/source/core/uibase/inc/labimg.hxx
diff --git a/sw/source/ui/inc/langhelper.hxx b/sw/source/core/uibase/inc/langhelper.hxx
index c771c0040c2f..c771c0040c2f 100644
--- a/sw/source/ui/inc/langhelper.hxx
+++ b/sw/source/core/uibase/inc/langhelper.hxx
diff --git a/sw/source/ui/inc/linenum.hxx b/sw/source/core/uibase/inc/linenum.hxx
index 94cc0fa02589..94cc0fa02589 100644
--- a/sw/source/ui/inc/linenum.hxx
+++ b/sw/source/core/uibase/inc/linenum.hxx
diff --git a/sw/source/ui/inc/listsh.hxx b/sw/source/core/uibase/inc/listsh.hxx
index d37d9ed62b6e..d37d9ed62b6e 100644
--- a/sw/source/ui/inc/listsh.hxx
+++ b/sw/source/core/uibase/inc/listsh.hxx
diff --git a/sw/source/ui/inc/macassgn.hxx b/sw/source/core/uibase/inc/macassgn.hxx
index cb4cda8e0391..cb4cda8e0391 100644
--- a/sw/source/ui/inc/macassgn.hxx
+++ b/sw/source/core/uibase/inc/macassgn.hxx
diff --git a/sw/source/ui/inc/mailconfigpage.hxx b/sw/source/core/uibase/inc/mailconfigpage.hxx
index 2de39fd89704..2de39fd89704 100644
--- a/sw/source/ui/inc/mailconfigpage.hxx
+++ b/sw/source/core/uibase/inc/mailconfigpage.hxx
diff --git a/sw/source/ui/inc/maildispatcher.hxx b/sw/source/core/uibase/inc/maildispatcher.hxx
index 512d6fde5b56..512d6fde5b56 100644
--- a/sw/source/ui/inc/maildispatcher.hxx
+++ b/sw/source/core/uibase/inc/maildispatcher.hxx
diff --git a/sw/source/ui/inc/mailmergechildwindow.hxx b/sw/source/core/uibase/inc/mailmergechildwindow.hxx
index f1ecd5a87c2c..f1ecd5a87c2c 100644
--- a/sw/source/ui/inc/mailmergechildwindow.hxx
+++ b/sw/source/core/uibase/inc/mailmergechildwindow.hxx
diff --git a/sw/source/ui/inc/mailmergehelper.hxx b/sw/source/core/uibase/inc/mailmergehelper.hxx
index fc87a3ec9949..fc87a3ec9949 100644
--- a/sw/source/ui/inc/mailmergehelper.hxx
+++ b/sw/source/core/uibase/inc/mailmergehelper.hxx
diff --git a/sw/source/ui/inc/mailmergewizard.hxx b/sw/source/core/uibase/inc/mailmergewizard.hxx
index f7a3b2ce944f..f7a3b2ce944f 100644
--- a/sw/source/ui/inc/mailmergewizard.hxx
+++ b/sw/source/core/uibase/inc/mailmergewizard.hxx
diff --git a/sw/source/ui/inc/mailmrge.hxx b/sw/source/core/uibase/inc/mailmrge.hxx
index c59bfda286f8..c59bfda286f8 100644
--- a/sw/source/ui/inc/mailmrge.hxx
+++ b/sw/source/core/uibase/inc/mailmrge.hxx
diff --git a/sw/source/ui/inc/mediash.hxx b/sw/source/core/uibase/inc/mediash.hxx
index 8d8cfd7b23b4..8d8cfd7b23b4 100644
--- a/sw/source/ui/inc/mediash.hxx
+++ b/sw/source/core/uibase/inc/mediash.hxx
diff --git a/sw/source/ui/inc/mergetbl.hxx b/sw/source/core/uibase/inc/mergetbl.hxx
index 3926c21b7376..3926c21b7376 100644
--- a/sw/source/ui/inc/mergetbl.hxx
+++ b/sw/source/core/uibase/inc/mergetbl.hxx
diff --git a/sw/source/ui/inc/misc.hrc b/sw/source/core/uibase/inc/misc.hrc
index 95113ff989f2..95113ff989f2 100644
--- a/sw/source/ui/inc/misc.hrc
+++ b/sw/source/core/uibase/inc/misc.hrc
diff --git a/sw/source/ui/inc/mmconfigitem.hxx b/sw/source/core/uibase/inc/mmconfigitem.hxx
index 8e53939f4bf8..8e53939f4bf8 100644
--- a/sw/source/ui/inc/mmconfigitem.hxx
+++ b/sw/source/core/uibase/inc/mmconfigitem.hxx
diff --git a/sw/source/ui/inc/multmrk.hxx b/sw/source/core/uibase/inc/multmrk.hxx
index b98192765931..b98192765931 100644
--- a/sw/source/ui/inc/multmrk.hxx
+++ b/sw/source/core/uibase/inc/multmrk.hxx
diff --git a/sw/source/ui/inc/navicfg.hxx b/sw/source/core/uibase/inc/navicfg.hxx
index 77a14d667166..77a14d667166 100644
--- a/sw/source/ui/inc/navicfg.hxx
+++ b/sw/source/core/uibase/inc/navicfg.hxx
diff --git a/sw/source/ui/inc/navicont.hxx b/sw/source/core/uibase/inc/navicont.hxx
index d04035ab1a72..d04035ab1a72 100644
--- a/sw/source/ui/inc/navicont.hxx
+++ b/sw/source/core/uibase/inc/navicont.hxx
diff --git a/sw/source/ui/inc/navipi.hxx b/sw/source/core/uibase/inc/navipi.hxx
index 04a6c269c706..04a6c269c706 100644
--- a/sw/source/ui/inc/navipi.hxx
+++ b/sw/source/core/uibase/inc/navipi.hxx
diff --git a/sw/source/ui/inc/navmgr.hxx b/sw/source/core/uibase/inc/navmgr.hxx
index 0ef4af93a1f6..0ef4af93a1f6 100644
--- a/sw/source/ui/inc/navmgr.hxx
+++ b/sw/source/core/uibase/inc/navmgr.hxx
diff --git a/sw/source/ui/inc/navsh.hxx b/sw/source/core/uibase/inc/navsh.hxx
index d05983a3948c..d05983a3948c 100644
--- a/sw/source/ui/inc/navsh.hxx
+++ b/sw/source/core/uibase/inc/navsh.hxx
diff --git a/sw/source/ui/inc/num.hxx b/sw/source/core/uibase/inc/num.hxx
index 67d107588265..67d107588265 100644
--- a/sw/source/ui/inc/num.hxx
+++ b/sw/source/core/uibase/inc/num.hxx
diff --git a/sw/source/ui/inc/numberingtypelistbox.hxx b/sw/source/core/uibase/inc/numberingtypelistbox.hxx
index 661252fb8e84..661252fb8e84 100644
--- a/sw/source/ui/inc/numberingtypelistbox.hxx
+++ b/sw/source/core/uibase/inc/numberingtypelistbox.hxx
diff --git a/sw/source/ui/inc/numfmtlb.hxx b/sw/source/core/uibase/inc/numfmtlb.hxx
index d6facd3da9b5..d6facd3da9b5 100644
--- a/sw/source/ui/inc/numfmtlb.hxx
+++ b/sw/source/core/uibase/inc/numfmtlb.hxx
diff --git a/sw/source/ui/inc/numpara.hxx b/sw/source/core/uibase/inc/numpara.hxx
index 71602d8fc33c..71602d8fc33c 100644
--- a/sw/source/ui/inc/numpara.hxx
+++ b/sw/source/core/uibase/inc/numpara.hxx
diff --git a/sw/source/ui/inc/numprevw.hxx b/sw/source/core/uibase/inc/numprevw.hxx
index 71374d899261..71374d899261 100644
--- a/sw/source/ui/inc/numprevw.hxx
+++ b/sw/source/core/uibase/inc/numprevw.hxx
diff --git a/sw/source/ui/inc/olesh.hxx b/sw/source/core/uibase/inc/olesh.hxx
index f9b6108a8edf..f9b6108a8edf 100644
--- a/sw/source/ui/inc/olesh.hxx
+++ b/sw/source/core/uibase/inc/olesh.hxx
diff --git a/sw/source/ui/inc/olmenu.hxx b/sw/source/core/uibase/inc/olmenu.hxx
index 288413d5d746..288413d5d746 100644
--- a/sw/source/ui/inc/olmenu.hxx
+++ b/sw/source/core/uibase/inc/olmenu.hxx
diff --git a/sw/source/ui/inc/optcomp.hxx b/sw/source/core/uibase/inc/optcomp.hxx
index afe29931d1d2..afe29931d1d2 100644
--- a/sw/source/ui/inc/optcomp.hxx
+++ b/sw/source/core/uibase/inc/optcomp.hxx
diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/core/uibase/inc/optload.hxx
index 6013d8b8dfc3..6013d8b8dfc3 100644
--- a/sw/source/ui/inc/optload.hxx
+++ b/sw/source/core/uibase/inc/optload.hxx
diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/core/uibase/inc/optpage.hxx
index 802b06092eed..802b06092eed 100644
--- a/sw/source/ui/inc/optpage.hxx
+++ b/sw/source/core/uibase/inc/optpage.hxx
diff --git a/sw/source/ui/inc/outline.hxx b/sw/source/core/uibase/inc/outline.hxx
index 6d54f977108d..6d54f977108d 100644
--- a/sw/source/ui/inc/outline.hxx
+++ b/sw/source/core/uibase/inc/outline.hxx
diff --git a/sw/source/ui/inc/pardlg.hxx b/sw/source/core/uibase/inc/pardlg.hxx
index d896350cbb85..d896350cbb85 100644
--- a/sw/source/ui/inc/pardlg.hxx
+++ b/sw/source/core/uibase/inc/pardlg.hxx
diff --git a/sw/source/ui/inc/pattern.hxx b/sw/source/core/uibase/inc/pattern.hxx
index 386952247924..386952247924 100644
--- a/sw/source/ui/inc/pattern.hxx
+++ b/sw/source/core/uibase/inc/pattern.hxx
diff --git a/sw/source/ui/inc/pgfnote.hxx b/sw/source/core/uibase/inc/pgfnote.hxx
index 156607ef105d..156607ef105d 100644
--- a/sw/source/ui/inc/pgfnote.hxx
+++ b/sw/source/core/uibase/inc/pgfnote.hxx
diff --git a/sw/source/ui/inc/pggrid.hxx b/sw/source/core/uibase/inc/pggrid.hxx
index 4dfc5d22748c..4dfc5d22748c 100644
--- a/sw/source/ui/inc/pggrid.hxx
+++ b/sw/source/core/uibase/inc/pggrid.hxx
diff --git a/sw/source/ui/inc/popbox.hxx b/sw/source/core/uibase/inc/popbox.hxx
index e085886eaa81..e085886eaa81 100644
--- a/sw/source/ui/inc/popbox.hxx
+++ b/sw/source/core/uibase/inc/popbox.hxx
diff --git a/sw/source/ui/inc/popup.hrc b/sw/source/core/uibase/inc/popup.hrc
index 88ed692f644a..88ed692f644a 100644
--- a/sw/source/ui/inc/popup.hrc
+++ b/sw/source/core/uibase/inc/popup.hrc
diff --git a/sw/source/ui/inc/prcntfld.hxx b/sw/source/core/uibase/inc/prcntfld.hxx
index 5e9422c03082..5e9422c03082 100644
--- a/sw/source/ui/inc/prcntfld.hxx
+++ b/sw/source/core/uibase/inc/prcntfld.hxx
diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/core/uibase/inc/pview.hxx
index de42c7930541..de42c7930541 100644
--- a/sw/source/ui/inc/pview.hxx
+++ b/sw/source/core/uibase/inc/pview.hxx
diff --git a/sw/source/ui/inc/redline_tmpl.hrc b/sw/source/core/uibase/inc/redline_tmpl.hrc
index 42717089947b..42717089947b 100644
--- a/sw/source/ui/inc/redline_tmpl.hrc
+++ b/sw/source/core/uibase/inc/redline_tmpl.hrc
diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/core/uibase/inc/redlndlg.hxx
index 2ee42bdef5c6..2ee42bdef5c6 100644
--- a/sw/source/ui/inc/redlndlg.hxx
+++ b/sw/source/core/uibase/inc/redlndlg.hxx
diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/core/uibase/inc/regionsw.hxx
index 44a9fa642684..44a9fa642684 100644
--- a/sw/source/ui/inc/regionsw.hxx
+++ b/sw/source/core/uibase/inc/regionsw.hxx
diff --git a/sw/source/ui/inc/ribbar.hrc b/sw/source/core/uibase/inc/ribbar.hrc
index 296b61d4b28c..296b61d4b28c 100644
--- a/sw/source/ui/inc/ribbar.hrc
+++ b/sw/source/core/uibase/inc/ribbar.hrc
diff --git a/sw/source/ui/inc/rowht.hxx b/sw/source/core/uibase/inc/rowht.hxx
index 022c1d2940f2..022c1d2940f2 100644
--- a/sw/source/ui/inc/rowht.hxx
+++ b/sw/source/core/uibase/inc/rowht.hxx
diff --git a/sw/source/ui/inc/scroll.hxx b/sw/source/core/uibase/inc/scroll.hxx
index ba0f66b33398..ba0f66b33398 100644
--- a/sw/source/ui/inc/scroll.hxx
+++ b/sw/source/core/uibase/inc/scroll.hxx
diff --git a/sw/source/ui/inc/selglos.hxx b/sw/source/core/uibase/inc/selglos.hxx
index 734c098fea88..734c098fea88 100644
--- a/sw/source/ui/inc/selglos.hxx
+++ b/sw/source/core/uibase/inc/selglos.hxx
diff --git a/sw/source/ui/inc/sharedconnection.hxx b/sw/source/core/uibase/inc/sharedconnection.hxx
index cf279b6e50b3..cf279b6e50b3 100644
--- a/sw/source/ui/inc/sharedconnection.hxx
+++ b/sw/source/core/uibase/inc/sharedconnection.hxx
diff --git a/sw/source/ui/inc/shdwcrsr.hxx b/sw/source/core/uibase/inc/shdwcrsr.hxx
index 5fb1d9684162..5fb1d9684162 100644
--- a/sw/source/ui/inc/shdwcrsr.hxx
+++ b/sw/source/core/uibase/inc/shdwcrsr.hxx
diff --git a/sw/source/ui/inc/shells.hrc b/sw/source/core/uibase/inc/shells.hrc
index 4070dd2c8764..4070dd2c8764 100644
--- a/sw/source/ui/inc/shells.hrc
+++ b/sw/source/core/uibase/inc/shells.hrc
diff --git a/sw/source/ui/inc/splittbl.hxx b/sw/source/core/uibase/inc/splittbl.hxx
index 522f1d65cab4..522f1d65cab4 100644
--- a/sw/source/ui/inc/splittbl.hxx
+++ b/sw/source/core/uibase/inc/splittbl.hxx
diff --git a/sw/source/ui/inc/srcedtw.hxx b/sw/source/core/uibase/inc/srcedtw.hxx
index c490dc4d6193..c490dc4d6193 100644
--- a/sw/source/ui/inc/srcedtw.hxx
+++ b/sw/source/core/uibase/inc/srcedtw.hxx
diff --git a/sw/source/ui/inc/srcview.hxx b/sw/source/core/uibase/inc/srcview.hxx
index ba91f8732278..ba91f8732278 100644
--- a/sw/source/ui/inc/srcview.hxx
+++ b/sw/source/core/uibase/inc/srcview.hxx
diff --git a/sw/source/ui/inc/srtdlg.hxx b/sw/source/core/uibase/inc/srtdlg.hxx
index 90fc60ab165a..90fc60ab165a 100644
--- a/sw/source/ui/inc/srtdlg.hxx
+++ b/sw/source/core/uibase/inc/srtdlg.hxx
diff --git a/sw/source/ui/inc/stmenu.hxx b/sw/source/core/uibase/inc/stmenu.hxx
index 4d7737142370..4d7737142370 100644
--- a/sw/source/ui/inc/stmenu.hxx
+++ b/sw/source/core/uibase/inc/stmenu.hxx
diff --git a/sw/source/ui/inc/swcont.hxx b/sw/source/core/uibase/inc/swcont.hxx
index 4c9294907b79..4c9294907b79 100644
--- a/sw/source/ui/inc/swcont.hxx
+++ b/sw/source/core/uibase/inc/swcont.hxx
diff --git a/sw/source/ui/inc/swdtflvr.hxx b/sw/source/core/uibase/inc/swdtflvr.hxx
index d68a9daac07a..d68a9daac07a 100644
--- a/sw/source/ui/inc/swdtflvr.hxx
+++ b/sw/source/core/uibase/inc/swdtflvr.hxx
diff --git a/sw/source/ui/inc/swlbox.hxx b/sw/source/core/uibase/inc/swlbox.hxx
index 49ac2b096892..49ac2b096892 100644
--- a/sw/source/ui/inc/swlbox.hxx
+++ b/sw/source/core/uibase/inc/swlbox.hxx
diff --git a/sw/source/ui/inc/swmessdialog.hxx b/sw/source/core/uibase/inc/swmessdialog.hxx
index 1937e3723058..1937e3723058 100644
--- a/sw/source/ui/inc/swmessdialog.hxx
+++ b/sw/source/core/uibase/inc/swmessdialog.hxx
diff --git a/sw/source/ui/inc/swmodalredlineacceptdlg.hxx b/sw/source/core/uibase/inc/swmodalredlineacceptdlg.hxx
index 8c38330b83d8..8c38330b83d8 100644
--- a/sw/source/ui/inc/swmodalredlineacceptdlg.hxx
+++ b/sw/source/core/uibase/inc/swmodalredlineacceptdlg.hxx
diff --git a/sw/source/ui/inc/swrenamexnameddlg.hxx b/sw/source/core/uibase/inc/swrenamexnameddlg.hxx
index 1dfc4f2597a4..1dfc4f2597a4 100644
--- a/sw/source/ui/inc/swrenamexnameddlg.hxx
+++ b/sw/source/core/uibase/inc/swrenamexnameddlg.hxx
diff --git a/sw/source/ui/inc/swruler.hxx b/sw/source/core/uibase/inc/swruler.hxx
index aebf0b97396d..aebf0b97396d 100644
--- a/sw/source/ui/inc/swruler.hxx
+++ b/sw/source/core/uibase/inc/swruler.hxx
diff --git a/sw/source/ui/inc/swtablerep.hxx b/sw/source/core/uibase/inc/swtablerep.hxx
index 7f92bc0bc26b..7f92bc0bc26b 100644
--- a/sw/source/ui/inc/swtablerep.hxx
+++ b/sw/source/core/uibase/inc/swtablerep.hxx
diff --git a/sw/source/ui/inc/swuiccoll.hxx b/sw/source/core/uibase/inc/swuiccoll.hxx
index d63d7ee99243..d63d7ee99243 100644
--- a/sw/source/ui/inc/swuiccoll.hxx
+++ b/sw/source/core/uibase/inc/swuiccoll.hxx
diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/core/uibase/inc/swuicnttab.hxx
index 1986936f86f3..1986936f86f3 100644
--- a/sw/source/ui/inc/swuicnttab.hxx
+++ b/sw/source/core/uibase/inc/swuicnttab.hxx
diff --git a/sw/source/ui/inc/swuiidxmrk.hxx b/sw/source/core/uibase/inc/swuiidxmrk.hxx
index e552586e353b..e552586e353b 100644
--- a/sw/source/ui/inc/swuiidxmrk.hxx
+++ b/sw/source/core/uibase/inc/swuiidxmrk.hxx
diff --git a/sw/source/ui/inc/swuipardlg.hxx b/sw/source/core/uibase/inc/swuipardlg.hxx
index 103cc99deb53..103cc99deb53 100644
--- a/sw/source/ui/inc/swuipardlg.hxx
+++ b/sw/source/core/uibase/inc/swuipardlg.hxx
diff --git a/sw/source/ui/inc/swvset.hxx b/sw/source/core/uibase/inc/swvset.hxx
index 10b71577f1d2..10b71577f1d2 100644
--- a/sw/source/ui/inc/swvset.hxx
+++ b/sw/source/core/uibase/inc/swvset.hxx
diff --git a/sw/source/ui/inc/swwrtshitem.hxx b/sw/source/core/uibase/inc/swwrtshitem.hxx
index ba498ea7c41f..ba498ea7c41f 100644
--- a/sw/source/ui/inc/swwrtshitem.hxx
+++ b/sw/source/core/uibase/inc/swwrtshitem.hxx
diff --git a/sw/source/ui/inc/syncbtn.hxx b/sw/source/core/uibase/inc/syncbtn.hxx
index 468821ff2b58..468821ff2b58 100644
--- a/sw/source/ui/inc/syncbtn.hxx
+++ b/sw/source/core/uibase/inc/syncbtn.hxx
diff --git a/sw/source/ui/inc/table.hrc b/sw/source/core/uibase/inc/table.hrc
index 6f7635bd4d36..6f7635bd4d36 100644
--- a/sw/source/ui/inc/table.hrc
+++ b/sw/source/core/uibase/inc/table.hrc
diff --git a/sw/source/ui/inc/tabledlg.hxx b/sw/source/core/uibase/inc/tabledlg.hxx
index d18be07670dc..d18be07670dc 100644
--- a/sw/source/ui/inc/tabledlg.hxx
+++ b/sw/source/core/uibase/inc/tabledlg.hxx
diff --git a/sw/source/ui/inc/tablemgr.hxx b/sw/source/core/uibase/inc/tablemgr.hxx
index 4144b9b9aa09..4144b9b9aa09 100644
--- a/sw/source/ui/inc/tablemgr.hxx
+++ b/sw/source/core/uibase/inc/tablemgr.hxx
diff --git a/sw/source/ui/inc/tabsh.hxx b/sw/source/core/uibase/inc/tabsh.hxx
index 8e37947b7cf5..8e37947b7cf5 100644
--- a/sw/source/ui/inc/tabsh.hxx
+++ b/sw/source/core/uibase/inc/tabsh.hxx
diff --git a/sw/source/ui/inc/tautofmt.hxx b/sw/source/core/uibase/inc/tautofmt.hxx
index 5aac7016a944..5aac7016a944 100644
--- a/sw/source/ui/inc/tautofmt.hxx
+++ b/sw/source/core/uibase/inc/tautofmt.hxx
diff --git a/sw/source/ui/inc/tblctrl.hxx b/sw/source/core/uibase/inc/tblctrl.hxx
index fbf66057e2ae..fbf66057e2ae 100644
--- a/sw/source/ui/inc/tblctrl.hxx
+++ b/sw/source/core/uibase/inc/tblctrl.hxx
diff --git a/sw/source/ui/inc/tblnumfm.hxx b/sw/source/core/uibase/inc/tblnumfm.hxx
index ad8b9999f56c..ad8b9999f56c 100644
--- a/sw/source/ui/inc/tblnumfm.hxx
+++ b/sw/source/core/uibase/inc/tblnumfm.hxx
diff --git a/sw/source/ui/inc/tbxanchr.hxx b/sw/source/core/uibase/inc/tbxanchr.hxx
index 96eed47f58d5..96eed47f58d5 100644
--- a/sw/source/ui/inc/tbxanchr.hxx
+++ b/sw/source/core/uibase/inc/tbxanchr.hxx
diff --git a/sw/source/ui/inc/textsh.hxx b/sw/source/core/uibase/inc/textsh.hxx
index e9e00baeb535..e9e00baeb535 100644
--- a/sw/source/ui/inc/textsh.hxx
+++ b/sw/source/core/uibase/inc/textsh.hxx
diff --git a/sw/source/ui/inc/titlepage.hxx b/sw/source/core/uibase/inc/titlepage.hxx
index 3031e3112ef9..3031e3112ef9 100644
--- a/sw/source/ui/inc/titlepage.hxx
+++ b/sw/source/core/uibase/inc/titlepage.hxx
diff --git a/sw/source/ui/inc/tmpdlg.hxx b/sw/source/core/uibase/inc/tmpdlg.hxx
index ac990146c80d..ac990146c80d 100644
--- a/sw/source/ui/inc/tmpdlg.hxx
+++ b/sw/source/core/uibase/inc/tmpdlg.hxx
diff --git a/sw/source/ui/inc/tmplctrl.hxx b/sw/source/core/uibase/inc/tmplctrl.hxx
index 9deea7c83496..9deea7c83496 100644
--- a/sw/source/ui/inc/tmplctrl.hxx
+++ b/sw/source/core/uibase/inc/tmplctrl.hxx
diff --git a/sw/source/ui/inc/toolbox.hrc b/sw/source/core/uibase/inc/toolbox.hrc
index e65caf2bbcb3..e65caf2bbcb3 100644
--- a/sw/source/ui/inc/toolbox.hrc
+++ b/sw/source/core/uibase/inc/toolbox.hrc
diff --git a/sw/source/ui/inc/toxmgr.hxx b/sw/source/core/uibase/inc/toxmgr.hxx
index 86b2d7f5ecc5..86b2d7f5ecc5 100644
--- a/sw/source/ui/inc/toxmgr.hxx
+++ b/sw/source/core/uibase/inc/toxmgr.hxx
diff --git a/sw/source/ui/inc/uiborder.hxx b/sw/source/core/uibase/inc/uiborder.hxx
index 78adaeb7846d..78adaeb7846d 100644
--- a/sw/source/ui/inc/uiborder.hxx
+++ b/sw/source/core/uibase/inc/uiborder.hxx
diff --git a/sw/source/ui/inc/uiitems.hxx b/sw/source/core/uibase/inc/uiitems.hxx
index 033adf755882..033adf755882 100644
--- a/sw/source/ui/inc/uiitems.hxx
+++ b/sw/source/core/uibase/inc/uiitems.hxx
diff --git a/sw/source/ui/inc/uinums.hxx b/sw/source/core/uibase/inc/uinums.hxx
index a474dbd88bd1..a474dbd88bd1 100644
--- a/sw/source/ui/inc/uinums.hxx
+++ b/sw/source/core/uibase/inc/uinums.hxx
diff --git a/sw/source/ui/inc/uitool.hxx b/sw/source/core/uibase/inc/uitool.hxx
index 211af6f33f11..211af6f33f11 100644
--- a/sw/source/ui/inc/uitool.hxx
+++ b/sw/source/core/uibase/inc/uitool.hxx
diff --git a/sw/source/ui/inc/uivwimp.hxx b/sw/source/core/uibase/inc/uivwimp.hxx
index 075dbf626708..075dbf626708 100644
--- a/sw/source/ui/inc/uivwimp.hxx
+++ b/sw/source/core/uibase/inc/uivwimp.hxx
diff --git a/sw/source/ui/inc/unoatxt.hxx b/sw/source/core/uibase/inc/unoatxt.hxx
index 3a27de5d55e7..3a27de5d55e7 100644
--- a/sw/source/ui/inc/unoatxt.hxx
+++ b/sw/source/core/uibase/inc/unoatxt.hxx
diff --git a/sw/source/ui/inc/unodispatch.hxx b/sw/source/core/uibase/inc/unodispatch.hxx
index f5992c1e0465..f5992c1e0465 100644
--- a/sw/source/ui/inc/unodispatch.hxx
+++ b/sw/source/core/uibase/inc/unodispatch.hxx
diff --git a/sw/source/ui/inc/unomailmerge.hxx b/sw/source/core/uibase/inc/unomailmerge.hxx
index 211c2cbfe41b..211c2cbfe41b 100644
--- a/sw/source/ui/inc/unomailmerge.hxx
+++ b/sw/source/core/uibase/inc/unomailmerge.hxx
diff --git a/sw/source/ui/inc/unomod.hxx b/sw/source/core/uibase/inc/unomod.hxx
index 1d1c8823eb7c..1d1c8823eb7c 100644
--- a/sw/source/ui/inc/unomod.hxx
+++ b/sw/source/core/uibase/inc/unomod.hxx
diff --git a/sw/source/ui/inc/unotools.hxx b/sw/source/core/uibase/inc/unotools.hxx
index 0b85820a62bb..0b85820a62bb 100644
--- a/sw/source/ui/inc/unotools.hxx
+++ b/sw/source/core/uibase/inc/unotools.hxx
diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/core/uibase/inc/unotxvw.hxx
index 76f370ca1eba..76f370ca1eba 100644
--- a/sw/source/ui/inc/unotxvw.hxx
+++ b/sw/source/core/uibase/inc/unotxvw.hxx
diff --git a/sw/source/ui/inc/usrpref.hxx b/sw/source/core/uibase/inc/usrpref.hxx
index 9169166c5a6b..9169166c5a6b 100644
--- a/sw/source/ui/inc/usrpref.hxx
+++ b/sw/source/core/uibase/inc/usrpref.hxx
diff --git a/sw/source/ui/inc/utlui.hrc b/sw/source/core/uibase/inc/utlui.hrc
index 774a0b868231..774a0b868231 100644
--- a/sw/source/ui/inc/utlui.hrc
+++ b/sw/source/core/uibase/inc/utlui.hrc
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/core/uibase/inc/view.hxx
index 91733d3da373..91733d3da373 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/core/uibase/inc/view.hxx
diff --git a/sw/source/ui/inc/viewlayoutctrl.hxx b/sw/source/core/uibase/inc/viewlayoutctrl.hxx
index 10648cd36671..10648cd36671 100644
--- a/sw/source/ui/inc/viewlayoutctrl.hxx
+++ b/sw/source/core/uibase/inc/viewlayoutctrl.hxx
diff --git a/sw/source/ui/inc/web.hrc b/sw/source/core/uibase/inc/web.hrc
index aef47e9d2bb1..aef47e9d2bb1 100644
--- a/sw/source/ui/inc/web.hrc
+++ b/sw/source/core/uibase/inc/web.hrc
diff --git a/sw/source/ui/inc/wformsh.hxx b/sw/source/core/uibase/inc/wformsh.hxx
index aac9f9f69c94..aac9f9f69c94 100644
--- a/sw/source/ui/inc/wformsh.hxx
+++ b/sw/source/core/uibase/inc/wformsh.hxx
diff --git a/sw/source/ui/inc/wfrmsh.hxx b/sw/source/core/uibase/inc/wfrmsh.hxx
index 68f7edcab86b..68f7edcab86b 100644
--- a/sw/source/ui/inc/wfrmsh.hxx
+++ b/sw/source/core/uibase/inc/wfrmsh.hxx
diff --git a/sw/source/ui/inc/wgrfsh.hxx b/sw/source/core/uibase/inc/wgrfsh.hxx
index 45682ac74554..45682ac74554 100644
--- a/sw/source/ui/inc/wgrfsh.hxx
+++ b/sw/source/core/uibase/inc/wgrfsh.hxx
diff --git a/sw/source/ui/inc/wlistsh.hxx b/sw/source/core/uibase/inc/wlistsh.hxx
index 3df943966885..3df943966885 100644
--- a/sw/source/ui/inc/wlistsh.hxx
+++ b/sw/source/core/uibase/inc/wlistsh.hxx
diff --git a/sw/source/ui/inc/wolesh.hxx b/sw/source/core/uibase/inc/wolesh.hxx
index bf9dcad60718..bf9dcad60718 100644
--- a/sw/source/ui/inc/wolesh.hxx
+++ b/sw/source/core/uibase/inc/wolesh.hxx
diff --git a/sw/source/ui/inc/wordcountctrl.hxx b/sw/source/core/uibase/inc/wordcountctrl.hxx
index 9026d2a676e9..9026d2a676e9 100644
--- a/sw/source/ui/inc/wordcountctrl.hxx
+++ b/sw/source/core/uibase/inc/wordcountctrl.hxx
diff --git a/sw/source/ui/inc/wordcountdialog.hxx b/sw/source/core/uibase/inc/wordcountdialog.hxx
index 3bebd69f4967..3bebd69f4967 100644
--- a/sw/source/ui/inc/wordcountdialog.hxx
+++ b/sw/source/core/uibase/inc/wordcountdialog.hxx
diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/core/uibase/inc/workctrl.hxx
index eef6332e01db..eef6332e01db 100644
--- a/sw/source/ui/inc/workctrl.hxx
+++ b/sw/source/core/uibase/inc/workctrl.hxx
diff --git a/sw/source/ui/inc/wrap.hxx b/sw/source/core/uibase/inc/wrap.hxx
index 322b0530a749..322b0530a749 100644
--- a/sw/source/ui/inc/wrap.hxx
+++ b/sw/source/core/uibase/inc/wrap.hxx
diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/core/uibase/inc/wrtsh.hxx
index fbcdecaecf19..fbcdecaecf19 100644
--- a/sw/source/ui/inc/wrtsh.hxx
+++ b/sw/source/core/uibase/inc/wrtsh.hxx
diff --git a/sw/source/ui/inc/wtabsh.hxx b/sw/source/core/uibase/inc/wtabsh.hxx
index 64f25bcb4ed4..64f25bcb4ed4 100644
--- a/sw/source/ui/inc/wtabsh.hxx
+++ b/sw/source/core/uibase/inc/wtabsh.hxx
diff --git a/sw/source/ui/inc/wtextsh.hxx b/sw/source/core/uibase/inc/wtextsh.hxx
index 3a236f7ce307..3a236f7ce307 100644
--- a/sw/source/ui/inc/wtextsh.hxx
+++ b/sw/source/core/uibase/inc/wtextsh.hxx
diff --git a/sw/source/ui/inc/wview.hxx b/sw/source/core/uibase/inc/wview.hxx
index 873f7a720648..873f7a720648 100644
--- a/sw/source/ui/inc/wview.hxx
+++ b/sw/source/core/uibase/inc/wview.hxx
diff --git a/sw/source/ui/inc/zoomctrl.hxx b/sw/source/core/uibase/inc/zoomctrl.hxx
index 89818fdf4f72..89818fdf4f72 100644
--- a/sw/source/ui/inc/zoomctrl.hxx
+++ b/sw/source/core/uibase/inc/zoomctrl.hxx
diff --git a/sw/source/ui/index/idxmrk.cxx b/sw/source/core/uibase/index/idxmrk.cxx
index 7a717fd42939..7a717fd42939 100644
--- a/sw/source/ui/index/idxmrk.cxx
+++ b/sw/source/core/uibase/index/idxmrk.cxx
diff --git a/sw/source/ui/index/idxmrk.hrc b/sw/source/core/uibase/index/idxmrk.hrc
index 2a748b70bd63..2a748b70bd63 100644
--- a/sw/source/ui/index/idxmrk.hrc
+++ b/sw/source/core/uibase/index/idxmrk.hrc
diff --git a/sw/source/ui/index/toxmgr.cxx b/sw/source/core/uibase/index/toxmgr.cxx
index 62875171feaf..62875171feaf 100644
--- a/sw/source/ui/index/toxmgr.cxx
+++ b/sw/source/core/uibase/index/toxmgr.cxx
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/core/uibase/lingu/hhcwrp.cxx
index b5d1950f24f3..b5d1950f24f3 100644
--- a/sw/source/ui/lingu/hhcwrp.cxx
+++ b/sw/source/core/uibase/lingu/hhcwrp.cxx
diff --git a/sw/source/ui/lingu/hyp.cxx b/sw/source/core/uibase/lingu/hyp.cxx
index 73de46c7aeb8..73de46c7aeb8 100644
--- a/sw/source/ui/lingu/hyp.cxx
+++ b/sw/source/core/uibase/lingu/hyp.cxx
diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/core/uibase/lingu/olmenu.cxx
index f5909da430d1..f5909da430d1 100644
--- a/sw/source/ui/lingu/olmenu.cxx
+++ b/sw/source/core/uibase/lingu/olmenu.cxx
diff --git a/sw/source/ui/lingu/olmenu.hrc b/sw/source/core/uibase/lingu/olmenu.hrc
index 0a8ae91cec6e..0a8ae91cec6e 100644
--- a/sw/source/ui/lingu/olmenu.hrc
+++ b/sw/source/core/uibase/lingu/olmenu.hrc
diff --git a/sw/source/ui/lingu/olmenu.src b/sw/source/core/uibase/lingu/olmenu.src
index 293d8043c7db..293d8043c7db 100644
--- a/sw/source/ui/lingu/olmenu.src
+++ b/sw/source/core/uibase/lingu/olmenu.src
diff --git a/sw/source/ui/lingu/sdrhhcwrap.cxx b/sw/source/core/uibase/lingu/sdrhhcwrap.cxx
index 3a05a06b3328..3a05a06b3328 100644
--- a/sw/source/ui/lingu/sdrhhcwrap.cxx
+++ b/sw/source/core/uibase/lingu/sdrhhcwrap.cxx
diff --git a/sw/source/ui/lingu/sdrhhcwrap.hxx b/sw/source/core/uibase/lingu/sdrhhcwrap.hxx
index d6befe334b44..d6befe334b44 100644
--- a/sw/source/ui/lingu/sdrhhcwrap.hxx
+++ b/sw/source/core/uibase/lingu/sdrhhcwrap.hxx
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/core/uibase/misc/glosdoc.cxx
index 4236067c95a8..4236067c95a8 100644
--- a/sw/source/ui/misc/glosdoc.cxx
+++ b/sw/source/core/uibase/misc/glosdoc.cxx
diff --git a/sw/source/ui/misc/glshell.cxx b/sw/source/core/uibase/misc/glshell.cxx
index c3776ceb852a..c3776ceb852a 100644
--- a/sw/source/ui/misc/glshell.cxx
+++ b/sw/source/core/uibase/misc/glshell.cxx
diff --git a/sw/source/ui/misc/numberingtypelistbox.cxx b/sw/source/core/uibase/misc/numberingtypelistbox.cxx
index d319a131e3df..d319a131e3df 100644
--- a/sw/source/ui/misc/numberingtypelistbox.cxx
+++ b/sw/source/core/uibase/misc/numberingtypelistbox.cxx
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/core/uibase/misc/redlndlg.cxx
index f6ceee69026d..f6ceee69026d 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/core/uibase/misc/redlndlg.cxx
diff --git a/sw/source/ui/misc/redlndlg.hrc b/sw/source/core/uibase/misc/redlndlg.hrc
index e3d0464faca6..e3d0464faca6 100644
--- a/sw/source/ui/misc/redlndlg.hrc
+++ b/sw/source/core/uibase/misc/redlndlg.hrc
diff --git a/sw/source/ui/misc/redlndlg.src b/sw/source/core/uibase/misc/redlndlg.src
index e3b9aadb3a0f..e3b9aadb3a0f 100644
--- a/sw/source/ui/misc/redlndlg.src
+++ b/sw/source/core/uibase/misc/redlndlg.src
diff --git a/sw/source/ui/misc/swruler.cxx b/sw/source/core/uibase/misc/swruler.cxx
index 1ba770fd6a42..1ba770fd6a42 100644
--- a/sw/source/ui/misc/swruler.cxx
+++ b/sw/source/core/uibase/misc/swruler.cxx
diff --git a/sw/source/ui/ribbar/conarc.cxx b/sw/source/core/uibase/ribbar/conarc.cxx
index d3cf4d146d16..d3cf4d146d16 100644
--- a/sw/source/ui/ribbar/conarc.cxx
+++ b/sw/source/core/uibase/ribbar/conarc.cxx
diff --git a/sw/source/ui/ribbar/concustomshape.cxx b/sw/source/core/uibase/ribbar/concustomshape.cxx
index 58e3747e5237..58e3747e5237 100644
--- a/sw/source/ui/ribbar/concustomshape.cxx
+++ b/sw/source/core/uibase/ribbar/concustomshape.cxx
diff --git a/sw/source/ui/ribbar/conform.cxx b/sw/source/core/uibase/ribbar/conform.cxx
index 2b15f5f8e9e4..2b15f5f8e9e4 100644
--- a/sw/source/ui/ribbar/conform.cxx
+++ b/sw/source/core/uibase/ribbar/conform.cxx
diff --git a/sw/source/ui/ribbar/conpoly.cxx b/sw/source/core/uibase/ribbar/conpoly.cxx
index 5edde1056ac2..5edde1056ac2 100644
--- a/sw/source/ui/ribbar/conpoly.cxx
+++ b/sw/source/core/uibase/ribbar/conpoly.cxx
diff --git a/sw/source/ui/ribbar/conrect.cxx b/sw/source/core/uibase/ribbar/conrect.cxx
index 383ff7e8310d..383ff7e8310d 100644
--- a/sw/source/ui/ribbar/conrect.cxx
+++ b/sw/source/core/uibase/ribbar/conrect.cxx
diff --git a/sw/source/ui/ribbar/drawbase.cxx b/sw/source/core/uibase/ribbar/drawbase.cxx
index de3eddb8fe3d..de3eddb8fe3d 100644
--- a/sw/source/ui/ribbar/drawbase.cxx
+++ b/sw/source/core/uibase/ribbar/drawbase.cxx
diff --git a/sw/source/ui/ribbar/dselect.cxx b/sw/source/core/uibase/ribbar/dselect.cxx
index 91ad444ccf0b..91ad444ccf0b 100644
--- a/sw/source/ui/ribbar/dselect.cxx
+++ b/sw/source/core/uibase/ribbar/dselect.cxx
diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/core/uibase/ribbar/inputwin.cxx
index aa1f46ab5598..aa1f46ab5598 100644
--- a/sw/source/ui/ribbar/inputwin.cxx
+++ b/sw/source/core/uibase/ribbar/inputwin.cxx
diff --git a/sw/source/ui/ribbar/inputwin.hrc b/sw/source/core/uibase/ribbar/inputwin.hrc
index 5e168a0d0552..5e168a0d0552 100644
--- a/sw/source/ui/ribbar/inputwin.hrc
+++ b/sw/source/core/uibase/ribbar/inputwin.hrc
diff --git a/sw/source/ui/ribbar/inputwin.src b/sw/source/core/uibase/ribbar/inputwin.src
index d228bbeed267..d228bbeed267 100644
--- a/sw/source/ui/ribbar/inputwin.src
+++ b/sw/source/core/uibase/ribbar/inputwin.src
diff --git a/sw/source/ui/ribbar/tblctrl.cxx b/sw/source/core/uibase/ribbar/tblctrl.cxx
index 2649d74e6951..2649d74e6951 100644
--- a/sw/source/ui/ribbar/tblctrl.cxx
+++ b/sw/source/core/uibase/ribbar/tblctrl.cxx
diff --git a/sw/source/ui/ribbar/tbxanchr.cxx b/sw/source/core/uibase/ribbar/tbxanchr.cxx
index e90b3ab9905e..e90b3ab9905e 100644
--- a/sw/source/ui/ribbar/tbxanchr.cxx
+++ b/sw/source/core/uibase/ribbar/tbxanchr.cxx
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/core/uibase/ribbar/workctrl.cxx
index e1d58875f9ba..e1d58875f9ba 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/core/uibase/ribbar/workctrl.cxx
diff --git a/sw/source/ui/ribbar/workctrl.hrc b/sw/source/core/uibase/ribbar/workctrl.hrc
index cee389be0671..cee389be0671 100644
--- a/sw/source/ui/ribbar/workctrl.hrc
+++ b/sw/source/core/uibase/ribbar/workctrl.hrc
diff --git a/sw/source/ui/ribbar/workctrl.src b/sw/source/core/uibase/ribbar/workctrl.src
index f3592d0a7a8e..f3592d0a7a8e 100644
--- a/sw/source/ui/ribbar/workctrl.src
+++ b/sw/source/core/uibase/ribbar/workctrl.src
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/core/uibase/shells/annotsh.cxx
index d1e69591744f..d1e69591744f 100644
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/core/uibase/shells/annotsh.cxx
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/core/uibase/shells/basesh.cxx
index 797f9dee8749..797f9dee8749 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/core/uibase/shells/basesh.cxx
diff --git a/sw/source/ui/shells/beziersh.cxx b/sw/source/core/uibase/shells/beziersh.cxx
index 8ba2d2a184df..8ba2d2a184df 100644
--- a/sw/source/ui/shells/beziersh.cxx
+++ b/sw/source/core/uibase/shells/beziersh.cxx
diff --git a/sw/source/ui/shells/drawdlg.cxx b/sw/source/core/uibase/shells/drawdlg.cxx
index 9ba12d925938..9ba12d925938 100644
--- a/sw/source/ui/shells/drawdlg.cxx
+++ b/sw/source/core/uibase/shells/drawdlg.cxx
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/core/uibase/shells/drawsh.cxx
index 5932d12c999b..5932d12c999b 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/core/uibase/shells/drawsh.cxx
diff --git a/sw/source/ui/shells/drformsh.cxx b/sw/source/core/uibase/shells/drformsh.cxx
index 117db5a8c69e..117db5a8c69e 100644
--- a/sw/source/ui/shells/drformsh.cxx
+++ b/sw/source/core/uibase/shells/drformsh.cxx
diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/core/uibase/shells/drwbassh.cxx
index c19d90caa019..c19d90caa019 100644
--- a/sw/source/ui/shells/drwbassh.cxx
+++ b/sw/source/core/uibase/shells/drwbassh.cxx
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/core/uibase/shells/drwtxtex.cxx
index 24abc785cf6e..24abc785cf6e 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/core/uibase/shells/drwtxtex.cxx
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/core/uibase/shells/drwtxtsh.cxx
index 350c4f62c06a..350c4f62c06a 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/core/uibase/shells/drwtxtsh.cxx
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/core/uibase/shells/frmsh.cxx
index f9ed0949a836..f9ed0949a836 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/core/uibase/shells/frmsh.cxx
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/core/uibase/shells/grfsh.cxx
index b8c9b422396a..b8c9b422396a 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/core/uibase/shells/grfsh.cxx
diff --git a/sw/source/ui/shells/grfshex.cxx b/sw/source/core/uibase/shells/grfshex.cxx
index 60988bac1736..60988bac1736 100644
--- a/sw/source/ui/shells/grfshex.cxx
+++ b/sw/source/core/uibase/shells/grfshex.cxx
diff --git a/sw/source/ui/shells/langhelper.cxx b/sw/source/core/uibase/shells/langhelper.cxx
index 8342502e12ae..8342502e12ae 100644
--- a/sw/source/ui/shells/langhelper.cxx
+++ b/sw/source/core/uibase/shells/langhelper.cxx
diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/core/uibase/shells/listsh.cxx
index ae32351c3db8..ae32351c3db8 100644
--- a/sw/source/ui/shells/listsh.cxx
+++ b/sw/source/core/uibase/shells/listsh.cxx
diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/core/uibase/shells/mediash.cxx
index 6f9671c42322..6f9671c42322 100644
--- a/sw/source/ui/shells/mediash.cxx
+++ b/sw/source/core/uibase/shells/mediash.cxx
diff --git a/sw/source/ui/shells/navsh.cxx b/sw/source/core/uibase/shells/navsh.cxx
index c5a9199daa32..c5a9199daa32 100644
--- a/sw/source/ui/shells/navsh.cxx
+++ b/sw/source/core/uibase/shells/navsh.cxx
diff --git a/sw/source/ui/shells/olesh.cxx b/sw/source/core/uibase/shells/olesh.cxx
index 6014c2fd725a..6014c2fd725a 100644
--- a/sw/source/ui/shells/olesh.cxx
+++ b/sw/source/core/uibase/shells/olesh.cxx
diff --git a/sw/source/ui/shells/slotadd.cxx b/sw/source/core/uibase/shells/slotadd.cxx
index ed66709a37e5..ed66709a37e5 100644
--- a/sw/source/ui/shells/slotadd.cxx
+++ b/sw/source/core/uibase/shells/slotadd.cxx
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/core/uibase/shells/tabsh.cxx
index 5b60dafb9d50..5b60dafb9d50 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/core/uibase/shells/tabsh.cxx
diff --git a/sw/source/ui/shells/textdrw.cxx b/sw/source/core/uibase/shells/textdrw.cxx
index fcc12affcb9c..fcc12affcb9c 100644
--- a/sw/source/ui/shells/textdrw.cxx
+++ b/sw/source/core/uibase/shells/textdrw.cxx
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/core/uibase/shells/textfld.cxx
index 5b336ff25aee..5b336ff25aee 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/core/uibase/shells/textfld.cxx
diff --git a/sw/source/ui/shells/textglos.cxx b/sw/source/core/uibase/shells/textglos.cxx
index 365534a38549..365534a38549 100644
--- a/sw/source/ui/shells/textglos.cxx
+++ b/sw/source/core/uibase/shells/textglos.cxx
diff --git a/sw/source/ui/shells/textidx.cxx b/sw/source/core/uibase/shells/textidx.cxx
index 05d9fc295c67..05d9fc295c67 100644
--- a/sw/source/ui/shells/textidx.cxx
+++ b/sw/source/core/uibase/shells/textidx.cxx
diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/core/uibase/shells/textsh.cxx
index 57314e0e8848..57314e0e8848 100644
--- a/sw/source/ui/shells/textsh.cxx
+++ b/sw/source/core/uibase/shells/textsh.cxx
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/core/uibase/shells/textsh1.cxx
index b346e8856bba..b346e8856bba 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/core/uibase/shells/textsh1.cxx
diff --git a/sw/source/ui/shells/textsh2.cxx b/sw/source/core/uibase/shells/textsh2.cxx
index ebd67d2a4d8a..ebd67d2a4d8a 100644
--- a/sw/source/ui/shells/textsh2.cxx
+++ b/sw/source/core/uibase/shells/textsh2.cxx
diff --git a/sw/source/ui/shells/txtattr.cxx b/sw/source/core/uibase/shells/txtattr.cxx
index 47d7e9312acb..47d7e9312acb 100644
--- a/sw/source/ui/shells/txtattr.cxx
+++ b/sw/source/core/uibase/shells/txtattr.cxx
diff --git a/sw/source/ui/shells/txtcrsr.cxx b/sw/source/core/uibase/shells/txtcrsr.cxx
index 1c0b43e1181a..1c0b43e1181a 100644
--- a/sw/source/ui/shells/txtcrsr.cxx
+++ b/sw/source/core/uibase/shells/txtcrsr.cxx
diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/core/uibase/shells/txtnum.cxx
index bffbfc2c3583..bffbfc2c3583 100644
--- a/sw/source/ui/shells/txtnum.cxx
+++ b/sw/source/core/uibase/shells/txtnum.cxx
diff --git a/sw/source/ui/sidebar/PageColumnControl.cxx b/sw/source/core/uibase/sidebar/PageColumnControl.cxx
index f2a5f3857bee..f2a5f3857bee 100644
--- a/sw/source/ui/sidebar/PageColumnControl.cxx
+++ b/sw/source/core/uibase/sidebar/PageColumnControl.cxx
diff --git a/sw/source/ui/sidebar/PageColumnControl.hxx b/sw/source/core/uibase/sidebar/PageColumnControl.hxx
index 875bea370fd7..875bea370fd7 100644
--- a/sw/source/ui/sidebar/PageColumnControl.hxx
+++ b/sw/source/core/uibase/sidebar/PageColumnControl.hxx
diff --git a/sw/source/ui/sidebar/PageMarginControl.cxx b/sw/source/core/uibase/sidebar/PageMarginControl.cxx
index dd3d031c8dff..dd3d031c8dff 100644
--- a/sw/source/ui/sidebar/PageMarginControl.cxx
+++ b/sw/source/core/uibase/sidebar/PageMarginControl.cxx
diff --git a/sw/source/ui/sidebar/PageMarginControl.hxx b/sw/source/core/uibase/sidebar/PageMarginControl.hxx
index f32e8846329c..f32e8846329c 100644
--- a/sw/source/ui/sidebar/PageMarginControl.hxx
+++ b/sw/source/core/uibase/sidebar/PageMarginControl.hxx
diff --git a/sw/source/ui/sidebar/PageOrientationControl.cxx b/sw/source/core/uibase/sidebar/PageOrientationControl.cxx
index 2dbf8bf8762a..2dbf8bf8762a 100644
--- a/sw/source/ui/sidebar/PageOrientationControl.cxx
+++ b/sw/source/core/uibase/sidebar/PageOrientationControl.cxx
diff --git a/sw/source/ui/sidebar/PageOrientationControl.hxx b/sw/source/core/uibase/sidebar/PageOrientationControl.hxx
index a4cfe4249376..a4cfe4249376 100644
--- a/sw/source/ui/sidebar/PageOrientationControl.hxx
+++ b/sw/source/core/uibase/sidebar/PageOrientationControl.hxx
diff --git a/sw/source/ui/sidebar/PagePropertyPanel.cxx b/sw/source/core/uibase/sidebar/PagePropertyPanel.cxx
index a5d02386cb52..a5d02386cb52 100644
--- a/sw/source/ui/sidebar/PagePropertyPanel.cxx
+++ b/sw/source/core/uibase/sidebar/PagePropertyPanel.cxx
diff --git a/sw/source/ui/sidebar/PagePropertyPanel.hrc b/sw/source/core/uibase/sidebar/PagePropertyPanel.hrc
index 0f827f0d84fe..0f827f0d84fe 100644
--- a/sw/source/ui/sidebar/PagePropertyPanel.hrc
+++ b/sw/source/core/uibase/sidebar/PagePropertyPanel.hrc
diff --git a/sw/source/ui/sidebar/PagePropertyPanel.hxx b/sw/source/core/uibase/sidebar/PagePropertyPanel.hxx
index d7b6e57153e0..d7b6e57153e0 100644
--- a/sw/source/ui/sidebar/PagePropertyPanel.hxx
+++ b/sw/source/core/uibase/sidebar/PagePropertyPanel.hxx
diff --git a/sw/source/ui/sidebar/PageSizeControl.cxx b/sw/source/core/uibase/sidebar/PageSizeControl.cxx
index 038e033235f2..038e033235f2 100644
--- a/sw/source/ui/sidebar/PageSizeControl.cxx
+++ b/sw/source/core/uibase/sidebar/PageSizeControl.cxx
diff --git a/sw/source/ui/sidebar/PageSizeControl.hxx b/sw/source/core/uibase/sidebar/PageSizeControl.hxx
index e1f0313a3649..e1f0313a3649 100644
--- a/sw/source/ui/sidebar/PageSizeControl.hxx
+++ b/sw/source/core/uibase/sidebar/PageSizeControl.hxx
diff --git a/sw/source/ui/sidebar/PropertyPanel.hrc b/sw/source/core/uibase/sidebar/PropertyPanel.hrc
index b374ab3dc96b..b374ab3dc96b 100644
--- a/sw/source/ui/sidebar/PropertyPanel.hrc
+++ b/sw/source/core/uibase/sidebar/PropertyPanel.hrc
diff --git a/sw/source/ui/sidebar/SwPanelFactory.cxx b/sw/source/core/uibase/sidebar/SwPanelFactory.cxx
index 18220cdbdf80..18220cdbdf80 100644
--- a/sw/source/ui/sidebar/SwPanelFactory.cxx
+++ b/sw/source/core/uibase/sidebar/SwPanelFactory.cxx
diff --git a/sw/source/ui/sidebar/WrapPropertyPanel.cxx b/sw/source/core/uibase/sidebar/WrapPropertyPanel.cxx
index 6d4e8526f6fc..6d4e8526f6fc 100644
--- a/sw/source/ui/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/core/uibase/sidebar/WrapPropertyPanel.cxx
diff --git a/sw/source/ui/sidebar/WrapPropertyPanel.hxx b/sw/source/core/uibase/sidebar/WrapPropertyPanel.hxx
index c5e524c25a0f..c5e524c25a0f 100644
--- a/sw/source/ui/sidebar/WrapPropertyPanel.hxx
+++ b/sw/source/core/uibase/sidebar/WrapPropertyPanel.hxx
diff --git a/sw/source/ui/smartmenu/stmenu.cxx b/sw/source/core/uibase/smartmenu/stmenu.cxx
index 79aa386c8b73..79aa386c8b73 100644
--- a/sw/source/ui/smartmenu/stmenu.cxx
+++ b/sw/source/core/uibase/smartmenu/stmenu.cxx
diff --git a/sw/source/ui/smartmenu/stmenu.hrc b/sw/source/core/uibase/smartmenu/stmenu.hrc
index 315fb3535af5..315fb3535af5 100644
--- a/sw/source/ui/smartmenu/stmenu.hrc
+++ b/sw/source/core/uibase/smartmenu/stmenu.hrc
diff --git a/sw/source/ui/smartmenu/stmenu.src b/sw/source/core/uibase/smartmenu/stmenu.src
index 326c13b8841e..326c13b8841e 100644
--- a/sw/source/ui/smartmenu/stmenu.src
+++ b/sw/source/core/uibase/smartmenu/stmenu.src
diff --git a/sw/source/ui/table/chartins.cxx b/sw/source/core/uibase/table/chartins.cxx
index c33991127529..c33991127529 100644
--- a/sw/source/ui/table/chartins.cxx
+++ b/sw/source/core/uibase/table/chartins.cxx
diff --git a/sw/source/ui/table/swtablerep.cxx b/sw/source/core/uibase/table/swtablerep.cxx
index f1176b07727f..f1176b07727f 100644
--- a/sw/source/ui/table/swtablerep.cxx
+++ b/sw/source/core/uibase/table/swtablerep.cxx
diff --git a/sw/source/ui/table/tablemgr.cxx b/sw/source/core/uibase/table/tablemgr.cxx
index d823f4571932..d823f4571932 100644
--- a/sw/source/ui/table/tablemgr.cxx
+++ b/sw/source/core/uibase/table/tablemgr.cxx
diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/core/uibase/table/tablepg.hxx
index 17a708c7b3e3..17a708c7b3e3 100644
--- a/sw/source/ui/table/tablepg.hxx
+++ b/sw/source/core/uibase/table/tablepg.hxx
diff --git a/sw/source/ui/uiview/formatclipboard.cxx b/sw/source/core/uibase/uiview/formatclipboard.cxx
index b6dd3f5167c6..b6dd3f5167c6 100644
--- a/sw/source/ui/uiview/formatclipboard.cxx
+++ b/sw/source/core/uibase/uiview/formatclipboard.cxx
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/core/uibase/uiview/pview.cxx
index 50aa5e1bd92a..50aa5e1bd92a 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/core/uibase/uiview/pview.cxx
diff --git a/sw/source/ui/uiview/scroll.cxx b/sw/source/core/uibase/uiview/scroll.cxx
index 92ba2e43060a..92ba2e43060a 100644
--- a/sw/source/ui/uiview/scroll.cxx
+++ b/sw/source/core/uibase/uiview/scroll.cxx
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/core/uibase/uiview/srcview.cxx
index c31d1111c41d..c31d1111c41d 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/core/uibase/uiview/srcview.cxx
diff --git a/sw/source/ui/uiview/swcli.cxx b/sw/source/core/uibase/uiview/swcli.cxx
index 3ee05fef848a..3ee05fef848a 100644
--- a/sw/source/ui/uiview/swcli.cxx
+++ b/sw/source/core/uibase/uiview/swcli.cxx
diff --git a/sw/source/ui/uiview/uivwimp.cxx b/sw/source/core/uibase/uiview/uivwimp.cxx
index 6c6c1911d74e..6c6c1911d74e 100644
--- a/sw/source/ui/uiview/uivwimp.cxx
+++ b/sw/source/core/uibase/uiview/uivwimp.cxx
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/core/uibase/uiview/view.cxx
index 868ae5d5e18b..868ae5d5e18b 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/core/uibase/uiview/view.cxx
diff --git a/sw/source/ui/uiview/view.hrc b/sw/source/core/uibase/uiview/view.hrc
index aa55887e0f6a..aa55887e0f6a 100644
--- a/sw/source/ui/uiview/view.hrc
+++ b/sw/source/core/uibase/uiview/view.hrc
diff --git a/sw/source/ui/uiview/view.src b/sw/source/core/uibase/uiview/view.src
index 17794b074479..17794b074479 100644
--- a/sw/source/ui/uiview/view.src
+++ b/sw/source/core/uibase/uiview/view.src
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/core/uibase/uiview/view0.cxx
index 5363d04bebf9..5363d04bebf9 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/core/uibase/uiview/view0.cxx
diff --git a/sw/source/ui/uiview/view1.cxx b/sw/source/core/uibase/uiview/view1.cxx
index 40e001c6fa4f..40e001c6fa4f 100644
--- a/sw/source/ui/uiview/view1.cxx
+++ b/sw/source/core/uibase/uiview/view1.cxx
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/core/uibase/uiview/view2.cxx
index 9133455ca429..9133455ca429 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/core/uibase/uiview/view2.cxx
diff --git a/sw/source/ui/uiview/viewcoll.cxx b/sw/source/core/uibase/uiview/viewcoll.cxx
index 1c87105ba737..1c87105ba737 100644
--- a/sw/source/ui/uiview/viewcoll.cxx
+++ b/sw/source/core/uibase/uiview/viewcoll.cxx
diff --git a/sw/source/ui/uiview/viewdlg.cxx b/sw/source/core/uibase/uiview/viewdlg.cxx
index b41d6ca345e5..b41d6ca345e5 100644
--- a/sw/source/ui/uiview/viewdlg.cxx
+++ b/sw/source/core/uibase/uiview/viewdlg.cxx
diff --git a/sw/source/ui/uiview/viewdlg2.cxx b/sw/source/core/uibase/uiview/viewdlg2.cxx
index af466021ead5..af466021ead5 100644
--- a/sw/source/ui/uiview/viewdlg2.cxx
+++ b/sw/source/core/uibase/uiview/viewdlg2.cxx
diff --git a/sw/source/ui/uiview/viewdraw.cxx b/sw/source/core/uibase/uiview/viewdraw.cxx
index 0e9849c797c4..0e9849c797c4 100644
--- a/sw/source/ui/uiview/viewdraw.cxx
+++ b/sw/source/core/uibase/uiview/viewdraw.cxx
diff --git a/sw/source/ui/uiview/viewfunc.hxx b/sw/source/core/uibase/uiview/viewfunc.hxx
index 6036509db172..6036509db172 100644
--- a/sw/source/ui/uiview/viewfunc.hxx
+++ b/sw/source/core/uibase/uiview/viewfunc.hxx
diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/core/uibase/uiview/viewling.cxx
index 45b2f12d5fb9..45b2f12d5fb9 100644
--- a/sw/source/ui/uiview/viewling.cxx
+++ b/sw/source/core/uibase/uiview/viewling.cxx
diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/core/uibase/uiview/viewmdi.cxx
index 4ff2f9443fea..4ff2f9443fea 100644
--- a/sw/source/ui/uiview/viewmdi.cxx
+++ b/sw/source/core/uibase/uiview/viewmdi.cxx
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/core/uibase/uiview/viewport.cxx
index 119e03e05d91..119e03e05d91 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/core/uibase/uiview/viewport.cxx
diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/core/uibase/uiview/viewprt.cxx
index 955fb77ec7cd..955fb77ec7cd 100644
--- a/sw/source/ui/uiview/viewprt.cxx
+++ b/sw/source/core/uibase/uiview/viewprt.cxx
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/core/uibase/uiview/viewsrch.cxx
index 5a1e30fd6d69..5a1e30fd6d69 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/core/uibase/uiview/viewsrch.cxx
diff --git a/sw/source/ui/uiview/viewstat.cxx b/sw/source/core/uibase/uiview/viewstat.cxx
index 6314f4784007..6314f4784007 100644
--- a/sw/source/ui/uiview/viewstat.cxx
+++ b/sw/source/core/uibase/uiview/viewstat.cxx
diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/core/uibase/uiview/viewtab.cxx
index e0bc61098195..e0bc61098195 100644
--- a/sw/source/ui/uiview/viewtab.cxx
+++ b/sw/source/core/uibase/uiview/viewtab.cxx
diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/core/uibase/uno/SwXDocumentSettings.cxx
index 48f68dbe6dfd..48f68dbe6dfd 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/core/uibase/uno/SwXDocumentSettings.cxx
diff --git a/sw/source/ui/uno/SwXDocumentSettings.hxx b/sw/source/core/uibase/uno/SwXDocumentSettings.hxx
index 49edf23964a0..49edf23964a0 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.hxx
+++ b/sw/source/core/uibase/uno/SwXDocumentSettings.hxx
diff --git a/sw/source/ui/uno/SwXFilterOptions.cxx b/sw/source/core/uibase/uno/SwXFilterOptions.cxx
index b944a9e0b6f4..b944a9e0b6f4 100644
--- a/sw/source/ui/uno/SwXFilterOptions.cxx
+++ b/sw/source/core/uibase/uno/SwXFilterOptions.cxx
diff --git a/sw/source/ui/uno/dlelstnr.cxx b/sw/source/core/uibase/uno/dlelstnr.cxx
index 802d45c40f4b..802d45c40f4b 100644
--- a/sw/source/ui/uno/dlelstnr.cxx
+++ b/sw/source/core/uibase/uno/dlelstnr.cxx
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/core/uibase/uno/unoatxt.cxx
index 3b381151a758..3b381151a758 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/core/uibase/uno/unoatxt.cxx
diff --git a/sw/source/ui/uno/unodefaults.cxx b/sw/source/core/uibase/uno/unodefaults.cxx
index 1959f742947c..1959f742947c 100644
--- a/sw/source/ui/uno/unodefaults.cxx
+++ b/sw/source/core/uibase/uno/unodefaults.cxx
diff --git a/sw/source/ui/uno/unodefaults.hxx b/sw/source/core/uibase/uno/unodefaults.hxx
index dc4a160596ed..dc4a160596ed 100644
--- a/sw/source/ui/uno/unodefaults.hxx
+++ b/sw/source/core/uibase/uno/unodefaults.hxx
diff --git a/sw/source/ui/uno/unodispatch.cxx b/sw/source/core/uibase/uno/unodispatch.cxx
index 9815c9f3b424..9815c9f3b424 100644
--- a/sw/source/ui/uno/unodispatch.cxx
+++ b/sw/source/core/uibase/uno/unodispatch.cxx
diff --git a/sw/source/ui/uno/unodoc.cxx b/sw/source/core/uibase/uno/unodoc.cxx
index 94c2f8570561..94c2f8570561 100644
--- a/sw/source/ui/uno/unodoc.cxx
+++ b/sw/source/core/uibase/uno/unodoc.cxx
diff --git a/sw/source/ui/uno/unofreg.cxx b/sw/source/core/uibase/uno/unofreg.cxx
index c8b3252df75b..c8b3252df75b 100644
--- a/sw/source/ui/uno/unofreg.cxx
+++ b/sw/source/core/uibase/uno/unofreg.cxx
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/core/uibase/uno/unomailmerge.cxx
index 8e80738003e2..8e80738003e2 100644
--- a/sw/source/ui/uno/unomailmerge.cxx
+++ b/sw/source/core/uibase/uno/unomailmerge.cxx
diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/core/uibase/uno/unomod.cxx
index ba9293248b9a..ba9293248b9a 100644
--- a/sw/source/ui/uno/unomod.cxx
+++ b/sw/source/core/uibase/uno/unomod.cxx
diff --git a/sw/source/ui/uno/unomodule.cxx b/sw/source/core/uibase/uno/unomodule.cxx
index 4acb8e88d816..4acb8e88d816 100644
--- a/sw/source/ui/uno/unomodule.cxx
+++ b/sw/source/core/uibase/uno/unomodule.cxx
diff --git a/sw/source/ui/uno/unomodule.hxx b/sw/source/core/uibase/uno/unomodule.hxx
index a32e2c5dfc4b..a32e2c5dfc4b 100644
--- a/sw/source/ui/uno/unomodule.hxx
+++ b/sw/source/core/uibase/uno/unomodule.hxx
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/core/uibase/uno/unotxdoc.cxx
index 6a6ce86d52f6..6a6ce86d52f6 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/core/uibase/uno/unotxdoc.cxx
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/core/uibase/uno/unotxvw.cxx
index c7e9c4ee4883..c7e9c4ee4883 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/core/uibase/uno/unotxvw.cxx
diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/core/uibase/utlui/attrdesc.cxx
index 6c3889384182..6c3889384182 100644
--- a/sw/source/ui/utlui/attrdesc.cxx
+++ b/sw/source/core/uibase/utlui/attrdesc.cxx
diff --git a/sw/source/ui/utlui/attrdesc.hrc b/sw/source/core/uibase/utlui/attrdesc.hrc
index 5f8f5b683657..5f8f5b683657 100644
--- a/sw/source/ui/utlui/attrdesc.hrc
+++ b/sw/source/core/uibase/utlui/attrdesc.hrc
diff --git a/sw/source/ui/utlui/attrdesc.src b/sw/source/core/uibase/utlui/attrdesc.src
index cd14d9e6add0..cd14d9e6add0 100644
--- a/sw/source/ui/utlui/attrdesc.src
+++ b/sw/source/core/uibase/utlui/attrdesc.src
diff --git a/sw/source/ui/utlui/bookctrl.cxx b/sw/source/core/uibase/utlui/bookctrl.cxx
index 1e5770f62f1a..1e5770f62f1a 100644
--- a/sw/source/ui/utlui/bookctrl.cxx
+++ b/sw/source/core/uibase/utlui/bookctrl.cxx
diff --git a/sw/source/ui/utlui/condedit.cxx b/sw/source/core/uibase/utlui/condedit.cxx
index 5aa7ff1abb0b..5aa7ff1abb0b 100644
--- a/sw/source/ui/utlui/condedit.cxx
+++ b/sw/source/core/uibase/utlui/condedit.cxx
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/core/uibase/utlui/content.cxx
index 60ac680ffd66..60ac680ffd66 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/core/uibase/utlui/content.cxx
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/core/uibase/utlui/glbltree.cxx
index 9cdcf71b7e4b..9cdcf71b7e4b 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/core/uibase/utlui/glbltree.cxx
diff --git a/sw/source/ui/utlui/gloslst.cxx b/sw/source/core/uibase/utlui/gloslst.cxx
index 518a1ed02b5d..518a1ed02b5d 100644
--- a/sw/source/ui/utlui/gloslst.cxx
+++ b/sw/source/core/uibase/utlui/gloslst.cxx
diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/core/uibase/utlui/initui.cxx
index 1a745a735392..1a745a735392 100644
--- a/sw/source/ui/utlui/initui.cxx
+++ b/sw/source/core/uibase/utlui/initui.cxx
diff --git a/sw/source/ui/utlui/initui.hrc b/sw/source/core/uibase/utlui/initui.hrc
index 6df29075cf65..6df29075cf65 100644
--- a/sw/source/ui/utlui/initui.hrc
+++ b/sw/source/core/uibase/utlui/initui.hrc
diff --git a/sw/source/ui/utlui/initui.src b/sw/source/core/uibase/utlui/initui.src
index 81e47ff75eaa..81e47ff75eaa 100644
--- a/sw/source/ui/utlui/initui.src
+++ b/sw/source/core/uibase/utlui/initui.src
diff --git a/sw/source/ui/utlui/navicfg.cxx b/sw/source/core/uibase/utlui/navicfg.cxx
index 975a08876fb9..975a08876fb9 100644
--- a/sw/source/ui/utlui/navicfg.cxx
+++ b/sw/source/core/uibase/utlui/navicfg.cxx
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/core/uibase/utlui/navipi.cxx
index 9dbb33e41893..9dbb33e41893 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/core/uibase/utlui/navipi.cxx
diff --git a/sw/source/ui/utlui/navipi.hrc b/sw/source/core/uibase/utlui/navipi.hrc
index daed23f3d77a..daed23f3d77a 100644
--- a/sw/source/ui/utlui/navipi.hrc
+++ b/sw/source/core/uibase/utlui/navipi.hrc
diff --git a/sw/source/ui/utlui/navipi.src b/sw/source/core/uibase/utlui/navipi.src
index 66bda96428c8..66bda96428c8 100644
--- a/sw/source/ui/utlui/navipi.src
+++ b/sw/source/core/uibase/utlui/navipi.src
diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/core/uibase/utlui/numfmtlb.cxx
index ecd4dee197d5..ecd4dee197d5 100644
--- a/sw/source/ui/utlui/numfmtlb.cxx
+++ b/sw/source/core/uibase/utlui/numfmtlb.cxx
diff --git a/sw/source/ui/utlui/prcntfld.cxx b/sw/source/core/uibase/utlui/prcntfld.cxx
index cd4863753d10..cd4863753d10 100644
--- a/sw/source/ui/utlui/prcntfld.cxx
+++ b/sw/source/core/uibase/utlui/prcntfld.cxx
diff --git a/sw/source/ui/utlui/shdwcrsr.cxx b/sw/source/core/uibase/utlui/shdwcrsr.cxx
index 6e30e2ff21f5..6e30e2ff21f5 100644
--- a/sw/source/ui/utlui/shdwcrsr.cxx
+++ b/sw/source/core/uibase/utlui/shdwcrsr.cxx
diff --git a/sw/source/ui/utlui/tmplctrl.cxx b/sw/source/core/uibase/utlui/tmplctrl.cxx
index a4a59ffc5370..a4a59ffc5370 100644
--- a/sw/source/ui/utlui/tmplctrl.cxx
+++ b/sw/source/core/uibase/utlui/tmplctrl.cxx
diff --git a/sw/source/ui/utlui/uiitems.cxx b/sw/source/core/uibase/utlui/uiitems.cxx
index a3dc8d4b2b3c..a3dc8d4b2b3c 100644
--- a/sw/source/ui/utlui/uiitems.cxx
+++ b/sw/source/core/uibase/utlui/uiitems.cxx
diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/core/uibase/utlui/uitool.cxx
index 206b86451a63..206b86451a63 100644
--- a/sw/source/ui/utlui/uitool.cxx
+++ b/sw/source/core/uibase/utlui/uitool.cxx
diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/core/uibase/utlui/unotools.cxx
index 6d9b90cc88b6..6d9b90cc88b6 100644
--- a/sw/source/ui/utlui/unotools.cxx
+++ b/sw/source/core/uibase/utlui/unotools.cxx
diff --git a/sw/source/ui/utlui/unotools.hrc b/sw/source/core/uibase/utlui/unotools.hrc
index db3d7805f821..db3d7805f821 100644
--- a/sw/source/ui/utlui/unotools.hrc
+++ b/sw/source/core/uibase/utlui/unotools.hrc
diff --git a/sw/source/ui/utlui/unotools.src b/sw/source/core/uibase/utlui/unotools.src
index 7ee442ed1589..7ee442ed1589 100644
--- a/sw/source/ui/utlui/unotools.src
+++ b/sw/source/core/uibase/utlui/unotools.src
diff --git a/sw/source/ui/utlui/viewlayoutctrl.cxx b/sw/source/core/uibase/utlui/viewlayoutctrl.cxx
index 18a92123d1d0..18a92123d1d0 100644
--- a/sw/source/ui/utlui/viewlayoutctrl.cxx
+++ b/sw/source/core/uibase/utlui/viewlayoutctrl.cxx
diff --git a/sw/source/ui/utlui/wordcountctrl.cxx b/sw/source/core/uibase/utlui/wordcountctrl.cxx
index 498de51ceb3c..498de51ceb3c 100644
--- a/sw/source/ui/utlui/wordcountctrl.cxx
+++ b/sw/source/core/uibase/utlui/wordcountctrl.cxx
diff --git a/sw/source/ui/utlui/zoomctrl.cxx b/sw/source/core/uibase/utlui/zoomctrl.cxx
index ac592474eb80..ac592474eb80 100644
--- a/sw/source/ui/utlui/zoomctrl.cxx
+++ b/sw/source/core/uibase/utlui/zoomctrl.cxx
diff --git a/sw/source/ui/web/wdocsh.cxx b/sw/source/core/uibase/web/wdocsh.cxx
index ac44c7d16c4a..ac44c7d16c4a 100644
--- a/sw/source/ui/web/wdocsh.cxx
+++ b/sw/source/core/uibase/web/wdocsh.cxx
diff --git a/sw/source/ui/web/wformsh.cxx b/sw/source/core/uibase/web/wformsh.cxx
index 9911d0be198a..9911d0be198a 100644
--- a/sw/source/ui/web/wformsh.cxx
+++ b/sw/source/core/uibase/web/wformsh.cxx
diff --git a/sw/source/ui/web/wfrmsh.cxx b/sw/source/core/uibase/web/wfrmsh.cxx
index d2697400f983..d2697400f983 100644
--- a/sw/source/ui/web/wfrmsh.cxx
+++ b/sw/source/core/uibase/web/wfrmsh.cxx
diff --git a/sw/source/ui/web/wgrfsh.cxx b/sw/source/core/uibase/web/wgrfsh.cxx
index 042b4ddbbefd..042b4ddbbefd 100644
--- a/sw/source/ui/web/wgrfsh.cxx
+++ b/sw/source/core/uibase/web/wgrfsh.cxx
diff --git a/sw/source/ui/web/wlistsh.cxx b/sw/source/core/uibase/web/wlistsh.cxx
index 7bca24fcf64e..7bca24fcf64e 100644
--- a/sw/source/ui/web/wlistsh.cxx
+++ b/sw/source/core/uibase/web/wlistsh.cxx
diff --git a/sw/source/ui/web/wolesh.cxx b/sw/source/core/uibase/web/wolesh.cxx
index bf8359c8ef47..bf8359c8ef47 100644
--- a/sw/source/ui/web/wolesh.cxx
+++ b/sw/source/core/uibase/web/wolesh.cxx
diff --git a/sw/source/ui/web/wtabsh.cxx b/sw/source/core/uibase/web/wtabsh.cxx
index ca24430380fd..ca24430380fd 100644
--- a/sw/source/ui/web/wtabsh.cxx
+++ b/sw/source/core/uibase/web/wtabsh.cxx
diff --git a/sw/source/ui/web/wtextsh.cxx b/sw/source/core/uibase/web/wtextsh.cxx
index 16299b4f2e68..16299b4f2e68 100644
--- a/sw/source/ui/web/wtextsh.cxx
+++ b/sw/source/core/uibase/web/wtextsh.cxx
diff --git a/sw/source/ui/web/wview.cxx b/sw/source/core/uibase/web/wview.cxx
index 5e733721c280..5e733721c280 100644
--- a/sw/source/ui/web/wview.cxx
+++ b/sw/source/core/uibase/web/wview.cxx
diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/core/uibase/wrtsh/delete.cxx
index 7d95390ce8e9..7d95390ce8e9 100644
--- a/sw/source/ui/wrtsh/delete.cxx
+++ b/sw/source/core/uibase/wrtsh/delete.cxx
diff --git a/sw/source/ui/wrtsh/move.cxx b/sw/source/core/uibase/wrtsh/move.cxx
index fdd75dfbbe14..fdd75dfbbe14 100644
--- a/sw/source/ui/wrtsh/move.cxx
+++ b/sw/source/core/uibase/wrtsh/move.cxx
diff --git a/sw/source/ui/wrtsh/navmgr.cxx b/sw/source/core/uibase/wrtsh/navmgr.cxx
index cb4fc1b6cd07..cb4fc1b6cd07 100644
--- a/sw/source/ui/wrtsh/navmgr.cxx
+++ b/sw/source/core/uibase/wrtsh/navmgr.cxx
diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/core/uibase/wrtsh/select.cxx
index 5b8eee1f367f..5b8eee1f367f 100644
--- a/sw/source/ui/wrtsh/select.cxx
+++ b/sw/source/core/uibase/wrtsh/select.cxx
diff --git a/sw/source/ui/wrtsh/wrtsh.hrc b/sw/source/core/uibase/wrtsh/wrtsh.hrc
index 87435e1bce99..87435e1bce99 100644
--- a/sw/source/ui/wrtsh/wrtsh.hrc
+++ b/sw/source/core/uibase/wrtsh/wrtsh.hrc
diff --git a/sw/source/ui/wrtsh/wrtsh.src b/sw/source/core/uibase/wrtsh/wrtsh.src
index 5d6e3bff3f9b..5d6e3bff3f9b 100644
--- a/sw/source/ui/wrtsh/wrtsh.src
+++ b/sw/source/core/uibase/wrtsh/wrtsh.src
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/core/uibase/wrtsh/wrtsh1.cxx
index ad6648d9078e..ad6648d9078e 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/core/uibase/wrtsh/wrtsh1.cxx
diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/core/uibase/wrtsh/wrtsh2.cxx
index 1634d1dae0b6..1634d1dae0b6 100644
--- a/sw/source/ui/wrtsh/wrtsh2.cxx
+++ b/sw/source/core/uibase/wrtsh/wrtsh2.cxx
diff --git a/sw/source/ui/wrtsh/wrtsh3.cxx b/sw/source/core/uibase/wrtsh/wrtsh3.cxx
index bc35ef16b8e3..bc35ef16b8e3 100644
--- a/sw/source/ui/wrtsh/wrtsh3.cxx
+++ b/sw/source/core/uibase/wrtsh/wrtsh3.cxx
diff --git a/sw/source/ui/wrtsh/wrtsh4.cxx b/sw/source/core/uibase/wrtsh/wrtsh4.cxx
index 6966e45c4fda..6966e45c4fda 100644
--- a/sw/source/ui/wrtsh/wrtsh4.cxx
+++ b/sw/source/core/uibase/wrtsh/wrtsh4.cxx
diff --git a/sw/source/ui/wrtsh/wrtundo.cxx b/sw/source/core/uibase/wrtsh/wrtundo.cxx
index 6290b5e7f5ce..6290b5e7f5ce 100644
--- a/sw/source/ui/wrtsh/wrtundo.cxx
+++ b/sw/source/core/uibase/wrtsh/wrtundo.cxx
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 973576cdc7e2..72ed52243c80 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -64,7 +64,7 @@
 #include <anchoredobject.hxx>
 #include <wrtsh.hxx>
 
-#include "../../ui/inc/view.hxx"
+#include "../uibase/inc/view.hxx"
 #include <PostItMgr.hxx>
 #include <vcl/dibtools.hxx>
 #include <vcl/sysdata.hxx>
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 6cf39d75ecb6..b79122ca5405 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -31,7 +31,7 @@
 #include "envelp.hrc"
 #include "dochdl.hrc"
 #include <index.hrc>
-#include <regionsw.hrc>
+#include <../../core/uibase/dialog/regionsw.hrc>
 
 #include <wordcountdialog.hxx>
 #include "abstract.hxx"
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index a5a5f4e05270..d406a226a22a 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -54,7 +54,7 @@
 
 #include <helpid.h>
 #include <cmdid.h>
-#include <regionsw.hrc>
+#include <../../core/uibase/dialog/regionsw.hrc>
 #include <comcore.hrc>
 #include <globals.hrc>
 #include <sfx2/bindings.hxx>
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 839bd7ff657a..90267465de83 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -24,7 +24,7 @@
 #include <swtypes.hxx>
 #include <wrtsh.hxx>
 #include <initui.hxx>
-#include <labimp.hxx>
+#include <../../core/uibase/envelp/labimp.hxx>
 #include <labfmt.hxx>
 #include <labprt.hxx>
 #include <unotools.hxx>
@@ -33,7 +33,7 @@
 #include <cmdid.h>
 #include <helpid.h>
 #include <globals.hrc>
-#include <label.hrc>
+#include <../../core/uibase/envelp/label.hrc>
 
 //impl in envimg.cxx
 extern SW_DLLPUBLIC OUString MakeSender();
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index bae7395f7694..dd5aebffb012 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -26,12 +26,12 @@
 #include "swtypes.hxx"
 #include "cmdid.h"
 #include "label.hxx"
-#include "labimp.hxx"
+#include "../../core/uibase/envelp/labimp.hxx"
 #include "labimg.hxx"
 #include "labfmt.hxx"
 #include "uitool.hxx"
 
-#include "label.hrc"
+#include "../../core/uibase/envelp/label.hrc"
 #include "labfmt.hrc"
 #include <unomid.h>
 
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index e853f4479d08..7e6590251ab1 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -18,7 +18,7 @@
  */
 #ifndef INCLUDED_SW_SOURCE_UI_ENVELP_SWUILABIMP_HXX
 #define INCLUDED_SW_SOURCE_UI_ENVELP_SWUILABIMP_HXX
-#include "labimp.hxx"
+#include "../../core/uibase/envelp/labimp.hxx"
 #include <com/sun/star/text/XAutoTextContainer2.hpp>
 #include <vcl/layout.hxx>
 
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 64c6c6f3a780..5641d4a97277 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -49,7 +49,7 @@
 #include <cmdid.h>
 #include <app.hrc>
 #include <index.hrc>
-#include <idxmrk.hrc>
+#include <../../core/uibase/index/idxmrk.hrc>
 #include <swmodule.hxx>
 #include <fldmgr.hxx>
 #include <fldbas.hxx>
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 1b956dd04582..4b1383b2a99b 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -45,7 +45,7 @@
 #include <uitool.hxx>
 #include <frmatr.hxx>
 #include <tabledlg.hxx>
-#include <tablepg.hxx>
+#include <../../core/uibase/table/tablepg.hxx>
 #include <tablemgr.hxx>
 #include <pagedesc.hxx>
 #include <uiitems.hxx>
diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx
index 08db8a790b1c..7aaa56bbafae 100644
--- a/sw/source/ui/utlui/swrenamexnameddlg.cxx
+++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx
@@ -21,7 +21,7 @@
 #include <globals.hrc>
 
 #include <utlui.hrc>
-#include <unotools.hrc>
+#include <../../core/uibase/utlui/unotools.hrc>
 #include <unoprnms.hxx>
 #include <osl/diagnose.h>
 #include <vcl/msgbox.hxx>