[Libreoffice-commits] core.git: sw/source
Mike Kaganski
mike.kaganski at collabora.com
Mon Oct 9 03:31:03 UTC 2017
sw/source/uibase/app/appenv.cxx | 6 +-
sw/source/uibase/app/appenv.hxx | 5 ++
sw/source/uibase/app/apphdl.cxx | 2
sw/source/uibase/app/applab.cxx | 4 -
sw/source/uibase/app/appopt.cxx | 2
sw/source/uibase/app/docsh2.cxx | 4 -
sw/source/uibase/app/docst.cxx | 44 ++++++++++-----------
sw/source/uibase/app/mainwn.cxx | 2
sw/source/uibase/app/swdll.cxx | 2
sw/source/uibase/app/swmodul1.cxx | 4 -
sw/source/uibase/app/swmodule.cxx | 2
sw/source/uibase/cctrl/actctrl.cxx | 2
sw/source/uibase/chrdlg/ccoll.cxx | 26 ++++++------
sw/source/uibase/config/barcfg.cxx | 2
sw/source/uibase/config/caption.cxx | 4 -
sw/source/uibase/config/cfgitems.cxx | 12 ++---
sw/source/uibase/config/usrpref.cxx | 10 ++--
sw/source/uibase/dbui/dbtree.cxx | 2
sw/source/uibase/dbui/dbui.cxx | 6 +-
sw/source/uibase/dbui/maildispatcher.cxx | 4 -
sw/source/uibase/dialog/regionsw.cxx | 2
sw/source/uibase/dialog/swabstdlg.cxx | 2
sw/source/uibase/dialog/swwrtshitem.cxx | 2
sw/source/uibase/dochdl/gloshdl.cxx | 2
sw/source/uibase/docvw/AnchorOverlayObject.cxx | 2
sw/source/uibase/docvw/AnnotationMenuButton.cxx | 2
sw/source/uibase/docvw/AnnotationWin.cxx | 10 ++--
sw/source/uibase/docvw/AnnotationWin2.cxx | 12 ++---
sw/source/uibase/docvw/OverlayRanges.cxx | 2
sw/source/uibase/docvw/PageBreakWin.cxx | 2
sw/source/uibase/docvw/PostItMgr.cxx | 16 +++----
sw/source/uibase/docvw/ShadowOverlayObject.cxx | 2
sw/source/uibase/docvw/SidebarScrollBar.cxx | 2
sw/source/uibase/docvw/SidebarTxtControl.cxx | 4 -
sw/source/uibase/docvw/SidebarTxtControlAcc.cxx | 4 -
sw/source/uibase/docvw/SidebarWinAcc.cxx | 2
sw/source/uibase/docvw/edtwin.cxx | 6 +-
sw/source/uibase/docvw/edtwin3.cxx | 24 +++++------
sw/source/uibase/docvw/frmsidebarwincontainer.cxx | 2
sw/source/uibase/docvw/romenu.cxx | 2
sw/source/uibase/docvw/romenu.hxx | 1
sw/source/uibase/envelp/labimg.cxx | 6 +-
sw/source/uibase/envelp/syncbtn.cxx | 14 +++---
sw/source/uibase/fldui/fldwrap.cxx | 2
sw/source/uibase/frmdlg/colex.cxx | 8 +--
sw/source/uibase/frmdlg/colmgr.cxx | 8 +--
sw/source/uibase/frmdlg/frmmgr.cxx | 20 ++++-----
sw/source/uibase/globdoc/globdoc.cxx | 8 +--
sw/source/uibase/inc/SidebarWindowsConsts.hxx | 2
sw/source/uibase/inc/actctrl.hxx | 2
sw/source/uibase/inc/annotsh.hxx | 4 -
sw/source/uibase/inc/beziersh.hxx | 2
sw/source/uibase/inc/bookmark.hxx | 2
sw/source/uibase/inc/caption.hxx | 2
sw/source/uibase/inc/cfgitems.hxx | 2
sw/source/uibase/inc/changedb.hxx | 2
sw/source/uibase/inc/chartins.hxx | 4 +
sw/source/uibase/inc/cnttab.hxx | 2
sw/source/uibase/inc/colex.hxx | 4 -
sw/source/uibase/inc/colmgr.hxx | 2
sw/source/uibase/inc/conarc.hxx | 2
sw/source/uibase/inc/concustomshape.hxx | 2
sw/source/uibase/inc/condedit.hxx | 2
sw/source/uibase/inc/conform.hxx | 2
sw/source/uibase/inc/conpoly.hxx | 2
sw/source/uibase/inc/conrect.hxx | 2
sw/source/uibase/inc/content.hxx | 2
sw/source/uibase/inc/conttree.hxx | 2
sw/source/uibase/inc/cption.hxx | 2
sw/source/uibase/inc/dbconfig.hxx | 2
sw/source/uibase/inc/dbtree.hxx | 2
sw/source/uibase/inc/docstdlg.hxx | 2
sw/source/uibase/inc/drawsh.hxx | 2
sw/source/uibase/inc/drformsh.hxx | 2
sw/source/uibase/inc/drwbassh.hxx | 2
sw/source/uibase/inc/drwtxtsh.hxx | 2
sw/source/uibase/inc/dselect.hxx | 2
sw/source/uibase/inc/envimg.hxx | 2
sw/source/uibase/inc/envlop.hxx | 2
sw/source/uibase/inc/fldmgr.hxx | 4 -
sw/source/uibase/inc/fldwrap.hxx | 2
sw/source/uibase/inc/fontcfg.hxx | 2
sw/source/uibase/inc/frmdlg.hxx | 2
sw/source/uibase/inc/frmmgr.hxx | 6 +-
sw/source/uibase/inc/frmsh.hxx | 2
sw/source/uibase/inc/glosdoc.hxx | 2
sw/source/uibase/inc/gloshdl.hxx | 2
sw/source/uibase/inc/glshell.hxx | 2
sw/source/uibase/inc/grfsh.hxx | 2
sw/source/uibase/inc/idxmrk.hxx | 2
sw/source/uibase/inc/initui.hxx | 2
sw/source/uibase/inc/labelcfg.hxx | 4 -
sw/source/uibase/inc/labimg.hxx | 2
sw/source/uibase/inc/langhelper.hxx | 5 ++
sw/source/uibase/inc/listsh.hxx | 2
sw/source/uibase/inc/mailmergehelper.hxx | 2
sw/source/uibase/inc/mediash.hxx | 2
sw/source/uibase/inc/mmconfigitem.hxx | 4 -
sw/source/uibase/inc/navmgr.hxx | 6 +-
sw/source/uibase/inc/navsh.hxx | 2
sw/source/uibase/inc/num.hxx | 2
sw/source/uibase/inc/numberingtypelistbox.hxx | 2
sw/source/uibase/inc/numfmtlb.hxx | 2
sw/source/uibase/inc/olesh.hxx | 2
sw/source/uibase/inc/outline.hxx | 2
sw/source/uibase/inc/prcntfld.hxx | 4 -
sw/source/uibase/inc/pview.hxx | 4 -
sw/source/uibase/inc/redlndlg.hxx | 4 -
sw/source/uibase/inc/srcview.hxx | 4 -
sw/source/uibase/inc/swmodalredlineacceptdlg.hxx | 2
sw/source/uibase/inc/swtablerep.hxx | 4 -
sw/source/uibase/inc/swuiccoll.hxx | 2
sw/source/uibase/inc/swuicnttab.hxx | 2
sw/source/uibase/inc/swuiidxmrk.hxx | 2
sw/source/uibase/inc/swuipardlg.hxx | 2
sw/source/uibase/inc/swwrtshitem.hxx | 2
sw/source/uibase/inc/tabledlg.hxx | 4 -
sw/source/uibase/inc/tablemgr.hxx | 6 +-
sw/source/uibase/inc/tabsh.hxx | 4 -
sw/source/uibase/inc/toxmgr.hxx | 4 -
sw/source/uibase/inc/uiitems.hxx | 6 +-
sw/source/uibase/inc/uinums.hxx | 2
sw/source/uibase/inc/uitool.hxx | 2
sw/source/uibase/inc/unotools.hxx | 2
sw/source/uibase/inc/unotxvw.hxx | 4 -
sw/source/uibase/inc/usrpref.hxx | 2
sw/source/uibase/inc/wformsh.hxx | 2
sw/source/uibase/inc/wfrmsh.hxx | 2
sw/source/uibase/inc/wgrfsh.hxx | 2
sw/source/uibase/inc/wlistsh.hxx | 2
sw/source/uibase/inc/wolesh.hxx | 2
sw/source/uibase/inc/wordcountdialog.hxx | 2
sw/source/uibase/inc/wrtsh.hxx | 4 -
sw/source/uibase/inc/wtabsh.hxx | 2
sw/source/uibase/inc/wtextsh.hxx | 2
sw/source/uibase/inc/wview.hxx | 4 -
sw/source/uibase/lingu/hhcwrp.cxx | 2
sw/source/uibase/lingu/hyp.cxx | 18 ++++----
sw/source/uibase/lingu/olmenu.cxx | 46 +++++++++++-----------
sw/source/uibase/lingu/sdrhhcwrap.cxx | 2
sw/source/uibase/misc/redlndlg.cxx | 2
sw/source/uibase/misc/swruler.cxx | 14 +++---
sw/source/uibase/ribbar/conarc.cxx | 10 ++--
sw/source/uibase/ribbar/conform.cxx | 12 ++---
sw/source/uibase/ribbar/conpoly.cxx | 10 ++--
sw/source/uibase/ribbar/drawbase.cxx | 20 ++++-----
sw/source/uibase/ribbar/dselect.cxx | 12 ++---
sw/source/uibase/ribbar/inputwin.cxx | 36 ++++++++---------
sw/source/uibase/ribbar/workctrl.cxx | 4 -
sw/source/uibase/shells/annotsh.cxx | 8 +--
sw/source/uibase/shells/basesh.cxx | 4 -
sw/source/uibase/shells/beziersh.cxx | 20 ++++-----
sw/source/uibase/shells/drawdlg.cxx | 10 ++--
sw/source/uibase/shells/drawsh.cxx | 20 ++++-----
sw/source/uibase/shells/drformsh.cxx | 20 ++++-----
sw/source/uibase/shells/drwbassh.cxx | 2
sw/source/uibase/shells/drwtxtex.cxx | 2
sw/source/uibase/shells/drwtxtsh.cxx | 4 -
sw/source/uibase/shells/frmsh.cxx | 4 -
sw/source/uibase/shells/grfsh.cxx | 4 -
sw/source/uibase/shells/langhelper.cxx | 2
sw/source/uibase/shells/listsh.cxx | 28 ++++++-------
sw/source/uibase/shells/mediash.cxx | 4 -
sw/source/uibase/shells/navsh.cxx | 20 ++++-----
sw/source/uibase/shells/slotadd.cxx | 18 ++++----
sw/source/uibase/shells/tabsh.cxx | 4 -
sw/source/uibase/shells/textfld.cxx | 2
sw/source/uibase/shells/textglos.cxx | 16 +++----
sw/source/uibase/shells/textidx.cxx | 20 ++++-----
sw/source/uibase/shells/textsh.cxx | 2
sw/source/uibase/shells/textsh1.cxx | 6 +-
sw/source/uibase/shells/textsh2.cxx | 20 ++++-----
sw/source/uibase/shells/txtattr.cxx | 6 +-
sw/source/uibase/shells/txtcrsr.cxx | 2
sw/source/uibase/shells/txtnum.cxx | 20 ++++-----
sw/source/uibase/sidebar/PageFooterPanel.cxx | 2
sw/source/uibase/sidebar/PageFormatPanel.cxx | 2
sw/source/uibase/sidebar/PageHeaderPanel.cxx | 2
sw/source/uibase/sidebar/PageMarginControl.cxx | 2
sw/source/uibase/sidebar/PageStylesPanel.cxx | 4 -
sw/source/uibase/sidebar/StylePresetsPanel.cxx | 4 -
sw/source/uibase/sidebar/StylePresetsPanel.hxx | 2
sw/source/uibase/sidebar/SwPanelFactory.cxx | 14 +++---
sw/source/uibase/sidebar/ThemePanel.cxx | 10 ++--
sw/source/uibase/sidebar/ThemePanel.hxx | 2
sw/source/uibase/table/swtablerep.cxx | 4 -
sw/source/uibase/table/tablemgr.cxx | 32 +++++++--------
sw/source/uibase/table/tablepg.hxx | 4 -
sw/source/uibase/uitest/uiobject.cxx | 8 +--
sw/source/uibase/uiview/formatclipboard.cxx | 2
sw/source/uibase/uiview/pview.cxx | 2
sw/source/uibase/uiview/scroll.cxx | 6 +-
sw/source/uibase/uiview/srcview.cxx | 4 -
sw/source/uibase/uiview/uivwimp.cxx | 2
sw/source/uibase/uiview/view.cxx | 2
sw/source/uibase/uiview/view0.cxx | 24 +++++------
sw/source/uibase/uiview/view1.cxx | 2
sw/source/uibase/uiview/view2.cxx | 2
sw/source/uibase/uiview/viewcoll.cxx | 10 ++--
sw/source/uibase/uiview/viewdlg.cxx | 16 +++----
sw/source/uibase/uiview/viewdlg2.cxx | 22 +++++-----
sw/source/uibase/uiview/viewdraw.cxx | 30 +++++++-------
sw/source/uibase/uiview/viewmdi.cxx | 2
sw/source/uibase/uiview/viewport.cxx | 2
sw/source/uibase/uiview/viewprt.cxx | 4 -
sw/source/uibase/uiview/viewsrch.cxx | 2
sw/source/uibase/uiview/viewtab.cxx | 32 +++++++--------
sw/source/uibase/uno/SwXDocumentSettings.cxx | 10 ++--
sw/source/uibase/uno/SwXFilterOptions.cxx | 2
sw/source/uibase/uno/dlelstnr.cxx | 2
sw/source/uibase/uno/unodefaults.cxx | 2
sw/source/uibase/uno/unodispatch.cxx | 4 -
sw/source/uibase/uno/unodoc.cxx | 10 ++--
sw/source/uibase/uno/unofreg.cxx | 8 +--
sw/source/uibase/uno/unomodule.cxx | 6 +-
sw/source/uibase/uno/unotxdoc.cxx | 8 +--
sw/source/uibase/uno/unotxvw.cxx | 4 -
sw/source/uibase/utlui/bookctrl.cxx | 12 ++---
sw/source/uibase/utlui/content.cxx | 10 ++--
sw/source/uibase/utlui/glbltree.cxx | 4 -
sw/source/uibase/utlui/navipi.cxx | 6 +-
sw/source/uibase/utlui/numfmtlb.cxx | 2
sw/source/uibase/utlui/prcntfld.cxx | 2
sw/source/uibase/utlui/shdwcrsr.cxx | 4 -
sw/source/uibase/utlui/tmplctrl.cxx | 12 ++---
sw/source/uibase/utlui/uiitems.cxx | 8 +--
sw/source/uibase/utlui/uitool.cxx | 2
sw/source/uibase/utlui/viewlayoutctrl.cxx | 2
sw/source/uibase/utlui/wordcountctrl.cxx | 2
sw/source/uibase/utlui/zoomctrl.cxx | 6 +-
sw/source/uibase/web/wdocsh.cxx | 12 ++---
sw/source/uibase/web/wformsh.cxx | 12 ++---
sw/source/uibase/web/wfrmsh.cxx | 16 +++----
sw/source/uibase/web/wgrfsh.cxx | 20 ++++-----
sw/source/uibase/web/wlistsh.cxx | 16 +++----
sw/source/uibase/web/wolesh.cxx | 16 +++----
sw/source/uibase/web/wtabsh.cxx | 20 ++++-----
sw/source/uibase/web/wtextsh.cxx | 18 ++++----
sw/source/uibase/wrtsh/navmgr.cxx | 4 -
sw/source/uibase/wrtsh/wrtsh1.cxx | 4 -
sw/source/uibase/wrtsh/wrtsh2.cxx | 2
sw/source/uibase/wrtsh/wrtsh3.cxx | 10 ++--
242 files changed, 777 insertions(+), 758 deletions(-)
New commits:
commit 5c151537b571614c8f10b96e2b60faa959413f1f
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date: Sun Oct 8 21:46:51 2017 +0300
uibase: consistently use "" and <> in include directives
Change-Id: Ib6888045cecb4bd7b3498534605d790324f1b40a
Reviewed-on: https://gerrit.libreoffice.org/43265
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx
index 1c5a93a8bf72..9dd8145a7b0f 100644
--- a/sw/source/uibase/app/appenv.cxx
+++ b/sw/source/uibase/app/appenv.cxx
@@ -64,9 +64,9 @@
#include <globals.hrc>
#include <app.hrc>
#include <strings.hrc>
-#include "swabstdlg.hxx"
-#include "envimg.hxx"
-#include <appenv.hxx>
+#include <swabstdlg.hxx>
+#include <envimg.hxx>
+#include "appenv.hxx"
#include <memory>
diff --git a/sw/source/uibase/app/appenv.hxx b/sw/source/uibase/app/appenv.hxx
index 1e58efccfc8a..64fcd4a81af0 100644
--- a/sw/source/uibase/app/appenv.hxx
+++ b/sw/source/uibase/app/appenv.hxx
@@ -10,6 +10,11 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_APP_APPENV_HXX
#define INCLUDED_SW_SOURCE_UIBASE_APP_APPENV_HXX
+#include <rtl/ustring.hxx>
+
+class SwWrtShell;
+class SwFieldMgr;
+
OUString InsertLabEnvText( SwWrtShell& , SwFieldMgr& , const OUString& );
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 11ab8fcdc312..e3fd77c077ff 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -110,7 +110,7 @@ using namespace ::com::sun::star;
// see Idl-file
#define SwModule
#include <sfx2/msg.hxx>
-#include "swslots.hxx"
+#include <swslots.hxx>
#include <strings.hrc>
diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index 1261362f7fc6..030d8ffda666 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -67,11 +67,11 @@
#include <app.hrc>
#include <strings.hrc>
-#include "swabstdlg.hxx"
+#include <swabstdlg.hxx>
#include <IDocumentDeviceAccess.hxx>
-#include <appenv.hxx>
+#include "appenv.hxx"
#include <memory>
using namespace ::com::sun::star;
diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx
index 6ff4597c21bd..946e5f6a2aab 100644
--- a/sw/source/uibase/app/appopt.cxx
+++ b/sw/source/uibase/app/appopt.cxx
@@ -65,7 +65,7 @@
#include <globals.hrc>
#include <globals.h>
#include <svl/slstitm.hxx>
-#include "swabstdlg.hxx"
+#include <swabstdlg.hxx>
#include <swwrtshitem.hxx>
#include <unomid.h>
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 9e3f51b03c0f..8c12de7b91c2 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -124,8 +124,8 @@
#include <sfx2/fcontnr.hxx>
#include <svx/ClassificationDialog.hxx>
-#include "swabstdlg.hxx"
-#include "watermarkdialog.hxx"
+#include <swabstdlg.hxx>
+#include <watermarkdialog.hxx>
#include <ndtxt.hxx>
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index cfc899eced44..f390339ce2bb 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -52,36 +52,36 @@
#include <swundo.hxx>
#include <svx/svdmodel.hxx>
#include <svx/drawitem.hxx>
-#include "view.hxx"
-#include "wrtsh.hxx"
-#include "docsh.hxx"
-#include "uitool.hxx"
-#include "cmdid.h"
-#include "globals.hrc"
-#include "viewopt.hxx"
+#include <view.hxx>
+#include <wrtsh.hxx>
+#include <docsh.hxx>
+#include <uitool.hxx>
+#include <cmdid.h>
+#include <globals.hrc>
+#include <viewopt.hxx>
#include <doc.hxx>
#include <drawdoc.hxx>
-#include "IDocumentDrawModelAccess.hxx"
+#include <IDocumentDrawModelAccess.hxx>
#include <IDocumentUndoRedo.hxx>
#include <IDocumentSettingAccess.hxx>
#include <IDocumentDeviceAccess.hxx>
#include <IDocumentFieldsAccess.hxx>
#include <IDocumentListsAccess.hxx>
#include <IDocumentState.hxx>
-#include "swstyle.h"
-#include "frmfmt.hxx"
-#include "charfmt.hxx"
-#include "poolfmt.hxx"
-#include "pagedesc.hxx"
-#include "docstyle.hxx"
-#include "uiitems.hxx"
-#include "fmtcol.hxx"
-#include "frmmgr.hxx"
-#include "swevent.hxx"
-#include "edtwin.hxx"
-#include "unochart.hxx"
-#include "app.hrc"
-#include "swabstdlg.hxx"
+#include <swstyle.h>
+#include <frmfmt.hxx>
+#include <charfmt.hxx>
+#include <poolfmt.hxx>
+#include <pagedesc.hxx>
+#include <docstyle.hxx>
+#include <uiitems.hxx>
+#include <fmtcol.hxx>
+#include <frmmgr.hxx>
+#include <swevent.hxx>
+#include <edtwin.hxx>
+#include <unochart.hxx>
+#include <app.hrc>
+#include <swabstdlg.hxx>
#include <list.hxx>
#include <paratr.hxx>
#include <tblafmt.hxx>
diff --git a/sw/source/uibase/app/mainwn.cxx b/sw/source/uibase/app/mainwn.cxx
index 4c690b0ce714..747b69e953f3 100644
--- a/sw/source/uibase/app/mainwn.cxx
+++ b/sw/source/uibase/app/mainwn.cxx
@@ -21,7 +21,7 @@
#include <sfx2/progress.hxx>
#include <docsh.hxx>
#include <swmodule.hxx>
-#include "swtypes.hxx"
+#include <swtypes.hxx>
class SwDocShell;
diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx
index 5bbee4388b53..553f8e613bac 100644
--- a/sw/source/uibase/app/swdll.cxx
+++ b/sw/source/uibase/app/swdll.cxx
@@ -22,7 +22,7 @@
#include <svx/svdobj.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
#include <swdll.hxx>
#include <wdocsh.hxx>
diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx
index 7eaa20e1c422..148323373780 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -59,12 +59,12 @@
#include <cmdid.h>
#include <app.hrc>
#include <strings.hrc>
-#include "helpids.h"
+#include <helpids.h>
#include <IDocumentLayoutAccess.hxx>
#include <unomid.h>
#include <tools/color.hxx>
-#include "PostItMgr.hxx"
+#include <PostItMgr.hxx>
using namespace ::svx;
using namespace ::com::sun::star;
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index 47567ec52256..ee09b4680a5b 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -128,7 +128,7 @@
#include <app.hrc>
#include <error.hrc>
#include <strings.hrc>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
#include <svx/xmlsecctrl.hxx>
bool g_bNoInterrupt = false;
diff --git a/sw/source/uibase/cctrl/actctrl.cxx b/sw/source/uibase/cctrl/actctrl.cxx
index b607041bbdfc..aa66ef49aeed 100644
--- a/sw/source/uibase/cctrl/actctrl.cxx
+++ b/sw/source/uibase/cctrl/actctrl.cxx
@@ -19,7 +19,7 @@
#include <comphelper/string.hxx>
#include <vcl/builderfactory.hxx>
-#include "actctrl.hxx"
+#include <actctrl.hxx>
bool NumEditAction::EventNotify( NotifyEvent& rNEvt )
{
diff --git a/sw/source/uibase/chrdlg/ccoll.cxx b/sw/source/uibase/chrdlg/ccoll.cxx
index 58f77f5770db..d066d7a86e91 100644
--- a/sw/source/uibase/chrdlg/ccoll.cxx
+++ b/sw/source/uibase/chrdlg/ccoll.cxx
@@ -17,22 +17,22 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "cmdid.h"
-#include "swmodule.hxx"
-#include "view.hxx"
-#include "wrtsh.hxx"
-#include "globals.hrc"
-#include "helpids.h"
+#include <cmdid.h>
+#include <swmodule.hxx>
+#include <view.hxx>
+#include <wrtsh.hxx>
+#include <globals.hrc>
+#include <helpids.h>
#include <sfx2/styfitem.hxx>
-#include "uitool.hxx"
-#include "ccoll.hxx"
-#include "fmtcol.hxx"
-#include "hintids.hxx"
-#include "docsh.hxx"
-#include "docstyle.hxx"
-#include "hints.hxx"
+#include <uitool.hxx>
+#include <ccoll.hxx>
+#include <fmtcol.hxx>
+#include <hintids.hxx>
+#include <docsh.hxx>
+#include <docstyle.hxx>
+#include <hints.hxx>
#include <vcl/svapp.hxx>
diff --git a/sw/source/uibase/config/barcfg.cxx b/sw/source/uibase/config/barcfg.cxx
index 61e12d64e723..671f81811a25 100644
--- a/sw/source/uibase/config/barcfg.cxx
+++ b/sw/source/uibase/config/barcfg.cxx
@@ -20,7 +20,7 @@
#include <osl/diagnose.h>
#include <com/sun/star/uno/Sequence.hxx>
#include <wrtsh.hxx>
-#include "barcfg.hxx"
+#include <barcfg.hxx>
#include <unomid.h>
diff --git a/sw/source/uibase/config/caption.cxx b/sw/source/uibase/config/caption.cxx
index 83746c5bb31e..9f38f73d89a1 100644
--- a/sw/source/uibase/config/caption.cxx
+++ b/sw/source/uibase/config/caption.cxx
@@ -18,8 +18,8 @@
*/
-#include "numrule.hxx"
-#include "caption.hxx"
+#include <numrule.hxx>
+#include <caption.hxx>
InsCaptionOpt::InsCaptionOpt(const SwCapObjType eType, const SvGlobalName* pOleId) :
bUseCaption(false),
diff --git a/sw/source/uibase/config/cfgitems.cxx b/sw/source/uibase/config/cfgitems.cxx
index 00d8f28f3ada..07b569fc6307 100644
--- a/sw/source/uibase/config/cfgitems.cxx
+++ b/sw/source/uibase/config/cfgitems.cxx
@@ -22,12 +22,12 @@
#include <svx/svxids.hrc>
#include <editeng/svxenum.hxx>
-#include "viewopt.hxx"
-#include "swtypes.hxx"
-#include "cmdid.h"
-#include "prtopt.hxx"
-#include "cfgitems.hxx"
-#include "crstate.hxx"
+#include <viewopt.hxx>
+#include <swtypes.hxx>
+#include <cmdid.h>
+#include <prtopt.hxx>
+#include <cfgitems.hxx>
+#include <crstate.hxx>
SwDocDisplayItem::SwDocDisplayItem() :
diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx
index a1390547da21..2309bf19c33b 100644
--- a/sw/source/uibase/config/usrpref.cxx
+++ b/sw/source/uibase/config/usrpref.cxx
@@ -24,11 +24,11 @@
#include <unotools/configmgr.hxx>
#include <unotools/syslocale.hxx>
-#include "swtypes.hxx"
-#include "hintids.hxx"
-#include "uitool.hxx"
-#include "usrpref.hxx"
-#include "crstate.hxx"
+#include <swtypes.hxx>
+#include <hintids.hxx>
+#include <uitool.hxx>
+#include <usrpref.hxx>
+#include <crstate.hxx>
#include <linguistic/lngprops.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index a4f058fb7ece..1e8eae86e486 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -42,7 +42,7 @@
#include <helpids.h>
#include <strings.hrc>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
#include <unomid.h>
diff --git a/sw/source/uibase/dbui/dbui.cxx b/sw/source/uibase/dbui/dbui.cxx
index 931683f5472f..39b74c84d8cd 100644
--- a/sw/source/uibase/dbui/dbui.cxx
+++ b/sw/source/uibase/dbui/dbui.cxx
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "wrtsh.hxx"
+#include <wrtsh.hxx>
-#include "dbui.hrc"
-#include "dbui.hxx"
+#include <dbui.hrc>
+#include <dbui.hxx>
PrintMonitor::PrintMonitor(vcl::Window *pParent, bool modal, PrintMonitorType eType )
: CancelableDialog(pParent, modal, "PrintMonitorDialog",
diff --git a/sw/source/uibase/dbui/maildispatcher.cxx b/sw/source/uibase/dbui/maildispatcher.cxx
index 8bc4dabdf5a9..89678bc34529 100644
--- a/sw/source/uibase/dbui/maildispatcher.cxx
+++ b/sw/source/uibase/dbui/maildispatcher.cxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "maildispatcher.hxx"
-#include "imaildsplistener.hxx"
+#include <maildispatcher.hxx>
+#include <imaildsplistener.hxx>
#include <algorithm>
diff --git a/sw/source/uibase/dialog/regionsw.cxx b/sw/source/uibase/dialog/regionsw.cxx
index d8888f091d3d..3e55705254ae 100644
--- a/sw/source/uibase/dialog/regionsw.cxx
+++ b/sw/source/uibase/dialog/regionsw.cxx
@@ -52,7 +52,7 @@
#include <sfx2/bindings.hxx>
#include <sfx2/htmlmode.hxx>
#include <svx/dlgutil.hxx>
-#include "swabstdlg.hxx"
+#include <swabstdlg.hxx>
#include <memory>
void SwBaseShell::InsertRegionDialog(SfxRequest& rReq)
diff --git a/sw/source/uibase/dialog/swabstdlg.cxx b/sw/source/uibase/dialog/swabstdlg.cxx
index 0d1ee6633c86..6343d27cf54e 100644
--- a/sw/source/uibase/dialog/swabstdlg.cxx
+++ b/sw/source/uibase/dialog/swabstdlg.cxx
@@ -19,7 +19,7 @@
#include <config_features.h>
-#include "swabstdlg.hxx"
+#include <swabstdlg.hxx>
#include <osl/module.hxx>
diff --git a/sw/source/uibase/dialog/swwrtshitem.cxx b/sw/source/uibase/dialog/swwrtshitem.cxx
index 27a9ab08d398..366c760efb55 100644
--- a/sw/source/uibase/dialog/swwrtshitem.cxx
+++ b/sw/source/uibase/dialog/swwrtshitem.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "swwrtshitem.hxx"
+#include <swwrtshitem.hxx>
#include <globals.hrc>
SwWrtShellItem::SwWrtShellItem( SwWrtShell* pSh )
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
index 9487080fab41..85964f4c1f0c 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -51,7 +51,7 @@
#include <vcl/lstbox.hxx>
#include <editeng/acorrcfg.hxx>
-#include "swabstdlg.hxx"
+#include <swabstdlg.hxx>
#include <IDocumentFieldsAccess.hxx>
diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/uibase/docvw/AnchorOverlayObject.cxx
index 16acfb845409..0afa6c36f0bd 100644
--- a/sw/source/uibase/docvw/AnchorOverlayObject.cxx
+++ b/sw/source/uibase/docvw/AnchorOverlayObject.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <AnchorOverlayObject.hxx>
+#include "AnchorOverlayObject.hxx"
#include <SidebarWindowsConsts.hxx>
#include <swrect.hxx>
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
index c3cc960961c2..af7af8aa60f4 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <AnnotationMenuButton.hxx>
+#include "AnnotationMenuButton.hxx"
#include <app.hrc>
#include <strings.hrc>
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index 5838e992276f..4a5cf6da9d6f 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -19,7 +19,7 @@
#include <AnnotationWin.hxx>
-#include <AnnotationMenuButton.hxx>
+#include "AnnotationMenuButton.hxx"
#include <PostItMgr.hxx>
#include <strings.hrc>
@@ -51,10 +51,10 @@
#include <IDocumentUndoRedo.hxx>
#include <SwUndoField.hxx>
#include <edtwin.hxx>
-#include <ShadowOverlayObject.hxx>
-#include <AnchorOverlayObject.hxx>
-#include <OverlayRanges.hxx>
-#include <SidebarTxtControl.hxx>
+#include "ShadowOverlayObject.hxx"
+#include "AnchorOverlayObject.hxx"
+#include "OverlayRanges.hxx"
+#include "SidebarTxtControl.hxx"
#include <memory>
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx
index a225edf5688d..182f19cc91b9 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -22,16 +22,16 @@
#include <cstddef>
#include <cstdlib>
-#include <SidebarWinAcc.hxx>
+#include "SidebarWinAcc.hxx"
#include <PostItMgr.hxx>
#include <AnnotationWin.hxx>
#include <basegfx/range/b2drange.hxx>
#include <comphelper/string.hxx>
-#include <SidebarTxtControl.hxx>
-#include <SidebarScrollBar.hxx>
-#include <AnchorOverlayObject.hxx>
-#include <ShadowOverlayObject.hxx>
-#include <OverlayRanges.hxx>
+#include "SidebarTxtControl.hxx"
+#include "SidebarScrollBar.hxx"
+#include "AnchorOverlayObject.hxx"
+#include "ShadowOverlayObject.hxx"
+#include "OverlayRanges.hxx"
#include <strings.hrc>
#include <app.hrc>
diff --git a/sw/source/uibase/docvw/OverlayRanges.cxx b/sw/source/uibase/docvw/OverlayRanges.cxx
index 1218f452d03e..7c0585d8988b 100644
--- a/sw/source/uibase/docvw/OverlayRanges.cxx
+++ b/sw/source/uibase/docvw/OverlayRanges.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <OverlayRanges.hxx>
+#include "OverlayRanges.hxx"
#include <view.hxx>
#include <svx/sdrpaintwindow.hxx>
#include <svx/svdview.hxx>
diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx
index 52971c2af085..7fa904801c19 100644
--- a/sw/source/uibase/docvw/PageBreakWin.cxx
+++ b/sw/source/uibase/docvw/PageBreakWin.cxx
@@ -9,7 +9,7 @@
#include <globals.hrc>
#include <strings.hrc>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
#include <cmdid.h>
#include <cntfrm.hxx>
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index 7e318eacd7bf..7a6b2495ddf0 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -19,16 +19,16 @@
#include <boost/property_tree/json_parser.hpp>
-#include "PostItMgr.hxx"
+#include <PostItMgr.hxx>
#include <postithelper.hxx>
#include <AnnotationWin.hxx>
-#include <frmsidebarwincontainer.hxx>
+#include "frmsidebarwincontainer.hxx"
#include <accmap.hxx>
#include <SidebarWindowsConsts.hxx>
-#include <AnchorOverlayObject.hxx>
-#include <ShadowOverlayObject.hxx>
+#include "AnchorOverlayObject.hxx"
+#include "ShadowOverlayObject.hxx"
#include <vcl/svapp.hxx>
#include <vcl/scrbar.hxx>
@@ -58,7 +58,7 @@
#include <swmodule.hxx>
#include <strings.hrc>
-#include "cmdid.h"
+#include <cmdid.h>
#include <sfx2/request.hxx>
#include <sfx2/event.hxx>
@@ -80,9 +80,9 @@
#include <comphelper/string.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
-#include "annotsh.hxx"
-#include "swabstdlg.hxx"
-#include "swevent.hxx"
+#include <annotsh.hxx>
+#include <swabstdlg.hxx>
+#include <swevent.hxx>
#include <calbck.hxx>
#include <memory>
diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.cxx b/sw/source/uibase/docvw/ShadowOverlayObject.cxx
index 4e4c1b10b3f9..b74dbae68a79 100644
--- a/sw/source/uibase/docvw/ShadowOverlayObject.cxx
+++ b/sw/source/uibase/docvw/ShadowOverlayObject.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <ShadowOverlayObject.hxx>
+#include "ShadowOverlayObject.hxx"
#include <view.hxx>
#include <svx/sdrpaintwindow.hxx>
diff --git a/sw/source/uibase/docvw/SidebarScrollBar.cxx b/sw/source/uibase/docvw/SidebarScrollBar.cxx
index 7ad03a6c5225..c51d37b7bee3 100644
--- a/sw/source/uibase/docvw/SidebarScrollBar.cxx
+++ b/sw/source/uibase/docvw/SidebarScrollBar.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <SidebarScrollBar.hxx>
+#include "SidebarScrollBar.hxx"
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <comphelper/lok.hxx>
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index 6f518ffaa2c8..e8540298706e 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <SidebarTxtControl.hxx>
+#include "SidebarTxtControl.hxx"
-#include <SidebarTxtControlAcc.hxx>
+#include "SidebarTxtControlAcc.hxx"
#include <docsh.hxx>
#include <doc.hxx>
diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
index d61a4b775d02..1df89c8e13f5 100644
--- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx
@@ -21,9 +21,9 @@
#include <memory>
-#include <SidebarTxtControlAcc.hxx>
+#include "SidebarTxtControlAcc.hxx"
-#include <SidebarTxtControl.hxx>
+#include "SidebarTxtControl.hxx"
#include <svl/SfxBroadcaster.hxx>
#include <toolkit/awt/vclxaccessiblecomponent.hxx>
diff --git a/sw/source/uibase/docvw/SidebarWinAcc.cxx b/sw/source/uibase/docvw/SidebarWinAcc.cxx
index ea1cb8de7b49..c892032b6e52 100644
--- a/sw/source/uibase/docvw/SidebarWinAcc.cxx
+++ b/sw/source/uibase/docvw/SidebarWinAcc.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <SidebarWinAcc.hxx>
+#include "SidebarWinAcc.hxx"
#include <AnnotationWin.hxx>
#include <viewsh.hxx>
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index b7aa96bb086a..1744dac0999c 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -110,7 +110,7 @@
#include <drwtxtsh.hxx>
#include <fchrfmt.hxx>
#include <fmturl.hxx>
-#include <romenu.hxx>
+#include "romenu.hxx"
#include <initui.hxx>
#include <frmatr.hxx>
#include <extinput.hxx>
@@ -133,7 +133,7 @@
#include <numrule.hxx>
#include <pagedesc.hxx>
#include <svtools/ruler.hxx>
-#include "formatclipboard.hxx"
+#include <formatclipboard.hxx>
#include <vcl/svapp.hxx>
#include <docstat.hxx>
#include <wordcountdialog.hxx>
@@ -152,7 +152,7 @@
#include <algorithm>
#include <vector>
-#include "../../core/inc/rootfrm.hxx"
+#include <rootfrm.hxx>
#include <unotools/syslocaleoptions.hxx>
#include <memory>
diff --git a/sw/source/uibase/docvw/edtwin3.cxx b/sw/source/uibase/docvw/edtwin3.cxx
index 5f6c304b2ba3..ead5e2179d28 100644
--- a/sw/source/uibase/docvw/edtwin3.cxx
+++ b/sw/source/uibase/docvw/edtwin3.cxx
@@ -21,20 +21,20 @@
#include <vcl/settings.hxx>
#include <svx/ruler.hxx>
#include <viewopt.hxx>
-#include "view.hxx"
-#include "wrtsh.hxx"
-#include "basesh.hxx"
-#include "pview.hxx"
-#include "mdiexp.hxx"
-#include "edtwin.hxx"
-#include "swmodule.hxx"
-#include "modcfg.hxx"
-#include "swtable.hxx"
-#include "docsh.hxx"
-#include "pagedesc.hxx"
+#include <view.hxx>
+#include <wrtsh.hxx>
+#include <basesh.hxx>
+#include <pview.hxx>
+#include <mdiexp.hxx>
+#include <edtwin.hxx>
+#include <swmodule.hxx>
+#include <modcfg.hxx>
+#include <swtable.hxx>
+#include <docsh.hxx>
+#include <pagedesc.hxx>
#include <frmatr.hxx>
#include <editeng/frmdiritem.hxx>
-#include "uiobject.hxx"
+#include <uiobject.hxx>
// Core-Notify
void ScrollMDI( SwViewShell const * pVwSh, const SwRect &rRect,
diff --git a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx
index dc03b70ae055..c1fb8f2618ad 100644
--- a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx
+++ b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <frmsidebarwincontainer.hxx>
+#include "frmsidebarwincontainer.hxx"
#include <map>
#include <fmtfld.hxx>
diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx
index 514b28ecb9fa..eeb1908137f8 100644
--- a/sw/source/uibase/docvw/romenu.cxx
+++ b/sw/source/uibase/docvw/romenu.cxx
@@ -39,7 +39,7 @@
#include <wrtsh.hxx>
#include <viewopt.hxx>
#include <swmodule.hxx>
-#include <romenu.hxx>
+#include "romenu.hxx"
#include <pagedesc.hxx>
#include <modcfg.hxx>
diff --git a/sw/source/uibase/docvw/romenu.hxx b/sw/source/uibase/docvw/romenu.hxx
index e074d41650b1..3beec59173b5 100644
--- a/sw/source/uibase/docvw/romenu.hxx
+++ b/sw/source/uibase/docvw/romenu.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_ROMENU_HXX
#include <editeng/brushitem.hxx>
+#include <vcl/builder.hxx>
#include <vcl/graph.hxx>
#include <vcl/menu.hxx>
#include <svl/stritem.hxx>
diff --git a/sw/source/uibase/envelp/labimg.cxx b/sw/source/uibase/envelp/labimg.cxx
index b26ff267a1e6..e65ccb2465d0 100644
--- a/sw/source/uibase/envelp/labimg.cxx
+++ b/sw/source/uibase/envelp/labimg.cxx
@@ -25,9 +25,9 @@
#include <sfx2/sfxsids.hrc>
#include <unotools/useroptions.hxx>
#include <swmodule.hxx>
-#include "labimg.hxx"
-#include "cmdid.h"
-#include "swtypes.hxx"
+#include <labimg.hxx>
+#include <cmdid.h>
+#include <swtypes.hxx>
#include <unomid.h>
using namespace utl;
diff --git a/sw/source/uibase/envelp/syncbtn.cxx b/sw/source/uibase/envelp/syncbtn.cxx
index 51b3f157e3b2..4c52714efd48 100644
--- a/sw/source/uibase/envelp/syncbtn.cxx
+++ b/sw/source/uibase/envelp/syncbtn.cxx
@@ -20,14 +20,14 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/dispatch.hxx>
-#include "cmdid.h"
-#include "swmodule.hxx"
-#include "view.hxx"
-#include "edtwin.hxx"
-#include "strings.hrc"
+#include <cmdid.h>
+#include <swmodule.hxx>
+#include <view.hxx>
+#include <edtwin.hxx>
+#include <strings.hrc>
-#include "syncbtn.hxx"
-#include "swtypes.hxx"
+#include <syncbtn.hxx>
+#include <swtypes.hxx>
SFX_IMPL_FLOATINGWINDOW( SwSyncChildWin, FN_SYNC_LABELS )
diff --git a/sw/source/uibase/fldui/fldwrap.cxx b/sw/source/uibase/fldui/fldwrap.cxx
index 8248278ae7d9..7540e1088eda 100644
--- a/sw/source/uibase/fldui/fldwrap.cxx
+++ b/sw/source/uibase/fldui/fldwrap.cxx
@@ -32,7 +32,7 @@
#include <helpids.h>
#include <globals.hrc>
-#include "swabstdlg.hxx"
+#include <swabstdlg.hxx>
SFX_IMPL_CHILDWINDOW_WITHID(SwFieldDlgWrapper, FN_INSERT_FIELD)
diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx
index ca063234fea1..ae4293d221f5 100644
--- a/sw/source/uibase/frmdlg/colex.cxx
+++ b/sw/source/uibase/frmdlg/colex.cxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "cmdid.h"
-#include "hintids.hxx"
+#include <cmdid.h>
+#include <hintids.hxx>
#include <algorithm>
#include <svl/eitem.hxx>
#include <tools/fract.hxx>
@@ -35,8 +35,8 @@
#include <vcl/builderfactory.hxx>
#include <tgrditem.hxx>
#include <viewopt.hxx>
-#include "colex.hxx"
-#include "colmgr.hxx"
+#include <colex.hxx>
+#include <colmgr.hxx>
#include <svx/unobrushitemhelper.hxx>
// Taking the updated values from the set
diff --git a/sw/source/uibase/frmdlg/colmgr.cxx b/sw/source/uibase/frmdlg/colmgr.cxx
index 35468442af77..5231eb6ef6b6 100644
--- a/sw/source/uibase/frmdlg/colmgr.cxx
+++ b/sw/source/uibase/frmdlg/colmgr.cxx
@@ -17,12 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "hintids.hxx"
+#include <hintids.hxx>
#include <editeng/lrspitem.hxx>
-#include "frmmgr.hxx"
-#include "frmfmt.hxx"
-#include "colmgr.hxx"
+#include <frmmgr.hxx>
+#include <frmfmt.hxx>
+#include <colmgr.hxx>
// private methods
diff --git a/sw/source/uibase/frmdlg/frmmgr.cxx b/sw/source/uibase/frmdlg/frmmgr.cxx
index 1875a20beff4..73df037c9fdf 100644
--- a/sw/source/uibase/frmdlg/frmmgr.cxx
+++ b/sw/source/uibase/frmdlg/frmmgr.cxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "cmdid.h"
-#include "hintids.hxx"
+#include <cmdid.h>
+#include <hintids.hxx>
#include <svl/stritem.hxx>
#include <editeng/protitem.hxx>
@@ -30,14 +30,14 @@
#include <svx/swframevalidation.hxx>
#include <svx/xdef.hxx>
#include <fmtclds.hxx>
-#include "wrtsh.hxx"
-#include "view.hxx"
-#include "viewopt.hxx"
-#include "uitool.hxx"
-#include "frmmgr.hxx"
-#include "format.hxx"
-#include "mdiexp.hxx"
-#include "poolfmt.hxx"
+#include <wrtsh.hxx>
+#include <view.hxx>
+#include <viewopt.hxx>
+#include <uitool.hxx>
+#include <frmmgr.hxx>
+#include <format.hxx>
+#include <mdiexp.hxx>
+#include <poolfmt.hxx>
#include <com/sun/star/text/HoriOrientation.hpp>
#include <com/sun/star/text/VertOrientation.hpp>
#include <com/sun/star/text/RelOrientation.hpp>
diff --git a/sw/source/uibase/globdoc/globdoc.cxx b/sw/source/uibase/globdoc/globdoc.cxx
index bc45a9efc1e9..1126822b1894 100644
--- a/sw/source/uibase/globdoc/globdoc.cxx
+++ b/sw/source/uibase/globdoc/globdoc.cxx
@@ -22,10 +22,10 @@
#include <unomid.h>
-#include "swtypes.hxx"
-#include "shellio.hxx"
-#include "globdoc.hxx"
-#include "strings.hrc"
+#include <swtypes.hxx>
+#include <shellio.hxx>
+#include <globdoc.hxx>
+#include <strings.hrc>
// Description: Register all filters
diff --git a/sw/source/uibase/inc/SidebarWindowsConsts.hxx b/sw/source/uibase/inc/SidebarWindowsConsts.hxx
index a7bd9195bad9..db36abeef2e8 100644
--- a/sw/source/uibase/inc/SidebarWindowsConsts.hxx
+++ b/sw/source/uibase/inc/SidebarWindowsConsts.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SIDEBARWINDOWSCONSTS_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_SIDEBARWINDOWSCONSTS_HXX
+#include <sal/types.h>
+
namespace sw { namespace sidebarwindows {
const sal_Int8 ANCHORLINE_WIDTH = 1;
diff --git a/sw/source/uibase/inc/actctrl.hxx b/sw/source/uibase/inc/actctrl.hxx
index 3dfe68ac77bf..87ef21e61859 100644
--- a/sw/source/uibase/inc/actctrl.hxx
+++ b/sw/source/uibase/inc/actctrl.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_ACTCTRL_HXX
#include <vcl/field.hxx>
-#include "swdllapi.h"
+#include <swdllapi.h>
// numerical input
class SW_DLLPUBLIC NumEditAction: public NumericField
diff --git a/sw/source/uibase/inc/annotsh.hxx b/sw/source/uibase/inc/annotsh.hxx
index 53c99e160710..1184f61f265d 100644
--- a/sw/source/uibase/inc/annotsh.hxx
+++ b/sw/source/uibase/inc/annotsh.hxx
@@ -20,8 +20,8 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_ANNOTSH_HXX
#include <sfx2/shell.hxx>
-#include "shellid.hxx"
-#include "swmodule.hxx"
+#include <shellid.hxx>
+#include <swmodule.hxx>
#include <unotools/caserotate.hxx>
class SwView;
diff --git a/sw/source/uibase/inc/beziersh.hxx b/sw/source/uibase/inc/beziersh.hxx
index abf64aa65533..76204f87471a 100644
--- a/sw/source/uibase/inc/beziersh.hxx
+++ b/sw/source/uibase/inc/beziersh.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_BEZIERSH_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_BEZIERSH_HXX
-#include "basesh.hxx"
+#include <basesh.hxx>
class SwBezierShell: public SwBaseShell
{
diff --git a/sw/source/uibase/inc/bookmark.hxx b/sw/source/uibase/inc/bookmark.hxx
index ac20eaa59b31..e8554052b9aa 100644
--- a/sw/source/uibase/inc/bookmark.hxx
+++ b/sw/source/uibase/inc/bookmark.hxx
@@ -27,7 +27,7 @@
#include <svtools/simptabl.hxx>
#include <pam.hxx>
-#include "IMark.hxx"
+#include <IMark.hxx>
class SwWrtShell;
class SfxRequest;
diff --git a/sw/source/uibase/inc/caption.hxx b/sw/source/uibase/inc/caption.hxx
index 8b03143ffbbf..e3bb8e8de208 100644
--- a/sw/source/uibase/inc/caption.hxx
+++ b/sw/source/uibase/inc/caption.hxx
@@ -22,7 +22,7 @@
#include <rtl/ustring.hxx>
#include <tools/globname.hxx>
#include <SwCapObjType.hxx>
-#include "swdllapi.h"
+#include <swdllapi.h>
class SW_DLLPUBLIC InsCaptionOpt
{
diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx
index 57a8c5f38bbf..c5716c7f13cd 100644
--- a/sw/source/uibase/inc/cfgitems.hxx
+++ b/sw/source/uibase/inc/cfgitems.hxx
@@ -21,7 +21,7 @@
#include <tools/color.hxx>
#include <svl/poolitem.hxx>
-#include "swdllapi.h"
+#include <swdllapi.h>
#include <printdata.hxx>
#include <cmdid.h>
diff --git a/sw/source/uibase/inc/changedb.hxx b/sw/source/uibase/inc/changedb.hxx
index 23ae2c6430a2..31210fdb09f1 100644
--- a/sw/source/uibase/inc/changedb.hxx
+++ b/sw/source/uibase/inc/changedb.hxx
@@ -24,7 +24,7 @@
#include <vcl/fixed.hxx>
#include <svtools/treelistbox.hxx>
#include <svx/stddlg.hxx>
-#include "dbtree.hxx"
+#include <dbtree.hxx>
class SwFieldMgr;
class SwView;
diff --git a/sw/source/uibase/inc/chartins.hxx b/sw/source/uibase/inc/chartins.hxx
index ef79107c2ff3..383e0fda1a58 100644
--- a/sw/source/uibase/inc/chartins.hxx
+++ b/sw/source/uibase/inc/chartins.hxx
@@ -19,6 +19,10 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX
+#include <tools/gen.hxx>
+
+namespace vcl { class Window; }
+
Point SwGetChartDialogPos( const vcl::Window *pParentWin, const Size& rDialogSize, const tools::Rectangle& rLogicChart );
void SwInsertChart();
diff --git a/sw/source/uibase/inc/cnttab.hxx b/sw/source/uibase/inc/cnttab.hxx
index 504edf633605..594ace19869b 100644
--- a/sw/source/uibase/inc/cnttab.hxx
+++ b/sw/source/uibase/inc/cnttab.hxx
@@ -27,7 +27,7 @@
#include <vcl/lstbox.hxx>
#include <sfx2/tabdlg.hxx>
-#include "tox.hxx"
+#include <tox.hxx>
#include <toxmgr.hxx>
#include <svx/checklbx.hxx>
#include <svtools/treelistbox.hxx>
diff --git a/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx
index c1c9ce014004..db65f85f13b2 100644
--- a/sw/source/uibase/inc/colex.hxx
+++ b/sw/source/uibase/inc/colex.hxx
@@ -21,9 +21,9 @@
#include <svx/pagectrl.hxx>
#include <editeng/paperinf.hxx>
-#include "swdllapi.h"
+#include <swdllapi.h>
#include <fmtclds.hxx>
-#include "frmatr.hxx"
+#include <frmatr.hxx>
class SwColMgr;
class SfxItemSet;
diff --git a/sw/source/uibase/inc/colmgr.hxx b/sw/source/uibase/inc/colmgr.hxx
index b9f55292d183..fa374f561b46 100644
--- a/sw/source/uibase/inc/colmgr.hxx
+++ b/sw/source/uibase/inc/colmgr.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_COLMGR_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_COLMGR_HXX
-#include "swdllapi.h"
+#include <swdllapi.h>
#include <fmtclds.hxx>
SW_DLLPUBLIC void FitToActualSize(SwFormatCol& rCol, sal_uInt16 nWidth);
diff --git a/sw/source/uibase/inc/conarc.hxx b/sw/source/uibase/inc/conarc.hxx
index b1b31ec03780..2c5011615da4 100644
--- a/sw/source/uibase/inc/conarc.hxx
+++ b/sw/source/uibase/inc/conarc.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONARC_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_CONARC_HXX
-#include "drawbase.hxx"
+#include <drawbase.hxx>
// draw rectangle
class ConstArc : public SwDrawBase
diff --git a/sw/source/uibase/inc/concustomshape.hxx b/sw/source/uibase/inc/concustomshape.hxx
index 4d67a00dd8f2..1116babc0c28 100644
--- a/sw/source/uibase/inc/concustomshape.hxx
+++ b/sw/source/uibase/inc/concustomshape.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_CONCUSTOMSHAPE_HXX
#include <rtl/ustring.hxx>
-#include "drawbase.hxx"
+#include <drawbase.hxx>
class SdrObject;
class SfxRequest;
diff --git a/sw/source/uibase/inc/condedit.hxx b/sw/source/uibase/inc/condedit.hxx
index b21f1087d1a0..76a38f0ab6d4 100644
--- a/sw/source/uibase/inc/condedit.hxx
+++ b/sw/source/uibase/inc/condedit.hxx
@@ -21,7 +21,7 @@
#include <vcl/edit.hxx>
#include <svtools/transfer.hxx>
-#include "swdllapi.h"
+#include <swdllapi.h>
class SW_DLLPUBLIC ConditionEdit : public Edit, public DropTargetHelper
{
diff --git a/sw/source/uibase/inc/conform.hxx b/sw/source/uibase/inc/conform.hxx
index 65e01caf98ce..d51028075b3e 100644
--- a/sw/source/uibase/inc/conform.hxx
+++ b/sw/source/uibase/inc/conform.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONFORM_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_CONFORM_HXX
-#include "drawbase.hxx"
+#include <drawbase.hxx>
class ConstFormControl : public SwDrawBase
{
diff --git a/sw/source/uibase/inc/conpoly.hxx b/sw/source/uibase/inc/conpoly.hxx
index f3276e3a2fef..29f71b9413c2 100644
--- a/sw/source/uibase/inc/conpoly.hxx
+++ b/sw/source/uibase/inc/conpoly.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONPOLY_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_CONPOLY_HXX
-#include "drawbase.hxx"
+#include <drawbase.hxx>
// base class for all functions
class ConstPolygon : public SwDrawBase
diff --git a/sw/source/uibase/inc/conrect.hxx b/sw/source/uibase/inc/conrect.hxx
index 878d99c8031e..94cb2fc4a875 100644
--- a/sw/source/uibase/inc/conrect.hxx
+++ b/sw/source/uibase/inc/conrect.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONRECT_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_CONRECT_HXX
-#include "drawbase.hxx"
+#include <drawbase.hxx>
// draw rectangle
class ConstRectangle : public SwDrawBase
diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx
index d579346fecca..0f4d7e57f6d7 100644
--- a/sw/source/uibase/inc/content.hxx
+++ b/sw/source/uibase/inc/content.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_CONTENT_HXX
#include <memory>
#include <limits.h>
-#include "swcont.hxx"
+#include <swcont.hxx>
#include <vcl/menu.hxx>
diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx
index 9ee6b468ad99..b1a7fa4c7034 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -22,7 +22,7 @@
#include <svl/lstner.hxx>
#include <svtools/treelistbox.hxx>
#include <svtools/svlbitm.hxx>
-#include "swcont.hxx"
+#include <swcont.hxx>
#include <map>
#include <memory>
diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx
index 525cef407d4b..8b2b448a22ed 100644
--- a/sw/source/uibase/inc/cption.hxx
+++ b/sw/source/uibase/inc/cption.hxx
@@ -30,7 +30,7 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <wrtsh.hxx>
-#include "optload.hxx"
+#include <optload.hxx>
class SwFieldMgr;
class SwView;
diff --git a/sw/source/uibase/inc/dbconfig.hxx b/sw/source/uibase/inc/dbconfig.hxx
index 33fedf11ff82..5ea79f423853 100644
--- a/sw/source/uibase/inc/dbconfig.hxx
+++ b/sw/source/uibase/inc/dbconfig.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_DBCONFIG_HXX
#include <unotools/configitem.hxx>
-#include "swdllapi.h"
+#include <swdllapi.h>
struct SwDBData;
diff --git a/sw/source/uibase/inc/dbtree.hxx b/sw/source/uibase/inc/dbtree.hxx
index 2eb1d4f41e8e..6b34da94c9e7 100644
--- a/sw/source/uibase/inc/dbtree.hxx
+++ b/sw/source/uibase/inc/dbtree.hxx
@@ -22,7 +22,7 @@
#include <memory>
#include <svtools/treelistbox.hxx>
-#include "swdllapi.h"
+#include <swdllapi.h>
#include <swtypes.hxx>
class SwDBTreeList_Impl;
diff --git a/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx
index f3e532798c35..b1226638a794 100644
--- a/sw/source/uibase/inc/docstdlg.hxx
+++ b/sw/source/uibase/inc/docstdlg.hxx
@@ -23,7 +23,7 @@
#include <vcl/fixed.hxx>
-#include "docstat.hxx"
+#include <docstat.hxx>
// DocInfo now as page
class SwDocStatPage: public SfxTabPage
diff --git a/sw/source/uibase/inc/drawsh.hxx b/sw/source/uibase/inc/drawsh.hxx
index e0fd449e4bf8..0676f1a207f1 100644
--- a/sw/source/uibase/inc/drawsh.hxx
+++ b/sw/source/uibase/inc/drawsh.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DRAWSH_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_DRAWSH_HXX
-#include "drwbassh.hxx"
+#include <drwbassh.hxx>
class SwDrawBaseShell;
diff --git a/sw/source/uibase/inc/drformsh.hxx b/sw/source/uibase/inc/drformsh.hxx
index 9c8602d149ba..03fe52413164 100644
--- a/sw/source/uibase/inc/drformsh.hxx
+++ b/sw/source/uibase/inc/drformsh.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DRFORMSH_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_DRFORMSH_HXX
-#include "drwbassh.hxx"
+#include <drwbassh.hxx>
class SwDrawBaseShell;
diff --git a/sw/source/uibase/inc/drwbassh.hxx b/sw/source/uibase/inc/drwbassh.hxx
index e75576dec2a0..ea2835682a1b 100644
--- a/sw/source/uibase/inc/drwbassh.hxx
+++ b/sw/source/uibase/inc/drwbassh.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DRWBASSH_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_DRWBASSH_HXX
-#include "basesh.hxx"
+#include <basesh.hxx>
class SwView;
class SfxItemSet;
diff --git a/sw/source/uibase/inc/drwtxtsh.hxx b/sw/source/uibase/inc/drwtxtsh.hxx
index ab4e2ec898e2..43d15f454993 100644
--- a/sw/source/uibase/inc/drwtxtsh.hxx
+++ b/sw/source/uibase/inc/drwtxtsh.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_DRWTXTSH_HXX
#include <sfx2/shell.hxx>
-#include "shellid.hxx"
+#include <shellid.hxx>
#include <unotools/caserotate.hxx>
class SdrView;
diff --git a/sw/source/uibase/inc/dselect.hxx b/sw/source/uibase/inc/dselect.hxx
index c3996640bc41..3fdc2c7c7c95 100644
--- a/sw/source/uibase/inc/dselect.hxx
+++ b/sw/source/uibase/inc/dselect.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DSELECT_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_DSELECT_HXX
-#include "drawbase.hxx"
+#include <drawbase.hxx>
// draw rectangle
class DrawSelection : public SwDrawBase
diff --git a/sw/source/uibase/inc/envimg.hxx b/sw/source/uibase/inc/envimg.hxx
index 26b7214b1725..1cf77dbe791c 100644
--- a/sw/source/uibase/inc/envimg.hxx
+++ b/sw/source/uibase/inc/envimg.hxx
@@ -21,7 +21,7 @@
#include <svl/poolitem.hxx>
#include <unotools/configitem.hxx>
-#include "swdllapi.h"
+#include <swdllapi.h>
SW_DLLPUBLIC OUString MakeSender();
diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx
index 2e0c43dec906..d82e35d376f3 100644
--- a/sw/source/uibase/inc/envlop.hxx
+++ b/sw/source/uibase/inc/envlop.hxx
@@ -30,7 +30,7 @@
#include <vcl/button.hxx>
-#include "envimg.hxx"
+#include <envimg.hxx>
#define GetFieldVal(rField) (rField).Denormalize((rField).GetValue(FUNIT_TWIP))
#define SetFieldVal(rField, lValue) (rField).SetValue((rField).Normalize(lValue), FUNIT_TWIP)
diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx
index 029dca1559fe..ef9d0ac2f832 100644
--- a/sw/source/uibase/inc/fldmgr.hxx
+++ b/sw/source/uibase/inc/fldmgr.hxx
@@ -19,8 +19,8 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FLDMGR_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_FLDMGR_HXX
-#include "swdllapi.h"
-#include "swtypes.hxx"
+#include <swdllapi.h>
+#include <swtypes.hxx>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Any.h>
#include <vector>
diff --git a/sw/source/uibase/inc/fldwrap.hxx b/sw/source/uibase/inc/fldwrap.hxx
index 0d8b58e7142c..9cec27ab26f9 100644
--- a/sw/source/uibase/inc/fldwrap.hxx
+++ b/sw/source/uibase/inc/fldwrap.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FLDWRAP_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_FLDWRAP_HXX
-#include "chldwrap.hxx"
+#include <chldwrap.hxx>
class AbstractSwFieldDlg;
class SwFieldDlgWrapper : public SwChildWinWrapper
diff --git a/sw/source/uibase/inc/fontcfg.hxx b/sw/source/uibase/inc/fontcfg.hxx
index 111846b6066c..71cdc060ee2a 100644
--- a/sw/source/uibase/inc/fontcfg.hxx
+++ b/sw/source/uibase/inc/fontcfg.hxx
@@ -23,7 +23,7 @@
#include <unotools/configitem.hxx>
#include <i18nlangtag/lang.h>
#include <osl/diagnose.h>
-#include "swdllapi.h"
+#include <swdllapi.h>
#define FONT_STANDARD 0
#define FONT_OUTLINE 1
diff --git a/sw/source/uibase/inc/frmdlg.hxx b/sw/source/uibase/inc/frmdlg.hxx
index 048042ac928b..ba2217d386eb 100644
--- a/sw/source/uibase/inc/frmdlg.hxx
+++ b/sw/source/uibase/inc/frmdlg.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FRMDLG_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_FRMDLG_HXX
-#include "globals.hrc"
+#include <globals.hrc>
#include <sfx2/tabdlg.hxx>
class SwWrtShell;
diff --git a/sw/source/uibase/inc/frmmgr.hxx b/sw/source/uibase/inc/frmmgr.hxx
index f1101153f537..43a0d05c7286 100644
--- a/sw/source/uibase/inc/frmmgr.hxx
+++ b/sw/source/uibase/inc/frmmgr.hxx
@@ -19,15 +19,15 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FRMMGR_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_FRMMGR_HXX
-#include "swtypes.hxx"
-#include "frmatr.hxx"
+#include <swtypes.hxx>
+#include <frmatr.hxx>
#include <editeng/svxenum.hxx>
#include <tools/gen.hxx>
#include <fmtfsize.hxx>
#include <fmtsrnd.hxx>
#include <fmtornt.hxx>
#include <fmtanchr.hxx>
-#include "swdllapi.h"
+#include <swdllapi.h>
class SwWrtShell;
struct SvxSwFrameValidation;
diff --git a/sw/source/uibase/inc/frmsh.hxx b/sw/source/uibase/inc/frmsh.hxx
index f86e0d06501f..e6c91cbd1756 100644
--- a/sw/source/uibase/inc/frmsh.hxx
+++ b/sw/source/uibase/inc/frmsh.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FRMSH_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_FRMSH_HXX
-#include "basesh.hxx"
+#include <basesh.hxx>
class SwFrameShell: public SwBaseShell
{
diff --git a/sw/source/uibase/inc/glosdoc.hxx b/sw/source/uibase/inc/glosdoc.hxx
index 9720d9c85069..f9ba04987743 100644
--- a/sw/source/uibase/inc/glosdoc.hxx
+++ b/sw/source/uibase/inc/glosdoc.hxx
@@ -33,7 +33,7 @@ typedef tools::SvRef<SwDocShell> SwDocShellRef;
#include <cppuhelper/weakref.hxx>
#include <vector>
-#include "swdllapi.h"
+#include <swdllapi.h>
typedef std::vector< css::uno::WeakReference< css::text::XAutoTextGroup > > UnoAutoTextGroups;
typedef std::vector< css::uno::WeakReference< css::text::XAutoTextEntry > > UnoAutoTextEntries;
diff --git a/sw/source/uibase/inc/gloshdl.hxx b/sw/source/uibase/inc/gloshdl.hxx
index 92398bc60536..dc7f3b0e740a 100644
--- a/sw/source/uibase/inc/gloshdl.hxx
+++ b/sw/source/uibase/inc/gloshdl.hxx
@@ -21,7 +21,7 @@
#include <memory>
#include <rtl/ustring.hxx>
-#include "swdllapi.h"
+#include <swdllapi.h>
class SwWrtShell;
class SwTextBlocks;
diff --git a/sw/source/uibase/inc/glshell.hxx b/sw/source/uibase/inc/glshell.hxx
index 1b98556cb64b..04fb733026ef 100644
--- a/sw/source/uibase/inc/glshell.hxx
+++ b/sw/source/uibase/inc/glshell.hxx
@@ -18,7 +18,7 @@
*/
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_GLSHELL_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_GLSHELL_HXX
-#include "wdocsh.hxx"
+#include <wdocsh.hxx>
class SwGlosDocShell : public SwDocShell
{
diff --git a/sw/source/uibase/inc/grfsh.hxx b/sw/source/uibase/inc/grfsh.hxx
index 139a7a8dfd12..56224db64f5c 100644
--- a/sw/source/uibase/inc/grfsh.hxx
+++ b/sw/source/uibase/inc/grfsh.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_GRFSH_HXX
#include <memory>
-#include "frmsh.hxx"
+#include <frmsh.hxx>
class SwGrfShell: public SwBaseShell
{
diff --git a/sw/source/uibase/inc/idxmrk.hxx b/sw/source/uibase/inc/idxmrk.hxx
index 8e9848b40e4f..8baf13c8ea05 100644
--- a/sw/source/uibase/inc/idxmrk.hxx
+++ b/sw/source/uibase/inc/idxmrk.hxx
@@ -21,7 +21,7 @@
#include <sfx2/childwin.hxx>
-#include "swabstdlg.hxx"
+#include <swabstdlg.hxx>
class SwWrtShell;
diff --git a/sw/source/uibase/inc/initui.hxx b/sw/source/uibase/inc/initui.hxx
index 70bcb6a4e60d..2278dd9138ec 100644
--- a/sw/source/uibase/inc/initui.hxx
+++ b/sw/source/uibase/inc/initui.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_INITUI_HXX
#include <tools/solar.h>
-#include "swdllapi.h"
+#include <swdllapi.h>
#include <rtl/ustring.hxx>
#include <vector>
diff --git a/sw/source/uibase/inc/labelcfg.hxx b/sw/source/uibase/inc/labelcfg.hxx
index 72ca724294fe..9dbbd285cfea 100644
--- a/sw/source/uibase/inc/labelcfg.hxx
+++ b/sw/source/uibase/inc/labelcfg.hxx
@@ -20,8 +20,8 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_LABELCFG_HXX
#include <unotools/configitem.hxx>
-#include "swdllapi.h"
-#include "labrec.hxx"
+#include <swdllapi.h>
+#include <labrec.hxx>
#include <map>
#include <vector>
diff --git a/sw/source/uibase/inc/labimg.hxx b/sw/source/uibase/inc/labimg.hxx
index 4a11b248020c..0763b99e1f21 100644
--- a/sw/source/uibase/inc/labimg.hxx
+++ b/sw/source/uibase/inc/labimg.hxx
@@ -22,7 +22,7 @@
#include <svl/poolitem.hxx>
#include <unotools/configitem.hxx>
-#include "swdllapi.h"
+#include <swdllapi.h>
class SwLabCfgItem;
diff --git a/sw/source/uibase/inc/langhelper.hxx b/sw/source/uibase/inc/langhelper.hxx
index a3f5405c78bf..2c7a979fd670 100644
--- a/sw/source/uibase/inc/langhelper.hxx
+++ b/sw/source/uibase/inc/langhelper.hxx
@@ -19,12 +19,17 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_LANGHELPER_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_LANGHELPER_HXX
+#include <sal/types.h>
+#include <rtl/ustring.hxx>
+#include <i18nlangtag/lang.h>
+
class SwWrtShell;
class SwView;
class EditEngine;
class EditView;
class OutlinerView;
class SfxItemSet;
+class SfxRequest;
struct ESelection;
enum class SvtScriptType;
diff --git a/sw/source/uibase/inc/listsh.hxx b/sw/source/uibase/inc/listsh.hxx
index 0caecf64282e..d04a64b28362 100644
--- a/sw/source/uibase/inc/listsh.hxx
+++ b/sw/source/uibase/inc/listsh.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_LISTSH_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_LISTSH_HXX
-#include "basesh.hxx"
+#include <basesh.hxx>
class SwListShell: public SwBaseShell
{
diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx
index 6037d32cf3c2..053f409fc921 100644
--- a/sw/source/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/uibase/inc/mailmergehelper.hxx
@@ -31,7 +31,7 @@
#include <cppuhelper/compbase.hxx>
#include <vcl/scrbar.hxx>
#include <rtl/ustring.hxx>
-#include "swdllapi.h"
+#include <swdllapi.h>
class SwMailMergeConfigItem;
diff --git a/sw/source/uibase/inc/mediash.hxx b/sw/source/uibase/inc/mediash.hxx
index 68f13ca215fe..4ac0f0a0f42c 100644
--- a/sw/source/uibase/inc/mediash.hxx
+++ b/sw/source/uibase/inc/mediash.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MEDIASH_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_MEDIASH_HXX
-#include "frmsh.hxx"
+#include <frmsh.hxx>
class SwMediaShell: public SwBaseShell
{
diff --git a/sw/source/uibase/inc/mmconfigitem.hxx b/sw/source/uibase/inc/mmconfigitem.hxx
index a885a5844530..80e0df0588da 100644
--- a/sw/source/uibase/inc/mmconfigitem.hxx
+++ b/sw/source/uibase/inc/mmconfigitem.hxx
@@ -26,8 +26,8 @@
#include <set>
#include <vector>
#include <swdbdata.hxx>
-#include "swdllapi.h"
-#include "sharedconnection.hxx"
+#include <swdllapi.h>
+#include <sharedconnection.hxx>
namespace com{namespace sun{namespace star{
namespace sdbc{
diff --git a/sw/source/uibase/inc/navmgr.hxx b/sw/source/uibase/inc/navmgr.hxx
index c0d22e932a5a..d99e44433edd 100644
--- a/sw/source/uibase/inc/navmgr.hxx
+++ b/sw/source/uibase/inc/navmgr.hxx
@@ -12,9 +12,9 @@
#include <vector>
#include <memory>
-#include "swtypes.hxx"
-#include "calbck.hxx"
-#include "unocrsr.hxx"
+#include <swtypes.hxx>
+#include <calbck.hxx>
+#include <unocrsr.hxx>
#include <vcl/svapp.hxx>
class SwWrtShell;
diff --git a/sw/source/uibase/inc/navsh.hxx b/sw/source/uibase/inc/navsh.hxx
index 287c0acb2cad..ebda6aa40291 100644
--- a/sw/source/uibase/inc/navsh.hxx
+++ b/sw/source/uibase/inc/navsh.hxx
@@ -9,7 +9,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NAVSH_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_NAVSH_HXX
-#include "frmsh.hxx"
+#include <frmsh.hxx>
class SfxItemSet;
diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx
index 0f7eaec04d74..23fd772cd9e9 100644
--- a/sw/source/uibase/inc/num.hxx
+++ b/sw/source/uibase/inc/num.hxx
@@ -29,7 +29,7 @@
#include <vcl/edit.hxx>
#include <svx/stddlg.hxx>
#include <numprevw.hxx>
-#include "numrule.hxx"
+#include <numrule.hxx>
class SwWrtShell;
class SvxBrushItem;
diff --git a/sw/source/uibase/inc/numberingtypelistbox.hxx b/sw/source/uibase/inc/numberingtypelistbox.hxx
index bcd9d47e185e..658b4b765ce5 100644
--- a/sw/source/uibase/inc/numberingtypelistbox.hxx
+++ b/sw/source/uibase/inc/numberingtypelistbox.hxx
@@ -21,7 +21,7 @@
#include <memory>
#include <vcl/lstbox.hxx>
-#include "swdllapi.h"
+#include <swdllapi.h>
#include <o3tl/typed_flags_set.hxx>
#include <editeng/svxenum.hxx>
diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx
index 8ee8be99e3c8..220a44d8a1cc 100644
--- a/sw/source/uibase/inc/numfmtlb.hxx
+++ b/sw/source/uibase/inc/numfmtlb.hxx
@@ -21,7 +21,7 @@
#include <vcl/lstbox.hxx>
#include <svl/zforlist.hxx>
-#include "swdllapi.h"
+#include <swdllapi.h>
class SwView;
diff --git a/sw/source/uibase/inc/olesh.hxx b/sw/source/uibase/inc/olesh.hxx
index 30979029ed16..d60d4b51078d 100644
--- a/sw/source/uibase/inc/olesh.hxx
+++ b/sw/source/uibase/inc/olesh.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_OLESH_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_OLESH_HXX
-#include "frmsh.hxx"
+#include <frmsh.hxx>
class SwOleShell: public SwFrameShell
{
diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx
index 7154dd394cc4..6fd15a45f8e1 100644
--- a/sw/source/uibase/inc/outline.hxx
+++ b/sw/source/uibase/inc/outline.hxx
@@ -34,7 +34,7 @@
#include <vcl/field.hxx>
-#include "swtypes.hxx"
+#include <swtypes.hxx>
#include <numprevw.hxx>
#include <numberingtypelistbox.hxx>
#include <rtl/ustring.hxx>
diff --git a/sw/source/uibase/inc/prcntfld.hxx b/sw/source/uibase/inc/prcntfld.hxx
index a717370649a2..f709b51f6424 100644
--- a/sw/source/uibase/inc/prcntfld.hxx
+++ b/sw/source/uibase/inc/prcntfld.hxx
@@ -20,8 +20,8 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_PRCNTFLD_HXX
#include <vcl/field.hxx>
-#include "swdllapi.h"
-#include "uitool.hxx"
+#include <swdllapi.h>
+#include <uitool.hxx>
//Wraps a MetricField with extra features
class SW_DLLPUBLIC PercentField
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index 5cd5c7feb60d..d9a619df7645 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -26,8 +26,8 @@
#include <sfx2/viewfac.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/zoomitem.hxx>
-#include "swdllapi.h"
-#include "shellid.hxx"
+#include <swdllapi.h>
+#include <shellid.hxx>
class SwViewOption;
class SwDocShell;
diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx
index d623d94ffdab..4b523bddc4b6 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.hxx
@@ -18,8 +18,8 @@
*/
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_REDLNDLG_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_REDLNDLG_HXX
-#include "swdllapi.h"
-#include "chldwrap.hxx"
+#include <swdllapi.h>
+#include <chldwrap.hxx>
#include <redline.hxx>
#include <tools/datetime.hxx>
#include <vcl/msgbox.hxx>
diff --git a/sw/source/uibase/inc/srcview.hxx b/sw/source/uibase/inc/srcview.hxx
index 185aab03de43..5f475df51e82 100644
--- a/sw/source/uibase/inc/srcview.hxx
+++ b/sw/source/uibase/inc/srcview.hxx
@@ -23,8 +23,8 @@
#include <sfx2/viewsh.hxx>
#include <vcl/outdev.hxx>
-#include "srcedtw.hxx"
-#include "shellid.hxx"
+#include <srcedtw.hxx>
+#include <shellid.hxx>
class SwDocShell;
class SvxSearchItem;
diff --git a/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx b/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx
index ca64cf0ba40b..233a1dda08d4 100644
--- a/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx
+++ b/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx
@@ -18,7 +18,7 @@
*/
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWMODALREDLINEACCEPTDLG_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_SWMODALREDLINEACCEPTDLG_HXX
-#include "chldwrap.hxx"
+#include <chldwrap.hxx>
#include <sfx2/basedlgs.hxx>
class SwRedlineAcceptDlg;
diff --git a/sw/source/uibase/inc/swtablerep.hxx b/sw/source/uibase/inc/swtablerep.hxx
index 32c584286567..59b9dbae73a7 100644
--- a/sw/source/uibase/inc/swtablerep.hxx
+++ b/sw/source/uibase/inc/swtablerep.hxx
@@ -21,8 +21,8 @@
#include <memory>
#include <sfx2/tabdlg.hxx>
-#include "swdllapi.h"
-#include "swtypes.hxx"
+#include <swdllapi.h>
+#include <swtypes.hxx>
class SwTabCols;
struct TColumn;
diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx
index 0a6e7fb7450f..4ae3c40495c3 100644
--- a/sw/source/uibase/inc/swuiccoll.hxx
+++ b/sw/source/uibase/inc/swuiccoll.hxx
@@ -19,6 +19,8 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWUICCOLL_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_SWUICCOLL_HXX
+#include <sfx2/tabdlg.hxx>
+
class SwWrtShell;
class SwFormat;
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index 505f4c5284a5..02bffaaaf37b 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -31,7 +31,7 @@
#include <vcl/lstbox.hxx>
#include <sfx2/tabdlg.hxx>
-#include "tox.hxx"
+#include <tox.hxx>
#include <toxmgr.hxx>
#include <svx/checklbx.hxx>
#include <svtools/treelistbox.hxx>
diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx
index 165ec5cfb465..0b4010d1a92e 100644
--- a/sw/source/uibase/inc/swuiidxmrk.hxx
+++ b/sw/source/uibase/inc/swuiidxmrk.hxx
@@ -33,7 +33,7 @@
#include <vcl/lstbox.hxx>
#include <sfx2/childwin.hxx>
-#include "toxe.hxx"
+#include <toxe.hxx>
#include <com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp>
#include <memory>
diff --git a/sw/source/uibase/inc/swuipardlg.hxx b/sw/source/uibase/inc/swuipardlg.hxx
index 13c0775459dd..da76e1e7e316 100644
--- a/sw/source/uibase/inc/swuipardlg.hxx
+++ b/sw/source/uibase/inc/swuipardlg.hxx
@@ -18,7 +18,7 @@
*/
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWUIPARDLG_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_SWUIPARDLG_HXX
-#include "pardlg.hxx"
+#include <pardlg.hxx>
class SwParaDlg: public SfxTabDialog
{
diff --git a/sw/source/uibase/inc/swwrtshitem.hxx b/sw/source/uibase/inc/swwrtshitem.hxx
index dcdb04dbda46..282d0d47e3b1 100644
--- a/sw/source/uibase/inc/swwrtshitem.hxx
+++ b/sw/source/uibase/inc/swwrtshitem.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWWRTSHITEM_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_SWWRTSHITEM_HXX
#include <svl/poolitem.hxx>
-#include "swdllapi.h"
+#include <swdllapi.h>
class SwWrtShell;
diff --git a/sw/source/uibase/inc/tabledlg.hxx b/sw/source/uibase/inc/tabledlg.hxx
index c8463451d6a5..eebd8922973d 100644
--- a/sw/source/uibase/inc/tabledlg.hxx
+++ b/sw/source/uibase/inc/tabledlg.hxx
@@ -21,8 +21,8 @@
#include <sfx2/tabdlg.hxx>
-#include "swtypes.hxx"
-#include "swtablerep.hxx"
+#include <swtypes.hxx>
+#include <swtablerep.hxx>
class SwWrtShell;
struct TColumn;
diff --git a/sw/source/uibase/inc/tablemgr.hxx b/sw/source/uibase/inc/tablemgr.hxx
index 365fb927dbe2..785862250fe9 100644
--- a/sw/source/uibase/inc/tablemgr.hxx
+++ b/sw/source/uibase/inc/tablemgr.hxx
@@ -19,9 +19,9 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_TABLEMGR_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_TABLEMGR_HXX
-#include "swdllapi.h"
-#include "swtypes.hxx"
-#include "tabcol.hxx"
+#include <swdllapi.h>
+#include <swtypes.hxx>
+#include <tabcol.hxx>
class SwFrameFormat;
class SwWrtShell;
diff --git a/sw/source/uibase/inc/tabsh.hxx b/sw/source/uibase/inc/tabsh.hxx
index fe940d486199..d2cb119539bb 100644
--- a/sw/source/uibase/inc/tabsh.hxx
+++ b/sw/source/uibase/inc/tabsh.hxx
@@ -19,8 +19,8 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_TABSH_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_TABSH_HXX
-#include "basesh.hxx"
-#include "swdllapi.h"
+#include <basesh.hxx>
+#include <swdllapi.h>
class SfxItemSet;
class SwWrtShell;
diff --git a/sw/source/uibase/inc/toxmgr.hxx b/sw/source/uibase/inc/toxmgr.hxx
index b15972d3cf55..470bc0a5fe22 100644
--- a/sw/source/uibase/inc/toxmgr.hxx
+++ b/sw/source/uibase/inc/toxmgr.hxx
@@ -20,8 +20,8 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_TOXMGR_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_TOXMGR_HXX
-#include "swdllapi.h"
-#include "tox.hxx"
+#include <swdllapi.h>
+#include <tox.hxx>
#include <authfld.hxx>
#include <memory>
diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx
index 9975394a6f49..173bbe1c3cab 100644
--- a/sw/source/uibase/inc/uiitems.hxx
+++ b/sw/source/uibase/inc/uiitems.hxx
@@ -21,9 +21,9 @@
#include <memory>
#include <svl/poolitem.hxx>
-#include "swdllapi.h"
-#include "cmdid.h"
-#include "pagedesc.hxx"
+#include <swdllapi.h>
+#include <cmdid.h>
+#include <pagedesc.hxx>
class SwNumRule;
class IntlWrapper;
diff --git a/sw/source/uibase/inc/uinums.hxx b/sw/source/uibase/inc/uinums.hxx
index 4dc28f663d30..8ee71aa9a28a 100644
--- a/sw/source/uibase/inc/uinums.hxx
+++ b/sw/source/uibase/inc/uinums.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_UINUMS_HXX
#include <numrule.hxx>
-#include "swdllapi.h"
+#include <swdllapi.h>
#include <memory>
#include <vector>
diff --git a/sw/source/uibase/inc/uitool.hxx b/sw/source/uibase/inc/uitool.hxx
index 3a1fd7060f97..2e2924df78b7 100644
--- a/sw/source/uibase/inc/uitool.hxx
+++ b/sw/source/uibase/inc/uitool.hxx
@@ -22,7 +22,7 @@
#include <tools/wintypes.hxx>
#include <vcl/field.hxx>
#include <swtypes.hxx>
-#include "swdllapi.h"
+#include <swdllapi.h>
class MetricFormatter;
class SfxItemSet;
diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx
index adface937008..c97e77d1d46b 100644
--- a/sw/source/uibase/inc/unotools.hxx
+++ b/sw/source/uibase/inc/unotools.hxx
@@ -29,7 +29,7 @@
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/text/XTextCursor.hpp>
#include <com/sun/star/awt/XControl.hpp>
-#include "swdllapi.h"
+#include <swdllapi.h>
class SwOneExampleFrame;
diff --git a/sw/source/uibase/inc/unotxvw.hxx b/sw/source/uibase/inc/unotxvw.hxx
index f298503944ba..b6cf4e4666af 100644
--- a/sw/source/uibase/inc/unotxvw.hxx
+++ b/sw/source/uibase/inc/unotxvw.hxx
@@ -38,8 +38,8 @@
#include <com/sun/star/datatransfer/XTransferableSupplier.hpp>
#include <cppuhelper/implbase.hxx>
#include <svl/itemprop.hxx>
-#include "calbck.hxx"
-#include "TextCursorHelper.hxx"
+#include <calbck.hxx>
+#include <TextCursorHelper.hxx>
#include <comphelper/uno3.hxx>
#include <sfx2/objsh.hxx>
diff --git a/sw/source/uibase/inc/usrpref.hxx b/sw/source/uibase/inc/usrpref.hxx
index af2b97852f21..021dded82d98 100644
--- a/sw/source/uibase/inc/usrpref.hxx
+++ b/sw/source/uibase/inc/usrpref.hxx
@@ -22,7 +22,7 @@
#include <memory>
#include <unotools/configitem.hxx>
#include <fldupde.hxx>
-#include "viewopt.hxx"
+#include <viewopt.hxx>
#include <tools/fldunit.hxx>
class SwMasterUsrPref;
diff --git a/sw/source/uibase/inc/wformsh.hxx b/sw/source/uibase/inc/wformsh.hxx
index dfce5359f1e3..c34dddb336e6 100644
--- a/sw/source/uibase/inc/wformsh.hxx
+++ b/sw/source/uibase/inc/wformsh.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WFORMSH_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_WFORMSH_HXX
-#include "drformsh.hxx"
+#include <drformsh.hxx>
class SwWebDrawFormShell : public SwDrawFormShell
{
diff --git a/sw/source/uibase/inc/wfrmsh.hxx b/sw/source/uibase/inc/wfrmsh.hxx
index 15cd8a8b7a63..b2aecbf22567 100644
--- a/sw/source/uibase/inc/wfrmsh.hxx
+++ b/sw/source/uibase/inc/wfrmsh.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WFRMSH_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_WFRMSH_HXX
-#include "frmsh.hxx"
+#include <frmsh.hxx>
class SwWebFrameShell: public SwFrameShell
{
diff --git a/sw/source/uibase/inc/wgrfsh.hxx b/sw/source/uibase/inc/wgrfsh.hxx
index 65987a423958..9c4271989f26 100644
--- a/sw/source/uibase/inc/wgrfsh.hxx
+++ b/sw/source/uibase/inc/wgrfsh.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WGRFSH_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_WGRFSH_HXX
-#include "grfsh.hxx"
+#include <grfsh.hxx>
class SwWebGrfShell: public SwGrfShell
{
diff --git a/sw/source/uibase/inc/wlistsh.hxx b/sw/source/uibase/inc/wlistsh.hxx
index f3a1179a6f60..1c738e8d687e 100644
--- a/sw/source/uibase/inc/wlistsh.hxx
+++ b/sw/source/uibase/inc/wlistsh.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WLISTSH_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_WLISTSH_HXX
-#include "listsh.hxx"
+#include <listsh.hxx>
class SwWebListShell: public SwListShell
{
diff --git a/sw/source/uibase/inc/wolesh.hxx b/sw/source/uibase/inc/wolesh.hxx
index 017768aace59..9ac3a254a6ee 100644
--- a/sw/source/uibase/inc/wolesh.hxx
+++ b/sw/source/uibase/inc/wolesh.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WOLESH_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_WOLESH_HXX
-#include "olesh.hxx"
+#include <olesh.hxx>
class SwWebOleShell: public SwOleShell
{
diff --git a/sw/source/uibase/inc/wordcountdialog.hxx b/sw/source/uibase/inc/wordcountdialog.hxx
index 972ea5cb990f..9d81cf8da841 100644
--- a/sw/source/uibase/inc/wordcountdialog.hxx
+++ b/sw/source/uibase/inc/wordcountdialog.hxx
@@ -23,7 +23,7 @@
#include <vcl/button.hxx>
struct SwDocStat;
#include <sfx2/childwin.hxx>
-#include "swabstdlg.hxx"
+#include <swabstdlg.hxx>
class SwWordCountFloatDlg : public SfxModelessDialog
{
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index d95ede2d2b50..4cb1be61db31 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -19,12 +19,12 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WRTSH_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_WRTSH_HXX
-#include "swdllapi.h"
+#include <swdllapi.h>
#include <fesh.hxx>
#include <sortopt.hxx>
#include <swurl.hxx>
#include <IMark.hxx>
-#include "navmgr.hxx"
+#include <navmgr.hxx>
#include <boost/optional.hpp>
#include <o3tl/typed_flags_set.hxx>
diff --git a/sw/source/uibase/inc/wtabsh.hxx b/sw/source/uibase/inc/wtabsh.hxx
index 0411750194a5..9e44bcf5d5ed 100644
--- a/sw/source/uibase/inc/wtabsh.hxx
+++ b/sw/source/uibase/inc/wtabsh.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WTABSH_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_WTABSH_HXX
-#include "tabsh.hxx"
+#include <tabsh.hxx>
class SwWebTableShell: public SwTableShell
{
diff --git a/sw/source/uibase/inc/wtextsh.hxx b/sw/source/uibase/inc/wtextsh.hxx
index 7924fdf903d9..494b2fa1b834 100644
--- a/sw/source/uibase/inc/wtextsh.hxx
+++ b/sw/source/uibase/inc/wtextsh.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WTEXTSH_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_WTEXTSH_HXX
-#include "textsh.hxx"
+#include <textsh.hxx>
class SwWebTextShell: public SwTextShell
{
diff --git a/sw/source/uibase/inc/wview.hxx b/sw/source/uibase/inc/wview.hxx
index cd4b5f6dbcf8..cfd63881dd7a 100644
--- a/sw/source/uibase/inc/wview.hxx
+++ b/sw/source/uibase/inc/wview.hxx
@@ -19,8 +19,8 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WVIEW_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_WVIEW_HXX
-#include "swdllapi.h"
-#include "view.hxx"
+#include <swdllapi.h>
+#include <view.hxx>
class SW_DLLPUBLIC SwWebView: public SwView
{
diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx
index 6293d32c965b..2f45e766b341 100644
--- a/sw/source/uibase/lingu/hhcwrp.cxx
+++ b/sw/source/uibase/lingu/hhcwrp.cxx
@@ -31,7 +31,7 @@
#include <rtl/ustring.hxx>
#include <com/sun/star/text/RubyAdjust.hpp>
#include <hhcwrp.hxx>
-#include <sdrhhcwrap.hxx>
+#include "sdrhhcwrap.hxx"
#include <doc.hxx>
#include <docsh.hxx>
#include <mdiexp.hxx>
diff --git a/sw/source/uibase/lingu/hyp.cxx b/sw/source/uibase/lingu/hyp.cxx
index 9e100d0c155b..56bd99b8471d 100644
--- a/sw/source/uibase/lingu/hyp.cxx
+++ b/sw/source/uibase/lingu/hyp.cxx
@@ -17,21 +17,21 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "initui.hxx"
-#include "view.hxx"
-#include "edtwin.hxx"
-#include "wrtsh.hxx"
-#include "globals.hrc"
+#include <initui.hxx>
+#include <view.hxx>
+#include <edtwin.hxx>
+#include <wrtsh.hxx>
+#include <globals.hrc>
#include <vcl/msgbox.hxx>
#include <vcl/wrkwin.hxx>
#include <linguistic/lngprops.hxx>
#include <com/sun/star/linguistic2/XLinguProperties.hpp>
#include <swwait.hxx>
-#include "hyp.hxx"
-#include "mdiexp.hxx"
-#include "olmenu.hxx"
-#include "strings.hrc"
+#include <hyp.hxx>
+#include <mdiexp.hxx>
+#include <olmenu.hxx>
+#include <strings.hrc>
#include <unomid.h>
diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx
index a3bb75c1cdc2..879a2c93f5c2 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -17,29 +17,29 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "SwRewriter.hxx"
-#include "cmdid.h"
-#include "strings.hrc"
-#include "doc.hxx"
-#include "docsh.hxx"
-#include "edtwin.hxx"
-#include "helpids.h"
-#include "hintids.hxx"
-#include "langhelper.hxx"
-#include "ndtxt.hxx"
-#include "bitmaps.hlst"
-#include "olmenu.hxx"
-#include "swabstdlg.hxx"
-#include "swmodule.hxx"
-#include "swtypes.hxx"
-#include "swundo.hxx"
-#include "uitool.hxx"
-#include "unomid.h"
-#include "view.hxx"
-#include "viewopt.hxx"
-#include "wrtsh.hxx"
-#include "wview.hxx"
-#include "textsh.hxx"
+#include <SwRewriter.hxx>
+#include <cmdid.h>
+#include <strings.hrc>
+#include <doc.hxx>
+#include <docsh.hxx>
+#include <edtwin.hxx>
+#include <helpids.h>
+#include <hintids.hxx>
+#include <langhelper.hxx>
+#include <ndtxt.hxx>
+#include <bitmaps.hlst>
+#include <olmenu.hxx>
+#include <swabstdlg.hxx>
+#include <swmodule.hxx>
+#include <swtypes.hxx>
+#include <swundo.hxx>
+#include <uitool.hxx>
+#include <unomid.h>
+#include <view.hxx>
+#include <viewopt.hxx>
+#include <wrtsh.hxx>
+#include <wview.hxx>
+#include <textsh.hxx>
#include <comphelper/anytostring.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/sw/source/uibase/lingu/sdrhhcwrap.cxx b/sw/source/uibase/lingu/sdrhhcwrap.cxx
index ee42ddec3339..6aae8d3aa34c 100644
--- a/sw/source/uibase/lingu/sdrhhcwrap.cxx
+++ b/sw/source/uibase/lingu/sdrhhcwrap.cxx
@@ -32,7 +32,7 @@
#include <editeng/unolingu.hxx>
#include <unotools/localedatawrapper.hxx>
#include <drawdoc.hxx>
-#include <sdrhhcwrap.hxx>
+#include "sdrhhcwrap.hxx"
#include <frmfmt.hxx>
#include <docsh.hxx>
#include <wrtsh.hxx>
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index 29f60efe9ef1..b19c90da46bb 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -45,7 +45,7 @@
#include <vector>
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
#include <unomid.h>
diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx
index 5c33febef4bc..21f2470bc2f7 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -11,19 +11,19 @@
// Design proposal: https://wiki.documentfoundation.org/Design/Whiteboards/Comments_Ruler_Control
// TODO Alpha blend border when it doesn't fit in window
-#include "swruler.hxx"
+#include <swruler.hxx>
-#include "viewsh.hxx"
-#include "edtwin.hxx"
-#include "PostItMgr.hxx"
-#include "viewopt.hxx"
+#include <viewsh.hxx>
+#include <edtwin.hxx>
+#include <PostItMgr.hxx>
+#include <viewopt.hxx>
#include <view.hxx>
-#include "cmdid.h"
+#include <cmdid.h>
#include <sfx2/request.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <vcl/settings.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
#include <comphelper/lok.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <boost/property_tree/json_parser.hpp>
diff --git a/sw/source/uibase/ribbar/conarc.cxx b/sw/source/uibase/ribbar/conarc.cxx
index 4373c677ecac..67ab49b8bc2f 100644
--- a/sw/source/uibase/ribbar/conarc.cxx
+++ b/sw/source/uibase/ribbar/conarc.cxx
@@ -19,11 +19,11 @@
#include <svx/svdobj.hxx>
-#include "view.hxx"
-#include "edtwin.hxx"
-#include "wrtsh.hxx"
-#include "drawbase.hxx"
-#include "conarc.hxx"
+#include <view.hxx>
+#include <edtwin.hxx>
+#include <wrtsh.hxx>
+#include <drawbase.hxx>
+#include <conarc.hxx>
ConstArc::ConstArc(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* pSwView)
: SwDrawBase(pWrtShell, pEditWin, pSwView), m_nButtonUpCount(0)
diff --git a/sw/source/uibase/ribbar/conform.cxx b/sw/source/uibase/ribbar/conform.cxx
index a94de2c32d7c..0694358ce096 100644
--- a/sw/source/uibase/ribbar/conform.cxx
+++ b/sw/source/uibase/ribbar/conform.cxx
@@ -21,12 +21,12 @@
#include <svx/svdview.hxx>
#include <svx/fmshell.hxx>
-#include "swmodule.hxx"
-#include "view.hxx"
-#include "edtwin.hxx"
-#include "wrtsh.hxx"
-#include "drawbase.hxx"
-#include "conform.hxx"
+#include <swmodule.hxx>
+#include <view.hxx>
+#include <edtwin.hxx>
+#include <wrtsh.hxx>
+#include <drawbase.hxx>
+#include <conform.hxx>
ConstFormControl::ConstFormControl(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* pSwView) :
SwDrawBase(pWrtShell, pEditWin, pSwView)
diff --git a/sw/source/uibase/ribbar/conpoly.cxx b/sw/source/uibase/ribbar/conpoly.cxx
index eb1125fca610..ad573d06a80c 100644
--- a/sw/source/uibase/ribbar/conpoly.cxx
+++ b/sw/source/uibase/ribbar/conpoly.cxx
@@ -21,11 +21,11 @@
#include <svx/svdview.hxx>
#include <svx/svdopath.hxx>
-#include "view.hxx"
-#include "edtwin.hxx"
-#include "wrtsh.hxx"
-#include "drawbase.hxx"
-#include "conpoly.hxx"
+#include <view.hxx>
+#include <edtwin.hxx>
+#include <wrtsh.hxx>
+#include <drawbase.hxx>
+#include <conpoly.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
ConstPolygon::ConstPolygon(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* pSwView) :
diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx
index 1831acac18d1..a32ee16bb905 100644
--- a/sw/source/uibase/ribbar/drawbase.cxx
+++ b/sw/source/uibase/ribbar/drawbase.cxx
@@ -26,17 +26,17 @@
#include <sfx2/bindings.hxx>
#include <fmtclds.hxx>
#include <frmfmt.hxx>
-#include "cmdid.h"
-#include "basesh.hxx"
-#include "view.hxx"
-#include "wrtsh.hxx"
-#include "drawbase.hxx"
-#include "edtwin.hxx"
-#include "caption.hxx"
-#include "swmodule.hxx"
-#include "swundo.hxx"
+#include <cmdid.h>
+#include <basesh.hxx>
+#include <view.hxx>
+#include <wrtsh.hxx>
+#include <drawbase.hxx>
+#include <edtwin.hxx>
+#include <caption.hxx>
+#include <swmodule.hxx>
+#include <swundo.hxx>
#include <SwRewriter.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
using namespace ::com::sun::star;
diff --git a/sw/source/uibase/ribbar/dselect.cxx b/sw/source/uibase/ribbar/dselect.cxx
index 89914f6527cc..9dd3b1a0c2bc 100644
--- a/sw/source/uibase/ribbar/dselect.cxx
+++ b/sw/source/uibase/ribbar/dselect.cxx
@@ -18,12 +18,12 @@
*/
#include <sfx2/bindings.hxx>
-#include "view.hxx"
-#include "edtwin.hxx"
-#include "wrtsh.hxx"
-#include "cmdid.h"
-#include "drawbase.hxx"
-#include "dselect.hxx"
+#include <view.hxx>
+#include <edtwin.hxx>
+#include <wrtsh.hxx>
+#include <cmdid.h>
+#include <drawbase.hxx>
+#include <dselect.hxx>
DrawSelection::DrawSelection(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* pSwView) :
SwDrawBase(pWrtShell, pEditWin, pSwView)
diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx
index 256f792b05b6..9e41761cfeac 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -30,27 +30,27 @@
#include <svl/stritem.hxx>
#include <vcl/settings.hxx>
-#include "swtypes.hxx"
-#include "cmdid.h"
-#include "swmodule.hxx"
-#include "wrtsh.hxx"
-#include "view.hxx"
-#include "calc.hxx"
-#include "inputwin.hxx"
-#include "fldbas.hxx"
-#include "fldmgr.hxx"
-#include "frmfmt.hxx"
-#include "cellatr.hxx"
-#include "edtwin.hxx"
-#include "helpids.h"
-#include "strings.hrc"
-#include "bitmaps.hlst"
+#include <swtypes.hxx>
+#include <cmdid.h>
+#include <swmodule.hxx>
+#include <wrtsh.hxx>
+#include <view.hxx>
+#include <calc.hxx>
+#include <inputwin.hxx>
+#include <fldbas.hxx>
+#include <fldmgr.hxx>
+#include <frmfmt.hxx>
+#include <cellatr.hxx>
+#include <edtwin.hxx>
+#include <helpids.h>
+#include <strings.hrc>
+#include <bitmaps.hlst>
// Only for the UpdateRange: Delete the box in which the stacked cursor is positioned.
-#include "pam.hxx"
+#include <pam.hxx>
-#include "swundo.hxx"
-#include "dbui.hrc"
+#include <swundo.hxx>
+#include <dbui.hrc>
#include <IDocumentContentOperations.hxx>
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index 45563df56b18..71eca1387699 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -42,13 +42,13 @@
#include <vcl/lstbox.hxx>
#include <vcl/settings.hxx>
#include <rtl/ustring.hxx>
-#include "swabstdlg.hxx"
+#include <swabstdlg.hxx>
#include <sfx2/zoomitem.hxx>
#include <vcl/svapp.hxx>
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
#include <svx/strings.hrc>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
#include <toolkit/helper/vclunohelper.hxx>
// Size check
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 79febb081f52..8e94dd42375d 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -90,12 +90,12 @@
#include <globals.hrc>
#include <strings.hrc>
#include <breakit.hxx>
-#include "annotsh.hxx"
-#include "view.hxx"
+#include <annotsh.hxx>
+#include <view.hxx>
#include <PostItMgr.hxx>
#include <AnnotationWin.hxx>
-#include "swtypes.hxx"
+#include <swtypes.hxx>
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
@@ -112,7 +112,7 @@
#include <docsh.hxx>
#include <svl/undo.hxx>
-#include "swabstdlg.hxx"
+#include <swabstdlg.hxx>
#include <app.hrc>
#include <comphelper/string.hxx>
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index c2180b12e39a..8dbfd4e91cc8 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -94,7 +94,7 @@
#include <doc.hxx>
#include <IDocumentSettingAccess.hxx>
#include <IDocumentUndoRedo.hxx>
-#include "swabstdlg.hxx"
+#include <swabstdlg.hxx>
#include <modcfg.hxx>
#include <instable.hxx>
#include <svx/fmshell.hxx>
@@ -125,7 +125,7 @@ static sal_uInt8 nFooterPos;
#define SwBaseShell
#include <sfx2/msg.hxx>
-#include "swslots.hxx"
+#include <swslots.hxx>
namespace
{
diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx
index baedf94d706b..bbabedc2eded 100644
--- a/sw/source/uibase/shells/beziersh.cxx
+++ b/sw/source/uibase/shells/beziersh.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "cmdid.h"
+#include <cmdid.h>
#include <svx/svdview.hxx>
#include <svl/srchitem.hxx>
#include <svl/eitem.hxx>
@@ -28,17 +28,17 @@
#include <sfx2/dispatch.hxx>
#include <sfx2/objface.hxx>
-#include "wrtsh.hxx"
-#include "view.hxx"
-#include "edtwin.hxx"
-#include "helpids.h"
-#include "globals.hrc"
-#include "drawbase.hxx"
-#include "beziersh.hxx"
-#include "strings.hrc"
+#include <wrtsh.hxx>
+#include <view.hxx>
+#include <edtwin.hxx>
+#include <helpids.h>
+#include <globals.hrc>
+#include <drawbase.hxx>
+#include <beziersh.hxx>
+#include <strings.hrc>
#define SwBezierShell
#include <sfx2/msg.hxx>
-#include "swslots.hxx"
+#include <swslots.hxx>
#include <unomid.h>
diff --git a/sw/source/uibase/shells/drawdlg.cxx b/sw/source/uibase/shells/drawdlg.cxx
index e771ad55f286..06a107981c58 100644
--- a/sw/source/uibase/shells/drawdlg.cxx
+++ b/sw/source/uibase/shells/drawdlg.cxx
@@ -25,12 +25,12 @@
#include <svx/drawitem.hxx>
#include <svx/xtable.hxx>
-#include "view.hxx"
-#include "wrtsh.hxx"
-#include "docsh.hxx"
-#include "cmdid.h"
+#include <view.hxx>
+#include <wrtsh.hxx>
+#include <docsh.hxx>
+#include <cmdid.h>
-#include "drawsh.hxx"
+#include <drawsh.hxx>
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
#include <memory>
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index f2d3a461a8ca..eb33d5ebfb0d 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -50,19 +50,19 @@
#include <svx/svdundo.hxx>
#include <svx/xbtmpit.hxx>
-#include "swundo.hxx"
-#include "wrtsh.hxx"
-#include "cmdid.h"
-#include "globals.hrc"
-#include "helpids.h"
-#include "strings.hrc"
-#include "drwbassh.hxx"
-#include "drawsh.hxx"
+#include <swundo.hxx>
+#include <wrtsh.hxx>
+#include <cmdid.h>
+#include <globals.hrc>
+#include <helpids.h>
+#include <strings.hrc>
+#include <drwbassh.hxx>
+#include <drawsh.hxx>
#define SwDrawShell
#include <sfx2/msg.hxx>
-#include "swslots.hxx"
-#include "swabstdlg.hxx"
+#include <swslots.hxx>
+#include <swabstdlg.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx
index 0c606e342637..b34c5f818d41 100644
--- a/sw/source/uibase/shells/drformsh.cxx
+++ b/sw/source/uibase/shells/drformsh.cxx
@@ -34,15 +34,15 @@
#include <sfx2/htmlmode.hxx>
#include <tools/urlobj.hxx>
-#include "viewopt.hxx"
-#include "swmodule.hxx"
-#include "wrtsh.hxx"
-#include "cmdid.h"
-#include "globals.hrc"
-#include "helpids.h"
-#include "strings.hrc"
-#include "drwbassh.hxx"
-#include "drformsh.hxx"
+#include <viewopt.hxx>
+#include <swmodule.hxx>
+#include <wrtsh.hxx>
+#include <cmdid.h>
+#include <globals.hrc>
+#include <helpids.h>
+#include <strings.hrc>
+#include <drwbassh.hxx>
+#include <drformsh.hxx>
#include <svl/urihelper.hxx>
#include <view.hxx>
#include <sfx2/docfile.hxx>
@@ -50,7 +50,7 @@
#define SwDrawFormShell
#include <sfx2/msg.hxx>
-#include "swslots.hxx"
+#include <swslots.hxx>
#include <unomid.h>
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index 5c31e2215d6b..53aa72233b20 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -55,7 +55,7 @@
#include <swslots.hxx>
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
-#include "swabstdlg.hxx"
+#include <swabstdlg.hxx>
#include <swundo.hxx>
#include <com/sun/star/text/HoriOrientation.hpp>
#include <com/sun/star/text/VertOrientation.hpp>
diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index 39c30245cced..e92724c00f00 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -94,7 +94,7 @@
#include <wrtsh.hxx>
#include <wview.hxx>
-#include "swabstdlg.hxx"
+#include <swabstdlg.hxx>
#include <memory>
using namespace ::com::sun::star;
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 5c81891d0de2..e5af6c0995a1 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -71,8 +71,8 @@
#include <svx/xtable.hxx>
#include <cppuhelper/bootstrap.hxx>
#include <comphelper/processfactory.hxx>
-#include "swabstdlg.hxx"
-#include "IDocumentUndoRedo.hxx"
+#include <swabstdlg.hxx>
+#include <IDocumentUndoRedo.hxx>
#include <memory>
using namespace ::com::sun::star;
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index 4464f69bd4b7..c995c01987ce 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -74,7 +74,7 @@
#include <cfgitems.hxx>
#include <globals.hrc>
#include <strings.hrc>
-#include "swabstdlg.hxx"
+#include <swabstdlg.hxx>
#include <svx/dialogs.hrc>
@@ -84,7 +84,7 @@
#define SwFrameShell
#include <sfx2/msg.hxx>
-#include "swslots.hxx"
+#include <swslots.hxx>
using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index 3e3e1bafa821..dafb8d4b643b 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -73,8 +73,8 @@
#define SwGrfShell
#include <sfx2/msg.hxx>
-#include "swslots.hxx"
-#include "swabstdlg.hxx"
+#include <swslots.hxx>
+#include <swabstdlg.hxx>
#include <unocrsr.hxx>
#include <memory>
diff --git a/sw/source/uibase/shells/langhelper.cxx b/sw/source/uibase/shells/langhelper.cxx
index 6297c2e5d1af..ce47eafd7e15 100644
--- a/sw/source/uibase/shells/langhelper.cxx
+++ b/sw/source/uibase/shells/langhelper.cxx
@@ -47,7 +47,7 @@
#include <view.hxx>
#include <viewopt.hxx>
-#include "swabstdlg.hxx"
+#include <swabstdlg.hxx>
#include <vcl/msgbox.hxx>
diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx
index cb17d42b9a14..5ef04460e6cb 100644
--- a/sw/source/uibase/shells/listsh.cxx
+++ b/sw/source/uibase/shells/listsh.cxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "cmdid.h"
-#include "hintids.hxx"
+#include <cmdid.h>
+#include <hintids.hxx>
#include <editeng/sizeitem.hxx>
#include <editeng/brushitem.hxx>
#include <sfx2/app.hxx>
@@ -33,21 +33,21 @@
#include <numrule.hxx>
#include <fmtornt.hxx>
-#include "wrtsh.hxx"
-#include "swmodule.hxx"
-#include "frmatr.hxx"
-#include "helpids.h"
-#include "globals.hrc"
-#include "strings.hrc"
-#include "uinums.hxx"
-#include "listsh.hxx"
-#include "poolfmt.hxx"
-#include "view.hxx"
-#include "edtwin.hxx"
+#include <wrtsh.hxx>
+#include <swmodule.hxx>
+#include <frmatr.hxx>
+#include <helpids.h>
+#include <globals.hrc>
+#include <strings.hrc>
+#include <uinums.hxx>
+#include <listsh.hxx>
+#include <poolfmt.hxx>
+#include <view.hxx>
+#include <edtwin.hxx>
#define SwListShell
#include <sfx2/msg.hxx>
-#include "swslots.hxx"
+#include <swslots.hxx>
#include <IDocumentOutlineNodes.hxx>
diff --git a/sw/source/uibase/shells/mediash.cxx b/sw/source/uibase/shells/mediash.cxx
index 149579727a02..297d0363d234 100644
--- a/sw/source/uibase/shells/mediash.cxx
+++ b/sw/source/uibase/shells/mediash.cxx
@@ -64,8 +64,8 @@
#define SwMediaShell
#include <sfx2/msg.hxx>
-#include "swslots.hxx"
-#include "swabstdlg.hxx"
+#include <swslots.hxx>
+#include <swabstdlg.hxx>
#include <memory>
SFX_IMPL_INTERFACE(SwMediaShell, SwBaseShell)
diff --git a/sw/source/uibase/shells/navsh.cxx b/sw/source/uibase/shells/navsh.cxx
index 8ae56c034970..80d76dbf735f 100644
--- a/sw/source/uibase/shells/navsh.cxx
+++ b/sw/source/uibase/shells/navsh.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "cmdid.h"
+#include <cmdid.h>
#include <svx/svdview.hxx>
#include <svl/srchitem.hxx>
#include <svl/eitem.hxx>
@@ -16,17 +16,17 @@
#include <sfx2/request.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/objface.hxx>
-#include "wrtsh.hxx"
-#include "view.hxx"
-#include "edtwin.hxx"
-#include "helpids.h"
-#include "globals.hrc"
-#include "navsh.hxx"
-#include "strings.hrc"
+#include <wrtsh.hxx>
+#include <view.hxx>
+#include <edtwin.hxx>
+#include <helpids.h>
+#include <globals.hrc>
+#include <navsh.hxx>
+#include <strings.hrc>
#define SwNavigationShell
-#include "swslots.hxx"
+#include <swslots.hxx>
#include <unomid.h>
-#include "navmgr.hxx"
+#include <navmgr.hxx>
SFX_IMPL_INTERFACE(SwNavigationShell, SwBaseShell)
diff --git a/sw/source/uibase/shells/slotadd.cxx b/sw/source/uibase/shells/slotadd.cxx
index 173bf0f41b6e..043357225f53 100644
--- a/sw/source/uibase/shells/slotadd.cxx
+++ b/sw/source/uibase/shells/slotadd.cxx
@@ -19,9 +19,9 @@
#include <config_options.h>
-#include "hintids.hxx"
-#include "uiitems.hxx"
-#include "cmdid.h"
+#include <hintids.hxx>
+#include <uiitems.hxx>
+#include <cmdid.h>
#include <svl/globalnameitem.hxx>
#include <editeng/memberids.h>
@@ -105,11 +105,11 @@
#include <fmtinfmt.hxx>
#include <fmtfsize.hxx>
#include <fmtsrnd.hxx>
-#include "envimg.hxx"
-#include "frmatr.hxx"
-#include "cfgitems.hxx"
-#include "grfatr.hxx"
-#include "fmtline.hxx"
+#include <envimg.hxx>
+#include <frmatr.hxx>
+#include <cfgitems.hxx>
+#include <grfatr.hxx>
+#include <fmtline.hxx>
#include <svx/clipfmtitem.hxx>
#include <editeng/blinkitem.hxx>
#include <svl/slstitm.hxx>
@@ -133,6 +133,6 @@
#define SFX_TYPEMAP
#include <sfx2/msg.hxx>
-#include "swslots.hxx"
+#include <swslots.hxx>
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index cd6726ee2b31..b3519acbf9d6 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -62,7 +62,7 @@
#include <uiitems.hxx>
#include <usrpref.hxx>
#include <tabsh.hxx>
-#include "swtablerep.hxx"
+#include <swtablerep.hxx>
#include <tablemgr.hxx>
#include <cellatr.hxx>
#include <frmfmt.hxx>
@@ -82,7 +82,7 @@
#include <sfx2/msg.hxx>
#include <swslots.hxx>
-#include "swabstdlg.hxx"
+#include <swabstdlg.hxx>
#include <memory>
diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx
index 9eeddb8e2a2b..eb7a92cd1a58 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -62,7 +62,7 @@
#include <strings.hrc>
#include <sfx2/app.hxx>
#include <svx/dialogs.hrc>
-#include "swabstdlg.hxx"
+#include <swabstdlg.hxx>
#include <doc.hxx>
#include <app.hrc>
#include <edtwin.hxx>
diff --git a/sw/source/uibase/shells/textglos.cxx b/sw/source/uibase/shells/textglos.cxx
index 21ca0f6c5a97..6a85f91867f8 100644
--- a/sw/source/uibase/shells/textglos.cxx
+++ b/sw/source/uibase/shells/textglos.cxx
@@ -21,14 +21,14 @@
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
-#include "view.hxx"
-#include "cmdid.h"
-#include "textsh.hxx"
-#include "initui.hxx"
-#include "gloshdl.hxx"
-#include "glosdoc.hxx"
-#include "gloslst.hxx"
-#include "swabstdlg.hxx"
+#include <view.hxx>
+#include <cmdid.h>
+#include <textsh.hxx>
+#include <initui.hxx>
+#include <gloshdl.hxx>
+#include <glosdoc.hxx>
+#include <gloslst.hxx>
+#include <swabstdlg.hxx>
void SwTextShell::ExecGlossary(SfxRequest &rReq)
{
diff --git a/sw/source/uibase/shells/textidx.cxx b/sw/source/uibase/shells/textidx.cxx
index e833e0f7e16f..73061b385934 100644
--- a/sw/source/uibase/shells/textidx.cxx
+++ b/sw/source/uibase/shells/textidx.cxx
@@ -27,16 +27,16 @@
#include <fmtfsize.hxx>
#include <fldbas.hxx>
#include <uiitems.hxx>
-#include "viewopt.hxx"
-#include "cmdid.h"
-#include "view.hxx"
-#include "wrtsh.hxx"
-#include "swundo.hxx"
-#include "textsh.hxx"
-#include "idxmrk.hxx"
-#include "cnttab.hxx"
-#include "toxmgr.hxx"
-#include "swabstdlg.hxx"
+#include <viewopt.hxx>
+#include <cmdid.h>
+#include <view.hxx>
+#include <wrtsh.hxx>
+#include <swundo.hxx>
+#include <textsh.hxx>
+#include <idxmrk.hxx>
+#include <cnttab.hxx>
+#include <toxmgr.hxx>
+#include <swabstdlg.hxx>
#include <globals.hrc>
#include <memory>
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 3f9ac4f5285e..f321650318e2 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -103,7 +103,7 @@ using namespace ::com::sun::star;
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
-#include "swabstdlg.hxx"
+#include <swabstdlg.hxx>
#include <unomid.h>
#include <IDocumentDrawModelAccess.hxx>
#include <drawdoc.hxx>
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 671906587815..269d59d35f44 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -80,17 +80,17 @@
#include <cellatr.hxx>
#include <edtwin.hxx>
#include <redlndlg.hxx>
-#include "fldmgr.hxx"
+#include <fldmgr.hxx>
#include <globals.hrc>
#include <strings.hrc>
#include <app.hrc>
-#include "paratr.hxx"
+#include <paratr.hxx>
#include <vcl/svapp.hxx>
#include <sfx2/app.hxx>
#include <breakit.hxx>
#include <SwSmartTagMgr.hxx>
#include <editeng/acorrcfg.hxx>
-#include "swabstdlg.hxx"
+#include <swabstdlg.hxx>
#include <IDocumentStatistics.hxx>
#include <sfx2/sfxdlg.hxx>
#include <unotools/lingucfg.hxx>
diff --git a/sw/source/uibase/shells/textsh2.cxx b/sw/source/uibase/shells/textsh2.cxx
index 936c327bf849..161dfa912789 100644
--- a/sw/source/uibase/shells/textsh2.cxx
+++ b/sw/source/uibase/shells/textsh2.cxx
@@ -36,21 +36,21 @@
#include <sfx2/frame.hxx>
#include <fldmgr.hxx>
#include <fldbas.hxx>
-#include "dbmgr.hxx"
+#include <dbmgr.hxx>
#include <comphelper/uno3.hxx>
#include <svx/dataaccessdescriptor.hxx>
#include <vcl/svapp.hxx>
-#include "view.hxx"
-#include "wrtsh.hxx"
-#include "swtypes.hxx"
-#include "cmdid.h"
-#include "swevent.hxx"
-#include "strings.hrc"
-#include "textsh.hxx"
-#include "swabstdlg.hxx"
-#include "dbui.hrc"
+#include <view.hxx>
+#include <wrtsh.hxx>
+#include <swtypes.hxx>
+#include <cmdid.h>
+#include <swevent.hxx>
+#include <strings.hrc>
+#include <textsh.hxx>
+#include <swabstdlg.hxx>
+#include <dbui.hrc>
#include <unomid.h>
diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx
index 00ea92dad174..b62232a7251c 100644
--- a/sw/source/uibase/shells/txtattr.cxx
+++ b/sw/source/uibase/shells/txtattr.cxx
@@ -38,7 +38,7 @@
#include <editeng/scripttypeitem.hxx>
#include <editeng/frmdiritem.hxx>
#include <editeng/cmapitem.hxx>
-#include "paratr.hxx"
+#include <paratr.hxx>
#include <fmtinfmt.hxx>
#include <docsh.hxx>
@@ -55,8 +55,8 @@
#include <globals.h>
#include <strings.hrc>
#include <SwStyleNameMapper.hxx>
-#include "swabstdlg.hxx"
-#include "outline.hxx"
+#include <swabstdlg.hxx>
+#include <outline.hxx>
#include <memory>
const sal_uInt32 nFontInc = 40; // 2pt
diff --git a/sw/source/uibase/shells/txtcrsr.cxx b/sw/source/uibase/shells/txtcrsr.cxx
index fa25fd5d8bf8..f64127c45069 100644
--- a/sw/source/uibase/shells/txtcrsr.cxx
+++ b/sw/source/uibase/shells/txtcrsr.cxx
@@ -42,7 +42,7 @@
#include <svx/svdouno.hxx>
#include <svx/fmshell.hxx>
#include <svx/sdrobjectfilter.hxx>
-#include "outline.hxx"
+#include <outline.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/uibase/shells/txtnum.cxx b/sw/source/uibase/shells/txtnum.cxx
index 95ea4e775478..2e3d4cbfc142 100644
--- a/sw/source/uibase/shells/txtnum.cxx
+++ b/sw/source/uibase/shells/txtnum.cxx
@@ -26,16 +26,16 @@
#include <editeng/brushitem.hxx>
#include <numrule.hxx>
-#include "cmdid.h"
-#include "wrtsh.hxx"
-#include "view.hxx"
-#include "viewopt.hxx"
-#include "wdocsh.hxx"
-#include "poolfmt.hxx"
-#include "textsh.hxx"
-#include "uiitems.hxx"
-#include "swabstdlg.hxx"
-#include "SwStyleNameMapper.hxx"
+#include <cmdid.h>
+#include <wrtsh.hxx>
+#include <view.hxx>
+#include <viewopt.hxx>
+#include <wdocsh.hxx>
+#include <poolfmt.hxx>
+#include <textsh.hxx>
+#include <uiitems.hxx>
+#include <swabstdlg.hxx>
+#include <SwStyleNameMapper.hxx>
#include <globals.hrc>
#include <sfx2/tabdlg.hxx>
#include <svx/nbdtmg.hxx>
diff --git a/sw/source/uibase/sidebar/PageFooterPanel.cxx b/sw/source/uibase/sidebar/PageFooterPanel.cxx
index 803e86715c81..07cca5607a05 100644
--- a/sw/source/uibase/sidebar/PageFooterPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFooterPanel.cxx
@@ -31,7 +31,7 @@
#include <sfx2/bindings.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/objsh.hxx>
-#include "cmdid.h"
+#include <cmdid.h>
namespace sw { namespace sidebar{
diff --git a/sw/source/uibase/sidebar/PageFormatPanel.cxx b/sw/source/uibase/sidebar/PageFormatPanel.cxx
index 4823efb4fee1..c60fe52dfbb9 100644
--- a/sw/source/uibase/sidebar/PageFormatPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFormatPanel.cxx
@@ -31,7 +31,7 @@
#include <sfx2/bindings.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/objsh.hxx>
-#include "cmdid.h"
+#include <cmdid.h>
#include <svtools/unitconv.hxx>
#include <svtools/optionsdrawinglayer.hxx>
diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.cxx b/sw/source/uibase/sidebar/PageHeaderPanel.cxx
index 037b31f77ef3..8c3dcbef3916 100644
--- a/sw/source/uibase/sidebar/PageHeaderPanel.cxx
+++ b/sw/source/uibase/sidebar/PageHeaderPanel.cxx
@@ -31,7 +31,7 @@
#include <sfx2/bindings.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/objsh.hxx>
-#include "cmdid.h"
+#include <cmdid.h>
namespace sw { namespace sidebar{
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index f20c51123869..11449958ec52 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -23,7 +23,7 @@
#include <cstdlib>
#include "PageMarginControl.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
#include <editeng/sizeitem.hxx>
#include <sfx2/dispatch.hxx>
diff --git a/sw/source/uibase/sidebar/PageStylesPanel.cxx b/sw/source/uibase/sidebar/PageStylesPanel.cxx
index 65a67c2a038d..0408d7fe23db 100644
--- a/sw/source/uibase/sidebar/PageStylesPanel.cxx
+++ b/sw/source/uibase/sidebar/PageStylesPanel.cxx
@@ -25,7 +25,7 @@
#include <svx/colorbox.hxx>
#include <svx/dlgutil.hxx>
#include <svx/rulritem.hxx>
-#include "svx/drawitem.hxx"
+#include <svx/drawitem.hxx>
#include <svx/SvxNumOptionsTabPageHelper.hxx>
#include "PageStylesPanel.hxx"
#include <sfx2/sidebar/ControlFactory.hxx>
@@ -33,7 +33,7 @@
#include <sfx2/bindings.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/objsh.hxx>
-#include "cmdid.h"
+#include <cmdid.h>
using namespace ::com::sun::star;
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
index fac137507c12..e62da4f1b4f4 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
@@ -30,8 +30,8 @@
#include <sfx2/doctempl.hxx>
-#include "shellio.hxx"
-#include "docsh.hxx"
+#include <shellio.hxx>
+#include <docsh.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/documentconstants.hxx>
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.hxx b/sw/source/uibase/sidebar/StylePresetsPanel.hxx
index 5a56a6ef6bfc..18a1f771dd8a 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.hxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.hxx
@@ -37,7 +37,7 @@
#include <svx/fntctrl.hxx>
-#include "docstyle.hxx"
+#include <docstyle.hxx>
namespace sw { namespace sidebar {
diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx
index 7c5e289b3d5a..d7b2962e26f0 100644
--- a/sw/source/uibase/sidebar/SwPanelFactory.cxx
+++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx
@@ -19,13 +19,13 @@
#include <com/sun/star/ui/XUIElementFactory.hpp>
-#include <ThemePanel.hxx>
-#include <StylePresetsPanel.hxx>
-#include <PageStylesPanel.hxx>
-#include <PageFormatPanel.hxx>
-#include <PageHeaderPanel.hxx>
-#include <PageFooterPanel.hxx>
-#include <WrapPropertyPanel.hxx>
+#include "ThemePanel.hxx"
+#include "StylePresetsPanel.hxx"
+#include "PageStylesPanel.hxx"
+#include "PageFormatPanel.hxx"
+#include "PageHeaderPanel.hxx"
+#include "PageFooterPanel.hxx"
+#include "WrapPropertyPanel.hxx"
#include <navipi.hxx>
#include <redlndlg.hxx>
diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx
index 74d97b85ffc1..25ffbf61a8ba 100644
--- a/sw/source/uibase/sidebar/ThemePanel.cxx
+++ b/sw/source/uibase/sidebar/ThemePanel.cxx
@@ -30,11 +30,11 @@
#include <editeng/fontitem.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/borderline.hxx>
-#include "charatr.hxx"
-#include "charfmt.hxx"
-#include "docstyle.hxx"
-#include "fmtcol.hxx"
-#include "format.hxx"
+#include <charatr.hxx>
+#include <charfmt.hxx>
+#include <docstyle.hxx>
+#include <fmtcol.hxx>
+#include <format.hxx>
namespace
{
diff --git a/sw/source/uibase/sidebar/ThemePanel.hxx b/sw/source/uibase/sidebar/ThemePanel.hxx
index a8311c93f791..6014938a2522 100644
--- a/sw/source/uibase/sidebar/ThemePanel.hxx
+++ b/sw/source/uibase/sidebar/ThemePanel.hxx
@@ -36,7 +36,7 @@
#include <svx/ColorSets.hxx>
-#include "docsh.hxx"
+#include <docsh.hxx>
namespace sw { namespace sidebar {
diff --git a/sw/source/uibase/table/swtablerep.cxx b/sw/source/uibase/table/swtablerep.cxx
index 60d5d539fea3..a9b9ae49b9ec 100644
--- a/sw/source/uibase/table/swtablerep.cxx
+++ b/sw/source/uibase/table/swtablerep.cxx
@@ -42,14 +42,14 @@
#include <uitool.hxx>
#include <frmatr.hxx>
-#include <tablepg.hxx>
+#include "tablepg.hxx"
#include <tablemgr.hxx>
#include <pagedesc.hxx>
#include <poolfmt.hxx>
#include <SwStyleNameMapper.hxx>
#include <cmdid.h>
-#include "swtablerep.hxx"
+#include <swtablerep.hxx>
#include <memory>
SwTableRep::SwTableRep( const SwTabCols& rTabCol )
diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx
index 6a8a9c28927c..54d770158708 100644
--- a/sw/source/uibase/table/tablemgr.cxx
+++ b/sw/source/uibase/table/tablemgr.cxx
@@ -28,22 +28,22 @@
#include <comphelper/classids.hxx>
#include <svx/charthelper.hxx>
-#include "edtwin.hxx"
-#include "wrtsh.hxx"
-#include "cmdid.h"
-#include "frmatr.hxx"
-#include "view.hxx"
-#include "basesh.hxx"
-#include "swundo.hxx"
-#include "tablemgr.hxx"
-#include "frmfmt.hxx"
-#include "instable.hxx"
-#include "swerror.h"
-#include "swabstdlg.hxx"
-#include "swcli.hxx"
-#include "docsh.hxx"
-#include "unotbl.hxx"
-#include "unochart.hxx"
+#include <edtwin.hxx>
+#include <wrtsh.hxx>
+#include <cmdid.h>
+#include <frmatr.hxx>
+#include <view.hxx>
+#include <basesh.hxx>
+#include <swundo.hxx>
+#include <tablemgr.hxx>
+#include <frmfmt.hxx>
+#include <instable.hxx>
+#include <swerror.h>
+#include <swabstdlg.hxx>
+#include <swcli.hxx>
+#include <docsh.hxx>
+#include <unotbl.hxx>
+#include <unochart.hxx>
#include <memory>
using namespace ::com::sun::star;
diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx
index c7e4bd786800..f5e683d0f8d5 100644
--- a/sw/source/uibase/table/tablepg.hxx
+++ b/sw/source/uibase/table/tablepg.hxx
@@ -23,8 +23,8 @@
#include <vcl/button.hxx>
#include <vcl/lstbox.hxx>
#include <actctrl.hxx>
-#include "prcntfld.hxx"
-#include "swtypes.hxx"
+#include <prcntfld.hxx>
+#include <swtypes.hxx>
class SwWrtShell;
class SwTableRep;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list