summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-06-28 00:09:43 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-06-29 11:04:16 +0000
commit2387c53dba185b45b0e34beae2a8ddaa315bb689 (patch)
tree1f2ef4ad4fb1f9c16566a10d51e3f044099ef83d
parent04b5dd4d5080c5ffc0666dcfc62bda78170ba74c (diff)
fdo#80009: xmloff: ignore excessive fo:clip values
These cause problems in drawinglayer, and nobody needs a 5km clip. Change-Id: Ic485250413194adbcd0ccf855f12e89e532d7120 (cherry picked from commit 924a28a7b1dc2f89e6940630057557f5f03494df) Reviewed-on: https://gerrit.libreoffice.org/9946 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--xmloff/source/style/XMLClipPropertyHandler.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/xmloff/source/style/XMLClipPropertyHandler.cxx b/xmloff/source/style/XMLClipPropertyHandler.cxx
index af089d7db656..2090462e4460 100644
--- a/xmloff/source/style/XMLClipPropertyHandler.cxx
+++ b/xmloff/source/style/XMLClipPropertyHandler.cxx
@@ -81,6 +81,13 @@ bool XMLClipPropertyHandler::importXML( const OUString& rStrImpValue, uno::Any&
!rUnitConverter.convertMeasureToCore( nVal, aToken ) )
break;
+ // fdo#80009 such nonsense could be written via WW8 import fdo#77454
+ if (abs(nVal) > 400000)
+ {
+ SAL_INFO("xmloff.style", "ignoring excessive clip " << aToken);
+ nVal = 0;
+ }
+
switch( nPos )
{
case 0: aCrop.Top = nVal; break;