summaryrefslogtreecommitdiff
path: root/padmin
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-02-18 17:52:08 +0100
committerMichael Stahl <mstahl@redhat.com>2014-02-18 22:56:51 +0100
commit6058a238fceba2e856e0f52c0438a480cb7cb59f (patch)
tree0a78f978dc11480c755b1ca8e7ef52a72ea6fb7c /padmin
parent1970bf0466e93412a157b6849ec96245856743ac (diff)
padmin: fix assert on opening Properties of "Generic Printer"
The default printer is special and allowed to be entirely sitting on the PDF/PS fence. Change-Id: I32a18cd0e4ed4c338c0be30928bedf26888a99cd
Diffstat (limited to 'padmin')
-rw-r--r--padmin/source/prtsetup.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index 1b59ffc07a55..952a11bbdd25 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -354,7 +354,9 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent )
bool bAutoIsPDF = officecfg::Office::Common::Print::Option::Printer::PDFAsStandardPrintJobFormat::get();
- assert(nLevelEntryData != 0 || int(bAutoIsPDF) == m_pParent->m_aJobData.m_nPDFDevice);
+ assert(nLevelEntryData != 0
+ || "Generic Printer" == m_pParent->m_aJobData.m_aPrinterName
+ || int(bAutoIsPDF) == m_pParent->m_aJobData.m_nPDFDevice);
OUString sStr = m_pLevelBox->GetEntry(0);
m_pLevelBox->InsertEntry(sStr.replaceAll("%s", bAutoIsPDF ? m_pLevelBox->GetEntry(5) : m_pLevelBox->GetEntry(1)), 0);