bnc#820509 DOCX import: try harder to disable form design mode

Previously this only worked if we had indexes in the document as well,
but actually these are independent.

Change-Id: I28afa60d2606230c901948d4c1da8f5a7c50a9f7

1 files changed, 4 insertions, 0 deletions

diff --git a/writerfilter/source/dmapper/SdtHelper.hxx b/writerfilter/source/dmapper/SdtHelper.hxx
index d2ce37220fc4..814dac0745cd 100644
--- a/writerfilter/source/dmapper/SdtHelper.hxx
+++ b/writerfilter/source/dmapper/SdtHelper.hxx
@@ -44,6 +44,8 @@ namespace writerfilter {
             /// Date format, see com/sun/star/awt/UnoControlDateFieldModel.idl
             boost::optional<sal_Int16> m_oDateFormat;
 
+            bool m_bHasElements;
+
             /// Create and append the drawing::XControlShape, containing the various models.
             void createControlShape(com::sun::star::awt::Size aSize, com::sun::star::uno::Reference<com::sun::star::awt::XControlModel>);
         public:
@@ -53,6 +55,8 @@ namespace writerfilter {
             std::vector<OUString>& getDropDownItems();
             OUStringBuffer& getSdtTexts();
             boost::optional<sal_Int16>& getDateFormat();
+            /// If createControlShape() was ever called.
+            bool hasElements();
 
             /// Create drop-down control from w:sdt's w:dropDownList.
             void createDropDownControl();