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

[Balazs Varga (via logerrit)]

 chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx |1 +
 chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx |1 +
 chart2/source/controller/main/ChartController_Tools.cxx|8 
++--
 chart2/source/tools/DataSeriesHelper.cxx   |2 ++
 4 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 0dce53516011f5d2d9408501714e2b1865517119
Author: Balazs Varga 
AuthorDate: Wed Sep 2 15:09:01 2020 +0200
Commit: László Németh 
CommitDate: Thu Sep 24 09:29:52 2020 +0200

tdf#136402 Chart View: remove custom label text

Now Delete Data Labels and Insert Data Labels local
menu options remove custom label text instead of keeping it.
See with unit test document custom_data_label.xlsx of
commit bcda268cde1f8408c2066ce985acedfce3e3bc2e
(tdf#134977 Chart OOXML: fix import of custom data label).

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

diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx 
b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 6328a222b622..302c56280fa0 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -338,6 +338,7 @@ bool DataPointItemConverter::ApplySpecialItem(
 
DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, 
CHART_UNONAME_LABEL , aOldValue ) )
 {
 
DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, 
CHART_UNONAME_LABEL , uno::Any( aLabel ) );
+
DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, 
CHART_UNONAME_CUSTOM_LABEL_FIELDS, uno::Any() );
 bChanged = true;
 }
 }
diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx 
b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
index bdeffbf6cf3c..5fe31b1bcd5f 100644
--- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
@@ -287,6 +287,7 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 
nWhichId, const SfxIte
 
DataSeriesHelper::hasAttributedDataPointDifferentValue(xSeries, 
CHART_UNONAME_LABEL, aOldValue))
 {
 
DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints(xSeries, 
CHART_UNONAME_LABEL, uno::Any(aLabel));
+
DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints(xSeries, 
CHART_UNONAME_CUSTOM_LABEL_FIELDS, uno::Any());
 bChanged = true;
 }
 }
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx 
b/chart2/source/controller/main/ChartController_Tools.cxx
index 3668321589db..d72a629757a1 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -765,10 +765,14 @@ bool ChartController::executeDispatch_Delete()
 if( aObjectType == OBJECTTYPE_DATA_LABELS )
 {
 uno::Reference< chart2::XDataSeries > xSeries( 
ObjectIdentifier::getDataSeriesForCID( aCID, getModel() ));
-
::chart::DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, 
CHART_UNONAME_LABEL, uno::Any(aLabel) );
+
DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, 
CHART_UNONAME_LABEL, uno::Any(aLabel) );
+
DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, 
CHART_UNONAME_CUSTOM_LABEL_FIELDS, uno::Any() );
 }
 else
-xObjectProperties->setPropertyValue( 
CHART_UNONAME_LABEL, uno::Any(aLabel) );
+{
+
xObjectProperties->setPropertyValue(CHART_UNONAME_LABEL, uno::Any(aLabel));
+
xObjectProperties->setPropertyValue(CHART_UNONAME_CUSTOM_LABEL_FIELDS, 
uno::Any());
+}
 bReturn = true;
 aUndoGuard.commit();
 }
diff --git a/chart2/source/tools/DataSeriesHelper.cxx 
b/chart2/source/tools/DataSeriesHelper.cxx
index 809ba67a931e..c7dabaf1d4da 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -173,6 +173,7 @@ void lcl_insertOrDeleteDataLabelsToSeriesAndAllPoints( 
const Reference< chart2::
 aLabel.ShowCustomLabel = false;
 }
 xPointProp->setPropertyValue(CHART_UNONAME_LABEL, 
un

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - 2 commits - common/Log.cpp

[Tor Lillqvist (via logerrit)]

 common/Log.cpp |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 9d3b3a2c2381ffac222f85493cb1a1430c1a52b3
Author: Tor Lillqvist 
AuthorDate: Fri Jul 10 11:33:14 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Sep 24 10:14:23 2020 +0300

Don't bother outputting the thread id in hex for iOS to log

We output the informative name we give ourselves to the thread anyway
which is much more useful.

Change-Id: I74721cc0014fa657adfb6ecea05bcd7f846421a4
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98477
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 

diff --git a/common/Log.cpp b/common/Log.cpp
index 0ae19df66..bc3637183 100644
--- a/common/Log.cpp
+++ b/common/Log.cpp
@@ -189,14 +189,15 @@ namespace Log
 // Don't bother with the "Source" which would be just "Mobile" always 
and non-informative as
 // there is just one process in the app anyway.
 char *pos = buffer;
+
+// Don't bother with the thread identifier either. We output the 
thread name which is much
+// more useful anyway.
 #else
 // Note that snprintf is deemed signal-safe in most common 
implementations.
 char* pos = strcopy((Source.getInited() ? Source.getId().c_str() : 
""), buffer);
 *pos++ = '-';
-#endif
 
 // Thread ID.
-#ifdef __linux
 const long osTid = Util::getThreadId();
 if (osTid > 9)
 {
@@ -213,17 +214,10 @@ namespace Log
 to_ascii_fixed<5>(pos, osTid);
 pos += 5;
 }
-#elif defined IOS
-uint64_t osTid;
-pthread_threadid_np(nullptr, &osTid);
-snprintf(pos, 32, "%#.05llx", osTid);
-// Skip to end.
-while (*pos)
-pos++;
+*pos++ = ' ';
 #endif
 
 // -MM-DD.
-*pos++ = ' ';
 to_ascii_fixed<4>(pos, time.year());
 pos[4] = '-';
 pos += 5;
commit 01d84a7003aa010a90f63c61ca94891417ddc0c1
Author: Tor Lillqvist 
AuthorDate: Thu Jul 2 22:15:08 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Sep 24 09:44:25 2020 +0300

Drop the fixed prefix ("Mobile-") from log output in the iOS app

There is just one process in the app so logging its name which always
is the same is pointless.

Change-Id: I89dbabc26457a142d35bf748981edb670cba4732

diff --git a/common/Log.cpp b/common/Log.cpp
index e001980af..0ae19df66 100644
--- a/common/Log.cpp
+++ b/common/Log.cpp
@@ -185,9 +185,15 @@ namespace Log
 
 char* prefix(const Poco::DateTime& time, char* buffer, const char* level)
 {
+#ifdef IOS
+// Don't bother with the "Source" which would be just "Mobile" always 
and non-informative as
+// there is just one process in the app anyway.
+char *pos = buffer;
+#else
 // Note that snprintf is deemed signal-safe in most common 
implementations.
 char* pos = strcopy((Source.getInited() ? Source.getId().c_str() : 
""), buffer);
 *pos++ = '-';
+#endif
 
 // Thread ID.
 #ifdef __linux
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 solenv/bin/modules/installer.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7e610406a2d063ba5efacb0e186524c2a4ed77a9
Author: Mike Kaganski 
AuthorDate: Thu Sep 24 10:48:57 2020 +0300
Commit: Mike Kaganski 
CommitDate: Thu Sep 24 10:17:43 2020 +0200

Only read msi database for msi package format

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

diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 7f18a572cbcb..0beb2ab4bd26 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -500,7 +500,7 @@ sub run {
 my $allupdatelastsequences = "";
 my $allupdatediskids = "";
 
-if ( $installer::globals::iswindowsbuild || 
$installer::globals::packageformat eq 'msi' )
+if ( $installer::globals::packageformat eq 'msi' )
 {
 if ( $allvariableshashref->{'UPDATE_DATABASE'} )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sd/qa/unit/data/odp/tdf136949.odp |binary
 sd/qa/unit/layout-tests.cxx   |   22 ++
 2 files changed, 22 insertions(+)

New commits:
commit 1e0ac737e620a6a3e5c54021c77f299e89e3a9ef
Author: Xisco Fauli 
AuthorDate: Thu Sep 24 00:31:35 2020 +0200
Commit: Xisco Fauli 
CommitDate: Thu Sep 24 10:23:41 2020 +0200

tdf#136949: sd_layout_tests: Add unittest

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

diff --git a/sd/qa/unit/data/odp/tdf136949.odp 
b/sd/qa/unit/data/odp/tdf136949.odp
new file mode 100644
index ..91f3017d4dae
Binary files /dev/null and b/sd/qa/unit/data/odp/tdf136949.odp differ
diff --git a/sd/qa/unit/layout-tests.cxx b/sd/qa/unit/layout-tests.cxx
index d6643f82420a..953500dc25a2 100644
--- a/sd/qa/unit/layout-tests.cxx
+++ b/sd/qa/unit/layout-tests.cxx
@@ -12,10 +12,12 @@ class SdLayoutTest : public SdModelTestBaseXML
 {
 public:
 void testTdf104722();
+void testTdf136949();
 
 CPPUNIT_TEST_SUITE(SdLayoutTest);
 
 CPPUNIT_TEST(testTdf104722);
+CPPUNIT_TEST(testTdf136949);
 
 CPPUNIT_TEST_SUITE_END();
 };
@@ -41,6 +43,26 @@ void SdLayoutTest::testTdf104722()
 xDocShRef->DoClose();
 }
 
+void SdLayoutTest::testTdf136949()
+{
+sd::DrawDocShellRef xDocShRef
+= 
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/odp/tdf136949.odp"), ODP);
+
+std::shared_ptr xMetaFile = xDocShRef->GetPreviewMetaFile();
+MetafileXmlDump dumper;
+
+xmlDocUniquePtr pXmlDoc = XmlTestTools::dumpAndParse(dumper, *xMetaFile);
+CPPUNIT_ASSERT(pXmlDoc);
+
+// Without the fix in place, this test would have failed with
+// - Expected: 13687
+// - Actual  : 2832
+assertXPath(pXmlDoc, 
"/metafile/push[1]/push[1]/push[7]/polyline/point[1]", "x", "13687");
+assertXPath(pXmlDoc, 
"/metafile/push[1]/push[1]/push[7]/polyline/point[2]", "x", "24759");
+
+xDocShRef->DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdLayoutTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 vcl/qa/cppunit/pdfexport/pdfexport.cxx |   31 +--
 1 file changed, 29 insertions(+), 2 deletions(-)

New commits:
commit 13251ea5da9a1761740cc65ce6c50c897f12c698
Author: Stephan Bergmann 
AuthorDate: Thu Sep 24 09:44:46 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 24 10:56:34 2020 +0200

More fixes of PDFium-provided strings, in test code

...similar to 08705b75ff8b5a10dc039a9aa1042e04a281729a "These 
PDFium-provided
strings are always in UTF-16LE".

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

diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx 
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 96dce4aff82a..94d583a0c52f 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1700,6 +1701,12 @@ void PdfExportTest::testTdf115262()
 unsigned long nTextSize = FPDFTextObj_GetText(pPageObject, 
pTextPage, nullptr, 0);
 std::vector aText(nTextSize);
 FPDFTextObj_GetText(pPageObject, pTextPage, aText.data(), 
nTextSize);
+#if defined OSL_BIGENDIAN
+// The data returned by FPDFTextObj_GetText is documented to 
always be UTF-16LE:
+for (auto & j: aText) {
+j = OSL_SWAPWORD(j);
+}
+#endif
 OUString sText(aText.data(), nTextSize / 2 - 1);
 if (sText == "400")
 nRowTop = fTop;
@@ -1735,6 +1742,12 @@ void PdfExportTest::testTdf121962()
 unsigned long nTextSize = FPDFTextObj_GetText(pPageObject, pTextPage, 
nullptr, 0);
 std::vector aText(nTextSize);
 FPDFTextObj_GetText(pPageObject, pTextPage, aText.data(), nTextSize);
+#if defined OSL_BIGENDIAN
+// The data returned by FPDFTextObj_GetText is documented to always be 
UTF-16LE:
+for (auto & j: aText) {
+j = OSL_SWAPWORD(j);
+}
+#endif
 OUString sText(aText.data(), nTextSize / 2 - 1);
 CPPUNIT_ASSERT(sText != "** Expression is faulty **");
 }
@@ -1767,6 +1780,12 @@ void PdfExportTest::testTdf115967()
 unsigned long nTextSize = FPDFTextObj_GetText(pPageObject, pTextPage, 
nullptr, 2);
 std::vector aText(nTextSize);
 FPDFTextObj_GetText(pPageObject, pTextPage, aText.data(), nTextSize);
+#if defined OSL_BIGENDIAN
+// The data returned by FPDFTextObj_GetText is documented to always be 
UTF-16LE:
+for (auto & j: aText) {
+j = OSL_SWAPWORD(j);
+}
+#endif
 OUString sChar(aText.data(), nTextSize / 2 - 1);
 sText += sChar.trim();
 }
@@ -2298,8 +2317,16 @@ void PdfExportTest::testFormFontName()
 CPPUNIT_ASSERT(FPDFAnnot_HasKey(pAnnot.get(), "DA"));
 CPPUNIT_ASSERT_EQUAL(FPDF_OBJECT_STRING, 
FPDFAnnot_GetValueType(pAnnot.get(), "DA"));
 size_t nDALength = FPDFAnnot_GetStringValue(pAnnot.get(), "DA", nullptr, 
0);
-std::vector aDABuf(nDALength);
-FPDFAnnot_GetStringValue(pAnnot.get(), "DA", aDABuf.data(), nDALength);
+CPPUNIT_ASSERT_EQUAL(std::size_t(0), nDALength % 2);
+std::vector aDABuf(nDALength / 2);
+FPDFAnnot_GetStringValue(
+pAnnot.get(), "DA", reinterpret_cast(aDABuf.data()), 
nDALength);
+#if defined OSL_BIGENDIAN
+// The data returned by FPDFAnnot_GetStringValue is documented to always 
be UTF-16LE:
+for (auto & i: aDABuf) {
+i = OSL_SWAPWORD(i);
+}
+#endif
 OUString aDA(reinterpret_cast(aDABuf.data()));
 
 // Without the accompanying fix in place, this test would have failed with:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 external/cairo/cairo/cairo.oldfreetype.patch |   31 +++
 1 file changed, 31 insertions(+)

New commits:
commit 83a5e33afaedb15a919fe6cc9f1866f3745dd114
Author: Miklos Vajna 
AuthorDate: Thu Sep 24 10:39:01 2020 +0200
Commit: Miklos Vajna 
CommitDate: Thu Sep 24 10:56:57 2020 +0200

cairo: avoid linking to freetype-2.8-only FT_Get_Var_Design_Coordinates

This is meant to help producing binaries which run on Ubuntu 16.04.

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

diff --git a/external/cairo/cairo/cairo.oldfreetype.patch 
b/external/cairo/cairo/cairo.oldfreetype.patch
index 2ccc1908fa22..a25c8bbdd030 100644
--- a/external/cairo/cairo/cairo.oldfreetype.patch
+++ b/external/cairo/cairo/cairo.oldfreetype.patch
@@ -9,3 +9,34 @@
/* If FT_Get_Var_Blend_Coordinates() is available, we can check if the
 * current design coordinates are the default coordinates. In this case
 * the current outlines match the font tables.
+--- a/cairo/src/cairo-ft-font.c2020-09-24 10:35:25.391941702 +0200
 b/cairo/src/cairo-ft-font.c2020-09-24 10:35:39.900126419 +0200
+@@ -451,7 +451,7 @@
+ unscaled->have_color = FT_HAS_COLOR (face) != 0;
+ unscaled->have_color_set = TRUE;
+ 
+-#ifdef HAVE_FT_GET_VAR_DESIGN_COORDINATES
++#if 0
+   {
+   FT_MM_Var *ft_mm_var;
+   if (0 == FT_Get_MM_Var (face, &ft_mm_var))
+@@ -2377,7 +2377,7 @@
+ }
+ 
+ current_coords = malloc (sizeof (FT_Fixed) * ft_mm_var->num_axis);
+-#ifdef HAVE_FT_GET_VAR_DESIGN_COORDINATES
++#if 0
+ ret = FT_Get_Var_Design_Coordinates (face, ft_mm_var->num_axis, 
current_coords);
+ if (ret == 0) {
+ for (i = 0; i < ft_mm_var->num_axis; i++) {
+--- a/cairo/test/font-variations.c 2020-09-24 10:36:01.592402635 +0200
 b/cairo/test/font-variations.c 2020-09-24 10:36:08.728493510 +0200
+@@ -117,7 +117,7 @@
+ return CAIRO_TEST_FAILURE;
+ }
+ 
+-#ifdef HAVE_FT_GET_VAR_DESIGN_COORDINATES
++#if 0
+ ret = FT_Get_Var_Design_Coordinates (ft_face, 20, coords);
+ if (ret != 0) {
+ cairo_test_log (ctx, "Failed to get coords");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - cypress_test/data cypress_test/integration_tests cypress_test/plugins

[Tamás Zolnai (via logerrit)]

 cypress_test/data/mobile/calc/nextcloud.ods |binary
 cypress_test/data/mobile/impress/nextcloud.odp  |binary
 cypress_test/integration_tests/common/mobile_helper.js  |   15 
 cypress_test/integration_tests/mobile/calc/nextcloud_spec.js|  170 
++
 cypress_test/integration_tests/mobile/impress/nextcloud_spec.js |  169 
+
 cypress_test/integration_tests/mobile/writer/nextcloud_spec.js  |1 
 cypress_test/plugins/blacklists.js  |2 
 7 files changed, 354 insertions(+), 3 deletions(-)

New commits:
commit bfc726639577c8b60b671c607aafc18c5b4dd96c
Author: Tamás Zolnai 
AuthorDate: Thu Sep 24 08:04:52 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Sep 24 10:58:53 2020 +0200

cypress: check close/edit button state on mobile.

Change-Id: I576f2d8358fd922a10fd4a9e846dd28b49191cb3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103291
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/integration_tests/common/mobile_helper.js 
b/cypress_test/integration_tests/common/mobile_helper.js
index 9875b29d9..1396ef6ca 100644
--- a/cypress_test/integration_tests/common/mobile_helper.js
+++ b/cypress_test/integration_tests/common/mobile_helper.js
@@ -9,13 +9,24 @@ function enableEditingMobile() {
cy.get('#mobile-edit-button')
.then(function(button) {
if (button.css('display') !== 'none') {
+
+   cy.get('#tb_actionbar_item_closemobile 
.editmode')
+   .should('not.exist');
+
+   cy.get('#tb_actionbar_item_closemobile 
.closemobile')
+   .should('be.visible');
+
cy.get('#mobile-edit-button')
.click();
}
});
 
-   cy.get('#tb_actionbar_item_mobile_wizard')
-   .should('not.have.class', 'disabled');
+
+   cy.get('#tb_actionbar_item_closemobile .editmode')
+   .should('be.visible');
+
+   cy.get('#tb_actionbar_item_closemobile .closemobile')
+   .should('not.exist');
 
// Wait until all UI update is finished.
cy.get('#toolbar-down')
commit 02be3eaa94273eb52b26d2aaf04b56a4437f6b19
Author: Tamás Zolnai 
AuthorDate: Thu Sep 24 07:57:11 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Sep 24 10:58:44 2020 +0200

cypress: NC: test nextcloud specific features also in Impress / Calc.

Change-Id: I47c5a318239c2b5c96f1bf8f69298d3369f67d43
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103290
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/data/mobile/calc/nextcloud.ods 
b/cypress_test/data/mobile/calc/nextcloud.ods
new file mode 100644
index 0..2e2c500fc
Binary files /dev/null and b/cypress_test/data/mobile/calc/nextcloud.ods differ
diff --git a/cypress_test/data/mobile/impress/nextcloud.odp 
b/cypress_test/data/mobile/impress/nextcloud.odp
new file mode 100644
index 0..8907786e3
Binary files /dev/null and b/cypress_test/data/mobile/impress/nextcloud.odp 
differ
diff --git a/cypress_test/integration_tests/mobile/calc/nextcloud_spec.js 
b/cypress_test/integration_tests/mobile/calc/nextcloud_spec.js
new file mode 100644
index 0..5423ec68c
--- /dev/null
+++ b/cypress_test/integration_tests/mobile/calc/nextcloud_spec.js
@@ -0,0 +1,170 @@
+/* global describe it cy require afterEach Cypress */
+
+var helper = require('../../common/helper');
+var mobileHelper = require('../../common/mobile_helper');
+
+describe('Nextcloud specific tests.', function() {
+   var testFileName = 'nextcloud.ods';
+
+   afterEach(function() {
+   helper.afterAll(testFileName);
+   });
+
+   it('Insert image from storage.', function() {
+   helper.loadFileToNextCloud('image_to_insert.png', 'calc');
+
+   helper.beforeAll(testFileName, 'calc', undefined, true);
+
+   // Click on edit button
+   mobileHelper.enableEditingMobile();
+
+   mobileHelper.openInsertionWizard();
+
+   cy.get('.insertgraphicremote')
+   .then(function(item) {
+   Cypress.env('IFRAME_LEVEL', '');
+   cy.wrap(item)
+   .click();
+   });
+
+   cy.get('.oc-dialog')
+   .should('be.visible');
+
+   cy.get('tr[data-entryname=\'image_to_insert.png\']')
+   .click();
+
+   cy.get('.oc-dialog-buttonrow .primary')
+   .then(function(item) {
+   Cypress.env('IFRAME_LEVEL', '2');
+   cy.wrap(item)
+   

[Libreoffice-commits] online.git: cypress_test/integration_tests

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/common/nextcloud_helper.js   |  123 
++
 cypress_test/integration_tests/mobile/calc/nextcloud_spec.js|  110 
 cypress_test/integration_tests/mobile/impress/nextcloud_spec.js |  110 
 cypress_test/integration_tests/mobile/writer/nextcloud_spec.js  |  111 
-
 4 files changed, 138 insertions(+), 316 deletions(-)

New commits:
commit 391b8b7fd7cc4ea42189782926472591d5934d4a
Author: Tamás Zolnai 
AuthorDate: Thu Sep 24 09:02:58 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Sep 24 10:59:07 2020 +0200

cypress: NC: extract some helper methods for nextcloud specific features.

Change-Id: I47b1811ce0501733544eaa42b8b117a08a8c
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103292
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 

diff --git a/cypress_test/integration_tests/common/nextcloud_helper.js 
b/cypress_test/integration_tests/common/nextcloud_helper.js
new file mode 100644
index 0..304c814e9
--- /dev/null
+++ b/cypress_test/integration_tests/common/nextcloud_helper.js
@@ -0,0 +1,123 @@
+/* global cy Cypress require */
+
+var mobileHelper = require('./mobile_helper');
+
+function checkAndCloseRevisionHistory() {
+   mobileHelper.openHamburgerMenu();
+
+   cy.contains('.menu-entry-with-icon', 'File')
+   .click();
+
+   cy.contains('.menu-entry-with-icon', 'See revision history')
+   .then(function(item) {
+   Cypress.env('IFRAME_LEVEL', '');
+   cy.wrap(item)
+   .click();
+   });
+   cy.get('#app-sidebar')
+   .should('be.visible');
+
+   cy.get('section#tab-versionsTabView')
+   .should('be.visible');
+
+   cy.get('.app-sidebar__close.icon-close')
+   .then(function(item) {
+   Cypress.env('IFRAME_LEVEL', '1');
+   cy.wrap(item)
+   .click();
+   });
+
+   cy.get('#revViewerContainer .icon-close')
+   .then(function(item) {
+   Cypress.env('IFRAME_LEVEL', '2');
+   cy.wrap(item)
+   .click();
+   });
+}
+
+function checkAndCloseSharing() {
+   mobileHelper.openHamburgerMenu();
+
+   cy.contains('.menu-entry-with-icon', 'File')
+   .click();
+
+   cy.contains('.menu-entry-with-icon', 'Share...')
+   .then(function(item) {
+   Cypress.env('IFRAME_LEVEL', '');
+   cy.wrap(item)
+   .click();
+   });
+
+   cy.get('#app-sidebar')
+   .should('be.visible');
+
+   // issue here
+   //cy.get('section#sharing')
+   //  .should('be.visible');
+
+   cy.get('.app-sidebar__close.icon-close')
+   .then(function(item) {
+   Cypress.env('IFRAME_LEVEL', '2');
+   cy.wrap(item)
+   .click();
+   });
+}
+
+function insertImageFromStorage(fileName) {
+   mobileHelper.openInsertionWizard();
+
+   cy.get('.insertgraphicremote')
+   .then(function(item) {
+   Cypress.env('IFRAME_LEVEL', '');
+   cy.wrap(item)
+   .click();
+   });
+
+   cy.get('.oc-dialog')
+   .should('be.visible');
+
+   cy.get('tr[data-entryname=\'' + fileName + '\']')
+   .click();
+
+   cy.get('.oc-dialog-buttonrow .primary')
+   .then(function(item) {
+   Cypress.env('IFRAME_LEVEL', '2');
+   cy.wrap(item)
+   .click();
+   });
+}
+
+function saveFileAs(fileName) {
+   mobileHelper.enableEditingMobile();
+
+   mobileHelper.openHamburgerMenu();
+
+   cy.contains('.menu-entry-with-icon', 'File')
+   .click();
+
+   cy.contains('.menu-entry-with-icon', 'Save As...')
+   .then(function(item) {
+   Cypress.env('IFRAME_LEVEL', '1');
+   cy.wrap(item)
+   .click();
+   });
+
+   cy.get('.oc-dialog')
+   .should('be.visible');
+
+   cy.get('.oc-dialog input')
+   .clear()
+   .type(fileName);
+
+   cy.get('.oc-dialog-buttonrow .primary')
+   .then(function(item) {
+   Cypress.env('IFRAME_LEVEL', '2');
+   cy.wrap(item)
+   .click();
+   });
+}
+
+module.exports.checkAndCloseRevisionHistory = checkAndCloseRevisionHistory;
+module.exports.checkAndCloseSharing = checkAndCloseSharing;
+module.exports.insertImageFromStorage = insertImageFromStorage;
+module.exports.saveFileAs = save

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

[Caolán McNamara (via logerrit)]

 sc/inc/cellvalue.hxx  |2 
 sc/inc/dociter.hxx|   10 ++--
 sc/inc/dpcache.hxx|8 +--
 sc/inc/dpobject.hxx   |   16 +++
 sc/qa/unit/ucalc_pivottable.cxx   |4 -
 sc/source/core/data/cellvalue.cxx |4 -
 sc/source/core/data/dociter.cxx   |   58 ++--
 sc/source/core/data/documen3.cxx  |2 
 sc/source/core/data/dpcache.cxx   |   77 ++
 sc/source/core/data/dpdimsave.cxx |4 -
 sc/source/core/data/dpobject.cxx  |   46 +++---
 sc/source/core/tool/interpr2.cxx  |2 
 12 files changed, 116 insertions(+), 117 deletions(-)

New commits:
commit 87f6ca70a7c1ce94d6a5a32789ab430f6e604db6
Author: Caolán McNamara 
AuthorDate: Wed Sep 23 11:19:17 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 24 11:01:42 2020 +0200

some places where ScDocument* is never passed a nullptr

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

diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx
index 68e38d845c84..5dfe66ba2763 100644
--- a/sc/inc/cellvalue.hxx
+++ b/sc/inc/cellvalue.hxx
@@ -170,7 +170,7 @@ struct SC_DLLPUBLIC ScRefCellValue
  *
  * This method is thread-safe.
  */
-OUString getRawString( const ScDocument* pDoc ) const;
+OUString getRawString( const ScDocument& rDoc ) const;
 
 bool isEmpty() const;
 
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 81cb345cfa82..23e35e06514a 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -131,7 +131,7 @@ private:
 {
 typedef std::pair 
PositionType;
 public:
-DataAccessInternal(ScDBQueryParamInternal* pParam, ScDocument* pDoc, 
const ScInterpreterContext& rContext);
+DataAccessInternal(ScDBQueryParamInternal* pParam, ScDocument& rDoc, 
const ScInterpreterContext& rContext);
 virtual ~DataAccessInternal() override;
 virtual bool getCurrent(Value& rValue) override;
 virtual bool getFirst(Value& rValue) override;
@@ -144,7 +144,7 @@ private:
 const sc::CellStoreType* mpCells;
 PositionType maCurPos;
 ScDBQueryParamInternal* mpParam;
-ScDocument* mpDoc;
+ScDocument& mrDoc;
 const ScInterpreterContext& mrContext;
 const ScAttrArray*  pAttrArray;
 sal_uInt32  nNumFormat; // for CalcAsShown
@@ -479,8 +479,8 @@ private:
 class ScHorizontalValueIterator
 {
 private:
-ScDocument   *pDoc;
-const ScAttrArray*pAttrArray;
+ScDocument&   rDoc;
+const ScAttrArray*pAttrArray;
 std::unique_ptr
   pCellIter;
 sal_uInt32nNumFormat; // for CalcAsShown
@@ -493,7 +493,7 @@ private:
 
 public:
 
-ScHorizontalValueIterator( ScDocument* pDocument,
+ScHorizontalValueIterator( ScDocument& rDocument,
const ScRange& rRange );
 ~ScHorizontalValueIterator();
 /// Does NOT reset rValue if no value found!
diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index 50088234f398..9265046d939d 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -108,7 +108,7 @@ public:
 
 private:
 
-ScDocument* mpDoc;
+ScDocument& mrDoc;
 SCCOL mnColumnCount;
 
 /**
@@ -169,7 +169,7 @@ public:
 
 const IndexArrayType* GetFieldIndexArray( size_t nDim ) const;
 const ScDPItemDataVec& GetDimMemberValues( SCCOL nDim ) const;
-void InitFromDoc(ScDocument* pDoc, const ScRange& rRange);
+void InitFromDoc(ScDocument& rDoc, const ScRange& rRange);
 bool InitFromDataBase(DBConnector& rDB);
 
 /**
@@ -189,7 +189,7 @@ public:
 bool IsRowEmpty(SCROW nRow) const;
 bool ValidQuery(SCROW nRow, const ScQueryParam& rQueryParam) const;
 
-ScDocument* GetDoc() const;
+ScDocument& GetDoc() const;
 long GetColumnCount() const;
 
 const ScDPItemData* GetItemDataById( long nDim, SCROW nId ) const;
@@ -199,7 +199,7 @@ public:
 
 ScDPCache(const ScDPCache&) = delete;
 const ScDPCache& operator=(const ScDPCache&) = delete;
-ScDPCache(ScDocument* pDoc);
+ScDPCache(ScDocument& rDoc);
 ~ScDPCache();
 
 #if DUMP_PIVOT_TABLE
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index a1a2c6e9e4b6..992e719e76ef 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -292,9 +292,9 @@ public:
 typedef std::vector RangeIndexType;
 CachesType m_Caches;
 RangeIndexType maRanges;
-ScDocument* mpDoc;
+ScDocument& mrDoc;
 public:
-SheetCaches(ScDocument* pDoc);
+SheetCaches(ScDocument& rDoc);
 bool hasCache(const ScRange& rRange) const;
 const ScDPCache* getCache(const ScRange& rRange, const 
ScD

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

[Caolán McNamara (via logerrit)]

 sc/inc/bigrange.hxx  |6 
 sc/inc/cellform.hxx  |2 
 sc/inc/cellsuno.hxx  |2 
 sc/inc/charthelper.hxx   |2 
 sc/inc/chgtrack.hxx  |   36 ++---
 sc/inc/document.hxx  |2 
 sc/inc/externalrefmgr.hxx|   10 -
 sc/inc/macromgr.hxx  |4 
 sc/qa/unit/subsequent_export-test.cxx|2 
 sc/qa/unit/ucalc.cxx |   14 +-
 sc/qa/unit/ucalc_condformat.cxx  |2 
 sc/qa/unit/ucalc_sharedformula.cxx   |4 
 sc/source/core/data/bigrange.cxx |8 -
 sc/source/core/data/column2.cxx  |8 -
 sc/source/core/data/column3.cxx  |6 
 sc/source/core/data/column4.cxx  |2 
 sc/source/core/data/documen2.cxx |2 
 sc/source/core/data/documen3.cxx |2 
 sc/source/core/data/documen6.cxx |2 
 sc/source/core/data/documen8.cxx |4 
 sc/source/core/data/document.cxx |   12 -
 sc/source/core/tool/cellform.cxx |8 -
 sc/source/core/tool/charthelper.cxx  |   10 -
 sc/source/core/tool/chgtrack.cxx |  162 
 sc/source/core/tool/interpr4.cxx |   16 +-
 sc/source/filter/excel/xicontent.cxx |2 
 sc/source/filter/html/htmlexp.cxx|2 
 sc/source/filter/oox/formulabuffer.cxx   |2 
 sc/source/filter/xml/xmlcelli.cxx|4 
 sc/source/filter/xml/xmlexprt.cxx|2 
 sc/source/ui/app/scmod.cxx   |2 
 sc/source/ui/app/transobj.cxx|2 
 sc/source/ui/docshell/arealink.cxx   |8 -
 sc/source/ui/docshell/dbdocfun.cxx   |   32 ++--
 sc/source/ui/docshell/dbdocimp.cxx   |4 
 sc/source/ui/docshell/docfunc.cxx|   58 
 sc/source/ui/docshell/docfuncutil.cxx|2 
 sc/source/ui/docshell/docsh.cxx  |8 -
 sc/source/ui/docshell/docsh3.cxx |   10 -
 sc/source/ui/docshell/docsh5.cxx |6 
 sc/source/ui/docshell/externalrefmgr.cxx |   82 ++--
 sc/source/ui/docshell/impex.cxx  |   12 -
 sc/source/ui/docshell/macromgr.cxx   |   10 -
 sc/source/ui/docshell/olinefun.cxx   |   20 +-
 sc/source/ui/docshell/tablink.cxx|2 
 sc/source/ui/inc/dbfunc.hxx  |2 
 sc/source/ui/inc/printfun.hxx|8 -
 sc/source/ui/miscdlgs/acredlin.cxx   |   24 +--
 sc/source/ui/miscdlgs/conflictsdlg.cxx   |6 
 sc/source/ui/miscdlgs/redcom.cxx |4 
 sc/source/ui/undo/undoblk3.cxx   |2 
 sc/source/ui/undo/undotab.cxx|2 
 sc/source/ui/unoobj/cellsuno.cxx |   28 ++--
 sc/source/ui/unoobj/tokenuno.cxx |2 
 sc/source/ui/view/dbfunc2.cxx|2 
 sc/source/ui/view/dbfunc3.cxx|8 -
 sc/source/ui/view/dbfunc4.cxx|8 -
 sc/source/ui/view/gridwin5.cxx   |2 
 sc/source/ui/view/output2.cxx|6 
 sc/source/ui/view/printfun.cxx   |  208 +++
 sc/source/ui/view/spelldialog.cxx|4 
 sc/source/ui/view/spelleng.cxx   |2 
 sc/source/ui/view/viewfun2.cxx   |8 -
 sc/source/ui/view/viewfun3.cxx   |   22 +--
 sc/source/ui/view/viewfun4.cxx   |   12 -
 sc/source/ui/view/viewfunc.cxx   |   14 +-
 sc/source/ui/view/viewutil.cxx   |2 
 67 files changed, 489 insertions(+), 485 deletions(-)

New commits:
commit 2346b09d19d98992e2dae826d7576cfe01538461
Author: Caolán McNamara 
AuthorDate: Wed Sep 23 12:09:41 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 24 11:02:05 2020 +0200

ScCellFormat::GetString never called with a null ScDocument*

and similar, allowing a few redundant null checks to be dropped

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

diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx
index 136c6e054c5a..056c0d4ae304 100644
--- a/sc/inc/bigrange.hxx
+++ b/sc/inc/bigrange.hxx
@@ -60,7 +60,7 @@ public:
 voidGetVars( sal_Int32& nColP, sal_Int32& nRowP, sal_Int32& nTabP ) 
const
 { nColP = nCol; nRowP = nRow; nTabP = nTab; }
 
-bool IsValid( const ScDocument* pDoc ) const;
+bool IsValid( const ScDocument& rDoc ) const;
 inline ScAddressMakeAddress() const;
 
 ScBigAddress&   operator=( const ScBigAddress& r )
@@ -132,8 +132,8 @@ public:
 { aStart.GetVars( nCol1, nRow1, nTab1 );
   aEnd.GetVars( nCol2, nRow2, nTab2 ); }
 
-boolIsValid( const ScDocument* pDoc ) const
-{ return aStart.IsValid( pDoc ) && aEnd.IsValid( pDoc ); }
+boolIsValid( const ScDocument& rDoc ) const
+{ return aStart.IsValid( rDoc ) && aEnd.IsValid( rDoc ); }
 ScRange  M

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

[Mike Kaganski (via logerrit)]

 solenv/bin/modules/installer.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d98ac4d2c584313c1e51630c6fbab8f8a092012c
Author: Mike Kaganski 
AuthorDate: Thu Sep 24 10:48:57 2020 +0300
Commit: Mike Kaganski 
CommitDate: Thu Sep 24 11:20:17 2020 +0200

Only read msi database for msi package format

Change-Id: I31f1b1aae3b89a58c33f58a76e32bf171f344012
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103293
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Mike Kaganski 
(cherry picked from commit 7e610406a2d063ba5efacb0e186524c2a4ed77a9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103203
Tested-by: Jenkins

diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 7f18a572cbcb..0beb2ab4bd26 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -500,7 +500,7 @@ sub run {
 my $allupdatelastsequences = "";
 my $allupdatediskids = "";
 
-if ( $installer::globals::iswindowsbuild || 
$installer::globals::packageformat eq 'msi' )
+if ( $installer::globals::packageformat eq 'msi' )
 {
 if ( $allvariableshashref->{'UPDATE_DATABASE'} )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 solenv/gdb/boost/util/printing.py   |2 +-
 solenv/gdb/libreoffice/util/printing.py |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4a899a5f8a72ea29a6919316afe3627de9f33e95
Author: Stephan Bergmann 
AuthorDate: Thu Sep 24 09:53:24 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 24 11:28:52 2020 +0200

Fix Python deprecation warnings

I noticed these "DeprecationWarning: Using or importing the ABCs from
'collections' instead of from 'collections.abc' is deprecated since Python 
3.3,
and in 3.9 it will stop working" now when running tests with
CPPUNITTRACE='gdb --args' on Fedora 32.

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

diff --git a/solenv/gdb/boost/util/printing.py 
b/solenv/gdb/boost/util/printing.py
index ca8b6c28eeca..85a91c9340a4 100644
--- a/solenv/gdb/boost/util/printing.py
+++ b/solenv/gdb/boost/util/printing.py
@@ -19,7 +19,7 @@
 # along with this program.  If not, see .
 
 
-from collections import Mapping
+from collections.abc import Mapping
 import gdb
 import re
 import six
diff --git a/solenv/gdb/libreoffice/util/printing.py 
b/solenv/gdb/libreoffice/util/printing.py
index b44c1ec8bd5c..30e311678025 100644
--- a/solenv/gdb/libreoffice/util/printing.py
+++ b/solenv/gdb/libreoffice/util/printing.py
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-from collections import Mapping
+from collections.abc import Mapping
 import gdb
 import re
 import six
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szabolcs Toth (via logerrit)]

 oox/inc/drawingml/textbodyproperties.hxx   |1 
 oox/source/drawingml/shape.cxx |   24 +--
 oox/source/drawingml/textbodypropertiescontext.cxx |5 +-
 oox/source/export/drawingml.cxx|   37 -
 sc/qa/unit/data/xlsx/tdf106197_import_upright.xlsx |binary
 sc/qa/unit/subsequent_filters-test.cxx |   45 +
 6 files changed, 89 insertions(+), 23 deletions(-)

New commits:
commit 8c23be49fb5a9044989532e6e20feb1e3ff64f2b
Author: Szabolcs Toth 
AuthorDate: Wed Sep 16 14:41:24 2020 +0200
Commit: László Németh 
CommitDate: Thu Sep 24 12:54:14 2020 +0200

tdf#106197 XLSX shape import: keep text upright

Handle and grab-bag attribute upright to keep
text upright regardless of shape rotation, fixing
the text direction after import and after a round-trip.

Co-authored-by: Balázs Regényi

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

diff --git a/oox/inc/drawingml/textbodyproperties.hxx 
b/oox/inc/drawingml/textbodyproperties.hxx
index 6e5e97fb94ba..26e34ac6a5f7 100644
--- a/oox/inc/drawingml/textbodyproperties.hxx
+++ b/oox/inc/drawingml/textbodyproperties.hxx
@@ -34,6 +34,7 @@ struct TextBodyProperties
 OptValue< sal_Int32 >   moRotation;
 boolmbAnchorCtr;
 OptValue< sal_Int32 >   moVert;
+boolmoUpright = false;
 std::optional< sal_Int32 >moInsets[4];
 std::optional< sal_Int32 >moTextOffUpper;
 std::optional< sal_Int32 >moTextOffLeft;
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 02b89312d200..326d90be3ffd 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1409,10 +1409,26 @@ Reference< XShape > const & Shape::createAndInsert(
 sal_Int32 nTextRotateAngle = static_cast< sal_Int32 >( 
getTextBody()->getTextProperties().moRotation.get( 0 ) );
 
 nTextRotateAngle -= mnDiagramRotation;
-/* OOX measures text rotation clockwise in 1/6th degrees,
-   relative to the containing shape. setTextRotateAngle wants
-   degrees anticlockwise. */
-mpCustomShapePropertiesPtr->setTextRotateAngle( -1 * 
nTextRotateAngle / 6 );
+
+bool isUpright = getTextBody()->getTextProperties().moUpright;
+if (isUpright)
+{
+// When upright is set, we want the text without any 
rotation.
+// But if we set 0 here, the text is still rotated if the
+// shape containing it is rotated.
+// Hence, we rotate the text into the the opposite 
direction of
+// the rotation of the shape, by as much as the shape was 
rotated.
+mpCustomShapePropertiesPtr->setTextRotateAngle(mnRotation 
/ 6);
+// Also put this away in a Gabbag.
+putPropertyToGrabBag("Upright", Any(isUpright));
+}
+else
+{
+/* OOX measures text rotation clockwise in 1/6th 
degrees,
+   relative to the containing shape. setTextRotateAngle 
wants
+   degrees anticlockwise. */
+mpCustomShapePropertiesPtr->setTextRotateAngle(-1 * 
nTextRotateAngle / 6);
+}
 }
 
 // Note that the script 
oox/source/drawingml/customshapes/generatePresetsData.pl looks
diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx 
b/oox/source/drawingml/textbodypropertiescontext.cxx
index b72fa194401a..d3add310097f 100644
--- a/oox/source/drawingml/textbodypropertiescontext.cxx
+++ b/oox/source/drawingml/textbodypropertiescontext.cxx
@@ -94,7 +94,10 @@ TextBodyPropertiesContext::TextBodyPropertiesContext( 
ContextHandler2Helper cons
 // ST_PositiveCoordinate
 //   sal_Int32 nSpcCol = rAttribs.getInteger( XML_spcCol, 0 );
 //   bool bSpcFirstLastPara = rAttribs.getBool( XML_spcFirstLastPara, 0 );
-//   bool bUpRight = rAttribs.getBool( XML_upright, 0 );
+
+bool bUpright = rAttribs.getBool(XML_upright, false);
+if (bUpright)
+mrTextBodyProp.moUpright = true;
 
 // ST_TextVerticalType
 if( rAttribs.hasAttribute( XML_vert ) ) {
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 8d3cbd23a6a7..8ea8035ea39a 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2932,24 +2932,6 @@ void DrawingML::WriteText(const Reference& 
rXIface, bool bBodyPr, bo
 else if( bVertical && eHorizontalA

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

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/platform/com_MSC_class.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 28d4d1e30b46f3de48fa9eca28770c3deef1623f
Author: Stephan Bergmann 
AuthorDate: Thu Sep 24 10:17:15 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 24 12:55:33 2020 +0200

Expand the Windows CPPUNITTRACE=TRUE abbreviation in place

...as a means towards defining gb_CppunitTest_GDBTRACE only in a single 
place
(in solenv/gbuild/CppunitTest.mk), which should make reasoning about the 
code
simpler

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

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index d69f7f46004d..09dd48dc8754 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -519,7 +519,7 @@ gb_PythonTest_PRECOMMAND := 
$(gb_CppunitTest_CPPTESTPRECOMMAND)
 gb_PythonTest_DEPS = $(call gb_Package_get_target,python3) $(call 
gb_Executable_get_target,python)
 
 ifeq ($(strip $(CPPUNITTRACE)),TRUE)
-gb_CppunitTest_GDBTRACE := '$(DEVENV)' /debugexe
+override CPPUNITTRACE := '$(DEVENV)' /debugexe
 endif
 
 # WinResTarget class
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 5 commits - config_host/config_qrcodegen.h.in config_host.mk.in configure.ac cui/source distro-configs/LibreOfficeOssFuzz.conf extern

[Caolán McNamara (via logerrit)]

 RepositoryExternal.mk |9 
 config_host.mk.in |1 
 config_host/config_qrcodegen.h.in |   17 
 configure.ac  |   52 +-
 cui/source/dialogs/QrCodeGenDialog.cxx|   24 +---
 distro-configs/LibreOfficeOssFuzz.conf|1 
 external/qrcodegen/Module_qrcodegen.mk|4 ++
 include/svtools/filechangedchecker.hxx|2 -
 lotuswordpro/source/filter/lwptablelayout.cxx |   14 +++
 lotuswordpro/source/filter/lwptablelayout.hxx |2 -
 svtools/source/misc/filechangedchecker.cxx|   21 ++
 sw/qa/python/xtextfieldssupplier.py   |5 ++
 vcl/source/font/fontcharmap.cxx   |   32 ++--
 13 files changed, 139 insertions(+), 45 deletions(-)

New commits:
commit 96a8c7b3ad21db406407a141eab1c52341273721
Author: Caolán McNamara 
AuthorDate: Mon Sep 21 17:02:31 2020 +0100
Commit: Andras Timar 
CommitDate: Thu Sep 24 13:12:57 2020 +0200

add an explicit --disable-qrcodegen configure option

Change-Id: If8e965fa955aecdb9e7011bdddc690de9cad0c4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103120
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103158
Reviewed-by: Xisco Fauli 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9c97d3af05f9..884bececcf08 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -4163,6 +4163,8 @@ gb_ExternalProject__use_qrcodegen :=
 
 else # !SYSTEM_QRCODEGEN
 
+ifneq ($(ENABLE_QRCODEGEN),)
+
 define gb_LinkTarget__use_qrcodegen
 $(call gb_LinkTarget_use_unpacked,$(1),qrcodegen)
 $(call gb_LinkTarget_set_include,$(1),\
@@ -4180,6 +4182,13 @@ $(call 
gb_ExternalProject_use_static_libraries,$(1),qrcodegen)
 
 endef
 
+else # !ENABLE_QRCODEGEN
+
+define gb_LinkTarget__use_qrcodegen
+endef
+
+endif # ENABLE_QRCODEGEN
+
 endif # SYSTEM_QRCODEGEN
 
 $(eval $(call gb_Helper_register_packages_for_install,ucrt_binarytable,\
diff --git a/config_host.mk.in b/config_host.mk.in
index de1e44dc657b..95971e70ba99 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -464,6 +464,7 @@ export PYTHON_LIBS=$(gb_SPACE)@PYTHON_LIBS@
 export PYTHON_VERSION=@PYTHON_VERSION@
 export PYTHON_VERSION_MAJOR=@PYTHON_VERSION_MAJOR@
 export PYTHON_VERSION_MINOR=@PYTHON_VERSION_MINOR@
+export ENABLE_QRCODEGEN=@ENABLE_QRCODEGEN@
 export QRCODEGEN_CFLAGS=$(gb_SPACE)@QRCODEGEN_CFLAGS@
 export QRCODEGEN_LIBS=$(gb_SPACE)@QRCODEGEN_LIBS@
 export QT5_CFLAGS=$(gb_SPACE)@QT5_CFLAGS@
diff --git a/config_host/config_qrcodegen.h.in 
b/config_host/config_qrcodegen.h.in
new file mode 100644
index ..63388651699f
--- /dev/null
+++ b/config_host/config_qrcodegen.h.in
@@ -0,0 +1,17 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_CONFIG_QRCODEGEN_H
+#define INCLUDED_CONFIG_QRCODEGEN_H
+
+#define ENABLE_QRCODEGEN 0
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configure.ac b/configure.ac
index bc027616295d..bcf41f4ce668 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1949,6 +1949,10 @@ AC_ARG_WITH(system-hunspell,
 [Use libhunspell already on system.]),,
 [with_system_hunspell="$with_system_libs"])
 
+libo_FUZZ_ARG_ENABLE(qrcodegen,
+AS_HELP_STRING([--disable-qrcodegen],
+[Disable use of qrcodegen external library.]))
+
 AC_ARG_WITH(system-qrcodegen,
 AS_HELP_STRING([--with-system-qrcodegen],
 [Use libqrcodegen already on system.]),,
@@ -10105,26 +10109,39 @@ AC_SUBST(HUNSPELL_LIBS)
 dnl ===
 dnl Check for system qrcodegen
 dnl ===
-AC_MSG_CHECKING([which libqrcodegen to use])
-if test "$with_system_qrcodegen" = "yes"; then
-AC_MSG_RESULT([external])
-SYSTEM_QRCODEGEN=TRUE
-AC_LANG_PUSH([C++])
-AC_CHECK_HEADER(qrcodegen/QrCode.hpp, [],
-[AC_MSG_ERROR(qrcodegen headers not found.)], [#include ])
-AC_CHECK_LIB([qrcodegencpp], [main], [:],
-[ AC_MSG_ERROR(qrcodegen C++ library not found.) ], [])
-QRCODEGEN_LIBS=-lqrcodegencpp
-AC_LANG_POP([C++])
-QRCODEGEN_CFLAGS=$(printf '%s' "$QRCODEGEN_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
-FilterLibs "${QRCODEGEN_LIBS}"
-QRCODEGEN_LIBS="${filteredlibs}"
-else
-AC_MSG_RESULT([internal])
+AC_MSG_CHECKING([whether to use libqrcodegen])
+if test "$enable_libqrcodegen" = "no"; then
+AC_MSG_RESULT([no])
+ENABLE_QRCODEGEN=
 SYSTEM_QRCODEGEN=
-BUILD_TYPE="$BUILD_TYPE QRCODEGEN"

[Libreoffice-commits] help.git: Changes to 'refs/tags/co-6.4-5'

[Andras Timar (via logerrit)]

Tag 'co-6.4-5' created by Andras Timar  at 
2020-09-24 11:14 +

co-6.4-5

Changes since cp-6.4-branch-point-11:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/co-6.4-5'

[Caolán McNamara (via logerrit)]

Tag 'co-6.4-5' created by Andras Timar  at 
2020-09-24 11:14 +

co-6.4-5

Changes since cp-6.4-5-6:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/co-6.4-5'

[zdposter (via logerrit)]

Tag 'co-6.4-5' created by Andras Timar  at 
2020-09-24 11:14 +

co-6.4-5

Changes since cp-6.4-branch-point-4:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/co-6.4-5'

[Andras Timar (via logerrit)]

Tag 'co-6.4-5' created by Andras Timar  at 
2020-09-24 11:14 +

co-6.4-5

Changes since co-6.4-2-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 lotuswordpro/source/filter/lwptablelayout.cxx |   14 +++---
 lotuswordpro/source/filter/lwptablelayout.hxx |2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 763bcdfee308ba07d4c8ba8f2a4cc87b2161f69f
Author: Caolán McNamara 
AuthorDate: Wed Sep 23 12:44:14 2020 +0100
Commit: Michael Stahl 
CommitDate: Thu Sep 24 13:31:18 2020 +0200

ofz#25881 use std::vector with bounds checking accessor

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

diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx 
b/lotuswordpro/source/filter/lwptablelayout.cxx
index bc1541d6bf9b..1e371b56426f 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -865,7 +865,7 @@ sal_uInt16 LwpTableLayout::ConvertHeadingRow(
 ConvertTable(pTmpTable.get(),nStartHeadRow,nEndHeadRow,0,nCol);
 
 sal_uInt16 nRowNum = pTmpTable->GetRowCount();
-std::unique_ptr CellMark( new sal_uInt8[nRowNum] );
+std::vector CellMark(nRowNum);
 
 if (nRowNum == 1)
 {
@@ -877,11 +877,11 @@ sal_uInt16 LwpTableLayout::ConvertHeadingRow(
 else
 {
 sal_uInt8 nFirstColSpann = 1;
-const bool bFindFlag = 
FindSplitColMark(pTmpTable.get(),CellMark.get(),nFirstColSpann);
+const bool bFindFlag = FindSplitColMark(pTmpTable.get(), CellMark, 
nFirstColSpann);
 
 if (bFindFlag)//split to 2 cells
 {
-
SplitRowToCells(pTmpTable.get(),pXFTable,nFirstColSpann,CellMark.get());
+SplitRowToCells(pTmpTable.get(), pXFTable, nFirstColSpann, 
CellMark.data());
 nContentRow = nEndHeadRow;
 }
 else//can not split,the first row will be the heading row,the rest 
will be content row
@@ -997,7 +997,7 @@ void LwpTableLayout::SplitRowToCells(XFTable* pTmpTable, 
rtl::Reference
  * @param  pXFTable - pointer of tmp XFtable
  * @param  CellMark - pointer of cell mark array
  */
-bool  LwpTableLayout::FindSplitColMark(XFTable* pXFTable, sal_uInt8* pCellMark,
+bool  LwpTableLayout::FindSplitColMark(XFTable* pXFTable, 
std::vector& rCellMark,
 sal_uInt8& nMaxColSpan)
 {
 sal_uInt16 nRowNum = pXFTable->GetRowCount();
@@ -1027,7 +1027,7 @@ bool  LwpTableLayout::FindSplitColMark(XFTable* pXFTable, 
sal_uInt8* pCellMark,
 }
 if (nColSpan > nMaxColSpan)
 nMaxColSpan = nColSpan;
-pCellMark[nRowLoop] = 0;//reset all cell mark to zero
+rCellMark.at(nRowLoop) = 0;//reset all cell mark to zero
 }
 
 //find if other row has the same column
@@ -1050,11 +1050,11 @@ bool  LwpTableLayout::FindSplitColMark(XFTable* 
pXFTable, sal_uInt8* pCellMark,
 if (nCellMark == 0)
 break;
 else
-pCellMark[nRowLoop] = nCellMark;
+rCellMark.at(nRowLoop) = nCellMark;
 }
 for(nRowLoop=1;nRowLoop<=nRowNum;nRowLoop++)//check if all ==0,break
 {
-if (pCellMark[nRowLoop] == 0)
+if (rCellMark.at(nRowLoop) == 0)
 break;
 }
 if (nRowLoop == nRowNum+1)
diff --git a/lotuswordpro/source/filter/lwptablelayout.hxx 
b/lotuswordpro/source/filter/lwptablelayout.hxx
index 7852ab9c0b0b..9eebb2b391c1 100644
--- a/lotuswordpro/source/filter/lwptablelayout.hxx
+++ b/lotuswordpro/source/filter/lwptablelayout.hxx
@@ -156,7 +156,7 @@ private:
 sal_uInt8 nEndCol, sal_uInt16 nRowID);
 void ConvertColumn(rtl::Reference const & pXFTable, sal_uInt8 
nStartCol, sal_uInt8 nEndCol);
 sal_uInt16 ConvertHeadingRow(rtl::Reference const & 
pXFTable,sal_uInt16 nStartHeadRow,sal_uInt16 nEndHeadRow);
-static bool FindSplitColMark(XFTable* pXFTable,sal_uInt8* 
pCellMark,sal_uInt8& nMaxColSpan);
+static bool FindSplitColMark(XFTable* pXFTable, std::vector& 
rCellMark, sal_uInt8& nMaxColSpan);
 void SplitRowToCells(XFTable* pTmpTable, rtl::Reference const & 
pXFTable,
 sal_uInt8 nFirstColSpann, const sal_uInt8* pCellMark);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/CppunitTest.mk|2 +-
 solenv/gbuild/platform/com_GCC_class.mk |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 78f8e6f4eb8191eebcc4d5c5e6335ef248b43869
Author: Stephan Bergmann 
AuthorDate: Thu Sep 24 10:27:39 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 24 13:46:54 2020 +0200

Move some settings from just DEBUGCPPUNIT to all gdb CPPUNITTRACE

For one, it is probably a good idea to always (a) return the tested process'
exit code, and (b) help users without a proper .gdbinit by setting
auto-load-safe-path.  And for another, this change works towards the goal of
implementing DEBUGCPPUNIT as a special case of CPPUNITTRACE, ultimately
simplifying the setting of gb_CppunitTest_GDBTRACE.

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

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 1c0e8d3dfe93..612a89286935 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -27,7 +27,7 @@ ifneq ($(strip $(CPPUNITTRACE)),)
 ifneq ($(filter gdb,$(CPPUNITTRACE)),)
 # sneak (a) setting the LD_LIBRARY_PATH, and (b) setting malloc debug flags, 
into the "gdb --args" command line
 gb_CppunitTest_GDBTRACE := $(subst gdb,\
-   gdb -ex "set environment $(subst =, 
,$(gb_CppunitTest_CPPTESTPRECOMMAND))" $(gb_CppunitTest_malloc_check),\
+   gdb -return-child-result -ex "add-auto-load-safe-path $(INSTDIR)" -ex 
"set environment $(subst =, ,$(gb_CppunitTest_CPPTESTPRECOMMAND))" 
$(gb_CppunitTest_malloc_check),\
$(CPPUNITTRACE))
 else ifneq ($(filter lldb,$(CPPUNITTRACE)),)
 gb_CppunitTest_PREGDBTRACE := lo_dyldpathfile=$(call var2file,$(shell 
$(gb_MKTEMP)),500,settings set target.env-vars 
$(gb_CppunitTest_CPPTESTPRECOMMAND))
diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index 93f750c4ce56..ea4f69efcd35 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -194,7 +194,7 @@ endef
 # CppunitTest class
 
 ifeq ($(strip $(DEBUGCPPUNIT)),TRUE)
-gb_CppunitTest_GDBTRACE := gdb -nx -ex "add-auto-load-safe-path $(INSTDIR)" 
-ex "set environment $(subst =, ,$(gb_CppunitTest_CPPTESTPRECOMMAND))" --batch 
--command=$(SRCDIR)/solenv/bin/gdbtrycatchtrace-stdout -return-child-result 
--args
+gb_CppunitTest_GDBTRACE := gdb -nx -ex "set environment $(subst =, 
,$(gb_CppunitTest_CPPTESTPRECOMMAND))" --batch 
--command=$(SRCDIR)/solenv/bin/gdbtrycatchtrace-stdout --args
 endif
 
 # ExternalProject class
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx |   87 ++
 1 file changed, 34 insertions(+), 53 deletions(-)

New commits:
commit 05dc3a8f5d88819356a754450c204ca9f11d282d
Author: Miklos Vajna 
AuthorDate: Wed Sep 23 21:06:55 2020 +0200
Commit: Miklos Vajna 
CommitDate: Thu Sep 24 13:49:03 2020 +0200

CppunitTest_xmlsecurity_pdfsigning: use PDFSignatureHelper for sig 
verification

Towards making vcl::filter::PDFDocument an implementation detail of
PDFSignatureHelper during signature verification: so pdfverify, cppunit
tests and the UI shares more code.

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

diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx 
b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
index 74b679bfa243..8b4a610fa56c 100644
--- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
+++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
@@ -25,7 +25,6 @@
 #include 
 
 #include 
-#include 
 #include 
 
 #ifdef _WIN32
@@ -53,8 +52,7 @@ protected:
  * Read a pdf and make sure that it has the expected number of valid
  * signatures.
  */
-std::vector verify(const OUString& rURL, size_t 
nCount,
- const OString& 
rExpectedSubFilter);
+std::vector verify(const OUString& rURL, size_t 
nCount);
 
 public:
 PDFSigningTest();
@@ -76,8 +74,7 @@ void PDFSigningTest::tearDown()
 test::BootstrapFixture::tearDown();
 }
 
-std::vector PDFSigningTest::verify(const OUString& rURL, 
size_t nCount,
- const OString& 
rExpectedSubFilter)
+std::vector PDFSigningTest::verify(const OUString& rURL, 
size_t nCount)
 {
 uno::Reference xSEInitializer
 = xml::crypto::SEInitializer::create(mxComponentContext);
@@ -86,26 +83,13 @@ std::vector 
PDFSigningTest::verify(const OUString& rURL, s
 std::vector aRet;
 
 SvFileStream aStream(rURL, StreamMode::READ);
-vcl::filter::PDFDocument aVerifyDocument;
-CPPUNIT_ASSERT(aVerifyDocument.Read(aStream));
-std::vector aSignatures = 
aVerifyDocument.GetSignatureWidgets();
-CPPUNIT_ASSERT_EQUAL(nCount, aSignatures.size());
-for (size_t i = 0; i < aSignatures.size(); ++i)
+PDFSignatureHelper aHelper;
+CPPUNIT_ASSERT(aHelper.ReadAndVerifySignatureSvStream(aStream));
+CPPUNIT_ASSERT_EQUAL(nCount, aHelper.GetSignatureInformations().size());
+for (size_t i = 0; i < aHelper.GetSignatureInformations().size(); ++i)
 {
-SignatureInformation aInfo(i);
-CPPUNIT_ASSERT(
-xmlsecurity::pdfio::ValidateSignature(aStream, aSignatures[i], 
aInfo, aVerifyDocument));
-aRet.push_back(aInfo);
-
-if (!rExpectedSubFilter.isEmpty())
-{
-vcl::filter::PDFObjectElement* pValue = 
aSignatures[i]->LookupObject("V");
-CPPUNIT_ASSERT(pValue);
-auto pSubFilter
-= 
dynamic_cast(pValue->Lookup("SubFilter"));
-CPPUNIT_ASSERT(pSubFilter);
-CPPUNIT_ASSERT_EQUAL(rExpectedSubFilter, pSubFilter->GetValue());
-}
+const SignatureInformation& rInfo = 
aHelper.GetSignatureInformations()[i];
+aRet.push_back(rInfo);
 }
 
 return aRet;
@@ -172,7 +156,7 @@ bool PDFSigningTest::sign(const OUString& rInURL, const 
OUString& rOutURL,
 
 // This was nOriginalSignatureCount when PDFDocument::Sign() silently 
returned success, without doing anything.
 if (bSignSuccessful)
-verify(rOutURL, nOriginalSignatureCount + 1, 
/*rExpectedSubFilter=*/OString());
+verify(rOutURL, nOriginalSignatureCount + 1);
 
 // May return false if NSS failed to parse its own profile or Windows has 
no valid certificates installed.
 return bSignSuccessful;
@@ -191,7 +175,8 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDFAdd)
 if (bHadCertificates)
 {
 // Assert that the SubFilter is not adbe.pkcs7.detached in the bAdES 
case.
-std::vector aInfos = verify(aOutURL, 1, 
"ETSI.CAdES.detached");
+std::vector aInfos = verify(aOutURL, 1);
+CPPUNIT_ASSERT(aInfos[0].bHasSigningCertificate);
 // Make sure the timestamp is correct.
 DateTime aDateTime(DateTime::SYSTEM);
 // This was 0 (on Windows), as neither the /M key nor the PKCS#7 blob 
contained a timestamp.
@@ -230,32 +215,33 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testPDFRemove)
 uno::Reference xSecurityContext
 = xSEInitializer->createSecurityContext(OUString());
 vcl::filter::PDFDocument aDocument;
+OUString aSourceDir = m_directories.getURLFromSrc(DATA_DIRECTORY);
+OUString aInURL = aSourceDir + "good.pdf";
 {
-OUString aSourceDir = m_directories.getURLFromSrc(DATA_DIRECTORY);
-OUString aInURL = aSourceDir + "good.pdf";
 SvFileStream aStream(aInURL, Str

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

[Attila Bakos (via logerrit)]

 sw/qa/extras/layout/data/tdf136588.docx |binary
 sw/qa/extras/layout/layout.cxx  |   11 +++
 sw/source/core/text/portxt.cxx  |3 +--
 sw/source/core/txtnode/fntcache.cxx |7 +++
 4 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit 0d28097fadf44ed58cb5e3e9b9c04a65a7a33fd6
Author: Attila Bakos 
AuthorDate: Tue Sep 22 16:37:22 2020 +0200
Commit: László Németh 
CommitDate: Thu Sep 24 13:54:23 2020 +0200

tdf#136588 sw: fix line break regression with small caps

Regression from commit 1b03a449161af225302e4b4dd2bb2e69c6d8d170
(tdf#112290 sw: fix missing line break in small capital).

This replaces the previous commit with a better solution.

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

diff --git a/sw/qa/extras/layout/data/tdf136588.docx 
b/sw/qa/extras/layout/data/tdf136588.docx
new file mode 100644
index ..606931286470
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf136588.docx differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 5c7bfdab7ab3..4a348bdd7f09 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -192,6 +192,17 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFootnotes)
 CheckRedlineFootnotesHidden();
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf136588)
+{
+load(DATA_DIRECTORY, "tdf136588.docx");
+auto pXMLLayoutDump = parseLayoutDump();
+CPPUNIT_ASSERT(pXMLLayoutDump);
+
+//there was a bad line break before, the correct break layout is this:
+assertXPath(pXMLLayoutDump, "/root/page/body/txt[2]/LineBreak[2]", "Line",
+"effectively by modern-day small to ");
+}
+
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInBody)
 {
 loadURL("private:factory/swriter", nullptr);
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 398b26e6706b..ace126870b54 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -344,8 +344,7 @@ bool SwTextPortion::Format_( SwTextFormatInfo &rInf )
 Insert( aGuess.ReleaseHangingPortion() );
 }
 // breakPos >= index
-else if (aGuess.BreakPos() >= rInf.GetIdx() && aGuess.BreakPos() != 
TextFrameIndex(COMPLETE_STRING)
-&& rInf.GetFont()->GetCaseMap() != SvxCaseMap::SmallCaps )
+else if (aGuess.BreakPos() >= rInf.GetIdx() && aGuess.BreakPos() != 
TextFrameIndex(COMPLETE_STRING))
 {
 // case B1
 if( aGuess.HyphWord().is() && aGuess.BreakPos() > rInf.GetLineStart()
diff --git a/sw/source/core/txtnode/fntcache.cxx 
b/sw/source/core/txtnode/fntcache.cxx
index 5d7188a0f4a1..b55821032936 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -2536,6 +2536,13 @@ TextFrameIndex SwFont::GetTextBreak(SwDrawTextInfo const 
& rInf, long nTextWidth
 ? TextFrameIndex(COMPLETE_STRING)
 : nTextBreak;
 
+// tdf112290 tdf136588 Break the line correctly only if there is an image 
inline,
+// and the image wider than the line...
+if (GetCaseMap() == SvxCaseMap::SmallCaps && 
TextFrameIndex(COMPLETE_STRING) == nTextBreak2 &&
+! bCompress && nTextWidth == 0)
+// If nTextWidth == 0 means the line is full, we have to break it
+nTextBreak2 = TextFrameIndex(1);
+
 if ( ! bCompress )
 return nTextBreak2;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke (via logerrit)]

 i18nlangtag/source/isolang/isolang.cxx |1 +
 include/i18nlangtag/lang.h |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 23ff2c96709e48e06aa0a9dee237b73935cd60e5
Author: Eike Rathke 
AuthorDate: Thu Sep 24 11:42:15 2020 +0200
Commit: Eike Rathke 
CommitDate: Thu Sep 24 14:20:36 2020 +0200

Add English Kenya LCID 0xAC09 {en-KE} langtag mapping, tdf#115436

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

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 9d521a499ef4..ecab61113ab1 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -689,6 +689,7 @@ IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_MINANGKABAU,   "min", "ID", k0},
 { LANGUAGE_USER_SUNDANESE, "sun", "ID", k0},
 { LANGUAGE_USER_YAKA_DRCONGO,  "yaf", "CD", k0},
+{ LANGUAGE_USER_ENGLISH_KENYA,  "en", "KE", k0},
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0},// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0},// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0},// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 96df56181159..d3b0ece0bce6 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -761,6 +761,7 @@ namespace o3tl
 #define LANGUAGE_USER_MINANGKABAU   LanguageType(0x06A7)
 #define LANGUAGE_USER_SUNDANESE LanguageType(0x06A8)
 #define LANGUAGE_USER_YAKA_DRCONGO  LanguageType(0x06A9)
+#define LANGUAGE_USER_ENGLISH_KENYA LanguageType(0xAC09)  /* 
makeLangID( 0x2B, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18npool/Library_localedata_others.mk i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/Library_localedata_others.mk |1 
 i18npool/source/localedata/data/en_KE.xml |   42 ++
 i18npool/source/localedata/localedata.cxx |3 +-
 3 files changed, 45 insertions(+), 1 deletion(-)

New commits:
commit ae8995694da9ca29a62d13e6a320e5d39f4727e8
Author: Eike Rathke 
AuthorDate: Thu Sep 24 11:54:27 2020 +0200
Commit: Eike Rathke 
CommitDate: Thu Sep 24 14:21:02 2020 +0200

Resolves: tdf#115436 Add English Kenya {en-KE} locale data

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

diff --git a/i18npool/Library_localedata_others.mk 
b/i18npool/Library_localedata_others.mk
index a6246b8b24c2..cece0e15fc30 100644
--- a/i18npool/Library_localedata_others.mk
+++ b/i18npool/Library_localedata_others.mk
@@ -52,6 +52,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,localedata_others,\
CustomTarget/i18npool/localedata/localedata_ee_GH \
CustomTarget/i18npool/localedata/localedata_en_HK \
CustomTarget/i18npool/localedata/localedata_en_IN \
+   CustomTarget/i18npool/localedata/localedata_en_KE \
CustomTarget/i18npool/localedata/localedata_en_MY \
CustomTarget/i18npool/localedata/localedata_eo \
CustomTarget/i18npool/localedata/localedata_fa_IR \
diff --git a/i18npool/source/localedata/data/en_KE.xml 
b/i18npool/source/localedata/data/en_KE.xml
new file mode 100644
index ..cb4811d73229
--- /dev/null
+++ b/i18npool/source/localedata/data/en_KE.xml
@@ -0,0 +1,42 @@
+
+
+
+
+  
+
+  en
+  English
+
+
+  KE
+  Kenya
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+  KES
+  KSh
+  KES
+  Kenyan shilling
+  2
+
+  
+  
+  
+  
+  
+
+
diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index aef93c66fe33..193d8eeb4f7c 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -331,7 +331,8 @@ const struct {
 { "ilo_PH", lcl_DATA_OTHERS },
 { "ha_Latn_NG",  lcl_DATA_OTHERS },
 { "min_ID", lcl_DATA_OTHERS },
-{ "sun_ID", lcl_DATA_OTHERS }
+{ "sun_ID", lcl_DATA_OTHERS },
+{ "en_KE",  lcl_DATA_OTHERS }
 };
 
 #else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke (via logerrit)]

 svtools/inc/langtab.hrc |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 8c96df159a5b049f703f4945d3a4b3977b2d5da6
Author: Eike Rathke 
AuthorDate: Thu Sep 24 12:32:15 2020 +0200
Commit: Eike Rathke 
CommitDate: Thu Sep 24 14:21:52 2020 +0200

Related: tdf#115436 Add English (Kenya) {en-KE} to language list

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

diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 7af85b0c6cd5..47bce2b1aa76 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -426,7 +426,8 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Ligurian") , LANGUAGE_USER_LIGURIAN },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Minangkabau") , 
LANGUAGE_USER_MINANGKABAU },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Sundanese") , LANGUAGE_USER_SUNDANESE 
},
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Hong Kong)") , 
LANGUAGE_ENGLISH_HONG_KONG_SAR }
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Hong Kong)") , 
LANGUAGE_ENGLISH_HONG_KONG_SAR },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "English (Kenya)") , 
LANGUAGE_USER_ENGLISH_KENYA }
 };
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/source/control/menubtn.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4e4362daade150f3f34520bd5e6e4673ea88efce
Author: Caolán McNamara 
AuthorDate: Thu Sep 24 11:52:51 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 24 14:46:13 2020 +0200

tdf#136678 crash in collectUIInformation

since...

commit cdb9c24b45ce7c35cf507430bd5ee1d9c3d5ea72
Date:   Fri Aug 28 05:35:22 2020 +0200

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

diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index f6d32d28db73..d1488f308c6f 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -95,13 +95,14 @@ void MenuButton::ExecuteMenu()
 mbStartingMenu = false;
 
 SetPressed(false);
+OUString aID = get_id(); // tdf#136678 take a copy if we are destroyed by 
Select callback
 if (mnCurItemId)
 {
 Select();
 mnCurItemId = 0;
 msCurItemIdent.clear();
 }
-collectUIInformation(get_id(),"OPENLIST","","");
+collectUIInformation(aID,"OPENLIST","","");
 }
 
 void MenuButton::CancelMenu()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Serge Krot (via logerrit)]

 desktop/source/app/app.cxx |   48 +
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |7 +
 stoc/source/javaloader/javaloader.cxx  |8 +-
 3 files changed, 62 insertions(+), 1 deletion(-)

New commits:
commit b2c1ba213143444163a0d4208f163fc1726421a7
Author: Serge Krot 
AuthorDate: Wed Mar 25 16:56:18 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Sep 24 15:01:32 2020 +0200

speed-up: preload JVM when PreloadJVM is set

Change-Id: I57f77f127f7cb45fb181b755b40873d47015e5b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91059
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 6e067efad529..dd38a74aa89e 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -74,6 +74,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -120,6 +121,7 @@
 #include 
 #include 
 #include "langselect.hxx"
+#include 
 
 #if defined MACOSX
 #include 
@@ -1173,6 +1175,36 @@ void Desktop::AppEvent( const ApplicationEvent& 
rAppEvent )
 
 namespace {
 
+class JVMloadThread : public salhelper::Thread {
+public:
+JVMloadThread() : salhelper::Thread("Preload JVM thread")
+{
+}
+
+private:
+virtual void execute() override final
+{
+Reference< XMultiServiceFactory > xSMgr = 
comphelper::getProcessServiceFactory();
+
+Reference< css::loader::XImplementationLoader > xJavaComponentLoader(
+
xSMgr->createInstance("com.sun.star.comp.stoc.JavaComponentLoader"),
+css::uno::UNO_QUERY_THROW);
+
+if (xJavaComponentLoader.is())
+{
+const css::uno::Reference< 
::com::sun::star::registry::XRegistryKey > xRegistryKey;
+try
+{
+xJavaComponentLoader->activate("", "", "", xRegistryKey);
+}
+catch (...)
+{
+SAL_WARN("desktop.app", "Cannot activate factory during JVM 
preloading");
+}
+}
+}
+};
+
 struct ExecuteGlobals
 {
 Reference < css::document::XDocumentEventListener > xGlobalBroadcaster;
@@ -1180,6 +1212,7 @@ struct ExecuteGlobals
 bool bUseSystemFileDialog;
 std::unique_ptr pLanguageOptions;
 std::unique_ptr pPathOptions;
+rtl::Reference< JVMloadThread > xJVMloadThread;
 
 ExecuteGlobals()
 : bRestartRequested( false )
@@ -1212,6 +1245,15 @@ int Desktop::Main()
 // Detect desktop environment - need to do this as early as possible
 css::uno::setCurrentContext( new DesktopContext( 
css::uno::getCurrentContext() ) );
 
+if (officecfg::Office::Common::Misc::PreloadJVM::get() && pExecGlobals)
+{
+SAL_INFO("desktop.app", "Preload JVM");
+
+// pre-load JVM
+pExecGlobals->xJVMloadThread = new JVMloadThread();
+pExecGlobals->xJVMloadThread->launch();
+}
+
 CommandLineArgs& rCmdLineArgs = GetCommandLineArgs();
 
 Translate::SetReadStringHook(ReplaceStringHookProc);
@@ -1566,6 +1608,12 @@ int Desktop::doShutdown()
 if (m_aUpdateThread.joinable())
 m_aUpdateThread.join();
 
+if (pExecGlobals->xJVMloadThread.is())
+{
+pExecGlobals->xJVMloadThread->join();
+pExecGlobals->xJVMloadThread.clear();
+}
+
 pExecGlobals->bRestartRequested = pExecGlobals->bRestartRequested ||
 OfficeRestartManager::get(comphelper::getProcessComponentContext())->
 isRestartRequested(true);
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 048f64ab3f18..f764d3d7aa45 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5824,6 +5824,13 @@
 
 true
   
+  
+
+  Specifies if the JVM should be preloaded during LO start 
up.
+  PreloadJVM
+
+false
+  
   
 
   List of URLs of the places the user bookmarked in the file 
picker dialog.
diff --git a/stoc/source/javaloader/javaloader.cxx 
b/stoc/source/javaloader/javaloader.cxx
index 2b40cdd219db..73b0ddf557ff 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -304,11 +304,17 @@ sal_Bool SAL_CALL JavaComponentLoader::writeRegistryInfo(
 return loader->writeRegistryInfo(xKey, blabla, rLibName);
 }
 
-
 css::uno::Reference SAL_CALL JavaComponentLoader::activate(
 const OUString & rImplName, const OUString & blabla, const OUString & 
rLibName,
 const css::uno::Reference & xKey)
 {
+if (rImplName.isEmpty() && blabla.isEmpty() && rLibName.isEmpty())
+{
+// preload JVM was requested
+(void)getJavaLoader();
+return css::uno::Reference();
+}
+
 const css::uno::Reference & loader = 
getJavaLoader();
 if (!

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - wsd/DocumentBroker.cpp

[Tor Lillqvist (via logerrit)]

 wsd/DocumentBroker.cpp |4 
 1 file changed, 4 insertions(+)

New commits:
commit ee5db61c7cc0cdccbc860c51353b9fb9d7dbc8a8
Author: Tor Lillqvist 
AuthorDate: Thu Sep 24 15:05:44 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Sep 24 15:01:41 2020 +0200

tdf#136977: Reset the MobileTerminationFlag to false before loop

Otherwise, if it hasn't been noticed and reset to false by
DocumentBroker::DocumentBrokerPoll::continuePolling(), it will stay
true and break things the next time a DocumentBroker thread runs.

Actually I am not sure at all whether MobileTerminationFlag fills any
useful function any more, but let's do a minimal change here. In the
master branch MobileTerminationFlag is gone.

Change-Id: I817f197ae32eabd5f8b5854680cecafe7348c429
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103314
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index d92e1bc75..3a3a7b3f9 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -226,6 +226,10 @@ void DocumentBroker::setupPriorities()
 
 void DocumentBroker::startThread()
 {
+#if MOBILEAPP
+MobileTerminationFlag = false;
+#endif
+
 _poll->startThread();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/CppunitTest.mk|4 ++--
 solenv/gbuild/platform/com_GCC_class.mk |8 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 9ad61fe99f02e0da7333e7b81834a96983ad48c2
Author: Stephan Bergmann 
AuthorDate: Thu Sep 24 10:53:30 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 24 15:16:43 2020 +0200

Implement DEBUGCPPUNIT as a special case of CPPUNITTRACE

...so that gb_CppunitTest_GDBTRACE is only defined in a single place now (in
solenv/gbuild/CppunitTest.mk), which should make reasoning about the code
simpler

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

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 612a89286935..356b4317ab4f 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -22,12 +22,11 @@
 gb_CppunitTest_UNITTESTFAILED ?= 
$(GBUILDDIR)/platform/unittest-failed-default.sh
 gb_CppunitTest_PYTHONDEPS ?= $(call gb_Library_get_target,pyuno_wrapper) $(if 
$(SYSTEM_PYTHON),,$(call gb_Package_get_target,python3))
 
-ifeq ($(strip $(gb_CppunitTest_GDBTRACE)),)
 ifneq ($(strip $(CPPUNITTRACE)),)
 ifneq ($(filter gdb,$(CPPUNITTRACE)),)
 # sneak (a) setting the LD_LIBRARY_PATH, and (b) setting malloc debug flags, 
into the "gdb --args" command line
 gb_CppunitTest_GDBTRACE := $(subst gdb,\
-   gdb -return-child-result -ex "add-auto-load-safe-path $(INSTDIR)" -ex 
"set environment $(subst =, ,$(gb_CppunitTest_CPPTESTPRECOMMAND))" 
$(gb_CppunitTest_malloc_check),\
+   gdb -return-child-result -ex "add-auto-load-safe-path $(INSTDIR)" -ex 
"set environment $(subst =, ,$(gb_CppunitTest_CPPTESTPRECOMMAND))" 
$(gb_CppunitTest_malloc_check) $(gb_CppunitTest_DEBUGCPPUNIT),\
$(CPPUNITTRACE))
 else ifneq ($(filter lldb,$(CPPUNITTRACE)),)
 gb_CppunitTest_PREGDBTRACE := lo_dyldpathfile=$(call var2file,$(shell 
$(gb_MKTEMP)),500,settings set target.env-vars 
$(gb_CppunitTest_CPPTESTPRECOMMAND))
@@ -38,6 +37,7 @@ gb_CppunitTest_POSTGDBTRACE := rm $$lo_dyldpathfile
 else
 gb_CppunitTest_GDBTRACE := $(CPPUNITTRACE)
 endif
+ifneq ($(strip $(DEBUGCPPUNIT)),TRUE)
 gb_CppunitTest__interactive := $(true)
 endif
 endif
diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index ea4f69efcd35..4d3003923433 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -194,7 +194,13 @@ endef
 # CppunitTest class
 
 ifeq ($(strip $(DEBUGCPPUNIT)),TRUE)
-gb_CppunitTest_GDBTRACE := gdb -nx -ex "set environment $(subst =, 
,$(gb_CppunitTest_CPPTESTPRECOMMAND))" --batch 
--command=$(SRCDIR)/solenv/bin/gdbtrycatchtrace-stdout --args
+ifeq ($(strip $(CPPUNITTRACE)),)
+CPPUNITTRACE := gdb --args
+endif
+ifeq ($(filter gdb,$(CPPUNITTRACE)),)
+$(error For DEBUGCPPUNIT=TRUE, CPPUNITTRACE must be a command that runs gdb)
+endif
+gb_CppunitTest_DEBUGCPPUNIT := -nx --batch 
--command=$(SRCDIR)/solenv/bin/gdbtrycatchtrace-stdout
 endif
 
 # ExternalProject class
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Minutes from the UX/design meeting 2020-Sep-24

[Heiko Tietze]

Present: Sascha, Rohan, Rivan, Heiko
Comments: Regina, Telesto, Maxim, Thomas, Maxim

Tickets/Topic

 * ENHANCEMENT UI: Synchronize checkbox for page margins
   + https://bugs.documentfoundation.org/show_bug.cgi?id=136055
   + not needed (Regina),
   + another use case is to decrease the margin to zero to get the max out of
 the page (Telesto)
   + also good for consistency (Sascha)
   => let's do it

 * Comment reply function has disappeared
   + https://bugs.documentfoundation.org/show_bug.cgi?id=136896
   + has been restricted intentionally (Maxim)
   + keep it blocked but disable command rather than hiding and
 provide a (contextual) tooltip; => force users to enter personal
 info (Heiko)
   + block replying to own comments unless no user (aka unknown author) (Thomas)
   + MSO allows replying to own comments (Maxim)
   + not unusual to have identical names like Muhammed, another user with the
 same name couldn't reply
   + keep as it is, there is no good reason to reply to own comments (Sascha)
   + sometimes people work on the same computer and address people in the
 comment like "He Muhammed, please check this"; so do not block (Rohan)
   => comment on the ticket and keep it open

 * EDITING: Insert checkbox easily as in Google Sheets
   + https://bugs.documentfoundation.org/show_bug.cgi?id=133417
   + alternative is to use a formula and insert a symbol depending on 1/0
   + like checkboxes; form controls are overly complex (Sascha)
   + cell value would be true/false with the visualization of a checkbox
 including the interaction on click to toggle the state (Sascha)
   + can't be kind of a number format but needs a special implementation
 to visualize boolean per checkbox; this wouldn't be cross-
 platform/application formatting is lost on round-trip
   + interesting to check how GDocs saves this checkbox
   => needsDevEval

 * Writer's defaults are not the same as with the Default template
   + https://bugs.documentfoundation.org/show_bug.cgi?id=133723
   + rename the default template (Thomas)
   + maybe "Plain" or "Blank" instead of "Default" (Heiko, Rivan)
 + is not so beneficial and not a solution to the actual problem (Sascha)
   + cannot override or delete Default template, no point in having it at
 all (Sascha)
 + would be nice to be able to override/delete all templates, meaning to
   store in user space (Rivan)
 + IIRC technical reasons prevent this (Heiko)
   + would be good to not initialize variables but always load a template (and
 define defaults there) (Sascha)
   + templates are a blueprint for documents not to store all variables for all
 styles (Heiko)
   => WF

 * MENUS: Global shortcuts not appearing in menu entries
   + https://bugs.documentfoundation.org/show_bug.cgi?id=85978
   + vote for CloseWindow but this solves only the example, see

https://opengrok.libreoffice.org/xref/core/sw/source/uibase/docvw/edtwin.cxx?r=1675f5c0#1351
   + File > Close is .uno:CloseDoc and assigning a shortcut would show Ctrl+W
 in this menu
   => let's do it for this command



signature.asc
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Andrea Gelmini (via logerrit)]

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

New commits:
commit 07451fb643b3c461054426d0f273c0f53d867739
Author: Andrea Gelmini 
AuthorDate: Thu Sep 24 13:02:58 2020 +0200
Commit: Andras Timar 
CommitDate: Thu Sep 24 15:31:41 2020 +0200

Fix typo in code

It passed "make check" on Linux

Change-Id: I860ce01077f1b71fa87eb6616cca676ef21af1a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103307
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/wizards/source/tools/Misc.xba b/wizards/source/tools/Misc.xba
index 9b9e1dba6cda..9813acdbf931 100644
--- a/wizards/source/tools/Misc.xba
+++ b/wizards/source/tools/Misc.xba
@@ -294,7 +294,7 @@ Function InitResources(Description) as boolean
 Dim xResource as Object
 Dim sOfficeDir as String
 Dim aArgs(5) as Any
-   On Error Goto ErrorOcurred
+   On Error Goto ErrorOccurred
sOfficeDir = "$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/wizards/"
sOfficeDir = 
GetDefaultContext.getByName("/singletons/com.sun.star.util.theMacroExpander").ExpandMacros(sOfficeDir)
aArgs(0) = sOfficeDir
@@ -311,7 +311,7 @@ Dim aArgs(5) as Any
InitResources = TRUE
End If
Exit Function
-ErrorOcurred:
+ErrorOccurred:
Dim nSolarVer
InitResources = FALSE
nSolarVer = GetSolarVersion()
@@ -323,7 +323,7 @@ End Function
 
 Function GetResText( sID as String ) As string
 Dim sString as String
-   On Error Goto ErrorOcurred
+   On Error Goto ErrorOccurred
If Not IsNull(oResSrv) Then
sString = oResSrv.resolveString(sID)
GetResText = ReplaceString(sString, GetProductname(), 
"%PRODUCTNAME")
@@ -331,7 +331,7 @@ Dim sString as String
GetResText = ""
End If
Exit Function
-ErrorOcurred:
+ErrorOccurred:
GetResText = ""
MsgBox("Resource with ID =" + sID + " not found!", 
16, GetProductName())
Resume CLERROR
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 chart2/source/view/axes/VCartesianAxis.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 85af9e1d7a5820b989b004594e5462093b300021
Author: Andrea Gelmini 
AuthorDate: Thu Sep 24 13:05:20 2020 +0200
Commit: Andras Timar 
CommitDate: Thu Sep 24 15:32:34 2020 +0200

Fix typo in code

It passed "make check" on Linux

Change-Id: Icf1d8dae0f357aabeeda70f8c059e4cbf785df89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103309
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/chart2/source/view/axes/VCartesianAxis.cxx 
b/chart2/source/view/axes/VCartesianAxis.cxx
index 1c62bfb93903..44e64973e0b8 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -1631,7 +1631,7 @@ void VCartesianAxis::doStaggeringOfLabels( const 
AxisLabelProperties& rAxisLabel
 if( isComplexCategoryAxis() )
 {
 sal_Int32 nTextLevelCount = getTextLevelCount();
-B2DVector aCummulatedLabelsDistance(0,0);
+B2DVector aCumulatedLabelsDistance(0,0);
 for( sal_Int32 nTextLevel=0; nTextLevel 
apTickIter(createLabelTickIterator(nTextLevel));
@@ -1640,14 +1640,14 @@ void VCartesianAxis::doStaggeringOfLabels( const 
AxisLabelProperties& rAxisLabel
 double fRotationAngleDegree = 
m_aAxisLabelProperties.fRotationAngleDegree;
 if( nTextLevel>0 )
 {
-lcl_shiftLabels(*apTickIter, aCummulatedLabelsDistance);
+lcl_shiftLabels(*apTickIter, aCumulatedLabelsDistance);
 //multilevel labels: 0 or 90 by default
 if( m_aAxisProperties.m_bSwapXAndY )
 fRotationAngleDegree = 90.0;
 else
 fRotationAngleDegree = 0.0;
 }
-aCummulatedLabelsDistance += lcl_getLabelsDistance(
+aCumulatedLabelsDistance += lcl_getLabelsDistance(
 *apTickIter, 
pTickFactory2D->getDistanceAxisTickToText(m_aAxisProperties),
 fRotationAngleDegree);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Minutes from the UX/design meeting 2020-Sep-24

[Jan-Marek Glogowski]

Am 24.09.20 um 15:26 schrieb Heiko Tietze:
> Present: Sascha, Rohan, Rivan, Heiko
> Comments: Regina, Telesto, Maxim, Thomas, Maxim
> 
> Tickets/Topic 

  * StartCenter is inconsistent with dark theme(s)
+ https://bugs.documentfoundation.org/show_bug.cgi?id=136555

IMHO it's stuck ATM, so I thoght you would bring it up in the meeting.

Also with regard to the patch fixing:
  https://bugs.documentfoundation.org/show_bug.cgi?id=134708

which should probably use the default anyway:

else if (IsControlForeground())
aColor = GetControlForeground();

There are two different patches currently proposed:
 - https://gerrit.libreoffice.org/c/core/+/103041
 - https://gerrit.libreoffice.org/c/core/+/103079

Not sure if there is solution, working in all cases on all platforms.

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

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

[Caolán McNamara (via logerrit)]

 sc/inc/chartarr.hxx   |4 +-
 sc/inc/chartpos.hxx   |6 +--
 sc/inc/conditio.hxx   |4 +-
 sc/inc/dbdocutl.hxx   |2 -
 sc/inc/docpool.hxx|2 -
 sc/inc/filter.hxx |2 -
 sc/inc/fmtuno.hxx |2 -
 sc/inc/formulacell.hxx|4 +-
 sc/inc/patattr.hxx|2 -
 sc/inc/reftokenhelper.hxx |4 +-
 sc/qa/unit/screenshots/screenshots.cxx|2 -
 sc/qa/unit/subsequent_export-test.cxx |2 -
 sc/source/core/data/cellvalue.cxx |6 +--
 sc/source/core/data/column.cxx|6 +--
 sc/source/core/data/conditio.cxx  |   10 +++---
 sc/source/core/data/dbdocutl.cxx  |   28 -
 sc/source/core/data/docpool.cxx   |4 +-
 sc/source/core/data/documen2.cxx  |2 -
 sc/source/core/data/document.cxx  |8 ++---
 sc/source/core/data/formulacell.cxx   |   32 ++--
 sc/source/core/data/patattr.cxx   |6 +--
 sc/source/core/data/poolhelp.cxx  |   13 +++-
 sc/source/core/data/table2.cxx|8 ++---
 sc/source/core/data/table4.cxx|2 -
 sc/source/core/inc/poolhelp.hxx   |4 +-
 sc/source/core/tool/chartarr.cxx  |   32 ++--
 sc/source/core/tool/chartpos.cxx  |   26 
 sc/source/core/tool/chgtrack.cxx  |2 -
 sc/source/core/tool/detfunc.cxx   |4 +-
 sc/source/core/tool/reftokenhelper.cxx|8 ++---
 sc/source/filter/html/htmlimp.cxx |   10 ++
 sc/source/filter/inc/ftools.hxx   |2 -
 sc/source/filter/inc/htmlimp.hxx  |2 -
 sc/source/filter/xml/xmlcelli.cxx |2 -
 sc/source/ui/app/inputhdl.cxx |8 ++---
 sc/source/ui/app/transobj.cxx |   41 +++---
 sc/source/ui/dataprovider/sqldataprovider.cxx |2 -
 sc/source/ui/dbgui/PivotLayoutDialog.cxx  |   10 +++---
 sc/source/ui/docshell/arealink.cxx|2 -
 sc/source/ui/docshell/dbdocimp.cxx|2 -
 sc/source/ui/docshell/docfunc.cxx |   28 -
 sc/source/ui/docshell/docsh4.cxx  |2 -
 sc/source/ui/docshell/docsh8.cxx  |2 -
 sc/source/ui/docshell/impex.cxx   |2 -
 sc/source/ui/drawfunc/fuins2.cxx  |2 -
 sc/source/ui/inc/cliputil.hxx |2 -
 sc/source/ui/inc/tabvwsh.hxx  |2 -
 sc/source/ui/inc/transobj.hxx |6 +--
 sc/source/ui/inc/viewutil.hxx |8 ++---
 sc/source/ui/navipi/content.cxx   |8 ++---
 sc/source/ui/undo/undoblk.cxx |8 ++---
 sc/source/ui/undo/undostyl.cxx|2 -
 sc/source/ui/unoobj/cellsuno.cxx  |   16 +-
 sc/source/ui/unoobj/fmtuno.cxx|   10 +++---
 sc/source/ui/unoobj/styleuno.cxx  |4 +-
 sc/source/ui/unoobj/viewuno.cxx   |2 -
 sc/source/ui/view/cellsh.cxx  |4 +-
 sc/source/ui/view/cliputil.cxx|4 +-
 sc/source/ui/view/formatsh.cxx|   10 +++---
 sc/source/ui/view/gridwin.cxx |6 +--
 sc/source/ui/view/tabcont.cxx |6 +--
 sc/source/ui/view/tabvwsh5.cxx|   10 +++---
 sc/source/ui/view/tabvwsha.cxx|2 -
 sc/source/ui/view/viewdata.cxx|2 -
 sc/source/ui/view/viewfun2.cxx|2 -
 sc/source/ui/view/viewfun3.cxx|   18 +--
 sc/source/ui/view/viewfun4.cxx|2 -
 sc/source/ui/view/viewfunc.cxx|   12 +++
 sc/source/ui/view/viewutil.cxx|   24 +++
 69 files changed, 258 insertions(+), 266 deletions(-)

New commits:
commit fe1ea3f546a539787d7f5e9c25fcf47dc0cbe2c0
Author: Caolán McNamara 
AuthorDate: Thu Sep 24 09:13:16 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 24 16:24:51 2020 +0200

some places where ScDocument* is never passed a nullptr

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

diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx
index c06400c34c69..c35fc4a6e66e 100644
--- a/sc/inc/chartarr.hxx
+++ b/sc/inc/chartarr.hxx
@@ -57,14 +57,14 @@ public:
 
 class ScChartArray // only parameter-struct
 {
-ScDocument* pDocument;
+ScDocument& rDocument;
 ScChartPositioner aPositioner;
 
 private:
 std::unique_ptr CreateMemChartSingle();
 

ESC meeting minutes: 2020-09-24

[Miklos Vajna]

* Present:
+ Michael W, Heiko, Caolan, Sophie, Miklos, Xisco, Olivier, Stephan, 
Michael S, Mike K, Gabriel, Thorsten


* Completed Action Items:
+ None

* Pending Action Items:
+ set up 1 Android CI builder and see the build turn-around time (Cloph)

* Release Engineering update (Cloph/Xisco)
+ 7.0 status
   + 7.0.2 rc2 will be tagged next week
+ 6.4 status
   + 6.4.7 rc1 was tagged yesterday, builds are in progress
+ Remotes
+ Android viewer
+ Online

* Documentation (Olivier)
+ New Help (no news)
+ Helpcontent2
  + Fixes and improvements (ohallot, LibreOfficiant G. Kelemen)
+ Google seasons of Doc
  + wiki on Calc Functions : Progressing. (R. Gandhi)
  + E learning on Calc : work in progress (Prashant)
+ Guides
  + work in progress
  + Call for duties (volunteers)

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
251(251) (topicUI) bugs open, 264(264) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week1 month3 months12 months
 added  15(8) 35(-15) 64(-15)175(-15)
 commented 147(58)   401(43)1052(20)3795(20)
   removed   4(3)  7(5)   11(2)   59(4)
  resolved  21(9) 49(18) 108(11) 406(9)
+ top 10 contributors:
  Heiko Tietze made 288 changes in 1 month, and 2208 changes in 1 year
  Telesto made 103 changes in 1 month, and 519 changes in 1 year
  BogdanB made 93 changes in 1 month, and 174 changes in 1 year
  Kainz, Andreas made 64 changes in 1 month, and 461 changes in 1 year
  Foote, V Stuart made 55 changes in 1 month, and 632 changes in 1 year
  Roman Kuznetsov made 42 changes in 1 month, and 266 changes in 1 year
  Dieter Praas made 40 changes in 1 month, and 495 changes in 1 year
  Ilmari Lauhakangas made 32 changes in 1 month, and 214 changes in 1 y
  Timur made 29 changes in 1 month, and 257 changes in 1 year
  Thomas Lendo made 28 changes in 1 month, and 139 changes in 1 year

 + New tickets with needsUXEval Sep/17-24

 -> * Optimize handling of page orientation in Writer (based on landscape
  page)
  + https://bugs.documentfoundation.org/show_bug.cgi?id=136961
  + workflow is hard: need to insert 2 page breaks, change style for 
the page in-between (Heiko)
+ right, there is currently no easier way (Miklos)
* In template directory odt files no longer visible
  + https://bugs.documentfoundation.org/show_bug.cgi?id=84709
 -> * Comment reply function has disappeared
  + https://bugs.documentfoundation.org/show_bug.cgi?id=136896
  + Unknown Author can’t reply to itself
  + perhaps self-replying should be allowed
  + MSO allows this
  + don’t know of a good reason (Michael S)
   -> * StartCenter is inconsistent with dark theme(s)
  + https://bugs.documentfoundation.org/show_bug.cgi?id=136555
+ currently stuck, two different patches currently proposed:
 - https://gerrit.libreoffice.org/c/core/+/103041 (Jan-Marek)
 - https://gerrit.libreoffice.org/c/core/+/103079 (Thorsten W)
 - would be great to talk to each other :-) (Miklos)
* Move Validity drop-down list control inside cell
  + https://bugs.documentfoundation.org/show_bug.cgi?id=136878
=> in discussion

* UI: Autocomplete for search field disturbing workflow
  + https://bugs.documentfoundation.org/show_bug.cgi?id=136942
=> NAB

* WRITER TABLES: Improve workflow for unfloating tables
  + https://bugs.documentfoundation.org/show_bug.cgi?id=136931
* Add "Shapes" sidebar from LO Draw into Impress
  + https://bugs.documentfoundation.org/show_bug.cgi?id=136946
=> New, easyhack

* BULLETS AND NUMBERING DIALOG: RFE add support to use Unicode SMP char
  acters as bullets
  + https://bugs.documentfoundation.org/show_bug.cgi?id=132970
=> fixed

  + notebookbar state: see tdf#135501 for details
 + NBs are not fully functional and perform below ribbons
 + Chicken/Egg: to get feedback we have to switch
 + Tabbed might be the most familiar, Contextual Single the most complete
 + UI picker is welcome (though it just makes the selection a bit easier)
 + NB variants showcase our self-concept to be as flexible as possible
 + Removing single toolbar and tabbed compact is broadly accepted
   + still 7 options are remaining
   + ESC request was to have a single notebookbar variant, if possible 
(Miklos)
   + some has the opposite opinion (Heiko)

* Crash testing (Caolan)
+ 4(-4) import failure, 0(-3) export failures
+ 1 writer footnote layout crash, 3 calc issues
+ 2 coverity issues
+ 16 ossfuzz issues

* Crash Reportin

[Libreoffice-commits] online.git: loleaflet/src

[gokaysatir (via logerrit)]

 loleaflet/src/control/Parts.js |   41 -
 1 file changed, 40 insertions(+), 1 deletion(-)

New commits:
commit b8025ec431226fe3a3d19ec46b660978edf2c1b9
Author: gokaysatir 
AuthorDate: Wed Sep 23 17:10:56 2020 +0300
Commit: Henry Castro 
CommitDate: Thu Sep 24 16:54:27 2020 +0200

Loleaflet: Show sheet feature is enabled also for mobile.

Change-Id: I60dd7354ee5e54c00e8ea78f93d15b34ab5c1fda
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103259
Tested-by: Jenkins CollaboraOffice 
Tested-by: Henry Castro 
Reviewed-by: Henry Castro 

diff --git a/loleaflet/src/control/Parts.js b/loleaflet/src/control/Parts.js
index 427a3238f..0e52e7472 100644
--- a/loleaflet/src/control/Parts.js
+++ b/loleaflet/src/control/Parts.js
@@ -2,6 +2,9 @@
 /*
  * Document parts switching and selecting handler
  */
+
+/* global vex */
+
 L.Map.include({
setPart: function (part, external, calledFromSetPartHandler) {
var docLayer = this._docLayer;
@@ -345,7 +348,43 @@ L.Map.include({
 
showPage: function () {
if (this.getDocType() === 'spreadsheet' && 
this.hasAnyHiddenPart()) {
-   this._socket.sendMessage('uno .uno:Show');
+   var partNames_ = this._docLayer._partNames;
+   var hiddenParts_ = this._docLayer._hiddenParts;
+
+   if (hiddenParts_.length > 0) {
+   var container = document.createElement('div');
+   container.style.maxHeight = '300px';
+   container.style.maxWidth = '200px';
+   for (var i = 0; i < hiddenParts_.length; i++) {
+   var checkbox = 
document.createElement('input');
+   checkbox.type = 'checkbox';
+   checkbox.id = 'hidden-part-checkbox-' + 
String(hiddenParts_[i]);
+   var label = 
document.createElement('label');
+   label.htmlFor = 'hidden-part-checkbox-' 
+ String(hiddenParts_[i]);
+   label.innerText = 
partNames_[hiddenParts_[i]];
+   var newLine = 
document.createElement('br');
+   container.appendChild(checkbox);
+   container.appendChild(label);
+   container.appendChild(newLine);
+   }
+   }
+
+   var socket_ = this._socket;
+   vex.dialog.confirm({
+   unsafeMessage: container.outerHTML,
+   callback: function (value) {
+   if (value === true) {
+   var checkboxList = 
document.querySelectorAll('input[id^="hidden-part-checkbox"]');
+   for (var i = 0; i < 
checkboxList.length; i++) {
+   if 
(checkboxList[i].checked === true) {
+   var partName_ = 
partNames_[parseInt(checkboxList[i].id.replace('hidden-part-checkbox-', ''))];
+   var argument = 
{aTableName: {type: 'string', value: partName_}};
+   
socket_.sendMessage('uno .uno:Show ' + JSON.stringify(argument));
+   }
+   }
+   }
+   }
+   });
}
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

 source/text/shared/optionen/java.xhp |   18 ++
 1 file changed, 18 insertions(+)

New commits:
commit 5c5167dd5b99c013d4db759489c7beea3613a57a
Author: Olivier Hallot 
AuthorDate: Wed Sep 23 17:13:02 2020 -0300
Commit: Olivier Hallot 
CommitDate: Thu Sep 24 17:23:34 2020 +0200

tdf#109084 Give precisions on JRE config path

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

diff --git a/source/text/shared/optionen/java.xhp 
b/source/text/shared/optionen/java.xhp
index 966a13aa4..1ee4b3466 100644
--- a/source/text/shared/optionen/java.xhp
+++ b/source/text/shared/optionen/java.xhp
@@ -59,6 +59,24 @@
 
 Java runtime environments (JRE) already installed:
 Select the JRE that you want to use. On some 
systems, you must wait a minute until the list gets populated. On some systems, 
you must restart %PRODUCTNAME to use your changed setting. The path to 
the JRE is displayed beneath the list box.
+You can override the 
default JRE of the operating system with one of the following 
alternatives:
+
+
+By setting the 
environment variable JAVA_HOME,
+
+
+By adding a JRE 
to the $PATH variable,
+
+
+By providing 
the configuration file 
+javasettings_macOS_X86_64.xml
+javasettings_Windows_X86_64.xml
+javasettings_Linux_X86_64.xml
+
javasettings_${_OS}_${_ARCH}.xml
+ in the folder 
/presets/config.
+
+
+
 
 
 Add
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 8fa5c9f531074fb23b0d90d1e796c201c0448056
Author: Olivier Hallot 
AuthorDate: Thu Sep 24 12:23:34 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Thu Sep 24 17:23:34 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 5c5167dd5b99c013d4db759489c7beea3613a57a
  - tdf#109084 Give precisions on JRE config path

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

diff --git a/helpcontent2 b/helpcontent2
index ab4b270d35eb..5c5167dd5b99 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ab4b270d35eb6db2f0e2408f33e7817a9a0e7ce0
+Subproject commit 5c5167dd5b99c013d4db759489c7beea3613a57a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: framework/CppunitTest_framework_services.mk framework/Module_framework.mk framework/qa framework/source

[Miklos Vajna (via logerrit)]

 framework/CppunitTest_framework_services.mk |   40 
 framework/Module_framework.mk   |7 +
 framework/qa/cppunit/services.cxx   |  133 
 framework/source/services/frame.cxx |7 +
 4 files changed, 187 insertions(+)

New commits:
commit 07b399eb91fb7860190504ca0214bdf4d30dfe2a
Author: Miklos Vajna 
AuthorDate: Thu Sep 24 13:58:44 2020 +0200
Commit: Miklos Vajna 
CommitDate: Thu Sep 24 17:45:29 2020 +0200

framework: lock the solar mutex in loadComponentFromURL() with OnMainThread

Regression from commit 2dc3a6c273cb82506842864481d78df7294debbf
(framework: allow loading a component on the main thread, 2018-12-19),
which was a forward-port from a 5.4-based vendor branch, where this was
(it turns out) just working by accident, but never on master.

It can happen that loadComponentFromURL() is invoked on a thread, which
does not own the solar mutex. Then once
vcl::SolarThreadExecutor::execute() is called, it'll try to release the
solar mutex. But SolarMutexReleaser is unsafe: it'll release the mutex
even if it is owned by an other thread.

To make this a bit more safer, it'll abort in
comphelper::SolarMutex::doRelease(), in case the current thread doesn't
have the mutex already.

Fix the problem by taking the solar mutex in loadComponentFromURL():
this is meant to cause no performance problems, since the actual
importers typically start with taking the solar mutex anyway. Taking it
earlier would be problematic, since this can be invoked by UNO clients
directly. Taking it later in vcl/ would be also unusual: typically vcl
just asserts that the solar mutex is locked, doesn't take it itself.

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

diff --git a/framework/CppunitTest_framework_services.mk 
b/framework/CppunitTest_framework_services.mk
new file mode 100644
index ..f098b7e0bcf9
--- /dev/null
+++ b/framework/CppunitTest_framework_services.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,framework_services))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,framework_services, \
+framework/qa/cppunit/services \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,framework_services))
+
+$(eval $(call gb_CppunitTest_use_libraries,framework_services, \
+   comphelper \
+   cppu \
+   cppuhelper \
+   sal \
+   salhelper \
+   test \
+   unotest \
+   vcl \
+))
+
+$(eval $(call gb_CppunitTest_use_external,framework_services,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,framework_services))
+
+$(eval $(call gb_CppunitTest_use_ure,framework_services))
+$(eval $(call gb_CppunitTest_use_vcl,framework_services))
+
+$(eval $(call gb_CppunitTest_use_rdb,framework_services,services))
+
+$(eval $(call gb_CppunitTest_use_configuration,framework_services))
+
+# vim: set noet sw=4 ts=4:
diff --git a/framework/Module_framework.mk b/framework/Module_framework.mk
index 4baf948abd9d..2d59a8183456 100644
--- a/framework/Module_framework.mk
+++ b/framework/Module_framework.mk
@@ -29,6 +29,13 @@ $(eval $(call gb_Module_add_slowcheck_targets,framework,\
 CppunitTest_framework_dispatch \
 ))
 
+# Not sure why this is not stable on macOS.
+ifneq ($(OS),MACOSX)
+$(eval $(call gb_Module_add_slowcheck_targets,framework,\
+CppunitTest_framework_services \
+))
+endif
+
 $(eval $(call gb_Module_add_l10n_targets,framework,\
 AllLangMoTarget_fwk \
 ))
diff --git a/framework/qa/cppunit/services.cxx 
b/framework/qa/cppunit/services.cxx
new file mode 100644
index ..93d05ff65ca5
--- /dev/null
+++ b/framework/qa/cppunit/services.cxx
@@ -0,0 +1,133 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+using namespace ::com::sun::star;
+
+namespace
+{
+/// Covers framework/source/services/ fixes.
+class Test : public test::BootstrapFixture, public unotest::MacrosTest
+{
+protected:
+uno::Reference mxComponent;
+
+public:
+void setUp() override;
+void tearDown() override;
+uno::Reference& getComponen

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

[Stephan Bergmann (via logerrit)]

 vcl/win/app/salinst.cxx |   35 +++
 1 file changed, 31 insertions(+), 4 deletions(-)

New commits:
commit 9771e61666455c969de751e4d8f27c1c160780e1
Author: Stephan Bergmann 
AuthorDate: Thu Sep 24 13:27:17 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 24 18:03:40 2020 +0200

Revert "Directly acquire m_aMutex, instead of looping on m_condition.wait()"

This reverts commit e9a16702ba025ca340bcded4fda37235d22410a1.  My 
understanding
that the code was pointless was apparently wrong (the relevant part being 
hidden
in m_condition.wait() internally doing the call to 
MsgWaitForMultipleObjects;
I've improved the relevant comment now).  (And my fears that the code using
osl::Condition might be broken by design were hopefully unfounded.)

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

diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 3af78712b1d2..476b6350147a 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -99,6 +99,9 @@ static LRESULT CALLBACK SalComWndProcW( HWND hWnd, UINT nMsg, 
WPARAM wParam, LPA
 
 class SalYieldMutex : public comphelper::SolarMutex
 {
+public: // for ImplSalYield() and ImplSalYieldMutexAcquireWithWait()
+osl::Conditionm_condition; /// for MsgWaitForMultipleObjects()
+
 protected:
 virtual void  doAcquire( sal_uInt32 nLockCount ) override;
 virtual sal_uInt32doRelease( bool bUnlockAll ) override;
@@ -135,11 +138,31 @@ void SalYieldMutex::BeforeReleaseHandler()
 void SalYieldMutex::doAcquire( sal_uInt32 nLockCount )
 {
 WinSalInstance* pInst = GetSalData()->mpInstance;
-if ( pInst && pInst->IsMainThread() && pInst->m_nNoYieldLock )
+if ( pInst && pInst->IsMainThread() )
 {
-return;
+if ( pInst->m_nNoYieldLock )
+return;
+// tdf#96887 If this is the main thread, then we must wait for two 
things:
+// - the yield mutex being unlocked
+// - SendMessage() being triggered
+// This can nicely be done using MsgWaitForMultipleObjects, which is 
called in
+// m_condition.wait(). The 2nd one is
+// needed because if we don't reschedule, then we create deadlocks if a
+// Window's create/destroy is called via SendMessage() from another 
thread.
+// Have a look at the osl_waitCondition implementation for more info.
+do {
+// reset condition *before* acquiring!
+m_condition.reset();
+if (m_aMutex.tryToAcquire())
+break;
+// wait for SalYieldMutex::release() to set the condition
+osl::Condition::Result res = m_condition.wait();
+assert(osl::Condition::Result::result_ok == res);
+}
+while ( true );
 }
-m_aMutex.acquire();
+else
+m_aMutex.acquire();
 ++m_nCount;
 --nLockCount;
 
@@ -152,7 +175,11 @@ sal_uInt32 SalYieldMutex::doRelease( const bool bUnlockAll 
)
 if ( pInst && pInst->m_nNoYieldLock && pInst->IsMainThread() )
 return 1;
 
-return comphelper::SolarMutex::doRelease( bUnlockAll );
+sal_uInt32 nCount = comphelper::SolarMutex::doRelease( bUnlockAll );
+// wake up ImplSalYieldMutexAcquireWithWait() after release
+if ( 0 == m_nCount )
+m_condition.set();
+return nCount;
 }
 
 bool SalYieldMutex::tryToAcquire()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 oox/source/crypto/AgileEngine.cxx|   16 ++--
 oox/source/crypto/Standard2007Engine.cxx |   28 
 2 files changed, 30 insertions(+), 14 deletions(-)

New commits:
commit 646a69757b928aeaf6e0d0d41c4b30c02803a3a3
Author: Stephan Bergmann 
AuthorDate: Thu Sep 24 14:51:16 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 24 18:07:36 2020 +0200

Fix endianness issues in OOX crypto routines

...without which CppunitTest_sw_ooxmlencryption failed on (big-endian) 
s390x:

* The 32-bit segment counter in AgileEngine::de-/encrypt apparently needs 
to be
  stored in LSB format (at least, if it is, CppunitTest_sw_ooxmlencryption
  ultimately succeeded, whereas otherwise it failed).

* The UTF-16 string in Standard2007Engine::calculateEncryptionKey apparently
  needs to be in LSB format (at least, if it is, 
CppunitTest_sw_ooxmlencryption
  ultimately succeeded, whereas otherwise it failed).

* The various 32-bit values in the EncryptionStandardHeader and
  EncryptionVerifierAES data structures apparently need to be written out 
in LSB
  format in Standard2007Engine::writeEncryptionInfo, given that they are 
always
  read in LSB format in Standard2007Engine::readEncryptionInfo.

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

diff --git a/oox/source/crypto/AgileEngine.cxx 
b/oox/source/crypto/AgileEngine.cxx
index e1ce103c5d0c..ad01e31def83 100644
--- a/oox/source/crypto/AgileEngine.cxx
+++ b/oox/source/crypto/AgileEngine.cxx
@@ -461,9 +461,11 @@ bool AgileEngine::decrypt(BinaryXInputStream& aInputStream,
 
 while ((inputLength = aInputStream.readMemory(inputBuffer.data(), 
inputBuffer.size())) > 0)
 {
-sal_uInt8* segmentBegin = reinterpret_cast(&segment);
-sal_uInt8* segmentEnd   = segmentBegin + sizeof(segment);
-std::copy(segmentBegin, segmentEnd, saltWithBlockKey.begin() + 
saltSize);
+auto p = saltWithBlockKey.begin() + saltSize;
+p[0] = segment & 0xFF;
+p[1] = (segment >> 8) & 0xFF;
+p[2] = (segment >> 16) & 0xFF;
+p[3] = segment >> 24;
 
 hashCalc(hash, saltWithBlockKey, mInfo.hashAlgorithm);
 
@@ -804,9 +806,11 @@ void AgileEngine::encrypt(const 
css::uno::Reference &  rx
 inputLength : oox::crypto::roundUp(inputLength, 
sal_uInt32(mInfo.blockSize));
 
 // Update Key
-sal_uInt8* segmentBegin = reinterpret_cast(&nSegment);
-sal_uInt8* segmentEnd   = segmentBegin + nSegmentByteSize;
-std::copy(segmentBegin, segmentEnd, saltWithBlockKey.begin() + 
saltSize);
+auto p = saltWithBlockKey.begin() + saltSize;
+p[0] = nSegment & 0xFF;
+p[1] = (nSegment >> 8) & 0xFF;
+p[2] = (nSegment >> 16) & 0xFF;
+p[3] = nSegment >> 24;
 
 hashCalc(hash, saltWithBlockKey, mInfo.hashAlgorithm);
 
diff --git a/oox/source/crypto/Standard2007Engine.cxx 
b/oox/source/crypto/Standard2007Engine.cxx
index ec9269e771fc..c3b0efad962e 100644
--- a/oox/source/crypto/Standard2007Engine.cxx
+++ b/oox/source/crypto/Standard2007Engine.cxx
@@ -77,12 +77,12 @@ bool Standard2007Engine::calculateEncryptionKey(const 
OUString& rPassword)
 std::vector initialData(saltSize + passwordByteLength);
 std::copy(saltArray, saltArray + saltSize, initialData.begin());
 
-const sal_uInt8* passwordByteArray = reinterpret_cast(rPassword.getStr());
-
-std::copy(
-passwordByteArray,
-passwordByteArray + passwordByteLength,
-initialData.begin() + saltSize);
+auto p = initialData.begin() + saltSize;
+for (sal_Int32 i = 0; i != rPassword.getLength(); ++i) {
+auto c = rPassword[i];
+*p++ = c & 0xFF;
+*p++ = c >> 8;
+}
 
 // use "hash" vector for result of sha1 hashing
 // calculate SHA1 hash of initialData
@@ -221,11 +221,23 @@ void 
Standard2007Engine::writeEncryptionInfo(BinaryXOutputStream& rStream)
 sal_uInt32 headerSize = encryptionHeaderSize + cspNameSize;
 rStream.WriteUInt32(headerSize);
 
-rStream.writeMemory(&mInfo.header, encryptionHeaderSize);
+rStream.WriteUInt32(mInfo.header.flags);
+rStream.WriteUInt32(mInfo.header.sizeExtra);
+rStream.WriteUInt32(mInfo.header.algId);
+rStream.WriteUInt32(mInfo.header.algIdHash);
+rStream.WriteUInt32(mInfo.header.keyBits);
+rStream.WriteUInt32(mInfo.header.providedType);
+rStream.WriteUInt32(mInfo.header.reserved1);
+rStream.WriteUInt32(mInfo.header.reserved2);
 rStream.writeUnicodeArray(lclCspName);
 rStream.WriteUInt16(0);
 
-rStream.writeMemory(&mInfo.verifier, 
sizeof(msfilter::EncryptionVerifierAES));
+rStream.WriteUInt32(mInfo.verifier.saltSize);
+rStream.writeMemory(&mInfo.verifier.salt, sizeof mInfo.verifier.salt);
+rStream.writeMe

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

[Attila Bakos (via logerrit)]

 sw/qa/extras/layout/data/tdf136613.docx |binary
 sw/qa/extras/layout/layout.cxx  |   31 
 sw/source/core/objectpositioning/anchoredobjectposition.cxx |7 ++
 3 files changed, 37 insertions(+), 1 deletion(-)

New commits:
commit 7351a5028b18591306dfe18b34f6c751e565766e
Author: Attila Bakos 
AuthorDate: Thu Sep 17 11:32:44 2020 +0200
Commit: László Németh 
CommitDate: Thu Sep 24 18:28:06 2020 +0200

tdf#136613 sw: fix picture position in tables

in the case of option FollowTextFlow.

Regression from commit b6850bbe95418ecfde404be1696548f18d200c9b
(tdf#106153 sw compatibility: fix textboxes exceeding the page).

Note: now images have the same position than before the previous
commit, but this is still not perfect, because option FollowTextFlow
doesn't allow them to be placed outside the cell where they are
anchored to. The proper fix might be extending FollowTextFlow.

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

diff --git a/sw/qa/extras/layout/data/tdf136613.docx 
b/sw/qa/extras/layout/data/tdf136613.docx
new file mode 100644
index ..f885564521b1
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf136613.docx differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 4a348bdd7f09..ce0a43f8c213 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -478,6 +478,37 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf134272)
 assertXPath(pXmlDoc, "/root/page[1]/header/txt[2]/infos/bounds", "bottom", 
"2819");
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf136613)
+{
+SwDoc* pDoc = createDoc("tdf136613.docx");
+CPPUNIT_ASSERT(pDoc);
+
+//get the flys and the root frame
+const auto vFlyFormats = pDoc->GetFlyFrameFormats(FLYCNTTYPE_ALL, true);
+const auto vFrames = pDoc->GetAllLayouts();
+
+CPPUNIT_ASSERT(!vFrames.empty());
+CPPUNIT_ASSERT(!vFlyFormats.empty());
+
+//get the page frame from the root
+SwFrame* pPageFrame = vFrames[0]->Lower();
+CPPUNIT_ASSERT(pPageFrame);
+
+//get the rectangle of the page
+const SwRect& rPageRect = pPageFrame->getFrameArea();
+
+//check the flys and...
+for (auto pFlyFormat : vFlyFormats)
+{
+//...the rectangle of the fly location...
+const SwRect& rRect = pFlyFormat->FindLayoutRect();
+CPPUNIT_ASSERT(!rRect.IsEmpty());
+
+//...if it is on the page. This will fail if not.
+CPPUNIT_ASSERT_MESSAGE("The pictures are outside the page!", 
rPageRect.IsInside(rRect));
+}
+}
+
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf88496)
 {
 SwDoc* pDoc = createDoc("tdf88496.docx");
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx 
b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index d83eaffb106d..bfcd075c8443 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -435,8 +435,13 @@ SwTwips SwAnchoredObjectPosition::ImplAdjustVertRelPos( 
const SwTwips nTopOfAnch
  const bool 
bCheckBottom ) const
 {
 SwTwips nAdjustedRelPosY = nProposedRelPosY;
-if 
(SwAnchoredObject::IsDraggingOffPageAllowed(FindFrameFormat(&mrDrawObj)))
+// TODO: Replace the following condition with the correction
+// of the implementation of option FollowTextFlow.
+if ( 
SwAnchoredObject::IsDraggingOffPageAllowed(FindFrameFormat(&mrDrawObj)) &&
+!(GetAnchorFrame().IsInTab() && DoesObjFollowsTextFlow()) )
+{
 return nAdjustedRelPosY;
+}
 
 const Size aObjSize(GetAnchoredObj().GetObjRect().SSize());
 // determine the area of 'page' alignment frame, to which the vertical
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 basic/source/uno/scriptcont.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 881aca8eb1f3b77dce1bdcf4a344eaa175b644c3
Author: Andrea Gelmini 
AuthorDate: Thu Sep 24 13:03:39 2020 +0200
Commit: Julien Nabet 
CommitDate: Thu Sep 24 18:32:07 2020 +0200

Fix typo in code

It passed "make check" on Linux

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

diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index c9b8fdeb0793..a5d7d02a1931 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -419,7 +419,7 @@ void SAL_CALL 
SfxScriptLibraryContainer::changeLibraryPassword( const OUString&
 loadLibrary( Name );
 
 bool bKillCryptedFiles = false;
-bool bKillUncryptedFiles = false;
+bool bKillUnencryptedFiles = false;
 
 // Remove or change password?
 if( bOldPassword )
@@ -480,11 +480,11 @@ void SAL_CALL 
SfxScriptLibraryContainer::changeLibraryPassword( const OUString&
 // Store application basic crypted
 uno::Reference< embed::XStorage > xStorage;
 storeLibraries_Impl( xStorage, false );
-bKillUncryptedFiles = true;
+bKillUnencryptedFiles = true;
 }
 }
 
-if( !(bKillCryptedFiles || bKillUncryptedFiles) )
+if( !(bKillCryptedFiles || bKillUnencryptedFiles) )
 return;
 
 Sequence< OUString > aElementNames = pImplLib->getElementNames();
@@ -501,7 +501,7 @@ void SAL_CALL 
SfxScriptLibraryContainer::changeLibraryPassword( const OUString&
 aElementInetObj.insertName( aElementName, false,
 INetURLObject::LAST_SEGMENT,
 INetURLObject::EncodeMechanism::All );
-if( bKillUncryptedFiles )
+if( bKillUnencryptedFiles )
 {
 aElementInetObj.setExtension( maLibElementFileExtension );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 oox/source/drawingml/shape.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c103ff090b5fa2e001f421f0d0b9c01fecb69647
Author: Andrea Gelmini 
AuthorDate: Thu Sep 24 17:26:29 2020 +0200
Commit: Julien Nabet 
CommitDate: Thu Sep 24 18:32:56 2020 +0200

Fix typo

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

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 326d90be3ffd..ddc5a96b8018 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1416,10 +1416,10 @@ Reference< XShape > const & Shape::createAndInsert(
 // When upright is set, we want the text without any 
rotation.
 // But if we set 0 here, the text is still rotated if the
 // shape containing it is rotated.
-// Hence, we rotate the text into the the opposite 
direction of
+// Hence, we rotate the text into the opposite direction of
 // the rotation of the shape, by as much as the shape was 
rotated.
 mpCustomShapePropertiesPtr->setTextRotateAngle(mnRotation 
/ 6);
-// Also put this away in a Gabbag.
+// Also put this away in a GrabBag.
 putPropertyToGrabBag("Upright", Any(isUpright));
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 configmgr/source/components.hxx |2 +-
 configmgr/source/data.hxx   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 02a78dee11f61490ede6e3e16202dc7987bede93
Author: Andrea Gelmini 
AuthorDate: Wed Sep 23 15:23:57 2020 +0200
Commit: Julien Nabet 
CommitDate: Thu Sep 24 18:33:44 2020 +0200

Fix typo in code

It passed "make check" on Linux

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

diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
index 5062ab36a15d..9ede2ed381f2 100644
--- a/configmgr/source/components.hxx
+++ b/configmgr/source/components.hxx
@@ -56,7 +56,7 @@ public:
 
 rtl::Reference< Node > resolvePathRepresentation(
 OUString const & pathRepresentation,
-OUString * canonicRepresenation, std::vector * path, int * 
finalizedLayer)
+OUString * canonicRepresentation, std::vector * path, int * 
finalizedLayer)
 const;
 
 rtl::Reference< Node > getTemplate( OUString const & fullName) const;
diff --git a/configmgr/source/data.hxx b/configmgr/source/data.hxx
index fbb96b391eb8..58763cd0d58c 100644
--- a/configmgr/source/data.hxx
+++ b/configmgr/source/data.hxx
@@ -68,7 +68,7 @@ struct Data {
 
 rtl::Reference< Node > resolvePathRepresentation(
 OUString const & pathRepresentation,
-OUString * canonicRepresenation, std::vector * path, int * 
finalizedLayer)
+OUString * canonicRepresentation, std::vector * path, int * 
finalizedLayer)
 const;
 
 rtl::Reference< Node > getTemplate(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 vcl/win/dtrans/target.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f90da5211abb470982b2070237c7758556a70145
Author: Andrea Gelmini 
AuthorDate: Wed Sep 23 08:24:44 2020 +0200
Commit: Julien Nabet 
CommitDate: Thu Sep 24 18:35:32 2020 +0200

Fix typo

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

diff --git a/vcl/win/dtrans/target.cxx b/vcl/win/dtrans/target.cxx
index 0aa04ea1f7ab..adddabab7038 100644
--- a/vcl/win/dtrans/target.cxx
+++ b/vcl/win/dtrans/target.cxx
@@ -343,7 +343,7 @@ HRESULT DropTarget::DragEnter( IDataObject *pDataObj,
 fire_dragEnter( e);
 // Check if the action derived from grfKeyState 
(m_nCurrentDropAction) or the action set
 // by the listener (m_nCurrentDropAction) is allowed by the 
source. Only an allowed action is set
-// in pdwEffect. The listener notification is asynchron, that is 
we cannot expect that the listener
+// in pdwEffect. The listener notification is asynchronous, that 
is we cannot expect that the listener
 // has already reacted to the notification.
 // If there is more than one valid action which is the case when 
ALT or RIGHT MOUSE BUTTON is pressed
 // then getDropEffect returns DROPEFFECT_MOVE which is the default 
value if no other modifier is pressed.
@@ -391,7 +391,7 @@ HRESULT DropTarget::DragOver( DWORD grfKeyState,
 fire_dragOver( e);
 // Check if the action derived from grfKeyState 
(m_nCurrentDropAction) or the action set
 // by the listener (m_nCurrentDropAction) is allowed by the 
source. Only an allowed action is set
-// in pdwEffect. The listener notification is asynchron, that is 
we cannot expect that the listener
+// in pdwEffect. The listener notification is asynchronous, that 
is we cannot expect that the listener
 // has already reacted to the notification.
 // If there is more than one valid action which is the case when 
ALT or RIGHT MOUSE BUTTON is pressed
 // then getDropEffect returns DROPEFFECT_MOVE which is the default 
value if no other modifier is pressed.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport15.cxx |   15 ++-
 sw/source/filter/ww8/wrtw8sty.cxx  |4 ++--
 2 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 5a234ba7f02660ab770f2744d0b936e5607ddafe
Author: Justin Luth 
AuthorDate: Fri Aug 28 15:00:48 2020 +0300
Commit: Justin Luth 
CommitDate: Thu Sep 24 19:18:31 2020 +0200

tdf#132149 ww8export: use left page properties for left style

This code was unchanged since original import from OOo.

There is some monkey business going on here to handle left/right
page styles following each other. Normally, the settings
between these pages would be identical in terms
of margins and page size etc. But not necessarily so.

So, make sure that for the left style, use the format properties
from the left style before switching over to the right style
to grab its header/footer.

[At least, that is how I understand what is happening...]

Change-Id: Idc65a14fb39566e05d32d677c90e68971d77590c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101544
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 09f847b64b2a..dfce2901c59a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -519,11 +519,24 @@ 
DECLARE_OOXMLEXPORT_TEST(testTdf135343_columnSectionBreak_c15, "tdf135343_column
 
 DECLARE_OOXMLEXPORT_TEST(testTdf132149_pgBreak, "tdf132149_pgBreak.odt")
 {
+// This 5 page document is designed to visually exaggerate the problems
+// of emulating LO's followed-by-page-style into MSWord's sections.
+// While much has been improved, there are extra pages present, which 
still need fixing.
 xmlDocUniquePtr pDump = parseLayoutDump();
 
-// No header on pages 1,2,3 (and currently 4).
+// No header on pages 1,2,3.
 assertXPath(pDump, "//page[2]/header", 0);
 
+// Margins/page orientation between Right and Left page styles are 
different
+assertXPath(pDump, "//page[1]/infos/prtBounds", "left", "1134");  //Right 
page style
+assertXPath(pDump, "//page[2]/infos/prtBounds", "left", "2268");  //Left 
page style
+
+assertXPath(pDump, "//page[1]/infos/bounds", "width", "8391");  //landscape
+assertXPath(pDump, "//page[2]/infos/bounds", "width", "5953");  //portrait
+// This two-line 3rd page ought not to exist. DID YOU FIX ME? The real 
page 3 should be "8391" landscape.
+assertXPath(pDump, "//page[3]/infos/bounds", "width", "5953");
+
+
 //Page break is not lost. This SHOULD be on page 4, but sadly it is not.
 assertXPathContent(pDump, "//page[5]/header/txt", "First Page Style");
 CPPUNIT_ASSERT(getXPathContent(pDump, 
"//page[5]/body/txt").startsWith("Lorem ipsum"));
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx 
b/sw/source/filter/ww8/wrtw8sty.cxx
index 0e7830ccfb04..5f4c31d9bc99 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1775,8 +1775,8 @@ void MSWordExportBase::SectionProperties( const 
WW8_SepInfo& rSepInfo, WW8_PdAtt
 if ( UseOnPage::Left == ( UseOnPage::All & pPd->ReadUseOn() ) )
 {
 nBreakCode = 3;
-pPd = pPd->GetFollow();
-pPdFormat = &pPd->GetMaster();
+pPdFormat = &pPd->GetMaster();  //use the current page for 
settings (margins/width etc)
+pPd = pPd->GetFollow(); //switch to the right page for the 
right/odd header/footer
 }
 else
 nBreakCode = 4;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

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

New commits:
commit 4f0ba68d9b95c51ae73b1d1c9d18055edab9c56d
Author: Olivier Hallot 
AuthorDate: Thu Sep 24 19:17:59 2020 +0200
Commit: Olivier Hallot 
CommitDate: Thu Sep 24 19:26:10 2020 +0200

Update external link on ICU and regexp

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

diff --git a/source/text/shared/01/0211.xhp 
b/source/text/shared/01/0211.xhp
index 093c95863..fc57b22f8 100644
--- a/source/text/shared/01/0211.xhp
+++ b/source/text/shared/01/0211.xhp
@@ -315,7 +315,7 @@
 
   
 
-For a full 
list of supported metacharacters and syntax, see http://userguide.icu-project.org/strings/regexp"; name="ICU Regular 
Expressions documentation">ICU Regular Expressions 
documentation
+For a full 
list of supported metacharacters and syntax, see https://unicode-org.github.io/icu/"; name="ICU Regular Expressions 
documentation">ICU Regular Expressions documentation
 Note that currently all 
named character class terms, [:alpha:] through [:upper:], must be enclosed in 
parentheses when used in a regular expression, see the examples that 
follow.
 Regular expression 
terms can be combined to form complex and sophisticated regular expressions for 
searches as show in the following examples.
 Examples
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Alain Romedenne (via logerrit)]

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

New commits:
commit fdca0383930535bd9b394c781dd8e561d9e8db84
Author: Alain Romedenne 
AuthorDate: Thu Sep 24 19:26:57 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Sep 24 19:26:57 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to a01ce79e9680bdda7cb4b214f46e474ee014927c
  - correct typo + extra API ref

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

diff --git a/helpcontent2 b/helpcontent2
index 4f0ba68d9b95..a01ce79e9680 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4f0ba68d9b95c51ae73b1d1c9d18055edab9c56d
+Subproject commit a01ce79e9680bdda7cb4b214f46e474ee014927c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit c27fff896565f535cf9e073104eba3da0812e283
Author: Olivier Hallot 
AuthorDate: Thu Sep 24 19:26:10 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Sep 24 19:26:10 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 4f0ba68d9b95c51ae73b1d1c9d18055edab9c56d
  - Update external link on ICU and regexp

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

diff --git a/helpcontent2 b/helpcontent2
index 5c5167dd5b99..4f0ba68d9b95 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5c5167dd5b99c013d4db759489c7beea3613a57a
+Subproject commit 4f0ba68d9b95c51ae73b1d1c9d18055edab9c56d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Alain Romedenne (via logerrit)]

 source/text/sbasic/shared/0104.xhp |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a01ce79e9680bdda7cb4b214f46e474ee014927c
Author: Alain Romedenne 
AuthorDate: Thu Sep 24 14:23:18 2020 +0200
Commit: Olivier Hallot 
CommitDate: Thu Sep 24 19:26:57 2020 +0200

correct typo + extra API ref

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

diff --git a/source/text/sbasic/shared/0104.xhp 
b/source/text/sbasic/shared/0104.xhp
index 87b04a6a5..2e6816f72 100644
--- a/source/text/sbasic/shared/0104.xhp
+++ b/source/text/sbasic/shared/0104.xhp
@@ -33,6 +33,7 @@
  assigning macros to events
  documents; events
  events; assigning macros
+ API; XDocumentEventListener
  
   Document Event-Driven Macros
  This section describes 
how to assign scripts to application, document or form events.
@@ -193,7 +194,7 @@
  
 Closed a sub component
 ...after a database form has been 
closed.
-OnSubComponentCloseded
+OnSubComponentClosed
  
  
 Printing of form letters started
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 3185c50691f2e61eaa5c52c28a186c68e8f1b660
Author: Olivier Hallot 
AuthorDate: Thu Sep 24 14:28:05 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Thu Sep 24 19:28:05 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to ec4da5345618568209a24eaa3f589947765da896
  - tdf#98232 Add info on control points for object corners

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

diff --git a/helpcontent2 b/helpcontent2
index a01ce79e9680..ec4da5345618 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a01ce79e9680bdda7cb4b214f46e474ee014927c
+Subproject commit ec4da5345618568209a24eaa3f589947765da896
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

 source/text/shared/01/05230400.xhp |   16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

New commits:
commit ec4da5345618568209a24eaa3f589947765da896
Author: Olivier Hallot 
AuthorDate: Thu Sep 24 14:13:16 2020 -0300
Commit: Olivier Hallot 
CommitDate: Thu Sep 24 19:28:05 2020 +0200

tdf#98232 Add info on control points for object corners

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

diff --git a/source/text/shared/01/05230400.xhp 
b/source/text/shared/01/05230400.xhp
index 664797c93..98cab1feb 100644
--- a/source/text/shared/01/05230400.xhp
+++ b/source/text/shared/01/05230400.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-
-
 
 
 
@@ -38,21 +34,23 @@
 mw made "slanting;..." a one level entry
 
 
-Slant & 
Corner Radius
+Slant & Corner Radius
 Slants the selected 
object, or rounds the corners of a rectangular object.
 
 
   
 
-Corner 
Radius
+Corner Radius
 You can only 
round the corners of a rectangular object.
 
-Radius
+Radius
 Enter the radius of the circle 
that you want to use to round the corners.
-Slant
+Slant
 Slants the 
selected object along an axis that you specify.
 
-Angle
+Angle
 Enter the angle of the slant 
axis.
+Control points 1 and 2
+Enter a value to set 
the X and Y coordinates of the top left corner of the object. If these sections 
are grayed out, then you cannot set any coordinates.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 framework/source/services/frame.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 48f3ee275a085fc97c156038d2423b7fb1bec6d5
Author: Andrea Gelmini 
AuthorDate: Thu Sep 24 18:54:39 2020 +0200
Commit: Julien Nabet 
CommitDate: Thu Sep 24 19:38:31 2020 +0200

Fix typo

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

diff --git a/framework/source/services/frame.cxx 
b/framework/source/services/frame.cxx
index 4941566b80f7..562afb695e35 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -586,7 +586,7 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL 
XFrameImpl::loadComponentF
 {
 // Make sure that we own the solar mutex, otherwise later
 // vcl::SolarThreadExecutor::execute() will release the solar mutex, 
even if it's owned by
-// an other thread, leading to an std::abort() at the end.
+// another thread, leading to an std::abort() at the end.
 SolarMutexGuard g;
 
 return 
vcl::solarthread::syncExecute(std::bind(&LoadEnv::loadComponentFromURL, xThis,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg icon-themes/colibre icon-themes/colibre_svg

[andreas kainz (via logerrit)]

 icon-themes/breeze/sfx2/res/grip.png  |binary
 icon-themes/breeze_dark/sfx2/res/grip.png |binary
 icon-themes/breeze_dark_svg/sfx2/res/grip.svg |2 +-
 icon-themes/breeze_svg/sfx2/res/grip.svg  |2 +-
 icon-themes/colibre/res/minus.png |binary
 icon-themes/colibre/res/plus.png  |binary
 icon-themes/colibre_svg/res/minus.svg |7 ++-
 icon-themes/colibre_svg/res/plus.svg  |7 ++-
 8 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 4e7f0727f3b25c0f317e56e852aa4c2fd39ee355
Author: andreas kainz 
AuthorDate: Thu Sep 24 17:55:17 2020 +0200
Commit: Andreas Kainz 
CommitDate: Thu Sep 24 20:36:46 2020 +0200

plus minus sidebar icon theme update

Change-Id: I2b6f16b7c3ed6ca44ff166fcd30c16ec47376667
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103324
Tested-by: Jenkins
Reviewed-by: Andreas Kainz 

diff --git a/icon-themes/breeze/sfx2/res/grip.png 
b/icon-themes/breeze/sfx2/res/grip.png
index 588d7e4681d5..8a0ad5d16505 100644
Binary files a/icon-themes/breeze/sfx2/res/grip.png and 
b/icon-themes/breeze/sfx2/res/grip.png differ
diff --git a/icon-themes/breeze_dark/sfx2/res/grip.png 
b/icon-themes/breeze_dark/sfx2/res/grip.png
index 588d7e4681d5..383dc6d65830 100644
Binary files a/icon-themes/breeze_dark/sfx2/res/grip.png and 
b/icon-themes/breeze_dark/sfx2/res/grip.png differ
diff --git a/icon-themes/breeze_dark_svg/sfx2/res/grip.svg 
b/icon-themes/breeze_dark_svg/sfx2/res/grip.svg
index b6df27e932a0..1e06e2236e9e 100644
--- a/icon-themes/breeze_dark_svg/sfx2/res/grip.svg
+++ b/icon-themes/breeze_dark_svg/sfx2/res/grip.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
diff --git a/icon-themes/breeze_svg/sfx2/res/grip.svg 
b/icon-themes/breeze_svg/sfx2/res/grip.svg
index b6df27e932a0..80da8809945c 100644
--- a/icon-themes/breeze_svg/sfx2/res/grip.svg
+++ b/icon-themes/breeze_svg/sfx2/res/grip.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>/>
\ No newline at end of file
diff --git a/icon-themes/colibre/res/minus.png 
b/icon-themes/colibre/res/minus.png
index 63629b02f820..418382e2ac8e 100644
Binary files a/icon-themes/colibre/res/minus.png and 
b/icon-themes/colibre/res/minus.png differ
diff --git a/icon-themes/colibre/res/plus.png b/icon-themes/colibre/res/plus.png
index def0d22ec69b..5a0ba2a7b6d9 100644
Binary files a/icon-themes/colibre/res/plus.png and 
b/icon-themes/colibre/res/plus.png differ
diff --git a/icon-themes/colibre_svg/res/minus.svg 
b/icon-themes/colibre_svg/res/minus.svg
index 966a8a0ef50e..404609b39ade 100644
--- a/icon-themes/colibre_svg/res/minus.svg
+++ b/icon-themes/colibre_svg/res/minus.svg
@@ -1 +1,6 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
+  
+
diff --git a/icon-themes/colibre_svg/res/plus.svg 
b/icon-themes/colibre_svg/res/plus.svg
index 5312a9fe7686..23660b55ea99 100644
--- a/icon-themes/colibre_svg/res/plus.svg
+++ b/icon-themes/colibre_svg/res/plus.svg
@@ -1 +1,6 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
+  
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz (via logerrit)]

 sfx2/source/sidebar/Theme.cxx |   28 +++-
 1 file changed, 3 insertions(+), 25 deletions(-)

New commits:
commit cc2060fb21d48d775e5a85b9080c10589ab7287e
Author: andreas kainz 
AuthorDate: Thu Sep 24 17:04:02 2020 +0200
Commit: Andreas Kainz 
CommitDate: Thu Sep 24 20:37:39 2020 +0200

tdf#133690 Cleanup Sidebar theme

Change-Id: Ic639637d2556f0224c5c2ed85d632b7ca415ff3a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103322
Tested-by: Jenkins
Reviewed-by: Andreas Kainz 

diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index ac38db8f21e2..ce32455b0093 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -166,27 +166,9 @@ void Theme::UpdateTheme()
 setPropertyValue(
 maPropertyIdToNameMap[Paint_DeckTitleBarBackground],
 Any(sal_Int32(aBaseBackgroundColor.GetRGBColor(;
-setPropertyValue(
-maPropertyIdToNameMap[Int_DeckLeftPadding],
-Any(sal_Int32(2)));
-setPropertyValue(
-maPropertyIdToNameMap[Int_DeckTopPadding],
-Any(sal_Int32(2)));
-setPropertyValue(
-maPropertyIdToNameMap[Int_DeckRightPadding],
-Any(sal_Int32(2)));
-setPropertyValue(
-maPropertyIdToNameMap[Int_DeckBottomPadding],
-Any(sal_Int32(2)));
-setPropertyValue(
-maPropertyIdToNameMap[Int_DeckBorderSize],
-Any(sal_Int32(1)));
 setPropertyValue(
 maPropertyIdToNameMap[Int_DeckSeparatorHeight],
 Any(sal_Int32(1)));
-setPropertyValue(
-maPropertyIdToNameMap[Int_ButtonCornerRadius],
-Any(sal_Int32(3)));
 setPropertyValue(
 maPropertyIdToNameMap[Color_DeckTitleFont],
 Any(sal_Int32(rStyle.GetFontColor().GetRGBColor(;
@@ -202,11 +184,7 @@ void Theme::UpdateTheme()
 
 setPropertyValue(
 maPropertyIdToNameMap[Paint_PanelTitleBarBackground],
-Any(Tools::VclToAwtGradient(Gradient(
-GradientStyle::Linear,
-aSecondColor.GetRGBColor(),
-aBaseBackgroundColor.GetRGBColor()
-;
+Any(sal_Int32(aSecondColor.GetRGBColor(;
 setPropertyValue(
 maPropertyIdToNameMap[Color_PanelTitleFont],
 Any(sal_Int32(mbIsHighContrastMode ? 0x00ff00 : 0x262626)));
@@ -234,13 +212,13 @@ void Theme::UpdateTheme()
 
 setPropertyValue(
 maPropertyIdToNameMap[Int_TabMenuPadding],
-Any(sal_Int32(6)));
+Any(sal_Int32(3)));
 setPropertyValue(
 maPropertyIdToNameMap[Color_TabMenuSeparator],
 Any(sal_Int32(aBorderColor.GetRGBColor(;
 setPropertyValue(
 maPropertyIdToNameMap[Int_TabMenuSeparatorPadding],
-Any(sal_Int32(7)));
+Any(sal_Int32(3)));
 
 setPropertyValue(
 maPropertyIdToNameMap[Int_TabItemWidth],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/CppunitTest.mk |7 +++
 solenv/gbuild/PythonTest.mk  |6 --
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 5d67dcc922f831d91424cae8d8758f067a6781b0
Author: Stephan Bergmann 
AuthorDate: Thu Sep 24 17:44:23 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 24 20:37:56 2020 +0200

PythonTest CPPUNITTRACE='gdb --args' needs to tunnel setting LD_LIBRARY_PATH

...so that it doesn't affect gdb itself, just like CppunitTest already did.
Otherwise, e.g.

  make PythonTest_sc_python CPPUNITTRACE='gdb --args'

in a Linux ASan and --enable-python=fully-internal build on Fedora 32 would 
fail
with

> gdb: symbol lookup error: instdir/program/libpython3.8.so.1.0: undefined 
symbol: __asan_option_detect_stack_use_after_return

as /usr/bin/gdb would try to use LO's instdir/program/libpython3.8.so.1.0
instead of /usr/lib64/libpython3.8.so.1.0.

So, at least on Linux, the gb_PythonTest_PRECOMMAND settings are now passed 
into
the test process either directly upfront (if gb_PythonTest_GDBTRACE is not 
set)
or tunneled past gdb via gb_PythonTest_GDBTRACE (if it is set).  At least on
some platforms, gb_PythonTest_PRECOMMAND has a different value than
gb_CppunitTest_CPPTESTPRECOMMAND, so gb_CppunitTest_GDBTRACE would reflect 
the
settings from gb_CppunitTest_CPPTESTPRECOMMAND but not from
gb_PythonTest_PRECOMMAND, so introduce a new gb_PythonTest_GDBTRACE (which 
is to
gb_PythonTest_PRECOMMAND what gb_CppunitTest_GDBTRACE is to
gb_CppunitTest_CPPTESTPRECOMMAND).

macOS with its split gb_CppunitTest_{,PRE,POST}GDBTRACE variables will 
likely
need some work to adopt that to PythonTest, but which is rather orthogonal 
to
this change, so just note that as a TODO for now.

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

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 356b4317ab4f..cd28e578cc1e 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -28,14 +28,21 @@ ifneq ($(filter gdb,$(CPPUNITTRACE)),)
 gb_CppunitTest_GDBTRACE := $(subst gdb,\
gdb -return-child-result -ex "add-auto-load-safe-path $(INSTDIR)" -ex 
"set environment $(subst =, ,$(gb_CppunitTest_CPPTESTPRECOMMAND))" 
$(gb_CppunitTest_malloc_check) $(gb_CppunitTest_DEBUGCPPUNIT),\
$(CPPUNITTRACE))
+gb_PythonTest_GDBTRACE := $(subst gdb,\
+   gdb -return-child-result -ex "add-auto-load-safe-path $(INSTDIR)" -ex 
"set environment $(subst =, ,$(gb_PythonTest_PRECOMMAND))" 
$(gb_CppunitTest_malloc_check) $(gb_CppunitTest_DEBUGCPPUNIT),\
+   $(CPPUNITTRACE))
 else ifneq ($(filter lldb,$(CPPUNITTRACE)),)
 gb_CppunitTest_PREGDBTRACE := lo_dyldpathfile=$(call var2file,$(shell 
$(gb_MKTEMP)),500,settings set target.env-vars 
$(gb_CppunitTest_CPPTESTPRECOMMAND))
 gb_CppunitTest_GDBTRACE := $(subst lldb,\
lldb -s $$lo_dyldpathfile $(gb_CppunitTest_malloc_check),\
$(CPPUNITTRACE))
 gb_CppunitTest_POSTGDBTRACE := rm $$lo_dyldpathfile
+#TODO: PythonTest.mk probably needs to handle gb_CppunitTest_PREGDBTRACE and
+# gb_CppunitTest_POSTGDBTRACE in addition to gb_PythonTest_GDBTRACE (aka 
gb_CppunitTest_GDBTRACE):
+gb_PythonTest_GDBTRACE := $(gb_CppunitTest_GDBTRACE)
 else
 gb_CppunitTest_GDBTRACE := $(CPPUNITTRACE)
+gb_PythonTest_GDBTRACE := $(gb_CppunitTest_GDBTRACE)
 endif
 ifneq ($(strip $(DEBUGCPPUNIT)),TRUE)
 gb_CppunitTest__interactive := $(true)
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index 52ecbffe7f1c..998df0767d2c 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -9,6 +9,8 @@
 
 # PythonTest class
 
+# (gb_PythonTest_GDBTRACE is defined alongside gb_CppunitTest_GDBTRACE in 
CppunitTest.mk)
+
 gb_PythonTest_UNITTESTFAILED ?= 
$(GBUILDDIR)/platform/unittest-failed-default.sh
 
 ifeq ($(SYSTEM_PYTHON),)
@@ -46,7 +48,7 @@ else
$(if $(gb_CppunitTest__interactive),, \
$(if $(value gb_CppunitTest_postprocess), \
rm -fr $@.core && mkdir $@.core && cd $@.core 
&&)) \
-   ($(gb_PythonTest_PRECOMMAND) \
+   ($(if $(filter 
gdb,$(gb_PythonTest_GDBTRACE)),,$(gb_PythonTest_PRECOMMAND)) \
$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
$(if 
$(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
$(DEFS) \
@@ -57,7 +59,7 @@ else
TestUserDir="$(call gb_Helper_make_url,$(dir $(call 
gb_PythonTest_get_target,$*)))" \
PYTHONDONTWRITEBYTECODE=1 \
$(gb_TEST_ENV_VARS) \
-   $(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) 
$(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_RR) \
+   $(ICECREAM_RUN) $(gb_PythonTest_GDBTRACE) 
$(gb_Cppun

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

[Michael Stahl (via logerrit)]

 sw/inc/IDocumentSettingAccess.hxx |1 +
 sw/qa/extras/layout/layout.cxx|7 +++
 sw/source/core/doc/DocumentSettingManager.cxx |   11 +++
 sw/source/core/inc/DocumentSettingManager.hxx |1 +
 sw/source/core/layout/calcmove.cxx|   16 +---
 sw/source/core/layout/flowfrm.cxx |   12 ++--
 sw/source/core/layout/frmtool.cxx |2 +-
 sw/source/filter/ww8/ww8par.cxx   |1 +
 sw/source/filter/xml/xmlimp.cxx   |7 +++
 sw/source/uibase/uno/SwXDocumentSettings.cxx  |   13 +
 writerfilter/source/filter/WriterFilter.cxx   |1 +
 11 files changed, 62 insertions(+), 10 deletions(-)

New commits:
commit 38aa699f265c17548769aaa4f20e1ae35d18f202
Author: Michael Stahl 
AuthorDate: Wed Sep 23 15:14:08 2020 +0200
Commit: Michael Stahl 
CommitDate: Thu Sep 24 20:56:27 2020 +0200

tdf#134782 sw: split AddParaSpacingToTableCells flag in 2

commit 3cccdabf19a99fd3f657985c1822436d7679df2b "extend
AddParaSpacingToTableCells with line spacing" changed how the
ADD_PARA_SPACING_TO_TABLE_CELLS compat flag works, to improve interop
with Word.

This commit splits out the change as a separate new compat flag
ADD_PARA_LINE_SPACING_TO_TABLE_CELLS ("AddParaLineSpacingToTableCells"),
to preserve compatibility with ODT documents that were produced
by LO < 6.4 (via SwXMLImport::SetConfigurationSettings()).

New documents and WW8/RTF/DOCX import have both flags enabled.

The combination false/true is invalid, and treated as equivalent
to false/false.

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

diff --git a/sw/inc/IDocumentSettingAccess.hxx 
b/sw/inc/IDocumentSettingAccess.hxx
index 2ae267d08fe0..c7dd852d3d23 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -47,6 +47,7 @@ enum class DocumentSettingId
 USE_HIRES_VIRTUAL_DEVICE,
 OLD_LINE_SPACING,
 ADD_PARA_SPACING_TO_TABLE_CELLS,
+ADD_PARA_LINE_SPACING_TO_TABLE_CELLS,
 USE_FORMER_OBJECT_POS,
 USE_FORMER_TEXT_WRAPPING,
 CONSIDER_WRAP_ON_OBJECT_POSITION,
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index ce0a43f8c213..194fea99d3b1 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -1196,10 +1196,9 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, 
testTableOverlapFooterFly)
 assertXPath(pLayout, 
"/root/page[2]/body/tab[1]/row[5]/cell[5]/txt[1]/Text", "Portion",
 "Abc def ghi jkl mno pqr stu vwx yz.");
 // height was: 1517
-assertXPath(
-pLayout, 
"/root/page[2]/body/tab[1]/row[5]/cell[5]/txt[1]/infos/bounds", "height",
-// "253"); // FIXME: this is correct but 
3cccdabf19a99fd3f657985c1822436d7679df2b breaks it
-"379");
+// tdf#134782 height was: 379
+assertXPath(pLayout, 
"/root/page[2]/body/tab[1]/row[5]/cell[5]/txt[1]/infos/bounds", "height",
+"253");
 }
 
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf134277)
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx 
b/sw/source/core/doc/DocumentSettingManager.cxx
index c1355c6b6319..febce5528ea7 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -117,6 +117,7 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc 
&rDoc)
 mbAddExternalLeading= !aOptions.GetDefault( 
SvtCompatibilityEntry::Index::NoExtLeading );
 mbOldLineSpacing= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::UseLineSpacing );
 mbAddParaSpacingToTableCells= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::AddTableSpacing );
+mbAddParaLineSpacingToTableCells= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::AddTableSpacing ); // FIXME? separate UI?
 mbUseFormerObjectPos= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::UseObjectPositioning );
 mbUseFormerTextWrapping = aOptions.GetDefault( 
SvtCompatibilityEntry::Index::UseOurTextWrapping );
 mbConsiderWrapOnObjPos  = aOptions.GetDefault( 
SvtCompatibilityEntry::Index::ConsiderWrappingStyle );
@@ -136,6 +137,7 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc 
&rDoc)
 mbAddExternalLeading= true;
 mbOldLineSpacing= false;
 mbAddParaSpacingToTableCells= false;
+mbAddParaLineSpacingToTableCells= false;
 mbUseFormerObjectPos= false;
 mbUseFormerTextWrapping = false;
 mbConsiderWrapOnObjPos  = false;
@@ -172,6 +174,7 @@ bool sw::DocumentSettingManager::get(/*[in]*/ 
DocumentSettingId id) const
 case

[Libreoffice-commits] core.git: include/unotools officecfg/registry sw/source sw/uiconfig unotools/source

[Michael Stahl (via logerrit)]

 include/unotools/compatibility.hxx|4 
 officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs |8 +
 sw/source/core/doc/DocumentSettingManager.cxx |2 
 sw/source/core/view/viewsh.cxx|5 -
 sw/source/ui/config/optcomp.cxx   |   48 
--
 sw/uiconfig/swriter/ui/optcompatpage.ui   |1 
 unotools/source/config/compatibility.cxx  |2 
 7 files changed, 62 insertions(+), 8 deletions(-)

New commits:
commit 68aec8fd57eda8c05926b7f361dc102772f2c501
Author: Michael Stahl 
AuthorDate: Wed Sep 23 18:51:54 2020 +0200
Commit: Michael Stahl 
CommitDate: Thu Sep 24 20:58:13 2020 +0200

tdf#134782 sw,unotools,officecfg: adapt configuration and UI

Store AddParaLineSpacingToTableCells in configuration as
"AddTableLineSpacing", consistently inconsistent like AddTableSpacing
(the  elements are not subject to translation).

Adapt SwCompatibilityOptPage with some ugly hacks to allow 3 different
states (TriState) for the corresponding checkbox that map to false/false,
true/false and true/true.

The checkbox widget doesn't allow to change *to* indeterminate but at
least the status of the document can be displayed this way,
with a non-obvious tweak to optcompatpage.ui to reference "checktri1"
column.

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

diff --git a/include/unotools/compatibility.hxx 
b/include/unotools/compatibility.hxx
index feae53faec8c..39674470e125 100644
--- a/include/unotools/compatibility.hxx
+++ b/include/unotools/compatibility.hxx
@@ -62,6 +62,10 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityEntry
 MsWordTrailingBlanks,
 SubtractFlysAnchoredAtFlys,
 EmptyDbFieldHidesPara,
+/// special entry: optcomp.cxx converts the other values to
+/// integers but not this one because it doesn't have its own
+/// checkbox, so keep it at the end!
+AddTableLineSpacing,
 
 /* Should be at the end. Do not remove it. */
 INVALID
diff --git a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
index 10468d11e3f4..5b89f9498005 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
@@ -76,7 +76,13 @@
   
   
 
-  ???
+  Add paragraph and table spacing at bottom of table cells
+
+true
+  
+  
+
+  Add paragraph line spacing at bottom of table cells
 
 true
   
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx 
b/sw/source/core/doc/DocumentSettingManager.cxx
index febce5528ea7..5f609221752f 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -117,7 +117,7 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc 
&rDoc)
 mbAddExternalLeading= !aOptions.GetDefault( 
SvtCompatibilityEntry::Index::NoExtLeading );
 mbOldLineSpacing= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::UseLineSpacing );
 mbAddParaSpacingToTableCells= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::AddTableSpacing );
-mbAddParaLineSpacingToTableCells= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::AddTableSpacing ); // FIXME? separate UI?
+mbAddParaLineSpacingToTableCells= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::AddTableLineSpacing );
 mbUseFormerObjectPos= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::UseObjectPositioning );
 mbUseFormerTextWrapping = aOptions.GetDefault( 
SvtCompatibilityEntry::Index::UseOurTextWrapping );
 mbConsiderWrapOnObjPos  = aOptions.GetDefault( 
SvtCompatibilityEntry::Index::ConsiderWrappingStyle );
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 7f2f6e4466bb..52a82345ef65 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -822,10 +822,13 @@ void SwViewShell::SetUseVirDev( bool bNewVirtual )
 void SwViewShell::SetAddParaSpacingToTableCells( bool 
_bAddParaSpacingToTableCells )
 {
 IDocumentSettingAccess& rIDSA = getIDocumentSettingAccess();
-if ( rIDSA.get(DocumentSettingId::ADD_PARA_SPACING_TO_TABLE_CELLS) != 
_bAddParaSpacingToTableCells )
+if (rIDSA.get(DocumentSettingId::ADD_PARA_SPACING_TO_TABLE_CELLS) != 
_bAddParaSpacingToTableCells
+|| rIDSA.get(DocumentSettingId::ADD_PARA_LINE_SPACING_TO_TABLE_CELLS) 
!= _bAddParaSpac

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

[Caolán McNamara (via logerrit)]

 sw/source/filter/basflt/fltshell.cxx |   16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

New commits:
commit 73f3028b501c72fb802aa15d0f450afd241e57c6
Author: Caolán McNamara 
AuthorDate: Thu Sep 24 16:06:00 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 24 21:35:00 2020 +0200

ofz#25908 detect if the SwFrameFormat is deleted

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

diff --git a/sw/source/filter/basflt/fltshell.cxx 
b/sw/source/filter/basflt/fltshell.cxx
index 4f725a98b9a9..ceae383380af 100644
--- a/sw/source/filter/basflt/fltshell.cxx
+++ b/sw/source/filter/basflt/fltshell.cxx
@@ -962,7 +962,15 @@ SwFltAnchorListener::SwFltAnchorListener(SwFltAnchor* 
pFltAnchor)
 
 void SwFltAnchorListener::Notify(const SfxHint& rHint)
 {
-if(auto pLegacyHint = dynamic_cast(&rHint))
+if (rHint.GetId() == SfxHintId::Dying)
+m_pFltAnchor->SetFrameFormat(nullptr);
+else if (auto pDrawFrameFormatHint = dynamic_cast(&rHint))
+{
+if (pDrawFrameFormatHint->m_eId != sw::DrawFrameFormatHintId::DYING)
+return;
+m_pFltAnchor->SetFrameFormat(nullptr);
+}
+else if (auto pLegacyHint = dynamic_cast(&rHint))
 {
 if(pLegacyHint->m_pNew->Which() != RES_FMT_CHG)
 return;
@@ -971,12 +979,6 @@ void SwFltAnchorListener::Notify(const SfxHint& rHint)
 if(pFrameFormat)
 m_pFltAnchor->SetFrameFormat(pFrameFormat);
 }
-else if (auto pDrawFrameFormatHint = dynamic_cast(&rHint))
-{
-if (pDrawFrameFormatHint->m_eId != sw::DrawFrameFormatHintId::DYING)
-return;
-m_pFltAnchor->SetFrameFormat(nullptr);
-}
 }
 
 // methods of SwFltRedline follow
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - i18nlangtag/source i18npool/Library_localedata_others.mk i18npool/source include/i18nlangtag

[Eike Rathke (via logerrit)]

 i18nlangtag/source/isolang/isolang.cxx|1 
 i18npool/Library_localedata_others.mk |1 
 i18npool/source/localedata/data/en_KE.xml |   42 ++
 i18npool/source/localedata/localedata.cxx |3 +-
 include/i18nlangtag/lang.h|1 
 5 files changed, 47 insertions(+), 1 deletion(-)

New commits:
commit 34b2f0d5c6634942486ed62527732b2184eb758c
Author: Eike Rathke 
AuthorDate: Thu Sep 24 11:42:15 2020 +0200
Commit: Caolán McNamara 
CommitDate: Thu Sep 24 21:40:39 2020 +0200

Resolves: tdf#115436 Add English Kenya {en-KE} locale data

 This is a combination of 2 commits.

Add English Kenya LCID 0xAC09 {en-KE} langtag mapping, tdf#115436

I0c32ffa2d7f316b3e97dc597da8539842ad51367
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103300
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit 23ff2c96709e48e06aa0a9dee237b73935cd60e5)

Resolves: tdf#115436 Add English Kenya {en-KE} locale data

I06b9479e48bfcc3421ae1ec634064f9f3209cffd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103301
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit ae8995694da9ca29a62d13e6a320e5d39f4727e8)

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

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 8151d5e29640..730890a2428c 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -689,6 +689,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_MINANGKABAU,   "min", "ID", k0},
 { LANGUAGE_USER_SUNDANESE, "sun", "ID", k0},
 { LANGUAGE_USER_YAKA_DRCONGO,  "yaf", "CD", k0},
+{ LANGUAGE_USER_ENGLISH_KENYA,  "en", "KE", k0},
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0},// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0},// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0},// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/i18npool/Library_localedata_others.mk 
b/i18npool/Library_localedata_others.mk
index 62436f1a817d..f1cb28820c6d 100644
--- a/i18npool/Library_localedata_others.mk
+++ b/i18npool/Library_localedata_others.mk
@@ -51,6 +51,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,localedata_others,\
CustomTarget/i18npool/localedata/localedata_ebo_CG \
CustomTarget/i18npool/localedata/localedata_ee_GH \
CustomTarget/i18npool/localedata/localedata_en_IN \
+   CustomTarget/i18npool/localedata/localedata_en_KE \
CustomTarget/i18npool/localedata/localedata_en_MY \
CustomTarget/i18npool/localedata/localedata_eo \
CustomTarget/i18npool/localedata/localedata_fa_IR \
diff --git a/i18npool/source/localedata/data/en_KE.xml 
b/i18npool/source/localedata/data/en_KE.xml
new file mode 100644
index ..cb4811d73229
--- /dev/null
+++ b/i18npool/source/localedata/data/en_KE.xml
@@ -0,0 +1,42 @@
+
+
+
+
+  
+
+  en
+  English
+
+
+  KE
+  Kenya
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+  KES
+  KSh
+  KES
+  Kenyan shilling
+  2
+
+  
+  
+  
+  
+  
+
+
diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index 4a8e565dc8e1..a0fbd8361068 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -330,7 +330,8 @@ static const struct {
 { "ilo_PH", lcl_DATA_OTHERS },
 { "ha_Latn_NG",  lcl_DATA_OTHERS },
 { "min_ID", lcl_DATA_OTHERS },
-{ "sun_ID", lcl_DATA_OTHERS }
+{ "sun_ID", lcl_DATA_OTHERS },
+{ "en_KE",  lcl_DATA_OTHERS }
 };
 
 #else
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 96df56181159..d3b0ece0bce6 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -761,6 +761,7 @@ namespace o3tl
 #define LANGUAGE_USER_MINANGKABAU   LanguageType(0x06A7)
 #define LANGUAGE_USER_SUNDANESE LanguageType(0x06A8)
 #define LANGUAGE_USER_YAKA_DRCONGO  LanguageType(0x06A9)
+#define LANGUAGE_USER_ENGLISH_KENYA LanguageType(0xAC09)  /* 
makeLangID( 0x2B, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 configure.ac   |   17 -
 solenv/gbuild/platform/com_GCC_defs.mk |4 
 2 files changed, 8 insertions(+), 13 deletions(-)

New commits:
commit 03d5167455a5cbadfad9a2d5989574b1d1929857
Author: Tor Lillqvist 
AuthorDate: Thu Sep 24 19:42:14 2020 +0100
Commit: Tor Lillqvist 
CommitDate: Thu Sep 24 22:36:22 2020 +0200

Use -flto=thin in gb_LTOFLAGS for Apple's Clang (for macOS and iOS)

Don't add any LTO flags into $CC and $CXX as we don't do that for
other platforms either. But maybe we should? Currently, with the
separate gb_LTOFLAGS, we have to handle each external project
separately to make it build with LTO.

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

diff --git a/configure.ac b/configure.ac
index 11f1bc87e4ae..1ea6b255bb23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3001,9 +3001,6 @@ if test $_os = Darwin; then
 INSTALL_NAME_TOOL=install_name_tool
 if test -z "$save_CC"; then
 stdlib=-stdlib=libc++
-if test "$ENABLE_LTO" = TRUE; then
-lto=-flto
-fi
 
 AC_MSG_CHECKING([what C compiler to use])
 CC="`xcrun -find clang`"
@@ -3013,7 +3010,7 @@ if test $_os = Darwin; then
 else
 CC+=" -target arm64-apple-macos"
 fi
-CC+=" $lto -mmacosx-version-min=$with_macosx_version_min_required 
-isysroot $MACOSX_SDK_PATH"
+CC+=" -mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH"
 AC_MSG_RESULT([$CC])
 
 AC_MSG_CHECKING([what C++ compiler to use])
@@ -3024,7 +3021,7 @@ if test $_os = Darwin; then
 else
 CXX+=" -target arm64-apple-macos"
 fi
-CXX+=" $lto $stdlib 
-mmacosx-version-min=$with_macosx_version_min_required -isysroot 
$MACOSX_SDK_PATH"
+CXX+=" $stdlib -mmacosx-version-min=$with_macosx_version_min_required 
-isysroot $MACOSX_SDK_PATH"
 AC_MSG_RESULT([$CXX])
 
 INSTALL_NAME_TOOL=`xcrun -find install_name_tool`
@@ -3193,24 +3190,18 @@ if test $_os = iOS; then
 
 AC_MSG_RESULT($sysroot)
 
-# LTO is not really recommended for iOS builds,
-# the link time will be astronomical
-if test "$ENABLE_LTO" = TRUE; then
-lto=-flto
-fi
-
 stdlib="-stdlib=libc++"
 
 AC_MSG_CHECKING([what C compiler to use])
 CC="`xcrun -find clang`"
 CC_BASE=`first_arg_basename "$CC"`
-CC+=" -arch $host_cpu_for_clang -isysroot $sysroot $lto $versionmin"
+CC+=" -arch $host_cpu_for_clang -isysroot $sysroot $versionmin"
 AC_MSG_RESULT([$CC])
 
 AC_MSG_CHECKING([what C++ compiler to use])
 CXX="`xcrun -find clang++`"
 CXX_BASE=`first_arg_basename "$CXX"`
-CXX+=" -arch $host_cpu_for_clang $stdlib -isysroot $sysroot $lto 
$versionmin"
+CXX+=" -arch $host_cpu_for_clang $stdlib -isysroot $sysroot $versionmin"
 AC_MSG_RESULT([$CXX])
 
 INSTALL_NAME_TOOL=`xcrun -find install_name_tool`
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 0480b0fc3fd5..047f121106de 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -177,8 +177,12 @@ gb_CFLAGS_COMMON += -std=gnu89
 
 ifeq ($(ENABLE_LTO),TRUE)
 ifeq ($(COM_IS_CLANG),TRUE)
+ifneq (,$(index,iOS MACOSX,$(OS)))
+gb_LTOFLAGS := -flto=thin
+else
 gb_LTOFLAGS := -flto
 gb_LTOPLUGINFLAGS := --plugin LLVMgold.so
+endif
 else
 gb_LTOFLAGS := -flto$(if $(filter-out 0,$(PARALLELISM)),=$(PARALLELISM)) 
-fuse-linker-plugin -O2
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz (via logerrit)]

 svx/uiconfig/ui/sidebarparagraph.ui |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit d237230ea014ba7a792c5ebccab28abe09868fc7
Author: andreas kainz 
AuthorDate: Thu Sep 24 21:43:37 2020 +0200
Commit: Andreas Kainz 
CommitDate: Fri Sep 25 00:22:54 2020 +0200

Paragraph Sidebar Align image icons

Change-Id: Ifac10b5c66b2f7273ffe33f3929ac5cb1e7b2a17
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103355
Tested-by: Jenkins
Reviewed-by: Andreas Kainz 

diff --git a/svx/uiconfig/ui/sidebarparagraph.ui 
b/svx/uiconfig/ui/sidebarparagraph.ui
index 49d18aef5dc6..1234b536f25f 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -267,6 +267,8 @@
 False
 center
 center
+6
+3
 svx/res/symphony/spacing1.png
   
   
@@ -313,6 +315,8 @@
 False
 center
 center
+6
+3
 svx/res/symphony/spacing2.png
   
   
@@ -355,6 +359,7 @@
 icons
 False
 2
+3
 
   
 True
@@ -464,6 +469,8 @@
 False
 center
 center
+6
+3
 svx/res/symphony/Indent4.png
   
   
@@ -510,6 +517,8 @@
 False
 center
 center
+6
+3
 svx/res/symphony/Indent3.png
   
   
@@ -556,6 +565,8 @@
 False
 center
 center
+6
+3
 svx/res/symphony/Indent2.png
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - include/unotools officecfg/registry sw/source sw/uiconfig unotools/source

[Michael Stahl (via logerrit)]

 include/unotools/compatibility.hxx|4 
 officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs |8 +
 sw/source/core/doc/DocumentSettingManager.cxx |2 
 sw/source/core/view/viewsh.cxx|5 -
 sw/source/ui/config/optcomp.cxx   |   48 
--
 sw/uiconfig/swriter/ui/optcompatpage.ui   |1 
 unotools/source/config/compatibility.cxx  |2 
 7 files changed, 62 insertions(+), 8 deletions(-)

New commits:
commit b8cbc02fbd4d8662de75d5a7a3bab6525caf766d
Author: Michael Stahl 
AuthorDate: Wed Sep 23 18:51:54 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Sep 25 01:20:20 2020 +0200

tdf#134782 sw,unotools,officecfg: adapt configuration and UI

Store AddParaLineSpacingToTableCells in configuration as
"AddTableLineSpacing", consistently inconsistent like AddTableSpacing
(the  elements are not subject to translation).

Adapt SwCompatibilityOptPage with some ugly hacks to allow 3 different
states (TriState) for the corresponding checkbox that map to false/false,
true/false and true/true.

The checkbox widget doesn't allow to change *to* indeterminate but at
least the status of the document can be displayed this way,
with a non-obvious tweak to optcompatpage.ui to reference "checktri1"
column.

Change-Id: I5f32e05c93b5e16e782cba5d1d055809d9e5e251
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103318
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 68aec8fd57eda8c05926b7f361dc102772f2c501)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103358
Reviewed-by: Thorsten Behrens 

diff --git a/include/unotools/compatibility.hxx 
b/include/unotools/compatibility.hxx
index feae53faec8c..39674470e125 100644
--- a/include/unotools/compatibility.hxx
+++ b/include/unotools/compatibility.hxx
@@ -62,6 +62,10 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityEntry
 MsWordTrailingBlanks,
 SubtractFlysAnchoredAtFlys,
 EmptyDbFieldHidesPara,
+/// special entry: optcomp.cxx converts the other values to
+/// integers but not this one because it doesn't have its own
+/// checkbox, so keep it at the end!
+AddTableLineSpacing,
 
 /* Should be at the end. Do not remove it. */
 INVALID
diff --git a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
index a2d4a8dc4c53..9c93c9513301 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
@@ -76,7 +76,13 @@
   
   
 
-  ???
+  Add paragraph and table spacing at bottom of table cells
+
+true
+  
+  
+
+  Add paragraph line spacing at bottom of table cells
 
 true
   
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx 
b/sw/source/core/doc/DocumentSettingManager.cxx
index 0a8f465e1736..ca68d3e306ce 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -116,7 +116,7 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc 
&rDoc)
 mbAddExternalLeading= !aOptions.GetDefault( 
SvtCompatibilityEntry::Index::NoExtLeading );
 mbOldLineSpacing= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::UseLineSpacing );
 mbAddParaSpacingToTableCells= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::AddTableSpacing );
-mbAddParaLineSpacingToTableCells= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::AddTableSpacing ); // FIXME? separate UI?
+mbAddParaLineSpacingToTableCells= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::AddTableLineSpacing );
 mbUseFormerObjectPos= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::UseObjectPositioning );
 mbUseFormerTextWrapping = aOptions.GetDefault( 
SvtCompatibilityEntry::Index::UseOurTextWrapping );
 mbConsiderWrapOnObjPos  = aOptions.GetDefault( 
SvtCompatibilityEntry::Index::ConsiderWrappingStyle );
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index ff036d9b9014..ef26275ab9fd 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -822,10 +822,13 @@ void SwViewShell::SetUseVirDev( bool bNewVirtual )
 void SwViewShell::SetAddParaSpacingToTableCells( bool 
_bAddParaSpacingToTableCells )
 {
 IDocumentSettingAccess& rIDSA = getIDocumentSettingAccess();
-if ( rIDSA.get(DocumentSettingId::ADD_PARA_SPACING_TO_TABLE_CELLS) != 
_bAddParaSpacingToTableCells )
+if (rIDSA.get(Docume

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

[Michael Stahl (via logerrit)]

 sw/inc/IDocumentSettingAccess.hxx |1 +
 sw/qa/extras/layout/layout.cxx|7 +++
 sw/source/core/doc/DocumentSettingManager.cxx |   11 +++
 sw/source/core/inc/DocumentSettingManager.hxx |1 +
 sw/source/core/layout/calcmove.cxx|   16 +---
 sw/source/core/layout/flowfrm.cxx |   12 ++--
 sw/source/core/layout/frmtool.cxx |2 +-
 sw/source/filter/ww8/ww8par.cxx   |1 +
 sw/source/filter/xml/xmlimp.cxx   |7 +++
 sw/source/uibase/uno/SwXDocumentSettings.cxx  |   13 +
 writerfilter/source/filter/WriterFilter.cxx   |1 +
 11 files changed, 62 insertions(+), 10 deletions(-)

New commits:
commit dc1ce5130a8df5017662c83be26bdada6098ee37
Author: Michael Stahl 
AuthorDate: Wed Sep 23 15:14:08 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Sep 25 01:19:42 2020 +0200

tdf#134782 sw: split AddParaSpacingToTableCells flag in 2

commit 3cccdabf19a99fd3f657985c1822436d7679df2b "extend
AddParaSpacingToTableCells with line spacing" changed how the
ADD_PARA_SPACING_TO_TABLE_CELLS compat flag works, to improve interop
with Word.

This commit splits out the change as a separate new compat flag
ADD_PARA_LINE_SPACING_TO_TABLE_CELLS ("AddParaLineSpacingToTableCells"),
to preserve compatibility with ODT documents that were produced
by LO < 6.4 (via SwXMLImport::SetConfigurationSettings()).

New documents and WW8/RTF/DOCX import have both flags enabled.

The combination false/true is invalid, and treated as equivalent
to false/false.

Change-Id: Ida20df8fe4a8192a714f91da95345f9726fd7d98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103317
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 38aa699f265c17548769aaa4f20e1ae35d18f202)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103331
Reviewed-by: Thorsten Behrens 

diff --git a/sw/inc/IDocumentSettingAccess.hxx 
b/sw/inc/IDocumentSettingAccess.hxx
index 737e1f8d5902..2388b3ad45d5 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -47,6 +47,7 @@ enum class DocumentSettingId
 USE_HIRES_VIRTUAL_DEVICE,
 OLD_LINE_SPACING,
 ADD_PARA_SPACING_TO_TABLE_CELLS,
+ADD_PARA_LINE_SPACING_TO_TABLE_CELLS,
 USE_FORMER_OBJECT_POS,
 USE_FORMER_TEXT_WRAPPING,
 CONSIDER_WRAP_ON_OBJECT_POSITION,
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 44512e2ce8a2..038ee2812785 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -1140,10 +1140,9 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, 
testTableOverlapFooterFly)
 assertXPath(pLayout, 
"/root/page[2]/body/tab[1]/row[5]/cell[5]/txt[1]/Text", "Portion",
 "Abc def ghi jkl mno pqr stu vwx yz.");
 // height was: 1517
-assertXPath(
-pLayout, 
"/root/page[2]/body/tab[1]/row[5]/cell[5]/txt[1]/infos/bounds", "height",
-// "253"); // FIXME: this is correct but 
3cccdabf19a99fd3f657985c1822436d7679df2b breaks it
-"379");
+// tdf#134782 height was: 379
+assertXPath(pLayout, 
"/root/page[2]/body/tab[1]/row[5]/cell[5]/txt[1]/infos/bounds", "height",
+"253");
 }
 
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf134277)
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx 
b/sw/source/core/doc/DocumentSettingManager.cxx
index 6cc92e62daf3..0a8f465e1736 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -116,6 +116,7 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc 
&rDoc)
 mbAddExternalLeading= !aOptions.GetDefault( 
SvtCompatibilityEntry::Index::NoExtLeading );
 mbOldLineSpacing= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::UseLineSpacing );
 mbAddParaSpacingToTableCells= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::AddTableSpacing );
+mbAddParaLineSpacingToTableCells= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::AddTableSpacing ); // FIXME? separate UI?
 mbUseFormerObjectPos= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::UseObjectPositioning );
 mbUseFormerTextWrapping = aOptions.GetDefault( 
SvtCompatibilityEntry::Index::UseOurTextWrapping );
 mbConsiderWrapOnObjPos  = aOptions.GetDefault( 
SvtCompatibilityEntry::Index::ConsiderWrappingStyle );
@@ -135,6 +136,7 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc 
&rDoc)
 mbAddExternalLeading= true;
 mbOldLineSpacing= false;
 mbAddParaSpacingToTableCells= false;
+mbAddParaLineSpacingToTableCells= false;
 mbUseFormerObjectPos= false;
 mbUseFormerTextWrapping 

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/inc sw/source writerfilter/source

[Michael Stahl (via logerrit)]

 sw/inc/IDocumentSettingAccess.hxx |1 +
 sw/source/core/doc/DocumentSettingManager.cxx |7 +++
 sw/source/core/inc/DocumentSettingManager.hxx |1 +
 sw/source/core/layout/calcmove.cxx|   16 +---
 sw/source/core/layout/flowfrm.cxx |   12 ++--
 sw/source/core/layout/frmtool.cxx |2 +-
 sw/source/filter/ww8/ww8par.cxx   |1 +
 sw/source/filter/xml/xmlimp.cxx   |7 +++
 sw/source/uibase/uno/SwXDocumentSettings.cxx  |   13 +
 writerfilter/source/filter/WriterFilter.cxx   |1 +
 10 files changed, 55 insertions(+), 6 deletions(-)

New commits:
commit d731b65d3c6b58ed98ee60488d07e5cba653ede0
Author: Michael Stahl 
AuthorDate: Wed Sep 23 15:14:08 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Sep 25 03:37:50 2020 +0200

tdf#134782 sw: split AddParaSpacingToTableCells flag in 2

commit 3cccdabf19a99fd3f657985c1822436d7679df2b "extend
AddParaSpacingToTableCells with line spacing" changed how the
ADD_PARA_SPACING_TO_TABLE_CELLS compat flag works, to improve interop
with Word.

This commit splits out the change as a separate new compat flag
ADD_PARA_LINE_SPACING_TO_TABLE_CELLS ("AddParaLineSpacingToTableCells"),
to preserve compatibility with ODT documents that were produced
by LO < 6.4 (via SwXMLImport::SetConfigurationSettings()).

New documents and WW8/RTF/DOCX import have both flags enabled.

The combination false/true is invalid, and treated as equivalent
to false/false.

Change-Id: Ida20df8fe4a8192a714f91da95345f9726fd7d98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103317
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 38aa699f265c17548769aaa4f20e1ae35d18f202)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103359
Reviewed-by: Thorsten Behrens 

diff --git a/sw/inc/IDocumentSettingAccess.hxx 
b/sw/inc/IDocumentSettingAccess.hxx
index 814f139b64fc..5b093bc0d08a 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -47,6 +47,7 @@ enum class DocumentSettingId
 USE_HIRES_VIRTUAL_DEVICE,
 OLD_LINE_SPACING,
 ADD_PARA_SPACING_TO_TABLE_CELLS,
+ADD_PARA_LINE_SPACING_TO_TABLE_CELLS,
 USE_FORMER_OBJECT_POS,
 USE_FORMER_TEXT_WRAPPING,
 CONSIDER_WRAP_ON_OBJECT_POSITION,
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx 
b/sw/source/core/doc/DocumentSettingManager.cxx
index b7f3af73d2af..a29c5bc6275f 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -112,6 +112,7 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc 
&rDoc)
 mbAddExternalLeading= !aOptions.GetDefault( 
SvtCompatibilityEntry::Index::NoExtLeading );
 mbOldLineSpacing= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::UseLineSpacing );
 mbAddParaSpacingToTableCells= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::AddTableSpacing );
+mbAddParaLineSpacingToTableCells= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::AddTableSpacing ); // FIXME? separate UI?
 mbUseFormerObjectPos= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::UseObjectPositioning );
 mbUseFormerTextWrapping = aOptions.GetDefault( 
SvtCompatibilityEntry::Index::UseOurTextWrapping );
 mbConsiderWrapOnObjPos  = aOptions.GetDefault( 
SvtCompatibilityEntry::Index::ConsiderWrappingStyle );
@@ -131,6 +132,7 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc 
&rDoc)
 mbAddExternalLeading= true;
 mbOldLineSpacing= false;
 mbAddParaSpacingToTableCells= false;
+mbAddParaLineSpacingToTableCells= false;
 mbUseFormerObjectPos= false;
 mbUseFormerTextWrapping = false;
 mbConsiderWrapOnObjPos  = false;
@@ -167,6 +169,7 @@ bool sw::DocumentSettingManager::get(/*[in]*/ 
DocumentSettingId id) const
 case DocumentSettingId::OLD_NUMBERING: return mbOldNumbering;
 case DocumentSettingId::OLD_LINE_SPACING: return mbOldLineSpacing;
 case DocumentSettingId::ADD_PARA_SPACING_TO_TABLE_CELLS: return 
mbAddParaSpacingToTableCells;
+case DocumentSettingId::ADD_PARA_LINE_SPACING_TO_TABLE_CELLS: return 
mbAddParaLineSpacingToTableCells;
 case DocumentSettingId::USE_FORMER_OBJECT_POS: return 
mbUseFormerObjectPos;
 case DocumentSettingId::USE_FORMER_TEXT_WRAPPING: return 
mbUseFormerTextWrapping;
 case DocumentSettingId::CONSIDER_WRAP_ON_OBJECT_POSITION: return 
mbConsiderWrapOnObjPos;
@@ -283,6 +286,9 @@ void sw::DocumentSettingManager::set(/*[in]*/ 
DocumentSettingId id, /*[in]*/ boo
 case DocumentSettingId::ADD_PARA_SPACING_TO_TABLE_CELLS:

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - include/unotools officecfg/registry sw/source sw/uiconfig unotools/source

[Michael Stahl (via logerrit)]

 include/unotools/compatibility.hxx|4 
 officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs |8 +
 sw/source/core/doc/DocumentSettingManager.cxx |2 
 sw/source/core/view/viewsh.cxx|5 -
 sw/source/ui/config/optcomp.cxx   |   48 
--
 sw/uiconfig/swriter/ui/optcompatpage.ui   |1 
 unotools/source/config/compatibility.cxx  |2 
 7 files changed, 62 insertions(+), 8 deletions(-)

New commits:
commit 70b2ee8ce4aa081a608bbde4f3125300675934c5
Author: Michael Stahl 
AuthorDate: Wed Sep 23 18:51:54 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Sep 25 03:38:08 2020 +0200

tdf#134782 sw,unotools,officecfg: adapt configuration and UI

Store AddParaLineSpacingToTableCells in configuration as
"AddTableLineSpacing", consistently inconsistent like AddTableSpacing
(the  elements are not subject to translation).

Adapt SwCompatibilityOptPage with some ugly hacks to allow 3 different
states (TriState) for the corresponding checkbox that map to false/false,
true/false and true/true.

The checkbox widget doesn't allow to change *to* indeterminate but at
least the status of the document can be displayed this way,
with a non-obvious tweak to optcompatpage.ui to reference "checktri1"
column.

Change-Id: I5f32e05c93b5e16e782cba5d1d055809d9e5e251
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103318
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 68aec8fd57eda8c05926b7f361dc102772f2c501)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103360
Reviewed-by: Thorsten Behrens 

diff --git a/include/unotools/compatibility.hxx 
b/include/unotools/compatibility.hxx
index 24f2da53e590..812b8cc480bd 100644
--- a/include/unotools/compatibility.hxx
+++ b/include/unotools/compatibility.hxx
@@ -62,6 +62,10 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityEntry
 MsWordTrailingBlanks,
 SubtractFlysAnchoredAtFlys,
 EmptyDbFieldHidesPara,
+/// special entry: optcomp.cxx converts the other values to
+/// integers but not this one because it doesn't have its own
+/// checkbox, so keep it at the end!
+AddTableLineSpacing,
 
 /* Should be at the end. Do not remove it. */
 INVALID
diff --git a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
index 71007f80c22e..77d33d1fbc0c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
@@ -76,7 +76,13 @@
   
   
 
-  ???
+  Add paragraph and table spacing at bottom of table cells
+
+true
+  
+  
+
+  Add paragraph line spacing at bottom of table cells
 
 true
   
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx 
b/sw/source/core/doc/DocumentSettingManager.cxx
index a29c5bc6275f..726db3242647 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -112,7 +112,7 @@ sw::DocumentSettingManager::DocumentSettingManager(SwDoc 
&rDoc)
 mbAddExternalLeading= !aOptions.GetDefault( 
SvtCompatibilityEntry::Index::NoExtLeading );
 mbOldLineSpacing= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::UseLineSpacing );
 mbAddParaSpacingToTableCells= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::AddTableSpacing );
-mbAddParaLineSpacingToTableCells= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::AddTableSpacing ); // FIXME? separate UI?
+mbAddParaLineSpacingToTableCells= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::AddTableLineSpacing );
 mbUseFormerObjectPos= aOptions.GetDefault( 
SvtCompatibilityEntry::Index::UseObjectPositioning );
 mbUseFormerTextWrapping = aOptions.GetDefault( 
SvtCompatibilityEntry::Index::UseOurTextWrapping );
 mbConsiderWrapOnObjPos  = aOptions.GetDefault( 
SvtCompatibilityEntry::Index::ConsiderWrappingStyle );
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 6ce52e5e041c..bf160861ee3c 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -833,10 +833,13 @@ void SwViewShell::SetUseVirDev( bool bNewVirtual )
 void SwViewShell::SetAddParaSpacingToTableCells( bool 
_bAddParaSpacingToTableCells )
 {
 IDocumentSettingAccess& rIDSA = getIDocumentSettingAccess();
-if ( rIDSA.get(DocumentSettingId::ADD_PARA_SPACING_TO_TABLE_CELLS) != 
_bAddParaSpacingToTableCells )
+if (rIDSA.get(Docume

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

[Stephan Bergmann (via logerrit)]

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

New commits:
commit fb06d5b1784cb8b91ea6d286b3f2baa38fed0b4c
Author: Stephan Bergmann 
AuthorDate: Thu Sep 24 19:11:02 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Sep 25 07:08:15 2020 +0200

Run gdb with PYTHONWARNINGS=default

Otherwise, --enable-werror (setting PYTHONWARNINGS=error) would cause
Cppunit-/PythonTest with CPPUNITTRACE='gdb --args' on Linux to print lots of
messages like

> Python Exception  the imp module is 
deprecated in favour of importlib; see the module's documentation for 
alternative uses:
> gdb: warning:
> Could not load the Python gdb module from `/usr/share/gdb/python'.
> Limited Python support is available from the _gdb module.
> Suggest passing --data-directory=/path/to/gdb/data-directory.

and

> Traceback (most recent call last):
>   File "instdir/program/python.bin-gdb.py", line 48, in 
> import gdb
>   File "/usr/share/gdb/python/gdb/__init__.py", line 23, in 
> from imp import reload
>   File "/usr/lib64/python3.8/imp.py", line 31, in 
> warnings.warn("the imp module is deprecated in favour of importlib; "
DeprecationWarning: the imp module is deprecated in favour of importlib; 
see the module's documentation for alternative uses

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

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index cd28e578cc1e..f0bad770cf6c 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -26,10 +26,10 @@ ifneq ($(strip $(CPPUNITTRACE)),)
 ifneq ($(filter gdb,$(CPPUNITTRACE)),)
 # sneak (a) setting the LD_LIBRARY_PATH, and (b) setting malloc debug flags, 
into the "gdb --args" command line
 gb_CppunitTest_GDBTRACE := $(subst gdb,\
-   gdb -return-child-result -ex "add-auto-load-safe-path $(INSTDIR)" -ex 
"set environment $(subst =, ,$(gb_CppunitTest_CPPTESTPRECOMMAND))" 
$(gb_CppunitTest_malloc_check) $(gb_CppunitTest_DEBUGCPPUNIT),\
+   PYTHONWARNINGS=default gdb -return-child-result -ex 
"add-auto-load-safe-path $(INSTDIR)" -ex "set environment $(subst =, 
,$(gb_CppunitTest_CPPTESTPRECOMMAND))" $(if $(PYTHONWARNINGS),-ex 'set 
environment PYTHONWARNINGS $(PYTHONWARNINGS)') $(gb_CppunitTest_malloc_check) 
$(gb_CppunitTest_DEBUGCPPUNIT),\
$(CPPUNITTRACE))
 gb_PythonTest_GDBTRACE := $(subst gdb,\
-   gdb -return-child-result -ex "add-auto-load-safe-path $(INSTDIR)" -ex 
"set environment $(subst =, ,$(gb_PythonTest_PRECOMMAND))" 
$(gb_CppunitTest_malloc_check) $(gb_CppunitTest_DEBUGCPPUNIT),\
+   PYTHONWARNINGS=default gdb -return-child-result -ex 
"add-auto-load-safe-path $(INSTDIR)" -ex "set environment $(subst =, 
,$(gb_PythonTest_PRECOMMAND))" $(if $(PYTHONWARNINGS),-ex 'set environment 
PYTHONWARNINGS $(PYTHONWARNINGS)') $(gb_CppunitTest_malloc_check) 
$(gb_CppunitTest_DEBUGCPPUNIT),\
$(CPPUNITTRACE))
 else ifneq ($(filter lldb,$(CPPUNITTRACE)),)
 gb_CppunitTest_PREGDBTRACE := lo_dyldpathfile=$(call var2file,$(shell 
$(gb_MKTEMP)),500,settings set target.env-vars 
$(gb_CppunitTest_CPPTESTPRECOMMAND))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 unotools/source/misc/fontcvt.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 094e84bcebd2fb0669e6bfccd0c589e719cbf517
Author: Andrea Gelmini 
AuthorDate: Thu Sep 24 13:02:12 2020 +0200
Commit: Andrea Gelmini 
CommitDate: Fri Sep 25 08:27:00 2020 +0200

Fix typo in code

It passed "make check" on Linux

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

diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 9ea6444363d9..b4bd2c45c852 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1180,7 +1180,7 @@ StarSymbolToMSMultiFontImpl::StarSymbolToMSMultiFontImpl()
 }
 
 //In order of preference
-static const ExtendedConvertTable aAgressiveTable[] =
+static const ExtendedConvertTable aAggressiveTable[] =
 {
 ExtendedConvertTable(Symbol, aSymbolExtraTab2,
 sizeof(aSymbolExtraTab2)),
@@ -1193,11 +1193,11 @@ 
StarSymbolToMSMultiFontImpl::StarSymbolToMSMultiFontImpl()
 };
 
  //Allow extra conversions that are not perfect, but "good enough"
-nEntries = SAL_N_ELEMENTS(aAgressiveTable);
+nEntries = SAL_N_ELEMENTS(aAggressiveTable);
 
 for (i = 0; i < nEntries; ++i)
 {
-const ExtendedConvertTable& r = aAgressiveTable[i];
+const ExtendedConvertTable& r = aAggressiveTable[i];
 SymbolEntry aEntry;
 aEntry.eFont = r.meFont;
 for (int j = r.mnSize / sizeof(r.mpTable[0]) - 1; j >=0; --j)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/comphelper include/dbaccess include/test

[Andrea Gelmini (via logerrit)]

 include/comphelper/AccessibleImplementationHelper.hxx |5 +
 include/dbaccess/AsynchronousLink.hxx |4 +---
 include/test/sheet/xarrayformularange.hxx |5 +
 3 files changed, 3 insertions(+), 11 deletions(-)

New commits:
commit 6505f43b09fda83f26159746083b971bfab8054a
Author: Andrea Gelmini 
AuthorDate: Thu Sep 24 12:55:55 2020 +0200
Commit: Andrea Gelmini 
CommitDate: Fri Sep 25 08:27:22 2020 +0200

tdf#124176 Use #pragma once in some include/

switch to #pragma

It passed "make check" on Linux

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

diff --git a/include/comphelper/AccessibleImplementationHelper.hxx 
b/include/comphelper/AccessibleImplementationHelper.hxx
index 742c56f195bb..b6c8d9ab0d85 100644
--- a/include/comphelper/AccessibleImplementationHelper.hxx
+++ b/include/comphelper/AccessibleImplementationHelper.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_COMPHELPER_ACESSIBLEIMPLEMENTATIONHELPER_HXX
-#define INCLUDED_COMPHELPER_ACESSIBLEIMPLEMENTATIONHELPER_HXX
+#pragma once
 
 #include 
 #include 
@@ -43,6 +42,4 @@ COMPHELPER_DLLPUBLIC OUString
 GetkeyBindingStrByXkeyBinding(const css::uno::Sequence& 
keySet);
 }
 
-#endif // INCLUDED_COMPHELPER_ACESSIBLEIMPLEMENTATIONHELPER_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/include/dbaccess/AsynchronousLink.hxx 
b/include/dbaccess/AsynchronousLink.hxx
index c2779be5334a..0b63cbed957d 100644
--- a/include/dbaccess/AsynchronousLink.hxx
+++ b/include/dbaccess/AsynchronousLink.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DBACCESS_ASYNCRONOUSLINK_HXX
-#define INCLUDED_DBACCESS_ASYNCRONOUSLINK_HXX
+#pragma once
 
 #include 
 #include 
@@ -57,6 +56,5 @@ namespace dbaui
 void CancelCall();
 };
 }
-#endif // INCLUDED_DBACCESS_ASYNCRONOUSLINK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/test/sheet/xarrayformularange.hxx 
b/include/test/sheet/xarrayformularange.hxx
index 8f54f7097ba6..2529b8153fc5 100644
--- a/include/test/sheet/xarrayformularange.hxx
+++ b/include/test/sheet/xarrayformularange.hxx
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_TEST_SHEET_XARRAUFORMULARANGE_HXX
-#define INCLUDED_TEST_SHEET_XARRAUFORMULARANGE_HXX
+#pragma once
 
 #include 
 #include 
@@ -30,6 +29,4 @@ protected:
 };
 } // namespace apitest
 
-#endif // INCLUDED_TEST_SHEET_XARRAUFORMULARANGE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LTO on Windows now working

[Noel Grandin]

On 2020/09/23 3:49 pm, Tor Lillqvist wrote:
By the way, did you manage to get all external libraries to get built using LTO, too? Or just what goes into our merged 
library? As far as I see, we use gb_LTOFLAGS only in three ExternalProject_foo.mk files. Should it be used in them all? 
Should we append gb_LTOFLAGS to CC and CXX instead of keeping it separate?




No, just the merged library. Would be nice to use it in externals too, but that would probably require fiddling with the 
various external build systems to pass in the necessary flags and workaround the consequent bugs.


Probably only worth doing for things that show up in profiles (icu comes to 
mind)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice