[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice

[Roman Kuznetsov (via logerrit)]

 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d8a1187fc262ccb4c6489b2ca830f230400c5b82
Author: Roman Kuznetsov 
AuthorDate: Tue Oct 12 14:45:24 2021 +0200
Commit: Roman Kuznetsov 
CommitDate: Wed Oct 13 08:41:29 2021 +0200

tdf#143686 increase a radiobutton's area size

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

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 43b77f1e8c0c..eee5c4e8cd48 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -183,7 +183,7 @@ MsiRMFilesInUse DlgDesc Text21  23  372 
25  196611  OOO_CONTROL_322
 MsiRMFilesInUseBannerLine  Line0   44  474 0   
1   
 MsiRMFilesInUseDlgText Text21  51  426 43  3   
OOO_CONTROL_323 
 MsiRMFilesInUseListListBox 21  95  432 85  7   
FileInUseProcess
-MsiRMFilesInUseShutdownOption  RadioButtonGroup26  190 
305 45  3   MsiUIRMOption   OK  
+MsiRMFilesInUseShutdownOption  RadioButtonGroup26  190 
422 45  3   MsiUIRMOption   OK  
 MsiRMFilesInUseDlgLine Line0   234 474 0   1   

 MsiRMFilesInUseOK  PushButton  330 243 66  17  
3   OOO_CONTROL_326 Cancel  
 MsiRMFilesInUseCancel  PushButton  401 243 66  17  
3   OOO_CONTROL_325 ShutdownOption  

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx |  129 +++--
 1 file changed, 86 insertions(+), 43 deletions(-)

New commits:
commit 13d1bcfa91b402e024223ebf83ca6fdf15b9ba25
Author: Miklos Vajna 
AuthorDate: Tue Oct 12 20:10:40 2021 +0200
Commit: Miklos Vajna 
CommitDate: Wed Oct 13 08:38:32 2021 +0200

CppunitTest_sw_ooxmlexport11: avoid DECLARE_OOXMLEXPORT_EXPORTONLY_TEST()

See commit a226cec52e536c46e03f57a5f1f7931abbeb0cdd
(CppunitTest_sw_rtfimport: convert one testcase to use
CPPUNIT_TEST_FIXTURE(), 2019-11-05) for motivation.

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

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 772a748b396d..c6bd56a5c03e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -167,8 +167,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf121456_tabsOffset, 
"tdf121456_tabsOffset.odt")
 }
 
 // tdf#121561: make sure w:sdt/w:sdtContent around TOC is written during 
ODT->DOCX conversion
-DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf121561_tocTitle, 
"tdf121456_tabsOffset.odt")
+CPPUNIT_TEST_FIXTURE(Test, testTdf121561_tocTitle)
 {
+loadAndSave("tdf121456_tabsOffset.odt");
 xmlDocUniquePtr pXmlDoc = parseExport();
 assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:sdt/w:sdtContent/w:p/w:r/w:t", "Inhaltsverzeichnis");
 assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:sdt/w:sdtContent/w:p/w:r/w:instrText", " TOC \\f \\o 
\"1-9\" \\h");
@@ -176,8 +177,9 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf121561_tocTitle, 
"tdf121456_tabsOffse
 assertXPath(pXmlDoc, 
"/w:document/w:body/w:sdt/w:sdtPr/w:docPartObj/w:docPartUnique", 1);
 }
 
-DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf129525, "tdf129525.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testTdf129525)
 {
+loadAndSave("tdf129525.rtf");
 xmlDocUniquePtr pXmlDoc = parseExport();
 assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:sdt/w:sdtContent/w:p[1]/w:r[4]/w:t", "Overview");
 assertXPathContent(pXmlDoc, 
"/w:document/w:body/w:sdt/w:sdtContent/w:p[1]/w:r[5]/w:t", "3");
@@ -195,8 +197,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf124106, "tdf121456.docx")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), text->getString().indexOf('y'));
 }
 
-DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf121561_tocTitleDocx, 
"tdf121456_tabsOffset.odt")
+CPPUNIT_TEST_FIXTURE(Test, testTdf121561_tocTitleDocx)
 {
+loadAndSave("tdf121456_tabsOffset.odt");
 CPPUNIT_ASSERT_EQUAL(7, getPages());
 xmlDocUniquePtr pXmlDoc = parseExport();
 
@@ -250,8 +253,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf82065_Ind_start_strict, 
"tdf82065_Ind_start_stri
 CPPUNIT_ASSERT_EQUAL_MESSAGE("IndentAt defined", true, bFoundIndentAt);
 }
 
-DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf76683_negativeTwipsMeasure, 
"tdf76683_negativeTwipsMeasure.docx")
+CPPUNIT_TEST_FIXTURE(Test, testTdf76683_negativeTwipsMeasure)
 {
+loadAndSave("tdf76683_negativeTwipsMeasure.docx");
 xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
 assertXPath(pXmlDoc, "/w:document/w:body/w:sectPr/w:cols/w:col", 2);
 sal_uInt32 nColumn1 = getXPath(pXmlDoc, 
"/w:document/w:body/w:sectPr/w:cols/w:col[1]", "w").toUInt32();
@@ -373,8 +377,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf94801, "tdf94801.docx")
 CPPUNIT_ASSERT_EQUAL(1, getPages());
 }
 
-DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testParagraphSplitOnSectionBorder, 
"parasplit-on-section-border.odt")
+CPPUNIT_TEST_FIXTURE(Test, testParagraphSplitOnSectionBorder)
 {
+loadAndSave("parasplit-on-section-border.odt");
 CPPUNIT_ASSERT_EQUAL(2, getPages());
 xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
 
@@ -384,8 +389,9 @@ 
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testParagraphSplitOnSectionBorder, "paraspli
 assertXPath(pXmlDoc, "//w:p", 3);
 }
 
-DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf44832_testSectionWithDifferentHeader,
 "tdf44832_section_new_header.odt")
+CPPUNIT_TEST_FIXTURE(Test, testTdf44832_testSectionWithDifferentHeader)
 {
+loadAndSave("tdf44832_section_new_header.odt");
 CPPUNIT_ASSERT_EQUAL(2, getPages());
 xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
 assertXPath(pXmlDoc, "/w:document/w:body/w:sectPr/w:headerReference", 1);
@@ -429,8 +435,9 @@ DECLARE_OOXMLEXPORT_TEST(testSignatureLineShape, 
"signature-line-all-props-set.d
 CPPUNIT_ASSERT_EQUAL(OUString("Check the machines!"), 
aSigningInstructions);
 }
 
-DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf117805, "tdf117805.odt")
+CPPUNIT_TEST_FIXTURE(Test, testTdf117805)
 {
+loadAndSave("tdf117805.odt");
 CPPUNIT_ASSERT_EQUAL(1, getShapes());
 CPPUNIT_ASSERT_EQUAL(1, getPages());
 uno::Reference xNameAccess
@@ -553,8 +560,9 @@ 
DECLARE_OOXMLEXPORT_TEST(testTdf142542_cancelledAutospacing, "tdf142542_cancelle
 

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

[Stephan Bergmann (via logerrit)]

 sc/source/core/tool/compiler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a60296694b3af2c18e7aa81eba8782e0ad03f7b8
Author: Stephan Bergmann 
AuthorDate: Tue Oct 12 19:54:22 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Oct 13 08:05:38 2021 +0200

Remove useless check

...that was introduced with b14107dd0eaf9bfc276544e1900873d36075425e 
"tdf#133858
reduce the double-ref range to data content", but which can only ever be 
either
true or invoke undefined behavior (as gets reported as

> sc/source/core/tool/compiler.cxx:6412:27: error: comparing the result of 
pointer addition 
‘(((ScCompiler*)this)->ScCompiler::.formula::FormulaCompiler::pCode 
+ -8)’ and NULL [-Werror=address]
>  6412 | if (!pCode || !(pCode -1) || !(*(pCode - 1)))
>   |~~~^~~

with recent GCC 12 trunk)

Change-Id: I72395f1874343a047afceaa5e342e9e67a51c44f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123531
Reviewed-by: Dennis Francis 
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index fd9c0ab51fe8..691eab13bbed 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -6409,7 +6409,7 @@ void ScCompiler::CorrectSumRange(const ScComplexRefData& 
rBaseRange,
 
 void ScCompiler::AnnotateTrimOnDoubleRefs()
 {
-if (!pCode || !(pCode -1) || !(*(pCode - 1)))
+if (!pCode || !(*(pCode - 1)))
 return;
 
 // OpCode of the "root" operator (which is already in RPN array).

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

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

 solenv/gbuild/platform/com_MSC_class.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fb3e13cae8ab0915facaf07fe5fca177a4041a9b
Author: Luboš Luňák 
AuthorDate: Tue Oct 12 23:22:31 2021 +0200
Commit: Luboš Luňák 
CommitDate: Wed Oct 13 01:01:00 2021 +0200

MSVC LTO does not like mixing 32bit and 64 code

So disable LTO for x64 code when building for 32bit.

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

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index ca6c60064897..ad1bb2561262 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -68,7 +68,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(call gb_CObject__compiler,$(2),$(3),$(7)) \
$(call gb_Helper_remove_overridden_flags, \
$(DEFS) \
-   $(gb_LTOFLAGS) \
+   $(if $(filter YES,$(LIBRARY_X64)), ,$(gb_LTOFLAGS)) \
$(2) $(if 
$(WARNINGS_DISABLED),$(gb_CXXFLAGS_DISABLE_WARNINGS)) \
$(if $(EXTERNAL_CODE), \
$(if $(filter -clr,$(2)),,$(if 
$(COM_IS_CLANG),-Wno-undef)), \
@@ -111,7 +111,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(4) $(5) $(if 
$(WARNINGS_DISABLED),$(gb_CXXFLAGS_DISABLE_WARNINGS))) \
-Fd$(PDBFILE) \
$(if $(EXTERNAL_CODE),$(if 
$(COM_IS_CLANG),-Wno-undef),$(gb_DEFS_INTERNAL)) \
-   $(gb_LTOFLAGS) \
+   $(if $(filter YES,$(LIBRARY_X64)), ,$(gb_LTOFLAGS)) \
$(gb_COMPILERDEPFLAGS) \
$(6) \
-c $(3) \

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/calc_tests9/tdf133629.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0ad70397c0b940ca7ec0d1de98f15628aa98abec
Author: Xisco Fauli 
AuthorDate: Tue Oct 12 23:03:32 2021 +0200
Commit: Xisco Fauli 
CommitDate: Wed Oct 13 00:20:24 2021 +0200

uitest: sc: fix assert

Change-Id: I043c9b1807fe30b24e907eee7954e5d32c170bbd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123536
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_tests9/tdf133629.py 
b/sc/qa/uitest/calc_tests9/tdf133629.py
index 72a0cc881831..c2dca144fd6a 100644
--- a/sc/qa/uitest/calc_tests9/tdf133629.py
+++ b/sc/qa/uitest/calc_tests9/tdf133629.py
@@ -22,9 +22,9 @@ class tdf133629(UITestCase):
 
 self.xUITest.executeCommand(".uno:SelectAll")
 
-# Check selection
+# Check both sheets are selected
 self.assertIsNotNone(getattr(document.CurrentSelection, 
'Sheet1.A1:AMJ1048576'))
-self.assertIsNotNone(getattr(document.CurrentSelection, 
'Sheet1.A2:AMJ1048576'))
+self.assertIsNotNone(getattr(document.CurrentSelection, 
'Sheet2.A1:AMJ1048576'))
 
 with 
self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog") as xDialog:
 xTabs = xDialog.getChild("tabcontrol")

[Libreoffice-commits] core.git: helpcontent2

[Andreas Heinisch (via logerrit)]

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

New commits:
commit 9a0335e7d2e43e46959bda16daf3fbf5944a1d9a
Author: Andreas Heinisch 
AuthorDate: Tue Oct 12 22:08:42 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Tue Oct 12 22:08:42 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to c0b8265b7148b1860bd47c77e072c3c605b208da
  - tdf#144924 - Change return type of array elements of the split function

If VBA is not enabled, allow the assignment of variables with different 
data types to the individual array elements created by the split function.

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

diff --git a/helpcontent2 b/helpcontent2
index 152530c4360c..c0b8265b7148 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 152530c4360c80e9a052c4c883a8e4d53001f364
+Subproject commit c0b8265b7148b1860bd47c77e072c3c605b208da

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

[Andreas Heinisch (via logerrit)]

 source/text/sbasic/shared/03120314.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c0b8265b7148b1860bd47c77e072c3c605b208da
Author: Andreas Heinisch 
AuthorDate: Fri Oct 8 19:45:12 2021 +0200
Commit: Olivier Hallot 
CommitDate: Tue Oct 12 22:08:40 2021 +0200

tdf#144924 - Change return type of array elements of the split function

If VBA is not enabled, allow the assignment of variables with different 
data types to the individual array elements created by the split function.

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

diff --git a/source/text/sbasic/shared/03120314.xhp 
b/source/text/sbasic/shared/03120314.xhp
index 23c8cc4d3..059f5e95e 100644
--- a/source/text/sbasic/shared/03120314.xhp
+++ b/source/text/sbasic/shared/03120314.xhp
@@ -44,7 +44,7 @@
 
 
 
-String
+With Option 
VBASupport 1: String, with Option VBASupport 0: Variant/String
 
 
  
Text: Any string expression.

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

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

 sw/qa/extras/uiwriter/uiwriter2.cxx |   32 
 sw/source/core/doc/docnum.cxx   |6 --
 2 files changed, 36 insertions(+), 2 deletions(-)

New commits:
commit 9ff8f4db5ffde338f1f810cb88214fe94e21bc7c
Author: László Németh 
AuthorDate: Mon Oct 11 12:24:33 2021 +0200
Commit: Xisco Fauli 
CommitDate: Tue Oct 12 21:36:56 2021 +0200

tdf#145066 sw change tracking: fix bad deletion at Move Up/Down

In Show Changes mode, moving a list item over
a deleted list item resulted the bad deletion
of the next adjacent paragraph, too.

Note: For manual testing with a non assert build,
put cursor in list item 2, click on Move Down once,
Move Up twice to show the bad deletion.

See also b5ab4836c03e9428aff6a48843f2a054ceff0f85
"tdf#39721 sw change tracking: fix move down".

Change-Id: Ie4dd1089dea4ed7068db94b134cd31881463c9ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123378
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit bcc06060bb286bd71a8fd1707eb499c8d2a88b69)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123411
Tested-by: Jenkins

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index c6c205a1d759..92393ab810fa 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -947,6 +947,38 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf39721)
 #endif
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf145066_bad_paragraph_deletion)
+{
+// check move down with redlining: jumping over a deleted paragraph
+// resulted bad deletion of the not deleted adjacent paragraph in Show 
Changes mode
+SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf39721.fodt");
+
+//turn on red-lining and show changes
+pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On | 
RedlineFlags::ShowDelete
+  | 
RedlineFlags::ShowInsert);
+CPPUNIT_ASSERT_MESSAGE("redlining should be on",
+   pDoc->getIDocumentRedlineAccess().IsRedlineOn());
+CPPUNIT_ASSERT_MESSAGE(
+"redlines should be visible",
+
IDocumentRedlineAccess::IsShowChanges(pDoc->getIDocumentRedlineAccess().GetRedlineFlags()));
+
+// Three paragraphs (list items)
+CPPUNIT_ASSERT_EQUAL(3, getParagraphs());
+
+// move down once and move up two times second paragraph with change 
tracking
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+pWrtShell->Down(/*bSelect=*/false);
+dispatchCommand(mxComponent, ".uno:MoveDown", {});
+dispatchCommand(mxComponent, ".uno:MoveUp", {});
+dispatchCommand(mxComponent, ".uno:MoveUp", {});
+
+// accept all changes
+dispatchCommand(mxComponent, ".uno:AcceptAllTrackedChanges", {});
+
+// This was 2 (bad deletion of the first paragraph)
+CPPUNIT_ASSERT_EQUAL(3, getParagraphs());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf54819)
 {
 load(DATA_DIRECTORY, "tdf54819.fodt");
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 95461208e954..87d60dba09bf 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -2177,9 +2177,11 @@ bool SwDoc::MoveParagraphImpl(SwPaM& rPam, tools::Long 
const nOffset,
 {
 break;
 }
-if (pRedline->GetType() == RedlineType::Delete)
+if (pRedline->GetType() == RedlineType::Delete &&
+// tdf#145066 skip full-paragraph deletion which was 
jumped over
+// in Show Changes mode to avoid of deleting an extra row
+*aPam.Start() <= *pRedline->Start())
 {
-assert(*aPam.Start() <= *pRedline->Start()); // caller's 
fault
 SwRangeRedline* pNewRedline;
 {
 SwPaM pam(*pRedline, nullptr);

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

[Chris Sherlock (via logerrit)]

 vcl/quartz/ctfonts.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 8da2af99cc205d7c79cd119ccb32a5f3de4ea204
Author: Chris Sherlock 
AuthorDate: Sun Oct 10 03:45:37 2021 +1100
Commit: Xisco Fauli 
CommitDate: Tue Oct 12 21:36:10 2021 +0200

tdf#144757 - fixed fonts not shown in font list

When in font options, the Fonts in "Font Setting for HTML, Basic and SQL
Sources" were not showing any fixed (non-proportional) fonts in the list
when "Non-proportional fonts only" was ticked.

The reason this was occuring was because we were not populating the
fixed font attribute when getting the CT font descriptor.

Change-Id: I06127ac48bd0f3bc9b70217b36bbf584a1b0fdc2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123316
Reviewed-by: Noel Grandin 
Reviewed-by: Mike Kaganski 
Tested-by: Jenkins
(cherry picked from commit d389a54e64accc3f46c1a646f947e9af9badd08e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123412
Reviewed-by: Xisco Fauli 

diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index 56408f4f9891..a01216a99304 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -376,6 +376,9 @@ FontAttributes DevFontFromCTFontDescriptor( 
CTFontDescriptorRef pFD, bool* bFont
 {
 CFNumberGetValue( pSymbolNum, kCFNumberSInt64Type, &nSymbolTrait );
 rDFA.SetSymbolFlag( (nSymbolTrait & kCTFontClassMaskTrait) == 
kCTFontSymbolicClass );
+
+if (nSymbolTrait & kCTFontMonoSpaceTrait)
+rDFA.SetPitch(PITCH_FIXED);
 }
 
 // get the font weight

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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtksalmenu.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 241619128c5620dbde4004c83a8d64d2a593a37a
Author: Caolán McNamara 
AuthorDate: Tue Oct 12 17:04:46 2021 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 12 21:28:23 2021 +0200

gtk4: allow cursoring to move through menus

oddly right arrow works, but left arrow seems to get stuck and pass
focus into the main window sometimes, but get this partially working
anyway

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

diff --git a/vcl/unx/gtk3/gtksalmenu.cxx b/vcl/unx/gtk3/gtksalmenu.cxx
index 5ad80816cded..9e7d9edf050f 100644
--- a/vcl/unx/gtk3/gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtksalmenu.cxx
@@ -1002,12 +1002,12 @@ void GtkSalMenu::CreateMenuBarWidget()
 #if !GTK_CHECK_VERSION(4, 0, 0)
 mpMenuAllowShrinkWidget = gtk_scrolled_window_new(nullptr, nullptr);
 
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(mpMenuAllowShrinkWidget),
 GTK_SHADOW_NONE);
+// tdf#129634 don't allow this scrolled window as a candidate to tab into
+gtk_widget_set_can_focus(GTK_WIDGET(mpMenuAllowShrinkWidget), false);
 #else
 mpMenuAllowShrinkWidget = gtk_scrolled_window_new();
 
gtk_scrolled_window_set_has_frame(GTK_SCROLLED_WINDOW(mpMenuAllowShrinkWidget), 
false);
 #endif
-// tdf#129634 don't allow this scrolled window as a candidate to tab into
-gtk_widget_set_can_focus(GTK_WIDGET(mpMenuAllowShrinkWidget), false);
 // tdf#116290 external policy on scrolledwindow will not show a scrollbar,
 // but still allow scrolled window to not be sized to the child content.
 // So the menubar can be shrunk past its nominal smallest width.

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

[Andreas Heinisch (via logerrit)]

 basic/source/inc/runtime.hxx |3 ++
 basic/source/runtime/runtime.cxx |   33 ++-
 sc/qa/extras/macros-test.cxx |   28 ++
 sc/qa/extras/testdocuments/tdf130307.ods |binary
 4 files changed, 63 insertions(+), 1 deletion(-)

New commits:
commit 5c502a100476c6b57a1a9f4305195c7e2d5d5608
Author: Andreas Heinisch 
AuthorDate: Mon Oct 4 21:32:20 2021 +0200
Commit: Andreas Heinisch 
CommitDate: Tue Oct 12 21:11:10 2021 +0200

tdf#130307 - Support for each loop for objects exposing XIndexAccess

Change-Id: Ib94c642e6d2a52ac7c60a8f7ae3c79d611b41614
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123072
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch 

diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 73e56838e2aa..d09db071a1a9 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -55,6 +56,7 @@ enum class ForType {
 EachArray,
 EachCollection,
 EachXEnumeration,
+EachXIndexAccess,
 Error,
 };
 
@@ -74,6 +76,7 @@ struct SbiForStack {// for/next stack:
 std::unique_ptr
 pArrayUpperBounds;
 css::uno::Reference< css::container::XEnumeration > xEnumeration;
+css::uno::Reference xIndexAccess;
 
 SbiForStack()
 : pNext(nullptr)
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 9a2a79e349b5..5c27b84223f7 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -1196,14 +1196,22 @@ void SbiRuntime::PushForEach()
 }
 else if (SbUnoObject* pUnoObj = dynamic_cast(pObj))
 {
-// XEnumerationAccess?
+// XEnumerationAccess or XIndexAccess?
 Any aAny = pUnoObj->getUnoAny();
+Reference xIndexAccess;
 Reference< XEnumerationAccess > xEnumerationAccess;
 if( aAny >>= xEnumerationAccess )
 {
 p->xEnumeration = xEnumerationAccess->createEnumeration();
 p->eForType = ForType::EachXEnumeration;
 }
+// tdf#130307 - support for each loop for objects exposing XIndexAccess
+else if (aAny >>= xIndexAccess)
+{
+p->eForType = ForType::EachXIndexAccess;
+p->xIndexAccess = xIndexAccess;
+p->nCurCollectionIndex = 0;
+}
 else if ( isVBAEnabled() && pUnoObj->isNativeCOMObject() )
 {
 uno::Reference< script::XInvocation > xInvocation;
@@ -3204,6 +3212,29 @@ void SbiRuntime::StepTESTFOR( sal_uInt32 nOp1 )
 }
 break;
 }
+// tdf#130307 - support for each loop for objects exposing XIndexAccess
+case ForType::EachXIndexAccess:
+{
+SbiForStack* p = pForStk;
+if (!p->xIndexAccess)
+{
+SbxBase::SetError(ERRCODE_BASIC_CONVERSION);
+pForStk->eForType = ForType::Error; // terminate loop at the 
next iteration
+}
+else if (pForStk->nCurCollectionIndex < 
p->xIndexAccess->getCount())
+{
+Any aElem = 
p->xIndexAccess->getByIndex(pForStk->nCurCollectionIndex);
+pForStk->nCurCollectionIndex++;
+SbxVariableRef xVar = new SbxVariable(SbxVARIANT);
+unoToSbxValue(xVar.get(), aElem);
+(*pForStk->refVar) = *xVar;
+}
+else
+{
+bEndLoop = true;
+}
+break;
+}
 case ForType::Error:
 {
 // We are in Resume Next mode after failed loop initialization
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 6c4c9e185521..759f416ae490 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -68,6 +68,7 @@ public:
 void testTdf90278();
 void testTdf143582();
 void testTdf144085();
+void testTdf130307();
 void testMacroButtonFormControlXlsxExport();
 
 CPPUNIT_TEST_SUITE(ScMacrosTest);
@@ -97,6 +98,7 @@ public:
 CPPUNIT_TEST(testTdf90278);
 CPPUNIT_TEST(testTdf143582);
 CPPUNIT_TEST(testTdf144085);
+CPPUNIT_TEST(testTdf130307);
 CPPUNIT_TEST(testMacroButtonFormControlXlsxExport);
 
 CPPUNIT_TEST_SUITE_END();
@@ -1057,6 +1059,32 @@ void ScMacrosTest::testTdf144085()
 xCloseable->close(true);
 }
 
+void ScMacrosTest::testTdf130307()
+{
+OUString aFileName;
+createFileURL(u"tdf130307.ods", aFileName);
+auto xComponent = loadFromDesktop(aFileName, 
"com.sun.star.sheet.SpreadsheetDocument");
+
+css::uno::Any aRet;
+css::uno::Sequence aParams;
+css::uno::Sequence aOutParam;
+css::uno::Sequence aOutParamIndex;
+
+SfxObjectShell::CallXScript(
+xComponent,
+
"vnd.sun.Star.script:Standard.Module1

[Libreoffice-commits] core.git: canvas/inc compilerplugins/clang dbaccess/inc dbaccess/source desktop/inc desktop/source include/vcl sc/inc sc/source vcl/source

[Noel Grandin (via logerrit)]

 canvas/inc/propertysethelper.hxx   |7 
 compilerplugins/clang/unusedmethods.results|  920 ++---
 compilerplugins/clang/unusedmethods.unused-returns.results |  238 +--
 dbaccess/inc/core_resource.hxx |   15 
 dbaccess/source/core/resource/core_resource.cxx|6 
 desktop/inc/lib/init.hxx   |1 
 desktop/source/lib/init.cxx|   22 
 include/vcl/metaact.hxx|4 
 sc/inc/editutil.hxx|6 
 sc/inc/formulacell.hxx |1 
 sc/source/core/data/formulacell.cxx|8 
 sc/source/core/tool/editutil.cxx   |   20 
 vcl/source/gdi/metaact.cxx |   12 
 13 files changed, 556 insertions(+), 704 deletions(-)

New commits:
commit 6e21f5a6b71790b3a36f67c3915b07a5f5717bcf
Author: Noel Grandin 
AuthorDate: Tue Oct 12 15:00:30 2021 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 12 20:21:22 2021 +0200

loplugin:unusedmethods

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

diff --git a/canvas/inc/propertysethelper.hxx b/canvas/inc/propertysethelper.hxx
index ebce8ba556a4..aebcbe049e20 100644
--- a/canvas/inc/propertysethelper.hxx
+++ b/canvas/inc/propertysethelper.hxx
@@ -85,13 +85,6 @@ namespace canvas
 push_back(aEntry);
 return *this;
 }
-MakeMap& operator()(const char*   name,
-const GetterType& getter)
-{
-MapType::MapEntry aEntry={name, {getter, SetterType()}};
-push_back(aEntry);
-return *this;
-}
 };
 
 /** Create helper with zero properties
diff --git a/compilerplugins/clang/unusedmethods.results 
b/compilerplugins/clang/unusedmethods.results
index 8e98e7050b03..3d3491661fc2 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -1,4 +1,4 @@
-basegfx/source/range/b2drangeclipper.cxx:688
+basegfx/source/range/b2drangeclipper.cxx:687
 type-parameter-?-? basegfx::(anonymous 
namespace)::eraseFromList(type-parameter-?-? &,const type-parameter-?-? &)
 basic/source/inc/buffer.hxx:40
 void SbiBuffer::operator+=(signed char)
@@ -10,6 +10,8 @@ bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:185
 void CPPU_CURRENT_NAMESPACE::raiseException(struct _uno_Any *,struct 
_uno_Mapping *)
 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:188
 void CPPU_CURRENT_NAMESPACE::fillUnoException(struct _uno_Any *,struct 
_uno_Mapping *)
+canvas/inc/propertysethelper.hxx:88
+class canvas::PropertySetHelper::MakeMap & 
canvas::PropertySetHelper::MakeMap::operator()(const char *,const class 
std::function &)
 canvas/inc/rendering/icolorbuffer.hxx:47
 unsigned char * canvas::IColorBuffer::lock() const
 canvas/inc/rendering/icolorbuffer.hxx:51
@@ -100,6 +102,8 @@ cui/source/inc/GraphicsTestsDialog.hxx:52
 void GraphicsTestsDialog::LinkStubHandleResultViewRequest(void *,class 
weld::Button &)
 cui/source/inc/SvxNotebookbarConfigPage.hxx:40
 void SvxNotebookbarConfigPage::SetElement()
+dbaccess/inc/core_resource.hxx:55
+class rtl::OUString dbaccess::ResourceManager::loadString(struct 
TranslateId,const char *,class std::basic_string_view >)
 dbaccess/source/filter/hsqldb/fbalterparser.hxx:19
 void dbahsql::FbAlterStmtParser::ensureProperTableLengths() const
 dbaccess/source/filter/hsqldb/parseschema.hxx:80
@@ -108,9 +112,9 @@ dbaccess/source/ui/inc/dsmeta.hxx:88
 class __gnu_debug::_Safe_iterator, class std::__debug::set, class std::allocator >, struct 
std::bidirectional_iterator_tag> dbaui::FeatureSet::begin() const
 dbaccess/source/ui/inc/dsmeta.hxx:89
 class __gnu_debug::_Safe_iterator, class std::__debug::set, class std::allocator >, struct 
std::bidirectional_iterator_tag> dbaui::FeatureSet::end() const
-dbaccess/source/ui/inc/FieldControls.hxx:67
+dbaccess/source/ui/inc/FieldControls.hxx:68
 class rtl::OUString dbaui::OPropNumericEditCtrl::get_text() const
-dbaccess/source/ui/inc/FieldControls.hxx:72
+dbaccess/source/ui/inc/FieldControls.hxx:73
 void dbaui::OPropNumericEditCtrl::set_min(int)
 dbaccess/source/ui/inc/indexcollection.hxx:52
 class __gnu_debug::_Safe_iterator > >, class 
std::__debug::vector >, struct std::random_access_iterator_tag> 
dbaui::OIndexCollection::begin() const
@@ -121,9 +125,11 @@ dbaccess/source/ui/inc/indexcollection.hxx:61
 dbaccess/source/ui/inc/indexcollection.hxx:63
 class __gnu_debug::_Safe_iterator > >, class 
std::__debug::vector >, struct std::random_access_iterator_tag> 
dbaui::OIndexCollection::findOriginal(const class

[Libreoffice-commits] core.git: framework/inc

[Andrea Gelmini (via logerrit)]

 framework/inc/helper/ocomponentenumeration.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 164ec9281aa57d52763e9622adb6e2e37d14bff8
Author: Andrea Gelmini 
AuthorDate: Tue Oct 12 11:09:55 2021 +0200
Commit: Julien Nabet 
CommitDate: Tue Oct 12 19:24:36 2021 +0200

Fix typo

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

diff --git a/framework/inc/helper/ocomponentenumeration.hxx 
b/framework/inc/helper/ocomponentenumeration.hxx
index 98f126bbc8d7..af48cdfe042f 100644
--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
@@ -125,8 +125,8 @@ class OComponentEnumeration final : public 
::cppu::WeakImplHelper< css::containe
 
 @descr  There are two ways to delete an instance of this 
class.
 1) delete with destructor
-2) dispose from parent or factory ore ...
-This method do the same for both ways! It free used 
memory and release references ...
+2) dispose from parent or factory or...
+This method do the same for both ways! It frees used 
memory and release references...
 
 @seealsomethod dispose()
 @seealsodestructor ~TaskEnumeration()

[Libreoffice-commits] core.git: compilerplugins/clang framework/inc framework/source include/svtools vcl/inc vcl/qa vcl/source

[Noel Grandin (via logerrit)]

 compilerplugins/clang/unusedfields.only-used-in-constructor.results |  282 
-
 compilerplugins/clang/unusedfields.readonly.results |  112 +--
 compilerplugins/clang/unusedfields.untouched.results|  312 
+-
 compilerplugins/clang/unusedfields.writeonly.results|   74 +-
 framework/inc/uielement/fontsizemenucontroller.hxx  |1 
 framework/source/uielement/fontsizemenucontroller.cxx   |2 
 include/svtools/ctrlbox.hxx |1 
 vcl/inc/font/PhysicalFontFace.hxx   |2 
 vcl/qa/cppunit/physicalfontface.cxx |2 
 vcl/source/font/PhysicalFontFamily.cxx  |2 
 10 files changed, 395 insertions(+), 395 deletions(-)

New commits:
commit ee49e597b23c093d25576936d34a8468cb618192
Author: Noel Grandin 
AuthorDate: Tue Oct 12 13:57:24 2021 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 12 19:04:42 2021 +0200

loplugin:unusedfields

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

diff --git 
a/compilerplugins/clang/unusedfields.only-used-in-constructor.results 
b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 179546d3c256..df664324f5bf 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -78,7 +78,7 @@ cppcanvas/source/mtfrenderer/textaction.cxx:1626
 cppcanvas::internal::(anonymous namespace)::OutlineAction maTextLineInfo 
const tools::TextLineInfo
 cppu/source/threadpool/threadpool.cxx:352
 _uno_ThreadPool dummy sal_Int32
-cppu/source/typelib/typelib.cxx:59
+cppu/source/typelib/typelib.cxx:58
 (anonymous namespace)::AlignSize_Impl nInt16 sal_Int16
 cppu/source/uno/check.cxx:38
 (anonymous namespace)::C1 n1 sal_Int16
@@ -144,23 +144,23 @@ cui/source/inc/tabstpge.hxx:87
 SvxTabulatorTabPage m_aDezWin class TabWin_Impl
 cui/source/options/optcolor.cxx:237
 (anonymous namespace)::ColorConfigWindow_Impl::Entry m_aDefaultColor class 
Color
-dbaccess/source/core/api/RowSet.hxx:107
+dbaccess/source/core/api/RowSet.hxx:108
 dbaccess::ORowSet m_aURL class rtl::OUString
-dbaccess/source/core/api/RowSet.hxx:121
-dbaccess::ORowSet m_nMaxFieldSize sal_Int32
 dbaccess/source/core/api/RowSet.hxx:123
-dbaccess::ORowSet m_nQueryTimeOut sal_Int32
+dbaccess::ORowSet m_nMaxFieldSize sal_Int32
 dbaccess/source/core/api/RowSet.hxx:125
+dbaccess::ORowSet m_nQueryTimeOut sal_Int32
+dbaccess/source/core/api/RowSet.hxx:127
 dbaccess::ORowSet m_nTransactionIsolation sal_Int32
-dbaccess/source/core/api/RowSet.hxx:137
-dbaccess::ORowSet m_bIsBookmarkable _Bool
 dbaccess/source/core/api/RowSet.hxx:139
+dbaccess::ORowSet m_bIsBookmarkable _Bool
+dbaccess/source/core/api/RowSet.hxx:141
 dbaccess::ORowSet m_bCanUpdateInsertedRows _Bool
-dbaccess/source/core/api/RowSet.hxx:455
+dbaccess/source/core/api/RowSet.hxx:457
 dbaccess::ORowSetClone m_nFetchDirection sal_Int32
-dbaccess/source/core/api/RowSet.hxx:456
+dbaccess/source/core/api/RowSet.hxx:458
 dbaccess::ORowSetClone m_nFetchSize sal_Int32
-dbaccess/source/core/api/RowSet.hxx:457
+dbaccess/source/core/api/RowSet.hxx:459
 dbaccess::ORowSetClone m_bIsBookmarkable _Bool
 dbaccess/source/core/dataaccess/connection.hxx:101
 dbaccess::OConnection m_nInAppend std::atomic
@@ -176,7 +176,7 @@ drawinglayer/source/tools/emfphelperdata.hxx:197
 emfplushelper::EmfPlusHelperData mnFrameRight sal_Int32
 drawinglayer/source/tools/emfphelperdata.hxx:198
 emfplushelper::EmfPlusHelperData mnFrameBottom sal_Int32
-editeng/source/editeng/impedit.hxx:521
+editeng/source/editeng/impedit.hxx:522
 ImpEditEngine aSelFuncSet class EditSelFunctionSet
 embeddedobj/source/msole/olecomponent.hxx:51
 OleComponent m_pInterfaceContainer 
comphelper::OMultiTypeInterfaceContainerHelper2 *
@@ -214,7 +214,7 @@ filter/source/graphicfilter/icgm/chart.hxx:51
 DataNode nBoxY2 sal_Int16
 helpcompiler/inc/HelpCompiler.hxx:201
 HelpCompiler lang const std::string
-include/basic/basmgr.hxx:56
+include/basic/basmgr.hxx:57
 BasicError nReason enum BasicErrorReason
 include/drawinglayer/primitive2d/textlayoutdevice.hxx:64
 drawinglayer::primitive2d::TextLayouterDevice maSolarGuard class 
SolarMutexGuard
@@ -228,11 +228,11 @@ include/LibreOfficeKit/LibreOfficeKitGtk.h:33
 _LOKDocView aDrawingArea GtkDrawingArea
 include/LibreOfficeKit/LibreOfficeKitGtk.h:38
 _LOKDocViewClass parent_class GtkDrawingAreaClass
-include/oox/export/shapes.hxx:103
+include/oox/export/shapes.hxx:104
 oox::drawingml::ShapeExport maShapeMap 
oox::drawingml::ShapeExport::ShapeHashMap
 include/registry/registry.hxx:34
 Registry_Api acquire void (*)(R

[ABANDONED] Re: getProgrammaticFuntionName typo in offapi/com/sun/star/sheet/XAddIn.idl

[Julien Nabet]

Thank you Stephan for your new feedback.

I've added this case in 
https://wiki.documentfoundation.org/Development/stuck_stuff


Julien

On 11/10/2021 19:24, Julien Nabet wrote:

(Sorry, without Nabble anymore, I don't know how to properly respond).

In response to Stephan:

"And if it would turn out not be used, why bother fixing the typo? :)"

Just to have the right spelling because it's boring to see this kind 
of typo ("boring" is an understatement for me, personnally I really 
hate letting typos)


So can we fix this or not?

...

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

[Caolán McNamara (via logerrit)]

 sw/qa/core/data/html/pass/ofz39850-1.html |binary
 sw/source/filter/html/htmlsect.cxx|2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 738ef11520a9e0e2b7793dc7117d6540fd66db47
Author: Caolán McNamara 
AuthorDate: Tue Oct 12 14:58:07 2021 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 12 18:21:29 2021 +0200

ofz#39850 remove content anchored to para being removed

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

diff --git a/sw/qa/core/data/html/pass/ofz39850-1.html 
b/sw/qa/core/data/html/pass/ofz39850-1.html
new file mode 100644
index ..ebe25683cea4
Binary files /dev/null and b/sw/qa/core/data/html/pass/ofz39850-1.html differ
diff --git a/sw/source/filter/html/htmlsect.cxx 
b/sw/source/filter/html/htmlsect.cxx
index 82f02d613587..99600517a0d4 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -209,7 +209,7 @@ void SwHTMLParser::NewDivision( HtmlTokenId nToken )
 
 if (!PendingObjectsInPaM(aDelPam))
 {
-ClearFootnotesMarksInRange(aDelPam.GetMark()->nNode, 
aDelPam.GetPoint()->nNode);
+m_xDoc->getIDocumentContentOperations().DeleteRange(aDelPam);
 m_xDoc->getIDocumentContentOperations().DelFullPara(aDelPam);
 }
 

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

[Caolán McNamara (via logerrit)]

 sw/source/core/text/itratr.cxx   |   34 +-
 sw/source/filter/ww8/ww8par6.cxx |7 +--
 2 files changed, 22 insertions(+), 19 deletions(-)

New commits:
commit a975a5f80fcb6bfa5d656e5647485832bb41d49e
Author: Caolán McNamara 
AuthorDate: Tue Oct 12 15:37:53 2021 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 12 17:55:42 2021 +0200

ofz#39837 avoid timeout

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

diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index e6105c2ff5ad..2074983ee90c 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2730,8 +2730,11 @@ void SwWW8ImplReader::StopApo()
 
 aFlySet.ClearItem(RES_FRM_SIZE);
 
-CalculateFlySize(aFlySet, m_xSFlyPara->xMainTextPos->nNode,
-m_xSFlyPara->nWidth);
+if (!m_bFuzzing)
+{
+CalculateFlySize(aFlySet, m_xSFlyPara->xMainTextPos->nNode,
+m_xSFlyPara->nWidth);
+}
 
 nNewWidth = ItemGet(aFlySet, 
RES_FRM_SIZE).GetWidth();
 
commit bd5d16b5b3c6bdf139c04d6e8ca1310418512244
Author: Caolán McNamara 
AuthorDate: Tue Oct 12 15:24:30 2021 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 12 17:55:27 2021 +0200

pass 2nd arg of lcl_MinMaxNode by reference

as a pointer it was never null

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

diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 9571324f8dbe..d62fc192ebf2 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -878,7 +878,7 @@ public:
 
 }
 
-static void lcl_MinMaxNode( SwFrameFormat* pNd, SwMinMaxNodeArgs* pIn )
+static void lcl_MinMaxNode(SwFrameFormat* pNd, SwMinMaxNodeArgs& rIn)
 {
 const SwFormatAnchor& rFormatA = pNd->GetAnchor();
 
@@ -889,8 +889,8 @@ static void lcl_MinMaxNode( SwFrameFormat* pNd, 
SwMinMaxNodeArgs* pIn )
 }
 
 const SwPosition *pPos = rFormatA.GetContentAnchor();
-OSL_ENSURE(pPos && pIn, "Unexpected NULL arguments");
-if (!pPos || !pIn || pIn->m_nIndex != pPos->nNode.GetIndex())
+OSL_ENSURE(pPos, "Unexpected NULL arguments");
+if (!pPos || rIn.m_nIndex != pPos->nNode.GetIndex())
 return;
 
 tools::Long nMin, nMax;
@@ -953,7 +953,7 @@ static void lcl_MinMaxNode( SwFrameFormat* pNd, 
SwMinMaxNodeArgs* pIn )
 
 if( css::text::WrapTextMode_THROUGH == pNd->GetSurround().GetSurround() )
 {
-pIn->Minimum( nMin );
+rIn.Minimum( nMin );
 return;
 }
 
@@ -966,33 +966,33 @@ static void lcl_MinMaxNode( SwFrameFormat* pNd, 
SwMinMaxNodeArgs* pIn )
 {
 if( nDiff )
 {
-pIn->m_nRightRest -= pIn->m_nRightDiff;
-pIn->m_nRightDiff = nDiff;
+rIn.m_nRightRest -= rIn.m_nRightDiff;
+rIn.m_nRightDiff = nDiff;
 }
 if( text::RelOrientation::FRAME != rOrient.GetRelationOrient() )
 {
-if (pIn->m_nRightRest > 0)
-pIn->m_nRightRest = 0;
+if (rIn.m_nRightRest > 0)
+rIn.m_nRightRest = 0;
 }
-pIn->m_nRightRest -= nMin;
+rIn.m_nRightRest -= nMin;
 break;
 }
 case text::HoriOrientation::LEFT:
 {
 if( nDiff )
 {
-pIn->m_nLeftRest -= pIn->m_nLeftDiff;
-pIn->m_nLeftDiff = nDiff;
+rIn.m_nLeftRest -= rIn.m_nLeftDiff;
+rIn.m_nLeftDiff = nDiff;
 }
-if (text::RelOrientation::FRAME != rOrient.GetRelationOrient() && 
pIn->m_nLeftRest < 0)
-pIn->m_nLeftRest = 0;
-pIn->m_nLeftRest -= nMin;
+if (text::RelOrientation::FRAME != rOrient.GetRelationOrient() && 
rIn.m_nLeftRest < 0)
+rIn.m_nLeftRest = 0;
+rIn.m_nLeftRest -= nMin;
 break;
 }
 default:
 {
-pIn->m_nMaxWidth += nMax;
-pIn->Minimum( nMin );
+rIn.m_nMaxWidth += nMax;
+rIn.Minimum(nMin);
 }
 }
 }
@@ -1041,7 +1041,7 @@ void SwTextNode::GetMinMaxSize( sal_uLong nIndex, 
sal_uLong& rMin, sal_uLong &rM
 {
 aNodeArgs.m_nIndex = nIndex;
 for( SwFrameFormat *pFormat : *pTmp )
-lcl_MinMaxNode( pFormat, &aNodeArgs );
+lcl_MinMaxNode(pFormat, aNodeArgs);
 }
 }
 if (aNodeArgs.m_nLeftRest < 0)

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

[Eike Rathke (via logerrit)]

 sc/inc/rangeutl.hxx  |3 ++-
 sc/source/core/tool/rangeutl.cxx |   16 
 sc/source/ui/view/tabvwsh3.cxx   |6 +++---
 3 files changed, 17 insertions(+), 8 deletions(-)

New commits:
commit 57f09e6f3cfdd9ad4e1673df14e6ee550d402743
Author: Eike Rathke 
AuthorDate: Tue Oct 12 13:56:09 2021 +0200
Commit: Eike Rathke 
CommitDate: Tue Oct 12 17:44:18 2021 +0200

Resolves: tdf#145077 Use position for jumping to named relative references

For named ranges with relative references construct the resulting
cell range reference to be selected according to the current cell
cursor position, same as in Manage Names and as they would result
if used in a formula expression on that position.

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

diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx
index 2f4a988725be..33f531444280 100644
--- a/sc/inc/rangeutl.hxx
+++ b/sc/inc/rangeutl.hxx
@@ -82,7 +82,8 @@ public:
 SCTAB   nCurTab,
 ScRange&rRange,
   RutlNameScope eScope=RUTL_NAMES,
-  ScAddress::Details const & rDetails = 
ScAddress::detailsOOOa1 );
+  ScAddress::Details const & rDetails = 
ScAddress::detailsOOOa1,
+  bool bUseDetailsPos = false );
 };
 
 class SC_DLLPUBLIC ScRangeStringConverter
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 34541e590f09..fd660a8a23a1 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -236,7 +236,8 @@ bool ScRangeUtil::MakeRangeFromName (
 SCTAB   nCurTab,
 ScRange&rRange,
 RutlNameScope   eScope,
-ScAddress::Details const & rDetails )
+ScAddress::Details const & rDetails,
+bool bUseDetailsPos )
 {
 bool bResult = false;
 if (rName.isEmpty())
@@ -292,9 +293,16 @@ bool ScRangeUtil::MakeRangeFromName (
 ScRefAddress aStartPos;
 ScRefAddress aEndPos;
 
-// tdf#138646 - consider the current grammar and address 
convention of the document
-pData->GetSymbol(aStrArea,
- FormulaGrammar::mergeToGrammar(rDoc.GetGrammar(), 
rDetails.eConv));
+// tdf#138646: use the current grammar of the document and passed
+// address convention.
+// tdf#145077: create range string according to current cell cursor
+// position if expression has relative references and details say 
so.
+if (bUseDetailsPos)
+pData->GetSymbol( aStrArea, ScAddress( rDetails.nCol, 
rDetails.nRow, nCurTab),
+FormulaGrammar::mergeToGrammar(rDoc.GetGrammar(), 
rDetails.eConv));
+else
+pData->GetSymbol( aStrArea,
+FormulaGrammar::mergeToGrammar(rDoc.GetGrammar(), 
rDetails.eConv));
 
 if ( IsAbsArea( aStrArea, rDoc, nTable,
 nullptr, &aStartPos, &aEndPos, rDetails ) )
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 03e8dd4f9593..2fa44e4233b4 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -374,9 +374,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
 else
 {
 const RutlNameScope eScope = (bForceGlobalName ? 
RUTL_NAMES_GLOBAL : RUTL_NAMES);
-formula::FormulaGrammar::AddressConvention eConv = 
rDoc.GetAddressConvention();
-if( ScRangeUtil::MakeRangeFromName( aAddress, rDoc, nTab, 
aScRange, eScope, eConv ) ||
-ScRangeUtil::MakeRangeFromName( aAddress, rDoc, nTab, 
aScRange, RUTL_DBASE, eConv ) )
+ScAddress::Details aDetails( rDoc.GetAddressConvention(), 
rViewData.GetCurY(), rViewData.GetCurX());
+if (ScRangeUtil::MakeRangeFromName( aAddress, rDoc, nTab, 
aScRange, eScope, aDetails, true) ||
+ScRangeUtil::MakeRangeFromName( aAddress, rDoc, nTab, 
aScRange, RUTL_DBASE, aDetails, true))
 {
 nResult |= ScRefFlags::VALID;
 if( aScRange.aStart.Tab() != nTab )

[Libreoffice-commits] core.git: external/breakpad

[Stephan Bergmann (via logerrit)]

 external/breakpad/SIGSTKSZ.patch  |   11 +++
 external/breakpad/UnpackedTarball_breakpad.mk |1 +
 2 files changed, 12 insertions(+)

New commits:
commit c90cb1b3c265c1f81e614e47652fe24137d7928c
Author: Stephan Bergmann 
AuthorDate: Tue Oct 12 14:42:05 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 12 17:07:08 2021 +0200

external/breakpad: Adpat to SIGSTKSZ type in glibc 2.34



"sysconf: Add _SC_MINSIGSTKSZ/_SC_SIGSTKSZ [BZ #20305]" introduced
sysdeps/unix/sysv/linux/bits/sigstksz.h containing

> # define SIGSTKSZ sysconf (_SC_SIGSTKSZ)

so that SIGSTKSZ would have type long, causing

> src/client/linux/handler/exception_handler.cc: In function ‘void 
google_breakpad::{anonymous}::InstallAlternateStackLocked()’:
> src/client/linux/handler/exception_handler.cc:141:49: error: no matching 
function for call to ‘max(int, long int)’
>   141 |   static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
>   | ^

when building ExternalProject_breakpad.  At least SuS4 appears to be silent
about a required type of SIGSTKSZ defined in signal.h.

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

diff --git a/external/breakpad/SIGSTKSZ.patch b/external/breakpad/SIGSTKSZ.patch
new file mode 100644
index ..d37c58a2f84b
--- /dev/null
+++ b/external/breakpad/SIGSTKSZ.patch
@@ -0,0 +1,11 @@
+--- src/client/linux/handler/exception_handler.cc
 src/client/linux/handler/exception_handler.cc
+@@ -138,7 +138,7 @@
+   // SIGSTKSZ may be too small to prevent the signal handlers from overrunning
+   // the alternative stack. Ensure that the size of the alternative stack is
+   // large enough.
+-  static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
++  static const unsigned kSigStackSize = std::max(16384, 
SIGSTKSZ);
+ 
+   // Only set an alternative stack if there isn't already one, or if the 
current
+   // one is too small.
diff --git a/external/breakpad/UnpackedTarball_breakpad.mk 
b/external/breakpad/UnpackedTarball_breakpad.mk
index 1b92728946cd..a44cb91e62bf 100644
--- a/external/breakpad/UnpackedTarball_breakpad.mk
+++ b/external/breakpad/UnpackedTarball_breakpad.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,breakpad,\
external/breakpad/c++20-allocator.patch \
external/breakpad/breakpad-dump_syms.patch.1 \
external/breakpad/breakpad-no-env.patch.1 \
+   external/breakpad/SIGSTKSZ.patch \
 ))
 
 $(eval $(call 
gb_UnpackedTarball_add_files,breakpad,src/tools/windows/dump_syms,\

Need help with patch for Fontwork shape

[Regina Henschel]

Hi all,

I need help with patch https://gerrit.libreoffice.org/c/core/+/123295

It passes Jenkins in Patchset 3. The only change was then a change in 
the commit message. But now it fails with always the same problem. I 
know Jenkins has a "hiccup" sometimes and tried a Rebase. But without 
success.


The failure refers to CppunitTest_vcl_filters_test.
https://ci.libreoffice.org/job/gerrit_linux_gcc_release/101923/consoleFull#-1482350923d893063f-7f3d-4b7e-b56f-4e0f225817cd

I see no connection to the change in my patch and vcl.check has no 
problems locally on Windows 10/Cygwin.


Kind regards
Regina

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

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

 sfx2/source/appl/workwin.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7a3d26a5fc2537546b448eff5d797274225fcc99
Author: Luboš Luňák 
AuthorDate: Tue Oct 5 15:11:43 2021 +0200
Commit: Luboš Luňák 
CommitDate: Tue Oct 12 16:57:42 2021 +0200

avoid repeated calls to SfxNotebookBar::IsActive()

The call reads configuration, and so is a bit expensive when
called in a loop.

Change-Id: I62398bcfdc856f02f6e2d928bac2f144bc47424d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123103
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 
(cherry picked from commit e304383b88d271b0e140946af201099c8314dd0a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123410
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Luboš Luňák 

diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 217ae75436bf..a466a01ea041 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1198,6 +1198,7 @@ void SfxWorkWindow::UpdateObjectBars_Impl2()
 
 // Iterate over all Toolboxes
 xLayoutManager->lock();
+const bool isNotebookBarActive = sfx2::SfxNotebookBar::IsActive();
 for ( auto const & n: aObjBarList )
 {
 ToolbarId eId = n.eId;
@@ -1211,7 +1212,7 @@ void SfxWorkWindow::UpdateObjectBars_Impl2()
 
 // Is a ToolBox required in this context ?
 bool bModesMatching = (nUpdateMode != SfxVisibilityFlags::Invisible) 
&& ((nTbxMode & nUpdateMode) == nUpdateMode);
-if ( bDestroy || sfx2::SfxNotebookBar::IsActive())
+if ( bDestroy || isNotebookBarActive)
 {
 OUString aTbxId = g_aTbxTypeName + 
GetResourceURLFromToolbarId(eId);
 xLayoutManager->destroyElement( aTbxId );

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

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

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

New commits:
commit cd1b2beb0d101ba7b7b83936262c5367094e9d01
Author: Luboš Luňák 
AuthorDate: Mon Oct 11 09:32:12 2021 +0200
Commit: Luboš Luňák 
CommitDate: Tue Oct 12 16:57:22 2021 +0200

update --enable-lto description

It's no longer broken with MSVC, and I don't what should be so
experimental about it when it seems to work just fine.

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

diff --git a/configure.ac b/configure.ac
index 4c9690d01007..1bffda90f816 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1599,8 +1599,7 @@ AC_ARG_ENABLE(lto,
 AS_HELP_STRING([--enable-lto],
 [Enable link-time optimization. Suitable for (optimised) product 
builds. Building might take
  longer but libraries and executables are optimized for speed. For 
GCC, best to use the 'gold'
- linker. For MSVC, this option is broken at the moment. This is 
experimental work
- in progress that shouldn't be used unless you are working on it.)]))
+ linker.)]))
 
 AC_ARG_ENABLE(python,
 AS_HELP_STRING([--enable-python=],

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

[Eike Rathke (via logerrit)]

 sc/source/ui/unoobj/cellsuno.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bc553f1b52f1865df125e0aefa85d74f57bea6ba
Author: Eike Rathke 
AuthorDate: Tue Oct 12 14:05:20 2021 +0200
Commit: Eike Rathke 
CommitDate: Tue Oct 12 16:40:51 2021 +0200

Pass rDetails argument from getCellRangeByName() to MakeRangeFromName()

The default MakeRangeFromName() argument ScAddress::detailsOOOa1
is the same as the only call to this getCellRangeByName(), just
make it explicit to clarify.

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

diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 209bef5f7ac5..73f167b6e57e 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -4709,8 +4709,8 @@ uno::Reference  
ScCellRangeObj::getCellRangeByName(
 }
 else
 {
-if ( ScRangeUtil::MakeRangeFromName( aName, rDoc, nTab, aCellRange 
) ||
- ScRangeUtil::MakeRangeFromName( aName, rDoc, nTab, 
aCellRange, RUTL_DBASE ) )
+if ( ScRangeUtil::MakeRangeFromName( aName, rDoc, nTab, 
aCellRange, RUTL_NAMES, rDetails) ||
+ ScRangeUtil::MakeRangeFromName( aName, rDoc, nTab, 
aCellRange, RUTL_DBASE, rDetails))
 bFound = true;
 }
 

[Libreoffice-commits] dev-tools.git: test-bugzilla-files/analyze-logs.py test-bugzilla-files/analyze_logs.py test-bugzilla-files/zip.sh

[Miklos Vajna (via logerrit)]

 test-bugzilla-files/analyze_logs.py |9 +
 test-bugzilla-files/zip.sh  |4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit b19f5584a560873cba462ba76bfd1d2390a96a51
Author: Miklos Vajna 
AuthorDate: Tue Oct 12 16:21:57 2021 +0200
Commit: Miklos Vajna 
CommitDate: Tue Oct 12 16:24:21 2021 +0200

test-bugzilla-files: make it possible to import functions from 
analyze_logs.py

In preparation of reusing import_csv() and export_csv() in other Python
files.

Change-Id: Ib11896dbe524a5f661808c55ae935c297d84017a

diff --git a/test-bugzilla-files/analyze-logs.py 
b/test-bugzilla-files/analyze_logs.py
similarity index 97%
rename from test-bugzilla-files/analyze-logs.py
rename to test-bugzilla-files/analyze_logs.py
index 3c74d0c..d273da5 100644
--- a/test-bugzilla-files/analyze-logs.py
+++ b/test-bugzilla-files/analyze_logs.py
@@ -118,7 +118,8 @@ def update_odfundiff():
 reader = import_csv("odfundiff.csv")
 export_csv("odfundiff.csv", differences, reader)
 
-update_import()
-update_export()
-update_validation()
-update_odfundiff()
+if __name__ == '__main__':
+update_import()
+update_export()
+update_validation()
+update_odfundiff()
diff --git a/test-bugzilla-files/zip.sh b/test-bugzilla-files/zip.sh
index 99efa3e..c6e5586 100755
--- a/test-bugzilla-files/zip.sh
+++ b/test-bugzilla-files/zip.sh
@@ -25,9 +25,9 @@ cd /srv/crashtestdata/logs/$SHA
 unzip validation.zip -d validation
 unzip odfundiff.zip -d odfundiff
 rm *.zip
-cp ~/source/dev-tools/test-bugzilla-files/analyze-logs.py .
+cp ~/source/dev-tools/test-bugzilla-files/analyze_logs.py .
 cp ../*.csv .
-python analyze-logs.py
+python analyze_logs.py
 cp *.csv ../.
 cd ..
 zip -r current.zip $SHA/*

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

[Eike Rathke (via logerrit)]

 sc/source/ui/app/inputwin.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 7cad3ed2042a17081b56fb2c4a4f4f0b785590f9
Author: Eike Rathke 
AuthorDate: Tue Oct 12 13:59:34 2021 +0200
Commit: Eike Rathke 
CommitDate: Tue Oct 12 16:18:50 2021 +0200

Construct ScAddress::Details only once

... instead of 4 times with the implicit conversion ctor.

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

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 7296eb15a5cd..1747639c611a 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2378,7 +2378,7 @@ static ScNameInputType lcl_GetInputType( const OUString& 
rText )
 ScViewData& rViewData = pViewSh->GetViewData();
 ScDocument& rDoc = rViewData.GetDocument();
 SCTAB nTab = rViewData.GetTabNo();
-formula::FormulaGrammar::AddressConvention eConv = 
rDoc.GetAddressConvention();
+ScAddress::Details aDetails( rDoc.GetAddressConvention());
 
 // test in same order as in SID_CURRENTCELL execute
 
@@ -2395,16 +2395,16 @@ static ScNameInputType lcl_GetInputType( const 
OUString& rText )
 
 if (rText == ScResId(STR_MANAGE_NAMES))
 eRet = SC_MANAGE_NAMES;
-else if ( aRange.Parse( rText, rDoc, eConv ) & ScRefFlags::VALID )
+else if ( aRange.Parse( rText, rDoc, aDetails ) & ScRefFlags::VALID )
 eRet = SC_NAME_INPUT_RANGE;
-else if ( aAddress.Parse( rText, rDoc, eConv ) & ScRefFlags::VALID )
+else if ( aAddress.Parse( rText, rDoc, aDetails ) & ScRefFlags::VALID )
 eRet = SC_NAME_INPUT_CELL;
-else if ( ScRangeUtil::MakeRangeFromName( rText, rDoc, nTab, aRange, 
eNameScope, eConv ) )
+else if ( ScRangeUtil::MakeRangeFromName( rText, rDoc, nTab, aRange, 
eNameScope, aDetails ) )
 {
 eRet = ((eNameScope == RUTL_NAMES_LOCAL) ? 
SC_NAME_INPUT_NAMEDRANGE_LOCAL :
 SC_NAME_INPUT_NAMEDRANGE_GLOBAL);
 }
-else if ( ScRangeUtil::MakeRangeFromName( rText, rDoc, nTab, aRange, 
RUTL_DBASE, eConv ) )
+else if ( ScRangeUtil::MakeRangeFromName( rText, rDoc, nTab, aRange, 
RUTL_DBASE, aDetails ) )
 eRet = SC_NAME_INPUT_DATABASE;
 else if ( comphelper::string::isdigitAsciiString( rText ) &&
   ( nNumeric = rText.toInt32() ) > 0 && nNumeric <= 
rDoc.MaxRow()+1 )

Build on Mint (bsdtar; liblangtag)

[o lu]

LibreOffice didn't build on my Linux Mint 20.1 (Ubuntu 20.04) system because of 
a problem with bsdtar. It always stopped at liblangtag. I temporarily remove 
bsdtar from /usr/bin and /usr/ocal and got a working dev build.

Sent with [ProtonMail](https://protonmail.com/) Secure Email.

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

[Michael Stahl (via logerrit)]

 
xmlsecurity/qa/unit/signing/data/02_doc_signed_by_trusted_person_manipulated.odt
 |binary
 xmlsecurity/qa/unit/signing/signing.cxx
  |   22 ++
 2 files changed, 22 insertions(+)

New commits:
commit f5bae85aaeaa903cd6e97e158ee6ae8e893ff99b
Author: Michael Stahl 
AuthorDate: Fri Feb 26 17:24:10 2021 +0100
Commit: Xisco Fauli 
CommitDate: Tue Oct 12 15:43: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/+/123403
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 d9661d348138..0cc948febff7 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -509,6 +509,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)
 {

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

[Michael Stahl (via logerrit)]

 
xmlsecurity/qa/unit/signing/data/02_doc_signed_by_trusted_person_manipulated.odt
 |binary
 xmlsecurity/qa/unit/signing/signing.cxx
  |   22 ++
 2 files changed, 22 insertions(+)

New commits:
commit 18f5b9a9d40ffdb92ce2a0bc7abaede0d20721bf
Author: Michael Stahl 
AuthorDate: Fri Feb 26 17:24:10 2021 +0100
Commit: Xisco Fauli 
CommitDate: Tue Oct 12 15:42:27 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)
 {

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

[Mark Hung (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf142407.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport17.cxx   |8 
 writerfilter/source/dmapper/PropertyMap.cxx  |6 +++---
 3 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 829a001ffe89dd9c9dcda08fcc61bb4711b447df
Author: Mark Hung 
AuthorDate: Thu Oct 7 23:54:51 2021 +0800
Commit: Xisco Fauli 
CommitDate: Tue Oct 12 15:20:44 2021 +0200

tdf#142407 fix incorrect number of lines in vertical writing.

Wrting mode isn't read correctly. The property PROP_WRITING_MODE
contans an Any of sal_Int16. When converting to WritingMode
enum directly, it always get WrtingMode::LR_TB(0), hence use wrong
side to calculate number of grid lines for vertical writing.

The resulted number of grid lines are much smaller than expected,
it ends up leaving large space between header and text.

Change-Id: Ifb0ff09fe981819cc2705de8d5596190f320f79e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123223
Tested-by: Jenkins
Reviewed-by: Mark Hung 
(cherry picked from commit 5f84c44e3d5ff19b800b6358e61228546e318d4f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123396
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf142407.docx 
b/sw/qa/extras/ooxmlexport/data/tdf142407.docx
new file mode 100644
index ..38397a4de996
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf142407.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
index 6884ea3ebc03..5a331a5f505d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
@@ -62,6 +62,14 @@ DECLARE_OOXMLEXPORT_TEST(testTdf123642_BookmarkAtDocEnd, 
"tdf123642.docx")
 CPPUNIT_ASSERT_EQUAL(OUString("Bookmark1"), getXPath(pXmlDoc, 
"/w:document/w:body/w:p[2]/w:bookmarkStart[1]", "name"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf142407, "tdf142407.docx")
+{
+uno::Reference xPageStyles = 
getStyles("PageStyles");
+uno::Reference 
xPageStyle(xPageStyles->getByName("Standard"), uno::UNO_QUERY);
+sal_Int16 nGridLines;
+xPageStyle->getPropertyValue("GridLines") >>= nGridLines;
+CPPUNIT_ASSERT_EQUAL( sal_Int16(36), nGridLines);   // was 23, left large 
space before text.
+}
 
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index b4c58c0d8808..3b8f36d602a0 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1709,12 +1709,12 @@ void SectionPropertyMap::CloseSectionGroup( 
DomainMapper_Impl& rDM_Impl )
 if ( pProp )
 pProp->second >>= nWidth;
 
-text::WritingMode eWritingMode = text::WritingMode_LR_TB;
+sal_Int16 nWritingMode = text::WritingMode2::LR_TB;
 pProp = getProperty( PROP_WRITING_MODE );
 if ( pProp )
-pProp->second >>= eWritingMode;
+pProp->second >>= nWritingMode;
 
-sal_Int32 nTextAreaHeight = eWritingMode == text::WritingMode_LR_TB ?
+sal_Int32 nTextAreaHeight = nWritingMode == text::WritingMode2::LR_TB ?
 nHeight - m_nTopMargin - m_nBottomMargin :
 nWidth - m_nLeftMargin - m_nRightMargin;
 

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

[Stephan Bergmann (via logerrit)]

 connectivity/source/parse/sqlbison.y |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 774c446a4b555f910a62f24e34f5dddc2edd2a59
Author: Stephan Bergmann 
AuthorDate: Tue Sep 14 12:20:48 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 12 15:15:47 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_NEW_LISTRULE   newNode("", SQLNodeType::ListRule, 
yyr1[yyrule])
+#define SQL_NEW_COMMALISTRULE   newNode("", SQLNodeType::CommaListRule, 
yyr1[yyrule])
+#else
 #define SQL_NEW_RULE   newNode("", SQLNodeType::Rule, 
yyr1[yyn])
 #define SQL_NEW_LISTRULE   newNode("", SQLNodeType::ListRule, 
yyr1[yyn])
 #define SQL_NEW_COMMALISTRULE   newNode("", SQLNodeType::CommaListRule, 
yyr1[yyn])
+#endif
 
 
 extern connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;

[Libreoffice-commits] core.git: README.wasm wasm-qt/README wasm-qt/README.md

[Hossein (via logerrit)]

 wasm-qt/README |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9498ec72394dd2a87bde10a181587036cab7b388
Author: Hossein 
AuthorDate: Tue Oct 12 13:46:18 2021 +0200
Commit: Hossein 
CommitDate: Tue Oct 12 15:04:08 2021 +0200

Move README.wasm -> wasm-qt/README.md

Most of the folders now have README.md in Markdown format and it is
possible to create html docs out of them which is available at:

https://docs.libreoffice.org/

The content of README file was previously converted to Markdown
format in commit d19299f579e820c34b38ee56b26125dc30f96ada, so only
the rename of the README file was needed.

Change-Id: Ib030676a70194fdb24aea066ec985c2f95ee4b3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123449
Reviewed-by: Ilmari Lauhakangas 
Tested-by: Jenkins

diff --git a/wasm-qt/README b/wasm-qt/README
deleted file mode 100644
index a23bd6a45ea9..
--- a/wasm-qt/README
+++ /dev/null
@@ -1 +0,0 @@
-See /README.wasm
diff --git a/README.wasm b/wasm-qt/README.md
similarity index 100%
rename from README.wasm
rename to wasm-qt/README.md

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

[Stephan Bergmann (via logerrit)]

 include/svl/itemset.hxx  |2 -
 svl/source/items/itemset.cxx |   64 ++-
 2 files changed, 4 insertions(+), 62 deletions(-)

New commits:
commit fa98d2da9219a03fb1fb0f213a8bdddf5040fe60
Author: Stephan Bergmann 
AuthorDate: Mon Oct 11 09:43:18 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 12 14:50:36 2021 +0200

Revert "Use placement new to avoid one of the allocation calls..."

This reverts commit 503ab1ca9ae11978d9717557546c01ff598aaf88, plus follow-up
17915ab5202a4d7456e9bc031c3f6a72bc861844 "fix ubsan alloc-dealloc-mismatch".
It failed to properly destroy the object assembly, and caused e.g.
CppunitTest_svl_items to fail with

> ==850754==ERROR: AddressSanitizer: new-delete-type-mismatch on 
0x606024e0 in thread T0:
>   object passed to delete has wrong type:
>   size of the allocated type:   64 bytes;
>   size of the deallocated type: 56 bytes.
>  #0 in operator delete(void*, unsigned long) at 
/home/sbergman/github.com/llvm/llvm-project/compiler-rt/lib/asan/asan_new_delete.cpp:164:3
 (workdir/LinkTarget/Executable/cppunittester +0x330ae2)
>  #1 in SfxItemSet::~SfxItemSet() at svl/source/items/itemset.cxx:202:1 
(instdir/program/libsvllo.so +0x110ccf6)
>  #2 in std::default_delete::operator()(SfxItemSet*) const at 
/home/sbergman/gcc/trunk/inst/lib/gcc/x86_64-pc-linux-gnu/12.0.0/../../../../include/c++/12.0.0/bits/unique_ptr.h:85:2
 (instdir/program/libsvllo.so +0x1142a28)
>  #3 in std::_Sp_counted_deleter, std::allocator, 
(__gnu_cxx::_Lock_policy)2>::_M_dispose() at 
/home/sbergman/gcc/trunk/inst/lib/gcc/x86_64-pc-linux-gnu/12.0.0/../../../../include/c++/12.0.0/bits/shared_ptr_base.h:442:9
 (instdir/program/libsvllo.so +0x12696e4)
>  #4 in std::_Sp_counted_base<(__gnu_cxx::_Lock_policy)2>::_M_release() at 
/home/sbergman/gcc/trunk/inst/lib/gcc/x86_64-pc-linux-gnu/12.0.0/../../../../include/c++/12.0.0/bits/shared_ptr_base.h:168:6
 (instdir/program/libsvllo.so +0xe500b5)
[...]
> 0x606024e0 is located 0 bytes inside of 64-byte region 
[0x606024e0,0x60602520)
> allocated by thread T0 here:
>  #0 in operator new(unsigned long) at 
/home/sbergman/github.com/llvm/llvm-project/compiler-rt/lib/asan/asan_new_delete.cpp:95:3
 (workdir/LinkTarget/Executable/cppunittester +0x32fe7d)
>  #1 in SfxItemSet::Clone(bool, SfxItemPool*) const at 
svl/source/items/itemset.cxx:1270:34 (instdir/program/libsvllo.so +0x1127854)
>  #2 in (anonymous namespace)::Node::setItemSet(SfxItemSet const&) at 
svl/source/items/stylepool.cxx:65:107 (instdir/program/libsvllo.so +0x1212179)
>  #3 in StylePoolImpl::insertItemSet(SfxItemSet const&, rtl::OUString 
const*) at svl/source/items/stylepool.cxx:417:19 (instdir/program/libsvllo.so 
+0x12103e1)
>  #4 in StylePool::insertItemSet(SfxItemSet const&, rtl::OUString const*) 
at svl/source/items/stylepool.cxx:456:17 (instdir/program/libsvllo.so 
+0x1212ffb)
[...]

in Clang ASan builds done with -fsized-deallocation.

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

diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index 5f9da72e3339..5ce13bb1f4c8 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -70,8 +70,6 @@ protected:
 SfxItemSet( SfxItemPool&, SfxAllItemSetFlag );
 /** special constructor for SfxItemSetFixed */
 SfxItemSet( SfxItemPool&, WhichRangesContainer&& ranges, SfxPoolItem const 
** ppItems );
-/** special constructor for Clone */
-SfxItemSet( const SfxItemSet&, SfxPoolItem const ** ppItems );
 
 public:
 SfxItemSet( const SfxItemSet& );
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index 3b47719dbf04..04fab3c9306e 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -136,44 +136,6 @@ SfxItemSet::SfxItemSet( const SfxItemSet& rASet )
 assert(svl::detail::validRanges2(m_pWhichRanges));
 }
 
-/** special constructor for Clone */
-SfxItemSet::SfxItemSet( const SfxItemSet& rASet, SfxPoolItem const ** ppItems )
-: m_pPool( rASet.m_pPool )
-, m_pParent( rASet.m_pParent )
-, m_ppItems( ppItems )
-, m_pWhichRanges( rASet.m_pWhichRanges )
-, m_nCount( rASet.m_nCount )
-, m_bItemsFixed(true)
-{
-if (rASet.m_pWhichRanges.empty())
-return;
-
-auto nCnt = svl::detail::CountRanges(m_pWhichRanges);
-
-// Copy attributes
-SfxPoolItem const** ppDst = m_ppItems;
-SfxPoolItem const** ppSrc = rASet.m_ppItems;
-for( sal_uInt16 n = nCnt; n; --n, ++ppDst, ++ppSrc )
-if ( nullptr == *ppSrc || // Current Default?
- IsInvalidItem(*ppSrc) ||   // DontCare?
- IsStaticDefaultItem(*ppSrc) )  // Defaults that are not to be 
pooled?
-// Just copy the pointer
-  

[Libreoffice-commits] core.git: Branch 'distro/mimo/mimo-6-3' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 6e69492a5216c94a4dd95265a497f96c2d2d5fa2
Author: Andras Timar 
AuthorDate: Tue Oct 12 13:37:49 2021 +0200
Commit: Andras Timar 
CommitDate: Tue Oct 12 13:37:49 2021 +0200

Bump product version to 6.3.6.2.M1

Change-Id: I7798ef9f0a4de858552f16168d5aa247725e16f4

diff --git a/configure.ac b/configure.ac
index a882432e9a42..14de6af60a79 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],[6.3.6.2],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.3.6.2.M1],[],[],[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: include/LibreOfficeKit

[Stephan Bergmann (via logerrit)]

 include/LibreOfficeKit/LibreOfficeKitInit.h |   38 
 1 file changed, 22 insertions(+), 16 deletions(-)

New commits:
commit 5dd9990a12509ec9326c061544b228652e495fe5
Author: Stephan Bergmann 
AuthorDate: Tue Oct 12 11:40:05 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 12 13:37:02 2021 +0200

Don't #include within extern "C"

At least when building against trunk libstdc++ on Fedora 35 beta now, that
caused failures like

> In file included from ~/lo/core/libreofficekit/qa/unit/checkapi.cxx:18:
> In file included from 
~/lo/core/workdir/UnpackedTarball/cppunit/include/cppunit/plugin/TestPlugIn.h:8:
> In file included from 
~/lo/core/workdir/UnpackedTarball/cppunit/include/cppunit/plugin/PlugInParameters.h:8:
> In file included from 
~/gcc/trunk/inst/lib/gcc/x86_64-pc-linux-gnu/12.0.0/../../../../include/c++/12.0.0/deque:70:
> In file included from 
~/gcc/trunk/inst/lib/gcc/x86_64-pc-linux-gnu/12.0.0/../../../../include/c++/12.0.0/debug/deque:40:
> In file included from 
~/gcc/trunk/inst/lib/gcc/x86_64-pc-linux-gnu/12.0.0/../../../../include/c++/12.0.0/debug/safe_sequence.h:35:
> In file included from 
~/gcc/trunk/inst/lib/gcc/x86_64-pc-linux-gnu/12.0.0/../../../../include/c++/12.0.0/debug/safe_base.h:32:
> In file included from 
~/gcc/trunk/inst/lib/gcc/x86_64-pc-linux-gnu/12.0.0/../../../../include/c++/12.0.0/ext/concurrence.h:34:
> 
~/gcc/trunk/inst/lib/gcc/x86_64-pc-linux-gnu/12.0.0/../../../../include/c++/12.0.0/exception:83:8:
 error: declaration of 'terminate' has a different language linkage
>   void terminate() _GLIBCXX_USE_NOEXCEPT __attribute__ ((__noreturn__));
>^
> 
~/gcc/trunk/inst/lib/gcc/x86_64-pc-linux-gnu/12.0.0/../../../../include/c++/12.0.0/x86_64-pc-linux-gnu/bits/c++config.h:302:10:
 note: previous declaration is here
> void terminate() _GLIBCXX_USE_NOEXCEPT __attribute__ ((__noreturn__));
>  ^

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

diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h 
b/include/LibreOfficeKit/LibreOfficeKitInit.h
index 8a48bd8392be..ccd42863ba25 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -12,11 +12,6 @@
 
 #include 
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 #if defined __GNUC__ || defined __clang__
 #  define LOK_TOLERATE_UNUSED __attribute__((used))
 #else
@@ -48,6 +43,26 @@ extern "C"
 #endif
 #define SEPARATOR '/'
 
+#else
+
+#if !defined WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include  
+#define TARGET_LIB"sofficeapp" ".dll"
+#define TARGET_MERGED_LIB "mergedlo" ".dll"
+#define SEPARATOR '\\'
+#define UNOPATH   "\\..\\URE\\bin"
+
+#endif
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#ifndef _WIN32
+
 #if !defined(IOS)
 static void *lok_loadlib(const char *pFN)
 {
@@ -88,15 +103,6 @@ extern "C"
 
 
 #else
-#if !defined WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include  
-#define TARGET_LIB"sofficeapp" ".dll"
-#define TARGET_MERGED_LIB "mergedlo" ".dll"
-#define SEPARATOR '\\'
-#define UNOPATH   "\\..\\URE\\bin"
-
 static void *lok_loadlib(const char *pFN)
 {
 return (void *) LoadLibraryA(pFN);
@@ -345,12 +351,12 @@ int lok_preinit( const char *install_path,  const char 
*user_profile_url )
 
 #undef SEPARATOR // It is used at least in enum class MenuItemType
 
-#endif // defined(__linux__) || defined (__FreeBSD__) || defined(_AIX) || 
defined(_WIN32) || defined(__APPLE__)
-
 #ifdef __cplusplus
 }
 #endif
 
+#endif // defined(__linux__) || defined (__FreeBSD__) || defined(_AIX) || 
defined(_WIN32) || defined(__APPLE__)
+
 #endif // INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKITINIT_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

[Szymon Kłos (via logerrit)]

 sc/source/ui/view/gridwin4.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 2ed4102a56981e5524a9992ef95e2c980db197fd
Author: Szymon Kłos 
AuthorDate: Tue Oct 12 11:00:10 2021 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 12 13:35:42 2021 +0200

tdf#145016 calc: don't show selection from other split panes

Change-Id: I636d98b5b95bb7ad51b39c6328440686f0bfd030
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123442
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index e37949f7ef23..9ee886d1ad50 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -2143,6 +2143,12 @@ void ScGridWindow::GetRectsAnyFor(const ScMarkData 
&rMarkData,
 PutInOrder( nX1, nX2 );
 PutInOrder( nY1, nY2 );
 
+SCCOL nPosX = mrViewData.GetPosX( eHWhich );
+SCROW nPosY = mrViewData.GetPosY( eVWhich );
+// is the selection visible at all?
+if (nX2 < nPosX || nY2 < nPosY)
+return;
+
 Point aScrStartPos = bInPrintTwips ? mrViewData.GetPrintTwipsPos(nX1, 
nY1) :
 mrViewData.GetScrPos(nX1, nY1, eWhich);
 

[Libreoffice-commits] core.git: compilerplugins/clang vbahelper/source

[Noel Grandin (via logerrit)]

 compilerplugins/clang/moveparam.cxx |  128 ++--
 compilerplugins/clang/test/moveparam.cxx|   21 +++
 vbahelper/source/vbahelper/vbadocumentsbase.cxx |4 
 3 files changed, 117 insertions(+), 36 deletions(-)

New commits:
commit d968425f009598bca3d10964c64f093b8d785c86
Author: Noel Grandin 
AuthorDate: Tue Oct 12 09:56:59 2021 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 12 13:12:11 2021 +0200

loplugin:moveparam check for collection params

Empirically, when we are passing a collection type to a constructor,
80% of the time, we are passing a local temporary that can be moved
instead of being copied.

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

diff --git a/compilerplugins/clang/moveparam.cxx 
b/compilerplugins/clang/moveparam.cxx
index 46816184071f..930e8a61a927 100644
--- a/compilerplugins/clang/moveparam.cxx
+++ b/compilerplugins/clang/moveparam.cxx
@@ -19,8 +19,13 @@
 #include "check.hxx"
 
 /*
-Look for places where we can pass by Primitive2DContainer param and so avoid
+Look for places where we can pass by move && param and so avoid
 unnecessary copies.
+Empirically, when we are passing a container type to a function, 80% of the 
time,
+we are passing a local temporary that can be moved instead of being copied.
+
+TODO this could be a lot smarter, with ignoring false+ e.g. when copying a 
param
+in a loop
 */
 
 namespace
@@ -33,7 +38,24 @@ public:
 {
 }
 
-virtual bool preRun() override { return true; }
+virtual bool preRun() override
+{
+std::string fn(handler.getMainFileName());
+loplugin::normalizeDotDotInFilePath(fn);
+if (loplugin::hasPathnamePrefix(fn, SRCDIR 
"/filter/source/msfilter/escherex.cxx"))
+return false;
+if (loplugin::hasPathnamePrefix(fn, SRCDIR 
"/sc/source/ui/docshell/docfunc.cxx"))
+return false;
+if (loplugin::hasPathnamePrefix(fn, SRCDIR 
"/sc/source/ui/view/viewfunc.cxx"))
+return false;
+if (loplugin::hasPathnamePrefix(fn, SRCDIR 
"/basegfx/source/polygon/b2dpolygontools.cxx"))
+return false;
+if (loplugin::hasPathnamePrefix(fn, SRCDIR 
"/basegfx/source/polygon/b3dpolygontools.cxx"))
+return false;
+if (loplugin::hasPathnamePrefix(fn, SRCDIR 
"/connectivity/source/commontools/dbtools.cxx"))
+return false;
+return true;
+}
 
 virtual void run() override
 {
@@ -41,10 +63,10 @@ public:
 TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
 }
 
-bool PreTraverseConstructorInitializer(CXXCtorInitializer*);
-bool PostTraverseConstructorInitializer(CXXCtorInitializer*, bool);
-bool TraverseConstructorInitializer(CXXCtorInitializer*);
 bool VisitCXXOperatorCallExpr(const CXXOperatorCallExpr*);
+bool VisitCXXConstructExpr(const CXXConstructExpr*);
+
+bool isContainerType(QualType qt);
 };
 
 bool MoveParam::VisitCXXOperatorCallExpr(const CXXOperatorCallExpr* callExpr)
@@ -53,9 +75,8 @@ bool MoveParam::VisitCXXOperatorCallExpr(const 
CXXOperatorCallExpr* callExpr)
 return true;
 if (!callExpr->isAssignmentOp())
 return true;
-if (!loplugin::TypeCheck(callExpr->getType())
- .Class("Primitive2DContainer")
- .Namespace("primitive2d"))
+auto qt = callExpr->getType();
+if (!isContainerType(qt))
 return true;
 auto declRef = 
dyn_cast(callExpr->getArg(1)->IgnoreParenImpCasts());
 if (!declRef)
@@ -68,29 +89,29 @@ bool MoveParam::VisitCXXOperatorCallExpr(const 
CXXOperatorCallExpr* callExpr)
 if (!loplugin::TypeCheck(parmVarDecl->getType()).LvalueReference().Const())
 return true;
 
-report(DiagnosticsEngine::Warning, "rather use move && param", 
compat::getBeginLoc(callExpr));
+StringRef aFileName = getFilenameOfLocation(
+
compiler.getSourceManager().getSpellingLoc(compat::getBeginLoc(parmVarDecl)));
+if (loplugin::hasPathnamePrefix(aFileName,
+SRCDIR 
"/svx/source/sidebar/line/LineWidthValueSet.cxx"))
+return true;
+
+report(DiagnosticsEngine::Warning, "rather use move && param1", 
compat::getBeginLoc(callExpr));
 
 return true;
 }
 
-bool MoveParam::PreTraverseConstructorInitializer(CXXCtorInitializer* init)
+bool MoveParam::VisitCXXConstructExpr(const CXXConstructExpr* constructExpr)
 {
-if (ignoreLocation(init->getSourceLocation()))
+if (ignoreLocation(compat::getBeginLoc(constructExpr)))
 return true;
-const FieldDecl* fieldDecl = init->getAnyMember();
-if (!fieldDecl)
+if (isInUnoIncludeFile(compat::getBeginLoc(constructExpr)))
 return true;
 
-auto dc = loplugin::TypeCheck(fieldDecl->getType())
-  .Class("Primitive2DContainer")
-   

[Libreoffice-commits] core.git: README.wasm

[Hossein (via logerrit)]

 README.wasm |  272 ++--
 1 file changed, 157 insertions(+), 115 deletions(-)

New commits:
commit d19299f579e820c34b38ee56b26125dc30f96ada
Author: Hossein 
AuthorDate: Sun Oct 10 19:59:20 2021 +0200
Commit: Hossein 
CommitDate: Tue Oct 12 13:11:15 2021 +0200

Convert Emscripten README.wasm to Markdown

* Converting README.wasm to Markdown
  + This file will be renamed to wasm-qt/README.md later and
wasm-qt/README will be removed
  + Filename is preserved in order to make diff understand the change

Change-Id: I908aa84b0fc5ac68e979f6182cda5ad5ef0e791d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123346
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 

diff --git a/README.wasm b/README.wasm
index 926f6565452c..2591d2de297d 100644
--- a/README.wasm
+++ b/README.wasm
@@ -1,19 +1,23 @@
-= Status =
+# Support for Emscripten Cross Build
 
-$ make
-$ emrun --serve_after_close instdir/program/ui-previewer.html
+This module provides support for emscripten cross build
 
-The ui-previewer "binary" will "crash" with memory alignment problems.
+## Status
+
+$ make
+$ emrun --serve_after_close instdir/program/ui-previewer.html
+
+The `ui-previewer` "binary" will "crash" with memory alignment problems.
 
 You can run the WASM mandelbrot Qt example, if you copy its HTML
 and the qtloader.js from the Qt's example folder after build with:
 
-$ emrun --serve_after_close workdir/LinkTarget/Executable/mandelbrot.html
+$ emrun --serve_after_close workdir/LinkTarget/Executable/mandelbrot.html
 
-REMINDER: always start new tabs in the browser, reload might fail / cache!
+REMINDER: Always start new tabs in the browser, reload might fail / cache!
 
 
-= Setup for the LO WASM build (with Qt) =
+## Setup for the LO WASM build (with Qt)
 
 We're using Qt 5.15 with the officially supported emscripten v1.39.8.
 But there are several potential problems with threads and exceptions, so this 
will likely
@@ -21,58 +25,60 @@ change later to a newer emscripten.
 
 Qt WASM is not yet used with LO, just if you're wondering!
 
- ++ See below under Docker build for another build option ++
+- See below under Docker build for another build option
 
-== Setup emscripten ==
+### Setup emscripten
 
-https://emscripten.org/docs/getting_started/index.html
+
 
-git clone https://github.com/emscripten-core/emsdk.git
-./emsdk install 1.39.8
-./emsdk activate --embedded 1.39.8
+git clone https://github.com/emscripten-core/emsdk.git
+./emsdk install 1.39.8
+./emsdk activate --embedded 1.39.8
 
-Example bashrc scriptlet:
+Example `bashrc` scriptlet:
 
-EMSDK_ENV=$HOME/Development/libreoffice/git_emsdk/emsdk_env.sh
-[ -f "$EMSDK_ENV" ] && \. "$EMSDK_ENV" 1>/dev/null 2>&1
+EMSDK_ENV=$HOME/Development/libreoffice/git_emsdk/emsdk_env.sh
+[ -f "$EMSDK_ENV" ] && \. "$EMSDK_ENV" 1>/dev/null 2>&1
 
+### Setup Qt
 
-== Setup Qt ==
-
-https://doc.qt.io/qt-5/wasm.html
+
 
 I originally build the Qt 5.15 branch, but probably better to build a tag like 
v5.15.2.
 
 So:
 
-git clone https://github.com/qt/qt5.git
-cd qt5
-git checkout v5.15.2
-./init-repository
-./configure -xplatform wasm-emscripten -feature-thread -compile-examples 
-prefix $PWD/qtbase
-make -j module-qtbase module-qtdeclarative
+git clone https://github.com/qt/qt5.git
+cd qt5
+git checkout v5.15.2
+./init-repository
+./configure -xplatform wasm-emscripten -feature-thread -compile-examples 
-prefix $PWD/qtbase
+make -j module-qtbase module-qtdeclarative
 
 Building with examples will break with some of them, but at that point Qt 
already works.
 
 At some point Qt configure failed for me with:
+
 "Checking for target architecture... Project ERROR: target architecture 
detection binary not found."
 
 What seems to have fixed this was to run "emsdk activate 1.39.8" again.
 
-Current Qt fails to start the demo webserver: 
https://bugreports.qt.io/browse/QTCREATORBUG-24072
-Use "emrun --serve_after_close" to run Qt WASM demos
+Current Qt fails to start the demo webserver: 

+
+Use `emrun --serve_after_close` to run Qt WASM demos
 
 Enabling multi-thread support in Firefox is a bit of work with older versions:
-- https://bugzilla.mozilla.org/show_bug.cgi?id=1477743#c7
-- https://wiki.qt.io/Qt_for_WebAssembly#Multithreading_Support
-- 
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer
+
+- 
+- 
+- 

 
 
-== Setup LO ==
+### Setup LO
 
-autogen.sh is patched to use emconfigure. That basically sets various 
environment vars,
-especiall

[Libreoffice-commits] core.git: 2 commits - sysui/desktop

[Caolán McNamara (via logerrit)]

 sysui/desktop/share/brand.pl |   12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

New commits:
commit e0ccbbf5011703fd8f5f36d8d8c93205644a1201
Author: Caolán McNamara 
AuthorDate: Tue Oct 12 09:30:15 2021 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 12 12:27:19 2021 +0200

uses of icon_filename are gone

since

commit e58a5f6db6d13d078f12c3496f46c227c6943c48
Author: Chris Mayo 
Date:   Wed Nov 11 19:27:52 2020 +

Remove obsolete GNOME 2 MIME types files

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

diff --git a/sysui/desktop/share/brand.pl b/sysui/desktop/share/brand.pl
index b17a7374fd62..e02c4ef6d045 100644
--- a/sysui/desktop/share/brand.pl
+++ b/sysui/desktop/share/brand.pl
@@ -87,10 +87,6 @@ while ($arg = shift) {
 s/Icon=/Icon=$iconprefix/;
 }
 
-# patch all occurrences of openoffice in icon_filename
-# line with $prefix
-s/icon_filename=/icon_filename=$iconprefix/;
-
 # patch all occurrences of openoffice in EXEC line with
 # $productfilename
 if ( /Exec/ ) {
commit 074644e2b5c0997f1b239eeb8c72712b7f01aeb4
Author: Caolán McNamara 
AuthorDate: Tue Oct 12 09:52:53 2021 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 12 12:27:05 2021 +0200

document-new shouldn't get prefixed to become libreoffice-document-new

seen by rpminspect as .desktop "references icon libreoffice-document-new
but no subpackages contain libreoffice-document-new"

introduced by:

commit f767d5e2b017c0d0cfd23ff3318cb30901847722
Date:   Sun Sep 1 11:30:12 2019 +0200

Add icons to New Document desktop file actions

in the [Desktop Action NewDocument] section

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

diff --git a/sysui/desktop/share/brand.pl b/sysui/desktop/share/brand.pl
index 9d73e619c495..b17a7374fd62 100644
--- a/sysui/desktop/share/brand.pl
+++ b/sysui/desktop/share/brand.pl
@@ -81,9 +81,11 @@ while ($arg = shift) {
 # remove possible Windows line-ends
 chomp;
 
-# patch all occurrences of openoffice in ICON line with
-# $prefix
-s/Icon=/Icon=$iconprefix/;
+# patch all icons in ICON line with $prefix
+if (! /Icon=document-new/ ) { # except for Icon=document-new which
+  # is a stock icon, not one of ours
+s/Icon=/Icon=$iconprefix/;
+}
 
 # patch all occurrences of openoffice in icon_filename
 # line with $prefix

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

[Julien Nabet (via logerrit)]

 sw/source/core/text/inftxt.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 50602fed86b2b972d49d6c6366b2a3eb406e4ed4
Author: Julien Nabet 
AuthorDate: Sun Oct 10 21:29:29 2021 +0200
Commit: Michael Stahl 
CommitDate: Tue Oct 12 11:57:17 2021 +0200

Try to fix Ubsan TB

/sw/source/core/text/inftxt.cxx:651:37: runtime error: downcast of address 
0x6060006542c0 which does not point to an object of type ´const SwTextPortion´
0x6060006542c0: note: object is of type ´SwBookmarkPortion´
3f 07 00 26  d0 ca 08 e3 2b 2b 00 00  2d 00 00 00 00 00 00 00  49 01 00 00 
00 00 00 00  60 42 65 00
 ^~~
 vptr for ´SwBookmarkPortion´
0x2b2bda76d6b7 in SwTextPaintInfo::DrawText_(rtl::OUString const&, 
SwLinePortion const&, o3tl::strong_int,
o3tl::strong_int, bool, bool, bool, bool) 
/sw/source/core/text/inftxt.cxx:651:37

Taking a look at some other locations in the same file, it seems we need to 
test "rPor.InTextGrp()" to consider rPor as a SwTextPortion

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

diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index b22ed6efdbcb..d85df6397551 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -648,7 +648,7 @@ void SwTextPaintInfo::DrawText_( const OUString &rText, 
const SwLinePortion &rPo
 
 // Draw text next to the left border
 Point aFontPos(m_aPos);
-if( m_pFnt->GetLeftBorder() && !static_cast(rPor).GetJoinBorderWithPrev() )
+if( m_pFnt->GetLeftBorder() && rPor.InTextGrp() && !static_cast(rPor).GetJoinBorderWithPrev() )
 {
 const sal_uInt16 nLeftBorderSpace = m_pFnt->GetLeftBorderSpace();
 if ( GetTextFrame()->IsRightToLeft() )

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - xmlsecurity/qa

[Michael Stahl (via logerrit)]

 
xmlsecurity/qa/unit/signing/data/02_doc_signed_by_trusted_person_manipulated.odt
 |binary
 xmlsecurity/qa/unit/signing/signing.cxx
  |   22 ++
 2 files changed, 22 insertions(+)

New commits:
commit 3aabce61782c9561a0e1680fe1ecc58ac87be0ee
Author: Michael Stahl 
AuthorDate: Fri Feb 26 17:24:10 2021 +0100
Commit: Michael Stahl 
CommitDate: Tue Oct 12 11:27:20 2021 +0200

xmlsecurity: add test for timestamps

Change-Id: I6ce64ca7c59639684779144ed0ed8d36c4aca32b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123437
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

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 df8ff85258b3..7d9d75a32150 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -558,6 +558,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)
 {

[Libreoffice-commits] core.git: 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/signed_with_x509certificate_chain.odt 
   |binary
 xmlsecurity/qa/unit/signing/signing.cxx
   |  108 ++
 6 files changed, 108 insertions(+)

New commits:
commit 40d70d427edddb589eda64fafc2e56536953d274
Author: Michael Stahl 
AuthorDate: Fri Feb 26 17:29:37 2021 +0100
Commit: Michael Stahl 
CommitDate: Tue Oct 12 11:13:57 2021 +0200

xmlsecurity: add tests for multiple X509Data/X509Certificate

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

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 0cc948febff7..40e085349403 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -531,6 +532,113 @@ 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()),
+

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

[Michael Stahl (via logerrit)]

 
xmlsecurity/qa/unit/signing/data/02_doc_signed_by_trusted_person_manipulated.odt
 |binary
 xmlsecurity/qa/unit/signing/signing.cxx
  |   22 ++
 2 files changed, 22 insertions(+)

New commits:
commit e5a0acda428fed64b9ba69365d6a54fbffa0727b
Author: Michael Stahl 
AuthorDate: Fri Feb 26 17:24:10 2021 +0100
Commit: Michael Stahl 
CommitDate: Tue Oct 12 11:12:32 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

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 d9661d348138..0cc948febff7 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -509,6 +509,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)
 {

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 2 commits - include/sfx2 xmlsecurity/qa

[Michael Stahl (via logerrit)]

 include/sfx2/objsh.hxx 
   |2 
 
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
   |  134 ++
 8 files changed, 135 insertions(+), 1 deletion(-)

New commits:
commit abc697f52fdffa63bd92c26b39df383bc8dbbd78
Author: Michael Stahl 
AuthorDate: Fri Feb 26 17:29:37 2021 +0100
Commit: Michael Stahl 
CommitDate: Mon Oct 11 22:04:32 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 732b76e34c04..af4150cd6355 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 
@@ -81,6 +82,11 @@ public:
 /// Document has a signature stream, but no actual signatures.
 void testODFNo();
 void testODFUnsignedTimestamp();
+void testODFX509CertificateChain();
+void testODFDoubleX509Data();
+void testODFTripleX509Data();
+void testODFMacroDoubleX509Data();
+void testODFDoubleX509Certificate();
 /// Test a typical OOXML where a number of (but not all) streams are 
signed.
 void testOOXMLPartial();
 /// Test a typical broken OOXML signature where one stream is corrupted.
@@ -139,6 +145,11 @@ public:
 CPPUNIT_TEST(testODFNo);
 CPPUNIT_TEST(testODFBroken);
 CPPUNIT_TEST(testODFUnsignedTimestamp);
+CPPUNIT_TEST(testODFX509CertificateChain);
+CPPUNIT_TEST(testODFDoubleX509Data);
+CPPUNIT_TEST(testODFTripleX509Data);
+CPPUNIT_TEST(testODFMacroDoubleX509Data);
+CPPUNIT_TEST(testODFDoubleX509Certificate);
 CPPUNIT_TEST(testOOXMLPartial);
 CPPUNIT_TEST(testOOXMLBroken);
 CPPUNIT_TEST(testOOXMLDescription);
@@ -616,6 +627,105 @@ void SigningTest::testODFUnsignedTimestamp()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(18183742), infos[0].SignatureTime);
 }
 
+void 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(*/(int)nActual/*)*/).getStr()),
+(nActual == SignatureState::NOTVALIDATED || nActual == 
SignatureState::OK));
+uno::Sequence const infos(

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - 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 8193373a700c4b5acfc6285fac25eff06b6ffb1b
Author: Michael Stahl 
AuthorDate: Fri Feb 26 17:29:37 2021 +0100
Commit: Michael Stahl 
CommitDate: Mon Oct 11 21:58:31 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 85ddd7395477..ad80c13955e9 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 
@@ -580,6 +581,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: Branch 'libreoffice-7-2' - sc/inc sc/qa sc/source

[Dennis Francis (via logerrit)]

 sc/inc/column.hxx|2 
 sc/inc/document.hxx  |2 
 sc/inc/table.hxx |2 
 sc/qa/unit/tiledrendering/tiledrendering.cxx |   66 ---
 sc/source/core/data/column3.cxx  |   54 +++---
 sc/source/core/data/documen3.cxx |8 +--
 sc/source/core/data/table3.cxx   |4 -
 sc/source/ui/app/inputhdl.cxx|   44 ++
 sc/source/ui/view/gridwin.cxx|2 
 9 files changed, 64 insertions(+), 120 deletions(-)

New commits:
commit 1e033fe1f270e7a76cb8821af9ceb1c096403442
Author: Dennis Francis 
AuthorDate: Mon Oct 11 16:27:57 2021 +0530
Commit: Dennis Francis 
CommitDate: Tue Oct 12 09:59:57 2021 +0200

calc: revert changes in autoinput

This is a combination of 4 commits.

Revert "autocomplete: allow cycling through possible matches"
This reverts commit 299227ad81d4a44556fda8cca7b8b79219ba7e6c.

Revert "tdf#142214: autoinput: remove search/entry count limits"
This reverts commit ebff4e5181b102e5184277f57fda32fcce60431f.

Revert "tdf#142214: unit-tests for new behaviour of auto-complete"
This reverts commit 06c360d4d27ab0dadfdcd5f9d4f0c87288d3cb75.

Revert "tdf#142214: show autocompletion only if there is..."
This reverts commit f8039c6d645acb015a6c4e45000bbfd1311bfea3.

Change-Id: Ief45d79d3a0ffac79d57e590c984d09aa9c38fc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123381
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas 
Reviewed-by: Jan Holesovsky 

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 72527a76cd9e..07b8f061bd88 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -538,7 +538,7 @@ public:
 sc::ColumnBlockConstPosition& rBlockPos, SCROW nStartRow, SCROW 
nEndRow,
 ScFilterEntries& rFilterEntries, bool bFiltering );
 
-bool GetDataEntries( SCROW nRow, std::set& rStrings) const;
+bool GetDataEntries( SCROW nRow, std::set& rStrings, bool 
bLimit ) const;
 
 void UpdateInsertTabAbs(SCTAB nNewPos);
 boolTestTabRefAbs(SCTAB nTable) const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 7c798cf08674..61770da26d71 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2095,7 +2095,7 @@ public:
 ScFilterEntries& rFilterEntries );
 
 void  GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab,
-  std::vector& rStrings, 
bool bValidation = false );
+  std::vector& rStrings, 
bool bLimit = false );
 void  GetFormulaEntries( ScTypedCaseStrSet& rStrings );
 
 bool   HasAutoFilter( SCCOL nCol, SCROW nRow, SCTAB nTab );
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index c3ba8d112e9d..a4e41a7bc318 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -963,7 +963,7 @@ public:
 void GetFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, 
ScFilterEntries& rFilterEntries, bool bFiltering = false);
 void GetFilteredFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, const 
ScQueryParam& rParam, ScFilterEntries& rFilterEntries, bool bFiltering );
 [[nodiscard]]
-bool GetDataEntries(SCCOL nCol, SCROW nRow, std::set& 
rStrings);
+bool GetDataEntries(SCCOL nCol, SCROW nRow, std::set& 
rStrings, bool bLimit);
 
 boolHasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, 
SCROW nEndRow ) const;
 boolHasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, 
SCROW nEndRow ) const;
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx 
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 8a722c2b8a29..ed35b29e7a63 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -47,7 +47,6 @@
 #include 
 #include 
 #include 
-#include 
 
 using namespace css;
 
@@ -114,7 +113,6 @@ public:
 void testSpellOnlineRenderParameter();
 void testPasteIntoWrapTextCell();
 void testSortAscendingDescending();
-void testAutoInputExactMatch();
 void testMoveShapeHandle();
 void testEditCursorBounds();
 void testTextSelectionBounds();
@@ -166,7 +164,6 @@ public:
 CPPUNIT_TEST(testSpellOnlineRenderParameter);
 CPPUNIT_TEST(testPasteIntoWrapTextCell);
 CPPUNIT_TEST(testSortAscendingDescending);
-CPPUNIT_TEST(testAutoInputExactMatch);
 CPPUNIT_TEST(testMoveShapeHandle);
 CPPUNIT_TEST(testEditCursorBounds);
 CPPUNIT_TEST(testTextSelectionBounds);
@@ -2634,69 +2631,6 @@ void ScTiledRenderingTest::testSortAscendingDescending()
 CPPUNIT_ASSERT_EQUAL(OString("rows"), aView.m_sInvalidateSheetGeometry);
 }
 
-void lcl_typeCharsInCell(const std::string& aStr, SCCOL nCol, SCROW nRow, 
ScTabViewShell* pView, ScModelObj* pModelObj)
-{
-pView->SetCursor(nCo

Re: getProgrammaticFuntionName typo in offapi/com/sun/star/sheet/XAddIn.idl

[Stephan Bergmann]

On 11/10/2021 19:24, Julien Nabet wrote:

(Sorry, without Nabble anymore, I don't know how to properly respond).

In response to Stephan:

"And if it would turn out not be used, why bother fixing the typo? :)"

Just to have the right spelling because it's boring to see this kind of 
typo ("boring" is an understatement for me, personnally I really hate 
letting typos)


So can we fix this or not?


I would strongly suggest not to, as css.sheet.XAddIn is an interface 
intended to be implemented by 3rd-party code (see e.g. 
odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java).



On 10/10/2021 11:13, Julien Nabet wrote:

Hello,

I noticed a typo in function name "getProgrammaticFuntionName" instead 
of "getProgrammaticFunctionName".


(see 
https://opengrok.libreoffice.org/xref/core/offapi/com/sun/star/sheet/XAddIn.idl?r=2b383d19#51). 



Usually I would have supposed we're stuck since it's in a public 
interface but the current implementations just return an empty 
OUString (unless I missed something) so wonder if it's really used.


Julien

PS : "Errare humanum est" but just wonder why these function names 
aren't double/triple-checked by at least 2 people before being 
published...

[Libreoffice-commits] core.git: 2 commits - animations/source connectivity/source drawinglayer/source filter/source include/svx libreofficekit/source starmath/inc starmath/source svx/source

[Noel Grandin (via logerrit)]

 animations/source/animcore/animcore.cxx   |8 +-
 connectivity/source/drivers/postgresql/pq_statement.cxx   |2 
 connectivity/source/drivers/postgresql/pq_updateableresultset.cxx |4 -
 connectivity/source/drivers/postgresql/pq_updateableresultset.hxx |2 
 drawinglayer/source/tools/wmfemfhelper.cxx|   28 
--
 filter/source/config/fragments/types/writer_T602_Document.xcu |2 
 include/svx/srchdlg.hxx   |1 
 libreofficekit/source/gtk/lokdocview.cxx  |4 -
 starmath/inc/dialog.hxx   |2 
 starmath/source/dialog.cxx|8 +-
 svx/source/dialog/srchdlg.cxx |8 ++
 11 files changed, 38 insertions(+), 31 deletions(-)

New commits:
commit 224953d896a3dba5d85992394525ab8b54d8c314
Author: Noel Grandin 
AuthorDate: Tue Oct 12 08:32:55 2021 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 12 09:50:31 2021 +0200

loplugin:moveparam in various

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

diff --git a/animations/source/animcore/animcore.cxx 
b/animations/source/animcore/animcore.cxx
index b664b683347a..d5652fbc4ccf 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -370,7 +370,7 @@ private:
 class TimeContainerEnumeration : public ::cppu::WeakImplHelper< XEnumeration >
 {
 public:
-explicit TimeContainerEnumeration( const std::vector< Reference< 
XAnimationNode > > &rChildren );
+explicit TimeContainerEnumeration( std::vector< Reference< XAnimationNode 
> >&& rChildren );
 
 // Methods
 virtual sal_Bool SAL_CALL hasMoreElements() override;
@@ -389,8 +389,8 @@ private:
 
 }
 
-TimeContainerEnumeration::TimeContainerEnumeration( const std::vector< 
Reference< XAnimationNode > > &rChildren )
-: maChildren( rChildren )
+TimeContainerEnumeration::TimeContainerEnumeration( std::vector< Reference< 
XAnimationNode > >&& rChildren )
+: maChildren( std::move(rChildren) )
 {
 maIter = maChildren.begin();
 }
@@ -1902,7 +1902,7 @@ Reference< XEnumeration > SAL_CALL 
AnimationNode::createEnumeration()
 {
 Guard< Mutex > aGuard( maMutex );
 
-return new TimeContainerEnumeration( maChildren);
+return new TimeContainerEnumeration(std::vector(maChildren));
 }
 
 
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx 
b/connectivity/source/drivers/postgresql/pq_statement.cxx
index 792fca0f1380..7db4b20536e2 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -446,7 +446,7 @@ bool executePostgresCommand( const OString & cmd, struct 
CommandData *data )
 *(data->pLastResultset) =
 UpdateableResultSet::createFromPGResultSet(
 data->refMutex, data->owner, data->ppSettings, 
result,
-schema, table,sourceTableKeys );
+schema, table, std::move(sourceTableKeys) );
 }
 else if( ! table.getLength() )
 {
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx 
b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
index e0373d265adf..5c1b23e82175 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
@@ -89,7 +89,7 @@ css::uno::Reference< css::sdbc::XCloseable > 
UpdateableResultSet::createFromPGRe
 PGresult *result,
 const OUString &schema,
 const OUString &table,
-const std::vector< OUString > &primaryKey )
+std::vector< OUString > && primaryKey )
 {
 sal_Int32 columnCount = PQnfields( result );
 sal_Int32 rowCount = PQntuples( result );
@@ -120,7 +120,7 @@ css::uno::Reference< css::sdbc::XCloseable > 
UpdateableResultSet::createFromPGRe
 }
 
 rtl::Reference pRS =  new UpdateableResultSet(
-mutex, owner, std::move(columnNames), std::move(data), ppSettings, 
schema, table, std::vector(primaryKey) );
+mutex, owner, std::move(columnNames), std::move(data), ppSettings, 
schema, table, std::move(primaryKey) );
 
 pRS->m_meta = new ResultSetMetaData( mutex, pRS,nullptr, ppSettings, 
result, schema, table );
 
diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx 
b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx
index afe385a15ec0..1beeadc31e98 100644
--- a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx
+++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx
@@ -118,7 +118,7 @@ public:
 PGresult *result,
 const

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/htmlexport/htmlexport.cxx  |   41 
 sw/source/filter/html/htmlnumwriter.cxx |   13 +-
 2 files changed, 53 insertions(+), 1 deletion(-)

New commits:
commit f6db057a505bc2a9fab66004f35b48bc89c72340
Author: Miklos Vajna 
AuthorDate: Mon Oct 11 16:46:21 2021 +0200
Commit: Miklos Vajna 
CommitDate: Tue Oct 12 09:02:50 2021 +0200

sw XHTML export: fix missing  around nested /

This was fine in practice in the HTML case, so make it conditional on
the XHTML flag for now.

(cherry picked from commit 869e554a017d57da14b0c5b1e1f6ce742db316e0)

Conflicts:
sw/source/filter/html/htmlnumwriter.cxx

Change-Id: Ie96357ba78f4a7fae125165c1c4e47c3f5686ddf

diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index e5d9b4fdc8b9..f95884620b55 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -1984,6 +1984,47 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, 
testOleEmfPreviewToHtml)
 CPPUNIT_ASSERT(aPath.endsWith("gif"));
 }
 
+CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testNestedBullets)
+{
+// Given a documented with nested lists:
+loadURL("private:factory/swriter", nullptr);
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+pWrtShell->Insert("first");
+sal_uInt16 nPos = pDoc->MakeNumRule(pDoc->GetUniqueNumRuleName());
+SwNumRule* pNumRule = pDoc->GetNumRuleTable()[nPos];
+{
+SwNode& rNode = pWrtShell->GetCursor()->GetPoint()->nNode.GetNode();
+SwTextNode& rTextNode = *rNode.GetTextNode();
+rTextNode.SetAttr(SwNumRuleItem(pNumRule->GetName()));
+rTextNode.SetAttrListLevel(0);
+}
+pWrtShell->SplitNode();
+pWrtShell->Insert("second");
+{
+SwNode& rNode = pWrtShell->GetCursor()->GetPoint()->nNode.GetNode();
+SwTextNode& rTextNode = *rNode.GetTextNode();
+rTextNode.SetAttr(SwNumRuleItem(pNumRule->GetName()));
+rTextNode.SetAttrListLevel(1);
+}
+
+// When exporting to xhtml:
+ExportToReqif();
+
+// Then make sure that there is a  between the outer and the inner 
:
+SvMemoryStream aStream;
+HtmlExportTest::wrapFragment(maTempFile, aStream);
+xmlDocUniquePtr pXmlDoc = parseXmlStream(&aStream);
+CPPUNIT_ASSERT(pDoc);
+// Without the accompanying fix in place, this test would have failed with:
+// - XPath 
'//reqif-xhtml:ol/reqif-xhtml:li/reqif-xhtml:ol/reqif-xhtml:li/reqif-xhtml:p' 
not found
+// i.e. the  inside the outer  was missing.
+assertXPathContent(
+pXmlDoc, 
"//reqif-xhtml:ol/reqif-xhtml:li/reqif-xhtml:ol/reqif-xhtml:li/reqif-xhtml:p",
+"second");
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmlnumwriter.cxx 
b/sw/source/filter/html/htmlnumwriter.cxx
index 5b9f484d9995..3360750ecfd9 100644
--- a/sw/source/filter/html/htmlnumwriter.cxx
+++ b/sw/source/filter/html/htmlnumwriter.cxx
@@ -211,11 +211,15 @@ Writer& OutHTML_NumberBulletListStart( SwHTMLWriter& rWrt,
 
 rWrt.m_aBulletGrfs[i].clear();
 OString sOut = "<" + rWrt.GetNamespace();
+if (rWrt.mbXHTML && (nPrevDepth != 0 || i != 0))
+{
+sOut += OOO_STRING_SVTOOLS_HTML_li "><" + rWrt.GetNamespace();
+}
 const SwNumFormat& rNumFormat = rInfo.GetNumRule()->Get( i );
 sal_Int16 eType = rNumFormat.GetNumberingType();
 if( SVX_NUM_CHAR_SPECIAL == eType )
 {
-// ordered list: 
+// unordered list: 
 sOut += OString(OOO_STRING_SVTOOLS_HTML_unorderlist);
 
 // determine the type by the bullet character
@@ -319,6 +323,7 @@ Writer& OutHTML_NumberBulletListEnd( SwHTMLWriter& rWrt,
 
 if (rWrt.mbXHTML)
 {
+// XHTML  for the list item content.
 if ((bListEnd && rInfo.IsNumbered()) || (!bListEnd && 
rNextInfo.IsNumbered()))
 {
 HTMLOutFuncs::Out_AsciiTag(rWrt.Strm(),
@@ -387,6 +392,12 @@ Writer& OutHTML_NumberBulletListEnd( SwHTMLWriter& rWrt,
 else
 aTag = OOO_STRING_SVTOOLS_HTML_orderlist;
 HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), rWrt.GetNamespace() + aTag, 
false );
+if (rWrt.mbXHTML && (nNextDepth != 0 || i != 1))
+{
+HTMLOutFuncs::Out_AsciiTag(
+rWrt.Strm(), rWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_li,
+/*bOn=*/false);
+}
 rWrt.m_bLFPossible = true;
 }