diff options
| author | Philipp Lohmann <pl@openoffice.org> | 2001-08-27 08:42:36 +0000 |
|---|---|---|
| committer | Philipp Lohmann <pl@openoffice.org> | 2001-08-27 08:42:36 +0000 |
| commit | cc2f1d74cd3d5389e790dcf7862abd6be98ab7fd (patch) | |
| tree | 1bcde1c074a51f99ae82f6564806f1b7d6131ec4 /vcl/unx/inc | |
| parent | 7ff2550e83d7e48b1f70b44f9fc7e63416430eef (diff) | |
#90132# removed USE_PSPRINT and USE_XRENDER defines (now default)
Diffstat (limited to 'vcl/unx/inc')
| -rw-r--r-- | vcl/unx/inc/prex.h | 11 | ||||
| -rw-r--r-- | vcl/unx/inc/salgdi.h | 8 | ||||
| -rw-r--r-- | vcl/unx/inc/salprn.h | 6 |
3 files changed, 11 insertions, 14 deletions
diff --git a/vcl/unx/inc/prex.h b/vcl/unx/inc/prex.h index 406011b32c14..5f362b00e0b2 100644 --- a/vcl/unx/inc/prex.h +++ b/vcl/unx/inc/prex.h @@ -2,9 +2,9 @@ * * $RCSfile: prex.h,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obr $ $Date: 2001-02-01 16:04:03 $ + * last change: $Author: pl $ $Date: 2001-08-27 09:42:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,7 +62,7 @@ // // // (C) 1997 Star Division GmbH, Hamburg, Germany // // // -// $Revision: 1.6 $ $Author: obr $ $Date: 2001-02-01 16:04:03 $ // +// $Revision: 1.7 $ $Author: pl $ $Date: 2001-08-27 09:42:34 $ // // // // $Workfile: prex.h $ // // $Modtime: 08 Aug 1997 10:13:54 $ // @@ -134,10 +134,7 @@ extern "C" { #define __Ol_OlXlibExt_h__ -#if !defined(_USE_PRINT_EXTENSION_) && ! defined USE_PSPRINT - #include <salpdecl.h> - #include <salpmacr.h> -#elif ! defined USE_PSPRINT +#if defined(_USE_PRINT_EXTENSION_) #include <X11/X.h> #include <X11/Xlib.h> #include <X11/Xutil.h> diff --git a/vcl/unx/inc/salgdi.h b/vcl/unx/inc/salgdi.h index 65ffc7eeff73..bb3d73f8385a 100644 --- a/vcl/unx/inc/salgdi.h +++ b/vcl/unx/inc/salgdi.h @@ -2,9 +2,9 @@ * * $RCSfile: salgdi.h,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: hdu $ $Date: 2001-07-06 13:15:35 $ + * last change: $Author: pl $ $Date: 2001-08-27 09:42:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -93,7 +93,7 @@ class SalPrinter; class SalInfoPrinter; class ServerFont; -#ifdef USE_PSPRINT +#ifndef _USE_PRINT_EXTENSION_ namespace psp { struct JobData; class PrinterGfx; } #endif @@ -112,7 +112,7 @@ class SalGraphicsData STDAPI( SalGraphicsData ) -#ifdef USE_PSPRINT +#ifndef _USE_PRINT_EXTENSION_ ::psp::JobData* m_pJobData; ::psp::PrinterGfx* m_pPrinterGfx; String* m_pPhoneNr; diff --git a/vcl/unx/inc/salprn.h b/vcl/unx/inc/salprn.h index b0eba6f2136c..e8e7630dbc65 100644 --- a/vcl/unx/inc/salprn.h +++ b/vcl/unx/inc/salprn.h @@ -2,9 +2,9 @@ * * $RCSfile: salprn.h,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: pl $ $Date: 2001-06-21 16:34:47 $ + * last change: $Author: pl $ $Date: 2001-08-27 09:42:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,7 +62,7 @@ #ifndef _SV_SALPRN_H #define _SV_SALPRN_H -#ifdef USE_PSPRINT +#ifndef _USE_PRINT_EXTENSION_ #ifndef _PSPRINT_JOBDATA_HXX_ #include <psprint/jobdata.hxx> |