[Libreoffice-commits] core.git: 2 commits - extras/Module_extras.mk extras/source scp2/source sw/qa sw/source

Justin Luth (via logerrit) logerrit at kemper.freedesktop.org
Sat Apr 4 12:03:19 UTC 2020 

 dev/null                                   |binary
 extras/Module_extras.mk                    |    1 -
 extras/source/gallery/people/people.str    |    2 --
 scp2/source/ooo/file_extra_ooo.scp         |    1 -
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx |    6 +++---
 sw/source/core/layout/tabfrm.cxx           |    9 ++-------
 6 files changed, 5 insertions(+), 14 deletions(-)

New commits:
commit 60a1b40cf363a54b64b84afcfad7fd08bc6ce770
Author:     Justin Luth <justin.luth at collabora.com>
AuthorDate: Fri Mar 6 21:26:37 2020 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Sat Apr 4 14:02:47 2020 +0200

    tdf#123116 sw layout: don't "page-break" before oversized row
    
    followup to LO 7.0 commit b271cc46851c61ddef20dc869bf339c857f76b18
    
    THIS PATCH INTENTIONALLY BREAKS COMPATIBILITY WITH MSO.
    
    In the rather rare case of a table row that is larger than
    the page, but is nevertheless set to not allow splitting,
    historically this oversized row has started on a new page
    and disappeared into the bottom of the page.
    
    The commit mentioned above allowed the row to spill over
    onto the next page, but kept the "page break" feature for
    maximum compatibility and interoperability with MSWord.
    
    However, all of that seems completely senseless, so
    the most natural thing for the document to do would be
    to completely ignore the do-not-split-row setting and let
    everything flow naturally, without leaving a potentially
    large gap in order to start on a new page.
    Just let the oversized row stay attached to the prior row.
    
    The cases are rare enough that interoperability isn't important.
    In any case, for .doc documents authored by LibreOffice,
    Word is still going to try to squeeze it all on one page anyway,
    so even if we do leave a gap and start a new page,
    there will still be a difference.
    
    Now that compatibilityMode=15 for new .docx files,
    MSO almost perfectly matches the behaviour prior to this patch,
    so this is the one case where users might raise a complaint.
    
    The prior patch was committed first just to prove that
    we could fallback to a more compatible state in case
    this radical departure from the norm is unacceptable.
    
    Change-Id: I47c78526d4c4fda2c48e38fb64788bafbc06f2c8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90131
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index fafe1cfe2b02..e59b25a430a6 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -362,9 +362,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf108350_noFontdefaults, "tdf108350_noFontdefaults
 
 DECLARE_OOXMLEXPORT_TEST(testTdf123116_oversizedRowSplit, "tdf123116_oversizedRowSplit.odt")
 {
-    // For highest backward compatibility and interoperability, the now-splitable-row
-    // should start on a new page.
-    CPPUNIT_ASSERT_EQUAL_MESSAGE("Row splits over 5 pages", 5, getPages());
+    // Intentionally require a very non-backward-compatible, natural continuation of the table
+    // instead of an ugly "page break" like MS Word does (and LO used to do).
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Row splits over 4 pages", 4, getPages());
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTdf129522_removeShadowStyle, "tdf129522_removeShadowStyle.odt")
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index be9fb1aef224..9adfcbef6988 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -1061,7 +1061,7 @@ bool SwTabFrame::Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowK
     {
         // A row larger than the entire page ought to be allowed to split regardless of setting,
         // otherwise it has hidden content and that makes no sense
-        if ( !pRow->GetPrev() && pRow->getFrameArea().Height() > FindPageFrame()->getFramePrintArea().Height() )
+        if ( pRow->getFrameArea().Height() > FindPageFrame()->getFramePrintArea().Height() )
             pRow->SetForceRowSplitAllowed( true );
         else
             bSplitRowAllowed = false;
@@ -3546,12 +3546,6 @@ bool SwTabFrame::ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool &rReformat )
             return true;
         }
 
-        // Unsplitable rows have always started on a new page, so don't movebwd, even though we now allow splitting in some cases.
-        // This also matches Word - so good for interoperability (tdf#123116)
-        const SwRowFrame* pFirstRow = GetFirstNonHeadlineRow();
-        if ( pFirstRow && pFirstRow->IsForceRowSplitAllowed() )
-            return false;
-
         bool bFits = nSpace > 0;
         if (!bFits && aRectFnSet.GetHeight(getFrameArea()) == 0)
             // This frame fits into pNewUpper in case it has no space, but this
@@ -3562,6 +3556,7 @@ bool SwTabFrame::ShouldBwdMoved( SwLayoutFrame *pNewUpper, bool &rReformat )
             // #i26945# - check, if follow flow line
             // contains frame, which are moved forward due to its object
             // positioning.
+            const SwRowFrame* pFirstRow = GetFirstNonHeadlineRow();
             if ( pFirstRow && pFirstRow->IsInFollowFlowRow() &&
                  SwLayouter::DoesRowContainMovedFwdFrame(
                                             *(pFirstRow->GetFormat()->GetDoc()),
commit e692f53d32eda0afccbe067f019aaf4e683529a1
Author:     andreas kainz <kainz.a at gmail.com>
AuthorDate: Sat Apr 4 13:23:52 2020 +0200
Commit:     andreas_kainz <kainz.a at gmail.com>
CommitDate: Sat Apr 4 14:02:40 2020 +0200

    tdf#131792 Remove People gallery
    
    Change-Id: I352879b2a0dd814b5d614c0cf6fc4513dcf6e326
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91683
    Tested-by: Jenkins
    Reviewed-by: andreas_kainz <kainz.a at gmail.com>

diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 4c4013ad25ab..620b4ee0ce9c 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -61,7 +61,6 @@ $(eval $(call gb_Module_add_targets,extras,\
 	Gallery_arrows \
 	Gallery_backgrounds \
 	Gallery_diagrams \
-	Gallery_people \
 	Gallery_symbols \
 	Gallery_sound \
 	Gallery_txtshapes \
diff --git a/extras/source/gallery/people/Artist-Female1.png b/extras/source/gallery/people/Artist-Female1.png
deleted file mode 100644
index 6868fa082d71..000000000000
Binary files a/extras/source/gallery/people/Artist-Female1.png and /dev/null differ
diff --git a/extras/source/gallery/people/Artist-Female2.png b/extras/source/gallery/people/Artist-Female2.png
deleted file mode 100644
index 4784671ec0be..000000000000
Binary files a/extras/source/gallery/people/Artist-Female2.png and /dev/null differ
diff --git a/extras/source/gallery/people/Artist-Male1.png b/extras/source/gallery/people/Artist-Male1.png
deleted file mode 100644
index 6c3acc33227e..000000000000
Binary files a/extras/source/gallery/people/Artist-Male1.png and /dev/null differ
diff --git a/extras/source/gallery/people/Artist-Male2.png b/extras/source/gallery/people/Artist-Male2.png
deleted file mode 100644
index 571200bcc0d1..000000000000
Binary files a/extras/source/gallery/people/Artist-Male2.png and /dev/null differ
diff --git a/extras/source/gallery/people/BusinessPerson-Female1.png b/extras/source/gallery/people/BusinessPerson-Female1.png
deleted file mode 100644
index f8db37e6cfa5..000000000000
Binary files a/extras/source/gallery/people/BusinessPerson-Female1.png and /dev/null differ
diff --git a/extras/source/gallery/people/BusinessPerson-Female2.png b/extras/source/gallery/people/BusinessPerson-Female2.png
deleted file mode 100644
index a9e7dbc52565..000000000000
Binary files a/extras/source/gallery/people/BusinessPerson-Female2.png and /dev/null differ
diff --git a/extras/source/gallery/people/BusinessPerson-Female3.png b/extras/source/gallery/people/BusinessPerson-Female3.png
deleted file mode 100644
index 6f63dab2527b..000000000000
Binary files a/extras/source/gallery/people/BusinessPerson-Female3.png and /dev/null differ
diff --git a/extras/source/gallery/people/BusinessPerson-Female4.png b/extras/source/gallery/people/BusinessPerson-Female4.png
deleted file mode 100644
index 75f34c530369..000000000000
Binary files a/extras/source/gallery/people/BusinessPerson-Female4.png and /dev/null differ
diff --git a/extras/source/gallery/people/BusinessPerson-Female5.png b/extras/source/gallery/people/BusinessPerson-Female5.png
deleted file mode 100644
index b41842b8e689..000000000000
Binary files a/extras/source/gallery/people/BusinessPerson-Female5.png and /dev/null differ
diff --git a/extras/source/gallery/people/BusinessPerson-Female6.png b/extras/source/gallery/people/BusinessPerson-Female6.png
deleted file mode 100644
index 5415992a5465..000000000000
Binary files a/extras/source/gallery/people/BusinessPerson-Female6.png and /dev/null differ
diff --git a/extras/source/gallery/people/BusinessPerson-HeadSet1.png b/extras/source/gallery/people/BusinessPerson-HeadSet1.png
deleted file mode 100644
index d4fb2abf474f..000000000000
Binary files a/extras/source/gallery/people/BusinessPerson-HeadSet1.png and /dev/null differ
diff --git a/extras/source/gallery/people/BusinessPerson-HeadSet2.png b/extras/source/gallery/people/BusinessPerson-HeadSet2.png
deleted file mode 100644
index 39a34d9bebd0..000000000000
Binary files a/extras/source/gallery/people/BusinessPerson-HeadSet2.png and /dev/null differ
diff --git a/extras/source/gallery/people/BusinessPerson-Male1.png b/extras/source/gallery/people/BusinessPerson-Male1.png
deleted file mode 100644
index 55b144e67f53..000000000000
Binary files a/extras/source/gallery/people/BusinessPerson-Male1.png and /dev/null differ
diff --git a/extras/source/gallery/people/BusinessPerson-Male2.png b/extras/source/gallery/people/BusinessPerson-Male2.png
deleted file mode 100644
index 1b022be1a83a..000000000000
Binary files a/extras/source/gallery/people/BusinessPerson-Male2.png and /dev/null differ
diff --git a/extras/source/gallery/people/BusinessPerson-Male3.png b/extras/source/gallery/people/BusinessPerson-Male3.png
deleted file mode 100644
index 089a5e6b3704..000000000000
Binary files a/extras/source/gallery/people/BusinessPerson-Male3.png and /dev/null differ
diff --git a/extras/source/gallery/people/BusinessPerson-Male4.png b/extras/source/gallery/people/BusinessPerson-Male4.png
deleted file mode 100644
index 8cecfbf3c2fc..000000000000
Binary files a/extras/source/gallery/people/BusinessPerson-Male4.png and /dev/null differ
diff --git a/extras/source/gallery/people/BusinessPerson-Male5.png b/extras/source/gallery/people/BusinessPerson-Male5.png
deleted file mode 100644
index 90515e4dbb9c..000000000000
Binary files a/extras/source/gallery/people/BusinessPerson-Male5.png and /dev/null differ
diff --git a/extras/source/gallery/people/BusinessPerson-Male6.png b/extras/source/gallery/people/BusinessPerson-Male6.png
deleted file mode 100644
index aa2a0ddfff5e..000000000000
Binary files a/extras/source/gallery/people/BusinessPerson-Male6.png and /dev/null differ
diff --git a/extras/source/gallery/people/Chef1.png b/extras/source/gallery/people/Chef1.png
deleted file mode 100644
index 7fd0428fa4c6..000000000000
Binary files a/extras/source/gallery/people/Chef1.png and /dev/null differ
diff --git a/extras/source/gallery/people/Chef2.png b/extras/source/gallery/people/Chef2.png
deleted file mode 100644
index c3012ed8596d..000000000000
Binary files a/extras/source/gallery/people/Chef2.png and /dev/null differ
diff --git a/extras/source/gallery/people/Computer-User-Female1.png b/extras/source/gallery/people/Computer-User-Female1.png
deleted file mode 100644
index 8c3d647f04e3..000000000000
Binary files a/extras/source/gallery/people/Computer-User-Female1.png and /dev/null differ
diff --git a/extras/source/gallery/people/Computer-User-Female2.png b/extras/source/gallery/people/Computer-User-Female2.png
deleted file mode 100644
index 0b8a0938237e..000000000000
Binary files a/extras/source/gallery/people/Computer-User-Female2.png and /dev/null differ
diff --git a/extras/source/gallery/people/Computer-User-Male1.png b/extras/source/gallery/people/Computer-User-Male1.png
deleted file mode 100644
index 1699cb7614a1..000000000000
Binary files a/extras/source/gallery/people/Computer-User-Male1.png and /dev/null differ
diff --git a/extras/source/gallery/people/Computer-User-Male2.png b/extras/source/gallery/people/Computer-User-Male2.png
deleted file mode 100644
index 7c61301e2cb6..000000000000
Binary files a/extras/source/gallery/people/Computer-User-Male2.png and /dev/null differ
diff --git a/extras/source/gallery/people/ConstructionWorker.png b/extras/source/gallery/people/ConstructionWorker.png
deleted file mode 100644
index 5b0a6244591d..000000000000
Binary files a/extras/source/gallery/people/ConstructionWorker.png and /dev/null differ
diff --git a/extras/source/gallery/people/ConstructionWorker2.png b/extras/source/gallery/people/ConstructionWorker2.png
deleted file mode 100644
index bfd91f00a0a2..000000000000
Binary files a/extras/source/gallery/people/ConstructionWorker2.png and /dev/null differ
diff --git a/extras/source/gallery/people/Detective1.png b/extras/source/gallery/people/Detective1.png
deleted file mode 100644
index 3a2aef39d3a7..000000000000
Binary files a/extras/source/gallery/people/Detective1.png and /dev/null differ
diff --git a/extras/source/gallery/people/Detective2.png b/extras/source/gallery/people/Detective2.png
deleted file mode 100644
index 9b6b492bf136..000000000000
Binary files a/extras/source/gallery/people/Detective2.png and /dev/null differ
diff --git a/extras/source/gallery/people/Doctor-Female1.png b/extras/source/gallery/people/Doctor-Female1.png
deleted file mode 100644
index 0f944f67ca81..000000000000
Binary files a/extras/source/gallery/people/Doctor-Female1.png and /dev/null differ
diff --git a/extras/source/gallery/people/Doctor-Female2.png b/extras/source/gallery/people/Doctor-Female2.png
deleted file mode 100644
index dbd723d70ecf..000000000000
Binary files a/extras/source/gallery/people/Doctor-Female2.png and /dev/null differ
diff --git a/extras/source/gallery/people/Doctor-Male1.png b/extras/source/gallery/people/Doctor-Male1.png
deleted file mode 100644
index 5479020f27c9..000000000000
Binary files a/extras/source/gallery/people/Doctor-Male1.png and /dev/null differ
diff --git a/extras/source/gallery/people/Doctor-Male2.png b/extras/source/gallery/people/Doctor-Male2.png
deleted file mode 100644
index 77c50bdc7602..000000000000
Binary files a/extras/source/gallery/people/Doctor-Male2.png and /dev/null differ
diff --git a/extras/source/gallery/people/Nurse1.png b/extras/source/gallery/people/Nurse1.png
deleted file mode 100644
index fd0829179dfa..000000000000
Binary files a/extras/source/gallery/people/Nurse1.png and /dev/null differ
diff --git a/extras/source/gallery/people/Nurse2.png b/extras/source/gallery/people/Nurse2.png
deleted file mode 100644
index 525e2ef49fa7..000000000000
Binary files a/extras/source/gallery/people/Nurse2.png and /dev/null differ
diff --git a/extras/source/gallery/people/PoliceOfficer1.png b/extras/source/gallery/people/PoliceOfficer1.png
deleted file mode 100644
index 2c6b62813e4f..000000000000
Binary files a/extras/source/gallery/people/PoliceOfficer1.png and /dev/null differ
diff --git a/extras/source/gallery/people/PoliceOfficer2.png b/extras/source/gallery/people/PoliceOfficer2.png
deleted file mode 100644
index d1e569f7eaa4..000000000000
Binary files a/extras/source/gallery/people/PoliceOfficer2.png and /dev/null differ
diff --git a/extras/source/gallery/people/Presenter-Female1.png b/extras/source/gallery/people/Presenter-Female1.png
deleted file mode 100644
index 6205cfeeeb0e..000000000000
Binary files a/extras/source/gallery/people/Presenter-Female1.png and /dev/null differ
diff --git a/extras/source/gallery/people/Presenter-Female2.png b/extras/source/gallery/people/Presenter-Female2.png
deleted file mode 100644
index eb559c61d15e..000000000000
Binary files a/extras/source/gallery/people/Presenter-Female2.png and /dev/null differ
diff --git a/extras/source/gallery/people/Presenter-Male1.png b/extras/source/gallery/people/Presenter-Male1.png
deleted file mode 100644
index 6c79df4d6461..000000000000
Binary files a/extras/source/gallery/people/Presenter-Male1.png and /dev/null differ
diff --git a/extras/source/gallery/people/Presenter-Male2.png b/extras/source/gallery/people/Presenter-Male2.png
deleted file mode 100644
index 7cc4dc705c84..000000000000
Binary files a/extras/source/gallery/people/Presenter-Male2.png and /dev/null differ
diff --git a/extras/source/gallery/people/Student-Female.png b/extras/source/gallery/people/Student-Female.png
deleted file mode 100644
index 9571a16288a2..000000000000
Binary files a/extras/source/gallery/people/Student-Female.png and /dev/null differ
diff --git a/extras/source/gallery/people/Student-Male.png b/extras/source/gallery/people/Student-Male.png
deleted file mode 100644
index cf6b4ded6a34..000000000000
Binary files a/extras/source/gallery/people/Student-Male.png and /dev/null differ
diff --git a/extras/source/gallery/people/Surgeon-Female1.png b/extras/source/gallery/people/Surgeon-Female1.png
deleted file mode 100644
index ba847a066c7c..000000000000
Binary files a/extras/source/gallery/people/Surgeon-Female1.png and /dev/null differ
diff --git a/extras/source/gallery/people/Surgeon-Female2.png b/extras/source/gallery/people/Surgeon-Female2.png
deleted file mode 100644
index 4f4817697c2f..000000000000
Binary files a/extras/source/gallery/people/Surgeon-Female2.png and /dev/null differ
diff --git a/extras/source/gallery/people/Surgeon1.png b/extras/source/gallery/people/Surgeon1.png
deleted file mode 100644
index 0161c11afb3e..000000000000
Binary files a/extras/source/gallery/people/Surgeon1.png and /dev/null differ
diff --git a/extras/source/gallery/people/Surgeon2.png b/extras/source/gallery/people/Surgeon2.png
deleted file mode 100644
index c422aae2ab46..000000000000
Binary files a/extras/source/gallery/people/Surgeon2.png and /dev/null differ
diff --git a/extras/source/gallery/people/Teacher1.png b/extras/source/gallery/people/Teacher1.png
deleted file mode 100644
index 85f81ab69ee0..000000000000
Binary files a/extras/source/gallery/people/Teacher1.png and /dev/null differ
diff --git a/extras/source/gallery/people/Teacher2.png b/extras/source/gallery/people/Teacher2.png
deleted file mode 100644
index 1e062515ed2a..000000000000
Binary files a/extras/source/gallery/people/Teacher2.png and /dev/null differ
diff --git a/extras/source/gallery/people/Tourist-Female1.png b/extras/source/gallery/people/Tourist-Female1.png
deleted file mode 100644
index 62c94b52369f..000000000000
Binary files a/extras/source/gallery/people/Tourist-Female1.png and /dev/null differ
diff --git a/extras/source/gallery/people/Tourist-Female2.png b/extras/source/gallery/people/Tourist-Female2.png
deleted file mode 100644
index ebe3b5466b64..000000000000
Binary files a/extras/source/gallery/people/Tourist-Female2.png and /dev/null differ
diff --git a/extras/source/gallery/people/Tourist-Male1.png b/extras/source/gallery/people/Tourist-Male1.png
deleted file mode 100644
index 99a208a0cabe..000000000000
Binary files a/extras/source/gallery/people/Tourist-Male1.png and /dev/null differ
diff --git a/extras/source/gallery/people/Tourist-Male2.png b/extras/source/gallery/people/Tourist-Male2.png
deleted file mode 100644
index a62ee330ef19..000000000000
Binary files a/extras/source/gallery/people/Tourist-Male2.png and /dev/null differ
diff --git a/extras/source/gallery/people/people.str b/extras/source/gallery/people/people.str
deleted file mode 100644
index bae770e142d2..000000000000
--- a/extras/source/gallery/people/people.str
+++ /dev/null
@@ -1,2 +0,0 @@
-# Translated by desktop-translate and ulfex
-name = "see extras/source/gallery/share/gallery_names.ulf"
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index b94da0068d08..3b32c4b11a10 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -40,7 +40,6 @@ End
 
 GALLERY_FILELIST(arrows)
 GALLERY_FILELIST(diagrams)
-GALLERY_FILELIST(people)
 GALLERY_FILELIST(sounds)
 GALLERY_FILELIST(symbols)
 GALLERY_FILELIST(txtshapes)

More information about the Libreoffice-commits mailing list