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

Chris Sherlock chris.sherlock79 at gmail.com
Sun Mar 27 15:34:48 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, 313 insertions(+), 309 deletions(-)

New commits:
commit 6b2889b3c4b2da175c4f95bde4495a1a89deedc3
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date:   Mon Mar 28 02:29:30 2016 +1100

    vcl: two printing headers should be private Unix headers
    
    Change-Id: I17a8d361b6c24dd9c4853d82e788c48084133e69

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 75fa402..2651704 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -137,6 +137,10 @@
 #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 1d8557f..3cc3624 100644
--- a/vcl/headless/svpprn.cxx
+++ b/vcl/headless/svpprn.cxx
@@ -19,7 +19,7 @@
 
 #include <vcl/svapp.hxx>
 #include <vcl/timer.hxx>
-#include <vcl/printerinfomanager.hxx>
+#include "unx/printerinfomanager.hxx"
 
 #include "jobset.h"
 #include "print.h"
diff --git a/vcl/inc/headless/svpprn.hxx b/vcl/inc/headless/svpprn.hxx
index 1c6d05d..b23aec9 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 <vcl/jobdata.hxx>
+#include "unx/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 576afd4..52c8a8a 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 <vcl/printerinfomanager.hxx>
+#include "unx/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 94a4046..c1f2990 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 <vcl/jobdata.hxx>
+#include "unx/jobdata.hxx"
 #include "unx/printergfx.hxx"
 #include "unx/printerjob.hxx"
 #include "salprn.hxx"
diff --git a/include/vcl/jobdata.hxx b/vcl/inc/unx/jobdata.hxx
similarity index 100%
rename from include/vcl/jobdata.hxx
rename to vcl/inc/unx/jobdata.hxx
diff --git a/include/vcl/printerinfomanager.hxx b/vcl/inc/unx/printerinfomanager.hxx
similarity index 99%
rename from include/vcl/printerinfomanager.hxx
rename to vcl/inc/unx/printerinfomanager.hxx
index f548bf2..8e4b493 100644
--- a/include/vcl/printerinfomanager.hxx
+++ b/vcl/inc/unx/printerinfomanager.hxx
@@ -25,7 +25,7 @@
 
 #include <vcl/dllapi.h>
 #include <vcl/helper.hxx>
-#include <vcl/jobdata.hxx>
+#include "unx/jobdata.hxx"
 #include <osl/file.hxx>
 
 #include <cstdio>
diff --git a/vcl/inc/unx/printerjob.hxx b/vcl/inc/unx/printerjob.hxx
index 8f283cda..3bb214b 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 <vcl/jobdata.hxx>
+#include "unx/jobdata.hxx"
 #include "osl/file.hxx"
 #include "rtl/string.hxx"
 
diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx
index e79701e..4be5efb 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 <vcl/printerinfomanager.hxx>
+#include "unx/printerinfomanager.hxx"
 
 #include "unx/gendata.hxx"
 
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index b470eff..3bc93f3 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 <vcl/jobdata.hxx>
+#include "unx/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 6852c06..adb46eb 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 <vcl/printerinfomanager.hxx>
+#include "unx/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 e8cfada..5a8df56 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 <vcl/printerinfomanager.hxx>
+#include "unx/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 45e3e16..7deff32 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 <vcl/printerinfomanager.hxx>
+#include "unx/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 85b6f17..e1022a6 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 <vcl/jobdata.hxx>
-#include <vcl/printerinfomanager.hxx>
+#include "unx/jobdata.hxx"
+#include "unx/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 9266c82..1e37dfc 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 <vcl/printerinfomanager.hxx>
+#include "unx/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 3d02468..2bbc513 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 <vcl/printerinfomanager.hxx>
+#include "unx/printerinfomanager.hxx"
 
 class RTSPaperPage;
 class RTSDevicePage;
diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx
index aead34c..b4e3e1a 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 <vcl/jobdata.hxx>
-#include <vcl/printerinfomanager.hxx>
+#include "unx/jobdata.hxx"
+#include "unx/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 a8e0cab..046cc89 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 <vcl/printerinfomanager.hxx>
+#include "unx/printerinfomanager.hxx"
 #include <vcl/settings.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/opengl/OpenGLContext.hxx>

More information about the Libreoffice-commits mailing list