diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-09-16 17:06:10 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-16 20:32:02 +0100 |
| commit | 902d4ded3b276ca3c0b4965bebede7c1efdc1a02 (patch) | |
| tree | bf9ba0b1663cd0f00bc96ff4d3f08e3b5d7c35ef | |
| parent | 2fbee32d3a384dc7035feb93cc216d20df7b4523 (diff) | |
drop annoying empty (slide) entry in inset->envelope->format
Change-Id: I87018c06e8aff15431a63ddf1d81299a233a7c0b
| -rw-r--r-- | sw/source/ui/envelp/envfmt.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 5cf9da61ab25..e6572340f1a3 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -178,14 +178,16 @@ SwEnvFmtPage::SwEnvFmtPage(Window* pParent, const SfxItemSet& rSet) { if (i != PAPER_USER) { - String aPaperName = SvxPaperInfo::GetName((Paper) i), - aEntryName; + OUString aPaperName = SvxPaperInfo::GetName((Paper) i); + + if (aPaperName.isEmpty()) + continue; sal_uInt16 nPos = 0; bool bFound = false; while (nPos < m_pSizeFormatBox->GetEntryCount() && !bFound) { - aEntryName = m_pSizeFormatBox->GetEntry(i); + OUString aEntryName = m_pSizeFormatBox->GetEntry(i); if (aEntryName < aPaperName) nPos++; else |