[Libreoffice-commits] core.git: sw/source

[Jochen Nitschke]

 sw/source/filter/xml/xmlimp.cxx |   13 +------------
 sw/source/filter/xml/xmlimp.hxx |    1 -
 2 files changed, 1 insertion(+), 13 deletions(-)

New commits:
commit fd6150b49356c3cb5c4f44700392143ce5aa6001
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Tue May 9 13:50:16 2017 +0200

    PreserveRedlineFlags is long gone
    
    it was renamed from PreserveRedlineMode to PreserveRedlineFlags in
    commit 847e004e65ec3c35acff607588d15cd75a84f121
        convert nsRedlineMode_t to typed_flags
    
    PreserveRedlineMode is dead for 16 years,
    we stopped setting the filter argument in
    commit 93dca26e27a4bc51ac873777ef8b134283ae9f71
    Date:   Wed May 2 15:26:26 2001 +0000
        added redline password protection
        moved redlining enabled flag from view settings to redline element
    
    Change-Id: I9c5f38cc42c4595e38862461e28340b450722f0f
    Reviewed-on: https://gerrit.libreoffice.org/37431
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>

diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index d77a596c6ff5..0208a60a13cd 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -405,7 +405,6 @@ SwXMLImport::SwXMLImport(
     m_bBlock( false ),
     m_bOrganizerMode( false ),
     m_bInititedXForms( false ),
-    m_bPreserveRedlineFlags( true ),
     m_pDoc( nullptr )
 {
     InitItemImport();
@@ -1440,20 +1439,10 @@ void SwXMLImport::initialize(
     // delegate to super class
     SvXMLImport::initialize(aArguments);
 
-    // we are only looking for a PropertyValue "PreserveRedlineFlags"
+    // we are only looking for a NamedValue "LateInitSettings"
     sal_Int32 nLength = aArguments.getLength();
     for(sal_Int32 i = 0; i < nLength; i++)
     {
-        beans::PropertyValue aValue;
-        if ( aArguments[i] >>= aValue )
-        {
-            if (aValue.Name == "PreserveRedlineFlags")
-            {
-                OSL_VERIFY( aValue.Value >>= m_bPreserveRedlineFlags );
-            }
-            continue;
-        }
-
         beans::NamedValue aNamedValue;
         if ( aArguments[i] >>= aNamedValue )
         {
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index ee6395994d90..e5f2eaa899cb 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -87,7 +87,6 @@ class SwXMLImport: public SvXMLImport
     bool                m_bBlock : 1;     // Load text block
     bool                m_bOrganizerMode : 1;
     bool                m_bInititedXForms : 1;
-    bool                m_bPreserveRedlineFlags;
 
     SwDoc*      m_pDoc; // cached for getDoc()