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

[Justin Luth (via logerrit)]

 sw/source/filter/xml/xmlimp.cxx |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit b13e8762a765b9ec619647d5f447d44156c8c5d1
Author:     Justin Luth <justin_luth at sil.org>
AuthorDate: Mon Sep 6 12:52:19 2021 +0200
Commit:     Justin Luth <justin_luth at sil.org>
CommitDate: Mon Sep 6 17:47:44 2021 +0200

    ODT xmlimport: No need to specify the default value for LoadReadonly
    
    A document is naturally not going to be loaded ReadOnly
    so no need to "force" this to false if the setting
    does not exist in the document.
    sfx2/source/doc/objxtor.cxx:    ,bLoadReadonly( false )
    
    That's just confusing because this is in a section of variables
    that have adjusted LO's native behaviour over time.
    However, this settings is not a native behaviour change,
    and is solely handled in the writerfilter import filters.
    
    Change-Id: I0699c14da99b9926aef03cac4e3b3934c23d5e42
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121718
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 7391ab83ebfb..6aa1e89a4fee 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1301,7 +1301,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
     bool bIgnoreFirstLineIndentInNumbering = false;
     bool bDoNotJustifyLinesWithManualBreak = false;
     bool bDoNotResetParaAttrsForNumFont    = false;
-    bool bLoadReadonly = false;
     bool bDoNotCaptureDrawObjsOnPage( false );
     bool bClipAsCharacterAnchoredWriterFlyFrames( false );
     bool bUnixForceZeroExtLeading = false;
@@ -1381,8 +1380,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
                     bDoNotJustifyLinesWithManualBreak = true;
                 else if ( rValue.Name == "DoNotResetParaAttrsForNumFont" )
                     bDoNotResetParaAttrsForNumFont = true;
-                else if ( rValue.Name == "LoadReadonly" )
-                    bLoadReadonly = true;
                 else if ( rValue.Name == "DoNotCaptureDrawObjsOnPage" )
                     bDoNotCaptureDrawObjsOnPage = true;
                 else if ( rValue.Name == "ClipAsCharacterAnchoredWriterFlyFrames" )
@@ -1511,11 +1508,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC
             makeAny( true ) );
     }
 
-    if ( !bLoadReadonly )
-    {
-        xProps->setPropertyValue( "LoadReadonly", makeAny( false ) );
-    }
-
     // This flag has to be set for all documents < SO8
     if ( !bDoNotCaptureDrawObjsOnPage && bDocumentPriorSO8 )
     {