date:20210908

 drawinglayer/source/primitive2d/Tools.cxx |   14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

New commits:
commit c07f4a7d04eb44020045859d305f4510ae9acfc4
Author: Noel Grandin 
AuthorDate: Wed Sep 8 20:20:55 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 8 22:20:41 2021 +0200

no need to call expand() here

we can just return the value directly

Change-Id: Ia4a79ebe668dd426edbe95baee8d8cf91d4bc3f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121828
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/drawinglayer/source/primitive2d/Tools.cxx 
b/drawinglayer/source/primitive2d/Tools.cxx
index 45b2a993b3a7..7be666a2cbd0 100644
--- a/drawinglayer/source/primitive2d/Tools.cxx
+++ b/drawinglayer/source/primitive2d/Tools.cxx
@@ -32,16 +32,12 @@ basegfx::B2DRange
 getB2DRangeFromPrimitive2DReference(const Primitive2DReference& rCandidate,
 const geometry::ViewInformation2D& 
aViewInformation)
 {
-basegfx::B2DRange aRetval;
+if (!rCandidate)
+return basegfx::B2DRange();
 
-if (rCandidate.is())
-{
-// get C++ implementation base
-const BasePrimitive2D* 
pCandidate(static_cast(rCandidate.get()));
-aRetval.expand(pCandidate->getB2DRange(aViewInformation));
-}
-
-return aRetval;
+// get C++ implementation base
+const BasePrimitive2D* 
pCandidate(static_cast(rCandidate.get()));
+return pCandidate->getB2DRange(aViewInformation);
 }
 
 bool arePrimitive2DReferencesEqual(const Primitive2DReference& rxA, const 
Primitive2DReference& rxB)

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

 sc/source/ui/unoobj/chart2uno.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 993ae97e38e72e9d5dabeb0f3abafdc55c73161e
Author: Noel Grandin 
AuthorDate: Wed Sep 8 21:11:05 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 8 22:17:59 2021 +0200

avoid double-lookup

this is hot when creating charts

Change-Id: Ic096d9293a48d53fc2cadfda95b5b7a13ba16f68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121830
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/source/ui/unoobj/chart2uno.cxx 
b/sc/source/ui/unoobj/chart2uno.cxx
index 5efa562cb352..3ee4f1cde054 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -760,12 +760,13 @@ void Chart2Positioner::createPositionMap()
 aCellData.SetAbsRow(nRow);
 aCellData.SetAbsTab(nTab);
 
-if (rCol.find(nInsRow) == rCol.end())
+auto& rCell = rCol[nInsRow];
+if (!rCell)
 {
 if (bExternal)
-rCol[ nInsRow ].reset(new 
ScExternalSingleRefToken(nFileId, aTabName, aCellData));
+rCell.reset(new ScExternalSingleRefToken(nFileId, 
aTabName, aCellData));
 else
-rCol[ nInsRow ].reset(new 
ScSingleRefToken(mpDoc->GetSheetLimits(), aCellData));
+rCell.reset(new 
ScSingleRefToken(mpDoc->GetSheetLimits(), aCellData));
 }
 }
 }

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

 chart2/source/view/main/PropertyMapper.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2cf4cf718165988e81b606be7fa0a4b02973a10a
Author: Noel Grandin 
AuthorDate: Wed Sep 8 21:19:59 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 8 22:17:25 2021 +0200

avoid some ref-counting

Change-Id: I04dfa4070b2e64c4ab7cb59d4a5c4668e98dc076
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121831
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/chart2/source/view/main/PropertyMapper.cxx 
b/chart2/source/view/main/PropertyMapper.cxx
index c7327974249a..d9ae1fc7a925 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -101,13 +101,13 @@ void PropertyMapper::getValueMap(
 {
 for (auto const& elem : rNameMap)
 {
-OUString aTarget = elem.first;
-OUString aSource = elem.second;
+const OUString & rTarget = elem.first;
+const OUString & rSource = elem.second;
 try
 {
-uno::Any aAny( xSourceProp->getPropertyValue(aSource) );
+uno::Any aAny( xSourceProp->getPropertyValue(rSource) );
 if( aAny.hasValue() )
-rValueMap.emplace(  aTarget, aAny );
+rValueMap.emplace(  rTarget, aAny );
 }
 catch( const uno::Exception& )
 {

[Libreoffice-commits] core.git: forms/source oox/source sc/source sfx2/source svx/source sw/source

 forms/source/richtext/rtattributehandler.cxx   |8 

 oox/source/export/shapes.cxx   |2 +-
 sc/source/core/data/table5.cxx |2 +-
 sc/source/ui/app/scmod.cxx |2 +-
 sc/source/ui/view/auditsh.cxx  |2 +-
 sc/source/ui/view/cellsh3.cxx  |2 +-
 sc/source/ui/view/tabvwshe.cxx |4 ++--
 sfx2/source/appl/appserv.cxx   |2 +-
 svx/source/stbctrls/zoomsliderctrl.cxx |2 +-
 sw/source/core/doc/doctxm.cxx  |9 
-
 sw/source/core/docnode/ndsect.cxx  |2 +-
 sw/source/core/edit/edglbldc.cxx   |2 +-
 sw/source/core/edit/edtox.cxx  |6 
+++---
 sw/source/core/layout/fly.cxx  |2 +-
 sw/source/core/layout/trvlfrm.cxx  |2 +-
 sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx  |6 
+++---
 sw/source/core/objectpositioning/environmentofanchoredobject.cxx   |4 ++--
 sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx |2 +-
 sw/source/core/txtnode/fmtatr2.cxx |3 +--
 sw/source/core/txtnode/ndtxt.cxx   |3 +--
 sw/source/core/unocore/unorefmk.cxx|3 +--
 sw/source/core/view/vprint.cxx |2 +-
 sw/source/uibase/app/docsh2.cxx|5 ++---
 sw/source/uibase/docvw/PostItMgr.cxx   |2 +-
 sw/source/uibase/uiview/srcview.cxx|4 ++--
 sw/source/uibase/utlui/viewlayoutctrl.cxx  |2 +-
 26 files changed, 40 insertions(+), 45 deletions(-)

New commits:
commit e11386053d3c404fbeab8b66402d68f813f7dd58
Author: Noel Grandin 
AuthorDate: Wed Sep 8 15:01:33 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 8 22:17:05 2021 +0200

convert some OSL_ENSURE -> assert

where we are just provide checking for a following static_cast.

I'd rather have an explicit assert failure than a random crash

Change-Id: Iab6c6b056341018deaa74b78b075e564f72c58d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121814
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/forms/source/richtext/rtattributehandler.cxx 
b/forms/source/richtext/rtattributehandler.cxx
index 804d6bb2d42d..653d42e46a5f 100644
--- a/forms/source/richtext/rtattributehandler.cxx
+++ b/forms/source/richtext/rtattributehandler.cxx
@@ -183,7 +183,7 @@ namespace frm
 
 AttributeCheckState ParaAlignmentHandler::implGetCheckState( const 
SfxPoolItem& _rItem ) const
 {
-OSL_ENSURE( dynamic_cast( &_rItem) !=  nullptr, 
"ParaAlignmentHandler::implGetCheckState: invalid pool item!" );
+assert( dynamic_cast( &_rItem) && 
"ParaAlignmentHandler::implGetCheckState: invalid pool item!" );
 SvxAdjust eAdjust = static_cast< const SvxAdjustItem& >( _rItem 
).GetAdjust();
 return ( eAdjust == m_eAdjust ) ? eChecked : eUnchecked;
 }
@@ -213,7 +213,7 @@ namespace frm
 
 AttributeCheckState LineSpacingHandler::implGetCheckState( const 
SfxPoolItem& _rItem ) const
 {
-OSL_ENSURE( dynamic_cast( &_rItem) !=  
nullptr, "LineSpacingHandler::implGetCheckState: invalid pool item!" );
+assert( dynamic_cast( &_rItem) && 
"LineSpacingHandler::implGetCheckState: invalid pool item!" );
 sal_uInt16 nLineSpace = static_cast< const SvxLineSpacingItem& >( 
_rItem ).GetPropLineSpace();
 return ( nLineSpace == m_nLineSpace ) ? eChecked : eUnchecked;
 }
@@ -250,7 +250,7 @@ namespace frm
 
 AttributeCheckState EscapementHandler::implGetCheckState( const 
SfxPoolItem& _rItem ) const
 {
-OSL_ENSURE( dynamic_cast( &_rItem) !=  
nullptr, "EscapementHandler::getState: invalid pool item!" );
+assert( dynamic_cast( &_rItem) && 
"EscapementHandler::getState: invalid pool item!" );
 SvxEscapement eEscapement = static_cast< const SvxEscapementItem& >( 
_rItem ).GetEscapement();
 return ( eEscapement == m_eEscapement ) ? eChecked : eUnchecked;
 }
@@ -389,7 +389,7 @@ namespace frm
 
 AttributeCheckState ParagraphDirectionHandler::implGetCheckState( const 
SfxPoolItem& _rItem ) const
 {
-OSL_ENSURE( dynamic_cast( &_rItem) !=  
nullptr, "ParagraphDirectionHandler::implGetCheckState: invalid pool item!" );
+assert( dynamic_cast( &_rItem) && 
"ParagraphDirectionHandler::implGetCheckState: invalid pool item!" );
 SvxFrameDirection eDirection = static_cast<

[Libreoffice-commits] core.git: vcl/unx

2021-09-08 Thread Julien Nabet (via logerrit)

 vcl/unx/gtk3/gtkinst.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 41a55bde344f924edd36dbbeead45c426ee07e4d
Author: Julien Nabet 
AuthorDate: Wed Sep 8 20:45:55 2021 +0200
Commit: Julien Nabet 
CommitDate: Wed Sep 8 21:53:56 2021 +0200

fix copy paste in assertion message (vcl/gtk3/gtkinst)

Change-Id: I2603dcb809d2bf062f3b14f7c21583fde1da9f05
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121829
Reviewed-by: Caolán McNamara 
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 053bf5a0d607..5a4270857919 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -16985,7 +16985,7 @@ public:
 {
 //get_accessible_relation_set should only be needed for the vcl 
implementation,
 //in the gtk impl the native equivalent should negate the need.
-assert(false && "get_accessible_parent should only be called on a vcl 
impl");
+assert(false && "get_accessible_relation_set should only be called on 
a vcl impl");
 return uno::Reference();
 }

Re: About putting a big warning for deb and rpm packages

2021-09-08 Thread Julien Nabet


argh, wrong example, tdf#144385 is about a snap package.

On 08/09/2021 20:26, Julien Nabet wrote:

Hello,

I had already noticed this but, since a few days it seems there are 
more and more bugs from people who install debs/rpm (but rather debs 
because they're on Ubuntu most of the time) and have some problem.


The last one I saw: 
https://bugs.documentfoundation.org/show_bug.cgi?id=144385.


Each time I indicate that these packages are more for repository 
maintainers because it requires dependency checking for libs and 
associated versions.


Would it be possible to put a big warning about this on websites 
unless I'm wrong from the start or missed something?


Julien

About putting a big warning for deb and rpm packages

2021-09-08 Thread Julien Nabet


Hello,

I had already noticed this but, since a few days it seems there are more 
and more bugs from people who install debs/rpm (but rather debs because 
they're on Ubuntu most of the time) and have some problem.


The last one I saw: 
https://bugs.documentfoundation.org/show_bug.cgi?id=144385.


Each time I indicate that these packages are more for repository 
maintainers because it requires dependency checking for libs and 
associated versions.


Would it be possible to put a big warning about this on websites unless 
I'm wrong from the start or missed something?


Julien

[Libreoffice-commits] core.git: 2 commits - winaccessibility/Library_uacccom.mk winaccessibility/source

2021-09-08 Thread Michael Weghorn (via logerrit)

 winaccessibility/Library_uacccom.mk  |1 
 winaccessibility/source/UAccCOM/AccTable.cxx |   99 +
 winaccessibility/source/UAccCOM/AccTable.h   |   18 ++
 winaccessibility/source/UAccCOM/AccTableCell.cxx |  168 +++
 winaccessibility/source/UAccCOM/AccTableCell.h   |   87 +++
 winaccessibility/source/UAccCOM/MAccessible.cxx  |   31 
 winaccessibility/source/UAccCOM/UAccCOM.cxx  |2 
 winaccessibility/source/UAccCOMIDL/UAccCOM.idl   |8 +
 8 files changed, 407 insertions(+), 7 deletions(-)

New commits:
commit 97a88e30e2e084ab860635ff4e0a03442d8a12af
Author: Michael Weghorn 
AuthorDate: Wed Sep 8 14:37:53 2021 +0100
Commit: Michael Weghorn 
CommitDate: Wed Sep 8 20:06:00 2021 +0200

tdf#100086 tdf#124832 wina11y: Implement IAccessibleTableCell

Add a new class 'AccTableCell' that implements the
IAccessibleTableCell interface from the IAccessible2 spec
and add what's needed to expose it to accessibility tools
via COM.

Since there's no specific XInterface for table cells
that an XAccessible's context could be queried for,
make use of the fact that a table cell's
parent is a table, i.e. its accessible context implements
XAccessibleTable.

AccTableCell keeps a reference to that table and remembers the
cell's index in the parent to retrieve information
on the cell from there.

This addresses the

> At least for LibreOffice Table Cells don't implement
> IAccessibleTableCell, and therefore there's no way to get the row and
> column span. LibreOffice itself also does not expose the merged state in
> the accessible name of the cell.

comment from [1] (which is the NVDA counterpart for LO's
tdf#124832) and may also help for tdf#100086,
though more work will be needed on LibreOffice and/or NVDA
side for both issues.

[1] https://github.com/nvaccess/nvda/issues/9310

Change-Id: I0f53212d14ee17c760b9e6c91be2154a1b25d862
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121821
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/winaccessibility/Library_uacccom.mk 
b/winaccessibility/Library_uacccom.mk
index 9fbb3b7b5bc6..8c3d3c1596e5 100644
--- a/winaccessibility/Library_uacccom.mk
+++ b/winaccessibility/Library_uacccom.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_add_exception_objects,UAccCOM,\
winaccessibility/source/UAccCOM/AccImage \
winaccessibility/source/UAccCOM/AccRelation \
winaccessibility/source/UAccCOM/AccTable \
+   winaccessibility/source/UAccCOM/AccTableCell \
winaccessibility/source/UAccCOM/AccText \
winaccessibility/source/UAccCOM/AccTextBase \
winaccessibility/source/UAccCOM/AccValue \
diff --git a/winaccessibility/source/UAccCOM/AccTableCell.cxx 
b/winaccessibility/source/UAccCOM/AccTableCell.cxx
new file mode 100644
index ..2cc9a2963ff2
--- /dev/null
+++ b/winaccessibility/source/UAccCOM/AccTableCell.cxx
@@ -0,0 +1,168 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "AccTableCell.h"
+
+#include 
+#include 
+
+using namespace com::sun::star::accessibility;
+using namespace com::sun::star::uno;
+
+CAccTableCell::CAccTableCell()
+: m_nIndexInParent(0)
+{
+}
+
+COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTableCell::put_XInterface(hyper 
pXInterface)
+{
+// internal IUNOXWrapper - no mutex meeded
+
+ENTER_PROTECTED_BLOCK
+
+CUNOXWrapper::put_XInterface(pXInterface);
+if (pUNOInterface == nullptr)
+return E_INVALIDARG;
+
+Reference xContext = 
pUNOInterface->getAccessibleContext();
+if (!xContext.is())
+return E_FAIL;
+
+// retrieve reference to table (parent of the cell)
+Reference xParentContext
+= xContext->getAccessibleParent()->getAccessibleContext();
+Reference xTable(xParentContext, UNO_QUERY);
+
+if (!xTable.is())
+{
+m_xTable.clear();
+return E_FAIL;
+}
+
+m_xTable = xTable;
+m_nIndexInParent = xContext->getAccessibleIndexInParent();
+retu

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-7.2.1.2'

2021-09-08 Thread Christian Lohmaier (via logerrit)

Tag 'libreoffice-7.2.1.2' created by Christian Lohmaier 
 at 2021-09-08 17:53 +

Tag libreoffice-7.2.1.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmE4+J0ACgkQ9DSh76/u
rqPSFg/+IZQjil1wcZ+SQcIa5GQzEXZMHA593tigHQoszhEkXNv2icsQRGmy/0O5
85s+OX0yfKpc91oWq152qSEH7D5+H8KYR8HHgRfvgRqH3pQwqOqAGuT+l/mo9leb
iALtZSegZM7oH6w2INbXUZxzWhkBcDkNWy7j6P6QMHamURulba6Ie5nPbeXZFfg8
ZuCs3p3nMG9ejuPFUeKSFpz+U64Wqs0/Yf12f0oHap/z6ftwOkVTOx5duGfQHybf
TzCgKIEM6t+ckX2GsBxosEmJ7aQbNMeNh5GH2IcgmCsHxaeArJ3rn17maT2oRNvJ
pXOkUuhmEMaWfrUL8bJJOXu59q1pwyIZJoKUAxNaE6LkQ4fr2P78P0GpkUdmZRsY
QHAC/yYGgLMxOUg1CmEKWOuBTNWkjuT/mu6tmXzTn5T/7KKfDBfugy7awspnUi1i
bJRKHkgF6Vr2RmUh8aoIYVJaDrEiJuHu4XRnGev5Bww4UA5Rc+lvoCA2Ej6gCnIq
7c6ZJPxlHeRU6XUqoPOaJLwHX2CpQ3Eyy9vCzBInARdbeoV/OGGbeGQwfrfqOEHH
XAOVURaGBL+oVlF+KeV1cWWf9Lt5CDRc39IwqffSvh4xsUoA4N6abCgUrhnjz4rb
u+5drmVE2ufs9BNbJYoW/3IQ/OpsNKBi+M+RHFZAeFxBZVRqaAo=
=qEAx
-END PGP SIGNATURE-

Changes since libreoffice-7-2-branch-point-436:
---
 0 files changed
---

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-7.2.1.2'

2021-09-08 Thread Christian Lohmaier (via logerrit)

Tag 'libreoffice-7.2.1.2' created by Christian Lohmaier 
 at 2021-09-08 17:53 +

Tag libreoffice-7.2.1.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmE4+J0ACgkQ9DSh76/u
rqN/5A//QZ3N6yMyKuamxpGuomnIGFeOFqzbwMOznQqlRisnkLMLdt9+kRTbYTuW
tCckCgFJya9wwauvc2hOwYrVsBqpRZ9YlRiYHRnUUX3AObW7MDb2oRM2LiciJpzV
mqyH6YxkBVkwqT3DuIfrpMWuRigfWC1EwI1whYPIWgpFTbhzcwvk8o/5MAPoI/vF
TyQBSvmo6FFgQe703j6k1oWasvqnaf/T4AZZTCEEHBN3hF6ry9y4pMWHpNPenPX1
PAj4dkO1LWSqSh7InG6qP6y+kL6jkAZkIdA0vKB6+O3IXeVlD2kXMh+5Q1izOKi1
J/kjXuxsziMXyGQNOpqXF8eYnl4o8a8hkJHRHi7N8+zaubbkdMe/CfCO95XA94Em
xt1invBK7JKDCkMG9cv9/GrDwwchJ813nDEHeMUP0k0kFdHtf1YpRsGE53pToQAv
ZdzOYIldckPaWIk8lcOOJsdi/OwLAaxWVm/RhfGKmPF8atolW6pRsRhIskQDaniv
JJrYhHSSokLibcg3zvhjPiHQvEWm04rXVzDZGj59/oOBEQAGJHRk4uxoQ32VSu9V
amE7KDpppGlzT2cwJtciOC7cajdQwHNBOf3UWhTe14yoWZAmwJWFUeX+ekuDBcNc
u+FhmWyLbVO74f8aZf+EbR+JD88Mv7s6mmUtk+0N9KNfw3a8/+o=
=QvUr
-END PGP SIGNATURE-

Changes since libreoffice-7-2-branch-point-13:
---
 0 files changed
---

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-7.2.1.2'

2021-09-08 Thread Christian Lohmaier (via logerrit)

Tag 'libreoffice-7.2.1.2' created by Christian Lohmaier 
 at 2021-09-08 17:53 +

Tag libreoffice-7.2.1.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmE4+J0ACgkQ9DSh76/u
rqPipw/7BeyKXBqAqP1Q+5QKNWq2ITCkdvN0uY7EWxzQf1oAKtcMG6cM8i6bZoZ9
zRyzdqDJ5P9c2sI+/Ws76lChRnfUOfgPEsstJu97NgxJK2HbI5Zi8RpKOgNfBBkD
KYqzNYIMoSV9bGy29RbAyOEg6oIix/aPlzvshpuG53BjcHJnUBgOVqEdwdq7ER5Q
T8OUp8smd3e4jdE0QLjtvZOBYdHb/EkA/Wnuzjg74Yx4461K8yd57yGQ4NNqqMCn
lkeBLz+qdv1a8Bu2Yk3pya+VCfNmMrETLDtiIJ6FXxsVlQnkWhl3xXQ4/Pc6diN7
DfXWcRNrgEKQZiOPHVcS4iV6avGExbh/NE/ffURQhUkB2DMPHOqKhPS5KZcvxG+O
hOQah4WQHlm8MCgg6kOsxUnWKtXKAz/yvh2moI7cCjXsynshT+oDT3aWYOrcgZRG
+xngzcYbvSQ4/k+f2y7uyoBuvc208OZScAVaNx0czGnTv9Hz01lLzmfNQfM6KSgx
cZqCH3fQgqg+rCiJ0vgS1FiGPCFXX6bwm275/9O9+h0drpYzDhvXAcACiW6PgP+y
IUG6qGlPLGtltpo9rIUzLxkz31H8bnqrqFXvlXqYl9c01C8UdgDM+OFp/IeGSTpT
9YJro+yVEGJ5nkzCJRDYZAtz6k22TrBBHqhHjxwalcpc9K2Rne0=
=ZT2P
-END PGP SIGNATURE-

Changes since libreoffice-7-2-branch-point-13:
---
 0 files changed
---

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-7.2.1.2'

2021-09-08 Thread Christian Lohmaier (via logerrit)

Tag 'libreoffice-7.2.1.2' created by Christian Lohmaier 
 at 2021-09-08 17:53 +

Tag libreoffice-7.2.1.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmE4+JoACgkQ9DSh76/u
rqMXQA/+ME98VuLUqI7YuMaNvpzuO5WttULxMzcG9eW/MAzSJlWSyY4kxwY94FGc
f2QxTRIPgymP3tnFlLqaHZshFazSTvjTeFwJm6hypSYq6rr0qd5C+8NTJwkTAu9o
OQfhSt4NChHRaKHeL+kLr+NteLWbRaQcKe6bRxl7CsXA2DwVeVtvYqYShy2eEXYu
UAAy+XPZTJPm9k52E4uCVO3WAbNJJbXZAroG3ZRzu4V4E5QWXIQay1OotUNmu6Ko
kZFcCaJ6qCpEqxs2AWf3pJqAhV8iqfcd50bnyg7EYv1UbOCufICZIpCOdtIUYJG4
iRQMENRna5StUoeXsagrvCI3vwT7AQMoWohgGIGKmXc7EinMaTArolf+2KgqmMoT
S0RIDebjvyFjt/DIa8dqGmDHJJZBG6x/NE8dU+KFjj4NEcqoSu/DNxelHSOSRJgU
gtr1br2RtyLsPgWo2k8DmAtt6E6wyxr9qxVe5DwvAysaCEDf8xcakIXrc8THBNLZ
TvfJdm9dSXXiu0/XtlecPSFtU9z+xZqS8CJnK+J3AI2pZMqnUdZyPnSP0LLYDcob
ADpPwvQL8FG+UTwE9nQUK7kmyTm/FZHxYUcmzg8QjOsKktIQBTJ0STcsG0iP9s6W
kJnkEFG1cTxHvkKdc/pG1PsXvJ7Jw/mH5VsEb+8n0pYeuryYmuo=
=Q51i
-END PGP SIGNATURE-

Changes since libreoffice-7-2-branch-point-12:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-1' - configure.ac

2021-09-08 Thread Christian Lohmaier (via logerrit)

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4a033d6c63225c76b6664a9cf297a0f05a814b8b
Author: Christian Lohmaier 
AuthorDate: Wed Sep 8 19:53:52 2021 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Sep 8 19:53:52 2021 +0200

bump product version to 7.2.1.2.0+

Change-Id: I0f99afed3b69d116ab26f83dd5e0cb162654b976

diff --git a/configure.ac b/configure.ac
index 4bb03edaeca9..ccdad1fbfd20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[7.2.1.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.2.1.2.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-1' - sc/qa sc/source

 sc/qa/uitest/autofilter/tdf36383.py |   68 
 sc/source/ui/view/viewfunc.cxx  |   22 +--
 2 files changed, 2 insertions(+), 88 deletions(-)

New commits:
commit 98a3abe58f13c875505fded61b4a39840600b3a3
Author: Xisco Fauli 
AuthorDate: Thu Sep 2 15:29:21 2021 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Sep 8 19:34:27 2021 +0200

tdf#144155: Revert "tdf#36383 sc AutoFilter: fix changing row height"

This reverts commit 3678e0efcb8bedc58dd329a430da0ac3b1572df8.

Conflicts: sc/qa/uitest/autofilter/tdf36383.py
Change-Id: Ie1abd0cdea013571a27b187ffcb20125a0656442
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121512
Reviewed-by: László Németh 
Tested-by: Jenkins
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121550
(cherry picked from commit 91eb9e16cd73df2249a24f949ea8bef62bbe2d09)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121555
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/sc/qa/uitest/autofilter/tdf36383.py 
b/sc/qa/uitest/autofilter/tdf36383.py
deleted file mode 100644
index d55db21837b3..
--- a/sc/qa/uitest/autofilter/tdf36383.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-from uitest.framework import UITestCase
-from uitest.uihelper.calc import enter_text_to_cell
-from libreoffice.uno.propertyvalue import mkPropertyValues
-from libreoffice.calc.document import get_row
-
-#Bug 36383 - EDITING auto row height or change row height removes AutoFilter 
result
-
-class tdf36383(UITestCase):
-def test_tdf36383_row_height(self):
-self.ui_test.create_doc_in_start_center("calc")
-document = self.ui_test.get_component()
-calcDoc = self.xUITest.getTopFocusWindow()
-gridwin = calcDoc.getChild("grid_window")
-document = self.ui_test.get_component()
-
-enter_text_to_cell(gridwin, "A1", "A")
-enter_text_to_cell(gridwin, "A2", "1")
-enter_text_to_cell(gridwin, "A3", "2")
-enter_text_to_cell(gridwin, "A4", "3")
-
-gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A4"}))
-
-self.xUITest.executeCommand(".uno:DataFilterAutoFilter")
-
-gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "", 
"COL": "0", "ROW": "0"}))
-xFloatWindow = self.xUITest.getFloatWindow()
-xCheckListMenu = xFloatWindow.getChild("check_list_menu")
-xList = xCheckListMenu.getChild("check_list_box")
-xEntry = xList.getChild("1")
-xEntry.executeAction("CLICK", tuple())
-
-xOkButton = xFloatWindow.getChild("ok")
-xOkButton.executeAction("CLICK", tuple())
-
-row = get_row(document, 2)
-self.assertFalse(row.getPropertyValue("IsVisible"))
-
-#row height
-self.ui_test.execute_dialog_through_command(".uno:RowHeight")
-xDialog = self.xUITest.getTopFocusWindow()
-xvalue = xDialog.getChild("value")
-xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"CTRL+A"}))
-xvalue.executeAction("TYPE", mkPropertyValues({"KEYCODE":"BACKSPACE"}))
-xvalue.executeAction("TYPE", mkPropertyValues({"TEXT":"1 cm"}))
-
-xOk = xDialog.getChild("ok")
-self.ui_test.close_dialog_through_button(xOk)
-
-self.assertFalse(row.getPropertyValue("IsVisible"))
-
-#optimal row height
-self.ui_test.execute_dialog_through_command(".uno:SetOptimalRowHeight")
-xDialog = self.xUITest.getTopFocusWindow()
-
-xOk = xDialog.getChild("ok")
-self.ui_test.close_dialog_through_button(xOk)
-
-self.assertFalse(row.getPropertyValue("IsVisible"))
-
-self.ui_test.close_doc()
-
-# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 718d8cd0e8c7..50606d80ad39 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -2177,17 +2177,7 @@ void ScViewFunc::SetWidthOrHeight(
 aCxt.setExtraHeight(nSizeTwips);
 rDoc.SetOptimalHeight(aCxt, nStartNo, nEndNo, nTab, true);
 if (bAll)
-{
-for (SCROW nRow = nStartNo; nRow <= nEndNo; ++nRow)
-{
-SCROW nLastRow = nRow;
-// tdf#36383 skip consecutive rows hidden by 
AutoFilter
-if (rDoc.RowFiltered(nRow, nTab, nullptr, 
&nLastRow))
-nRow = nLastRow;
-else
-rDoc.ShowRow(nRow, nTab,

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-1' - vcl/qt5 vcl/unx

2021-09-08 Thread Jan-Marek Glogowski (via logerrit)

 vcl/qt5/Qt5Instance.cxx|   18 +++---
 vcl/unx/kf5/KF5SalInstance.cxx |   15 ---
 2 files changed, 27 insertions(+), 6 deletions(-)

New commits:
commit 51f9e920982e1ef3ac0bb2226b059c0e802642d5
Author: Jan-Marek Glogowski 
AuthorDate: Thu Aug 26 13:49:13 2021 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Sep 8 19:28:11 2021 +0200

tdf#144008 Qt5/Kf5 create frames in the GUI thread

There was a 50% chance my pick would have been correct... ok,
just half-true, as in hindsight, I should have preferred the
secure variant using RunInMain to start with.

I thought I could use some templated class functions to get rid
of all the copy and paste, but that looked even more ugly.

P.S. if you wonder - like myself - about the code formatting in
Qt5Instance::CreateFrame: that if from clang-format.

Change-Id: I3a6b0c12c9d71ad8e777ed82526d1515a249832c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121091
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 923b30aa27ceb377d6a540c012000e89ce5db31e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121063
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 76cb48b6a00cde41987a1b67b78fee68a133ad53)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121568
Reviewed-by: Michael Weghorn 
Reviewed-by: Xisco Fauli 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index 184f822faa45..c1e82aa6a0d9 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -285,13 +285,21 @@ void Qt5Instance::deleteObjectLater(QObject* pObject) { 
pObject->deleteLater();
 
 SalFrame* Qt5Instance::CreateChildFrame(SystemParentData* /*pParent*/, 
SalFrameStyleFlags nStyle)
 {
-return new Qt5Frame(nullptr, nStyle, m_bUseCairo);
+SalFrame* pRet(nullptr);
+RunInMainThread([&, this]() { pRet = new Qt5Frame(nullptr, nStyle, 
useCairo()); });
+assert(pRet);
+return pRet;
 }
 
 SalFrame* Qt5Instance::CreateFrame(SalFrame* pParent, SalFrameStyleFlags 
nStyle)
 {
 assert(!pParent || dynamic_cast(pParent));
-return new Qt5Frame(static_cast(pParent), nStyle, m_bUseCairo);
+
+SalFrame* pRet(nullptr);
+RunInMainThread(
+[&, this]() { pRet = new Qt5Frame(static_cast(pParent), 
nStyle, useCairo()); });
+assert(pRet);
+return pRet;
 }
 
 void Qt5Instance::DestroyFrame(SalFrame* pFrame)
@@ -306,7 +314,11 @@ void Qt5Instance::DestroyFrame(SalFrame* pFrame)
 SalObject* Qt5Instance::CreateObject(SalFrame* pParent, SystemWindowData*, 
bool bShow)
 {
 assert(!pParent || dynamic_cast(pParent));
-return new Qt5Object(static_cast(pParent), bShow);
+
+SalObject* pRet(nullptr);
+RunInMainThread([&]() { pRet = new 
Qt5Object(static_cast(pParent), bShow); });
+assert(pRet);
+return pRet;
 }
 
 void Qt5Instance::DestroyObject(SalObject* pObject)
diff --git a/vcl/unx/kf5/KF5SalInstance.cxx b/vcl/unx/kf5/KF5SalInstance.cxx
index 608b5dccc4dc..9279ec50b98b 100644
--- a/vcl/unx/kf5/KF5SalInstance.cxx
+++ b/vcl/unx/kf5/KF5SalInstance.cxx
@@ -42,13 +42,22 @@ 
KF5SalInstance::KF5SalInstance(std::unique_ptr& pQApp, bool bUseCa
 
 SalFrame* KF5SalInstance::CreateChildFrame(SystemParentData* /*pParent*/, 
SalFrameStyleFlags nStyle)
 {
-return new KF5SalFrame(nullptr, nStyle, useCairo());
+SalFrame* pRet(nullptr);
+RunInMainThread([&, this]() { pRet = new KF5SalFrame(nullptr, nStyle, 
useCairo()); });
+assert(pRet);
+return pRet;
 }
 
-SalFrame* KF5SalInstance::CreateFrame(SalFrame* pParent, SalFrameStyleFlags 
nState)
+SalFrame* KF5SalInstance::CreateFrame(SalFrame* pParent, SalFrameStyleFlags 
nStyle)
 {
 assert(!pParent || dynamic_cast(pParent));
-return new KF5SalFrame(static_cast(pParent), nState, 
useCairo());
+
+SalFrame* pRet(nullptr);
+RunInMainThread([&, this]() {
+pRet = new KF5SalFrame(static_cast(pParent), nStyle, 
useCairo());
+});
+assert(pRet);
+return pRet;
 }
 
 bool KF5SalInstance::hasNativeFileSelection() const

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-1' - sc/source

 sc/source/filter/xml/xmlexprt.cxx |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 25bdfc5404f210ed889e452cb3b7deb016c6c0d3
Author: Xisco Fauli 
AuthorDate: Thu Aug 26 19:10:58 2021 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Sep 8 19:25:50 2021 +0200

tdf#143940: the style index might be -1

Similar to 52aebe6986bcec07071adb3f94d6c09fea147044
< tdf#138466 Crash when creating different scenarios >

ExportColumns calls GetStyleNameIndex which might return -1
so check the index is different than -1 as it's already done
when calling ScFormatRangeStyles::GetStyleNameByIndex

Also move fix for tdf#138466 down the stack to be consistent

Debug builds will still assert, see coverity#1438402

Since 5e777f23fd0118f6649f0d9e30eb77a72f1099e4
< loplugin:useuniqueptr in ScColumnRowStylesBase >
where the nIndex < 0 check in
ScColumnRowStylesBase::GetStyleNameByIndex was removed

Change-Id: I084bfa04c39f37cb325c3b3df76801b3abdea994
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121128
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 7246759822aff30e4e4e1bca7949eae3b0d960ef)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121068
Reviewed-by: Xisco Fauli 
(cherry picked from commit aecdbb01ea6d89d1e3e25707b0dcd2bedaeb64a6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121287
Reviewed-by: Adolfo Jayme Barrientos 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 497daf4a49e3..affd763e80ad 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -737,7 +737,9 @@ void ScXMLExport::WriteSingleColumn(const sal_Int32 
nRepeatColumns, const sal_In
 const sal_Int32 nIndex, const bool bIsAutoStyle, const bool bIsVisible)
 {
 CheckAttrList();
-AddAttribute(sAttrStyleName, 
pColumnStyles->GetStyleNameByIndex(nStyleIndex));
+// tdf#138466
+if (nStyleIndex != -1)
+AddAttribute(sAttrStyleName, 
pColumnStyles->GetStyleNameByIndex(nStyleIndex));
 if (!bIsVisible)
 AddAttribute(XML_NAMESPACE_TABLE, XML_VISIBILITY, XML_COLLAPSE);
 if (nRepeatColumns > 1)
@@ -870,9 +872,7 @@ void ScXMLExport::ExportColumns(const sal_Int32 nTable, 
const ScRange& aColumnHe
 nColsRepeated = 1;
 }
 }
-// tdf#138466
-if (nPrevIndex != -1)
-WriteColumn(nPrevColumn, nColsRepeated, nPrevIndex, bPrevIsVisible);
+WriteColumn(nPrevColumn, nColsRepeated, nPrevIndex, bPrevIsVisible);
 if (!bIsClosed)
 CloseHeaderColumn();
 if (pGroupColumns->IsGroupEnd(nColumn - 1))
@@ -1351,7 +1351,9 @@ void ScXMLExport::WriteRowStartTag(
 const sal_Int32 nIndex, const sal_Int32 nEqualRows,
 bool bHidden, bool bFiltered)
 {
-AddAttribute(sAttrStyleName, pRowStyles->GetStyleNameByIndex(nIndex));
+// tdf#143940
+if (nIndex != -1)
+AddAttribute(sAttrStyleName, pRowStyles->GetStyleNameByIndex(nIndex));
 if (bHidden)
 {
 if (bFiltered)

[Libreoffice-commits] core.git: include/vcl

2021-09-08 Thread Andrea Gelmini (via logerrit)

 include/vcl/metaact.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit b298885ceaab0c892ffc449e09c2967a3a9e3ea6
Author: Andrea Gelmini 
AuthorDate: Wed Sep 8 08:27:41 2021 +0200
Commit: Julien Nabet 
CommitDate: Wed Sep 8 19:21:36 2021 +0200

Removed duplicated include

Change-Id: Icc9747237c4ff23cd844f23531f0de37ca1a37d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121798
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 38390ec9b9f5..6562e8197158 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -29,7 +29,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-1' - readlicense_oo/license

2021-09-08 Thread Christian Lohmaier (via logerrit)

 readlicense_oo/license/CREDITS.fodt | 3742 ++--
 1 file changed, 1875 insertions(+), 1867 deletions(-)

New commits:
commit 38c87f7bad183877a172d10e60607c85f8aa414b
Author: Christian Lohmaier 
AuthorDate: Wed Sep 8 19:05:30 2021 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Sep 8 19:13:53 2021 +0200

update credits

Change-Id: Ie9a3df3c6dc8af63023e579638f13026451a346f
(cherry picked from commit 4a07a8963a74ef1659aa3e467d9288d1e3c7b9d4)
(cherry picked from commit 4914ecbad25fd7b699d15c859034561e13b70d3f)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 50d3e077a4fb..b3ee4aaa23ad 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 
 
 http://openoffice.org/2009/office"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns
 :config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="ur
 n:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms"; office:version="1.3" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/7.1.5.2$Linux_X86_64
 
LibreOffice_project/85f04e9f809797b8199d13c421bd8a2b025d52b52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/7.2.0.4$Linux_X86_64
 
LibreOffice_project/9a9c6381e3f7a62afc1329bd359cc48accb6435b2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   531
+   651
501
48588
-   27360
+   26450
true
true

@@ -16,14 +16,15 @@
  3577
  3434
  501
- 531
+ 651
  49087
- 27889
+ 27099
  0
  0
  false
  100
  false
+ false
  false
 

@@ -47,6 +48,7 @@
true
false
false
+   false
false
false
true
@@ -95,7 +97,7 @@


true
-   10252920
+   10265368

true
false
@@ -113,6 +115,7 @@
false
false
true
+   false
false

false
@@ -147,22 +150,22 @@
   
  
  
-  
-  
-  
+  
   
   
-  
-  
-  
   
+  
   
+  
+  
   
+  
+  
  
  
   

-   
+   
 


@@ -283,52 +286,52 @@

   
   
-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 
@@ -340,23 +343,26 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
+  
+   
+  
   

   
@@ -418,24 +424,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -448,41 +454,41 @@


   
-  
-   
+  
+   
+   
   
   
-   
+

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - readlicense_oo/license

2021-09-08 Thread Christian Lohmaier (via logerrit)

 readlicense_oo/license/CREDITS.fodt | 3742 ++--
 1 file changed, 1875 insertions(+), 1867 deletions(-)

New commits:
commit 4914ecbad25fd7b699d15c859034561e13b70d3f
Author: Christian Lohmaier 
AuthorDate: Wed Sep 8 19:05:30 2021 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Sep 8 19:11:57 2021 +0200

update credits

Change-Id: Ie9a3df3c6dc8af63023e579638f13026451a346f
(cherry picked from commit 4a07a8963a74ef1659aa3e467d9288d1e3c7b9d4)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 50d3e077a4fb..b3ee4aaa23ad 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 
 
 http://openoffice.org/2009/office"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns
 :config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="ur
 n:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms"; office:version="1.3" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/7.1.5.2$Linux_X86_64
 
LibreOffice_project/85f04e9f809797b8199d13c421bd8a2b025d52b52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/7.2.0.4$Linux_X86_64
 
LibreOffice_project/9a9c6381e3f7a62afc1329bd359cc48accb6435b2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   531
+   651
501
48588
-   27360
+   26450
true
true

@@ -16,14 +16,15 @@
  3577
  3434
  501
- 531
+ 651
  49087
- 27889
+ 27099
  0
  0
  false
  100
  false
+ false
  false
 

@@ -47,6 +48,7 @@
true
false
false
+   false
false
false
true
@@ -95,7 +97,7 @@


true
-   10252920
+   10265368

true
false
@@ -113,6 +115,7 @@
false
false
true
+   false
false

false
@@ -147,22 +150,22 @@
   
  
  
-  
-  
-  
+  
   
   
-  
-  
-  
   
+  
   
+  
+  
   
+  
+  
  
  
   

-   
+   
 


@@ -283,52 +286,52 @@

   
   
-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 
@@ -340,23 +343,26 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
+  
+   
+  
   

   
@@ -418,24 +424,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -448,41 +454,41 @@


   
-  
-   
+  
+   
+   
   
   
-   
+   
   
-  
-   
+  
+   
   
   

-   
   
   
-   
-   
+

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - readlicense_oo/license

2021-09-08 Thread Christian Lohmaier (via logerrit)

 readlicense_oo/license/CREDITS.fodt | 3742 ++--
 1 file changed, 1875 insertions(+), 1867 deletions(-)

New commits:
commit f6db54d2dd7de5b227cb766575f4b0cb7bbf5184
Author: Christian Lohmaier 
AuthorDate: Wed Sep 8 19:05:30 2021 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Sep 8 19:09:20 2021 +0200

update credits

Change-Id: Ie9a3df3c6dc8af63023e579638f13026451a346f
(cherry picked from commit 4a07a8963a74ef1659aa3e467d9288d1e3c7b9d4)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 50d3e077a4fb..b3ee4aaa23ad 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 
 
 http://openoffice.org/2009/office"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns
 :config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="ur
 n:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms"; office:version="1.3" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/7.1.5.2$Linux_X86_64
 
LibreOffice_project/85f04e9f809797b8199d13c421bd8a2b025d52b52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/7.2.0.4$Linux_X86_64
 
LibreOffice_project/9a9c6381e3f7a62afc1329bd359cc48accb6435b2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   531
+   651
501
48588
-   27360
+   26450
true
true

@@ -16,14 +16,15 @@
  3577
  3434
  501
- 531
+ 651
  49087
- 27889
+ 27099
  0
  0
  false
  100
  false
+ false
  false
 

@@ -47,6 +48,7 @@
true
false
false
+   false
false
false
true
@@ -95,7 +97,7 @@


true
-   10252920
+   10265368

true
false
@@ -113,6 +115,7 @@
false
false
true
+   false
false

false
@@ -147,22 +150,22 @@
   
  
  
-  
-  
-  
+  
   
   
-  
-  
-  
   
+  
   
+  
+  
   
+  
+  
  
  
   

-   
+   
 


@@ -283,52 +286,52 @@

   
   
-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 
@@ -340,23 +343,26 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
+  
+   
+  
   

   
@@ -418,24 +424,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -448,41 +454,41 @@


   
-  
-   
+  
+   
+   
   
   
-   
+   
   
-  
-   
+  
+   
   
   

-   
   
   
-   
-   
+

[Libreoffice-commits] core.git: readlicense_oo/license

2021-09-08 Thread Christian Lohmaier (via logerrit)

 readlicense_oo/license/CREDITS.fodt | 3742 ++--
 1 file changed, 1875 insertions(+), 1867 deletions(-)

New commits:
commit 4a07a8963a74ef1659aa3e467d9288d1e3c7b9d4
Author: Christian Lohmaier 
AuthorDate: Wed Sep 8 19:05:30 2021 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Sep 8 19:05:51 2021 +0200

update credits

Change-Id: Ie9a3df3c6dc8af63023e579638f13026451a346f

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 50d3e077a4fb..b3ee4aaa23ad 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 
 
 http://openoffice.org/2009/office"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns
 :config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="ur
 n:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms"; office:version="1.3" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/7.1.5.2$Linux_X86_64
 
LibreOffice_project/85f04e9f809797b8199d13c421bd8a2b025d52b52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/7.2.0.4$Linux_X86_64
 
LibreOffice_project/9a9c6381e3f7a62afc1329bd359cc48accb6435b2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   531
+   651
501
48588
-   27360
+   26450
true
true

@@ -16,14 +16,15 @@
  3577
  3434
  501
- 531
+ 651
  49087
- 27889
+ 27099
  0
  0
  false
  100
  false
+ false
  false
 

@@ -47,6 +48,7 @@
true
false
false
+   false
false
false
true
@@ -95,7 +97,7 @@


true
-   10252920
+   10265368

true
false
@@ -113,6 +115,7 @@
false
false
true
+   false
false

false
@@ -147,22 +150,22 @@
   
  
  
-  
-  
-  
+  
   
   
-  
-  
-  
   
+  
   
+  
+  
   
+  
+  
  
  
   

-   
+   
 


@@ -283,52 +286,52 @@

   
   
-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 

-   
+   
 
  
 
@@ -340,23 +343,26 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
+  
+   
+  
   

   
@@ -418,24 +424,24 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -448,41 +454,41 @@


   
-  
-   
+  
+   
+   
   
   
-   
+   
   
-  
-   
+  
+   
   
   

-   
   
   
-   
-   
+   
   
   

-   
+   
   
   

-   
+   
   
   

-   
+

[Libreoffice-commits] core.git: sc/qa

 sc/qa/uitest/calc_tests9/tdf118938.py |   33 +
 1 file changed, 9 insertions(+), 24 deletions(-)

New commits:
commit 708b1aa962dd667a9de6d6131cfc63937212536e
Author: Xisco Fauli 
AuthorDate: Wed Sep 8 17:43:53 2021 +0200
Commit: Xisco Fauli 
CommitDate: Wed Sep 8 18:51:03 2021 +0200

related: tdf#118938: simplify uitest

use execute_dialog_through_command like every other test
and remove the try/except complexity

Change-Id: Ie9cb68e56174516002c15afe89e4314e4c16a755
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121826
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_tests9/tdf118938.py 
b/sc/qa/uitest/calc_tests9/tdf118938.py
index 7444f65780ea..67647ba6d940 100644
--- a/sc/qa/uitest/calc_tests9/tdf118938.py
+++ b/sc/qa/uitest/calc_tests9/tdf118938.py
@@ -12,38 +12,23 @@ from libreoffice.uno.propertyvalue import mkPropertyValues
 # with additional password protection for editing not working 
(Calc)
 
 class tdf118938(UITestCase):
+
 def test_tdf118938(self):
 with self.ui_test.load_file(get_url_for_data_file("tdf118938.xlsx")):
 #The document was created in Calc after this fix.
 calcDoc = self.xUITest.getTopFocusWindow()
 gridwin = calcDoc.getChild("grid_window")
 
-incorrectPass = False;
+document = self.ui_test.get_component()
+
+# Without the fix in place, this test would have failed with
+# AssertionError: False is not true
+self.assertTrue(document.isReadonly())
 
-try:
-self.xUITest.executeDialog(".uno:EditDoc")
-xDialog = self.xUITest.getTopFocusWindow();
+with self.ui_test.execute_dialog_through_command(".uno:EditDoc") 
as xDialog:
 xPassword = xDialog.getChild("newpassEntry")
 xPassword.executeAction("TYPE", mkPropertyValues({"TEXT": 
"a"}))
-xOKBtn = xDialog.getChild("ok")
-self.ui_test.close_dialog_through_button(xOKBtn)
-
-try:
-xWarnDialog = self.xUITest.getTopFocusWindow()
-xOK = xWarnDialog.getChild("ok")
-self.ui_test.close_dialog_through_button(xOK)
-
-xDialog2 = self.xUITest.getTopFocusWindow();
-xCancelBtn = xDialog2.getChild("cancel")
-self.ui_test.close_dialog_through_button(xCancelBtn)
-
-incorrectPass = True;
-except:
-pass
-except:
-assert False, "The password dialog hasn't appeared."
-
-if incorrectPass:
-assert False, "Incorrect password."
+
+self.assertFalse(document.isReadonly())
 
 # vim: set shiftwidth=4 softtabstop=4 expandtab:

[Libreoffice-commits] core.git: sc/qa uitest/libreoffice

 sc/qa/uitest/csv_dialog/tdf114878.py  |   44 ++--
 sc/qa/uitest/csv_dialog/tdf117868.py  |   43 +++-
 sc/qa/uitest/csv_dialog/tdf142395.py  |   42 ---
 sc/qa/uitest/csv_dialog/tdf57841.py   |   41 ++
 sc/qa/uitest/csv_dialog/tdf60468.py   |   38 ++--
 sc/qa/uitest/csv_dialog/tdf92503.py   |   39 +
 sc/qa/uitest/csv_dialog/tdf96561.py   |   40 ++
 uitest/libreoffice/calc/csv_dialog.py |   52 ++
 8 files changed, 113 insertions(+), 226 deletions(-)

New commits:
commit 2c0e5d8b2e53921f09b2e5036cc25f8b0a177dd6
Author: Xisco Fauli 
AuthorDate: Wed Sep 8 12:13:32 2021 +0200
Commit: Xisco Fauli 
CommitDate: Wed Sep 8 17:51:47 2021 +0200

uitest: sc: factor out common code

Change-Id: Iaba3b9633eac26516bbb4bb0b6baadb4c6772fa6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121808
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/csv_dialog/tdf114878.py 
b/sc/qa/uitest/csv_dialog/tdf114878.py
index b94368a71343..266f182abdd4 100644
--- a/sc/qa/uitest/csv_dialog/tdf114878.py
+++ b/sc/qa/uitest/csv_dialog/tdf114878.py
@@ -5,32 +5,19 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 from uitest.framework import UITestCase
-from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
-from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict
 from libreoffice.calc.document import get_cell_by_position
+from libreoffice.calc.csv_dialog import load_csv_file
 
 class Td114878(UITestCase):
 
 def test_tdf114878(self):
 
-# Load file from Open dialog
-with self.ui_test.execute_dialog_through_command(".uno:Open", 
close_button="open") as xOpenDialog:
-
-xFileName = xOpenDialog.getChild("file_name")
-xFileName.executeAction("TYPE", mkPropertyValues({"TEXT": 
get_url_for_data_file("tdf114878.csv")}))
-
-xDialog = self.ui_test.wait_for_top_focus_window('TextImportCsvDialog')
-
 # First import the file with 'Evaluate Formulas' unchecked
-
-# Without the fix in place, this test would have failed with
-# Could not find child with id: evaluateformulas
-xEvalutateFormulas = xDialog.getChild("evaluateformulas")
-self.assertEqual('false', 
get_state_as_dict(xEvalutateFormulas)['Selected'])
-
-xOK = xDialog.getChild('ok')
-with self.ui_test.wait_until_component_loaded():
-self.ui_test.close_dialog_through_button(xOK)
+with load_csv_file(self, "tdf114878.csv", True):
+# Without the fix in place, this test would have failed with
+# Could not find child with id: evaluateformulas
+pass
 
 document = self.ui_test.get_component()
 
@@ -41,22 +28,11 @@ class Td114878(UITestCase):
 
 self.ui_test.close_doc()
 
-# Load the same file again
-with self.ui_test.execute_dialog_through_command(".uno:Open", 
close_button="open") as xOpenDialog:
-
-xFileName = xOpenDialog.getChild("file_name")
-xFileName.executeAction("TYPE", mkPropertyValues({"TEXT": 
get_url_for_data_file("tdf114878.csv")}))
-
-xDialog = self.ui_test.wait_for_top_focus_window('TextImportCsvDialog')
-
 # Now import the file with 'Evaluate Formulas' checked
-xEvalutateFormulas = xDialog.getChild("evaluateformulas")
-xEvalutateFormulas.executeAction("CLICK", tuple())
-self.assertEqual('true', 
get_state_as_dict(xEvalutateFormulas)['Selected'])
-
-xOK = xDialog.getChild('ok')
-with self.ui_test.wait_until_component_loaded():
-self.ui_test.close_dialog_through_button(xOK)
+with load_csv_file(self, "tdf114878.csv", True) as xDialog:
+xEvalutateFormulas = xDialog.getChild("evaluateformulas")
+xEvalutateFormulas.executeAction("CLICK", tuple())
+self.assertEqual('true', 
get_state_as_dict(xEvalutateFormulas)['Selected'])
 
 document = self.ui_test.get_component()
 
diff --git a/sc/qa/uitest/csv_dialog/tdf117868.py 
b/sc/qa/uitest/csv_dialog/tdf117868.py
index 5cfcd1503749..0a2dac3a7ef7 100644
--- a/sc/qa/uitest/csv_dialog/tdf117868.py
+++ b/sc/qa/uitest/csv_dialog/tdf117868.py
@@ -5,41 +5,30 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 from uitest.framework import UITestCase
-from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
-from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict
 from libreoffice.calc.document import get_cell_by_position
+from libreoffice.calc.csv_dialog import load_csv_file
 
 class Td117868(UITestCase):
 
 def test_tdf117868(self):
 
-# Load file from Open dialog
-with self.ui_te

[Libreoffice-commits] core.git: helpcontent2

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9c2d703363798aad33a22b3b4e6ac8043dd53b95
Author: Alain Romedenne 
AuthorDate: Wed Sep 8 17:40:57 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Sep 8 17:40:57 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 9088fa2a2fefecaa450cc2b9767a8d958b9e4350
  - SF_Base.CloseFormDocument() new 7.3 method

Change-Id: Id58053f554c27819aa073ea8312ece8fb32710a0
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/121762
Tested-by: Jenkins
Reviewed-by: Rafael Lima 

diff --git a/helpcontent2 b/helpcontent2
index ab28d2cbdffe..9088fa2a2fef 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ab28d2cbdffe0e5c9a966fa5f7659a455a042663
+Subproject commit 9088fa2a2fefecaa450cc2b9767a8d958b9e4350

[Libreoffice-commits] help.git: source/text

 source/text/sbasic/shared/03/sf_base.xhp |   33 ---
 1 file changed, 30 insertions(+), 3 deletions(-)

New commits:
commit 9088fa2a2fefecaa450cc2b9767a8d958b9e4350
Author: Alain Romedenne 
AuthorDate: Tue Sep 7 17:06:27 2021 +0200
Commit: Rafael Lima 
CommitDate: Wed Sep 8 17:40:55 2021 +0200

SF_Base.CloseFormDocument() new 7.3 method

Change-Id: Id58053f554c27819aa073ea8312ece8fb32710a0
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/121762
Tested-by: Jenkins
Reviewed-by: Rafael Lima 

diff --git a/source/text/sbasic/shared/03/sf_base.xhp 
b/source/text/sbasic/shared/03/sf_base.xhp
index 96a4b6b14..64d680c00 100644
--- a/source/text/sbasic/shared/03/sf_base.xhp
+++ b/source/text/sbasic/shared/03/sf_base.xhp
@@ -83,24 +83,51 @@



+ CloseFormDocument
  FormDocuments
- Forms




+ Forms
  GetDatabase
- IsLoaded




- OpenFormDocument
+ IsLoaded
+ OpenFormDocument



 
 
+
+   CloseFormDocument 
-
 
+  
+Base service;CloseFormDocument
+  
+  CloseFormDocument
+  Closes the given form 
document. Returns True if closure is successful.
+  
+  
+  
+svc.CloseFormDocument(formdocument: str): bool
+  
+  
+  formDocument: The name of the 
FormDocument to be closed, as a case-sensitive 
string.
+  
+  If form documents are 
organized in folders, it is necessary to include the folder name to specify the 
form document to be opened, as illustrated in the following 
examples:
+  
+  
+oDoc.CloseFormDocument("Folder1/myFormDocument")
+  
+  
+  
+doc.CloseFormDocument('Folder1/myFormDocument')
+  
+
+
 
FormDocuments 
---

[Libreoffice-commits] core.git: helpcontent2

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9e4bf8b36010c54a32059119ada0335857fdcd75
Author: Alain Romedenne 
AuthorDate: Wed Sep 8 17:38:15 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Sep 8 17:38:15 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to ab28d2cbdffe0e5c9a966fa5f7659a455a042663
  - sf-exception.PythonPrint new method

Change-Id: I11402201ef509816fc38665eae8d057e1761274a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/121469
Tested-by: Jenkins
Reviewed-by: Rafael Lima 

diff --git a/helpcontent2 b/helpcontent2
index 77c10ceaaabe..ab28d2cbdffe 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 77c10ceaaabe76f57014e53dbdd4560d988bb8a1
+Subproject commit ab28d2cbdffe0e5c9a966fa5f7659a455a042663

[Libreoffice-commits] help.git: source/text

 source/text/sbasic/shared/0003.xhp |   29 +
 source/text/sbasic/shared/03/avail_release.xhp |8 +-
 source/text/sbasic/shared/03/sf_exception.xhp  |   28 ++--
 3 files changed, 30 insertions(+), 35 deletions(-)

New commits:
commit ab28d2cbdffe0e5c9a966fa5f7659a455a042663
Author: Alain Romedenne 
AuthorDate: Thu Sep 2 15:37:05 2021 +0200
Commit: Rafael Lima 
CommitDate: Wed Sep 8 17:38:13 2021 +0200

sf-exception.PythonPrint new method

Change-Id: I11402201ef509816fc38665eae8d057e1761274a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/121469
Tested-by: Jenkins
Reviewed-by: Rafael Lima 

diff --git a/source/text/sbasic/shared/0003.xhp 
b/source/text/sbasic/shared/0003.xhp
index 5c2b7fb2b..04e6b540c 100644
--- a/source/text/sbasic/shared/0003.xhp
+++ b/source/text/sbasic/shared/0003.xhp
@@ -17,28 +17,21 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
-
 
   
 Information
 /text/sbasic/shared/0003.xhp
   
 
-
 
-
-
 Information
-
 
 You can set 
the locale used for controlling the formatting numbers, dates and currencies in 
$[officename] Basic in %PRODUCTNAME - Preferences
 Tools - 
Options - Language Settings - 
Languages. In Basic format codes, the decimal point (.) is 
always used as placeholder for the decimal separator defined in 
your locale and will be replaced by the corresponding character.
 The same 
applies to the locale settings for date, time and currency formats. The Basic 
format code will be interpreted and displayed according to your locale 
setting.
 
-
 
 The color 
values of the 16 basic colors are as follows:
-
 
   
 
@@ -178,7 +171,6 @@
   
 
 
-
 
 Open Tools - Macros - Organize 
Dialogs and select %PRODUCTNAME Dialogs 
container.
 
@@ -188,67 +180,51 @@
 
 This library must be loaded 
before execution. Execute the following statement before running any macro that 
uses this library:
 
-
 
 This constant, function or object 
is enabled with the statement Option VBASupport 1 placed 
before the executable program code in a module.
 
 
 This statement must be added before the 
executable program code in a module.
 
-
 
 Syntax:
 
-
 
 Return 
value:
 
-
 
 Parameters:
 
-
 
 Example:
 
-
 
 In Basic
 
-
 
 In Python
 
-
 
 This method is only available for 
Basic scripts.
 
-
 
 This method is only available for 
Python scripts.
 
-
 
-This method requires the installation of 
the https://extensions.libreoffice.org/en/extensions/show/apso-alternative-script-organizer-for-python";
 name="APSO Link">APSO (Alternative Script Organizer for Python) 
extension. If it is not installed, an error will occur.
+This method requires the installation of 
the https://extensions.libreoffice.org/en/extensions/show/apso-alternative-script-organizer-for-python";
 name="APSO Link">APSO (Alternative Script Organizer for Python) 
extension. In turn APSO requires the presence of %PRODUCTNAME Python scripting 
framework. If APSO or Python are missing, an error occurs.
 
-
 
 This service is fully supported in both Basic 
and Python languages. All examples are expressed using the Basic programming 
language and can be easily converted to Python.
 
-
 String functions
-
-
 VBA financial 
functions
 VBA Time and Date 
functions
 VBA I/O 
functions
 VBA Mathematical 
functions
 VBA Object 
functions
-
 
 Error codes:
 
-
 
 1 An exception occurred
 2 Syntax error
@@ -373,5 +349,4 @@
 1006 Unable to determine property
 
 
-
-
+
\ No newline at end of file
diff --git a/source/text/sbasic/shared/03/avail_release.xhp 
b/source/text/sbasic/shared/03/avail_release.xhp
index addcd426c..f33c4e3aa 100644
--- a/source/text/sbasic/shared/03/avail_release.xhp
+++ b/source/text/sbasic/shared/03/avail_release.xhp
@@ -8,26 +8,23 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 *
 -->
-
 
 
 (Un)Available since 
release
 /text/sbasic/shared/03/avail_release.xhp
 
 
-
 
   This method is 
not available in Basic.
   This property 
is not available in Basic.
   This method is 
not available in Python.
   This property 
is not available in Python.
-
  Tags for LibreOffice 7.3 
 
 This method is available from 
%PRODUCTNAME 7.3 onwards.
 
 
-This property is available from 
%PRODUCTNAME 7.3 onwards.
+This property is available from 
%PRODUCTNAME 7.3 onwards.
 
  Tags for LibreOffice 7.2 
 
@@ -48,6 +45,5 @@
 
 This property is available from 
%PRODUCTNAME 7.2 onwards.
 
-
 
-
+
\ No newline at end of file
diff --git a/source/text/sbasic/shared/03/sf_exception.xhp 
b/source/text/sbasic/shared/03/sf_exception.xhp
index 75a688dc9..e29e19dea 100644
--- a/source/text/sbasic/shared/03/sf_exception.xhp
+++ b/source/text/sbasic/shared/03/sf_

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

2021-09-08 Thread László Németh (via logerrit)

 sw/qa/extras/uiwriter/data/tdf132744.odt |binary
 1 file changed

New commits:
commit c0c0a24c7e77170622f260b194745810096bae79
Author: László Németh 
AuthorDate: Tue Sep 7 17:01:35 2021 +0200
Commit: László Németh 
CommitDate: Wed Sep 8 17:12:50 2021 +0200

related to tdf#132744: clean-up unit test document

commit a7b12e23bf9ac8e394405a1de5835e18e40c27c2
"tdf#132744: sw: Add unittest" added an ODT
file with a – likely proprietary – photo in a
*453 kB* PNG file. Replace the image with a
*68 B* PNG in the test document.

Change-Id: I684ed3494bf9e7c0489395309e39cd41e78384ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121785
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/uiwriter/data/tdf132744.odt 
b/sw/qa/extras/uiwriter/data/tdf132744.odt
index 5681787d7f61..1c5894bc16aa 100644
Binary files a/sw/qa/extras/uiwriter/data/tdf132744.odt and 
b/sw/qa/extras/uiwriter/data/tdf132744.odt differ

[Libreoffice-commits] core.git: lotuswordpro/Library_lwpft.mk lotuswordpro/source

2021-09-08 Thread Caolán McNamara (via logerrit)

 lotuswordpro/Library_lwpft.mk|1 +
 lotuswordpro/source/filter/lwpcelllayout.cxx |6 --
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 637068510682ec0cf63227d2f81bdcfc6598c7e6
Author: Caolán McNamara 
AuthorDate: Wed Sep 8 14:40:05 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 8 17:09:30 2021 +0200

ofz#27296 limit row span when fuzzing

Change-Id: I3069875f64acaf394cfef7f6478abc974022d536
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121819
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index 5965b385e1bc..af0f940cc666 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_libraries,lwpft,\
 svxcore \
 tl \
 ucbhelper \
+utl \
 vcl \
 xo \
 ))
diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx 
b/lotuswordpro/source/filter/lwpcelllayout.cxx
index 71d0bce8a943..ef39c4ae1009 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -67,6 +67,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include 
@@ -813,13 +814,14 @@ LwpCellBorderType 
LwpConnectedCellLayout::GetCellBorderType(sal_uInt16 nRow, sal
 void LwpConnectedCellLayout::Read()
 {
 LwpCellLayout::Read();
-sal_uInt16 numcols;
 
 cnumrows = m_pObjStrm->QuickReaduInt16();
-numcols = m_pObjStrm->QuickReaduInt16();// written as a lushort
+sal_uInt16 numcols = m_pObjStrm->QuickReaduInt16();// written as a 
lushort
 cnumcols = static_cast(numcols);
 
 m_nRealrowspan = cnumrows;
+if (utl::ConfigManager::IsFuzzing())
+m_nRealrowspan = std::min(m_nRealrowspan, SAL_MAX_INT16);
 m_nRealcolspan = cnumcols;
 
 m_pObjStrm->SkipExtra();

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

2021-09-08 Thread Baran Aytas (via logerrit)

 sw/qa/extras/rtfexport/rtfexport5.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 7b3a681a867eeb2d68abd4ce33b07cabfff224ef
Author: Baran Aytas 
AuthorDate: Mon Sep 6 00:17:42 2021 +0300
Commit: Hossein 
CommitDate: Wed Sep 8 17:02:44 2021 +0200

tdf#141908: replace usage of sal_Int32 with colors

Change-Id: I536e2c8d15db7c4973525ffc1e0abfb211228751
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121703
Tested-by: Jenkins
Reviewed-by: Hossein 

diff --git a/sw/qa/extras/rtfexport/rtfexport5.cxx 
b/sw/qa/extras/rtfexport/rtfexport5.cxx
index ad392be7fb75..44b969c9a6ff 100644
--- a/sw/qa/extras/rtfexport/rtfexport5.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport5.cxx
@@ -392,14 +392,14 @@ DECLARE_RTFEXPORT_TEST(testNestedTable, "rhbz1065629.rtf")
 table::BorderLine2 halfPtSolid(sal_Int32(COL_BLACK), 0, 18, 0, 
table::BorderLineStyle::SOLID,
18);
 CPPUNIT_ASSERT_BORDER_EQUAL(halfPtSolid, 
getProperty(xCell, "LeftBorder"));
-CPPUNIT_ASSERT_EQUAL(static_cast(0x),
- getProperty(xCell, "BackColor"));
+CPPUNIT_ASSERT_EQUAL(COL_TRANSPARENT,
+ Color(ColorTransparency, 
getProperty(xCell, "BackColor")));
 xCell.set(xTable->getCellByName("B2"), uno::UNO_QUERY);
 CPPUNIT_ASSERT(xCell.is());
 CPPUNIT_ASSERT_BORDER_EQUAL(halfPtSolid, 
getProperty(xCell, "LeftBorder"));
 CPPUNIT_ASSERT_BORDER_EQUAL(halfPtSolid, 
getProperty(xCell, "RightBorder"));
-CPPUNIT_ASSERT_EQUAL(static_cast(0x),
- getProperty(xCell, "BackColor"));
+CPPUNIT_ASSERT_EQUAL(COL_TRANSPARENT,
+ Color(ColorTransparency, 
getProperty(xCell, "BackColor")));
 
 // \sect at the end resulted in spurious page break
 CPPUNIT_ASSERT_EQUAL(1, getPages());

RE : LibreOffice 7.2.0.4 : bug report

2021-09-08 Thread Lydie TREBUCHON

Bonjour et merci de votre retour,

Mais je confirme, un bug de cette nature d’entrée de jeu ça fait quand même
peur car je ne suis pas allé chercher une nouvelle fonction,
j’ai tout simplement ouvert Calc (on s’aperçoit au passage que l’ouverture est
carrément plus longue qu’il y a dix ans, à méditer), j’ai sélectionné une
cellule, j’ai saisi des chiffres et taper Entrée. Et boum, plantage.

Je suis sur Windows 7 64 bits avec une carte graphique ATI HD 5770 en 1920 *
1200 (format 16/10)

Sur vos conseils, je vais essayer la version 7.1.5 et essayer de vous faire un
retour.

Cordialement,

De : Regis Perdreau
Envoyé le :mardi 7 septembre 2021 23:54
À : Lydie TREBUCHON
Cc : libreoffice@lists.freedesktop.org
Objet :Re: LibreOffice 7.2.0.4 : bug report

Bonjour,

Je pense que vous feriez mieux de prendre la version 7.1.5 ici
https://fr.libreoffice.org/download/telecharger-libreoffice/?type=win-x86&version=7.2.0&lang=fr
version X64 probablement de nos jours ...
Vous avez pris une version qui peut etre qualifiée d'expérimentalr, des
plantages sont possibles...c'est clairement expliqué.

Par contre effectivement, vous aideriez la communauté en explicitant comment
vous avez réussi à obtenir le crash en question.
Les informations que vous avez récupèré ne permette pas directement d'obtenir
la cause...

Régis Perdreau

Le mar. 7 sept. 2021 à 23:05, Lydie TREBUCHON
mailto:lydie.trebuc...@hotmail.fr>> a écrit :
Bonjour,

Voici le bug que j’ai malheureusement sur mon ordinateur lorsque j’ouvre Calc,
je saisis des chiffres dans une cellule et je fais Entrée.
Rapport en pièce jointe.
Ça fait peur pour un logiciel à peine installé et dont le code a soit disant
était revu et dépoussiéré. C’est à vous dégoûter du libre.
Microsoft a encore de beau jours devant lui !

Cordialement,
Pierre

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

 sw/source/filter/ww8/writerhelper.hxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 939dff83ba8bc2dd124a73cc5460e52b8a642d9f
Author: Noel Grandin 
AuthorDate: Wed Sep 8 13:35:55 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 8 16:13:46 2021 +0200

no need to do this dynamic_cast in a release build

just make it an assert

Change-Id: I6cd84c9988a3d5111d24b44aae46dc6d69ca06ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121813
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sw/source/filter/ww8/writerhelper.hxx 
b/sw/source/filter/ww8/writerhelper.hxx
index 9ad16d0c2f14..91b881eaf57c 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -224,8 +224,7 @@ namespace sw
 */
 template const T & item_cast(const SfxPoolItem &rItem)
 {
-if (dynamic_cast(&rItem) == nullptr)
-throw std::bad_cast();
+assert(dynamic_cast(&rItem) && "bad type cast");
 return static_cast(rItem);
 }

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

2021-09-08 Thread László Németh (via logerrit)

 sw/inc/hintids.hxx   |4 
 sw/qa/extras/uiwriter/uiwriter3.cxx  |7 +++
 sw/source/core/docnode/ndtbl1.cxx|   19 +++
 sw/source/core/frmedt/fetab.cxx  |6 +++---
 sw/source/core/unocore/unocrsrhelper.cxx |6 --
 sw/source/uibase/wrtsh/delete.cxx|9 ++---
 6 files changed, 43 insertions(+), 8 deletions(-)

New commits:
commit 99059a1ececa3621c2fe46fabdd79eed9d626c42
Author: László Németh 
AuthorDate: Tue Sep 7 15:57:35 2021 +0200
Commit: László Németh 
CommitDate: Wed Sep 8 15:28:00 2021 +0200

tdf#143359 sw: track deletion of empty table rows

Empty table rows were deleted immediately during
change tracking, or in the case of a deleted table
also with non-empty rows, accepting table deletion
kept empty rows.

Note: as a workaround for tracking of the empty rows,
i.e. rows without text content, add a redline with
invisible text ZWJ in the first cell of the empty row.

See also commit a483a44ca00f43a64ae51d62b8fbb4129a413f6d
"tdf#143215 DOCX import: fix tracked empty row insertion/deletion",
commit b50d386dfa70f7c1d4eb1a49091ec9dd782b767b
"tdf#142701 track changes: fix layout regression of image deletion"
and commit 05366b8e6683363688de8708a3d88cf144c7a2bf
"tdf#60382 sw offapi: add change tracking of table/row deletion".

Note: switch off unnecessary redlining of tdf#132744 unit test
to keep the sake of that test (i.e. cut of the selected table
with empty rows).

Change-Id: Ief59008e8714fb88afdfce867598e3dda21bfba5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121784
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 739a6de59e2e..1642c094ca27 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -182,6 +182,10 @@ class SfxVoidItem;
 #define CH_TXT_ATR_SUBST_FIELDSTART ("[")
 #define CH_TXT_ATR_SUBST_FIELDEND ("]")
 
+// a non-visible dummy character to track deleted tables,
+// table rows, and images anchored to characters
+#define CH_TXT_TRACKED_DUMMY_CHAR u'\x200D'
+
 /*
  * Enums for the hints
  */
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 590aa62bce8b..19ebe1e1495e 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -1615,6 +1615,13 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132744)
 SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf132744.odt");
 SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
 
+// disable change tracking to cut the table
+pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::ShowDelete
+  | 
RedlineFlags::ShowInsert);
+
+CPPUNIT_ASSERT_MESSAGE("redlining should be off",
+   !pDoc->getIDocumentRedlineAccess().IsRedlineOn());
+
 CPPUNIT_ASSERT_EQUAL(1, getShapes());
 
 dispatchCommand(mxComponent, ".uno:SelectAll", {});
diff --git a/sw/source/core/docnode/ndtbl1.cxx 
b/sw/source/core/docnode/ndtbl1.cxx
index 3df6b3272cee..c36e7e3b3f6e 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -35,6 +35,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -557,7 +559,24 @@ void SwDoc::SetRowNotTracked( const SwCursor& rCursor, 
const SvxPrintItem &rNew
 aFormatCmp.reserve( std::max( 255, static_cast(aRowArr.size()) ) );
 
 for( auto pLn : aRowArr )
+{
 ::lcl_ProcessRowAttr( aFormatCmp, pLn, rNew );
+// as a workaround for the rows without text content,
+// add a redline with invisible text CH_TXT_TRACKED_DUMMY_CHAR
+if (pLn->IsEmpty())
+{
+SwNodeIndex aInsPos( *(pLn->GetTabBoxes()[0]->GetSttNd()), 1 );
+RedlineFlags eOld = getIDocumentRedlineAccess().GetRedlineFlags();
+
getIDocumentRedlineAccess().SetRedlineFlags_intern(RedlineFlags::NONE);
+SwPaM aPaM(aInsPos);
+getIDocumentContentOperations().InsertString( aPaM,
+OUStringChar(CH_TXT_TRACKED_DUMMY_CHAR) );
+aPaM.SetMark();
+aPaM.GetMark()->nContent.Assign(aPaM.GetContentNode(), 0);
+getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld );
+getIDocumentContentOperations().DeleteAndJoin( aPaM );
+}
+}
 
 getIDocumentState().SetModified();
 }
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 04c046806a6e..11103b98cfbf 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -332,6 +332,8 @@ bool SwFEShell::DeleteRow(bool bCompleteTable)
 // and set IsNoTracked table line property to false
 if ( GetDoc()->GetDocShell()->IsChangeRecording() )
 {
+SwEditShell* pEditShell = GetDoc()->GetEditShell();
+

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

2021-09-08 Thread Tomaž Vajngerl (via logerrit)

 desktop/qa/data/SearchIndexResultShapeTest.odt|binary
 desktop/qa/desktop_lib/test_desktop_lib.cxx   |   53 --
 sw/qa/extras/indexing/SearchResultLocatorTest.cxx |   16 +++---
 sw/source/core/model/SearchResultLocator.cxx  |3 -
 4 files changed, 59 insertions(+), 13 deletions(-)

New commits:
commit 160b6db92cc94f2ec2447ae0e9c60c8c9dcf3bad
Author: Tomaž Vajngerl 
AuthorDate: Wed Sep 8 16:34:42 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Wed Sep 8 15:18:52 2021 +0200

indexing: fix correct size and pos. for shapes + more tests

Determining the position and size of the shapes (SdrObjects) was
wrong as the assumption was the values are in Hmm but were in
twips. Added some more tests that check rendering of SdrObjects.

Change-Id: I6ef9287892d1774a1243118a5c97f58384bcfd68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121801
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/desktop/qa/data/SearchIndexResultShapeTest.odt 
b/desktop/qa/data/SearchIndexResultShapeTest.odt
new file mode 100644
index ..4298eb8ad06e
Binary files /dev/null and b/desktop/qa/data/SearchIndexResultShapeTest.odt 
differ
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 28a5e76a6e1e..c593eca12562 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -207,7 +207,8 @@ public:
 void testMetricField();
 void testMultiDocuments();
 void testJumpCursor();
-void testRenderSearchResult();
+void testRenderSearchResult_WriterNode();
+void testRenderSearchResult_CommonNode();
 void testABI();
 
 CPPUNIT_TEST_SUITE(DesktopLOKTest);
@@ -271,7 +272,8 @@ public:
 CPPUNIT_TEST(testMetricField);
 CPPUNIT_TEST(testMultiDocuments);
 CPPUNIT_TEST(testJumpCursor);
-CPPUNIT_TEST(testRenderSearchResult);
+CPPUNIT_TEST(testRenderSearchResult_WriterNode);
+CPPUNIT_TEST(testRenderSearchResult_CommonNode);
 CPPUNIT_TEST(testABI);
 CPPUNIT_TEST_SUITE_END();
 
@@ -3107,7 +3109,7 @@ void DesktopLOKTest::testJumpCursor()
 comphelper::LibreOfficeKit::setTiledAnnotations(true);
 }
 
-void DesktopLOKTest::testRenderSearchResult()
+void DesktopLOKTest::testRenderSearchResult_WriterNode()
 {
 constexpr const bool bDumpBitmap = false;
 
@@ -3152,6 +3154,51 @@ void DesktopLOKTest::testRenderSearchResult()
 std::free(pBuffer);
 }
 
+void DesktopLOKTest::testRenderSearchResult_CommonNode()
+{
+constexpr const bool bDumpBitmap = false;
+
+LibLODocument_Impl* pDocument = loadDoc("SearchIndexResultShapeTest.odt");
+pDocument->m_pDocumentClass->initializeForRendering(pDocument, "{}");
+
+Scheduler::ProcessEventsToIdle();
+
+unsigned char* pBuffer = nullptr;
+OString aPayload =
+""
+""
+"";
+
+int nWidth = 0;
+int nHeight = 0;
+size_t nByteSize = 0;
+
+bool bResult = pDocument->m_pDocumentClass->renderSearchResult(pDocument, 
aPayload.getStr(), &pBuffer, &nWidth, &nHeight, &nByteSize);
+
+CPPUNIT_ASSERT(bResult);
+CPPUNIT_ASSERT(pBuffer);
+
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(192, nWidth);
+CPPUNIT_ASSERT_EQUAL(96, nHeight);
+CPPUNIT_ASSERT_EQUAL(size_t(73728), nByteSize);
+
+const sal_uInt8* pD = reinterpret_cast(pBuffer);
+BitmapEx aBitmap = vcl::bitmap::CreateFromData(pD, nWidth, nHeight, nWidth 
* 4, vcl::PixelFormat::N32_BPP, true, true);
+
+if (bDumpBitmap)
+{
+SvFileStream aStream("~/SearchResultBitmap.png", StreamMode::WRITE | 
StreamMode::TRUNC);
+vcl::PNGWriter aPNGWriter(aBitmap);
+aPNGWriter.Write(aStream);
+}
+CPPUNIT_ASSERT_EQUAL(tools::Long(192), aBitmap.GetSizePixel().Width());
+CPPUNIT_ASSERT_EQUAL(tools::Long(96), aBitmap.GetSizePixel().Height());
+
+std::free(pBuffer);
+}
+
 namespace {
 
 constexpr size_t classOffset(int i)
diff --git a/sw/qa/extras/indexing/SearchResultLocatorTest.cxx 
b/sw/qa/extras/indexing/SearchResultLocatorTest.cxx
index 08d074bb86f8..586c07b1e534 100644
--- a/sw/qa/extras/indexing/SearchResultLocatorTest.cxx
+++ b/sw/qa/extras/indexing/SearchResultLocatorTest.cxx
@@ -155,11 +155,11 @@ void 
SearchResultLocatorTest::testSearchResultLocatorForSdrObjects()
 // inconsistent results
 #if !defined(_WIN32) && !defined(MACOSX)
 auto aRectangle = aResult.maRectangles[0];
-CPPUNIT_ASSERT_DOUBLES_EQUAL(1478.0, aRectangle.getMinX(), 1e-4);
-CPPUNIT_ASSERT_DOUBLES_EQUAL(3223.0, aRectangle.getMinY(), 1e-4);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(2607.0, aRectangle.getMinX(), 1e-4);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(5685.0, aRectangle.getMinY(), 1e-4);
 
-CPPUNIT_ASSERT_DOUBLES_EQUAL(2059.0, aRectangle.getWidth(), 1e-4);
-CPPUNIT_ASSERT_DOUBLES_EQUAL(2059.0, aRectangle.getHeight(), 1e-4);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(3631.0, aRectangle.getWidth(), 1e-4);
+CPPUNIT_ASS

[Libreoffice-commits] core.git: sc/qa

 sc/qa/uitest/csv_dialog/tdf114878.py |   70 +++
 sc/qa/uitest/data/tdf114878.csv  |4 ++
 2 files changed, 74 insertions(+)

New commits:
commit 11622c2eb319bb096d4d587ea06a932ba5fceafb
Author: Xisco Fauli 
AuthorDate: Wed Sep 8 10:56:05 2021 +0200
Commit: Xisco Fauli 
CommitDate: Wed Sep 8 14:58:18 2021 +0200

tdf#114878: sc: Add UItest

Change-Id: I4edac5f45f18e1aa85d1936a2577420ee274f43e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121804
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/csv_dialog/tdf114878.py 
b/sc/qa/uitest/csv_dialog/tdf114878.py
new file mode 100644
index ..b94368a71343
--- /dev/null
+++ b/sc/qa/uitest/csv_dialog/tdf114878.py
@@ -0,0 +1,70 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from libreoffice.calc.document import get_cell_by_position
+
+class Td114878(UITestCase):
+
+def test_tdf114878(self):
+
+# Load file from Open dialog
+with self.ui_test.execute_dialog_through_command(".uno:Open", 
close_button="open") as xOpenDialog:
+
+xFileName = xOpenDialog.getChild("file_name")
+xFileName.executeAction("TYPE", mkPropertyValues({"TEXT": 
get_url_for_data_file("tdf114878.csv")}))
+
+xDialog = self.ui_test.wait_for_top_focus_window('TextImportCsvDialog')
+
+# First import the file with 'Evaluate Formulas' unchecked
+
+# Without the fix in place, this test would have failed with
+# Could not find child with id: evaluateformulas
+xEvalutateFormulas = xDialog.getChild("evaluateformulas")
+self.assertEqual('false', 
get_state_as_dict(xEvalutateFormulas)['Selected'])
+
+xOK = xDialog.getChild('ok')
+with self.ui_test.wait_until_component_loaded():
+self.ui_test.close_dialog_through_button(xOK)
+
+document = self.ui_test.get_component()
+
+self.assertEqual("=-3+5", get_cell_by_position(document, 0, 0, 
0).getString())
+self.assertEqual('=TRUE()', get_cell_by_position(document, 0, 0, 
1).getString())
+self.assertEqual('=4*10', get_cell_by_position(document, 0, 0, 
2).getString())
+self.assertEqual('=SUM(A1:A3)', get_cell_by_position(document, 0, 0, 
3).getString())
+
+self.ui_test.close_doc()
+
+# Load the same file again
+with self.ui_test.execute_dialog_through_command(".uno:Open", 
close_button="open") as xOpenDialog:
+
+xFileName = xOpenDialog.getChild("file_name")
+xFileName.executeAction("TYPE", mkPropertyValues({"TEXT": 
get_url_for_data_file("tdf114878.csv")}))
+
+xDialog = self.ui_test.wait_for_top_focus_window('TextImportCsvDialog')
+
+# Now import the file with 'Evaluate Formulas' checked
+xEvalutateFormulas = xDialog.getChild("evaluateformulas")
+xEvalutateFormulas.executeAction("CLICK", tuple())
+self.assertEqual('true', 
get_state_as_dict(xEvalutateFormulas)['Selected'])
+
+xOK = xDialog.getChild('ok')
+with self.ui_test.wait_until_component_loaded():
+self.ui_test.close_dialog_through_button(xOK)
+
+document = self.ui_test.get_component()
+
+self.assertEqual("2", get_cell_by_position(document, 0, 0, 
0).getString())
+self.assertEqual('1', get_cell_by_position(document, 0, 0, 
1).getString())
+self.assertEqual('40', get_cell_by_position(document, 0, 0, 
2).getString())
+self.assertEqual('43', get_cell_by_position(document, 0, 0, 
3).getString())
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/data/tdf114878.csv b/sc/qa/uitest/data/tdf114878.csv
new file mode 100644
index ..2104f559ebcf
--- /dev/null
+++ b/sc/qa/uitest/data/tdf114878.csv
@@ -0,0 +1,4 @@
+=-3+5
+=TRUE()
+=4*10
+=SUM(A1:A3)

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

2021-09-08 Thread Caolán McNamara (via logerrit)

 vcl/source/filter/imet/ios2met.cxx |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 0ffb0ad7ddecae4a1271bccdc0db762649aa9269
Author: Caolán McNamara 
AuthorDate: Wed Sep 8 08:57:00 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Sep 8 14:56:55 2021 +0200

ofz: MemorySanitizer: use-of-uninitialized-value

Change-Id: I9117bc6b499c8f86663980c26b7247e58c9737d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121802
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/source/filter/imet/ios2met.cxx 
b/vcl/source/filter/imet/ios2met.cxx
index e6f1058389fd..e6d31c5dc86a 100644
--- a/vcl/source/filter/imet/ios2met.cxx
+++ b/vcl/source/filter/imet/ios2met.cxx
@@ -1602,8 +1602,8 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, 
sal_uInt16 nOrderLen)
 }
 case GOrdFilPth:
 {
-sal_uInt32 nID;
-sal_uInt16  nDummy;
+sal_uInt32 nID(0);
+sal_uInt16 nDummy(0);
 OSPath* p = pPathList;
 
 pOS2MET->ReadUInt16( nDummy )
@@ -1801,7 +1801,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, 
sal_uInt16 nOrderLen)
 case GOrdPIxCol: PushAttr(nOrderID);
 [[fallthrough]];
 case GOrdSIxCol: {
-sal_uInt8 nFlags;
+sal_uInt8 nFlags(0);
 pOS2MET->ReadUChar( nFlags );
 if ((nFlags&0x80)!=0) {
 aAttr.aLinCol=aDefAttr.aLinCol;
@@ -1829,7 +1829,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, 
sal_uInt16 nOrderLen)
 [[fallthrough]];
 case GOrdSColor:
 case GOrdSXtCol: {
-sal_uInt16 nVal;
+sal_uInt16 nVal(0);
 if (nOrderID==GOrdPColor || nOrderID==GOrdSColor) {
 sal_uInt8 nbyte(0);
 pOS2MET->ReadUChar( nbyte ); 
nVal=static_cast(nbyte)|0xff00;
@@ -1857,7 +1857,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, 
sal_uInt16 nOrderLen)
 case GOrdPBgCol: PushAttr(nOrderID);
 [[fallthrough]];
 case GOrdSBgCol: {
-sal_uInt16 nVal;
+sal_uInt16 nVal(0);
 pOS2MET->ReadUInt16( nVal );
 if (nVal==0x || nVal==0xff00)  {
 aAttr.aLinBgCol=aDefAttr.aLinBgCol;
@@ -1880,7 +1880,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, 
sal_uInt16 nOrderLen)
 case GOrdPBxCol: PushAttr(nOrderID);
 [[fallthrough]];
 case GOrdSBxCol: {
-sal_uInt8 nFlags;
+sal_uInt8 nFlags(0);
 pOS2MET->ReadUChar( nFlags );
 if ((nFlags&0x80)!=0) {
 aAttr.aLinBgCol=aDefAttr.aLinBgCol;
@@ -1906,7 +1906,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, 
sal_uInt16 nOrderLen)
 case GOrdPMixMd: PushAttr(nOrderID);
 [[fallthrough]];
 case GOrdSMixMd: {
-sal_uInt8 nMix;
+sal_uInt8 nMix(0);
 pOS2MET->ReadUChar( nMix );
 if (nMix==0) {
 aAttr.eLinMix=aDefAttr.eLinMix;
@@ -1924,7 +1924,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, 
sal_uInt16 nOrderLen)
 case GOrdPBgMix: PushAttr(nOrderID);
 [[fallthrough]];
 case GOrdSBgMix: {
-sal_uInt8 nMix;
+sal_uInt8 nMix(0);
 pOS2MET->ReadUChar( nMix );
 if (nMix==0) {
 aAttr.eLinBgMix=aDefAttr.eLinBgMix;
@@ -1947,7 +1947,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, 
sal_uInt16 nOrderLen)
 case GOrdPPtSym: PushAttr(nOrderID);
 [[fallthrough]];
 case GOrdSPtSym: {
-sal_uInt8 nPatt;
+sal_uInt8 nPatt(0);
 pOS2MET->ReadUChar( nPatt );
 aAttr.bFill = ( nPatt != 0x0f );
 break;
@@ -1971,7 +1971,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, 
sal_uInt16 nOrderLen)
 case GOrdPLnTyp: PushAttr(nOrderID);
 [[fallthrough]];
 case GOrdSLnTyp: {
-sal_uInt8 nType;
+sal_uInt8 nType(0);
 pOS2MET->ReadUChar( nType );
 switch (nType) {
 case 0: aAttr.eLinStyle=aDefAttr.eLinStyle; break;
@@ -2001,7 +2001,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, 
sal_uInt16 nOrderLen)
 [[fallthrough]];
 case GOrdSStLWd :
 {
-sal_uInt8 nFlags;
+sal_uInt8 nFlags(0);
 
 pOS2MET->ReadUChar( nFlags );
 if ( nFlags & 0x80 )

[Libreoffice-commits] core.git: basic/source filter/source sc/source sd/source svx/source sw/source vcl/unx

 basic/source/classes/eventatt.cxx |4 
 filter/source/msfilter/escherex.cxx   |5 
 sc/source/ui/drawfunc/fudraw.cxx  |5 
 sc/source/ui/view/tabvwsh5.cxx|9 -
 sd/source/ui/func/funavig.cxx |  109 --
 sd/source/ui/func/fupoor.cxx  |   55 -
 svx/source/customshapes/EnhancedCustomShapeEngine.cxx |9 -
 svx/source/customshapes/EnhancedCustomShapeHandle.cxx |   14 --
 svx/source/unodraw/unoshap4.cxx   |6 
 svx/source/unodraw/unoshape.cxx   |5 
 sw/source/core/doc/swserv.cxx |   16 +-
 sw/source/core/text/txtfly.cxx|2 
 vcl/unx/generic/gdi/salbmp.cxx|5 
 13 files changed, 120 insertions(+), 124 deletions(-)

New commits:
commit 3afb514362a2ce2701628256fa96d4a5324433d6
Author: Noel Grandin 
AuthorDate: Wed Sep 8 13:33:44 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 8 14:38:15 2021 +0200

simplify static_cast after dynamic_cast

Change-Id: I53ae7f18519fdd878730d1d0316ebc408271c66d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121811
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/basic/source/classes/eventatt.cxx 
b/basic/source/classes/eventatt.cxx
index 6fa48784212e..6489d88d8339 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -417,12 +417,12 @@ void RTL_Impl_CreateUnoDialog( SbxArray& rPar )
 
 // Get dialog
 SbxBaseRef pObj = rPar.Get(1)->GetObject();
-if( !(pObj.is() && dynamic_cast( pObj.get() ) != 
nullptr) )
+SbUnoObject* pUnoObj = dynamic_cast(pObj.get());
+if( !pUnoObj )
 {
 StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
 return;
 }
-SbUnoObject* pUnoObj = static_cast(pObj.get());
 Any aAnyISP = pUnoObj->getUnoAny();
 TypeClass eType = aAnyISP.getValueType().getTypeClass();
 
diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 865df7c292b4..95b8b27c48d3 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -2582,12 +2582,13 @@ void 
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
 if ( !aXPropSet.is() )
 return;
 
-if(nullptr == dynamic_cast< SdrObjCustomShape* 
>(SdrObject::getSdrObjectFromXShape(rXShape)))
+SdrObjCustomShape* pSdrObjCustomShape = dynamic_cast< SdrObjCustomShape* 
>(SdrObject::getSdrObjectFromXShape(rXShape));
+if(!pSdrObjCustomShape)
 {
 return;
 }
 
-SdrObjCustomShape& rSdrObjCustomShape(static_cast< SdrObjCustomShape& 
>(*SdrObject::getSdrObjectFromXShape(rXShape)));
+SdrObjCustomShape& rSdrObjCustomShape = *pSdrObjCustomShape;
 uno::Any aGeoPropSet = aXPropSet->getPropertyValue( "CustomShapeGeometry" 
);
 uno::Sequence< beans::PropertyValue > aGeoPropSeq;
 if ( !(aGeoPropSet >>= aGeoPropSeq) )
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index 582a1ba77713..9306a5fd9556 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -241,9 +241,10 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
 {
 bool bOle = 
rViewShell.GetViewFrame()->GetFrame().IsInPlace();
 SdrObject* pObj = rMarkList.GetMark( 0 
)->GetMarkedSdrObj();
-if( dynamic_cast( pObj) && !bOle )
+auto pOleObj = dynamic_cast(pObj);
+if( pOleObj && !bOle )
 {
-
rViewShell.ActivateObject(static_cast(pObj), 
css::embed::EmbedVerbs::MS_OLEVERB_PRIMARY);
+rViewShell.ActivateObject(pOleObj, 
css::embed::EmbedVerbs::MS_OLEVERB_PRIMARY);
 
 // consumed
 bReturn = true;
diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index 70d88753b752..62949eaaa472 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -106,15 +106,14 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const 
SfxHint& rHint )
 }
 }
 }
-else if (dynamic_cast(&rHint))   // table 
insert / deleted
+else if (auto pTablesHint = dynamic_cast(&rHint)) 
  // table insert / deleted
 {
 // first fetch current table (can be changed during DeleteTab on 
ViewData)
 SCTAB nActiveTab = GetViewData().GetTabNo();
 
-const ScTablesHint& rTabHint = static_cast(rHint);
-SCTAB nTab1 = rTabHint.GetTab1();
-SCTAB nTab2 = rTabHint.GetTab2();
-sal_uInt16 nId  = rTabHint.GetTablesHintId();
+SCTAB nTab1 = pTablesHint->GetTab1();
+SCTAB nTab2 = pTablesHint->GetTab2();
+sal_uInt16 nId  = pTablesHint->Ge

Aleś Bułojčyk license statement

2021-09-08 Thread Aleś Bułojčyk

All of my past & future contributions to LibreOffice may be
licensed under the MPLv2/LGPLv3+ dual license.

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

2021-09-08 Thread Michael Stahl (via logerrit)

 cui/source/dialogs/SpellDialog.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 73c8bd42650dafc38c87b5e6dc1ef222d4f6175c
Author: Michael Stahl 
AuthorDate: Wed Sep 8 12:00:22 2021 +0200
Commit: Michael Stahl 
CommitDate: Wed Sep 8 13:33:48 2021 +0200

cui: fix spell check dialog pointlessly modifying text shape

In Impress, closing the spell check dialog without doing any changes
will replace the entire text of a shape, creating an
sd::UndoObjectSetText and messing up the formatting.

Apparently in commit bbb1428e3666acc7503d86704bbf1e1a4ac04795
a check of the modified flag was removed, but it's not obvious why,
so add it back, which appears to fix the problem.

Change-Id: I8ce6c75f097baa82f11f7b1c813262845001ae7f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121807
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 22072108293c..6adadba8441d 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -904,7 +904,10 @@ IMPL_LINK_NOARG(SpellDialog, ModifyHdl, LinkParamNone*, 
void)
 IMPL_LINK_NOARG(SpellDialog, CancelHdl, weld::Button&, void)
 {
 //apply changes and ignored text parts first - if there are any
-rParent.ApplyChangedSentence(m_xSentenceED->CreateSpellPortions(), false);
+if (m_xSentenceED->IsModified())
+{
+rParent.ApplyChangedSentence(m_xSentenceED->CreateSpellPortions(), 
false);
+}
 Close();
 }

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-1' - translations

2021-09-08 Thread Christian Lohmaier (via logerrit)

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c59d9bbe1f1dc42806a08c273475dc8ef67379f8
Author: Christian Lohmaier 
AuthorDate: Wed Sep 8 13:22:35 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Sep 8 13:22:35 2021 +0200

Update git submodules

* Update translations from branch 'libreoffice-7-2-1'
  to 4e8f7340242dae8004b281228b88c0643fc7a437
  - update translations for 7.2.1 rc2

and force-fix errors using pocheck

Change-Id: I4b8c8e545d7aba21bf9e925bfb9018be6e4c04f8
(cherry picked from commit 4460c7babd574c5040a528d10fe51001c27680bc)
(cherry picked from commit 2fd52f2e5b9aa66f3e685e89fa8a00b42c2917b3)

diff --git a/translations b/translations
index 3febaabc4aa8..4e8f7340242d 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 3febaabc4aa8344193ac0a8f9213b6012124ca36
+Subproject commit 4e8f7340242dae8004b281228b88c0643fc7a437

[Libreoffice-commits] translations.git: Branch 'libreoffice-7-2' - source/am source/an source/ast source/ca source/da source/de source/el source/es source/fi source/fr source/fur source/gl source/gug

2021-09-08 Thread Christian Lohmaier (via logerrit)

 source/am/chart2/messages.po   |   
60 
 source/am/connectivity/registry/evoab2/org/openoffice/Office/DataAccess.po |   
 4 
 source/am/cui/messages.po  |   
29 
 source/am/dbaccess/messages.po |   
12 
 source/am/dictionaries/en/dialog.po|   
10 
 source/am/dictionaries/hu_HU/dialog.po |   
44 
 source/am/extensions/messages.po   |   
10 
 source/am/extras/source/autocorr/emoji.po  | 
1585 
 source/am/filter/messages.po   |   
34 
 source/am/formula/messages.po  |   
16 
 source/am/instsetoo_native/inc_openoffice/windows/msi_languages.po |   
20 
 source/am/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po|   
 8 
 source/am/nlpsolver/src/locale.po  |   
 6 
 source/am/officecfg/registry/data/org/openoffice/Office.po |   
12 
 source/am/officecfg/registry/data/org/openoffice/Office/UI.po  |   
46 
 source/am/sc/messages.po   |  
120 
 source/am/scaddins/messages.po |   
 8 
 source/am/sd/messages.po   |   
44 
 source/am/sfx2/classification.po   |   
 8 
 source/am/starmath/messages.po |   
10 
 source/am/sw/messages.po   |  
241 -
 source/am/uui/messages.po  |   
23 
 source/am/vcl/messages.po  |   
15 
 source/an/sfx2/messages.po |   
 4 
 source/ast/svtools/messages.po |   
16 
 source/ca/helpcontent2/source/text/sbasic/python.po|   
12 
 source/ca/helpcontent2/source/text/sdatabase.po|   
26 
 source/da/helpcontent2/source/text/scalc/01.po |   
16 
 source/de/helpcontent2/source/text/shared/00.po|   
 6 
 source/el/basctl/messages.po   |   
 6 
 source/el/chart2/messages.po   |   
 6 
 source/el/cui/messages.po  |   
 8 
 source/el/desktop/messages.po  |   
 6 
 source/el/helpcontent2/source/auxiliary.po |   
 6 
 source/el/helpcontent2/source/text/scalc/00.po |   
 6 
 source/el/helpcontent2/source/text/shared/01.po|   
 8 
 source/el/helpcontent2/source/text/swriter/01.po   |   
48 
 source/el/sc/messages.po   |   
 6 
 source/el/sd/messages.po   |   
 6 
 source/el/sw/messages.po   |   
 6 
 source/es/basic/messages.po|   
 6 
 source/es/cui/messages.po  |   
10 
 source/es/dbaccess/messages.po |   
20 
 source/es/desktop/messages.po  |   
 8 
 source/es/helpcontent2/source/text/sbasic/python.po|   
 6 
 source/es/helpcontent2/source/text/sbasic/shared.po|   
 4 
 source/es/helpcontent2/source/text/scalc/01.po |   
14 
 source/es/helpcontent2/source/text/scalc/04.po |   
 6 
 source/es/helpcontent2/source/text/scalc/guide.po  |   
 8 
 source/es/helpcontent2/source/text/schart/01.po|   
52 
 source/es/helpcontent2/source/text/shared/00.po|   
80 
 source/es/helpcontent2/source/text/shared/01.po|   
 8 
 source/es/helpcontent2/source/text/shared/02.po|   
16 
 source/es/helpcontent2/source/text/shared/05.po|   
 4 
 source/es/helpcontent2/source/text/shared/guide.po |   
14 
 source/es/helpcontent2/source/text/simpress.po |   
10 
 source/es/helpcontent2/source/text/simpress/01.po  |   
 6 
 source/es/helpcontent2/source/text/simpress/guide.po   |   
 8 
 source/es/helpcontent2/source/text/swriter/00.po

[Libreoffice-commits] translations.git: Branch 'libreoffice-7-2-1' - source/am source/an source/ast source/ca source/da source/de source/el source/es source/fi source/fr source/fur source/gl source/gu

2021-09-08 Thread Christian Lohmaier (via logerrit)

 source/am/chart2/messages.po   |   
60 
 source/am/connectivity/registry/evoab2/org/openoffice/Office/DataAccess.po |   
 4 
 source/am/cui/messages.po  |   
29 
 source/am/dbaccess/messages.po |   
12 
 source/am/dictionaries/en/dialog.po|   
10 
 source/am/dictionaries/hu_HU/dialog.po |   
44 
 source/am/extensions/messages.po   |   
10 
 source/am/extras/source/autocorr/emoji.po  | 
1585 
 source/am/filter/messages.po   |   
34 
 source/am/formula/messages.po  |   
16 
 source/am/instsetoo_native/inc_openoffice/windows/msi_languages.po |   
20 
 source/am/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po|   
 8 
 source/am/nlpsolver/src/locale.po  |   
 6 
 source/am/officecfg/registry/data/org/openoffice/Office.po |   
12 
 source/am/officecfg/registry/data/org/openoffice/Office/UI.po  |   
46 
 source/am/sc/messages.po   |  
120 
 source/am/scaddins/messages.po |   
 8 
 source/am/sd/messages.po   |   
44 
 source/am/sfx2/classification.po   |   
 8 
 source/am/starmath/messages.po |   
10 
 source/am/sw/messages.po   |  
241 -
 source/am/uui/messages.po  |   
23 
 source/am/vcl/messages.po  |   
15 
 source/an/sfx2/messages.po |   
 4 
 source/ast/svtools/messages.po |   
16 
 source/ca/helpcontent2/source/text/sbasic/python.po|   
12 
 source/ca/helpcontent2/source/text/sdatabase.po|   
26 
 source/da/helpcontent2/source/text/scalc/01.po |   
16 
 source/de/helpcontent2/source/text/shared/00.po|   
 6 
 source/el/basctl/messages.po   |   
 6 
 source/el/chart2/messages.po   |   
 6 
 source/el/cui/messages.po  |   
 8 
 source/el/desktop/messages.po  |   
 6 
 source/el/helpcontent2/source/auxiliary.po |   
 6 
 source/el/helpcontent2/source/text/scalc/00.po |   
 6 
 source/el/helpcontent2/source/text/shared/01.po|   
 8 
 source/el/helpcontent2/source/text/swriter/01.po   |   
48 
 source/el/sc/messages.po   |   
 6 
 source/el/sd/messages.po   |   
 6 
 source/el/sw/messages.po   |   
 6 
 source/es/basic/messages.po|   
 6 
 source/es/cui/messages.po  |   
10 
 source/es/dbaccess/messages.po |   
20 
 source/es/desktop/messages.po  |   
 8 
 source/es/helpcontent2/source/text/sbasic/python.po|   
 6 
 source/es/helpcontent2/source/text/sbasic/shared.po|   
 4 
 source/es/helpcontent2/source/text/scalc/01.po |   
14 
 source/es/helpcontent2/source/text/scalc/04.po |   
 6 
 source/es/helpcontent2/source/text/scalc/guide.po  |   
 8 
 source/es/helpcontent2/source/text/schart/01.po|   
52 
 source/es/helpcontent2/source/text/shared/00.po|   
80 
 source/es/helpcontent2/source/text/shared/01.po|   
 8 
 source/es/helpcontent2/source/text/shared/02.po|   
16 
 source/es/helpcontent2/source/text/shared/05.po|   
 4 
 source/es/helpcontent2/source/text/shared/guide.po |   
14 
 source/es/helpcontent2/source/text/simpress.po |   
10 
 source/es/helpcontent2/source/text/simpress/01.po  |   
 6 
 source/es/helpcontent2/source/text/simpress/guide.po   |   
 8 
 source/es/helpcontent2/source/text/swriter/00.po

[Libreoffice-commits] core.git: translations

2021-09-08 Thread Christian Lohmaier (via logerrit)

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 28ac9bd1d8ff19e1b60c64a205220167baf5085f
Author: Christian Lohmaier 
AuthorDate: Wed Sep 8 13:20:42 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Sep 8 13:20:42 2021 +0200

Update git submodules

* Update translations from branch 'master'
  to 4460c7babd574c5040a528d10fe51001c27680bc
  - update translations for 7.2.1 rc2

and force-fix errors using pocheck

Change-Id: I4b8c8e545d7aba21bf9e925bfb9018be6e4c04f8

diff --git a/translations b/translations
index 02e3dd80f5b0..4460c7babd57 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 02e3dd80f5b066ff95b1769ad2a5c9651337a509
+Subproject commit 4460c7babd574c5040a528d10fe51001c27680bc

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - translations

2021-09-08 Thread Christian Lohmaier (via logerrit)

 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a242a98009db7349be1905d9402c8b68b7a82d3f
Author: Christian Lohmaier 
AuthorDate: Wed Sep 8 13:21:46 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Sep 8 13:21:46 2021 +0200

Update git submodules

* Update translations from branch 'libreoffice-7-2'
  to 2fd52f2e5b9aa66f3e685e89fa8a00b42c2917b3
  - update translations for 7.2.1 rc2

and force-fix errors using pocheck

Change-Id: I4b8c8e545d7aba21bf9e925bfb9018be6e4c04f8
(cherry picked from commit 4460c7babd574c5040a528d10fe51001c27680bc)

diff --git a/translations b/translations
index a1920d052f39..2fd52f2e5b9a 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit a1920d052f3979cf66c7f7a836793ff6511d50aa
+Subproject commit 2fd52f2e5b9aa66f3e685e89fa8a00b42c2917b3

[Libreoffice-commits] translations.git: source/am source/an source/ast source/ca source/da source/de source/el source/es source/fi source/fr source/fur source/gl source/gug source/he source/hu source/

2021-09-08 Thread Christian Lohmaier (via logerrit)

 source/am/chart2/messages.po   |   
60 
 source/am/connectivity/registry/evoab2/org/openoffice/Office/DataAccess.po |   
 4 
 source/am/cui/messages.po  |   
29 
 source/am/dbaccess/messages.po |   
12 
 source/am/dictionaries/en/dialog.po|   
10 
 source/am/dictionaries/hu_HU/dialog.po |   
44 
 source/am/extensions/messages.po   |   
10 
 source/am/extras/source/autocorr/emoji.po  | 
1585 
 source/am/filter/messages.po   |   
34 
 source/am/formula/messages.po  |   
16 
 source/am/instsetoo_native/inc_openoffice/windows/msi_languages.po |   
20 
 source/am/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po|   
 8 
 source/am/nlpsolver/src/locale.po  |   
 6 
 source/am/officecfg/registry/data/org/openoffice/Office.po |   
12 
 source/am/officecfg/registry/data/org/openoffice/Office/UI.po  |   
46 
 source/am/sc/messages.po   |  
120 
 source/am/scaddins/messages.po |   
 8 
 source/am/sd/messages.po   |   
44 
 source/am/sfx2/classification.po   |   
 8 
 source/am/starmath/messages.po |   
10 
 source/am/sw/messages.po   |  
241 -
 source/am/uui/messages.po  |   
23 
 source/am/vcl/messages.po  |   
15 
 source/an/sfx2/messages.po |   
 4 
 source/ast/svtools/messages.po |   
16 
 source/ca/helpcontent2/source/text/sbasic/python.po|   
12 
 source/ca/helpcontent2/source/text/sdatabase.po|   
26 
 source/da/helpcontent2/source/text/scalc/01.po |   
16 
 source/de/helpcontent2/source/text/shared/00.po|   
 6 
 source/el/basctl/messages.po   |   
 6 
 source/el/chart2/messages.po   |   
 6 
 source/el/cui/messages.po  |   
 8 
 source/el/desktop/messages.po  |   
 6 
 source/el/helpcontent2/source/auxiliary.po |   
 6 
 source/el/helpcontent2/source/text/scalc/00.po |   
 6 
 source/el/helpcontent2/source/text/shared/01.po|   
 8 
 source/el/helpcontent2/source/text/swriter/01.po   |   
48 
 source/el/sc/messages.po   |   
 6 
 source/el/sd/messages.po   |   
 6 
 source/el/sw/messages.po   |   
 6 
 source/es/basic/messages.po|   
 6 
 source/es/cui/messages.po  |   
10 
 source/es/dbaccess/messages.po |   
20 
 source/es/desktop/messages.po  |   
 8 
 source/es/helpcontent2/source/text/sbasic/python.po|   
 6 
 source/es/helpcontent2/source/text/sbasic/shared.po|   
 4 
 source/es/helpcontent2/source/text/scalc/01.po |   
14 
 source/es/helpcontent2/source/text/scalc/04.po |   
 6 
 source/es/helpcontent2/source/text/scalc/guide.po  |   
 8 
 source/es/helpcontent2/source/text/schart/01.po|   
52 
 source/es/helpcontent2/source/text/shared/00.po|   
80 
 source/es/helpcontent2/source/text/shared/01.po|   
 8 
 source/es/helpcontent2/source/text/shared/02.po|   
16 
 source/es/helpcontent2/source/text/shared/05.po|   
 4 
 source/es/helpcontent2/source/text/shared/guide.po |   
14 
 source/es/helpcontent2/source/text/simpress.po |   
10 
 source/es/helpcontent2/source/text/simpress/01.po  |   
 6 
 source/es/helpcontent2/source/text/simpress/guide.po   |   
 8 
 source/es/helpcontent2/source/text/swriter/00.po

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

2021-09-08 Thread Tomaž Vajngerl (via logerrit)

 sw/qa/extras/indexing/IndexingExportTest.cxx  |   80 +++---
 sw/qa/extras/indexing/SearchResultLocatorTest.cxx |   30 
 sw/source/core/model/SearchResultLocator.cxx  |   18 
 sw/source/filter/indexing/IndexingExport.cxx  |4 -
 4 files changed, 89 insertions(+), 43 deletions(-)

New commits:
commit cce5a278659b1dafacdf64da8dcfab02dba25d75
Author: Tomaž Vajngerl 
AuthorDate: Wed Sep 8 00:00:57 2021 +0900
Commit: Tomaž Vajngerl 
CommitDate: Wed Sep 8 11:55:35 2021 +0200

indexing: rename "parent" attibute and parse the attribute back

Rename the attribute "parent" to "object_name" and "parent_index"
and parse the "object_name" attribute for JSON and XML when used
as input to SearchResultLocator.

Change-Id: I46ad8d6aa14f15d1b759126af71284f7d73a7a96
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121797
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/sw/qa/extras/indexing/IndexingExportTest.cxx 
b/sw/qa/extras/indexing/IndexingExportTest.cxx
index c08cdcd282c9..87ab70758de3 100644
--- a/sw/qa/extras/indexing/IndexingExportTest.cxx
+++ b/sw/qa/extras/indexing/IndexingExportTest.cxx
@@ -192,53 +192,53 @@ void IndexingExportTest::testIndexingExport_Tables()
 assertXPath(pXmlDoc, "/indexing/object[1]", "name", "Table1");
 assertXPath(pXmlDoc, "/indexing/object[1]", "object_type", "table");
 assertXPath(pXmlDoc, "/indexing/object[1]", "index", "9");
-// Search paragraph with parent = 9
-assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent=9][1]", "A");
-assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent=9][2]", "B");
-assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent=9][3]", "1");
-assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent=9][4]", "2");
+// Search paragraph with parent_index = 9
+assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent_index=9][1]", 
"A");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent_index=9][2]", 
"B");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent_index=9][3]", 
"1");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent_index=9][4]", 
"2");
 
 assertXPath(pXmlDoc, "/indexing/object[2]", "name", "Table2");
 assertXPath(pXmlDoc, "/indexing/object[2]", "object_type", "table");
 assertXPath(pXmlDoc, "/indexing/object[2]", "index", "24");
-// Search paragraph with parent = 24
-assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent=24][1]", "A");
-assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent=24][2]", "B");
-assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent=24][3]", "C");
-assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent=24][4]", "1");
-assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent=24][5]", "10");
-assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent=24][6]", "100");
-assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent=24][7]", "2");
-assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent=24][8]", "20");
-assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent=24][9]", "200");
-assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent=24][10]", "3");
-assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent=24][11]", "30");
-assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent=24][12]", "300");
-assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent=24][13]", "4");
-assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent=24][14]", "40");
-assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent=24][15]", "400");
+// Search paragraph with parent_index = 24
+assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent_index=24][1]", 
"A");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent_index=24][2]", 
"B");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent_index=24][3]", 
"C");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent_index=24][4]", 
"1");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent_index=24][5]", 
"10");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent_index=24][6]", 
"100");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent_index=24][7]", 
"2");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent_index=24][8]", 
"20");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent_index=24][9]", 
"200");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent_index=24][10]", 
"3");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent_index=24][11]", 
"30");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent_index=24][12]", 
"300");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent_index=24][13]", 
"4");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent_index=24][14]", 
"40");
+assertXPathContent(pXmlDoc, "/indexing/paragraph[@parent_index=24][15]", 
"400");
 
 assertXPath(pXmlDoc, "/indexing

[Libreoffice-commits] dev-tools.git: test-bugzilla-files/new-control.py test-bugzilla-files/test-bugzilla-files.py

2021-09-08 Thread Gülşah Köse (via logerrit)

 test-bugzilla-files/new-control.py |7 +--
 test-bugzilla-files/test-bugzilla-files.py |3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit d07ab8251361bdfa3d0e6cf2ccaf88dfbd5dfdb9
Author: Gülşah Köse 
AuthorDate: Wed Sep 8 11:09:00 2021 +0300
Commit: Miklos Vajna 
CommitDate: Wed Sep 8 11:53:28 2021 +0200

Extend file formats to compare with odfundiff.

Before we were comparing only odt files. Now we can compare ods,
odb, odg and odp files too.

Change-Id: Id10280b67989b8c8cc919f181b205e322a1d1670
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/121803
Tested-by: Miklos Vajna 
Reviewed-by: Miklos Vajna 

diff --git a/test-bugzilla-files/new-control.py 
b/test-bugzilla-files/new-control.py
index 9a56fa3..f5faa0a 100644
--- a/test-bugzilla-files/new-control.py
+++ b/test-bugzilla-files/new-control.py
@@ -54,10 +54,13 @@ def execute_task(task_file, asan):
 time.sleep(1)
 
 def saveAsPreviousState(exported_files):
-odf_file_ext = ['odt']
+odf_file_ext = ['odt', 'odp', 'odb', 'ods', 'odg']
 previous_path = "/srv/crashtestdata/previous"
 if os.path.exists(previous_path):
-rmtree("/srv/crashtestdata/previous")
+rmtree(previous_path)
+
+for ext in odf_file_ext:
+os.makedirs(previous_path + "/srv/crashtestdata/files/"+ ext)
 
 prefix = "/srv/crashtestdata/current"
 for file in exported_files:
diff --git a/test-bugzilla-files/test-bugzilla-files.py 
b/test-bugzilla-files/test-bugzilla-files.py
index 710364d..0f2d7d3 100644
--- a/test-bugzilla-files/test-bugzilla-files.py
+++ b/test-bugzilla-files/test-bugzilla-files.py
@@ -668,8 +668,9 @@ if __name__ == "__main__":
 exclude_list = [line.rstrip() for line in exclude_list]
 
 if  isPreviousExist():
+odf_file_ext = ['odt', 'odp', 'odb', 'ods', 'odg']
 for filename in exportedFiles:
-if filename[-3:] == 'odt':
+if filename[-3:] in odf_file_ext:
 odfundiffCommandWithURL = getODFunDiffCommand() + " 
/srv/crashtestdata/previous" + filename + " /srv/crashtestdata/current" + 
filename
 print(odfundiffCommandWithURL)
 try:

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/source

2021-09-08 Thread Tor Lillqvist (via logerrit)

 vcl/source/window/paint.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 591dc3147a8e6d8a76392258d7b6dfca01dfd801
Author: Tor Lillqvist 
AuthorDate: Wed Sep 8 12:36:37 2021 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Sep 8 12:45:51 2021 +0300

Revert "Tentative fix for crash in the iOS app"

The root cause for the problem was fixed elsewhere by
0f65b4b6f33891a724bee5356aa5549c76fa0ce3 (and back-ports).

This reverts commit 9e4c72ec7ea83aa0d023a90a6b02ddb17c6b2d74

Change-Id: I0167846d2aaeacc66657b4203d0118b7847679ba

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 02c15254ad0a..910bbe6b69f5 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -651,7 +651,7 @@ IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Timer *, void)
 mpWindowImpl->mpFrameData->maPaintIdle.Stop();
 return;
 }
-#ifndef IOS
+
 comphelper::ProfileZone aZone("VCL idle re-paint");
 
 // save paint events until layout is done
@@ -671,7 +671,6 @@ IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Timer *, void)
 {
 ImplCallOverlapPaint();
 }
-#endif
 }
 
 IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl, Timer *, void)

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/source

2021-09-08 Thread Tor Lillqvist (via logerrit)

 vcl/source/window/paint.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 79ffe18e08a531ec3d0bed2277f6c5f304261ffd
Author: Tor Lillqvist 
AuthorDate: Wed Sep 8 12:37:55 2021 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Sep 8 12:37:55 2021 +0300

Revert "Tentative fix for crash in the iOS app"

The root cause for the problem was fixed elsewhere by
0f65b4b6f33891a724bee5356aa5549c76fa0ce3 (and back-ports).

This reverts (the back-port of) commit
9e4c72ec7ea83aa0d023a90a6b02ddb17c6b2d74.

Change-Id: I0167846d2aaeacc66657b4203d0118b7847679ba

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index f361e49d392b..e890503e615d 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -645,7 +645,6 @@ void Window::ImplCallOverlapPaint()
 
 IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Timer *, void)
 {
-#ifndef IOS
 comphelper::ProfileZone aZone("VCL idle re-paint");
 
 // save paint events until layout is done
@@ -668,7 +667,6 @@ IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Timer *, void)
 mpWindowImpl->mpFrameData->maPaintIdle.IsActive())
 mpWindowImpl->mpFrameData->maPaintIdle.Stop();
 }
-#endif
 }
 
 IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl, Timer *, void)

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

2021-09-08 Thread Tor Lillqvist (via logerrit)

 vcl/source/window/paint.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 9a2d65274073c7b56f0e45f82d580e21b03968b6
Author: Tor Lillqvist 
AuthorDate: Wed Sep 8 12:36:37 2021 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Sep 8 12:36:37 2021 +0300

Revert "Tentative fix for crash in the iOS app"

The root cause for the problem was fixed elsewhere by
0f65b4b6f33891a724bee5356aa5549c76fa0ce3 (and back-ports).

This reverts commit 9e4c72ec7ea83aa0d023a90a6b02ddb17c6b2d74

Change-Id: I0167846d2aaeacc66657b4203d0118b7847679ba

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 4efb43c1bc1b..5a01e4825e3a 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -652,7 +652,7 @@ IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Timer *, void)
 mpWindowImpl->mpFrameData->maPaintIdle.Stop();
 return;
 }
-#ifndef IOS
+
 comphelper::ProfileZone aZone("VCL idle re-paint");
 
 // save paint events until layout is done
@@ -672,7 +672,6 @@ IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Timer *, void)
 {
 ImplCallOverlapPaint();
 }
-#endif
 }
 
 IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl, Timer *, void)

[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-1' - tools/source

 tools/source/generic/fract.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 54a6a0dc204280783ee74a11234d5eb5f187cd14
Author: Noel Grandin 
AuthorDate: Mon Sep 6 13:25:45 2021 +0200
Commit: Michael Stahl 
CommitDate: Wed Sep 8 11:06:19 2021 +0200

tdf#144319 fix formula load

regression from
commit 67d83e40e2c4f3862c50e6abeabfc24a75119fc8
Author: Noel Grandin 
Date:   Sat Dec 19 13:25:53 2020 +0200
speedup rational_FromDouble

Change-Id: Icb728b63f950e827f1492087114f927c2f85ddb9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121719
Tested-by: Jenkins
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
Reviewed-by: Noel Grandin 
(cherry picked from commit f8cf0d2cb4e5e18f48d6b3bfbc7d0e72e7ed5190)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121571
(cherry picked from commit 80730649fd584bb605dd3ecb734d2ac104a55e5c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121756
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index 7c0e850db8d7..57dd4e79c138 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.cxx
@@ -43,6 +43,9 @@ static boost::rational toRational(sal_Int32 n, 
sal_Int32 d)
 // https://github.com/boostorg/boost/issues/335 when these are 
std::numeric_limits::min
 if (n == d)
 return 1;
+// tdf#144319 avoid boost::bad_rational e.g. if numerator=-476741369, 
denominator=-2147483648
+if (d < -std::numeric_limits::max())
+return 0;
 return boost::rational(n, d);
 }

Re: Linker error when compiling libreoffice core.

2021-09-08 Thread Michael Stahl


On 08.09.21 10:26, Caolán McNamara wrote:

On Tue, 2021-09-07 at 16:41 +0200, Mysaa Java wrote:

/sources/libreoffice/ext/core/workdir/CxxObject/writerfilter/source/rtf
tok/rtfdocumentimpl.o: in function
`writerfilter::rtftok::RTFDocumentImpl::handleEmbeddedObject()':
rtfdocumentimpl.cxx:(.text+0x86bc): undefined reference to `non-virtual
thunk to cppu::ImplInheritanceHelper::acquire()'
collect2: error: ld returned 1 exit status
make: ***
[/sources/libreoffice/ext/core/writerfilter/Library_writerfilter.mk:10:
/sources/libreoffice/ext/core/instdir/program/libwriterfilterlo.so]
Error 1
```


I haven't had this exact error before, but we have seen similar in the
past. What's probably relevant is the version of your compiler
(gcc --version). The last time we saw this the workaround deployed was
https://cgit.freedesktop.org/libreoffice/core/commit/?id=c820cb429fc3d3eec9bf6596f0a34995cbd93982

Trying similar for OSeekableInputStreamWrapper might help.


probably it's a bug in the compiler, you could try to upgrade the 
compiler or try if it works if you remove --enable-mergelibs.

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

2021-09-08 Thread Michael Stahl (via logerrit)

 svx/source/accessibility/AccessibleTextHelper.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 294a82dda5045ad71122f946b67ec3d1d2e278d8
Author: Michael Stahl 
AuthorDate: Tue Sep 7 18:55:40 2021 +0200
Commit: Michael Stahl 
CommitDate: Wed Sep 8 10:58:29 2021 +0200

svx: try to avoid crash in AccessibleEditableTextPara

There is an out-of-bounds access to a non-existant editengine paragraph:

warn:legacy.tools:40400:40400:editeng/source/editeng/editdoc.cxx:1136: 
Index out of range in Adjust(2)
warn:legacy.tools:40400:40400:editeng/source/editeng/editeng.cxx:1984: 
Paragraph not found: GetWindowPosTopLeft
/usr/include/c++/11/debug/vector:438:
Error: attempt to subscript container with out-of-bounds index 1, but
container only holds 1 elements.

4  ParaPortionList::operator[](int) (this=0x6270d38, nPos=1) at 
editeng/source/editeng/editdoc.cxx:722
5  ImpEditEngine::CalcParaWidth(int, bool) (this=0x6270ca0, nPara=1, 
bIgnoreExtraSpace=true) at editeng/source/editeng/impedit2.cxx:3307
6  EditEngine::GetParaBounds(int) (this=0x6264a00, nPara=1) at 
editeng/source/editeng/editeng.cxx:646
7  Outliner::GetParaBounds(int) const (this=0x30fb510, nParagraph=1) at 
editeng/source/outliner/outlin2.cxx:414
8  SvxOutlinerForwarder::GetParaBounds(int) const (this=0x3424710, nPara=1) 
at editeng/source/uno/unoforou.cxx:326
9  SvxAccessibleTextAdapter::GetParaBounds(int) const (this=0x73d7d30, 
nPara=1) at editeng/source/uno/unoedprx.cxx:757
10 accessibility::AccessibleEditableTextPara::getBounds() (this=0x27c45c0) 
at editeng/source/accessibility/AccessibleEditableTextPara.cxx:1050
11 accessibility::AccessibleTextHelper_Impl::UpdateBoundRect() 
(this=0x73d7c90) at svx/source/accessibility/AccessibleTextHelper.cxx:799
12 accessibility::AccessibleTextHelper::UpdateChildren() (this=0x2ae5eb0) 
at svx/source/accessibility/AccessibleTextHelper.cxx:1658
13 
accessibility::AccessibleShape::notifyShapeEvent(com::sun::star::document::EventObject
 const&) (this=0x73d7690, rEventObject=...) at 
svx/source/accessibility/AccessibleShape.cxx:926
14 SfxBaseModel::notifyEvent(com::sun::star::document::EventObject const&) 
const (this=0x2eb1b80, aEvent=...) at sfx2/source/doc/sfxbasemodel.cxx:3341
15 SdXImpressDocument::Notify(SfxBroadcaster&, SfxHint const&) 
(this=0x2eb1b80, rBC=..., rHint=...) at sd/source/ui/unoidl/unomodel.cxx:408
16 SfxBroadcaster::Broadcast(SfxHint const&) (this=0x2e6f120, rHint=...) at 
svl/source/notify/SfxBroadcaster.cxx:39
17 SdrObject::BroadcastObjectChange() const (this=0x30fb190) at 
svx/source/svdraw/svdobj.cxx:1028
18 SdrUndoObjSetText::Undo() (this=0x732acb0) at 
svx/source/svdraw/svdundo.cxx:1050
19 sd::UndoObjectSetText::Undo() (this=0x732acb0) at 
sd/source/core/undo/undoobjects.cxx:204

This was replaced when GetTextForwarder() apparently replaced the
editengine object or something along those lines:

5  ParaPortionList::Insert(int, ParaPortion&&) (this=0x6270d38, nPos=0, 
p=...) at editeng/source/editeng/editdoc.cxx:740
6  ImpEditEngine::InitDoc(bool) (this=0x6270ca0, bKeepParaAttribs=true) at 
editeng/source/editeng/impedit2.cxx:241
7  ImpEditEngine::RemoveText() (this=0x6270ca0) at 
editeng/source/editeng/impedit2.cxx:678
8  ImpEditEngine::SetText(rtl::OUString const&) (this=0x6270ca0, rText="") 
at editeng/source/editeng/impedit2.cxx:694
9  ImpEditEngine::SetText(EditTextObject const&) (this=0x6270ca0, 
rTextObject=...) at editeng/source/editeng/impedit4.cxx:1139
10 EditEngine::SetText(EditTextObject const&) (this=0x6264a00, 
rTextObject=...) at editeng/source/editeng/editeng.cxx:1535
11 Outliner::SetText(OutlinerParaObject const&) (this=0x30fb510, rPObj=...) 
at editeng/source/outliner/outliner.cxx:568
12 SvxTextEditSourceImpl::GetBackgroundTextForwarder() (this=0x73d7990) at 
svx/source/unodraw/unoshtxt.cxx:553
13 SvxTextEditSourceImpl::GetTextForwarder() (this=0x73d7990) at 
svx/source/unodraw/unoshtxt.cxx:658
14 SvxTextEditSource::GetTextForwarder() (this=0x73c9580) at 
svx/source/unodraw/unoshtxt.cxx:936
15 SvxEditSourceAdapter::GetTextForwarderAdapter() (this=0x73d7d20) at 
editeng/source/uno/unoedprx.cxx:324
16 SvxEditSourceAdapter::GetTextForwarder() (this=0x73d7d20) at 
editeng/source/uno/unoedprx.cxx:339
17 accessibility::AccessibleTextHelper_Impl::GetTextForwarder() const 
(this=0x73d7c90) at svx/source/accessibility/AccessibleTextHelper.cxx:265
18 accessibility::AccessibleTextHelper_Impl::UpdateVisibleChildren(bool) 
(this=0x73d7c90, bBroadcastEvents=true) at 
svx/source/accessibility/AccessibleTextHelper.cxx:750
19 accessibility::AccessibleTextHelper::UpdateChildren() (this=0x2ae5eb0) 
at svx/source/accessibility/AccessibleTextHelper.cxx:1657
20 
accessibility::AccessibleShape::notifyShapeEvent(com::sun::star::document::EventObject
 const&) (this=0x73d7690, rEventObject=...)

[Libreoffice-commits] core.git: include/svx svx/inc svx/source

 include/svx/sdr/properties/defaultproperties.hxx|2 -
 include/svx/sdr/properties/properties.hxx   |5 ++
 svx/inc/sdr/properties/attributeproperties.hxx  |2 -
 svx/inc/sdr/properties/captionproperties.hxx|2 -
 svx/inc/sdr/properties/circleproperties.hxx |2 -
 svx/inc/sdr/properties/connectorproperties.hxx  |2 -
 svx/inc/sdr/properties/customshapeproperties.hxx|2 -
 svx/inc/sdr/properties/e3dproperties.hxx|2 -
 svx/inc/sdr/properties/emptyproperties.hxx  |2 -
 svx/inc/sdr/properties/graphicproperties.hxx|2 -
 svx/inc/sdr/properties/groupproperties.hxx  |2 -
 svx/inc/sdr/properties/measureproperties.hxx|2 -
 svx/inc/sdr/properties/rectangleproperties.hxx  |2 -
 svx/inc/sdr/properties/textproperties.hxx   |3 +
 svx/source/sdr/properties/attributeproperties.cxx   |2 -
 svx/source/sdr/properties/captionproperties.cxx |4 +-
 svx/source/sdr/properties/circleproperties.cxx  |4 +-
 svx/source/sdr/properties/connectorproperties.cxx   |4 +-
 svx/source/sdr/properties/customshapeproperties.cxx |6 +--
 svx/source/sdr/properties/defaultproperties.cxx |   34 ++--
 svx/source/sdr/properties/e3dproperties.cxx |4 +-
 svx/source/sdr/properties/emptyproperties.cxx   |2 -
 svx/source/sdr/properties/graphicproperties.cxx |4 +-
 svx/source/sdr/properties/groupproperties.cxx   |2 -
 svx/source/sdr/properties/measureproperties.cxx |4 +-
 svx/source/sdr/properties/rectangleproperties.cxx   |4 +-
 svx/source/sdr/properties/textproperties.cxx|   10 ++---
 svx/source/table/cell.cxx   |   10 ++---
 28 files changed, 73 insertions(+), 53 deletions(-)

New commits:
commit 18d6373d3ae767d3f06d53acd3b1f88f008c4bf4
Author: Noel Grandin 
AuthorDate: Wed Sep 8 09:37:45 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 8 10:53:46 2021 +0200

reduce cost of creating large charts (tdf#144052)

creating a temporary SfxItemSet for each geometry object adds up fast,
so only create the temporary for those SdrTextObj subclasses that need
it.

Change-Id: I0c03a630057718f09c12a4a2d07ad23fca46fd2d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121800
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/svx/sdr/properties/defaultproperties.hxx 
b/include/svx/sdr/properties/defaultproperties.hxx
index e901278d3b3e..b7e5d706aff1 100644
--- a/include/svx/sdr/properties/defaultproperties.hxx
+++ b/include/svx/sdr/properties/defaultproperties.hxx
@@ -52,7 +52,7 @@ namespace sdr::properties
 virtual void PostItemChange(const sal_uInt16 nWhich) override;
 
 // react on ItemSet changes
-virtual void ItemSetChanged(const SfxItemSet& rSet) override;
+virtual void ItemSetChanged(const SfxItemSet*) override;
 
 // check if SfxItemSet exists
 bool HasSfxItemSet() const { return bool(mxItemSet); }
diff --git a/include/svx/sdr/properties/properties.hxx 
b/include/svx/sdr/properties/properties.hxx
index 600522981dc0..f27aa5d39d3e 100644
--- a/include/svx/sdr/properties/properties.hxx
+++ b/include/svx/sdr/properties/properties.hxx
@@ -104,7 +104,10 @@ namespace sdr::properties
 virtual void PostItemChange(const sal_uInt16 nWhich) = 0;
 
 // Internally react on ItemSet changes. The given ItemSet contains 
all changed items, the new ones.
-virtual void ItemSetChanged(const SfxItemSet& rSet) = 0;
+virtual void ItemSetChanged(const SfxItemSet*) = 0;
+// Subclasses need to return true if they want the 
ItemSetChanged() callback to actually have a non-zero pointer.
+// We do this because creating the temporary item set is expensive 
and seldom used.
+virtual bool WantItemSetInItemSetChanged() const { return false; }
 
 public:
 // basic constructor, used from SdrObject.
diff --git a/svx/inc/sdr/properties/attributeproperties.hxx 
b/svx/inc/sdr/properties/attributeproperties.hxx
index 9633257c5a63..1aa45721436c 100644
--- a/svx/inc/sdr/properties/attributeproperties.hxx
+++ b/svx/inc/sdr/properties/attributeproperties.hxx
@@ -49,7 +49,7 @@ namespace sdr::properties
 virtual void ItemChange(const sal_uInt16 nWhich, const 
SfxPoolItem* pNewItem = nullptr) override;
 
 // react on ItemSet changes
-virtual void ItemSetChanged(const SfxItemSet& rSet) override;
+virtual void ItemSetChanged(const SfxItemSet*) override;
 
 public:
 // basic constructor
diff --git a/svx/inc/sdr/properties/captionproperties.hxx 
b/svx/inc/sdr/properties/captionproperties.hxx
index c6f71529e181..54057fa3a102 100644
--- a/svx/inc/sdr/properties/captionproperties.hxx
+++ b/svx/inc/sdr/properties/captionproperties.hxx
@@ -

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sd/qa vcl/source

 sd/qa/unit/tiledrendering/LOKitSearchTest.cxx |4 ++--
 vcl/source/window/paint.cxx   |   21 ++---
 2 files changed, 20 insertions(+), 5 deletions(-)

New commits:
commit c7451989984cc96e8d195dbe026d803bc462c1f5
Author: Luboš Luňák 
AuthorDate: Thu Jul 22 22:07:42 2021 +0200
Commit: Luboš Luňák 
CommitDate: Wed Sep 8 10:33:56 2021 +0200

avoid painting to windows in LOK mode

There are no actual toplevel windows in that case, and tiled rendering
is used to paint whenever any painting is needed. The painting is
already made useless by using (1,1)-sized Cairo surfaces for windows
(SvpSalFrame::SetPosSize() calling SvpSalFrame::GetSurfaceFrameSize()),
this should avoid it altogether.

It is possible this commit causes regressions if some code relies
on Paint() getting called at specific times (such as 2f961c7a811bdff66
doing relayout there, causing geometry changes), but those should be
fixed.

Change-Id: Ie4be16301fdddb7c1b0350e6458178efca88aa4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119270
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Luboš Luňák 

diff --git a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx 
b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx
index beba53b67078..4bb6ca2d9a5f 100644
--- a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx
+++ b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx
@@ -244,8 +244,8 @@ void LOKitSearchTest::testSearchAllSelections()
 lcl_search("third", /*bFindAll=*/true);
 // Make sure this is found on the 3rd slide.
 CPPUNIT_ASSERT_EQUAL(static_cast(2), 
mpCallbackRecorder->m_nPart);
-
-CPPUNIT_ASSERT_EQUAL(static_cast(1), 
mpCallbackRecorder->m_aSelection.size());
+// This was 1: only the first match was highlighted.
+CPPUNIT_ASSERT_EQUAL(static_cast(2), 
mpCallbackRecorder->m_aSelection.size());
 }
 
 void LOKitSearchTest::testSearchAllNotifications()
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 95640db261bb..02c15254ad0a 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -645,6 +645,12 @@ void Window::ImplCallOverlapPaint()
 
 IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Timer *, void)
 {
+if (comphelper::LibreOfficeKit::isActive())
+{
+// Tiled rendering is used, idle paint does not need to do anything.
+mpWindowImpl->mpFrameData->maPaintIdle.Stop();
+return;
+}
 #ifndef IOS
 comphelper::ProfileZone aZone("VCL idle re-paint");
 
@@ -664,9 +670,6 @@ IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Timer *, void)
 else if ( mpWindowImpl->mbReallyVisible )
 {
 ImplCallOverlapPaint();
-if (comphelper::LibreOfficeKit::isActive() &&
-mpWindowImpl->mpFrameData->maPaintIdle.IsActive())
-mpWindowImpl->mpFrameData->maPaintIdle.Stop();
 }
 #endif
 }
@@ -688,6 +691,12 @@ IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl, Timer *, 
void)
 
 void Window::ImplInvalidateFrameRegion( const vcl::Region* pRegion, 
InvalidateFlags nFlags )
 {
+if (comphelper::LibreOfficeKit::isActive())
+{
+// Tiled rendering is used, so there's no need to invalidate for idle 
painting.
+return;
+}
+
 // set PAINTCHILDREN for all parent windows till the first OverlapWindow
 if ( !ImplIsOverlapWindow() )
 {
@@ -1293,6 +1302,12 @@ void Window::PaintImmediately()
 if (!mpWindowImpl)
 return;
 
+if (comphelper::LibreOfficeKit::isActive())
+{
+// Tiled rendering is used, direct paint does not need to do anything.
+return;
+}
+
 if ( mpWindowImpl->mpBorderWindow )
 {
 mpWindowImpl->mpBorderWindow->PaintImmediately();

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sd/source

 sd/source/ui/unoidl/unomodel.cxx |   24 
 1 file changed, 24 insertions(+)

New commits:
commit 092c5f5ae9e8e1975ab1595f782fe10a2739a4d7
Author: Luboš Luňák 
AuthorDate: Tue Sep 7 13:02:14 2021 +0200
Commit: Luboš Luňák 
CommitDate: Wed Sep 8 10:33:39 2021 +0200

patch SdrPageWindow in SdXImpressDocument::paintTile()

This is based on commit 424312aa99307da9f0ee60ea6e3213b2b3dc26b4
amd I don't quite understand everything that happens, because
the drawing layer classes have all kinds of comments except those
that would explain the purpose or usage of the classes. My
understanding is that drawing layer keeps all kinds of state
in Sdr* classes and when drawing it tries to find those based
on the OutputDevice. But since tiled drawing uses its own
VirtualDevice for the drawing, the search fails and a temporary state
is used that's always setup up and cleared again. Which is wasteful,
and not having the state around also means that e.g. when clicking
a checkbox for impress master background, with idle painting
disabled there's nothing to react to the event and cause a tile
repaint.

Change-Id: Ic9036680c628d67615a82dcc4f585ab827b91525
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121779
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Luboš Luňák 

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index a246aab75b34..f5d3b51c72d4 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -58,6 +58,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -2220,6 +,25 @@ void SdXImpressDocument::paintTile( VirtualDevice& 
rDevice,
 if (!pViewSh)
 return;
 
+// Setup drawing layer to work properly. Since we use a custom 
VirtualDevice
+// for the drawing, SdrPaintView::BeginCompleteRedraw() will call 
FindPaintWindow()
+// unsuccessfully and use a temporary window that doesn't keep state. So 
patch
+// the existing SdrPageWindow to use a temporary, and this way the state 
will be kept.
+// Well, at least that's how I understand it based on Writer's 
RenderContextGuard,
+// as the drawing layer classes lack documentation.
+SdrPageWindow* patchedPageWindow = nullptr;
+SdrPaintWindow* previousPaintWindow = nullptr;
+std::unique_ptr temporaryPaintWindow;
+if(SdrView* pDrawView = pViewSh->GetDrawView())
+{
+if(SdrPageView* pSdrPageView = pDrawView->GetSdrPageView())
+{
+patchedPageWindow = pSdrPageView->FindPageWindow(*getDocWindow());
+temporaryPaintWindow.reset(new SdrPaintWindow(*pDrawView, 
rDevice));
+previousPaintWindow = 
patchedPageWindow->patchPaintWindow(*temporaryPaintWindow);
+}
+}
+
 // Scaling. Must convert from pixels to twips. We know
 // that VirtualDevices use a DPI of 96.
 // We specifically calculate these scales first as we're still
@@ -2257,6 +2278,9 @@ void SdXImpressDocument::paintTile( VirtualDevice& 
rDevice,
 
 LokChartHelper::PaintAllChartsOnTile(rDevice, nOutputWidth, nOutputHeight,
  nTilePosX, nTilePosY, nTileWidth, 
nTileHeight);
+
+if(patchedPageWindow != nullptr)
+patchedPageWindow->unpatchPaintWindow(previousPaintWindow);
 }
 
 void SdXImpressDocument::selectPart(int nPart, int nSelect)

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - include/sfx2 sfx2/source

 include/sfx2/titledockwin.hxx   |6 --
 sfx2/source/dialog/titledockwin.cxx |   18 +++---
 2 files changed, 3 insertions(+), 21 deletions(-)

New commits:
commit 7280d3b62c0326554a0d2b14f218b5282562b2cf
Author: Luboš Luňák 
AuthorDate: Tue Jun 1 11:56:32 2021 +0200
Commit: Luboš Luňák 
CommitDate: Wed Sep 8 10:33:21 2021 +0200

do not use delayed layout in TitledDockingWindow

The layout is only performed in Paint(), so if something uses
geometry before that happens (may happen with tiled rendering),
then is not up to date. I don't see why delay it anyway, there
seems to be usually just one resize, and only during init I see
two of them, which can presumably be fixed if needed.

Change-Id: I7133f3c6be41bc6480f86d1053b455d42c40b9ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116529
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit 2f961c7a811bdff66a94c20573798d58b565195a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120242
Tested-by: Jenkins CollaboraOffice 

diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx
index 976c4bb9f665..cb2d73542bac 100644
--- a/include/sfx2/titledockwin.hxx
+++ b/include/sfx2/titledockwin.hxx
@@ -73,7 +73,6 @@ namespace sfx2
 DECL_LINK( OnToolboxItemSelected, ToolBox*, void );
 
 voidimpl_layout();
-voidimpl_scheduleLayout();
 
 private:
 OUStringm_sTitle;
@@ -86,11 +85,6 @@ namespace sfx2
 */
 SvBorderm_aBorder;
 
-/** Remember that a layout is pending, i.e. Resize() has been called
-since the last Paint().
-*/
-boolm_bLayoutPending;
-
 /** Height of the title bar.  Calculated in impl_layout().
 */
 int m_nTitleBarHeight;
diff --git a/sfx2/source/dialog/titledockwin.cxx 
b/sfx2/source/dialog/titledockwin.cxx
index 7483ee8d193d..a56530ed8924 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -39,7 +39,6 @@ namespace sfx2
 ,m_aToolbox( VclPtr::Create(this) )
 ,m_aContentWindow( VclPtr::Create(this, WB_DIALOGCONTROL) 
)
 ,m_aBorder( 3, 1, 3, 3 )
-,m_bLayoutPending( false )
 ,m_nTitleBarHeight(0)
 {
 SetBackground( Wallpaper() );
@@ -83,20 +82,12 @@ namespace sfx2
 void TitledDockingWindow::Resize()
 {
 SfxDockingWindow::Resize();
-impl_scheduleLayout();
-}
-
-
-void TitledDockingWindow::impl_scheduleLayout()
-{
-m_bLayoutPending = true;
+impl_layout();
 }
 
 
 void TitledDockingWindow::impl_layout()
 {
-m_bLayoutPending = false;
-
 m_aToolbox->ShowItem( 1, !IsFloatingMode() );
 
 const Size aToolBoxSize( m_aToolbox->CalcWindowSizePixel() );
@@ -143,9 +134,6 @@ namespace sfx2
 {
 const StyleSettings& rStyleSettings = 
rRenderContext.GetSettings().GetStyleSettings();
 
-if (m_bLayoutPending)
-impl_layout();
-
 SfxDockingWindow::Paint(rRenderContext, i_rArea);
 
 rRenderContext.Push(PushFlags::FONT | PushFlags::FILLCOLOR | 
PushFlags::LINECOLOR);
@@ -240,7 +228,7 @@ namespace sfx2
 switch ( i_nType )
 {
 case StateChangedType::InitShow:
-impl_scheduleLayout();
+impl_layout();
 break;
 default:;
 }
@@ -260,7 +248,7 @@ namespace sfx2
 case DataChangedEventType::FONTS:
 case DataChangedEventType::FONTSUBSTITUTION:
 {
-impl_scheduleLayout();
+impl_layout();
 Invalidate();
 }
 break;

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sw/source

 sw/source/core/layout/layact.cxx |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit e2ef885007bcfe7a14c57865e4d3144028f59105
Author: Luboš Luňák 
AuthorDate: Mon Aug 9 12:44:40 2021 +0200
Commit: Luboš Luňák 
CommitDate: Wed Sep 8 10:32:03 2021 +0200

avoid repeated writer layout calls with tiled rendering

My next commit will disable idle paints for tile rendering, as they
do nothing in that case (or at least that should be the case).
But this code causes an infinite loop with idle layout timer,
because painting resets the SwViewShellImp paint region, which is
not performed if painting is done only later by idle rendering.

Change-Id: Ic401f16254aade02ddb3e4faffd99f0ce29d4df4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120240
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Luboš Luňák 

diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 87b76cc6b4ca..c8924882b5fd 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -2230,7 +2230,16 @@ SwLayIdle::SwLayIdle( SwRootFrame *pRt, SwViewShellImp 
*pI ) :
 {
 --rSh.mnStartAction;
 
-if ( rSh.Imp()->GetRegion() )
+// When using tiled rendering, idle painting is disabled and 
paints are done
+// only later by tiled rendering. But paints call 
SwViewShellImp::DelRegion()
+// to reset this GetRegion(), and if it's done too late,
+// SwTiledRenderingTest::testTablePaintInvalidate() will end up in 
an infinite
+// loop, because the idle layout will call this code repeatedly, 
because there
+// will be no idle paints to reset GetRegion().
+// This code dates back to the initial commit, and I find its 
purpose unclear,
+// so I'm still leaving it here in case it turns out it serves a 
purpose.
+static const bool blockOnRepaints = true;
+if (!blockOnRepaints && rSh.Imp()->GetRegion())
 bActions = true;
 else
 {

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sw/source

 sw/source/uibase/uiview/viewsrch.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit eeda6c57b14838e4a7381b5cd89505842acbf507
Author: Luboš Luňák 
AuthorDate: Tue Jul 6 04:10:39 2021 +0200
Commit: Luboš Luňák 
CommitDate: Wed Sep 8 10:31:48 2021 +0200

explicitly send LOK_CALLBACK_TEXT_SELECTION at the end of FindAll

It normally gets emitted by SwSelPaintRects::Show(), called from
paiting, but Online uses tiled painting and so doesn't need normal
painting.

Change-Id: If276ce176f4e65b4efe3d053941b83917df2ae1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119268
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Luboš Luňák 

diff --git a/sw/source/uibase/uiview/viewsrch.cxx 
b/sw/source/uibase/uiview/viewsrch.cxx
index a0cd2967fad5..8db4ff0134bb 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -94,6 +95,7 @@ static void lcl_emitSearchResultCallbacks(SvxSearchItem const 
* pSearchItem, SwW
 return;
 
 std::vector aMatches;
+OString textSelection;
 for (SwPaM& rPaM : pPaM->GetRingContainer())
 {
 if (SwShellCursor* pShellCursor = dynamic_cast(&rPaM))
@@ -109,6 +111,7 @@ static void lcl_emitSearchResultCallbacks(SvxSearchItem 
const * pSearchItem, SwW
 }
 OString sRect = comphelper::string::join("; ", aRect);
 aMatches.push_back(sRect);
+textSelection = sRect;
 }
 }
 boost::property_tree::ptree aTree;
@@ -121,6 +124,12 @@ static void lcl_emitSearchResultCallbacks(SvxSearchItem 
const * pSearchItem, SwW
 OString aPayload = aStream.str().c_str();
 
 
pWrtShell->GetSfxViewShell()->libreOfficeKitViewCallback(LOK_CALLBACK_SEARCH_RESULT_SELECTION,
 aPayload.getStr());
+
+if(bHighlightAll)
+{   // FindAll disables this during find, do it once when done.
+
pWrtShell->GetSfxViewShell()->libreOfficeKitViewCallback(LOK_CALLBACK_TEXT_SELECTION,
 textSelection.getStr());
+SfxLokHelper::notifyOtherViews(pWrtShell->GetSfxViewShell(), 
LOK_CALLBACK_TEXT_VIEW_SELECTION, "selection", textSelection);
+}
 }
 
 void SwView::ExecSearch(SfxRequest& rReq)

[Libreoffice-commits] core.git: sd/qa vcl/source

 sd/qa/unit/tiledrendering/LOKitSearchTest.cxx |4 ++--
 vcl/source/window/paint.cxx   |   21 ++---
 2 files changed, 20 insertions(+), 5 deletions(-)

New commits:
commit 9b73d3e8926d5f9b10464d19b539eef3eb088f50
Author: Luboš Luňák 
AuthorDate: Thu Jul 22 22:07:42 2021 +0200
Commit: Luboš Luňák 
CommitDate: Wed Sep 8 10:31:32 2021 +0200

avoid painting to windows in LOK mode

There are no actual toplevel windows in that case, and tiled rendering
is used to paint whenever any painting is needed. The painting is
already made useless by using (1,1)-sized Cairo surfaces for windows
(SvpSalFrame::SetPosSize() calling SvpSalFrame::GetSurfaceFrameSize()),
this should avoid it altogether.

It is possible this commit causes regressions if some code relies
on Paint() getting called at specific times (such as 2f961c7a811bdff66
doing relayout there, causing geometry changes), but those should be
fixed.

Change-Id: Ie4be16301fdddb7c1b0350e6458178efca88aa4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119385
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx 
b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx
index 762faaac1b56..8bb2144bbe80 100644
--- a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx
+++ b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx
@@ -236,8 +236,8 @@ void LOKitSearchTest::testSearchAllSelections()
 lcl_search("third", /*bFindAll=*/true);
 // Make sure this is found on the 3rd slide.
 CPPUNIT_ASSERT_EQUAL(static_cast(2), 
mpCallbackRecorder->m_nPart);
-
-CPPUNIT_ASSERT_EQUAL(static_cast(1), 
mpCallbackRecorder->m_aSelection.size());
+// This was 1: only the first match was highlighted.
+CPPUNIT_ASSERT_EQUAL(static_cast(2), 
mpCallbackRecorder->m_aSelection.size());
 }
 
 void LOKitSearchTest::testSearchAllNotifications()
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 734e4d8ed63b..4efb43c1bc1b 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -646,6 +646,12 @@ void Window::ImplCallOverlapPaint()
 
 IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Timer *, void)
 {
+if (comphelper::LibreOfficeKit::isActive() && true)
+{
+// Tiled rendering is used, idle paint does not need to do anything.
+mpWindowImpl->mpFrameData->maPaintIdle.Stop();
+return;
+}
 #ifndef IOS
 comphelper::ProfileZone aZone("VCL idle re-paint");
 
@@ -665,9 +671,6 @@ IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Timer *, void)
 else if ( mpWindowImpl->mbReallyVisible )
 {
 ImplCallOverlapPaint();
-if (comphelper::LibreOfficeKit::isActive() &&
-mpWindowImpl->mpFrameData->maPaintIdle.IsActive())
-mpWindowImpl->mpFrameData->maPaintIdle.Stop();
 }
 #endif
 }
@@ -689,6 +692,12 @@ IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl, Timer *, 
void)
 
 void Window::ImplInvalidateFrameRegion( const vcl::Region* pRegion, 
InvalidateFlags nFlags )
 {
+if (comphelper::LibreOfficeKit::isActive() && true)
+{
+// Tiled rendering is used, so there's no need to invalidate for idle 
painting.
+return;
+}
+
 // set PAINTCHILDREN for all parent windows till the first OverlapWindow
 if ( !ImplIsOverlapWindow() )
 {
@@ -1270,6 +1279,12 @@ void Window::PaintImmediately()
 if (!mpWindowImpl)
 return;
 
+if (comphelper::LibreOfficeKit::isActive() && true)
+{
+// Tiled rendering is used, direct paint does not need to do anything.
+return;
+}
+
 if ( mpWindowImpl->mpBorderWindow )
 {
 mpWindowImpl->mpBorderWindow->PaintImmediately();

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

 sd/source/ui/unoidl/unomodel.cxx |   24 
 sw/source/core/layout/layact.cxx |   11 ++-
 2 files changed, 34 insertions(+), 1 deletion(-)

New commits:
commit 0f699173519176b9bd21761d553c34156c1ebd7d
Author: Luboš Luňák 
AuthorDate: Tue Sep 7 13:02:14 2021 +0200
Commit: Luboš Luňák 
CommitDate: Wed Sep 8 10:31:17 2021 +0200

patch SdrPageWindow in SdXImpressDocument::paintTile()

This is based on commit 424312aa99307da9f0ee60ea6e3213b2b3dc26b4
amd I don't quite understand everything that happens, because
the drawing layer classes have all kinds of comments except those
that would explain the purpose or usage of the classes. My
understanding is that drawing layer keeps all kinds of state
in Sdr* classes and when drawing it tries to find those based
on the OutputDevice. But since tiled drawing uses its own
VirtualDevice for the drawing, the search fails and a temporary state
is used that's always setup up and cleared again. Which is wasteful,
and not having the state around also means that e.g. when clicking
a checkbox for impress master background, with idle painting
disabled there's nothing to react to the event and cause a tile
repaint.

Change-Id: Ic9036680c628d67615a82dcc4f585ab827b91525
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121780
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 54827450a64d..6c4f83244c74 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -57,6 +57,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -2208,6 +2210,25 @@ void SdXImpressDocument::paintTile( VirtualDevice& 
rDevice,
 if (!pViewSh)
 return;
 
+// Setup drawing layer to work properly. Since we use a custom 
VirtualDevice
+// for the drawing, SdrPaintView::BeginCompleteRedraw() will call 
FindPaintWindow()
+// unsuccessfully and use a temporary window that doesn't keep state. So 
patch
+// the existing SdrPageWindow to use a temporary, and this way the state 
will be kept.
+// Well, at least that's how I understand it based on Writer's 
RenderContextGuard,
+// as the drawing layer classes lack documentation.
+SdrPageWindow* patchedPageWindow = nullptr;
+SdrPaintWindow* previousPaintWindow = nullptr;
+std::unique_ptr temporaryPaintWindow;
+if(SdrView* pDrawView = pViewSh->GetDrawView())
+{
+if(SdrPageView* pSdrPageView = pDrawView->GetSdrPageView())
+{
+patchedPageWindow = 
pSdrPageView->FindPageWindow(*getDocWindow()->GetOutDev());
+temporaryPaintWindow.reset(new SdrPaintWindow(*pDrawView, 
rDevice));
+previousPaintWindow = 
patchedPageWindow->patchPaintWindow(*temporaryPaintWindow);
+}
+}
+
 // Scaling. Must convert from pixels to twips. We know
 // that VirtualDevices use a DPI of 96.
 // We specifically calculate these scales first as we're still
@@ -2244,6 +2265,9 @@ void SdXImpressDocument::paintTile( VirtualDevice& 
rDevice,
 
 LokChartHelper::PaintAllChartsOnTile(rDevice, nOutputWidth, nOutputHeight,
  nTilePosX, nTilePosY, nTileWidth, 
nTileHeight);
+
+if(patchedPageWindow != nullptr)
+patchedPageWindow->unpatchPaintWindow(previousPaintWindow);
 }
 
 void SdXImpressDocument::selectPart(int nPart, int nSelect)
commit b9c2207e1b5247b4d3184b137be9a75a4b8c6c37
Author: Luboš Luňák 
AuthorDate: Mon Aug 9 12:44:40 2021 +0200
Commit: Luboš Luňák 
CommitDate: Wed Sep 8 10:31:03 2021 +0200

avoid repeated writer layout calls with tiled rendering

My next commit will disable idle paints for tile rendering, as they
do nothing in that case (or at least that should be the case).
But this code causes an infinite loop with idle layout timer,
because painting resets the SwViewShellImp paint region, which is
not performed if painting is done only later by idle rendering.

Change-Id: Ic401f16254aade02ddb3e4faffd99f0ce29d4df4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120201
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 8bc306ee8505..2b689f10b52e 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -2261,7 +2261,16 @@ SwLayIdle::SwLayIdle( SwRootFrame *pRt, SwViewShellImp 
*pI ) :
 {
 --rSh.mnStartAction;
 
-if ( rSh.Imp()->GetRegion() )
+// When using tiled rendering, idle painting is disabled and 
paints are done
+// only later by tiled rendering. But paints call 
SwViewShellImp::DelRegion()
+// to reset this GetRegion(), and if it's done too late,
+// SwTiledRenderingTest::testTablePaintInvalid

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

 sw/source/uibase/uiview/viewsrch.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 89a282e874a706a6f7265218f476e3948dbaa10c
Author: Luboš Luňák 
AuthorDate: Tue Jul 6 04:10:39 2021 +0200
Commit: Luboš Luňák 
CommitDate: Wed Sep 8 10:30:25 2021 +0200

explicitly send LOK_CALLBACK_TEXT_SELECTION at the end of FindAll

It normally gets emitted by SwSelPaintRects::Show(), called from
paiting, but Online uses tiled painting and so doesn't need normal
painting.

Change-Id: If276ce176f4e65b4efe3d053941b83917df2ae1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119382
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/sw/source/uibase/uiview/viewsrch.cxx 
b/sw/source/uibase/uiview/viewsrch.cxx
index 643b5b58f230..66fb79ac3809 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -93,6 +94,7 @@ static void lcl_emitSearchResultCallbacks(SvxSearchItem const 
* pSearchItem, SwW
 return;
 
 std::vector aMatches;
+OString textSelection;
 for (SwPaM& rPaM : pPaM->GetRingContainer())
 {
 if (SwShellCursor* pShellCursor = dynamic_cast(&rPaM))
@@ -108,6 +110,7 @@ static void lcl_emitSearchResultCallbacks(SvxSearchItem 
const * pSearchItem, SwW
 }
 OString sRect = comphelper::string::join("; ", aRect);
 aMatches.push_back(sRect);
+textSelection = sRect;
 }
 }
 boost::property_tree::ptree aTree;
@@ -120,6 +123,12 @@ static void lcl_emitSearchResultCallbacks(SvxSearchItem 
const * pSearchItem, SwW
 OString aPayload = aStream.str().c_str();
 
 
pWrtShell->GetSfxViewShell()->libreOfficeKitViewCallback(LOK_CALLBACK_SEARCH_RESULT_SELECTION,
 aPayload.getStr());
+
+if(bHighlightAll)
+{   // FindAll disables this during find, do it once when done.
+
pWrtShell->GetSfxViewShell()->libreOfficeKitViewCallback(LOK_CALLBACK_TEXT_SELECTION,
 textSelection.getStr());
+SfxLokHelper::notifyOtherViews(pWrtShell->GetSfxViewShell(), 
LOK_CALLBACK_TEXT_VIEW_SELECTION, "selection", textSelection);
+}
 }
 
 void SwView::ExecSearch(SfxRequest& rReq)

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