diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-05-24 11:02:33 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-05-24 11:02:33 +0000 |
| commit | b618f62a93fde760d35f2add89e7de9a7f9a767c (patch) | |
| tree | ba355bfbe960dcdf34561b8fea2dcb58b7aeda76 /psprint | |
| parent | 40114cc2501732cc5780b8b520e1059b1bf79dfc (diff) | |
INTEGRATION: CWS macosxcups (1.15.14); FILE MERGED
2006/05/13 18:17:42 obr 1.15.14.1: #i63376# Enabled CUPS printing code for MACOSX
Diffstat (limited to 'psprint')
| -rw-r--r-- | psprint/source/printer/cupsmgr.cxx | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/psprint/source/printer/cupsmgr.cxx b/psprint/source/printer/cupsmgr.cxx index f401e5be6839..def136022976 100644 --- a/psprint/source/printer/cupsmgr.cxx +++ b/psprint/source/printer/cupsmgr.cxx @@ -4,9 +4,9 @@ * * $RCSfile: cupsmgr.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: vg $ $Date: 2006-04-06 15:29:51 $ + * last change: $Author: vg $ $Date: 2006-05-24 12:02:33 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,7 +36,8 @@ #ifdef ENABLE_CUPS #include <cups/cups.h> #include <cups/ppd.h> -#else + +#else // !ENABLE_CUPS typedef void ppd_file_t; typedef void cups_dest_t; typedef void cups_option_t; @@ -52,6 +53,13 @@ typedef void cups_option_t; #include <algorithm> +// FIXME: SAL_MODULENAME_WITH_VERSION needs to be fixed on OS X +#ifdef MACOSX +#define CUPS_LIB_NAME "libcups.2.dylib" +#else +#define CUPS_LIB_NAME "libcups.so.2" +#endif + namespace psp { class CUPSWrapper @@ -153,11 +161,11 @@ CUPSWrapper::CUPSWrapper() m_bPPDThreadRunning( false ) { #ifdef ENABLE_CUPS - OUString aLib( RTL_CONSTASCII_USTRINGPARAM( "libcups.so.2" ) ); + OUString aLib( RTL_CONSTASCII_USTRINGPARAM( CUPS_LIB_NAME ) ); m_pLib = osl_loadModule( aLib.pData, SAL_LOADMODULE_LAZY ); if( ! m_pLib ) { - aLib = OUString( RTL_CONSTASCII_USTRINGPARAM( "libcups.so" ) ); + aLib = OUString( RTL_CONSTASCII_USTRINGPARAM( SAL_MODULENAME( "cups" ) ) ); m_pLib = osl_loadModule( aLib.pData, SAL_LOADMODULE_LAZY ); } #endif |