summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-07-06 15:57:50 +0100
committerAron Budea <aron.budea@collabora.com>2017-07-25 15:38:12 +0200
commit93075f4df21a7d5202703e813be60f1b46996942 (patch)
tree7529fa95ea190304e855a287a5baba3516b2ec2d
parent112479351ea3c794578d58af12c8c6f501f0c0ef (diff)
crashtesting: 554 crashing documents on export to .doc
regression from... commit d72e0cadceb0b43928a9b4f18d75c9d5d30afdda Date: Mon Jun 19 15:32:16 2017 +0200 Watermark: tdf#91687 correct size in the .doc hopefully this fix is correct Change-Id: I17512ffdd4db605e79b3adb97551e6f4e3816f2f Reviewed-on: https://gerrit.libreoffice.org/39661 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 661fa18d424690e1c3bce4ac70a8018dabe82637) Reviewed-on: https://gerrit.libreoffice.org/40406 (cherry picked from commit fa4a86135dda98c8b2de85a677ffb3cdc8f4e28b) Reviewed-on: https://gerrit.libreoffice.org/40412 Reviewed-by: Aron Budea <aron.budea@collabora.com> Tested-by: Aron Budea <aron.budea@collabora.com>
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 2e94c500cbde..fc68e76fcd0e 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -763,8 +763,10 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
// We have to export original size with padding
const SfxItemSet& rSet = pObj->GetMergedItemSet();
- const SdrMetricItem* pItem = static_cast<const SdrMetricItem*>(rSet.GetItem(SDRATTR_TEXT_UPPERDIST));
- aRect.SetSize(Size(aRect.GetWidth(), aRect.GetHeight() + pItem->GetValue()));
+ long nHeight = aRect.GetHeight();
+ if (const SdrMetricItem* pItem = static_cast<const SdrMetricItem*>(rSet.GetItem(SDRATTR_TEXT_UPPERDIST)))
+ nHeight += pItem->GetValue();
+ aRect.SetSize(Size(aRect.GetWidth(), nHeight));
}
}