mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#62176: Revert "n757419: Hidden/Non-wrapping text."

Browse Source 
This reverts commit 0f8f92a5b6.

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
This commit is contained in:
Michael Stahl
2014-05-07 22:15:07 +02:00
parent c63e2919ea
commit 3b566ca82e
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
svx/source/unodraw/unoshape.cxx
View File

@@ -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 ) void SvxItemPropertySet_setPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet )
{ {
uno::Any aVal(rVal);
if(!pMap || !pMap->nWID) if(!pMap || !pMap->nWID)
return; return;
bool bDontConvertNegativeValues = ( pMap->nWID == XATTR_FILLBMP_SIZEX || pMap->nWID == XATTR_FILLBMP_SIZEY ); 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 rPropSet.setPropertyValue( pMap, rVal, rSet, bDontConvertNegativeValues );
{
sal_Int32 nVal = sal_Int32();
if( (aVal >>= nVal) && nVal < 0 )
aVal <<= ( sal_Int32 ) 0;
}
rPropSet.setPropertyValue( pMap, aVal, rSet, bDontConvertNegativeValues );
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */