summaryrefslogtreecommitdiff
path: root/padmin/source/padialog.cxx
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2006-05-05 08:04:56 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2006-05-05 08:04:56 +0000
commit4f7b065479d4de408dddc9dc38e24408e78b95e4 (patch)
tree7f1c23afe4fea066464f18fe538f556d9ba6dc98 /padmin/source/padialog.cxx
parenta22f7e29b7472941ec8a326723b9bddf0badd1f2 (diff)
INTEGRATION: CWS vcl57 (1.18.28); FILE MERGED
2006/04/07 13:56:57 pl 1.18.28.1: #131024# protect against faulty printer
Diffstat (limited to 'padmin/source/padialog.cxx')
-rw-r--r--padmin/source/padialog.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index 112ca7c1fc09..84aa6f252025 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: padialog.cxx,v $
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: kz $ $Date: 2005-11-04 15:41:01 $
+ * last change: $Author: rt $ $Date: 2006-05-05 09:04:56 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -500,9 +500,11 @@ void PADialog::PrintTestPage()
aPrintText.appendAscii( ": " );
aPrintText.append( sPrinter );
aPrintText.appendAscii( "\n: " );
- aPrintText.append( pPrintParser->getPrinterName() );
+ if( pPrintParser )
+ aPrintText.append( pPrintParser->getPrinterName() );
aPrintText.appendAscii( "\n: " );
- INetURLObject aDriverPath( pPrintParser->getFilename(), INET_PROT_FILE, INetURLObject::ENCODE_ALL );
+ INetURLObject aDriverPath( pPrintParser ? pPrintParser->getFilename() : String( RTL_CONSTASCII_USTRINGPARAM( "<undef>" ) ),
+ INET_PROT_FILE, INetURLObject::ENCODE_ALL );
aPrintText.append( aDriverPath.GetName() );
aPrintText.appendAscii( "\n: " );
aPrintText.append( aInfo.m_aCommand );