svx/source/unodraw/unoshape.cxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
New commits: commit 0f8f92a5b6fcba1fef456539bb929819a9162a85 Author: Muthu Subramanian <[email protected]> Date: Fri Jun 15 17:20:20 2012 +0530 n757419: Hidden/Non-wrapping text. Negative values for left-margin plays havoc with the text in this case. diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 16af6ec..4c21d47 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -4299,11 +4299,18 @@ uno::Any SvxItemPropertySet_getPropertyValue( const SvxItemPropertySet& rPropSet void SvxItemPropertySet_setPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet ) { + uno::Any aVal(rVal); if(!pMap || !pMap->nWID) return; bool bDontConvertNegativeValues = ( pMap->nWID == XATTR_FILLBMP_SIZEX || pMap->nWID == XATTR_FILLBMP_SIZEY ); - rPropSet.setPropertyValue( pMap, rVal, rSet, bDontConvertNegativeValues ); + if( pMap->nWID == EE_PARA_LRSPACE ) // n#757419 Don't import negative values + { + sal_Int32 nVal; + if( (aVal >>= nVal) && nVal < 0 ) + aVal <<= ( sal_Int32 ) 0; + } + rPropSet.setPropertyValue( pMap, aVal, rSet, bDontConvertNegativeValues ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
