revert header move of viewdata.hxx and viewutil.hxx

It is better to have two exceptions than making these UI files globally
available.

This effectively reverts commit a0f6374670f67646e802aef45d927a8746b2ae12

Change-Id: I0f7f1159058be0f5038fbffd7efb5c3a9da3f27c

4 files changed, 5 insertions, 5 deletions

diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index a2365bbb2ebe..ca777799cb95 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -85,8 +85,8 @@
 #include "externalrefmgr.hxx"
 #include "appoptio.hxx"
 #include "scmod.hxx"
-#include "viewdata.hxx"
-#include "viewutil.hxx"
+#include "../../ui/inc/viewdata.hxx"
+#include "../../ui/inc/viewutil.hxx"
 #include "tabprotection.hxx"
 #include "formulaparserpool.hxx"
 #include "clipparam.hxx"
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index e82e7a5e0ae7..d8a0f18d9b80 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -44,7 +44,7 @@
 #include "globstr.hrc"
 
 #include <../../ui/inc/docsh.hxx>
-#include "viewdata.hxx"
+#include <../../ui/inc/viewdata.hxx>
 #include <excdoc.hxx>
 
 #include <oox/token/tokens.hxx>
diff --git a/sc/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 1e765ec7a9ba..827057eccd9c 100644
--- a/sc/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -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 SC_INC_VIEWDATA_HXX
-#define SC_INC_VIEWDATA_HXX
+#ifndef INCLUDED_SC_SOURCE_UI_INC_VIEWDATA_HXX
+#define INCLUDED_SC_SOURCE_UI_INC_VIEWDATA_HXX
 
 #include <sfx2/zoomitem.hxx>
 #include "rangelst.hxx"
diff --git a/sc/inc/viewutil.hxx b/sc/source/ui/inc/viewutil.hxx
index af37b9620edb..af37b9620edb 100644
--- a/sc/inc/viewutil.hxx
+++ b/sc/source/ui/inc/viewutil.hxx