summaryrefslogtreecommitdiff
path: root/vcl/unx/headless
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/unx/headless')
-rw-r--r--vcl/unx/headless/makefile.mk66
-rw-r--r--vcl/unx/headless/svpbmp.hxx2
-rw-r--r--vcl/unx/headless/svpdummies.hxx7
-rw-r--r--vcl/unx/headless/svpframe.hxx2
-rw-r--r--vcl/unx/headless/svpgdi.cxx2
-rw-r--r--vcl/unx/headless/svpgdi.hxx5
-rw-r--r--vcl/unx/headless/svpinst.cxx12
-rw-r--r--vcl/unx/headless/svpinst.hxx6
-rw-r--r--vcl/unx/headless/svpprn.cxx15
-rw-r--r--vcl/unx/headless/svpprn.hxx10
-rw-r--r--vcl/unx/headless/svppspgraphics.cxx41
-rw-r--r--vcl/unx/headless/svppspgraphics.hxx5
-rw-r--r--vcl/unx/headless/svptext.cxx12
-rw-r--r--vcl/unx/headless/svpvd.hxx2
14 files changed, 65 insertions, 122 deletions
diff --git a/vcl/unx/headless/makefile.mk b/vcl/unx/headless/makefile.mk
deleted file mode 100644
index a32f02838080..000000000000
--- a/vcl/unx/headless/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-
-ENABLE_EXCEPTIONS=true
-
-PRJNAME=vcl
-TARGET=svpplug
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(listening)"!="" || "$(LISTENING)"!=""
-CDEFS+= -DWITH_SVP_LISTENING
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)" == "unx"
-
-SLOFILES=\
- $(SLO)$/svpinst.obj\
- $(SLO)$/svpdummies.obj\
- $(SLO)$/svpframe.obj\
- $(SLO)$/svpgdi.obj\
- $(SLO)$/svptext.obj\
- $(SLO)$/svpprn.obj\
- $(SLO)$/svppspgraphics.obj\
- $(SLO)$/svpvd.obj\
- $(SLO)$/svpbmp.obj\
- $(SLO)$/svpelement.obj
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
diff --git a/vcl/unx/headless/svpbmp.hxx b/vcl/unx/headless/svpbmp.hxx
index 695d7226b0f0..b3adb3b9951f 100644
--- a/vcl/unx/headless/svpbmp.hxx
+++ b/vcl/unx/headless/svpbmp.hxx
@@ -29,7 +29,7 @@
#ifndef SVP_SVBMP_HXX
#define SVP_SVBMP_HXX
-#include <vcl/salbmp.hxx>
+#include <salbmp.hxx>
#include "svpelement.hxx"
class SvpSalBitmap : public SalBitmap, public SvpElement
diff --git a/vcl/unx/headless/svpdummies.hxx b/vcl/unx/headless/svpdummies.hxx
index 86a9382adb96..bc46e9b22f70 100644
--- a/vcl/unx/headless/svpdummies.hxx
+++ b/vcl/unx/headless/svpdummies.hxx
@@ -28,10 +28,11 @@
#ifndef _SVP_SVPDUMMIES_HXX
-#include <vcl/salobj.hxx>
#include <vcl/sysdata.hxx>
-#include <vcl/salimestatus.hxx>
-#include <vcl/salsys.hxx>
+
+#include <salobj.hxx>
+#include <salimestatus.hxx>
+#include <salsys.hxx>
class SalGraphics;
diff --git a/vcl/unx/headless/svpframe.hxx b/vcl/unx/headless/svpframe.hxx
index be160626957a..e57381780f61 100644
--- a/vcl/unx/headless/svpframe.hxx
+++ b/vcl/unx/headless/svpframe.hxx
@@ -28,9 +28,9 @@
#ifndef _SVP_SVPFRAME_HXX
-#include <vcl/salframe.hxx>
#include <vcl/sysdata.hxx>
+#include <salframe.hxx>
#include "svpelement.hxx"
#include <list>
diff --git a/vcl/unx/headless/svpgdi.cxx b/vcl/unx/headless/svpgdi.cxx
index 8c9a4e42a65a..0a7041661d4e 100644
--- a/vcl/unx/headless/svpgdi.cxx
+++ b/vcl/unx/headless/svpgdi.cxx
@@ -30,7 +30,6 @@
#include "svpbmp.hxx"
#include <vcl/sysdata.hxx>
-#include <vcl/region.h>
#include <basegfx/range/b2drange.hxx>
#include <basegfx/range/b2irange.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
@@ -48,6 +47,7 @@
#endif
#include <svppspgraphics.hxx>
+#include <region.h>
using namespace basegfx;
using namespace basebmp;
diff --git a/vcl/unx/headless/svpgdi.hxx b/vcl/unx/headless/svpgdi.hxx
index 0489606e9fce..4b6bcb58c9b0 100644
--- a/vcl/unx/headless/svpgdi.hxx
+++ b/vcl/unx/headless/svpgdi.hxx
@@ -28,11 +28,12 @@
#ifndef _SVP_SVPGDI_HXX
-#include <vcl/salgdi.hxx>
-#include <vcl/sallayout.hxx>
#include <basebmp/bitmapdevice.hxx>
#include <basebmp/color.hxx>
+#include <salgdi.hxx>
+#include <sallayout.hxx>
+
class ServerFont;
class SvpSalGraphics : public SalGraphics
diff --git a/vcl/unx/headless/svpinst.cxx b/vcl/unx/headless/svpinst.cxx
index f4fe1dbdc649..e563e95821f0 100644
--- a/vcl/unx/headless/svpinst.cxx
+++ b/vcl/unx/headless/svpinst.cxx
@@ -31,18 +31,20 @@
#include <sys/time.h>
#include <sys/poll.h>
+#include <sal/types.h>
+
+#include <vcl/apptypes.hxx>
+
#include "svpinst.hxx"
#include "svpframe.hxx"
#include "svpdummies.hxx"
#include "svpvd.hxx"
#include "svpbmp.hxx"
-#include <vcl/salframe.hxx>
-#include <vcl/svdata.hxx>
-#include <vcl/apptypes.hxx>
-#include <vcl/saldatabasic.hxx>
+#include <salframe.hxx>
+#include <svdata.hxx>
+#include <saldatabasic.hxx>
#include <vcl/solarmutex.hxx>
-#include <sal/types.h>
// plugin factory function
extern "C"
diff --git a/vcl/unx/headless/svpinst.hxx b/vcl/unx/headless/svpinst.hxx
index eaffc99978d6..6fcafe0c7f66 100644
--- a/vcl/unx/headless/svpinst.hxx
+++ b/vcl/unx/headless/svpinst.hxx
@@ -29,13 +29,13 @@
#ifndef _SVP_SALINST_HXX
#define _SVP_SALINST_HXX
-#include <vcl/salinst.hxx>
-#include <vcl/salwtype.hxx>
-#include <vcl/saltimer.hxx>
#include <vcl/solarmutex.hxx>
#include <osl/mutex.hxx>
#include <osl/thread.hxx>
+#include <salinst.hxx>
+#include <salwtype.hxx>
+#include <saltimer.hxx>
#include <list>
diff --git a/vcl/unx/headless/svpprn.cxx b/vcl/unx/headless/svpprn.cxx
index 35ca451e432c..6f30f2d38969 100644
--- a/vcl/unx/headless/svpprn.cxx
+++ b/vcl/unx/headless/svpprn.cxx
@@ -29,21 +29,22 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+
#include "vcl/svapp.hxx"
-#include "vcl/jobset.h"
-#include "vcl/print.h"
-#include "vcl/salptype.hxx"
#include "vcl/timer.hxx"
#include "vcl/printerinfomanager.hxx"
+#include "jobset.h"
+#include "print.h"
+#include "salptype.hxx"
+
#include "svpprn.hxx"
#include "svppspgraphics.hxx"
#include "svpinst.hxx"
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-
using namespace psp;
using ::rtl::OUString;
diff --git a/vcl/unx/headless/svpprn.hxx b/vcl/unx/headless/svpprn.hxx
index 3a143443a599..e4625bf70792 100644
--- a/vcl/unx/headless/svpprn.hxx
+++ b/vcl/unx/headless/svpprn.hxx
@@ -30,10 +30,12 @@
#define _SVP_SVPPRN_HXX
#include "vcl/jobdata.hxx"
-#include "vcl/printergfx.hxx"
-#include "vcl/printerjob.hxx"
-#include "vcl/salprn.hxx"
-#include "salprn.h"
+
+#include "printergfx.hxx"
+#include "printerjob.hxx"
+#include "salprn.hxx"
+
+#include "vclpluginapi.h"
class PspGraphics;
diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx
index 7200019db9d2..fb0228c4339e 100644
--- a/vcl/unx/headless/svppspgraphics.cxx
+++ b/vcl/unx/headless/svppspgraphics.cxx
@@ -29,33 +29,34 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#include "svppspgraphics.hxx"
-#include "svpbmp.hxx"
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include "basegfx/vector/b2ivector.hxx"
+#include "basegfx/point/b2ipoint.hxx"
+
+#include "basebmp/color.hxx"
#include "vcl/jobdata.hxx"
-#include "vcl/printergfx.hxx"
#include "vcl/printerinfomanager.hxx"
#include "vcl/bmpacc.hxx"
-#include "vcl/salbmp.hxx"
-#include "vcl/glyphcache.hxx"
-#include "vcl/impfont.hxx"
-#include "vcl/outfont.hxx"
-#include "vcl/fontsubset.hxx"
#include "vcl/svapp.hxx"
-#include "vcl/salprn.hxx"
#include "vcl/sysdata.hxx"
-#include "vcl/region.h"
-#include "basegfx/vector/b2ivector.hxx"
-#include "basegfx/point/b2ipoint.hxx"
-#include "basebmp/color.hxx"
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/types.h>
+#include "salprn.hxx"
+#include "salbmp.hxx"
+#include "glyphcache.hxx"
+#include "impfont.hxx"
+#include "outfont.hxx"
+#include "fontsubset.hxx"
+#include "printergfx.hxx"
+#include "svppspgraphics.hxx"
+#include "svpbmp.hxx"
+#include "region.h"
using namespace psp;
using namespace basebmp;
diff --git a/vcl/unx/headless/svppspgraphics.hxx b/vcl/unx/headless/svppspgraphics.hxx
index 78f36f85295e..1e6f1b1b1747 100644
--- a/vcl/unx/headless/svppspgraphics.hxx
+++ b/vcl/unx/headless/svppspgraphics.hxx
@@ -31,8 +31,9 @@
#include "vcl/fontmanager.hxx"
-#include "vcl/sallayout.hxx"
-#include "vcl/salgdi.hxx"
+
+#include "sallayout.hxx"
+#include "salgdi.hxx"
namespace psp { struct JobData; class PrinterGfx; }
diff --git a/vcl/unx/headless/svptext.cxx b/vcl/unx/headless/svptext.cxx
index 18e2f4af8c90..40351bc27d07 100644
--- a/vcl/unx/headless/svptext.cxx
+++ b/vcl/unx/headless/svptext.cxx
@@ -26,12 +26,10 @@
*
************************************************************************/
-#include "svpgdi.hxx"
-#include "svpbmp.hxx"
-
#include <basegfx/range/b2drange.hxx>
#include <basegfx/range/b2irange.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
+
#include <basebmp/scanlineformats.hxx>
#include <tools/debug.hxx>
@@ -40,10 +38,12 @@
#include <basebmp/debug.hxx>
#endif
-#include <vcl/outfont.hxx>
-#include <vcl/glyphcache.hxx>
-#include <vcl/impfont.hxx>
+#include <outfont.hxx>
+#include <glyphcache.hxx>
+#include <impfont.hxx>
+#include "svpgdi.hxx"
+#include "svpbmp.hxx"
#include "svppspgraphics.hxx"
using namespace basegfx;
diff --git a/vcl/unx/headless/svpvd.hxx b/vcl/unx/headless/svpvd.hxx
index c6dde57abd38..211cf36846f9 100644
--- a/vcl/unx/headless/svpvd.hxx
+++ b/vcl/unx/headless/svpvd.hxx
@@ -29,7 +29,7 @@
#ifndef _SVP_SVPVD_HXX
#define _SVP_SVPVD_HXX
-#include <vcl/salvd.hxx>
+#include <salvd.hxx>
#include "svpelement.hxx"
#include <list>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 03:18:46 +0000