[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - svx/source

[Michael Stahl]

 svx/source/unodraw/unoshape.cxx |    9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 0500ac6f276f7e0a5522e1ecdbd3688462ee4533
Author: Michael Stahl <mstahl at 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
    (cherry picked from commit 3b566ca82ebbe754902c1837e11da5fba1e6c93d)
    Reviewed-on: https://gerrit.libreoffice.org/9275
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 77fa691..40feb56 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: */