Re: test testPreserveJpg::TestBody fails
Hi JBF, On Tue, Sep 07, 2021 at 07:13:19PM +0200, Jean-Baptiste Faure wrote: > I get the following error when I run the tests on the master: > > > [_RUN_] testPreserveJpg::TestBody > > unknown:0:testPreserveJpg::TestBody > > An uncaught exception of type com.sun.star.io.IOException > > - SfxBaseModel::impl_store failed: 0xc10(Error Area:Io > > Class:Write Code:16) > > [...]/libo/master/sfx2/source/doc/sfxbasemodel.cxx:3187 > > [...]/libo/master/sfx2/source/doc/sfxbasemodel.cxx:1767 > > My C++ skills are not enough to understand the problem. > > Something has changed recently because the tests passed fine 2 or 3 weaks ago. Did you try manually performing the test? Open the preserve-jpg.odt test document, select the image, context menu, export to SVG and see if it fails. If so, you could bibisect when this started in your environment. Regards, Miklos
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 75 --
1 file changed, 50 insertions(+), 25 deletions(-)
New commits:
commit 5a10614eb46bd206e512a34aa55c38fc64a7a19f
Author: Miklos Vajna
AuthorDate: Tue Sep 7 19:44:49 2021 +0200
Commit: Miklos Vajna
CommitDate: Wed Sep 8 08:18:25 2021 +0200
CppunitTest_sw_ooxmlexport9: avoid DECLARE_OOXMLEXPORT_EXPORTONLY_TEST()
See commit a226cec52e536c46e03f57a5f1f7931abbeb0cdd
(CppunitTest_sw_rtfimport: convert one testcase to use
CPPUNIT_TEST_FIXTURE(), 2019-11-05) for motivation.
Change-Id: Ic11b52a2a54aa4865d3a9663e5aaf3ee9ac85cc2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121790
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 6f784e6174c1..eb57341eac33 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -75,8 +75,9 @@ DECLARE_OOXMLEXPORT_TEST(testFdo55381, "fdo55381.docx")
//TODO: frames not located on the correct pages
}
-DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testDocm, "hello.docm")
+CPPUNIT_TEST_FIXTURE(Test, testDocm)
{
+loadAndSave("hello.docm");
// Make sure that we check the name of the export filter.
// This was application/vnd.ms-word.document.macroEnabled.main+xml when the
// name of the import filter was checked.
@@ -87,8 +88,9 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testDocm, "hello.docm")
"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml");
}
-DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testDefaultContentTypes, "fdo55381.docx")
+CPPUNIT_TEST_FIXTURE(Test, testDefaultContentTypes)
{
+loadAndSave("fdo55381.docx");
xmlDocUniquePtr pXmlDoc = parseExport("[Content_Types].xml");
assertXPath(pXmlDoc,
"/ContentType:Types/ContentType:Default[@Extension='xml']",
@@ -137,8 +139,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf109063, "tdf109063.docx")
CPPUNIT_ASSERT_EQUAL(0, getShapes());
}
-DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf108269, "tdf108269.docm")
+CPPUNIT_TEST_FIXTURE(Test, testTdf108269)
{
+loadAndSave("tdf108269.docm");
uno::Reference xNameAccess =
packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory),
maTempFile.GetURL());
// This failed: VBA streams were not roundtripped via the doc-level
// grab-bag.
@@ -191,8 +194,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf122342, "tdf122342.docx")
CPPUNIT_ASSERT_EQUAL(static_cast(494),
getProperty(getParagraph(3), "ParaBottomMargin"));
}
-DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf132802, "tdf132802.docx")
+CPPUNIT_TEST_FIXTURE(Test, testTdf132802)
{
+loadAndSave("tdf132802.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:spacing", "after",
"0");
assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:pPr/w:spacing", "after",
"0");
@@ -207,8 +211,9 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf132802,
"tdf132802.docx")
assertXPath(pXmlDoc, "/w:document/w:body/w:p[4]/w:pPr/w:spacing", "after",
"280");
}
-DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf132807, "tdf132807.docx")
+CPPUNIT_TEST_FIXTURE(Test, testTdf132807)
{
+loadAndSave("tdf132807.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:pPr/w:spacing",
"before", "280");
// This was 240 (list auto spacing is zero in lists)
@@ -225,8 +230,9 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf132807,
"tdf132807.docx")
assertXPath(pXmlDoc, "/w:document/w:body/w:p[5]/w:pPr/w:spacing",
"before", "280");
}
-DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf133052, "tdf133052.docx")
+CPPUNIT_TEST_FIXTURE(Test, testTdf133052)
{
+loadAndSave("tdf133052.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
// These were 240 (top auto spacing of list subitems are zero)
assertXPath(pXmlDoc, "/w:document/w:body/w:p[4]/w:pPr/w:spacing",
"before", "0");
@@ -238,8 +244,9 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf133052,
"tdf133052.docx")
assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc/w:p[5]/w:pPr/w:spacing", "before", "0");
}
-DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf134648, "tdf134648.docx")
+CPPUNIT_TEST_FIXTURE(Test, testTdf134648)
{
+loadAndSave("tdf134648.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
// list item with direct top auto spacing
@@ -314,8 +321,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf129575_docDefault,
"tdf129575-docDefault.docx")
}
-DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf118812,
"tdf118812_tableStyles-comprehensive.docx")
+CPPUNIT_TEST_FIXTURE(Test, testTdf118812)
{
+loadAndSave("tdf118812_tableStyles-comprehensive.docx");
xmlDocUniquePtr pXmlDoc = parseExpo
[Libreoffice-commits] core.git: extras/CustomTarget_autotextshare.mk extras/source
extras/CustomTarget_autotextshare.mk | 266 -- extras/source/autotext/lang/bg/crdbus50/+BBUEGwQV-1/meta.xml | 17 extras/source/autotext/lang/bg/crdbus50/+BBUEGwQV-2/meta.xml | 17 extras/source/autotext/lang/bg/crdbus50/+BBUEGwQV-3/meta.xml | 17 extras/source/autotext/lang/bg/crdbus50/+BCEEKgQS-1/meta.xml | 17 extras/source/autotext/lang/bg/crdbus50/+BCEEKgQS-2/meta.xml | 17 extras/source/autotext/lang/bg/crdbus50/META-INF/manifest.xml |5 extras/source/autotext/lang/bg/standard/CAN/meta.xml | 17 extras/source/autotext/lang/bg/standard/DMS/meta.xml | 17 extras/source/autotext/lang/bg/standard/FN/Obj0012D655/meta.xml | 18 extras/source/autotext/lang/bg/standard/J/meta.xml| 17 extras/source/autotext/lang/bg/standard/JACL/meta.xml | 17 extras/source/autotext/lang/bg/standard/JACR/meta.xml | 17 extras/source/autotext/lang/bg/standard/JAINV/meta.xml| 17 extras/source/autotext/lang/bg/standard/JARL/meta.xml | 17 extras/source/autotext/lang/bg/standard/META-INF/manifest.xml | 11 extras/source/autotext/lang/bg/standard/R1/meta.xml | 17 extras/source/autotext/lang/bg/standard/R2/meta.xml | 17 extras/source/autotext/lang/bg/standard/YT/meta.xml | 17 extras/source/autotext/lang/cs/crdbus50/CON1/meta.xml | 17 extras/source/autotext/lang/cs/crdbus50/CON2/meta.xml | 17 extras/source/autotext/lang/cs/crdbus50/ELE1/meta.xml | 17 extras/source/autotext/lang/cs/crdbus50/ELE2/meta.xml | 17 extras/source/autotext/lang/cs/crdbus50/ELE3/meta.xml | 17 extras/source/autotext/lang/cs/crdbus50/META-INF/manifest.xml |5 extras/source/autotext/lang/cs/crdbus54/ELE1/meta.xml | 17 extras/source/autotext/lang/cs/crdbus54/ELE2/meta.xml | 17 extras/source/autotext/lang/cs/crdbus54/ELE3/meta.xml | 17 extras/source/autotext/lang/cs/crdbus54/META-INF/manifest.xml |5 extras/source/autotext/lang/cs/crdbus54/MOD1/meta.xml | 17 extras/source/autotext/lang/cs/crdbus54/MOD2/meta.xml | 17 extras/source/autotext/lang/cs/standard/CAN/meta.xml | 17 extras/source/autotext/lang/cs/standard/DMS/meta.xml | 17 extras/source/autotext/lang/cs/standard/J/meta.xml| 17 extras/source/autotext/lang/cs/standard/JACL/meta.xml | 17 extras/source/autotext/lang/cs/standard/JACR/meta.xml | 17 extras/source/autotext/lang/cs/standard/JAINV/meta.xml| 17 extras/source/autotext/lang/cs/standard/JARL/meta.xml | 17 extras/source/autotext/lang/cs/standard/LIC/meta.xml | 17 extras/source/autotext/lang/cs/standard/META-INF/manifest.xml | 11 extras/source/autotext/lang/cs/standard/R1/meta.xml | 17 extras/source/autotext/lang/cs/standard/R2/meta.xml | 17 extras/source/autotext/lang/cs/standard/YT/meta.xml | 17 extras/source/autotext/lang/da/crdbus50/CON1/meta.xml | 17 extras/source/autotext/lang/da/crdbus50/CON2/meta.xml | 17 extras/source/autotext/lang/da/crdbus50/ELE1/meta.xml | 17 extras/source/autotext/lang/da/crdbus50/ELE2/meta.xml | 17 extras/source/autotext/lang/da/crdbus50/ELE3/meta.xml | 17 extras/source/autotext/lang/da/crdbus50/META-INF/manifest.xml |5 extras/source/autotext/lang/da/standard/CAN/meta.xml | 15 extras/source/autotext/lang/da/standard/DMS/meta.xml | 15 extras/source/autotext/lang/da/standard/J/meta.xml| 15 extras/source/autotext/lang/da/standard/JACL/meta.xml | 15 extras/source/autotext/lang/da/standard/JACR/meta.xml | 15 extras/source/autotext/lang/da/standard/JAINV/meta.xml| 15 extras/source/autotext/lang/da/standard/JARL/meta.xml | 15 extras/source/autotext/lang/da/standard/META-INF/manifest.xml | 10 extras/source/autotext/lang/da/standard/R1/meta.xml | 15 extras/source/autotext/lang/da/standard/R2/meta.xml | 15 extras/source/autotext/lang/da/standard/YT/meta.xml | 15 extras/source/autotext/lang/de/crdbus50/KLA1/meta.xml | 18 extras/source/autotext/lang/de/crdbus50/KLA2/meta.xml | 18 extras/source/autotext/lang/de/crdbus50/KLA3/meta.xml | 18 extras/source/autotext/lang/de/crdbus50/META-INF/manifest.xml |5 extras/source/autotext/lang/de/crdbus50/MOD1/meta.xml | 18 extras/source/autotext/lang/de/crdbus50/MOD2/meta.xml | 18 extras/source/autotext/lang/de/standa
[Libreoffice-commits] core.git: desktop/qa sw/qa sw/source
desktop/qa/desktop_lib/test_desktop_lib.cxx |2 - sw/qa/extras/indexing/IndexingExportTest.cxx | 34 +- sw/qa/extras/indexing/SearchResultLocatorTest.cxx |6 +-- sw/source/core/inc/SearchResultLocator.hxx|2 - sw/source/core/model/SearchResultLocator.cxx | 24 +++ sw/source/filter/indexing/IndexingExport.cxx | 14 - 6 files changed, 51 insertions(+), 31 deletions(-) New commits: commit 83da70de985e1f9f7193676bef8dc71226803bb0 Author: Tomaž Vajngerl AuthorDate: Tue Sep 7 15:40:42 2021 +0900 Commit: Tomaž Vajngerl CommitDate: Wed Sep 8 06:58:07 2021 +0200 indexing: rename "type" for prargraph an object nodes They are conflicting, so rename the one for paragraphs to "node_type and the one for objects to "object_type". This needs adusting all the tests. Also change the node_type from numerical value (correcponding to a enum) to string based - "writer" or "commom" values. Change-Id: I0465cd4c2c6989e436d5a675db20c87066d19208 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121743 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 85e09ab13a51..28a5e76a6e1e 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -3119,7 +3119,7 @@ void DesktopLOKTest::testRenderSearchResult() unsigned char* pBuffer = nullptr; OString aPayload = "" -"ABC" +"ABC" ""; int nWidth = 0; diff --git a/sw/qa/extras/indexing/IndexingExportTest.cxx b/sw/qa/extras/indexing/IndexingExportTest.cxx index 9d40d887f30d..c08cdcd282c9 100644 --- a/sw/qa/extras/indexing/IndexingExportTest.cxx +++ b/sw/qa/extras/indexing/IndexingExportTest.cxx @@ -74,7 +74,7 @@ void IndexingExportTest::testIndexingExport_Paragraphs() assertXPath(pXmlDoc, "/indexing"); assertXPathContent(pXmlDoc, "/indexing/paragraph[1]", "Title"); -assertXPath(pXmlDoc, "/indexing/paragraph[1]", "type", "1"); +assertXPath(pXmlDoc, "/indexing/paragraph[1]", "node_type", "writer"); assertXPathContent(pXmlDoc, "/indexing/paragraph[2]", "Heading 1"); assertXPathContent(pXmlDoc, "/indexing/paragraph[3]", "Heading 2"); assertXPathContent(pXmlDoc, "/indexing/paragraph[4]", "Paragraph 1"); @@ -91,6 +91,7 @@ void IndexingExportTest::testIndexingExport_Paragraphs() assertXPathContent(pXmlDoc, "/indexing/paragraph[15]", "Center"); assertXPathContent(pXmlDoc, "/indexing/paragraph[16]", "Right"); assertXPathContent(pXmlDoc, "/indexing/paragraph[17]", "Bold Italic Underline Strikeout"); +assertXPath(pXmlDoc, "/indexing/paragraph[17]", "node_type", "writer"); } void IndexingExportTest::testIndexingExport_Images() @@ -109,10 +110,10 @@ void IndexingExportTest::testIndexingExport_Images() assertXPath(pXmlDoc, "/indexing"); assertXPath(pXmlDoc, "/indexing/object[1]", "alt", "Image_NonCaption - Alternative text"); assertXPath(pXmlDoc, "/indexing/object[1]", "name", "Image_NonCaption"); -assertXPath(pXmlDoc, "/indexing/object[1]", "type", "graphic"); +assertXPath(pXmlDoc, "/indexing/object[1]", "object_type", "graphic"); assertXPath(pXmlDoc, "/indexing/object[2]", "alt", "Image_InCaption - Alternative text"); assertXPath(pXmlDoc, "/indexing/object[2]", "name", "Image_InCaption"); -assertXPath(pXmlDoc, "/indexing/object[2]", "type", "graphic"); +assertXPath(pXmlDoc, "/indexing/object[2]", "object_type", "graphic"); } void IndexingExportTest::testIndexingExport_OLE() @@ -131,7 +132,7 @@ void IndexingExportTest::testIndexingExport_OLE() assertXPath(pXmlDoc, "/indexing"); assertXPath(pXmlDoc, "/indexing/object[1]", "name", "Object - Chart"); assertXPath(pXmlDoc, "/indexing/object[1]", "alt", "Alt Text"); -assertXPath(pXmlDoc, "/indexing/object[1]", "type", "ole"); +assertXPath(pXmlDoc, "/indexing/object[1]", "object_type", "ole"); } void IndexingExportTest::testIndexingExport_Shapes() @@ -149,21 +150,28 @@ void IndexingExportTest::testIndexingExport_Shapes() assertXPath(pXmlDoc, "/indexing"); assertXPathContent(pXmlDoc, "/indexing/paragraph[1]", "Drawing : Just a Diamond"); +assertXPath(pXmlDoc, "/indexing/paragraph[1]", "node_type", "writer"); assertXPath(pXmlDoc, "/indexing/object[1]", "name", "Circle"); -assertXPath(pXmlDoc, "/indexing/object[1]", "type", "shape"); +assertXPath(pXmlDoc, "/indexing/object[1]", "object_type", "shape"); assertXPathContent(pXmlDoc, "/indexing/paragraph[2]", "This is a circle"); +assertXPath(pXmlDoc, "/indexing/paragraph[2]", "node_type", "common"); assertXPathContent(pXmlDoc, "/indexing/paragraph[3]", "This is a second paragraph"); +assertXPath(pXmlDoc, "/indexing/paragraph[3]", "node_type", "common"); assertXPath(pXmlDoc, "/indexing/o
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/indexing/SearchResultLocatorTest.cxx | 36 +++-
sw/source/core/inc/SearchResultLocator.hxx| 15 ++-
sw/source/core/model/SearchResultLocator.cxx | 98 +++---
3 files changed, 112 insertions(+), 37 deletions(-)
New commits:
commit eac288d02cafc49c5a14fa27bb449c33eb4b1803
Author: Tomaž Vajngerl
AuthorDate: Mon Sep 6 14:17:01 2021 +0900
Commit: Tomaž Vajngerl
CommitDate: Wed Sep 8 06:57:23 2021 +0200
indexing: support JSON and XML as input for SearchResultLocator
JSON is much easier to deal with when using REST and javascript,
so support both.
Change-Id: I61035452d9a7ba889ac355a42201d79b9fafec6f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121742
Tested-by: Tomaž Vajngerl
Reviewed-by: Tomaž Vajngerl
diff --git a/sw/qa/extras/indexing/SearchResultLocatorTest.cxx
b/sw/qa/extras/indexing/SearchResultLocatorTest.cxx
index c740f982b2c3..fd9e8c4f3827 100644
--- a/sw/qa/extras/indexing/SearchResultLocatorTest.cxx
+++ b/sw/qa/extras/indexing/SearchResultLocatorTest.cxx
@@ -27,12 +27,14 @@ private:
public:
void testSearchResultLocator();
-void testSearchResultLocatorUsingPayload();
+void testSearchResultLocatorUsingXmlPayload();
+void testSearchResultLocatorUsingJsonPayload();
void testSearchResultLocatorForSdrObjects();
CPPUNIT_TEST_SUITE(SearchResultLocatorTest);
CPPUNIT_TEST(testSearchResultLocator);
-CPPUNIT_TEST(testSearchResultLocatorUsingPayload);
+CPPUNIT_TEST(testSearchResultLocatorUsingXmlPayload);
+CPPUNIT_TEST(testSearchResultLocatorUsingJsonPayload);
CPPUNIT_TEST(testSearchResultLocatorForSdrObjects);
CPPUNIT_TEST_SUITE_END();
};
@@ -76,7 +78,7 @@ void SearchResultLocatorTest::testSearchResultLocator()
#endif
}
-void SearchResultLocatorTest::testSearchResultLocatorUsingPayload()
+void SearchResultLocatorTest::testSearchResultLocatorUsingXmlPayload()
{
if (!IsDefaultDPI())
return;
@@ -104,6 +106,34 @@ void
SearchResultLocatorTest::testSearchResultLocatorUsingPayload()
#endif
}
+void SearchResultLocatorTest::testSearchResultLocatorUsingJsonPayload()
+{
+if (!IsDefaultDPI())
+return;
+
+SwDoc* pDoc = createDoc("IndexingExport_VariousParagraphs.odt");
+CPPUNIT_ASSERT(pDoc);
+
+sw::search::SearchResultLocator aLocator(pDoc);
+OString payload = "["
+ "{ \"type\" : 1, \"index\" : 14 }"
+ "]";
+
+sw::search::LocationResult aResult =
aLocator.findForPayload(payload.getStr());
+CPPUNIT_ASSERT_EQUAL(size_t(1), aResult.maRectangles.size());
+
+// skip asserting exact values for macOS and Windows because of
+// inconsistent results
+#if !defined(_WIN32) && !defined(MACOSX)
+auto aRectangle = aResult.maRectangles[0];
+CPPUNIT_ASSERT_DOUBLES_EQUAL(1418.0, aRectangle.getMinX(), 1e-4);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(.0, aRectangle.getMinY(), 1e-4);
+
+CPPUNIT_ASSERT_DOUBLES_EQUAL(9638.0, aRectangle.getWidth(), 1e-4);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(276.0, aRectangle.getHeight(), 1e-4);
+#endif
+}
+
void SearchResultLocatorTest::testSearchResultLocatorForSdrObjects()
{
if (!IsDefaultDPI())
diff --git a/sw/source/core/inc/SearchResultLocator.hxx
b/sw/source/core/inc/SearchResultLocator.hxx
index 7dac632ae58f..fb46c85253eb 100644
--- a/sw/source/core/inc/SearchResultLocator.hxx
+++ b/sw/source/core/inc/SearchResultLocator.hxx
@@ -18,20 +18,20 @@ namespace sw::search
{
enum class NodeType
{
-Undefined,
-WriterNode,
-SdrObject
+Undefined = 0,
+WriterNode = 1,
+SdrObject = 2
};
struct SearchIndexData
{
NodeType meType = NodeType::Undefined;
-sal_uInt32 mnNodeIndex = 0;
+sal_Int32 mnNodeIndex = 0;
OUString maObjectName;
SearchIndexData() {}
-SearchIndexData(NodeType eType, sal_uInt32 nNodeIndex, OUString const&
aObjectName = OUString())
+SearchIndexData(NodeType eType, sal_Int32 nNodeIndex, OUString const&
aObjectName = OUString())
: meType(eType)
, mnNodeIndex(nNodeIndex)
, maObjectName(aObjectName)
@@ -50,6 +50,10 @@ class SW_DLLPUBLIC SearchResultLocator
SwDoc* mpDocument;
void findOne(LocationResult& rResult, SearchIndexData const&
rSearchIndexData);
+static bool tryParseJSON(const char* pPayload,
+ std::vector&
rDataVector);
+static bool tryParseXML(const char* pPayload,
+std::vector&
rDataVector);
public:
SearchResultLocator(SwDoc* pDoc)
@@ -58,7 +62,6 @@ public:
}
LocationResult find(std::vector const&
rSearchIndexDataVector);
-
LocationResult findForPayload(const char* pPayload);
};
diff --git a/sw/source/core/model/SearchResultLocator.cxx
b/sw/source/core/model/SearchResultLocator.cxx
index a0e405b2ed33..089859683cb4 100644
--- a/sw/source/core/model/SearchResultLocator.cxx
+++ b/sw/source/core/model/SearchRes
[Libreoffice-commits] core.git: filter/source
filter/source/config/cache/typedetection.cxx |9 +
filter/source/config/cache/typedetection.hxx | 11 ---
2 files changed, 1 insertion(+), 19 deletions(-)
New commits:
commit 8151f3a1d99ab740d2affdccc7115faa156bf3ad
Author: Mike Kaganski
AuthorDate: Tue Sep 7 23:21:17 2021 +0200
Commit: Mike Kaganski
CommitDate: Wed Sep 8 00:29:17 2021 +0200
Drop unused rUsedDetectors argument
... ever since commit e4003b67062e575f9b2488f9b9691fa9fc38
Author: Kohei Yoshida
Date: Thu Mar 7 01:35:09 2013 -0500
Make check passes. Remove deep-only detection for real.
Now the type detection process is a lot more simpler.
Change-Id: Ib0c08e28edf85a3642e187798a08ed2e143bf56c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121765
Tested-by: Mike Kaganski
Reviewed-by: Mike Kaganski
diff --git a/filter/source/config/cache/typedetection.cxx
b/filter/source/config/cache/typedetection.cxx
index 1fd749ab..774005722a32 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -422,9 +422,8 @@ OUString SAL_CALL
TypeDetection::queryTypeByDescriptor(css::uno::Sequence< css::
// outside (bAllowDeep=sal_False) or break the whole detection by
// throwing an exception if creation of the might needed input
// stream failed by e.g. an IO exception ...
-std::vector lUsedDetectors;
if (!lFlatTypes.empty())
-sType = impl_detectTypeFlatAndDeep(stlDescriptor, lFlatTypes,
bAllowDeep, lUsedDetectors, sLastChance);
+sType = impl_detectTypeFlatAndDeep(stlDescriptor, lFlatTypes,
bAllowDeep, sLastChance);
// flat detection failed
// pure deep detection failed
@@ -855,13 +854,11 @@ void TypeDetection::impl_getAllFormatTypes(
OUString TypeDetection::impl_detectTypeFlatAndDeep( utl::MediaDescriptor&
rDescriptor ,
const FlatDetection&
lFlatTypes,
bool
bAllowDeep,
-
std::vector& rUsedDetectors,
OUString&
rLastChance )
{
// reset it everytimes, so the outside code can distinguish between
// a set and a not set value.
rLastChance.clear();
-rUsedDetectors.clear();
// step over all possible types for this URL.
// solutions:
@@ -919,10 +916,6 @@ OUString TypeDetection::impl_detectTypeFlatAndDeep(
utl::MediaDescriptor& r
continue;
}
-// don't forget to add every real asked deep detection service
here.
-// Such detectors will be ignored if may be
"impl_detectTypeDeepOnly()"
-// must be called later!
-rUsedDetectors.push_back(sDetectService);
OUString sDeepType = impl_askDetectService(sDetectService,
rDescriptor);
// d)
diff --git a/filter/source/config/cache/typedetection.hxx
b/filter/source/config/cache/typedetection.hxx
index 21f598055fda..79145e836d17 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -98,10 +98,6 @@ private:
was used without getting any result. Then this
"last-chance-type"
should be returned. Of course using of it can fail too ...
but it's a try :-)
-As an optimization - this method collects the names of all
used deep
-detection services. This information can be useful inside
the may be
-afterwards called method "impl_detectTypeDeepOnly()"!
-
@param rDescriptor
provides any easy-to-use stl interface to the
MediaDescriptor.
Note : Its content will be adapted to returned result of
this method.
@@ -116,12 +112,6 @@ private:
Note: it will be reset to an empty string every time. So
a set value of "rLastChance" can be detected outside very
easy.
-@param rUsedDetectors
-used as [out] parameter. It contains a list of names of
all deep
-detection services, which was used inside this method.
-Such detectors can be ignored later if
"impl_detectTypeDeepOnly()"
-is called.
-
@param bAllowDeep
enable/disable using of a might existing deep detection
service.
@@ -132,7 +122,6 @@ private:
OUString impl_detectTypeFlatAndDeep( utl::MediaDescriptor&
rDescriptor ,
const FlatDetection&
lFlatTypes,
Re: LibreOffice 7.2.0.4 : bug report
Bonjour, Je pense que vous feriez mieux de prendre la version 7.1.5 ici https://fr.libreoffice.org/download/telecharger-libreoffice/?type=win-x86&version=7.2.0&lang=fr version X64 probablement de nos jours ... Vous avez pris une version qui peut etre qualifiée d'expérimentalr, des plantages sont possibles...c'est clairement expliqué. Par contre effectivement, vous aideriez la communauté en explicitant comment vous avez réussi à obtenir le crash en question. Les informations que vous avez récupèré ne permette pas directement d'obtenir la cause... Régis Perdreau Le mar. 7 sept. 2021 à 23:05, Lydie TREBUCHON a écrit : > Bonjour, > > > > Voici le bug que j’ai malheureusement sur mon ordinateur lorsque j’ouvre > Calc, je saisis des chiffres dans une cellule et je fais Entrée. > > Rapport en pièce jointe. > > Ça fait peur pour un logiciel à peine installé et dont le code a soit > disant était revu et dépoussiéré. C’est à vous dégoûter du libre. > > Microsoft a encore de beau jours devant lui ! > > > > Cordialement, > > Pierre > > >
[Libreoffice-commits] core.git: framework/source
framework/source/loadenv/loadenv.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit e662e835c208481c909d8caa34fc66b6fadda3c0
Author: Mike Kaganski
AuthorDate: Tue Sep 7 21:10:07 2021 +0200
Commit: Mike Kaganski
CommitDate: Tue Sep 7 23:16:15 2021 +0200
Guard Orcus detection shortcut
So that its policy matches the other places in this function
Change-Id: I309441f63cf82bbae2b19c7de588d4228b988bad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121764
Tested-by: Mike Kaganski
Reviewed-by: Mike Kaganski
diff --git a/framework/source/loadenv/loadenv.cxx
b/framework/source/loadenv/loadenv.cxx
index cd83d9403748..a4b7e6557004 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -745,6 +745,9 @@ void LoadEnv::impl_detectTypeAndFilter()
if (queryOrcusTypeAndFilter(lDescriptor, sType, sFilter) &&
!sType.isEmpty() && !sFilter.isEmpty())
{
+// SAFE ->
+osl::MutexGuard aWriteLock(m_mutex);
+
// Orcus type detected. Skip the normal type detection process.
m_lMediaDescriptor << lDescriptor;
m_lMediaDescriptor[utl::MediaDescriptor::PROP_TYPENAME()] <<= sType;
@@ -752,6 +755,7 @@ void LoadEnv::impl_detectTypeAndFilter()
m_lMediaDescriptor[utl::MediaDescriptor::PROP_FILTERPROVIDER()] <<=
OUString("orcus");
m_lMediaDescriptor[utl::MediaDescriptor::PROP_DOCUMENTSERVICE()] <<=
OUString("com.sun.star.sheet.SpreadsheetDocument");
return;
+// <- SAFE
}
css::uno::Reference< css::document::XTypeDetection > xDetect(
Linker error when compiling libreoffice core.
Hello, i hope i am at the right place to report this, i already tried on bugzilla and i have been sent here. I want to compile libreoffice online on my raspberry pi 4 (armv7l) on a custom LFS OS. According to the INSTALL file, i have first to build libreoffice core. But during the `make` command, I get a linker error of type `undefined reference to 'non-virtual thunk to ...'` Here is the complete log of my command: ``` bash-5.0$ make -j 1 -rs -f /sources/libreoffice/ext/core/Makefile.gbuild build [DEP] LNK:Library/libchartcontrollerlo.so [LNK] Library/libchartcontrollerlo.so [CMP] chart2/source/controller/chartcontroller [BIN] chart2 [MOD] chart2 [DEP] LNK:Library/libcuilo.so [LNK] Library/libcuilo.so [CMP] cui/util/cui [BIN] cui [MOD] cui [DEP] LNK:Library/libwriterfilterlo.so [LNK] Library/libwriterfilterlo.so /usr/bin/ld: /sources/libreoffice/ext/core/workdir/CxxObject/writerfilter/source/rtftok/rtfdocumentimpl.o: in function `writerfilter::rtftok::RTFDocumentImpl::handleEmbeddedObject()': rtfdocumentimpl.cxx:(.text+0x86bc): undefined reference to `non-virtual thunk to cppu::ImplInheritanceHelper::acquire()' collect2: error: ld returned 1 exit status make: *** [/sources/libreoffice/ext/core/writerfilter/Library_writerfilter.mk:10: /sources/libreoffice/ext/core/instdir/program/libwriterfilterlo.so] Error 1 ``` Steps to Reproduce: 1. clone the core repository of libreoffice 2. Autogen: ./autogen.sh --without-system-libxml --with-distro=LibreOfficeOnline 3. Make: make Here is the head of ./config.log ./configure --without-system-libxml --disable-cups --disable-dbus --disable-dconf --disable-epm --disable-evolution2 --disable-ext-nlpsolver --disable-ext-wiki-publisher --disable-firebird-sdbc --disable-gio --disable-gstreamer-1-0 --disable-gtk3 --disable-gui --disable-qt5 --disable-kf5 --disable-odk --disable-online-update --disable-skia --enable-pdfimport --disable-postgresql-sdbc --disable-report-builder --disable-scripting-beanshell --disable-scripting-javascript --disable-sdremote --disable-sdremote-bluetooth --enable-extension-integration --enable-mergelibs --enable-python=internal --enable-release-build --with-external-dict-dir=/usr/share/hunspell --with-external-hyph-dir=/usr/share/hyphen --with-external-thes-dir=/usr/share/mythes --with-fonts --with-galleries=no --with-lang=ALL --with-linker-hash-style=both --with-system-dicts --with-system-zlib --with-theme=colibre --without-branding --without-help --without-java --without-junit --with-myspell-dicts --without-package-format --without-system-cairo --without-system-jars --without-system-jpeg --without-system-libpng --without-system-libxml --without-system-openssl --disable-poppler --without-system-postgresql --srcdir=/sources/libreoffice/ext/core --enable-option-checking=fata I also added `/sources/libreoffice/ext/core/workdir/UnpackedTarball/libxml2/.libs/` to my LD_LIBRARY_PATH to solve another compilation error. As i am totally unfamilliar with UNO API and with C++ programming, i don't think i can do a lot. Thanks in advance for your time. Mysaa Java
LibreOffice 7.2.0.4 : bug report
Bonjour, Voici le bug que j’ai malheureusement sur mon ordinateur lorsque j’ouvre Calc, je saisis des chiffres dans une cellule et je fais Entrée. Rapport en pièce jointe. Ça fait peur pour un logiciel à peine installé et dont le code a soit disant était revu et dépoussiéré. C’est à vous dégoûter du libre. Microsoft a encore de beau jours devant lui ! Cordialement, Pierre Signature du problème : Nom dévénement de problème: APPCRASH Nom de lapplication: soffice.bin Version de lapplication: 7.2.0.4 Horodatage de lapplication: 611afbde Nom du module par défaut: ucrtbase.DLL Version du module par défaut: 10.0.10240.16390 Horodateur du module par défaut: 55a5b718 Code de lexception: 4015 Décalage de lexception: 00065a5f Version du système: 6.1.7601.2.1.0.256.48 Identificateur de paramètres régionaux: 1036 Information supplémentaire n° 1: 3f1b Information supplémentaire n° 2: 3f1bb0b42f2868ebfb1bcc83f72390aa Information supplémentaire n° 3: 802c Information supplémentaire n° 4: 802c63bd84c0c638c08b921fdf73
[Libreoffice-commits] core.git: basic/source
basic/source/runtime/runtime.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 975c73fe13e743ecd922a93be190476cf250d9ba
Author: Andreas Heinisch
AuthorDate: Tue Sep 7 21:45:04 2021 +0200
Commit: Andreas Heinisch
CommitDate: Tue Sep 7 23:00:32 2021 +0200
Fixed typos in the description of the default case for optionals
Change-Id: Ib80faf454fe4ef22b3ebb0b633769d4479cd84a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121793
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index b0e9653522d2..6ab49727c0c3 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -4188,8 +4188,8 @@ void SbiRuntime::StepPARAM( sal_uInt32 nOp1, sal_uInt32
nOp2 )
if( nDefaultId > 0 )
{
// tdf#143707 - check if the data type character was
added after the string
-// termination symbol, and convert the variable if it
was present. The
-// data type character was It was added in
basic/source/comp/symtbl.cxx.
+// termination symbol, and convert the variable if it
was present. The
+// data type character was added in
basic/source/comp/symtbl.cxx.
SbxDataType eTypeStr;
OUString aDefaultStr = pImg->GetString( nDefaultId,
&eTypeStr );
pVar = new SbxVariable(pParam-> eType);
[Libreoffice-commits] core.git: basic/qa
basic/qa/vba_tests/collection.vb | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 409abb1fca4d360295304e1efff471d63a51e436
Author: Andreas Heinisch
AuthorDate: Tue Sep 7 21:31:13 2021 +0200
Commit: Andreas Heinisch
CommitDate: Tue Sep 7 22:25:13 2021 +0200
Fixed a copy paste error in the test cases
Change-Id: Ib11b6cfe385542664b28de35897caee67099d22c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121792
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch
diff --git a/basic/qa/vba_tests/collection.vb b/basic/qa/vba_tests/collection.vb
index d98ad9d1d237..0f0c47a262d9 100644
--- a/basic/qa/vba_tests/collection.vb
+++ b/basic/qa/vba_tests/collection.vb
@@ -60,12 +60,12 @@ Sub verify_testCollection()
' After the fix of tdf#110003
' TestUtil.AssertEqual(b.Count, 2, "b.Count")
-TestUtil.AssertEqual(b.Item("SS"), 1, "a.Item(""SS"")")
-TestUtil.AssertEqual(b.Item("ss"), 1, "a.Item(""ss"")")
-TestUtil.AssertEqual(b.Item("ẞ"), 3, "a.Item(""ẞ"")")
-TestUtil.AssertEqual(b.Item("ß"), 4, "a.Item(""ß"")")
+TestUtil.AssertEqual(b.Item("SS"), 1, "b.Item(""SS"")")
+TestUtil.AssertEqual(b.Item("ss"), 1, "b.Item(""ss"")")
+TestUtil.AssertEqual(b.Item("ẞ"), 3, "b.Item(""ẞ"")")
+TestUtil.AssertEqual(b.Item("ß"), 4, "b.Item(""ß"")")
' After the fix of tdf#110003
-' TestUtil.AssertEqual(a.Item("ß"), 3, "a.Item(""ß"")")
+' TestUtil.AssertEqual(b.Item("ß"), 3, "b.Item(""ß"")")
Exit Sub
errorHandler:
[Libreoffice-commits] core.git: basic/qa
basic/qa/cppunit/test_vba.cxx|1 +
basic/qa/vba_tests/collection.vb |8
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 092740eddd9d2e9b19e4c08f4980a59402e676e1
Author: Andreas Heinisch
AuthorDate: Tue Sep 7 19:49:41 2021 +0200
Commit: Andreas Heinisch
CommitDate: Tue Sep 7 20:52:00 2021 +0200
tdf#144245 - Added test file to automatic test
Change-Id: I92b71b7e7ac8c2262d36875e4b04ed91e17bc495
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121791
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 8c43575f8f51..64875b9e1c46 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -74,6 +74,7 @@ void VBATest::testMiscVBAFunctions()
"cos.vb",
"cint.vb",
"clng.vb",
+"collection.vb",
"csng.vb",
"cstr.vb",
"cvdate.vb",
diff --git a/basic/qa/vba_tests/collection.vb b/basic/qa/vba_tests/collection.vb
index 0b765905290a..d98ad9d1d237 100644
--- a/basic/qa/vba_tests/collection.vb
+++ b/basic/qa/vba_tests/collection.vb
@@ -60,10 +60,10 @@ Sub verify_testCollection()
' After the fix of tdf#110003
' TestUtil.AssertEqual(b.Count, 2, "b.Count")
-TestUtil.AssertEqual(a.Item("SS"), 1, "a.Item(""SS"")")
-TestUtil.AssertEqual(a.Item("ss"), 1, "a.Item(""ss"")")
-TestUtil.AssertEqual(a.Item("ẞ"), 3, "a.Item(""ẞ"")")
-TestUtil.AssertEqual(a.Item("ß"), 4, "a.Item(""ß"")")
+TestUtil.AssertEqual(b.Item("SS"), 1, "a.Item(""SS"")")
+TestUtil.AssertEqual(b.Item("ss"), 1, "a.Item(""ss"")")
+TestUtil.AssertEqual(b.Item("ẞ"), 3, "a.Item(""ẞ"")")
+TestUtil.AssertEqual(b.Item("ß"), 4, "a.Item(""ß"")")
' After the fix of tdf#110003
' TestUtil.AssertEqual(a.Item("ß"), 3, "a.Item(""ß"")")
[Libreoffice-commits] core.git: sd/source
sd/source/ui/view/sdview2.cxx | 19 ---
sd/source/ui/view/sdview3.cxx | 21 +
2 files changed, 29 insertions(+), 11 deletions(-)
New commits:
commit 491678690b5b40f446b40c368ec4b4423ee603c1
Author: Caolán McNamara
AuthorDate: Tue Sep 7 16:46:38 2021 +0100
Commit: Caolán McNamara
CommitDate: Tue Sep 7 19:54:03 2021 +0200
unbalanced [Beg/End]Undo possible on self-dnd in impress
repeatedly holding the mouse button on an object long enough to start a
drag and then trying again will eventually result in a situation where
View::StartDrag is called, triggering a gtk_drag_begin which neither
fails with drag-failure or succeeds with drag-end and so no
View::DragFinished gets called. This is possibly only an issue under
(Fedora 34) wayland.
When it happens it leaves an unbalanced BegUndo from StartDrag with no
EndUndo which will eventually be fatal if the user uses undo.
So remove the BegUndo from StartDrag because we can't be sure to get
a DragFinished and...
a) put the removal of original objects (when ACTION_MOVE) in
DragFinished in a simple BegUndo/EndUndo block of its own. Whether the
dnd is to another application or to ourself won't matter.
b) in View::InsertData detect if the action is a self-dnd and if so
put that in another BegUndo/EndUndo block and explicitly call
DragFinished before EndUndo to put a) within that group so a drag
of an object from one slide to the other gives a single "Drag and Drop"
move undo action listed for the copy and delete. DragFinished will
get called again but that's ok in this case and its 2nd call won't
affect the undo stack.
c) when this problem arises, later Drag attempts fail to do anything
because View::StartDrag returns early if a mpDragSrcMarkList from an
earlier attempt is set. Remove that guard and allow mpDragSrcMarkList
to be replaced after a silently failed drag attempt.
Change-Id: I3933663ff74f1ca99d9410b7752227ecf8d0da46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121787
Tested-by: Jenkins
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 6ac19f72e1e7..5f305228c1e3 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -341,7 +341,7 @@ void View::DoPaste (::sd::Window* pWindow)
void View::StartDrag( const Point& rStartPos, vcl::Window* pWindow )
{
-if( !AreObjectsMarked() || !IsAction() || !mpViewSh || !pWindow ||
mpDragSrcMarkList )
+if (!AreObjectsMarked() || !IsAction() || !mpViewSh || !pWindow)
return;
BrkAction();
@@ -359,17 +359,18 @@ void View::StartDrag( const Point& rStartPos,
vcl::Window* pWindow )
mpDragSrcMarkList.reset( new SdrMarkList(GetMarkedObjectList()) );
mnDragSrcPgNum = GetSdrPageView()->GetPage()->GetPageNum();
-if( IsUndoEnabled() )
-{
-OUString aStr(SdResId(STR_UNDO_DRAGDROP));
-BegUndo(aStr + " " + mpDragSrcMarkList->GetMarkDescription());
-}
CreateDragDataObject( this, *pWindow, rStartPos );
}
void View::DragFinished( sal_Int8 nDropAction )
{
const bool bUndo = IsUndoEnabled();
+const bool bGroupUndo = bUndo && mpDragSrcMarkList;
+if (bGroupUndo)
+{
+OUString aStr(SdResId(STR_UNDO_DRAGDROP));
+BegUndo(aStr + " " + mpDragSrcMarkList->GetMarkDescription());
+}
SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag;
@@ -419,11 +420,7 @@ void View::DragFinished( sal_Int8 nDropAction )
if( pDragTransferable )
pDragTransferable->SetInternalMove( false );
-//This Undo appears to matches with the STR_UNDO_DRAGDROP Undo Start of
-//View::StartDrag But this DragFinished can be called without a matching
-//StartDrag. So use the existence of mpDragSrcMarkList as a flag that
-//this EndUndo has a matching BegUndo
-if (bUndo && mpDragSrcMarkList)
+if (bGroupUndo)
EndUndo();
mnDragSrcPgNum = SDRPAGE_NOTFOUND;
mpDragSrcMarkList.reset();
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 8bbb9ce7e24f..a7204648ee4d 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -293,17 +293,29 @@ bool View::InsertData( const TransferableDataHelper&
rDataHelper,
pImplementation = nullptr;
}
+bool bSelfDND = false;
+
// try to get own transfer data
if( pImplementation )
{
if( SD_MOD()->pTransferClip == pImplementation )
pOwnData = SD_MOD()->pTransferClip;
else if( SD_MOD()->pTransferDrag == pImplementation )
+{
pOwnData = SD_MOD()->pTransferDrag;
+bSelfDND = true;
+}
else if( SD_MOD()->pTransferSelection == pImplementation )
pOwnData = SD_MOD()->pTransferSelection;
}
+c
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e812693053b18f4d0c6461c4fe8f965ba1695f76
Author: Caolán McNamara
AuthorDate: Tue Sep 7 14:17:17 2021 +0100
Commit: Caolán McNamara
CommitDate: Tue Sep 7 19:53:12 2021 +0200
ofz: MemorySanitizer: use-of-uninitialized-value
Change-Id: I07ab38df2855a55cea1993ad29c7e2b58c6a3142
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121781
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 08ab320489eb..3f8fbb67d47b 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -6217,9 +6217,9 @@ ErrCode SwWW8ImplReader::LoadDoc(WW8Glossary *pGloss)
if (m_pStg && 0xa5ec == nMagic)
{
sal_uLong nCurPos = m_pStrm->Tell();
-if (m_pStrm->Seek(nCurPos + 22))
+if (checkSeek(*m_pStrm, nCurPos + 2))
{
-sal_uInt32 nfcMin;
+sal_uInt32 nfcMin(0);
m_pStrm->ReadUInt32( nfcMin );
if (0x300 != nfcMin)
nErrRet = ERR_WW6_NO_WW6_FILE_ERR;
test testPreserveJpg::TestBody fails
Hi, I get the following error when I run the tests on the master: [_RUN_] testPreserveJpg::TestBody unknown:0:testPreserveJpg::TestBody An uncaught exception of type com.sun.star.io.IOException - SfxBaseModel::impl_store failed: 0xc10(Error Area:Io Class:Write Code:16) [...]/libo/master/sfx2/source/doc/sfxbasemodel.cxx:3187 [...]/libo/master/sfx2/source/doc/sfxbasemodel.cxx:1767 My C++ skills are not enough to understand the problem. Something has changed recently because the tests passed fine 2 or 3 weaks ago. My build: Version: 7.3.0.0.alpha0+ / LibreOffice Community Build ID: b42516b433c1d71487db061a058887f6dd76dd74 CPU threads: 8; OS: Linux 5.11; UI render: default; VCL: gtk3 Locale: fr-FR (fr_FR.UTF-8); UI: en-US Ubuntu_20.04_x86-64 Calc: threaded I have the same problem with LO 7.2.2.0.0+. I use gcc 10 to build LO. Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents.
[Libreoffice-commits] core.git: include/vcl vcl/qa vcl/source
include/vcl/filter/pdfdocument.hxx |1
vcl/qa/cppunit/pdfexport/data/WG7100-Preface.odt |binary
vcl/qa/cppunit/pdfexport/data/master.odm |binary
vcl/qa/cppunit/pdfexport/pdfexport.cxx | 87 +++
vcl/source/filter/ipdf/pdfdocument.cxx | 17
5 files changed, 105 insertions(+)
New commits:
commit 992f878e8c3424f7ce96a78ccf3a316b29ffd9ec
Author: Michael Stahl
AuthorDate: Tue Sep 7 13:51:20 2021 +0200
Commit: Michael Stahl
CommitDate: Tue Sep 7 19:02:32 2021 +0200
tdf#142129 vcl: add unit test
Reportedly bug was fixed by commit
5fc6a601d7a1978db291fd0f7dcec638a7c25651
Change-Id: Iee32cacff0c939bdf498e9dc8102eb2d22a5a1c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121776
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/include/vcl/filter/pdfdocument.hxx
b/include/vcl/filter/pdfdocument.hxx
index 073225b589b0..aae3b5a1f893 100644
--- a/include/vcl/filter/pdfdocument.hxx
+++ b/include/vcl/filter/pdfdocument.hxx
@@ -546,6 +546,7 @@ public:
//@{
/// Decode a hex dump.
static std::vector DecodeHexString(PDFHexStringElement
const* pElement);
+static OUString DecodeHexStringUTF16BE(PDFHexStringElement const&
rElement);
static OString ReadKeyword(SvStream& rStream);
static size_t FindStartXRef(SvStream& rStream);
void ReadXRef(SvStream& rStream);
diff --git a/vcl/qa/cppunit/pdfexport/data/WG7100-Preface.odt
b/vcl/qa/cppunit/pdfexport/data/WG7100-Preface.odt
new file mode 100644
index ..05e2bb18408a
Binary files /dev/null and b/vcl/qa/cppunit/pdfexport/data/WG7100-Preface.odt
differ
diff --git a/vcl/qa/cppunit/pdfexport/data/master.odm
b/vcl/qa/cppunit/pdfexport/data/master.odm
new file mode 100644
index ..74016352b762
Binary files /dev/null and b/vcl/qa/cppunit/pdfexport/data/master.odm differ
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index bb203602714d..0da9bedd33ef 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -2791,6 +2791,93 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testPdfUaMetadata)
CPPUNIT_ASSERT_EQUAL(OString("1"), aPdfUaPart);
}
+CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf142129)
+{
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "master.odm";
+mxComponent = loadFromDesktop(aURL);
+
+// update linked section
+dispatchCommand(mxComponent, ".uno:UpdateAllLinks", {});
+
+uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
+utl::MediaDescriptor aMediaDescriptor;
+aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export");
+
+// Enable Outlines export
+uno::Sequence aFilterData(
+comphelper::InitPropertySequence({ { "ExportBookmarks", uno::Any(true)
} }));
+aMediaDescriptor["FilterData"] <<= aFilterData;
+xStorable->storeToURL(maTempFile.GetURL(),
aMediaDescriptor.getAsConstPropertyValueList());
+
+// Parse the export result.
+vcl::filter::PDFDocument aDocument;
+SvFileStream aStream(maTempFile.GetURL(), StreamMode::READ);
+CPPUNIT_ASSERT(aDocument.Read(aStream));
+
+auto* pCatalog = aDocument.GetCatalog();
+CPPUNIT_ASSERT(pCatalog);
+auto* pCatalogDictionary = pCatalog->GetDictionary();
+CPPUNIT_ASSERT(pCatalogDictionary);
+auto* pOutlinesObject = pCatalogDictionary->LookupObject("Outlines");
+CPPUNIT_ASSERT(pOutlinesObject);
+auto* pOutlinesDictionary = pOutlinesObject->GetDictionary();
+#if 0
+// Type isn't actually written currently
+auto* pType
+=
dynamic_cast(pOutlinesDictionary->LookupElement("Type"));
+CPPUNIT_ASSERT(pType);
+CPPUNIT_ASSERT_EQUAL(OString("Outlines"), pType->GetValue());
+#endif
+
+auto* pFirst = dynamic_cast(
+pOutlinesDictionary->LookupElement("First"));
+CPPUNIT_ASSERT(pFirst);
+auto* pFirstD = pFirst->LookupObject()->GetDictionary();
+CPPUNIT_ASSERT(pFirstD);
+//CPPUNIT_ASSERT_EQUAL(OString("Outlines"),
dynamic_cast(pFirstD->LookupElement("Type"))->GetValue());
+CPPUNIT_ASSERT_EQUAL(OUString(u"Preface"),
::vcl::filter::PDFDocument::DecodeHexStringUTF16BE(
+
*dynamic_cast(
+
pFirstD->LookupElement("Title";
+
+auto* pFirst1
+=
dynamic_cast(pFirstD->LookupElement("First"));
+CPPUNIT_ASSERT(pFirst1);
+auto* pFirst1D = pFirst1->LookupObject()->GetDictionary();
+CPPUNIT_ASSERT(pFirst1D);
+// here is a hidden section with headings "Copyright" etc.; check that
+// there are no outline entries for it
+//CPPUNIT_ASSERT_EQUAL(OString("Outlines"),
dynamic_cast(pFirst1D->LookupElement("Type"))->GetValue());
+CPPUNIT_ASSERT_EQUAL(
+OUString(u"Who is this book for?"),
+::vcl::filter::PDFDocument::DecodeHexStringUTF16BE(
+
*d
[Libreoffice-commits] core.git: include/sfx2 include/svtools include/vcl sfx2/source svtools/source vcl/inc vcl/Library_vcl.mk vcl/source vcl/unx
include/sfx2/printopt.hxx | 10 +-
include/svtools/printoptions.hxx |6 -
include/vcl/print.hxx | 108 -
include/vcl/printer/Options.hxx| 120 +
sfx2/source/dialog/printopt.cxx| 20 ++---
svtools/source/config/printoptions.cxx | 17 ++--
vcl/Library_vcl.mk |1
vcl/inc/print.hrc |2
vcl/source/gdi/print.cxx | 117 +++-
vcl/source/gdi/print2.cxx |5 -
vcl/source/gdi/print3.cxx | 40 +--
vcl/source/printer/Options.cxx | 110 ++
vcl/source/window/printdlg.cxx | 30
vcl/unx/generic/print/genprnpsp.cxx|1
14 files changed, 329 insertions(+), 258 deletions(-)
New commits:
commit 7228a2dbfa11cd846678aaacd248c68adcda5f34
Author: Chris Sherlock
AuthorDate: Wed Sep 1 02:19:27 2021 +1000
Commit: Mike Kaganski
CommitDate: Tue Sep 7 17:59:47 2021 +0200
vcl: rename PrinterOptions to vcl::printer::Options
Move Options to own source and header files. Options moved to own
source and header files, however also put Options into vcl::printer
namespace.
I have renamed and moved PrinterOptions into the vcl::printer namespace
because the word "Printer" is redundant, and we want to organize the vcl
namespace better.
Change-Id: I2ef188af381dd65907d48f7b190e4ab69417606d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121389
Reviewed-by: Mike Kaganski
Tested-by: Jenkins
diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx
index e68286c1a2e1..2bdc6a9c2011 100644
--- a/include/sfx2/printopt.hxx
+++ b/include/sfx2/printopt.hxx
@@ -25,7 +25,7 @@
#include
#include
#include
-
+#include
class SFX2_DLLPUBLIC SfxCommonPrintOptionsTabPage final : public SfxTabPage
{
@@ -54,8 +54,8 @@ private:
private:
-PrinterOptions maPrinterOptions;
-PrinterOptions maPrintFileOptions;
+vcl::printer::Options maPrinterOptions;
+vcl::printer::Options maPrintFileOptions;
DECL_DLLPRIVATE_LINK( ToggleOutputPrinterRBHdl,
weld::Toggleable&, void );
DECL_DLLPRIVATE_LINK( ToggleOutputPrintFileRBHdl,
weld::Toggleable&, void);
@@ -67,8 +67,8 @@ private:
DECL_DLLPRIVATE_LINK(
ToggleReduceGradientsStripesRBHdl, weld::Toggleable&, void );
DECL_DLLPRIVATE_LINK(
ToggleReduceBitmapsResolutionRBHdl, weld::Toggleable&, void );
-SAL_DLLPRIVATE void ImplUpdateControls( const PrinterOptions*
pCurrentOptions );
-SAL_DLLPRIVATE void ImplSaveControls( PrinterOptions* pCurrentOptions );
+SAL_DLLPRIVATE void ImplUpdateControls( const vcl::printer::Options*
pCurrentOptions );
+SAL_DLLPRIVATE void ImplSaveControls( vcl::printer::Options*
pCurrentOptions );
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
diff --git a/include/svtools/printoptions.hxx b/include/svtools/printoptions.hxx
index 6f2e86df3cf1..1223814a84b3 100644
--- a/include/svtools/printoptions.hxx
+++ b/include/svtools/printoptions.hxx
@@ -23,12 +23,12 @@
#include
#include
-class PrinterOptions;
+namespace vcl::printer { class Options; }
namespace svtools
{
-SVT_DLLPUBLIC void GetPrinterOptions( PrinterOptions& rOptions, bool bFile
);
-SVT_DLLPUBLIC void SetPrinterOptions( const PrinterOptions& rOptions, bool
bFile );
+SVT_DLLPUBLIC void GetPrinterOptions( vcl::printer::Options& rOptions,
bool bFile );
+SVT_DLLPUBLIC void SetPrinterOptions( const vcl::printer::Options&
rOptions, bool bFile );
};
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index b4db13959954..dba696eebf18 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -20,15 +20,22 @@
#ifndef INCLUDED_VCL_PRINT_HXX
#define INCLUDED_VCL_PRINT_HXX
+#include
+
#include
+
+#include
#include
+#include
+#include
#include
-#include
#include
+#include
+#include
#include
#include
-#include
+#include
#include
#include
@@ -48,97 +55,14 @@ enum class SalPrinterError;
namespace vcl {
class PrinterController;
+
+namespace printer {
+class Options;
+}
}
namespace weld { class Window; }
-enum class PrinterTransparencyMode
-{
-Auto = 0,
-NONE = 1
-};
-
-
-enum class PrinterGradientMode
-{
-Stripes = 0,
-Color= 1
-};
-
-
-enum class PrinterBitmapMode
-{
-Optimal= 0,
-Normal = 1,
-Resolution = 2
-};
-
-
-class UNLESS_MERGELIBS(VCL_DLLPUBLIC) PrinterOptions
-{
-private:
-
-boolmbReduceTransparency;
-PrinterTransparencyMode meReducedTransparencyMode;
-boolmbReduceGradients;
-PrinterGradientMode meReducedGradientsMode;
-sal_uInt16
[Libreoffice-commits] core.git: sd/source
sd/source/ui/view/sdview2.cxx | 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
New commits:
commit b42516b433c1d71487db061a058887f6dd76dd74
Author: Caolán McNamara
AuthorDate: Tue Sep 7 10:16:23 2021 +0100
Commit: Caolán McNamara
CommitDate: Tue Sep 7 17:29:34 2021 +0200
dynamic_cast followed by static_cast
Change-Id: If917550a1425d3ec82fcf7ad06dd9f9438fb2e30
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121750
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 950a2422c599..6ac19f72e1e7 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -349,14 +349,11 @@ void View::StartDrag( const Point& rStartPos,
vcl::Window* pWindow )
if( IsTextEdit() )
SdrEndTextEdit();
-DrawViewShell* pDrawViewShell = dynamic_cast< DrawViewShell* >( mpDocSh ?
mpDocSh->GetViewShell() : nullptr );
-
-if( pDrawViewShell )
+if (DrawViewShell* pDrawViewShell = dynamic_cast(mpDocSh ?
mpDocSh->GetViewShell() : nullptr))
{
-const rtl::Reference& xFunction(
pDrawViewShell->GetCurrentFunction() );
-
-if( xFunction.is() && nullptr != dynamic_cast< const FuDraw *>(
xFunction.get() ) )
-static_cast(xFunction.get())->ForcePointer();
+const rtl::Reference&
xFunction(pDrawViewShell->GetCurrentFunction());
+if (FuDraw* pFunction = dynamic_cast(xFunction.get()))
+pFunction->ForcePointer();
}
mpDragSrcMarkList.reset( new SdrMarkList(GetMarkedObjectList()) );
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 500f85145181ff219d801cb26b0cfd44a219598a Author: Mike Kaganski AuthorDate: Tue Sep 7 16:44:58 2021 +0200 Commit: René Engelhard CommitDate: Tue Sep 7 17:25:24 2021 +0200 Fix typo Change-Id: Ie7481a122436ae765e36642f27afa45b8a11bba3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121761 Reviewed-by: René Engelhard Tested-by: René Engelhard diff --git a/configure.ac b/configure.ac index e44f1ab9e312..3779924c6550 100644 --- a/configure.ac +++ b/configure.ac @@ -8830,7 +8830,7 @@ if test -n "$with_idlc_cpp"; then fi else AC_MSG_RESULT([ucpp]) -AC_MSG_CHECKING([which ucpp tp use]) +AC_MSG_CHECKING([which ucpp to use]) if test -n "$with_system_ucpp" -a "$with_system_ucpp" != "no"; then AC_MSG_RESULT([external]) AC_PATH_PROG(SYSTEM_UCPP, ucpp)
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5be9a4c470c7423956eb8d2cdaf90b4a77dd82d7 Author: Ilmari Lauhakangas AuthorDate: Tue Sep 7 18:16:15 2021 +0300 Commit: Gerrit Code Review CommitDate: Tue Sep 7 17:16:15 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 77c10ceaaabe76f57014e53dbdd4560d988bb8a1 - Fix typo in path to Tip-of-the-day xhp Change-Id: Id7a058cd490fcf52151e7ae8897016039d16f3d1 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/121786 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas diff --git a/helpcontent2 b/helpcontent2 index 280680693746..77c10ceaaabe 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 280680693746332e5bf1d49f53285b29b0ae321d +Subproject commit 77c10ceaaabe76f57014e53dbdd4560d988bb8a1
[Libreoffice-commits] help.git: AllLangHelp_shared.mk
AllLangHelp_shared.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 77c10ceaaabe76f57014e53dbdd4560d988bb8a1 Author: Ilmari Lauhakangas AuthorDate: Tue Sep 7 18:14:46 2021 +0300 Commit: Ilmari Lauhakangas CommitDate: Tue Sep 7 17:16:14 2021 +0200 Fix typo in path to Tip-of-the-day xhp Change-Id: Id7a058cd490fcf52151e7ae8897016039d16f3d1 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/121786 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk index 7db786845..48266a686 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -376,7 +376,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ helpcontent2/source/text/shared/01/securitywarning \ helpcontent2/source/text/shared/01/selectcertificate \ helpcontent2/source/text/shared/01/timestampauth \ -helpcontent2/source/text/shared/01/tipoftheday \ +helpcontent2/source/text/shared/guide/tipoftheday \ helpcontent2/source/text/shared/01/webhtml \ helpcontent2/source/text/shared/01/xformsdata \ helpcontent2/source/text/shared/01/xformsdataadd \
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sc/qa sc/source
sc/qa/unit/scshapetest.cxx | 84
sc/source/filter/xcl97/xcl97rec.cxx |8 ++-
2 files changed, 90 insertions(+), 2 deletions(-)
New commits:
commit 7ed532a2cbce52cd20b0801116d35ce713365f76
Author: Regina Henschel
AuthorDate: Sun Sep 5 01:28:44 2021 +0200
Commit: Xisco Fauli
CommitDate: Tue Sep 7 17:05:50 2021 +0200
tdf#144242 no width-height swap for line and pathline
MS Office swaps width and height for rotation angle ranges 45..135 and
225..315. Line and Pathline objects incorporate the rotation into their
points, so have no rotation. Line and open Pathline objects nevertheless
report an rotation angle. That one is used to align the text direction
to the line. But because of this reported angle, width and height were
swapped. The patch excludes these objects explicitly.
The case differentiation for the rotation range had forgotten to
normalize the angle. Therefore, in a reopened spreadsheet, the line was
accidentally exported correctly without width-height swap, because in
this case the rotation angle is negative.
Change-Id: I5f698d1cc734e17bcb02ff77db5224a228392e06
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121661
Tested-by: Jenkins
Reviewed-by: Regina Henschel
(cherry picked from commit 84d6d704682a4d0e037a28895356b073e4f992a5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121752
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/unit/scshapetest.cxx b/sc/qa/unit/scshapetest.cxx
index c178c28578a6..5586cdb954f2 100644
--- a/sc/qa/unit/scshapetest.cxx
+++ b/sc/qa/unit/scshapetest.cxx
@@ -71,6 +71,8 @@ public:
void testTdf115655_HideDetail();
void testFitToCellSize();
void testCustomShapeCellAnchoredRotatedShape();
+void testTdf144242_Line_noSwapWH();
+void testTdf144242_OpenBezier_noSwapWH();
CPPUNIT_TEST_SUITE(ScShapeTest);
CPPUNIT_TEST(testTdf143619_validation_circle_pos);
@@ -98,6 +100,8 @@ public:
CPPUNIT_TEST(testTdf115655_HideDetail);
CPPUNIT_TEST(testFitToCellSize);
CPPUNIT_TEST(testCustomShapeCellAnchoredRotatedShape);
+CPPUNIT_TEST(testTdf144242_Line_noSwapWH);
+CPPUNIT_TEST(testTdf144242_OpenBezier_noSwapWH);
CPPUNIT_TEST_SUITE_END();
};
@@ -206,6 +210,86 @@ static SdrObject* lcl_getSdrObjectWithAssert(ScDocument&
rDoc, sal_uInt16 nObjNu
return pObj;
}
+void ScShapeTest::testTdf144242_OpenBezier_noSwapWH()
+{
+// Shapes, which have rotation incorporated in their points, got
erroneously width-height
+// swapped, because they report a rotation. (Rotation was introduced to
align text with curve.)
+
+// Create a spreadsheet document with default row height and col width
+uno::Reference xComponent
+= loadFromDesktop("private:factory/scalc",
"com.sun.star.sheet.SpreadsheetDocument");
+
+// Get ScDocShell
+ScDocShell* pDocSh = lcl_getScDocShellWithAssert(xComponent);
+
+// Insert default open Bezier curve
+ScTabViewShell* pTabViewShell = lcl_getScTabViewShellWithAssert(pDocSh);
+SfxRequest aReq(pTabViewShell->GetViewFrame(), SID_DRAW_BEZIER_NOFILL);
+aReq.SetModifier(KEY_MOD1); // Ctrl
+pTabViewShell->ExecDraw(aReq);
+pTabViewShell->SetDrawShell(false);
+
+// Get document and newly created object
+ScDocument& rDoc = pDocSh->GetDocument();
+SdrObject* pObj = lcl_getSdrObjectWithAssert(rDoc, 0);
+
+// Rotate object by 300deg
+pObj->Rotate(pObj->GetSnapRect().Center(), 3_deg100,
sin(toRadians(3_deg100)),
+ cos(toRadians(3_deg100)));
+tools::Rectangle aExpectRect(pObj->GetSnapRect());
+
+// Save, reload and compare
+saveAndReload(xComponent, "Calc Office Open XML");
+pDocSh = lcl_getScDocShellWithAssert(xComponent);
+ScDocument& rDoc2 = pDocSh->GetDocument();
+pObj = lcl_getSdrObjectWithAssert(rDoc2, 0);
+tools::Rectangle aSnapRect(pObj->GetSnapRect());
+// Without fix in place width and height were swapped
+lcl_AssertRectEqualWithTolerance("Reload: wrong pos and size",
aExpectRect, aSnapRect, 30);
+
+pDocSh->DoClose();
+}
+
+void ScShapeTest::testTdf144242_Line_noSwapWH()
+{
+// Shapes, which have rotation incorporated in their points, got
erroneously width-height
+// swapped, because they report a rotation. (Rotation was introduced to
align text with line.)
+
+// Create a spreadsheet document with default row height and col width
+uno::Reference xComponent
+= loadFromDesktop("private:factory/scalc",
"com.sun.star.sheet.SpreadsheetDocument");
+
+// Get ScDocShell
+ScDocShell* pDocSh = lcl_getScDocShellWithAssert(xComponent);
+
+// Insert default line
+ScTabViewShell* pTabViewShell = lcl_getScTabViewShellWithAssert(pDocSh);
+SfxRequest aReq(pTabViewShell->GetViewFrame(), SID_DRAW_LINE);
+aReq.SetModifier(KEY_MOD1); // Ctrl
+pTabViewShell->ExecDraw(aReq);
+pTabViewSh
Re: Footnote in a frame
Le 07/09/2021 à 08:15, Miklos Vajna a écrit : Hi JBF, On Mon, Sep 06, 2021 at 06:42:30PM +0200, Jean-Baptiste Faure wrote: Thank you for your answer. If sw/source/core/layout/ code doesn't handle footnote anchors in Writer frames, is it because nobody wrote the code or because there is some impossibility to do that ? I think it's rather "nobody wrote the code". Thank you. I filed this enhancement: https://bugs.documentfoundation.org/show_bug.cgi?id=144357 Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents.
[Libreoffice-commits] core.git: winaccessibility/source
winaccessibility/source/UAccCOM/AccTable.cxx | 104 +++
winaccessibility/source/UAccCOM/AccTable.h |6 -
2 files changed, 43 insertions(+), 67 deletions(-)
New commits:
commit b3a3cc0e260b4f0fee645910db9548b1098eb420
Author: Michael Weghorn
AuthorDate: Tue Sep 7 13:01:15 2021 +0100
Commit: Michael Weghorn
CommitDate: Tue Sep 7 16:48:05 2021 +0200
wina11y: Drop CAccTable::GetXInterface
Consistently use the 'pRXTable' member directly instead
of mixing both ways to access it in almost every
CAccTable method.
While at it, also unify code a bit which is used to check
'pRXTable' inside of most CAccTable methods.
Change-Id: Iafbff80b8304edd994507f86abd57b6dae7fe353
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121778
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/winaccessibility/source/UAccCOM/AccTable.cxx
b/winaccessibility/source/UAccCOM/AccTable.cxx
index 25ecb2ea8496..7a628d2e9409 100644
--- a/winaccessibility/source/UAccCOM/AccTable.cxx
+++ b/winaccessibility/source/UAccCOM/AccTable.cxx
@@ -63,7 +63,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccTable::get_accessibleAt(long row, long col
if(!pRXTable.is())
return E_FAIL;
-Reference pRAcc =
GetXInterface()->getAccessibleCellAt(row,column);
+Reference pRAcc = pRXTable->getAccessibleCellAt(row, column);
if(!pRAcc.is())
{
@@ -82,7 +82,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccTable::get_accessibleAt(long row, long col
}
else if(pRAcc.is())
{
-Reference pxTable(GetXInterface(),UNO_QUERY);
+Reference pxTable(pRXTable, UNO_QUERY);
CMAccessible::g_pAgent->InsertAccObj(pRAcc.get(),pxTable.get());
isTRUE = CMAccessible::get_IAccessibleFromXAccessible(pRAcc.get(),
&pRet);
@@ -129,7 +129,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccTable::get_columnDescription(long column,
if(!pRXTable.is())
return E_FAIL;
-const OUString& ouStr =
GetXInterface()->getAccessibleColumnDescription(column);
+const OUString& ouStr = pRXTable->getAccessibleColumnDescription(column);
// #CHECK#
SAFE_SYSFREESTRING(*description);
@@ -154,23 +154,15 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccTable::get_columnExtentAt(long row, long c
ENTER_PROTECTED_BLOCK
-XAccessibleTable*pXAccTable = GetXInterface();
-
// Check pointer.
if(nColumnsSpanned == nullptr)
return E_INVALIDARG;
-// Get Extent.
-if(pXAccTable)
-{
-long lExt = pXAccTable->getAccessibleColumnExtentAt(row,column);
-
-// Fill Extent struct.
-*nColumnsSpanned = lExt;
-return S_OK;
-}
+if(!pRXTable.is())
+return E_FAIL;
-return E_FAIL;
+*nColumnsSpanned = pRXTable->getAccessibleColumnExtentAt(row, column);
+return S_OK;
LEAVE_PROTECTED_BLOCK
}
@@ -195,7 +187,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccTable::get_columnHeader(IAccessibleTable _
if(!pRXTable.is())
return E_FAIL;
-Reference pRColumnHeaderTable =
GetXInterface()->getAccessibleColumnHeaders();
+Reference pRColumnHeaderTable =
pRXTable->getAccessibleColumnHeaders();
if(!pRColumnHeaderTable.is())
{
*accessibleTable = nullptr;
@@ -245,7 +237,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccTable::get_nColumns(long * columnCount)
if(!pRXTable.is())
return E_FAIL;
-*columnCount = GetXInterface()->getAccessibleColumnCount();
+*columnCount = pRXTable->getAccessibleColumnCount();
return S_OK;
LEAVE_PROTECTED_BLOCK
@@ -270,7 +262,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_nRows(long
* rowCount)
if(!pRXTable.is())
return E_FAIL;
-*rowCount = GetXInterface()->getAccessibleRowCount();
+*rowCount = pRXTable->getAccessibleRowCount();
return S_OK;
LEAVE_PROTECTED_BLOCK
@@ -295,7 +287,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccTable::get_nSelectedColumns(long * columnC
if(!pRXTable.is())
return E_FAIL;
-Sequence pSelected = GetXInterface()->getSelectedAccessibleColumns();
+Sequence pSelected = pRXTable->getSelectedAccessibleColumns();
*columnCount = pSelected.getLength();
return S_OK;
@@ -321,7 +313,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccTable::get_nSelectedRows(long * rowCount)
if(!pRXTable.is())
return E_FAIL;
-Sequence pSelected = GetXInterface()->getSelectedAccessibleRows();
+Sequence pSelected = pRXTable->getSelectedAccessibleRows();
*rowCount = pSelected.getLength();
return S_OK;
@@ -348,7 +340,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
CAccTable::get_rowDescription(long row, BSTR *
if(!pRXTable.is())
return E_FAIL;
-const OUString& ouStr = GetXInterface()->getAccessibleRowDescription(row);
+const OUString& ouStr = pRXTable->getAccessibleRowDescription(row);
// #CHECK#
SAFE_SYSFREESTRING(*descriptio
[Libreoffice-commits] core.git: winaccessibility/source
winaccessibility/source/UAccCOM/MAccessible.cxx |1 - winaccessibility/source/UAccCOM/MAccessible.h |1 + winaccessibility/source/UAccCOM/UNOXWrapper.cxx |1 - winaccessibility/source/UAccCOM/UNOXWrapper.h |1 + 4 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 47b1bb2f66acc920a0a46cc84a32dabdd9540894 Author: Michael Weghorn AuthorDate: Tue Sep 7 10:29:50 2021 +0100 Commit: Michael Weghorn CommitDate: Tue Sep 7 16:47:45 2021 +0200 wina11y: Move "stdafx.h" include to headers Move the "stdafx.h" include to the MAccessible.h and UNOXWrapper.h headers from the corresponding source files, since the 'ATL_NO_VTABLE' define from stdafx.h is already used in the headers. (This e.g. also makes sure that the define is known when opening one of those headers in an IDE.) Change-Id: I3b6b7df037846daaad4d702e0e0c0bd2970dc663 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121773 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx index e9c563b3da5e..7ac0e67b9eff 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.cxx +++ b/winaccessibility/source/UAccCOM/MAccessible.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "stdafx.h" #include "MAccessible.h" #if defined __clang__ diff --git a/winaccessibility/source/UAccCOM/MAccessible.h b/winaccessibility/source/UAccCOM/MAccessible.h index 80e9cb463ca1..5384e6a5c665 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.h +++ b/winaccessibility/source/UAccCOM/MAccessible.h @@ -19,6 +19,7 @@ #pragma once +#include "stdafx.h" #include "Resource.h" // main symbols #include #include diff --git a/winaccessibility/source/UAccCOM/UNOXWrapper.cxx b/winaccessibility/source/UAccCOM/UNOXWrapper.cxx index a2b5d917dfa0..c009a005e4d1 100644 --- a/winaccessibility/source/UAccCOM/UNOXWrapper.cxx +++ b/winaccessibility/source/UAccCOM/UNOXWrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "stdafx.h" #include "UNOXWrapper.h" #if defined __clang__ diff --git a/winaccessibility/source/UAccCOM/UNOXWrapper.h b/winaccessibility/source/UAccCOM/UNOXWrapper.h index 76e47565a2d9..42983f88ace6 100644 --- a/winaccessibility/source/UAccCOM/UNOXWrapper.h +++ b/winaccessibility/source/UAccCOM/UNOXWrapper.h @@ -19,6 +19,7 @@ #pragma once +#include "stdafx.h" #include "Resource.h" // main symbols #include
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtkframe.cxx |6 -- 1 file changed, 6 deletions(-) New commits: commit f565adda49eae3cb2a07c3b4f2dff5c380c7a524 Author: Caolán McNamara AuthorDate: Tue Sep 7 12:42:57 2021 +0100 Commit: Caolán McNamara CommitDate: Tue Sep 7 15:49:17 2021 +0200 Revert: #i47175# update eventual pointer grab with cursor revert commit: commit d4f61372b23d6bb7f4df1e563f0823b3a3211c1d Date: Mon Mar 5 14:25:35 2007 + INTEGRATION: CWS vcl74 (1.59.42); FILE MERGED 2007/01/31 15:25:15 pl 1.59.42.1: #i47175# update eventual pointer grab with cursor this got later modified by... commit e9cb118e6e98eb13b3ad1901c8c912bed674f096 Date: Tue Jan 29 15:21:11 2008 + INTEGRATION: CWS vcl85_SRC680 (1.71.70); FILE MERGED ... 2007/12/13 15:30:31 pl 1.71.70.1: #i80791# use correct owner events parameter in SetPointer but now in impress, under wayland, if I click and hold on the border of a textbox and then try to use SetPointer while the mouse is captured then the cursor doesn't change, the regrab drops the cursor. The original problem reported back in #i47175# no longer arises in gtk as the dialog is a native gtk one. Drop this workaround as its weird to potentially do a special grab when we just want to change the mouse cursor. Change-Id: Ifb7f55a17692a5e79cd4221d1e0f440dacbee0bf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121775 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx index cd596b3a4297..807d5e8b5445 100644 --- a/vcl/unx/gtk3/gtkframe.cxx +++ b/vcl/unx/gtk3/gtkframe.cxx @@ -2299,12 +2299,6 @@ void GtkSalFrame::SetPointer( PointerStyle ePointerStyle ) m_ePointerStyle = ePointerStyle; GdkCursor *pCursor = getDisplay()->getCursor( ePointerStyle ); widget_set_cursor(GTK_WIDGET(m_pWindow), pCursor); - -// #i80791# use grabPointer the same way as CaptureMouse, respective float grab -if( getDisplay()->MouseCaptured( this ) ) -grabPointer( true, false, false ); -else if( m_nFloats > 0 ) -grabPointer( true, false, true ); } void GtkSalFrame::grabPointer( bool bGrab, bool bKeyboardAlso, bool bOwnerEvents )
[Libreoffice-commits] core.git: include/svx include/vcl sc/source sd/source sfx2/source
include/svx/sidebar/AreaTransparencyGradientPopup.hxx |1 -
include/vcl/gdimtf.hxx|3 ---
sc/source/ui/inc/drawsh.hxx |2 --
sd/source/ui/inc/custsdlg.hxx |2 --
sfx2/source/dialog/StyleList.cxx |5 -
sfx2/source/inc/StyleList.hxx |3 ---
6 files changed, 16 deletions(-)
New commits:
commit a19e8ddded0aa4d1fe1d36a3c63dff43cb8ad589
Author: Noel Grandin
AuthorDate: Mon Sep 6 15:58:48 2021 +0200
Commit: Noel Grandin
CommitDate: Tue Sep 7 14:29:44 2021 +0200
loplugin:unusedmethods
Change-Id: I6295d6ff6fb7410852351801c324244308c5c472
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121751
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
index 04b8fa91a8b6..3383884a807f 100644
--- a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
+++ b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
@@ -49,7 +49,6 @@ private:
DECL_LINK(ModifiedTrgrHdl_Impl, weld::MetricSpinButton&, void);
DECL_LINK(Left_Click45_Impl, const OString&, void);
DECL_LINK(Right_Click45_Impl, const OString&, void);
-DECL_LINK(FocusHdl, weld::Widget&, void);
public:
AreaTransparencyGradientPopup(const
css::uno::Reference& rFrame,
diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx
index 007f59521cdd..614d77369d1f 100644
--- a/include/vcl/gdimtf.hxx
+++ b/include/vcl/gdimtf.hxx
@@ -52,9 +52,6 @@ enum class MtfConversion
typedef Color (*ColorExchangeFnc)( const Color& rColor, const void* pColParam
);
typedef BitmapEx (*BmpExchangeFnc)( const BitmapEx& rBmpEx, const void*
pBmpParam );
-VCL_DLLPUBLIC SvStream& ReadGDIMetaFile(SvStream& rIStm, GDIMetaFile&
rGDIMetaFile, ImplMetaReadData* pReadData = nullptr);
-VCL_DLLPUBLIC SvStream& WriteGDIMetaFile( SvStream& rOStm, const GDIMetaFile&
rGDIMetaFile );
-
class VCL_DLLPUBLIC GDIMetaFile final
{
private:
diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx
index 8644bc13f3d5..ae78ad10296a 100644
--- a/sc/source/ui/inc/drawsh.hxx
+++ b/sc/source/ui/inc/drawsh.hxx
@@ -43,8 +43,6 @@ class ScDrawShell : public SfxShell
DECL_LINK( NameObjectHdl, AbstractSvxObjectNameDialog&, bool );
-void SetHlinkForObject( SdrObject* pObj, const OUString& rHlnk );
-
protected:
virtual voidActivate(bool bMDI) override;
ScViewData& GetViewData() { return rViewData; }
diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx
index 2de2eb30f509..519361aff69e 100644
--- a/sd/source/ui/inc/custsdlg.hxx
+++ b/sd/source/ui/inc/custsdlg.hxx
@@ -84,8 +84,6 @@ public:
SdDefineCustomShowDlg(weld::Window* pWindow, SdDrawDocument& rDrawDoc,
std::unique_ptr& rpCS);
virtual ~SdDefineCustomShowDlg() override;
-
-boolIsModified() const { return bModified; }
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/StyleList.cxx b/sfx2/source/dialog/StyleList.cxx
index 9899417ec9ef..e2b80c1e71d7 100644
--- a/sfx2/source/dialog/StyleList.cxx
+++ b/sfx2/source/dialog/StyleList.cxx
@@ -1805,9 +1805,4 @@ IMPL_LINK(StyleList, PopupTreeMenuHdl, const
CommandEvent&, rCEvt, bool)
return true;
}
-void StyleList::setVisible(bool b)
-{
-m_xTreeBox->set_visible(b && m_bHierarchical);
-m_xFmtLb->set_visible(b && !m_bHierarchical);
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/StyleList.hxx b/sfx2/source/inc/StyleList.hxx
index 2768f4ce18ae..238655da889a 100644
--- a/sfx2/source/inc/StyleList.hxx
+++ b/sfx2/source/inc/StyleList.hxx
@@ -96,7 +96,6 @@ public:
// Returns the Family Item at ith index
// Used in Dialog's ReadResource_Hdl
const SfxStyleFamilyItem& GetFamilyItemByIndex(size_t i) const;
-const SfxObjectShell* GetObjectShell() const { return m_pCurObjShell; }
bool IsHierarchical() const { return m_bHierarchical; }
void Enabledel(bool candel) { m_bCanDel = candel; }
@@ -121,8 +120,6 @@ public:
void FamilySelect(sal_uInt16 nEntry);
void FilterSelect(sal_uInt16 nActFilter, bool bsetFilter);
-void setVisible(bool b);
-
DECL_LINK(NewMenuExecuteAction, void*, void);
private:
[Libreoffice-commits] core.git: vcl/headless
vcl/headless/svpgdi.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 39f88f29725a5e896bdd3dffc8957f50a19c1698 Author: Luboš Luňák AuthorDate: Tue Sep 7 14:22:38 2021 +0200 Commit: Luboš Luňák CommitDate: Tue Sep 7 14:25:36 2021 +0200 explain a 'not sure why' comment about cairo (1,1) sizes This is from 9090dc1f3b27195f5defd35586ac79357992be21. Change-Id: Iae98628b58022c8bb3c50eef6889923023b67319 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121777 Tested-by: Luboš Luňák Reviewed-by: Luboš Luňák diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index 5126abb19385..53d0de812475 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -2583,7 +2583,7 @@ void SvpSalGraphics::releaseCairoContext(cairo_t* cr, bool bXorModeAllowed, cons sal_Int32 nUnscaledExtentsTop = nExtentsTop * m_fScale; sal_Int32 nUnscaledExtentsBottom = nExtentsBottom * m_fScale; -// not sure why this happens +// Handle headless size forced to (1,1) by SvpSalFrame::GetSurfaceFrameSize(). int target_surface_width = cairo_image_surface_get_width(target_surface); if (nUnscaledExtentsLeft > target_surface_width) nUnscaledExtentsLeft = target_surface_width;
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a08130b30671c0c9865e759c19aebed76d80d186 Author: Olivier Hallot AuthorDate: Tue Sep 7 09:03:41 2021 -0300 Commit: Gerrit Code Review CommitDate: Tue Sep 7 14:03:41 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 280680693746332e5bf1d49f53285b29b0ae321d - tdf#141179 Add tip-of-the-day help page Change-Id: I0fe0a3d6615b98d943d6a4cb9f47bc255cf4eef8 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/121689 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index d883745bda47..280680693746 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d883745bda47f21301f6cbf29bbd47512ef9d000 +Subproject commit 280680693746332e5bf1d49f53285b29b0ae321d
[Libreoffice-commits] help.git: AllLangHelp_shared.mk source/text
AllLangHelp_shared.mk|1 source/text/shared/guide/tipoftheday.xhp | 44 +++ 2 files changed, 45 insertions(+) New commits: commit 280680693746332e5bf1d49f53285b29b0ae321d Author: Olivier Hallot AuthorDate: Sun Sep 5 10:19:10 2021 -0300 Commit: Olivier Hallot CommitDate: Tue Sep 7 14:03:40 2021 +0200 tdf#141179 Add tip-of-the-day help page Change-Id: I0fe0a3d6615b98d943d6a4cb9f47bc255cf4eef8 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/121689 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk index dd111e15e..7db786845 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -376,6 +376,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\ helpcontent2/source/text/shared/01/securitywarning \ helpcontent2/source/text/shared/01/selectcertificate \ helpcontent2/source/text/shared/01/timestampauth \ +helpcontent2/source/text/shared/01/tipoftheday \ helpcontent2/source/text/shared/01/webhtml \ helpcontent2/source/text/shared/01/xformsdata \ helpcontent2/source/text/shared/01/xformsdataadd \ diff --git a/source/text/shared/guide/tipoftheday.xhp b/source/text/shared/guide/tipoftheday.xhp new file mode 100644 index 0..927f18f76 --- /dev/null +++ b/source/text/shared/guide/tipoftheday.xhp @@ -0,0 +1,44 @@ + + + + + + +Tip of the day +/text/shared/guide/tipoftheday.xhp + + + + + +tip of the day + + + +Tip of the Day +The Tip of the Day dialog displays useful tips for the user. + + +Choose Help - Show Tip of the day. + + +The set of tips is collected from several %PRODUCTNAME community web pages, and is updated on each new release of the software. +The tip of the day is not specific to the current module. +Show tips on startup +Displays a dialog with a random tip on %PRODUCTNAME startup. + +Next Tip +Displays another tip of the day in the same dialog. + +OK +Close the Tip of the Day dialog. + + +
[Libreoffice-commits] core.git: 2 commits - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit eae61be02760e6e49179552978584a949694cd5a Author: Olivier Hallot AuthorDate: Tue Sep 7 09:03:21 2021 -0300 Commit: Gerrit Code Review CommitDate: Tue Sep 7 14:03:21 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to d883745bda47f21301f6cbf29bbd47512ef9d000 - tdf#144339 Add Help page for ProtectFields and ProtectBookmarks Change-Id: Ib784738af17d89b356bc6954c9402b2423cfd478 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/121739 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 2753562419d2..d883745bda47 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2753562419d2407c22db5af9c216f2ac00eb5000 +Subproject commit d883745bda47f21301f6cbf29bbd47512ef9d000 commit 4bf69ec35cb19577319fc2fa66ca425d40b7892b Author: Olivier Hallot AuthorDate: Tue Sep 7 09:03:09 2021 -0300 Commit: Gerrit Code Review CommitDate: Tue Sep 7 14:03:09 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 2753562419d2407c22db5af9c216f2ac00eb5000 - tdf#137084 Update Writer Table and Tools menu Help Change-Id: I546f247253bd7c8f041342ae2cf7447be34caf38 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/121733 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index e02e75de71ee..2753562419d2 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e02e75de71eed2d22a4ad4bb18bbfb1f60aa5480 +Subproject commit 2753562419d2407c22db5af9c216f2ac00eb5000
[Libreoffice-commits] help.git: 2 commits - AllLangHelp_swriter.mk source/text
AllLangHelp_swriter.mk |1 source/text/swriter/00/0406.xhp|5 +++ source/text/swriter/01/protectdocument.xhp | 41 source/text/swriter/guide/protection.xhp | 42 +++-- source/text/swriter/main0106.xhp |6 ++-- source/text/swriter/main0110.xhp |6 6 files changed, 80 insertions(+), 21 deletions(-) New commits: commit d883745bda47f21301f6cbf29bbd47512ef9d000 Author: Olivier Hallot AuthorDate: Mon Sep 6 17:25:24 2021 -0300 Commit: Olivier Hallot CommitDate: Tue Sep 7 14:03:20 2021 +0200 tdf#144339 Add Help page for ProtectFields and ProtectBookmarks Change-Id: Ib784738af17d89b356bc6954c9402b2423cfd478 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/121739 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk index a92668e64..40dd86a91 100644 --- a/AllLangHelp_swriter.mk +++ b/AllLangHelp_swriter.mk @@ -200,6 +200,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\ helpcontent2/source/text/swriter/01/mm_seladdlis \ helpcontent2/source/text/swriter/01/mm_seltab \ helpcontent2/source/text/swriter/01/outlinecontent_visibility \ +helpcontent2/source/text/swriter/01/protectdocument \ helpcontent2/source/text/swriter/01/selection_mode \ helpcontent2/source/text/swriter/01/show_whitespace \ helpcontent2/source/text/swriter/01/title_page \ diff --git a/source/text/swriter/00/0406.xhp b/source/text/swriter/00/0406.xhp index 7c9f2f397..bef0d0793 100644 --- a/source/text/swriter/00/0406.xhp +++ b/source/text/swriter/00/0406.xhp @@ -56,6 +56,11 @@ Choose Tools - Update - Links Choose Tools - Update - Charts + +Choose Tools - Protect Document - Protect Fields. +Choose Tools - Protect Document - Protect Bookmarks. + + Choose Tools - Mail Merge Wizard Click the Mail Merge icon on the Mail Merge bar: diff --git a/source/text/swriter/01/protectdocument.xhp b/source/text/swriter/01/protectdocument.xhp new file mode 100644 index 0..9fce04fd2 --- /dev/null +++ b/source/text/swriter/01/protectdocument.xhp @@ -0,0 +1,41 @@ + + + + + + +Protect Document +/text/swriter/01/protectdocument.xhp + + + + +protection;fields in text documents +protection;bookmarks in text documents + + + + +Protect Document +Toggles write protection for fields and bookmarks in the document. + + + + + +Protect Fields +Toggles fields write protection. When checked, the fields cannot be edited or deleted. +Protect Bookmarks +Toggles bookmark write protection. When checked, the bookmarks cannot be deleted or renamed. + + + + + diff --git a/source/text/swriter/guide/protection.xhp b/source/text/swriter/guide/protection.xhp index 7163741e4..073539508 100644 --- a/source/text/swriter/guide/protection.xhp +++ b/source/text/swriter/guide/protection.xhp @@ -39,14 +39,14 @@ -Protecting Contents in %PRODUCTNAME Writer +Protecting Contents in %PRODUCTNAME Writer The following is an overview of the different ways of protecting contents in %PRODUCTNAME Writer from being modified or deleted. -Protecting Sections in %PRODUCTNAME Writer +Protecting Sections in %PRODUCTNAME Writer Any section of a %PRODUCTNAME Writer text document can be protected against changes, and with an optional password. -Protection is not intended to be an information security protection, it is a switch to prevent accidental changes. +Protection is not intended to be an information security protection, it is a switch to prevent accidental changes. -Turning on protection +Turning on protection Information to protect must be in a section. To create or select a section: @@ -68,7 +68,7 @@ -Modification of protection +Modification of protection @@ -83,7 +83,7 @@ -Turning off protection +Turning off protection @@ -95,11 +95,11 @@ -Protecting Cells in a %PRODUCTNAME Writer Table +Protecting Cells in a %PRODUCTNAME Writer Table You can protect the contents of individual cells of tables or whole table in %PRODUCTNAME Writer from changes. - + - + @@ -110,9 +110,9 @@ - -If necessary, choose %PRODUCTNAME - Preferences -Tools - Options - %PRODUCTNAME Writer - Formatting Aids and select Enable cursor under the Protected Areas. + +If necessary, choose %PRODUCTNAME - Preferences +Tools - Options - %PRODUCTNAME Writer - Formatting Aids and select Enable cursor under the Protected Areas. @@ -123,11 +123,11 @@ -Contents Protection in Tables of Contents and Indexes +Contents Protection in Tables of Contents and Indexes Tables of contents and indexes created in %PRODUCTNAME Writer, are automatically protected against accidental changes. - + - + @@ -138,8 +138,8 @@ - - + + @@ -150,9 +150,13 @@ -Protection of the whole %PRODUCTNAME Writer docum
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e59d4723bb8959d1d39dccdccb66156ca68d280a Author: Olivier Hallot AuthorDate: Tue Sep 7 09:02:47 2021 -0300 Commit: Gerrit Code Review CommitDate: Tue Sep 7 14:02:47 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to e02e75de71eed2d22a4ad4bb18bbfb1f60aa5480 - tdf#144332 Add Help page for Accessibility Check Tool Change-Id: Ifdca4c17a5f2f97d27cd59e65b1855abb2d243f6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/121731 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 5910cbd9619d..e02e75de71ee 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 5910cbd9619da6f850da070babb75abd6d334806 +Subproject commit e02e75de71eed2d22a4ad4bb18bbfb1f60aa5480
[Libreoffice-commits] help.git: AllLangHelp_swriter.mk source/text
AllLangHelp_swriter.mk |1 source/text/shared/guide/accessibility.xhp | 10 +-- source/text/swriter/01/accessibility_check.xhp | 82 + 3 files changed, 89 insertions(+), 4 deletions(-) New commits: commit e02e75de71eed2d22a4ad4bb18bbfb1f60aa5480 Author: Olivier Hallot AuthorDate: Mon Sep 6 13:36:47 2021 -0300 Commit: Olivier Hallot CommitDate: Tue Sep 7 14:02:45 2021 +0200 tdf#144332 Add Help page for Accessibility Check Tool Change-Id: Ifdca4c17a5f2f97d27cd59e65b1855abb2d243f6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/121731 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk index a23f3136e..a92668e64 100644 --- a/AllLangHelp_swriter.mk +++ b/AllLangHelp_swriter.mk @@ -176,6 +176,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\ helpcontent2/source/text/swriter/01/0622 \ helpcontent2/source/text/swriter/01/0699 \ helpcontent2/source/text/swriter/01/edit_reference_submenu \ +helpcontent2/source/text/swriter/01/accessibility_check \ helpcontent2/source/text/swriter/01/format_object \ helpcontent2/source/text/swriter/01/legacynumbering \ helpcontent2/source/text/swriter/01/mailmerge00 \ diff --git a/source/text/shared/guide/accessibility.xhp b/source/text/shared/guide/accessibility.xhp index 7c9fc5022..248de3bae 100644 --- a/source/text/shared/guide/accessibility.xhp +++ b/source/text/shared/guide/accessibility.xhp @@ -1,6 +1,4 @@ - - + + + +Accessibility Check +/text/swriter/01/accessibility_check.xhp + + + + +accessibility;check in text document +PDF/UA;ckeck + + + +Accessibility Check +Review common accessibility problems in the document, and support for PDF/UA specifications in the PDF export dialog. + + +Choose Tools - Accessibility Check. +Select File - Export as PDF - General - Universal Accessibility (PDF/UA) and click OK. + + +The Accessibility Check tool traverses the document structure and gather all possible accessibility issues. The check can be run manually through the menu or it will be triggered after PDF export dialog, when the PDF/UA support is enabled. + +The Accessibility Check dialog +The Accessibility Check dialog shows a list of all issues found in the text document. +Go to Issue +Click the button to jump to the page and select the object or issue that requires attention for accessibility. + +Common accessibility checks + +The checks that are currently implemented are: + + +Check that the document title is set. + + +Check that the document language is set, or that all styles that are in use, have the language set. + + +Check all images, graphics, OLE objects for the alt (or title in some objects) text. + + +Check tables don't include splits or merges, which aren't allowed by the specifications. + + +Check for fake/manual numbering (not using integrated numbering). For example writing "1." "2." "3." at the beginning of the paragraphs. + + +Check that hyperlink text is not a hyperlink itself - hyperlink should be described. + + +Check for the contrast between text and the background. The algorithm is described in the WCAG specification. + + +Check for blinking text, discouraged for the obvious reasons. + + +Check for footnotes and endnotes, which should be avoided. + + +Check for heading order. Order of the headings must increase incrementally with no skips (for example Heading 1 to Heading 3, skipping Heading 2). + + +Check, if text conveys additional meaning with (direct) formatting. + + + + + + +
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9627b2cb9e5d53f54ec09805eadc98d247121463 Author: Olivier Hallot AuthorDate: Tue Sep 7 09:02:13 2021 -0300 Commit: Gerrit Code Review CommitDate: Tue Sep 7 14:02:13 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 5910cbd9619da6f850da070babb75abd6d334806 - tdf#127385 Update HTML export. Change-Id: I8c3968e89d8b919b57def783b8964efeb3d65ec1 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/121722 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index f62fb28bc3aa..5910cbd9619d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f62fb28bc3aad654de660408e9215cd66abb3e5b +Subproject commit 5910cbd9619da6f850da070babb75abd6d334806
[Libreoffice-commits] help.git: source/text
source/text/shared/01/about_meta_tags.xhp | 32 ++ 1 file changed, 20 insertions(+), 12 deletions(-) New commits: commit 5910cbd9619da6f850da070babb75abd6d334806 Author: Olivier Hallot AuthorDate: Mon Sep 6 09:53:31 2021 -0300 Commit: Olivier Hallot CommitDate: Tue Sep 7 14:02:11 2021 +0200 tdf#127385 Update HTML export. Change-Id: I8c3968e89d8b919b57def783b8964efeb3d65ec1 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/121722 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/about_meta_tags.xhp b/source/text/shared/01/about_meta_tags.xhp index 77cf44d8c..6e1544f60 100644 --- a/source/text/shared/01/about_meta_tags.xhp +++ b/source/text/shared/01/about_meta_tags.xhp @@ -1,6 +1,6 @@ - + - - + + HTML import and export @@ -34,13 +34,21 @@ META tags tags; META tags -HTML import and export -When you export a file to an HTML document, the description and the user-defined file properties are included as META tags between the HEAD tags of the exported document. META tags are not displayed in a Web browser, and are used to include information, such as keywords for search engines on your Web page. To set the properties of the current document, choose File - Properties, click the Description or User Defined tabs, and then type the information you want. +HTML import and export +When you export a file to an HTML document, the description and the user-defined file properties are included as META tags between the HEAD tags of the exported document. META tags are not displayed in a Web browser, and are used to include information, such as keywords for search engines on your Web page. To set the properties of the current document, choose File - Properties, click the Description or Custom Properties tabs, and then type the information you want. The following file properties are converted to META tags when you export a file as an HTML document: + + +ODF Property + + +HTML Tags + + -File Property +Title@@ -72,22 +80,22 @@ -Info fields 1...4 +Custom Properties -<META NAME="Info field name" CONTENT="Field Content"> +<META NAME="Custom field name" CONTENT="Custom field content"> -When you import an HTML containing these META tags, the contents of the tags are added to the corresponding $[officename] file property box. -Keywords must be separated by commas. A keyword can contain white space characters or semicolons. -Import Tips +When you import an HTML containing these META tags, the contents of the tags are added to the corresponding $[officename] file property box. +Keywords must be separated by commas. A keyword can contain white space characters or semicolons. +Import Tips When you import an HTML document, following META tags are automatically converted to $[officename] fields: <META HTTP-EQUIV="REFRESH"...> and <META NAME="..." ...> , where NAME equals to AUTHOR, CREATED, CHANGED, CHANGEDBY, DESCRIPTION, KEYWORDS or CLASSIFICATION. Scripts, comments, and META tags that are positioned directly before a TABLE tag are inserted in the first cell of the table. Scripts and META tags in the header of an HTML document are imported and anchored to the first paragraph in the document. To set the options for importing HTML tags, choose %PRODUCTNAME - PreferencesTools - Options - Load/Save - HTML Compatibility. A known META tag contains either "HTTP-EQUIV" or "NAME", and are imported as $[officename] comments. The only exception is <META NAME="GENERATOR"...>, which is ignored. -Export Tips +Export Tips Comments and script fields at the beginning of the first paragraph in a document are exported to the header of an HTML document. If the document begins with a table, the first paragraph in the first cell of the table is exported to the header of the HTML document. </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291855.html">[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - basic/qa basic/source</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+core.git%5C%3A+Branch+%27libreoffice%5C-7%5C-2%27+%5C-+basic%5C%2Fqa+basic%5C%2Fsource%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22Andreas+Heinisch+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Andreas Heinisch (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> basic/qa/vba_tests/collection.vb | 73 +++ basic/source/classes/sb.cxx | 11 - 2 files changed, 82 insertions(+), 2 deletions(-) New commits: commit 463a1012c3e22ce40209b9fddd7cd5df4ae0870a Author: Andreas Heinisch AuthorDate: Thu Sep 2 20:54:40 2021 +0200 Commit: Mike Kaganski CommitDate: Tue Sep 7 13:46:33 2021 +0200 tdf#144245 - Case-insensitive operation for non-ASCII characters Support case-insensitive operation for non-ASCII characters in the Collection object (VBA). Change-Id: Ie17560cb9aac5bfb32aa04175dd4839681d6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121534 Tested-by: Jenkins Reviewed-by: Eike Rathke Reviewed-by: Andreas Heinisch (cherry picked from commit ef32c3b4f9b80918d6018e14297fa41245afd381) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121759 Reviewed-by: Mike Kaganski diff --git a/basic/qa/vba_tests/collection.vb b/basic/qa/vba_tests/collection.vb new file mode 100644 index ..0b765905290a --- /dev/null +++ b/basic/qa/vba_tests/collection.vb @@ -0,0 +1,73 @@ +' +' 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/. +' + +Option VBASupport 1 +Option Explicit + +Function doUnitTest() As String +TestUtil.TestInit +verify_testCollection +doUnitTest = TestUtil.GetResult() +End Function + +Sub verify_testCollection() + +Dim a As Collection +Dim b As Collection + +On Error Resume Next +Set a = New Collection +a.Add 1, "D" +a.Add 2, "d" +a.Add 3, "Д" ' uppercase Cyrillic script De +a.Add 4, "д" ' lowercase Cyrillic script De +On Error GoTo 0 + +On Error Resume Next +Set b = New Collection +b.Add 1, "SS" +b.Add 2, "ss" +b.Add 3, "ẞ" ' uppercase German Eszett +b.Add 4, "ß" ' lowercase German Eszett +On Error GoTo 0 + +On Error GoTo errorHandler + +' tdf#144245 - case-insensitive operation for non-ASCII characters +' Without the fix in place, this test would have failed with +' - Expected: 2 +' - Actual : 3 +TestUtil.AssertEqual(a.Count, 2, "a.Count") + +' tdf#144245 - case-insensitive operation for non-ASCII item access +' Without the fix in place, this test would have failed with +' - Expected: 1 for d, 3 for lowercase Cyrillic script De (д) +' - Actual : 2 for d, 4 for lowercase Cyrillic script De (д) +TestUtil.AssertEqual(a.Item("D"), 1, "a.Item(""D"")") +TestUtil.AssertEqual(a.Item("d"), 1, "a.Item(""d"")") +TestUtil.AssertEqual(a.Item("Д"), 3, "a.Item(""Д"")") +TestUtil.AssertEqual(a.Item("д"), 3, "a.Item(""д"")") + +' tdf#144245 - German Eszett is uppercased to a two-character 'SS'. +' This test should fail after tdf#110003 has been fixed since the lowercase and the uppercase +' German Eszett should be matched to the same index. +TestUtil.AssertEqual(b.Count, 3, "b.Count") +' After the fix of tdf#110003 +' TestUtil.AssertEqual(b.Count, 2, "b.Count") + +TestUtil.AssertEqual(a.Item("SS"), 1, "a.Item(""SS"")") +TestUtil.AssertEqual(a.Item("ss"), 1, "a.Item(""ss"")") +TestUtil.AssertEqual(a.Item("ẞ"), 3, "a.Item(""ẞ"")") +TestUtil.AssertEqual(a.Item("ß"), 4, "a.Item(""ß"")") +' After the fix of tdf#110003 +' TestUtil.AssertEqual(a.Item("ß"), 3, "a.Item(""ß"")") + +Exit Sub +errorHandler: +TestUtil.ReportErrorHandler("verify_testCollection", Err, Error$, Erl) +End Sub diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 74eacdb504c6..75d5fea70640 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -47,6 +47,9 @@ #include #include +#include +#include + #include #include @@ -2059,11 +2062,15 @@ sal_Int32 BasicCollection::implGetIndexForName(std::u16string_view rName) sal_Int32 nIndex = -1; sal_Int32 nCount = xItemArray->Count(); sal_Int32 nNameHash = MakeHashCode( rName ); + +// tdf#144245 - case-insensitive operation for non-ASCII characters +utl::TransliterationWrapper& rTransliteration = SbGlobal::GetTransliteration(); + for( sal_Int32 i = 0 ; i < nCount ; i++ ) { SbxVariable* pVar = xItemArray->Get(i); -if( pVar->GetHashCode() == nNameHash && -pVar->GetName().equalsIgnoreAsciiCase( rName ) ) +if (pVar->GetHashCode() == nNameHash +&& rTransliteration.isEqual(pVar->GetName(), OUString(rName))) { nIndex = i; break; </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291854.html">[Libreoffice-commits] core.git: external/firebird</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+core.git%5C%3A+external%5C%2Ffirebird%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22Stephan+Bergmann+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Stephan Bergmann (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1 | 41 ++ external/firebird/UnpackedTarball_firebird.mk |6 + external/firebird/firebird-cygwin-msvc-warnings.patch |8 - 3 files changed, 50 insertions(+), 5 deletions(-) New commits: commit 6593ebcc01a097e865a0fdc59b65604ae9cd5032 Author: Stephan Bergmann AuthorDate: Tue Sep 7 08:33:45 2021 +0200 Commit: Stephan Bergmann CommitDate: Tue Sep 7 13:19:16 2021 +0200 exernal/firebird: extern/cloop: Missing dependencies of compilations on... ...output directories Change-Id: Iaa2b750a12e3df078b46e5bb4feeafc926e11165 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121741 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1 b/external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1 new file mode 100644 index ..a59e70e06abc --- /dev/null +++ b/external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1 @@ -0,0 +1,41 @@ +From 8305b41bb262b6e249f2551639fa88392e152287 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Tue, 7 Sep 2021 08:47:32 +0200 +Subject: [PATCH] extern/cloop: Missing dependencies of compilations on output + directories + +When building Firebird 3.0.7 as part of LibreOffice, we noticed occasional build +failures like <https://ci.libreoffice.org/job/gerrit_linux_clang_dbgutil/96392/> + +> error: unable to open output file '/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/workdir/UnpackedTarball/firebird/temp/Debug/cloop/release/tests/test1/CTest.o': 'No such file or directory' +> 1 error generated. +> Makefile:72: recipe for target '/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_clang_dbgutil_64/workdir/UnpackedTarball/firebird/temp/Debug/cloop/release/tests/test1/CTest.o' failed + +and while target "all" depends on target "mkdirs" (which would create all those +directories) in extern/cloop/Makefile, there is no order among the dependencies +of "all", so no guarantee that the directories are already created when the +compilation recipes are executed. +--- + extern/cloop/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/extern/cloop/Makefile b/extern/cloop/Makefile +index 3fca0c7356..c5a2b52628 100644 +--- a/extern/cloop/Makefile b/extern/cloop/Makefile +@@ -54,10 +54,10 @@ vpath %.c $(SRC_DIRS) + vpath %.cpp $(SRC_DIRS) + + define compile +-$1/%.o: %.c ++$1/%.o: %.c | $1 + $(CC) -c $$(C_FLAGS) $$< -o $$@ + +-$1/%.o: %.cpp ++$1/%.o: %.cpp | $1 + $(CXX) -c $$(CXX_FLAGS) $$< -o $$@ + endef + +-- +2.31.1 + diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk index 64052570fb2b..cc84b5f139e7 100644 --- a/external/firebird/UnpackedTarball_firebird.mk +++ b/external/firebird/UnpackedTarball_firebird.mk @@ -26,7 +26,10 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,firebird,\ # code", # * external/firebird/0001-extern-cloop-Missing-dependency-of-BIN_DIR-cloop-on-.patch.1 is upstream # at <https://github.com/FirebirdSQL/firebird/pull/302> "extern/cloop: Missing dependency of -# $(BIN_DIR)/cloop on $(BIN_DIR)": +# $(BIN_DIR)/cloop on $(BIN_DIR)", +# * external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1 is upstream +# at <https://github.com/FirebirdSQL/firebird/pull/6948> "extern/cloop: Missing dependencies of +# compilations on output directories": $(eval $(call gb_UnpackedTarball_add_patches,firebird,\ external/firebird/firebird.disable-ib-util-not-found.patch.1 \ external/firebird/firebird-Engine12.patch \ @@ -45,6 +48,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\ external/firebird/0001-extern-cloop-Missing-dependency-of-BIN_DIR-cloop-on-.patch.1 \ external/firebird/msvc.patch \ external/firebird/wnt-per-process-trace-storage.patch.1 \ + external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1 \ )) ifeq ($(OS),WNT) diff --git a/external/firebird/firebird-cygwin-msvc-warnings.patch b/external/firebird/firebird-cygwin-msvc-warnings.patch index b40f94750fa9..942522439bac 100644 --- a/external/firebird/firebird-cygwin-msvc-warnings.patch +++ b/external/firebird/firebird-cygwin-msvc-warnings.patch @@ -180,12 +180,12 @@ diff -ur builds/posix/make.rules builds/posix/make.rules vpath %.cpp $(SRC_DIRS) define compile --$1/%.o: %.c -+$1/%.obj: %.c +-$1/%.o: %.c | $1 ++$1/%.obj: %.c | $1 $(CC) -c $$(C_FLAGS) $$< -o $$@ --$1/%.o: %.cpp -+$1/%.obj: %.cpp +-$1/%.o: %.cpp | $1 ++$1/%.obj: %.cpp | $1 $(CXX) -c $$(CXX_FLAGS) $$< -o $$@ endef </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291853.html">[Libreoffice-commits] dev-tools.git: test-bugzilla-files/test-bugzilla-files.py</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+dev%5C-tools.git%5C%3A+test%5C-bugzilla%5C-files%5C%2Ftest%5C-bugzilla%5C-files.py%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22G%C3%BCl%C5%9Fah+K%C3%B6se+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Gülşah Köse (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> test-bugzilla-files/test-bugzilla-files.py |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit dc01a975a1066b54bb1712cfa5071175633a7238 Author: Gülşah Köse AuthorDate: Tue Sep 7 10:19:10 2021 +0300 Commit: Miklos Vajna CommitDate: Tue Sep 7 12:15:44 2021 +0200 Ignore some diffs if file is in exclude list. /srv/crashtestdata/odfundiff_exclude_list.txt is manuel exclude list. If the file has difference but file name in exclude list it will be ignored. Example entry for odfundiff_exclude_list.txt /srv/crashtestdata/files/odt/test.odt Change-Id: Ibfb568e49d492458b824704cfb5a8734f59de850 Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/121744 Tested-by: Miklos Vajna Reviewed-by: Miklos Vajna diff --git a/test-bugzilla-files/test-bugzilla-files.py b/test-bugzilla-files/test-bugzilla-files.py index 0ade4eb..710364d 100644 --- a/test-bugzilla-files/test-bugzilla-files.py +++ b/test-bugzilla-files/test-bugzilla-files.py @@ -661,6 +661,12 @@ if __name__ == "__main__": # Check the roundtripped files doesn't crash at import time runLoadFileTests(opts, exportedFiles, False) +exclude_list = [] +if os.path.exists("/srv/crashtestdata/odfundiff_exclude_list.txt"): +with open('/srv/crashtestdata/odfundiff_exclude_list.txt') as file: +exclude_list = file.readlines() +exclude_list = [line.rstrip() for line in exclude_list] + if isPreviousExist(): for filename in exportedFiles: if filename[-3:] == 'odt': @@ -668,7 +674,8 @@ if __name__ == "__main__": print(odfundiffCommandWithURL) try: output = str(subprocess.check_output(odfundiffCommandWithURL, shell=True, timeout=600), encoding='utf-8') -if not "Diff finished, number of differences found: 0" in output: +if not "Diff finished, number of differences found: 0" in output and \ + not filename in exclude_list: validLog = open("/srv/crashtestdata/current" + filename + ".log.odfundiff", "w") validLog.write(output) validLog.close() </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291852.html">[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - dbaccess/source</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+core.git%5C%3A+Branch+%27libreoffice%5C-7%5C-1%27+%5C-+dbaccess%5C%2Fsource%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22Julien+Nabet+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Julien Nabet (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 098c6c216af2828ab388ca61abee594f69bb5793 Author: Julien Nabet AuthorDate: Mon Sep 6 21:45:42 2021 +0200 Commit: Xisco Fauli CommitDate: Tue Sep 7 12:07:55 2021 +0200 tdf#140951: fix crash on Base when accessibility used See bt here: https://bugs.documentfoundation.org/attachment.cgi?id=174832 Change-Id: Ia0a52b1e6aafc043f6be2d8406a98e7d4ebf55dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121735 Tested-by: Jenkins Reviewed-by: Julien Nabet (cherry picked from commit 970883a85ad1d714683a1d98fb45efc89cbdeb3b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121758 Reviewed-by: Michael Stahl diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 22e17c01ec36..a466f74c840a 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -2098,6 +2098,8 @@ OUString OSelectionBrowseBox::GetCellText(sal_Int32 nRow, sal_uInt16 nColId) con { sal_uInt16 nPos = GetColumnPos(nColId); +if ( nPos == 0 || nPos == BROWSER_INVALIDID || nPos > getFields().size() ) +return OUString(); OTableFieldDescRef pEntry = getFields()[nPos-1]; OSL_ENSURE(pEntry != nullptr, "OSelectionBrowseBox::GetCellText : invalid column id, prepare for GPF ... "); @@ -2682,7 +2684,7 @@ void OSelectionBrowseBox::setFunctionCell(OTableFieldDescRef const & _pEntry) Reference< XAccessible > OSelectionBrowseBox::CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) { OTableFieldDescRef pEntry; -if(getFields().size() > o3tl::make_unsigned(_nColumnPos - 1)) +if ( _nColumnPos != 0 && _nColumnPos != BROWSER_INVALIDID && _nColumnPos <= getFields().size() ) pEntry = getFields()[_nColumnPos - 1]; if ( _nRow == BROW_VIS_ROW && pEntry.is() ) </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291851.html">[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - dbaccess/source</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+core.git%5C%3A+Branch+%27libreoffice%5C-7%5C-2%27+%5C-+dbaccess%5C%2Fsource%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22Julien+Nabet+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Julien Nabet (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit b658ca65c6d5583dedec64da9b891b62d2692d49 Author: Julien Nabet AuthorDate: Mon Sep 6 21:45:42 2021 +0200 Commit: Michael Stahl CommitDate: Tue Sep 7 12:03:32 2021 +0200 tdf#140951: fix crash on Base when accessibility used See bt here: https://bugs.documentfoundation.org/attachment.cgi?id=174832 Change-Id: Ia0a52b1e6aafc043f6be2d8406a98e7d4ebf55dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121735 Tested-by: Jenkins Reviewed-by: Julien Nabet (cherry picked from commit 970883a85ad1d714683a1d98fb45efc89cbdeb3b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121754 Reviewed-by: Michael Stahl diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 6e65bfc1781d..0c65ad53ab60 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -2105,6 +2105,8 @@ OUString OSelectionBrowseBox::GetCellText(sal_Int32 nRow, sal_uInt16 nColId) con { sal_uInt16 nPos = GetColumnPos(nColId); +if ( nPos == 0 || nPos == BROWSER_INVALIDID || nPos > getFields().size() ) +return OUString(); OTableFieldDescRef pEntry = getFields()[nPos-1]; OSL_ENSURE(pEntry != nullptr, "OSelectionBrowseBox::GetCellText : invalid column id, prepare for GPF ... "); @@ -2689,7 +2691,7 @@ void OSelectionBrowseBox::setFunctionCell(OTableFieldDescRef const & _pEntry) Reference< XAccessible > OSelectionBrowseBox::CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) { OTableFieldDescRef pEntry; -if(getFields().size() > o3tl::make_unsigned(_nColumnPos - 1)) +if ( _nColumnPos != 0 && _nColumnPos != BROWSER_INVALIDID && _nColumnPos <= getFields().size() ) pEntry = getFields()[_nColumnPos - 1]; if ( _nRow == BROW_VIS_ROW && pEntry.is() ) </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291850.html">[Libreoffice-commits] core.git: Branch 'libreoffice-7-2-1' - distro-configs/LibreOfficeFlatpak.conf solenv/flatpak-manifest.in</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+core.git%5C%3A+Branch+%27libreoffice%5C-7%5C-2%5C-1%27+%5C-+distro%5C-configs%5C%2FLibreOfficeFlatpak.conf+solenv%5C%2Fflatpak%5C-manifest.in%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22Stephan+Bergmann+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Stephan Bergmann (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> distro-configs/LibreOfficeFlatpak.conf |1 + solenv/flatpak-manifest.in |9 + 2 files changed, 2 insertions(+), 8 deletions(-) New commits: commit a8d560c4a89614a6bd99c9af3e76927d4405dbf7 Author: Stephan Bergmann AuthorDate: Fri Sep 3 11:14:31 2021 +0200 Commit: Michael Stahl CommitDate: Tue Sep 7 11:53:55 2021 +0200 Flatpak: Upgrade to 21.08 runtime, disable Skia For whatever reason, building Skia against the 21.08 SDK would fail with > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp: In function ‘void {anonymous}::colrv1_draw_paint(SkCanvas*, const FT_Color*, FT_Face, FT_COLR_Paint)’: > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp:668:14: error: ‘FT_COLR_PAINTFORMAT_TRANSFORMED’ was not declared in this scope; did you mean ‘FT_COLR_PAINTFORMAT_TRANSFORM’? > 668 | case FT_COLR_PAINTFORMAT_TRANSFORMED: { > | ^~~ > | FT_COLR_PAINTFORMAT_TRANSFORM > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp:669:60: error: ‘union FT_COLR_Paint_::’ has no member named ‘transformed’; did you mean ‘transform’? > 669 | SkMatrix transform = ToSkMatrix(colrv1_paint.u.transformed.affine); > | ^~~ > | transform > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp: In function ‘bool {anonymous}::colrv1_traverse_paint(SkCanvas*, const FT_Color*, FT_Face, FT_OpaquePaint)’: > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp:763:14: error: ‘FT_COLR_PAINTFORMAT_TRANSFORMED’ was not declared in this scope; did you mean ‘FT_COLR_PAINTFORMAT_TRANSFORM’? > 763 | case FT_COLR_PAINTFORMAT_TRANSFORMED: > | ^~~ > | FT_COLR_PAINTFORMAT_TRANSFORM > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp:768:74: error: ‘union FT_COLR_Paint_::’ has no member named ‘transformed’; did you mean ‘transform’? > 768 | colrv1_traverse_paint(canvas, palette, face, paint.u.transformed.paint); > | ^~~ > | transform > make[1]: *** [/run/build/libreoffice/solenv/gbuild/LinkTarget.mk:347: /run/build/libreoffice/workdir/GenCxxObject/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.o] Error 1 But including Skia in the Linux flatpak isn't too useful anyway (and just happened to be on by default): First, it is disabled by default on Linux, cf. UseSkia in officecfg/registry/data/org/openoffice/Office/Common.xcu. And second, on Linux it can only be enabled for SAL_USE_VCLPLUGIN=gen, but not for the gtk3 plugin that the flatpak normally uses, cf. OfaViewTabPage::UpdateSkiaStatus in cui/source/options/optgdlg.cxx. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121705 Tested-by: Jenkins Reviewed-by: Stephan Bergmann (cherry picked from commit 9d88f11de57bcbeb29fa6f1299d5d0867c1a75a4) Conflicts: solenv/flatpak-manifest.in Change-Id: Ifdc9c23676280caf19db0e9f09df15aaa21eef5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121712 Tested-by: Jenkins Reviewed-by: Caolán McNamara (cherry picked from commit 92c55f7840267fdbe775897c913c5fc369286368) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121757 Reviewed-by: Xisco Fauli Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf index bef37df46c1b..b864ea3798b7 100644 --- a/distro-configs/LibreOfficeFlatpak.conf +++ b/distro-configs/LibreOfficeFlatpak.conf @@ -1,4 +1,5 @@ --disable-odk +--disable-skia --enable-release-build --with-ant-home=/run/build/libreoffice/ant --with-extra-buildid=Flatpak diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 4167735133f7..9cd302b2b3f1 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -1,7 +1,7 @@ { "id": "org.libreoffice.LibreOffice", "runtime": "org.freedesktop.Platform", -"runtime-version": "20.08", +"runtime-version": "21.08", "sdk": "org.freedesktop.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.openjdk11" @@ -655,13 +655,6 @@ "dest": "external/tarballs", "dest-filename": "libatomic_ops-7.6.8.tar.gz" </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291849.html">[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - external/firebird</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+core.git%5C%3A+Branch+%27libreoffice%5C-7%5C-2%27+%5C-+external%5C%2Ffirebird%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22Mike+Kaganski+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Mike Kaganski (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> external/firebird/firebird-cygwin-msvc.patch | 46 --- 1 file changed, 28 insertions(+), 18 deletions(-) New commits: commit e07e37569e7db08c82d73d582fb3a488035acd2f Author: Mike Kaganski AuthorDate: Mon Sep 6 22:10:58 2021 +0200 Commit: Michael Stahl CommitDate: Tue Sep 7 11:50:12 2021 +0200 tdf#144340: fix FB configure on Windows ./configure runs on Windows, and sets value of FB_ALIGNMENT, a define that affects the layout of FB's sort memory pool. Trying to include fails on Windows; the test in ./configure considers error value (equal to 2) as the value of the alignment (which should be 4 or 8 depending on arch). This makes the memory misaligned, chunks overlapping and re-written during the sort, memory corrupt, and so on. Removing the include (which is documented in a commit adding a similar include [1] to be needed for m68k) fixes detection. Additionally this cleans up the code added to config.h.in from autoconfig_msvc.h, because the former is auto-generated during configure, and the values get re-written in all occurrences of respective defines anyway. [1] https://github.com/FirebirdSQL/firebird/commit/7ba46163c74211ce4bf1051ee9998db58cb2f396 Change-Id: I8cdc5c764385a04efd130af09138149c748341fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121753 Tested-by: Jenkins Reviewed-by: Mike Kaganski (cherry picked from commit c7b5e6566d9b24a0a996c739a945004d9aadee2f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121755 Reviewed-by: Michael Stahl diff --git a/external/firebird/firebird-cygwin-msvc.patch b/external/firebird/firebird-cygwin-msvc.patch index 9536403886c6..7f4332633316 100644 --- a/external/firebird/firebird-cygwin-msvc.patch +++ b/external/firebird/firebird-cygwin-msvc.patch @@ -27,8 +27,34 @@ grep ODS_VERSION $OdsH | grep -v ENCODE_ODS >$Mini +--- configure 2016-07-07 15:57:04.538983200 +0200 configure 2016-07-13 11:31:18.132820200 +0200 +@@ -21473,13 +21473,12 @@ + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include + main () { + struct s { + char a; +-union { long long x; sem_t y; } b; ++long long b; + }; + exit((int)&((struct s*)1024)->b - 1024); + } + _ACEOF + if ac_fn_c_try_run "$LINENO"; then : --- builds/make.new/config/config.h.in 2016-07-07 15:55:55.693112800 +0200 +++ builds/make.new/config/config.h.in 2016-07-08 13:38:49.994986400 +0200 +@@ -211,7 +211,7 @@ + #undef HAVE_GETMNTENT + + /* Define to 1 if you have the `getpagesize' function. */ +-#undef HAVE_GETPAGESIZE ++#define HAVE_GETPAGESIZE 1 + + /* Define to 1 if you have the `getrlimit' function. */ + #undef HAVE_GETRLIMIT @@ -396,7 +396,7 @@ #undef HAVE_SIGSET @@ -56,7 +82,7 @@ /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ -@@ -703,3 +703,36 @@ +@@ -703,3 +703,20 @@ #ifndef HAVE_SOCKLEN_T typedef int socklen_t; #endif @@ -66,28 +92,12 @@ +#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers +#endif +/* target architecture */ -+#if defined(_M_IX86) -+/* sizeof(void *) */ -+#define SIZEOF_VOID_P 4 -+/* sizeof(size_t) */ -+#define SIZEOF_SIZE_T 4 -+/* alignment of long */ -+#define FB_ALIGNMENT 4 -+#elif defined(_M_AMD64) ++#if defined(_M_AMD64) +#define AMD64 -+/* sizeof(void *) */ -+#define SIZEOF_VOID_P 8 -+/* sizeof(size_t) */ -+#define SIZEOF_SIZE_T 8 -+/* alignment of long */ -+#define FB_ALIGNMENT 8 -+#else -+#error unknown target platform +#endif + +#define HAVE_IO_H +#define HAVE_CTIME_S -+#define HAVE_GETPAGESIZE + +#if defined _MSC_VER +#define isnan _isnan </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291848.html">[Libreoffice-commits] core.git: emfio/source</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+core.git%5C%3A+emfio%5C%2Fsource%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22Caol%C3%A1n+McNamara+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Caolán McNamara (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> emfio/source/reader/emfreader.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5d47a0e6c0fe4c2aca0c6a6cc6a542bada977f12 Author: Caolán McNamara AuthorDate: Tue Sep 7 08:47:52 2021 +0100 Commit: Caolán McNamara CommitDate: Tue Sep 7 11:49:48 2021 +0200 ofz: MemorySanitizer: use-of-uninitialized-value Change-Id: I4c88389de1a7f6cf4ceac278b264a0ec71fba86d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121747 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx index f72db2353829..45ea81024519 100644 --- a/emfio/source/reader/emfreader.cxx +++ b/emfio/source/reader/emfreader.cxx @@ -1015,7 +1015,7 @@ namespace emfio case EMR_SETMAPMODE : { -sal_uInt32 nMapMode; +sal_uInt32 nMapMode(0); mpInputStream->ReadUInt32( nMapMode ); SAL_INFO("emfio", "\t\tMapMode: 0x" << std::hex << nMapMode << std::dec); SetMapMode( nMapMode ); @@ -1101,7 +1101,7 @@ namespace emfio case EMR_RESTOREDC : { -sal_Int32 nSavedDC; +sal_Int32 nSavedDC(0); mpInputStream->ReadInt32( nSavedDC ); SAL_INFO( "emfio", "\t\t SavedDC Index: " << nSavedDC ); if ( nSavedDC < 0 ) </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291847.html">[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 10 commits - emfio/source filter/source readlicense_oo/license sc/source sfx2/source starmath/source vcl/unx</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+core.git%5C%3A+Branch+%27distro%5C%2Fcollabora%5C%2Fco%5C-2021%27+%5C-+10+commits+%5C-+emfio%5C%2Fsource+filter%5C%2Fsource+readlicense_oo%5C%2Flicense+sc%5C%2Fsource+sfx2%5C%2Fsource+starmath%5C%2Fsource+vcl%5C%2Funx%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22Julien+Nabet+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Julien Nabet (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> emfio/source/reader/emfreader.cxx | 15 filter/source/graphicfilter/ipsd/ipsd.cxx |8 readlicense_oo/license/CREDITS.fodt | 4228 +++--- sc/source/filter/lotus/lotimpop.cxx |5 sc/source/filter/xml/XMLConverter.hxx |8 sc/source/filter/xml/xmlexprt.cxx | 12 sfx2/source/control/emojiview.cxx | 10 starmath/source/mathtype.cxx | 20 vcl/unx/gtk3/gtk3gtkinst.cxx |5 9 files changed, 2207 insertions(+), 2104 deletions(-) New commits: commit 5ad6bfb54ffec15fe311ed990aa1518979b8f086 Author: Julien Nabet AuthorDate: Sat Sep 4 22:00:51 2021 +0200 Commit: Andras Timar CommitDate: Tue Sep 7 11:17:58 2021 +0200 tdf#105689: fix path management to retrieve Emoji toolbar button On Windows console logs show: warn:sfx:7060:6444:sfx2/source/control/emojiview.cxx:105: Emoji config data is empty Change-Id: I85baf2fedc20ff855183147e9a178bb048ac75ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121653 Tested-by: Jenkins Reviewed-by: Julien Nabet (cherry picked from commit 37357e3cae749c54f1b9645c6670240baf860bc4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121564 Reviewed-by: Xisco Fauli Signed-off-by: Xisco Fauli Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121711 Reviewed-by: Noel Grandin diff --git a/sfx2/source/control/emojiview.cxx b/sfx2/source/control/emojiview.cxx index 63aa9ac602c9..ee902a9da207 100644 --- a/sfx2/source/control/emojiview.cxx +++ b/sfx2/source/control/emojiview.cxx @@ -7,6 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include #include #include #include @@ -64,9 +65,12 @@ EmojiView::EmojiView(std::unique_ptr xWindow) : ThumbnailView(std::move(xWindow), nullptr) { // locate json data file -OUString sPath("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/emojiconfig/emoji.json"); -rtl::Bootstrap::expandMacros(sPath); -std::string strPath = OUStringToOString(sPath.copy(strlen("file://")), RTL_TEXTENCODING_UTF8).getStr(); +OUString aURL("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/emojiconfig/emoji.json"); +rtl::Bootstrap::expandMacros(aURL); + +OUString aPath; +osl::FileBase::getSystemPathFromFileURL(aURL, aPath); +std::string strPath = OUStringToOString(aPath, RTL_TEXTENCODING_UTF8).getStr(); std::ifstream file(strPath); if(!file.is_open()) commit ef953367b6776716a3ddb5af6aafe35b8d28a5c2 Author: Caolán McNamara AuthorDate: Wed Sep 1 10:33:09 2021 +0100 Commit: Andras Timar CommitDate: Tue Sep 7 11:17:58 2021 +0200 tdf#138519 use gtk_adjustment_set_value instead of gtk_spin_button_set_value for FormattedSpinButton because the latter doesn't change the value if the new value is less than an EPSILON diff of 1e-10 from the old value Change-Id: I410ceec28e1855e53de8c2982e540c612578bf54 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121439 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 8254fdbd0578..cd3d55663742 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -13198,7 +13198,10 @@ public: return; m_bSyncingValue = true; disable_notify_events(); -gtk_spin_button_set_value(m_pButton, m_pFormatter->GetValue()); +// tdf#138519 use gtk_adjustment_set_value instead of gtk_spin_button_set_value because the +// latter doesn't change the value if the new value is less than an EPSILON diff of 1e-10 +// from the old value +gtk_adjustment_set_value(gtk_spin_button_get_adjustment(m_pButton), m_pFormatter->GetValue()); enable_notify_events(); m_bSyncingValue = false; } commit 0afa30c52c9c7a946163fa33c27ba90a599da6a5 Author: Xisco Fauli AuthorDate: Wed Sep 1 11:18:27 2021 +0200 Commit: Andras Timar CommitDate: Tue Sep 7 11:17:57 2021 +0200 update credits Change-Id: I8fc0e8085dd647f3677554084a0de139a71e4367 (cherry picked from commit 2cfcc8d7c988631333998a78b4b40cb17b025fe7) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index 4cf5c381c1f6..50d3e077a4fb 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1074,7 +1074,7 @@ Credits -1690 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2021-08-06 11:42:16. +1696 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2021-08-13 14:11:24. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1082,7 +1082,7 @@ - + Ruedig</pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291846.html">[Libreoffice-commits] core.git: Changes to 'refs/tags/co-21.06.4-1'</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+core.git%5C%3A+Changes+to+%27refs%5C%2Ftags%5C%2Fco%5C-21.06.4%5C-1%27%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22Julien+Nabet+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Julien Nabet (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> Tag 'co-21.06.4-1' created by Andras Timar at 2021-09-07 09:42 + co-21.06.4-1 Changes since co-21.06.3-1-200: --- 0 files changed --- </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291845.html">[Libreoffice-commits] translations.git: Changes to 'refs/tags/co-21.06.4-1'</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+translations.git%5C%3A+Changes+to+%27refs%5C%2Ftags%5C%2Fco%5C-21.06.4%5C-1%27%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22Christian+Lohmaier+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Christian Lohmaier (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> Tag 'co-21.06.4-1' created by Andras Timar at 2021-09-07 09:42 + co-21.06.4-1 Changes since co-21.06.3-1-3: --- 0 files changed --- </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291844.html">[Libreoffice-commits] help.git: Changes to 'refs/tags/co-21.06.4-1'</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+help.git%5C%3A+Changes+to+%27refs%5C%2Ftags%5C%2Fco%5C-21.06.4%5C-1%27%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22Adolfo+Jayme+Barrientos+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Adolfo Jayme Barrientos (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> Tag 'co-21.06.4-1' created by Andras Timar at 2021-09-07 09:42 + co-21.06.4-1 Changes since co-2021-branch-point-10: --- 0 files changed --- </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291843.html">[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/co-21.06.4-1'</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+dictionaries.git%5C%3A+Changes+to+%27refs%5C%2Ftags%5C%2Fco%5C-21.06.4%5C-1%27%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22Andras+Timar+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Andras Timar (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> Tag 'co-21.06.4-1' created by Andras Timar at 2021-09-07 09:42 + co-21.06.4-1 Changes since libreoffice-7-1-branch-point-5: --- 0 files changed --- </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291842.html">[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - translations</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+core.git%5C%3A+Branch+%27distro%5C%2Fcollabora%5C%2Fco%5C-2021%27+%5C-+translations%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22Christian+Lohmaier+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Christian Lohmaier (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f1b6d23db7a8417666dd0995276b61861bae66e9 Author: Christian Lohmaier AuthorDate: Tue Sep 7 11:13:46 2021 +0200 Commit: Gerrit Code Review CommitDate: Tue Sep 7 11:13:46 2021 +0200 Update git submodules * Update translations from branch 'distro/collabora/co-2021' to e6569294340de8d2489d09b77911ba148977b13b - update translations for 7.1.6 rc2 and force-fix errors using pocheck Change-Id: I33f3530234e3ec6571ef3bc9096ac7511da550f6 (cherry picked from commit e2b905b6fd271224552f5146b0632fcea8a1a025) diff --git a/translations b/translations index 96ffb24921d7..e6569294340d 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 96ffb24921d7e554a3a353580b720915a95d2740 +Subproject commit e6569294340de8d2489d09b77911ba148977b13b </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291841.html">[Libreoffice-commits] translations.git: Branch 'distro/collabora/co-2021' - source/ab source/af source/am source/an source/ast source/bn-IN source/ca source/de source/el source/eo source/es source/eu </a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+translations.git%5C%3A+Branch+%27distro%5C%2Fcollabora%5C%2Fco%5C-2021%27+%5C-+source%5C%2Fab+source%5C%2Faf+source%5C%2Fam+source%5C%2Fan+source%5C%2Fast+source%5C%2Fbn%5C-IN+source%5C%2Fca+source%5C%2Fde+source%5C%2Fel+source%5C%2Feo+source%5C%2Fes+source%5C%2Feu+%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22Christian+Lohmaier+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Christian Lohmaier (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> source/ab/filter/source/config/fragments/filters.po |6 source/af/svtools/messages.po |8 source/am/chart2/messages.po | 46 source/am/connectivity/registry/evoab2/org/openoffice/Office/DataAccess.po |4 source/am/cui/messages.po | 42 source/am/formula/messages.po | 14 source/am/officecfg/registry/data/org/openoffice/Office.po | 10 source/am/officecfg/registry/data/org/openoffice/Office/UI.po | 50 source/am/reportbuilder/java/org/libreoffice/report/function/metadata.po | 22 source/am/sc/messages.po | 12 source/am/scaddins/messages.po |4 source/am/sd/messages.po |6 source/am/setup_native/source/mac.po |6 source/am/sfx2/messages.po | 40 source/am/starmath/messages.po | 50 source/am/sw/messages.po | 36 source/am/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po | 44 source/am/vcl/messages.po | 16 source/an/filter/messages.po |4 source/ast/connectivity/registry/firebird/org/openoffice/Office/DataAccess.po | 18 source/bn-IN/sc/messages.po | 18 source/bn-IN/svx/messages.po | 107 source/bn-IN/sw/messages.po | 80 source/ca/helpcontent2/source/text/sbasic/guide.po | 22 source/ca/helpcontent2/source/text/sbasic/shared.po |8 source/ca/helpcontent2/source/text/scalc/01.po |8 source/ca/helpcontent2/source/text/scalc/guide.po |8 source/ca/helpcontent2/source/text/schart/01.po |6 source/ca/helpcontent2/source/text/sdatabase.po | 10 source/ca/helpcontent2/source/text/shared/05.po |6 source/ca/helpcontent2/source/text/shared/autopi.po |6 source/ca/helpcontent2/source/text/shared/guide.po | 14 source/ca/helpcontent2/source/text/simpress/02.po |8 source/ca/helpcontent2/source/text/simpress/guide.po | 21 source/ca/helpcontent2/source/text/smath/01.po |6 source/ca/helpcontent2/source/text/swriter/01.po |6 source/ca/helpcontent2/source/text/swriter/guide.po |6 source/ca/svx/messages.po |6 source/ca/sw/messages.po |6 source/de/cui/messages.po |6 source/de/helpcontent2/source/text/shared/00.po | 48 source/de/helpcontent2/source/text/shared/01.po | 132 source/de/sc/messages.po |4 source/de/svtools/messages.po |8 source/el/basctl/messages.po |8 source/el/chart2/messages.po |8 source/el/cui/messages.po |8 source/el/desktop/messages.po |8 source/el/sc/messages.po |8 source/el/sd/messages.po |8 source/el/sw/messages.po |6 source/eo/helpcontent2/source/text/swriter/guide.po | 18 source/es/connectivity/registry/firebird/org/openoffice/Office/DataAccess.po | 18 source/es/cui/messages.po | 10 source/es/dbaccess/messages.po |8 source/es/helpcontent2/source/text/sbasic/python.po |6 source/es/help</pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291840.html">[Libreoffice-commits] core.git: Branch 'refs/tags/co-21.06.4-1' - 0 commits -</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+core.git%5C%3A+Branch+%27refs%5C%2Ftags%5C%2Fco%5C-21.06.4%5C-1%27+%5C-+0+commits+%5C-%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22+%5C%28via+logerrit%5C%29%22&o=newest&f=1"> (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> Rebased ref, commits from common ancestor: </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291839.html">[Libreoffice-commits] help.git: Branch 'refs/tags/co-21.06.4-1' - 0 commits -</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+help.git%5C%3A+Branch+%27refs%5C%2Ftags%5C%2Fco%5C-21.06.4%5C-1%27+%5C-+0+commits+%5C-%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22+%5C%28via+logerrit%5C%29%22&o=newest&f=1"> (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> Rebased ref, commits from common ancestor: </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291838.html">[Libreoffice-commits] translations.git: Branch 'refs/tags/co-21.06.4-1' - 0 commits -</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+translations.git%5C%3A+Branch+%27refs%5C%2Ftags%5C%2Fco%5C-21.06.4%5C-1%27+%5C-+0+commits+%5C-%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22+%5C%28via+logerrit%5C%29%22&o=newest&f=1"> (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> Rebased ref, commits from common ancestor: </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291837.html">[Libreoffice-commits] dictionaries.git: Branch 'refs/tags/co-21.06.4-1' - 0 commits -</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+dictionaries.git%5C%3A+Branch+%27refs%5C%2Ftags%5C%2Fco%5C-21.06.4%5C-1%27+%5C-+0+commits+%5C-%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22+%5C%28via+logerrit%5C%29%22&o=newest&f=1"> (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> Rebased ref, commits from common ancestor: </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291836.html">[Libreoffice-commits] core.git: Changes to 'refs/tags/co-21.06.4-1'</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+core.git%5C%3A+Changes+to+%27refs%5C%2Ftags%5C%2Fco%5C-21.06.4%5C-1%27%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22Dennis+Francis+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Dennis Francis (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> Tag 'co-21.06.4-1' created by Andras Timar at 2021-09-07 09:05 + co-21.06.4-1 Changes since co-21.06.3-1-189: --- 0 files changed --- </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291833.html">[Libreoffice-commits] help.git: Changes to 'refs/tags/co-21.06.4-1'</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+help.git%5C%3A+Changes+to+%27refs%5C%2Ftags%5C%2Fco%5C-21.06.4%5C-1%27%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22Adolfo+Jayme+Barrientos+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Adolfo Jayme Barrientos (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> Tag 'co-21.06.4-1' created by Andras Timar at 2021-09-07 09:05 + co-21.06.4-1 Changes since co-2021-branch-point-10: --- 0 files changed --- </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291834.html">[Libreoffice-commits] translations.git: Changes to 'refs/tags/co-21.06.4-1'</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+translations.git%5C%3A+Changes+to+%27refs%5C%2Ftags%5C%2Fco%5C-21.06.4%5C-1%27%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22Christian+Lohmaier+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Christian Lohmaier (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> Tag 'co-21.06.4-1' created by Andras Timar at 2021-09-07 09:05 + co-21.06.4-1 Changes since co-21.06.3-1-2: --- 0 files changed --- </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291835.html">[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/co-21.06.4-1'</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+dictionaries.git%5C%3A+Changes+to+%27refs%5C%2Ftags%5C%2Fco%5C-21.06.4%5C-1%27%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22Andras+Timar+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Andras Timar (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> Tag 'co-21.06.4-1' created by Andras Timar at 2021-09-07 09:05 + co-21.06.4-1 Changes since libreoffice-7-1-branch-point-5: --- 0 files changed --- </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291832.html">[Libreoffice-commits] core.git: include/vcl vcl/source</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+core.git%5C%3A+include%5C%2Fvcl+vcl%5C%2Fsource%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22Caol%C3%A1n+McNamara+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Caolán McNamara (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> include/vcl/layout.hxx |2 -- vcl/source/window/layout.cxx | 20 2 files changed, 4 insertions(+), 18 deletions(-) New commits: commit 99141aea4d81d89ff5d14087e6647b25f7018e8b Author: Caolán McNamara AuthorDate: Fri Sep 3 21:16:13 2021 +0100 Commit: Caolán McNamara CommitDate: Tue Sep 7 10:51:24 2021 +0200 Related: tdf#142458 don't change border size during Paint so GetOptimalSize/get_preferred_size before/after paint has the same result Change-Id: I25abe31c069561e30a9af7c4b9b81582298e0f9d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121616 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index 14c85938d639..19eca5b5cf40 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -500,8 +500,6 @@ public: private: virtual Size calculateRequisition() const override; virtual void setAllocation(const Size &rAllocation) override; -// sets new border size and adapts scrollbar and child widget position/size as needed -void updateBorderWidth(tools::Long nBorderWidth); int CalcBorderWidth() const; DECL_LINK(ScrollBarHdl, ScrollBar*, void); void InitScrollBars(const Size &rRequest); diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 680a650f34f2..d9f479ee39e6 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -2100,27 +2100,15 @@ bool VclScrolledWindow::EventNotify(NotifyEvent& rNEvt) return bDone || VclBin::EventNotify( rNEvt ); } -void VclScrolledWindow::updateBorderWidth(tools::Long nBorderWidth) -{ -if (m_nBorderWidth == nBorderWidth || nBorderWidth < 1) -return; - -m_nBorderWidth = nBorderWidth; -// update scrollbars and child window -doSetAllocation(GetSizePixel(), false); -}; - void VclScrolledWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) { +VclBin::Paint(rRenderContext, rRect); const tools::Rectangle aRect(tools::Rectangle(Point(0,0), GetSizePixel())); DecorationView aDecoView(&rRenderContext); const tools::Rectangle aContentRect = aDecoView.DrawFrame(aRect, m_eDrawFrameStyle, m_eDrawFrameFlags); - -// take potentially changed frame size into account before rendering content -const tools::Long nFrameWidth = (aRect.GetWidth() - aContentRect.GetWidth()) / 2; -updateBorderWidth(nFrameWidth); - -VclBin::Paint(rRenderContext, rRect); +const auto nBorderWidth = (aRect.GetWidth() - aContentRect.GetWidth()) / 2; +SAL_WARN_IF(nBorderWidth > m_nBorderWidth, "vcl.layout", "desired border at paint " << +nBorderWidth << " is larger than expected " << m_nBorderWidth); } void VclViewport::setAllocation(const Size &rAllocation) </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291831.html">[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - distro-configs/LibreOfficeFlatpak.conf solenv/flatpak-manifest.in</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+core.git%5C%3A+Branch+%27libreoffice%5C-7%5C-2%27+%5C-+distro%5C-configs%5C%2FLibreOfficeFlatpak.conf+solenv%5C%2Fflatpak%5C-manifest.in%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22Stephan+Bergmann+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Stephan Bergmann (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> distro-configs/LibreOfficeFlatpak.conf |1 + solenv/flatpak-manifest.in |9 + 2 files changed, 2 insertions(+), 8 deletions(-) New commits: commit 92c55f7840267fdbe775897c913c5fc369286368 Author: Stephan Bergmann AuthorDate: Fri Sep 3 11:14:31 2021 +0200 Commit: Caolán McNamara CommitDate: Tue Sep 7 09:55:44 2021 +0200 Flatpak: Upgrade to 21.08 runtime, disable Skia For whatever reason, building Skia against the 21.08 SDK would fail with > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp: In function ‘void {anonymous}::colrv1_draw_paint(SkCanvas*, const FT_Color*, FT_Face, FT_COLR_Paint)’: > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp:668:14: error: ‘FT_COLR_PAINTFORMAT_TRANSFORMED’ was not declared in this scope; did you mean ‘FT_COLR_PAINTFORMAT_TRANSFORM’? > 668 | case FT_COLR_PAINTFORMAT_TRANSFORMED: { > | ^~~ > | FT_COLR_PAINTFORMAT_TRANSFORM > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp:669:60: error: ‘union FT_COLR_Paint_::’ has no member named ‘transformed’; did you mean ‘transform’? > 669 | SkMatrix transform = ToSkMatrix(colrv1_paint.u.transformed.affine); > | ^~~ > | transform > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp: In function ‘bool {anonymous}::colrv1_traverse_paint(SkCanvas*, const FT_Color*, FT_Face, FT_OpaquePaint)’: > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp:763:14: error: ‘FT_COLR_PAINTFORMAT_TRANSFORMED’ was not declared in this scope; did you mean ‘FT_COLR_PAINTFORMAT_TRANSFORM’? > 763 | case FT_COLR_PAINTFORMAT_TRANSFORMED: > | ^~~ > | FT_COLR_PAINTFORMAT_TRANSFORM > /run/build/libreoffice/workdir/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.cpp:768:74: error: ‘union FT_COLR_Paint_::’ has no member named ‘transformed’; did you mean ‘transform’? > 768 | colrv1_traverse_paint(canvas, palette, face, paint.u.transformed.paint); > | ^~~ > | transform > make[1]: *** [/run/build/libreoffice/solenv/gbuild/LinkTarget.mk:347: /run/build/libreoffice/workdir/GenCxxObject/UnpackedTarball/skia/src/ports/SkFontHost_FreeType_common.o] Error 1 But including Skia in the Linux flatpak isn't too useful anyway (and just happened to be on by default): First, it is disabled by default on Linux, cf. UseSkia in officecfg/registry/data/org/openoffice/Office/Common.xcu. And second, on Linux it can only be enabled for SAL_USE_VCLPLUGIN=gen, but not for the gtk3 plugin that the flatpak normally uses, cf. OfaViewTabPage::UpdateSkiaStatus in cui/source/options/optgdlg.cxx. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121705 Tested-by: Jenkins Reviewed-by: Stephan Bergmann (cherry picked from commit 9d88f11de57bcbeb29fa6f1299d5d0867c1a75a4) Conflicts: solenv/flatpak-manifest.in Change-Id: Ifdc9c23676280caf19db0e9f09df15aaa21eef5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121712 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/distro-configs/LibreOfficeFlatpak.conf b/distro-configs/LibreOfficeFlatpak.conf index bef37df46c1b..b864ea3798b7 100644 --- a/distro-configs/LibreOfficeFlatpak.conf +++ b/distro-configs/LibreOfficeFlatpak.conf @@ -1,4 +1,5 @@ --disable-odk +--disable-skia --enable-release-build --with-ant-home=/run/build/libreoffice/ant --with-extra-buildid=Flatpak diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 75b843729a2e..df24ee69f173 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -1,7 +1,7 @@ { "id": "org.libreoffice.LibreOffice", "runtime": "org.freedesktop.Platform", -"runtime-version": "20.08", +"runtime-version": "21.08", "sdk": "org.freedesktop.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.openjdk11" @@ -655,13 +655,6 @@ "dest": "external/tarballs", "dest-filename": "libatomic_ops-7.6.8.tar.gz" }, -{ -"url": "https://dev-www.libreoffice.org/src/skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz";, -"sha256": "abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f</pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291830.html">[Libreoffice-commits] core.git: basic/qa basic/source</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+core.git%5C%3A+basic%5C%2Fqa+basic%5C%2Fsource%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22Andreas+Heinisch+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Andreas Heinisch (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> basic/qa/vba_tests/collection.vb | 73 +++ basic/source/classes/sb.cxx | 11 - 2 files changed, 82 insertions(+), 2 deletions(-) New commits: commit ef32c3b4f9b80918d6018e14297fa41245afd381 Author: Andreas Heinisch AuthorDate: Thu Sep 2 20:54:40 2021 +0200 Commit: Andreas Heinisch CommitDate: Tue Sep 7 09:51:26 2021 +0200 tdf#144245 - Case-insensitive operation for non-ASCII characters Support case-insensitive operation for non-ASCII characters in the Collection object (VBA). Change-Id: Ie17560cb9aac5bfb32aa04175dd4839681d6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121534 Tested-by: Jenkins Reviewed-by: Eike Rathke Reviewed-by: Andreas Heinisch diff --git a/basic/qa/vba_tests/collection.vb b/basic/qa/vba_tests/collection.vb new file mode 100644 index ..0b765905290a --- /dev/null +++ b/basic/qa/vba_tests/collection.vb @@ -0,0 +1,73 @@ +' +' 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/. +' + +Option VBASupport 1 +Option Explicit + +Function doUnitTest() As String +TestUtil.TestInit +verify_testCollection +doUnitTest = TestUtil.GetResult() +End Function + +Sub verify_testCollection() + +Dim a As Collection +Dim b As Collection + +On Error Resume Next +Set a = New Collection +a.Add 1, "D" +a.Add 2, "d" +a.Add 3, "Д" ' uppercase Cyrillic script De +a.Add 4, "д" ' lowercase Cyrillic script De +On Error GoTo 0 + +On Error Resume Next +Set b = New Collection +b.Add 1, "SS" +b.Add 2, "ss" +b.Add 3, "ẞ" ' uppercase German Eszett +b.Add 4, "ß" ' lowercase German Eszett +On Error GoTo 0 + +On Error GoTo errorHandler + +' tdf#144245 - case-insensitive operation for non-ASCII characters +' Without the fix in place, this test would have failed with +' - Expected: 2 +' - Actual : 3 +TestUtil.AssertEqual(a.Count, 2, "a.Count") + +' tdf#144245 - case-insensitive operation for non-ASCII item access +' Without the fix in place, this test would have failed with +' - Expected: 1 for d, 3 for lowercase Cyrillic script De (д) +' - Actual : 2 for d, 4 for lowercase Cyrillic script De (д) +TestUtil.AssertEqual(a.Item("D"), 1, "a.Item(""D"")") +TestUtil.AssertEqual(a.Item("d"), 1, "a.Item(""d"")") +TestUtil.AssertEqual(a.Item("Д"), 3, "a.Item(""Д"")") +TestUtil.AssertEqual(a.Item("д"), 3, "a.Item(""д"")") + +' tdf#144245 - German Eszett is uppercased to a two-character 'SS'. +' This test should fail after tdf#110003 has been fixed since the lowercase and the uppercase +' German Eszett should be matched to the same index. +TestUtil.AssertEqual(b.Count, 3, "b.Count") +' After the fix of tdf#110003 +' TestUtil.AssertEqual(b.Count, 2, "b.Count") + +TestUtil.AssertEqual(a.Item("SS"), 1, "a.Item(""SS"")") +TestUtil.AssertEqual(a.Item("ss"), 1, "a.Item(""ss"")") +TestUtil.AssertEqual(a.Item("ẞ"), 3, "a.Item(""ẞ"")") +TestUtil.AssertEqual(a.Item("ß"), 4, "a.Item(""ß"")") +' After the fix of tdf#110003 +' TestUtil.AssertEqual(a.Item("ß"), 3, "a.Item(""ß"")") + +Exit Sub +errorHandler: +TestUtil.ReportErrorHandler("verify_testCollection", Err, Error$, Erl) +End Sub diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index f0ab981d62a5..8f2155e6d218 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -47,6 +47,9 @@ #include #include +#include +#include + #include #include @@ -2058,11 +2061,15 @@ sal_Int32 BasicCollection::implGetIndexForName(std::u16string_view rName) sal_Int32 nIndex = -1; sal_Int32 nCount = xItemArray->Count(); sal_Int32 nNameHash = MakeHashCode( rName ); + +// tdf#144245 - case-insensitive operation for non-ASCII characters +utl::TransliterationWrapper& rTransliteration = SbGlobal::GetTransliteration(); + for( sal_Int32 i = 0 ; i < nCount ; i++ ) { SbxVariable* pVar = xItemArray->Get(i); -if( pVar->GetHashCode() == nNameHash && -pVar->GetName().equalsIgnoreAsciiCase( rName ) ) +if (pVar->GetHashCode() == nNameHash +&& rTransliteration.isEqual(pVar->GetName(), OUString(rName))) { nIndex = i; break; </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291829.html">[Libreoffice-commits] core.git: sal/osl</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+core.git%5C%3A+sal%5C%2Fosl%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22Lubo%C5%A1+Lu%C5%88%C3%A1k+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Luboš Luňák (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> sal/osl/unx/backtraceapi.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 57cac3a19f5e07da137ecd616ccddf81ca185fa9 Author: Luboš Luňák AuthorDate: Mon Sep 6 15:46:36 2021 +0200 Commit: Luboš Luňák CommitDate: Tue Sep 7 09:19:36 2021 +0200 prepend # to frames in unx backtraces To make complex backtraces readable. Change-Id: I3a95d03d97c8e6d1aa7aeab37957d3b8441c3c90 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121724 Tested-by: Jenkins Reviewed-by: Luboš Luňák diff --git a/sal/osl/unx/backtraceapi.cxx b/sal/osl/unx/backtraceapi.cxx index 8e55cc338020..1868ae7132bb 100644 --- a/sal/osl/unx/backtraceapi.cxx +++ b/sal/osl/unx/backtraceapi.cxx @@ -213,6 +213,7 @@ OUString sal::backtrace_to_string(BacktraceState* backtraceState) { if (i != 0) b3.append("\n"); +b3.append( "#" + OUString::number( i ) + " " ); if(!frameData[i].info.isEmpty()) b3.append(o3tl::runtimeToOUString(frameData[i].info.getStr())); else @@ -245,6 +246,7 @@ OUString sal::backtrace_to_string(BacktraceState* backtraceState) if (i != 0) { b3.append("\n"); } +b3.append( "#" + OUString::number( i ) + " " ); b3.append(o3tl::runtimeToOUString(b2.get()[i])); } return b3.makeStringAndClear(); </pre></span> </blockquote><br> <h3><span class=subject><a href="/libreoffice@lists.freedesktop.org/msg291828.html">[Libreoffice-commits] core.git: Branch 'feature/themesupport2' - include/sfx2 offapi/com offapi/UnoApi_offapi.mk sfx2/source</a></span></h3> <div class="darkgray font13"> <span class="sender pipe"> <span class=date><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date:20210907&o=newest&f=1">2021-09-07</a></span></span> <span class="sender pipe"> <span class=thead><a href="/search?l=libreoffice%40lists.freedesktop.org&q=subject:%22%5C%5BLibreoffice%5C-commits%5C%5D+core.git%5C%3A+Branch+%27feature%5C%2Fthemesupport2%27+%5C-+include%5C%2Fsfx2+offapi%5C%2Fcom+offapi%5C%2FUnoApi_offapi.mk+sfx2%5C%2Fsource%22&o=newest&f=1">Thread</a></span></span> <span class=name><a href="/search?l=libreoffice%40lists.freedesktop.org&q=from:%22Sarper+Akdemir+%5C%28via+logerrit%5C%29%22&o=newest&f=1">Sarper Akdemir (via logerrit)</a></span> </div> <blockquote><span class="msgFragment"><pre> include/sfx2/sfxbasemodel.hxx |6 + offapi/UnoApi_offapi.mk|1 offapi/com/sun/star/document/XColorSetsManager.idl | 24 + sfx2/source/doc/sfxbasemodel.cxx | 22 +++ 4 files changed, 53 insertions(+) New commits: commit 3f1bca8b4f451fa30bf341116390738c456d651f Author: Sarper Akdemir AuthorDate: Tue Sep 7 10:14:52 2021 +0300 Commit: Sarper Akdemir CommitDate: Tue Sep 7 10:14:52 2021 +0300 WIP: introduce XColorSetsManager interface Change-Id: I3878749b5183ad2e39eafcbac8856e7bff16719c diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx index b55705b57e1d..b96e8e25c786 100644 --- a/include/sfx2/sfxbasemodel.hxx +++ b/include/sfx2/sfxbasemodel.hxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -42,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -115,6 +117,7 @@ namespace com::sun::star::util { class XModifyListener; } typedef ::cppu::WeakImplHelper < css::container::XChild , css::document::XDocumentPropertiesSupplier , css::document::XCmisDocument +, css::document::XColorSetsManager , css::rdf::XDocumentMetadataAccess , css::document::XDocumentRecovery , css::document::XUndoManagerSupplier @@ -665,6 +668,9 @@ public: virtual sal_Bool SAL_CALL canCancelCheckOut( ) override; virtual sal_Bool SAL_CALL canCheckIn( ) override; +// XColorSetsManager +virtual void SAL_CALL addNewColorSet(const OUString& rColorSetName, const css::uno::Sequence& rColorSetColors) override; + /// @throws css::uno::RuntimeException bool getBoolPropertyValue( const OUString& rName ); diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 0de6196f54b4..fbb453a8ee1a 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -2221,6 +2221,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/document,\ XBinaryStreamResolver \ XCmisDocument \ XCodeNameQuery \ + XColorSetsManager \ XCompatWriterDocProperties \ XDocumentEventBroadcaster \ XDocumentEventListener \ diff --git a/offapi/com/sun/star/document/XColorSetsManager.idl b/offapi/com/sun/star/document/XColorSetsManager.idl new file mode 100644 index ..5e16df71e06b --- /dev/null +++ b/offapi/com/sun/star/document/XColorSetsManager.idl @@ -0,0 +1,24 @@ +/* -*- 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 + +module com { module sun { module star { module document { + +interface XColorSetsManager: com::sun::star::uno::XInterface +{ + /* definitions of colorset functions here*/ + void addNewColorSet( [in] string ColorSetName, [in] sequence < com::sun::star::util::Color > ColorSetColors ); +}; + +}; }; }; }; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index c95c068463cd..d3d6479e47e4 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -99,6 +99,7 @@ #include #include #include +#include #include #include #include @@ -2735,6 +2736,27 @@ void SfxBaseModel::loadCmisProperties( ) } } +void SAL_CALL SfxBaseModel::addNewColorSet(const OUString& rColorSetName, + const css::uno::Sequence& rColorSetColors) +{ +if(SfxObjectShell* pObjShell = SfxObjectShell::Current()) +{ +if(const SfxColorSetListItem* pColorSetItem = pObjShell->GetItem(SID_COLOR_SETS)) +{ +pColorSetItem->GetSfxColorSetListPtr();//->AddNewColorSet( NAME, COLORS ); +//SAL/_DEBUG("Got the ColorSet without a problem!"); +} +else +{ +//SAL/_DEBUG("Couldn't get pColorSetItem (in addNewColorSet)"); +} +} +else +{ +//SAL/_DEBUG("Couldn't get the object shell (in addNewColorSet)"); +} +} + SfxMedium* SfxBaseModel::handleLoadError( ErrCode nError, SfxMedium* pMedium ) { if (!nError) </pre></span> </blockquote><br> <h2></h2> </div> <div class="aside" role="complementary"> <div class="logo"> <a href="/"><img src="/logo.png" width=247 height=88 alt="The Mail Archive"></a> </div> <h2>65 matches</h2> <br> <ul><li><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date%3A20210907&a=1&o=newest&f=1">Advanced search</a></li></ul> <form class="overflow" action="/search" method="get"> <input type="hidden" name="l" value="libreoffice@lists.freedesktop.org"> <label class="hidden" for="q">Search the list</label> <input class="submittext" type="text" id="q" name="q" placeholder="Search libreoffice" value="date:20210907"> <input class="submitbutton" id="submit" type="image" src="/submit.png" alt="Submit"> </form> <div class="nav margintop" id="nav" role="navigation"> <h2 class="hidden"> Site Navigation </h2> <ul class="icons font16"> <li class="icons-home"><a href="/">The Mail Archive home</a></li> <li class="icons-list"> <a href="/libreoffice@lists.freedesktop.org" title="c" id="c">libreoffice - all messages</a></li> <li class="icons-about"> <a href="/libreoffice@lists.freedesktop.org/info.html">libreoffice - about the list</a></li> <li class="icons-expand"><a href="/search?l=libreoffice%40lists.freedesktop.org&q=date%3A20210907&o=newest" title="e" id="e">Expand</a></li> </ul> </div> <div class="listlogo margintopdouble"> <h2 class="hidden"> Mail list logo </h2> </div> </div> <div class="footer" role="contentinfo"> <h2 class="hidden"> Footer information </h2> <ul> <li><a href="/">The Mail Archive home</a></li> <li><a href="/faq.html#newlist">Add your mailing list</a></li> <li><a href="/faq.html">FAQ</a></li> <li><a href="/faq.html#support">Support</a></li> <li><a href="/faq.html#privacy">Privacy</a></li> </ul> </div> <script language="javascript" type="text/javascript"> document.onkeydown = NavigateThrough; function NavigateThrough (event) { if (!document.getElementById) return; if (window.event) event = window.event; if (event.target.tagName == 'INPUT') return; if (event.ctrlKey || event.metaKey) return; var link = null; switch (event.keyCode ? event.keyCode : event.which ? event.which : null) { case 69: link = document.getElementById ('e'); break; } if (link && link.href) document.location = link.href; } </script> </body> </html>