[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - include/svx svx/source

[Stephan Bergmann]

 include/svx/sdmetitm.hxx      |    2 +-
 svx/source/svdraw/svdfmtf.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit eef61f54285c718ea78da631ebdd2d806d153fea
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Nov 21 11:05:46 2014 +0100

    More fixes after SdrMetricItem changes
    
    ...like e0c2ea6bde31bd68e1794154b72fddcd40dda7f9 "Consistency around
    SdrMetricItem in svx/sderitm.hxx," similar to recent
    c3a9a9542b018f781ee12e6c8c943d4f19641afe "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
    (cherry picked from commit 226e0abd2c5ebd9fd591966b584d04e4ab5cd171)

diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx
index ece56a6..0e2766f 100644
--- a/include/svx/sdmetitm.hxx
+++ b/include/svx/sdmetitm.hxx
@@ -32,7 +32,7 @@ class SVX_DLLPUBLIC SdrMetricItem: public SfxInt32Item {
 public:
     TYPEINFO_OVERRIDE();
     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) {}
     virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE;
     virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE;
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index a457b22..12c19db 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -735,7 +735,7 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaRoundRectAction& rAct)
     long nRad=(rAct.GetHorzRound()+rAct.GetVertRound())/2;
     if (nRad!=0) {
         SfxItemSet aSet(*mpLineAttr->GetPool(), SDRATTR_ECKENRADIUS, SDRATTR_ECKENRADIUS, 0, 0);
-        aSet.Put(SdrMetricItem(nRad));
+        aSet.Put(SdrMetricItem(SDRATTR_ECKENRADIUS, nRad));
         pRect->SetMergedItemSet(aSet);
     }
     InsertObj(pRect);