[Libreoffice-commits] core.git: vcl/generic vcl/headless vcl/inc vcl/Library_vcl.mk vcl/unx
Chris Sherlock
chris.sherlock79 at gmail.com
Sun Jan 10 22:05:20 PST 2016
vcl/Library_vcl.mk | 18
vcl/generic/print/bitmap_gfx.cxx | 690 --------------
vcl/generic/print/common_gfx.cxx | 1235 --------------------------
vcl/generic/print/genprnpsp.cxx | 1367 -----------------------------
vcl/generic/print/genpspgraphics.cxx | 1382 ------------------------------
vcl/generic/print/glyphset.cxx | 847 ------------------
vcl/generic/print/glyphset.hxx | 125 --
vcl/generic/print/printerjob.cxx | 1016 ----------------------
vcl/generic/print/prtsetup.cxx | 530 -----------
vcl/generic/print/prtsetup.hxx | 135 --
vcl/generic/print/psheader.ps | 363 -------
vcl/generic/print/psputil.cxx | 249 -----
vcl/generic/print/psputil.hxx | 70 -
vcl/generic/print/text_gfx.cxx | 728 ---------------
vcl/headless/svpprn.cxx | 2
vcl/inc/generic/geninst.h | 2
vcl/inc/generic/genprn.h | 96 --
vcl/inc/generic/genpspgraphics.h | 221 ----
vcl/inc/generic/printergfx.hxx | 399 --------
vcl/inc/generic/printerjob.hxx | 130 --
vcl/inc/headless/svpinst.hxx | 2
vcl/inc/headless/svpprn.hxx | 6
vcl/inc/unx/genprn.h | 96 ++
vcl/inc/unx/genpspgraphics.h | 221 ++++
vcl/inc/unx/gtk/gtkprn.hxx | 2
vcl/inc/unx/printergfx.hxx | 399 ++++++++
vcl/inc/unx/printerjob.hxx | 130 ++
vcl/unx/generic/app/salinst.cxx | 4
vcl/unx/generic/fontmanager/fontsubst.cxx | 4
vcl/unx/generic/gdi/cairotextrender.cxx | 4
vcl/unx/generic/gdi/salgdi.cxx | 2
vcl/unx/generic/gdi/salgdi2.cxx | 2
vcl/unx/generic/gdi/salgdi3.cxx | 4
vcl/unx/generic/print/bitmap_gfx.cxx | 690 ++++++++++++++
vcl/unx/generic/print/common_gfx.cxx | 1235 ++++++++++++++++++++++++++
vcl/unx/generic/print/genprnpsp.cxx | 1367 +++++++++++++++++++++++++++++
vcl/unx/generic/print/genpspgraphics.cxx | 1382 ++++++++++++++++++++++++++++++
vcl/unx/generic/print/glyphset.cxx | 847 ++++++++++++++++++
vcl/unx/generic/print/glyphset.hxx | 125 ++
vcl/unx/generic/print/printerjob.cxx | 1016 ++++++++++++++++++++++
vcl/unx/generic/print/prtsetup.cxx | 530 +++++++++++
vcl/unx/generic/print/prtsetup.hxx | 135 ++
vcl/unx/generic/print/psheader.ps | 363 +++++++
vcl/unx/generic/print/psputil.cxx | 249 +++++
vcl/unx/generic/print/psputil.hxx | 70 +
vcl/unx/generic/print/text_gfx.cxx | 728 +++++++++++++++
vcl/unx/generic/window/salframe.cxx | 2
vcl/unx/gtk/gtkinst.cxx | 2
vcl/unx/gtk/gtksalframe.cxx | 2
vcl/unx/gtk3/gtk3gtkframe.cxx | 2
50 files changed, 9613 insertions(+), 9613 deletions(-)
New commits:
commit 22d5d2ca7dde6164bd1e0fa9b3493870995375c5
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Mon Jan 11 15:03:01 2016 +1100
vcl: move vcl/generic/print files to vcl/unx/generic/print
These source files as all specific to Unix environments (not, however,
OS X) and are not "generic" (i.e. used across all platforms).
Change-Id: I6008a272c4b961a12702e2ef8727c56df9e80164
Reviewed-on: https://gerrit.libreoffice.org/21334
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79 at gmail.com>
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 65ad25d..5556cf9 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -545,15 +545,6 @@ vcl_really_generic_code= \
vcl_generic_code= \
$(vcl_really_generic_code) \
vcl/generic/app/gendisp \
- vcl/generic/print/bitmap_gfx \
- vcl/generic/print/common_gfx \
- vcl/generic/print/glyphset \
- vcl/generic/print/printerjob \
- vcl/generic/print/psputil \
- vcl/generic/print/genpspgraphics \
- vcl/generic/print/genprnpsp \
- vcl/generic/print/prtsetup \
- vcl/generic/print/text_gfx \
vcl_headless_code= \
vcl/headless/svpbmp \
@@ -580,6 +571,15 @@ vcl_headless_freetype_code=\
vcl/unx/generic/fontmanager/helper \
vcl/unx/generic/fontmanager/parseAFM \
vcl/headless/svpcairotextrender \
+ vcl/unx/generic/print/bitmap_gfx \
+ vcl/unx/generic/print/common_gfx \
+ vcl/unx/generic/print/glyphset \
+ vcl/unx/generic/print/printerjob \
+ vcl/unx/generic/print/psputil \
+ vcl/unx/generic/print/genpspgraphics \
+ vcl/unx/generic/print/genprnpsp \
+ vcl/unx/generic/print/prtsetup \
+ vcl/unx/generic/print/text_gfx \
ifeq ($(USING_X11),TRUE)
$(eval $(call gb_Library_add_exception_objects,vcl,\
diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx
index 8941303..422da1c 100644
--- a/vcl/headless/svpprn.cxx
+++ b/vcl/headless/svpprn.cxx
@@ -26,7 +26,7 @@
#include "salptype.hxx"
#include "saldatabasic.hxx"
-#include "generic/genpspgraphics.h"
+#include "unx/genpspgraphics.h"
#include "headless/svpprn.hxx"
#include "headless/svpinst.hxx"
diff --git a/vcl/inc/generic/geninst.h b/vcl/inc/generic/geninst.h
index 5e7e61e..cda664a 100644
--- a/vcl/inc/generic/geninst.h
+++ b/vcl/inc/generic/geninst.h
@@ -26,7 +26,7 @@
#include <vclpluginapi.h>
#include <salinst.hxx>
#include <saldatabasic.hxx>
-#include <generic/genprn.h>
+#include "unx/genprn.h"
class VCL_DLLPUBLIC SalYieldMutexReleaser
{
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 2d2716e..97fa2f8 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -26,7 +26,7 @@
#include <salwtype.hxx>
#include <saltimer.hxx>
#include <generic/geninst.h>
-#include <generic/genprn.h>
+#include <unx/genprn.h>
#include <basebmp/scanlineformats.hxx>
#include <list>
diff --git a/vcl/inc/headless/svpprn.hxx b/vcl/inc/headless/svpprn.hxx
index 54280f6..61487e7 100644
--- a/vcl/inc/headless/svpprn.hxx
+++ b/vcl/inc/headless/svpprn.hxx
@@ -21,9 +21,9 @@
#define INCLUDED_VCL_INC_HEADLESS_SVPPRN_HXX
#include "vcl/jobdata.hxx"
-#include "generic/printergfx.hxx"
-#include "generic/printerjob.hxx"
-#include "generic/genprn.h"
+#include "unx/printergfx.hxx"
+#include "unx/printerjob.hxx"
+#include "unx/genprn.h"
#include "vclpluginapi.h"
diff --git a/vcl/inc/generic/genprn.h b/vcl/inc/unx/genprn.h
similarity index 98%
rename from vcl/inc/generic/genprn.h
rename to vcl/inc/unx/genprn.h
index 5914784..5fee250 100644
--- a/vcl/inc/generic/genprn.h
+++ b/vcl/inc/unx/genprn.h
@@ -21,8 +21,8 @@
#define INCLUDED_VCL_INC_GENERIC_GENPRN_H
#include "vcl/jobdata.hxx"
-#include "generic/printergfx.hxx"
-#include "generic/printerjob.hxx"
+#include "unx/printergfx.hxx"
+#include "unx/printerjob.hxx"
#include "salprn.hxx"
#include "vclpluginapi.h"
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h
similarity index 100%
rename from vcl/inc/generic/genpspgraphics.h
rename to vcl/inc/unx/genpspgraphics.h
diff --git a/vcl/inc/unx/gtk/gtkprn.hxx b/vcl/inc/unx/gtk/gtkprn.hxx
index 910ddcb..e7da3c7 100644
--- a/vcl/inc/unx/gtk/gtkprn.hxx
+++ b/vcl/inc/unx/gtk/gtkprn.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKPRN_HXX
#define INCLUDED_VCL_INC_UNX_GTK_GTKPRN_HXX
-#include "generic/genprn.h"
+#include "unx/genprn.h"
#include <memory>
diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/unx/printergfx.hxx
similarity index 100%
rename from vcl/inc/generic/printergfx.hxx
rename to vcl/inc/unx/printergfx.hxx
diff --git a/vcl/inc/generic/printerjob.hxx b/vcl/inc/unx/printerjob.hxx
similarity index 100%
rename from vcl/inc/generic/printerjob.hxx
rename to vcl/inc/unx/printerjob.hxx
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index af3f95c..697e16f 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -27,9 +27,9 @@
#include "unx/saldata.hxx"
#include "unx/saldisp.hxx"
#include "generic/geninst.h"
-#include "generic/genpspgraphics.h"
+#include "unx/genpspgraphics.h"
#include "unx/salframe.h"
-#include "generic/genprn.h"
+#include "unx/genprn.h"
#include "unx/sm.hxx"
#include "vcl/apptypes.hxx"
diff --git a/vcl/unx/generic/fontmanager/fontsubst.cxx b/vcl/unx/generic/fontmanager/fontsubst.cxx
index f8894450..c78ec9b 100644
--- a/vcl/unx/generic/fontmanager/fontsubst.cxx
+++ b/vcl/unx/generic/fontmanager/fontsubst.cxx
@@ -18,13 +18,13 @@
*/
#include "generic/geninst.h"
-#include "generic/genpspgraphics.h"
+#include "unx/genpspgraphics.h"
#include "unx/glyphcache.hxx"
#include "vcl/sysdata.hxx"
#include "fontinstance.hxx"
-#include "generic/printergfx.hxx"
+#include "unx/printergfx.hxx"
#include "salbmp.hxx"
#include "impfont.hxx"
#include "outdev.h"
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index 5e39d0e..b48b0ca 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -25,8 +25,8 @@
#include <vcl/svapp.hxx>
#include <vcl/fontcharmap.hxx>
-#include "generic/printergfx.hxx"
-#include "generic/genpspgraphics.h"
+#include "unx/printergfx.hxx"
+#include "unx/genpspgraphics.h"
#include "generic/geninst.h"
#include "unx/glyphcache.hxx"
#include "PhysicalFontFace.hxx"
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 650bd83..fc8554b 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -60,7 +60,7 @@
#include "x11cairotextrender.hxx"
#include "openglx11cairotextrender.hxx"
-#include "generic/printergfx.hxx"
+#include "unx/printergfx.hxx"
#include "xrender_peer.hxx"
#include "cairo_cairo.hxx"
#include "cairo_xlib_cairo.hxx"
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 629cf88..456d146 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -34,7 +34,7 @@
#include <unx/x11/xlimits.hxx>
#include "xrender_peer.hxx"
-#include "generic/printergfx.hxx"
+#include "unx/printergfx.hxx"
#include "vcl/bmpacc.hxx"
#include <outdata.hxx>
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 9a45d11..5112546 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -45,8 +45,8 @@
#include "fontmanager.hxx"
#include "impfont.hxx"
#include "gcach_xpeer.hxx"
-#include "generic/genpspgraphics.h"
-#include "generic/printergfx.hxx"
+#include "unx/genpspgraphics.h"
+#include "unx/printergfx.hxx"
#include "outdev.h"
#include "PhysicalFontCollection.hxx"
#include "PhysicalFontFace.hxx"
diff --git a/vcl/generic/print/bitmap_gfx.cxx b/vcl/unx/generic/print/bitmap_gfx.cxx
similarity index 99%
rename from vcl/generic/print/bitmap_gfx.cxx
rename to vcl/unx/generic/print/bitmap_gfx.cxx
index 3baff51..47c48da 100644
--- a/vcl/generic/print/bitmap_gfx.cxx
+++ b/vcl/unx/generic/print/bitmap_gfx.cxx
@@ -19,7 +19,7 @@
#include "psputil.hxx"
-#include "generic/printergfx.hxx"
+#include "unx/printergfx.hxx"
#include "vcl/strhelper.hxx"
namespace psp {
diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/unx/generic/print/common_gfx.cxx
similarity index 99%
rename from vcl/generic/print/common_gfx.cxx
rename to vcl/unx/generic/print/common_gfx.cxx
index cc9724c..3034e3e 100644
--- a/vcl/generic/print/common_gfx.cxx
+++ b/vcl/unx/generic/print/common_gfx.cxx
@@ -24,8 +24,8 @@
#include "psputil.hxx"
#include "glyphset.hxx"
-#include "generic/printergfx.hxx"
-#include "generic/printerjob.hxx"
+#include "unx/printergfx.hxx"
+#include "unx/printerjob.hxx"
#include "fontmanager.hxx"
#include "vcl/strhelper.hxx"
#include "vcl/printerinfomanager.hxx"
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
similarity index 99%
rename from vcl/generic/print/genprnpsp.cxx
rename to vcl/unx/generic/print/genprnpsp.cxx
index 36e3538..5a961ba 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -51,9 +51,9 @@
#include "vcl/settings.hxx"
#include "svids.hrc"
#include "saldatabasic.hxx"
-#include "generic/genprn.h"
+#include "unx/genprn.h"
#include "generic/geninst.h"
-#include "generic/genpspgraphics.h"
+#include "unx/genpspgraphics.h"
#include "jobset.h"
#include "print.h"
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
similarity index 99%
rename from vcl/generic/print/genpspgraphics.cxx
rename to vcl/unx/generic/print/genpspgraphics.cxx
index d3cc75c..80f4fa4 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -45,9 +45,9 @@
#include "fontsubset.hxx"
#include "generic/geninst.h"
-#include "generic/genpspgraphics.h"
+#include "unx/genpspgraphics.h"
#include "unx/glyphcache.hxx"
-#include "generic/printergfx.hxx"
+#include "unx/printergfx.hxx"
#include "impfont.hxx"
#include "langboost.hxx"
#include "fontinstance.hxx"
diff --git a/vcl/generic/print/glyphset.cxx b/vcl/unx/generic/print/glyphset.cxx
similarity index 99%
rename from vcl/generic/print/glyphset.cxx
rename to vcl/unx/generic/print/glyphset.cxx
index b004a5e..7bd8e03 100644
--- a/vcl/generic/print/glyphset.cxx
+++ b/vcl/unx/generic/print/glyphset.cxx
@@ -22,7 +22,7 @@
#include "sft.hxx"
-#include "generic/printergfx.hxx"
+#include "unx/printergfx.hxx"
#include "fontsubset.hxx"
#include "fontmanager.hxx"
diff --git a/vcl/generic/print/glyphset.hxx b/vcl/unx/generic/print/glyphset.hxx
similarity index 100%
rename from vcl/generic/print/glyphset.hxx
rename to vcl/unx/generic/print/glyphset.hxx
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/unx/generic/print/printerjob.cxx
similarity index 99%
rename from vcl/generic/print/printerjob.cxx
rename to vcl/unx/generic/print/printerjob.cxx
index b446c1b..746ceed 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/unx/generic/print/printerjob.cxx
@@ -26,8 +26,8 @@
#include "psputil.hxx"
#include "glyphset.hxx"
-#include "generic/printerjob.hxx"
-#include "generic/printergfx.hxx"
+#include "unx/printerjob.hxx"
+#include "unx/printergfx.hxx"
#include "vcl/ppdparser.hxx"
#include "vcl/strhelper.hxx"
#include "vcl/printerinfomanager.hxx"
diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/unx/generic/print/prtsetup.cxx
similarity index 100%
rename from vcl/generic/print/prtsetup.cxx
rename to vcl/unx/generic/print/prtsetup.cxx
diff --git a/vcl/generic/print/prtsetup.hxx b/vcl/unx/generic/print/prtsetup.hxx
similarity index 100%
rename from vcl/generic/print/prtsetup.hxx
rename to vcl/unx/generic/print/prtsetup.hxx
diff --git a/vcl/generic/print/psheader.ps b/vcl/unx/generic/print/psheader.ps
similarity index 100%
rename from vcl/generic/print/psheader.ps
rename to vcl/unx/generic/print/psheader.ps
diff --git a/vcl/generic/print/psputil.cxx b/vcl/unx/generic/print/psputil.cxx
similarity index 100%
rename from vcl/generic/print/psputil.cxx
rename to vcl/unx/generic/print/psputil.cxx
diff --git a/vcl/generic/print/psputil.hxx b/vcl/unx/generic/print/psputil.hxx
similarity index 100%
rename from vcl/generic/print/psputil.hxx
rename to vcl/unx/generic/print/psputil.hxx
diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/unx/generic/print/text_gfx.cxx
similarity index 99%
rename from vcl/generic/print/text_gfx.cxx
rename to vcl/unx/generic/print/text_gfx.cxx
index 3bf390d..f5b1e7e 100644
--- a/vcl/generic/print/text_gfx.cxx
+++ b/vcl/unx/generic/print/text_gfx.cxx
@@ -22,7 +22,7 @@
#include "psputil.hxx"
#include "glyphset.hxx"
-#include "generic/printergfx.hxx"
+#include "unx/printergfx.hxx"
#include "fontmanager.hxx"
#include "vcl/helper.hxx"
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index d7eb98d..d88a7f9 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -50,7 +50,7 @@
#include "unx/salframe.h"
#include "unx/sm.hxx"
#include "unx/wmadaptor.hxx"
-#include "generic/genprn.h"
+#include "unx/genprn.h"
#include "unx/salbmp.h"
#include "unx/i18n_ic.hxx"
#include "unx/i18n_keysym.hxx"
diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx
index 7ae75c4..99679ae 100644
--- a/vcl/unx/gtk/gtkinst.cxx
+++ b/vcl/unx/gtk/gtkinst.cxx
@@ -32,7 +32,7 @@
#include <headless/svpvd.hxx>
#include <headless/svpbmp.hxx>
#include <vcl/apptypes.hxx>
-#include <generic/genpspgraphics.h>
+#include <unx/genpspgraphics.h>
#include <rtl/strbuf.hxx>
#include <rtl/uri.hxx>
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 29d5bca..d49dafa 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -27,7 +27,7 @@
#include <unx/wmadaptor.hxx>
#include <unx/sm.hxx>
#include <unx/salbmp.h>
-#include <generic/genprn.h>
+#include <unx/genprn.h>
#include <generic/geninst.h>
#include <headless/svpgdi.hxx>
#include <osl/file.hxx>
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index fea19c9..71a7b3d 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -27,7 +27,7 @@
#include <unx/wmadaptor.hxx>
#include <unx/sm.hxx>
#include <unx/salbmp.h>
-#include <generic/genprn.h>
+#include <unx/genprn.h>
#include <generic/geninst.h>
#include <headless/svpgdi.hxx>
#include <osl/file.hxx>
More information about the Libreoffice-commits
mailing list