[Libreoffice-commits] core.git: sfx2/inc sfx2/source

[Adam Kasztenny]

 sfx2/inc/doc.hrc                            |  138 ++++++++++++++++++++++++++++
 sfx2/source/control/emojiview.cxx           |    2 
 sfx2/source/control/templatedefaultview.cxx |    2 
 sfx2/source/control/templatelocalview.cxx   |    2 
 sfx2/source/control/templatesearchview.cxx  |    2 
 sfx2/source/doc/doc.hrc                     |  138 ----------------------------
 6 files changed, 142 insertions(+), 142 deletions(-)

New commits:
commit 69d11029d6c72078381f33918574c5a0e043e217
Author: Adam Kasztenny <adamkasztenny at gmail.com>
Date:   Mon Dec 12 19:54:50 2016 -0500

    tdf#95416 Fix an include for sfx2
    
    This .hrc file was used in multiple places.
    
    Change-Id: I603c6d35da2e870d8586f081ccd2672065ade5db
    Reviewed-on: https://gerrit.libreoffice.org/31928
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sfx2/source/doc/doc.hrc b/sfx2/inc/doc.hrc
similarity index 100%
rename from sfx2/source/doc/doc.hrc
rename to sfx2/inc/doc.hrc
diff --git a/sfx2/source/control/emojiview.cxx b/sfx2/source/control/emojiview.cxx
index 6494002..36b185c 100644
--- a/sfx2/source/control/emojiview.cxx
+++ b/sfx2/source/control/emojiview.cxx
@@ -25,7 +25,7 @@
 #include <fstream>
 #include <streambuf>
 
-#include "../doc/doc.hrc"
+#include <doc.hrc>
 
 #include <vcl/builderfactory.hxx>
 using namespace ::com::sun::star;
diff --git a/sfx2/source/control/templatedefaultview.cxx b/sfx2/source/control/templatedefaultview.cxx
index 219c533..26d3f80 100644
--- a/sfx2/source/control/templatedefaultview.cxx
+++ b/sfx2/source/control/templatedefaultview.cxx
@@ -14,7 +14,7 @@
 #include <vcl/builderfactory.hxx>
 #include <sfx2/app.hxx>
 
-#include "../doc/doc.hrc"
+#include <doc.hrc>
 
 #define MNI_OPEN               1
 #define MNI_EDIT               2
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 6603a3c..9bb05809 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 
-#include "../doc/doc.hrc"
+#include <doc.hrc>
 #include "templateview.hrc"
 
 #define MNI_OPEN               1
diff --git a/sfx2/source/control/templatesearchview.cxx b/sfx2/source/control/templatesearchview.cxx
index 8403143..3b1a6fb 100644
--- a/sfx2/source/control/templatesearchview.cxx
+++ b/sfx2/source/control/templatesearchview.cxx
@@ -14,7 +14,7 @@
 #include <tools/urlobj.hxx>
 #include <vcl/layout.hxx>
 
-#include "../doc/doc.hrc"
+#include <doc.hrc>
 
 #include <vcl/builderfactory.hxx>