diff options
author | Michael Stahl <mstahl@redhat.com> | 2014-10-02 21:38:22 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-10-02 21:40:34 +0200 |
commit | e02c37866b7fd6984efbeeccafe2b04bcb34c1c4 (patch) | |
tree | 0d873200b810625b1b153698a7068b41bf0d3eca | |
parent | a23801b740d8ec952097a5e2a2feb450bc0e585f (diff) |
writerfilter: that fallback appears necessary after all...
Change-Id: Id4bc638c81d695745fc44bde16252e3040f0a03c
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index c8d8ae96c5e5..c31b7fa19d3a 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -810,9 +810,12 @@ int RTFDocumentImpl::resolvePict(bool const bInline, uno::Reference<drawing::XSh uno::Reference<lang::XServiceInfo> xSI(xShape, uno::UNO_QUERY_THROW); if (!xSI->supportsService("com.sun.star.drawing.GraphicObjectShape")) { - //fdo37691-1.rtf - SAL_WARN("writerfilter.rtf", "cannot set graphic on existing shape, creating a new GraphicObjectShape"); - xShape.set(NULL); + // it's sometimes an error to get here - but it's possible to have + // a \pict inside the \shptxt of a \shp of shapeType 202 "TextBox" + // and in that case xShape is the text frame; we actually need a + // new GraphicObject then (example: fdo37691-1.rtf) + SAL_INFO("writerfilter.rtf", "cannot set graphic on existing shape, creating a new GraphicObjectShape"); + xShape.clear(); } } if (!xShape.is()) |