Kaydet (Commit) 226e0abd authored tarafından Stephan Bergmann's avatar Stephan Bergmann

More fixes after SdrMetricItem changes

...like e0c2ea6b "Consistency around
SdrMetricItem in svx/sderitm.hxx," similar to recent
c3a9a954 "that's not right anyway, using the
Distance as a which-id."

Should all be found and fixed now with the removal of the unnecessary but
harmful default value from the two-argument SdrMetricItem ctor.

Change-Id: I6eaeb6633c9a350b18e02d476d2c8794a733cea8
üst fde82414
...@@ -32,7 +32,7 @@ class SVX_DLLPUBLIC SdrMetricItem: public SfxInt32Item { ...@@ -32,7 +32,7 @@ class SVX_DLLPUBLIC SdrMetricItem: public SfxInt32Item {
public: public:
TYPEINFO_OVERRIDE(); TYPEINFO_OVERRIDE();
SdrMetricItem(): SfxInt32Item() {} SdrMetricItem(): SfxInt32Item() {}
SdrMetricItem(sal_uInt16 nId, sal_Int32 nVal=0): SfxInt32Item(nId,nVal) {} SdrMetricItem(sal_uInt16 nId, sal_Int32 nVal): SfxInt32Item(nId,nVal) {}
SdrMetricItem(sal_uInt16 nId, SvStream& rIn): SfxInt32Item(nId,rIn) {} SdrMetricItem(sal_uInt16 nId, SvStream& rIn): SfxInt32Item(nId,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE;
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE;
......
...@@ -735,7 +735,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaRoundRectAction& rAct) ...@@ -735,7 +735,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaRoundRectAction& rAct)
long nRad=(rAct.GetHorzRound()+rAct.GetVertRound())/2; long nRad=(rAct.GetHorzRound()+rAct.GetVertRound())/2;
if (nRad!=0) { if (nRad!=0) {
SfxItemSet aSet(*mpLineAttr->GetPool(), SDRATTR_ECKENRADIUS, SDRATTR_ECKENRADIUS, 0, 0); SfxItemSet aSet(*mpLineAttr->GetPool(), SDRATTR_ECKENRADIUS, SDRATTR_ECKENRADIUS, 0, 0);
aSet.Put(SdrMetricItem(nRad)); aSet.Put(SdrMetricItem(SDRATTR_ECKENRADIUS, nRad));
pRect->SetMergedItemSet(aSet); pRect->SetMergedItemSet(aSet);
} }
InsertObj(pRect); InsertObj(pRect);
......
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