diff options
author | Michael Stahl <mstahl@redhat.com> | 2016-05-30 15:25:26 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2016-05-30 17:33:53 +0200 |
commit | 84fb4be390a7a09c27f3aa1f004c022f0cdc192a (patch) | |
tree | 569f66c35ad260da7ab21f20432c2458e02c445e /svx | |
parent | 4d23189aee9adeb87e749a21305f22a43fb3fb17 (diff) |
editeng: rename misleading SvxBoxItem::GetDistance()/SetDistance()
Change-Id: Iea61f2de2b907974bbb05c66abf6cdaeab87b8b2
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/svdraw/svdattr.cxx | 2 | ||||
-rw-r--r-- | svx/source/table/cell.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 5a0570c93832..65b1b124b49d 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -307,7 +307,7 @@ SdrItemPool::SdrItemPool( mppLocalPoolDefaults[ SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL - SDRATTR_START ] = new SdrCustomShapeReplacementURLItem; SvxBoxItem* pboxItem = new SvxBoxItem( SDRATTR_TABLE_BORDER ); - pboxItem->SetDistance( 100 ); + pboxItem->SetAllDistances( 100 ); mppLocalPoolDefaults[ SDRATTR_TABLE_BORDER - SDRATTR_START ] = pboxItem; SvxBoxInfoItem* pBoxInfoItem = new SvxBoxInfoItem( SDRATTR_TABLE_BORDER_INNER ); diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index f4d11deaeca4..fc270351059c 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -1046,7 +1046,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& aBoxInfo.SetLine(bSet ? &aLine : nullptr, SvxBoxInfoItemLine::VERT); aBoxInfo.SetValid(SvxBoxInfoItemValidFlags::VERT, pBorder->IsVerticalLineValid); - aBox.SetDistance(pBorder->Distance); //TODO + aBox.SetAllDistances(pBorder->Distance); //TODO aBoxInfo.SetValid(SvxBoxInfoItemValidFlags::DISTANCE, pBorder->IsDistanceValid); mpProperties->SetObjectItem(aBox); @@ -1162,7 +1162,7 @@ Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) throw(Unknow aTableBorder.IsHorizontalLineValid = rBoxInfoItem.IsValid(SvxBoxInfoItemValidFlags::HORI); aTableBorder.VerticalLine = SvxBoxItem::SvxLineToLine(rBoxInfoItem.GetVert(), false); aTableBorder.IsVerticalLineValid = rBoxInfoItem.IsValid(SvxBoxInfoItemValidFlags::VERT); - aTableBorder.Distance = rBox.GetDistance(); + aTableBorder.Distance = rBox.GetSmallestDistance(); aTableBorder.IsDistanceValid = rBoxInfoItem.IsValid(SvxBoxInfoItemValidFlags::DISTANCE); return Any( aTableBorder ); |