[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - vcl/inc vcl/unx

[Chris Sherlock]

 vcl/inc/unx/gtk/gtkprintwrapper.hxx |  126 ++++++++++++++++++++++++++++++++++++
 vcl/unx/gtk/gtkinst.cxx             |    2 
 vcl/unx/gtk/gtkprintwrapper.cxx     |    2 
 vcl/unx/gtk/gtkprintwrapper.hxx     |  126 ------------------------------------
 vcl/unx/gtk/salprn-gtk.cxx          |    2 
 5 files changed, 129 insertions(+), 129 deletions(-)

New commits:
commit 03d5a294f3e5eedb6e7eb3bbc2af6512df471d4d
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Mon Jan 25 19:51:27 2016 +1100

    vcl: gtkprintwrapper is a private gtk only header
    
    (cherry picked from commit ea60011a5aa36a8f13067b8acb152e927fddf621)
    
    Change-Id: I12d7b59c5e307403715865411993119ccbc291ec

diff --git a/vcl/unx/gtk/gtkprintwrapper.hxx b/vcl/inc/unx/gtk/gtkprintwrapper.hxx
similarity index 100%
rename from vcl/unx/gtk/gtkprintwrapper.hxx
rename to vcl/inc/unx/gtk/gtkprintwrapper.hxx
diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx
index f073635..6bb7bb8 100644
--- a/vcl/unx/gtk/gtkinst.cxx
+++ b/vcl/unx/gtk/gtkinst.cxx
@@ -42,7 +42,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "gtkprintwrapper.hxx"
+#include "unx/gtk/gtkprintwrapper.hxx"
 
 extern "C"
 {
diff --git a/vcl/unx/gtk/gtkprintwrapper.cxx b/vcl/unx/gtk/gtkprintwrapper.cxx
index e552042..b7f4668 100644
--- a/vcl/unx/gtk/gtkprintwrapper.cxx
+++ b/vcl/unx/gtk/gtkprintwrapper.cxx
@@ -11,7 +11,7 @@
 
 #include <rtl/ustring.hxx>
 
-#include "gtkprintwrapper.hxx"
+#include "unx/gtk/gtkprintwrapper.hxx"
 
 namespace vcl
 {
diff --git a/vcl/unx/gtk/salprn-gtk.cxx b/vcl/unx/gtk/salprn-gtk.cxx
index 7679494..b073272 100644
--- a/vcl/unx/gtk/salprn-gtk.cxx
+++ b/vcl/unx/gtk/salprn-gtk.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "gtkprintwrapper.hxx"
+#include "unx/gtk/gtkprintwrapper.hxx"
 
 #include "unx/gtk/gtkdata.hxx"
 #include "unx/gtk/gtkframe.hxx"