diff options
| author | Justin Luth <justin.luth@collabora.com> | 2018-10-10 23:38:22 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-10-11 10:39:37 +0200 |
| commit | 6b9fb354be966e00b9b9425eb99ec1a339babe22 (patch) | |
| tree | dcff56400fec3baff5920b4d37f862fdd32fe517 /sw | |
| parent | 5c57e18a775cf82714f7dfd385d970b7a5439c88 (diff) | |
related tdf#120225 ww8export: save PROTECT_FORM
Change-Id: I20664f8c2dc2c49feec17ee6a1df72776d43cc40
Reviewed-on: https://gerrit.libreoffice.org/61635
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit 9943f37e8a80f2c4df6d58da4c50f3e7f3d6f3ce)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ww8export/ww8export.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx index bcbaad089c59..ea0333ace59f 100644 --- a/sw/qa/extras/ww8export/ww8export.cxx +++ b/sw/qa/extras/ww8export/ww8export.cxx @@ -11,6 +11,7 @@ //#include <com/sun/star/text/XDependentTextField.hpp> +#include <IDocumentSettingAccess.hxx> #include <com/sun/star/awt/FontWeight.hpp> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/awt/XBitmap.hpp> @@ -382,6 +383,11 @@ DECLARE_WW8EXPORT_TEST(testCp1000044, "cp1000044.doc") uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY); // It wasn't possible to fill out this form. CPPUNIT_ASSERT_EQUAL(false, bool(xStorable->isReadonly())); + + SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get()); + CPPUNIT_ASSERT(pTextDoc); + SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc(); + CPPUNIT_ASSERT_EQUAL( true, pDoc->getIDocumentSettingAccess().get( DocumentSettingId::PROTECT_FORM ) ); } DECLARE_WW8EXPORT_TEST(testBorderColours, "bordercolours.doc") diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index afef206af619..374665f56ec8 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -510,6 +510,7 @@ static void WriteDop( WW8Export& rWrt ) } if ((rWrt.pSepx && rWrt.pSepx->DocumentIsProtected()) || + rWrt.m_pDoc->getIDocumentSettingAccess().get(DocumentSettingId::PROTECT_FORM ) || rDop.lKeyProtDoc != 0) { rDop.fProtEnabled = true; |