diff options
| author | Jian Fang Zhang <zhangjf@apache.org> | 2012-09-11 11:44:52 +0000 |
|---|---|---|
| committer | Xisco Fauli <anistenis@gmail.com> | 2013-06-06 01:52:19 +0200 |
| commit | 2dde2beff09b1e5ca25ddc4367c0508c4307aac7 (patch) | |
| tree | 87288593957530c38081c48f0d416a5a7b1dc77b /sw | |
| parent | cd1bbf0a2b9141c0d20f676503b5cc3dc2b00ee3 (diff) | |
Related #i120832#, the style and color set on table text by user...
should have higher priority than that from table style
Found by: Jinlong Wu,wujinlong@gmail.com
Patch by: bjcheny,companycy@gmail.com
Review by: zhangjf
(cherry picked from commit fe7e723a727f6def90ee80ef2964a40546b37a90)
Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
Change-Id: I3f4c96d49de40b21cc3da9bcb5e588a270434cd8
(cherry picked from commit 8943478b8d34216d3f2d64dfccd48d181d1a0f91)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/unocore/unotext.cxx | 12 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 14c11e4a401a..28178421a87e 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -2169,9 +2169,15 @@ lcl_ApplyCellProperties( xCellText->createTextCursor(); xCellCurs->gotoStart( sal_False ); xCellCurs->gotoEnd( sal_True ); - const uno::Reference< beans::XPropertySet > xCellTextProps( - xCellCurs, uno::UNO_QUERY); - xCellTextProps->setPropertyValue(rName, rValue); + const uno::Reference< beans::XPropertyState > + xCellTextPropState(xCellCurs, uno::UNO_QUERY); + const beans::PropertyState state = xCellTextPropState->getPropertyState(rName); + if (state == beans::PropertyState_DEFAULT_VALUE) + { + const uno::Reference< beans::XPropertySet > + xCellTextProps(xCellCurs, uno::UNO_QUERY); + xCellTextProps->setPropertyValue(rName, rValue); + } } } } diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 0d9a6388d992..c33eec1de987 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -1396,8 +1396,8 @@ bool SwWW8ImplReader::SetShadow(SvxShadowItem& rShadow, const short *pSizeArray, : (pbrc[WW8_RIGHT].aBits2[ 1 ] & 0x20 ) ) && (pSizeArray && pSizeArray[WW8_RIGHT]) ); - if (bRet) - { + //if (bRet) + //{ rShadow.SetColor(Color(COL_BLACK)); short nVal = pSizeArray[WW8_RIGHT]; if (nVal < 0x10) @@ -1405,7 +1405,7 @@ bool SwWW8ImplReader::SetShadow(SvxShadowItem& rShadow, const short *pSizeArray, rShadow.SetWidth(nVal); rShadow.SetLocation(SVX_SHADOW_BOTTOMRIGHT); bRet = true; - } + //} return bRet; } |