sfx2/inc/app.hrc | 130 ++++++++++++++++++++++++++++++++++++
sfx2/source/appl/app.hrc | 130 ------------------------------------
sfx2/source/dialog/dinfdlg.cxx | 2
sfx2/source/dialog/securitypage.cxx | 2
sfx2/source/doc/guisaveas.cxx | 2
sfx2/source/doc/objmisc.cxx | 2
sfx2/source/doc/objserv.cxx | 2
sfx2/source/doc/objstor.cxx | 2
sfx2/source/view/viewfrm.cxx | 2
ucb/source/ucp/webdav/SerfUri.cxx | 2
10 files changed, 138 insertions(+), 138 deletions(-)
New commits:
commit befafd4f8d58f81ac9cb0e4ef8dfbda9373787f7
Author: Jeevan <suryama...@yahoo.in>
Date: Fri Mar 10 02:46:30 2017 +0530
tdf#95416 remove ../ in #include headers of sfx2 files
Change-Id: I5f3e1a8fe559500aec7ea9e38edaba42dff3f98b
Reviewed-on: https://gerrit.libreoffice.org/35028
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
diff --git a/sfx2/source/appl/app.hrc b/sfx2/inc/app.hrc
similarity index 98%
rename from sfx2/source/appl/app.hrc
rename to sfx2/inc/app.hrc
index 2510c46..760706f 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 07d0af8..0ae7a11 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 04a138a..181e548 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 8f08c35..237821b 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 da263b3..16d58bc 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 2ac1ccd..95048d1 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 0e8f04e..4f70a1d 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 818a519..008cd10 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 7aec24f..78cb6da 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
