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

[Miklos Vajna (via logerrit)]

 include/vcl/filter/PDFiumLibrary.hxx  |2 
 xmlsecurity/qa/unit/pdfsigning/data/bad-cert-p3-stamp.pdf |binary
 xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx |   18 
 xmlsecurity/source/pdfio/pdfdocument.cxx  |   63 --
 4 files changed, 78 insertions(+), 5 deletions(-)

New commits:
commit 1dc6df7139295ac6e3eb1352d77fcddb0339af0b
Author: Miklos Vajna 
AuthorDate: Wed Nov 4 21:39:04 2020 +0100
Commit: Michael Stahl 
CommitDate: Fri Dec 4 09:30:41 2020 +0100

xmlsecurity: reject a few dangerous annotation types during pdf sig verify

(cherry picked from commit f231dacde9df1c4aa5f4e0970535c4f4093364a7)

Conflicts:
xmlsecurity/source/helper/pdfsignaturehelper.cxx

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105926
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit fcab45e0e22f4cf46e71856dba7ae5abd6f99bc5)

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

diff --git a/include/vcl/filter/PDFiumLibrary.hxx 
b/include/vcl/filter/PDFiumLibrary.hxx
index 783b9a6da8b4..027e4939fab1 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -59,6 +59,8 @@ public:
 FPDF_ClosePage(mpPage);
 }
 
+FPDF_PAGE getPointer() { return mpPage; }
+
 /// Get bitmap checksum of the page, without annotations/commenting.
 BitmapChecksum getChecksum(int nMDPPerm);
 };
diff --git a/xmlsecurity/qa/unit/pdfsigning/data/bad-cert-p3-stamp.pdf 
b/xmlsecurity/qa/unit/pdfsigning/data/bad-cert-p3-stamp.pdf
new file mode 100644
index ..b30f5b03867c
Binary files /dev/null and 
b/xmlsecurity/qa/unit/pdfsigning/data/bad-cert-p3-stamp.pdf differ
diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx 
b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
index b5a6d5914833..63990fb36225 100644
--- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
+++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
@@ -76,6 +76,7 @@ public:
 /// Test a valid signature that does not cover the whole file.
 void testPartial();
 void testBadCertP1();
+void testBadCertP3Stamp();
 void testPartialInBetween();
 /// Test writing a PAdES signature.
 void testSigningCertificateAttribute();
@@ -99,6 +100,7 @@ public:
 CPPUNIT_TEST(testPDFPAdESGood);
 CPPUNIT_TEST(testPartial);
 CPPUNIT_TEST(testBadCertP1);
+CPPUNIT_TEST(testBadCertP3Stamp);
 CPPUNIT_TEST(testPartialInBetween);
 CPPUNIT_TEST(testSigningCertificateAttribute);
 CPPUNIT_TEST(testGood);
@@ -455,6 +457,22 @@ void PDFSigningTest::testBadCertP1()
  rInformation.nStatus);
 }
 
+void PDFSigningTest::testBadCertP3Stamp()
+{
+std::vector aInfos
+= verify(m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"bad-cert-p3-stamp.pdf", 1,
+ /*rExpectedSubFilter=*/OString());
+CPPUNIT_ASSERT(!aInfos.empty());
+SignatureInformation& rInformation = aInfos[0];
+
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 0 (SecurityOperationStatus_UNKNOWN)
+// - Actual  : 1 (SecurityOperationStatus_OPERATION_SUCCEEDED)
+// i.e. adding a stamp annotation was not considered as a bad modification.
+
CPPUNIT_ASSERT_EQUAL(xml::crypto::SecurityOperationStatus::SecurityOperationStatus_UNKNOWN,
+ rInformation.nStatus);
+}
+
 /// Test writing a PAdES signature.
 void PDFSigningTest::testSigningCertificateAttribute()
 {
diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx 
b/xmlsecurity/source/pdfio/pdfdocument.cxx
index 9d056de0a15c..51eac91495a7 100644
--- a/xmlsecurity/source/pdfio/pdfdocument.cxx
+++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
@@ -24,6 +24,11 @@
 #include 
 #include 
 #include 
+#include 
+
+#if HAVE_FEATURE_PDFIUM
+#include 
+#endif
 
 using namespace com::sun::star;
 
@@ -138,8 +143,29 @@ bool IsCompleteSignature(SvStream& rStream, 
vcl::filter::PDFDocument& rDocument,
 return std::find(rAllEOFs.begin(), rAllEOFs.end(), nFileEnd) != 
rAllEOFs.end();
 }
 
+/**
+ * Contains checksums of a PDF page, which is rendered without annotations. It 
also contains
+ * the geometry of a few dangerous annotation types.
+ */
+struct PageChecksum
+{
+BitmapChecksum m_nPageContent;
+std::vector m_aAnnotations;
+bool operator==(const PageChecksum& rChecksum) const;
+};
+
+bool PageChecksum::operator==(const PageChecksum& rChecksum) const
+{
+if (m_nPageContent != rChecksum.m_nPageContent)
+{
+return false;
+}
+
+return m_aAnnotations == rChecksum.m_aAnnotations;
+}
+
 /// Collects the checksum of each page of one version of the PDF.
-void AnalyizeSignatureStream(SvMemoryStream& rStream, 
std::vector& rPageChecksums,
+void AnalyizeSignatureStream(Sv

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

[Noel Grandin (via logerrit)]

 sc/qa/unit/subsequent_export-test.cxx  |2 ++
 sc/qa/unit/subsequent_filters-test.cxx |2 ++
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx |2 ++
 3 files changed, 6 insertions(+)

New commits:
commit 5eeb1af1ca22129a7ee630de4d2a596d372b26bc
Author: Noel Grandin 
AuthorDate: Fri Dec 4 09:25:49 2020 +0200
Commit: Noel Grandin 
CommitDate: Fri Dec 4 09:34:47 2020 +0100

exclude some more tests for !IsDefaultDPI

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

diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index e46d356d677b..e2f783c30bfc 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -5405,6 +5405,8 @@ void ScExportTest::testHeaderFontStyleXLSX()
 
 void ScExportTest::testTdf135828_Shape_Rect()
 {
+if (!IsDefaultDPI())
+return;
 // tdf#135828 Check that the width and the height of rectangle of the shape
 // is correct.
 ScDocShellRef xShell = loadDoc("tdf135828_Shape_Rect.", FORMAT_XLSX);
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index a00e756bcbc8..593c12c3e27a 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -4997,6 +4997,8 @@ void ScFiltersTest::testPreviewMissingObjLink()
 
 void ScFiltersTest::testShapeRotationImport()
 {
+if (!IsDefaultDPI())
+return;
 // tdf#83593 Incorrectly calculated bounding rectangles caused shapes to 
appear as if there
 // were extra or missing rotations. Hence, we check the sizes of these 
rectangles.
 ScDocShellRef xDocSh = loadDoc("testShapeRotationImport.", FORMAT_XLSX);
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 1670d11cfeca..3601d735f717 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -220,6 +220,8 @@ DECLARE_OOXMLEXPORT_TEST(testTdf130814model, 
"tdf130814.docx")
 
 DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf107020, "tdf107020.docx")
 {
+if (!IsDefaultDPI())
+return;
 xmlDocUniquePtr p_XmlDoc = parseExport("word/document.xml");
 CPPUNIT_ASSERT(p_XmlDoc);
 assertXPath(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/cib-6.1-20'

[Michael Stahl (via logerrit)]

Tag 'cib-6.1-20' created by Thorsten Behrens  at 
2020-12-04 08:54 +

Release LibreOffice powered by CIB 6.1-20
-BEGIN PGP SIGNATURE-

iQKTBAABCgB9FiEEHp/al2IcD3tw8LrPZ7OyyFo1BNkFAl/J+T9fFIAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDFF
OUZEQTk3NjIxQzBGN0I3MEYwQkFDRjY3QjNCMkM4NUEzNTA0RDkACgkQZ7OyyFo1
BNlYmA/7Bp7Ah4m7aJIUqGmN2l84/S27xdBp4bNa0PPx1jYXeDekpsZDLZ3BX2Wc
OxhgO4ZMy2ZTD8f0MzB7I7/m4Dn3ecW6FpDa/XqUAhEWS7eSXUGL+mszosDdmx7h
yHlE7BxCIj0ByQbTzkdjGOSPa+kHFYGno6b8jmmbDvRH11c1g2fmicCVdAYg55CQ
ZPndYUMeyBHCBv/UXR+FFZNLaXWUjBa58A6ntT9ECcQzknPPsyULf7gqxQvGzhTG
ElqHAbu5EE26fuB+h7qaIbbnvCV98Q5AKggSuc2XowW5bz80wjPIXN4q3reAsDcK
+oDz5dEWtjQW5VRvTuj8BWX523t0D95wJqa36JRpy3aK3FqLEBP194nVvROtRI/k
rn6TDB3ZWie3oGff/WGIXdiTZzO/09pJltf9KYEYvHnIhT4S+vaMgBgyP/rUnHv9
JfLv2X+3INkXplUqG6ZnBr0XVyQgaV3N14mwJ7fESOZFcKBRqiimX4cOwgO9jVaG
w7kGaBFDbaYqwVh3Sv90iCmvrQQb08tDyPGvfxDPR4+FDj2HBU9fqs15SiibScmr
32STSq9L92I+wCWFrg/G08KGi0SrI/rKfSGbLqHrMs1uzlF24QcCcJ0dWsTeX9+a
O9UmHie0mB7G2aXaZVnCNTvTpd/iCbWDVGmPbb0DOapkw9Fi1G0=
=Xdhk
-END PGP SIGNATURE-

Changes since cib-6.1-19-22:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 sw/qa/extras/uiwriter/data3/tdf61154.fodt |  132 ++
 sw/qa/extras/uiwriter/uiwriter3.cxx   |   36 
 sw/source/core/tox/txmsrt.cxx |2 
 3 files changed, 169 insertions(+), 1 deletion(-)

New commits:
commit daf2a7d957c829c551754871a3545495c0f76bc0
Author: László Németh 
AuthorDate: Thu Dec 3 20:27:13 2020 +0100
Commit: László Németh 
CommitDate: Fri Dec 4 10:15:16 2020 +0100

tdf#61154 sw Table of Contents: remove tracked deletion

... part of a chapter, section etc. names also in Show
Changes mode, instead of showing as normal text.

Note: This problem was worse, then the case of references,
because hiding tracked changes didn't fix the Table of
Contents automatically, so it's better to avoid the
generation of the bad mixed names, which showed also
the deleted text as normal, without any visible differences
(strikethrough etc.).

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

diff --git a/sw/qa/extras/uiwriter/data3/tdf61154.fodt 
b/sw/qa/extras/uiwriter/data3/tdf61154.fodt
new file mode 100644
index ..18e0c0a64331
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data3/tdf61154.fodt
@@ -0,0 +1,132 @@
+
+http://openoffice.org/2009/office"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text" 
xmlns:dc="http://purl.org/dc/elements/1.1/";>
+ 
+  
+  
+   
+  
+ 
+ 
+  
+   
+
+ 
+  
+   X
+   2020-12-03
+  
+ 
+
+
+ 
+  
+   X
+   2020-12-03
+  
+ 
+
+
+ 
+  
+   X
+   2020-12-03
+  
+ 
+
+   
+   
+   
+
+ Table of 
Contents
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+
+
+ 
+  Table of Contents
+ 
+ Update me!1
+
+   
+   Text InsertedDeleted
+  
+ 
+
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index baca0e6f8c0e..d5f57f018913 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -33,6 +33,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 namespace
 {
@@ -218,6 +220,40 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132911)
 //CPPUNIT_ASSERT_EQUAL(4, getShapes());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf61154)
+{
+load(DATA_DIRECTORY, "tdf61154.fodt");
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+CPPUNIT_ASSERT(pWrtShell);
+
+SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
+
+pWrtShell->GotoNextTOXBase();
+
+// show changes
+pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::ShowDelete
+  | 
RedlineFlags::ShowInsert);
+CPPUNIT_ASSERT_MESSAGE("redlining should be off",
+   !pDoc->getIDocumentRedlineAccess().IsRedlineOn());
+CPPUNIT_ASSERT_MESSAGE(
+"redlines should be visible",
+
IDocumentRedlineAccess::IsShowChanges(pDoc->getIDocumentRedlineAccess().GetRedlineFlags()));
+
+const SwTOXBase* pTOXBase = pWrtShell->GetCurTOX();
+pWrtShell->UpdateTableOf(*pTOXBase);
+SwCursorShell* pShell(pDoc->GetEditShell());
+SwTextNode* pTitleNode = pShell->GetCursor()->GetNode().GetTextNode();
+SwNodeIndex aIdx(*pTitleNode);
+
+// table of contents node shouldn't contain tracked deletion
+// This was "Text InsertedDeleted\t1"
+SwTextNode* pNext = 
static_cast(pDoc->GetNodes().GoNext(&aIdx));
+CPPUNIT_ASSERT_EQUAL(OUString("Text Inserted\t1"), pNext->GetText());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf134404)
 {
 load(DATA_DIRECTORY, "tdf134404.odt");
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index 962c6edf3044..87e58744e260 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -551,7 +551,7 @@ TextAndReading SwTOXPara::GetText_Impl(SwRootFrame 
const*const pLayout) const
 assert(nEndIndex == -1);
 return TextAndReading(sw::GetExpandTextMerged(
 pLayout, *static_cast(pNd),
-false, false, ExpandMode(0)),
+ 

[Libreoffice-commits] core.git: canvas/inc canvas/Library_vclcanvas.mk canvas/source

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

 canvas/Library_vclcanvas.mk  |5 +
 canvas/inc/pch/precompiled_vclcanvas.hxx |6 +++---
 canvas/source/vcl/spritehelper.cxx   |   10 +-
 3 files changed, 5 insertions(+), 16 deletions(-)

New commits:
commit b5704e5431c6662b8b39f6458ec08a906efe1705
Author: Luboš Luňák 
AuthorDate: Tue Dec 1 11:30:46 2020 +0100
Commit: Luboš Luňák 
CommitDate: Fri Dec 4 10:55:27 2020 +0100

Revert "tdf#118107 canvas opengl: avoid assertion failure with negative 
widths"

I fixed the assert with 4eb816de71f1310a3a5d9803f7355849e6273439 (and
follow-up commits), so this is no longer needed.

This reverts commit 76b43425d764fbc9bf4dac52054b1d94344f26b0.

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

diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index 8c5f31484d56..5192857d87b5 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -28,10 +28,7 @@ $(eval $(call 
gb_Library_set_precompiled_header,vclcanvas,canvas/inc/pch/precomp
 
 $(eval $(call 
gb_Library_set_componentfile,vclcanvas,canvas/source/vcl/vclcanvas))
 
-$(eval $(call gb_Library_use_externals,vclcanvas,\
-   boost_headers \
-   epoxy \
-))
+$(eval $(call gb_Library_use_external,vclcanvas,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,vclcanvas))
 
diff --git a/canvas/inc/pch/precompiled_vclcanvas.hxx 
b/canvas/inc/pch/precompiled_vclcanvas.hxx
index cdad07862596..b31a1cd02792 100644
--- a/canvas/inc/pch/precompiled_vclcanvas.hxx
+++ b/canvas/inc/pch/precompiled_vclcanvas.hxx
@@ -13,7 +13,7 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2020-10-02 11:01:53 using:
+ Generated on 2020-12-01 16:34:48 using:
  ./bin/update_pch canvas vclcanvas --cutoff=1 --exclude:system 
--include:module --include:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
@@ -39,8 +39,8 @@
 #include 
 #include 
 #include 
+#include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -54,7 +54,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -81,6 +80,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #endif // PCH_LEVEL >= 3
diff --git a/canvas/source/vcl/spritehelper.cxx 
b/canvas/source/vcl/spritehelper.cxx
index 96300101b5ae..53116fa9d53d 100644
--- a/canvas/source/vcl/spritehelper.cxx
+++ b/canvas/source/vcl/spritehelper.cxx
@@ -32,7 +32,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
@@ -189,15 +188,8 @@ namespace vclcanvas
 
 if( !bIdentityTransform )
 {
-// Avoid the trick with the negative width in the OpenGL case,
-// OutputDevice::DrawDeviceAlphaBitmap() doesn't like it.
 if (!::basegfx::fTools::equalZero( aTransform.get(0,1) ) ||
-!::basegfx::fTools::equalZero( aTransform.get(1,0) )
-#if HAVE_FEATURE_UI
-|| OpenGLHelper::isVCLOpenGLEnabled()
-#endif
-|| SkiaHelper::isVCLSkiaEnabled()
-   )
+!::basegfx::fTools::equalZero( aTransform.get(1,0) ))
 {
 // "complex" transformation, employ affine
 // transformator
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/source/uibase/inc/OutlineContentVisibilityWin.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit eed5a105bf6338828ee6c973891c1d922b3fb08b
Author: Caolán McNamara 
AuthorDate: Fri Dec 4 09:16:53 2020 +
Commit: Caolán McNamara 
CommitDate: Fri Dec 4 10:56:55 2020 +0100

unused IdleDisappearHandler

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

diff --git a/sw/source/uibase/inc/OutlineContentVisibilityWin.hxx 
b/sw/source/uibase/inc/OutlineContentVisibilityWin.hxx
index 3816484391a2..02866f8532d5 100644
--- a/sw/source/uibase/inc/OutlineContentVisibilityWin.hxx
+++ b/sw/source/uibase/inc/OutlineContentVisibilityWin.hxx
@@ -46,7 +46,6 @@ public:
 
 private:
 DECL_LINK(DelayAppearHandler, Timer*, void);
-DECL_LINK(IdleDisappearHandler, Timer*, void);
 DECL_LINK(MousePressHdl, const MouseEvent&, bool);
 DECL_LINK(MouseMoveHdl, const MouseEvent&, bool);
 DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 sw/qa/extras/uiwriter/data3/tdf61154.fodt |  132 ++
 sw/qa/extras/uiwriter/uiwriter3.cxx   |   36 
 sw/source/core/tox/txmsrt.cxx |2 
 3 files changed, 169 insertions(+), 1 deletion(-)

New commits:
commit d0a1179d2ee9de52bcad864cc19af76c46917817
Author: László Németh 
AuthorDate: Thu Dec 3 20:27:13 2020 +0100
Commit: László Németh 
CommitDate: Fri Dec 4 11:06:05 2020 +0100

tdf#61154 sw Table of Contents: remove tracked deletion

... part of chapter, section etc. names also in Show
Changes mode, instead of showing as normal text.

Note: This problem was worse, than the case of references,
because hiding tracked changes didn't fix the Table of
Contents automatically, so it's better to avoid the
generation of the bad mixed names, which showed also
the deleted text as normal, without any visible differences
(strikethrough etc.).

Change-Id: Ieef8cf6e2f8bef64f99e5cb0542b7b43d8e76a27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107176
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit daf2a7d957c829c551754871a3545495c0f76bc0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107200

diff --git a/sw/qa/extras/uiwriter/data3/tdf61154.fodt 
b/sw/qa/extras/uiwriter/data3/tdf61154.fodt
new file mode 100644
index ..18e0c0a64331
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data3/tdf61154.fodt
@@ -0,0 +1,132 @@
+
+http://openoffice.org/2009/office"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text" 
xmlns:dc="http://purl.org/dc/elements/1.1/";>
+ 
+  
+  
+   
+  
+ 
+ 
+  
+   
+
+ 
+  
+   X
+   2020-12-03
+  
+ 
+
+
+ 
+  
+   X
+   2020-12-03
+  
+ 
+
+
+ 
+  
+   X
+   2020-12-03
+  
+ 
+
+   
+   
+   
+
+ Table of 
Contents
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+
+
+ 
+  Table of Contents
+ 
+ Update me!1
+
+   
+   Text InsertedDeleted
+  
+ 
+
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 972cc6af88b5..0a518971272b 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -34,6 +34,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 namespace
 {
@@ -219,6 +221,40 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132911)
 //CPPUNIT_ASSERT_EQUAL(4, getShapes());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf61154)
+{
+load(DATA_DIRECTORY, "tdf61154.fodt");
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+CPPUNIT_ASSERT(pWrtShell);
+
+SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
+
+pWrtShell->GotoNextTOXBase();
+
+// show changes
+pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::ShowDelete
+  | 
RedlineFlags::ShowInsert);
+CPPUNIT_ASSERT_MESSAGE("redlining should be off",
+   !pDoc->getIDocumentRedlineAccess().IsRedlineOn());
+CPPUNIT_ASSERT_MESSAGE(
+"redlines should be visible",
+
IDocumentRedlineAccess::IsShowChanges(pDoc->getIDocumentRedlineAccess().GetRedlineFlags()));
+
+const SwTOXBase* pTOXBase = pWrtShell->GetCurTOX();
+pWrtShell->UpdateTableOf(*pTOXBase);
+SwCursorShell* pShell(pDoc->GetEditShell());
+SwTextNode* pTitleNode = pShell->GetCursor()->GetNode().GetTextNode();
+SwNodeIndex aIdx(*pTitleNode);
+
+// table of contents node shouldn't contain tracked deletion
+// This was "Text InsertedDeleted\t1"
+SwTextNode* pNext = 
static_cast(pDoc->GetNodes().GoNext(&aIdx));
+CPPUNIT_ASSERT_EQUAL(OUString("Text Inserted\t1"), pNext->GetText());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf134404)
 {
 load(DATA_DIRECTORY, "tdf134404.odt");
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index d69e57ba2c3b..e2591dfb3514 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -550,7 +550,7 @@ TextAndReading SwTOXPara::GetText_Impl(SwRootFrame 
const*const pLayout) const
 assert(nEndIndex == -1);
 return TextAndReading(

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

[Xisco Fauli (via logerrit)]

 sw/qa/uitest/data/tdf137802.odt |binary
 sw/qa/uitest/writer_tests7/tdf137802.py |   84 
 2 files changed, 84 insertions(+)

New commits:
commit 44a3a3a53db57398efa2ec4db026e4ebda086dde
Author: Xisco Fauli 
AuthorDate: Thu Dec 3 23:23:06 2020 +0100
Commit: Xisco Fauli 
CommitDate: Fri Dec 4 11:43:03 2020 +0100

tdf#137802: sw: Add UITest

First, I tried to create this as a CppUnittest but I couldn't
make it to work, so i'm using a UItest instead. At least we
have a test

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

diff --git a/sw/qa/uitest/data/tdf137802.odt b/sw/qa/uitest/data/tdf137802.odt
new file mode 100644
index ..2d5ac8b04a96
Binary files /dev/null and b/sw/qa/uitest/data/tdf137802.odt differ
diff --git a/sw/qa/uitest/writer_tests7/tdf137802.py 
b/sw/qa/uitest/writer_tests7/tdf137802.py
new file mode 100644
index ..8f7a887e753c
--- /dev/null
+++ b/sw/qa/uitest/writer_tests7/tdf137802.py
@@ -0,0 +1,84 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from com.sun.star.text.TextContentAnchorType import AT_PAGE, AT_PARAGRAPH
+import org.libreoffice.unotest
+import pathlib
+
+def get_url_for_data_file(file_name):
+return 
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+
+class tdf137802(UITestCase):
+
+def test_tdf137802(self):
+
+self.ui_test.load_file(get_url_for_data_file("tdf137802.odt"))
+
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+document = self.ui_test.get_component()
+
+self.assertEqual(document.DrawPage.getCount(), 2)
+self.assertEqual(AT_PARAGRAPH, 
document.DrawPage.getByIndex(0).AnchorType)
+
+self.xUITest.executeCommand(".uno:JumpToNextFrame")
+
+self.ui_test.wait_until_child_is_available(xWriterEdit, 'metricfield')
+
+self.ui_test.execute_dialog_through_command(".uno:TransformDialog")
+
+xDialog = self.xUITest.getTopFocusWindow()
+
+xDialog.getChild('topage').executeAction("CLICK", tuple())
+
+xOkBtn = xDialog.getChild("ok")
+xOkBtn.executeAction("CLICK", tuple())
+
+self.assertEqual(AT_PAGE, document.DrawPage.getByIndex(0).AnchorType)
+
+self.assertEqual(document.DrawPage.getCount(), 2)
+
+xWriterDoc = self.xUITest.getTopFocusWindow()
+xWriterEdit = xWriterDoc.getChild("writer_edit")
+
+# When shape 1 is selected, esc key doesn't put the focus back to the 
document
+# because the shape has a textbox. Move the focus to another shape 
with tab key
+# and then use escape
+xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": "TAB"}))
+xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": "ESC"}))
+
+# Wait until the shape is deselected and the cursor is on the document
+self.ui_test.wait_until_child_is_available(xWriterEdit, 'FontNameBox')
+
+# Delete the second paragraph. Shape 2 is anchored to this paragraph
+# so it should be deleted
+xWriterEdit.executeAction("TYPE", mkPropertyValues({"KEYCODE": 
"BACKSPACE"}))
+
+self.assertEqual(document.DrawPage.getCount(), 1)
+
+self.xUITest.executeCommand(".uno:JumpToNextFrame")
+self.xUITest.executeCommand(".uno:Delete")
+
+self.assertEqual(document.DrawPage.getCount(), 0)
+
+self.xUITest.executeCommand(".uno:Undo")
+
+self.assertEqual(document.DrawPage.getCount(), 1)
+
+self.xUITest.executeCommand(".uno:Undo")
+
+self.assertEqual(document.DrawPage.getCount(), 2)
+
+self.xUITest.executeCommand(".uno:Undo")
+
+self.assertEqual(AT_PARAGRAPH, 
document.DrawPage.getByIndex(0).AnchorType)
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 include/xmloff/shapeimport.hxx|5 +
 reportdesign/source/filter/xml/xmlCell.cxx|   40 +++--
 reportdesign/source/filter/xml/xmlCell.hxx|4 
 reportdesign/source/filter/xml/xmlSubDocument.cxx |   44 --
 reportdesign/source/filter/xml/xmlSubDocument.hxx |4 
 sc/source/filter/xml/XMLTableShapesContext.cxx|   16 +--
 sc/source/filter/xml/XMLTableShapesContext.hxx|6 -
 sc/source/filter/xml/xmlannoi.cxx |   78 --
 sc/source/filter/xml/xmlannoi.hxx |   12 +-
 sc/source/filter/xml/xmlcelli.cxx |   92 --
 sc/source/filter/xml/xmlcelli.hxx |4 
 xmloff/source/chart/SchXMLChartContext.cxx|   44 --
 xmloff/source/chart/SchXMLChartContext.hxx|4 
 xmloff/source/draw/shapeimport.cxx|   44 ++
 xmloff/source/draw/ximpgrp.cxx|   33 +++
 xmloff/source/draw/ximpgrp.hxx|2 
 xmloff/source/draw/ximplink.cxx   |9 +-
 xmloff/source/draw/ximplink.hxx   |5 -
 xmloff/source/draw/ximppage.cxx   |   17 +---
 xmloff/source/draw/ximppage.hxx   |3 
 20 files changed, 218 insertions(+), 248 deletions(-)

New commits:
commit 15c5da78ec773b7b59a092f84dca02de5931e634
Author: Noel 
AuthorDate: Fri Dec 4 11:35:32 2020 +0200
Commit: Noel Grandin 
CommitDate: Fri Dec 4 11:58:33 2020 +0100

fastparser in CreateGroupChildContext

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

diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index dacd947a66d2..0f841acfd601 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -256,6 +256,11 @@ public:
 const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
 css::uno::Reference< css::drawing::XShapes > const & rShapes,
 bool bTemporaryShape = false);
+SvXMLShapeContext* CreateGroupChildContext(
+SvXMLImport& rImport, sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList>& 
xAttrList,
+css::uno::Reference< css::drawing::XShapes > const & rShapes,
+bool bTemporaryShape = false);
 
 SvXMLShapeContext* CreateFrameChildContext(
 SvXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLocalName,
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx 
b/reportdesign/source/filter/xml/xmlCell.cxx
index 1ce789210df1..51dc70c75ffb 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -86,32 +86,6 @@ OXMLCell::~OXMLCell()
 {
 }
 
-SvXMLImportContextRef OXMLCell::CreateChildContext(
-sal_uInt16 _nPrefix,
-const OUString& _rLocalName,
-const Reference< XAttributeList > & xAttrList )
-{
-SvXMLImportContext *pContext = nullptr;
-ORptFilter& rImport = GetOwnImport();
-const SvXMLTokenMap&rTokenMap   = rImport.GetCellElemTokenMap();
-const sal_uInt16 nToken = rTokenMap.Get( _nPrefix, _rLocalName );
-switch( nToken )
-{
-case XML_TOK_CUSTOM_SHAPE:
-case XML_TOK_FRAME:
-{
-if ( !m_bContainsShape )
-m_nCurrentCount = m_pContainer->getSection()->getCount();
-rtl::Reference< XMLShapeImportHelper > xShapeImportHelper = 
rImport.GetShapeImport();
-uno::Reference< drawing::XShapes > xShapes = 
m_pContainer->getSection().get();
-pContext = 
xShapeImportHelper->CreateGroupChildContext(rImport,_nPrefix,_rLocalName,xAttrList,xShapes);
-m_bContainsShape = true;
-}
-break;
-}
-return pContext;
-}
-
 css::uno::Reference< css::xml::sax::XFastContextHandler > 
OXMLCell::createFastChildContext(
 sal_Int32 nElement,
 const css::uno::Reference< css::xml::sax::XFastAttributeList >& 
xAttrList )
@@ -172,8 +146,20 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > 
OXMLCell::createFastCh
 case XML_ELEMENT(TEXT, XML_P):
 xContext = new OXMLCell( rImport,xAttrList ,m_pContainer,this);
 break;
-default:
+
+case XML_ELEMENT(DRAW, XML_CUSTOM_SHAPE):
+case XML_ELEMENT(DRAW, XML_FRAME):
+{
+if ( !m_bContainsShape )
+m_nCurrentCount = m_pContainer->getSection()->getCount();
+uno::Reference< drawing::XShapes > xShapes = 
m_pContainer->getSection().get();
+xContext = 
GetImport().GetShapeImport()->CreateGroupChildContext(rImport,nElement,xAttrList,xShapes);
+m_bContainsShape = true;
+}
 break;
+
+default:
+SAL_WARN("reportdesi

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

[Caolán McNamara (via logerrit)]

 emfio/source/reader/mtftools.cxx |   50 +++
 1 file changed, 40 insertions(+), 10 deletions(-)

New commits:
commit 7f615923dd53143b0598627f534b7595d3f00dfd
Author: Caolán McNamara 
AuthorDate: Fri Dec 4 09:42:15 2020 +
Commit: Caolán McNamara 
CommitDate: Fri Dec 4 12:02:52 2020 +0100

ofz#28271 divide-by-zero

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

diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index 9ad212b17dfa..778adeb429ba 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -322,8 +322,14 @@ namespace emfio
 fY2  = mnWinOrgY-fY2;
 fX2 *= HUNDREDTH_MILLIMETERS_PER_MILLIINCH * 10;
 fY2 *= HUNDREDTH_MILLIMETERS_PER_MILLIINCH * 10;
-fX2 += mnDevOrgX * static_cast(mnMillX) * 
100.0 / static_cast(mnPixX);
-fY2 += mnDevOrgY * static_cast(mnMillY) * 
100.0 / static_cast(mnPixY);
+double nDevOrgX = mnDevOrgX;
+if (mnPixX)
+nDevOrgX *= static_cast(mnMillX) * 100.0 / 
static_cast(mnPixX);
+fX2 += nDevOrgX;
+double nDevOrgY = mnDevOrgY;
+if (mnPixY)
+nDevOrgY *= static_cast(mnMillY) * 100.0 / 
static_cast(mnPixY);
+fY2 += nDevOrgY;
 }
 break;
 case MM_HIENGLISH :
@@ -332,8 +338,14 @@ namespace emfio
 fY2  = mnWinOrgY-fY2;
 fX2 *= HUNDREDTH_MILLIMETERS_PER_MILLIINCH;
 fY2 *= HUNDREDTH_MILLIMETERS_PER_MILLIINCH;
-fX2 += mnDevOrgX * static_cast(mnMillX) * 
100.0 / static_cast(mnPixX);
-fY2 += mnDevOrgY * static_cast(mnMillY) * 
100.0 / static_cast(mnPixY);
+double nDevOrgX = mnDevOrgX;
+if (mnPixX)
+nDevOrgX *= static_cast(mnMillX) * 100.0 / 
static_cast(mnPixX);
+fX2 += nDevOrgX;
+double nDevOrgY = mnDevOrgY;
+if (mnPixY)
+nDevOrgY *= static_cast(mnMillY) * 100.0 / 
static_cast(mnPixY);
+fY2 += nDevOrgY;
 }
 break;
 case MM_TWIPS:
@@ -342,8 +354,14 @@ namespace emfio
 fY2  = mnWinOrgY-fY2;
 fX2 *= HUNDREDTH_MILLIMETERS_PER_MILLIINCH / 
MILLIINCH_PER_TWIPS;
 fY2 *= HUNDREDTH_MILLIMETERS_PER_MILLIINCH / 
MILLIINCH_PER_TWIPS;
-fX2 += mnDevOrgX * static_cast(mnMillX) * 
100.0 / static_cast(mnPixX);
-fY2 += mnDevOrgY * static_cast(mnMillY) * 
100.0 / static_cast(mnPixY);
+double nDevOrgX = mnDevOrgX;
+if (mnPixX)
+nDevOrgX *= static_cast(mnMillX) * 100.0 / 
static_cast(mnPixX);
+fX2 += nDevOrgX;
+double nDevOrgY = mnDevOrgY;
+if (mnPixY)
+nDevOrgY *= static_cast(mnMillY) * 100.0 / 
static_cast(mnPixY);
+fY2 += nDevOrgY;
 }
 break;
 case MM_LOMETRIC :
@@ -352,16 +370,28 @@ namespace emfio
 fY2  = mnWinOrgY-fY2;
 fX2 *= 10;
 fY2 *= 10;
-fX2 += mnDevOrgX * static_cast(mnMillX) * 
100.0 / static_cast(mnPixX);
-fY2 += mnDevOrgY * static_cast(mnMillY) * 
100.0 / static_cast(mnPixY);
+double nDevOrgX = mnDevOrgX;
+if (mnPixX)
+nDevOrgX *= static_cast(mnMillX) * 100.0 / 
static_cast(mnPixX);
+fX2 += nDevOrgX;
+double nDevOrgY = mnDevOrgY;
+if (mnPixY)
+nDevOrgY *= static_cast(mnMillY) * 100.0 / 
static_cast(mnPixY);
+fY2 += nDevOrgY;
 }
 break;
 case MM_HIMETRIC : // in hundredth of a millimeter
 {
 fX2 -= mnWinOrgX;
 fY2  = mnWinOrgY-fY2;
-fX2 += mnDevOrgX * static_cast(mnMillX) * 
100.0 / static_cast(mnPixX);
-fY2 += mnDevOrgY * static_cast(mnMillY) * 
100.0 / static_cast(mnPixY);
+double nDevOrgX = mnDevOrgX;
+

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

[Jeff Law (via logerrit)]

 include/o3tl/lru_map.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8830cf86b146b1252ac37f351a23246088d569b0
Author: Jeff Law 
AuthorDate: Tue Nov 3 08:05:03 2020 -0700
Commit: Caolán McNamara 
CommitDate: Fri Dec 4 12:04:15 2020 +0100

include cstddef for gcc11

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

diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx
index c7132fd079c4..96fb3161782d 100644
--- a/include/o3tl/lru_map.hxx
+++ b/include/o3tl/lru_map.hxx
@@ -14,6 +14,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace o3tl
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: accessibility/inc basctl/inc basic/inc chart2/inc comphelper/inc configmgr/inc connectivity/inc cppcanvas/inc cppuhelper/inc cui/inc dbaccess/inc desktop/inc drawinglay

[Caolán McNamara (via logerrit)]

 accessibility/inc/pch/precompiled_acc.hxx |4 -
 basctl/inc/pch/precompiled_basctl.hxx |7 +
 basic/inc/pch/precompiled_sb.hxx  |3 
 chart2/inc/pch/precompiled_chartcontroller.hxx|8 +-
 chart2/inc/pch/precompiled_chartcore.hxx  |4 -
 comphelper/inc/pch/precompiled_comphelper.hxx |7 +
 configmgr/inc/pch/precompiled_configmgr.hxx   |3 
 connectivity/inc/pch/precompiled_ado.hxx  |2 
 connectivity/inc/pch/precompiled_dbase.hxx|4 -
 connectivity/inc/pch/precompiled_dbpool2.hxx  |3 
 connectivity/inc/pch/precompiled_dbtools.hxx  |8 --
 connectivity/inc/pch/precompiled_file.hxx |6 +
 connectivity/inc/pch/precompiled_flat.hxx |3 
 connectivity/inc/pch/precompiled_postgresql-sdbc-impl.hxx |7 -
 cppcanvas/inc/pch/precompiled_cppcanvas.hxx   |5 +
 cppuhelper/inc/pch/precompiled_cppuhelper.hxx |3 
 cui/inc/pch/precompiled_cui.hxx   |8 +-
 dbaccess/inc/pch/precompiled_dba.hxx  |5 +
 dbaccess/inc/pch/precompiled_dbaxml.hxx   |4 -
 dbaccess/inc/pch/precompiled_dbu.hxx  |9 +-
 desktop/inc/pch/precompiled_deploymentgui.hxx |4 -
 desktop/inc/pch/precompiled_deploymentmisc.hxx|3 
 desktop/inc/pch/precompiled_sofficeapp.hxx|6 +
 drawinglayer/inc/pch/precompiled_drawinglayer.hxx |   13 +--
 editeng/inc/pch/precompiled_editeng.hxx   |7 +
 forms/inc/pch/precompiled_frm.hxx |9 +-
 framework/inc/pch/precompiled_fwk.hxx |9 +-
 hwpfilter/inc/pch/precompiled_hwp.hxx |3 
 lotuswordpro/inc/pch/precompiled_lwpft.hxx|4 -
 oox/inc/pch/precompiled_oox.hxx   |8 +-
 package/inc/pch/precompiled_package2.hxx  |3 
 package/inc/pch/precompiled_xstor.hxx |4 -
 reportdesign/inc/pch/precompiled_rpt.hxx  |7 +
 reportdesign/inc/pch/precompiled_rptui.hxx|7 +
 sc/inc/pch/precompiled_sc.hxx |   17 +++-
 sc/inc/pch/precompiled_scfilt.hxx |   13 +--
 sc/inc/pch/precompiled_scui.hxx   |   10 +-
 sc/inc/pch/precompiled_vbaobj.hxx |3 
 sd/inc/pch/precompiled_sd.hxx |   15 +++
 sd/inc/pch/precompiled_sdui.hxx   |8 +-
 sdext/inc/pch/precompiled_PresentationMinimizer.hxx   |5 +
 sdext/inc/pch/precompiled_PresenterScreen.hxx |5 +
 sfx2/inc/pch/precompiled_sfx.hxx  |   21 +
 slideshow/inc/pch/precompiled_slideshow.hxx   |   10 +-
 sot/inc/pch/precompiled_sot.hxx   |4 -
 starmath/inc/pch/precompiled_sm.hxx   |   12 +--
 svgio/inc/pch/precompiled_svgio.hxx   |4 -
 svl/inc/pch/precompiled_svl.hxx   |7 +
 svtools/inc/pch/precompiled_svt.hxx   |   53 +-
 svx/inc/pch/precompiled_svx.hxx   |   12 +--
 svx/inc/pch/precompiled_svxcore.hxx   |9 --
 sw/inc/pch/precompiled_msword.hxx |8 +-
 sw/inc/pch/precompiled_sw.hxx |   20 +++--
 sw/inc/pch/precompiled_swui.hxx   |   21 -
 sw/inc/pch/precompiled_vbaswobj.hxx   |   27 ++-
 tools/inc/pch/precompiled_tl.hxx  |5 +
 unotools/inc/pch/precompiled_utl.hxx  |3 
 uui/inc/pch/precompiled_uui.hxx   |3 
 vbahelper/inc/pch/precompiled_msforms.hxx |7 +
 vbahelper/inc/pch/precompiled_vbahelper.hxx   |3 
 vcl/inc/pch/precompiled_vcl.hxx   |   10 ++
 writerfilter/inc/pch/precompiled_writerfilter.hxx |3 
 xmloff/inc/pch/precompiled_xo.hxx |4 -
 xmloff/inc/pch/precompiled_xof.hxx|3 
 xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx   |5 +
 xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx   |4 -
 66 files changed, 320 insertions(+), 204 deletions(-)

New commits:
commit 1ac449874c0e93ee7e7a9765053d392fde0067f4
Author: Caolán McNamara 
AuthorDate: Fri Dec 4 10:01:04 2020 +
Commit: Caolán McNamara 
CommitDate: Fri Dec 4 12:05:13 2020 +0100

update pches

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

diff --g

instdir/program/python.bin SIGSEGV on Jenkins lo_tb_master_linux, lo_tb_master_linux_dbg

[Stephan Bergmann]

Recently, some (but not all) of the 
 and 
 builds started 
to fail with SIGSEGV in instdir/program/python.bin as run during the 
build.  One example is 




/bin/sh: line 1: 24274 Segmentation fault  (core dumped) 
LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"$I/program:$I/program" 
PYTHONHOME="$I/program/python-core-3.8.4" 
PYTHONPATH="${PYPATH:+$PYPATH:}$I/program/python-core-3.8.4/lib:$I/program/python-core-3.8.4/lib/lib-dynload"
 $I/program/python.bin $S/writerfilter/source/ooxml/factoryimpl_ns.py 
$W/CustomTarget/writerfilter/source/ooxml/model_preprocessed.xml 
$W/CustomTarget/writerfilter/source/ooxml/OOXMLFactory_wml.cxx > 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux/workdir/CustomTarget/writerfilter/source/ooxml/OOXMLFactory_wml.cxx
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux/writerfilter/CustomTarget_source.mk:98:
 recipe for target 
'/home/tdf/lode/jenkins/workspace/lo_tb_master_linux/workdir/CustomTarget/writerfilter/source/ooxml/OOXMLFactory_wml.cxx'
 failed
make[1]: *** 
[/home/tdf/lode/jenkins/workspace/lo_tb_master_linux/workdir/CustomTarget/writerfilter/source/ooxml/OOXMLFactory_wml.cxx]
 Error 139
make[1]: *** Deleting file 
'/home/tdf/lode/jenkins/workspace/lo_tb_master_linux/workdir/CustomTarget/writerfilter/source/ooxml/OOXMLFactory_wml.cxx'


where I think I captured the right (but unfortunately unhelpful) core 
file on tb75:



[tdf@lilith ~]$ cd lode/jenkins/workspace/lo_tb_master_linux
[tdf@lilith lo_tb_master_linux]$ ls -l core.24274
-rw---. 1 tdf users 4.2M Dec  4 11:54 core.24274
[tdf@lilith lo_tb_master_linux]$ file core.24274
core.24274: ELF 64-bit LSB core file x86-64, version 1 (SYSV), SVR4-style, from 
'/home/tdf/lode/jenkins/workspace/lo_tb_master_linux/instdir/program/python.bin',
 real uid: 10037, effective uid: 10037, real gid: 100, effective gid: 100, 
execfn: 
'/home/tdf/lode/jenkins/workspace/lo_tb_master_linux/instdir/program/python.bin',
 platform: 'x86_64'
[tdf@lilith lo_tb_master_linux]$ gdb instdir/program/python.bin core.24274
GNU gdb (GDB) Red Hat Enterprise Linux 7.6.1-119.el7
Copyright (C) 2013 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later 
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.  Type "show copying"
and "show warranty" for details.
This GDB was configured as "x86_64-redhat-linux-gnu".
For bug reporting instructions, please see:
...
Reading symbols from 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux/instdir/program/python.bin...done.
[New LWP 24274]
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib64/libthread_db.so.1".
Core was generated by 
`/home/tdf/lode/jenkins/workspace/lo_tb_master_linux/instdir/program/python.bin'.
Program terminated with signal 11, Segmentation fault.
#0  0x0ae0 in ?? ()
warning: File 
"/home/tdf/lode/jenkins/workspace/lo_tb_master_linux/instdir/program/python.bin-gdb.py" 
auto-loading has been declined by your `auto-load safe-path' set to 
"$debugdir:$datadir/auto-load:/usr/bin/mono-gdb.py:/home/tdf/lode/jenkins/workspace/lo_gerrit/:/home/tdf/lode/opt_private/gcc-7.3.0/".
To enable execution of this file add
add-auto-load-safe-path 
/home/tdf/lode/jenkins/workspace/lo_tb_master_linux/instdir/program/python.bin-gdb.py
line to your configuration file "/home/tdf/.gdbinit".
To completely disable this security protection add
set auto-load safe-path /
line to your configuration file "/home/tdf/.gdbinit".
For more information about this security protection see the
"Auto-loading safe path" section in the GDB manual.  E.g., run from the shell:
info "(gdb)Auto-loading safe path"
Missing separate debuginfos, use: debuginfo-install glibc-2.17-307.el7.1.x86_64
(gdb) t a a bt

Thread 1 (Thread 0x2af1d2787a40 (LWP 24274)):
#0  0x0ae0 in ?? ()
#1  0x2af1d275307a in _dl_fini () from /lib64/ld-linux-x86-64.so.2
#2  0x2af1d3aa8ce9 in __run_exit_handlers () from /lib64/libc.so.6
#3  0x2af1d3aa8d37 in exit () from /lib64/libc.so.6
#4  0x2af1d3a9155c in __libc_start_main () from /lib64/libc.so.6
#5  0x0040068e in _start ()
(gdb) q
[tdf@lilith lo_tb_master_linux]$ 


(Those Jenkins builds had started to fail apparently systematically with 
such instdir/program/python.bin SIGSEGV, but which then appeared to stop 
at least for the moment with admin_slave_cleaning, as discussed in the 
comments starting at 
 
"Enable Python Py_DEBUG setting when built with --enable-dbgutil on Linux".)


If anybody has an idea what's going wrong there...

__

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sd/source

[Xisco Fauli (via logerrit)]

 sd/source/filter/eppt/epptso.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2d253ef05719144f5e3d5a773caf8f0b5ec0a02c
Author: Xisco Fauli 
AuthorDate: Wed Dec 2 10:23:57 2020 +0100
Commit: Michael Stahl 
CommitDate: Fri Dec 4 13:22:22 2020 +0100

related: tdf#127086: PPT: export custom shapes as Bitmap

this way the cropping is kept after roundtrip

found while working on fix for tdf#128501

Change-Id: I5cf023b469407d5a70d83cbb5b499b2a1d6310e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107051
Reviewed-by: Xisco Fauli 
Tested-by: Jenkins
(cherry picked from commit 0956226ca535a62ab22d8d2502b159037c327f7d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107095
Reviewed-by: Michael Stahl 

diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index b29c9c9d9e5f..153ef6f9bc3b 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1711,7 +1711,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, 
EscherSolverContainer& a
 // We can't map this custom shape to a PPT preset 
and it has a bitmap
 // fill. Make sure that at least the bitmap fill 
is not lost.
 mType = "drawing.GraphicObject";
-aGraphicPropertyName = "FillBitmap";
+aGraphicPropertyName = "Bitmap";
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - include/o3tl

[Jeff Law (via logerrit)]

 include/o3tl/lru_map.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f6112bf4a0577db4c43370aafa37a073e73a94b1
Author: Jeff Law 
AuthorDate: Tue Nov 3 08:05:03 2020 -0700
Commit: Caolán McNamara 
CommitDate: Fri Dec 4 13:35:03 2020 +0100

include cstddef for gcc11

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

diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx
index c7132fd079c4..96fb3161782d 100644
--- a/include/o3tl/lru_map.hxx
+++ b/include/o3tl/lru_map.hxx
@@ -14,6 +14,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace o3tl
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - include/o3tl

[Jeff Law (via logerrit)]

 include/o3tl/lru_map.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0ee36f180acafcb67968950f5a75e9cef8479abb
Author: Jeff Law 
AuthorDate: Tue Nov 3 08:05:03 2020 -0700
Commit: Caolán McNamara 
CommitDate: Fri Dec 4 13:35:29 2020 +0100

include cstddef for gcc11

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

diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx
index e822fde0294c..33a1487fa239 100644
--- a/include/o3tl/lru_map.hxx
+++ b/include/o3tl/lru_map.hxx
@@ -14,6 +14,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace o3tl
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

 source/text/swriter/guide/print_selection.xhp |   37 +++---
 1 file changed, 17 insertions(+), 20 deletions(-)

New commits:
commit 5e804bf7708f734fcfe1619286a9319c2849ec5f
Author: Olivier Hallot 
AuthorDate: Thu Dec 3 19:39:34 2020 -0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Dec 4 13:42:25 2020 +0100

Review print selection Help page

* Add section to hold sublist (see DTD)
* drop table
* drop future and use present
* change "e.g" to "For example"
* drop parenthesis

ref: 
https://wiki.documentfoundation.org/Documentation/DocumentationTeamInfo/StyleGuide#Writing_style

and below.

Change-Id: Ia6a79eda713074ad651f4961dd7916ff3e63de2d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107179
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/swriter/guide/print_selection.xhp 
b/source/text/swriter/guide/print_selection.xhp
index 477c459a0..6902aef23 100644
--- a/source/text/swriter/guide/print_selection.xhp
+++ b/source/text/swriter/guide/print_selection.xhp
@@ -51,26 +51,23 @@
   
   
 Enter the page 
numbers to print.
-• Use 
- for a range of pages (e.g., 1–4 will print 
all pages from 1 to 4).
-   • Partial 
ranges are also permitted.
-Empty tablecells needed for layout, do not delete
-   
-
- 
- 
-  -5 prints all pages up to page 5.
- 
-
-
- 
- 
-  10- prints from page 10 to end of 
document.
- 
-
-   
-   • Use 
, or ; for a list of pages (e.g.,  
1,3;7 will print pages 1, 3 and 7.  Spaces are optional. 1, 3, 7 will 
also work).
-   • Combinations 
are also possible (e.g., 1, 3, 5-10, 15- will print pages 1,3, 5 
through 10, and 15 to end of document.
-  
+
+  
+
+Use 
- for a range of pages. For example, 1-4 
prints all pages from 1 to 4.
+
+
+Partial ranges 
are also allowed: -5 prints all pages up to page 5; 
10- prints from page 10 to end of document.
+
+
+   Use 
, or ; for a list of pages. For example, 
1,3;7 prints pages 1, 3 and 7.  Spaces are optional: 1, 
3, 7 also works.
+
+
+   Combinations are also 
possible. For example, 1, 3, 5-10, 15- prints pages 1,3, 5 to 
10, and 15 to end of document.
+
+
+
+
   
The preview box on 
the left shows the selected pages.
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 6928bd3d6ecf9b3f64946b2b4ae021359c9fc4ba
Author: Olivier Hallot 
AuthorDate: Fri Dec 4 09:42:25 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Fri Dec 4 13:42:25 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 5e804bf7708f734fcfe1619286a9319c2849ec5f
  - Review print selection Help page

* Add section to hold sublist (see DTD)
* drop table
* drop future and use present
* change "e.g" to "For example"
* drop parenthesis

ref: 
https://wiki.documentfoundation.org/Documentation/DocumentationTeamInfo/StyleGuide#Writing_style

and below.

Change-Id: Ia6a79eda713074ad651f4961dd7916ff3e63de2d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107179
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 37d03e7d61ca..5e804bf7708f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 37d03e7d61caa560373268675ad87d91242bce05
+Subproject commit 5e804bf7708f734fcfe1619286a9319c2849ec5f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sc/qa/unit/subsequent_export-test.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f3cd444134e7b96eb5e462150b972df5aefcc1b1
Author: Andrea Gelmini 
AuthorDate: Fri Dec 4 00:15:39 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Dec 4 13:43:33 2020 +0100

Fix typo

Change-Id: Ic47ae69728feeec6e91a478ebcbbde7b77cb9544
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107182
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index e2f783c30bfc..c02f4a08aa3d 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -5571,7 +5571,7 @@ void ScExportTest::testTdf87973_externalLinkSkipUnuseds()
 ScDocShellRef pDocSh = saveAndReload(&(*pShell), FORMAT_XLSX);
 CPPUNIT_ASSERT(pDocSh.is());
 
-// check if the the new filename is present in the link (and not replaced 
by '[2]')
+// check if the new filename is present in the link (and not replaced by 
'[2]')
 ScDocument& rDoc2 = pDocSh->GetDocument();
 rDoc2.GetFormula(3, 1, 0, bFormula);
 CPPUNIT_ASSERT(bFormula.indexOf("tdf132105_external.ods") < 0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 sw/qa/extras/uiwriter/data3/tdf100691.fodt |  230 +
 sw/qa/extras/uiwriter/uiwriter3.cxx|   25 +++
 sw/source/core/tox/txmsrt.cxx  |2 
 3 files changed, 256 insertions(+), 1 deletion(-)

New commits:
commit 69a73d0443d408f04837c8781e8fd2296fdd49c6
Author: László Németh 
AuthorDate: Fri Dec 4 12:02:19 2020 +0100
Commit: László Németh 
CommitDate: Fri Dec 4 13:44:56 2020 +0100

tdf#100691 sw Table of Contents: remove hidden text

part of chapter, section etc. names.

See also commit daf2a7d957c829c551754871a3545495c0f76bc0
(tdf#61154 sw Table of Contents: remove tracked deletion).

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

diff --git a/sw/qa/extras/uiwriter/data3/tdf100691.fodt 
b/sw/qa/extras/uiwriter/data3/tdf100691.fodt
new file mode 100644
index ..6488f0b40663
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data3/tdf100691.fodt
@@ -0,0 +1,230 @@
+
+http://www.w3.org/TR/css3-text/"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:ooow="http://openoffice.org/200
 4/writer" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:table="urn:oasis:names:tc:open
 document:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
+ 
2020-12-04T11:52:59.211331599PT29S1LibreOfficeDev/7.2.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/e3e68283a0a3457df3501428f8c1310077a7d9b8
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink"/>
+  
+ 
+ 
+  
+ 
+ 
+  
+   
+   
+
+   
+   
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+  
+  
+  
+  
+ 
+ 
+  
+  
+   
+  
+  
+   
+
+   
+  
+  
+   
+
+   
+   
+   
+  
+ 
+ 
+  
+ 
+ 
+  
+   
+
+
+
+
+
+   
+   
+   
+
+ Table of 
Contents
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+
+
+ 
+  Table of Contents
+ 
+ Text Hidden1
+
+   
+   Text 
Hidden
+  
+ 
+
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiw

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

[Szymon Kłos (via logerrit)]

 sc/uiconfig/scalc/ui/notebookbar.ui |  133 
 vcl/source/window/dockmgr.cxx   |4 +
 2 files changed, 110 insertions(+), 27 deletions(-)

New commits:
commit 922c1f7e41503abaefe4b65441526c1ddca731e0
Author: Szymon Kłos 
AuthorDate: Fri Dec 4 12:24:27 2020 +0100
Commit: Szymon Kłos 
CommitDate: Fri Dec 4 14:00:12 2020 +0100

Avoid crash on closing docking window

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

diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 746e957b6fd0..a0825e616467 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -383,6 +383,10 @@ void DockingManager::RemoveWindow( const vcl::Window 
*pWindow )
 {
 if( (*it)->mpDockingWindow == pWindow )
 {
+// deleting wrappers calls set of actions which may want to use
+// wrapper we want to delete - avoid crash using temporary owner
+// while erasing
+auto pTemporaryOwner = std::move(*it);
 mvDockingWindows.erase( it );
 break;
 }
commit fe6f19ecf320b45878f8394dd67cbcd178300ae7
Author: Szymon Kłos 
AuthorDate: Fri Dec 4 11:02:11 2020 +0100
Commit: Szymon Kłos 
CommitDate: Fri Dec 4 14:00:05 2020 +0100

notebookbar: add pivot table section to tab data

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

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 863f0ea416df..fbdd66c61761 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -7399,6 +7399,46 @@
 1
   
 
+
+  
+True
+False
+center
+True
+
+  
+True
+True
+center
+True
+both
+False
+3
+
+  
+True
+False
+.uno:ManageXMLSource
+  
+  
+False
+True
+  
+
+  
+  
+False
+True
+2
+  
+
+  
+  
+False
+True
+2
+  
+
 
   
 True
@@ -7439,7 +7479,7 @@
   
 
 
-  
+  
 True
 True
 center
@@ -7447,10 +7487,10 @@
 both-horiz
 False
 
-  
+  
 True
 False
-.uno:ManageXMLSource
+.uno:DataProviderRefresh
   
   
 False
@@ -7478,7 +7518,7 @@
   
 False
 True
-2
+3
   
 
 
@@ -7533,24 +7573,66 @@
   
 False
 True
-3
+4
   
 
 
-  
+  
 True
 False
 center
 True
 
-  
+  
+True
+False
+5
+ 

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

[Szymon Kłos (via logerrit)]

 sc/source/ui/cctrl/checklistmenu.cxx |5 +
 sc/source/ui/dbgui/dapitype.cxx  |4 
 sc/source/ui/inc/checklistmenu.hxx   |1 -
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit dbcc736e6f7fd540c8edd7f73a2eb80525fcf17a
Author: Szymon Kłos 
AuthorDate: Fri Dec 4 12:29:39 2020 +0100
Commit: Szymon Kłos 
CommitDate: Fri Dec 4 14:00:38 2020 +0100

Revert "Avoid crash while closing autofilter"

This reverts commit 8e75c42253d92a014baf24dda82d3379bd736978.
Fixed by other patch solving problem in DockingManager
during removing DockingWindows.
see "Avoid crash on closing docking window"

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

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index 6798520f1ffb..deeb987ee806 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -400,8 +400,7 @@ void ScCheckListMenuControl::setSubMenuFocused(const 
ScCheckListMenuControl* pSu
 void ScCheckListMenuControl::EndPopupMode()
 {
 vcl::Window::GetDockingManager()->EndPopupMode(mxFrame);
-if (!mbDisposing)
-mxFrame->EnableDocking(false);
+mxFrame->EnableDocking(false);
 }
 
 void ScCheckListMenuControl::StartPopupMode(const tools::Rectangle& rRect, 
FloatWinPopupFlags eFlags)
@@ -466,7 +465,6 @@ 
ScCheckListMenuControl::ScCheckListMenuControl(ScCheckListMenuWindow* pParent, v
 , mbCanHaveSubMenu(bCanHaveSubMenu)
 , maOpenTimer(this)
 , maCloseTimer(this)
-, mbDisposing(false)
 {
 /*
tdf#136559 If we have no dates we don't need a tree
@@ -581,7 +579,6 @@ void ScCheckListMenuControl::GrabFocus()
 
 ScCheckListMenuControl::~ScCheckListMenuControl()
 {
-mbDisposing = true;
 EndPopupMode();
 for (auto& rMenuItem : maMenuItems)
 rMenuItem.mxSubMenuWin.disposeAndClear();
diff --git a/sc/source/ui/inc/checklistmenu.hxx 
b/sc/source/ui/inc/checklistmenu.hxx
index 74014e9ce80d..5d4d6a6abd33 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -293,7 +293,6 @@ private:
 
 SubMenuItemData   maOpenTimer;
 SubMenuItemData   maCloseTimer;
-bool  mbDisposing;
 };
 
 /**
commit 13504aab04e01a14580b35c9f1a24db6fa6e720e
Author: Szymon Kłos 
AuthorDate: Fri Dec 4 13:42:19 2020 +0100
Commit: Szymon Kłos 
CommitDate: Fri Dec 4 14:00:26 2020 +0100

pivot table: hide database source in online

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

diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index 411ff96872c0..15acb8c65553 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -20,6 +20,7 @@
 #undef SC_DLLIMPLEMENTATION
 
 #include 
+#include 
 
 using namespace com::sun::star;
 
@@ -52,6 +53,9 @@ 
ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(weld::Window* pParent, bool b
 
 // Intentionally hide this button to see if anyone complains.
 m_xBtnExternal->hide();
+
+if (comphelper::LibreOfficeKit::isActive())
+m_xBtnDatabase->hide();
 }
 
 IMPL_LINK(ScDataPilotSourceTypeDlg, ResponseHdl, weld::Button&, rButton, void)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-7-1' - source/text

[Olivier Hallot (via logerrit)]

 source/text/swriter/guide/print_selection.xhp |   37 +++---
 1 file changed, 17 insertions(+), 20 deletions(-)

New commits:
commit c0209500150e6fede8c288372a17cbf4b30817c5
Author: Olivier Hallot 
AuthorDate: Thu Dec 3 19:39:34 2020 -0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Dec 4 14:03:34 2020 +0100

Review print selection Help page

* Add section to hold sublist (see DTD)
* drop table
* drop future and use present
* change "e.g" to "For example"
* drop parenthesis

ref: 
https://wiki.documentfoundation.org/Documentation/DocumentationTeamInfo/StyleGuide#Writing_style

and below.

Change-Id: Ia6a79eda713074ad651f4961dd7916ff3e63de2d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107179
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 5e804bf7708f734fcfe1619286a9319c2849ec5f)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107205

diff --git a/source/text/swriter/guide/print_selection.xhp 
b/source/text/swriter/guide/print_selection.xhp
index 477c459a0..6902aef23 100644
--- a/source/text/swriter/guide/print_selection.xhp
+++ b/source/text/swriter/guide/print_selection.xhp
@@ -51,26 +51,23 @@
   
   
 Enter the page 
numbers to print.
-• Use 
- for a range of pages (e.g., 1–4 will print 
all pages from 1 to 4).
-   • Partial 
ranges are also permitted.
-Empty tablecells needed for layout, do not delete
-   
-
- 
- 
-  -5 prints all pages up to page 5.
- 
-
-
- 
- 
-  10- prints from page 10 to end of 
document.
- 
-
-   
-   • Use 
, or ; for a list of pages (e.g.,  
1,3;7 will print pages 1, 3 and 7.  Spaces are optional. 1, 3, 7 will 
also work).
-   • Combinations 
are also possible (e.g., 1, 3, 5-10, 15- will print pages 1,3, 5 
through 10, and 15 to end of document.
-  
+
+  
+
+Use 
- for a range of pages. For example, 1-4 
prints all pages from 1 to 4.
+
+
+Partial ranges 
are also allowed: -5 prints all pages up to page 5; 
10- prints from page 10 to end of document.
+
+
+   Use 
, or ; for a list of pages. For example, 
1,3;7 prints pages 1, 3 and 7.  Spaces are optional: 1, 
3, 7 also works.
+
+
+   Combinations are also 
possible. For example, 1, 3, 5-10, 15- prints pages 1,3, 5 to 
10, and 15 to end of document.
+
+
+
+
   
The preview box on 
the left shows the selected pages.
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

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

New commits:
commit 0fd63c6d0f8c6e75174f5a4cf9729b4f3f5d6d9c
Author: Olivier Hallot 
AuthorDate: Fri Dec 4 10:03:34 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Fri Dec 4 14:03:34 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-1'
  to c0209500150e6fede8c288372a17cbf4b30817c5
  - Review print selection Help page

* Add section to hold sublist (see DTD)
* drop table
* drop future and use present
* change "e.g" to "For example"
* drop parenthesis

ref: 
https://wiki.documentfoundation.org/Documentation/DocumentationTeamInfo/StyleGuide#Writing_style

and below.

Change-Id: Ia6a79eda713074ad651f4961dd7916ff3e63de2d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107179
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 5e804bf7708f734fcfe1619286a9319c2849ec5f)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107205

diff --git a/helpcontent2 b/helpcontent2
index e017c71c1ca6..c0209500150e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e017c71c1ca6e86fd65bab2af300fe149fcc01ab
+Subproject commit c0209500150e6fede8c288372a17cbf4b30817c5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bartosz Kosiorek (via logerrit)]

 emfio/qa/cppunit/emf/EmfImportTest.cxx  |   36 
 emfio/qa/cppunit/emf/data/test_mm_hienglish_ref.emf |binary
 emfio/qa/cppunit/emf/data/test_mm_himetric_ref.emf  |binary
 emfio/source/reader/mtftools.cxx|   58 +++-
 4 files changed, 80 insertions(+), 14 deletions(-)

New commits:
commit 8cefac236aee547e35fc41518f998b33980bf806
Author: Bartosz Kosiorek 
AuthorDate: Tue Nov 24 18:53:06 2020 +0100
Commit: Caolán McNamara 
CommitDate: Fri Dec 4 14:08:57 2020 +0100

EMF: tdf#138467 Fix MapMode translation

Add proper translation for map mapping modes:
MM_LOMETRIC = 0x02, MM_HIMETRIC = 0x03, MM_LOENGLISH = 0x04, MM_HIENGLISH = 
0x05, MM_TWIPS = 0x06

according to MS-EMF documentation.

Change-Id: If4c71b52e5236441837e62590797ced8acd6c80f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106251
Tested-by: Jenkins
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
Reviewed-by: Bartosz Kosiorek 
(cherry picked from commit e179e53e3c703153bb0bb3155c1c6e2d25577fe0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107105
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx 
b/emfio/qa/cppunit/emf/EmfImportTest.cxx
index 7a3e6593dc3a..8ec6166cbbe0 100644
--- a/emfio/qa/cppunit/emf/EmfImportTest.cxx
+++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx
@@ -49,6 +49,7 @@ class Test : public test::BootstrapFixture, public 
XmlTestTools, public unotest:
 void TestDrawLine();
 void TestLinearGradient();
 void TestTextMapMode();
+void TestEnglishMapMode();
 void TestCreatePen();
 void TestPdfInEmf();
 
@@ -66,6 +67,7 @@ public:
 CPPUNIT_TEST(TestDrawLine);
 CPPUNIT_TEST(TestLinearGradient);
 CPPUNIT_TEST(TestTextMapMode);
+CPPUNIT_TEST(TestEnglishMapMode);
 CPPUNIT_TEST(TestCreatePen);
 CPPUNIT_TEST(TestPdfInEmf);
 CPPUNIT_TEST_SUITE_END();
@@ -271,6 +273,40 @@ void Test::TestTextMapMode()
 assertXPath(pDocument, 
"/primitive2D/metafile/transform/polygonstroke[20]/line", "width", "11");
 }
 
+void Test::TestEnglishMapMode()
+{
+// Check import of EMF image with records: SETMAPMODE with MM_ENGLISH 
MapMode, STROKEANDFILLPATH, EXTTEXTOUTW, SETTEXTALIGN, STRETCHDIBITS
+// MM_LOENGLISH is mapped to 0.01 inch. Positive x is to the right; 
positive y is up.M
+Primitive2DSequence aSequence = 
parseEmf("/emfio/qa/cppunit/emf/data/test_mm_hienglish_ref.emf");
+CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength()));
+drawinglayer::tools::Primitive2dXmlDump dumper;
+xmlDocUniquePtr pDocument = 
dumper.dumpAndParse(comphelper::sequenceToContainer(aSequence));
+CPPUNIT_ASSERT (pDocument);
+
+assertXPath(pDocument, "/primitive2D/metafile/transform/mask/polypolygon", 
1);
+assertXPath(pDocument, 
"/primitive2D/metafile/transform/mask/polypolygon[1]", "path", "m0 
0h29699v20999h-29699z");
+
+assertXPath(pDocument, 
"/primitive2D/metafile/transform/mask/polypolygoncolor", 3);
+assertXPath(pDocument, 
"/primitive2D/metafile/transform/mask/polypolygoncolor[1]", "color", "#ad");
+assertXPath(pDocument, 
"/primitive2D/metafile/transform/mask/polypolygoncolor[1]/polypolygon", "path", 
"m-1-1h29699v21005h-29699z");
+assertXPath(pDocument, 
"/primitive2D/metafile/transform/mask/polypolygoncolor[2]/polypolygon", "path", 
"m1058 7937v5293h3175v-1059h-2118v-4234z");
+assertXPath(pDocument, 
"/primitive2D/metafile/transform/mask/polypolygoncolor[3]/polypolygon", "path", 
"m12699 1058h4234v1060h-1587v4231h-1059v-4231h-1588z");
+
+assertXPath(pDocument, 
"/primitive2D/metafile/transform/mask/textsimpleportion", 4);
+assertXPath(pDocument, 
"/primitive2D/metafile/transform/mask/textsimpleportion[1]", "text", "UL");
+assertXPath(pDocument, 
"/primitive2D/metafile/transform/mask/textsimpleportion[1]", "fontcolor", 
"#00");
+assertXPath(pDocument, 
"/primitive2D/metafile/transform/mask/textsimpleportion[1]", "x", "106");
+assertXPath(pDocument, 
"/primitive2D/metafile/transform/mask/textsimpleportion[1]", "y", "459");
+assertXPath(pDocument, 
"/primitive2D/metafile/transform/mask/textsimpleportion[1]", "width", "424");
+assertXPath(pDocument, 
"/primitive2D/metafile/transform/mask/textsimpleportion[1]", "height", "424");
+
+assertXPath(pDocument, 
"/primitive2D/metafile/transform/mask/polygonhairline", 3);
+assertXPathContent(pDocument, 
"/primitive2D/metafile/transform/mask/polygonhairline[1]/polygon", "-1,-1 
29698,-1 29698,21004 -1,21004");
+assertXPathContent(pDocument, 
"/primitive2D/metafile/transform/mask/polygonhairline[2]/polygon", "1058,7937 
1058,13230 4233,13230 4233,12171 2115,12171 2115,7937");
+assertXPathContent(pDocument, 
"/primitive2D/metafile/transform/mask/polygonhairline[3]/polygon", "12699,1058 
16933,1058 16933,2118 15346,2118 15346,6349 14287,6349 14287,2118 12699,2118");
+
+
+}

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

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

 sw/qa/extras/uiwriter/data3/tdf100691.fodt |  230 +
 sw/qa/extras/uiwriter/uiwriter3.cxx|   25 +++
 sw/source/core/tox/txmsrt.cxx  |2 
 3 files changed, 256 insertions(+), 1 deletion(-)

New commits:
commit 474f79224d2db89dc33bae89edd69979d53e745b
Author: László Németh 
AuthorDate: Fri Dec 4 12:02:19 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Dec 4 15:08:42 2020 +0100

tdf#100691 sw Table of Contents: remove hidden text

part of chapter, section etc. names.

See also commit daf2a7d957c829c551754871a3545495c0f76bc0
(tdf#61154 sw Table of Contents: remove tracked deletion).

Change-Id: I96f2308b1b5241f62bcb0091aae32757caeab73b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107214
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit 69a73d0443d408f04837c8781e8fd2296fdd49c6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107206
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sw/qa/extras/uiwriter/data3/tdf100691.fodt 
b/sw/qa/extras/uiwriter/data3/tdf100691.fodt
new file mode 100644
index ..6488f0b40663
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data3/tdf100691.fodt
@@ -0,0 +1,230 @@
+
+http://www.w3.org/TR/css3-text/"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:ooow="http://openoffice.org/200
 4/writer" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:table="urn:oasis:names:tc:open
 document:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
+ 
2020-12-04T11:52:59.211331599PT29S1LibreOfficeDev/7.2.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/e3e68283a0a3457df3501428f8c1310077a7d9b8
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink"/>
+  
+ 
+ 
+  
+ 
+ 
+  
+   
+   
+
+   
+   
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+  
+  
+  
+  
+ 
+ 
+  
+  
+   
+  
+  
+   
+
+   
+  
+  
+   
+
+   
+   
+   
+  
+ 
+ 
+  
+ 
+ 
+  
+   
+
+
+
+
+
+   
+   
+   
+
+ Table of 
Contents
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+  
+ 

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

[Szymon Kłos (via logerrit)]

 sc/source/ui/view/gridwin.cxx |   27 +--
 1 file changed, 13 insertions(+), 14 deletions(-)

New commits:
commit cbad3dec6421afb5f0040058bba7b97c3ee09cb4
Author: Szymon Kłos 
AuthorDate: Fri Dec 4 15:14:03 2020 +0100
Commit: Szymon Kłos 
CommitDate: Fri Dec 4 15:33:52 2020 +0100

pivot table: fix interactions in online

Single clicks were identified as double so
clicks in the pivot table caused to create
new tables or other unwanted behaviour.

In case cursor is over pivot table - require
real double click.

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

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index fe1bf2703a34..c3473afaebbf 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2116,23 +2116,26 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& 
rMEvt )
 pView->ResetBrushDocument();// invalidates pBrushDoc 
pointer
 }
 
+Point aPos = rMEvt.GetPosPixel();
+SCCOL nPosX;
+SCROW nPosY;
+SCTAB nTab = pViewData->GetTabNo();
+pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY );
+ScDPObject* pDPObj  = pDoc->GetDPAtCursor( nPosX, nPosY, nTab );
+
+bool bInDataPilotTable = (pDPObj != nullptr);
+
 // double click (only left button)
 // in the tiled rendering case, single click works this way too
 
 bool bIsTiledRendering = comphelper::LibreOfficeKit::isActive();
 bool bDouble = ( rMEvt.GetClicks() == 2 && rMEvt.IsLeft() );
-if ((bDouble || bIsTiledRendering)
+if ((bDouble || (bIsTiledRendering && !bInDataPilotTable))
 && !bRefMode
 && (nMouseStatus == SC_GM_DBLDOWN || (bIsTiledRendering && 
nMouseStatus != SC_GM_URLDOWN))
 && !pScMod->IsRefDialogOpen())
 {
 //  data pilot table
-Point aPos = rMEvt.GetPosPixel();
-SCCOL nPosX;
-SCROW nPosY;
-SCTAB nTab = pViewData->GetTabNo();
-pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY );
-ScDPObject* pDPObj  = pDoc->GetDPAtCursor( nPosX, nPosY, nTab );
 if ( pDPObj && pDPObj->GetSaveData()->GetDrillDown() )
 {
 ScAddress aCellPos( nPosX, nPosY, pViewData->GetTabNo() );
@@ -2248,9 +2251,7 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt 
)
 if (isTiledRendering && pViewShell &&
 (pViewShell->isLOKMobilePhone() || 
pViewShell->isLOKTablet()))
 {
-Point aPos = rMEvt.GetPosPixel();
-SCCOL nPosX;
-SCROW nPosY;
+aPos = rMEvt.GetPosPixel();
 pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, 
nPosX, nPosY );
 auto pForTabView = dynamic_cast(pViewShell);
 OString aCursor = 
pForTabView->GetViewData().describeCellCursorAt(nPosX, nPosY);
@@ -2303,10 +2304,8 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& 
rMEvt )
 uno::Reference< script::vba::XVBAEventProcessor > xVbaEvents = 
pDoc->GetVbaEventProcessor();
 if( xVbaEvents.is() ) try
 {
-Point aPos = rMEvt.GetPosPixel();
-SCCOL nPosX;
-SCROW nPosY;
-SCTAB nTab = pViewData->GetTabNo();
+aPos = rMEvt.GetPosPixel();
+nTab = pViewData->GetTabNo();
 pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, 
nPosY );
 OUString sURL;
 ScRefCellValue aCell;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Balaharipreetha Muthu (via logerrit)]

 source/text/shared/guide/convertfilters.xhp |  330 
 1 file changed, 330 deletions(-)

New commits:
commit 7ad3201bf8bc895e9cc8742fe51ac94431ec50bf
Author: Balaharipreetha Muthu 
AuthorDate: Thu Dec 3 21:49:42 2020 +0100
Commit: Olivier Hallot 
CommitDate: Fri Dec 4 15:43:35 2020 +0100

tdf#138627 - Repeated data in Tables of File Conversion Filter Names

Delete repeated rows in table

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

diff --git a/source/text/shared/guide/convertfilters.xhp 
b/source/text/shared/guide/convertfilters.xhp
index 32e34091f..b448266fa 100644
--- a/source/text/shared/guide/convertfilters.xhp
+++ b/source/text/shared/guide/convertfilters.xhp
@@ -110,17 +110,6 @@
 fb2 zip
 
 
-
-
-HTML 
Document
-
-
-text/html
-
-
-html xhtml htm
-
-
 
 
 HTML 
Document
@@ -374,28 +363,6 @@
 fodt odt xml
 
 
-
-
-OpenOffice.org 
1.0 Text Document
-
-
-application/vnd.sun.xml.writer
-
-
-sxw
-
-
-
-
-OpenOffice.org 
1.0 Text Document
-
-
-application/vnd.sun.xml.writer
-
-
-sxw
-
-
 
 
 OpenOffice.org 
1.0 Text Document
@@ -407,28 +374,6 @@
 sxw
 
 
-
-
-PDF - Portable 
Document Format
-
-
-application/pdf
-
-
-pdf
-
-
-
-
-PDF - Portable 
Document Format
-
-
-application/pdf
-
-
-pdf
-
-
 
 
 PDF - Portable 
Document Format
@@ -495,28 +440,6 @@
 602 txt
 
 
-
-
-Text
-
-
-text/plain
-
-
-csv tsv tab txt
-
-
-
-
-Text
-
-
-text/plain
-
-
-csv tsv tab txt
-
-
 
 
 Text
@@ -1797,17 +1720,6 @@
 
 
 
-
-
-BMP - 
Windows Bitmap
-
-
-image/x-MS-bmp
-
-
-bmp
-
-
 
 
 BMP - 
Windows Bitmap
@@ -1841,17 +1753,6 @@
 dxf
 
 
-
-
-EMF - 
Enhanced Meta File
-
-
-image/x-emf
-
-
-emf
-
-
 
 
 EMF - 
Enhanced Meta File
@@ -1863,17 +1764,6 @@
 emf
 
 
-
-
-EPS - 
Encapsulated PostScript
-
-
-image/x-eps
-
-
-eps
-
-
 
 
 EPS - 
Encapsulated PostScript
@@ -1885,17 +1775,6 @@
 eps
 
 
-
-
-GIF - 
Graphics Interchange
-
-
-image/gif
-
-
-gif
-
-
 
 
 GIF - 
Graphics Interchange
@@ -1907,17 +1786,6 @@
 gif
 
 
-
-
-HTML
-
-
-text/html
-
-
-html htm
-
-
 
 
 HTML
@@ -1929,28 +1797,6 @@
 html htm
 
 
-
-
-JPEG - 
Joint Photographic Experts Group
-
-
-image/jpeg
-
-
-jpg jpeg jfif jif jpe
-
-
-
-
-JPEG - 
Joint Photographic Experts Group
-
-
-image/jpeg
-
-
-jpg jpeg jfif jif jpe
-
-
 
 

[Libreoffice-commits] core.git: helpcontent2

[Balaharipreetha Muthu (via logerrit)]

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

New commits:
commit 7b4d3dde79992c80c62475c63dc6aebf5a210fb2
Author: Balaharipreetha Muthu 
AuthorDate: Fri Dec 4 15:43:35 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Fri Dec 4 15:43:35 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 7ad3201bf8bc895e9cc8742fe51ac94431ec50bf
  - tdf#138627 - Repeated data in Tables of File Conversion Filter Names

Delete repeated rows in table

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

diff --git a/helpcontent2 b/helpcontent2
index 5e804bf7708f..7ad3201bf8bc 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5e804bf7708f734fcfe1619286a9319c2849ec5f
+Subproject commit 7ad3201bf8bc895e9cc8742fe51ac94431ec50bf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 wizards/source/sfdialogs/SF_DialogControl.xba |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b760e1f28840ae5ecce0c00201fa058c17334203
Author: Andrea Gelmini 
AuthorDate: Fri Dec 4 00:15:42 2020 +0100
Commit: Jean-Pierre Ledure 
CommitDate: Fri Dec 4 15:54:20 2020 +0100

Fix typo

Change-Id: I26d4878c4e555c3760aec442d0a27b753ba2fc90
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107184
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure 

diff --git a/wizards/source/sfdialogs/SF_DialogControl.xba 
b/wizards/source/sfdialogs/SF_DialogControl.xba
index 56d362e48a52..3a85149f3e93 100644
--- a/wizards/source/sfdialogs/SF_DialogControl.xba
+++ b/wizards/source/sfdialogs/SF_DialogControl.xba
@@ -27,7 +27,7 @@ Option Explicit
 ''' It is easy with the API proposed in the current 
class to populate a tree, either
 ''' - branch by branch (CreateRoot and 
AddChild), or
 ''' - with a set of branches at once 
(AddSubtree)
-''' Additionally populating a TreeConctrol can be 
done statically or dynamically
+''' Additionally populating a TreeControl can be 
done statically or dynamically
 '''
 ''' Service invocation:
 ''' Dim myDialog As Object, myControl As 
Object
@@ -741,7 +741,7 @@ Try:
oRoot.DataValue = DataValue
.setRoot(oRoot)
'  To be visible, a root must have contained at least 1 
child. Create a fictive one and erase it.
-   '  This behavious does not seem related to the 
RootDisplayed property ??
+   '  This behaviour does not seem related to the 
RootDisplayed property ??
oRoot.appendChild(.createNode("Something", False))
oRoot.removeChildByIndex(0)
End With
@@ -1069,7 +1069,7 @@ Public Sub _Initialize()
 ''' - Initialization of private members
 ''' - Collection of main attributes
 
-Dim vServiceName As Variant'  Splitted service name
+Dim vServiceName As Variant'  Split service name
 Dim sType As String'  Last component of 
service name
 Try:
_ImplementationName = _ControlModel.getImplementationName()
@@ -1613,4 +1613,4 @@ Private Function _Repr() As String
 End Function   '  SFDialogs.SF_DialogControl._Repr
 
 REM  END OF 
SFDIALOGS.SF_DIALOGCONTROL
-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx |   17 +
 1 file changed, 17 insertions(+)

New commits:
commit 30c54afbf5bf03da27db7f90b518817cd05e8ccd
Author: Caolán McNamara 
AuthorDate: Fri Dec 4 12:58:20 2020 +
Commit: Caolán McNamara 
CommitDate: Fri Dec 4 15:56:45 2020 +0100

disable tests that don't work without pdfium

we're probably past the end of the road on --disable-pdfium

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

diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx 
b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
index 283223b9c409..f6bdfce9c050 100644
--- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
+++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
@@ -8,6 +8,7 @@
  */
 
 #include 
+#include 
 
 #include 
 
@@ -85,7 +86,12 @@ std::vector 
PDFSigningTest::verify(const OUString& rURL, s
 SvFileStream aStream(rURL, StreamMode::READ);
 PDFSignatureHelper aHelper;
 CPPUNIT_ASSERT(aHelper.ReadAndVerifySignatureSvStream(aStream));
+
+#if HAVE_FEATURE_PDFIUM
 CPPUNIT_ASSERT_EQUAL(nCount, aHelper.GetSignatureInformations().size());
+#else
+(void)nCount;
+#endif
 for (size_t i = 0; i < aHelper.GetSignatureInformations().size(); ++i)
 {
 const SignatureInformation& rInfo = 
aHelper.GetSignatureInformations()[i];
@@ -161,6 +167,7 @@ bool PDFSigningTest::sign(const OUString& rInURL, const 
OUString& rOutURL,
 return bSignSuccessful;
 }
 
+#if HAVE_FEATURE_PDFIUM
 /// Test adding a new signature to a previously unsigned file.
 CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDFAdd)
 {
@@ -184,6 +191,7 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDFAdd)
 CPPUNIT_ASSERT_EQUAL(xml::crypto::DigestID::SHA256, 
aInfos[0].nDigestID);
 }
 }
+#endif
 
 /// Test signing a previously unsigned file twice.
 CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDFAdd2)
@@ -205,6 +213,7 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDFAdd2)
 sign(aInURL, aOutURL, 1);
 }
 
+#if HAVE_FEATURE_PDFIUM
 /// Test removing a signature from a previously signed file.
 CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDFRemove)
 {
@@ -283,6 +292,8 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDFRemoveAll)
 CPPUNIT_ASSERT_EQUAL(static_cast(0), rInformations.size());
 }
 
+#endif
+
 CPPUNIT_TEST_FIXTURE(PDFSigningTest, testTdf107782)
 {
 uno::Reference xSEInitializer
@@ -305,6 +316,7 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testTdf107782)
 aManager.getSecurityEnvironment());
 }
 
+#if HAVE_FEATURE_PDFIUM
 /// Test a PDF 1.4 document, signed by Adobe.
 CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDF14Adobe)
 {
@@ -316,6 +328,7 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDF14Adobe)
 // This was 0, out-of-PKCS#7 signature date wasn't read.
 CPPUNIT_ASSERT_EQUAL(static_cast(2016), 
aInfos[1].stDateTime.Year);
 }
+#endif
 
 /// Test a PDF 1.6 document, signed by Adobe.
 CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDF16Adobe)
@@ -359,6 +372,7 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDF14LOWin)
 verify(m_directories.getURLFromSrc(DATA_DIRECTORY) + "pdf14lowin.pdf", 1);
 }
 
+#if HAVE_FEATURE_PDFIUM
 /// Test a PAdES document, signed by LO on Linux.
 CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDFPAdESGood)
 {
@@ -458,6 +472,7 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testGood)
  static_cast(rInformation.nStatus));
 }
 }
+#endif
 
 /// Test that we don't crash / loop while tokenizing these files.
 CPPUNIT_TEST_FIXTURE(PDFSigningTest, testTokenize)
@@ -490,6 +505,7 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testTokenize)
 CPPUNIT_ASSERT_EQUAL(static_cast(1), 
aDocument.GetPages().size());
 }
 }
+#if HAVE_FEATURE_PDFIUM
 
 /// Test handling of unknown SubFilter values.
 CPPUNIT_TEST_FIXTURE(PDFSigningTest, testUnknownSubFilter)
@@ -533,6 +549,7 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testGoodCustomMagic)
 std::vector& rInformations = 
aManager.getCurrentSignatureInformations();
 CPPUNIT_ASSERT_EQUAL(static_cast(1), rInformations.size());
 }
+#endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx |   17 +
 1 file changed, 17 insertions(+)

New commits:
commit f3babc0adedc4ed304f047ab5dcbfb34a9a3505c
Author: Caolán McNamara 
AuthorDate: Fri Dec 4 12:58:20 2020 +
Commit: Caolán McNamara 
CommitDate: Fri Dec 4 15:57:03 2020 +0100

disable tests that don't work without pdfium

we're probably past the end of the road on --disable-pdfium

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

diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx 
b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
index 283223b9c409..f6bdfce9c050 100644
--- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
+++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
@@ -8,6 +8,7 @@
  */
 
 #include 
+#include 
 
 #include 
 
@@ -85,7 +86,12 @@ std::vector 
PDFSigningTest::verify(const OUString& rURL, s
 SvFileStream aStream(rURL, StreamMode::READ);
 PDFSignatureHelper aHelper;
 CPPUNIT_ASSERT(aHelper.ReadAndVerifySignatureSvStream(aStream));
+
+#if HAVE_FEATURE_PDFIUM
 CPPUNIT_ASSERT_EQUAL(nCount, aHelper.GetSignatureInformations().size());
+#else
+(void)nCount;
+#endif
 for (size_t i = 0; i < aHelper.GetSignatureInformations().size(); ++i)
 {
 const SignatureInformation& rInfo = 
aHelper.GetSignatureInformations()[i];
@@ -161,6 +167,7 @@ bool PDFSigningTest::sign(const OUString& rInURL, const 
OUString& rOutURL,
 return bSignSuccessful;
 }
 
+#if HAVE_FEATURE_PDFIUM
 /// Test adding a new signature to a previously unsigned file.
 CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDFAdd)
 {
@@ -184,6 +191,7 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDFAdd)
 CPPUNIT_ASSERT_EQUAL(xml::crypto::DigestID::SHA256, 
aInfos[0].nDigestID);
 }
 }
+#endif
 
 /// Test signing a previously unsigned file twice.
 CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDFAdd2)
@@ -205,6 +213,7 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDFAdd2)
 sign(aInURL, aOutURL, 1);
 }
 
+#if HAVE_FEATURE_PDFIUM
 /// Test removing a signature from a previously signed file.
 CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDFRemove)
 {
@@ -283,6 +292,8 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDFRemoveAll)
 CPPUNIT_ASSERT_EQUAL(static_cast(0), rInformations.size());
 }
 
+#endif
+
 CPPUNIT_TEST_FIXTURE(PDFSigningTest, testTdf107782)
 {
 uno::Reference xSEInitializer
@@ -305,6 +316,7 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testTdf107782)
 aManager.getSecurityEnvironment());
 }
 
+#if HAVE_FEATURE_PDFIUM
 /// Test a PDF 1.4 document, signed by Adobe.
 CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDF14Adobe)
 {
@@ -316,6 +328,7 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDF14Adobe)
 // This was 0, out-of-PKCS#7 signature date wasn't read.
 CPPUNIT_ASSERT_EQUAL(static_cast(2016), 
aInfos[1].stDateTime.Year);
 }
+#endif
 
 /// Test a PDF 1.6 document, signed by Adobe.
 CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDF16Adobe)
@@ -359,6 +372,7 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDF14LOWin)
 verify(m_directories.getURLFromSrc(DATA_DIRECTORY) + "pdf14lowin.pdf", 1);
 }
 
+#if HAVE_FEATURE_PDFIUM
 /// Test a PAdES document, signed by LO on Linux.
 CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDFPAdESGood)
 {
@@ -458,6 +472,7 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testGood)
  static_cast(rInformation.nStatus));
 }
 }
+#endif
 
 /// Test that we don't crash / loop while tokenizing these files.
 CPPUNIT_TEST_FIXTURE(PDFSigningTest, testTokenize)
@@ -490,6 +505,7 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testTokenize)
 CPPUNIT_ASSERT_EQUAL(static_cast(1), 
aDocument.GetPages().size());
 }
 }
+#if HAVE_FEATURE_PDFIUM
 
 /// Test handling of unknown SubFilter values.
 CPPUNIT_TEST_FIXTURE(PDFSigningTest, testUnknownSubFilter)
@@ -533,6 +549,7 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testGoodCustomMagic)
 std::vector& rInformations = 
aManager.getCurrentSignatureInformations();
 CPPUNIT_ASSERT_EQUAL(static_cast(1), rInformations.size());
 }
+#endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/sanitizers sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk

[Caolán McNamara (via logerrit)]

 solenv/sanitizers/ui/modules/swriter.suppr  |8 +
 sw/UIConfig_swriter.mk  |5 -
 sw/inc/strings.hrc  |2 
 sw/source/uibase/docvw/FrameControlsManager.cxx |   22 -
 sw/source/uibase/docvw/HeaderFooterWin.cxx  |   90 --
 sw/source/uibase/docvw/PageBreakWin.cxx |   69 ++---
 sw/source/uibase/docvw/UnfloatTableButton.cxx   |   43 +++---
 sw/source/uibase/inc/FrameControl.hxx   |   15 ++-
 sw/source/uibase/inc/HeaderFooterWin.hxx|   15 +--
 sw/source/uibase/inc/PageBreakWin.hxx   |   15 +--
 sw/source/uibase/inc/UnfloatTableButton.hxx |6 +
 sw/uiconfig/swriter/ui/headerfootermenu.ui  |   47 ---
 sw/uiconfig/swriter/ui/hfmenubutton.ui  |   97 
 sw/uiconfig/swriter/ui/pagebreakmenu.ui |   25 --
 sw/uiconfig/swriter/ui/pbmenubutton.ui  |   59 ++
 sw/uiconfig/swriter/ui/unfloatbutton.ui |   28 ++
 16 files changed, 351 insertions(+), 195 deletions(-)

New commits:
commit 51379fb3d46e5891bdaea0122bd62b0753663da3
Author: Caolán McNamara 
AuthorDate: Thu Dec 3 15:54:45 2020 +
Commit: Caolán McNamara 
CommitDate: Fri Dec 4 15:57:41 2020 +0100

weld writer's FrameControl MenuButtons

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

diff --git a/solenv/sanitizers/ui/modules/swriter.suppr 
b/solenv/sanitizers/ui/modules/swriter.suppr
index 5eec1594569b..922203ebcc9d 100644
--- a/solenv/sanitizers/ui/modules/swriter.suppr
+++ b/solenv/sanitizers/ui/modules/swriter.suppr
@@ -58,8 +58,10 @@ 
sw/uiconfig/swriter/ui/frmtypepage.ui://GtkCheckButton[@id='relheight'] missing-
 sw/uiconfig/swriter/ui/gotopagedialog.ui://GtkLabel[@id='page_count'] 
orphan-label
 sw/uiconfig/swriter/ui/gotopagedialog.ui://GtkEntry[@id='page'] no-labelled-by
 sw/uiconfig/swriter/ui/gotopagedialog.ui://GtkLabel[@id='page_label'] 
orphan-label
-sw/uiconfig/swriter/ui/headerfootermenu.ui://GtkMenuItem[@id='edit'] 
button-no-label
-sw/uiconfig/swriter/ui/headerfootermenu.ui://GtkMenuItem[@id='delete'] 
button-no-label
+sw/uiconfig/swriter/ui/hfmenubutton.ui://GtkMenuItem[@id='edit'] 
button-no-label
+sw/uiconfig/swriter/ui/hfmenubutton.ui://GtkMenuItem[@id='delete'] 
button-no-label
+sw/uiconfig/swriter/ui/hfmenubutton.ui://GtkButton[@id='button'] 
button-no-label
+sw/uiconfig/swriter/ui/hfmenubutton.ui://GtkMenuButton[@id='menubutton'] 
button-no-label
 sw/uiconfig/swriter/ui/inputeditbox.ui://GtkEntry[@id='entry'] no-labelled-by
 sw/uiconfig/swriter/ui/insertbookmark.ui://GtkLabel[@id='lbForbiddenChars'] 
orphan-label
 sw/uiconfig/swriter/ui/insertbreak.ui://GtkSpinButton[@id='pagenumsb'] 
missing-label-for
@@ -84,6 +86,7 @@ 
sw/uiconfig/swriter/ui/opttablepage.ui://GtkLabel[@id='label13'] orphan-label
 sw/uiconfig/swriter/ui/opttablepage.ui://GtkLabel[@id='label4'] orphan-label
 sw/uiconfig/swriter/ui/opttablepage.ui://GtkLabel[@id='label14'] orphan-label
 sw/uiconfig/swriter/ui/outlinenumberingpage.ui://GtkDrawingArea[@id='preview'] 
no-labelled-by
+sw/uiconfig/swriter/ui/pbmenubutton.ui://GtkMenuButton[@id='menubutton'] 
button-no-label
 sw/uiconfig/swriter/ui/poseditbox.ui://GtkEntry[@id='entry'] no-labelled-by
 sw/uiconfig/swriter/ui/mailmerge.ui://GtkLabel[@id='fieldlabel'] orphan-label
 sw/uiconfig/swriter/ui/mailmerge.ui://GtkLabel[@id='mailformatlabel'] 
orphan-label
@@ -177,6 +180,7 @@ 
sw/uiconfig/swriter/ui/tokenwidget.ui://GtkButton[@id='left'] button-no-label
 sw/uiconfig/swriter/ui/tokenwidget.ui://GtkButton[@id='right'] button-no-label
 sw/uiconfig/swriter/ui/toxbuttonwidget.ui://GtkToggleButton[@id='button'] 
button-no-label
 sw/uiconfig/swriter/ui/toxentrywidget.ui://GtkEntry[@id='entry'] no-labelled-by
+sw/uiconfig/swriter/ui/unfloatbutton.ui://GtkButton[@id='button'] 
button-no-label
 sw/uiconfig/swriter/ui/viewoptionspage.ui://GtkLabel[@id='measureunitlabel'] 
orphan-label
 sw/uiconfig/swriter/ui/watermarkdialog.ui://GtkLabel[@id='TextLabel'] 
orphan-label
 sw/uiconfig/swriter/ui/watermarkdialog.ui://GtkLabel[@id='FontLabel'] 
orphan-label
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 33074fc8f76e..71a0632d6979 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -161,7 +161,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/frmtypepage \
sw/uiconfig/swriter/ui/frmurlpage \
sw/uiconfig/swriter/ui/gotopagedialog \
-   sw/uiconfig/swriter/ui/headerfootermenu \
+   sw/uiconfig/swriter/ui/hfmenubutton \
sw/uiconfig/swriter/ui/indexentry \
sw/uiconfig/swriter/ui/inputfielddialog \
sw/uiconfig/swriter/ui/inputwinmenu \
@@ -204,6 +204,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/outlinen

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

[Mike Kaganski (via logerrit)]

 include/vcl/scheduler.hxx |1 +
 vcl/inc/schedulerimpl.hxx |   19 +++
 vcl/source/app/svapp.cxx  |1 +
 3 files changed, 21 insertions(+)

New commits:
commit 46f6b39c6d8acd064bafb2416feba757ba0d0fbc
Author: Mike Kaganski 
AuthorDate: Fri Dec 4 15:13:13 2020 +0300
Commit: Mike Kaganski 
CommitDate: Fri Dec 4 16:02:11 2020 +0100

Unlock scheduler when calling ProcessEventsToIdle

When processing the events, solar mutex will be temporarily released,
and then it's possible that another thread will acquire solar mutex
and try to lock scheduler. This will result in deadlock.

Seen in CppunitTest_sw_core_undo that deadlocked locally on Windows
frequently.

Main thread call stack:

win32u.dll!NtUserMsgWaitForMultipleObjectsEx()
user32.dll!RealMsgWaitForMultipleObjectsEx()
sal3.dll!osl_waitCondition(void * Condition, const TimeValue * 
pTimeout) Line 82
vclplug_winlo.dll!osl::Condition::wait(const TimeValue * pTimeout) Line 
120
vclplug_winlo.dll!SalYieldMutex::doAcquire(unsigned long nLockCount) 
Line 159
comphelper.dll!comphelper::SolarMutex::acquire(unsigned long 
nLockCount) Line 87
vclplug_winlo.dll!ImplSalYieldMutexAcquireWithWait(unsigned long 
nCount) Line 204
vclplug_winlo.dll!WinSalTimer::ImplHandleElapsedTimer() Line 163
vclplug_winlo.dll!WinSalTimer::ImplHandle_WM_TIMER(unsigned __int64 
aWPARAM) Line 197
vclplug_winlo.dll!SalComWndProc(HWND__ * __formal, unsigned int nMsg, 
unsigned __int64 wParam, __int64 lParam, bool & rDef) Line 638
vclplug_winlo.dll!SalComWndProcW(HWND__ * hWnd, unsigned int nMsg, 
unsigned __int64 wParam, __int64 lParam) Line 665
user32.dll!UserCallWinProcCheckWow()
user32.dll!DispatchMessageWorker()
vclplug_winlo.dll!ImplSalDispatchMessage(const tagMSG * pMsg) Line 426
vclplug_winlo.dll!ImplSalYield(bool bWait, bool 
bHandleAllCurrentEvents) Line 457
vclplug_winlo.dll!WinSalInstance::DoYield(bool bWait, bool 
bHandleAllCurrentEvents) Line 528
vcllo.dll!ImplYield(bool i_bWait, bool i_bAllEvents) Line 447
vcllo.dll!Application::Reschedule(bool i_bAllEvents) Line 461
vcllo.dll!Scheduler::ProcessEventsToIdle() Line 466
vcllo.dll!Scheduler::ImplDeInitScheduler() Line 129
vcllo.dll!DeInitVCL() Line 483
vclbootstrapprotector.dll!`anonymous 
namespace'::Protector::~Protector() Line 34
vclbootstrapprotector.dll!`anonymous namespace'::Protector::`scalar 
deleting destructor'(unsigned int)
cppunitd_dll.dll!CppUnit::ProtectorChain::pop() Line 56
cppunitd_dll.dll!CppUnit::TestResult::popProtector() Line 197
cppunittester.exe!`anonymous namespace'::ProtectedFixtureFunctor::run() 
Line 332
cppunittester.exe!sal_main() Line 473
cppunittester.exe!main(int argc, char * * argv) Line 380
cppunittester.exe!invoke_main() Line 79
cppunittester.exe!__scrt_common_main_seh() Line 288
cppunittester.exe!__scrt_common_main() Line 331
cppunittester.exe!mainCRTStartup() Line 17
kernel32.dll!BaseThreadInitThunk()
ntdll.dll!RtlUserThreadStart()

Clipboard thread call stack:

ntdll.dll!NtWaitForAlertByThreadId()
ntdll.dll!RtlpWaitOnAddressWithTimeout()
ntdll.dll!RtlpWaitOnAddress()
ntdll.dll!RtlpWaitOnCriticalSection()
ntdll.dll!RtlpEnterCriticalSectionContended()
ntdll.dll!RtlEnterCriticalSection()
sal3.dll!osl_acquireMutex(_oslMutexImpl * Mutex) Line 66
vcllo.dll!osl::Mutex::acquire() Line 57
vcllo.dll!SchedulerMutex::acquire(unsigned long nLockCount) Line 213
vcllo.dll!Scheduler::Lock(unsigned long nLockCount) Line 237
vcllo.dll!SchedulerGuard::SchedulerGuard() Line 60
vcllo.dll!Task::~Task() Line 660
vcllo.dll!Timer::~Timer() Line 61
vcllo.dll!Idle::~Idle()
svxcorelo.dll!SdrPaintView::~SdrPaintView() Line 189
svxcorelo.dll!SdrSnapView::~SdrSnapView() Line 200
svxcorelo.dll!SdrMarkView::~SdrMarkView() Line 193
svxcorelo.dll!SdrEditView::~SdrEditView() Line 125
svxcorelo.dll!SdrPolyEditView::~SdrPolyEditView() Line 58
svxcorelo.dll!SdrGlueEditView::~SdrGlueEditView() Line 40
svxcorelo.dll!SdrObjEditView::~SdrObjEditView() Line 95
svxcorelo.dll!SdrExchangeView::~SdrExchangeView()
svxcorelo.dll!SdrDragView::~SdrDragView() Line 65
svxcorelo.dll!SdrCreateView::~SdrCreateView() Line 200
svxcorelo.dll!SdrView::~SdrView() Line 159
swlo.dll!SdrView::`scalar deleting destructor'(unsigned int)
swlo.dll!std::default_delete::operator()(SdrView * _Ptr) Line 
2537

swlo.dll!std::unique_ptr>::~unique_ptr>()
 Line 2649
swlo.dll!SwDrawFrameFormat::MakeGraphic(ImageMap * __formal) Line 7491
swlo.dll!OutHTML_FrameFormatAsImage(Writer & 

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

[Caolán McNamara (via logerrit)]

 sc/source/core/tool/interpr1.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 22c7ad49679c2abcac4409c93d32b20746b16904
Author: Caolán McNamara 
AuthorDate: Wed Dec 2 13:31:59 2020 +
Commit: Eike Rathke 
CommitDate: Fri Dec 4 16:39:23 2020 +0100

cid#1468696 Logically dead code

bool bTryXlA1 = (eConv == FormulaGrammar::CONV_A1_XL_A1);

if (...)
eConv = FormulaGrammar::CONV_XL_R1C1;

if (bTryXlA1 || eConv == FormulaGrammar::CONV_OOO)
{
if (...)
{
bExternalName = true;
eConv = FormulaGrammar::CONV_OOO;
}
}

if (!bExternalName && (bTryXlA1 || eConv != FormulaGrammar::CONV_OOO))
{
if (...)
{
if (eConv == FormulaGrammar::CONV_OOO)
{
// this condition can only be reached if bTryXlA1 is true
// but bTryXlA1 is only true if eConv was originally
// CONV_A1_XL_A1. The only things eConv can be changed to
// in this function are CONV_XL_R1C1 or CONV_OOO. If it
// was changed to CONV_OOO then bExternalName was also
// set to true and the block isn't entered if that is true
}
}
}

maybe an unconditional assignment of
eConv = FormulaGrammar::CONV_XL_A1
is a better solution

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

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 95185b71aa19..38bcc983c36e 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -8199,8 +8199,6 @@ void ScInterpreter::ScIndirect()
 if (nIndex >= 3 && sRefStr[nIndex-1] == '\'')
 {
 bExternalName = true;
-if (eConv == FormulaGrammar::CONV_OOO)
-eConv = FormulaGrammar::CONV_XL_A1;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/app/AppDetailPageHelper.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 51d7f7717b12171d215df3a9920d431b0beae85a
Author: Caolán McNamara 
AuthorDate: Fri Dec 4 14:24:07 2020 +
Commit: Caolán McNamara 
CommitDate: Fri Dec 4 17:20:19 2020 +0100

create an awt::XPopupMenu the standard way

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

diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx 
b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 3dd2195f7965..02a80d2046d7 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -50,7 +51,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include "AppController.hxx"
@@ -1117,8 +1117,8 @@ IMPL_LINK_NOARG(OAppDetailPageHelper, OnDropdownClickHdl, 
weld::ToggleButton&, v
 if (!xPopupController.is())
 return;
 
-rtl::Reference xPopupMenu(new VCLXPopupMenu);
-xPopupController->setPopupMenu(xPopupMenu.get());
+css::uno::Reference 
xPopupMenu(css::awt::PopupMenu::create(xContext));
+xPopupController->setPopupMenu(xPopupMenu);
 
 css::util::URL aTargetURL;
 Reference xDispatchProvider(xFrame, 
css::uno::UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 xmloff/inc/txtfldi.hxx|7 +-
 xmloff/source/forms/elementimport.cxx |9 ++-
 xmloff/source/forms/elementimport.hxx |6 +-
 xmloff/source/text/txtfldi.cxx|   80 ++
 4 files changed, 44 insertions(+), 58 deletions(-)

New commits:
commit 3d0084770923ed8c17e496965abae862a4796e63
Author: Noel 
AuthorDate: Fri Dec 4 16:14:16 2020 +0200
Commit: Noel Grandin 
CommitDate: Fri Dec 4 17:39:12 2020 +0100

fastparser in a couple of random places

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

diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index bebc30a5b135..10c33b3bfa31 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -1061,10 +1061,9 @@ private:
 virtual void PrepareField(
 const css::uno::Reference< css::beans::XPropertySet > & xPropertySet) 
override;
 
-virtual SvXMLImportContextRef CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const css::uno::Reference& xAttrList ) 
override;
+virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL 
createFastChildContext(
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& 
AttrList ) override;
 virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
 };
 
diff --git a/xmloff/source/forms/elementimport.cxx 
b/xmloff/source/forms/elementimport.cxx
index 896aaf3cd3cc..6f892de8ca09 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -1301,10 +1301,11 @@ namespace xmloff
 enableTrackAttributes();
 }
 
-SvXMLImportContextRef OTextLikeImport::CreateChildContext( sal_uInt16 
_nPrefix, const OUString& _rLocalName,
-const Reference< XAttributeList >& _rxAttrList )
+css::uno::Reference< css::xml::sax::XFastContextHandler > 
OTextLikeImport::createFastChildContext(
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& 
xAttrList )
 {
-if ( ( XML_NAMESPACE_TEXT == _nPrefix ) && 
_rLocalName.equalsIgnoreAsciiCase("p") )
+if ( nElement == XML_ELEMENT(TEXT, XML_P) )
 {
 OSL_ENSURE( m_eElementType == OControlElement::TEXT_AREA,
 "OTextLikeImport::CreateChildContext: text paragraphs in a 
non-text-area?" );
@@ -1327,7 +1328,7 @@ namespace xmloff
 if ( m_xCursor.is() )
 {
 m_bEncounteredTextPara = true;
-return xTextImportHelper->CreateTextChildContext( 
m_rContext.getGlobalContext(), _nPrefix, _rLocalName, _rxAttrList );
+return xTextImportHelper->CreateTextChildContext( 
m_rContext.getGlobalContext(), nElement, xAttrList );
 }
 }
 else
diff --git a/xmloff/source/forms/elementimport.hxx 
b/xmloff/source/forms/elementimport.hxx
index 67eebc2f2a7a..a3f9d6de4359 100644
--- a/xmloff/source/forms/elementimport.hxx
+++ b/xmloff/source/forms/elementimport.hxx
@@ -420,9 +420,9 @@ namespace xmloff
 virtual void SAL_CALL startFastElement(
 sal_Int32 nElement,
 const css::uno::Reference< css::xml::sax::XFastAttributeList >& 
_rxAttrList) override;
-virtual SvXMLImportContextRef CreateChildContext(
-sal_uInt16 _nPrefix, const OUString& _rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList >& 
_rxAttrList) override;
+virtual css::uno::Reference< css::xml::sax::XFastContextHandler > 
SAL_CALL createFastChildContext(
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& 
xAttrList ) override;
 virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
 
 private:
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 60c6027ce83b..96cfd80041f8 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -3309,65 +3309,51 @@ void XMLAnnotationImportContext::ProcessAttribute(
 XMLOFF_WARN_UNKNOWN_ATTR("xmloff", nAttrToken, sAttrValue);
 }
 
-SvXMLImportContextRef XMLAnnotationImportContext::CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const Reference& xAttrList )
+css::uno::Reference< css::xml::sax::XFastContextHandler > 
XMLAnnotationImportContext::createFastChildContext(
+sal_Int32 nElement,
+const uno::Reference< xml::sax::XFastAttributeList>& xAttrList )
 {
-SvXMLImportContext *pContext = nullptr;
-if( XML_NAMESPACE_DC == nPrefix )
-{
-if( IsXMLToken( rLocalName, XML_CREATOR ) )
-pContext = new XMLStringBufferImportContext(GetImport(), 
aAuthorBuffer);
-else if( IsXMLToken( rLoc

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

[Jean-Pierre Ledure (via logerrit)]

 wizards/source/sfdialogs/SF_DialogControl.xba |   55 +-
 1 file changed, 53 insertions(+), 2 deletions(-)

New commits:
commit d087459826212867e72a0031d3b2e91941140f60
Author: Jean-Pierre Ledure 
AuthorDate: Fri Dec 4 16:02:12 2020 +0100
Commit: Jean-Pierre Ledure 
CommitDate: Fri Dec 4 17:48:05 2020 +0100

ScriptForge: RootNode/CurrentNode for tree controls

RootNode returns the root node
CurrentNode is for getting or setting a unique selected node

Change-Id: Ie92761f57fe18b188769870ed7d2e0340a9e146c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107227
Tested-by: Jean-Pierre Ledure 
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure 

diff --git a/wizards/source/sfdialogs/SF_DialogControl.xba 
b/wizards/source/sfdialogs/SF_DialogControl.xba
index 3a85149f3e93..d7bfd7d6f44d 100644
--- a/wizards/source/sfdialogs/SF_DialogControl.xba
+++ b/wizards/source/sfdialogs/SF_DialogControl.xba
@@ -148,6 +148,20 @@ Property Get ControlType() As String
ControlType = _PropertyGet("ControlType")
 End Property   '  SFDialogs.SF_DialogControl.ControlType
 
+REM 
-
+Property Get CurrentNode() As Variant
+''' The CurrentNode property returns the currently selected 
node
+''' It returns Empty when there is no node selected
+''' When there are several selections, it returns the 
topmost node among the selected ones
+   CurrentNode = _PropertyGet("CurrentNode", "")
+End Property   '  SFDialogs.SF_DialogControl.CurrentNode (get)
+
+REM 
-
+Property Let CurrentNode(Optional ByVal pvCurrentNode As Variant)
+''' Set a single selection in a tree control
+   _PropertySet("CurrentNode", pvCurrentNode)
+End Property   '  SFDialogs.SF_DialogControl.CurrentNode (let)
+
 REM 
-
 Property Get Default() As Variant
 ''' The Default property specifies whether a command button 
is the default (OK) button.
@@ -459,6 +473,12 @@ Property Let Picture(Optional ByVal pvPicture As Variant)
_PropertySet("Picture", pvPicture)
 End Property   '  SFDialogs.SF_DialogControl.Picture (let)
 
+REM 
-
+Property Get RootNode() As Variant
+''' The RootNode property returns the last root node of a 
tree control
+   RootNode = _PropertyGet("RootNode", "")
+End Property   '  SFDialogs.SF_DialogControl.RootNode (get)
+
 REM 
-
 Property Get RowSource() As Variant
 ''' The RowSource property specifies the data contained in 
a combobox or a listbox
@@ -1105,7 +1125,7 @@ Private Function _PropertyGet(Optional ByVal psProperty 
As String _
 
 Dim vGet As Variant'  
Return value
 Static oSession As Object  '  Alias 
of SF_Session
-Dim vSelection As Variant  '  Alias 
of Model.SelectedItems
+Dim vSelection As Variant  '  Alias 
of Model.SelectedItems or Model.Selection
 Dim vList As Variant   '  Alias 
of Model.StringItemList
 Dim lIndex As Long '  
Index in StringItemList
 Dim sItem As String'  
A single item
@@ -1142,6 +1162,22 @@ Const cstSubArgs = ""
End Select
Case UCase("ControlType")
_PropertyGet = _ControlType
+   Case UCase("CurrentNode")
+   Select Case _ControlType
+   Case CTLTREECONTROL
+   If oSession.HasUNOMethod(_ControlView, 
"getSelection") Then
+   _PropertyGet = Empty
+   If _ControlModel.SelectionType 
<> com.sun.star.view.SelectionType.NONE Then
+   vSelection = 
_ControlView.getSelection()
+   If IsArray(vSelection) 
Then
+   If 
UBound(vSelection) >= 0 Then Set _PropertyGet = vSelection(0)
+   Else
+   Set 
_PropertyGet = vSelection
+   End If
+   End If
+   End If
+   Case Else   :   GoTo CatchType
+   End Select
Case UCase("De

[Libreoffice-commits] core.git: include/vcl svtools/source toolkit/inc toolkit/source vcl/source

[Caolán McNamara (via logerrit)]

 include/vcl/menu.hxx |3 +++
 include/vcl/toolkit/unowrap.hxx  |9 +++--
 svtools/source/control/managedmenubutton.cxx |8 
 toolkit/inc/helper/unowrapper.hxx|3 +++
 toolkit/source/helper/unowrapper.cxx |6 ++
 vcl/source/window/menu.cxx   |8 
 6 files changed, 31 insertions(+), 6 deletions(-)

New commits:
commit d97a819abe84fe667f8b136b1c2adaec5ca7196e
Author: Caolán McNamara 
AuthorDate: Fri Dec 4 15:18:38 2020 +
Commit: Caolán McNamara 
CommitDate: Fri Dec 4 17:48:20 2020 +0100

add a way to get an awt::XPopupMenu from a PopupMenu

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

diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 7613f14f157c..3838395601ac 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -50,6 +50,7 @@ class MenuBarWindow;
 struct SystemMenuData;
 enum class FloatWinPopupFlags;
 
+namespace com::sun::star::awt { class XPopupMenu; }
 namespace com::sun::star::accessibility { class XAccessible;  }
 namespace com::sun::star::frame { class XFrame; }
 
@@ -521,6 +522,8 @@ public:
 virtual void SelectItem(sal_uInt16 nId) override;
 void SetSelectedEntry( sal_uInt16 nId ); // for use by native submenu only
 
+css::uno::Reference CreateMenuInterface();
+
 static bool IsInExecute();
 static PopupMenu* GetActivePopupMenu();
 
diff --git a/include/vcl/toolkit/unowrap.hxx b/include/vcl/toolkit/unowrap.hxx
index ad528af0e0b3..c646dbccc882 100644
--- a/include/vcl/toolkit/unowrap.hxx
+++ b/include/vcl/toolkit/unowrap.hxx
@@ -30,10 +30,12 @@
 #include 
 
 namespace vcl { class Window; }
-class OutputDevice;
 class Menu;
+class OutputDevice;
+class PopupMenu;
 namespace com::sun::star::awt {
 class XGraphics;
+class XPopupMenu;
 class XToolkit;
 class XWindow;
 class XWindowPeer;
@@ -55,10 +57,13 @@ public:
 virtual voidReleaseAllGraphics( OutputDevice* pOutDev ) = 
0;
 
 // Window
-virtual css::uno::Reference< css::awt::XWindowPeer> GetWindowInterface( 
vcl::Window* pWindow ) = 0;
+virtual css::uno::Reference GetWindowInterface( 
vcl::Window* pWindow ) = 0;
 virtual voidSetWindowInterface( vcl::Window* pWindow, 
css::uno::Reference< css::awt::XWindowPeer > xIFace ) = 0;
 virtual VclPtr GetWindow(const 
css::uno::Reference& rxWindow) = 0;
 
+// PopupMenu
+virtual css::uno::Reference CreateMenuInterface( 
PopupMenu* pPopupMenu ) = 0;
+
 virtual voidWindowDestroyed( vcl::Window* pWindow ) = 0;
 
 // Accessibility
diff --git a/svtools/source/control/managedmenubutton.cxx 
b/svtools/source/control/managedmenubutton.cxx
index 45e9d98ca1a8..4db9d2a1858b 100644
--- a/svtools/source/control/managedmenubutton.cxx
+++ b/svtools/source/control/managedmenubutton.cxx
@@ -9,11 +9,11 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -31,7 +31,7 @@ public:
 void dispose() override;
 
 private:
-rtl::Reference m_xPopupMenu;
+css::uno::Reference m_xPopupMenu;
 css::uno::Reference m_xPopupController;
 };
 
@@ -71,7 +71,7 @@ void ManagedMenuButton::Activate()
 }
 
 if (!m_xPopupMenu.is())
-m_xPopupMenu.set(new VCLXPopupMenu(GetPopupMenu()));
+m_xPopupMenu = GetPopupMenu()->CreateMenuInterface();
 
 // FIXME: get the frame from the parent VclBuilder.
 css::uno::Reference 
xContext(comphelper::getProcessComponentContext());
@@ -112,7 +112,7 @@ void ManagedMenuButton::Activate()
 "com.sun.star.comp.framework.ResourceMenuController", aArgs, 
xContext), css::uno::UNO_QUERY);
 
 if (m_xPopupController.is())
-m_xPopupController->setPopupMenu(m_xPopupMenu.get());
+m_xPopupController->setPopupMenu(m_xPopupMenu);
 }
 
 }
diff --git a/toolkit/inc/helper/unowrapper.hxx 
b/toolkit/inc/helper/unowrapper.hxx
index cfb890584c61..6e10e870506d 100644
--- a/toolkit/inc/helper/unowrapper.hxx
+++ b/toolkit/inc/helper/unowrapper.hxx
@@ -55,6 +55,9 @@ public:
 virtual voidSetWindowInterface( vcl::Window* pWindow, 
css::uno::Reference< css::awt::XWindowPeer> xIFace ) override;
 virtual VclPtr GetWindow(const 
css::uno::Reference& rxWindow) override;
 
+// Menu
+virtual css::uno::Reference CreateMenuInterface( 
PopupMenu* pPopupMenu ) override;
+
 voidWindowDestroyed( vcl::Window* pWindow ) override;
 
 // Accessibility
diff --git a/toolkit/source/helper/unowrapper.cxx 
b/toolkit/source/helper/unowrapper.cxx
index eb37d4137419..edac7fe62b34 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -179,6 +180,11 @@ 

[Libreoffice-commits] core.git: solenv/bin solenv/clang-format svtools/Library_svt.mk svtools/source vcl/inc vcl/Library_vcl.mk vcl/source

[Caolán McNamara (via logerrit)]

 solenv/bin/native-code.py|1 -
 solenv/clang-format/excludelist  |2 +-
 svtools/Library_svt.mk   |1 -
 vcl/Library_vcl.mk   |1 +
 vcl/inc/managedmenubutton.hxx|   30 ++
 vcl/source/control/managedmenubutton.cxx |   28 +++-
 vcl/source/window/builder.cxx|   11 +++
 7 files changed, 46 insertions(+), 28 deletions(-)

New commits:
commit fcb7fe3a082c200f69f10c1d3951761a7e41d6e0
Author: Caolán McNamara 
AuthorDate: Fri Dec 4 15:39:45 2020 +
Commit: Caolán McNamara 
CommitDate: Fri Dec 4 17:48:56 2020 +0100

move ManagedMenuButton to vcl

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

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 13a7e720be08..6eefce978bb9 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -716,7 +716,6 @@ constructor_map = {
 custom_widgets = [
 'ContextVBox',
 'DropdownBox',
-'ManagedMenuButton',
 'NotebookbarTabControl',
 'NotebookbarToolBox',
 'PriorityHBox',
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index fddf4b2955f8..b7105c4d962d 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -11421,7 +11421,6 @@ svtools/source/control/ctrlbox.cxx
 svtools/source/control/ctrltool.cxx
 svtools/source/control/indexentryres.cxx
 svtools/source/control/inettbc.cxx
-svtools/source/control/managedmenubutton.cxx
 svtools/source/control/ruler.cxx
 svtools/source/control/scriptedtext.cxx
 svtools/source/control/tabbar.cxx
@@ -14995,6 +14994,7 @@ vcl/source/control/imp_listbox.cxx
 vcl/source/control/ivctrl.cxx
 vcl/source/control/listbox.cxx
 vcl/source/control/longcurr.cxx
+vcl/source/control/managedmenubutton.cxx
 vcl/source/control/menubtn.cxx
 vcl/source/control/notebookbar.cxx
 vcl/source/control/prgsbar.cxx
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index be89ea4c2b56..adaa6b1bc99d 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -96,7 +96,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
 svtools/source/control/ctrltool \
 svtools/source/control/indexentryres \
 svtools/source/control/inettbc \
-svtools/source/control/managedmenubutton \
 svtools/source/control/ruler \
 svtools/source/control/scriptedtext \
 svtools/source/control/tabbar \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index bc6b8f8f9af7..8f9608d2ca2c 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -199,6 +199,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 vcl/source/control/longcurr \
 vcl/source/control/imp_listbox \
 vcl/source/control/listbox \
+   vcl/source/control/managedmenubutton \
 vcl/source/control/menubtn \
 vcl/source/control/notebookbar \
 vcl/source/control/WeldedTabbedNotebookbar \
diff --git a/vcl/inc/managedmenubutton.hxx b/vcl/inc/managedmenubutton.hxx
new file mode 100644
index ..d80655288215
--- /dev/null
+++ b/vcl/inc/managedmenubutton.hxx
@@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include 
+#include 
+#include 
+
+class ManagedMenuButton : public MenuButton
+{
+public:
+ManagedMenuButton(vcl::Window* pParent, WinBits nStyle);
+~ManagedMenuButton() override;
+
+void Activate() override;
+void dispose() override;
+
+private:
+css::uno::Reference m_xPopupMenu;
+css::uno::Reference m_xPopupController;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/svtools/source/control/managedmenubutton.cxx 
b/vcl/source/control/managedmenubutton.cxx
similarity index 84%
rename from svtools/source/control/managedmenubutton.cxx
rename to vcl/source/control/managedmenubutton.cxx
index 4db9d2a1858b..880730721ce2 100644
--- a/svtools/source/control/managedmenubutton.cxx
+++ b/vcl/source/control/managedmenubutton.cxx
@@ -9,31 +9,13 @@
 
 #include 
 #include 
-#include 
+
+#include 
 #include 
-#include 
 
-#include 
-#include 
 #include 
+#include 
 #include 
-#include 
-
-namespace {
-
-class ManagedMenuButton : public MenuButton
-{
-public:
-ManagedMenuButton(vcl::Window* pParent, WinBits nStyle);
-~ManagedMenuButton() override;
-
-void Activate() override;
-void dispose() override;
-
-private:
-css::uno::Reference m_xPopupMenu;
-css::uno::Reference m_xPopupController;
-};
 
 Mana

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

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/check.cxx   |   10 
 compilerplugins/clang/check.hxx   |2 
 compilerplugins/clang/stringview.cxx  |   74 +++---
 compilerplugins/clang/test/stringview.cxx |   43 -
 sc/source/ui/docshell/impex.cxx   |4 +
 sw/qa/extras/ooxmlexport/ooxmlexport2.cxx |4 -
 6 files changed, 126 insertions(+), 11 deletions(-)

New commits:
commit 6c905fb6430b6ec43630e826f9afd935734f4c91
Author: Stephan Bergmann 
AuthorDate: Fri Dec 4 16:24:56 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Dec 4 17:54:48 2020 +0100

Improve loplugin:stringview detection of unnecessary O[U]String construction

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

diff --git a/compilerplugins/clang/check.cxx b/compilerplugins/clang/check.cxx
index 2ae58504fe3b..003224a21ba1 100644
--- a/compilerplugins/clang/check.cxx
+++ b/compilerplugins/clang/check.cxx
@@ -113,6 +113,16 @@ TypeCheck TypeCheck::LvalueReference() const {
 return TypeCheck();
 }
 
+TypeCheck TypeCheck::RvalueReference() const {
+if (!type_.isNull()) {
+auto const t = type_->getAs();
+if (t != nullptr) {
+return TypeCheck(t->getPointeeType());
+}
+}
+return TypeCheck();
+}
+
 TypeCheck TypeCheck::Pointer() const {
 if (!type_.isNull()) {
 auto const t = type_->getAs();
diff --git a/compilerplugins/clang/check.hxx b/compilerplugins/clang/check.hxx
index 03c5ab1eb1e4..9c35acff7b5e 100644
--- a/compilerplugins/clang/check.hxx
+++ b/compilerplugins/clang/check.hxx
@@ -64,6 +64,8 @@ public:
 
 TypeCheck LvalueReference() const;
 
+TypeCheck RvalueReference() const;
+
 inline ContextCheck Class(llvm::StringRef id) const;
 
 inline ContextCheck Struct(llvm::StringRef id) const;
diff --git a/compilerplugins/clang/stringview.cxx 
b/compilerplugins/clang/stringview.cxx
index 06b2fb8fdf02..26af817659be 100644
--- a/compilerplugins/clang/stringview.cxx
+++ b/compilerplugins/clang/stringview.cxx
@@ -122,21 +122,85 @@ bool StringView::VisitImplicitCastExpr(ImplicitCastExpr 
const* expr)
 {
 handleCXXConstructExpr(e1);
 }
-else if (auto const e2 = dyn_cast(e))
+else if (auto const e2 = dyn_cast(e))
 {
-handleCXXMemberCallExpr(e2);
+auto e3 = e2->getSubExpr();
+if (auto const e4 = dyn_cast(e3))
+{
+e3 = e4->getSubExpr();
+}
+if (auto const e4 = dyn_cast(e3))
+{
+handleCXXConstructExpr(e4);
+}
+}
+else if (auto const e3 = dyn_cast(e))
+{
+handleCXXMemberCallExpr(e3);
 }
 return true;
 }
 
 void StringView::handleCXXConstructExpr(CXXConstructExpr const* expr)
 {
-if (expr->getNumArgs() != 0)
+auto const d = expr->getConstructor();
+switch (d->getNumParams())
 {
-return;
+case 0:
+break;
+case 1:
+{
+auto const t = d->getParamDecl(0)->getType();
+if (t->isAnyCharacterType())
+{
+break;
+}
+loplugin::TypeCheck tc(t);
+if (tc.LvalueReference()
+.Const()
+.Class("OStringLiteral")
+.Namespace("rtl")
+.GlobalNamespace()
+|| tc.LvalueReference()
+   .Const()
+   .Class("OUStringLiteral")
+   .Namespace("rtl")
+   .GlobalNamespace()
+|| 
tc.RvalueReference().Struct("OStringNumber").Namespace("rtl").GlobalNamespace()
+|| 
tc.RvalueReference().Struct("OUStringNumber").Namespace("rtl").GlobalNamespace()
+|| tc.ClassOrStruct("basic_string_view").StdNamespace())
+{
+break;
+}
+return;
+}
+case 2:
+{
+auto const t0 = d->getParamDecl(0)->getType();
+if (t0->isPointerType() && 
t0->getPointeeType()->isAnyCharacterType())
+{
+auto const t = d->getParamDecl(1)->getType();
+if (t->isIntegralType(compiler.getASTContext())
+&& !(t->isBooleanType() || t->isAnyCharacterType()))
+{
+break;
+}
+}
+if (loplugin::TypeCheck(d->getParamDecl(1)->getType())
+.Struct("Dummy")
+.Namespace("libreoffice_internal")
+.Namespace("rtl")
+.GlobalNamespace())
+{
+break;
+}
+return;
+}
+default:
+return;
 }
 report(DiagnosticsEngine::Warning,
-   "instead of an empty %0, pass an empty 
'%select{std:

LibreOffice DevRoom Call for Papers

[Italo Vignoli]

FOSDEM 2021 will be a virtual event, taking place online on Saturday,
February 6, and Sunday, February 7. The LibreOffice DevRoom is scheduled
for Sunday, February 7, from 9AM to 7PM (times to be confirmed).

NEW RULES FOR 2021

- The reference time will be Brussels local time (CET).
- Talks will be pre-recorded in advance, and streamed during the event
- Q/A session will be live
- A facility will be provided for people watching to chat between themselves
- A facility will be provided for people watching to submit questions

IMPORTANT DATES TO REMEMBER

December 27: Submission deadline
December 31: Announcement of selected talks
January 4: Publication of DevRoom schedule
January 15: Presentations upload deadline

CALL FOR PAPERS

We are inviting proposals for talks about LibreOffice or the ODF
standard document format, on topics such as code, localization, QA, UX,
tools, extensions, migrations and general advocacy. Please keep in mind
that product pitches are not allowed at FOSDEM.

The length of talks is limited to a maximum of 25 minutes, as we would
like to have some minutes for questions after each presentation, and to
fit as many presenters as possible in the schedule. Exceptions must be
explicitly requested and justified. You may be assigned LESS time than
you request.

IMPORTANT INFORMATIONS

- Presentations have to be pre-recorded and tested for streaming before
the event.
- Once your talk is accepted, someone will help you to produce the
pre-recorded content.
- Contents will be reviewed to ensure they have the required quality,
and uploaded before January 15, to be prepared and ready for broadcast.
- During the stream of talks, speakers must be available online for the
Q/A session.

TALK SUBMISSIONS

All talk submissions have to be made in the Pentabarf event planning
tool: https://penta.fosdem.org/submission/FOSDEM21.

While filing the proposal, please provide the title of your talk, a
short abstract (one or two paragraphs), some information about yourself
(name, bio and photo, but please do remember that your profile might be
already stored in Pentabarf).

To submit your talk, click on “Create Event” and select the
“LibreOffice” DevRoom as the “Track”. Otherwise, your talk will not be
even considered for any devroom at all.

If you already have a Pentabarf account from a previous year, even if
your talk was not accepted, please reuse it. Create an account if, and
only if, you don’t have one from a previous year. If you have any issues
with Pentabarf, please contact it...@libreoffice.org for help.

CONTACTS

Italo Vignoli: it...@libreoffice.org
Mike Saunders: mike.saund...@documentfoundation.org

Blog Post:
https://blog.documentfoundation.org/blog/2020/12/04/fosdem-2021-lo-devroom-cfp/

-- 
Italo Vignoli - Marketing & PR
The Document Foundation & LibreOffice
email italo.vign...@documentfoundation.org
hangout/jabber italo.vign...@gmail.com
mobile/signal +39.348.5653829

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Balaharipreetha Muthu license statement

[bala]

Hello,

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

warm regards,
Bala Muthu
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Krishna Maheshwari License Statement

[Krishna Maheshwari]

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



Thanks and regards
Krishna Maheshwari
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Noel (via logerrit)]

 sc/source/filter/xml/XMLTrackedChangesContext.cxx |4 +---
 sc/source/filter/xml/xmlannoi.cxx |4 +---
 xmloff/source/core/xmlictxt.cxx   |4 
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit dad6155e2882e27b972845d458087d8ecbf5be43
Author: Noel 
AuthorDate: Fri Dec 4 14:42:23 2020 +0200
Commit: Noel Grandin 
CommitDate: Fri Dec 4 18:43:18 2020 +0100

move some logic inside createFastChildContextFallback

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

diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx 
b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index 3467c1eb9c7f..74f0810831d8 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -693,9 +693,7 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL 
ScXMLChangeTextPContext
 {
 if (!bWasContext)
 pTextPContext->characters(sText.makeStringAndClear());
-xContext = pTextPContext->createFastChildContext(nElement, 
xAttrList);
-if (!xContext)
-xContext = 
pTextPContext->createFastChildContextFallback(nElement, xAttrList);
+xContext = pTextPContext->createFastChildContextFallback(nElement, 
xAttrList);
 }
 }
 
diff --git a/sc/source/filter/xml/xmlannoi.cxx 
b/sc/source/filter/xml/xmlannoi.cxx
index b78d2cbccb48..d14fb587645c 100644
--- a/sc/source/filter/xml/xmlannoi.cxx
+++ b/sc/source/filter/xml/xmlannoi.cxx
@@ -126,9 +126,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > 
ScXMLAnnotationContext
 
 if( pShapeContext )
 {
-auto p = pShapeContext->createFastChildContext(nElement, xAttrList);
-if (!p)
-p = pShapeContext->createFastChildContextFallback(nElement, 
xAttrList);
+auto p = pShapeContext->createFastChildContextFallback(nElement, 
xAttrList);
 if (p)
 return p;
 }
diff --git a/xmloff/source/core/xmlictxt.cxx b/xmloff/source/core/xmlictxt.cxx
index 0074ee886089..b41d847805f0 100644
--- a/xmloff/source/core/xmlictxt.cxx
+++ b/xmloff/source/core/xmlictxt.cxx
@@ -112,6 +112,10 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL 
SvXMLImportContext::cre
 
 css::uno::Reference< css::xml::sax::XFastContextHandler > 
SvXMLImportContext::createFastChildContextFallback(sal_Int32 Element, const 
uno::Reference< xml::sax::XFastAttributeList > & Attribs)
 {
+auto p = createFastChildContext(Element, Attribs);
+if (p)
+return p;
+
 // fall back to slow-parser path
 const OUString& rPrefix = 
SvXMLImport::getNamespacePrefixFromToken(Element, &mrImport.GetNamespaceMap());
 const OUString& rLocalName = SvXMLImport::getNameFromToken( Element );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - configure.ac

[Michael Stahl (via logerrit)]

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

New commits:
commit a72a72e7ad2a7eef871d2d146ef1b0e00eeb319e
Author: Michael Stahl 
AuthorDate: Fri Dec 4 19:29:18 2020 +0100
Commit: Michael Stahl 
CommitDate: Fri Dec 4 19:29:18 2020 +0100

configure: fix kde4_libdirs

Change-Id: Ie70a4d36a63068b5e2dff4552b0b2e4754d71559

diff --git a/configure.ac b/configure.ac
index 1906280e583b..986ed019809e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10794,8 +10794,8 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = 
"TRUE"; then
 kde4_libdirs="/usr/lib /usr/lib/kde4 /usr/lib/kde4/devel $x_libraries"
 
 if test -n "$supports_multilib"; then
-qt4_libdirs="$qt4_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
-kde4_libdirs="$kde4_libdirs /usr/lib64 /usr/lib64/kde4 
/usr/lib64/kde4/devel"
+qt4_libdirs="/usr/lib64/qt4 /usr/lib64/qt /usr/lib64 $qt4_libdirs"
+kde4_libdirs="/usr/lib64 /usr/lib64/kde4 /usr/lib64/kde4/devel 
$kde4_libdirs"
 fi
 
 if test -n "$QTDIR"; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet (via logerrit)]

 pyuno/source/loader/pythonloader.py |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 62887aa764e51a74d3b452abd2297a05d9a6bd3f
Author: Julien Nabet 
AuthorDate: Fri Dec 4 18:39:53 2020 +0100
Commit: Noel Grandin 
CommitDate: Fri Dec 4 20:02:57 2020 +0100

Fix ResourceWarning in pythonloader.py

trace:
/home/julien/lo/libreoffice/instdir/program/pythonloader.py:146: 
ResourceWarning: unclosed file <_io.TextIOWrapper 
name='/home/julien/lo/libreoffice/instdir/share/extensions/numbertext/reg.uno.py'
 mode='r' encoding='utf_8'>
  mod = self.getModuleFromUrl( locationUrl )
ResourceWarning: Enable tracemalloc to get the object allocation traceback

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

diff --git a/pyuno/source/loader/pythonloader.py 
b/pyuno/source/loader/pythonloader.py
index 5b824a3c26a1..7c16e226bad9 100644
--- a/pyuno/source/loader/pythonloader.py
+++ b/pyuno/source/loader/pythonloader.py
@@ -100,6 +100,7 @@ class Loader( XImplementationLoader, XServiceInfo, 
unohelper.Base ):
 mod.__file__ = filename
 exec(codeobject, mod.__dict__)
 g_loadedComponents[url] = mod
+fileHandle.close()
 return mod
 elif "vnd.openoffice.pymodule" == protocol:
 nSlash = dependent.rfind('/')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 compilerplugins/clang/xmlimport.cxx|3 +++
 sw/source/filter/xml/xmlfmt.cxx|2 +-
 xmloff/source/draw/XMLNumberStyles.cxx |   10 +-
 xmloff/source/table/XMLTableImport.cxx |2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit ef80ef57f50cf41afa461fc8c188e40436194f1a
Author: Noel Grandin 
AuthorDate: Fri Dec 4 19:42:56 2020 +0200
Commit: Noel Grandin 
CommitDate: Fri Dec 4 20:19:32 2020 +0100

call createFastChildContextFallback in more places

to make my fastparser work easier to manage

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

diff --git a/compilerplugins/clang/xmlimport.cxx 
b/compilerplugins/clang/xmlimport.cxx
index b18554dfc768..a15c3c63f057 100644
--- a/compilerplugins/clang/xmlimport.cxx
+++ b/compilerplugins/clang/xmlimport.cxx
@@ -58,6 +58,9 @@ public:
 if (loplugin::isSamePathname(fn, SRCDIR
  
"/xmloff/source/text/XMLIndexBibliographySourceContext.cxx"))
 return false;
+// calling mxSlaveContext
+if (loplugin::isSamePathname(fn, SRCDIR 
"/xmloff/source/draw/XMLNumberStyles.cxx"))
+return false;
 return true;
 }
 
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index fa0b31a5e78d..50a6aead1671 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -608,7 +608,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > 
SwXMLItemSetStyleConte
 pTextStyle->startFastElement( nElement, xTmpAttrList.get() );
 rStyles.AddStyle( *pTextStyle );
 }
-return pTextStyle->createFastChildContext( nElement, xAttrList );
+return pTextStyle->createFastChildContextFallback( nElement, 
xAttrList );
 }
 default:
 XMLOFF_WARN_UNKNOWN_ELEMENT("sw", nElement);
diff --git a/xmloff/source/draw/XMLNumberStyles.cxx 
b/xmloff/source/draw/XMLNumberStyles.cxx
index 1696fc038ac8..44c85b8e2bfd 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -492,7 +492,7 @@ private:
 bool mbTextual;
 bool mbDecimal02;
 OUString maText;
-css::uno::Reference< css::xml::sax::XFastContextHandler > mxSlaveContext;
+SvXMLImportContextRef mxSlaveContext;
 
 public:
 
@@ -500,7 +500,7 @@ public:
 sal_Int32 nElement,
 const css::uno::Reference< css::xml::sax::XFastAttributeList>& 
xAttrList,
 SdXMLNumberFormatImportContext* pParent,
-const css::uno::Reference< css::xml::sax::XFastContextHandler >& 
rSlaveContext );
+const SvXMLImportContextRef& rSlaveContext );
 
 virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL 
createFastChildContext(
 sal_Int32 nElement, const css::uno::Reference< 
css::xml::sax::XFastAttributeList >& AttrList ) override;
@@ -519,7 +519,7 @@ 
SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext(
 sal_Int32 nElement,
 const css::uno::Reference< css::xml::sax::XFastAttributeList>& xAttrList,
 SdXMLNumberFormatImportContext* pParent,
-const css::uno::Reference< css::xml::sax::XFastContextHandler >& 
rSlaveContext )
+const SvXMLImportContextRef& rSlaveContext )
 :   SvXMLImportContext(rImport),
 mpParent( pParent ),
 maNumberStyle( SvXMLImport::getNameFromToken(nElement) ),
@@ -555,7 +555,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > 
SdXMLNumberFormatMembe
 sal_Int32 nElement,
 const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
 {
-return mxSlaveContext->createFastChildContext( nElement, xAttrList );
+return mxSlaveContext->createFastChildContextFallback( nElement, xAttrList 
);
 }
 
 void SdXMLNumberFormatMemberImportContext::startFastElement(
@@ -707,7 +707,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > 
SdXMLNumberFormatImpor
 const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
 {
 return new SdXMLNumberFormatMemberImportContext( GetImport(), nElement, 
xAttrList,
-this, SvXMLNumFormatContext::createFastChildContext( nElement, 
xAttrList ) );
+this, 
&dynamic_cast(*SvXMLNumFormatContext::createFastChildContext(
 nElement, xAttrList )) );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/table/XMLTableImport.cxx 
b/xmloff/source/table/XMLTableImport.cxx
index af931822cbe6..7a54c1478acc 100644
--- a/xmloff/source/table/XMLTableImport.cxx
+++ b/xmloff/source/table/XMLTableImport.cxx
@@ -199,7 +199,7 @@ SvXMLImportContextRef XMLProxyContext::CreateChildContext( 
sal_uInt16 nPrefix, c
  css::uno::Reference< css::xml::sax::XFastContextHandler > 
XMLProxyContext::createFastChildContext( sal_Int32 nElement, const Reference< 
XFas

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

[Noel Grandin (via logerrit)]

 sw/source/uibase/dochdl/swdtflvr.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9869f2d46b163ec81858bad55373e8d4e7a7d02a
Author: Noel Grandin 
AuthorDate: Thu Dec 3 14:57:17 2020 +0200
Commit: Noel Grandin 
CommitDate: Fri Dec 4 20:20:27 2020 +0100

fix SEGV in CppunitTest_sw_core_undo on Windows

when something else changed the clipboard concurrently
 CppunitTest_sw_core_undo

Change-Id: Ie0d21ed77ac38bfe2ca55e5b001e3fd09ac05493
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107159
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 7898eddf919a30f03a2224adbc16db4ce4bac8e5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107196

diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx 
b/sw/source/uibase/dochdl/swdtflvr.cxx
index da8c13e04caa..9fa684a1b0fc 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -314,6 +314,8 @@ static SwDoc& lcl_GetDoc(SwDocFac & rDocFac)
 void SwTransferable::ObjectReleased()
 {
 SwModule *pMod = SW_MOD();
+if (!pMod)
+return;
 if( this == pMod->m_pDragDrop )
 pMod->m_pDragDrop = nullptr;
 else if( this == pMod->m_pXSelection )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - configure.ac

[Mike Kaganski (via logerrit)]

 configure.ac |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit fa5ccf18cd9f48fc6df3f827dfdd908ee253300a
Author: Mike Kaganski 
AuthorDate: Tue Aug 25 19:49:11 2020 +0300
Commit: Michael Stahl 
CommitDate: Fri Dec 4 20:40:13 2020 +0100

Check for X11/Intrinsic.h required by officebean

Change-Id: I49b6868c2896c4aa5a70c2517c2f35f3ea475f2b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101341
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 406c8c6e46b3b0ba9a950767aef29a8e706dfeb6)

diff --git a/configure.ac b/configure.ac
index 986ed019809e..90692fd71324 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9289,6 +9289,9 @@ if test "$USING_X11" = TRUE; then
 AC_CHECK_HEADERS(X11/SM/SMlib.h,[],[AC_MSG_ERROR([libSM headers not 
found])])
 AC_CHECK_LIB([SM], [SmcOpenConnection], [:],
 [AC_MSG_ERROR(SM library not found)])
+
+# bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c needs Xt
+AC_CHECK_HEADERS(X11/Intrinsic.h,[],[AC_MSG_ERROR([libXt headers not 
found])])
 fi
 
 dnl ===
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 xmloff/source/draw/ximpshap.cxx |7 ---
 xmloff/source/draw/ximpshap.hxx |4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit a823fd68bae37329e7c7a41f3a29c59b842871ac
Author: Noel Grandin 
AuthorDate: Fri Dec 4 20:22:03 2020 +0200
Commit: Noel Grandin 
CommitDate: Fri Dec 4 20:55:10 2020 +0100

fastparser in SdXMLChartShapeContext

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

diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 0d9a171d3848..476c3ec006e7 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -2578,11 +2578,12 @@ void SdXMLChartShapeContext::characters( const 
OUString& rChars )
 mxChartContext->characters( rChars );
 }
 
-SvXMLImportContextRef SdXMLChartShapeContext::CreateChildContext( sal_uInt16 
nPrefix, const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList )
+css::uno::Reference< css::xml::sax::XFastContextHandler > 
SdXMLChartShapeContext::createFastChildContext(
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
 {
 if( mxChartContext.is() )
-return mxChartContext->CreateChildContext( nPrefix, rLocalName, 
xAttrList );
+return mxChartContext->createFastChildContextFallback( nElement, 
xAttrList );
 
 return nullptr;
 }
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index ca89d1ffc431..31a15323e625 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -425,8 +425,8 @@ public:
 const css::uno::Reference< css::xml::sax::XFastAttributeList >& 
xAttrList ) override;
 virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
 virtual void SAL_CALL characters( const OUString& rChars ) override;
-virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, 
const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ) 
override;
+virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL 
createFastChildContext(
+sal_Int32 nElement, const css::uno::Reference< 
css::xml::sax::XFastAttributeList >& AttrList ) override;
 };
 
 // draw:object and draw:object_ole context
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 xmloff/source/text/XMLTextMarkImportContext.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9f8b7280903f2a0b0202bc7fbc4fd807cc78045e
Author: Noel 
AuthorDate: Fri Dec 4 15:51:33 2020 +0200
Commit: Noel Grandin 
CommitDate: Fri Dec 4 21:18:45 2020 +0100

no need to use GetLocalName here

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

diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx 
b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 7d53c7b5af4d..4aad5f380f70 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -166,7 +166,7 @@ void XMLTextMarkImportContext::startFastElement( sal_Int32 
nElement,
 m_rHelper.pushFieldCtx( m_sBookmarkName, m_sFieldName );
 }
 
-if (IsXMLToken(GetLocalName(), XML_BOOKMARK_START))
+if ((nElement & TOKEN_MASK) == XML_BOOKMARK_START)
 {
 const OUString sHidden= 
xAttrList->getOptionalValue(XML_ELEMENT(LO_EXT, XML_HIDDEN));
 const OUString sCondition = 
xAttrList->getOptionalValue(XML_ELEMENT(LO_EXT, XML_CONDITION));
@@ -241,12 +241,12 @@ static auto PopFieldmark(XMLTextImportHelper & rHelper) 
-> void
 }
 }
 
-void XMLTextMarkImportContext::endFastElement(sal_Int32 )
+void XMLTextMarkImportContext::endFastElement(sal_Int32 nElement)
 {
 static const char sAPI_bookmark[] = "com.sun.star.text.Bookmark";
 
 lcl_MarkType nTmp{};
-if (!SvXMLUnitConverter::convertEnum(nTmp, GetLocalName(), 
lcl_aMarkTypeMap))
+if (!SvXMLUnitConverter::convertEnum(nTmp, 
SvXMLImport::getNameFromToken(nElement), lcl_aMarkTypeMap))
 return;
 
 if (m_sBookmarkName.isEmpty() && TypeFieldmarkEnd != nTmp)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-7-1' - source/text

[Balaharipreetha Muthu (via logerrit)]

 source/text/shared/guide/convertfilters.xhp |  330 
 1 file changed, 330 deletions(-)

New commits:
commit ce1a6e03a6ad57f68a4da315df26fc0ff10c142a
Author: Balaharipreetha Muthu 
AuthorDate: Thu Dec 3 21:49:42 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Dec 5 05:35:15 2020 +0100

tdf#138627 - Repeated data in Tables of File Conversion Filter Names

Delete repeated rows in table

Change-Id: I83fc15c1063644d086cbc5fef4ec6f9764dbb4c5
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107197
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 7ad3201bf8bc895e9cc8742fe51ac94431ec50bf)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107210
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/shared/guide/convertfilters.xhp 
b/source/text/shared/guide/convertfilters.xhp
index 32e34091f..b448266fa 100644
--- a/source/text/shared/guide/convertfilters.xhp
+++ b/source/text/shared/guide/convertfilters.xhp
@@ -110,17 +110,6 @@
 fb2 zip
 
 
-
-
-HTML 
Document
-
-
-text/html
-
-
-html xhtml htm
-
-
 
 
 HTML 
Document
@@ -374,28 +363,6 @@
 fodt odt xml
 
 
-
-
-OpenOffice.org 
1.0 Text Document
-
-
-application/vnd.sun.xml.writer
-
-
-sxw
-
-
-
-
-OpenOffice.org 
1.0 Text Document
-
-
-application/vnd.sun.xml.writer
-
-
-sxw
-
-
 
 
 OpenOffice.org 
1.0 Text Document
@@ -407,28 +374,6 @@
 sxw
 
 
-
-
-PDF - Portable 
Document Format
-
-
-application/pdf
-
-
-pdf
-
-
-
-
-PDF - Portable 
Document Format
-
-
-application/pdf
-
-
-pdf
-
-
 
 
 PDF - Portable 
Document Format
@@ -495,28 +440,6 @@
 602 txt
 
 
-
-
-Text
-
-
-text/plain
-
-
-csv tsv tab txt
-
-
-
-
-Text
-
-
-text/plain
-
-
-csv tsv tab txt
-
-
 
 
 Text
@@ -1797,17 +1720,6 @@
 
 
 
-
-
-BMP - 
Windows Bitmap
-
-
-image/x-MS-bmp
-
-
-bmp
-
-
 
 
 BMP - 
Windows Bitmap
@@ -1841,17 +1753,6 @@
 dxf
 
 
-
-
-EMF - 
Enhanced Meta File
-
-
-image/x-emf
-
-
-emf
-
-
 
 
 EMF - 
Enhanced Meta File
@@ -1863,17 +1764,6 @@
 emf
 
 
-
-
-EPS - 
Encapsulated PostScript
-
-
-image/x-eps
-
-
-eps
-
-
 
 
 EPS - 
Encapsulated PostScript
@@ -1885,17 +1775,6 @@
 eps
 
 
-
-
-GIF - 
Graphics Interchange
-
-
-image/gif
-
-
-gif
-
-
 
 
 GIF - 
Graphics Interchange
@@ -1907,17 +1786,6 @@
 gif
 
 
-
-
-HTML
-
-
-text/html
-
-
-html htm
-
-
 
 
 HTML
@@ -1929,28 +1797,6 @@
 html htm
 
 
-
-
-JPEG - 
Joint Photographic Experts Group
-
-
-image/jpeg
-
-
-jpg jpeg jfif jif jpe
-
-
-
-
-JPEG - 
Joint Photograp

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

[Balaharipreetha Muthu (via logerrit)]

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

New commits:
commit c28434a4028d3c802778449c905ce2568b2e5245
Author: Balaharipreetha Muthu 
AuthorDate: Sat Dec 5 05:35:15 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Sat Dec 5 05:35:15 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-1'
  to ce1a6e03a6ad57f68a4da315df26fc0ff10c142a
  - tdf#138627 - Repeated data in Tables of File Conversion Filter Names

Delete repeated rows in table

Change-Id: I83fc15c1063644d086cbc5fef4ec6f9764dbb4c5
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107197
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 7ad3201bf8bc895e9cc8742fe51ac94431ec50bf)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107210
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index c0209500150e..ce1a6e03a6ad 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c0209500150e6fede8c288372a17cbf4b30817c5
+Subproject commit ce1a6e03a6ad57f68a4da315df26fc0ff10c142a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-7-0' - source/text

[Balaharipreetha Muthu (via logerrit)]

 source/text/shared/guide/convertfilters.xhp |  330 
 1 file changed, 330 deletions(-)

New commits:
commit 105093891218c1ca1ee08f732cb940831c0369ce
Author: Balaharipreetha Muthu 
AuthorDate: Thu Dec 3 21:49:42 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Sat Dec 5 05:36:16 2020 +0100

tdf#138627 - Repeated data in Tables of File Conversion Filter Names

Delete repeated rows in table

Change-Id: I83fc15c1063644d086cbc5fef4ec6f9764dbb4c5
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107197
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 7ad3201bf8bc895e9cc8742fe51ac94431ec50bf)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107211
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/shared/guide/convertfilters.xhp 
b/source/text/shared/guide/convertfilters.xhp
index 32e34091f..b448266fa 100644
--- a/source/text/shared/guide/convertfilters.xhp
+++ b/source/text/shared/guide/convertfilters.xhp
@@ -110,17 +110,6 @@
 fb2 zip
 
 
-
-
-HTML 
Document
-
-
-text/html
-
-
-html xhtml htm
-
-
 
 
 HTML 
Document
@@ -374,28 +363,6 @@
 fodt odt xml
 
 
-
-
-OpenOffice.org 
1.0 Text Document
-
-
-application/vnd.sun.xml.writer
-
-
-sxw
-
-
-
-
-OpenOffice.org 
1.0 Text Document
-
-
-application/vnd.sun.xml.writer
-
-
-sxw
-
-
 
 
 OpenOffice.org 
1.0 Text Document
@@ -407,28 +374,6 @@
 sxw
 
 
-
-
-PDF - Portable 
Document Format
-
-
-application/pdf
-
-
-pdf
-
-
-
-
-PDF - Portable 
Document Format
-
-
-application/pdf
-
-
-pdf
-
-
 
 
 PDF - Portable 
Document Format
@@ -495,28 +440,6 @@
 602 txt
 
 
-
-
-Text
-
-
-text/plain
-
-
-csv tsv tab txt
-
-
-
-
-Text
-
-
-text/plain
-
-
-csv tsv tab txt
-
-
 
 
 Text
@@ -1797,17 +1720,6 @@
 
 
 
-
-
-BMP - 
Windows Bitmap
-
-
-image/x-MS-bmp
-
-
-bmp
-
-
 
 
 BMP - 
Windows Bitmap
@@ -1841,17 +1753,6 @@
 dxf
 
 
-
-
-EMF - 
Enhanced Meta File
-
-
-image/x-emf
-
-
-emf
-
-
 
 
 EMF - 
Enhanced Meta File
@@ -1863,17 +1764,6 @@
 emf
 
 
-
-
-EPS - 
Encapsulated PostScript
-
-
-image/x-eps
-
-
-eps
-
-
 
 
 EPS - 
Encapsulated PostScript
@@ -1885,17 +1775,6 @@
 eps
 
 
-
-
-GIF - 
Graphics Interchange
-
-
-image/gif
-
-
-gif
-
-
 
 
 GIF - 
Graphics Interchange
@@ -1907,17 +1786,6 @@
 gif
 
 
-
-
-HTML
-
-
-text/html
-
-
-html htm
-
-
 
 
 HTML
@@ -1929,28 +1797,6 @@
 html htm
 
 
-
-
-JPEG - 
Joint Photographic Experts Group
-
-
-image/jpeg
-
-
-jpg jpeg jfif jif jpe
-
-
-
-
-JPEG - 
Joint Photograp

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - helpcontent2

[Balaharipreetha Muthu (via logerrit)]

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

New commits:
commit 8fe3fc0042129eccb276de62163c0a24e128a70a
Author: Balaharipreetha Muthu 
AuthorDate: Sat Dec 5 05:36:16 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Sat Dec 5 05:36:16 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 105093891218c1ca1ee08f732cb940831c0369ce
  - tdf#138627 - Repeated data in Tables of File Conversion Filter Names

Delete repeated rows in table

Change-Id: I83fc15c1063644d086cbc5fef4ec6f9764dbb4c5
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107197
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 7ad3201bf8bc895e9cc8742fe51ac94431ec50bf)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/107211
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index c9675a9cdcbe..105093891218 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c9675a9cdcbe6228f697fbe08f8171f59206710a
+Subproject commit 105093891218c1ca1ee08f732cb940831c0369ce
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

1 new defect(s) introduced to LibreOffice found with Coverity Scan.
4 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent 
build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 1 of 1 defect(s)


** CID 1470402:  SpotBugs: Internationalization  (FB.DM_DEFAULT_ENCODING)
/odk/source/com/sun/star/lib/loader/WinRegKey.java: 48 in 
com.sun.star.lib.loader.WinRegKey.getStringValue()()



*** CID 1470402:  SpotBugs: Internationalization  (FB.DM_DEFAULT_ENCODING)
/odk/source/com/sun/star/lib/loader/WinRegKey.java: 48 in 
com.sun.star.lib.loader.WinRegKey.getStringValue()()
42 /**
43  * Reads the default string value.
44  */
45 public String getStringValue() throws WinRegKeyException {
46 try {
47 Process p = Runtime.getRuntime().exec(new String[]{"reg", 
"QUERY", m_keyName});
>>> CID 1470402:  SpotBugs: Internationalization  (FB.DM_DEFAULT_ENCODING)
>>> Found reliance on default encoding: new 
>>> java.io.InputStreamReader(InputStream).
48 BufferedReader r = new BufferedReader(new 
InputStreamReader(p.getInputStream()));
49 String v = null;
50 Pattern pt = 
Pattern.compile("\\s+\\(Default\\)\\s+REG_SZ\\s+(.+)");
51 for (;;) {
52 String s = r.readLine();
53 if (s == null) {



To view the defects in Coverity Scan visit, 
https://u15810271.ct.sendgrid.net/ls/click?upn=HRESupC-2F2Czv4BOaCWWCy7my0P0qcxCbhZ31OYv50ypSs1kiFPuCn2xFdlMIFBirii0zZ9j2-2F9F2XPBcBm2BNgi9duPy3v-2FzgFDd2LJ-2BDKI-3DFob-_OTq2XUZbbipYjyLSo6GRo-2FpVxQ9OzkDINu9UTS-2FQhSdO0F0jQniitrGlNxDIzPJiGe6c8AT01Hb9KNQnXdZCrq2Y91B3A0hcb-2F0aK0eqa0-2FDBZHfxDlc6hw2K2UwU7Bup5h1D4a-2ByER-2FMauULh7KMotCvo3NiKHT6mp5xX3xsKPjCnmJN1rbXAhPyg-2BcMHfhGrJ-2BV2X9tMbufqhKuDu-2FBIK4JHfeErbKQmTjFgag29hPijrB7ldYHAPGK8lnVdyD

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

build failure on ubuntu 18.04

[christie]

Hi all, 

The command: 

sudo apt-get install libx11-xcb-dev 


resolved the build problem I identified earlier. I'll try to familiarize
myself with the skia build system, but it may take a while, so a dev
with more experience may want to implement the fix in the build system. 


Now I'm off to figure out what's going on with the .png export subsystem
in writer. (Can't seem to create a .png without the transparency
channel.) 

Cheers, 


Ron___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: build failure on ubuntu 18.04

[Mike Kaganski]

On 05.12.2020 5:07, chris...@eagle.ca wrote:
Now I'm off to figure out what's going on with the .png export subsystem 
in writer. (Can't seem to create a .png without the transparency channel.)


Most possibly related to 
https://git.libreoffice.org/core/+/bf021c369f2306ee507da9bd3cc4cd10ac5d234c.



--
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Noel Grandin (via logerrit)]

 xmloff/source/draw/ximpshap.cxx |   11 ++-
 xmloff/source/draw/ximpshap.hxx |3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 3b8ce394593fa4acfb1336b2b4cc3f32f67f4932
Author: Noel Grandin 
AuthorDate: Fri Dec 4 20:26:02 2020 +0200
Commit: Noel Grandin 
CommitDate: Sat Dec 5 08:16:52 2020 +0100

fastparser in SdXMLTableShapeContext

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

diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 476c3ec006e7..520bc682e6bf 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -4018,12 +4018,13 @@ void SdXMLTableShapeContext::processAttribute( 
sal_uInt16 nPrefix, const OUStrin
 SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue );
 }
 
-SvXMLImportContextRef SdXMLTableShapeContext::CreateChildContext( sal_uInt16 
nPrefix, const OUString& rLocalName, const 
uno::Reference& xAttrList )
+css::uno::Reference< css::xml::sax::XFastContextHandler > 
SdXMLTableShapeContext::createFastChildContext(
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
 {
-if( mxTableImportContext.is() && (nPrefix == XML_NAMESPACE_TABLE) )
-return mxTableImportContext->CreateChildContext(nPrefix, rLocalName, 
xAttrList);
-else
-return SdXMLShapeContext::CreateChildContext(nPrefix, rLocalName, 
xAttrList);
+if( mxTableImportContext.is() && IsTokenInNamespace(nElement, 
XML_NAMESPACE_TABLE) )
+return mxTableImportContext->createFastChildContextFallback(nElement, 
xAttrList);
+return SdXMLShapeContext::createFastChildContext(nElement, xAttrList);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index 31a15323e625..49d70c5b3c37 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -625,7 +625,8 @@ public:
 const css::uno::Reference< css::xml::sax::XFastAttributeList >& 
xAttrList ) override;
 virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
 
-virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, 
const OUString& rLocalName, const css::uno::Reference< 
css::xml::sax::XAttributeList>& xAttrList ) override;
+virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL 
createFastChildContext(
+sal_Int32 nElement, const css::uno::Reference< 
css::xml::sax::XFastAttributeList >& AttrList ) override;
 
 // this is called from the parent group for each unparsed attribute in the 
attribute list
 virtual void processAttribute( sal_uInt16 nPrefix, const OUString& 
rLocalName, const OUString& rValue ) override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'private/tml/lov-7.0.3.3'

[Caolán McNamara (via logerrit)]

New branch 'private/tml/lov-7.0.3.3' available with the following commits:
commit 5037140059140a9027b7242c41883e90893374b5
Author: Caolán McNamara 
Date:   Thu Oct 29 15:45:01 2020 +

fix --disable-pdfium build

Change-Id: I580972220bc39abe16288fa62c717e4ab25833d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105015
Tested-by: Jenkins
Tested-by: René Engelhard 
Reviewed-by: René Engelhard 
Reviewed-by: Noel Grandin 

commit 7c0cac16aaff0c1722e1c6525631b0a2f7b7b65f
Author: Stephan Bergmann 
Date:   Wed Dec 2 11:14:19 2020 +0100

external/firebird: Fix checks for null HANDLE in Windows-only code

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

commit 6c4ec8adf22e8f81e694697a0855d5f0a35c0e8c
Author: Tor Lillqvist 
Date:   Fri Nov 27 00:41:00 2020 +0200

Fix Firebird build on macOS on arm64

Must set RAW_DEVICES_FLG=N for this architecture, too. Make the
prefix.darwin_arm64 match the x86_64 one. Don't bother defining ARM64,
just check for __aarch64__.

Change-Id: I9de67493cb159ce97a46cdd1974b04753518c703
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106716
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

commit ad93b8693143169954b2688e399424a2532f25b3
Author: Stephan Bergmann 
Date:   Tue Nov 24 08:22:51 2020 +0100

New UBSan failures with Firebird 3.0.7

While building ExternalProject_firebird:  For one, the ICU UCHAR_TYPE 
mismatch

> workdir/UnpackedTarball/firebird/src/intl/cs_icu.cpp:66:30: runtime 
error: call to function ucnv_fromUChars_68 through pointer to incorrect 
function type 'int (*)(UConverter *, char *, int, const unsigned short *, int, 
UErrorCode *)'

from 61411db9f719d793f0665a4d278e0748e8fcd75f "external/firebird: 
ICU_UCHAR_TYPE
breaks -fsanitize=function" returned in a slightly different form.  Instead 
of
passing in the problematic UCHAR_TYPE macro from
external/firebird/ExternalProject_firebird.mk, Firebird now set it 
internally in
src/common/common.h.  And for another, it grew a new invalid-shift-base at

> workdir/UnpackedTarball/firebird/src/yvalve/gds.cpp:2564:33: runtime 
error: left shift of negative value -1

(And beyond that there were no further new ASan/UBSan issues with a full 
`make
check screenshot`.)

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

commit b23f6e28c937c81855a8ec175c64256ffcaa3e30
Author: Julien Nabet 
Date:   Fri Nov 13 18:45:29 2020 +0100

firebird: update to 3.0.7

This tries to get rid of a lot of cruft from older builds and it
also aims to build as much as possible on Windows.

The firebird-cygwin-msvc-warnings.patch should be optional. It
gets rid of various compiler warnings on Windows, either by
disableing or fixing them:
- fix: D9002 - ignoring unknown option '-fno-rtti'
- fix: D9024 - unrecognized source file type , object
  file assumed
- ign: C4291 - : no matching operator delete found;
  memory will not be freed if initialization throws an exception
- ign: C4477 - : format string  requires an
  argument of type , but variadic argument number has
  type 

And I explicitly got rid of the "win32" handling and simply use
arch depending patches on Windows, which strips additional stuff.

sberg adds:  I have no idea how in an upstream macOS build the empbuild
executible in gen/examples should now find @rpath/lib/libfbclient.dylib, as 
it
does not have an RPATH set.  So add an appropriate one in
external/firebird/firebird-macosx.patch.1's patch of
builds/posix/Makefile.in.examples (which needs to know whether we do a 
Debug or
a Release build; an attempt of using firebird's $(IsDeveloper) for that 
caused
other failures, see bca0dc97bf3d1348c928bdaf4964524374835823 "Revert
'external/firebird: Pass --enable-developer into configure'", so use LO's
$(ENABLE_DEBUG) and rely on that being exported from LO's make into 
firebird's
make).  Also, the fbclient and Engine12 dylibs now have RPATHs set which we 
do
not need in LO (where we still stick to our general use of @loader_path), so
drop them in external/firebird/ExternalProject_firebird.mk (even though 
leaving
them in should be harmless).

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

commit ade1476eb487fda0db2c1009af193ced5f7a4658
Author: Jan-Marek Glogowski 
Date:   Sun Nov 15 19:57:48 2020 +0100

firebird: build fixes (incl. parallel build)

The main idea is to get rid of the "unset MAKEFLAGS". AFAI can