Kaydet (Commit) 277ab34a authored tarafından Caolán McNamara's avatar Caolán McNamara

condition is always true

üst 8fd03963
...@@ -1024,23 +1024,18 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem ...@@ -1024,23 +1024,18 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem
default: break; default: break;
} // switch } // switch
if (aEntry.bIsNum) aEntry.bCanNum = true; if (aEntry.bIsNum) aEntry.bCanNum = true;
bool bGetPres = true;
if (bGetPres) { rItem.GetPresentation(SFX_ITEM_PRESENTATION_NAMELESS,
rItem.GetPresentation(SFX_ITEM_PRESENTATION_NAMELESS, pPool->GetMetric(nWhich),
pPool->GetMetric(nWhich), SFX_MAPUNIT_MM, aEntry.aValue);
SFX_MAPUNIT_MM,aEntry.aValue); if (aEntry.bCanNum)
if (aEntry.bCanNum) { {
aEntry.aValue.InsertAscii(": ",0); aEntry.aValue.InsertAscii(": ",0);
aEntry.aValue.Insert(UniString::CreateFromInt32(aEntry.nVal),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);
} }
} else { }
else
{
aEntry.aValue = String("InvalidItem", aTextEncoding); aEntry.aValue = String("InvalidItem", aTextEncoding);
} }
ImpSetEntry(aEntry,nEntryNum); ImpSetEntry(aEntry,nEntryNum);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment