cui/source/tabpages/transfrm.cxx | 2 +- svx/source/svdraw/svdedtv1.cxx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
New commits: commit 8c1d1b66904cdd95e8eec746a81cf1c57ad0e85a Author: David Tardon <dtar...@redhat.com> Date: Wed Jun 19 14:23:44 2013 +0200 fdo#65870 fix changing shape height via dialog Change-Id: I7c61be2c3d368dfd3ea66427c77636f797a7e88a diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 196779b..85ea67d 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -1522,6 +1522,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,sal_True,&pPoolItem)) { nSizY=((const SfxUInt32Item*)pPoolItem)->GetValue(); bChgSiz=true; + bChgHgt=true; } if (bChgSiz) { eSizePoint=(RECT_POINT)((const SfxAllEnumItem&)rAttr.Get(SID_ATTR_TRANSFORM_SIZE_POINT)).GetValue(); commit 8fbb2ebc2155b03d1436d9100886318642d47714 Author: David Tardon <dtar...@redhat.com> Date: Wed Jun 19 14:26:41 2013 +0200 fix copypasta Change-Id: I7744acc8cf1e8b6cad05d22df43f3d5a5beaa2f6 diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index a20ea83..9cd709f 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -886,7 +886,7 @@ sal_Bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) nHeight = MetricField::ConvertDoubleValue( nHeight, maMtrHeight.GetBaseValue(), maMtrHeight.GetDecimalDigits(), meDlgUnit, FUNIT_100TH_MM ); long lHeight = long(nHeight * (double)aUIScale); lHeight = OutputDevice::LogicToLogic( lHeight, MAP_100TH_MM, (MapUnit)mePoolUnit ); - lHeight = static_cast<long>(maMtrWidth.Denormalize( lHeight )); + lHeight = static_cast<long>(maMtrHeight.Denormalize( lHeight )); // put Width & Height to itemset rOutAttrs.Put( SfxUInt32Item( GetWhich( SID_ATTR_TRANSFORM_WIDTH ), _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits