diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-01-21 12:32:00 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-01-21 15:27:07 +0100 |
| commit | a7fd527ece87a1c25fe0d8a9811fe2b230eeea88 (patch) | |
| tree | 031a5959e067d5e7216581a9bb625059f1e35858 /sw/qa/extras | |
| parent | 703cae949a826898b2aa9e96703ffbb2ca8c024e (diff) | |
Revert "tdf#122201 sw: DOCX: allow editing of unprotected areas in protected doc"
Dependent patches were abandoned, this one does not work in isolation.
This reverts commit 46c6c414a6df79575517f5df67510d6f4e3d0128.
Change-Id: I28edb844242a1e31df0be2e57ad8591055db330c
Reviewed-on: https://gerrit.libreoffice.org/66677
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sw/qa/extras')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf122201_editUnprotectedText.odt | bin | 7104 -> 0 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 24 |
2 files changed, 0 insertions, 24 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf122201_editUnprotectedText.odt b/sw/qa/extras/ooxmlexport/data/tdf122201_editUnprotectedText.odt Binary files differdeleted file mode 100644 index 217c8c38a409..000000000000 --- a/sw/qa/extras/ooxmlexport/data/tdf122201_editUnprotectedText.odt +++ /dev/null diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx index 4b443c7ff67c..54bb46946354 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx @@ -52,8 +52,6 @@ #include <string> #include <config_features.h> -#include <unocrsr.hxx> -#include <ndtxt.hxx> class Test : public SwModelTestBase { @@ -998,28 +996,6 @@ DECLARE_OOXMLEXPORT_TEST(tdf66398_permissions, "tdf66398_permissions.docx") CPPUNIT_ASSERT(xBookmarksByName->hasByName("permission-for-group:267014232:everyone")); } -DECLARE_OOXMLEXPORT_TEST(tdf122201_editUnprotectedText, "tdf122201_editUnprotectedText.odt") -{ - // get the document - SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get()); - CPPUNIT_ASSERT(pTextDoc); - - SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc(); - CPPUNIT_ASSERT(pDoc); - - // get two different nodes - SwNodeIndex aDocEnd(pDoc->GetNodes().GetEndOfContent()); - SwNodeIndex aDocStart(*aDocEnd.GetNode().StartOfSectionNode(), 3); - - // check protected area - SwPaM aPaMPortected(aDocStart); - CPPUNIT_ASSERT(aPaMPortected.HasReadonlySel(false)); - - // check unprotected area - SwPaM aPaMUnprotected(aDocEnd); - CPPUNIT_ASSERT(!aPaMUnprotected.HasReadonlySel(false)); -} - DECLARE_OOXMLEXPORT_TEST(testSectionHeader, "sectionprot.odt") { if (xmlDocPtr pXmlDoc = parseExport("word/document.xml")) |