diff options
Diffstat (limited to 'sw/source/core')
| -rw-r--r-- | sw/source/core/unocore/unoframe.cxx | 13 | ||||
| -rw-r--r-- | sw/source/core/unocore/unomap.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/unocore/unoprnms.cxx | 3 |
3 files changed, 17 insertions, 3 deletions
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index ebf73ac348e1..60e66fcbfd26 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -385,8 +385,13 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI GetProperty(RES_BOX, CONVERT_TWIPS|TOP_BORDER_DISTANCE, pTopDistance); const ::uno::Any* pBottomDistance = 0; GetProperty(RES_BOX, CONVERT_TWIPS|BOTTOM_BORDER_DISTANCE, pBottomDistance); + const ::uno::Any* pLineStyle = 0; + GetProperty(RES_BOX, LINE_STYLE, pLineStyle); + const ::uno::Any* pLineWidth = 0; + GetProperty(RES_BOX, LINE_WIDTH, pLineWidth); if( pLeft || pRight || pTop || pBottom || pDistance || - pLeftDistance || pRightDistance || pTopDistance || pBottomDistance ) + pLeftDistance || pRightDistance || pTopDistance || pBottomDistance || + pLineStyle || pLineWidth ) { SvxBoxItem aBox ( static_cast < const :: SvxBoxItem & > ( rFromSet.Get ( RES_BOX ) ) ); if( pLeft ) @@ -407,6 +412,10 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI bRet &= ((SfxPoolItem&)aBox).PutValue(*pTopDistance, CONVERT_TWIPS|TOP_BORDER_DISTANCE); if( pBottomDistance ) bRet &= ((SfxPoolItem&)aBox).PutValue(*pBottomDistance, CONVERT_TWIPS|BOTTOM_BORDER_DISTANCE); + if( pLineStyle ) + bRet &= ((SfxPoolItem&)aBox).PutValue(*pLineStyle, LINE_STYLE); + if( pLineWidth ) + bRet &= ((SfxPoolItem&)aBox).PutValue(*pLineWidth, LINE_WIDTH|CONVERT_TWIPS); rToSet.Put(aBox); } { @@ -2386,7 +2395,7 @@ awt::Point SwXFrame::getPosition(void) throw( uno::RuntimeException ) throw aRuntime; } -void SwXFrame::setPosition(const awt::Point& /*aPosition*/) throw( uno::RuntimeException ) +void SwXFrame::setPosition(const awt::Point& aPosition) throw( uno::RuntimeException ) { SolarMutexGuard aGuard; uno::RuntimeException aRuntime; diff --git a/sw/source/core/unocore/unomap.cxx b/sw/source/core/unocore/unomap.cxx index 4e6a17c0a80e..ca85a1801751 100644 --- a/sw/source/core/unocore/unomap.cxx +++ b/sw/source/core/unocore/unomap.cxx @@ -350,7 +350,9 @@ SwUnoPropertyMapProvider::~SwUnoPropertyMapProvider() { SW_PROP_NMID(UNO_NAME_WRAP_INFLUENCE_ON_POSITION), RES_WRAP_INFLUENCE_ON_OBJPOS, CPPU_E2T(CPPUTYPE_INT8), PROPERTY_NONE, MID_WRAP_INFLUENCE}, \ { SW_PROP_NMID(UNO_NAME_TITLE), FN_UNO_TITLE, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0}, \ { SW_PROP_NMID(UNO_NAME_DESCRIPTION), FN_UNO_DESCRIPTION, CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_NONE, 0}, \ - { SW_PROP_NMID(UNO_NAME_LAYOUT_SIZE), WID_LAYOUT_SIZE, CPPU_E2T(CPPUTYPE_AWTSIZE), PropertyAttribute::MAYBEVOID | PropertyAttribute::READONLY, 0 }, + { SW_PROP_NMID(UNO_NAME_LAYOUT_SIZE), WID_LAYOUT_SIZE, CPPU_E2T(CPPUTYPE_AWTSIZE), PropertyAttribute::MAYBEVOID | PropertyAttribute::READONLY, 0 }, \ + { SW_PROP_NMID(UNO_NAME_LINE_STYLE), RES_BOX, CPPU_E2T(CPPUTYPE_LINESTYLE), 0, LINE_STYLE }, \ + { SW_PROP_NMID(UNO_NAME_LINE_WIDTH), RES_BOX, CPPU_E2T(CPPUTYPE_INT32), 0, LINE_WIDTH |CONVERT_TWIPS }, diff --git a/sw/source/core/unocore/unoprnms.cxx b/sw/source/core/unocore/unoprnms.cxx index 0c0479c8c797..a3f84d469b8c 100644 --- a/sw/source/core/unocore/unoprnms.cxx +++ b/sw/source/core/unocore/unoprnms.cxx @@ -784,6 +784,9 @@ const SwPropNameTab aPropNameTab = { /* 0745 UNO_NAME_RSID */ {MAP_CHAR_LEN("Rsid")}, /* 0746 UNO_NAME_PARRSID */ {MAP_CHAR_LEN("ParRsid")}, +/* 0747 UNO_NAME_LINE_STYLE */ {MAP_CHAR_LEN("LineStyle")}, +/* 0748 UNO_NAME_LINE_WIDTH */ {MAP_CHAR_LEN("LineWidth")}, + // new items in this array must match enum SwPropNameIds }; |