diff options
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/tdf92157.docx | bin | 0 -> 25188 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 5 | ||||
| -rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 5 |
3 files changed, 6 insertions, 4 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/tdf92157.docx b/sw/qa/extras/ooxmlimport/data/tdf92157.docx Binary files differnew file mode 100644 index 000000000000..ba5bc2a8f5f5 --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/tdf92157.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index df0f695a8714..57507ea2c98e 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -2980,6 +2980,11 @@ DECLARE_OOXMLIMPORT_TEST(testTdf95775, "tdf95775.docx") // This must not fail in layout } +DECLARE_OOXMLIMPORT_TEST(testTdf92157, "tdf92157.docx") +{ + // A graphic with dimensions 0,0 should not fail on load +} + DECLARE_OOXMLIMPORT_TEST(testTdf60351, "tdf60351.docx") { // Get the first image in the document and check its contour polygon. diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 9e0b50c15fb4..e0f9418d7ab0 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -282,10 +282,7 @@ bool SwFormatFrameSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) aTmp.Height() = convertMm100ToTwip(aTmp.Height()); aTmp.Width() = convertMm100ToTwip(aTmp.Width()); } - if(aTmp.Height() || aTmp.Width()) - m_aSize = aTmp; - else - bRet = false; + m_aSize = aTmp; } } break; |