diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-25 13:21:05 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-25 13:21:05 +0000 |
| commit | f237e5c8af662c46117e3268c20032ef2eb716b7 (patch) | |
| tree | e9d4f29fc20d1daaf6b354577b19f0e77d3144a1 /psprint | |
| parent | b8db0a1dd269330ca1a324061d6f562ee079ffc9 (diff) | |
INTEGRATION: CWS vcl89 (1.33.8); FILE MERGED
2008/05/07 19:06:47 pl 1.33.8.1: #i72327# support for system cups dir
Diffstat (limited to 'psprint')
| -rw-r--r-- | psprint/source/helper/helper.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/psprint/source/helper/helper.cxx b/psprint/source/helper/helper.cxx index 0df9a3400870..0c24b269f540 100644 --- a/psprint/source/helper/helper.cxx +++ b/psprint/source/helper/helper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: helper.cxx,v $ - * $Revision: 1.34 $ + * $Revision: 1.35 $ * * This file is part of OpenOffice.org. * @@ -37,6 +37,7 @@ #include <limits.h> #include "psprint/helper.hxx" +#include "psprint/ppdparser.hxx" #include "tools/string.hxx" #include "tools/urlobj.hxx" #include "osl/file.hxx" @@ -176,6 +177,13 @@ void psp::getPrinterPathList( std::list< OUString >& rPathList, const char* pSub rPathList.push_back( OStringToOUString( aDir, aEncoding ) ); } while( nIndex != -1 ); + #ifdef SYSTEM_PPD_DIR + if( pSubDir && rtl_str_compare( pSubDir, PRINTER_PPDDIR ) == 0 ) + { + rPathList.push_back( rtl::OStringToOUString( rtl::OString( SYSTEM_PPD_DIR ), RTL_TEXTENCODING_UTF8 ) ); + } + #endif + if( rPathList.empty() ) { // last resort: next to program file (mainly for setup) |