diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 08:47:32 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 08:47:32 +0000 |
| commit | b955a29ef8a458ba21335cc6e66384626f281ebe (patch) | |
| tree | 7b7a3e15d93132a690ae1de0917c89d8996fb92d /psprint | |
| parent | 084987b62021c347bf68a3b5685f0b59ef1a1435 (diff) | |
INTEGRATION: CWS vcl88 (1.47.8); FILE MERGED
2008/04/17 05:50:53 pl 1.47.8.3: RESYNC: (1.48-1.49); FILE MERGED
2008/04/10 12:59:08 pl 1.47.8.2: RESYNC: (1.47-1.48); FILE MERGED
2008/03/31 17:21:45 pl 1.47.8.1: #i86558# mute paperconf assertions on all platforms
Diffstat (limited to 'psprint')
| -rw-r--r-- | psprint/source/printer/printerinfomanager.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/psprint/source/printer/printerinfomanager.cxx b/psprint/source/printer/printerinfomanager.cxx index 45e0d3d2d446..41cddc6f4354 100644 --- a/psprint/source/printer/printerinfomanager.cxx +++ b/psprint/source/printer/printerinfomanager.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: printerinfomanager.cxx,v $ - * $Revision: 1.49 $ + * $Revision: 1.50 $ * * This file is part of OpenOffice.org. * @@ -159,13 +159,9 @@ void PrinterInfoManager::initSystemDefaultPaper() bool bSuccess = false; // try libpaper - #ifdef SOLARIS - // #i78617# workaround missing paperconf command; on e.g. Linux - // the 2>/dev/null works on the started shell also + + // #i78617# workaround missing paperconf command FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" ); - #else - FILE* pPipe = popen( "paperconf 2>/dev/null", "r" ); - #endif if( pPipe ) { char pBuffer[ 1024 ]; |