[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 13 commits - cui/source cui/uiconfig include/cui officecfg/registry readlicense_oo/license sc/qa sc/source sfx2/source sw/source sysui/desktop vcl/inc vcl/source

Xisco Fauli (via logerrit) logerrit at kemper.freedesktop.org
Sat May 1 18:59:53 UTC 2021


 cui/source/dialogs/AdditionsDialog.cxx                     |    4 
 cui/source/dialogs/cuicharmap.cxx                          |   93 
 cui/uiconfig/ui/additionsfragment.ui                       |    4 
 include/cui/cuicharmap.hxx                                 |   17 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   17 
 readlicense_oo/license/CREDITS.fodt                        | 4189 ++++++-------
 sc/qa/uitest/data/tdf137945.ods                            |binary
 sc/qa/uitest/validity/tdf137945.py                         |   38 
 sc/source/core/data/table4.cxx                             |    3 
 sc/source/ui/inc/content.hxx                               |    6 
 sc/source/ui/inc/navipi.hxx                                |    1 
 sc/source/ui/navipi/content.cxx                            |   65 
 sc/source/ui/navipi/navipi.cxx                             |   22 
 sfx2/source/control/charmapcontrol.cxx                     |   17 
 sw/source/uibase/docvw/edtdd.cxx                           |    5 
 sw/source/uibase/utlui/content.cxx                         |    4 
 sysui/desktop/apparmor/program.oosplash                    |    2 
 vcl/inc/printdlg.hxx                                       |    3 
 vcl/source/window/printdlg.cxx                             |   28 
 vcl/source/window/window2.cxx                              |    2 
 20 files changed, 2322 insertions(+), 2198 deletions(-)

New commits:
commit 93a77060fb653d38ae9cb3efc1916de6cab7ec46
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Fri Apr 30 10:49:28 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sat May 1 20:59:11 2021 +0200

    tdf#137945: sc: Add UItest
    
    Change-Id: I6fa935d0c77556113ae087a67c2932ddcee12a1e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114871
    Tested-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sc/qa/uitest/data/tdf137945.ods b/sc/qa/uitest/data/tdf137945.ods
new file mode 100644
index 000000000000..ddda28140b1a
Binary files /dev/null and b/sc/qa/uitest/data/tdf137945.ods differ
diff --git a/sc/qa/uitest/validity/tdf137945.py b/sc/qa/uitest/validity/tdf137945.py
new file mode 100644
index 000000000000..1feb12cd7ebe
--- /dev/null
+++ b/sc/qa/uitest/validity/tdf137945.py
@@ -0,0 +1,38 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.common import get_state_as_dict
+import org.libreoffice.unotest
+import pathlib
+
+def get_url_for_data_file(file_name):
+    return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+
+class Tdf137945(UITestCase):
+
+    def test_tdf137945(self):
+        calc_doc = self.ui_test.load_file(get_url_for_data_file("tdf137945.ods"))
+
+        self.ui_test.execute_dialog_through_command(".uno:Validation")
+        xDialog = self.xUITest.getTopFocusWindow()
+        xTabs = xDialog.getChild("tabcontrol")
+        select_pos(xTabs, "1")
+        xInput = xDialog.getChild("inputhelp")
+        xTitle = xDialog.getChild("title")
+
+        self.assertEqual("test", get_state_as_dict(xTitle)['Text'])
+        # Without the fix in place, this test would have failed with
+        # '1 2  3   4    5    10         end' != '1 2   3     4       5       10                 end'
+        self.assertEqual("1 2  3   4    5    10         end", get_state_as_dict(xInput)['Text'])
+
+        xOKBtn = xDialog.getChild("ok")
+        self.ui_test.close_dialog_through_button(xOKBtn)
+
+        self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
commit 0957a98f6f1b8714f6650e7e67f936537ae96cc8
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Thu Apr 29 12:02:06 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sat May 1 20:59:10 2021 +0200

    vcl: print dialog: remove broken code
    
    This was introduced in 149807eb6100090e178505ba4a264bb38eba1e0c
    < Resolves tdf#127782 - Print dialog height >
    trying to fix the problem of the window size not being remembered
    after reopening the dialog, however, the problem is still
    reproducible in master with GEN, thus, remove this code
    
    Change-Id: I65f327fa692cd3e2b5597d04e9e15abc952fe6d9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114874
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Signed-off-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114890
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 49018a07ca17..e1df1a0d8ffd 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3511,16 +3511,6 @@
           </info>
           <value>false</value>
         </prop>
-        <prop oor:name="Width" oor:type="xs:int">
-          <info>
-            <desc>Stores the width of the print dialog.</desc>
-          </info>
-        </prop>
-        <prop oor:name="Height" oor:type="xs:int">
-          <info>
-            <desc>Stores the height of the print dialog.</desc>
-          </info>
-        </prop>
       </group>
     </group>
     <group oor:name="AddXMLToStorage">
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 6583e1891e52..d37c0ec068bc 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -683,15 +683,6 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, const std::shared_ptr<PrinterC
         mxScrolledWindow->get_preferred_size().Width() + mxScrolledWindow->get_vscroll_width(),
         450);
 
-    // restore dialog size
-    std::optional<long> aWidth = officecfg::Office::Common::Print::Dialog::Width::get();
-    std::optional<long> aHeight = officecfg::Office::Common::Print::Dialog::Height::get();
-    WindowStateData aState;
-    if (aWidth) aState.SetWidth(*aWidth); else aWidth = -1;
-    if (aHeight) aState.SetHeight(*aHeight); else aHeight = -1;
-    aState.SetMask(WindowStateMask::Width | WindowStateMask::Height);
-    m_xDialog->set_window_state(aState.ToStr());
-
     m_xDialog->set_centered_on_parent(true);
 }
 
@@ -700,8 +691,6 @@ PrintDialog::~PrintDialog()
     std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create());
     officecfg::Office::Common::Print::Dialog::RangeSectionExpanded::set(mxRangeExpander->get_expanded(), batch);
     officecfg::Office::Common::Print::Dialog::LayoutSectionExpanded::set(mxLayoutExpander->get_expanded(), batch);
-    officecfg::Office::Common::Print::Dialog::Width::set(m_xDialog->get_size().getWidth(), batch);
-    officecfg::Office::Common::Print::Dialog::Height::set(m_xDialog->get_size().getHeight(), batch);
     batch->commit();
 }
 
commit 7149defa3d18785603adcf3c0fc5221a42261494
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Apr 27 11:16:33 2021 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sat May 1 20:59:10 2021 +0200

    tdf#141854 Resize called during dispose
    
    Change-Id: Ie5eaafa95704f9567b8bb9881865571a39bb2f6b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114708
    Tested-by: Jenkins
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit aea139c440d7c7a3683fcbbc48799bc79ba590e7)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114860
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index a729f655a93d..75885cb43d98 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1348,7 +1348,7 @@ void Window::queue_resize(StateChangedType eReason)
         }
     }
 
-    if (bSomeoneCares && !mpWindowImpl->mbInDispose)
+    if (bSomeoneCares && !isDisposed())
     {
         //fdo#57090 force a resync of the borders of the borderwindow onto this
         //window in case they have changed
commit 0199e092253845ca85ba57b1e35623616da6eacd
Author:     Rico Tzschichholz <ricotz at ubuntu.com>
AuthorDate: Wed Apr 28 20:13:48 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sat May 1 20:59:09 2021 +0200

    apparmor: Fix "oopslash" typo
    
    Change-Id: I8b355bceadeebebc9e6fedbf92a35aa44a356e09
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114819
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    (cherry picked from commit f616d96bd8ce8986e4cc204953db0467e6060b5c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114866
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sysui/desktop/apparmor/program.oosplash b/sysui/desktop/apparmor/program.oosplash
index bcc06914d112..dd1136bc9b06 100644
--- a/sysui/desktop/apparmor/program.oosplash
+++ b/sysui/desktop/apparmor/program.oosplash
@@ -14,7 +14,7 @@
 
 #include <tunables/global>
 
-profile libreoffice-oopslash INSTDIR-program/oosplash {
+profile libreoffice-oosplash INSTDIR-program/oosplash {
   #include <abstractions/base>
   #include <abstractions/X>
 
commit 9e8b1702a43f300dd4b84dcd7a377b988c8323c4
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Thu Apr 29 13:19:43 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sat May 1 20:59:09 2021 +0200

    tdf#141970 Revert "tdf#129606: Round the mean of the two subtractions"
    
    This reverts commit d5ebe7c3089ab9f4d3fe0707169fc1ce024cdb70, and
    brings number of inexact values in testing back to lower numbers
    (see test document in the bug).
    
    Change-Id: I5cfb34b7260fc6e4866585af6a2a50e79696eea2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114861
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit aa096331ba468f19951e43e2550105d4dcf50053)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114865
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 392eb8847028..37f88e218193 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -208,8 +208,7 @@ double approxDiff( double a, double b )
     // tdf#129606: Limit precision to the 16th significant digit of the least precise argument.
     // Cf. mnMaxGeneralPrecision in sc/source/core/data/column3.cxx.
     const int nExpArg = static_cast<int>(floor(log10(std::max(aa, ab)))) - 15;
-    // Round the mean of the two subtractions
-    return rtl::math::round((c + d) / 2, -std::max(nExp, nExpArg));
+    return rtl::math::round(c, -std::max(nExp, nExpArg));
 }
 }
 
commit 3893c06e42c94d16e4fd7aa1d0e7e28b8320df5b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Apr 26 10:44:55 2021 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sat May 1 20:59:09 2021 +0200

    Related: tdf#130326 skip calling Refresh if its already just called
    
    Change-Id: I80d3ae7f10b56dfe53a4ab5101ae771b47848092
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114877
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Jenkins

diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx
index f91636802901..985b4665dfc8 100644
--- a/sc/source/ui/inc/content.hxx
+++ b/sc/source/ui/inc/content.hxx
@@ -151,7 +151,9 @@ public:
     void    SetRootType( ScContentId nNew );
     ScContentId  GetRootType() const             { return nRootType; }
 
-    void    ActiveDocChanged();
+    // return true if Refresh was called to allow detecting that the navigator
+    // tree is now up to date
+    bool    ActiveDocChanged();
     void    ResetManualDoc();
     void    SetManualDoc(const OUString& rName);
     void    LoadFile(const OUString& rUrl);
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index 43d48dc74f59..61c4e6da4f4f 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -142,6 +142,7 @@ private:
     void    SetCurrentObject( const OUString& rName );
     void    SetCurrentDoc( const OUString& rDocName );
     void    UpdateSelection();
+    void    ContentUpdated(); // stop aContentIdle because content is up to date
 
     static ScTabViewShell*  GetTabViewShell();
     static ScNavigatorSettings* GetNavigatorSettings();
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 692894ec8270..1fb9697c6fca 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -1409,10 +1409,15 @@ void ScContentTree::ResetManualDoc()
     ActiveDocChanged();
 }
 
-void ScContentTree::ActiveDocChanged()
+bool ScContentTree::ActiveDocChanged()
 {
+    bool bRefreshed = false;
+
     if ( !bHiddenDoc && aManualDoc.isEmpty() )
+    {
         Refresh();                                  // content only if automatic
+        bRefreshed = true;
+    }
 
         //  if flag active Listbox must be updated
 
@@ -1430,12 +1435,15 @@ void ScContentTree::ActiveDocChanged()
 
             aManualDoc.clear();             // again automatically
             Refresh();
+            bRefreshed = true;
             pSh = GetManualOrCurrent();     // should be active now
             if (pSh)
                 aCurrent = pSh->GetTitle();
         }
     }
     pParentWindow->GetDocNames( &aCurrent );        // select
+
+    return bRefreshed;
 }
 
 void ScContentTree::SetManualDoc(const OUString& rName)
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index f9f196d3717b..16e546b8d1c9 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -484,8 +484,14 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint )
         if (pHint->GetEventId() == SfxEventHintId::ActivateDoc)
         {
             UpdateSheetLimits();
-            m_xLbEntries->ActiveDocChanged();
-            UpdateAll();
+            bool bRefreshed = m_xLbEntries->ActiveDocChanged();
+            // UpdateAll just possibly calls Refresh (and always
+            // ContentUpdated) so if ActiveDocChanged already called Refresh
+            // skip re-calling it
+            if (bRefreshed)
+                ContentUpdated();
+            else
+                UpdateAll();
         }
     }
     else
@@ -750,7 +756,12 @@ void ScNavigatorDlg::UpdateAll()
             break;
     }
 
-    aContentIdle.Stop();       // not again
+    ContentUpdated();       // not again
+}
+
+void ScNavigatorDlg::ContentUpdated()
+{
+    aContentIdle.Stop();
 }
 
 void ScNavigatorDlg::SetListMode(NavListMode eMode)
commit 0e6562fffc0ea43e49bfd909ed824738325ce5f4
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Apr 26 09:36:14 2021 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sat May 1 20:59:08 2021 +0200

    Related: tdf#130326 drop ScContentTree::ObjectFresh
    
    this was introduced as part of the large IA2 integration
    
    commit b41332475783c31136673fb44cf4c411bb0148f8
    Author: Steve Yin <steve_y at apache.org>
    Date:   Mon Dec 2 15:54:29 2013 +0000
    
        Integrate branch of IAccessible2
    
    Both calc and writer gained the feature that "space" in the navigator
    for drawing objects selects the highlighted object, extending the
    selection of another one is already selected. (notably impress was
    left unchanged)
    
    In calc, but not writer, an ObjectFresh was added which fires
    on every SfxHintId::ScKillEditView which is broadcast on every
    exit of the cursor from a cell. Its purpose seems to be primarily to
    re-highlight the last selected-by-keyboard entry on a content refresh.
    
    As far as I can tell this doesn't seem necessary and we already refresh
    content on SfxHintId::ScDrawChanged events so we shouldn't need to
    additionally refresh on ScKillEditView and refreshing on every
    ScKillEditView is very slow on navigating through a calc document with a
    lot of drawing objects.
    
    Change-Id: I64b2840f8510d474314d108e657fc3367f8ab6c0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114876
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Jenkins

diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx
index 1c0d2c27c4d5..f91636802901 100644
--- a/sc/source/ui/inc/content.hxx
+++ b/sc/source/ui/inc/content.hxx
@@ -55,7 +55,6 @@ class ScContentTree
     ScDocument*             pHiddenDocument;    // temporary
     bool                    bisInNavigatoeDlg;
     bool                    m_bFreeze;
-    OUString                sKeyString;
     ImplSVEvent*            m_nAsyncMouseReleaseId;
 
     o3tl::enumarray<ScContentId, sal_uInt16> pPosList;     // for the sequence
@@ -124,7 +123,6 @@ public:
     ScContentTree(std::unique_ptr<weld::TreeView> xTreeView, ScNavigatorDlg* pNavigatorDlg);
     ~ScContentTree();
 
-    void     ObjectFresh(ScContentId nType, const weld::TreeIter* pEntry = nullptr);
     void     SetNavigatorDlgFlag(bool isInNavigateDlg){ bisInNavigatoeDlg=isInNavigateDlg;};
 
     void    set_selection_mode(SelectionMode eMode)
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 9ec35128176b..692894ec8270 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -451,7 +451,8 @@ IMPL_LINK(ScContentTree, KeyInputHdl, const KeyEvent&, rKEvt, bool)
             break;
         }
     }
-    //Make KEY_SPACE has same function as DoubleClick
+    //Make KEY_SPACE has same function as DoubleClick, and realize
+    //multi-selection.
     if ( bisInNavigatoeDlg )
     {
         if(aCode.GetCode() == KEY_SPACE )
@@ -469,7 +470,6 @@ IMPL_LINK(ScContentTree, KeyInputHdl, const KeyEvent&, rKEvt, bool)
                 if ( bHiddenDoc )
                     return true;                //! later...
                 OUString aText(m_xTreeView->get_text(*xEntry));
-                sKeyString = aText;
                 if (!aManualDoc.isEmpty())
                     pParentWindow->SetCurrentDoc( aManualDoc );
                 switch (nType)
@@ -503,7 +503,6 @@ IMPL_LINK(ScContentTree, KeyInputHdl, const KeyEvent&, rKEvt, bool)
                             }
                             if (!bHasMakredObject && pScTabViewShell)
                                 pScTabViewShell->SetDrawShell(false);
-                            ObjectFresh(nType, xEntry.get());
                         }
                         break;
                     }
@@ -663,56 +662,6 @@ ScDocument* ScContentTree::GetSourceDocument()
     return nullptr;
 }
 
-//Move along and draw "*" sign .
-void ScContentTree::ObjectFresh(ScContentId nType, const weld::TreeIter* pEntry)
-{
-    if (bHiddenDoc && !pHiddenDocument)
-        return;     // other document displayed
-
-    if (!(nType == ScContentId::GRAPHIC || nType == ScContentId::OLEOBJECT || nType == ScContentId::DRAWING))
-        return;
-
-    auto nOldChildren = m_aRootNodes[nType] ? m_xTreeView->iter_n_children(*m_aRootNodes[nType]) : 0;
-    auto nOldPos = m_xTreeView->vadjustment_get_value();
-
-    freeze();
-    ClearType( nType );
-    GetDrawNames( nType/*, nId*/ );
-    thaw();
-
-    auto nNewChildren = m_aRootNodes[nType] ? m_xTreeView->iter_n_children(*m_aRootNodes[nType]) : 0;
-    bool bRestorePos = nOldChildren == nNewChildren;
-
-    if (!pEntry)
-        ApplyNavigatorSettings(bRestorePos, nOldPos);
-    if (!pEntry)
-        return;
-
-    weld::TreeIter* pParent = m_aRootNodes[nType].get();
-    std::unique_ptr<weld::TreeIter> xOldEntry;
-    std::unique_ptr<weld::TreeIter> xBeginEntry(m_xTreeView->make_iterator(pParent));
-    bool bBeginEntry = false;
-    if( pParent )
-        bBeginEntry = m_xTreeView->iter_children(*xBeginEntry);
-    while (bBeginEntry)
-    {
-        OUString aTempText(m_xTreeView->get_text(*xBeginEntry));
-        if (aTempText == sKeyString)
-        {
-            xOldEntry = m_xTreeView->make_iterator(xBeginEntry.get());
-            break;
-        }
-        bBeginEntry = m_xTreeView->iter_next(*xBeginEntry);
-    }
-    if (xOldEntry)
-    {
-        m_xTreeView->expand_row(*pParent);
-        m_xTreeView->select(*xOldEntry);
-        m_xTreeView->set_cursor(*xOldEntry);
-        StoreNavigatorSettings();
-    }
-}
-
 void ScContentTree::Refresh( ScContentId nType )
 {
     if ( bHiddenDoc && !pHiddenDocument )
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index eb998e878e75..f9f196d3717b 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -536,11 +536,6 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint )
                 case SfxHintId::ScAnyDataChanged:
                     aContentIdle.Start();      // Do not search notes immediately
                     break;
-                case SfxHintId::ScKillEditView:
-                    m_xLbEntries->ObjectFresh( ScContentId::OLEOBJECT );
-                    m_xLbEntries->ObjectFresh( ScContentId::DRAWING );
-                    m_xLbEntries->ObjectFresh( ScContentId::GRAPHIC );
-                    break;
                 case SfxHintId::ScSelectionChanged:
                     UpdateSelection();
                     break;
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 87f526a17996..220a2be35534 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3528,8 +3528,8 @@ IMPL_LINK(SwContentTree, KeyInputHdl, const KeyEvent&, rEvent, bool)
             }
         }
     }
-    //Make KEY_SPACE has same function as DoubleClick ,
-    //and realize multi-selection .
+    //Make KEY_SPACE has same function as DoubleClick, and realize
+    //multi-selection.
     else if (aCode.GetCode() == KEY_SPACE && 0 == aCode.GetModifier())
     {
         std::unique_ptr<weld::TreeIter> xEntry(m_xTreeView->make_iterator());
commit 29cd42c23b74c2355027bdf98a779349a0c0e1f7
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Apr 28 12:37:19 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sat May 1 20:59:08 2021 +0200

    tdf#135997: make sure that the two lists are same length
    
    This fixes the strange assumption that when searching the two
    lists (character names and font names) independently, the two
    found positions will necessarily correspond to each other.
    
    Instead, the positions of the match must be the same, which is
    implemented now. Also the input from configuration is sanitized.
    
    Change-Id: I920de7414387e181e11183b8a22776a72b6be419
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114722
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit b6ab5914d8b2fc7041430796890f086f8e3e6369)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114852
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index d674cda9c48f..ed0200c54cc3 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -185,7 +185,7 @@ short SvxCharacterMap::run()
     if( SvxShowCharSet::getSelectedChar() == ' ')
     {
         m_xOKBtn->set_sensitive(false);
-        setFavButtonState(OUString(), OUString());
+        setFavButtonState(u"", u"");
     }
     else
     {
@@ -235,6 +235,11 @@ void SvxCharacterMap::getRecentCharacterList()
     {
         maRecentCharFontList.push_back(s);
     }
+
+    // tdf#135997: make sure that the two lists are same length
+    const auto nCommonLength = std::min(maRecentCharList.size(), maRecentCharFontList.size());
+    maRecentCharList.resize(nCommonLength);
+    maRecentCharFontList.resize(nCommonLength);
 }
 
 
@@ -255,11 +260,46 @@ void SvxCharacterMap::getFavCharacterList()
     {
         maFavCharFontList.push_back(s);
     }
+
+    // tdf#135997: make sure that the two lists are same length
+    const auto nCommonLength = std::min(maFavCharList.size(), maFavCharFontList.size());
+    maFavCharList.resize(nCommonLength);
+    maFavCharFontList.resize(nCommonLength);
+}
+
+static std::pair<std::deque<OUString>::const_iterator, std::deque<OUString>::const_iterator>
+findInPair(std::u16string_view str1, const std::deque<OUString>& rContainer1,
+           std::u16string_view str2, const std::deque<OUString>& rContainer2)
+{
+    assert(rContainer1.size() == rContainer2.size());
+
+    if (auto it1 = std::find(rContainer1.begin(), rContainer1.end(), str1);
+        it1 != rContainer1.end())
+    {
+        auto it2 = rContainer2.begin() + (it1 - rContainer1.begin());
+        if (*it2 == str2)
+            return { it1, it2 };
+    }
+    return { rContainer1.end(), rContainer2.end() };
+}
+
+std::pair<std::deque<OUString>::const_iterator, std::deque<OUString>::const_iterator>
+SvxCharacterMap::getRecentChar(std::u16string_view sTitle, std::u16string_view rFont) const
+{
+    return findInPair(sTitle, maRecentCharList, rFont, maRecentCharFontList);
+}
+
+std::pair<std::deque<OUString>::const_iterator, std::deque<OUString>::const_iterator>
+SvxCharacterMap::getFavChar(std::u16string_view sTitle, std::u16string_view rFont) const
+{
+    return findInPair(sTitle, maFavCharList, rFont, maFavCharFontList);
 }
 
 
 void SvxCharacterMap::updateRecentCharControl()
 {
+    assert(maRecentCharList.size() == maRecentCharFontList.size());
+
     int i = 0;
     for ( std::deque< OUString >::iterator it = maRecentCharList.begin(), it2 = maRecentCharFontList.begin();
         it != maRecentCharList.end() && it2 != maRecentCharFontList.end();
@@ -281,12 +321,9 @@ void SvxCharacterMap::updateRecentCharControl()
 
 void SvxCharacterMap::updateRecentCharacterList(const OUString& sTitle, const OUString& rFont)
 {
-    auto itChar = std::find(maRecentCharList.begin(), maRecentCharList.end(), sTitle);
-
-    auto itChar2 = std::find(maRecentCharFontList.begin(), maRecentCharFontList.end(), rFont);
-
     // if recent char to be added is already in list, remove it
-    if( itChar != maRecentCharList.end() &&  itChar2 != maRecentCharFontList.end() )
+    if( const auto& [itChar, itChar2] = getRecentChar(sTitle, rFont);
+        itChar != maRecentCharList.end() &&  itChar2 != maRecentCharFontList.end() )
     {
         maRecentCharList.erase( itChar );
         maRecentCharFontList.erase( itChar2);
@@ -321,12 +358,9 @@ void SvxCharacterMap::updateRecentCharacterList(const OUString& sTitle, const OU
 
 void SvxCharacterMap::updateFavCharacterList(const OUString& sTitle, const OUString& rFont)
 {
-    auto itChar = std::find(maFavCharList.begin(), maFavCharList.end(), sTitle);
-
-    auto itChar2 = std::find(maFavCharFontList.begin(), maFavCharFontList.end(), rFont);
-
     // if Fav char to be added is already in list, remove it
-    if( itChar != maFavCharList.end() &&  itChar2 != maFavCharFontList.end() )
+    if( const auto& [itChar, itChar2] = getFavChar(sTitle, rFont);
+        itChar != maFavCharList.end() &&  itChar2 != maFavCharFontList.end() )
     {
         maFavCharList.erase( itChar );
         maFavCharFontList.erase( itChar2);
@@ -359,6 +393,8 @@ void SvxCharacterMap::updateFavCharacterList(const OUString& sTitle, const OUStr
 
 void SvxCharacterMap::updateFavCharControl()
 {
+    assert(maFavCharList.size() == maFavCharFontList.size());
+
     int i = 0;
     for ( std::deque< OUString >::iterator it = maFavCharList.begin(), it2 = maFavCharFontList.begin();
         it != maFavCharList.end() && it2 != maFavCharFontList.end();
@@ -380,14 +416,11 @@ void SvxCharacterMap::updateFavCharControl()
     m_xSearchSet->getFavCharacterList();
 }
 
-void SvxCharacterMap::deleteFavCharacterFromList(const OUString& sTitle, const OUString& rFont)
+void SvxCharacterMap::deleteFavCharacterFromList(std::u16string_view sTitle, std::u16string_view rFont)
 {
-    auto itChar = std::find(maFavCharList.begin(), maFavCharList.end(), sTitle);
-
-    auto itChar2 = std::find(maFavCharFontList.begin(), maFavCharFontList.end(), rFont);
-
-    // if Fav char to be added is already in list, remove it
-    if( itChar != maFavCharList.end() &&  itChar2 != maFavCharFontList.end() )
+    // if Fav char is found, remove it
+    if( const auto& [itChar, itChar2] = getFavChar(sTitle, rFont);
+        itChar != maFavCharList.end() &&  itChar2 != maFavCharFontList.end() )
     {
         maFavCharList.erase( itChar );
         maFavCharFontList.erase( itChar2);
@@ -529,24 +562,16 @@ void SvxCharacterMap::init()
     m_xSearchText->connect_changed(LINK(this, SvxCharacterMap, SearchUpdateHdl));
 }
 
-bool SvxCharacterMap::isFavChar(const OUString& sTitle, const OUString& rFont)
+bool SvxCharacterMap::isFavChar(std::u16string_view sTitle, std::u16string_view rFont)
 {
-    auto isFavCharTitleExists = std::any_of(maFavCharList.begin(),
-         maFavCharList.end(),
-         [sTitle] (const OUString & a) { return a == sTitle; });
-
-    auto isFavCharFontExists = std::any_of(maFavCharFontList.begin(),
-         maFavCharFontList.end(),
-         [rFont] (const OUString & a) { return a == rFont; });
-
-    // if Fav char to be added is already in list, remove it
-    return isFavCharTitleExists && isFavCharFontExists;
+    const auto& [itChar, itFont] = getFavChar(sTitle, rFont);
+    return itChar != maFavCharList.end() && itFont != maFavCharFontList.end();
 }
 
 
-void SvxCharacterMap::setFavButtonState(const OUString& sTitle, const OUString& rFont)
+void SvxCharacterMap::setFavButtonState(std::u16string_view sTitle, std::u16string_view rFont)
 {
-    if(sTitle.isEmpty() || rFont.isEmpty())
+    if(sTitle.empty() || rFont.empty())
     {
         m_xFavouritesBtn->set_sensitive(false);
         return;
@@ -747,13 +772,11 @@ IMPL_LINK_NOARG(SvxCharacterMap, SubsetSelectHdl, weld::ComboBox&, void)
 IMPL_LINK(SvxCharacterMap, RecentClearClickHdl, SvxCharView*, rView, void)
 {
     const OUString& sTitle = rView->GetText();
-    auto itChar = std::find(maRecentCharList.begin(), maRecentCharList.end(), sTitle);
-
     OUString sFont = rView->GetFont().GetFamilyName();
-    auto itChar2 = std::find(maRecentCharFontList.begin(), maRecentCharFontList.end(), sFont);
 
     // if recent char to be added is already in list, remove it
-    if( itChar != maRecentCharList.end() &&  itChar2 != maRecentCharFontList.end() )
+    if( const auto& [itChar, itChar2] = getRecentChar(sTitle, sFont);
+        itChar != maRecentCharList.end() &&  itChar2 != maRecentCharFontList.end() )
     {
         maRecentCharList.erase( itChar );
         maRecentCharFontList.erase( itChar2);
diff --git a/include/cui/cuicharmap.hxx b/include/cui/cuicharmap.hxx
index 4548f7013e87..11e464912a8d 100644
--- a/include/cui/cuicharmap.hxx
+++ b/include/cui/cuicharmap.hxx
@@ -31,6 +31,10 @@
 #include <cui/cuidllapi.h>
 #include <com/sun/star/frame/XFrame.hpp>
 
+#include <deque>
+#include <memory>
+#include <utility>
+
 using namespace ::com::sun::star;
 class SubsetMap;
 
@@ -165,18 +169,25 @@ public:
 
     void getFavCharacterList(); //gets both Fav char and Fav char font list
     void updateFavCharacterList(const OUString& rChar, const OUString& rFont);
-    void deleteFavCharacterFromList(const OUString& rChar, const OUString& rFont);
-    bool isFavChar(const OUString& sTitle, const OUString& rFont);
+    void deleteFavCharacterFromList(std::u16string_view rChar, std::u16string_view rFont);
+    bool isFavChar(std::u16string_view sTitle, std::u16string_view rFont);
 
     void updateRecentCharControl();
     void insertCharToDoc(const OUString& sChar);
 
     void updateFavCharControl();
-    void setFavButtonState(const OUString& sTitle, const OUString& rFont);
+    void setFavButtonState(std::u16string_view sTitle, std::u16string_view rFont);
 
     void setCharName(sal_UCS4 nDecimalValue);
 
     void toggleSearchView(bool state);
+
+private:
+    std::pair<std::deque<OUString>::const_iterator, std::deque<OUString>::const_iterator>
+    getRecentChar(std::u16string_view sTitle, std::u16string_view rFont) const;
+
+    std::pair<std::deque<OUString>::const_iterator, std::deque<OUString>::const_iterator>
+    getFavChar(std::u16string_view sTitle, std::u16string_view rFont) const;
 };
 
 #endif
diff --git a/sfx2/source/control/charmapcontrol.cxx b/sfx2/source/control/charmapcontrol.cxx
index ce580f1618b7..c2175718fca8 100644
--- a/sfx2/source/control/charmapcontrol.cxx
+++ b/sfx2/source/control/charmapcontrol.cxx
@@ -122,10 +122,17 @@ void SfxCharmapCtrl::getFavCharacterList()
     //retrieve recent character font list
     css::uno::Sequence< OUString > rFavCharFontList( officecfg::Office::Common::FavoriteCharacters::FavoriteCharacterFontList::get() );
     m_aFavCharFontList.insert( m_aFavCharFontList.end(), rFavCharFontList.begin(), rFavCharFontList.end() );
+
+    // tdf#135997: make sure that the two lists are same length
+    const auto nCommonLength = std::min(m_aFavCharList.size(), m_aFavCharFontList.size());
+    m_aFavCharList.resize(nCommonLength);
+    m_aFavCharFontList.resize(nCommonLength);
 }
 
 void SfxCharmapCtrl::updateFavCharControl()
 {
+    assert(m_aFavCharList.size() == m_aFavCharFontList.size());
+
     int i = 0;
     for ( std::deque< OUString >::iterator it = m_aFavCharList.begin(), it2 = m_aFavCharFontList.begin();
         it != m_aFavCharList.end() && it2 != m_aFavCharFontList.end();
@@ -154,10 +161,16 @@ void SfxCharmapCtrl::getRecentCharacterList()
     //retrieve recent character font list
     css::uno::Sequence< OUString > rRecentCharFontList( officecfg::Office::Common::RecentCharacters::RecentCharacterFontList::get() );
     m_aRecentCharFontList.insert( m_aRecentCharFontList.end(), rRecentCharFontList.begin(), rRecentCharFontList.end() );
+
+    // tdf#135997: make sure that the two lists are same length
+    const auto nCommonLength = std::min(m_aRecentCharList.size(), m_aRecentCharFontList.size());
+    m_aRecentCharList.resize(nCommonLength);
+    m_aRecentCharFontList.resize(nCommonLength);
 }
 
 void SfxCharmapCtrl::updateRecentCharControl()
 {
+    assert(m_aRecentCharList.size() == m_aRecentCharFontList.size());
     int i = 0;
     for ( std::deque< OUString >::iterator it = m_aRecentCharList.begin(), it2 = m_aRecentCharFontList.begin();
         it != m_aRecentCharList.end() && it2 != m_aRecentCharFontList.end();
commit dce57af8da048cac6a9619b3086eaf4e61c39fb7
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Apr 28 17:19:30 2021 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sat May 1 20:59:07 2021 +0200

    tdf#116384 only drag hyperlink if user's not currently setting the selection
    
    which is what writer does for normal text.
    
    Under gtk its common on selecting by dragging the mouse over a hyperlink
    for one or two letters of the hyperlink to get selected before that
    selection then gets dragged as dnd.
    
    Under gen StartDragWidth is 2 by default so the drag kicks in before
    enough text has been selected for writer to select anything, but under
    gtk gtk-dnd-drag-threshold is used for StartDragWidth and that is 8 by
    default making it easy to select one or two characters before the
    gesture is recognized as a possible drag.
    
    it seems sane to do the same as for normal text and not dnd if the user
    is still using the mouse to set a selection
    
    Change-Id: I971d429acaf8a5a656c5ce58f52632979b94e40a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114726
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx
index 31594da032af..a9d80375b51e 100644
--- a/sw/source/uibase/docvw/edtdd.cxx
+++ b/sw/source/uibase/docvw/edtdd.cxx
@@ -83,7 +83,8 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel )
     bool bStart = false, bDelSelect = false;
     SdrObject *pObj = nullptr;
     Point aDocPos( PixelToLogic( rPosPixel ) );
-    if ( !rSh.IsInSelect() && rSh.TestCurrPam( aDocPos, true))
+    const bool bInSelect = rSh.IsInSelect();
+    if (!bInSelect && rSh.TestCurrPam(aDocPos, true))
         //We are not selecting and aren't at a selection
         bStart = true;
     else if ( !g_bFrameDrag && rSh.IsSelFrameMode() &&
@@ -109,7 +110,7 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel )
         else
             rSh.UnlockPaint();
     }
-    else
+    else if (!bInSelect)// tdf#116384 only drag hyperlink if user's not currently setting the selection
     {
         SwContentAtPos aSwContentAtPos( IsAttrAtPos::InetAttr );
         bStart = rSh.GetContentAtPos( aDocPos,
commit 519d2937dbeed1b5ea829b6cd42464ba0665cb2d
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Apr 28 11:25:18 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sat May 1 20:59:07 2021 +0200

    tdf#135997: fix toolbar control
    
    This is the same as fc7b4bfeba39a2479c9a2c9c8ef5ced5ab3c0de7,
    just for the toolbar control (the older one was for special
    character dialog).
    
    The problem was present since 800ac37021e3f8859a52c5eebca261a5d3bc5a11.
    
    Change-Id: Ib86aa7336a3078ff28b417de37fbd5bc492c85c6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114719
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit b27de500b1412bacefc7144b5222c307ca1ae0fe)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114731
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sfx2/source/control/charmapcontrol.cxx b/sfx2/source/control/charmapcontrol.cxx
index 56af57524a88..ce580f1618b7 100644
--- a/sfx2/source/control/charmapcontrol.cxx
+++ b/sfx2/source/control/charmapcontrol.cxx
@@ -128,7 +128,7 @@ void SfxCharmapCtrl::updateFavCharControl()
 {
     int i = 0;
     for ( std::deque< OUString >::iterator it = m_aFavCharList.begin(), it2 = m_aFavCharFontList.begin();
-        it != m_aFavCharList.end() || it2 != m_aFavCharFontList.end();
+        it != m_aFavCharList.end() && it2 != m_aFavCharFontList.end();
         ++it, ++it2, i++)
     {
         m_aFavCharView[i].SetText(*it);
@@ -160,7 +160,7 @@ void SfxCharmapCtrl::updateRecentCharControl()
 {
     int i = 0;
     for ( std::deque< OUString >::iterator it = m_aRecentCharList.begin(), it2 = m_aRecentCharFontList.begin();
-        it != m_aRecentCharList.end() || it2 != m_aRecentCharFontList.end();
+        it != m_aRecentCharList.end() && it2 != m_aRecentCharFontList.end();
         ++it, ++it2, i++)
     {
         m_aRecentCharView[i].SetText(*it);
commit 1ca94b11dc2ce07202045456189b30939e93b363
Author:     Heiko Tietze <tietze.heiko at gmail.com>
AuthorDate: Tue Feb 9 12:03:08 2021 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sat May 1 20:59:07 2021 +0200

    Resolves tdf#127782 - Print dialog height
    
    * Expander status remembered
    * Fix default size for scrollwindow
    * Window size remembered
    * Window position center on parent
    * Size doesn't depend on preview anymore
    
    Change-Id: If14376ecd190f5d73e7cfad6f5f136d287778478
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110631
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>
    Signed-off-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114821
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 579c66c5e018..49018a07ca17 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3495,6 +3495,33 @@
           </prop>
         </group>
       </group>
+      <group oor:name="Dialog">
+        <info>
+          <desc>User-settings on the printer dialog</desc>
+        </info>
+        <prop oor:name="RangeSectionExpanded" oor:type="xs:boolean" oor:nillable="false">
+          <info>
+            <desc>Determines whether the range section should be expanded.</desc>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="LayoutSectionExpanded" oor:type="xs:boolean" oor:nillable="false">
+          <info>
+            <desc>Determines whether the layout section should be expanded.</desc>
+          </info>
+          <value>false</value>
+        </prop>
+        <prop oor:name="Width" oor:type="xs:int">
+          <info>
+            <desc>Stores the width of the print dialog.</desc>
+          </info>
+        </prop>
+        <prop oor:name="Height" oor:type="xs:int">
+          <info>
+            <desc>Stores the height of the print dialog.</desc>
+          </info>
+        </prop>
+      </group>
     </group>
     <group oor:name="AddXMLToStorage">
       <info>
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 60839b07382f..db1e6a73bcfc 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -60,7 +60,6 @@ namespace vcl
             PrintPreviewWindow(PrintDialog* pDialog);
             virtual ~PrintPreviewWindow() override;
 
-            virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
             virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override;
             virtual bool Command( const CommandEvent& ) override;
             virtual void Resize() override;
@@ -226,8 +225,6 @@ namespace vcl
         DECL_LINK( UIOption_SpinModifyHdl, weld::SpinButton&, void );
         DECL_LINK( UIOption_EntryModifyHdl, weld::Entry&, void );
 
-        DECL_LINK( ExpandHdl, weld::Expander&, void );
-
         css::beans::PropertyValue* getValueForWindow(weld::Widget*) const;
 
         void preparePreview( bool i_bMayUseCache );
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 2d5ebf2a49a8..6583e1891e52 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -21,6 +21,8 @@
 #include <svdata.hxx>
 #include <strings.hrc>
 #include <bitmaps.hlst>
+#include <officecfg/Office/Common.hxx>
+#include <vcl/windowstate.hxx>
 
 #include <vcl/QueueInfo.hxx>
 #include <vcl/commandevent.hxx>
@@ -117,13 +119,6 @@ void PrintDialog::PrintPreviewWindow::Resize()
     preparePreviewBitmap();
 }
 
-void PrintDialog::PrintPreviewWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea)
-{
-    pDrawingArea->set_size_request(pDrawingArea->get_approximate_digit_width() * 45,
-                                   pDrawingArea->get_text_height() * 30);
-    CustomWidgetController::SetDrawingArea(pDrawingArea);
-}
-
 void PrintDialog::PrintPreviewWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&)
 {
     rRenderContext.Push();
@@ -672,28 +667,42 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, const std::shared_ptr<PrinterC
     mxPageMarginEdt->connect_value_changed( LINK( this, PrintDialog, MetricSpinModifyHdl ) );
     mxSheetMarginEdt->connect_value_changed( LINK( this, PrintDialog, MetricSpinModifyHdl ) );
 
-    mxRangeExpander->connect_expanded(LINK( this, PrintDialog, ExpandHdl));
-    mxLayoutExpander->connect_expanded(LINK( this, PrintDialog, ExpandHdl));
-
     updateNupFromPages();
 
     // tdf#129180 Delay setting the default value in the Paper Size list
     // set paper sizes listbox
     setPaperSizes();
 
+    mxRangeExpander->set_expanded(
+        officecfg::Office::Common::Print::Dialog::RangeSectionExpanded::get());
+    mxLayoutExpander->set_expanded(
+        officecfg::Office::Common::Print::Dialog::LayoutSectionExpanded::get());
+
     // lock the dialog height, regardless of later expander state
     mxScrolledWindow->set_size_request(
         mxScrolledWindow->get_preferred_size().Width() + mxScrolledWindow->get_vscroll_width(),
-        mxScrolledWindow->get_preferred_size().Height());
-}
+        450);
 
-IMPL_LINK_NOARG(PrintDialog, ExpandHdl, weld::Expander&, void)
-{
-    m_xDialog->resize_to_request();
+    // restore dialog size
+    std::optional<long> aWidth = officecfg::Office::Common::Print::Dialog::Width::get();
+    std::optional<long> aHeight = officecfg::Office::Common::Print::Dialog::Height::get();
+    WindowStateData aState;
+    if (aWidth) aState.SetWidth(*aWidth); else aWidth = -1;
+    if (aHeight) aState.SetHeight(*aHeight); else aHeight = -1;
+    aState.SetMask(WindowStateMask::Width | WindowStateMask::Height);
+    m_xDialog->set_window_state(aState.ToStr());
+
+    m_xDialog->set_centered_on_parent(true);
 }
 
 PrintDialog::~PrintDialog()
 {
+    std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create());
+    officecfg::Office::Common::Print::Dialog::RangeSectionExpanded::set(mxRangeExpander->get_expanded(), batch);
+    officecfg::Office::Common::Print::Dialog::LayoutSectionExpanded::set(mxLayoutExpander->get_expanded(), batch);
+    officecfg::Office::Common::Print::Dialog::Width::set(m_xDialog->get_size().getWidth(), batch);
+    officecfg::Office::Common::Print::Dialog::Height::set(m_xDialog->get_size().getHeight(), batch);
+    batch->commit();
 }
 
 void PrintDialog::setupPaperSidesBox()
commit eaf775e715a97b237c0c6c3f3a8e2bd6e411af0e
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Wed Apr 28 17:29:28 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sat May 1 20:59:06 2021 +0200

    update credits
    
    Change-Id: Idd3d14c272c1eebca7207054dccbeae4632c51cc
    (cherry picked from commit 93a90a5b0558aeac847aefe06f49f68c00a26678)

diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt
index d799cf24fac4..9a320cf6eac5 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <office:document xmlns:officeooo="http://openoffice.org/2009/office" xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rpt="http://openoffice.org/2005/report" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns
 :config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="ur
 n:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
- <office:meta><dc:title>Credits » LibreOffice</dc:title><meta:keyword>Credits</meta:keyword><meta:keyword>contributors</meta:keyword><meta:keyword>coders</meta:keyword><meta:keyword>developers</meta:keyword><dc:description>Credits for the LibreOffice development/coding.</dc:description><meta:generator>LibreOffice/7.1.1.2$Linux_X86_64 LibreOffice_project/fe0b08f4af1bacafe4c7ecc87ce55bb426164676</meta:generator><dc:date>2012-02-20T22:17:18.060000000</dc:date><meta:editing-duration>PT14M12S</meta:editing-duration><meta:editing-cycles>3</meta:editing-cycles><meta:document-statistic meta:table-count="5" meta:image-count="1" meta:object-count="0" meta:page-count="2" meta:paragraph-count="4359" meta:word-count="16090" meta:character-count="115952" meta:non-whitespace-character-count="101592"/><meta:user-defined meta:name="google-site-verification">JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA</meta:user-defined></office:meta>
+ <office:meta><dc:title>Credits » LibreOffice</dc:title><meta:keyword>Credits</meta:keyword><meta:keyword>contributors</meta:keyword><meta:keyword>coders</meta:keyword><meta:keyword>developers</meta:keyword><dc:description>Credits for the LibreOffice development/coding.</dc:description><meta:generator>LibreOffice/7.1.2.2$Linux_X86_64 LibreOffice_project/8a45595d069ef5570103caea1b71cc9d82b2aae4</meta:generator><dc:date>2012-02-20T22:17:18.060000000</dc:date><meta:editing-duration>PT14M12S</meta:editing-duration><meta:editing-cycles>3</meta:editing-cycles><meta:document-statistic meta:table-count="5" meta:image-count="1" meta:object-count="0" meta:page-count="2" meta:paragraph-count="4378" meta:word-count="16181" meta:character-count="116627" meta:non-whitespace-character-count="102189"/><meta:user-defined meta:name="google-site-verification">JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA</meta:user-defined></office:meta>
  <office:settings>
   <config:config-item-set config:name="ooo:view-settings">
-   <config:config-item config:name="ViewAreaTop" config:type="long">3288</config:config-item>
+   <config:config-item config:name="ViewAreaTop" config:type="long">1214</config:config-item>
    <config:config-item config:name="ViewAreaLeft" config:type="long">501</config:config-item>
-   <config:config-item config:name="ViewAreaWidth" config:type="long">16221</config:config-item>
-   <config:config-item config:name="ViewAreaHeight" config:type="long">22139</config:config-item>
+   <config:config-item config:name="ViewAreaWidth" config:type="long">48588</config:config-item>
+   <config:config-item config:name="ViewAreaHeight" config:type="long">28268</config:config-item>
    <config:config-item config:name="ShowRedlineChanges" config:type="boolean">true</config:config-item>
    <config:config-item config:name="InBrowseMode" config:type="boolean">true</config:config-item>
    <config:config-item-map-indexed config:name="Views">
     <config:config-item-map-entry>
      <config:config-item config:name="ViewId" config:type="string">view2</config:config-item>
-     <config:config-item config:name="ViewLeft" config:type="long">8192</config:config-item>
-     <config:config-item config:name="ViewTop" config:type="long">6320</config:config-item>
+     <config:config-item config:name="ViewLeft" config:type="long">3577</config:config-item>
+     <config:config-item config:name="ViewTop" config:type="long">3434</config:config-item>
      <config:config-item config:name="VisibleLeft" config:type="long">501</config:config-item>
-     <config:config-item config:name="VisibleTop" config:type="long">3288</config:config-item>
-     <config:config-item config:name="VisibleRight" config:type="long">16720</config:config-item>
-     <config:config-item config:name="VisibleBottom" config:type="long">25425</config:config-item>
+     <config:config-item config:name="VisibleTop" config:type="long">1214</config:config-item>
+     <config:config-item config:name="VisibleRight" config:type="long">49087</config:config-item>
+     <config:config-item config:name="VisibleBottom" config:type="long">29480</config:config-item>
      <config:config-item config:name="ZoomType" config:type="short">0</config:config-item>
      <config:config-item config:name="ViewLayoutColumns" config:type="short">0</config:config-item>
      <config:config-item config:name="ViewLayoutBookMode" config:type="boolean">false</config:config-item>
@@ -95,7 +95,7 @@
    </config:config-item-map-indexed>
    <config:config-item config:name="PrinterSetup" config:type="base64Binary"/>
    <config:config-item config:name="AddParaTableSpacingAtStart" config:type="boolean">true</config:config-item>
-   <config:config-item config:name="Rsid" config:type="int">10056069</config:config-item>
+   <config:config-item config:name="Rsid" config:type="int">10061684</config:config-item>
    <config:config-item config:name="EmbeddedDatabaseName" config:type="string"/>
    <config:config-item config:name="FieldAutoUpdate" config:type="boolean">true</config:config-item>
    <config:config-item config:name="OutlineLevelYieldsNumbering" config:type="boolean">false</config:config-item>
@@ -162,7 +162,7 @@
  <office:styles>
   <style:default-style style:family="graphic">
    <style:graphic-properties svg:stroke-color="#3465a4" draw:fill-color="#729fcf" fo:wrap-option="no-wrap" draw:shadow-offset-x="0.3cm" draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm" draw:start-line-spacing-vertical="0.283cm" draw:end-line-spacing-horizontal="0.283cm" draw:end-line-spacing-vertical="0.283cm" style:flow-with-text="true"/>
-   <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:writing-mode="lr-tb" style:font-independent-line-spacing="false">
+   <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:font-independent-line-spacing="false">
     <style:tab-stops/>
    </style:paragraph-properties>
    <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Thorndale AMT" fo:font-size="12pt" fo:language="hu" fo:country="HU" style:letter-kerning="true" style:font-name-asian="SimSun" style:font-size-asian="12pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Mangal" style:font-size-complex="12pt" style:language-complex="hi" style:country-complex="IN"/>
@@ -340,58 +340,58 @@
  </office:styles>
  <office:automatic-styles>
   <style:style style:name="Tabelle1" style:family="table">
-   <style:table-properties style:width="15.847cm" table:align="left"/>
+   <style:table-properties style:width="25.675cm" table:align="left"/>
   </style:style>
   <style:style style:name="Tabelle1.A" style:family="table-column">
-   <style:table-column-properties style:column-width="4.373cm"/>
+   <style:table-column-properties style:column-width="5.422cm"/>
   </style:style>
   <style:style style:name="Tabelle1.B" style:family="table-column">
-   <style:table-column-properties style:column-width="3.678cm"/>
+   <style:table-column-properties style:column-width="6.682cm"/>
   </style:style>
   <style:style style:name="Tabelle1.C" style:family="table-column">
-   <style:table-column-properties style:column-width="4.198cm"/>
+   <style:table-column-properties style:column-width="6.68cm"/>
   </style:style>
   <style:style style:name="Tabelle1.D" style:family="table-column">
-   <style:table-column-properties style:column-width="3.598cm"/>
+   <style:table-column-properties style:column-width="6.892cm"/>
   </style:style>
   <style:style style:name="Tabelle1.A1" style:family="table-cell">
    <style:table-cell-properties style:vertical-align="middle" fo:padding="0.049cm" fo:border="none"/>
   </style:style>
-  <style:style style:name="Tabelle1.B382" style:family="table-cell">
+  <style:style style:name="Tabelle1.C385" style:family="table-cell">
    <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
   </style:style>
   <style:style style:name="Tabelle2" style:family="table">
-   <style:table-properties style:width="15.847cm" table:align="left"/>
+   <style:table-properties style:width="17.865cm" table:align="left"/>
   </style:style>
   <style:style style:name="Tabelle2.A" style:family="table-column">
-   <style:table-column-properties style:column-width="3.438cm"/>
+   <style:table-column-properties style:column-width="3.812cm"/>
   </style:style>
   <style:style style:name="Tabelle2.B" style:family="table-column">
-   <style:table-column-properties style:column-width="3.625cm"/>
+   <style:table-column-properties style:column-width="4.048cm"/>
   </style:style>
   <style:style style:name="Tabelle2.C" style:family="table-column">
-   <style:table-column-properties style:column-width="4.517cm"/>
+   <style:table-column-properties style:column-width="5.212cm"/>
   </style:style>
   <style:style style:name="Tabelle2.D" style:family="table-column">
-   <style:table-column-properties style:column-width="4.267cm"/>
+   <style:table-column-properties style:column-width="4.792cm"/>
   </style:style>
   <style:style style:name="Tabelle2.A1" style:family="table-cell">
    <style:table-cell-properties style:vertical-align="middle" fo:padding="0.049cm" fo:border="none"/>
   </style:style>
   <style:style style:name="Tabelle3" style:family="table">
-   <style:table-properties style:width="15.847cm" table:align="left"/>
+   <style:table-properties style:width="17.768cm" table:align="left"/>
   </style:style>
   <style:style style:name="Tabelle3.A" style:family="table-column">
-   <style:table-column-properties style:column-width="3.376cm"/>
+   <style:table-column-properties style:column-width="3.812cm"/>
   </style:style>
   <style:style style:name="Tabelle3.B" style:family="table-column">
-   <style:table-column-properties style:column-width="3.41cm"/>
+   <style:table-column-properties style:column-width="3.789cm"/>
   </style:style>
   <style:style style:name="Tabelle3.C" style:family="table-column">
-   <style:table-column-properties style:column-width="5.368cm"/>
+   <style:table-column-properties style:column-width="6.144cm"/>
   </style:style>
   <style:style style:name="Tabelle3.D" style:family="table-column">
-   <style:table-column-properties style:column-width="3.694cm"/>
+   <style:table-column-properties style:column-width="4.023cm"/>
   </style:style>
   <style:style style:name="Tabelle3.A1" style:family="table-cell">
    <style:table-cell-properties style:vertical-align="middle" fo:padding="0.049cm" fo:border="none"/>
@@ -400,19 +400,19 @@
    <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
   </style:style>
   <style:style style:name="Tabelle4" style:family="table">
-   <style:table-properties style:width="15.847cm" table:align="left"/>
+   <style:table-properties style:width="16.723cm" table:align="left"/>
   </style:style>
   <style:style style:name="Tabelle4.A" style:family="table-column">
-   <style:table-column-properties style:column-width="3.639cm"/>
+   <style:table-column-properties style:column-width="3.838cm"/>
   </style:style>
   <style:style style:name="Tabelle4.B" style:family="table-column">
-   <style:table-column-properties style:column-width="4.577cm"/>
+   <style:table-column-properties style:column-width="4.817cm"/>
   </style:style>
   <style:style style:name="Tabelle4.C" style:family="table-column">
-   <style:table-column-properties style:column-width="3.993cm"/>
+   <style:table-column-properties style:column-width="4.21cm"/>
   </style:style>
   <style:style style:name="Tabelle4.D" style:family="table-column">
-   <style:table-column-properties style:column-width="3.637cm"/>
+   <style:table-column-properties style:column-width="3.858cm"/>
   </style:style>
   <style:style style:name="Tabelle4.A1" style:family="table-cell">
    <style:table-cell-properties style:vertical-align="middle" fo:padding="0.049cm" fo:border="none"/>
@@ -421,24 +421,24 @@
    <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
   </style:style>
   <style:style style:name="Tabelle5" style:family="table">
-   <style:table-properties style:width="21.946cm" table:align="left"/>
+   <style:table-properties style:width="33.166cm" table:align="left"/>
   </style:style>
   <style:style style:name="Tabelle5.A" style:family="table-column">
-   <style:table-column-properties style:column-width="5.865cm"/>
+   <style:table-column-properties style:column-width="11.779cm"/>
   </style:style>
   <style:style style:name="Tabelle5.B" style:family="table-column">
-   <style:table-column-properties style:column-width="6.96cm"/>
+   <style:table-column-properties style:column-width="7.938cm"/>
   </style:style>
   <style:style style:name="Tabelle5.C" style:family="table-column">
-   <style:table-column-properties style:column-width="4.678cm"/>
+   <style:table-column-properties style:column-width="6.632cm"/>
   </style:style>
   <style:style style:name="Tabelle5.D" style:family="table-column">
-   <style:table-column-properties style:column-width="4.443cm"/>
+   <style:table-column-properties style:column-width="6.817cm"/>
   </style:style>
   <style:style style:name="Tabelle5.A1" style:family="table-cell">
    <style:table-cell-properties style:vertical-align="middle" fo:padding="0.049cm" fo:border="none"/>
   </style:style>
-  <style:style style:name="Tabelle5.B664" style:family="table-cell">
+  <style:style style:name="Tabelle5.D665" style:family="table-cell">
    <style:table-cell-properties fo:padding="0.049cm" fo:border="none"/>
   </style:style>
   <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Table_20_Contents">
@@ -1077,7 +1077,7 @@
    </draw:frame>
    <text:section text:style-name="Sect1" text:name="BgContainer">
     <text:p text:style-name="P16">Credits</text:p>
-    <text:p text:style-name="Text_20_body">1655 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2021-03-23 11:11:49.</text:p>
+    <text:p text:style-name="Text_20_body">1668 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2021-04-28 17:20:52.</text:p>
     <text:p text:style-name="Text_20_body"><text:span text:style-name="T1">*</text:span> marks developers whose first contributions happened after 2010-09-28.</text:p>
     <text:h text:style-name="Heading_20_2" text:outline-level="2">Developers committing code since 2010-09-28</text:h>
     <table:table table:name="Tabelle1" table:style-name="Tabelle1">
@@ -1085,7 +1085,7 @@
      <table:table-column table:style-name="Tabelle1.B"/>
      <table:table-column table:style-name="Tabelle1.C"/>
      <table:table-column table:style-name="Tabelle1.D"/>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents">Ruediger Timm<text:line-break/>Commits: 82464<text:line-break/>Joined: 2000-10-10</text:p>
       </table:table-cell>
@@ -1096,10 +1096,10 @@
        <text:p text:style-name="Table_20_Contents">Oliver Bolte<text:line-break/>Commits: 31008<text:line-break/>Joined: 2000-09-19</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents">Caolán McNamara<text:line-break/>Commits: 30245<text:line-break/>Joined: 2000-10-10</text:p>
+       <text:p text:style-name="Table_20_Contents">Caolán McNamara<text:line-break/>Commits: 30446<text:line-break/>Joined: 2000-10-10</text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents">Jens-Heiner Rechtien [hr]<text:line-break/>Commits: 28805<text:line-break/>Joined: 2000-09-18</text:p>
       </table:table-cell>
@@ -1107,27 +1107,27 @@
        <text:p text:style-name="Table_20_Contents">Vladimir Glazunov<text:line-break/>Commits: 25434<text:line-break/>Joined: 2000-12-04</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents">Stephan Bergmann<text:line-break/>Commits: 18960<text:line-break/>Joined: 2000-10-04</text:p>
+       <text:p text:style-name="Table_20_Contents">Stephan Bergmann<text:line-break/>Commits: 19000<text:line-break/>Joined: 2000-10-04</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Noel Grandin<text:line-break/>Commits: 13875<text:line-break/>Joined: <text:span text:style-name="T2">2011-12-12</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Noel Grandin<text:line-break/>Commits: 13968<text:line-break/>Joined: <text:span text:style-name="T2">2011-12-12</text:span></text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents">Ivo Hinkelmann<text:line-break/>Commits: 9480<text:line-break/>Joined: 2002-09-09</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents">Tor Lillqvist<text:line-break/>Commits: 8946<text:line-break/>Joined: 2010-03-23</text:p>
+       <text:p text:style-name="Table_20_Contents">Tor Lillqvist<text:line-break/>Commits: 8971<text:line-break/>Joined: 2010-03-23</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents">Miklos Vajna<text:line-break/>Commits: 8371<text:line-break/>Joined: 2010-07-29</text:p>
+       <text:p text:style-name="Table_20_Contents">Miklos Vajna<text:line-break/>Commits: 8428<text:line-break/>Joined: 2010-07-29</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents">Michael Stahl<text:line-break/>Commits: 7660<text:line-break/>Joined: 2008-06-16</text:p>
+       <text:p text:style-name="Table_20_Contents">Michael Stahl<text:line-break/>Commits: 7681<text:line-break/>Joined: 2008-06-16</text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents">Kohei Yoshida<text:line-break/>Commits: 5571<text:line-break/>Joined: 2009-06-19</text:p>
       </table:table-cell>
@@ -1138,15 +1138,15 @@
        <text:p text:style-name="Table_20_Contents">Frank Schoenheit [fs]<text:line-break/>Commits: 5008<text:line-break/>Joined: 2000-09-19</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents">Eike Rathke<text:line-break/>Commits: 4865<text:line-break/>Joined: 2000-10-11</text:p>
+       <text:p text:style-name="Table_20_Contents">Eike Rathke<text:line-break/>Commits: 4879<text:line-break/>Joined: 2000-10-11</text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents">David Tardon<text:line-break/>Commits: 3642<text:line-break/>Joined: 2009-11-12</text:p>
+       <text:p text:style-name="Table_20_Contents">David Tardon<text:line-break/>Commits: 3644<text:line-break/>Joined: 2009-11-12</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Julien Nabet<text:line-break/>Commits: 3050<text:line-break/>Joined: <text:span text:style-name="T2">2010-11-04</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Julien Nabet<text:line-break/>Commits: 3060<text:line-break/>Joined: <text:span text:style-name="T2">2010-11-04</text:span></text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents">Hans-Joachim Lankenau<text:line-break/>Commits: 3007<text:line-break/>Joined: 2000-09-19</text:p>
@@ -1155,12 +1155,12 @@
        <text:p text:style-name="Table_20_Contents">Ocke Janssen [oj]<text:line-break/>Commits: 2850<text:line-break/>Joined: 2000-09-20</text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Andrea Gelmini<text:line-break/>Commits: 2772<text:line-break/>Joined: <text:span text:style-name="T2">2014-10-30</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Andrea Gelmini<text:line-break/>Commits: 2799<text:line-break/>Joined: <text:span text:style-name="T2">2014-10-30</text:span></text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Tomaž Vajngerl<text:line-break/>Commits: 2763<text:line-break/>Joined: <text:span text:style-name="T2">2012-06-02</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Tomaž Vajngerl<text:line-break/>Commits: 2784<text:line-break/>Joined: <text:span text:style-name="T2">2012-06-02</text:span></text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents">Jan Holesovsky<text:line-break/>Commits: 2664<text:line-break/>Joined: 2009-06-23</text:p>
@@ -1169,21 +1169,21 @@
        <text:p text:style-name="Table_20_Contents">Mathias Bauer<text:line-break/>Commits: 2580<text:line-break/>Joined: 2000-09-20</text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents">Oliver Specht<text:line-break/>Commits: 2549<text:line-break/>Joined: 2000-09-21</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents">Michael Meeks<text:line-break/>Commits: 2455<text:line-break/>Joined: 2004-08-05</text:p>
+       <text:p text:style-name="Table_20_Contents">Luboš Luňák<text:line-break/>Commits: 2468<text:line-break/>Joined: 2010-09-21</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents">Bjoern Michaelsen<text:line-break/>Commits: 2441<text:line-break/>Joined: 2009-10-14</text:p>
+       <text:p text:style-name="Table_20_Contents">Michael Meeks<text:line-break/>Commits: 2457<text:line-break/>Joined: 2004-08-05</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents">Luboš Luňák<text:line-break/>Commits: 2430<text:line-break/>Joined: 2010-09-21</text:p>
+       <text:p text:style-name="Table_20_Contents">Bjoern Michaelsen<text:line-break/>Commits: 2441<text:line-break/>Joined: 2009-10-14</text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Norbert Thiebaud<text:line-break/>Commits: 2176<text:line-break/>Joined: <text:span text:style-name="T2">2010-09-29</text:span></text:p>
       </table:table-cell>
@@ -1194,10 +1194,10 @@
        <text:p text:style-name="Table_20_Contents">Philipp Lohmann [pl]<text:line-break/>Commits: 2089<text:line-break/>Joined: 2000-09-21</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Andras Timar<text:line-break/>Commits: 1946<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-02</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Andras Timar<text:line-break/>Commits: 1950<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-02</text:span></text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents">Christian Lippka<text:line-break/>Commits: 1805<text:line-break/>Joined: 2000-09-25</text:p>
       </table:table-cell>
@@ -1205,15 +1205,15 @@
        <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Matúš Kukan<text:line-break/>Commits: 1712<text:line-break/>Joined: <text:span text:style-name="T2">2011-04-06</text:span></text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Mike Kaganski<text:line-break/>Commits: 1578<text:line-break/>Joined: <text:span text:style-name="T2">2015-04-26</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Mike Kaganski<text:line-break/>Commits: 1638<text:line-break/>Joined: <text:span text:style-name="T2">2015-04-26</text:span></text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Takeshi Abe<text:line-break/>Commits: 1486<text:line-break/>Joined: <text:span text:style-name="T2">2010-11-08</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents">Armin Le Grand (Allotropia)<text:line-break/>Commits: 1487<text:line-break/>Joined: 2000-09-25</text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents">Armin Le Grand (Allotropia)<text:line-break/>Commits: 1483<text:line-break/>Joined: 2000-09-25</text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Takeshi Abe<text:line-break/>Commits: 1486<text:line-break/>Joined: <text:span text:style-name="T2">2010-11-08</text:span></text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Matteo Casalin<text:line-break/>Commits: 1476<text:line-break/>Joined: <text:span text:style-name="T2">2011-11-13</text:span></text:p>
@@ -1222,29 +1222,29 @@
        <text:p text:style-name="Table_20_Contents">Thorsten Behrens<text:line-break/>Commits: 1440<text:line-break/>Joined: 2001-04-25</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents">Fridrich Štrba<text:line-break/>Commits: 1338<text:line-break/>Joined: 2007-02-22</text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Xisco Fauli<text:line-break/>Commits: 1348<text:line-break/>Joined: <text:span text:style-name="T2">2011-02-06</text:span></text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents">Thomas Lange [tl]<text:line-break/>Commits: 1310<text:line-break/>Joined: 2000-09-22</text:p>
+       <text:p text:style-name="Table_20_Contents">Fridrich Štrba<text:line-break/>Commits: 1338<text:line-break/>Joined: 2007-02-22</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Xisco Fauli<text:line-break/>Commits: 1300<text:line-break/>Joined: <text:span text:style-name="T2">2011-02-06</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents">Thomas Lange [tl]<text:line-break/>Commits: 1310<text:line-break/>Joined: 2000-09-22</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents">Niklas Nebel<text:line-break/>Commits: 1296<text:line-break/>Joined: 2000-09-19</text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Olivier Hallot<text:line-break/>Commits: 1305<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-25</text:span></text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Chris Sherlock<text:line-break/>Commits: 1294<text:line-break/>Joined: <text:span text:style-name="T2">2013-02-25</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents">Niklas Nebel<text:line-break/>Commits: 1296<text:line-break/>Joined: 2000-09-19</text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Olivier Hallot<text:line-break/>Commits: 1285<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-25</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Chris Sherlock<text:line-break/>Commits: 1294<text:line-break/>Joined: <text:span text:style-name="T2">2013-02-25</text:span></text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>andreas kainz<text:line-break/>Commits: 1216<text:line-break/>Joined: <text:span text:style-name="T2">2015-03-18</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>andreas kainz<text:line-break/>Commits: 1224<text:line-break/>Joined: <text:span text:style-name="T2">2015-03-18</text:span></text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Tamás Zolnai<text:line-break/>Commits: 1208<text:line-break/>Joined: <text:span text:style-name="T2">2012-08-06</text:span></text:p>
@@ -1253,26 +1253,26 @@
        <text:p text:style-name="Table_20_Contents">Daniel Rentz [dr]<text:line-break/>Commits: 1206<text:line-break/>Joined: 2000-09-28</text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Lionel Elie Mamane<text:line-break/>Commits: 1049<text:line-break/>Joined: <text:span text:style-name="T2">2011-01-15</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Lionel Elie Mamane<text:line-break/>Commits: 1051<text:line-break/>Joined: <text:span text:style-name="T2">2011-01-15</text:span></text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Gabor Kelemen<text:line-break/>Commits: 1004<text:line-break/>Joined: <text:span text:style-name="T2">2013-06-18</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Gabor Kelemen<text:line-break/>Commits: 1012<text:line-break/>Joined: <text:span text:style-name="T2">2013-06-18</text:span></text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Samuel Mehrbrodt<text:line-break/>Commits: 983<text:line-break/>Joined: <text:span text:style-name="T2">2011-06-08</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Samuel Mehrbrodt<text:line-break/>Commits: 984<text:line-break/>Joined: <text:span text:style-name="T2">2011-06-08</text:span></text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents">Petr Mladek<text:line-break/>Commits: 958<text:line-break/>Joined: 2006-10-03</text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents">Noel Power<text:line-break/>Commits: 950<text:line-break/>Joined: 2002-09-24</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Jan-Marek Glogowski<text:line-break/>Commits: 918<text:line-break/>Joined: <text:span text:style-name="T2">2013-11-14</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Jan-Marek Glogowski<text:line-break/>Commits: 934<text:line-break/>Joined: <text:span text:style-name="T2">2013-11-14</text:span></text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents">Kai Ahrens<text:line-break/>Commits: 909<text:line-break/>Joined: 2000-09-21</text:p>
@@ -1281,21 +1281,21 @@
        <text:p text:style-name="Table_20_Contents">Henning Brinkmann<text:line-break/>Commits: 899<text:line-break/>Joined: 2002-08-14</text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents">Christian Lohmaier<text:line-break/>Commits: 890<text:line-break/>Joined: 2008-06-01</text:p>
+       <text:p text:style-name="Table_20_Contents">Christian Lohmaier<text:line-break/>Commits: 897<text:line-break/>Joined: 2008-06-01</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents">Cédric Bosdonnat<text:line-break/>Commits: 882<text:line-break/>Joined: 2009-11-16</text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Szymon Kłos<text:line-break/>Commits: 888<text:line-break/>Joined: <text:span text:style-name="T2">2014-03-22</text:span></text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents">Malte Timmermann [mt]<text:line-break/>Commits: 864<text:line-break/>Joined: 2000-10-10</text:p>
+       <text:p text:style-name="Table_20_Contents">Cédric Bosdonnat<text:line-break/>Commits: 882<text:line-break/>Joined: 2009-11-16</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Szymon Kłos<text:line-break/>Commits: 859<text:line-break/>Joined: <text:span text:style-name="T2">2014-03-22</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents">Malte Timmermann [mt]<text:line-break/>Commits: 864<text:line-break/>Joined: 2000-10-10</text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents">Sven Jacobi<text:line-break/>Commits: 850<text:line-break/>Joined: 2000-09-21</text:p>
       </table:table-cell>
@@ -1309,7 +1309,7 @@
        <text:p text:style-name="Table_20_Contents">Mikhail Voytenko<text:line-break/>Commits: 793<text:line-break/>Joined: 2001-01-16</text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Maxim Monastirsky<text:line-break/>Commits: 778<text:line-break/>Joined: <text:span text:style-name="T2">2013-10-27</text:span></text:p>
       </table:table-cell>
@@ -1320,10 +1320,10 @@
        <text:p text:style-name="Table_20_Contents">Joachim Lingner<text:line-break/>Commits: 745<text:line-break/>Joined: 2000-10-05</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Katarina Behrens<text:line-break/>Commits: 734<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-13</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Katarina Behrens<text:line-break/>Commits: 738<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-13</text:span></text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Andrzej Hunt<text:line-break/>Commits: 734<text:line-break/>Joined: <text:span text:style-name="T2">2012-03-27</text:span></text:p>
       </table:table-cell>
@@ -1337,7 +1337,7 @@
        <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Zdeněk Crhonek<text:line-break/>Commits: 714<text:line-break/>Joined: <text:span text:style-name="T2">2016-05-19</text:span></text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents">Joerg Skottke [jsk]<text:line-break/>Commits: 678<text:line-break/>Joined: 2008-06-17</text:p>
       </table:table-cell>
@@ -1351,12 +1351,12 @@
        <text:p text:style-name="Table_20_Contents">Kai Sommerfeld<text:line-break/>Commits: 651<text:line-break/>Joined: 2000-10-10</text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents">Ingrid Halama<text:line-break/>Commits: 639<text:line-break/>Joined: 2001-01-19</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>László Németh<text:line-break/>Commits: 616<text:line-break/>Joined: <text:span text:style-name="T2">2010-09-29</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>László Németh<text:line-break/>Commits: 627<text:line-break/>Joined: <text:span text:style-name="T2">2010-09-29</text:span></text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Rafael Dominguez<text:line-break/>Commits: 606<text:line-break/>Joined: <text:span text:style-name="T2">2011-02-13</text:span></text:p>
@@ -1365,21 +1365,21 @@
        <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Jochen Nitschke<text:line-break/>Commits: 586<text:line-break/>Joined: <text:span text:style-name="T2">2016-02-02</text:span></text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Yousuf Philips<text:line-break/>Commits: 569<text:line-break/>Joined: <text:span text:style-name="T2">2014-09-21</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Johnny_M<text:line-break/>Commits: 582<text:line-break/>Joined: <text:span text:style-name="T2">2016-05-12</text:span></text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents">Thomas Benisch [tbe]<text:line-break/>Commits: 551<text:line-break/>Joined: 2000-10-23</text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Yousuf Philips<text:line-break/>Commits: 569<text:line-break/>Joined: <text:span text:style-name="T2">2014-09-21</text:span></text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Johnny_M<text:line-break/>Commits: 551<text:line-break/>Joined: <text:span text:style-name="T2">2016-05-12</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents">Thomas Benisch [tbe]<text:line-break/>Commits: 551<text:line-break/>Joined: 2000-10-23</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents">Rene Engelhard<text:line-break/>Commits: 542<text:line-break/>Joined: 2005-03-14</text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Khaled Hosny<text:line-break/>Commits: 542<text:line-break/>Joined: <text:span text:style-name="T2">2011-01-28</text:span></text:p>
       </table:table-cell>
@@ -1390,10 +1390,10 @@
        <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Peter Foley<text:line-break/>Commits: 489<text:line-break/>Joined: <text:span text:style-name="T2">2011-09-04</text:span></text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Adolfo Jayme Barrientos<text:line-break/>Commits: 476<text:line-break/>Joined: <text:span text:style-name="T2">2013-06-21</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Adolfo Jayme Barrientos<text:line-break/>Commits: 478<text:line-break/>Joined: <text:span text:style-name="T2">2013-06-21</text:span></text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>jan Iversen<text:line-break/>Commits: 474<text:line-break/>Joined: <text:span text:style-name="T2">2015-11-03</text:span></text:p>
       </table:table-cell>
@@ -1401,27 +1401,30 @@
        <text:p text:style-name="Table_20_Contents">Andreas Bregas<text:line-break/>Commits: 470<text:line-break/>Joined: 2000-09-25</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Justin Luth<text:line-break/>Commits: 445<text:line-break/>Joined: <text:span text:style-name="T2">2014-09-30</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Justin Luth<text:line-break/>Commits: 457<text:line-break/>Joined: <text:span text:style-name="T2">2014-09-30</text:span></text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Rizal Muttaqin<text:line-break/>Commits: 395<text:line-break/>Joined: <text:span text:style-name="T2">2018-05-21</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Rizal Muttaqin<text:line-break/>Commits: 429<text:line-break/>Joined: <text:span text:style-name="T2">2018-05-21</text:span></text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents">Dirk Voelzke<text:line-break/>Commits: 392<text:line-break/>Joined: 2000-11-27</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Ashod Nakashian<text:line-break/>Commits: 386<text:line-break/>Joined: <text:span text:style-name="T2">2015-01-07</text:span></text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Ashod Nakashian<text:line-break/>Commits: 388<text:line-break/>Joined: <text:span text:style-name="T2">2015-01-07</text:span></text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Ivan Timofeev<text:line-break/>Commits: 380<text:line-break/>Joined: <text:span text:style-name="T2">2011-09-16</text:span></text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
-       <text:p text:style-name="Table_20_Contents">Oliver-Rainer Wittmann<text:line-break/>Commits: 372<text:line-break/>Joined: 2002-08-09</text:p>
+       <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Seth Chaiklin<text:line-break/>Commits: 375<text:line-break/>Joined: <text:span text:style-name="T2">2019-11-13</text:span></text:p>
       </table:table-cell>
      </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
+     <table:table-row table:style-name="TableLine117846112">
+      <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
+       <text:p text:style-name="Table_20_Contents">Oliver-Rainer Wittmann<text:line-break/>Commits: 372<text:line-break/>Joined: 2002-08-09</text:p>
+      </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents">Martin Hollmichel<text:line-break/>Commits: 371<text:line-break/>Joined: 2000-09-19</text:p>
       </table:table-cell>
@@ -1431,67 +1434,64 @@
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Laurent BP<text:line-break/>Commits: 362<text:line-break/>Joined: <text:span text:style-name="T2">2011-08-31</text:span></text:p>
       </table:table-cell>
+     </table:table-row>
+     <table:table-row table:style-name="TableLine117846112">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Muhammet Kara<text:line-break/>Commits: 361<text:line-break/>Joined: <text:span text:style-name="T2">2016-03-20</text:span></text:p>
       </table:table-cell>
-     </table:table-row>
-     <table:table-row table:style-name="TableLine182217968">
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
        <text:p text:style-name="Table_20_Contents">Matthias Huetsch [mhu]<text:line-break/>Commits: 360<text:line-break/>Joined: 2000-09-28</text:p>
       </table:table-cell>
       <table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list