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

[Miklos Vajna (via logerrit)]

 sw/source/core/doc/DocumentDeviceManager.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit b4c84dc73b7121f6c8fd0364fce9db227e0d2dd1
Author: Miklos Vajna 
AuthorDate: Thu Oct 14 20:53:13 2021 +0200
Commit: Miklos Vajna 
CommitDate: Fri Oct 15 08:35:34 2021 +0200

sw: remove useless debug code in DocumentDeviceManager

A gdb breakpoint can do the same.

Change-Id: I2fb87c8e3ac7d576e9b3f3b29e500e3482a13910
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123596
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx 
b/sw/source/core/doc/DocumentDeviceManager.cxx
index a53a3ada86f2..33e76ab8ad36 100644
--- a/sw/source/core/doc/DocumentDeviceManager.cxx
+++ b/sw/source/core/doc/DocumentDeviceManager.cxx
@@ -282,10 +282,6 @@ SfxPrinter& DocumentDeviceManager::CreatePrinter_() const
 {
 OSL_ENSURE( ! mpPrt, "Do not call CreatePrinter_(), call getPrinter() 
instead" );
 
-#if OSL_DEBUG_LEVEL > 1
-SAL_INFO("sw", "Printer will be created!" );
-#endif
-
 // We create a default SfxPrinter.
 // The ItemSet is deleted by Sfx!
 auto pSet = std::make_unique

[Libreoffice-commits] core.git: registry/CustomTarget_regcompare_test.mk registry/Module_registry.mk registry/test unoidl/CustomTarget_unoidl-check_test.mk unoidl/Module_unoidl.mk unoidl/qa

[Stephan Bergmann (via logerrit)]

 registry/CustomTarget_regcompare_test.mk |  213 ---
 registry/Module_registry.mk  |   11 -
 unoidl/CustomTarget_unoidl-check_test.mk |  206 +
 unoidl/Module_unoidl.mk  |1 
 4 files changed, 207 insertions(+), 224 deletions(-)

New commits:
commit 1101b3524d9d6513fe539e5365e099ebed38d5e8
Author: Stephan Bergmann 
AuthorDate: Tue Sep 7 16:04:45 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Oct 15 07:59:25 2021 +0200

Repurpose regcompare test as unoidl-check test

532b47a650ce5189e1fb759201129d7d1f434133 "[ABI CHANGE] In SDK, replace
regcompare with unoidl-check" had left 
"registry/CustomTarget_regcompare_test.mk
around to verify that unoidl-check behaves the same as did regcompare on 
those
old-format .urd/.rdb files."  Behavior of unoidl-check on those old-format 
.rdb
files will become less relevant with the planned move from the old-format
idlc/regmerge toolchain to the new-format unoidl-write toolchain also for 
the
SDK.  But there appear to be no unit tests for unoidl-check, so repurpose 
(and
move around) the existing test (switching it from using idlc/regmerge to 
using
unoidl-write).

Change-Id: I4c33e9c16aaf0f99e35d9257a40f3bc2ae2725ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121783
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/registry/CustomTarget_regcompare_test.mk 
b/registry/CustomTarget_regcompare_test.mk
deleted file mode 100644
index e7816301f8ce..
--- a/registry/CustomTarget_regcompare_test.mk
+++ /dev/null
@@ -1,213 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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 .
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,registry/regcompare_test))
-
-.PHONY: $(call gb_CustomTarget_get_target,registry/regcompare_test)
-
-$(call gb_CustomTarget_get_target,registry/regcompare_test): \
-$(call gb_Executable_get_runtime_dependencies,unoidl-check) \
-$(call 
gb_CustomTarget_get_workdir,registry/regcompare_test)/other1.rdb \
-$(call 
gb_CustomTarget_get_workdir,registry/regcompare_test)/other2.rdb \
-$(call gb_CustomTarget_get_workdir,registry/regcompare_test)/pe.rdb \
-$(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
-$(call gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.rdb \
-$(call gb_CustomTarget_get_workdir,registry/regcompare_test)/ue.rdb \
-$(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb \
-$(call gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.rdb
-ifneq ($(gb_SUPPRESS_TESTS),)
-   @true
-else
-   $(call gb_Helper_abbreviate_dirs,( \
-$(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
-$(call 
gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
--- $(call 
gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb) \
-> $@.log 2>&1 || (cat $@.log && false))
-   $(call gb_Helper_abbreviate_dirs,( \
-! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
-$(call 
gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
--- $(call 
gb_CustomTarget_get_workdir,registry/regcompare_test)/psb.rdb) \
-> $@.log 2>&1 || (cat $@.log && false))
-   $(call gb_Helper_abbreviate_dirs,( \
-! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
-$(call 
gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
--- $(call 
gb_CustomTarget_get_workdir,registry/regcompare_test)/usa.rdb) \
-> $@.log 2>&1 || (cat $@.log && false))
-   $(call gb_Helper_abbreviate_dirs,( \
-! $(call gb_Executable_get_command,unoidl-check) --ignore-unpublished \
-$(call 
gb_CustomTarget_get_workdir,registry/regcompare_test)/psa.rdb \
--- $(call 
gb_CustomTarget_get_workdir,registry/regcompare_test)/usb.rdb) \
-> $@.log 2>&1 || (cat $@.log && false))
-   $(call gb_Helper_abbreviate_dirs,( \
-! $(call gb_Exe

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

[Mert Tumer (via logerrit)]

 desktop/source/lib/init.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4c5b693267fac35c83e59f3288a1d46b99f02eea
Author: Mert Tumer 
AuthorDate: Fri Oct 1 15:34:33 2021 +0300
Commit: Szymon Kłos 
CommitDate: Fri Oct 15 07:24:31 2021 +0200

lok: Fix graphicselection INPLACE msg is filtered out

INPLACE message is not at the beginning,
search it instead

Signed-off-by: Mert Tumer 
Change-Id: I2a09ac5a664c1ff26790aa776d871ac34c3d99dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122919
Reviewed-by: Szymon Kłos 
Tested-by: Jenkins CollaboraOffice 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123522
Tested-by: Jenkins

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8156b3b2b40f..1d9c482c8f14 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1667,7 +1667,7 @@ void CallbackFlushHandler::queue(const int type, const 
char* data)
 // remove only selection ranges and 'EMPTY' messages
 // always send 'INPLACE' and 'INPLACE EXIT' messages
 removeAll(type, [payload] (const CallbackData& elemData)
-{ return (elemData.PayloadString[0] != 'I'); });
+{ return (elemData.PayloadString.find("INPLACE") == 
std::string::npos); });
 }
 break;
 }

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

[Mike Kaganski (via logerrit)]

 cppuhelper/source/typeprovider.cxx |  320 ++---
 1 file changed, 122 insertions(+), 198 deletions(-)

New commits:
commit addf0b2abb9b78429b7b55f9463899a8ec21bf85
Author: Mike Kaganski 
AuthorDate: Thu Oct 14 23:46:13 2021 +0200
Commit: Mike Kaganski 
CommitDate: Fri Oct 15 05:51:01 2021 +0200

Simplify OTypeCollection ctors

Change-Id: I775e0a425abcf616a6d61570edfdfd99c7b9d46a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123526
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/cppuhelper/source/typeprovider.cxx 
b/cppuhelper/source/typeprovider.cxx
index c69aa11ab6c9..649e0ed5503d 100644
--- a/cppuhelper/source/typeprovider.cxx
+++ b/cppuhelper/source/typeprovider.cxx
@@ -22,6 +22,8 @@
 #include 
 #include 
 
+#include 
+
 using namespace osl;
 using namespace com::sun::star::uno;
 
@@ -58,255 +60,177 @@ Sequence< sal_Int8 > 
OImplementationId::getImplementationId() const
 return *_pSeq;
 }
 
-
-static void copy( Sequence< Type > & rDest, const Sequence< Type > & rSource, 
sal_Int32 nOffset )
+namespace
 {
-Type * pDest = rDest.getArray();
-const Type * pSource = rSource.getConstArray();
+sal_Int32 TypeSeqLen(const Sequence& s) { return s.getLength(); }
+template  sal_Int32 TypeSeqLen(const Type&, Args... args)
+{
+return 1 + TypeSeqLen(args...);
+}
 
-for ( sal_Int32 nPos = rSource.getLength(); nPos--; )
-pDest[nOffset+ nPos] = pSource[nPos];
+void PutToTypeSeq(Type* p, const Sequence& s) { std::copy(s.begin(), 
s.end(), p); }
+template  void PutToTypeSeq(Type* p, const Type& t, Args... 
args)
+{
+*p = t;
+PutToTypeSeq(p + 1, args...);
 }
 
+template  Sequence InitTypeSeq(Args... args)
+{
+Sequence s(TypeSeqLen(args...));
+PutToTypeSeq(s.getArray(), args...);
+return s;
+}
+}
 
 OTypeCollection::OTypeCollection(
-const Type & rType1,
-const Sequence< Type > & rAddTypes )
-: _aTypes( 1 + rAddTypes.getLength() )
+const Type & rT1,
+const Sequence< Type > & rMore )
+: _aTypes(InitTypeSeq(rT1, rMore))
 {
-_aTypes[0] = rType1;
-copy( _aTypes, rAddTypes, 1 );
 }
 
 OTypeCollection::OTypeCollection(
-const Type & rType1,
-const Type & rType2,
-const Sequence< Type > & rAddTypes )
-: _aTypes( 2 + rAddTypes.getLength() )
+const Type & rT1,
+const Type & rT2,
+const Sequence< Type > & rMore )
+: _aTypes(InitTypeSeq(rT1, rT2, rMore))
 {
-_aTypes[0] = rType1;
-_aTypes[1] = rType2;
-copy( _aTypes, rAddTypes, 2 );
 }
 
 OTypeCollection::OTypeCollection(
-const Type & rType1,
-const Type & rType2,
-const Type & rType3,
-const Sequence< Type > & rAddTypes )
-: _aTypes( 3 + rAddTypes.getLength() )
+const Type & rT1,
+const Type & rT2,
+const Type & rT3,
+const Sequence< Type > & rMore )
+: _aTypes(InitTypeSeq(rT1, rT2, rT3, rMore))
 {
-_aTypes[0] = rType1;
-_aTypes[1] = rType2;
-_aTypes[2] = rType3;
-copy( _aTypes, rAddTypes, 3 );
 }
 
 OTypeCollection::OTypeCollection(
-const Type & rType1,
-const Type & rType2,
-const Type & rType3,
-const Type & rType4,
-const Sequence< Type > & rAddTypes )
-: _aTypes( 4 + rAddTypes.getLength() )
+const Type & rT1,
+const Type & rT2,
+const Type & rT3,
+const Type & rT4,
+const Sequence< Type > & rMore )
+: _aTypes(InitTypeSeq(rT1, rT2, rT3, rT4, rMore))
 {
-_aTypes[0] = rType1;
-_aTypes[1] = rType2;
-_aTypes[2] = rType3;
-_aTypes[3] = rType4;
-copy( _aTypes, rAddTypes, 4 );
 }
 
 OTypeCollection::OTypeCollection(
-const Type & rType1,
-const Type & rType2,
-const Type & rType3,
-const Type & rType4,
-const Type & rType5,
-const Sequence< Type > & rAddTypes )
-: _aTypes( 5 + rAddTypes.getLength() )
+const Type & rT1,
+const Type & rT2,
+const Type & rT3,
+const Type & rT4,
+const Type & rT5,
+const Sequence< Type > & rMore )
+: _aTypes(InitTypeSeq(rT1, rT2, rT3, rT4, rT5, rMore))
 {
-_aTypes[0] = rType1;
-_aTypes[1] = rType2;
-_aTypes[2] = rType3;
-_aTypes[3] = rType4;
-_aTypes[4] = rType5;
-copy( _aTypes, rAddTypes, 5 );
 }
 
 OTypeCollection::OTypeCollection(
-const Type & rType1,
-const Type & rType2,
-const Type & rType3,
-const Type & rType4,
-const Type & rType5,
-const Type & rType6,
-const Sequence< Type > & rAddTypes )
-: _aTypes( 6 + rAddTypes.getLength() )
+const Type & rT1,
+const Type & rT2,
+const Type & rT3,
+const Type & rT4,
+const Type & rT5,
+const Type & rT6,
+const Sequence< Type > & rMore )
+: _aTypes(InitTypeSeq(rT1, rT2, rT3, rT4, rT5, rT6, rMore))
 {
-_aTypes[0] = rType1;
-_aTypes[1] = rType2;
-_aTypes[2] = rType3;
-_aTypes[3] = rType4;
-_aTypes[4] = rType5;
-_aTypes[5] = rType6;
-copy( _aTypes, rAddTypes, 6 );
 }
 
 OTypeCollection::OTypeCollection(
-const Type

Change Reviewer Queue

[Emanuel Schorsch]

Hello,

I made a small change  but
it wasn't clear to me how to find someone to review it. Noone was active in
the chat room and there wasn't much guidance in the documentation for the
process to follow.

What are people's thoughts on having a reviewer queue? It would be nice to
be able to click a button and have it populate the next reviewer in the
queue. But even if it's just as simple as a spreadsheet it would be very
helpful for a new contributor to know who to send a change to. Thank you
for your time!

Best,
Emanuel

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

[Eike Rathke (via logerrit)]

 sc/source/ui/docshell/impex.cxx |  112 +++-
 1 file changed, 100 insertions(+), 12 deletions(-)

New commits:
commit 9bcdfcb74dae7ccd07be7159c0e1deba110d2a6f
Author: Eike Rathke 
AuthorDate: Thu Oct 14 23:28:11 2021 +0200
Commit: Eike Rathke 
CommitDate: Fri Oct 15 01:38:55 2021 +0200

Related: tdf#88359 CSV: choose proper ISO date(+time) format if detected

... if column type is set to "Date (YMD)".

Also be more strict if ISO is detected and timezone is included
keep it as type Text instead of silently discarding the timezone
information.

Change-Id: Ia2236e87d6cf8b0ece33590a7fd99328f109d7a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123612
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 7b9559169bb2..714066c9fafd 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -62,6 +62,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -1096,26 +1097,24 @@ static bool lcl_PutString(
 sal_Int32 nStart[nMaxNumberParts];
 sal_Int32 nEnd[nMaxNumberParts];
 
+bool bIso;
 sal_uInt16 nDP, nMP, nYP;
 switch ( nColFormat )
 {
-case SC_COL_YMD: nDP = 2; nMP = 1; nYP = 0; break;
-case SC_COL_MDY: nDP = 1; nMP = 0; nYP = 2; break;
+case SC_COL_YMD: nDP = 2; nMP = 1; nYP = 0; bIso = true; break;
+case SC_COL_MDY: nDP = 1; nMP = 0; nYP = 2; bIso = false; break;
 case SC_COL_DMY:
-default: nDP = 0; nMP = 1; nYP = 2; break;
+default: nDP = 0; nMP = 1; nYP = 2; bIso = false; break;
 }
 
 sal_uInt16 nFound = 0;
 bool bInNum = false;
-for ( sal_Int32 nPos=0; nPos 
nStart[nFound-1] + 1)))
+// Each M,D,h,m,s at most 2 digits.
+bIso = false;
 }
 else
+{
 bInNum = false;
+if (bIso)
+{
+// ([+-])-MM-DD([T ]hh:mm(:ss(.fff)))(([+-])TZ)
+// XXX NOTE: timezone is accepted here, but number
+// formatter parser will not, so the end result will be
+// type Text to preserve timezone information.
+switch (rStr[nPos])
+{
+case '+':
+if (nFound >= 5 && nPos == nEnd[nFound-1] + 1)
+// Accept timezone offset.
+;
+else if (nPos > 0)
+// Accept one leading sign.
+bIso = false;
+break;
+case '-':
+if (nFound >= 5 && nPos == nEnd[nFound-1] + 1)
+// Accept timezone offset.
+;
+else if (nFound == 0 && nPos > 0)
+// Accept one leading sign.
+bIso = false;
+else if (nFound < 1 || 2 < nFound || nPos != 
nEnd[nFound-1] + 1)
+// Not immediately after 1 or 1-2
+bIso = false;
+break;
+case 'T':
+case ' ':
+if (nFound != 3 || nPos != nEnd[nFound-1] + 1)
+// Not immediately after 1-2-3
+bIso = false;
+break;
+case ':':
+if (nFound < 4 || 5 < nFound || nPos != 
nEnd[nFound-1] + 1)
+// Not at 1-2-3T4:5:
+bIso = false;
+break;
+case '.':
+case ',':
+if (nFound != 6 || nPos != nEnd[nFound-1] + 1)
+// Not at 1-2-3T4:5:6.
+bIso = false;
+break;
+case 'Z':
+if (nFound >= 5 && nPos == nEnd[nFound-1] + 1)
+// Accept Zero timezone.
+;
+else
+bIso = false;
+break;
+default:
+bIso = false;
+}
+}
+}
+}
+
+if (nFound < 3)
+bIso = false;
+
+if (bIso)
+{
+// Leave conversion and detection of various possible number
+// formats to the number formatter. ISO i

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/data/tdf144840.odt |binary
 sw/qa/extras/uiwriter/uiwriter3.cxx  |   41 +++
 2 files changed, 41 insertions(+)

New commits:
commit a12727702b4132bb0576062afe68e39a87a6a426
Author: Xisco Fauli 
AuthorDate: Thu Oct 14 18:27:43 2021 +0200
Commit: Xisco Fauli 
CommitDate: Thu Oct 14 23:30:58 2021 +0200

tdf#144840: sw_uiwriter3: Add unittest

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

diff --git a/sw/qa/extras/uiwriter/data/tdf144840.odt 
b/sw/qa/extras/uiwriter/data/tdf144840.odt
new file mode 100644
index ..cb611262b879
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf144840.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index cc9f2f385845..d6aec38d1d11 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -13,6 +13,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -418,6 +419,46 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132597)
 CPPUNIT_ASSERT_EQUAL(1, getPages());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf144840)
+{
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf144840.odt");
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+uno::Reference xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xIndexAccess(xTextTablesSupplier->getTextTables(),
+ uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+
+dispatchCommand(mxComponent, ".uno:SelectAll", {});
+
+rtl::Reference xTransfer = new SwTransferable(*pWrtShell);
+xTransfer->Cut();
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount());
+
+// Paste special as RTF
+uno::Sequence aPropertyValues = 
comphelper::InitPropertySequence(
+{ { "SelectedFormat", 
uno::makeAny(static_cast(SotClipboardFormatId::RTF)) } });
+
+dispatchCommand(mxComponent, ".uno:ClipboardFormatItems", aPropertyValues);
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+
+uno::Reference xTextTable(xIndexAccess->getByIndex(0), 
uno::UNO_QUERY);
+
+table::TableBorder2 tableBorder = 
getProperty(xTextTable, "TableBorder2");
+
+// Without the fix in place, this test would have failed with
+// - Expected: 4
+// - Actual  : 0
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(4), tableBorder.TopLine.LineWidth);
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(4), tableBorder.LeftLine.LineWidth);
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(4), tableBorder.RightLine.LineWidth);
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(4), tableBorder.BottomLine.LineWidth);
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf131963)
 {
 SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf131963.docx");

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

[Luboš Luňák (via logerrit)]

 solenv/gbuild/platform/com_GCC_defs.mk |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit a69940a9a208fe4b7a8e6db4392359f2842e9c16
Author: Luboš Luňák 
AuthorDate: Fri Oct 8 12:52:54 2021 +0200
Commit: Luboš Luňák 
CommitDate: Thu Oct 14 22:20:26 2021 +0200

use ThinLTO for Clang everywhere

No idea why it should be used only on Apple platforms and normal LTO
elsewhere. ThinLTO should build faster and the result should perform
roughly the same.

Change-Id: Ie93cf0ba810ee5bb2309fcbd3548a4847587b3d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123256
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit cca8c5ad553e21bd55aef93757cd31626f9beba1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123521
Tested-by: Jenkins CollaboraOffice 

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index c369235275bc..51e72c1c1b4a 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -177,10 +177,8 @@ gb_CFLAGS_COMMON += -std=gnu89
 
 ifeq ($(ENABLE_LTO),TRUE)
 ifeq ($(COM_IS_CLANG),TRUE)
-ifneq (,$(index,iOS MACOSX,$(OS)))
 gb_LTOFLAGS := -flto=thin
-else
-gb_LTOFLAGS := -flto
+ifeq (,$(index,iOS MACOSX,$(OS)))
 gb_LTOPLUGINFLAGS := --plugin LLVMgold.so
 endif
 else

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter.cxx |   38 +
 1 file changed, 38 insertions(+)

New commits:
commit 12bd8d8d50da871e8f6be57ce46083f84d493d8b
Author: Xisco Fauli 
AuthorDate: Thu Oct 14 19:01:33 2021 +0200
Commit: Xisco Fauli 
CommitDate: Thu Oct 14 21:40:55 2021 +0200

tdf#138873: sw_uiwriter: Add unittest

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

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 5aa4df1f0b73..dbcb8edd3e1c 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -283,6 +283,7 @@ public:
 void testTdf89720();
 void testTdf88986();
 void testTdf78150();
+void testTdf138873();
 void testTdf87922();
 void testTdf77014();
 void testTdf92648();
@@ -403,6 +404,7 @@ public:
 CPPUNIT_TEST(testTdf89720);
 CPPUNIT_TEST(testTdf88986);
 CPPUNIT_TEST(testTdf78150);
+CPPUNIT_TEST(testTdf138873);
 CPPUNIT_TEST(testTdf87922);
 CPPUNIT_TEST(testTdf77014);
 CPPUNIT_TEST(testTdf92648);
@@ -4262,6 +4264,42 @@ void SwUiWriterTest::testTdf78150()
 CPPUNIT_ASSERT_EQUAL(OUString(""), getParagraph(1)->getString());
 }
 
+void SwUiWriterTest::testTdf138873()
+{
+SwDoc* pDoc = createSwDoc();
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+pWrtShell->Insert("A B C");
+
+CPPUNIT_ASSERT_EQUAL(OUString("A B C"), getParagraph(1)->getString());
+
+// Select B
+pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/false, 2, 
/*bBasicCall=*/false);
+pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/true, 1, 
/*bBasicCall=*/false);
+
+pWrtShell->Insert("DDD");
+
+CPPUNIT_ASSERT_EQUAL(OUString("A DDD C"), getParagraph(1)->getString());
+
+dispatchCommand(mxComponent, ".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(OUString("A B C"), getParagraph(1)->getString());
+
+// Select B and C
+pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/true, 2, 
/*bBasicCall=*/false);
+
+dispatchCommand(mxComponent, ".uno:Copy", {});
+Scheduler::ProcessEventsToIdle();
+
+dispatchCommand(mxComponent, ".uno:Paste", {});
+Scheduler::ProcessEventsToIdle();
+
+// Without the fix in place, this test would have failed with
+// - Expected: A B C
+// - Actual  : A  CB CB
+CPPUNIT_ASSERT_EQUAL(OUString("A B C"), getParagraph(1)->getString());
+}
+
 void SwUiWriterTest::testTdf87922()
 {
 // Create an SwDrawTextInfo.

[Libreoffice-commits] core.git: basctl/source connectivity/source cui/source dbaccess/source extensions/source filter/source forms/source framework/source include/filter sc/inc sc/source sd/source sfx

[Noel Grandin (via logerrit)]

 basctl/source/basicide/basobj2.cxx |   14 +++--
 connectivity/source/drivers/file/FStatement.cxx|5 
 cui/source/customize/SvxNotebookbarConfigPage.cxx  |9 +---
 cui/source/dialogs/cuigaldlg.cxx   |7 --
 dbaccess/source/core/api/TableDeco.cxx |7 +-
 extensions/source/propctrlr/formcomponenthandler.cxx   |6 +
 filter/source/msfilter/escherex.cxx|9 +---
 forms/source/component/ComboBox.cxx|3 --
 forms/source/xforms/binding.cxx|3 --
 framework/source/accelerators/acceleratorconfiguration.cxx |8 +--
 include/filter/msfilter/escherex.hxx   |2 -
 sc/inc/rangelst.hxx|2 +
 sc/source/core/data/column3.cxx|   10 ++---
 sc/source/core/data/documen5.cxx   |4 ---
 sc/source/core/data/dpdimsave.cxx  |4 ---
 sc/source/filter/oox/sheetdatabuffer.cxx   |3 --
 sc/source/ui/unoobj/cellsuno.cxx   |3 --
 sc/source/ui/view/drawvie4.cxx |3 --
 sd/source/filter/pdf/sdpdffilter.cxx   |   10 +
 sfx2/source/dialog/filedlghelper.cxx   |   10 -
 slideshow/source/engine/slide/slideimpl.cxx|3 --
 starmath/source/utility.cxx|3 --
 svx/source/dialog/imapdlg.cxx  |   10 ++---
 svx/source/dialog/imapwnd.cxx  |5 
 sw/source/core/docnode/ndtbl1.cxx  |3 --
 sw/source/filter/ww8/rtfstringbuffer.cxx   |3 --
 tools/source/memtools/multisel.cxx |6 +
 ucb/source/ucp/file/filtask.cxx|4 +--
 vcl/unx/generic/fontmanager/fontmanager.cxx|5 
 xmloff/source/text/txtparae.cxx|6 +
 30 files changed, 51 insertions(+), 119 deletions(-)

New commits:
commit 1f9468fc29874eae5100317282ab8b395904406d
Author: Noel Grandin 
AuthorDate: Thu Oct 14 14:57:54 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Oct 14 21:28:40 2021 +0200

use std::vector::insert instead of push_back

because it will pre-allocate space and often is optimised to memcpy

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

diff --git a/basctl/source/basicide/basobj2.cxx 
b/basctl/source/basicide/basobj2.cxx
index 9748b24ccd2f..f14535cbd3f1 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -100,21 +100,15 @@ Sequence< OUString > GetMergedLibraryNames( const 
Reference< script::XLibraryCon
 std::vector aLibList;
 if ( xModLibContainer.is() )
 {
-Sequence< OUString > aModLibNames = 
xModLibContainer->getElementNames();
-sal_Int32 nModLibCount = aModLibNames.getLength();
-const OUString* pModLibNames = aModLibNames.getConstArray();
-for ( sal_Int32 i = 0 ; i < nModLibCount ; i++ )
-aLibList.push_back( pModLibNames[ i ] );
+const Sequence< OUString > aModLibNames = 
xModLibContainer->getElementNames();
+aLibList.insert( aLibList.end(), aModLibNames.begin(), 
aModLibNames.end() );
 }
 
 // create a list of dialog library names
 if ( xDlgLibContainer.is() )
 {
-Sequence< OUString > aDlgLibNames = 
xDlgLibContainer->getElementNames();
-sal_Int32 nDlgLibCount = aDlgLibNames.getLength();
-const OUString* pDlgLibNames = aDlgLibNames.getConstArray();
-for ( sal_Int32 i = 0 ; i < nDlgLibCount ; i++ )
-aLibList.push_back( pDlgLibNames[ i ] );
+const Sequence< OUString > aDlgLibNames = 
xDlgLibContainer->getElementNames();
+aLibList.insert( aLibList.end(), aDlgLibNames.begin(), 
aDlgLibNames.end() );
 }
 
 // sort list
diff --git a/connectivity/source/drivers/file/FStatement.cxx 
b/connectivity/source/drivers/file/FStatement.cxx
index 1fde6881de12..e0ea8bc59aef 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -499,10 +499,7 @@ void OStatement_Base::GetAssignValues()
 if (pOptColumnCommalist->count() == 0)
 {
 const Sequence< OUString>& aNames = m_xColNames->getElementNames();
-const OUString* pBegin = aNames.getConstArray();
-const OUString* pEnd = pBegin + aNames.getLength();
-for (; pBegin != pEnd; ++pBegin)
-aColumnNameList.push_back(*pBegin);
+aColumnNameList.insert(aColumnNameList.end(), aNames

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

[Roman Kuznetsov (via logerrit)]

 sc/uiconfig/scalc/popupmenu/drawtext.xml |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 43b0d4f709a3a1446a32e36abb5deaa3bb45ddd9
Author: Roman Kuznetsov 
AuthorDate: Wed Oct 13 16:13:58 2021 +0200
Commit: Roman Kuznetsov 
CommitDate: Thu Oct 14 21:16:44 2021 +0200

tdf#138842 Delete Default item from Calc Comment's context menu

Change-Id: I4f3b78bfdf479f96c9d8e2387c5c38446f2eaf72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123513
Tested-by: Jenkins
Reviewed-by: Roman Kuznetsov 

diff --git a/sc/uiconfig/scalc/popupmenu/drawtext.xml 
b/sc/uiconfig/scalc/popupmenu/drawtext.xml
index 62a4f9141cee..d8cdc15e603e 100644
--- a/sc/uiconfig/scalc/popupmenu/drawtext.xml
+++ b/sc/uiconfig/scalc/popupmenu/drawtext.xml
@@ -28,6 +28,4 @@
   
   
   
-  
-  
 

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.1.7.1' created by Christian Lohmaier 
 at 2021-10-14 19:09 +

Tag libreoffice-7.1.7.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmFogHYACgkQ9DSh76/u
rqO4RhAArpg7g5uWRw19tDbBlv4VdqW7J3TyO1EeeezqAww0fmT6CLvfyT588JFd
lO/WCrJIU0/JVOO7QsApbg93Ja5bBhojmGao7d8IXWKZq0kbvjNR/nvCH8YCzxQ8
imHM+cl+UgcbgjGcS8pbha915ZBMD+yo1eoW6r0dfKgiH488yc1qDQnCWBD6LCs5
xPZLUzgjwOTc1gCI3wewAx2UMcBEiLL8v6SiLdn+xQ4kmDIBHx5kzYPdwuyWjCT+
WJ9QxJsan6tUAeXzaNDwFiud+C4L6UI3OTehSE9UrpOp4Dhks5Zp/Ek/7Hb54BtZ
xNbD9VlAvfpjtoUIHzU8AZHOVP5VXs95L8BxY743VeDwiBNCO38+oiZE8naKmvyu
OSclGSwVLkOgrFNRDWTf9c4LaDlfCdgR6M6NHsSO5eQWfXXSInhwO85v0GYVlkOy
JPLxh0H6ZdTqV8s19q/hrNiezwAeQGCA8mS9cx4tttUsm8/dQG9DlLnzUlqFbvo/
pz64qcxoI6tlWBoLCescwWcUPahA00cYnmE7VpTHrC+Pz6o4YBYt/xoXkx1AP1Z/
SHe/4/gHWOeAWh+IBesVN6VxOcEIJnIsq5udb0rD9NOzgL5+WWNhZLvrrdWtYLjM
Pjgm1PDwHP/Q95flQdokrHG5M4pcpYexGe7zE0rPRDanGkTINW0=
=z+uO
-END PGP SIGNATURE-

Changes since co-2021-branch-point-412:
---
 0 files changed
---

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.1.7.1' created by Christian Lohmaier 
 at 2021-10-14 19:09 +

Tag libreoffice-7.1.7.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmFogHYACgkQ9DSh76/u
rqPr1g/+LnxNzj+D7aZFnwLn1ZIixnthS6u1Py2Y7Fp8E/I9e8ZaHaWzXvh7boll
UeEo/0L6kCqozGIsptFwpp9DaFORQ04LZU4yNHqCPD0KTnCnT6yrookgZLN5y3Ur
Nxx/Xfqqe/4qLRrZGyRmg7+8YYDJE3S02yX6W1/vfjWrvxl/Zdy6B/Ahjp514PQz
1TGmBLMCL+Lc/k/gIYZs4OB8EwyCpZSb1BhtRFUt1xVvKnpWMB7zvROGne6U4vj/
SpN9BoyEvxLb7DhF+YkpLoqnJpmX4TUeDkAfAqUnHNsK3m1RzK55f+C3adHAJsnH
I+4t8AhiHPMmN52tSTvyXZpGxsJVRf4mMgK5wyxkmXcTyr/xkzKJ42RwSr1hGuKX
lqVbFAX9SXohFzY+n0aO8TEbNEsrhtIkTwpd/VQ9v09PJM2e0I0likDKMydilM7X
qO31diHYxkz15yLTQmOvtODISFwI+jCtcvc+qPBRETUJ4GtC2Jo3yMKQz18uFe5R
okk06rEj2OIxj08QW4sYrDM/VTTrCi5ijJDxTbPTJIolDQyffQH4c9koMA42toeD
WzZi02QQgDIHj2frk0sJqD/zidzRqvP9Q5TGCPUeH1Y3TQzFuwxRNFzWTnlAK9sz
1t8szPtIgGXs05ptM17plTzB9XfcbyfTjknXHpwzOqbC2Pqwej8=
=E6aI
-END PGP SIGNATURE-

Changes since co-21.06.3-1-6:
---
 0 files changed
---

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.1.7.1' created by Christian Lohmaier 
 at 2021-10-14 19:09 +

Tag libreoffice-7.1.7.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmFogHYACgkQ9DSh76/u
rqM8kg/+MTTt65kdlDA5Uzn4TNqEZIeG3wB4UpgFdsu2rP9ZiklCqRhouZLb0eUC
EOQinjy+SRnhe6++EtuMnlekocTg0LM+V/nWuReiv3OW6jUibi+zDMo4mMKRoXjp
pO0x3IuhfllAB/jf2IbCvsXrr52yBjeYqa5QLHGauSipsoUReUeSxYqH4Bn1tzbY
HFPCbAkNZnBXbE4tzKFJgSXCUkhHNuGbn2MxeXuhNI3+H/0eK+MI9SymnIRG4b84
Ah2+9ps0Isrh8vCcBiAwA13SNJhrZIdvw4T/XFEMuOsxNszPt9SV3CFoVUtDsiqs
Mm86a3y9WNC61aVHcFpl4XzhvlJk0JrrGJkaFJj2nzMfBvoSbrJfVe1lDu8U4WuJ
QuraZwnhyyfZ/dRq3lK66xiPz5Dnq78zDRJylpYfp9sov1cjqDd1njX/nUikK1Ua
0bCgdn/p/a8K/YookgLQgFwM4ElLPQ5LeQ9sFg+ldJyWTFGGs0uy4tr/x8pNEqiI
q5v07u/SJ1wAQj/iTuUkuFTl683uIuL3WR5VTT6TzcIuC+1b0VJ4tlfWwZZ5oiUQ
pw1DIWCe9bHxJzH/nNlBYGvQV0A3Zmu0qXv3O5JYtdWI+3OqhZQL6um71fAipvp6
mo7hPRKPgaCPV9ajfQUU7sdYZZh1HYx32mSxd+5Y2r6e0ffVtwM=
=nqaG
-END PGP SIGNATURE-

Changes since co-2021-branch-point-3:
---
 0 files changed
---

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.1.7.1' created by Christian Lohmaier 
 at 2021-10-14 19:09 +

Tag libreoffice-7.1.7.1
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmFogHMACgkQ9DSh76/u
rqMwiBAAunpxYUXFEExCFAH0LgTmPcXgUnTMvI4uls4ZXNoWth3fNfZm/XpZsKR7
YbcXV7RXj7BNaQ7E3tTa64cgUwvQboOmeOyE1EUxCzuYZgr8sJ8ppdYQANewo967
VDj3FJju4R2YyA+MWUhpYkqDPpAwOgMJCAoV5Mfq0bjleABEOVtQ06LZ9neTHuRO
ajnEfPXvgIS7WHAX+InRsA9V8oHFh5qyzExNTsUvHs/e6b94JsPsaPnFMizemjl4
gIFmyccxZF+4RgyNLXuvJ6d7ctZ9n3gPdJLOzSQHmOGYDeZ6biox2mHkl6dIE9Ha
ewbHkfLXW+hiwARsV5vbwdT/nbK3QaCwpRYNRGy96oODcnYxVUKk0TPeOrmAy53O
WkZHg/3xQ1/n9cmXsLeLiTx3HF0/QTd0fk+TWDnn/j5PypSOvoxl3PA2ORonK+xw
DWUexfVYc01GZuHDmENKwInUCMjYpmu/aF+x+aGIdeWIw/G6EWps044M+mDg6B/m
8LNlBd5AK/VNM0fLtsAT4rGcyINv2EsXeI7CajKmrjClUPFBCGwprW7GOew4NSqN
CkaZ/TOrA5osJOVpOTdqvg6ujgS04wU8qRucGyQr4PaOWSNWMy2mbAeS/CCVFpS+
+8JIWsktiURzXXbfqFihTgrsuOdkmdrghLCcNWK9nXutwYUNBlY=
=InRI
-END PGP SIGNATURE-

Changes since cp-21.06.5-1-2:
---
 0 files changed
---

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

[Christian Lohmaier (via logerrit)]

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

New commits:
commit afb53345e7e0e09184fa81d50208023006d56a02
Author: Christian Lohmaier 
AuthorDate: Thu Oct 14 21:10:08 2021 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Oct 14 21:10:08 2021 +0200

bump product version to 7.1.7.1.0+

Change-Id: I937d9c8ba8383499085c02a38b2d8d0445b8a1ba

diff --git a/configure.ac b/configure.ac
index 83b67fd34d50..f482f46355ef 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.1.7.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.1.7.1.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-1' - configure.ac

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 4784990eda6098f0408276b4d424e81382a50460
Author: Christian Lohmaier 
AuthorDate: Thu Oct 14 21:07:58 2021 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Oct 14 21:07:58 2021 +0200

bump product version to 7.1.8.0.0+

Change-Id: I3ba1585241bd069a582a311c8c1e5c142c937a7b

diff --git a/configure.ac b/configure.ac
index 83b67fd34d50..a9c4b1513bd7 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.1.7.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.1.8.0.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: Changes to 'libreoffice-7-1-7'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-1-7' available with the following commits:
commit cba33b926c278d6015e263a7e227e772c3c19d4a
Author: Christian Lohmaier 
Date:   Thu Oct 14 21:07:10 2021 +0200

Branch libreoffice-7-1-7

This is 'libreoffice-7-1-7' - the stable branch for the 7.1.7 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.1.x release,
please use the 'libreoffice-7-1' branch.

If you want to build something cool, unstable, and risky, use master.

[Libreoffice-commits] translations.git: Changes to 'libreoffice-7-1-7'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-1-7' available with the following commits:
commit 381c24a5af6b9996677911cfbe547bf3d1412302
Author: Christian Lohmaier 
Date:   Thu Oct 14 21:06:50 2021 +0200

Branch libreoffice-7-1-7

This is 'libreoffice-7-1-7' - the stable branch for the 7.1.7 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.1.x release,
please use the 'libreoffice-7-1' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I17b5a14ec758c69f4f4df701002f4172b2edc798

[Libreoffice-commits] help.git: Changes to 'libreoffice-7-1-7'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-1-7' available with the following commits:
commit a7f4f8d80c27178c9df19eae4d1630ed16fca518
Author: Christian Lohmaier 
Date:   Thu Oct 14 21:06:50 2021 +0200

Branch libreoffice-7-1-7

This is 'libreoffice-7-1-7' - the stable branch for the 7.1.7 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.1.x release,
please use the 'libreoffice-7-1' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I23c46f4d8499edbef34a5a99ea5032f329d6f58f

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-7-1-7'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-7-1-7' available with the following commits:
commit 7c2af72b7154390555bc2b69c3bd886f72d3b97b
Author: Christian Lohmaier 
Date:   Thu Oct 14 21:06:50 2021 +0200

Branch libreoffice-7-1-7

This is 'libreoffice-7-1-7' - the stable branch for the 7.1.7 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 7.1.x release,
please use the 'libreoffice-7-1' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I952e4d64fccf5fb9fa7f8319de4b904b10c814ad

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

[Jan Holesovsky (via logerrit)]

 filter/source/config/fragments/types/writer_T602_Document.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit da66ff3d83e5e975383615081eeffd3fa2f668f9
Author: Jan Holesovsky 
AuthorDate: Thu Oct 7 15:12:18 2021 +0200
Commit: Xisco Fauli 
CommitDate: Thu Oct 14 20:48:19 2021 +0200

T602 is an obsolete format, don't assume .txt files are T602

Without this, when the user tries to open a 0-bytes .txt file, they are
asked for a Save As operation after they hit the Save button.

When we remove the 'txt' from the T602 detection, it rather asks if the
user wants to use ODT or Plain text (and lose formatting).

Change-Id: Ic48fa61064a9ed78c64d56bc8864f0e12528e072
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123216
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 
(cherry picked from commit d602c433a08c6df28198ceb61b95f5c6d85d1a87)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123525
Reviewed-by: Xisco Fauli 

diff --git a/filter/source/config/fragments/types/writer_T602_Document.xcu 
b/filter/source/config/fragments/types/writer_T602_Document.xcu
index c34f823da4ca..e9b3df39cf33 100644
--- a/filter/source/config/fragments/types/writer_T602_Document.xcu
+++ b/filter/source/config/fragments/types/writer_T602_Document.xcu
@@ -18,7 +18,7 @@
 
 com.sun.star.comp.Writer.T602ImportFilter
 
-602 txt
+602
 application/x-t602
 true
 T602Document

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

[Stephan Bergmann (via logerrit)]

 unoidl/source/sourceprovider-scanner.l |4 
 1 file changed, 4 deletions(-)

New commits:
commit 620179240670bd00f60555f1f5c5b0268492f97c
Author: Stephan Bergmann 
AuthorDate: Tue Sep 14 17:15:08 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 14 20:39:18 2021 +0200

Enforce the UNOIDL identifier scheme

...which reserves identifiers containing underscores and starting with a
lowercase letter for the implementation.  That TODO can finally be resolved 
now
after 04af4e4f55f3ef319a78edd4d0109e2e7eba90b6 "[API CHANGE] Fix all bad 
UNOIDL
identifiers across offapi".

Change-Id: Id63ba96aa77f8666fbdfa90f7b260af42e6856bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122362
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/unoidl/source/sourceprovider-scanner.l 
b/unoidl/source/sourceprovider-scanner.l
index 847138b56dd0..bdedfcffc919 100644
--- a/unoidl/source/sourceprovider-scanner.l
+++ b/unoidl/source/sourceprovider-scanner.l
@@ -195,13 +195,9 @@ ALNUM {DIGIT}|{ALPHA}
 }
 
 ({ALPHA}|"_")({ALNUM}|"_")* {
-#if 1 //TODO
-yylval->sval=new OString(yytext);return TOK_IDENTIFIER;
-#else
 yyextra->errorMessage = "illegal identifier "
 + OUString(yytext, yyleng, RTL_TEXTENCODING_ASCII_US);
 return TOK_ERROR;
-#endif
 }
 
 0+[LUlu]? |

[Libreoffice-commits] core.git: helpcontent2

[Rafael Lima (via logerrit)]

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

New commits:
commit 4ab6aec7062ff752a28e7c7cff0e2836460c00a1
Author: Rafael Lima 
AuthorDate: Thu Oct 14 19:52:25 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Oct 14 19:52:25 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 28499f409af62f1930f427ebf040f9a2cd6422b3
  - tdf#145067 Document the Basic Collection object

Change-Id: I0ea7be144cca78b48ab3dfd07426ad679b07b26b
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/123398
Tested-by: Jenkins
Reviewed-by: Alain Romedenne 

diff --git a/helpcontent2 b/helpcontent2
index 1efde59fa4d7..28499f409af6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1efde59fa4d731f1fbbb1c14a647acb67d0be27a
+Subproject commit 28499f409af62f1930f427ebf040f9a2cd6422b3

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

[Rafael Lima (via logerrit)]

 AllLangHelp_sbasic.mk  |1 
 source/auxiliary/sbasic.tree   |1 
 source/text/sbasic/shared/03/sf_dictionary.xhp |4 
 source/text/sbasic/shared/03104200.xhp |   57 ---
 source/text/sbasic/shared/collection.xhp   |  189 +
 5 files changed, 224 insertions(+), 28 deletions(-)

New commits:
commit 28499f409af62f1930f427ebf040f9a2cd6422b3
Author: Rafael Lima 
AuthorDate: Mon Oct 11 19:59:51 2021 +0200
Commit: Rafael Lima 
CommitDate: Thu Oct 14 19:52:24 2021 +0200

tdf#145067 Document the Basic Collection object

Change-Id: I0ea7be144cca78b48ab3dfd07426ad679b07b26b
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/123398
Tested-by: Jenkins
Reviewed-by: Alain Romedenne 

diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk
index dfc04180f..d1acdf5a4 100644
--- a/AllLangHelp_sbasic.mk
+++ b/AllLangHelp_sbasic.mk
@@ -391,6 +391,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\
 helpcontent2/source/text/sbasic/shared/calc_functions \
 helpcontent2/source/text/sbasic/shared/code-stubs \
 helpcontent2/source/text/sbasic/shared/classmodule \
+helpcontent2/source/text/sbasic/shared/collection \
 helpcontent2/source/text/sbasic/shared/compatible \
 helpcontent2/source/text/sbasic/shared/compatibilitymode \
 helpcontent2/source/text/sbasic/shared/Compiler_options \
diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree
index cde86c221..cdd7c7ae6 100644
--- a/source/auxiliary/sbasic.tree
+++ b/source/auxiliary/sbasic.tree
@@ -96,6 +96,7 @@
 Chr 
Function
 ChrW 
Function [VBA]
 Close 
Statement
+Collection Object
 Const 
Statement
 ConvertFromURL Function
 ConvertToURL Function
diff --git a/source/text/sbasic/shared/03/sf_dictionary.xhp 
b/source/text/sbasic/shared/03/sf_dictionary.xhp
index bce0c86ea..c05c13d90 100644
--- a/source/text/sbasic/shared/03/sf_dictionary.xhp
+++ b/source/text/sbasic/shared/03/sf_dictionary.xhp
@@ -31,8 +31,7 @@
 
 
   Keys 
and items can be retrieved, counted, updated, and much more.
-  %PRODUCTNAME Basic Collection object does 
not support the retrieval of the keys.
-  Additionally its items contain only primitive Basic data types such as 
dates, text, numbers, and the like.
+  The 
Dictionary service is similar to the built-in %PRODUCTNAME Basic 
Collection object, however with more features. For example, 
Collection objects do not support the retrieval of keys. 
Moreover, Dictionaries provide additional capabilities as replacing keys, 
testing if a specific key already exists and converting the Dictionary into an 
Array object or JSON string.
 
   Service invocation
   
@@ -518,6 +517,7 @@
   
   
 
+
   
 
 
diff --git a/source/text/sbasic/shared/03104200.xhp 
b/source/text/sbasic/shared/03104200.xhp
index 056478400..ffe9b526a 100644
--- a/source/text/sbasic/shared/03104200.xhp
+++ b/source/text/sbasic/shared/03104200.xhp
@@ -1,5 +1,5 @@
 
-
+
 
 
-
 
-
-Array Function
-/text/sbasic/shared/03104200.xhp
-
-
-Sun Microsystems, Inc.
-
+  
+Array Function
+/text/sbasic/shared/03104200.xhp
+  
+  
+Sun Microsystems, Inc.
+  
 
 
-
-Array function
-
-Array 
Function
-Returns the 
type Variant with a data field.
-
-
-
-Array ( Argument 
list)
-
-See also DimArray
-
-
-Argument list: A list of any number of arguments that are 
separated by commas.
-
-
+  
+
+  Array function
+
+Array 
Function
+Returns 
the type Variant with a data field.
+  
+  
+  
+Array ( 
Argument list)
+  
+  See also 
DimArray
+  
+  
+  Argument list: A list of any number of arguments that are 
separated by commas.
+  
+  
 Dim A As Variant
 A = 
Array("Fred","Tom","Bill")
 Msgbox A(2)
-
+  
+
+  
+
+
+  
 
 
diff --git a/source/text/sbasic/shared/collection.xhp 
b/source/text/sbasic/shared/collection.xhp
new file mode 100644
index 0..5fb1d79eb
--- /dev/null
+++ b/source/text/sbasic/shared/collection.xhp
@@ -0,0 +1,189 @@
+
+
+
+
+
+  
+Collection Object
+/text/sbasic/shared/collection.xhp
+  
+
+
+  
+
+  Collection Object
+  Collection;Count
+
+Collection 
Object
+Collections can be 
used to store items of different types. Each item can be accessed by its index 
or by an optional key associated with it.
+  
+  A 
Collection object has the following methods:
+  
+
+Add: inserts a new item into the collection. 
Optionally a string value can be defined as the key to the item.
+
+
+Count: returns the number of items in the 
collection.
+
+
+Item: returns the item in the collection by 
passing its index or key.
+
+
+Remove: removes the specified item from the 
collection by its index or key.
+
+  
+  Items in a Collection can be accessed 
eit

[Libreoffice-commits] core.git: helpcontent2

[Rafael Lima (via logerrit)]

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

New commits:
commit 672ae729c40b782024b7e4b7adf3a5a45dd4af0c
Author: Rafael Lima 
AuthorDate: Thu Oct 14 19:52:03 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Oct 14 19:52:03 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 1efde59fa4d731f1fbbb1c14a647acb67d0be27a
  - tdf#143756 Update VBA Round function

Change-Id: I2bab4225b618125c52fc1146140118e3bce009a6
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/123514
Tested-by: Jenkins
Reviewed-by: Alain Romedenne 

diff --git a/helpcontent2 b/helpcontent2
index 89ebbf38c76b..1efde59fa4d7 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 89ebbf38c76bc5ea6e8161adaa2c4a55772b4ecb
+Subproject commit 1efde59fa4d731f1fbbb1c14a647acb67d0be27a

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

[Rafael Lima (via logerrit)]

 source/text/sbasic/shared/0317.xhp |  141 ++---
 1 file changed, 77 insertions(+), 64 deletions(-)

New commits:
commit 1efde59fa4d731f1fbbb1c14a647acb67d0be27a
Author: Rafael Lima 
AuthorDate: Wed Oct 13 22:49:21 2021 +0200
Commit: Rafael Lima 
CommitDate: Thu Oct 14 19:52:02 2021 +0200

tdf#143756 Update VBA Round function

Change-Id: I2bab4225b618125c52fc1146140118e3bce009a6
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/123514
Tested-by: Jenkins
Reviewed-by: Alain Romedenne 

diff --git a/source/text/sbasic/shared/0317.xhp 
b/source/text/sbasic/shared/0317.xhp
index b6ac5a4ff..7f5d824fb 100644
--- a/source/text/sbasic/shared/0317.xhp
+++ b/source/text/sbasic/shared/0317.xhp
@@ -1,71 +1,84 @@
 
 
-
+
 
-
-
-Round Function [VBA]
-/text/sbasic/shared/0317.xhp
-
-
+
+  
+Round Function [VBA]
+/text/sbasic/shared/0317.xhp
+  
+
 
-
+
+  
+
+  Round function (VBA)
+
+Round 
Function [VBA]
+Rounds a numeric value to a 
specified number of decimal digits.
+  
+  
+  This function 
implements the rounding rule known as "round-to-even". With this rule, whenever 
the difference between the number to be rounded and its nearest integer is 
equal to 0.5, the number is rounded to the nearest even number. See the 
examples below to learn more about this rule.
+  Beware that VBA's Round 
function works differently than %PRODUCTNAME Calc's Round 
function. In Calc, if the difference between the number to be rounded and the 
nearest integer is exactly 0.5, then the number is rounded up. Hence, in Calc 
the number 2.5 is rounded to 3 whereas using VBA's Round 
function the value 2.5 is rounded to 2 due to the "round-to-even" rule.
+  
+  
+Round(expression [,numdecimalplaces])
+  
+  
+  Double
+  
+  expression: The numeric expression to be 
rounded.
+  numdecimalplaces: Optional argument that 
specifies the number of decimal digits in the resulting rounded value. The 
default value is 0.
+  
+  
+  
+  
+Option VBASupport 1
+Sub 
Example_Round
+
Dim r 
+r 
= Pi
+
print r ' 3,14159265358979
+
print Round(r, 5) ' 3,14159
+
r = exp(1)
+
print r ' 2,71828182845904
+
print Round(r) ' 3
+End Sub
+  
+  
+The following 
examples illustrate the "round-to-even" rule:
+  
+  
+' Rounding to the 
nearest integer (decimalplaces = 0)
+MsgBox Round(3.5) ' 4
+MsgBox Round(4.5) ' 4
+MsgBox Round(5.5) ' 6
+MsgBox Round(6.5) ' 6
+' Rounding with 2 
decimal digits (decimalplaces = 2)
+MsgBox Round(1.555, 2) ' 1.56
+MsgBox Round(1.565, 2) ' 1.56
+MsgBox Round(1.575, 2) ' 1.58
+MsgBox Round(1.585, 2) ' 1.58
+  
 
-
-
-Round function
-
-Round Function [VBA]
-The 
Round function returns a number rounded to a specified number of 
digits.
-
-
-
-
-Round( expression as Double [,numdecimalplaces as Integer] ) 

-
-
-Double
-
-expression: Required. The numeric expression to 
be rounded.
-numdecimalplaces: Optional. Specifies how many 
places to the right of the decimal are included in the rounding. Default is 
0.
-
-
-
-
-
-REM * BASIC *
-Option VBASupport 1
-Sub Example_Round
- Dim r 
- r = Pi
- print r ' 3,14159265358979
- print Round(r, 5) ' 3,14159
- r = exp(1)
- print r ' 2,71828182845904
- print Round(r) ' 3
-End Sub
-
-
-
-Calc ROUND 
function
-
-
+  
+Calc ROUND 
function
+
+  
 
-
 

[Libreoffice-commits] core.git: editeng/source i18npool/source include/i18nutil offapi/com offapi/type_reference

[Stephan Bergmann (via logerrit)]

 editeng/source/misc/svxacorr.cxx|2 
 i18npool/source/transliteration/transliterationImpl.cxx |   36 +++
 include/i18nutil/transliteration.hxx|   36 +++
 offapi/com/sun/star/i18n/TransliterationModules.idl |   36 +++
 offapi/com/sun/star/i18n/TransliterationModulesNew.idl  |   36 +++
 offapi/com/sun/star/i18n/UnicodeScript.idl  |2 
 offapi/type_reference/offapi.idl|   74 
 7 files changed, 111 insertions(+), 111 deletions(-)

New commits:
commit 04af4e4f55f3ef319a78edd4d0109e2e7eba90b6
Author: Stephan Bergmann 
AuthorDate: Mon Sep 6 16:53:29 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 14 19:50:30 2021 +0200

[API CHANGE] Fix all bad UNOIDL identifiers across offapi

Identifiers containing underscores must start with an uppercase letter.  (So
that the UNO implementation can use identifiers containing underscores and
starting with a lowercase letter for internal purposes, see e.g. the 
static_type
member functions in the C++ *.hdl files.  idlc checks that with the -cid 
option,
while unoidl-write silently allows bad identifiers for now, see the TODO in
unoidl/source/sourceprovider-scanner.l, which can be dropped after this 
change.)

All of the affected identifiers were present since early OOo times, but 
none of
them appear to be used much, at least not across LO itself, so there is hope
that we can get away with these incompatible changes.  (For the constant 
group
members, we could roll this out in two steps, introducing the new members
alongside the old ones and deprecating the old ones in a first step, then
removing the old, deprecated ones in a second step, so that third-party code
would have more time to adapt.  But that would not work for the enum 
members and
interface methods, so just do all of this in one breaking step.)

udkapi happened to not contain any bad identifiers.

Change-Id: If2d4c16563606f9efb48b937c76af54746377428
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121725
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index d809f373fbb3..0cd4e8d0d161 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -147,7 +147,7 @@ static bool lcl_IsUnsupportedUnicodeChar( CharClass const & 
rCC, const OUString&
 case css::i18n::UnicodeScript_kHangulCompatibilityJamo:
 case css::i18n::UnicodeScript_kEnclosedCJKLetterMonth:
 case css::i18n::UnicodeScript_kCJKCompatibility:
-case css::i18n::UnicodeScript_k_CJKUnifiedIdeographsExtensionA:
+case css::i18n::UnicodeScript_kCJKUnifiedIdeographsExtensionA:
 case css::i18n::UnicodeScript_kCJKUnifiedIdeograph:
 case css::i18n::UnicodeScript_kHangulSyllable:
 case css::i18n::UnicodeScript_kCJKCompatibilityIdeograph:
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx 
b/i18npool/source/transliteration/transliterationImpl.cxx
index 6a04ce8cd823..4a1e2eab6147 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -64,22 +64,22 @@ TMList const TMlist[] = {//  Modules
  ModulesNew
 // No enum define for this trans. application has to use impl name to load it
 //  TmItem1 (IGNORE_CASE_SIMPLE),   // (1<<11  1024) 
(66)
 
-  TmItem1 (ignoreTraditionalKanji_ja_JP),   // 3. (1<<12  4096) (10)
-  TmItem1 (ignoreTraditionalKana_ja_JP),// 4. (1<<13  8192) (11)
-  TmItem1 (ignoreMinusSign_ja_JP),  // 5. (1<<13 16384) (12)
-  TmItem1 (ignoreIterationMark_ja_JP),  // 6. (1<<14 32768) (13)
-  TmItem1 (ignoreSeparator_ja_JP),  // 7. (1<<15 65536) (14)
-  TmItem1 (ignoreSize_ja_JP),   // 15. (1<<23  16777216) (22)
-  TmItem1 (ignoreMiddleDot_ja_JP),  // 17. (1<<25  67108864) (24)
-  TmItem1 (ignoreSpace_ja_JP),  // 18. (1<<26 134217728) (25)
-  TmItem1 (ignoreZiZu_ja_JP),   // 8. (1<<16131072) (15)
-  TmItem1 (ignoreBaFa_ja_JP),   // 9. (1<<17262144) (16)
-  TmItem1 (ignoreTiJi_ja_JP),   // 10. (1<<18524288) (17)
-  TmItem1 (ignoreHyuByu_ja_JP), // 11. (1<<19   1048576) (18)
-  TmItem1 (ignoreSeZe_ja_JP),   // 12. (1<<20   2097152) (19)
-  TmItem1 (ignoreIandEfollowedByYa_ja_JP),  // 13. (1<<21   4194304) (20)
-  TmItem1 (ignoreKiKuFollowedBySa_ja_JP),   // 14. (1<<22   8388608) (21)
-  TmItem1 (ignoreProlongedSoundMark_ja_JP), // 16. (1<<24  33554432) (23)
+  TmItem1 (IgnoreTraditionalKanji_ja_JP),   // 3. (1<<12  4096) (10)
+  TmItem1 (IgnoreTraditionalKana_ja_JP),

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

[Mike Kaganski (via logerrit)]

 ucb/source/ucp/webdav-neon/webdavcontent.cxx |   21 -
 1 file changed, 4 insertions(+), 17 deletions(-)

New commits:
commit 6f761939196eb0963c218b2ac9263f358f946675
Author: Mike Kaganski 
AuthorDate: Thu Oct 14 17:05:53 2021 +0200
Commit: Mike Kaganski 
CommitDate: Thu Oct 14 18:37:47 2021 +0200

Finish merging two identical conditional branches

The code in the branches used to do different things before commit
26e6d4b05ab444e6a7529ffcac7fbe592fc94833, which technically made
aProperties a copy of rProperties in both cases, only in one case
there were some checks that didn't affect the end result. This was
progressively cleaned up in commits e06afb0c9546ddcde1cedd75f59001396ac6fdf2
and 39bbfa61653ba7c3cca0aed739559914c78edc89, and this one drops
the last redundant bit.

The only question that remains is: did the initial change
actually intend this result?

Change-Id: Id26d50f7f7bdfed3bfb436e0c8bbbf6b3a0dbf98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123524
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx 
b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index c613926e445d..45907b8a53d3 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -1364,24 +1364,11 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
 // Only DAV resources support PROPFIND
 std::vector< OUString > aPropNames;
 
-uno::Sequence< beans::Property > aProperties(
-rProperties.getLength() );
-
-if ( !m_aFailedPropNames.empty() )
-{
-sal_Int32 nProps = rProperties.getLength();
-std::copy(rProperties.begin(), rProperties.end(), 
aProperties.begin());
-
-aProperties.realloc( nProps );
-}
-else
-{
-aProperties = rProperties;
-}
-
-if ( aProperties.hasElements() )
+// FIXME: Should m_aFailedPropNames be checked here? It got 
effectively
+// ignored since commit 
26e6d4b05ab444e6a7529ffcac7fbe592fc94833.
+if ( rProperties.hasElements() )
 ContentProperties::UCBNamesToDAVNames(
-aProperties, aPropNames );
+rProperties, aPropNames );
 
 if ( !aPropNames.empty() )
 {

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

[Xisco Fauli (via logerrit)]

 sw/qa/uitest/data/tdf141957.odt |binary
 sw/qa/uitest/writer_tests6/tdf141957.py |   34 
 2 files changed, 34 insertions(+)

New commits:
commit e799d70c646748b90879d7b31c2b28fe8c0853d8
Author: Xisco Fauli 
AuthorDate: Thu Oct 14 12:07:05 2021 +0200
Commit: Xisco Fauli 
CommitDate: Thu Oct 14 18:10:21 2021 +0200

tdf#141957: sw: Add UItest

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

diff --git a/sw/qa/uitest/data/tdf141957.odt b/sw/qa/uitest/data/tdf141957.odt
new file mode 100644
index ..707c798c7145
Binary files /dev/null and b/sw/qa/uitest/data/tdf141957.odt differ
diff --git a/sw/qa/uitest/writer_tests6/tdf141957.py 
b/sw/qa/uitest/writer_tests6/tdf141957.py
new file mode 100644
index ..679841533133
--- /dev/null
+++ b/sw/qa/uitest/writer_tests6/tdf141957.py
@@ -0,0 +1,34 @@
+# -*- 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
+
+class tdf141957(UITestCase):
+
+def test_tdf_141957(self):
+with self.ui_test.load_file(get_url_for_data_file("tdf141957.odt")):
+with 
self.ui_test.execute_dialog_through_command(".uno:PageDialog") as xDialog:
+tabcontrol = xDialog.getChild("tabcontrol")
+
+xLandscape = xDialog.getChild('radiobuttonLandscape')
+self.assertEqual("true", 
get_state_as_dict(xLandscape)['Checked'])
+
+xTextDirectionList = xDialog.getChild("comboTextFlowBox")
+self.assertEqual("Right-to-left (vertical)", 
get_state_as_dict(xTextDirectionList)['SelectEntryText'])
+
+xHeaderOn = xDialog.getChild("checkHeaderOn")
+self.assertEqual(get_state_as_dict(xHeaderOn)["Selected"], 
"true")
+
+xCharsPerLine = xDialog.getChild("spinNF_CHARSPERLINE")
+xLinesPerLine = xDialog.getChild("spinNF_LINESPERPAGE")
+
+# Without the fix in place, this test would have failed with
+# AssertionError: '21' != '24'
+self.assertEqual("21", 
get_state_as_dict(xCharsPerLine)['Text'])
+self.assertEqual("20", 
get_state_as_dict(xLinesPerLine)['Text'])
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:

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

[Xisco Fauli (via logerrit)]

 sc/qa/unit/data/fods/SlowValidNewTabName1.fods |  408 -
 1 file changed, 408 deletions(-)

New commits:
commit 16da78d9734885aebe0a2ed93e885c811c13f456
Author: Xisco Fauli 
AuthorDate: Thu Oct 14 16:40:18 2021 +0200
Commit: Xisco Fauli 
CommitDate: Thu Oct 14 17:49:14 2021 +0200

sc: remove unused document

This was added in bc28d51cb88c796da241d1ab914bbe6bb174cc49
< ofz: make ValidNewTabName faster wrt collisions >

 caolanm, I found you added a file in 
bc28d51cb88c796da241d1ab914bbe6bb174cc49
but the file is not used at all.
was it by mistake or you wanted to add it to one of these 'pass' 
directories ?
 x1sc0, I don't recall what I wanted to do there, I think its safe 
to just remove that doc now.
If the slowness returns oss-fuzz will file a timeout bug for it
 caolanm, ok, I'll remove it then

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

diff --git a/sc/qa/unit/data/fods/SlowValidNewTabName1.fods 
b/sc/qa/unit/data/fods/SlowValidNewTabName1.fods
deleted file mode 100644
index 3f5dd3fc4115..
--- a/sc/qa/unit/data/fods/SlowValidNewTabName1.fods
+++ /dev/null
@@ -1,408 +0,0 @@
-
-http://purl.org/dc/elements/1.1/"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
office:mimetype="application/vnd.oasis.opendocument.presentation" 
office:version="1.0">
-  
-
-  0
-  27093
-
-  
-  
-  
-
-  
-  
-
-  
-
-
-  9style:table-column-properties style:column-width="3.8194in"/>
-   ties draw:fill="none" draw:textarea-horizontal-align="center" 
fo:padding="0.0382in"/>
-  
-
-  
-  
-
-
-
-
-
-
-  
-  
-  NMTOKENSe:presentation>
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-   

ESC meeting minutes: 2021-10-14

[Miklos Vajna]

* Present:
+ Sophie, Stephan, Michael W, Hossein, Heiko, Gabriel, Guilhem, Caolan, 
Olivier, Miklos, Cloph, Xisco, Michael S, Eike, Kendy

* Completed Action Items:
+ None

* Pending Action Items:
+ Create https://wiki.documentfoundation.org/ReleasePlan/7.3 (Cloph)

* Release Engineering update (Cloph)
+ 7.2 status: 7.2.2 was released as final today
+ 7.1 status: 7.1.7 rc1 will be tagged this evening
+ Remotes: Android, iOS
+ Android viewer

* Documentation (Olivier)
+ New Help: No news
+ Helpcontents2
  + Updates by ohallot, R. Lima, A. Romedenne
  + Fixes and refactor, A. Gelmini, Johnny_M
  + 249 open, 31 unclosed, 7 unconfirmed, 1 new, 1 fixed.
+ Guides
  + Updates in progress
  + Revisions need volunteers → call on the topic later today
+ Notes: ohallot absent in the next 2 weeks (back in november)

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
256(256) (topicUI) bugs open, 160(160) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week1 month   3 months   12 months
 added 11(1)  20(3) 43(1)   95(3)
 commented 71(-19)   219(-5)   736(-15)   3274(-28)
   removed  0(0)   1(-1) 6(0)   36(0)
  resolved  7(-2) 25(-2)90(-5) 471(-1)
+ top 10 contributors:
  Heiko Tietze made 131 changes in 1 month, and 2233 changes in 1 year
  Telesto made 47 changes in 1 month, and 672 changes in 1 year
  Foote, V Stuart made 40 changes in 1 month, and 579 changes in 1 year
  Ross Johnson made 23 changes in 1 month, and 23 changes in 1 year
  Roman Kuznetsov made 20 changes in 1 month, and 217 changes in 1 year
  Dieter made 20 changes in 1 month, and 288 changes in 1 year
  Timur made 15 changes in 1 month, and 123 changes in 1 year
  Xisco Fauli made 14 changes in 1 month, and 183 changes in 1 year
  Kaganski, Mike made 13 changes in 1 month, and 188 changes in 1 year
  David made 9 changes in 1 month, and 9 changes in 1 year

+ 20 new tickets with needsUXEval Oct/07-14

   [Bug 145118] direct formatting of "character locale" cannot be cleared
   [Bug 144851] Title Case Applied Outside of Selection
   [Bug 145109] Wording in "Format > Lists" are inconsistent
   [Bug 144531] Undo of textbox keeps the textbox insert button activated
   [Bug 144530] Redo of the insertion of a textbox doesn't activate selected
highlighting (which appears as redo isn't working)
   [Bug 136141] Sidebar: writer wrap sidebar visible only at image selection
   [Bug 145102] WRITER -- "open template" -- clearing up terms and menu
titles (a little bit of reorg)
   [Bug 145092] Remove option "Word justify" from FontWork toolbar
   [Bug 144190] _Left Align and _Right Align should be Align _Left and
Align _Right
   [Bug 145043] Footnotes & endnotes category in navigator causes
exponential lag
   [Bug 145039] UI: Add icons to the effect list (instead of text only)
   [Bug 145036] UI: Category "Exit" contains nearly the same "Entrance"
   [Bug 145038] UI: A button to expand the animation picker dialog to
dedicated dialog
   [Bug 145037] UI: Animation list, show all entry's by default. Add
search & drop down to filter
   [Bug 145035] UI: Show recently used animations or most used animations
first?
   [Bug 145034] UI: Animation not arrange alphabetically
   [Bug 145031] UI: Add shape name in the list, which list the animations
   [Bug 145028] UI: Sidebar Animation isn't that 'self-explaining' for
adding a new animation
   [Bug 144999] Writer Navigator: Add a toggle button to Expand
entries / Show only top-level items
   [Bug 144991] EDITING: The "Increase Indent" and "Decrease Indent"
increment step should be the width of 3 space chars (using the
default style font) when working in an xlsx document

 ->[Bug 144633] Allow setting marker color independently from line color
(marker color is lost when loading from OOXML)
+ Calc lacks on icon color being different from line color; round-trip
  and compatibility issue

* Crash Testing (Caolan)
+ 7(+1) import failure, 3(-1) export failures
+ 0 coverity issues
+ 4 ossfuzz issues
+ CVE-2021-25633 CVE-2021-25634 CVE-2021-25635 announced

* Crash Reporting (Xisco)
   + https://crashreport.libreoffice.org/stats/version/7.1.6.2
 + (+24) 930 906 650 210 0
   + https://crashreport.libreoffice.org/stats/version/7.2.0.4
 + (-336) 1506 1842 2023 2483 2159 1768 1068 0
   + https://crashreport.libreoffice.org/stats/version/7.2.1.2
 + (+167) 2209 2042 1450 0
   + 
https://crashreport.libreoffice.org/stats/signature/SalInstanceTreeView::get_drag_source()

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

[Mark Hung (via logerrit)]

 sw/source/ui/misc/pggrid.cxx |   19 +++
 1 file changed, 19 insertions(+)

New commits:
commit b21880ab06e85fdb688c8e5d11453a9fb9d52896
Author: Mark Hung 
AuthorDate: Thu Oct 7 20:36:17 2021 +0800
Commit: Xisco Fauli 
CommitDate: Thu Oct 14 16:43:46 2021 +0200

tdf#141957 include the size of header and footer.

Text grid dialog didn't include the size of header and footer,
so if any of them are included, the resulted number of lines or
chars per line was wrong.

Change-Id: I09c1eed1552485adf75ad75cfaf25b99f8eec1e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123215
Tested-by: Jenkins
Reviewed-by: Mark Hung 
(cherry picked from commit 8ac8a20ed15bb458e1ee5a8df2b97aef05ca4f7c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123397
Reviewed-by: Xisco Fauli 

diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 20a964eceaf7..73657c9573aa 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -272,6 +273,24 @@ void SwTextGridPage::UpdatePageSize(const SfxItemSet& rSet)
 sal_Int32 nDistanceLR = rLRSpace.GetLeft() + rLRSpace.GetRight();
 sal_Int32 nDistanceUL = rULSpace.GetUpper() + rULSpace.GetLower();
 
+for( sal_Int32 nId : { SID_ATTR_PAGE_HEADERSET, SID_ATTR_PAGE_FOOTERSET })
+{
+const SfxPoolItem* pItem;
+if( SfxItemState::SET == rSet.GetItemState( nId, false, &pItem ) )
+{
+const SfxItemSet& rExtraSet = static_cast(pItem)->GetItemSet();
+const SfxBoolItem& rOn =
+static_cast(rExtraSet.Get( 
rSet.GetPool()->GetWhich( SID_ATTR_PAGE_ON ) ));
+
+if ( rOn.GetValue() )
+{
+const SvxSizeItem& rSizeItem =
+static_cast(rExtraSet.Get(rSet.GetPool()->GetWhich(SID_ATTR_PAGE_SIZE)));
+nDistanceUL += rSizeItem.GetSize().Height();
+}
+}
+}
+
 sal_Int32 nValue1 = rSize.GetSize().Height() - nDistanceUL -
 rBox.GetDistance(SvxBoxItemLine::TOP) -
 rBox.GetDistance(SvxBoxItemLine::BOTTOM);

[Libreoffice-commits] core.git: offapi/com offapi/type_reference offapi/UnoApi_offapi.mk udkapi/com

[Stephan Bergmann (via logerrit)]

 offapi/UnoApi_offapi.mk  |1 
 offapi/com/sun/star/resource/XLocale.idl |  208 ---
 offapi/type_reference/offapi.idl |   21 ---
 udkapi/com/sun/star/lang/Locale.idl  |   10 -
 4 files changed, 240 deletions(-)

New commits:
commit a74d15adced66dfcd63fbec0ce23bb4f7089824b
Author: Stephan Bergmann 
AuthorDate: Wed Oct 13 09:08:25 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 14 16:27:32 2021 +0200

[API CHANGE] Remove unused css.resource.XLocale

It had been present ever since at least 
88c437c597b604524d50f450506285a594bd03a5
"moved from api" from 2000, but was apparently never implemented nor used at
least in OOo/LO itself.  It is problematic as it uses reserved identifiers
("getDisplayLanguage_Default" etc.) that contain underscores and start with 
a
lowercase letter, and a planned change to unoidl-write will no longer 
tolerate
usage of such reserved identifiers (see the TODO in
unoidl/source/sourceprovider-scanner.l).

Change-Id: I76a3a3da7b7c1f4c109ca7a12c9f07857ca1be1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123544
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 46718a5c2fa2..7509d0ff5163 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3119,7 +3119,6 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,com/sun/star/report/meta,\
 ))
 $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/resource,\
MissingResourceException \
-   XLocale \
XStringResourceManager \
XStringResourcePersistence \
XStringResourceResolver \
diff --git a/offapi/com/sun/star/resource/XLocale.idl 
b/offapi/com/sun/star/resource/XLocale.idl
deleted file mode 100644
index 562307d82def..
--- a/offapi/com/sun/star/resource/XLocale.idl
+++ /dev/null
@@ -1,208 +0,0 @@
-/* -*- 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 .
- */
-#ifndef __com_sun_star_resource_XLocale_idl__
-#define __com_sun_star_resource_XLocale_idl__
-
-#include 
-
-#include 
-
-#include 
-
-
-
- module com {  module sun {  module star {  module resource {
-
-/** offers some operations on com::sun::star::lang::Locale
-structures.
-@see Locale
- */
-published interface XLocale: com::sun::star::uno::XInterface
-{
-/** creates a locale from language, country, and variant.
-
-NOTE: ISO 639 is not a stable standard; some of the
-language codes it defines (specifically iw, ji, and in) have
-changed.  This constructor accepts both the old codes (iw, ji,
-and in) and the new codes (he, yi, and id), but all other API
-on XLocale will return only the NEW codes.
-
-Note: The Java class Locale returns the 
old codes.
-
-
- */
-com::sun::star::lang::Locale create( [in] string aLanguage,
- [in] string aCountry,
- [in] string aVariant );
-
-/** the common method of getting the current default locale.
-
-It is used for the presentation (for menus, dialogs, etc.).
-It is, generally, set once when your applet or application is
-initialized, then never reset. (If you do reset the default
-locale, you probably want to reload your GUI, so that the
-change is reflected in your interface.)
-
-More advanced programs allow users to use different locales
-for different fields, for example, in a spreadsheet.
-
-Note that the initial setting will match the host system.
- */
-com::sun::star::lang::Locale getDefault();
-
-/** sets the default locale for the whole environment.
-
-It is normally set once at the beginning of an application,
-then never reset. setDefault does not reset the host
-locale.
-
-
- */
-void setDefault( [in] com::sun::star::lang::Locale newLocale );
-
-/** @returns
-a sequence of all locales which are available in the 
system.
- */
-sequence getAvailableLocales();
-
-/** @

[Libreoffice-commits] core.git: distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeOnline.conf distro-configs/LibreOfficeWin32.conf distro-configs/LibreOfficeWin64.conf distro-configs/Libr

[Luboš Luňák (via logerrit)]

 distro-configs/LibreOfficeLinux.conf|1 +
 distro-configs/LibreOfficeOnline.conf   |1 +
 distro-configs/LibreOfficeWin32.conf|1 +
 distro-configs/LibreOfficeWin64.conf|1 +
 distro-configs/LibreOfficeWinArm64.conf |1 +
 5 files changed, 5 insertions(+)

New commits:
commit 58c3dab9e3120fab4db2e9f3c15916a8610cc1b6
Author: Luboš Luňák 
AuthorDate: Thu Oct 14 14:25:56 2021 +0200
Commit: Luboš Luňák 
CommitDate: Thu Oct 14 15:58:07 2021 +0200

--enable-lto for distro-configs/* that already use --enable-mergelibs

LTO should now work properly at least on these platforms, and it's
a couple percent better performance at the cost of build time.

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

diff --git a/distro-configs/LibreOfficeLinux.conf 
b/distro-configs/LibreOfficeLinux.conf
index 00a70c75010b..db759a8cb4e5 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -35,3 +35,4 @@
 --enable-breakpad
 --disable-dconf
 --enable-mergelibs
+--enable-lto
diff --git a/distro-configs/LibreOfficeOnline.conf 
b/distro-configs/LibreOfficeOnline.conf
index 3f90da0001bd..338fd7ac43a8 100644
--- a/distro-configs/LibreOfficeOnline.conf
+++ b/distro-configs/LibreOfficeOnline.conf
@@ -24,6 +24,7 @@
 --disable-sdremote-bluetooth
 --enable-extension-integration
 --enable-mergelibs
+--enable-lto
 --enable-python=internal
 --enable-release-build
 --with-external-dict-dir=/usr/share/hunspell
diff --git a/distro-configs/LibreOfficeWin32.conf 
b/distro-configs/LibreOfficeWin32.conf
index 92947bfc6526..2a9145b7c260 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -12,4 +12,5 @@
 --with-myspell-dicts
 --with-package-format=msi
 --enable-mergelibs
+--enable-lto
 --enable-odk
diff --git a/distro-configs/LibreOfficeWin64.conf 
b/distro-configs/LibreOfficeWin64.conf
index 58ff734f3619..71c386b36116 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -12,4 +12,5 @@
 --with-myspell-dicts
 --with-package-format=msi
 --enable-mergelibs
+--enable-lto
 --enable-odk
diff --git a/distro-configs/LibreOfficeWinArm64.conf 
b/distro-configs/LibreOfficeWinArm64.conf
index 509ed865fe5d..a052e9bcfc4c 100644
--- a/distro-configs/LibreOfficeWinArm64.conf
+++ b/distro-configs/LibreOfficeWinArm64.conf
@@ -11,4 +11,5 @@
 --with-myspell-dicts
 --with-package-format=msi
 --enable-mergelibs
+--enable-lto
 --enable-odk

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit c7eef45a876740e7707548734889626727fffebd
Author: Olivier Hallot 
AuthorDate: Thu Oct 14 10:40:02 2021 -0300
Commit: Gerrit Code Review 
CommitDate: Thu Oct 14 15:40:02 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 89ebbf38c76bc5ea6e8161adaa2c4a55772b4ecb
  - tdf#139290 Help button for Load Styles to right page

Actually there are multiple Help pages for the same dialog.

The Load Style (writer), Change Master Slide (Impress) and Master Page
(Draw) all use the same dialog sfx/ui/loadtemplatedialog

Switches were added to select the contents for the right application.

Still, slides and pages terms are mixed in the UI.

Change-Id: I2d48dd8a72fe7b43e92b57299eed1577e355c060
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/123529
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index c984b1f7c6d0..89ebbf38c76b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c984b1f7c6d08c21aa21413980c0bd4408a88a3a
+Subproject commit 89ebbf38c76bc5ea6e8161adaa2c4a55772b4ecb

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

[Olivier Hallot (via logerrit)]

 AllLangHelp_simpress.mk|1 
 source/text/sdraw/00/page_menu.xhp |3 
 source/text/sdraw/main_page.xhp|5 -
 source/text/simpress/00/slide_menu.xhp |3 
 source/text/simpress/01/0512.xhp   |   48 +++---
 source/text/simpress/01/05120100.xhp   |   49 ---
 source/text/swriter/01/0517.xhp|  107 ++---
 7 files changed, 117 insertions(+), 99 deletions(-)

New commits:
commit 89ebbf38c76bc5ea6e8161adaa2c4a55772b4ecb
Author: Olivier Hallot 
AuthorDate: Tue Oct 12 14:13:12 2021 -0300
Commit: Olivier Hallot 
CommitDate: Thu Oct 14 15:40:01 2021 +0200

tdf#139290 Help button for Load Styles to right page

Actually there are multiple Help pages for the same dialog.

The Load Style (writer), Change Master Slide (Impress) and Master Page
(Draw) all use the same dialog sfx/ui/loadtemplatedialog

Switches were added to select the contents for the right application.

Still, slides and pages terms are mixed in the UI.

Change-Id: I2d48dd8a72fe7b43e92b57299eed1577e355c060
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/123529
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/AllLangHelp_simpress.mk b/AllLangHelp_simpress.mk
index 0b4dbf68c..b46409d25 100644
--- a/AllLangHelp_simpress.mk
+++ b/AllLangHelp_simpress.mk
@@ -78,7 +78,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,simpress,\
 helpcontent2/source/text/simpress/01/0510 \
 helpcontent2/source/text/simpress/01/05110500m \
 helpcontent2/source/text/simpress/01/0512 \
-helpcontent2/source/text/simpress/01/05120100 \
 helpcontent2/source/text/simpress/01/05120500m \
 helpcontent2/source/text/simpress/01/0513 \
 helpcontent2/source/text/simpress/01/0515 \
diff --git a/source/text/sdraw/00/page_menu.xhp 
b/source/text/sdraw/00/page_menu.xhp
index 3e6802ab9..0119a9e72 100644
--- a/source/text/sdraw/00/page_menu.xhp
+++ b/source/text/sdraw/00/page_menu.xhp
@@ -32,6 +32,7 @@
 
 Choose Page - Master 
Page
 
+Choose Page - Master Page - 
Load
 
   Choose Page - New Page
   On the Insert bar, click
@@ -39,7 +40,7 @@
 
   
 
-   Icon
+   Icon 
New Page
 
 
   New Page
diff --git a/source/text/sdraw/main_page.xhp b/source/text/sdraw/main_page.xhp
index 48ac8523c..2e33da0c0 100644
--- a/source/text/sdraw/main_page.xhp
+++ b/source/text/sdraw/main_page.xhp
@@ -43,8 +43,7 @@
 Properties
 
 
-
-Master Page
+
 New Master
 Delete Master
 Master background
@@ -52,7 +51,5 @@
 Master Elements
 Move
 
-
-
 
 
diff --git a/source/text/simpress/00/slide_menu.xhp 
b/source/text/simpress/00/slide_menu.xhp
index 5ef3f5944..eeb135d6a 100644
--- a/source/text/simpress/00/slide_menu.xhp
+++ b/source/text/simpress/00/slide_menu.xhp
@@ -34,6 +34,7 @@
 
 Choose Slide - Change Slide Master
 
+Choose Slide - Change Slide Master - 
Load
 
   Choose 
Slide - New Slide
   On the 
Presentation bar, click
@@ -41,7 +42,7 @@
 
   
 
-   
Icon
+   
Icon New 
slide
 
 
   New Slide
diff --git a/source/text/simpress/01/0512.xhp 
b/source/text/simpress/01/0512.xhp
index a4a471a2d..348c005d0 100644
--- a/source/text/simpress/01/0512.xhp
+++ b/source/text/simpress/01/0512.xhp
@@ -25,23 +25,51 @@
   
   
 
-
 
-
-  Change Slide Master
-  Displays the Available Master Slides 
dialog, where you can select a layout scheme for the current slide. Any objects 
in the slide design are inserted behind objects in the current 
slide.
-
+
+
+
+
+
+Master Page
+Displays the Available Master Slides 
dialog, where you can select a layout scheme for the current page. Any objects 
in the page design are inserted behind objects in the current 
page.
+
+
+
+
+Change Slide Master
+Displays the Available Master Slides 
dialog, where you can select a layout scheme for the current slide. Any objects 
in the slide design are inserted behind objects in the current 
slide.
+
+
+
 
-  
+
+
+
+
+
+
+
+
 
 
 Slide design
 Displays 
the slide designs you can apply to your slide. Select a design and click 
OK to apply it to the current slide.
-Exchange background page
+
+Exchange background page
 Applies the background 
of the selected slide design to all of the slides in your 
document.
-Delete unused 
backgrounds
+
+Delete unused backgrounds
 Deletes unreferenced 
background slides and presentation layouts from your 
document.
-Load
-Displays the Load Master 
Slide dialog, where you can select additi

[Libreoffice-commits] core.git: solenv/gbuild

[Luboš Luňák (via logerrit)]

 solenv/gbuild/platform/filter-creatingLibrary.awk |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 59fe5c0a9c3f21dbd2bae7f5886105ab9fc3727c
Author: Luboš Luňák 
AuthorDate: Thu Oct 14 13:29:48 2021 +0200
Commit: Luboš Luňák 
CommitDate: Thu Oct 14 15:23:42 2021 +0200

filter out also link.exe messages about LTO code generation

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

diff --git a/solenv/gbuild/platform/filter-creatingLibrary.awk 
b/solenv/gbuild/platform/filter-creatingLibrary.awk
index 5b3335ce8724..231609feb2d5 100755
--- a/solenv/gbuild/platform/filter-creatingLibrary.awk
+++ b/solenv/gbuild/platform/filter-creatingLibrary.awk
@@ -13,15 +13,27 @@
 
 BEGIN {
 creatinglibrary_prefix = ENVIRON["CREATINGLIBRARY_PREFIX"];
+generatingcode_message = ENVIRON["GENERATINGCODE_MESSAGE"];
+finishedgeneratingcode_message = ENVIRON["FINISHEDGENERATINGCODE_MESSAGE"];
 if (!creatinglibrary_prefix) {
 creatinglibrary_prefix = "\\.lib.*\\.exp"
 }
+if (!generatingcode_message) {
+generatingcode_message = "Generating code"
+}
+if (!finishedgeneratingcode_message) {
+finishedgeneratingcode_message = "Finished generating code"
+}
 firstline = 1
 }
 
 {
 if (firstline && match($0, creatinglibrary_prefix)) {
 # ignore
+} else if (match($0, generatingcode_message)) {
+# ignore
+} else if (match($0, finishedgeneratingcode_message)) {
+# ignore
 } else {
 # because MSVC stupidly prints errors on stdout, it's
 # necessary to forward everything that isn't matched by the pattern

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-21.06.5-1'

[Andras Timar (via logerrit)]

Tag 'cp-21.06.5-1' created by Andras Timar  at 
2021-10-14 13:13 +

cp-21.06.5-1

Changes since co-21.06.4-1-124:
---
 0 files changed
---

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-21.06.5-1'

[Christian Lohmaier (via logerrit)]

Tag 'cp-21.06.5-1' created by Andras Timar  at 
2021-10-14 13:13 +

cp-21.06.5-1

Changes since co-21.06.4-1:
Christian Lohmaier (1):
  update translations for 7.1.7 rc1

---
 source/ab/filter/source/config/fragments/filters.po
|   12 
 source/af/connectivity/registry/ado/org/openoffice/Office/DataAccess.po
|8 
 source/af/connectivity/registry/jdbc/org/openoffice/Office/DataAccess.po   
|   16 
 source/af/connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess.po 
|8 
 source/af/dbaccess/messages.po 
|6 
 source/af/desktop/messages.po  
|6 
 source/af/filter/messages.po   
|6 
 source/af/filter/source/config/fragments/filters.po
|   46 
 source/af/filter/source/config/fragments/internalgraphicfilters.po 
|   18 
 source/af/filter/source/config/fragments/types.po  
|8 
 source/af/officecfg/registry/data/org/openoffice/Office/UI.po  
|   24 
 source/af/sfx2/messages.po 
|   10 
 source/af/vcl/messages.po  
|6 
 source/am/chart2/messages.po   
|   14 
 source/am/cui/messages.po  
|   29 
 source/am/dbaccess/messages.po 
|   12 
 source/am/desktop/messages.po  
|   30 
 source/am/dictionaries/en/dialog.po
|   10 
 source/am/dictionaries/hu_HU/dialog.po 
|   56 
 source/am/editeng/messages.po  
|   14 
 source/am/extensions/messages.po   
|   18 
 source/am/extras/source/autocorr/emoji.po  
| 1585 +-
 source/am/filter/messages.po   
|   32 
 source/am/forms/messages.po
|   10 
 source/am/formula/messages.po  
|4 
 source/am/instsetoo_native/inc_openoffice/windows/msi_languages.po 
|   24 
 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/UI.po  
|  106 
 source/am/sc/messages.po   
|  274 -
 source/am/scaddins/messages.po 
|   20 
 source/am/scp2/source/draw.po  
|   10 
 source/am/scp2/source/math.po  
|   20 
 source/am/sd/messages.po   
|   22 
 source/am/sfx2/messages.po 
|   24 
 source/am/starmath/messages.po 
|   10 
 source/am/svx/messages.po  
|   45 
 source/am/sw/messages.po   
|  199 -
 source/am/uui/messages.po  
|   24 
 source/am/vcl/messages.po  
|   46 
 source/an/cui/messages.po  
|   14 
 source/an/dictionaries/en/dialog.po
|   55 
 source/an/dictionaries/hu_HU/dialog.po 
|   50 
 source/an/fpicker/messages.po  
|   12 
 source/an/officecfg/registry/data/org/openoffice/Office.po 
|   30 
 source/an/officecfg/registry/data/org/openoffice/Office/UI.po  
|   14 
 source/an/sd/messages.po   
|8 
 source/an/sfx2/messages.po 
|8 
 source/an/sw/messages.po   
|6 
 source/an/uui/messages.po  
|   13 
 source/an/vcl/messages.po  
|7 
 source/ast/chart2/messages.po  
|6 
 source/ast/cui/messages.po 
|   50 
 source/ast/dbaccess/messages.po
|   20

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-21.06.5-1'

[Adolfo Jayme Barrientos (via logerrit)]

Tag 'cp-21.06.5-1' created by Andras Timar  at 
2021-10-14 13:13 +

cp-21.06.5-1

Changes since co-2021-branch-point-10:
---
 0 files changed
---

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-21.06.5-1'

[Andras Timar (via logerrit)]

Tag 'cp-21.06.5-1' created by Andras Timar  at 
2021-10-14 13:13 +

cp-21.06.5-1

Changes since libreoffice-7-1-branch-point-5:
---
 0 files changed
---

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

[Jan Holesovsky (via logerrit)]

 filter/source/config/fragments/types/writer_T602_Document.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4feba9d025f1f97ea80854bc340ee0867eef8fff
Author: Jan Holesovsky 
AuthorDate: Thu Oct 7 15:12:18 2021 +0200
Commit: Miklos Vajna 
CommitDate: Thu Oct 14 15:00:09 2021 +0200

T602 is an obsolete format, don't assume .txt files are T602

Without this, when the user tries to open a 0-bytes .txt file, they are
asked for a Save As operation after they hit the Save button.

When we remove the 'txt' from the T602 detection, it rather asks if the
user wants to use ODT or Plain text (and lose formatting).

Change-Id: Ic48fa61064a9ed78c64d56bc8864f0e12528e072
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123216
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 
(cherry picked from commit d602c433a08c6df28198ceb61b95f5c6d85d1a87)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123401
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/filter/source/config/fragments/types/writer_T602_Document.xcu 
b/filter/source/config/fragments/types/writer_T602_Document.xcu
index c34f823da4ca..e9b3df39cf33 100644
--- a/filter/source/config/fragments/types/writer_T602_Document.xcu
+++ b/filter/source/config/fragments/types/writer_T602_Document.xcu
@@ -18,7 +18,7 @@
 
 com.sun.star.comp.Writer.T602ImportFilter
 
-602 txt
+602
 application/x-t602
 true
 T602Document

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

[Jan Holesovsky (via logerrit)]

 filter/source/config/fragments/types/writer_T602_Document.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bc714f2401d0f912c6cc38abc0bc21f36202b1c6
Author: Jan Holesovsky 
AuthorDate: Thu Oct 7 15:12:18 2021 +0200
Commit: Miklos Vajna 
CommitDate: Thu Oct 14 14:59:52 2021 +0200

T602 is an obsolete format, don't assume .txt files are T602

Without this, when the user tries to open a 0-bytes .txt file, they are
asked for a Save As operation after they hit the Save button.

When we remove the 'txt' from the T602 detection, it rather asks if the
user wants to use ODT or Plain text (and lose formatting).

Change-Id: Ic48fa61064a9ed78c64d56bc8864f0e12528e072
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123216
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 
(cherry picked from commit d602c433a08c6df28198ceb61b95f5c6d85d1a87)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123402
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/filter/source/config/fragments/types/writer_T602_Document.xcu 
b/filter/source/config/fragments/types/writer_T602_Document.xcu
index c34f823da4ca..e9b3df39cf33 100644
--- a/filter/source/config/fragments/types/writer_T602_Document.xcu
+++ b/filter/source/config/fragments/types/writer_T602_Document.xcu
@@ -18,7 +18,7 @@
 
 com.sun.star.comp.Writer.T602ImportFilter
 
-602 txt
+602
 application/x-t602
 true
 T602Document

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/docshell/externalrefmgr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6e43569fdfcb5070b6149b34f797008ff9b95809
Author: Caolán McNamara 
AuthorDate: Thu Oct 14 11:51:01 2021 +0100
Commit: Caolán McNamara 
CommitDate: Thu Oct 14 14:45:37 2021 +0200

ofz: leak of ScDocument

since...

commit 12ee423c7549ddd2b86dfc3fc6fed2c617dcca7f
Date:   Mon Sep 13 12:17:37 2021 +0200

tdf#144397 tdf#144636 XLSX: cache external named ranges and their 
formulas

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

diff --git a/sc/source/ui/docshell/externalrefmgr.cxx 
b/sc/source/ui/docshell/externalrefmgr.cxx
index d3b1bdd84d41..0da26f43b63f 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1758,7 +1758,7 @@ void 
ScExternalRefManager::storeRangeNameTokens(sal_uInt16 nFileId, const OUStri
 {
 // Parse all tokens in this external range data, and replace each 
absolute
 // reference token with an external reference token, and cache them.
-pNewArray = std::make_shared(*new ScDocument());
+pNewArray = std::make_shared(mrDoc);
 FormulaTokenArrayPlainIterator aIter(rArray);
 for (const FormulaToken* pToken = aIter.First(); pToken; pToken = 
aIter.Next())
 {

Re: Link Time Optimization for release builds?

[Luboš Luňák]

On Monday 11 of October 2021, Luboš Luňák wrote:
>  Hello,
>
>  I've noticed that the --enable-lto description says that it's broken with
> MSVC and also experimental, since 2015. I've fixed the MSVC build and
> checked that all MSVC/GCC/Clang LTO builds work. It's just a couple percent
> better performance, at the cost of somewhat longer build time, but still,
> it's basically free performance.
>
>  Is there a good reason why I should not add --enable-lto to all the
> distro-config/*.conf files?

 Ok, given there's been no more feedback, I''ve added --enable-lto to all 
distro-configs/* that already have --enable-mergelibs, and I'll submit
https://gerrit.libreoffice.org/c/core/+/123585 soon.

-- 
 Luboš Luňák
 l.lu...@collabora.com

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

[Luboš Luňák (via logerrit)]

 include/basic/modsizeexceeded.hxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit a2dce7ceeeada0e57c49bc28d50132b375b72ab6
Author: Luboš Luňák 
AuthorDate: Mon Oct 11 08:41:12 2021 +0200
Commit: Luboš Luňák 
CommitDate: Thu Oct 14 14:28:18 2021 +0200

fix MSVC mergelibs build

Linker complains about duplicate symbols for the template, seems
to be a case of
https://codesynthesis.com/~boris/blog/2010/01/18/dll-export-cxx-templates/

Change-Id: Iaffa3ba55edf4e54c62757c64d6b340b55a514cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123362
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit bbe9bfee56ce395c5fa1c1173e9909925a3a6393)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123520
Tested-by: Jenkins CollaboraOffice 

diff --git a/include/basic/modsizeexceeded.hxx 
b/include/basic/modsizeexceeded.hxx
index decaae9b07b3..7403b398e777 100644
--- a/include/basic/modsizeexceeded.hxx
+++ b/include/basic/modsizeexceeded.hxx
@@ -28,6 +28,13 @@
 
 namespace com::sun::star::task { class XInteractionContinuation; }
 
+#if defined(_MSC_VER)
+// MSVC automatically applies dllexport to template instantiations if they are 
a base class
+// of a dllexport class, and this template instantiation is a case of that. If 
we don't
+// dllimport here, MSVC will complain about duplicate symbols in a mergelibs 
build.
+template class __declspec(dllimport) cppu::WeakImplHelper< 
css::task::XInteractionRequest >;
+#endif
+
 class UNLESS_MERGELIBS(BASIC_DLLPUBLIC) ModuleSizeExceeded final : public 
cppu::WeakImplHelper< css::task::XInteractionRequest >
 {
 // C++ interface

[Libreoffice-commits] core.git: Changes to 'refs/tags/mimo-6.2.8.2.M6'

[Andras Timar (via logerrit)]

Tag 'mimo-6.2.8.2.M6' created by Andras Timar  at 
2021-10-14 12:17 +

mimo-6.2.8.2.M6

Changes since mimo-6.2.8.2.M5-34:
---
 0 files changed
---

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

[Andras Timar (via logerrit)]

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

New commits:
commit ef5029848dad369b3cfd3d6804304a7cbf8bcf58
Author: Andras Timar 
AuthorDate: Thu Oct 14 13:40:56 2021 +0200
Commit: Andras Timar 
CommitDate: Thu Oct 14 13:40:56 2021 +0200

Bump version to 21.06.5.1

Change-Id: I5c589aafa81853d9a8f35adc57d37a37f18e6ee9

diff --git a/configure.ac b/configure.ac
index 518fce0704d8..ed5f5a3c2ad5 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([Collabora Office],[21.06.4.1],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[21.06.5.1],[],[],[https://collaboraoffice.com/])
 
 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: sc/source

[Noel Grandin (via logerrit)]

 sc/source/core/tool/grouparealistener.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit c998691e22ceda15c89d55cf7005201f0392dadb
Author: Noel Grandin 
AuthorDate: Thu Oct 14 12:30:54 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Oct 14 13:37:08 2021 +0200

tdf#119083 small improvement to large vlookup sheet insert

Change-Id: Ia1742944fa42dc8a31161d10580b240b2c7c4052
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123582
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/sc/source/core/tool/grouparealistener.cxx 
b/sc/source/core/tool/grouparealistener.cxx
index fa234fbcc1c1..3fab01bd2c75 100644
--- a/sc/source/core/tool/grouparealistener.cxx
+++ b/sc/source/core/tool/grouparealistener.cxx
@@ -258,8 +258,7 @@ void FormulaGroupAreaListener::collectFormulaCells(
 if (nRow2 < nRefRow1 || nRefRow2 < nRow1)
 return;
 
-for (; pp != ppEnd; ++pp)
-rCells.push_back(*pp);
+rCells.insert(rCells.end(), pp, ppEnd);
 }
 else
 {
@@ -281,8 +280,7 @@ void FormulaGroupAreaListener::collectFormulaCells(
 assert(nRow1 <= nRefRow2);
 
 // Notify the first hit cell and all subsequent ones.
-for (; pp != ppEnd; ++pp)
-rCells.push_back(*pp);
+rCells.insert(rCells.end(), pp, ppEnd);
 }
 }
 else if (mbEndFixed)

[Libreoffice-commits] core.git: configure.ac

[Noel Grandin (via logerrit)]

 configure.ac |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 42da199753515584e615cdcdd8601d2ffc27245b
Author: Noel Grandin 
AuthorDate: Thu Oct 14 10:58:25 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Oct 14 13:35:48 2021 +0200

more VS2022 integration

so it finds the v143 DLLs

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

diff --git a/configure.ac b/configure.ac
index 62d74e99db55..88962625644f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6471,7 +6471,7 @@ find_msvc_x64_dlls()
 msvcdllpath="$VC_PRODUCT_DIR/redist/x64/Microsoft.VC${VCVER}.CRT"
 case "$VCVER" in
 16.0 | 17.0)
-for crtver in 141 142; do
+for crtver in 141 142 143; do
 for l in `ls -1 $VC_PRODUCT_DIR/redist/MSVC/`; do
 echo "$as_me:$LINENO: testing 
$VC_PRODUCT_DIR/redist/MSVC/$l/x64/Microsoft.VC$crtver.CRT" >&5
 if test -d 
"$VC_PRODUCT_DIR/redist/MSVC/$l/x64/Microsoft.VC$crtver.CRT"; then
@@ -8210,7 +8210,9 @@ if test $_os = "WINNT"; then
 MSVC_DLLS="$msvcdlls"
 test -n "$msmdir" && MSM_PATH=`win_short_path_for_make "$msmdir"`
 # MSVC 15.3 changed it to VC141
-if echo "$msvcdllpath" | grep -q "VC142.CRT$"; then
+if echo "$msvcdllpath" | grep -q "VC143.CRT$"; then
+SCPDEFS="$SCPDEFS -DWITH_VC143_REDIST"
+elif echo "$msvcdllpath" | grep -q "VC142.CRT$"; then
 SCPDEFS="$SCPDEFS -DWITH_VC142_REDIST"
 elif echo "$msvcdllpath" | grep -q "VC141.CRT$"; then
 SCPDEFS="$SCPDEFS -DWITH_VC141_REDIST"

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

[Noel Grandin (via logerrit)]

 sw/source/core/table/swtable.cxx |   12 
 1 file changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 12cac92a7f803808d971071fb091ba8572db587a
Author: Noel Grandin 
AuthorDate: Thu Oct 14 12:06:09 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Oct 14 13:21:58 2021 +0200

tdf#144840 Special Paste RTF: Table with merged cells messed up

Revert "tdf#135683 speed up large writer table load"

This reverts commit e3ea0e32657a41b48d9d9d28f6ad15af4c2a7abc.

Change-Id: If36077de62cbff8a3157b0824d4713c10e90f45e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123580
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 3e05628b58b4..ff85241e1cdf 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -1768,7 +1768,6 @@ SwFrameFormat* SwTableBox::ClaimFrameFormat()
 // If other SwTableBox objects currently listen to the same 
SwTableBoxFormat as
 // this one, something needs to be done
 SwTableBoxFormat *pRet = static_cast(GetFrameFormat());
-const bool bInImport = pRet->GetDoc()->IsInWriterfilterImport();
 SwIterator aIter( *pRet );
 for( SwTableBox* pLast = aIter.First(); pLast; pLast = aIter.Next() )
 {
@@ -1784,13 +1783,10 @@ SwFrameFormat* SwTableBox::ClaimFrameFormat()
 pNewFormat->UnlockModify();
 
 // re-register SwCellFrame objects that know me
-if (!bInImport)
-{
-SwIterator aFrameIter( *pRet );
-for( SwCellFrame* pCell = aFrameIter.First(); pCell; pCell = 
aFrameIter.Next() )
-if( pCell->GetTabBox() == this )
-pCell->RegisterToFormat( *pNewFormat );
-}
+SwIterator aFrameIter( *pRet );
+for( SwCellFrame* pCell = aFrameIter.First(); pCell; pCell = 
aFrameIter.Next() )
+if( pCell->GetTabBox() == this )
+pCell->RegisterToFormat( *pNewFormat );
 
 // re-register myself
 pNewFormat->Add( this );

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

[Xisco Fauli (via logerrit)]

 0 files changed

New commits:
commit 57cd44143f6292383020b4d95fc0743125770ebb
Author: Xisco Fauli 
AuthorDate: Wed Oct 13 18:34:47 2021 +0200
Commit: Caolán McNamara 
CommitDate: Thu Oct 14 12:57:02 2021 +0200

sc: move test to the right directory

added in 0162cfd55f397ded2af7d32f50cb3cba763c68bc
< forcepoint#40 null deref >

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

diff --git a/sc/qa/unit/data/xls/forcepoint-pivot-1.xls 
b/sc/qa/unit/data/xls/pass/forcepoint-pivot-1.xls
similarity index 100%
rename from sc/qa/unit/data/xls/forcepoint-pivot-1.xls
rename to sc/qa/unit/data/xls/pass/forcepoint-pivot-1.xls

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

[Christian Lohmaier (via logerrit)]

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

New commits:
commit b4e24288064c4960a70335265e4b72900a08dd35
Author: Christian Lohmaier 
AuthorDate: Thu Oct 14 12:50:06 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Oct 14 12:50:06 2021 +0200

Update git submodules

* Update translations from branch 'distro/collabora/co-2021'
  to 199bc9df9e0c79c47767cf6abb24e7b4aa116c6f
  - update translations for 7.1.7 rc1

and force-fix errors using pocheck

Change-Id: I190d7d75d9c53fcf3e09553f6a30ec788aaf3561

diff --git a/translations b/translations
index e6569294340d..199bc9df9e0c 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit e6569294340de8d2489d09b77911ba148977b13b
+Subproject commit 199bc9df9e0c79c47767cf6abb24e7b4aa116c6f

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 3 commits - connectivity/source readlicense_oo/license xmlsecurity/qa

[Michael Stahl (via logerrit)]

 connectivity/source/parse/sqlbison.y   
  |6 
 readlicense_oo/license/CREDITS.fodt
  | 4132 +-
 
xmlsecurity/qa/unit/signing/data/02_doc_signed_by_trusted_person_manipulated.odt
 |binary
 xmlsecurity/qa/unit/signing/signing.cxx
  |   22 
 4 files changed, 2116 insertions(+), 2044 deletions(-)

New commits:
commit 531c74c1d8ed70120831d1167d01795f5b387262
Author: Michael Stahl 
AuthorDate: Fri Feb 26 17:24:10 2021 +0100
Commit: Andras Timar 
CommitDate: Thu Oct 14 12:35:33 2021 +0200

xmlsecurity: add test for timestamps

Change-Id: I6ce64ca7c59639684779144ed0ed8d36c4aca32b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111665
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit e5a0acda428fed64b9ba69365d6a54fbffa0727b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123404
Reviewed-by: Xisco Fauli 

diff --git 
a/xmlsecurity/qa/unit/signing/data/02_doc_signed_by_trusted_person_manipulated.odt
 
b/xmlsecurity/qa/unit/signing/data/02_doc_signed_by_trusted_person_manipulated.odt
new file mode 100644
index ..4136b32e5610
Binary files /dev/null and 
b/xmlsecurity/qa/unit/signing/data/02_doc_signed_by_trusted_person_manipulated.odt
 differ
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx 
b/xmlsecurity/qa/unit/signing/signing.cxx
index 513ebcce6009..1ac88f9e731b 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -508,6 +508,28 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testODFNo)
  
static_cast(pObjectShell->GetDocumentSignatureState()));
 }
 
+// document has one signed timestamp and one unsigned timestamp
+CPPUNIT_TEST_FIXTURE(SigningTest, testODFUnsignedTimestamp)
+{
+createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY)
+  + "02_doc_signed_by_trusted_person_manipulated.odt");
+SfxBaseModel* pBaseModel = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pBaseModel);
+SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
+CPPUNIT_ASSERT(pObjectShell);
+SignatureState nActual = pObjectShell->GetDocumentSignatureState();
+CPPUNIT_ASSERT_MESSAGE(
+(OString::number(o3tl::underlyingEnumValue(nActual)).getStr()),
+(nActual == SignatureState::NOTVALIDATED || nActual == 
SignatureState::OK));
+uno::Sequence const infos(
+pObjectShell->GetDocumentSignatureInformation(false));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), infos.getLength());
+// was: 
+CPPUNIT_ASSERT_EQUAL(sal_Int32(20210126), infos[0].SignatureDate);
+// was: 0
+CPPUNIT_ASSERT_EQUAL(sal_Int32(18183742), infos[0].SignatureTime);
+}
+
 /// Test a typical OOXML where a number of (but not all) streams are signed.
 CPPUNIT_TEST_FIXTURE(SigningTest, testOOXMLPartial)
 {
commit b36347a312da988285de797ac9ed0782caa06a66
Author: Stephan Bergmann 
AuthorDate: Tue Sep 14 12:20:48 2021 +0200
Commit: Andras Timar 
CommitDate: Thu Oct 14 12:35:26 2021 +0200

Adapt to Bison 3.8 internal yyn -> yyrule rename

see


"glr2.cc: log the execution of deferred actions" including "Rename argument 
yyn
as yyrule for clarity."

YYBISON was defined as 1 rather than as a representation of the Bison 
version
prior to


"yacc.c: provide the Bison version as an integral macro", which shouldn't 
be a
problem here.  And YYBISON is apparently completely undefined with
/usr/bin/bison on macOS.

(The preceding comment always mentioned "yyi" and "yyrmap" in apparent 
mismatch
with the actually used "yyn" and "yyr1" ever since
c25ec0608a167bcf1d891043f02273761c351701 "initial import", so just leave it
untouched.)

Change-Id: I4f901407aa21ed4abec84e661d813ee7599f02f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122082
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 45227d9b79dc4f2a2aa6874cd4e3c02b7934b197)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123408
Reviewed-by: Michael Stahl 

diff --git a/connectivity/source/parse/sqlbison.y 
b/connectivity/source/parse/sqlbison.y
index d14f36e7794f..c4be0bc00bd0 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -74,9 +74,15 @@ inline connectivity::OSQLInternalNode* newNode(const 
OUString& _newValue,
 
 // yyi is the internal number of the rule that is currently being reduced
 // This can be mapped to external rule number via the yyrmap.
+#if defined YYBISON && YYBISON >= 30800
+#define SQL_NEW_RULE   newNode("", SQLNodeType::Rule, 
yyr1[yyrule])
+#define SQL_N

[Libreoffice-commits] core.git: desktop/source icon-themes/colibre officecfg/registry sc/uiconfig sd/uiconfig

[Ross Johnson (via logerrit)]

 desktop/source/lib/init.cxx   |4 +---
 icon-themes/colibre/links.txt |6 +++---
 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |7 
+--
 sc/uiconfig/scalc/toolbar/formatobjectbar.xml |9 
++---
 sc/uiconfig/scalc/toolbar/singlemode.xml  |9 
++---
 sd/uiconfig/simpress/popupmenu/table.xml  |1 +
 6 files changed, 22 insertions(+), 14 deletions(-)

New commits:
commit 7f5379e040221435548d9be7c8c976378c04489a
Author: Ross Johnson 
AuthorDate: Wed Sep 22 19:58:54 2021 +1000
Commit: Eike Rathke 
CommitDate: Thu Oct 14 12:33:11 2021 +0200

tdf#33749 - revised merge and unmerge cells UI controls

Revert the two changes made under this issue tdf#33749:
1) Cell context menu back to 7.2
2) Format - Merge Cells menu back to 7.2
3) Help pages to reflect this

Moving forward with the following changes:
1) Rename "Split Cells" to "Unmerge Cells" (Calc only) which more accurately
   describes it's function in Calc (and for consistency with alternative
   office software).
2) Add "Merge Cells" and "Unmerge Cells" to Formatting toolbar alongside
   "Merge and Center Cells", including other available user interface
   schemes where possible.
3) Change the Format - Merge Cells menu icon to the "Merge Cells" icon
   as less confusing than the current "Merge and Center Cells" icon.
   Re-label the Format - Merge Cells menu to Format - Merge and Unmerge 
Cells.
4) Add TooltipLabel to .uno:ToggleMergeCells to clarify dual action.
5) Add Split Cells to Table context menu in Impress (as it is in Writer).
6) Help pages to reflect changes.
7) Remove two duplicate entries in the sUnoCommands array in init.cxx
   (one was ".uno:MergeCells" related to this change). This is untested
   but relates to status updates sent to the headless LOK clients. I assume
   duplicate entries would generate duplicate updates, which may be
   harmless but is probably not desirable.

Change-Id: I3063f871707a7286d95108d3a34a5287401baa6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122811
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 306b6d417d9d..8156b3b2b40f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2823,8 +2823,6 @@ static void doc_iniUnoCommands ()
 OUString(".uno:Copy"),
 OUString(".uno:Paste"),
 OUString(".uno:SelectAll"),
-OUString(".uno:InsertAnnotation"),
-OUString(".uno:DeleteAnnotation"),
 OUString(".uno:ReplyComment"),
 OUString(".uno:ResolveComment"),
 OUString(".uno:ResolveCommentThread"),
@@ -2832,7 +2830,6 @@ static void doc_iniUnoCommands ()
 OUString(".uno:InsertRowsAfter"),
 OUString(".uno:InsertColumnsBefore"),
 OUString(".uno:InsertColumnsAfter"),
-OUString(".uno:MergeCells"),
 OUString(".uno:DeleteRows"),
 OUString(".uno:DeleteColumns"),
 OUString(".uno:DeleteTable"),
@@ -2885,6 +2882,7 @@ static void doc_iniUnoCommands ()
 OUString(".uno:InsertObjectChart"),
 OUString(".uno:InsertSection"),
 OUString(".uno:InsertAnnotation"),
+OUString(".uno:DeleteAnnotation"),
 OUString(".uno:InsertPagebreak"),
 OUString(".uno:InsertColumnBreak"),
 OUString(".uno:HyperlinkDialog"),
diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index 226ba61f52e6..166043128182 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -1719,17 +1719,17 @@ cmd/sc_arrangemenu.png cmd/sc_bringtofront.png
 
 # Calc
 cmd/32/insertcell.png cmd/32/insertcellsright.png
-cmd/32/mergecellsmenu.png cmd/32/togglemergecells.png
+cmd/32/mergecellsmenu.png cmd/32/mergecells.png
 cmd/32/numberformatmenu.png cmd/32/numberformatstandard.png
 cmd/32/printrangesmenu.png cmd/32/defineprintarea.png
 
 cmd/lc_insertcell.png cmd/lc_insertcellsright.png
-cmd/lc_mergecellsmenu.png cmd/lc_togglemergecells.png
+cmd/lc_mergecellsmenu.png cmd/lc_mergecells.png
 cmd/lc_numberformatmenu.png cmd/lc_numberformatstandard.png
 cmd/lc_printrangesmenu.png cmd/lc_defineprintarea.png
 
 cmd/sc_insertcell.png cmd/sc_insertcellsright.png
-cmd/sc_mergecellsmenu.png cmd/sc_togglemergecells.png
+cmd/sc_mergecellsmenu.png cmd/sc_mergecells.png
 cmd/sc_numberformatmenu.png cmd/sc_numberformatstandard.png
 cmd/sc_printrangesmenu.png cmd/sc_defineprintarea.png
 
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index d41df29586fd..3c1013147c65 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openo

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

[Justin Luth (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter.cxx |   49 -
 sw/source/uibase/wrtsh/wrtsh1.cxx  |   21 ---
 2 files changed, 70 deletions(-)

New commits:
commit 08ede5d51a33f83ededee8a03c10f9bb8244690e
Author: Justin Luth 
AuthorDate: Wed Oct 13 14:56:44 2021 +0200
Commit: Xisco Fauli 
CommitDate: Thu Oct 14 12:23:37 2021 +0200

tdf#134426 tdf#138873 sw:  Revert "tdf#79717 ...

...save/restore character format on selection overwrite"
which might also fix tdf#144638 as well.

This reverts LO 6.3 commit 6abed0ea006f3616e40faf2ae782cf64f8ac2914.

This 6.3 fix for bug 79717 has caused too many other problems
that are not being looked at, so it should just be reverted.
It is spamming documents with direct formatting which
is a terrible thing to have happen by accident.
It completely wrecks the proper use of styles.

Also revert asscoiated follow-up commits:
Revert "tdf#79717 save/restore character style on selection overwrite"
This reverts commit 6.3 04bd1925706360414438b814046b543c5e317d0a.

Revert "tdf#79717: sw_uiwriter: Add unittest"
This reverts commit 7.1 b05955b480fe4d32852e7be8a118d46ca7e6dbfa.

These effectively revert 7.0.4 12eac5bcbc9b71bf00cb88b918988826229cca35
but its unit test is left intact.

Change-Id: Ideced4d38bfdf4c82f1744534afbaad29689fded
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123566
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123577
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 702dc90636fd..8579f46b9b87 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -216,7 +216,6 @@ public:
 void testCaretPositionMovingUp();
 void testTdf93441();
 void testTdf81226();
-void testTdf79717();
 void testTdf137532();
 void testFdo87448();
 void testTextCursorInvalidation();
@@ -451,7 +450,6 @@ public:
 CPPUNIT_TEST(testCaretPositionMovingUp);
 CPPUNIT_TEST(testTdf93441);
 CPPUNIT_TEST(testTdf81226);
-CPPUNIT_TEST(testTdf79717);
 CPPUNIT_TEST(testTdf137532);
 CPPUNIT_TEST(testFdo87448);
 CPPUNIT_TEST(testTextCursorInvalidation);
@@ -2069,53 +2067,6 @@ void SwUiWriterTest::testTdf81226()
 CPPUNIT_ASSERT_EQUAL(OUString("beforeafter"), 
getParagraph(1)->getString());
 }
 
-void SwUiWriterTest::testTdf79717()
-{
-SwDoc* const pDoc = createDoc();
-SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
-pWrtShell->Insert("normal");
-lcl_setWeight(pWrtShell, WEIGHT_BOLD);
-pWrtShell->Insert("bold");
-pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/false, 1, 
/*bBasicCall=*/false);
-// Select 'bol' and replace it
-pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/true, 3, 
/*bBasicCall=*/false);
-pWrtShell->Insert("bol");
-
-// Without the fix in place, 'bol' would have been replaced with normal 
font weight
-
-auto xText = getParagraph(1)->getText();
-CPPUNIT_ASSERT(xText.is());
-{
-auto xCursor(xText->createTextCursorByRange(getRun(getParagraph(1), 
1)));
-CPPUNIT_ASSERT(xCursor.is());
-CPPUNIT_ASSERT_EQUAL(OUString("normal"), xCursor->getString());
-CPPUNIT_ASSERT_EQUAL(awt::FontWeight::NORMAL, 
getProperty(xCursor, "CharWeight"));
-}
-{
-auto xCursor(xText->createTextCursorByRange(getRun(getParagraph(1), 
2)));
-CPPUNIT_ASSERT(xCursor.is());
-CPPUNIT_ASSERT_EQUAL(OUString("bold"), xCursor->getString());
-CPPUNIT_ASSERT_EQUAL(awt::FontWeight::BOLD, 
getProperty(xCursor, "CharWeight"));
-}
-
-// Now select characters from both runs and replace them
-pWrtShell->EndPara();
-pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/true, 5, 
/*bBasicCall=*/false);
-pWrtShell->Insert("new");
-{
-auto xCursor(xText->createTextCursorByRange(getRun(getParagraph(1), 
1)));
-CPPUNIT_ASSERT(xCursor.is());
-CPPUNIT_ASSERT_EQUAL(OUString("norma"), xCursor->getString());
-CPPUNIT_ASSERT_EQUAL(awt::FontWeight::NORMAL, 
getProperty(xCursor, "CharWeight"));
-}
-{
-auto xCursor(xText->createTextCursorByRange(getRun(getParagraph(1), 
2)));
-CPPUNIT_ASSERT(xCursor.is());
-CPPUNIT_ASSERT_EQUAL(OUString("new"), xCursor->getString());
-CPPUNIT_ASSERT_EQUAL(awt::FontWeight::BOLD, 
getProperty(xCursor, "CharWeight"));
-}
-}
-
 void SwUiWriterTest::testTdf137532()
 {
 SwDoc* const pDoc = createDoc();
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx 
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 8251a9978142..bec2831d5531 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -198,11 +198,6 @@ void SwWrtShell::Insert( const OUString &rStr )
  bCallIns = m_bIns /*|| bHas

[Libreoffice-commits] core.git: Branch 'distro/vector/vector-7.0' - sw/qa sw/source

[Miklos Vajna (via logerrit)]

 sw/qa/core/unocore/data/graphic.png  |binary
 sw/qa/core/unocore/unocore.cxx   |   26 ++
 sw/source/core/unocore/unocrsrhelper.cxx |3 ++-
 3 files changed, 28 insertions(+), 1 deletion(-)

New commits:
commit 0fb7a4324aac356856e215e6c19521cb6871bc77
Author: Miklos Vajna 
AuthorDate: Wed Oct 13 17:00:30 2021 +0200
Commit: Miklos Vajna 
CommitDate: Thu Oct 14 12:06:33 2021 +0200

sw: fix corrupted proxy object for SwGrfNode via the view cursor UNO API

Creating an SwXTextFrame for a graphic node will result in a wrapper
that has no underlying SwTextNode, as the downcast from SwNode fails in
SwXParagraphEnumerationImpl::NextElement_Impl(). This is certainly not
intended, similar code in SwFmDrawPage::CreateShape() handles the text
node, graphic node and OLE node cases separately.

To make this more problematic, this corrupted wrapper can be still alive
by the time we try to save to ODT, but the wrapper without an underlying
SwTextNode will be unable to enumerat the paragraphs of the text frame,
so it throws, making it impossible to save the document.

Fix this by limiting the TextFrame property of the cursor to actual text
frames any returning an empty reference in other cases.

If there is a need to access graphic or OLE frames via that API, then
dedicated properties can be added to expose those different nodes.

(cherry picked from commit a399b05401fc35ebba4dbd07504fae4a609b3614)

Conflicts:
sw/qa/core/unocore/unocore.cxx

Change-Id: I5e97a826271b0d8a1bf262e43cd8516656b37c3a

diff --git a/sw/qa/core/unocore/data/graphic.png 
b/sw/qa/core/unocore/data/graphic.png
new file mode 100644
index ..fdad35484e7c
Binary files /dev/null and b/sw/qa/core/unocore/data/graphic.png differ
diff --git a/sw/qa/core/unocore/unocore.cxx b/sw/qa/core/unocore/unocore.cxx
index a4a39489da60..6ad020077d46 100644
--- a/sw/qa/core/unocore/unocore.cxx
+++ b/sw/qa/core/unocore/unocore.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -42,6 +43,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -108,6 +110,30 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, flyAtParaAnchor)
 xText->insertTextContent(xAnchor, xFieldmark, false);
 }
 
+CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, testViewCursorTextFrame)
+{
+// Given a document with a graphic and holding a reference to that graphic 
frame:
+mxComponent = loadFromDesktop("private:factory/swriter", 
"com.sun.star.text.TextDocument");
+uno::Sequence aInsertArgs = { 
comphelper::makePropertyValue(
+"FileName", m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"graphic.png") };
+dispatchCommand(mxComponent, ".uno:InsertGraphic", aInsertArgs);
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+uno::Reference xTextViewCursorSupplier(
+xModel->getCurrentController(), uno::UNO_QUERY);
+uno::Reference 
xViewCursor(xTextViewCursorSupplier->getViewCursor(),
+uno::UNO_QUERY);
+uno::Reference xFrame;
+xViewCursor->getPropertyValue("TextFrame") >>= xFrame;
+
+// When saving to ODT, then make sure the store doesn't fail:
+uno::Reference xStorable(xModel, uno::UNO_QUERY);
+uno::Sequence aStoreArgs
+= { comphelper::makePropertyValue("FilterName", OUString("writer8")) };
+// Without the accompanying fix in place, this test would have failed with:
+// uno.RuntimeException: "SwXParagraph: disposed or invalid ..."
+xStorable->storeToURL(maTempFile.GetURL(), aStoreArgs);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx 
b/sw/source/core/unocore/unocrsrhelper.cxx
index a82e7a1c2308..6a71158d0c3e 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -631,7 +631,8 @@ bool getCursorPropertyValue(const 
SfxItemPropertySimpleEntry& rEntry
 SwFrameFormat* pFormat;
 if(eType == SwFlyStartNode && nullptr != (pFormat = 
pSttNode->GetFlyFormat()))
 {
-if( pAny )
+// Create a wrapper only for text frames, not for graphic or 
OLE nodes.
+if (pAny && !rPam.GetNode().IsNoTextNode())
 {
 uno::Reference const xFrame(
 SwXTextFrame::CreateXTextFrame(*pFormat->GetDoc(), 
pFormat));

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

[Luboš Luňák (via logerrit)]

 sc/qa/unit/rangelst_test.cxx  |   14 ++
 sc/source/core/tool/rangelst.cxx  |   10 +-
 sc/source/ui/unoobj/chart2uno.cxx |8 
 3 files changed, 27 insertions(+), 5 deletions(-)

New commits:
commit c20d606c9c04e5c4092e059c43a292264e3bf12f
Author: Luboš Luňák 
AuthorDate: Wed Oct 6 12:57:15 2021 +0200
Commit: Luboš Luňák 
CommitDate: Thu Oct 14 11:51:33 2021 +0200

ScRangeList::UpdateReference() join all ranges properly (tdf#140901)

This is basically a revert of 6eb8634a9f62bfe486ecd2f46, which
made this Join() just the last range, probably under the assumption
that the function is always called with just one range to update,
or to avoid the possibility that Join() removes several items
from the list, breaking the next step of the loop. But DeleteArea()
may split several ranges, so we need to make sure to Join()
all of them.

Change-Id: Iea124142335ccdc8fa578344cddce8670c27573d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123135
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit e7ec79fe36a0f22f10167806da80e3c1f30b36e8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123519
Tested-by: Jenkins CollaboraOffice 

diff --git a/sc/qa/unit/rangelst_test.cxx b/sc/qa/unit/rangelst_test.cxx
index bfd4acd5dae1..4239cc91e8a9 100644
--- a/sc/qa/unit/rangelst_test.cxx
+++ b/sc/qa/unit/rangelst_test.cxx
@@ -520,6 +520,20 @@ void Test::testUpdateReference_DeleteRow()
 ScRangeList aList2(ScRange(2,2,0,2,2,0));
 aList2.UpdateReference(URM_INSDEL, m_pDoc, ScRange(0,3,0,MAXCOL,MAXROW,0), 
0, -1, 0);
 CPPUNIT_ASSERT(aList2.empty());
+
+ScRangeList aList3;
+aList3.push_back(ScRange(2,2,0,2,8,0));
+aList3.push_back(ScRange(4,2,0,4,8,0));
+aList3.UpdateReference(URM_INSDEL, m_pDoc, ScRange(2,5,0,MAXCOL,MAXROW,0), 
0, -1, 0);
+// Verify all ranges in the list have been updated properly.
+CPPUNIT_ASSERT_EQUAL(size_t(2), aList3.size());
+CPPUNIT_ASSERT_EQUAL(ScRange(2,2,0,2,7,0), aList3[0]);
+CPPUNIT_ASSERT_EQUAL(ScRange(4,2,0,4,7,0), aList3[1]);
+
+ScRangeList aList4(ScRange(0,0,0,MAXCOL,MAXROW,0));
+ScRangeList aList4Copy = aList4;
+aList4.UpdateReference(URM_INSDEL, m_pDoc, ScRange(14,3,0,MAXCOL,7,0), 0, 
-2, 0);
+CPPUNIT_ASSERT_EQUAL(aList4Copy, aList4);
 }
 
 void Test::testUpdateReference_DeleteLastRow()
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index c49e9694c0c8..eb1ad4fc37e5 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -438,7 +438,15 @@ bool ScRangeList::UpdateReference(
 if( nDx < 0 || nDy < 0 )
 {
 size_t n = maRanges.size();
-Join(maRanges[n-1], true);
+for(size_t i = n-1; i > 0;)
+{
+Join(maRanges[i], true);
+// Join() may merge and remove even more than one item, 
protect against it.
+if(i >= maRanges.size())
+i = maRanges.size()-1;
+else
+--i;
+}
 }
 }
 
diff --git a/sc/source/ui/unoobj/chart2uno.cxx 
b/sc/source/ui/unoobj/chart2uno.cxx
index c8bc1fc77996..437157aa050c 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -2716,7 +2716,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& 
/*rBC*/, const SfxHint& rHint
 }
 }
 
-OSL_ENSURE(m_pRangeIndices->size() == aRanges.size(),
+assert(m_pRangeIndices->size() == aRanges.size() &&
"range list and range index list have different sizes.");
 
 unique_ptr pUndoRanges;
@@ -2729,7 +2729,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& 
/*rBC*/, const SfxHint& rHint
 
 if (bChanged)
 {
-OSL_ENSURE(m_pRangeIndices->size() == aRanges.size(),
+assert(m_pRangeIndices->size() == aRanges.size() &&
"range list and range index list have different sizes 
after the reference update.");
 
 // Bring the change back from the range list to the token list.
@@ -2751,7 +2751,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& 
/*rBC*/, const SfxHint& rHint
 
 if (!m_pRangeIndices || m_pRangeIndices->empty())
 {
-OSL_FAIL(" faulty range indices");
+assert(false && " faulty range indices");
 break;
 }
 
@@ -2760,7 +2760,7 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& 
/*rBC*/, const SfxHint& rHint
 size_t nCount = rRanges.size();
 if (nCount != m_pRangeIndices->size())
 {
-OSL_FAIL("range count and range index count differ.");
+assert(false && "range count and range index count differ.");
 break;
 }
 

Re: Build failure on x86 linux: undefined reference to `__atomic_load'

[Noel Grandin]

On Wed, 13 Oct 2021 at 18:50, Luke Benes  wrote:

> I can successfully build LO on i686 with
> LDFLAGS="-latomic"
>
>
>
external/clew/Library_clew.mk looks like a good example of stuff that adds
library paths, see the
   gb_Library_add_libs
command there

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

[Stephan Bergmann (via logerrit)]

 editeng/inc/editdoc.hxx|4 +-
 editeng/qa/unit/core-test.cxx  |   72 ++---
 editeng/source/editeng/editdoc.cxx |   10 ++---
 editeng/source/editeng/editeng.cxx |2 -
 include/editeng/editeng.hxx|2 -
 5 files changed, 45 insertions(+), 45 deletions(-)

New commits:
commit d296a0a271bcce56e15c4d8a577d4e0d368f7533
Author: Stephan Bergmann 
AuthorDate: Thu Oct 14 09:29:18 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 14 10:44:52 2021 +0200

Use more appropriate return type for some editeng functions

...whose return values are OUString-length related:

* ContentNode::GetExpandedLen from sal_uLong to sal_Int32
* EditDoc::GetTextLen from sal_uLong to sal_Int32
* EditEngine::GetTextLen from sal_uInt32 to sal_Int32

Change-Id: Ia5156e247906728e2130b321af15cda7669108ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123576
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx
index d56b4b385d7d..7d9af8e7d616 100644
--- a/editeng/inc/editdoc.hxx
+++ b/editeng/inc/editdoc.hxx
@@ -280,7 +280,7 @@ public:
 const OUString& GetString() const { return maString;}
 
 /// return length including expanded fields
-sal_uLong GetExpandedLen() const;
+sal_Int32 GetExpandedLen() const;
 /// return content including expanded fields
 OUString  GetExpandedText(sal_Int32 nStartPos = 0, sal_Int32 nEndPos = -1) 
const;
 /// re-write offsets in the expanded text to string offsets
@@ -774,7 +774,7 @@ public:
 EditPaM ConnectParagraphs( ContentNode* pLeft, ContentNode* pRight 
);
 
 OUStringGetText( LineEnd eEnd ) const;
-sal_uLong   GetTextLen() const;
+sal_Int32   GetTextLen() const;
 
 OUString   GetParaAsString( sal_Int32 nNode ) const;
 static OUString  GetParaAsString(const ContentNode* pNode, sal_Int32 
nStartPos = 0, sal_Int32 nEndPos = -1);
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 0859a018ca0a..740f58f0b772 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -156,7 +156,7 @@ void Test::testLineSpacing()
 EditDoc &rDoc = aEditEngine.GetEditDoc();
 
 // Initially no text should be there
-CPPUNIT_ASSERT_EQUAL(sal_uLong(0), rDoc.GetTextLen());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), rDoc.GetTextLen());
 CPPUNIT_ASSERT_EQUAL(OUString(), rDoc.GetParaAsString(sal_Int32(0)));
 
 // Set initial text
@@ -166,7 +166,7 @@ void Test::testLineSpacing()
 aEditEngine.SetText(aText);
 
 // Assert changes - text insertion
-CPPUNIT_ASSERT_EQUAL(sal_uLong(aTextLen), rDoc.GetTextLen());
+CPPUNIT_ASSERT_EQUAL(aTextLen, rDoc.GetTextLen());
 CPPUNIT_ASSERT_EQUAL(aText, rDoc.GetParaAsString(sal_Int32(0)));
 
 // Select all paragraphs
@@ -563,7 +563,7 @@ void Test::testHyperlinkCopyPaste()
 EditDoc &rDoc = aEditEngine.GetEditDoc();
 
 // New instance must be empty - no initial text
-CPPUNIT_ASSERT_EQUAL( sal_uLong(0), rDoc.GetTextLen() );
+CPPUNIT_ASSERT_EQUAL( sal_Int32(0), rDoc.GetTextLen() );
 CPPUNIT_ASSERT_EQUAL( OUString(), rDoc.GetParaAsString(sal_Int32(0)) );
 
 // Get corresponding Field Item for inserting URLs in text
@@ -585,7 +585,7 @@ void Test::testHyperlinkCopyPaste()
 aEditEngine.SetText( aParaText );
 
 // Assert changes
-CPPUNIT_ASSERT_EQUAL( sal_uLong(aTextLen), rDoc.GetTextLen() );
+CPPUNIT_ASSERT_EQUAL( aTextLen, rDoc.GetTextLen() );
 CPPUNIT_ASSERT_EQUAL( aParaText, rDoc.GetParaAsString(sal_Int32(0)) );
 
 // Insert URL 1
@@ -605,7 +605,7 @@ void Test::testHyperlinkCopyPaste()
 
 // Assert URL Fields and text before copy
 // Check text
-CPPUNIT_ASSERT_EQUAL( sal_uLong(aTextLen + aRepres1.getLength() + 
aRepres2.getLength()), rDoc.GetTextLen() );
+CPPUNIT_ASSERT_EQUAL( aTextLen + aRepres1.getLength() + 
aRepres2.getLength(), rDoc.GetTextLen() );
 CPPUNIT_ASSERT_EQUAL( 
OUString("sampletextforuser@example.comtestingexample@domain.comfeaturefields"),
 rDoc.GetParaAsString(sal_Int32(0)) );
 
 // Check Field 1
@@ -638,7 +638,7 @@ void Test::testHyperlinkCopyPaste()
 CPPUNIT_ASSERT_EQUAL( sal_uInt16(3), aEditEngine.GetFieldCount(0) );
 
 // Check the updated text length
-CPPUNIT_ASSERT_EQUAL( sal_uLong(aTextLen + 10 + aRepres1.getLength()*2 + 
aRepres2.getLength()), rDoc.GetTextLen() );
+CPPUNIT_ASSERT_EQUAL( aTextLen + 10 + aRepres1.getLength()*2 + 
aRepres2.getLength(), rDoc.GetTextLen() );
 
 // Check the updated text contents
 CPPUNIT_ASSERT_EQUAL( 
OUString("sampletextforuser@example.comtestingexample@domain.comfeaturefieldsforuser@example.comtesting"),
 rDoc.GetParaAsString(sal_Int32(0)) );
@@ -682,7 +682,7 @@ void Test::testCopyPaste()
 EditDoc &rDoc = aEditEngine.GetEditDoc();
 
 // Initially no text should be there
-CPPUNIT_ASSERT_EQUAL( sa

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

[Stephan Bergmann (via logerrit)]

 codemaker/source/codemaker/global.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 900ba7d24e1bfa7e9a2abcb7cb410261f680155a
Author: Stephan Bergmann 
AuthorDate: Thu Oct 14 09:24:27 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 14 10:42:31 2021 +0200

Use more appropriate type for OString-length related variable

Change-Id: I7a2925116928e16381c95b59a45200fa5f05935e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123575
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/codemaker/source/codemaker/global.cxx 
b/codemaker/source/codemaker/global.cxx
index 1b2b11db0f7e..6d831b45dca8 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -67,7 +67,7 @@ OString createFileNameFromType( const OString& destination,
 {
 OString type(typeName.replace('.', '/'));
 
-sal_uInt32 length = destination.getLength();
+sal_Int32 length = destination.getLength();
 
 bool bWithPoint = false;
 if (length == 0)

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

[Julien Nabet (via logerrit)]

 uui/source/iahndl-locking.cxx |9 +++--
 uui/source/iahndl-ssl.cxx |3 +--
 uui/source/iahndl.cxx |   23 ---
 3 files changed, 12 insertions(+), 23 deletions(-)

New commits:
commit f28c4ae3c676554723ae5959f15b5766e322cee6
Author: Julien Nabet 
AuthorDate: Wed Oct 13 21:59:05 2021 +0200
Commit: Julien Nabet 
CommitDate: Thu Oct 14 10:28:44 2021 +0200

Directly initialize vectors in uui

Change-Id: Ifca1362d8ee97640b31ce75b3dc8e819fe32588d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123567
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index 23493c16053c..47b15dc5e9da 100644
--- a/uui/source/iahndl-locking.cxx
+++ b/uui/source/iahndl-locking.cxx
@@ -72,8 +72,7 @@ void handleReadOnlyOpenRequest_(
 std::locale aResLocale = Translate::Create("uui");
 
 OUString aMessage;
-std::vector aArguments;
-aArguments.push_back(aDocumentURL);
+std::vector aArguments { aDocumentURL };
 
 aMessage = Translate::get(STR_READONLYOPEN_MSG, aResLocale);
 aMessage = UUIInteractionHelper::replaceMessageWithArguments(aMessage, 
aArguments);
@@ -102,8 +101,7 @@ void handleReloadEditableRequest_(
 std::locale aResLocale = Translate::Create("uui");
 
 OUString aMessage;
-std::vector aArguments;
-aArguments.push_back(aDocumentURL);
+std::vector aArguments { aDocumentURL };
 
 aMessage = Translate::get(STR_RELOADEDITABLE_MSG, aResLocale);
 aMessage = UUIInteractionHelper::replaceMessageWithArguments(aMessage, 
aArguments);
@@ -140,8 +138,7 @@ handleLockedDocumentRequest_(
 std::locale aResLocale = Translate::Create("uui");
 
 OUString aMessage;
-std::vector< OUString > aArguments;
-aArguments.push_back( aDocumentURL );
+std::vector< OUString > aArguments { aDocumentURL };
 
 bool bAllowOverride = xRetry.is() && 
officecfg::Office::Common::Misc::AllowOverrideLocking::get();
 
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index 136907da7cc2..bf4e8811f949 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -146,8 +146,7 @@ executeUnknownAuthDialog(
 // Get correct resource string
 OUString aMessage;
 
-std::vector< OUString > aArguments;
-aArguments.push_back( getContentPart( rXCert->getSubjectName()) );
+std::vector< OUString > aArguments { getContentPart( 
rXCert->getSubjectName()) };
 
 std::locale aResLocale(Translate::Create("uui"));
 
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 1fb003796682..e36598605b8f 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -463,7 +463,6 @@ UUIInteractionHelper::handleRequest_impl(
 ucb::UnsupportedNameClashException aUORequest;
 if (aAnyRequest >>= aUORequest)
 {
-std::vector< OUString > aArguments;
 
 uno::Reference< task::XInteractionApprove > xApprove;
 uno::Reference< task::XInteractionDisapprove > xDisapprove;
@@ -472,6 +471,7 @@ UUIInteractionHelper::handleRequest_impl(
 
 if ( xApprove.is() && xDisapprove.is() )
 {
+std::vector< OUString > aArguments;
 handleErrorHandlerRequest( 
task::InteractionClassification_QUERY,
ERRCODE_UUI_IO_UNSUPPORTEDOVERWRITE,
aArguments,
@@ -553,8 +553,7 @@ UUIInteractionHelper::handleRequest_impl(
 {
 sal_Int32 nMedium = 0;
 aWrongMediumException.Medium >>= nMedium;
-std::vector< OUString > aArguments;
-aArguments.push_back(OUString::number(nMedium + 1));
+std::vector< OUString > aArguments { OUString::number(nMedium + 1) 
};
 handleErrorHandlerRequest(aWrongMediumException.Classification,
   ERRCODE_UUI_WRONGMEDIUM,
   aArguments,
@@ -607,8 +606,7 @@ UUIInteractionHelper::handleRequest_impl(
 ? ERRCODE_UUI_CONFIGURATION_BROKENDATA_WITHREMOVE
 : ERRCODE_UUI_CONFIGURATION_BROKENDATA_NOREMOVE;
 
-std::vector< OUString > aArguments;
-aArguments.push_back(aMergeRecoveryRequest.ErrorLayerId);
+std::vector< OUString > aArguments { 
aMergeRecoveryRequest.ErrorLayerId };
 
 handleErrorHandlerRequest(task::InteractionClassification_ERROR,
   nErrorCode,
@@ -631,8 +629,7 @@ UUIInteractionHelper::handleRequest_impl(
 if (aStratum.isEmpty())
 aStratum = aStratumCreationException.StratumService;
 
-std::vector< OUString > aArguments;
-aArguments.push_back(aStratum);
+std::vector< OUString > aArguments { aStratum };
 
 handleErrorHandlerRequest(task::InteractionClassification_ERROR,
 

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

[Justin Luth (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter.cxx |   49 -
 sw/source/uibase/wrtsh/wrtsh1.cxx  |   21 ---
 2 files changed, 70 deletions(-)

New commits:
commit 49e8691530ea93174fd88727c2451e98a3bd
Author: Justin Luth 
AuthorDate: Wed Oct 13 14:56:44 2021 +0200
Commit: Mike Kaganski 
CommitDate: Thu Oct 14 10:17:19 2021 +0200

tdf#134426 tdf#138873 sw:  Revert "tdf#79717 ...

...save/restore character format on selection overwrite"
which might also fix tdf#144638 as well.

This reverts LO 6.3 commit 6abed0ea006f3616e40faf2ae782cf64f8ac2914.

This 6.3 fix for bug 79717 has caused too many other problems
that are not being looked at, so it should just be reverted.
It is spamming documents with direct formatting which
is a terrible thing to have happen by accident.
It completely wrecks the proper use of styles.

Also revert asscoiated follow-up commits:
Revert "tdf#79717 save/restore character style on selection overwrite"
This reverts commit 04bd1925706360414438b814046b543c5e317d0a.

Revert "tdf#79717: sw_uiwriter: Add unittest"
This reverts commit b05955b480fe4d32852e7be8a118d46ca7e6dbfa.

These effectively revert 12eac5bcbc9b71bf00cb88b918988826229cca35
but its unit test is left intact.

Change-Id: Ideced4d38bfdf4c82f1744534afbaad29689fded
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123566
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123573

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 23b7d9bb8e96..4973e238a4d0 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -220,7 +220,6 @@ public:
 void testCaretPositionMovingUp();
 void testTdf93441();
 void testTdf81226();
-void testTdf79717();
 void testTdf137532();
 void testFdo87448();
 void testTextCursorInvalidation();
@@ -340,7 +339,6 @@ public:
 CPPUNIT_TEST(testCaretPositionMovingUp);
 CPPUNIT_TEST(testTdf93441);
 CPPUNIT_TEST(testTdf81226);
-CPPUNIT_TEST(testTdf79717);
 CPPUNIT_TEST(testTdf137532);
 CPPUNIT_TEST(testFdo87448);
 CPPUNIT_TEST(testTextCursorInvalidation);
@@ -1655,53 +1653,6 @@ void SwUiWriterTest::testTdf81226()
 CPPUNIT_ASSERT_EQUAL(OUString("beforeafter"), 
getParagraph(1)->getString());
 }
 
-void SwUiWriterTest::testTdf79717()
-{
-SwDoc* const pDoc = createSwDoc();
-SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
-pWrtShell->Insert("normal");
-lcl_setWeight(pWrtShell, WEIGHT_BOLD);
-pWrtShell->Insert("bold");
-pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/false, 1, 
/*bBasicCall=*/false);
-// Select 'bol' and replace it
-pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/true, 3, 
/*bBasicCall=*/false);
-pWrtShell->Insert("bol");
-
-// Without the fix in place, 'bol' would have been replaced with normal 
font weight
-
-auto xText = getParagraph(1)->getText();
-CPPUNIT_ASSERT(xText.is());
-{
-auto xCursor(xText->createTextCursorByRange(getRun(getParagraph(1), 
1)));
-CPPUNIT_ASSERT(xCursor.is());
-CPPUNIT_ASSERT_EQUAL(OUString("normal"), xCursor->getString());
-CPPUNIT_ASSERT_EQUAL(awt::FontWeight::NORMAL, 
getProperty(xCursor, "CharWeight"));
-}
-{
-auto xCursor(xText->createTextCursorByRange(getRun(getParagraph(1), 
2)));
-CPPUNIT_ASSERT(xCursor.is());
-CPPUNIT_ASSERT_EQUAL(OUString("bold"), xCursor->getString());
-CPPUNIT_ASSERT_EQUAL(awt::FontWeight::BOLD, 
getProperty(xCursor, "CharWeight"));
-}
-
-// Now select characters from both runs and replace them
-pWrtShell->EndPara();
-pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/true, 5, 
/*bBasicCall=*/false);
-pWrtShell->Insert("new");
-{
-auto xCursor(xText->createTextCursorByRange(getRun(getParagraph(1), 
1)));
-CPPUNIT_ASSERT(xCursor.is());
-CPPUNIT_ASSERT_EQUAL(OUString("norma"), xCursor->getString());
-CPPUNIT_ASSERT_EQUAL(awt::FontWeight::NORMAL, 
getProperty(xCursor, "CharWeight"));
-}
-{
-auto xCursor(xText->createTextCursorByRange(getRun(getParagraph(1), 
2)));
-CPPUNIT_ASSERT(xCursor.is());
-CPPUNIT_ASSERT_EQUAL(OUString("new"), xCursor->getString());
-CPPUNIT_ASSERT_EQUAL(awt::FontWeight::BOLD, 
getProperty(xCursor, "CharWeight"));
-}
-}
-
 void SwUiWriterTest::testTdf137532()
 {
 SwDoc* const pDoc = createSwDoc();
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx 
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 4eb96467fc80..63237d2da2db 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -219,11 +219,6 @@ void SwWrtShell::Insert( const OUString &rStr )
  bCallIns = m_bIns /*|| bHasSel*/;
 bool bDeleted = false;
 
-

Re: Build failure on x86 linux: undefined reference to `__atomic_load'

[Stephan Bergmann]

On 13/10/2021 18:49, Luke Benes wrote:

I can successfully build LO on i686 with
LDFLAGS="-latomic"

This is overkill. I think patch is needed for the cuckoo module that you added 
in https://cgit.freedesktop.org/libreoffice/core/commit/?id=3749d9af3745
for IA-32 clang. I attempted to do this but I'm not family with how this 
patching/external system works. If you could give me some tips or something to 
try, I'd be happy to test it out for you.


In RepositoryExternal.mk's !SYSTEM_CPPUNIT definition of 
gb_LinkTarget__use_cuckoo_headers, you'll probably need something like


  $(call gb_LinkTarget_add_libs,$(1),-latomic)

properly if'ed for your specific i686 case.

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-7-0' - 2 commits - xmlsecurity/qa

[Michael Stahl (via logerrit)]

 
xmlsecurity/qa/unit/signing/data/02_doc_macros_signed_by_attacker_manipulated.odt
 |binary
 xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated.odt 
   |binary
 xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated2.odt
   |binary
 
xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated_triple.odt
 |binary
 
xmlsecurity/qa/unit/signing/data/02_doc_signed_by_trusted_person_manipulated.odt
  |binary
 xmlsecurity/qa/unit/signing/data/signed_with_x509certificate_chain.odt 
   |binary
 xmlsecurity/qa/unit/signing/signing.cxx
   |  122 ++
 7 files changed, 122 insertions(+)

New commits:
commit 40df732d7ce52fbaf60a9e5ab1ead1266428f638
Author: Michael Stahl 
AuthorDate: Fri Feb 26 17:29:37 2021 +0100
Commit: Andras Timar 
CommitDate: Thu Oct 14 09:14:01 2021 +0200

xmlsecurity: add tests for multiple X509Data/X509Certificate

Change-Id: If50ae8156f81c1053aa8fbfc3148da64bb8e1442

diff --git 
a/xmlsecurity/qa/unit/signing/data/02_doc_macros_signed_by_attacker_manipulated.odt
 
b/xmlsecurity/qa/unit/signing/data/02_doc_macros_signed_by_attacker_manipulated.odt
new file mode 100644
index ..d63e4b6b7b72
Binary files /dev/null and 
b/xmlsecurity/qa/unit/signing/data/02_doc_macros_signed_by_attacker_manipulated.odt
 differ
diff --git 
a/xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated.odt 
b/xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated.odt
new file mode 100644
index ..0190abb00f23
Binary files /dev/null and 
b/xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated.odt 
differ
diff --git 
a/xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated2.odt 
b/xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated2.odt
new file mode 100644
index ..f4b4198f94a6
Binary files /dev/null and 
b/xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated2.odt 
differ
diff --git 
a/xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated_triple.odt
 
b/xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated_triple.odt
new file mode 100644
index ..558bdee47e59
Binary files /dev/null and 
b/xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated_triple.odt
 differ
diff --git 
a/xmlsecurity/qa/unit/signing/data/signed_with_x509certificate_chain.odt 
b/xmlsecurity/qa/unit/signing/data/signed_with_x509certificate_chain.odt
new file mode 100644
index ..5e519dd8b7e7
Binary files /dev/null and 
b/xmlsecurity/qa/unit/signing/data/signed_with_x509certificate_chain.odt differ
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx 
b/xmlsecurity/qa/unit/signing/signing.cxx
index 7fdaf1b55574..48627ac5ce84 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -577,6 +578,105 @@ CPPUNIT_TEST_FIXTURE(SigningTest, 
testODFUnsignedTimestamp)
 CPPUNIT_ASSERT_EQUAL(sal_Int32(18183742), infos[0].SignatureTime);
 }
 
+CPPUNIT_TEST_FIXTURE(SigningTest, testODFX509CertificateChain)
+{
+createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY)
+  + "signed_with_x509certificate_chain.odt");
+SfxBaseModel* pBaseModel = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pBaseModel);
+SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
+CPPUNIT_ASSERT(pObjectShell);
+SignatureState nActual = pObjectShell->GetDocumentSignatureState();
+CPPUNIT_ASSERT_MESSAGE(
+(OString::number(o3tl::underlyingEnumValue(nActual)).getStr()),
+(nActual == SignatureState::NOTVALIDATED || nActual == 
SignatureState::OK));
+uno::Sequence const infos(
+pObjectShell->GetDocumentSignatureInformation(false));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), infos.getLength());
+// check that the signing certificate was picked, not one of the 2 CA ones
+CPPUNIT_ASSERT_EQUAL(security::CertificateValidity::VALID, 
infos[0].CertificateStatus);
+CPPUNIT_ASSERT(infos[0].Signer.is());
+CPPUNIT_ASSERT_EQUAL(
+OUString("CN=Xmlsecurity RSA Test example Alice,O=Xmlsecurity RSA 
Test,ST=England,C=UK"),
+infos[0].Signer->getSubjectName());
+}
+
+CPPUNIT_TEST_FIXTURE(SigningTest, testODFDoubleX509Data)
+{
+createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY)
+  + "02_doc_signed_by_attacker_manipulated.odt");
+SfxBaseModel* pBaseModel = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pBaseModel);
+SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
+CPPUNIT_ASSERT(pObjectShell);
+SignatureState nActual = pObjectShell->GetDocumentSignatureState();
+CPPUNIT_ASSERT_MESSAGE(
+(OString::number(o3tl::underlyingEnumValue(nActual)).getStr()),
+(nActual == SignatureState:

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

[László Németh (via logerrit)]

 sw/qa/uitest/data/tdf39721.fodt |   42 
 sw/qa/uitest/writer_tests7/tdf145093.py |   34 
 sw/source/core/doc/DocumentContentOperationsManager.cxx |6 +-
 3 files changed, 80 insertions(+), 2 deletions(-)

New commits:
commit eda5ac4a63fac6bce939b6791dec52270618dc29
Author: László Németh 
AuthorDate: Wed Oct 13 08:56:02 2021 +0200
Commit: László Németh 
CommitDate: Thu Oct 14 09:13:31 2021 +0200

tdf#145093 sw track changes: fix crash at moving list items

over a tracked paragraph insertion (both in Show Changes and
Hide Changes modes).

Note: we needed a Python UI test, because uiwriter doesn't crash
on Linux without this fix.

Likely regression from commit a19dc0d9cc35ae1e200f51d86950595f6771e9c3
"sw_redlinehide_3: update frames in MoveParagraph()".

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

diff --git a/sw/qa/uitest/data/tdf39721.fodt b/sw/qa/uitest/data/tdf39721.fodt
new file mode 100644
index ..1acf06c5e2a5
--- /dev/null
+++ b/sw/qa/uitest/data/tdf39721.fodt
@@ -0,0 +1,42 @@
+
+http://openoffice.org/2009/office"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text" 
xmlns:dc="http://purl.org/dc/elements/1.1/";>
+ 
+  
+  
+   
+  
+ 
+ 
+  
+   
+
+ 
+  
+   Unknown Author
+   2021-01-06T16:18:57
+  
+ 
+
+
+ 
+  
+   Unknown Author
+   2021-01-06T16:20:17
+  
+ 
+
+   
+   
+
+ Lorem ipsum
+
+
+ dolor sit
+
+
+ amet.
+
+   
+  
+ 
+
diff --git a/sw/qa/uitest/writer_tests7/tdf145093.py 
b/sw/qa/uitest/writer_tests7/tdf145093.py
new file mode 100644
index ..c22510a619cc
--- /dev/null
+++ b/sw/qa/uitest/writer_tests7/tdf145093.py
@@ -0,0 +1,34 @@
+# -*- 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 libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.common import type_text
+from uitest.uihelper.common import get_url_for_data_file
+
+class tdf145093(UITestCase):
+def test_tdf145093(self):
+# load the sample file
+with self.ui_test.load_file(get_url_for_data_file("tdf39721.fodt")) as 
document:
+
+# redlining should be on
+self.xUITest.executeCommand(".uno:TrackChanges")
+
+# Move Up/Down a list item over a tracked paragraph insertion 
resulted a crash
+# (Note: not only at the end of the document, but check the 
original
+# bug report temporarily, where the problem is triggered by an 
other problem).
+
+self.xUITest.executeCommand(".uno:MoveDown")
+self.xUITest.executeCommand(".uno:MoveDown")
+# Note: Move list item from the end of the document creates an 
extra insertion.
+# TODO: fix this other problem, and improve the test with an extra 
paragraph insertion
+self.xUITest.executeCommand(".uno:MoveUp")
+
+# This was a crash (using invalid pointer) both in Show Changes 
and Hide Changes modes
+self.xUITest.executeCommand(".uno:MoveDown")
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 9a093450f992..e078b3aeda8e 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -949,8 +949,10 @@ namespace
 for(SaveRedline & rSvRedLine : rArr)
 {
 rSvRedLine.SetPos( nInsPos );
-rDoc.getIDocumentRedlineAccess().AppendRedline( rSvRedLine.pRedl, 
true );
-if (rSvRedLine.pRedl->GetType() == RedlineType::Delete)
+IDocumentRedlineAccess::AppendResult const result(
+rDoc.getIDocumentRedlineAccess().AppendRedline( 
rSvRedLine.pRedl, true ));
+if ( IDocumentRedlineAccess::AppendResult::APPENDED == result &&
+rSvRedLine.pRedl->GetType() == RedlineType::Delete )
 {
 UpdateFramesForAddDeleteRedline(rDoc, *rSvRedLine.pRedl);
 }

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-3' - 2 commits - xmlsecurity/qa

[Michael Stahl (via logerrit)]

 
xmlsecurity/qa/unit/signing/data/02_doc_macros_signed_by_attacker_manipulated.odt
 |binary
 xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated.odt 
   |binary
 xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated2.odt
   |binary
 
xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated_triple.odt
 |binary
 
xmlsecurity/qa/unit/signing/data/02_doc_signed_by_trusted_person_manipulated.odt
  |binary
 xmlsecurity/qa/unit/signing/data/signed_with_x509certificate_chain.odt 
   |binary
 xmlsecurity/qa/unit/signing/signing.cxx
   |  122 ++
 7 files changed, 122 insertions(+)

New commits:
commit f4836f66e1468dfc727fec77d72f5fb9ea104d4f
Author: Michael Stahl 
AuthorDate: Fri Feb 26 17:29:37 2021 +0100
Commit: Andras Timar 
CommitDate: Wed Oct 13 23:28:57 2021 +0200

xmlsecurity: add tests for multiple X509Data/X509Certificate

Change-Id: If50ae8156f81c1053aa8fbfc3148da64bb8e1442

diff --git 
a/xmlsecurity/qa/unit/signing/data/02_doc_macros_signed_by_attacker_manipulated.odt
 
b/xmlsecurity/qa/unit/signing/data/02_doc_macros_signed_by_attacker_manipulated.odt
new file mode 100644
index ..d63e4b6b7b72
Binary files /dev/null and 
b/xmlsecurity/qa/unit/signing/data/02_doc_macros_signed_by_attacker_manipulated.odt
 differ
diff --git 
a/xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated.odt 
b/xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated.odt
new file mode 100644
index ..0190abb00f23
Binary files /dev/null and 
b/xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated.odt 
differ
diff --git 
a/xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated2.odt 
b/xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated2.odt
new file mode 100644
index ..f4b4198f94a6
Binary files /dev/null and 
b/xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated2.odt 
differ
diff --git 
a/xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated_triple.odt
 
b/xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated_triple.odt
new file mode 100644
index ..558bdee47e59
Binary files /dev/null and 
b/xmlsecurity/qa/unit/signing/data/02_doc_signed_by_attacker_manipulated_triple.odt
 differ
diff --git 
a/xmlsecurity/qa/unit/signing/data/signed_with_x509certificate_chain.odt 
b/xmlsecurity/qa/unit/signing/data/signed_with_x509certificate_chain.odt
new file mode 100644
index ..5e519dd8b7e7
Binary files /dev/null and 
b/xmlsecurity/qa/unit/signing/data/signed_with_x509certificate_chain.odt differ
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx 
b/xmlsecurity/qa/unit/signing/signing.cxx
index dc28a9b5098d..b3525937b46c 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -581,6 +582,105 @@ CPPUNIT_TEST_FIXTURE(SigningTest, 
testODFUnsignedTimestamp)
 CPPUNIT_ASSERT_EQUAL(sal_Int32(18183742), infos[0].SignatureTime);
 }
 
+CPPUNIT_TEST_FIXTURE(SigningTest, testODFX509CertificateChain)
+{
+createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY)
+  + "signed_with_x509certificate_chain.odt");
+SfxBaseModel* pBaseModel = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pBaseModel);
+SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
+CPPUNIT_ASSERT(pObjectShell);
+SignatureState nActual = pObjectShell->GetDocumentSignatureState();
+CPPUNIT_ASSERT_MESSAGE(
+(OString::number(o3tl::underlyingEnumValue(nActual)).getStr()),
+(nActual == SignatureState::NOTVALIDATED || nActual == 
SignatureState::OK));
+uno::Sequence const infos(
+pObjectShell->GetDocumentSignatureInformation(false));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), infos.getLength());
+// check that the signing certificate was picked, not one of the 2 CA ones
+CPPUNIT_ASSERT_EQUAL(security::CertificateValidity::VALID, 
infos[0].CertificateStatus);
+CPPUNIT_ASSERT(infos[0].Signer.is());
+CPPUNIT_ASSERT_EQUAL(
+OUString("CN=Xmlsecurity RSA Test example Alice,O=Xmlsecurity RSA 
Test,ST=England,C=UK"),
+infos[0].Signer->getSubjectName());
+}
+
+CPPUNIT_TEST_FIXTURE(SigningTest, testODFDoubleX509Data)
+{
+createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY)
+  + "02_doc_signed_by_attacker_manipulated.odt");
+SfxBaseModel* pBaseModel = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pBaseModel);
+SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
+CPPUNIT_ASSERT(pObjectShell);
+SignatureState nActual = pObjectShell->GetDocumentSignatureState();
+CPPUNIT_ASSERT_MESSAGE(
+(OString::number(o3tl::underlyingEnumValue(nActual)).getStr()),
+(nActual == SignatureState: