[Libreoffice-commits] core.git: 2 commits - bin/flat-odf-cleanup.py sw/source

[Michael Stahl (via logerrit)]

 bin/flat-odf-cleanup.py         |    4 ++--
 sw/source/core/text/frmform.cxx |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 93495c2a94ab5a827912d73d24736eb9c1cc46cd
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Wed Feb 16 17:29:05 2022 +0100
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Feb 16 20:33:15 2022 +0100

    flat-odf-cleanup.py: fix FutureWarning
    
    The behavior of this method will change in future versions. Use specific 
'len(elem)' or 'elem is not None' test instead.
    
    Change-Id: Ic1aedaff3569b9b3063823c747c1d09623b2efad
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130032
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/bin/flat-odf-cleanup.py b/bin/flat-odf-cleanup.py
index cbaf03c65e7b..8d4c176af89b 100644
--- a/bin/flat-odf-cleanup.py
+++ b/bin/flat-odf-cleanup.py
@@ -238,12 +238,12 @@ def remove_unused(root):
 
     # remove office:settings
     settings = 
root.find(".//{urn:oasis:names:tc:opendocument:xmlns:office:1.0}settings")
-    if settings:
+    if settings is not None:
         root.remove(settings)
 
     # scripts are almost never needed
     scripts = 
root.find(".//{urn:oasis:names:tc:opendocument:xmlns:office:1.0}scripts")
-    if scripts:
+    if scripts is not None:
         root.remove(scripts)
 
     # TODO: replace embedded image with some tiny one
commit 8f24e1a32f55ed179594c9fb50ca33a85608db7b
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Wed Feb 16 12:47:53 2022 +0100
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Feb 16 20:33:02 2022 +0100

    sw: convert an OSL_FAIL to SAL_INFO
    
    Change-Id: I1ff4c56b52716822dd04cb0e07347a19a2122a4f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130031
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 537c87be458b..66916d7e8c61 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -573,7 +573,8 @@ void SwTextFrame::AdjustFollow_( SwTextFormatter &rLine,
         {
             if( GetFollow()->IsLocked() )
             {
-                OSL_FAIL( "+SwTextFrame::JoinFrame: Follow is locked." );
+                // this can happen when follow calls pMaster->GetFormatted()
+                SAL_INFO("sw.core", "+SwTextFrame::JoinFrame: Follow is 
locked." );
                 return;
             }
             if (GetFollow()->IsDeleteForbidden())