[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - 51 commits - basctl/source basic/source chart2/qa chart2/source config_host.mk.in configure.ac connectivity/registry cui/source cui/uiconfig dbaccess/CppunitTest_dbaccess_firebird_regression_test.mk dbaccess/CppunitTest_dbaccess_firebird_test.mk dbaccess/Module_dbaccess.mk dbaccess/qa dbaccess/source dtrans/Library_mcnttype.mk dtrans/source editeng/source extensions/source filter/source include/svx include/tools include/vcl instsetoo_native/CustomTarget_setup.mk instsetoo_native/util librelogo/source readlicense_oo/license reportdesign/inc reportdesign/source sc/qa scripting/source sc/sdi sc/source sc/uiconfig sd/source sfx2/source sfx2/uiconfig solenv/clang-format svl/source svx/source sw/qa sw/source vcl/source vcl/unx vcl/win writerfilter/source xmlscript/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Oct 25 14:15:08 UTC 2018
basctl/source/dlged/dlgedobj.cxx | 19
basic/source/runtime/dllmgr-x64.cxx | 2
chart2/qa/extras/xshape/data/reference/tdf90839-1.xml | 68
chart2/qa/extras/xshape/data/reference/tdf90839-2.xml | 10
chart2/qa/extras/xshape/data/reference/tdf90839-3.xml | 10
chart2/qa/extras/xshape/data/reference/tdf90839-4.xml | 10
chart2/source/controller/main/ChartController_Tools.cxx | 61
chart2/source/tools/DiagramHelper.cxx | 6
config_host.mk.in | 1
configure.ac | 11
connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu | 5
cui/source/customize/cfg.cxx | 6
cui/uiconfig/ui/positionpage.ui | 8
dbaccess/CppunitTest_dbaccess_firebird_regression_test.mk | 70
dbaccess/CppunitTest_dbaccess_firebird_test.mk | 18
dbaccess/Module_dbaccess.mk | 6
dbaccess/qa/unit/data/firebird_empty.odb |binary
dbaccess/qa/unit/data/firebird_empty_le.odb |binary
dbaccess/qa/unit/data/firebird_integer_ods12.odb |binary
dbaccess/qa/unit/firebird-regression.cxx | 108
dbaccess/qa/unit/firebird.cxx | 2
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 3
dtrans/Library_mcnttype.mk | 1
dtrans/source/cnttype/mcnttype.cxx | 269
dtrans/source/cnttype/mcnttype.hxx | 3
editeng/source/items/frmitems.cxx | 3
extensions/source/propctrlr/propertyhandler.hxx | 5
filter/source/xslt/export/wordml/ooo2wordml_list.xsl | 3
include/svx/fmview.hxx | 6
include/tools/stream.hxx | 8
include/vcl/button.hxx | 2
instsetoo_native/CustomTarget_setup.mk | 2
instsetoo_native/util/openoffice.lst.in | 2
librelogo/source/LibreLogo/LibreLogo.py | 4
readlicense_oo/license/CREDITS.fodt | 3830 +++++-----
reportdesign/inc/RptObject.hxx | 4
reportdesign/source/core/sdr/RptObject.cxx | 55
reportdesign/source/ui/report/ReportController.cxx | 51
sc/qa/unit/data/ods/tdf62268.ods |binary
sc/qa/unit/helper/qahelper.cxx | 3
sc/qa/unit/subsequent_export-test.cxx | 59
sc/qa/unit/subsequent_filters-test.cxx | 26
sc/sdi/scalc.sdi | 8
sc/source/core/data/column4.cxx | 16
sc/source/core/tool/queryparam.cxx | 6
sc/source/filter/excel/xeformula.cxx | 6
sc/source/filter/xml/xmlimprt.cxx | 21
sc/source/filter/xml/xmlimprt.hxx | 5
sc/source/filter/xml/xmlrowi.cxx | 16
sc/source/ui/app/transobj.cxx | 66
sc/source/ui/view/cellsh.cxx | 8
sc/source/ui/view/gridwin.cxx | 2
sc/uiconfig/scalc/ui/recalcquerydialog.ui | 1
scripting/source/pyprov/pythonscript.py | 30
sd/source/ui/view/ToolBarManager.cxx | 17
sfx2/source/sidebar/SidebarController.cxx | 2
sfx2/uiconfig/ui/linkeditdialog.ui | 1
solenv/clang-format/blacklist | 1
svl/source/numbers/zformat.cxx | 4
svx/source/fmcomp/gridcell.cxx | 13
svx/source/fmcomp/gridctrl.cxx | 4
svx/source/form/fmview.cxx | 4
svx/source/form/fmvwimp.cxx | 32
svx/source/inc/fmvwimp.hxx | 6
sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 13
sw/qa/extras/rtfexport/data/tdf112520.docx |binary
sw/qa/extras/rtfexport/rtfexport.cxx | 2
sw/qa/extras/rtfexport/rtfexport3.cxx | 21
sw/source/core/unocore/unoidx.cxx | 6
sw/source/filter/ww8/docxattributeoutput.cxx | 9
sw/source/filter/ww8/rtfsdrexport.cxx | 12
sw/source/filter/ww8/rtfsdrexport.hxx | 2
sw/source/filter/ww8/ww8par.cxx | 40
sw/source/uibase/docvw/PostItMgr.cxx | 5
sw/source/uibase/docvw/edtwin2.cxx | 2
sw/source/uibase/sidebar/PageFormatPanel.cxx | 9
vcl/source/control/field.cxx | 7
vcl/source/window/builder.cxx | 3
vcl/source/window/menu.cxx | 2
vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx | 43
vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.hxx | 55
vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx | 229
vcl/unx/gtk3_kde5/kde5_filepicker_ipc.hxx | 18
vcl/win/gdi/salfont.cxx | 16
vcl/win/gdi/salprn.cxx | 7
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 54
xmlscript/source/xmldlg_imexp/xmldlg_export.cxx | 2
87 files changed, 3023 insertions(+), 2563 deletions(-)
New commits:
commit 18a388c696567e6ddbf8c997ee0a9a686e7d80ed
Author: Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Fri Oct 12 16:37:32 2018 +0200
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu Oct 25 10:33:30 2018 +0200
editeng: do not throw from QueryValue implementation
None of the other QueryValue throw; in case of a problem they return
false without initialising the Any.
On the one hand, it would be useful to throw an exception for this
special property that has now become Write-Only, so that API users
get a better hint what is going wrong; on the other hand, it breaks
various other things like the various multi-property interfaces that
call QueryValue for multiple items (there are 3 such loops in
SwAccessibleParagraph alone).
(throw was introduced in 7a8ed362eb163ac15a000ba1cfc74b58315800a1)
It turns out there is even a test for the exception on ToX.
Change-Id: Id60ff43544f7399ce869227bfd6fb933dbaea3be
Reviewed-on: https://gerrit.libreoffice.org/61719
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
Signed-off-by: Michael Meeks <michael.meeks at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/62331
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index d5c2e7aea47b..e3ca3a125595 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -3316,7 +3316,8 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
case MID_GRAPHIC_URL:
{
- throw uno::RuntimeException("Getting from this property is not supported");
+ SAL_INFO("editeng.items", "Getting GraphicURL property is not supported");
+ return false;
}
break;
case MID_GRAPHIC:
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index f2550b36fa23..76f4faf3e09b 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -36,6 +36,7 @@
#include <cppuhelper/supportsservice.hxx>
#include <vcl/svapp.hxx>
#include <editeng/unolingu.hxx>
+#include <editeng/memberids.h>
#include <hints.hxx>
#include <cmdid.h>
#include <swtypes.hxx>
@@ -886,6 +887,11 @@ SwXDocumentIndex::getPropertyValue(const OUString& rPropertyName)
"Unknown property: " + rPropertyName,
static_cast< cppu::OWeakObject * >(this));
}
+ // TODO: is this the best approach to tell API clients about the change?
+ if (pEntry->nWID == RES_BACKGROUND && pEntry->nMemberId == MID_GRAPHIC_URL)
+ {
+ throw uno::RuntimeException("Getting GraphicURL property is not supported");
+ }
SwSectionFormat *const pSectionFormat( m_pImpl->GetSectionFormat() );
SwTOXBase* pTOXBase = nullptr;
commit 424454997a2a464d99c0e7125ea6b143716715b0
Author: Lionel Elie Mamane <lionel at mamane.lu>
AuthorDate: Wed Oct 24 18:13:56 2018 +0200
Commit: Lionel Elie Mamane <lionel at mamane.lu>
CommitDate: Thu Oct 25 10:03:23 2018 +0200
tdf#120713 correctly handle boolean values in filters
This commit has two parts:
- Hardcode the correct BooleanComparisonMode in the firebird-sdbc driver
(this fixes on Firebird databases, among others, the AutoFilter for bools)
- Generic to all DBMS, have the "form-based filter" obey the BooleanComparisonMode
Change-Id: Ib14e6c3d5cb773ae1f972840f8b53062f0224396
Reviewed-on: https://gerrit.libreoffice.org/62320
Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
Tested-by: Jenkins
diff --git a/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu
index 03896aff4412..586264183b60 100644
--- a/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -66,6 +66,11 @@
<value>true</value>
</prop>
</node>
+ <node oor:name="BooleanComparisonMode" oor:op="replace">
+ <prop oor:name="Value" oor:type="xs:int">
+ <value>2</value>
+ </prop>
+ </node>
</node><!--Properties-->
<node oor:name="Features">
</node><!--Features-->
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 222267f4b85e..a6abdc7cdc83 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -3099,20 +3099,27 @@ void DbFilterField::UpdateFromField(const Reference< XColumn >& /*_rxField*/, co
IMPL_LINK_NOARG(DbFilterField, OnClick, VclPtr<CheckBox>, void)
{
TriState eState = static_cast<CheckBoxControl*>(m_pWindow.get())->GetBox().GetState();
- OUString aText;
+ OUStringBuffer aTextBuf;
+
+ Reference< XRowSet > xDataSourceRowSet(
+ Reference< XInterface >(*m_rColumn.GetParent().getDataSource()), UNO_QUERY);
+ Reference< XConnection > xConnection(getConnection(xDataSourceRowSet));
+ const sal_Int32 nBooleanComparisonMode = ::dbtools::DatabaseMetaData( xConnection ).getBooleanComparisonMode();
switch (eState)
{
case TRISTATE_TRUE:
- aText = "1";
+ ::dbtools::getBooleanComparisonPredicate("", true, nBooleanComparisonMode, aTextBuf);
break;
case TRISTATE_FALSE:
- aText = "0";
+ ::dbtools::getBooleanComparisonPredicate("", false, nBooleanComparisonMode, aTextBuf);
break;
case TRISTATE_INDET:
break;
}
+ const OUString aText(aTextBuf.makeStringAndClear());
+
if (m_aText != aText)
{
m_aText = aText;
commit 1805239ffd35a4ee87b6c9ac05891ec60f7d577a
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Sat Jun 9 15:21:40 2018 +0200
Commit: Eike Rathke <erack at redhat.com>
CommitDate: Wed Oct 24 20:27:29 2018 +0200
adding some fuzz to row height tolerance tests
Expanding on a4ab0c08e74746a96dcf23c3d50cd2e65ee31342 there's
another test that on some tinderboxes was a few permille off.
Adding 1% fuzz in comparison, seems we've now aquired some font
layout instabilities across platforms.
Change-Id: I7b068105c6ffad44b055e4dc37deb03c6040ab09
Reviewed-on: https://gerrit.libreoffice.org/55509
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
(cherry picked from commit 47cd12eba409ba08c041b5405a3f606102848365)
Reviewed-on: https://gerrit.libreoffice.org/62303
Reviewed-by: Vasily Melenchuk <vasily.melenchuk at cib.de>
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack at redhat.com>
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 5d112bd73489..326dc0608f29 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -4089,9 +4089,9 @@ void ScFiltersTest::testTdf62268()
SCTAB nTab = 0;
nHeight = rDoc.GetRowHeight(0, nTab, false);
- CPPUNIT_ASSERT_EQUAL(256, nHeight);
+ CPPUNIT_ASSERT_LESSEQUAL( 3, abs( 256 - nHeight ) );
nHeight = rDoc.GetRowHeight(1, nTab, false);
- CPPUNIT_ASSERT_EQUAL(1905, nHeight);
+ CPPUNIT_ASSERT_LESSEQUAL( 19, abs( 1905 - nHeight ) );
xDocSh->DoClose();
}
commit d6f563b37d8a694c6c1d4c9ef3ba746c7f019517
Author: Eike Rathke <erack at redhat.com>
AuthorDate: Mon Oct 22 22:07:54 2018 +0200
Commit: Eike Rathke <erack at redhat.com>
CommitDate: Wed Oct 24 10:33:41 2018 +0200
Resolves: tdf#120689 omit <definedName> for ocMacro in OOXML
Change-Id: I7578d568d2afe5d3a45b31a8a349cd370b03fc67
Reviewed-on: https://gerrit.libreoffice.org/62204
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Jenkins
(cherry picked from commit 4df55ffee791b9fcb4b2f5e6c64ad15b34316faf)
Reviewed-on: https://gerrit.libreoffice.org/62235
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index 3cd1bd9a06bf..e8cb691b5bdb 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -1632,7 +1632,11 @@ void XclExpFmlaCompImpl::AppendDefaultParam( XclExpFuncData& rFuncData )
AppendEuroToolCallToken( rFuncData.GetExtFuncData() );
break;
case ocMacro:
- AppendMacroCallToken( rFuncData.GetExtFuncData() );
+ // Do not write the OOXML <definedName> element.
+ if (GetOutput() == EXC_OUTPUT_XML_2007)
+ AppendNameToken( 0 ); // dummy to keep parameter count valid
+ else
+ AppendMacroCallToken( rFuncData.GetExtFuncData() );
break;
default:
{
commit 5e582b7755c9d1e7e358cf5734c8b93d5219622d
Author: Armin Le Grand <Armin.Le.Grand at cib.de>
AuthorDate: Fri Oct 19 14:01:18 2018 +0200
Commit: Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Tue Oct 23 23:06:23 2018 +0200
tdf#120674 set DlgEdForm early in DlgEdObj::EndCreate
Change-Id: I5ba0504265f5692614a8db0117883528bd4bfc0b
Reviewed-on: https://gerrit.libreoffice.org/62000
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand at cib.de>
(cherry picked from commit 92b849b9297cbf78bddf5e48bdbd44303a7021db)
Reviewed-on: https://gerrit.libreoffice.org/62224
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 8052f3cb159a..36e39f0d3b6a 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -946,6 +946,22 @@ bool DlgEdObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
{
bool bResult = SdrUnoObj::EndCreate(rStat, eCmd);
+ // tdf#120674 after interactive creation, the SdrObject (this) has no SdrPage yet
+ // due to not being inserted. Usually this should be handled in a ::handlePageChange
+ // implementation. For historical reasons, the SdrPage (which is the DlgEdPage) was
+ // already set. For now, get it from the SdrDragStat and use it to access and set
+ // the local pDlgEdForm
+ if(nullptr == pDlgEdForm && nullptr != rStat.GetPageView())
+ {
+ const DlgEdPage* pDlgEdPage(dynamic_cast<const DlgEdPage*>(rStat.GetPageView()->GetPage()));
+
+ if(nullptr != pDlgEdPage)
+ {
+ // set parent form
+ pDlgEdForm = pDlgEdPage->GetDlgEdForm();
+ }
+ }
+
SetDefaults();
StartListening();
@@ -954,9 +970,6 @@ bool DlgEdObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
void DlgEdObj::SetDefaults()
{
- // set parent form
- pDlgEdForm = static_cast<DlgEdPage*>(getSdrPageFromSdrObject())->GetDlgEdForm();
-
if ( pDlgEdForm )
{
// add child to parent form
commit f6d13aa7e1f0dd3baafc70795008722b46867b76
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Oct 19 12:55:00 2018 +0100
Commit: Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Tue Oct 23 10:44:53 2018 +0200
wrong pointer check
since...
commit 2636ab883adbcb1f6593787934c6d6d3fff67c21
Date: Mon Sep 15 20:13:54 2014 +0200
vcl menu: Rename CloseStartedFrom() to ClosePopup() + adapt code.
Change-Id: Ie30f6d907907551e23e592b8502107e75c333f2e
Reviewed-on: https://gerrit.libreoffice.org/62045
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 62739890e3aa..a2d6083c234f 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2700,7 +2700,7 @@ void PopupMenu::ClosePopup(Menu* pMenu)
{
MenuFloatingWindow* p = dynamic_cast<MenuFloatingWindow*>(ImplGetWindow());
PopupMenu *pPopup = dynamic_cast<PopupMenu*>(pMenu);
- if (p && pMenu)
+ if (p && pPopup)
p->KillActivePopup(pPopup);
}
commit 9fe444b407f2bdcf1956ac3498c7443b571159de
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Oct 22 15:14:57 2018 +0100
Commit: Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Tue Oct 23 10:41:49 2018 +0200
pvs-studio: V670 The uninitialized class member 'm_aMutex' is used
Change-Id: I7ac2662afe77e6e9170b004b335635f97ae03692
Reviewed-on: https://gerrit.libreoffice.org/62185
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx
index faad4b062f47..37ad084fcbe4 100644
--- a/extensions/source/propctrlr/propertyhandler.hxx
+++ b/extensions/source/propctrlr/propertyhandler.hxx
@@ -38,6 +38,7 @@
#include <com/sun/star/inspection/XPropertyHandler.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <osl/interlck.h>
+#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase1.hxx>
#include <comphelper/uno3.hxx>
@@ -68,7 +69,8 @@ namespace pcr
> PropertyHandler_Base;
/** the base class for property handlers
*/
- class PropertyHandler : public PropertyHandler_Base
+ class PropertyHandler : public ::cppu::BaseMutex
+ , public PropertyHandler_Base
{
private:
/// cache for getSupportedProperties
@@ -81,7 +83,6 @@ namespace pcr
PropertyChangeListeners m_aPropertyListeners;
protected:
- mutable ::osl::Mutex m_aMutex;
/// the context in which the instance was created
css::uno::Reference< css::uno::XComponentContext > m_xContext;
/// the component we're inspecting
commit 790af9d119094bb2e47bac29017b392ecaa8df30
Author: Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Mon Oct 22 23:01:25 2018 +0200
Commit: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Tue Oct 23 08:21:24 2018 +0200
tdf#120795: fix ooo2wordml_list.xsl syntax
See errors in comments from tracker
Regression from:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=1501df419ea4d40358d705a281fd9662088ba51e
Change-Id: I9bbf970ac2b8cbf8fcc448f0847f61e8606797c7
Reviewed-on: https://gerrit.libreoffice.org/62205
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
(cherry picked from commit 2995a95d8efa727ea53b06323c0b2bdc52e1aed0)
Reviewed-on: https://gerrit.libreoffice.org/62210
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/filter/source/xslt/export/wordml/ooo2wordml_list.xsl b/filter/source/xslt/export/wordml/ooo2wordml_list.xsl
index e3c9614d6e06..67337bc4eab3 100644
--- a/filter/source/xslt/export/wordml/ooo2wordml_list.xsl
+++ b/filter/source/xslt/export/wordml/ooo2wordml_list.xsl
@@ -228,12 +228,15 @@
<xsl:when test="$number-format = 'I'">
<!-- nfcUCRoman: Uppercase roman -->
<w:nfc w:val="1"/>
+ </xsl:when>
<xsl:when test="$number-format = '1st'">
<!-- nfcUCOrdinal: Ordinal indicator -->
<w:nfc w:val="5"/>
+ </xsl:when>
<xsl:when test="$number-format = 'One'">
<!-- nfcCardText: Cardinal -->
<w:nfc w:val="6"/>
+ </xsl:when>
<xsl:when test="$number-format = 'First'">
<!-- nfcOrdText: Ordinal -->
<w:nfc w:val="7"/>
commit 5de85be43198804573787d4186b156b5931c4a9f
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Oct 22 14:37:14 2018 +0100
Commit: Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Mon Oct 22 23:37:03 2018 +0200
cannot interact with chart sidebar as the previous deck is still active
Change-Id: I7972ef73b8c11ae78569fa1c7dc0a244ebba3f30
Reviewed-on: https://gerrit.libreoffice.org/62182
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 4f2b3e900d6a..14b40e58a6f8 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -732,6 +732,8 @@ void SidebarController::SwitchToDeck (
if (bForceNewPanels && !bForceNewDeck) // already forced if bForceNewDeck
CreatePanels(rDeckDescriptor.msId, rContext);
+ if (mpCurrentDeck && mpCurrentDeck != rDeckDescriptor.mpDeck)
+ mpCurrentDeck->Hide();
mpCurrentDeck.reset(rDeckDescriptor.mpDeck);
if ( ! mpCurrentDeck)
commit 693953dd4699887bd3f5bca2c3582b5fae1d6992
Author: Vasily Melenchuk <Vasily.Melenchuk at cib.de>
AuthorDate: Fri Apr 6 20:19:10 2018 +0300
Commit: Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Mon Oct 22 23:30:23 2018 +0200
tdf#62268: allow row height recalculation on document load
During document load rows with style:use-optimal-row-height="true"
should recalculate it's height.
* includes: Row height tolerance level increase for unittest
* tdf#118086: calc: invalid row autoheight fixed
Change-Id: Ib38b5b753d9ff8352116d77851d228c5d77bd530
Reviewed-on: https://gerrit.libreoffice.org/52521
Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
(cherry picked from commit 1e55a47e89a9d9d6cf9cb3993484022aaf2c097b)
Reviewed-on: https://gerrit.libreoffice.org/61898
Tested-by: Jenkins
diff --git a/sc/qa/unit/data/ods/tdf62268.ods b/sc/qa/unit/data/ods/tdf62268.ods
new file mode 100644
index 000000000000..da88adfd25cd
Binary files /dev/null and b/sc/qa/unit/data/ods/tdf62268.ods differ
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index 8aa9cc883568..d414b1abfb96 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -754,7 +754,8 @@ void ScBootstrapFixture::miscRowHeightsTest( TestParam const * aTestValues, unsi
bool bOpt = !(rDoc.GetRowFlags( nRow, nTab ) & CRFlags::ManualSize);
CPPUNIT_ASSERT_EQUAL(aTestValues[ index ].pData[ i ].bOptimal, bOpt);
}
- CPPUNIT_ASSERT_EQUAL(nExpectedHeight, nHeight);
+ // Due to some minor differences on Mac this comparison is made bit fuzzy
+ CPPUNIT_ASSERT_LESSEQUAL( 15, abs( nHeight - nExpectedHeight ) );
}
}
xShell->DoClose();
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index ea0792f5acee..36f62373e7e0 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -1034,60 +1034,57 @@ void ScExportTest::testOutlineExportXLSX()
// We expected that exactly 13 unique Nodes will be produced
assertXPath(pSheet, "/x:worksheet/x:cols/x:col", 13);
- // We need to save all 30 rows, as it provides information about outLineLevel
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[1]", "r", "1");
+ // First row is empty and default so it is not written into XML file
+ // so we need to save 29 rows, as it provides information about outLineLevel
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[1]", "r", "2");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[1]", "hidden", "false");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[1]", "outlineLevel", "0");
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[1]", "outlineLevel", "1");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[1]", "collapsed", "false");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[2]", "r", "2");
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[2]", "r", "3");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[2]", "hidden", "false");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[2]", "outlineLevel", "1");
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[2]", "outlineLevel", "2");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[2]", "collapsed", "false");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[3]", "r", "3");
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[3]", "r", "4");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[3]", "hidden", "false");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[3]", "outlineLevel", "2");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[3]", "collapsed", "false");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[4]", "r", "4");
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[4]", "r", "5");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[4]", "hidden", "false");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[4]", "outlineLevel", "2");
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[4]", "outlineLevel", "3");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[4]", "collapsed", "false");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[5]", "r", "5");
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[5]", "r", "6");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[5]", "hidden", "false");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[5]", "outlineLevel", "3");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[5]", "collapsed", "false");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[6]", "r", "6");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[6]", "hidden", "false");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[6]", "outlineLevel", "3");
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[6]", "r", "7");
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[6]", "hidden", "true");
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[6]", "outlineLevel", "4");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[6]", "collapsed", "false");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[7]", "r", "7");
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[7]", "r", "8");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[7]", "hidden", "true");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[7]", "outlineLevel", "4");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[7]", "collapsed", "false");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[8]", "r", "8");
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[8]", "r", "9");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[8]", "hidden", "true");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[8]", "outlineLevel", "4");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[8]", "collapsed", "false");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[9]", "r", "9");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[9]", "hidden", "true");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[9]", "outlineLevel", "4");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[9]", "collapsed", "false");
// Next rows are the same as the previous one but it needs to bre preserved,
// as they contain information about outlineLevel
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[21]", "r", "21");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[21]", "hidden", "true");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[21]", "outlineLevel", "4");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[21]", "collapsed", "false");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[22]", "r", "22");
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[20]", "r", "21");
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[20]", "hidden", "true");
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[20]", "outlineLevel", "4");
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[20]", "collapsed", "false");
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[21]", "r", "22");
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[21]", "hidden", "false");
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[21]", "outlineLevel", "3");
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[21]", "collapsed", "true");
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[22]", "r", "23");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[22]", "hidden", "false");
assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[22]", "outlineLevel", "3");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[22]", "collapsed", "true");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[23]", "r", "23");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[23]", "hidden", "false");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[23]", "outlineLevel", "3");
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[23]", "collapsed", "false");
-
- // We expected that exactly 30 Row Nodes will be produced
- assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row", 30);
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[22]", "collapsed", "false");
+
+ // We expected that exactly 29 Row Nodes will be produced
+ assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row", 29);
}
void ScExportTest::testAllRowsHiddenXLSX()
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 0d6bc90761fb..5d112bd73489 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -246,6 +246,7 @@ public:
void testBorderColorsXLSXML();
void testHiddenRowsColumnsXLSXML();
void testColumnWidthRowHeightXLSXML();
+ void testTdf62268();
CPPUNIT_TEST_SUITE(ScFiltersTest);
CPPUNIT_TEST(testBooleanFormatXLSX);
@@ -378,6 +379,7 @@ public:
CPPUNIT_TEST(testHiddenRowsColumnsXLSXML);
CPPUNIT_TEST(testColumnWidthRowHeightXLSXML);
CPPUNIT_TEST(testCondFormatFormulaListenerXLSX);
+ CPPUNIT_TEST(testTdf62268);
CPPUNIT_TEST_SUITE_END();
@@ -2654,8 +2656,8 @@ void ScFiltersTest::testMiscRowHeights()
TestParam::RowData MultiLineOptData[] =
{
- // Row 0 is 12.63 mm and optimal flag is set
- { 0, 0, 0, 1263, CHECK_OPTIMAL, true },
+ // Row 0 is 12.63 mm, but optimal flag is set
+ { 0, 0, 0, 1236, CHECK_OPTIMAL, true },
// Row 1 is 11.99 mm and optimal flag is NOT set
{ 1, 1, 0, 1199, CHECK_OPTIMAL, false },
};
@@ -2687,8 +2689,9 @@ void ScFiltersTest::testOptimalHeightReset()
ScDocument& rDoc = xDocSh->GetDocument();
// open document in read/write mode ( otherwise optimal height stuff won't
// be triggered ) *and* you can't delete cell contents.
- int nHeight = sc::TwipsToHMM ( rDoc.GetRowHeight(nRow, nTab, false) );
- CPPUNIT_ASSERT_EQUAL(1263, nHeight);
+ int nHeight = rDoc.GetRowHeight(nRow, nTab, false);
+ // Due to some minor differences on Mac this comparison is made bit fuzzy
+ CPPUNIT_ASSERT_LESSEQUAL( 8, abs( nHeight - 701 ) );
ScDocFunc &rFunc = xDocSh->GetDocFunc();
@@ -4078,6 +4081,21 @@ void ScFiltersTest::testCondFormatFormulaListenerXLSX()
xDocSh->DoClose();
}
+void ScFiltersTest::testTdf62268()
+{
+ ScDocShellRef xDocSh = loadDoc("tdf62268.", FORMAT_ODS);
+ ScDocument& rDoc = xDocSh->GetDocument();
+ int nHeight;
+
+ SCTAB nTab = 0;
+ nHeight = rDoc.GetRowHeight(0, nTab, false);
+ CPPUNIT_ASSERT_EQUAL(256, nHeight);
+ nHeight = rDoc.GetRowHeight(1, nTab, false);
+ CPPUNIT_ASSERT_EQUAL(1905, nHeight);
+
+ xDocSh->DoClose();
+}
+
ScFiltersTest::ScFiltersTest()
: ScBootstrapFixture( "sc/qa/unit/data" )
{
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index ca24d77523b5..3be69b5ae4f0 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -76,6 +76,7 @@
#include "pivotsource.hxx"
#include <unonames.hxx>
#include <numformat.hxx>
+#include <sizedev.hxx>
#include <comphelper/base64.hxx>
#include <comphelper/extract.hxx>
@@ -1809,6 +1810,26 @@ void SAL_CALL ScXMLImport::endDocument()
pDoc->SetStreamValid( nTab, true );
}
}
+
+ // There are rows with optimal height which need to be updated
+ if (!maRecalcRowRanges.empty())
+ {
+ bool bLockHeight = pDoc->IsAdjustHeightLocked();
+ if (bLockHeight)
+ {
+ pDoc->UnlockAdjustHeight();
+ }
+
+ ScSizeDeviceProvider aProv(static_cast<ScDocShell*>(pDoc->GetDocumentShell()));
+ ScDocRowHeightUpdater aUpdater(*pDoc, aProv.GetDevice(), aProv.GetPPTX(), aProv.GetPPTY(), &maRecalcRowRanges);
+ aUpdater.update();
+
+ if (bLockHeight)
+ {
+ pDoc->LockAdjustHeight();
+ }
+ }
+
aTables.FixupOLEs();
}
if (GetModel().is())
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index 59b4fb1fce18..555835033747 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -31,6 +31,7 @@
#include <global.hxx>
#include <formula/grammar.hxx>
#include <compiler.hxx>
+#include <dociter.hxx>
#include "xmlstyle.hxx"
#include <com/sun/star/sheet/ValidationAlertStyle.hpp>
@@ -269,6 +270,8 @@ class ScXMLImport: public SvXMLImport
ScMyTables aTables;
+ std::vector<ScDocRowHeightUpdater::TabRanges> maRecalcRowRanges;
+
std::unique_ptr<ScMyNamedExpressions> m_pMyNamedExpressions;
SheetNamedExpMap m_SheetNamedExpressions;
@@ -341,6 +344,8 @@ public:
ScMyTables& GetTables() { return aTables; }
+ std::vector<ScDocRowHeightUpdater::TabRanges>& GetRecalcRowRanges() { return maRecalcRowRanges; }
+
bool IsStylesOnlyMode() const { return !bLoadDoc; }
static sal_Int16 GetCellType(const char* rStrValue, const sal_Int32 nStrLength);
diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx
index 7f958d459f4d..3093c33f0a8e 100644
--- a/sc/source/filter/xml/xmlrowi.cxx
+++ b/sc/source/filter/xml/xmlrowi.cxx
@@ -27,6 +27,7 @@
#include <olinetab.hxx>
#include <sheetdata.hxx>
#include <documentimport.hxx>
+#include <unonames.hxx>
#include <xmloff/xmltkmap.hxx>
#include <xmloff/nmspmap.hxx>
@@ -198,6 +199,21 @@ void SAL_CALL ScXMLTableRowContext::endFastElement(sal_Int32 /*nElement*/)
}
if (bFiltered)
xRowProperties->setPropertyValue(SC_ISFILTERED, uno::makeAny(bFiltered));
+
+ uno::Any any = xRowProperties->getPropertyValue(SC_UNONAME_OHEIGHT);
+ bool bOptionalHeight = false;
+ any >>= bOptionalHeight;
+ if (bOptionalHeight)
+ {
+ // Save this row for later height update
+ std::vector<ScDocRowHeightUpdater::TabRanges>& rRecalcRanges = rXMLImport.GetRecalcRowRanges();
+ while (static_cast<SCTAB>(rRecalcRanges.size()) <= nSheet)
+ {
+ rRecalcRanges.emplace_back(0);
+ }
+ rRecalcRanges.at(nSheet).mnTab = nSheet;
+ rRecalcRanges.at(nSheet).mpRanges->setTrue(nFirstRow, nCurrentRow);
+ }
}
}
}
commit fad764c02c7a9cd210bfa44ea0ce1ac5354d6427
Author: Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Thu Oct 18 20:21:27 2018 +0200
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Oct 22 21:56:49 2018 +0200
tdf#120410: Disable insert/delete row/page break if sheet is protected
Follow-up on f7982d4dfa85f15a6f0c25e9795a5847ecfcbf31
Change-Id: I2defd3474fdbb0b87898df7734bb076ab95c8c08
Reviewed-on: https://gerrit.libreoffice.org/61950
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack at redhat.com>
(cherry picked from commit 812f63ba45ae6cd10ff2e9ed14ca01baeb4fe528)
Reviewed-on: https://gerrit.libreoffice.org/62177
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index cda4214c4d36..854794adfb9d 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -872,22 +872,22 @@ void ScCellShell::GetState(SfxItemSet &rSet)
break;
case FID_INS_ROWBRK:
- if ( nPosY==0 || (pDoc->HasRowBreak(nPosY, nTab) & ScBreakType::Manual) )
+ if ( nPosY==0 || (pDoc->HasRowBreak(nPosY, nTab) & ScBreakType::Manual) || pDoc->IsTabProtected(nTab) )
rSet.DisableItem( nWhich );
break;
case FID_INS_COLBRK:
- if ( nPosX==0 || (pDoc->HasColBreak(nPosX, nTab) & ScBreakType::Manual) )
+ if ( nPosX==0 || (pDoc->HasColBreak(nPosX, nTab) & ScBreakType::Manual) || pDoc->IsTabProtected(nTab) )
rSet.DisableItem( nWhich );
break;
case FID_DEL_ROWBRK:
- if ( nPosY==0 || !(pDoc->HasRowBreak(nPosY, nTab) & ScBreakType::Manual) )
+ if ( nPosY==0 || !(pDoc->HasRowBreak(nPosY, nTab) & ScBreakType::Manual) || pDoc->IsTabProtected(nTab) )
rSet.DisableItem( nWhich );
break;
case FID_DEL_COLBRK:
- if ( nPosX==0 || !(pDoc->HasColBreak(nPosX, nTab) & ScBreakType::Manual) )
+ if ( nPosX==0 || !(pDoc->HasColBreak(nPosX, nTab) & ScBreakType::Manual) || pDoc->IsTabProtected(nTab) )
rSet.DisableItem( nWhich );
break;
commit 77536b29b9241930256917fde7e5fc9513be9a7c
Author: heiko tietze <tietze.heiko at gmail.com>
AuthorDate: Thu Oct 18 12:12:26 2018 +0200
Commit: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Mon Oct 22 13:38:18 2018 +0200
tdf#120176 - Text appears as white on first launch
Splash screen text should be black now
Change-Id: I963ffc89c48fdc1de148586cd6f0fb4bf35d44bd
Reviewed-on: https://gerrit.libreoffice.org/61924
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <tietze.heiko at gmail.com>
(cherry picked from commit 920bf3979cd7421110b65621635aefc072e8a779)
Reviewed-on: https://gerrit.libreoffice.org/62176
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/configure.ac b/configure.ac
index 38a39a35ebbb..df9441656bfe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2119,7 +2119,7 @@ AC_ARG_WITH(branding,
bar from left,top. Comma separated decimal values.
PROGRESSFRAMECOLOR="20,136,3" Set color of progress
bar frame. Comma separated RGB decimal values.
- PROGRESSTEXTCOLOR="255,255,255" Set color of progress
+ PROGRESSTEXTCOLOR="0,0,0" Set color of progress
bar text. Comma separated RGB decimal values.
PROGRESSTEXTBASELINE="287" Set vertical position of
progress bar text from top. Decimal value.
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index ebeb00dcd019..ec31d718a6a0 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -129,7 +129,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'ProgressPositionHigh=46,212' \
&& echo 'ProgressSizeHigh=617,12' \
&& echo 'ProgressTextBaseline=145' \
- && echo 'ProgressTextColor=255,255,255' \
+ && echo 'ProgressTextColor=0,0,0' \
&& echo 'SecureUserConfig=true' \
&& echo 'SecureUserConfigCompress=true' \
&& echo 'SecureUserConfigExtensions=true' \
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index afc8631cfd3a..8394418d5fe6 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -22,7 +22,7 @@ Globals
PROGRESSPOSITIONHIGH 46,212
PROGRESSFRAMECOLOR 102,102,102
PROGRESSTEXTBASELINE 145
- PROGRESSTEXTCOLOR 255,255,255
+ PROGRESSTEXTCOLOR 0,0,0
NATIVEPROGRESS false
REGISTRYLAYERNAME Layers
SERVICEPACK 1
commit e67ca59e293c4dd37795150cf871e36ca1affb76
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Oct 17 15:03:24 2018 +0100
Commit: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Mon Oct 22 12:27:58 2018 +0200
tdf#120651 have to sort radiogroup by tab position
Change-Id: I8fcf4c4b186d8292c85babaa90e98396a5fbc71b
Reviewed-on: https://gerrit.libreoffice.org/61883
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/cui/uiconfig/ui/positionpage.ui b/cui/uiconfig/ui/positionpage.ui
index 0e0c731d7b67..987064ff1dc8 100644
--- a/cui/uiconfig/ui/positionpage.ui
+++ b/cui/uiconfig/ui/positionpage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.4 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="cui">
<requires lib="gtk+" version="3.18"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -82,8 +82,8 @@
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
+ <property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">subscript</property>
</object>
<packing>
<property name="expand">False</property>
@@ -99,8 +99,8 @@
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
- <property name="active">True</property>
<property name="draw_indicator">True</property>
+ <property name="group">normal</property>
</object>
<packing>
<property name="expand">False</property>
@@ -493,7 +493,7 @@
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="shadow_type">in</property>
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 85f798af5c90..8a259b60b06e 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -268,6 +268,8 @@ public:
class VCL_DLLPUBLIC RadioButton : public Button
{
private:
+ friend class VclBuilder;
+
std::shared_ptr< std::vector< VclPtr< RadioButton > > > m_xGroup;
tools::Rectangle maStateRect;
tools::Rectangle maMouseRect;
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 219fb2dcab0b..63e459a0becb 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -418,7 +418,10 @@ VclBuilder::VclBuilder(vcl::Window *pParent, const OUString& sUIDir, const OUStr
if (m_bLegacy)
pOne->group(*pOther);
else
+ {
pOther->group(*pOne);
+ std::stable_sort(pOther->m_xGroup->begin(), pOther->m_xGroup->end(), sortIntoBestTabTraversalOrder(this));
+ }
}
}
commit 3f6113de944faea920fe51bcafa4b1ae7ac27857
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Oct 18 20:39:23 2018 +0100
Commit: Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Sun Oct 21 14:01:55 2018 +0200
keep pyuno script processing below base uri
Change-Id: Icc13fb7193fb1e7c50e0df286161a10b4ed636c7
Reviewed-on: https://gerrit.libreoffice.org/61968
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py
index 722dc24b9b07..f1b2bfc75ee3 100644
--- a/scripting/source/pyprov/pythonscript.py
+++ b/scripting/source/pyprov/pythonscript.py
@@ -25,6 +25,7 @@ import imp
import time
import ast
import platform
+from com.sun.star.uri.RelativeUriExcessParentSegments import RETAIN
try:
unicode
@@ -212,8 +213,33 @@ class MyUriHelper:
def scriptURI2StorageUri( self, scriptURI ):
try:
- myUri = self.m_uriRefFac.parse(scriptURI)
- ret = self.m_baseUri + "/" + myUri.getName().replace( "|", "/" )
+ # base path to the python script location
+ sBaseUri = self.m_baseUri + "/"
+ xBaseUri = self.m_uriRefFac.parse(sBaseUri)
+
+ # path to the .py file + "$functionname, arguments, etc
+ xStorageUri = self.m_uriRefFac.parse(scriptURI)
+ sStorageUri = xStorageUri.getName().replace( "|", "/" );
+
+ # path to the .py file, relative to the base
+ sFileUri = sStorageUri[0:sStorageUri.find("$")]
+ xFileUri = self.m_uriRefFac.parse(sFileUri)
+ if not xFileUri:
+ message = "pythonscript: invalid relative uri '" + sFileUri+ "'"
+ log.debug( message )
+ raise RuntimeException( message )
+
+ # absolute path to the .py file
+ xAbsScriptUri = self.m_uriRefFac.makeAbsolute(xBaseUri, xFileUri, True, RETAIN)
+ sAbsScriptUri = xAbsScriptUri.getUriReference()
+
+ # ensure py file is under the base path
+ if not sAbsScriptUri.startswith(sBaseUri):
+ message = "pythonscript: storage uri '" + sAbsScriptUri + "' not in base uri '" + self.m_baseUri + "'"
+ log.debug( message )
+ raise RuntimeException( message )
+
+ ret = sBaseUri + sStorageUri
log.debug( "converting scriptURI="+scriptURI + " to storageURI=" + ret )
return ret
except UnoException as e:
commit 7951138541caabcd25fccaa8f9ebb0226ce2ce12
Author: Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Fri Oct 19 14:54:28 2018 +0200
Commit: Eike Rathke <erack at redhat.com>
CommitDate: Sat Oct 20 14:43:29 2018 +0200
tdf#120706: nullptr dereference
Change-Id: I55814a6b4cdfda93a51621b5b31c166507a7e7a6
Reviewed-on: https://gerrit.libreoffice.org/62005
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
(cherry picked from commit 49d304c4f6635381a27b60a8944744cc81ff1e91)
Reviewed-on: https://gerrit.libreoffice.org/62028
Reviewed-by: Eike Rathke <erack at redhat.com>
diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx
index 2c311861122a..85af90b53f79 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -475,7 +475,7 @@ ErrCode call(
OUString const & dll, ProcData const & proc, SbxArray * arguments,
SbxVariable & result)
{
- if (arguments->Count() > 20)
+ if (arguments && arguments->Count() > 20)
return ERRCODE_BASIC_NOT_IMPLEMENTED;
std::vector< char > stack;
commit 392ec204197c723b4dff4f7091df5afb46b5b9db
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Oct 19 09:56:30 2018 +0100
Commit: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Sat Oct 20 10:49:49 2018 +0200
copy and paste error
Change-Id: If352e7a0f6e8dab2a9acc9aa2cde56b40cedb50c
Reviewed-on: https://gerrit.libreoffice.org/61993
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index eb812f7fb215..b2bd86673130 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5605,7 +5605,7 @@ OString ScGridWindow::getCellCursor(const Fraction& rZoomX, const Fraction& rZoo
SCROW nY = pViewData->GetCurY();
Fraction defaultZoomX = pViewData->GetZoomX();
- Fraction defaultZoomY = pViewData->GetZoomX();
+ Fraction defaultZoomY = pViewData->GetZoomY();
pViewData->SetZoom(rZoomX, rZoomY, true);
commit fe6a98ed8fe863dd5a5aee5becb6e989c1f6a457
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Oct 16 09:57:36 2018 +0100
Commit: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Sat Oct 20 10:48:07 2018 +0200
ofz#10994 move the reset of trailing fly paras to before redline processing
Change-Id: I906c29848acc3917f76cb8c21e0bd581e0ded421
Reviewed-on: https://gerrit.libreoffice.org/61821
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index e2a18452cf90..bcc16adc2d98 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5324,6 +5324,9 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const *pGloss)
// stacks etc. are destroyed, and before fields
// are updated
m_aExtraneousParas.delete_all_from_doc();
+ // ofz#10994 remove any trailing fly paras before processing redlines
+ m_xWFlyPara.reset();
+ m_xSFlyPara.reset();
m_xRedlineStack->closeall(*m_pPaM->GetPoint());
while (!m_aFrameRedlines.empty())
m_aFrameRedlines.pop();
@@ -5417,9 +5420,6 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const *pGloss)
UpdateFields();
- m_xWFlyPara.reset();
- m_xSFlyPara.reset();
-
// delete the pam before the call for hide all redlines (Bug 73683)
if (m_bNewDoc)
m_rDoc.getIDocumentRedlineAccess().SetRedlineFlags(eMode);
commit 3ec5fb847364ca65322079fdc1026ed95a0a8933
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Oct 19 10:21:30 2018 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Oct 19 17:08:11 2018 +0200
copy and paste error
Change-Id: I73a617137bf0b3b567181ff817069944076eab0e
Reviewed-on: https://gerrit.libreoffice.org/62022
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
index ae6340cd9848..f5705703a278 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
@@ -1248,7 +1248,7 @@ inline bool equalFont( Style const & style1, Style const & style2 )
f1.StyleName == f2.StyleName &&
f1.Family == f2.Family &&
f1.CharSet == f2.CharSet &&
- f1.Pitch == f2.CharSet &&
+ f1.Pitch == f2.Pitch &&
f1.CharacterWidth == f2.CharacterWidth &&
f1.Weight == f2.Weight &&
f1.Slant == f2.Slant &&
commit c78c42f63f91f28dfae7340d379fa1b8136633c0
Author: Eike Rathke <erack at redhat.com>
AuthorDate: Mon Oct 15 23:10:07 2018 +0200
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Oct 19 16:32:15 2018 +0200
Resolves: tdf#119623 record group positions also for top cells
So listeners can be re-established for remaining grouped cells if
top cell is deleted (which ends listening and probably was the
cause to exclude them here).
Change-Id: Ic91b74c65013452d56b5cfbc132722c4314743c8
Reviewed-on: https://gerrit.libreoffice.org/61808
Reviewed-by: Eike Rathke <erack at redhat.com>
Tested-by: Jenkins
(cherry picked from commit fbec372ba829b3f32b3c0874920b2ee36220ef9d)
Reviewed-on: https://gerrit.libreoffice.org/61818
Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index 832351d275a7..d08321073668 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -1539,10 +1539,12 @@ void ScColumn::EndListeningIntersectedGroups(
{
ScFormulaCell* pFC = sc::formula_block::at(*it->data, aPos.second);
ScFormulaCellGroupRef xGroup = pFC->GetCellGroup();
- if (xGroup && !pFC->IsSharedTop())
+ if (xGroup)
{
- // End listening.
- pFC->EndListeningTo(rCxt);
+ if (!pFC->IsSharedTop())
+ // End listening.
+ pFC->EndListeningTo(rCxt);
+
if (pGroupPos)
// Record the position of the top cell of the group.
pGroupPos->push_back(xGroup->mpTopCell->aPos);
@@ -1555,10 +1557,12 @@ void ScColumn::EndListeningIntersectedGroups(
{
ScFormulaCell* pFC = sc::formula_block::at(*it->data, aPos.second);
ScFormulaCellGroupRef xGroup = pFC->GetCellGroup();
- if (xGroup && !pFC->IsSharedTop())
+ if (xGroup)
{
- // End listening.
- pFC->EndListeningTo(rCxt);
+ if (!pFC->IsSharedTop())
+ // End listening.
+ pFC->EndListeningTo(rCxt);
+
if (pGroupPos)
{
// Record the position of the bottom cell of the group.
commit 1c6bea8e677861d201e9b21b5f0e356f77dabaaf
Author: Miklos Vajna <vmiklos at collabora.co.uk>
AuthorDate: Mon Oct 15 21:11:24 2018 +0200
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Oct 19 16:31:41 2018 +0200
tdf#112520 RTF export: write ZOrder only for toplevel shapes
RTF export at the moment exports children of group shapes as a flat
shape list. This means that the order inside the group shape is not
relevant for the toplevel ZOrder, so just don't write it.
(cherry picked from commit 2b920bdc12f3bf3a196ec0d6d59043a68e663e33)
Change-Id: I870707cb28c2f177c0e5d9cf5328260e76b661f3
Reviewed-on: https://gerrit.libreoffice.org/61904
Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/qa/extras/rtfexport/data/tdf112520.docx b/sw/qa/extras/rtfexport/data/tdf112520.docx
new file mode 100644
index 000000000000..31c5a0afc21e
Binary files /dev/null and b/sw/qa/extras/rtfexport/data/tdf112520.docx differ
diff --git a/sw/qa/extras/rtfexport/rtfexport3.cxx b/sw/qa/extras/rtfexport/rtfexport3.cxx
index 45be1c450cb4..26bbc8121372 100644
--- a/sw/qa/extras/rtfexport/rtfexport3.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport3.cxx
@@ -16,6 +16,7 @@
#include <com/sun/star/text/XPageCursor.hpp>
#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
#include <com/sun/star/text/XTextColumns.hpp>
+#include <com/sun/star/text/TextContentAnchorType.hpp>
class Test : public SwModelTestBase
{
@@ -172,6 +173,26 @@ DECLARE_RTFEXPORT_TEST(testTdf117505, "tdf117505.odt")
getProperty<sal_Int32>(xFirstPage, "HeaderHeight"));
}
+DECLARE_RTFEXPORT_TEST(testTdf112520, "tdf112520.docx")
+{
+ if (!mbExported)
+ return;
+
+ // Assert that the white shape is on top of the yellow one.
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0xffff00),
+ getProperty<sal_Int32>(getShape(2), "FillColor"));
+ CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER,
+ getProperty<text::TextContentAnchorType>(getShape(2), "AnchorType"));
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0xffffff),
+ getProperty<sal_Int32>(getShape(3), "FillColor"));
+ // Without the accompanying fix in place, this test would have failed with
+ // 'expected: 4, actual: 2'.
+ // This means the draw page was 0/at-char/white, 1/at-char/yellow, 2/at-page/white,
+ // instead of the good 0/at-page/white, 1/at-char/yellow, 2/at-char/white.
+ CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER,
+ getProperty<text::TextContentAnchorType>(getShape(3), "AnchorType"));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx
index 209e3a9d993c..c1b835194784 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -89,10 +89,11 @@ void RtfSdrExport::CloseContainer()
sal_uInt32 RtfSdrExport::EnterGroup(const OUString& /*rShapeName*/,
const tools::Rectangle* /*pRect*/)
{
+ m_bInGroup = true;
return GenerateShapeId();
}
-void RtfSdrExport::LeaveGroup() { /* noop */}
+void RtfSdrExport::LeaveGroup() { m_bInGroup = false; }
void RtfSdrExport::AddShape(sal_uInt32 nShapeType, ShapeFlag nShapeFlags, sal_uInt32 /*nShapeId*/)
{
@@ -562,8 +563,13 @@ sal_Int32 RtfSdrExport::StartShape()
m_rAttrOutput.RunText().append(OOO_STRING_SVTOOLS_RTF_SHPBYIGNORE);
// Write ZOrder.
- m_rAttrOutput.RunText().append(OOO_STRING_SVTOOLS_RTF_SHPZ);
- m_rAttrOutput.RunText().append(OString::number(m_pSdrObject->GetOrdNum()));
+ if (!m_bInGroup)
+ {
+ // Order inside the group shape is not relevant for the flat shape list
+ // we write.
+ m_rAttrOutput.RunText().append(OOO_STRING_SVTOOLS_RTF_SHPZ);
+ m_rAttrOutput.RunText().append(OString::number(m_pSdrObject->GetOrdNum()));
+ }
for (auto it = m_aShapeProps.rbegin(); it != m_aShapeProps.rend(); ++it)
lcl_AppendSP(m_rAttrOutput.RunText(), (*it).first.getStr(), (*it).second);
diff --git a/sw/source/filter/ww8/rtfsdrexport.hxx b/sw/source/filter/ww8/rtfsdrexport.hxx
index c2c33de4aca2..b0c9f151e790 100644
--- a/sw/source/filter/ww8/rtfsdrexport.hxx
+++ b/sw/source/filter/ww8/rtfsdrexport.hxx
@@ -56,6 +56,8 @@ class RtfSdrExport final : public EscherEx
/// Remember which shape types we had already written.
std::unique_ptr<bool[]> m_pShapeTypeWritten;
+ bool m_bInGroup = false;
+
public:
explicit RtfSdrExport(RtfExport& rExport);
~RtfSdrExport() override;
commit ac39aba9b2d08b061b0eef651f5ebc7a84391171
Author: Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Thu Oct 18 21:56:56 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Oct 19 08:13:28 2018 +0200
tdf#120204 drop simple glyph cache
Master has a new shared LRU glyph cache, but that is much more
new code. So simply drop the current cache implementation.
Change-Id: Ib73f3680f3d6357b1c9d2b07db521867b3742843
Reviewed-on: https://gerrit.libreoffice.org/61961
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 8056b46522a6..a5e240afc480 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -58,11 +58,6 @@
using namespace vcl;
-// GetGlyphOutlineW() seems to be a little slow, and doesn't seem to do its own caching (tested on Windows10).
-// TODO include the font as part of the cache key, then we won't need to clear it on font change
-// The cache limit is set by the rough number of characters needed to read your average Asian newspaper.
-static o3tl::lru_map<sal_GlyphId, tools::Rectangle> g_BoundRectCache(3000);
-
static const int MAXFONTHEIGHT = 2048;
inline FIXED FixedFromDouble( double d )
@@ -853,8 +848,6 @@ HFONT WinSalGraphics::ImplDoSetFont(FontSelectPattern const * i_pFont,
float& o_rFontScale,
HFONT& o_rOldFont)
{
- // clear the cache on font change
- g_BoundRectCache.clear();
HFONT hNewFont = nullptr;
LOGFONTW aLogFont;
@@ -1387,13 +1380,6 @@ void WinSalGraphics::ClearDevFontCache()
bool WinSalGraphics::GetGlyphBoundRect(const GlyphItem& rGlyph, tools::Rectangle& rRect)
{
- auto it = g_BoundRectCache.find(rGlyph.maGlyphId);
- if (it != g_BoundRectCache.end())
- {
- rRect = it->second;
- return true;
- }
-
WinFontInstance* pFont = mpWinFontEntry[rGlyph.mnFallbackLevel];
HFONT hNewFont = pFont ? pFont->GetHFONT() : mhFonts[rGlyph.mnFallbackLevel];
float fFontScale = pFont ? pFont->GetScale() : mfFontScale[rGlyph.mnFallbackLevel];
@@ -1427,8 +1413,6 @@ bool WinSalGraphics::GetGlyphBoundRect(const GlyphItem& rGlyph, tools::Rectangle
rRect.SetTop(static_cast<int>( fFontScale * rRect.Top() ));
rRect.SetBottom(static_cast<int>( fFontScale * rRect.Bottom() ) + 1);
- g_BoundRectCache.insert({rGlyph.maGlyphId, rRect});
-
return true;
}
commit 67c65aa21335cf28aca2e92a9fa2f180aa800ea6
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Thu Oct 18 18:01:39 2018 +0200
Commit: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Thu Oct 18 18:09:47 2018 +0200
update credits
Change-Id: I666805e38c40826328d8c4226c394d4c3072b2a7
(cherry picked from commit c3eb1c85f95168f8e84b8f655c839eff23c7e98a)
diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt
index a3155ffe923a..af19c057ea7e 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:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas
is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:
experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" 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/6.1.1.1$Linux_X86_64 LibreOffice_project/2718b4a18dfcc6a54ebe5f7b801ee7a47fa81e0c</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="3844" meta:word-count="13889" meta:character-count="99808" meta:non-whitespace-character-count="87347"/><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/6.1.2.1$Linux_X86_64 LibreOffice_project/65905a128db06ba48db947242809d14d3f9a93fe</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="3849" meta:word-count="13911" meta:character-count="99976" meta:non-whitespace-character-count="87496"/><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">679</config:config-item>
+ <config:config-item config:name="ViewAreaTop" config:type="long">649</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">40483</config:config-item>
- <config:config-item config:name="ViewAreaHeight" config:type="long">21327</config:config-item>
+ <config:config-item config:name="ViewAreaWidth" config:type="long">50872</config:config-item>
+ <config:config-item config:name="ViewAreaHeight" config:type="long">26846</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">3649</config:config-item>
- <config:config-item config:name="ViewTop" config:type="long">3471</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">679</config:config-item>
- <config:config-item config:name="VisibleRight" config:type="long">40982</config:config-item>
- <config:config-item config:name="VisibleBottom" config:type="long">22005</config:config-item>
+ <config:config-item config:name="VisibleTop" config:type="long">649</config:config-item>
+ <config:config-item config:name="VisibleRight" config:type="long">51372</config:config-item>
+ <config:config-item config:name="VisibleBottom" config:type="long">27494</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>
@@ -69,7 +69,7 @@
<config:config-item config:name="InvertBorderSpacing" config:type="boolean">false</config:config-item>
<config:config-item config:name="SaveGlobalDocumentLinks" config:type="boolean">false</config:config-item>
<config:config-item config:name="TabsRelativeToIndent" config:type="boolean">true</config:config-item>
- <config:config-item config:name="Rsid" config:type="int">8029560</config:config-item>
+ <config:config-item config:name="Rsid" config:type="int">8065751</config:config-item>
<config:config-item config:name="PrintProspectRTL" config:type="boolean">false</config:config-item>
<config:config-item config:name="PrintEmptyPages" config:type="boolean">false</config:config-item>
<config:config-item config:name="ApplyUserData" config:type="boolean">false</config:config-item>
@@ -320,55 +320,58 @@
</office:styles>
<office:automatic-styles>
<style:style style:name="Tabelle1" style:family="table">
- <style:table-properties style:width="26.174cm" table:align="left"/>
+ <style:table-properties style:width="24.742cm" table:align="left"/>
</style:style>
<style:style style:name="Tabelle1.A" style:family="table-column">
- <style:table-column-properties style:column-width="6.299cm"/>
+ <style:table-column-properties style:column-width="5.724cm"/>
</style:style>
<style:style style:name="Tabelle1.B" style:family="table-column">
- <style:table-column-properties style:column-width="6.219cm"/>
+ <style:table-column-properties style:column-width="6.823cm"/>
</style:style>
<style:style style:name="Tabelle1.C" style:family="table-column">
- <style:table-column-properties style:column-width="6.828cm"/>
+ <style:table-column-properties style:column-width="6.214cm"/>
+ </style:style>
+ <style:style style:name="Tabelle1.D" style:family="table-column">
+ <style:table-column-properties style:column-width="5.981cm"/>
</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.D308" style:family="table-cell">
+ <style:style style:name="Tabelle1.C309" 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="18.528cm" table:align="left"/>
+ <style:table-properties style:width="18.309cm" table:align="left"/>
</style:style>
<style:style style:name="Tabelle2.A" style:family="table-column">
- <style:table-column-properties style:column-width="5.32cm"/>
+ <style:table-column-properties style:column-width="5.235cm"/>
</style:style>
<style:style style:name="Tabelle2.B" style:family="table-column">
- <style:table-column-properties style:column-width="4.817cm"/>
+ <style:table-column-properties style:column-width="4.724cm"/>
</style:style>
<style:style style:name="Tabelle2.C" style:family="table-column">
- <style:table-column-properties style:column-width="4.103cm"/>
+ <style:table-column-properties style:column-width="4.048cm"/>
</style:style>
<style:style style:name="Tabelle2.D" style:family="table-column">
- <style:table-column-properties style:column-width="4.288cm"/>
+ <style:table-column-properties style:column-width="4.302cm"/>
</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="17.999cm" 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.865cm"/>
+ <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.838cm"/>
+ <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="6.193cm"/>
+ <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="4.103cm"/>
+ <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"/>
@@ -377,16 +380,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="17.02cm" 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.918cm"/>
+ <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.897cm"/>
+ <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="4.288cm"/>
+ <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.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"/>
@@ -395,23 +401,26 @@
<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="31.678cm" table:align="left"/>
+ <style:table-properties style:width="31.33cm" table:align="left"/>
</style:style>
<style:style style:name="Tabelle5.A" style:family="table-column">
- <style:table-column-properties style:column-width="11.855cm"/>
+ <style:table-column-properties style:column-width="6.285cm"/>
</style:style>
<style:style style:name="Tabelle5.B" style:family="table-column">
- <style:table-column-properties style:column-width="6.246cm"/>
+ <style:table-column-properties style:column-width="11.756cm"/>
</style:style>
<style:style style:name="Tabelle5.C" style:family="table-column">
- <style:table-column-properties style:column-width="6.669cm"/>
+ <style:table-column-properties style:column-width="6.634cm"/>
</style:style>
<style:style style:name="Tabelle5.D" style:family="table-column">
- <style:table-column-properties style:column-width="6.907cm"/>
+ <style:table-column-properties style:column-width="6.655cm"/>
</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.C610" 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">
<style:text-properties fo:font-size="2pt" style:font-size-asian="2pt" style:font-size-complex="2pt"/>
</style:style>
@@ -494,12 +503,12 @@
<style:style style:name="P29" style:family="paragraph" style:parent-style-name="Text_20_body" style:list-style-name="L7">
<style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" loext:contextual-spacing="false"/>
</style:style>
- <style:style style:name="P30" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name="HTML">
- <style:paragraph-properties style:page-number="auto"/>
- </style:style>
- <style:style style:name="P31" style:family="paragraph" style:parent-style-name="Table_20_Contents">
+ <style:style style:name="P30" style:family="paragraph" style:parent-style-name="Table_20_Contents">
<style:text-properties fo:font-size="2pt" style:font-size-asian="2pt" style:font-size-complex="2pt"/>
</style:style>
+ <style:style style:name="P31" style:family="paragraph" style:parent-style-name="Heading_20_1" style:master-page-name="HTML">
+ <style:paragraph-properties style:page-number="auto"/>
+ </style:style>
<style:style style:name="T1" style:family="text">
<style:text-properties style:text-position="33% 80%"/>
</style:style>
@@ -779,10 +788,10 @@
<text:sequence-decl text:display-outline-level="0" text:name="Table"/>
<text:sequence-decl text:display-outline-level="0" text:name="Text"/>
<text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
- <text:sequence-decl text:display-outline-level="0" text:name="Illustration"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Figure"/>
</text:sequence-decls>
<text:section text:style-name="Sect1" text:name="BgContainer">
- <text:p text:style-name="P30"><draw:frame draw:style-name="fr1" draw:name="graphics114" text:anchor-type="paragraph" svg:x="0.025cm" svg:y="-0.423cm" svg:width="8.304cm" svg:height="2.653cm" draw:z-index="0"><draw:image loext:mime-type="image/png">
+ <text:p text:style-name="P31"><draw:frame draw:style-name="fr1" draw:name="graphics114" text:anchor-type="paragraph" svg:x="0.025cm" svg:y="-0.423cm" svg:width="8.304cm" svg:height="2.653cm" draw:z-index="0"><draw:image loext:mime-type="image/png">
<office:binary-data>iVBORw0KGgoAAAANSUhEUgAAATkAAABkCAYAAAD9hkdsAAAAAXNSR0IArs4c6QAAAAZiS0dE
AP8A/wD/oL2nkwAAAAlwSFlzAAAOuQAADrkBuAYXvwAAAAd0SU1FB9oMChUNCQOjP/4AADYV
SURBVHja7V0HfBXF9r65N0B67yEhQIAkJEAggSQklNB7B0UELAhIFYIUReBhQewFEBREUBEQ
@@ -1045,13 +1054,14 @@
</office:binary-data>
</draw:image>
</draw:frame>Credits</text:p>
- <text:p text:style-name="Text_20_body">1361 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2018-09-19 15:40:20.</text:p>
+ <text:p text:style-name="Text_20_body">1364 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2018-10-18 11:20:47.</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">
<table:table-column table:style-name="Tabelle1.A"/>
<table:table-column table:style-name="Tabelle1.B"/>
- <table:table-column table:style-name="Tabelle1.C" table:number-columns-repeated="2"/>
+ <table:table-column table:style-name="Tabelle1.C"/>
+ <table:table-column table:style-name="Tabelle1.D"/>
<table:table-row>
<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>
@@ -1071,13 +1081,13 @@
<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">Caolán McNamara<text:line-break/>Commits: 24837<text:line-break/>Joined: 2000-10-10</text:p>
+ <text:p text:style-name="Table_20_Contents">Caolán McNamara<text:line-break/>Commits: 25074<text:line-break/>Joined: 2000-10-10</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: 16406<text:line-break/>Joined: 2000-10-04</text:p>
+ <text:p text:style-name="Table_20_Contents">Stephan Bergmann<text:line-break/>Commits: 16463<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: 10295<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: 10457<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>
@@ -1085,10 +1095,10 @@
<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: 8328<text:line-break/>Joined: 2010-03-23</text:p>
+ <text:p text:style-name="Table_20_Contents">Tor Lillqvist<text:line-break/>Commits: 8384<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: 7108<text:line-break/>Joined: 2010-07-29</text:p>
+ <text:p text:style-name="Table_20_Contents">Miklos Vajna<text:line-break/>Commits: 7140<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: 6418<text:line-break/>Joined: 2008-06-16</text:p>
@@ -1099,13 +1109,13 @@
<text:p text:style-name="Table_20_Contents">Kohei Yoshida<text:line-break/>Commits: 5568<text:line-break/>Joined: 2009-06-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>Markus Mohrhard<text:line-break/>Commits: 5157<text:line-break/>Joined: <text:span text:style-name="T2">2011-03-17</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Markus Mohrhard<text:line-break/>Commits: 5165<text:line-break/>Joined: <text:span text:style-name="T2">2011-03-17</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">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: 4515<text:line-break/>Joined: 2000-10-11</text:p>
+ <text:p text:style-name="Table_20_Contents">Eike Rathke<text:line-break/>Commits: 4544<text:line-break/>Joined: 2000-10-11</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
@@ -1124,13 +1134,13 @@
</table:table-row>
<table:table-row>
<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: 2555<text:line-break/>Joined: 2009-06-23</text:p>
+ <text:p text:style-name="Table_20_Contents">Jan Holesovsky<text:line-break/>Commits: 2557<text:line-break/>Joined: 2009-06-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">Oliver Specht<text:line-break/>Commits: 2548<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>Julien Nabet<text:line-break/>Commits: 2506<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: 2522<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">Michael Meeks<text:line-break/>Commits: 2299<text:line-break/>Joined: 2004-08-05</text:p>
@@ -1138,7 +1148,7 @@
</table:table-row>
<table:table-row>
<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: 2258<text:line-break/>Joined: 2009-10-14</text:p>
+ <text:p text:style-name="Table_20_Contents">Bjoern Michaelsen<text:line-break/>Commits: 2259<text:line-break/>Joined: 2009-10-14</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>Norbert Thiebaud<text:line-break/>Commits: 2176<text:line-break/>Joined: <text:span text:style-name="T2">2010-09-29</text:span></text:p>
@@ -1152,13 +1162,13 @@
</table:table-row>
<table:table-row>
<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: 1916<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: 1917<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">Christian Lippka<text:line-break/>Commits: 1805<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>Andras Timar<text:line-break/>Commits: 1791<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: 1802<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-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"><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>
@@ -1166,16 +1176,16 @@
</table:table-row>
<table:table-row>
<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: 1597<text:line-break/>Joined: 2010-09-21</text:p>
+ <text:p text:style-name="Table_20_Contents">Luboš Luňák<text:line-break/>Commits: 1603<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"><text:span text:style-name="T1">*</text:span>Takeshi Abe<text:line-break/>Commits: 1454<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"><text:span text:style-name="T1">*</text:span>Takeshi Abe<text:line-break/>Commits: 1458<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">Armin Le Grand<text:line-break/>Commits: 1430<text:line-break/>Joined: 2000-09-25</text:p>
+ <text:p text:style-name="Table_20_Contents">Armin Le Grand<text:line-break/>Commits: 1436<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">Thorsten Behrens<text:line-break/>Commits: 1367<text:line-break/>Joined: 2001-04-25</text:p>
+ <text:p text:style-name="Table_20_Contents">Thorsten Behrens<text:line-break/>Commits: 1372<text:line-break/>Joined: 2001-04-25</text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
@@ -1200,10 +1210,10 @@
<text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Chris Sherlock<text:line-break/>Commits: 1204<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>Lionel Elie Mamane<text:line-break/>Commits: 1023<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: 1027<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>Tamás Zolnai<text:line-break/>Commits: 976<text:line-break/>Joined: <text:span text:style-name="T2">2012-08-06</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Tamás Zolnai<text:line-break/>Commits: 978<text:line-break/>Joined: <text:span text:style-name="T2">2012-08-06</text:span></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
@@ -1239,21 +1249,21 @@
<text:p text:style-name="Table_20_Contents">Martin Gallwey<text:line-break/>Commits: 827<text:line-break/>Joined: 2000-11-08</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">Mikhail Voytenko<text:line-break/>Commits: 793<text:line-break/>Joined: 2001-01-16</text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Andrea Gelmini<text:line-break/>Commits: 810<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>Andrea Gelmini<text:line-break/>Commits: 773<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">Mikhail Voytenko<text:line-break/>Commits: 793<text:line-break/>Joined: 2001-01-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">Carsten Driesner<text:line-break/>Commits: 748<text:line-break/>Joined: 2000-10-06</text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Olivier Hallot<text:line-break/>Commits: 749<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-25</text:span></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
- <text:p text:style-name="Table_20_Contents">Joachim Lingner<text:line-break/>Commits: 745<text:line-break/>Joined: 2000-10-05</text:p>
+ <text:p text:style-name="Table_20_Contents">Carsten Driesner<text:line-break/>Commits: 748<text:line-break/>Joined: 2000-10-06</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>Olivier Hallot<text:line-break/>Commits: 741<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">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>Andrzej Hunt<text:line-break/>Commits: 733<text:line-break/>Joined: <text:span text:style-name="T2">2012-03-27</text:span></text:p>
@@ -1267,10 +1277,10 @@
<text:p text:style-name="Table_20_Contents">Release Engineering<text:line-break/>Commits: 728<text:line-break/>Joined: 2008-10-02</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">Christian Lohmaier<text:line-break/>Commits: 704<text:line-break/>Joined: 2008-06-01</text:p>
+ <text:p text:style-name="Table_20_Contents">Christian Lohmaier<text:line-break/>Commits: 706<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"><text:span text:style-name="T1">*</text:span>Maxim Monastirsky<text:line-break/>Commits: 703<text:line-break/>Joined: <text:span text:style-name="T2">2013-10-27</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Maxim Monastirsky<text:line-break/>Commits: 705<text:line-break/>Joined: <text:span text:style-name="T2">2013-10-27</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">Joerg Skottke [jsk]<text:line-break/>Commits: 678<text:line-break/>Joined: 2008-06-17</text:p>
@@ -1278,41 +1288,41 @@
</table:table-row>
<table:table-row>
<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>Joseph Powers<text:line-break/>Commits: 658<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-15</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: 660<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">Kai Sommerfeld<text:line-break/>Commits: 651<text:line-break/>Joined: 2000-10-10</text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Joseph Powers<text:line-break/>Commits: 658<text:line-break/>Joined: <text:span text:style-name="T2">2010-10-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>Katarina Behrens<text:line-break/>Commits: 641<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">Kai Sommerfeld<text:line-break/>Commits: 651<text:line-break/>Joined: 2000-10-10</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">Ingrid Halama<text:line-break/>Commits: 639<text:line-break/>Joined: 2001-01-19</text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Katarina Behrens<text:line-break/>Commits: 648<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: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: 639<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">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>Rafael Dominguez<text:line-break/>Commits: 606<text:line-break/>Joined: <text:span text:style-name="T2">2011-02-13</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>Zdeněk Crhonek<text:line-break/>Commits: 593<text:line-break/>Joined: <text:span text:style-name="T2">2016-05-19</text:span></text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Zdeněk Crhonek<text:line-break/>Commits: 595<text:line-break/>Joined: <text:span text:style-name="T2">2016-05-19</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>Jochen Nitschke<text:line-break/>Commits: 575<text:line-break/>Joined: <text:span text:style-name="T2">2016-02-02</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: 585<text:line-break/>Joined: <text:span text:style-name="T2">2015-04-26</text:span></text:p>
</table:table-cell>
</table:table-row>
<table:table-row>
<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>Jochen Nitschke<text:line-break/>Commits: 584<text:line-break/>Joined: <text:span text:style-name="T2">2016-02-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"><text:span text:style-name="T1">*</text:span>Mike Kaganski<text:line-break/>Commits: 568<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>Gabor Kelemen<text:line-break/>Commits: 575<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>Gabor Kelemen<text:line-break/>Commits: 563<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>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">Thomas Benisch [tbe]<text:line-break/>Commits: 551<text:line-break/>Joined: 2000-10-23</text:p>
@@ -1326,15 +1336,15 @@
<text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>Khaled Hosny<text:line-break/>Commits: 525<text:line-break/>Joined: <text:span text:style-name="T2">2011-01-28</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">Jürgen Schmidt<text:line-break/>Commits: 512<text:line-break/>Joined: 2000-10-09</text:p>
+ <text:p text:style-name="Table_20_Contents"><text:span text:style-name="T1">*</text:span>andreas kainz<text:line-break/>Commits: 515<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">
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list