svx/source/unodraw/unoshape.cxx | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
New commits:
commit 3b566ca82ebbe754902c1837e11da5fba1e6c93d
Author: Michael Stahl <mst...@redhat.com>
Date: Wed May 7 22:15:07 2014 +0200
fdo#62176: Revert "n757419: Hidden/Non-wrapping text."
This reverts commit 0f8f92a5b6fcba1fef456539bb929819a9162a85.
Negative fo:text-indent values are explicitly allowed by ODF, so
whatever problem was worked around here needs to be fixed differently.
Conflicts:
svx/source/unodraw/unoshape.cxx
Change-Id: I7e2ae38c4c950e37f0c96a32164a5b6ec10fd47d
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 6b8e7ba..c0df754 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -4246,18 +4246,11 @@ 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 );
- if( pMap->nWID == EE_PARA_LRSPACE ) // n#757419 Don't import negative
values
- {
- sal_Int32 nVal = sal_Int32();
- if( (aVal >>= nVal) && nVal < 0 )
- aVal <<= ( sal_Int32 ) 0;
- }
- rPropSet.setPropertyValue( pMap, aVal, rSet, bDontConvertNegativeValues );
+ rPropSet.setPropertyValue( pMap, rVal, rSet, bDontConvertNegativeValues );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
