summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-05-07 22:15:07 +0200
committerAndras Timar <andras.timar@collabora.com>2014-05-08 07:35:20 +0000
commit0500ac6f276f7e0a5522e1ecdbd3688462ee4533 (patch)
treec5bed7cffb3fd5281277a6bdeab1af82ab3521e7 /svx
parent8943dc062b47df92fbd28dbee2dfd77be6e88775 (diff)
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 (cherry picked from commit 3b566ca82ebbe754902c1837e11da5fba1e6c93d) Reviewed-on: https://gerrit.libreoffice.org/9275 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/unodraw/unoshape.cxx9
1 files changed, 1 insertions, 8 deletions
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 77fa691f2988..40feb56a976a 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -4295,18 +4295,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: */