summaryrefslogtreecommitdiff
path: root/sw/source/uibase/app
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2017-10-08 21:46:51 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2017-10-09 05:30:41 +0200
commit5c151537b571614c8f10b96e2b60faa959413f1f (patch)
treea3410556cd5a09546aafd327d090eb4176235129 /sw/source/uibase/app
parent91d5cebbde2e854a73a9a7633725350df1418387 (diff)
uibase: consistently use "" and <> in include directives
Change-Id: Ib6888045cecb4bd7b3498534605d790324f1b40a Reviewed-on: https://gerrit.libreoffice.org/43265 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/source/uibase/app')
-rw-r--r--sw/source/uibase/app/appenv.cxx6
-rw-r--r--sw/source/uibase/app/appenv.hxx5
-rw-r--r--sw/source/uibase/app/apphdl.cxx2
-rw-r--r--sw/source/uibase/app/applab.cxx4
-rw-r--r--sw/source/uibase/app/appopt.cxx2
-rw-r--r--sw/source/uibase/app/docsh2.cxx4
-rw-r--r--sw/source/uibase/app/docst.cxx44
-rw-r--r--sw/source/uibase/app/mainwn.cxx2
-rw-r--r--sw/source/uibase/app/swdll.cxx2
-rw-r--r--sw/source/uibase/app/swmodul1.cxx4
-rw-r--r--sw/source/uibase/app/swmodule.cxx2
11 files changed, 41 insertions, 36 deletions
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;