restore disabled rtfimport tests

There were two problems here:

- Writer textframes don't have an AnchorPosition property, use
  compareRegionStarts() instead
- turns out DOC/DOCX import doesn't create Write textframes when the
  shape has no text, doing so in the RTF import fixes the other two
  testcase as well.

Change-Id: Ib2b4a0b7f8317d300fd532daea22568e33eceb53

3 files changed, 10 insertions, 0 deletions

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index b458bffa651c..1df9d615e22d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -612,6 +612,11 @@ RTFParserState& RTFDocumentImpl::getDefaultState()
         return m_pSuperstream->getDefaultState();
 }
 
+RTFBuffer_t RTFDocumentImpl::getShapetextBuffer()
+{
+    return m_aShapetextBuffer;
+}
+
 void RTFDocumentImpl::resolve(Stream & rMapper)
 {
     m_pMapperStream = &rMapper;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 16e149326464..8ebf6010e594 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -478,6 +478,8 @@ namespace writerfilter {
                 rtl_TextEncoding getEncoding(sal_uInt32 nFontIndex);
                 /// Get the default parser state.
                 RTFParserState& getDefaultState();
+                /// Get the shape text buffer;
+                RTFBuffer_t getShapetextBuffer();
 
             private:
                 SvStream& Strm();
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 6d296a4d9882..3cb4038a3afe 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -149,6 +149,7 @@ void RTFSdrImport::resolve(RTFShape& rShape)
                     break;
                 case ESCHER_ShpInst_Rectangle:
                 case ESCHER_ShpInst_TextBox:
+                    if (!m_rImport.getShapetextBuffer().empty())
                     {
                         createShape("com.sun.star.text.TextFrame", xShape, xPropertySet);
                         bTextFrame = true;
@@ -156,6 +157,8 @@ void RTFSdrImport::resolve(RTFShape& rShape)
                         for (size_t j = 0; j < aDefaults.size(); ++j)
                             xPropertySet->setPropertyValue(aDefaults[j].Name, aDefaults[j].Value);
                     }
+                    else
+                        bCustom = true;
                     break;
                 default:
                     bCustom = true;