summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeevan <suryamaddu@yahoo.in>2017-03-10 02:46:30 +0530
committerTor Lillqvist <tml@collabora.com>2017-03-13 18:54:37 +0000
commitbefafd4f8d58f81ac9cb0e4ef8dfbda9373787f7 (patch)
tree932cbc5ca237d96548dfa6d0c891ca4e85b1a37a
parentc0b4bd7409c86addc7971d7810176150c36fbf24 (diff)
tdf#95416 remove ../ in #include headers of sfx2 files
Change-Id: I5f3e1a8fe559500aec7ea9e38edaba42dff3f98b Reviewed-on: https://gerrit.libreoffice.org/35028 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
-rw-r--r--sfx2/inc/app.hrc (renamed from sfx2/source/appl/app.hrc)4
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx2
-rw-r--r--sfx2/source/dialog/securitypage.cxx2
-rw-r--r--sfx2/source/doc/guisaveas.cxx2
-rw-r--r--sfx2/source/doc/objmisc.cxx2
-rw-r--r--sfx2/source/doc/objserv.cxx2
-rw-r--r--sfx2/source/doc/objstor.cxx2
-rw-r--r--sfx2/source/view/viewfrm.cxx2
-rw-r--r--ucb/source/ucp/webdav/SerfUri.cxx2
9 files changed, 10 insertions, 10 deletions
diff --git a/sfx2/source/appl/app.hrc b/sfx2/inc/app.hrc
index 2510c46a6e09..760706fc92ea 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/inc/app.hrc
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SFX2_SOURCE_APPL_APP_HRC
-#define INCLUDED_SFX2_SOURCE_APPL_APP_HRC
+#ifndef INCLUDED_SFX2_INC_APP_HRC
+#define INCLUDED_SFX2_INC_APP_HRC
#include <sfx2/sfx.hrc>
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 07d0af89d038..0ae7a117b344 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -67,7 +67,7 @@
#include "documentfontsdialog.hxx"
#include <sfx2/sfx.hrc>
#include "dinfdlg.hrc"
-#include "../appl/app.hrc"
+#include "app.hrc"
#include "sfxlocal.hrc"
#include <dialog.hrc>
#include <vcl/help.hxx>
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index 04a138abed00..181e54872bbf 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -38,7 +38,7 @@
#include <svl/intitem.hxx>
#include <svl/PasswordHelper.hxx>
-#include "../appl/app.hrc"
+#include "app.hrc"
using namespace ::com::sun::star;
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 8f08c35ca2c1..237821beaee7 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -86,7 +86,7 @@
#include <rtl/ref.hxx>
#include <framework/interaction.hxx>
#include <svtools/sfxecode.hxx>
-#include "../appl/app.hrc"
+#include "app.hrc"
#include <memory>
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index da263b3c8fe6..16d58bcfbdb7 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -118,7 +118,7 @@
#include "doc.hrc"
#include "workwin.hxx"
#include "helpid.hrc"
-#include "../appl/app.hrc"
+#include "app.hrc"
#include <sfx2/sfxdlg.hxx>
#include "appbaslib.hxx"
#include <openflag.hxx>
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 2ac1ccd60289..95048d118856 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -91,7 +91,7 @@
#include <sfx2/objface.hxx>
#include <sfx2/checkin.hxx>
-#include "../appl/app.hrc"
+#include "app.hrc"
#include <com/sun/star/document/XDocumentSubStorageSupplier.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
#include <com/sun/star/util/XCloneable.hpp>
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 0e8f04e6a8fc..4f70a1db4068 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -129,7 +129,7 @@
#include "appdata.hxx"
#include <objstor.hxx>
-#include "../appl/app.hrc"
+#include "app.hrc"
using namespace ::com::sun::star;
using namespace ::com::sun::star::container;
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 818a519bde97..008cd1043ddf 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -135,7 +135,7 @@ using ::com::sun::star::container::XIndexContainer;
#include "workwin.hxx"
#include "helper.hxx"
#include <sfx2/minfitem.hxx>
-#include "../appl/app.hrc"
+#include "app.hrc"
#include "impviewframe.hxx"
#define SfxViewFrame
diff --git a/ucb/source/ucp/webdav/SerfUri.cxx b/ucb/source/ucp/webdav/SerfUri.cxx
index 7aec24f61bc0..78cb6da08284 100644
--- a/ucb/source/ucp/webdav/SerfUri.cxx
+++ b/ucb/source/ucp/webdav/SerfUri.cxx
@@ -25,7 +25,7 @@
#include "DAVException.hxx"
#include "AprEnv.hxx"
-#include "../inc/urihelper.hxx"
+#include "urihelper.hxx"
using namespace http_dav_ucp;