diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-17 21:08:00 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-18 13:03:20 +0100 |
| commit | 277ab34a566739a82babc544e5e35f0413ccd0dd (patch) | |
| tree | 7160f33b1a13af092d5bb22bf0a7f957977af61a /svx/source/svdraw/svdibrow.cxx | |
| parent | 8fd03963cdaa0ffd9a5fbe0f56d6e4c2700e7883 (diff) | |
condition is always true
Diffstat (limited to 'svx/source/svdraw/svdibrow.cxx')
| -rw-r--r-- | svx/source/svdraw/svdibrow.cxx | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index b21bc0bfe43a..f2dc1b956120 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -1024,23 +1024,18 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem default: break; } // switch if (aEntry.bIsNum) aEntry.bCanNum = true; - bool bGetPres = true; - if (bGetPres) { - rItem.GetPresentation(SFX_ITEM_PRESENTATION_NAMELESS, - pPool->GetMetric(nWhich), - SFX_MAPUNIT_MM,aEntry.aValue); - if (aEntry.bCanNum) { - aEntry.aValue.InsertAscii(": ",0); - aEntry.aValue.Insert(UniString::CreateFromInt32(aEntry.nVal),0); - } - } else { - if (aEntry.eItemType==ITEM_BOOL) aEntry.aValue.AppendAscii(aEntry.nVal!=0 ? "True" : "False"); - else if (aEntry.bCanNum) aEntry.aValue = UniString::CreateFromInt32(aEntry.nVal); - else if (aEntry.eItemType==ITEM_STRING) aEntry.aValue=((SfxStringItem&)rItem).GetValue(); - else if (aEntry.eItemType==ITEM_ENUM && nWhich!=EE_CHAR_WEIGHT) aEntry.aValue=((SfxEnumItemInterface&)rItem).GetValueTextByPos((sal_Bool)aEntry.nVal); - else aEntry.aValue = String("GPF", aTextEncoding); + + rItem.GetPresentation(SFX_ITEM_PRESENTATION_NAMELESS, + pPool->GetMetric(nWhich), + SFX_MAPUNIT_MM, aEntry.aValue); + if (aEntry.bCanNum) + { + aEntry.aValue.InsertAscii(": ",0); + aEntry.aValue.Insert(UniString::CreateFromInt32(aEntry.nVal),0); } - } else { + } + else + { aEntry.aValue = String("InvalidItem", aTextEncoding); } ImpSetEntry(aEntry,nEntryNum); |