[Libreoffice-commits] core.git: include/vcl sw/source vcl/headless vcl/inc vcl/null vcl/unx

Sun Mar 27 20:41:00 UTC 2016

include/vcl/jobdata.hxx                  |   87 +++++++++++++
 include/vcl/printerinfomanager.hxx       |  205 +++++++++++++++++++++++++++++++
 sw/source/uibase/dbui/dbmgr.cxx          |    4 
 vcl/headless/svpprn.cxx                  |    2 
 vcl/inc/headless/svpprn.hxx              |    2 
 vcl/inc/unx/cupsmgr.hxx                  |    2 
 vcl/inc/unx/genprn.h                     |    2 
 vcl/inc/unx/jobdata.hxx                  |   87 -------------
 vcl/inc/unx/printerinfomanager.hxx       |  205 -------------------------------
 vcl/inc/unx/printerjob.hxx               |    2 
 vcl/null/printerinfomanager.cxx          |    2 
 vcl/unx/generic/gdi/salgdi.cxx           |    2 
 vcl/unx/generic/plugadapt/salplug.cxx    |    2 
 vcl/unx/generic/print/common_gfx.cxx     |    2 
 vcl/unx/generic/print/genprnpsp.cxx      |    2 
 vcl/unx/generic/print/genpspgraphics.cxx |    4 
 vcl/unx/generic/print/printerjob.cxx     |    2 
 vcl/unx/generic/print/prtsetup.hxx       |    2 
 vcl/unx/generic/printer/jobdata.cxx      |    4 
 vcl/unx/generic/window/salframe.cxx      |    2 
 20 files changed, 309 insertions(+), 313 deletions(-)

New commits:
commit 92a294678500852c343cfacd33da1ec5a7a40d4c
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Mar 27 22:39:22 2016 +0200

    Revert "vcl: two printing headers should be private Unix headers"
    
    This reverts commit 6b2889b3c4b2da175c4f95bde4495a1a89deedc3.
    It breaks several TBs
    eg:
    /Users/cloph/source/libo-core/sw/source/uibase/dbui/dbmgr.cxx:140:10: fatal error: 'config_cups.h' file not found
             ^

diff --git a/vcl/inc/unx/jobdata.hxx b/include/vcl/jobdata.hxx
similarity index 100%
rename from vcl/inc/unx/jobdata.hxx
rename to include/vcl/jobdata.hxx
diff --git a/vcl/inc/unx/printerinfomanager.hxx b/include/vcl/printerinfomanager.hxx
similarity index 99%
rename from vcl/inc/unx/printerinfomanager.hxx
rename to include/vcl/printerinfomanager.hxx
index 8e4b493..f548bf2 100644
--- a/vcl/inc/unx/printerinfomanager.hxx
+++ b/include/vcl/printerinfomanager.hxx
@@ -25,7 +25,7 @@
 
 #include <vcl/dllapi.h>
 #include <vcl/helper.hxx>
-#include "unx/jobdata.hxx"
+#include <vcl/jobdata.hxx>
 #include <osl/file.hxx>
 
 #include <cstdio>
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 2651704..75fa402 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -137,10 +137,6 @@
 #include <IDocumentState.hxx>
 
 #include <memory>
-#include <config_cups.h>
-#if ENABLE_CUPS && !defined(MACOSX)
-#include "unx/printerinfomanager.hxx"
-#endif
 #include <comphelper/propertysequence.hxx>
 #include <officecfg/Office/Common.hxx>
 
diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx
index 3cc3624..1d8557f 100644
--- a/vcl/headless/svpprn.cxx
+++ b/vcl/headless/svpprn.cxx
@@ -19,7 +19,7 @@
 
 #include <vcl/svapp.hxx>
 #include <vcl/timer.hxx>
-#include "unx/printerinfomanager.hxx"
+#include <vcl/printerinfomanager.hxx>
 
 #include "jobset.h"
 #include "print.h"
diff --git a/vcl/inc/headless/svpprn.hxx b/vcl/inc/headless/svpprn.hxx
index b23aec9..1c6d05d 100644
--- a/vcl/inc/headless/svpprn.hxx
+++ b/vcl/inc/headless/svpprn.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_HEADLESS_SVPPRN_HXX
 #define INCLUDED_VCL_INC_HEADLESS_SVPPRN_HXX
 
-#include "unx/jobdata.hxx"
+#include <vcl/jobdata.hxx>
 #include "unx/printergfx.hxx"
 #include "unx/printerjob.hxx"
 #include "unx/genprn.h"
diff --git a/vcl/inc/unx/cupsmgr.hxx b/vcl/inc/unx/cupsmgr.hxx
index 52c8a8a..576afd4 100644
--- a/vcl/inc/unx/cupsmgr.hxx
+++ b/vcl/inc/unx/cupsmgr.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_UNX_CUPSMGR_HXX
 #define INCLUDED_VCL_INC_UNX_CUPSMGR_HXX
 
-#include "unx/printerinfomanager.hxx"
+#include <vcl/printerinfomanager.hxx>
 #include "osl/module.h"
 #include "osl/thread.h"
 #include "osl/mutex.hxx"
diff --git a/vcl/inc/unx/genprn.h b/vcl/inc/unx/genprn.h
index c1f2990..94a4046 100644
--- a/vcl/inc/unx/genprn.h
+++ b/vcl/inc/unx/genprn.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_GENERIC_GENPRN_H
 #define INCLUDED_VCL_INC_GENERIC_GENPRN_H
 
-#include "unx/jobdata.hxx"
+#include <vcl/jobdata.hxx>
 #include "unx/printergfx.hxx"
 #include "unx/printerjob.hxx"
 #include "salprn.hxx"
diff --git a/vcl/inc/unx/printerjob.hxx b/vcl/inc/unx/printerjob.hxx
index 3bb214b..8f283cda 100644
--- a/vcl/inc/unx/printerjob.hxx
+++ b/vcl/inc/unx/printerjob.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_GENERIC_PRINTERJOB_HXX
 #define INCLUDED_VCL_INC_GENERIC_PRINTERJOB_HXX
 
-#include "unx/jobdata.hxx"
+#include <vcl/jobdata.hxx>
 #include "osl/file.hxx"
 #include "rtl/string.hxx"
 
diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx
index 4be5efb..e79701e 100644
--- a/vcl/null/printerinfomanager.cxx
+++ b/vcl/null/printerinfomanager.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "unx/printerinfomanager.hxx"
+#include <vcl/printerinfomanager.hxx>
 
 #include "unx/gendata.hxx"
 
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 3bc93f3..b470eff 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -41,7 +41,7 @@
 #include "basegfx/polygon/b2dpolypolygoncutter.hxx"
 #include "basegfx/polygon/b2dtrapezoid.hxx"
 
-#include "unx/jobdata.hxx"
+#include <vcl/jobdata.hxx>
 #include <vcl/virdev.hxx>
 
 #include "unx/salunx.h"
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index adb46eb..6852c06 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -28,7 +28,7 @@
 #include "unx/gendata.hxx"
 #include "headless/svpinst.hxx"
 #include "unx/desktops.hxx"
-#include "unx/printerinfomanager.hxx"
+#include <vcl/printerinfomanager.hxx>
 #include <config_vclplug.h>
 
 #include <cstdio>
diff --git a/vcl/unx/generic/print/common_gfx.cxx b/vcl/unx/generic/print/common_gfx.cxx
index 5a8df56..e8cfada 100644
--- a/vcl/unx/generic/print/common_gfx.cxx
+++ b/vcl/unx/generic/print/common_gfx.cxx
@@ -28,7 +28,7 @@
 #include "unx/printerjob.hxx"
 #include "unx/fontmanager.hxx"
 #include <vcl/strhelper.hxx>
-#include "unx/printerinfomanager.hxx"
+#include <vcl/printerinfomanager.hxx>
 
 #include "tools/debug.hxx"
 #include "tools/color.hxx"
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index 7deff32..45e3e16 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -47,7 +47,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/print.hxx>
 #include <vcl/pdfwriter.hxx>
-#include "unx/printerinfomanager.hxx"
+#include <vcl/printerinfomanager.hxx>
 #include <vcl/settings.hxx>
 #include "svids.hrc"
 #include "saldatabasic.hxx"
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index e1022a6..85b6f17 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -35,8 +35,8 @@
 #include <comphelper/string.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <vcl/bitmapaccess.hxx>
-#include "unx/jobdata.hxx"
-#include "unx/printerinfomanager.hxx"
+#include <vcl/jobdata.hxx>
+#include <vcl/printerinfomanager.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/sysdata.hxx>
diff --git a/vcl/unx/generic/print/printerjob.cxx b/vcl/unx/generic/print/printerjob.cxx
index 1e37dfc..9266c82 100644
--- a/vcl/unx/generic/print/printerjob.cxx
+++ b/vcl/unx/generic/print/printerjob.cxx
@@ -30,7 +30,7 @@
 #include "unx/printergfx.hxx"
 #include <vcl/ppdparser.hxx>
 #include <vcl/strhelper.hxx>
-#include "unx/printerinfomanager.hxx"
+#include <vcl/printerinfomanager.hxx>
 
 #include "rtl/ustring.hxx"
 #include "rtl/strbuf.hxx"
diff --git a/vcl/unx/generic/print/prtsetup.hxx b/vcl/unx/generic/print/prtsetup.hxx
index 2bbc513..3d02468 100644
--- a/vcl/unx/generic/print/prtsetup.hxx
+++ b/vcl/unx/generic/print/prtsetup.hxx
@@ -32,7 +32,7 @@
 #include <vcl/field.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/ppdparser.hxx>
-#include "unx/printerinfomanager.hxx"
+#include <vcl/printerinfomanager.hxx>
 
 class RTSPaperPage;
 class RTSDevicePage;
diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx
index b4e3e1a..aead34c 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -18,8 +18,8 @@
  */
 
 #include <officecfg/Office/Common.hxx>
-#include "unx/jobdata.hxx"
-#include "unx/printerinfomanager.hxx"
+#include <vcl/jobdata.hxx>
+#include <vcl/printerinfomanager.hxx>
 #include "tools/stream.hxx"
 
 #include <rtl/strbuf.hxx>
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 046cc89..a8e0cab 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -31,7 +31,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/keycodes.hxx>
 #include <vcl/layout.hxx>
-#include "unx/printerinfomanager.hxx"
+#include <vcl/printerinfomanager.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/opengl/OpenGLContext.hxx>
