[Libreoffice-commits] online.git: test/httpwserror.cpp test/Makefile.am test/UnitBadDocLoad.cpp

[Miklos Vajna (via logerrit)]

 test/Makefile.am|7 +
 test/UnitBadDocLoad.cpp |  222 +++-
 2 files changed, 113 insertions(+), 116 deletions(-)

New commits:
commit d10bbef7499c0d19791fab85e83b7e44d8da01b1
Author: Miklos Vajna 
AuthorDate: Thu Jan 9 08:33:48 2020 +0100
Commit: Miklos Vajna 
CommitDate: Thu Jan 9 08:59:09 2020 +0100

Convert the WS error tests to a new-style one

So that they are in-process, which means it's easier to debug when they 
fail.

Change-Id: Icb3d7a7d0ffa7371eb3056b5de7144137c0acb8a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86463
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/test/Makefile.am b/test/Makefile.am
index 6789e3d63..a1b6528e1 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -36,6 +36,7 @@ noinst_LTLIBRARIES = \
unit-calc.la \
unit-insert-delete.la \
unit-close.la \
+   unit-bad-doc-load.la \
unit-wopi-loadencoded.la unit-wopi-temp.la
 
 MAGIC_TO_FORCE_SHLIB_CREATION = -rpath /dummy
@@ -85,8 +86,7 @@ test_all_source = \
TileCacheTests.cpp \
integration-http-server.cpp \
httpwstest.cpp \
-   httpcrashtest.cpp \
-   httpwserror.cpp
+   httpcrashtest.cpp
 
 unittest_CPPFLAGS = -I$(top_srcdir) -DBUILDING_TESTS
 unittest_SOURCES = $(test_base_source) test.cpp
@@ -167,6 +167,8 @@ unit_insert_delete_la_SOURCES = UnitInsertDelete.cpp
 unit_insert_delete_la_LIBADD = $(CPPUNIT_LIBS)
 unit_close_la_SOURCES = UnitClose.cpp
 unit_close_la_LIBADD = $(CPPUNIT_LIBS)
+unit_bad_doc_load_la_SOURCES = UnitBadDocLoad.cpp
+unit_bad_doc_load_la_LIBADD = $(CPPUNIT_LIBS)
 
 if HAVE_LO_PATH
 SYSTEM_STAMP = @SYSTEMPLATE_PATH@/system_stamp
@@ -201,6 +203,7 @@ TESTS = unit-copy-paste.la unit-typing.la unit-convert.la 
unit-prefork.la unit-t
unit-calc.la \
unit-insert-delete.la \
unit-close.la \
+   unit-bad-doc-load.la \
unit-wopi-loadencoded.la unit-wopi-temp.la
 # TESTS = unit-client.la
 # TESTS += unit-admin.la
diff --git a/test/httpwserror.cpp b/test/UnitBadDocLoad.cpp
similarity index 55%
rename from test/httpwserror.cpp
rename to test/UnitBadDocLoad.cpp
index 9ba782803..7fe0f74e3 100644
--- a/test/httpwserror.cpp
+++ b/test/UnitBadDocLoad.cpp
@@ -7,106 +7,56 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include 
-
-#include 
+#include 
+#include 
+#include 
 #include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
 #include 
+#include 
 
-#include 
-
-#include 
-#include 
-#include 
+#include 
+#include 
 #include 
-#include 
-
-using namespace helpers;
-
-class HTTPWSError : public CPPUNIT_NS::TestFixture
-{
-const Poco::URI _uri;
-Poco::Net::HTTPResponse _response;
-
-CPPUNIT_TEST_SUITE(HTTPWSError);
 
-CPPUNIT_TEST(testBadDocLoadFail);
-// FIXME: Disabled recently - breaking the tests - should
-//check for the warning popup instead.
-#if 0
-CPPUNIT_TEST(testMaxDocuments);
-CPPUNIT_TEST(testMaxConnections);
-CPPUNIT_TEST(testMaxViews);
-#endif
+// Include config.h last, so the test server URI is still HTTP, even in SSL 
builds.
+#include 
 
-CPPUNIT_TEST_SUITE_END();
+class LOOLWebSocket;
 
-void testBadDocLoadFail();
-void testMaxDocuments();
-void testMaxConnections();
-void testMaxViews();
+/// Test suite for bad document loading, etc.
+class UnitBadDocLoad : public UnitWSD
+{
+TestResult testBadDocLoadFail();
+TestResult testMaxDocuments();
+TestResult testMaxConnections();
+TestResult testMaxViews();
 
 public:
-HTTPWSError()
-: _uri(helpers::getTestServerURI())
-{
-#if ENABLE_SSL
-Poco::Net::initializeSSL();
-// Just accept the certificate anyway for testing purposes
-Poco::SharedPtr 
invalidCertHandler = new Poco::Net::AcceptCertificateHandler(false);
-Poco::Net::Context::Params sslParams;
-Poco::Net::Context::Ptr sslContext = new 
Poco::Net::Context(Poco::Net::Context::CLIENT_USE, sslParams);
-Poco::Net::SSLManager::instance().initializeClient(nullptr, 
invalidCertHandler, sslContext);
-#endif
-}
-
-#if ENABLE_SSL
-~HTTPWSError()
-{
-Poco::Net::uninitializeSSL();
-}
-#endif
-
-void setUp()
-{
-resetTestStartTime();
-testCountHowManyLoolkits();
-resetTestStartTime();
-}
-
-void tearDown()
-{
-resetTestStartTime();
-testNoExtraLoolKitsLeft();
-resetTestStartTime();
-}
+void invokeTest() override;
 };
 
-void HTTPWSError::testBadDocLoadFail()
+UnitBase::TestResult UnitBadDocLoad::testBadDocLoadFail()
 {
 // Load corrupted document and validate error.
 const char* testname = "docLoadFail ";
 try
 {
 std::string documentPath, documentURL;
-getDocumentPathAndURL("corrupted.odt", documentPath, documentURL, 
testname)

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

[Miklos Vajna (via logerrit)]

 writerperfect/source/calc/MSWorksCalcImportFilter.cxx |   34 ++
 1 file changed, 19 insertions(+), 15 deletions(-)

New commits:
commit 838935758a5ec8e0e68f4df0cf5bfcf737e3f6f2
Author: Miklos Vajna 
AuthorDate: Wed Jan 8 21:05:34 2020 +0100
Commit: Miklos Vajna 
CommitDate: Thu Jan 9 08:33:31 2020 +0100

writerprefect: add missing braces around try-catch

Spelling them out helps readability.

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

diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx 
b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
index 875f7ebe32cd..9eec43b28545 100644
--- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
+++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx
@@ -38,24 +38,28 @@ namespace MSWorksCalcImportFilterInternal
 {
 /// returns the list of stream name present in a folder
 static uno::Reference
-getResultSet(const css::uno::Reference& xPackageContent) 
try
+getResultSet(const css::uno::Reference& xPackageContent)
 {
-if (xPackageContent.is())
+try
 {
-ucbhelper::Content packageContent(xPackageContent,
-  
uno::Reference(),
-  
comphelper::getProcessComponentContext());
-uno::Sequence lPropNames{ "Title" };
-uno::Reference xResultSet(
-packageContent.createCursor(lPropNames, 
ucbhelper::INCLUDE_DOCUMENTS_ONLY));
-return xResultSet;
+if (xPackageContent.is())
+{
+ucbhelper::Content packageContent(xPackageContent,
+  
uno::Reference(),
+  
comphelper::getProcessComponentContext());
+uno::Sequence lPropNames{ "Title" };
+uno::Reference xResultSet(
+packageContent.createCursor(lPropNames, 
ucbhelper::INCLUDE_DOCUMENTS_ONLY));
+return xResultSet;
+}
+return uno::Reference();
+}
+catch (...)
+{
+SAL_WARN("writerperfect",
+ "ignoring Exception in 
MSWorksCalcImportFilterInternal:getResultSet");
+return uno::Reference();
 }
-return uno::Reference();
-}
-catch (...)
-{
-SAL_WARN("writerperfect", "ignoring Exception in 
MSWorksCalcImportFilterInternal:getResultSet");
-return uno::Reference();
 }
 
 namespace
___
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.2' - sw/qa writerfilter/CppunitTest_writerfilter_dmapper.mk writerfilter/qa writerfilter/source

[Miklos Vajna (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx  |4 
 writerfilter/CppunitTest_writerfilter_dmapper.mk   |1 
 writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx |   85 
++
 writerfilter/qa/cppunittests/dmapper/data/page-break-footer-table.docx |binary
 writerfilter/source/dmapper/DomainMapper_Impl.cxx  |9 -
 writerfilter/source/dmapper/DomainMapper_Impl.hxx  |5 
 6 files changed, 99 insertions(+), 5 deletions(-)

New commits:
commit 84c27fda6ac602631e06a8d41f534eab7a8a8050
Author: Miklos Vajna 
AuthorDate: Wed Jan 8 15:40:32 2020 +0100
Commit: Miklos Vajna 
CommitDate: Thu Jan 9 08:33:04 2020 +0100

DOCX import: fix lost page break when footer ends with a table

Regression from commit 7d3778e0ef9f54f3c8988f1b84d58e7002d6c625
(bnc#816593 DOCX import: ignore page breaks in tables, 2013-09-02), the
page break was ignored because the preceding footer ended with a table
(no empty paragraph at the end of the footer stream).

Fix the problem by saving/loading the table state around header/footers,
that way the page break is not ignored.

Adjust testTdf102466 to test the page number from Word.

(cherry picked from commit a86a2a1c1ceb7203857d4317913c5b1bb9feb4aa)

Conflicts:
writerfilter/source/dmapper/DomainMapper_Impl.hxx

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

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index 2356d2f55995..d5359c6a0798 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -1093,8 +1093,8 @@ DECLARE_OOXMLEXPORT_TEST(testTdf102466, "tdf102466.docx")
 CPPUNIT_ASSERT_MESSAGE("The table is clipped in a fly frame.", 
nFlyPrtHeight >= nTableHeight);
 }
 
-// check how much pages we have
-CPPUNIT_ASSERT_EQUAL(10, getPages());
+// check how much pages we have: it should match the Word layout result
+CPPUNIT_ASSERT_EQUAL(11, getPages());
 
 // check content of the first page
 {
diff --git a/writerfilter/CppunitTest_writerfilter_dmapper.mk 
b/writerfilter/CppunitTest_writerfilter_dmapper.mk
index fbb302297c94..20dc37e75a23 100644
--- a/writerfilter/CppunitTest_writerfilter_dmapper.mk
+++ b/writerfilter/CppunitTest_writerfilter_dmapper.mk
@@ -17,6 +17,7 @@ $(eval $(call 
gb_CppunitTest_use_externals,writerfilter_dmapper,\
 
 $(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_dmapper, \
 writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler \
+writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,writerfilter_dmapper, \
diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
new file mode 100644
index ..00c83c913d96
--- /dev/null
+++ b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
@@ -0,0 +1,85 @@
+/* -*- 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 
+
+using namespace ::com::sun::star;
+
+namespace
+{
+/// Tests for writerfilter/source/dmapper/DomainMapper_Impl.cxx.
+class Test : public test::BootstrapFixture, public unotest::MacrosTest
+{
+private:
+uno::Reference mxComponentContext;
+uno::Reference mxComponent;
+
+public:
+void setUp() override;
+void tearDown() override;
+uno::Reference& getComponent() { return mxComponent; }
+};
+
+void Test::setUp()
+{
+test::BootstrapFixture::setUp();
+
+
mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory()));
+mxDesktop.set(frame::Desktop::create(mxComponentContext));
+}
+
+void Test::tearDown()
+{
+if (mxComponent.is())
+mxComponent->dispose();
+
+test::BootstrapFixture::tearDown();
+}
+
+char const DATA_DIRECTORY[] = "/writerfilter/qa/cppunittests/dmapper/data/";
+
+CPPUNIT_TEST_FIXTURE(Test, testPageBreakFooterTable)
+{
+// Load a document which refers to a footer which ends with a table, and 
there is a page break
+// in the body text right after the footer reference.
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"page-break-footer-table.docx";
+getComponent() = loadFromDesktop(aURL);
+
+// Check the last paragraph.
+uno::Reference xTextDocument(getComponent(), 
uno::UNO_QUERY

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

[Mike Kaganski (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf129353.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx|   29 +++
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |   29 +++
 sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx |   16 -
 sw/qa/extras/rtfimport/rtfimport.cxx  |2 
 writerfilter/source/dmapper/DomainMapper.cxx  |   11 -
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |  180 +-
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |5 
 8 files changed, 191 insertions(+), 81 deletions(-)

New commits:
commit e76fcb8f169acac3d81bdaf9b126cc4c98e2eb8e
Author: Mike Kaganski 
AuthorDate: Fri Dec 13 09:36:39 2019 +0300
Commit: Andras Timar 
CommitDate: Thu Jan 9 08:19:01 2020 +0100

tdf#129353, tdf#129402: fix node creation on index import

ToC, bibliography, and index sections import code changed to closely
follow what Word does, make sure that pre-rendered entries don't get
imported as standalone paragraphs outside of the index sections, and
paragraph count is accurate (no missing or added paragraphs as much
as possible).

In Word, an index may start and end in the middle of a paragraph:



Some text before index





 TOC ...





First pre-rendered index entry


...


Last pre-rendered index entry





Some text after index



However, normally it looks like either no runs precedig index, or no
runs of pre-rendered contents will be present. When no Std elements
are used, the typical situation is that there's a normal paragraph
(possibly with some user text), which ends with index start marker,
without any pre-rendered contents in the same paragraph; and all pre-
rendered contents goes in following paragraphs. Such index normally
ends with index end marker in the *first* run of a paragraph, which
then might have normal text runs.

When Stds are used, then no leading/trailing out-of-index runs in
paragraphs with marks are usually present; and in this case, when
paragraphs with index marks don't contain pre-rendered entries, they
still are treated as part of the index.

In Writer, indexes are node sections (and so cannot be inline with
other paragraph contents). When there was some paragraph content
already before the start-of-index mark, the paragraph is assumed
to end before the index; in this case, when current  element
ends, importer decides if a separate starting paragraph is needed
or not, depending on if there was some runs after the mark. When
there was no text runs before the starting mark, then the paragraph
is treated as leading paragraph of the index. This allows to not
miss empty paragraphs before index; and not have two paragraphs
where there was one in Word. Only in cases when user had manually
typed text both in and outside of the index in the same paragraph
in Word, we would have the paragraph split into two in Writer.

For end marks, the behaviour depends on whether it's inside Std.
When inside, the ending paragraph starting with index end mark is
considered part of the index. For out-of-Std case, it's considered
normal paragraph (and measures are taken to make sure it's not
dropped even if empty, because sometimes such paragraphs don't
have other content, and have section settings, which is usually
treated by Writer as "drop this paragraph" sign).

A special problem is multi-column index. It's wrapped into a
continuous section by Word; and in Writer, we also wrap it into
a section. It would be possibly useful to detect somehow if this
section is part of index definition, and in this case, drop the
section and put its properties into the Writer's index section.
That would avoid an explicit section in the imported document.
This is TODO, for someone who figures how to detect reliably if
the section belongs to index definition. See comment in
DomainMapper_Impl::appendTextSectionAfter. By the way, current
export code is wrong, producing an index that is single-column
in Word; this change doesn't touch that.

Several existing tests needed to be fixed, which used to test
wrong results.

Reviewed-on: https://gerrit.libreoffice.org/85089
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 5cdb14345842c07eb1a466897753da910e9488f8)

Change-Id: I9597c8ab13f31ded9abcc24054d3478d3e3a3b40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85289
Tested-by: Jenkins
Reviewed-by: Andras Tim

[Libreoffice-commits] core.git: Repository.mk scp2/source setup_native/Library_reg_dlls.mk setup_native/Module_setup_native.mk setup_native/source solenv/bin

[Mike Kaganski (via logerrit)]

 Repository.mk |1 
 scp2/source/ooo/windowscustomaction_ooo.scp   |   41 +
 scp2/source/spsupp/module_spsupp.scp  |   18 
 setup_native/Library_reg_dlls.mk  |   40 +
 setup_native/Module_setup_native.mk   |1 
 setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx |  309 ++
 setup_native/source/win32/customactions/reg_dlls/reg_dlls.def |5 
 solenv/bin/modules/installer/windows/feature.pm   |   23 
 8 files changed, 432 insertions(+), 6 deletions(-)

New commits:
commit f480617ca3a4869c9afd4d3d68f8057a6067d489
Author: Mike Kaganski 
AuthorDate: Wed May 22 19:17:44 2019 +0300
Commit: Mike Kaganski 
CommitDate: Thu Jan 9 07:23:48 2020 +0100

Register spsupp*.dll during installation

This registers SharePoint integration libraries using regsvr.exe.
Both 32-bit and 64-bit libraries are registered; registration of
LOSPSupport.OpenDocuments is unconditional.

This introduces a new hidden MSI feature, which is disabled for
installation: gm_SharePointSupport_SubstMSO. When installed, it
registers SharePoint.OpenDocuments class in registry, thus
overriding registration of this component by MS Office, allowing
LibreOffice to serve as MS Office replacement working in IE with
SharePoint. To install the feature, either a transform is needed
setting the feature's level <= 100, or a command line:

  msiexec path-to-msi ADDLOCAL=gm_SharePointSupport_SubstMSO

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

diff --git a/Repository.mk b/Repository.mk
index 88b88d73808f..03628e958f72 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -676,6 +676,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooobinaryta
instooofiltmsi \
inst_msu_msi \
qslnkmsi \
+   reg_dlls \
reg4allmsdoc \
sdqsmsi \
sellangmsi \
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp 
b/scp2/source/ooo/windowscustomaction_ooo.scp
index bc7201b9b2b4..116b437b1ed3 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -221,3 +221,44 @@ WindowsCustomAction gid_Customaction_RegisterSomeExtensions
 End
 
 #endif /* HAVE_WINDOWS_SDK */
+
+/* Deferred not-impersonated actions that will call regsvr32 to (un)register 
DLLs.
+ * Custom action type 1 (msidbCustomActionTypeDll + 
msidbCustomActionTypeBinaryData)
+ * + 64 (msidbCustomActionTypeContinue) + 1024 (msidbCustomActionTypeInScript)
+ * + 2048 (msidbCustomActionTypeNoImpersonate).
+ * Since deferred actions don't have access to current DB, the actions depend 
on
+ * immediate-executed action prep_reg_unreg_dlls (see below) that precedes it, 
and
+ * sets this action's CustomActionData property.
+ */
+
+WindowsCustomAction gid_Customaction_reg_dlls
+Name = "reg_dlls";
+Typ = "3137";
+Source = "reg_dlls.dll";
+Target = "RegDLLs";
+Inbinarytable = 1;
+Assignment1 = ("InstallExecuteSequence", "reg_dlls", "InstallFinalize");
+End
+
+WindowsCustomAction gid_Customaction_unreg_dlls
+Name = "unreg_dlls";
+Typ = "3137";
+Source = "reg_dlls.dll";
+Target = "UnregDLLs";
+Inbinarytable = 1;
+Assignment1 = ("InstallExecuteSequence", "unreg_dlls", 
"UnpublishComponents");
+End
+
+/* Immediately-executed action that adds registration command lines for 
spsupp_x*.dll
+ * to "[un]reg_dlls" properties.
+ * Custom action type 1 (msidbCustomActionTypeDll + 
msidbCustomActionTypeBinaryData)
+ * + 64 (msidbCustomActionTypeContinue).
+ */
+WindowsCustomAction gid_Customaction_prep_reg_dlls
+Name = "prep_reg_unreg_dlls";
+Typ = "65";
+Source = "reg_dlls.dll";
+Target = "PrepRegUnregDLLs";
+Inbinarytable = 1;
+Assignment1 = ("InstallExecuteSequence", "", "behind_CostFinalize");
+End
diff --git a/scp2/source/spsupp/module_spsupp.scp 
b/scp2/source/spsupp/module_spsupp.scp
index 39c547a5fa5c..b97a84a699d5 100644
--- a/scp2/source/spsupp/module_spsupp.scp
+++ b/scp2/source/spsupp/module_spsupp.scp
@@ -22,5 +22,23 @@ Module gid_Module_Optional_SharePointSupport
 Files = (auto_spsuppfiles_ALL);
 End
 
+/*
+ * This is an *empty* feature disabled by default, that controls custom action 
registering
+ * SharePoint.OpenDocuments class, which replaces registration of that class 
from MSO.
+ * It is disabled to allow co-existing with MS Office. To install, a transform 
must be
+ * used that would set its level to non-0 value, or a command line like
+ *
+ * msiexec.exe /i path-to-msi ADDLOCAL=gm_SharePointSupport_SubstMSO
+ */
+Module gid_Module_SharePointSupport_SubstMSO
+ParentID = gid_Module_Optional_Sh

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

[Serge Krot (via logerrit)]

 svx/source/accessibility/AccessibleShape.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 75265fad67c38827aec074e99e010109f9219079
Author: Serge Krot 
AuthorDate: Wed Jan 8 21:18:20 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Jan 9 00:59:00 2020 +0100

tdf#129887: fix crash during scrolling down document

regression from tdf#129708

Change-Id: I6c5d7eb90030234e899ab8ce5b3adec33e03962a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86454
Reviewed-by: Julien Nabet 
Tested-by: Thorsten Behrens 
(cherry picked from commit a3c3f21a742f7c7f587bd63ee2617a150bb39b96)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86460
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/svx/source/accessibility/AccessibleShape.cxx 
b/svx/source/accessibility/AccessibleShape.cxx
index debd4fa7243e..f248df629ff0 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -159,7 +159,7 @@ void AccessibleShape::Init()
 if( pSdrObject )
 {
 SdrTextObj* pTextObj = dynamic_cast( pSdrObject  
);
-const bool hasOutlinerParaObject = 
pTextObj->CanCreateEditOutlinerParaObject() || 
pSdrObject->GetOutlinerParaObject() != nullptr;
+const bool hasOutlinerParaObject = (pTextObj && 
pTextObj->CanCreateEditOutlinerParaObject()) || 
(pSdrObject->GetOutlinerParaObject() != nullptr);
 
 // create AccessibleTextHelper to handle this shape's text
 if( !hasOutlinerParaObject )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Seth Chaiklin (via logerrit)]

 source/text/swriter/01/04120212.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5f5d1373c85c9de0cc9a906e9d8c4a78dab64740
Author: Seth Chaiklin 
AuthorDate: Wed Jan 8 10:49:14 2020 +0100
Commit: Olivier Hallot 
CommitDate: Wed Jan 8 23:14:39 2020 +0100

tdf#94411 update help for Index page

- grammatical correction
- appearance of f/ff depends on locale/Language setting.

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

diff --git a/source/text/swriter/01/04120212.xhp 
b/source/text/swriter/01/04120212.xhp
index 5b5202b09..697074e97 100644
--- a/source/text/swriter/01/04120212.xhp
+++ b/source/text/swriter/01/04120212.xhp
@@ -45,8 +45,8 @@
 Combine 
identical entries
 Replaces identical index 
entries with a single entry that lists the page numbers where the entry occurs 
in the document. For example, the entries "View 10, View 43" are combined as 
"View 10, 43".
 
-Combine 
identical entries with p or pp
-Replaces identical index entries, 
which occur also on the directly following page or pages, with a single entry 
that lists the first page number and a "p" or "pp". For example, the entries 
"View 10, View 11, View 12" are combined as "View 10pp", and "View 10, View 11" 
as "View 10p".
+Combine 
identical entries with f or ff
+Replaces identical index entries 
that occur on the directly following page(s), with a single entry that lists 
the first page number and a "f" or "ff". For example, the entries "View 10, 
View 11" are combined as "View 10f", and "View 10, View 11, View 12" as "View 
10ff". Actual appearance depends on the locale setting, but can be overidden 
with the Sort - Language.
 
 Combine 
with -
 Replaces identical index entries 
that occur on consecutive pages with a single entry and the page range where 
the entry occurs. For example, the entries "View 10, View 11, View 12" are 
combined as "View 10-12".
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

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

New commits:
commit d9fe1a661c6a76f0b122c82edf73ec9efbdff349
Author: Seth Chaiklin 
AuthorDate: Wed Jan 8 23:14:39 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Jan 8 23:14:39 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 5f5d1373c85c9de0cc9a906e9d8c4a78dab64740
  - tdf#94411 update help for Index page

- grammatical correction
- appearance of f/ff depends on locale/Language setting.

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

diff --git a/helpcontent2 b/helpcontent2
index 9fc4da0db94a..5f5d1373c85c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9fc4da0db94a4d06ab31ada262551a0a28f2859e
+Subproject commit 5f5d1373c85c9de0cc9a906e9d8c4a78dab64740
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Serge Krot (via logerrit)]

 svx/source/accessibility/AccessibleShape.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a3c3f21a742f7c7f587bd63ee2617a150bb39b96
Author: Serge Krot 
AuthorDate: Wed Jan 8 21:18:20 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Jan 8 22:26:24 2020 +0100

tdf#129887: fix crash during scrolling down document

regression from tdf#129708

Change-Id: I6c5d7eb90030234e899ab8ce5b3adec33e03962a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86454
Reviewed-by: Julien Nabet 
Tested-by: Thorsten Behrens 

diff --git a/svx/source/accessibility/AccessibleShape.cxx 
b/svx/source/accessibility/AccessibleShape.cxx
index 1c0f1e83880e..e96f6501069c 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -159,7 +159,7 @@ void AccessibleShape::Init()
 if( pSdrObject )
 {
 SdrTextObj* pTextObj = dynamic_cast( pSdrObject  
);
-const bool hasOutlinerParaObject = 
pTextObj->CanCreateEditOutlinerParaObject() || 
pSdrObject->GetOutlinerParaObject() != nullptr;
+const bool hasOutlinerParaObject = (pTextObj && 
pTextObj->CanCreateEditOutlinerParaObject()) || 
(pSdrObject->GetOutlinerParaObject() != nullptr);
 
 // create AccessibleTextHelper to handle this shape's text
 if( !hasOutlinerParaObject )
___
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/colibre icon-themes/elementary icon-themes/karasa_jaga icon-themes/sifr icon-themes/tango

[andreas kainz (via logerrit)]

 icon-themes/breeze/links.txt  |3 
 icon-themes/colibre/links.txt |1 
 icon-themes/elementary/links.txt  |3 
 icon-themes/karasa_jaga/links.txt | 3871 +++---
 icon-themes/sifr/links.txt|1 
 icon-themes/tango/links.txt   |1 
 6 files changed, 1943 insertions(+), 1937 deletions(-)

New commits:
commit f02cd6c420815149b57d674ccd2301e787514f82
Author: andreas kainz 
AuthorDate: Wed Jan 8 16:31:07 2020 +0100
Commit: andreas_kainz 
CommitDate: Wed Jan 8 21:36:23 2020 +0100

icon themes add setreminder icon for navigator

Change-Id: Ie0011143ab4f7b832d160e6074ff26afc05ed9cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86443
Reviewed-by: Heiko Tietze 
Tested-by: Jenkins

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index 5a125381e23c..90243416354b 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -1770,6 +1770,7 @@ cmd/sc_selectmode.png cmd/sc_selectobject.png
 # Navigator
 cmd/32/navigationbar.png cmd/32/navigator.png
 cmd/32/reportnavigator.png cmd/32/navigator.png
+cmd/sc_setreminder.png cmd/sc_timefield.png
 
 cmd/lc_navigationbar.png cmd/lc_navigator.png
 cmd/lc_reportnavigator.png cmd/lc_navigator.png
@@ -1800,7 +1801,7 @@ cmd/sc_browseforward.png cmd/sc_nextrecord.png
 cmd/32/donation.png cmd/32/currencyfield.png
 cmd/lc_donation.png cmd/lc_currencyfield.png
 cmd/sc_donation.png cmd/sc_currencyfield.png
- 
+
 # Math
 cmd/32/symbolcatalogue.png cmd/32/insertsymbol.png
 cmd/lc_symbolcatalogue.png cmd/lc_insertsymbol.png
diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index bb9508c181bb..44f00de25a9b 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -1409,6 +1409,7 @@ cmd/sc_selectmode.png cmd/sc_selectobject.png
 cmd/32/reportnavigator.png cmd/32/navigator.png
 cmd/lc_reportnavigator.png cmd/lc_navigator.png
 cmd/sc_reportnavigator.png cmd/sc_navigator.png
+cmd/sc_setreminder.png cmd/sc_timefield.png
 
 # Database
 cmd/32/dbdtableedit.png cmd/32/dbtableedit.png
diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt
index 09d7aa3fd3cb..68aa0274f61a 100644
--- a/icon-themes/elementary/links.txt
+++ b/icon-themes/elementary/links.txt
@@ -1410,6 +1410,7 @@ cmd/sc_showgraphics.png cmd/sc_graphic.png
 cmd/32/savesimple.png cmd/32/save.png
 cmd/lc_savesimple.png cmd/lc_save.png
 cmd/sc_savesimple.png cmd/sc_save.png
+cmd/sc_setreminder.png cmd/sc_timefield.png
 
 # Locale language support
 cmd/32/underlinesimple.png cmd/32/underline.png
@@ -2340,7 +2341,7 @@ cmd/32/addtextbox.png cmd/32/insertfixedtext.png
 cmd/lc_addtextbox.png cmd/lc_insertfixedtext.png
 cmd/sc_addtextbox.png cmd/sc_insertfixedtext.png
 
-# Edit menu 
+# Edit menu
 # ===
 cmd/32/authoritiesentrydialog.png cmd/32/dbviewaliases.png
 cmd/32/changesmenu.png cmd/32/accepttrackedchange.png
diff --git a/icon-themes/karasa_jaga/links.txt 
b/icon-themes/karasa_jaga/links.txt
index 4bf604e8fa1f..a00b68686df5 100644
--- a/icon-themes/karasa_jaga/links.txt
+++ b/icon-themes/karasa_jaga/links.txt
@@ -1,1935 +1,1936 @@
-avmedia/res/av02048.png cmd/sc_open.png
-avmedia/res/av02049.png cmd/sc_datastreamsplay.png
-avmedia/res/av02050.png cmd/sc_mediapause.png
-avmedia/res/av02051.png cmd/sc_datastreamsstop.png
-avmedia/res/av02052.png cmd/sc_mediarepeat.png
-avmedia/res/av02053.png cmd/sc_ok.png
-avmedia/res/av02054.png cmd/sc_mediamute.png
-avmedia/res/avl02048.png cmd/lc_open.png
-avmedia/res/avl02049.png cmd/lc_datastreamsplay.png
-avmedia/res/avl02050.png cmd/lc_mediapause.png
-avmedia/res/avl02051.png cmd/lc_datastreamsstop.png
-avmedia/res/avl02052.png cmd/lc_mediarepeat.png
-avmedia/res/avl02053.png cmd/lc_ok.png
-avmedia/res/avl02054.png cmd/lc_mediamute.png
-chart2/res/dataeditor_icon01.png cmd/sc_insertrowsafter.png
-chart2/res/dataeditor_icon02.png cmd/sc_insertcolumnsafter.png
-chart2/res/dataeditor_icon03.png cmd/sc_deleterows.png
-chart2/res/dataeditor_icon04.png cmd/sc_deletecolumns.png
-chart2/res/typecolumn_16.png cmd/sc_insertobjectchartfromfile.png
-chart2/res/typecolumnline_16.png cmd/sc_statisticsmenu.png
-chart2/res/typepie_16.png cmd/sc_drawchart.png
-cmd/32/acceptchanges.png cmd/32/accepttrackedchanges.png
-cmd/32/accepttracedchange.png cmd/32/accepttrackedchange.png
-cmd/32/adddatefield.png cmd/32/datefield.png
-cmd/32/addtextbox.png cmd/32/insertfixedtext.png
-cmd/32/adjust.png cmd/32/zoomoptimal.png
-cmd/32/advancedmode.png cmd/32/toggleobjectrotatemode.png
-cmd/32/alignframemenu.png cmd/32/objectalign.png
-cmd/32/alignvcenter.png cmd/32/alignverticalcenter.png
-cmd/32/anchormenu.png cmd/32/toggleanchortype.png
-cmd/32/ar/bulletliststyle.png cmd/32/ar/defaultbullet.png
-cmd/32/ar/numberliststyle.png cmd/32/ar/defaultnumbering.png
-cmd/32/arrangeframemenu.png cmd/32/bringtofront.png
-cmd/32/arrangemenu.png cmd/32/bringtofront.png
-cmd/32/arrowsh

[Libreoffice-commits] core.git: offapi/com xmlsecurity/source

[brinzing (via logerrit)]

 offapi/com/sun/star/security/XDocumentDigitalSignatures.idl |   18 
 xmlsecurity/source/component/documentdigitalsignatures.cxx  |   47 +++-
 2 files changed, 63 insertions(+), 2 deletions(-)

New commits:
commit 697989d11e25b3eb83e5ca2dad5d71b178abfbc1
Author: brinzing 
AuthorDate: Thu Jan 2 18:12:31 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Jan 8 21:27:55 2020 +0100

[API CHANGE] extend css.security.XDocumentDigitalSignatures

Add support for macro and package signing with a provided certificate
which is already possible for document signing since LO 6.2:

boolean signScriptingContentWithCertificate(
  [in] ::com::sun::star::security::XCertificate xCertificate,
  [in] ::com::sun::star::embed::XStorage xStorage,
  [in] ::com::sun::star::io::XStream xStream);

boolean signPackageWithCertificate(
  [in] ::com::sun::star::security::XCertificate xCertificate,
  [in] ::com::sun::star::embed::XStorage xStorage,
  [in] ::com::sun::star::io::XStream xStream);

Change-Id: I9783cd317a7202691913be186eca95964b1e0ff7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86141
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl 
b/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl
index dc6affc62a9b..541d1d822121 100644
--- a/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl
+++ b/offapi/com/sun/star/security/XDocumentDigitalSignatures.idl
@@ -205,6 +205,24 @@ interface XDocumentDigitalSignatures : 
com::sun::star::uno::XInterface
 @since LibreOffice 6.3
 */
 void setParentWindow([in] ::com::sun::star::awt::XWindow xParentWindow);
+
+/** signs the content of the Scripting including macros and basic dialogs 
with the provided certificate.
+
+The rest of document content will not be signed.
+
+@since LibreOffice 6.5
+*/
+boolean signScriptingContentWithCertificate([in] 
::com::sun::star::security::XCertificate xCertificate,
+[in] 
::com::sun::star::embed::XStorage xStorage,
+[in] 
::com::sun::star::io::XStream xStream);
+
+/** signs the full Package, which means everything in the storage except 
the content of META-INF with the provided certificate.
+
+@since LibreOffice 6.5
+*/
+boolean signPackageWithCertificate([in] 
::com::sun::star::security::XCertificate xCertificate,
+[in] 
::com::sun::star::embed::XStorage xStorage,
+[in] 
::com::sun::star::io::XStream xStream);
 };
 
 } ; } ; } ; } ;
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx 
b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index 7c3ec4232b80..9f4bcb7a85f2 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -103,7 +103,12 @@ private:
 chooseCertificatesImpl(std::map& rProperties, const 
UserAction eAction,
const CertificateKind 
certificateKind=CertificateKind_NONE);
 
-public:
+bool signWithCertificateImpl(
+css::uno::Reference const& xCertificate,
+css::uno::Reference const& xStorage,
+css::uno::Reference const& xStream, 
DocumentSignatureMode eMode);
+
+ public:
 explicit DocumentDigitalSignatures(
 const css::uno::Reference& rxCtx);
 
@@ -186,6 +191,16 @@ public:
 css::uno::Reference const & 
xStoragexStorage,
 css::uno::Reference const & 
xStream) override;
 
+sal_Bool SAL_CALL signPackageWithCertificate(
+css::uno::Reference 
const& xCertificate,
+css::uno::Reference const& 
xStoragexStorage,
+css::uno::Reference const& 
xStream) override;
+
+sal_Bool SAL_CALL signScriptingContentWithCertificate(
+css::uno::Reference 
const& xCertificate,
+css::uno::Reference const& 
xStoragexStorage,
+css::uno::Reference const& 
xStream) override;
+
 void SAL_CALL setParentWindow(const 
css::uno::Reference& rParentwindow) override
 {
 mxParentWindow = rParentwindow;
@@ -768,7 +783,35 @@ sal_Bool 
DocumentDigitalSignatures::signDocumentWithCertificate(
 css::uno::Reference const & xStorage,
 css::uno::Reference const & xStream)
 {
-DocumentSignatureManager aSignatureManager(mxCtx, 
DocumentSignatureMode::Content);
+return signWithCertificateImpl(xCertificate, xStorage, xStream, 
DocumentSignatureMode::Content);
+}
+
+sal_Bool DocumentDigitalSignatures::signPackageWithCertificate(
+css::uno::Reference con

Minutes from the UX/design meeting 2020-Jan-08

[Heiko Tietze]

Present: Heiko
Comments from: Olivier, Dieter, Thomas, Stuart, Roman, MikeK

Tickets

 * Create a new style with name "Appendix"
   + https://bugs.documentfoundation.org/show_bug.cgi?id=114090
   + is another heading really needed?
   + Needed with level 1 (Thomas, Olivier)
   => go for it

 * Change wording of PDF Export File encryption and Permission dialog in Writer 
for clarity
   + https://bugs.documentfoundation.org/show_bug.cgi?id=129800
 + Set open password -> Read access
 + Set permission password -> Print/Change/Content access
   + labels are clear, no change needed (Roman)
   + +1 to get rid of the extra dialog; little benefit from renaming (Thomas)
 + Set open password for read access
 + Set permission password for change access
   => let's keep the label but add some informative tooltip

 * Rename Default Style to Default Paragraph/Page/Table Style
   + https://bugs.documentfoundation.org/show_bug.cgi?id=129568
   + consider variable defaults (Stuart)
   + agree on the proposal (Thomas)
   => let's do it

 * Provide a way to let user search and display Tip-of-the-day
   + https://bugs.documentfoundation.org/show_bug.cgi?id=129648
   + invalid, not needed (Heiko)
   + über-complex, better suited for a comprehensive wiki or help page (Thomas)
   => wf

 * In Paragraph Style dialog box, allow "Edit Style" button to be active, and 
open the Chapter Numbering dialog
   + https://bugs.documentfoundation.org/show_bug.cgi?id=129668
   + agree with the request (Mike K)
   + rather not because of unforseeable dependencies (Heiko)
   => keep it

 * Alphabetize the styles in the dropdown boxes in the Styles section of 
"Footnotes/Endnotes Settings" dialog
   + https://bugs.documentfoundation.org/show_bug.cgi?id=129836
   + better sorting is an improvement (Thomas, Heiko)
   => do it

 * New Print dialog is too high
   + https://bugs.documentfoundation.org/show_bug.cgi?id=127782
   + Andreas' patch is on Gerrit; better solutions welcome
   + scrollarea with collapsed content (Heiko)
   => simple solution needed




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

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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkframe.cxx |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit d001e1fa04c4fc29bad6ef6cce146aac38bb7fe1
Author: Caolán McNamara 
AuthorDate: Wed Jan 8 17:27:00 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Jan 8 20:08:51 2020 +0100

can expand these macros since gtk2 is gone

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

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 178b0ac6aa30..85fb2b9e 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -60,9 +60,6 @@
 #include 
 #include 
 
-#define IS_WIDGET_REALIZED gtk_widget_get_realized
-#define IS_WIDGET_MAPPED   gtk_widget_get_mapped
-
 using namespace com::sun::star;
 
 int GtkSalFrame::m_nFloats = 0;
@@ -1741,7 +1738,7 @@ void GtkSalFrame::SetScreen( unsigned int nNewScreen, 
SetType eType, tools::Rect
 }
 
 bool bResize = false;
-bool bVisible = IS_WIDGET_MAPPED( m_pWindow );
+bool bVisible = gtk_widget_get_mapped( m_pWindow );
 if( bVisible )
 Show( false );
 
@@ -1838,7 +1835,7 @@ void GtkSalFrame::updateWMClass()
 
 display = GDK_DISPLAY_XDISPLAY(getGdkDisplay());
 
-if( IS_WIDGET_REALIZED( m_pWindow ) )
+if( gtk_widget_get_realized( m_pWindow ) )
 {
 XClassHint* pClass = XAllocClassHint();
 OString aResName = SalGenericSystem::getFrameResName();
@@ -1932,7 +1929,7 @@ void GtkSalFrame::ToTop( SalFrameToTop nFlags )
 gtk_widget_set_can_focus(GTK_WIDGET(m_pFixedContainer), true);
 gtk_widget_grab_focus(GTK_WIDGET(m_pFixedContainer));
 }
-else if( IS_WIDGET_MAPPED( m_pWindow ) )
+else if( gtk_widget_get_mapped( m_pWindow ) )
 {
 if (!(nFlags & SalFrameToTop::GrabFocusOnly))
 gtk_window_present_with_time(GTK_WINDOW(m_pWindow), 
GetLastInputEventTime());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 xmloff/source/style/xmlnumfi.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit c7235d9550ff5596d7e5540b98f1ff8b121df24d
Author: Caolán McNamara 
AuthorDate: Wed Jan 8 14:52:07 2020 +
Commit: Noel Grandin 
CommitDate: Wed Jan 8 19:33:08 2020 +0100

ofz#19933 Null-dereference READ

since...

commit e1383444c6d00f5d0b1d507670517f45988b9cc7
Date:   Tue Jan 7 13:01:41 2020 +0200

extract some common code from ImportContext classes

which reduces code bloat, and lets us log when elements are ignored

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

diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index d74353bcf314..199d8d7f3846 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -1550,6 +1550,12 @@ SvXMLImportContextRef 
SvXMLNumFormatContext::CreateChildContext(
 break;
 }
 
+if( !pContext )
+{
+SAL_WARN("xmloff.core", "No context for unknown-element " << rLName);
+pContext = new SvXMLImportContext(GetImport(), nPrfx, rLName);
+}
+
 return pContext;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Makefile.am

[Jan Holesovsky (via logerrit)]

 Makefile.am |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0cfd90d82922c772ac25d87363e10208ea111af6
Author: Jan Holesovsky 
AuthorDate: Wed Jan 8 18:21:57 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Wed Jan 8 18:29:15 2020 +0100

android: Fix creating new file from a template.

rm -rf of the assets was newly introduced, done after copying the
templates to their place.  So missing templates => crash; fixed.

Change-Id: I53d243b4f44c2c38843336e38e603ae0bd4b3c89
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86449
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/Makefile.am b/Makefile.am
index 57a666adb..d17bb8d99 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ if ENABLE_GTKAPP
 SUBDIRS = gtk loleaflet
 else
 if ENABLE_ANDROIDAPP
-SUBDIRS = android loleaflet
+SUBDIRS = loleaflet android
 else
 SUBDIRS = loleaflet
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: LO 6.4 : missing file in python 3.7.6 tarball

[Michael Stahl]

On 08.01.20 14:49, Jean-Baptiste Faure wrote:

Hi Michael, all,

My current build of LibreOffice 6.4 under Ubuntu 18.04 x86-64 fails with 
the following error message:


[...]/60/external/python3/ExternalPackage_python3.mk:43: *** file 
[...]/60/workdir/UnpackedTarball/python3/LO_lib/_uuid.cpython-3.7m.so 
does not exist in the tarball. Arrêt.

Makefile:167: recipe for target 'ExternalPackage_python3' failed


I guess there is a problem in the commit " python3: upgrade to release 
3.7.6" 
https://gerrit.libreoffice.org/plugins/gitiles/core/+/853cc90f49d59a94242494c4aee2479de0865486 



should be fixed in commit
ebb6c2576af8d883ddf8eb09e3969c50d9ac07c9 "python3: remove _uuid module"
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Henry Castro (via logerrit)]

 loleaflet/src/layer/marker/TextInput.js |   15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 368f6ff70ee063c4d7322051237c29287d2d296e
Author: Henry Castro 
AuthorDate: Wed Jan 8 11:11:46 2020 -0400
Commit: Henry Castro 
CommitDate: Wed Jan 8 18:23:12 2020 +0100

loleaflet: prevent auto focus when the page is loaded

It has been added an attribute 'disabled' when permission is
'readonly', otherwise it is removed

Change-Id: I64a4cf9a7a754d66862e55805202358b9f83caf8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86442
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/layer/marker/TextInput.js 
b/loleaflet/src/layer/marker/TextInput.js
index ec431c267..4a0914b4f 100644
--- a/loleaflet/src/layer/marker/TextInput.js
+++ b/loleaflet/src/layer/marker/TextInput.js
@@ -64,6 +64,7 @@ L.TextInput = L.Layer.extend({
 
this._emptyArea();
 
+   this._map.on('updatepermission', this._onPermission, this);
L.DomEvent.on(this._textArea, 'focus blur', this._onFocusBlur, 
this);
 
// Do not wait for a 'focus' event to attach events if the
@@ -80,13 +81,22 @@ L.TextInput = L.Layer.extend({
if (this._container) {
this.getPane().removeChild(this._container);
}
-   L.DomEvent.off(this._textArea, 'focus blur', this._onFocusBlur, 
this);
 
+   this._map.off('updatepermission', this._onPermission, this);
+   L.DomEvent.off(this._textArea, 'focus blur', this._onFocusBlur, 
this);
L.DomEvent.off(this._map.getContainer(), 'mousedown 
touchstart', this._abortComposition, this);
 
this._map.removeLayer(this._cursorHandler);
},
 
+   _onPermission: function(e) {
+   if (e.perm === 'edit') {
+   this._textArea.removeAttribute('disabled');
+   } else {
+   this._textArea.setAttribute('disabled', true);
+   }
+   },
+
_onFocusBlur: function(ev) {
this._fancyLog(ev.type, '');
 
@@ -191,6 +201,9 @@ L.TextInput = L.Layer.extend({
// See 
https://developer.mozilla.org/en-US/docs/Web/HTML/Element/textarea#attr-wrap
this._textArea.setAttribute('wrap', 'off');
 
+   // Prevent autofocus
+   this._textArea.setAttribute('disabled', true);
+
this._setupStyles();
 
this._emptyArea();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

 loleaflet/src/map/Map.js  |4 
 loleaflet/src/map/handler/Map.TouchGesture.js |2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit ccd6c73a6010e0417c3e8568c3e8d2cb27726d39
Author: Henry Castro 
AuthorDate: Wed Jan 8 11:07:37 2020 -0400
Commit: Henry Castro 
CommitDate: Wed Jan 8 18:22:44 2020 +0100

loleaflet: encapsulate the function related to map blur

Change-Id: I2d2dab867769e7f9b5497d4bc4834fc097c8d30f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86441
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index d0f571564..eab0f9668 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -896,6 +896,10 @@ L.Map = L.Evented.extend({
this._textInput.focus();
},
 
+   blur: function () {
+   this._textInput.blur();
+   },
+
hasFocus: function () {
return document.activeElement === 
this._textInput.activeElement();
},
diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js 
b/loleaflet/src/map/handler/Map.TouchGesture.js
index f6f22761e..505ee7feb 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -324,7 +324,7 @@ L.Map.TouchGesture = L.Handler.extend({
docLayer._postMouseEvent('buttonup', mousePos.x, 
mousePos.y, 1, 1, 0);
 
if (this._state === L.Map.TouchGesture.MARKER || 
(this._state === L.Map.TouchGesture.GRAPHIC && !docLayer._isCursorVisible)) {
-   this._map._textInput.blur();
+   this._map.blur();
} else if (!this._map.hasFocus()) {
this._map.focus();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

 loleaflet/src/layer/marker/TextInput.js |3 +++
 loleaflet/src/map/Map.js|7 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 0064cfff56c9492ba063a033ead11f01078f198e
Author: Henry Castro 
AuthorDate: Wed Jan 8 11:02:53 2020 -0400
Commit: Henry Castro 
CommitDate: Wed Jan 8 18:22:11 2020 +0100

loleaflet: simplify the function related to map focus

Change-Id: I0849ad3a5abe50aaba3b993f6851c113b1bb27cb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86440
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/layer/marker/TextInput.js 
b/loleaflet/src/layer/marker/TextInput.js
index 22b904632..ec431c267 100644
--- a/loleaflet/src/layer/marker/TextInput.js
+++ b/loleaflet/src/layer/marker/TextInput.js
@@ -118,6 +118,9 @@ L.TextInput = L.Layer.extend({
 
// Focus the textarea/contenteditable
focus: function() {
+   // Clicking or otherwise focusing the map should focus on the 
clipboard
+   // container in order for the user to input text (and on-screen 
keyboards
+   // to pop-up), unless the document is read only.
if (this._map._permission !== 'edit') {
console.log('EPIC HORRORS HERE');
return;
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index ef557f6c1..d0f571564 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -893,12 +893,7 @@ L.Map = L.Evented.extend({
},
 
focus: function () {
-   // Clicking or otherwise focusing the map should focus on the 
clipboard
-   // container in order for the user to input text (and on-screen 
keyboards
-   // to pop-up), unless the document is read only.
-   if (this._permission === 'edit') {
-   this._textInput.focus();
-   }
+   this._textInput.focus();
},
 
hasFocus: function () {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 external/python3/ExternalPackage_python3.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit ebb6c2576af8d883ddf8eb09e3969c50d9ac07c9
Author: Michael Stahl 
AuthorDate: Wed Jan 8 15:05:34 2020 +0100
Commit: Michael Stahl 
CommitDate: Wed Jan 8 18:22:06 2020 +0100

python3: remove _uuid module

Of course the autotetection in setup.py strikes again, the build will
fail if the user doesn't have libuuid-devel installed; we'd need to add
a check to LO's configure.ac for libuuid.

Let's just not ship it, not sure if anybody needs it.

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

diff --git a/external/python3/ExternalPackage_python3.mk 
b/external/python3/ExternalPackage_python3.mk
index 60eeb022160c..87361941fa88 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -114,7 +114,6 @@ $(eval $(call 
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-cor

LO_lib/_testimportmultiple.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so
 \

LO_lib/_testmultiphase.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so
 \

LO_lib/unicodedata.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
-   
LO_lib/_uuid.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \

LO_lib/xxlimited.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \

LO_lib/_xxtestfuzz.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
LO_lib/zlib.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so 
\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

 loleaflet/js/global.js|8 
 loleaflet/src/main.js |4 
 loleaflet/src/map/handler/Map.TouchGesture.js |2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit e9d11f4a6605809d52d4205ec9ff91a6ffef143b
Author: Henry Castro 
AuthorDate: Tue Jan 7 14:04:14 2020 -0400
Commit: Henry Castro 
CommitDate: Wed Jan 8 18:21:14 2020 +0100

loleaflet: simplify "prevent default 'contextmenu' action"

The mobile and desktop prevents default 'contextmenu' action

Change-Id: I89171c955c153b2fceaad92970e2eaf039cb8527
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86373
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/js/global.js b/loleaflet/js/global.js
index b3b619f8c..8445ecb4f 100644
--- a/loleaflet/js/global.js
+++ b/loleaflet/js/global.js
@@ -1,6 +1,14 @@
 /* -*- js-indent-level: 8 -*- */
 (function (global) {
 
+   document.addEventListener('contextmenu', function(e) {
+   if (e.preventDefault) {
+   e.preventDefault();
+   } else {
+   e.returnValue = false;
+   }
+   }, false);
+
global.fakeWebSocketCounter = 0;
global.FakeWebSocket = function () {
this.binaryType = 'arraybuffer';
diff --git a/loleaflet/src/main.js b/loleaflet/src/main.js
index fb7890b36..ba500fd09 100644
--- a/loleaflet/src/main.js
+++ b/loleaflet/src/main.js
@@ -91,10 +91,6 @@ window.addEventListener('beforeunload', function () {
}
 });
 
-if (!L.Browser.mobile) {
-   L.DomEvent.on(document, 'contextmenu', L.DomEvent.preventDefault);
-}
-
 window.bundlejsLoaded = true;
 
 }(window));
diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js 
b/loleaflet/src/map/handler/Map.TouchGesture.js
index 66c333791..f6f22761e 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -62,7 +62,7 @@ L.Map.TouchGesture = L.Handler.extend({
}
 
L.DomEvent.on(this._map._mapPane, 'mousedown mousemove 
mouseup', L.DomEvent.preventDefault);
-   L.DomEvent.on(document, 'contextmenu touchmove', 
L.DomEvent.preventDefault);
+   L.DomEvent.on(document, 'touchmove', 
L.DomEvent.preventDefault);
}
 
for (var events in L.Draggable.MOVE) {
___
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/libreoffice-6.4.0.2'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-6.4.0.2' created by Christian Lohmaier 
 at 2020-01-08 17:14 +

Tag libreoffice-6.4.0.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl4WDd0ACgkQ9DSh76/u
rqOOTw//dUeN7THPbf+00vk6jbKdlvGaSI1zIc3Euy+I1h77U1L9rECmDqOVuH9f
Vu7fytYa0Q37Mz59dp+8p68nUom1FGJ5h7nspG22u3tJ+Wf+qeUGDCkqzx5rMR7D
Yw79L8+DA7a/jf/msPDzoBssZvyE1ZzO074x6F4QC0d3zUrw2/VsUmiga03dk6kJ
1pONrvEQwOXmFURCE4f6+PYzTbwaYAtxDVKB4WjhTa6NNcZwoyibCj3JKKqyEXz7
Z/ftIphGjiGUdxqFg1zCEy/ue3CUqcQIC4iEDTGtsbltXVReByHOwn/9Kdh0aBVE
bYrJB4gcjY7FTBaW3pU8qAUF+BJ5NgvIyLIDjo6aUKn0ac3zHgFanP45157kS1DX
Rdf/+DqUScMHuerF16cmREdt7BpkrOnlMkXki9hO3RCKbzRbr2qd96FFnmiuNYpq
TIHNsMO0VYe/8oVyQ1uTkDeUL7idue64kr4F/6j2qSV1bWx0u5djl/cx3ETqeSIA
2OFmohDTvHklGsnUe+kR0y9cedDjg14QSqOobdGsqnQjQEGCqcKQ2PlB2Jo0xWP4
vtnpk/X32scu76Jt6J48dXJumINbS/MGKWVyom/nH3Foncc3/n1jZaHYBQ/ySPcs
iPA5Wq4veGEiJCBqULsLiqBeKHyM/bgSeFqNx7Rqu/WfSAow3yY=
=q+Wj
-END PGP SIGNATURE-

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

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-6.4.0.2' created by Christian Lohmaier 
 at 2020-01-08 17:14 +

Tag libreoffice-6.4.0.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl4WDd0ACgkQ9DSh76/u
rqPCwA/+JT8+X2rcIUsMntZALzW8GPWjIfUNg75EFJRxa0oQcUjNVVQQvjLuavIr
qi1QeJkfr+B6gBuIIHCJsB9KRxTiIZ3c+xUyGxQAub1yG6bCNPISpV64i62nF3s7
SZ8eR1dF576L4baDFh0BEXxYGn25sDFYsoVmril78n5Rk/01Yjnz3duU0I1hDoSA
6wIlAS5nRP2e0HwdHqNgntSk1Tr1w4uxZoa6phRaLPO+7LZ1+2sGVuLZdO6JmB9d
iOBm4w7FTWTkVvn9OREM89Fm/Tq1m9kLFWG7Osi7tNAyRWZTclugrWjrqCkj6qhZ
6MctQ6KjLpO1jGltbKUYQ57EI7Zv/7FfYXndJQ31Wx0hhGxbzlgF1s3sYJkFOaz/
4LYkA5zF+103my83Srr8VR6f4i89K6TwQS+n0dDo5LZKSWlEQfj3n2R2WrTZ2PEQ
ls5wakPEI5IyMaM9InNzrdhCaVvl+cowsNyLwytk9fEWz8+Dmv8svcIWUsokP7VA
WVSyj/bAoyzzsCV5+Ae3kb0e5EvLIujUD5DXxGTgFJBrxpVXmW6mBpagNujxfsde
xKviRnBYGMu7EXPSuDwWURofp9/iPLBvOWsEI6ldHzZZ+rJRduElwgR5WFprXUN4
bgtH90j3XsJ2tXEkpV6DsjDdjC9+Hc/mip10zkD7CxtNDdPcL6Q=
=RdsH
-END PGP SIGNATURE-

Changes since libreoffice-6-4-branch-point-42:
---
 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-6-4-0' - configure.ac

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 847d7d3b3df98dbd8ef34eabe8c763a69a940168
Author: Christian Lohmaier 
AuthorDate: Wed Jan 8 18:14:26 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Jan 8 18:14:26 2020 +0100

bump product version to 6.4.0.2.0+

Change-Id: I611dde3d9a38d1a41a2bb6496d6e8a35c131f15a

diff --git a/configure.ac b/configure.ac
index 4a4e3821b844..562e2769ff23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.4.0.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.4.0.2.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-6.4.0.2' created by Christian Lohmaier 
 at 2020-01-08 17:14 +

Tag libreoffice-6.4.0.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl4WDdkACgkQ9DSh76/u
rqO+RQ/9HCqcbgocG1TpOhwHryAVCgqNryyX2UgtjI3hfqpbgHrNikR5fcGy6gKU
RQPY9Aoneb0cJCHx1WwrKGemoIQz3aPh9UrHmdmlPjLWyD47uF5SAO8NmTGEtSis
3nsc4oLlz33JYpYpp8YPxgyyXd/Q8uXyA1qK96x8JStdiCjWYuCfGMzcOTcOJl40
llaf2MzGrTO+1uXRPOTHNtSQZTb0uir4X99+OhR1sdPmJWI3yjqgEMEE5o+KMtJ5
TwwiKij82Wwz2EquSZkYMV/IbbkPI88tQDnIv8vqxXcgmU4wA6wcBtLJnHOMc7FY
tVUH4WBxW38B1CwEM4nbsnKBA1lUy5E0iVqdmig082N835vhPkN3+tTJJWWKFnc+
RtzT9QdEcgAHM2RZTpXeXQxJizqMFaMcomHoI8WdGVRhKzGq5a7xu0oW/zqMc7hy
w17YmhrTCIA50HkraGD0NsJOhBKDem4hi2mBpdj6g27hyKsFVg/UyWhR01en0CYA
FP29QLOio6UO3kezEaHFedPo2t+HP4Lk2kiEbSvmWIEmVrb4Gi8qL3/wyPYiPEeI
K1cJvV70VOz7DJU8HduuS95USJvInbalCt/lkQj1KG0coINJtXMjm5RqnjuIYGD7
DKNJHtZ4SK7lCl3Hx+9rmWw4/yg7A6Qqa9NC/R/vb6rVVsPb994=
=np7l
-END PGP SIGNATURE-

Changes since libreoffice-6-4-branch-point-3:
---
 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/libreoffice-6.4.0.2'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-6.4.0.2' created by Christian Lohmaier 
 at 2020-01-08 17:14 +

Tag libreoffice-6.4.0.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl4WDd0ACgkQ9DSh76/u
rqPV5w/+KEaSkZOm5EmPHHk53Dz/z9Oahhld/29nfzROdL40oRMGCrztpB4bcfjo
yyxZBEti71eJ1Rdw8eUJd/TcWYA5XKtBpX3jYN2ZnmPJhIlsUsgRGLNBL4FDZQv8
20E+9EXoIj/SC41TgW+FA5eMZo8uWk78q8j8BfbFWgMMxaQR7amyUE7oTf240SxD
kSKB9/mFYyktE1Bfk6Y8p1kkkaoB4XxzzSQ8Ivj5/umOI54u9U7KAhSZYrISwx3n
eYOIPrt6lrE+k1R9s/1hS6I8dSiTrgUoiZzFoMF5SO2H+5jKeO4ZAqjyR1z2CwMN
fRXrduOSNccHW8aE+uUrIu1WIHPV0Vez2tQNEfQ/8hsBGtmGYFoHhJPIYTjMsFTq
VTFDb1S2GN3ISuHYfBYztCA/BK8i4n1AaavTeYu0XYcrAu+97jn6i7I6Qmp8If6R
K7zyDUGmDSwN+VcTGXNMN9YMsm8a1JjUhjj1WEjIgehSXW+ZxWNcMYhmBMCDRaet
atyo202MHB9fdPgfj8mJrG+IDisZEElD0scJZBqxLqaxx/Xuj7YQaF7D5DzpiOWs
kxKI8/B+pzGBX6zC5pMGDgOcvbawXGJ1jOhSmkUovfx3VCs7cOv0XP/3SYx+IPzY
DiQ6FI5eTRidbRPXRtvoDJ5uJRpES/u98Kgvgw/XJPkqH3Z1yTY=
=digs
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: include/sfx2 include/svtools include/svx sfx2/source svtools/source svx/source svx/uiconfig svx/UIConfig_svx.mk vcl/source

[Caolán McNamara (via logerrit)]

 include/sfx2/weldutils.hxx   |   14 -
 include/svtools/popupwindowcontroller.hxx|9 -
 include/svtools/toolbarmenu.hxx  |   40 +
 include/svx/colorwindow.hxx  |   10 -
 sfx2/source/toolbox/weldutils.cxx|   11 -
 svtools/source/control/toolbarmenu.cxx   |   50 ++
 svtools/source/uno/popupwindowcontroller.cxx |6 
 svx/UIConfig_svx.mk  |2 
 svx/source/tbxctrls/bulletsnumbering.cxx |  202 ---
 svx/source/tbxctrls/tbcontrl.cxx |   21 +-
 svx/uiconfig/ui/interimdockparent.ui |   30 
 svx/uiconfig/ui/interimparent.ui |   14 +
 svx/uiconfig/ui/numberingwindow.ui   |2 
 vcl/source/window/dockwin.cxx|2 
 14 files changed, 191 insertions(+), 222 deletions(-)

New commits:
commit e653a084ef8693aaf8396e8d6c7fb605f5b59f94
Author: Caolán McNamara 
AuthorDate: Wed Jan 8 10:50:08 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Jan 8 18:15:01 2020 +0100

add a scheme to host welded toolbar dropdown windows in unwelded toolbars

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

diff --git a/include/sfx2/weldutils.hxx b/include/sfx2/weldutils.hxx
index 8ea999675ad1..cfcf545d9002 100644
--- a/include/sfx2/weldutils.hxx
+++ b/include/sfx2/weldutils.hxx
@@ -16,7 +16,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
@@ -53,19 +52,6 @@ public:
 ~ToolbarUnoDispatcher();
 };
 
-class SFX2_DLLPUBLIC WeldToolbarPopup : public svtools::ToolbarPopupBase
-{
-protected:
-std::unique_ptr m_xBuilder;
-std::unique_ptr m_xTopLevel;
-
-public:
-WeldToolbarPopup(const css::uno::Reference& rFrame, 
weld::Widget* pParent,
- const OUString& rUIFile, const OString& rId);
-virtual ~WeldToolbarPopup() override;
-weld::Container* getTopLevel() { return m_xTopLevel.get(); }
-};
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/popupwindowcontroller.hxx 
b/include/svtools/popupwindowcontroller.hxx
index 1666c8ad1513..be39cc8e2b69 100644
--- a/include/svtools/popupwindowcontroller.hxx
+++ b/include/svtools/popupwindowcontroller.hxx
@@ -32,10 +32,8 @@
 
 namespace vcl { class Window; }
 
-namespace svtools
-{
-class ToolbarPopupBase;
-}
+class InterimToolbarPopup;
+class WeldToolbarPopup;
 
 namespace svt
 {
@@ -69,7 +67,8 @@ public:
 virtual css::uno::Reference< css::awt::XWindow > SAL_CALL 
createPopupWindow() override;
 
 protected:
-std::unique_ptr mxPopover;
+std::unique_ptr mxPopover;
+VclPtr mxInterimPopover;
 
 private:
 std::unique_ptr>  mxImpl;
diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx
index 01c8652d3415..1ff5079e569a 100644
--- a/include/svtools/toolbarmenu.hxx
+++ b/include/svtools/toolbarmenu.hxx
@@ -26,6 +26,7 @@
 
 #include 
 #include 
+#include 
 
 namespace com :: sun :: star :: frame { class XFrame; }
 namespace com :: sun :: star :: frame { struct FeatureStateEvent; }
@@ -152,6 +153,45 @@ private:
 
 } // namespace svtools
 
+class SVT_DLLPUBLIC WeldToolbarPopup : public svtools::ToolbarPopupBase
+{
+private:
+DECL_LINK(FocusHdl, weld::Widget&, void);
+
+protected:
+std::unique_ptr m_xBuilder;
+std::unique_ptr m_xTopLevel;
+std::unique_ptr m_xContainer;
+
+public:
+WeldToolbarPopup(const css::uno::Reference& rFrame,
+ weld::Widget* pParent, const OUString& rUIFile, const 
OString& rId);
+virtual ~WeldToolbarPopup() override;
+weld::Container* getTopLevel() { return m_xTopLevel.get(); }
+weld::Container* getContainer() { return m_xContainer.get(); }
+
+virtual void GrabFocus() = 0;
+};
+
+class SVT_DLLPUBLIC InterimToolbarPopup : public svtools::ToolbarPopup
+{
+protected:
+VclPtr m_xBox;
+std::unique_ptr m_xBuilder;
+std::unique_ptr m_xContainer;
+
+WeldToolbarPopup* m_pPopup;
+public:
+InterimToolbarPopup(const css::uno::Reference& rFrame, 
vcl::Window* pParent, WeldToolbarPopup* pPopup);
+weld::Container* getContainer() { return m_xContainer.get(); }
+virtual void dispose() override;
+virtual ~InterimToolbarPopup() override;
+
+virtual void GetFocus() override;
+
+using ToolbarPopup::EndPopupMode;
+};
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx
index 257d1e6801f7..67e5aebdb353 100644
--- a/include/svx/colorwindow.hxx
+++ b/include/svx/colorwindow.hxx
@@ -126,11 +126,9 @@ public:
 weld::Widget* get_widget() const;
 };
 
-class SVX_DLLPUBLIC ColorWindow final : public svtools::ToolbarPopupBase
+class SVX_DLLPUBLIC ColorWindow final : public WeldToolbarPopup
 {
 private:
-std::unique_ptr m_xBuilder;
-
 const sal_uInt16theSl

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - configure.ac

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 0596b93afc6f5987da9c80a12c730a5828df7e09
Author: Christian Lohmaier 
AuthorDate: Wed Jan 8 18:11:05 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Jan 8 18:11:05 2020 +0100

bump product version to 6.4.1.0.0+

Change-Id: I4dd8377f4c16f73362d397a054a5b57441efb365

diff --git a/configure.ac b/configure.ac
index 4a4e3821b844..c239b1f66794 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.4.0.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.4.1.0.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-6-4-0'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-6-4-0' available with the following commits:
commit 06706ac86f74958613762114c0982aec079975b0
Author: Christian Lohmaier 
Date:   Wed Jan 8 18:09:02 2020 +0100

Branch libreoffice-6-4-0

This is 'libreoffice-6-4-0' - the stable branch for the 6.4.0 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.4.x release,
please use the 'libreoffice-6-4' branch.

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

Change-Id: Iaf71b3e8bfcd36526208d8ac07a0d12346145799

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'libreoffice-6-4-0'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-6-4-0' available with the following commits:
commit 2beba1663a2f069fa01badb5a4aceb4e37f24cd9
Author: Christian Lohmaier 
Date:   Wed Jan 8 18:09:02 2020 +0100

Branch libreoffice-6-4-0

This is 'libreoffice-6-4-0' - the stable branch for the 6.4.0 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.4.x release,
please use the 'libreoffice-6-4' branch.

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

Change-Id: If840095cf7b1fce3bc0a1fc58df00af7fe872bf0

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'libreoffice-6-4-0'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-6-4-0' available with the following commits:
commit 380d32947ee2b05830a29f4c44d0b694119d1f07
Author: Christian Lohmaier 
Date:   Wed Jan 8 18:09:02 2020 +0100

Branch libreoffice-6-4-0

This is 'libreoffice-6-4-0' - the stable branch for the 6.4.0 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.4.x release,
please use the 'libreoffice-6-4' branch.

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

Change-Id: I9933e1d1ebea63a7dbcef0170689507ccea005de

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'libreoffice-6-4-0'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-6-4-0' available with the following commits:
commit a185d8d4ba4fa216b2ba7420904e83ce7c4de680
Author: Christian Lohmaier 
Date:   Wed Jan 8 18:09:37 2020 +0100

Branch libreoffice-6-4-0

This is 'libreoffice-6-4-0' - the stable branch for the 6.4.0 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.4.x release,
please use the 'libreoffice-6-4' branch.

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

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit cbac26c52ccbe59c51c6631cb8c4b0a314a9848a
Author: Christian Lohmaier 
AuthorDate: Wed Jan 8 17:47:29 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Jan 8 17:47:29 2020 +0100

Update git submodules

* Update translations from branch 'libreoffice-6-4'
  to a7bd83b1b05ea2a4604ca73b011afca6ae9b8f40
  - update translations for 6.4.0 rc2

and force-fix errors using pocheck

Change-Id: I271c6f6ca96a7cfd41bfc51b5e9894033b17fabc

diff --git a/translations b/translations
index 51e009dadcd8..a7bd83b1b05e 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 51e009dadcd8769a9902b98ec00d03e26b1ebd54
+Subproject commit a7bd83b1b05ea2a4604ca73b011afca6ae9b8f40
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[mert (via logerrit)]

 loleaflet/css/toolbar.css |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 026500b3a5d60e90e2d34c10fb82ffeef0eeb68c
Author: mert 
AuthorDate: Mon Dec 23 13:09:17 2019 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Jan 8 17:49:19 2020 +0100

Fix insertshapes display problem

Insert Shapes dialog opens on the right
side of the screen and can be too
narrow on desktop

Change-Id: I8f9fe8f00989b504d05282fcd5332bf1a1b94ad0
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/85747
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 95d7eae00..47ad32e4e 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -764,6 +764,7 @@ button.leaflet-control-search-next
position: relative;
padding: 2px;
display: inline-block;
+   min-width: 350px;
width:  100%;
height: 100%;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/source fpicker/source hwpfilter/source i18npool/source

[ayhanyalcinsoy (via logerrit)]

 editeng/source/editeng/impedit2.cxx   |2 +-
 editeng/source/rtf/rtfitem.cxx|2 +-
 fpicker/source/office/fileview.cxx|4 ++--
 hwpfilter/source/hgzip.cxx|4 ++--
 i18npool/source/collator/gencoll_rule.cxx |2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit c1599fc5c9800086548595d1f1464619a7024d06
Author: ayhanyalcinsoy 
AuthorDate: Fri Dec 27 15:23:57 2019 +0300
Commit: Michael Stahl 
CommitDate: Wed Jan 8 17:47:54 2020 +0100

tdf#96505:Get rid of cargo cult long integer literals

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

diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index cd7ddad07c3e..2ee7d52496af 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3659,7 +3659,7 @@ Range ImpEditEngine::GetInvalidYOffsets( ParaPortion* 
pPortion )
 && nPropLineSpace && ( nPropLineSpace < 100 ) )
 {
 const EditLine& rL = pPortion->GetLines()[nFirstInvalid];
-long n = rL.GetTxtHeight() * ( 100L - nPropLineSpace );
+long n = rL.GetTxtHeight() * ( 100 - nPropLineSpace );
 n /= 100;
 aRange.Min() -= n;
 aRange.Max() += n;
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 297469d85a58..2ada3d2a6289 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -417,7 +417,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
 if( IsCalcValue() )
 CalcValue();
 
-nTokenValue = short( 100L * aLSpace.GetLineHeight() / 
nTokenValue );
+nTokenValue = short( 100 * aLSpace.GetLineHeight() / 
nTokenValue );
 
 aLSpace.SetPropLineSpace( 
static_cast(nTokenValue) );
 aLSpace.SetLineSpaceRule( SvxLineSpaceRule::Auto );
diff --git a/fpicker/source/office/fileview.cxx 
b/fpicker/source/office/fileview.cxx
index b09f589a32ba..c6fe831a73ec 100644
--- a/fpicker/source/office/fileview.cxx
+++ b/fpicker/source/office/fileview.cxx
@@ -1213,8 +1213,8 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
 OSL_ENSURE( nMinTimeout > 0, "SvtFileView_Impl::GetFolderContent_Impl: 
invalid minimum timeout!" );
 if ( nMinTimeout <= 0 )
 nMinTimeout = sal_Int32( 1000 );
-pTimeout->Seconds = nMinTimeout / 1000L;
-pTimeout->Nanosec = ( nMinTimeout % 1000L ) * 100L;
+pTimeout->Seconds = nMinTimeout / 1000;
+pTimeout->Nanosec = ( nMinTimeout % 1000 ) * 100;
 
 m_xContentEnumerator->enumerateFolderContent( _rFolder, this );
 
diff --git a/hwpfilter/source/hgzip.cxx b/hwpfilter/source/hgzip.cxx
index e813cd01b98e..d26ea22c8824 100644
--- a/hwpfilter/source/hgzip.cxx
+++ b/hwpfilter/source/hgzip.cxx
@@ -66,7 +66,7 @@ gz_stream *gz_open(HStream & _stream)
 //s->_inputstream = NULL;
 s->z_err = Z_OK;
 s->z_eof = 0;
-s->crc = crc32(0L, Z_NULL, 0);
+s->crc = crc32(0, Z_NULL, 0);
 s->msg = nullptr;
 
 s->mode = 'r';
@@ -194,7 +194,7 @@ size_t gz_read(gz_stream * file, voidp buf, unsigned len)
 else if (s->z_err == Z_OK)
 {
 inflateReset(&(s->stream));
-s->crc = crc32(0L, Z_NULL, 0);
+s->crc = crc32(0, Z_NULL, 0);
 }
 }
 if (s->z_err != Z_OK || s->z_eof)
diff --git a/i18npool/source/collator/gencoll_rule.cxx 
b/i18npool/source/collator/gencoll_rule.cxx
index 5eb659c280b1..091ff6b2fa90 100644
--- a/i18npool/source/collator/gencoll_rule.cxx
+++ b/i18npool/source/collator/gencoll_rule.cxx
@@ -88,7 +88,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 exit(1);
 }
 
-fseek(fp, 0L, SEEK_END);
+fseek(fp, 0, SEEK_END);
 int fileSize = ftell(fp);
 rewind(fp);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf123262_textFootnoteSeparators.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx   |   18 
++
 writerfilter/source/dmapper/DomainMapper.cxx|   28 
+++---
 writerfilter/source/dmapper/DomainMapper_Impl.cxx   |   14 
-
 writerfilter/source/dmapper/DomainMapper_Impl.hxx   |   18 
--
 5 files changed, 52 insertions(+), 26 deletions(-)

New commits:
commit 1bbff471cdcfcd4a9ceb6ff6fed7006fbc3f6e1c
Author: Justin Luth 
AuthorDate: Fri Nov 29 22:10:27 2019 +0300
Commit: Michael Stahl 
CommitDate: Wed Jan 8 17:41:52 2020 +0100

tdf#123262 writerfilter: completely ignore footnote separators

... except for processing enough to observe the separator exists.

For each footnote reference, the entire footnote.xml file is
parsed every time. The text in the "separator" footnote was
being added to every footnote.  The normal case where this is just
a single paragraph was already handled, but this patch generalizes
everything to handle cases of actual text or multiple paragraphs.

Not every footnote has a type, so we can't depend on that to turn
ignoringText ON/OFF. Every footnote has an ID, but theoretically
the ID could be processed before or after the type, and it has
no idea which type it is. Finally, the skipped text has no idea
how many times/paragaphs it needs to skip. So a three-way
control was needed to handle on/used/off. As a safeguard, finishing
the footnote.xml parse (PopFootOrEndnote) ensures that
ignoring won't be left on in the unlikely case that
the separator is the last footnote.

Change-Id: Ia30ca8d3a36417a4691e3b2e1c978720be017030
Reviewed-on: https://gerrit.libreoffice.org/82172
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 
(cherry picked from commit acb9d901009d026cb48e6a8b94e6200f05110504)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85734
Reviewed-by: Michael Stahl 

diff --git 
a/sw/qa/extras/ooxmlexport/data/tdf123262_textFootnoteSeparators.docx 
b/sw/qa/extras/ooxmlexport/data/tdf123262_textFootnoteSeparators.docx
new file mode 100644
index ..ceccb767e27e
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf123262_textFootnoteSeparators.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 14ba1cde9683..2560cf89a506 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -523,6 +523,24 @@ DECLARE_OOXMLEXPORT_TEST(testFDO79062, "fdo79062.docx")
 CPPUNIT_ASSERT_EQUAL_MESSAGE( "Paragraph starts with W(87), not tab(9)", 
u'W', sFootnotePara[0] );
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf123262_textFootnoteSeparators, 
"tdf123262_textFootnoteSeparators.docx")
+{
+//Everything easily fits on one page
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "Number of Pages", 1, getPages() );
+
+uno::Reference xFootnotesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xFootnotes = 
xFootnotesSupplier->getFootnotes();
+uno::Reference xFootnoteText(xFootnotes->getByIndex(0), 
uno::UNO_QUERY);
+
+// The text in the separator footnote should not be added to the footnotes
+OUString sText = " Microsoft Office.";
+CPPUNIT_ASSERT_EQUAL(sText, xFootnoteText->getString());
+
+// Ensure that paragraph markers are not lost.
+xFootnoteText.set(xFootnotes->getByIndex(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "Number of paragraphs in second footnote", 
2, getParagraphs(xFootnoteText) );
+}
+
 DECLARE_OOXMLEXPORT_TEST(testfdo79668,"fdo79668.docx")
 {
 // fdo#79668: Document was Crashing on DebugUtil build while Saving
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 5417b6a05e0b..87b7fdbcbecc 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1078,9 +1078,20 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 }
 break;
 case NS_ooxml::LN_CT_FtnEdn_type:
-// This is the "separator" footnote, ignore its linebreak.
+// This is the "separator" footnote, ignore its linebreaks/text.
 if (static_cast(nIntValue) == 
NS_ooxml::LN_Value_doc_ST_FtnEdn_separator)
-m_pImpl->SeenFootOrEndnoteSeparator();
+m_pImpl->SetSkipFootnoteState( SkipFootnoteSeparator::ON );
+else
+m_pImpl->SetSkipFootnoteState( SkipFootnoteSeparator::OFF );
+break;
+case NS_ooxml::LN_CT_FtnEdn_id:
+{
+SkipFootnoteSeparator eSkip = m_pImpl->GetSkipFootnoteState();
+if ( eSkip == SkipFootnoteSeparator::ON )
+m_pImpl->SetSkipFootnoteState( SkipFootnoteSeparator::SKIPPING 
);
+else

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - cui/uiconfig

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/optviewpage.ui |   10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit f2d54bb55d23d000d2c69860cb145ae379e1ea10
Author: Heiko Tietze 
AuthorDate: Mon Jan 6 13:48:14 2020 +0100
Commit: Heiko Tietze 
CommitDate: Wed Jan 8 17:30:51 2020 +0100

Resolves tdf#129622 - Layout problem in Options-LibreOffice-View

horizontal fill set for the questionable controls

Change-Id: Iab194709ec3ad4881ace36a605ebb4a0d37fe8a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86275
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit beed7183ac6323eb052e7c586d6a807fcb32eb1f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86427

diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index 188a3f9e2d09..db59ad52b4ba 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -269,6 +269,7 @@
   
 True
 False
+True
 
   Automatic
   Small
@@ -298,6 +299,7 @@
   
 True
 False
+True
 
   Automatic
   Small
@@ -327,6 +329,7 @@
   
 True
 False
+True
 
   Automatic
   Small
@@ -719,11 +722,4 @@
   
 
   
-  
-10
-90
-75
-1
-10
-  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/source

[Stephan Bergmann (via logerrit)]

 cui/source/tabpages/tpbitmap.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 97ba3e13844ffa6a227ca09c7b794ad0da0d841f
Author: Stephan Bergmann 
AuthorDate: Tue Jan 7 18:06:09 2020 +0100
Commit: Michael Stahl 
CommitDate: Wed Jan 8 17:20:39 2020 +0100

Fix SfxPoolItem use-after-free

...as observed with -fsanitize=address in Draw, after drawing some 
rectangle (so
that there is at least one marked object) doing "Format - Area... - Area -
Bitmap":

> ERROR: AddressSanitizer: heap-use-after-free on address 0x6030004aca50 at 
pc 0x7f14d0ef5fe1 bp 0x7ffd966c6cb0 sp 0x7ffd966c6ca8
> READ of size 4 at 0x6030004aca50 thread T0
>  #0 in CntUInt32Item::GetValue() const at include/svl/cintitem.hxx:163:42
>  #1 in SvxBitmapTabPage::Reset(SfxItemSet const*) at 
cui/source/tabpages/tpbitmap.cxx:278:124
>  #2 in SvxAreaTabPage::CreatePage(int, SfxTabPage*) at 
cui/source/tabpages/tparea.cxx:448:21
>  #3 in SvxAreaTabPage::SelectFillType(weld::ToggleButton&, SfxItemSet 
const*) at cui/source/tabpages/tparea.cxx:381:9
>  #4 in SvxAreaTabPage::SelectFillTypeHdl_Impl(weld::ToggleButton&) at 
cui/source/tabpages/tparea.cxx:364:5
>  #5 in SvxAreaTabPage::LinkStubSelectFillTypeHdl_Impl(void*, 
weld::ToggleButton&) at cui/source/tabpages/tparea.cxx:358:1
>  #6 in Link::Call(weld::ToggleButton&) const 
at include/tools/link.hxx:111:45
>  #7 in weld::ToggleButton::signal_toggled() at 
include/vcl/weld.hxx:1130:42
[...]
> 0x6030004aca50 is located 16 bytes inside of 24-byte region 
[0x6030004aca40,0x6030004aca58)
> freed by thread T0 here:
>  #0 in operator delete(void*, unsigned long) at 
~/github.com/llvm/llvm-project/compiler-rt/lib/asan/asan_new_delete.cpp:172:3
>  #1 in SfxUInt32Item::~SfxUInt32Item() at include/svl/intitem.hxx:113:21
>  #2 in SfxItemPool::Remove(SfxPoolItem const&) at 
svl/source/items/itempool.cxx:710:13
>  #3 in SfxItemSet::~SfxItemSet() at svl/source/items/itemset.cxx:252:42
>  #4 in SvxBitmapTabPage::Reset(SfxItemSet const*) at 
cui/source/tabpages/tpbitmap.cxx:276:9
>  #5 in SvxAreaTabPage::CreatePage(int, SfxTabPage*) at 
cui/source/tabpages/tparea.cxx:448:21
>  #6 in SvxAreaTabPage::SelectFillType(weld::ToggleButton&, SfxItemSet 
const*) at cui/source/tabpages/tparea.cxx:381:9
>  #7 in SvxAreaTabPage::SelectFillTypeHdl_Impl(weld::ToggleButton&) at 
cui/source/tabpages/tparea.cxx:364:5
>  #8 in SvxAreaTabPage::LinkStubSelectFillTypeHdl_Impl(void*, 
weld::ToggleButton&) at cui/source/tabpages/tparea.cxx:358:1
>  #9 in Link::Call(weld::ToggleButton&) const 
at include/tools/link.hxx:111:45

This appears to be broken ever since 
d543d66a4ee34d3b0088f45951b56c150f7206ec
"tdf#104615: there's no mpView when opening odc directly".

Change-Id: Id0b3991f3e953ca5b10f466daab890383b0428ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86368
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 4d59436258702251a881a007ccc52ffd5a3eeb38)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86424
Reviewed-by: Michael Stahl 

diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index f291b1bdf48a..625eb11e8603 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -269,8 +269,8 @@ bool SvxBitmapTabPage::FillItemSet( SfxItemSet* rAttrs )
 
 void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs )
 {
-const SfxPoolItem* pItemTransfWidth = nullptr;
-const SfxPoolItem* pItemTransfHeight = nullptr;
+double transfWidth = 0.0;
+double transfHeight = 0.0;
 double fUIScale  = 1.0;
 if (mpView)
 {
@@ -280,12 +280,12 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs )
 if (mpView->AreObjectsMarked())
 {
 SfxItemSet rGeoAttr(mpView->GetGeoAttrFromMarked());
-pItemTransfWidth = GetItem( rGeoAttr, SID_ATTR_TRANSFORM_WIDTH );
-pItemTransfHeight= GetItem( rGeoAttr, SID_ATTR_TRANSFORM_HEIGHT );
+transfWidth = static_cast(GetItem( rGeoAttr, 
SID_ATTR_TRANSFORM_WIDTH )->GetValue());
+transfHeight= static_cast(GetItem( rGeoAttr, 
SID_ATTR_TRANSFORM_HEIGHT )->GetValue());
 }
 }
-m_fObjectWidth = std::max( pItemTransfWidth ? 
static_cast(static_cast(pItemTransfWidth)->GetValue()) : 0.0, 1.0 );
-m_fObjectHeight = std::max( pItemTransfHeight ? 
static_cast(static_cast(pItemTransfHeight)->GetValue()) : 0.0, 1.0 );
+m_fObjectWidth = std::max( transfWidth, 1.0 );
+m_fObjectHeight = std::max( transfHeight, 1.0 );
 double 
fTmpWidth((OutputDevice::LogicToLogic(static_cast(m_fObjectWidth), 
mePoolUnit, MapUnit::Map100thMM )) / fUIScale);
 m_fObjectWidth = fTmpWidth;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.fr

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx  |4 
 writerfilter/CppunitTest_writerfilter_dmapper.mk   |1 
 writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx |   85 
++
 writerfilter/qa/cppunittests/dmapper/data/page-break-footer-table.docx |binary
 writerfilter/source/dmapper/DomainMapper_Impl.cxx  |9 -
 writerfilter/source/dmapper/DomainMapper_Impl.hxx  |5 
 6 files changed, 99 insertions(+), 5 deletions(-)

New commits:
commit a86a2a1c1ceb7203857d4317913c5b1bb9feb4aa
Author: Miklos Vajna 
AuthorDate: Wed Jan 8 15:40:32 2020 +0100
Commit: Miklos Vajna 
CommitDate: Wed Jan 8 17:16:39 2020 +0100

DOCX import: fix lost page break when footer ends with a table

Regression from commit 7d3778e0ef9f54f3c8988f1b84d58e7002d6c625
(bnc#816593 DOCX import: ignore page breaks in tables, 2013-09-02), the
page break was ignored because the preceding footer ended with a table
(no empty paragraph at the end of the footer stream).

Fix the problem by saving/loading the table state around header/footers,
that way the page break is not ignored.

Adjust testTdf102466 to test the page number from Word.

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

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index 6c0cfcf7cf7b..abadb9765aa1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -997,8 +997,8 @@ DECLARE_OOXMLEXPORT_TEST(testTdf102466, "tdf102466.docx")
 CPPUNIT_ASSERT_MESSAGE("The table is clipped in a fly frame.", 
nFlyPrtHeight >= nTableHeight);
 }
 
-// check how much pages we have
-CPPUNIT_ASSERT_EQUAL(10, getPages());
+// check how much pages we have: it should match the Word layout result
+CPPUNIT_ASSERT_EQUAL(11, getPages());
 
 // check content of the first page
 {
diff --git a/writerfilter/CppunitTest_writerfilter_dmapper.mk 
b/writerfilter/CppunitTest_writerfilter_dmapper.mk
index 9805e28228a0..41b92e9bdb3e 100644
--- a/writerfilter/CppunitTest_writerfilter_dmapper.mk
+++ b/writerfilter/CppunitTest_writerfilter_dmapper.mk
@@ -18,6 +18,7 @@ $(eval $(call 
gb_CppunitTest_use_externals,writerfilter_dmapper,\
 $(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_dmapper, \
 writerfilter/qa/cppunittests/dmapper/CellColorHandler \
 writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler \
+writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,writerfilter_dmapper, \
diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
new file mode 100644
index ..00c83c913d96
--- /dev/null
+++ b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
@@ -0,0 +1,85 @@
+/* -*- 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 
+
+using namespace ::com::sun::star;
+
+namespace
+{
+/// Tests for writerfilter/source/dmapper/DomainMapper_Impl.cxx.
+class Test : public test::BootstrapFixture, public unotest::MacrosTest
+{
+private:
+uno::Reference mxComponentContext;
+uno::Reference mxComponent;
+
+public:
+void setUp() override;
+void tearDown() override;
+uno::Reference& getComponent() { return mxComponent; }
+};
+
+void Test::setUp()
+{
+test::BootstrapFixture::setUp();
+
+
mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory()));
+mxDesktop.set(frame::Desktop::create(mxComponentContext));
+}
+
+void Test::tearDown()
+{
+if (mxComponent.is())
+mxComponent->dispose();
+
+test::BootstrapFixture::tearDown();
+}
+
+char const DATA_DIRECTORY[] = "/writerfilter/qa/cppunittests/dmapper/data/";
+
+CPPUNIT_TEST_FIXTURE(Test, testPageBreakFooterTable)
+{
+// Load a document which refers to a footer which ends with a table, and 
there is a page break
+// in the body text right after the footer reference.
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"page-break-footer-table.docx";
+getComponent() = loadFromDesktop(aURL);
+
+// Check the last paragraph.
+uno::Reference xTextDocument(getComponent(), 
uno::UNO_QUERY);
+uno::Reference 
xParaEnumAccess(xTextDocument->getText(),
+ 

[Libreoffice-commits] core.git: include/svx officecfg/registry sc/source sd/source svx/source svx/util sw/source

[Caolán McNamara (via logerrit)]

 include/svx/ParaLineSpacingPopup.hxx|   18 ++--
 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu |   11 ++
 sc/source/ui/app/scdll.cxx  |1 
 sd/source/ui/app/sddll.cxx  |1 
 svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx |   42 
+-
 svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx |   10 +-
 svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx   |   39 
++---
 svx/util/svx.component  |4 
 sw/source/uibase/app/swmodule.cxx   |1 
 9 files changed, 68 insertions(+), 59 deletions(-)

New commits:
commit 7e4b2d90f8b877bd954b7549e17c790fa05ea96a
Author: Caolán McNamara 
AuthorDate: Tue Jan 7 20:01:32 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Jan 8 17:15:23 2020 +0100

rework ParaLineSpacingPopup to be a PopupWindowController

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

diff --git a/include/svx/ParaLineSpacingPopup.hxx 
b/include/svx/ParaLineSpacingPopup.hxx
index 0cacabdf072e..835fbb6fca23 100644
--- a/include/svx/ParaLineSpacingPopup.hxx
+++ b/include/svx/ParaLineSpacingPopup.hxx
@@ -19,20 +19,26 @@
 #ifndef INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGPOPUP_HXX
 #define INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGPOPUP_HXX
 
-#include 
+#include 
 #include 
 
 namespace svx {
 
-class SVX_DLLPUBLIC ParaLineSpacingPopup final : public SfxToolBoxControl
+class SVX_DLLPUBLIC SvxLineSpacingToolBoxControl final : public 
svt::PopupWindowController
 {
 public:
-SFX_DECL_TOOLBOX_CONTROL();
+explicit SvxLineSpacingToolBoxControl( const 
css::uno::Reference& rContext );
+virtual ~SvxLineSpacingToolBoxControl() override;
 
-ParaLineSpacingPopup(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx);
-virtual ~ParaLineSpacingPopup() override;
+using svt::ToolboxController::createPopupWindow;
+virtual VclPtr createPopupWindow( vcl::Window* pParent ) 
override;
 
-virtual VclPtr CreatePopupWindow() override;
+// XServiceInfo
+virtual OUString SAL_CALL getImplementationName() override;
+virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() 
override;
+
+// XInitialization
+virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any 
>& rArguments ) override;
 };
 
 }
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 722df647ce3b..c9870cec546c 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -1272,6 +1272,17 @@
   com.sun.star.comp.svx.LineEndToolBoxControl
 
   
+  
+
+  .uno:LineSpacing
+
+
+  
+
+
+  com.sun.star.comp.svx.LineSpacingToolBoxControl
+
+  
   
 
   .uno:SetBorderStyle
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 45129b81b089..4df0bf295e80 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -153,7 +153,6 @@ void ScDLL::Init()
 SvxClipBoardControl ::RegisterControl(SID_PASTE_UNFORMATTED,   
 pMod );
 SvxUndoRedoControl  ::RegisterControl(SID_UNDO,
 pMod );
 SvxUndoRedoControl  ::RegisterControl(SID_REDO,
 pMod );
-svx::ParaLineSpacingPopup   ::RegisterControl(SID_ATTR_PARA_LINESPACE, 
 pMod );
 svx::TextCharacterSpacingPopup  ::RegisterControl(SID_ATTR_CHAR_KERNING,   
 pMod );
 svx::TextUnderlinePopup ::RegisterControl(SID_ATTR_CHAR_UNDERLINE, 
 pMod );
 svx::FormatPaintBrushToolBoxControl::RegisterControl(SID_FORMATPAINTBRUSH, 
 pMod );
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 55d306e53925..43f40d8df7bf 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -215,7 +215,6 @@ void SdDLL::RegisterControllers(SdModule* pMod)
 SvxClipBoardControl::RegisterControl( SID_PASTE, pMod );
 SvxClipBoardControl::RegisterControl( SID_PASTE_UNFORMATTED, pMod );
 
-svx::ParaLineSpacingPopup::RegisterControl(SID_ATTR_PARA_LINESPACE, pMod);
 svx::TextCharacterSpacingPopup::RegisterControl(SID_ATTR_CHAR_KERNING, 
pMod);
 svx::TextUnderlinePopup::RegisterControl(SID_ATTR_CHAR_UNDERLINE, pMod);
 
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx 
b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index 90fb26e99b7e..ccb4359b0ef2 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -29

[Libreoffice-commits] core.git: include/sfx2 sfx2/source solenv/sanitizers svx/source svx/uiconfig svx/UIConfig_svx.mk

[Caolán McNamara (via logerrit)]

 include/sfx2/weldutils.hxx  |   16 ++
 sfx2/source/toolbox/weldutils.cxx   |   11 +
 solenv/sanitizers/ui/svx.suppr  |1 
 svx/UIConfig_svx.mk |1 
 svx/source/sidebar/lists/ListsPropertyPanel.cxx |   14 +-
 svx/source/sidebar/lists/ListsPropertyPanel.hxx |9 -
 svx/source/tbxctrls/bulletsnumbering.cxx|  145 
 svx/source/tbxctrls/tbcontrl.cxx|   25 
 svx/uiconfig/ui/numberingwindow.ui  |   70 +++
 svx/uiconfig/ui/sidebarlists.ui |   47 +++
 10 files changed, 282 insertions(+), 57 deletions(-)

New commits:
commit d799e19c0e1ff629fc3c9464c45039f64bdbbf7e
Author: Caolán McNamara 
AuthorDate: Tue Jan 7 12:04:43 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Jan 8 17:05:40 2020 +0100

weld ListsPropertyPanel

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

diff --git a/include/sfx2/weldutils.hxx b/include/sfx2/weldutils.hxx
index e87295c23abc..8ea999675ad1 100644
--- a/include/sfx2/weldutils.hxx
+++ b/include/sfx2/weldutils.hxx
@@ -16,6 +16,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #include 
 
@@ -50,6 +53,19 @@ public:
 ~ToolbarUnoDispatcher();
 };
 
+class SFX2_DLLPUBLIC WeldToolbarPopup : public svtools::ToolbarPopupBase
+{
+protected:
+std::unique_ptr m_xBuilder;
+std::unique_ptr m_xTopLevel;
+
+public:
+WeldToolbarPopup(const css::uno::Reference& rFrame, 
weld::Widget* pParent,
+ const OUString& rUIFile, const OString& rId);
+virtual ~WeldToolbarPopup() override;
+weld::Container* getTopLevel() { return m_xTopLevel.get(); }
+};
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/toolbox/weldutils.cxx 
b/sfx2/source/toolbox/weldutils.cxx
index 52cf254d7b9a..434f6c479d6a 100644
--- a/sfx2/source/toolbox/weldutils.cxx
+++ b/sfx2/source/toolbox/weldutils.cxx
@@ -132,4 +132,15 @@ void ToolbarUnoDispatcher::dispose()
 
 ToolbarUnoDispatcher::~ToolbarUnoDispatcher() { dispose(); }
 
+WeldToolbarPopup::WeldToolbarPopup(const 
css::uno::Reference& rFrame,
+   weld::Widget* pParent, const OUString& 
rUIFile,
+   const OString& rId)
+: ToolbarPopupBase(rFrame)
+, m_xBuilder(Application::CreateBuilder(pParent, rUIFile))
+, m_xTopLevel(m_xBuilder->weld_container(rId))
+{
+}
+
+WeldToolbarPopup::~WeldToolbarPopup() {}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/sanitizers/ui/svx.suppr b/solenv/sanitizers/ui/svx.suppr
index 9779f86780a9..04829fc63161 100644
--- a/solenv/sanitizers/ui/svx.suppr
+++ b/solenv/sanitizers/ui/svx.suppr
@@ -43,6 +43,7 @@ svx/uiconfig/ui/mediaplayback.ui://GtkLabel[@id='label3'] 
orphan-label
 svx/uiconfig/ui/mediaplayback.ui://GtkScale[@id='timeslider'] no-labelled-by
 svx/uiconfig/ui/mediaplayback.ui://GtkEntry[@id='timeedit:border'] 
no-labelled-by
 svx/uiconfig/ui/mediaplayback.ui://GtkScale[@id='volumeslider'] no-labelled-by
+svx/uiconfig/ui/numberingwindow.ui://GtkButton[@id='more'] button-no-label
 svx/uiconfig/ui/oldcolorwindow.ui://GtkButton[@id='auto_color_button'] 
button-no-label
 svx/uiconfig/ui/oldcolorwindow.ui://GtkComboBox[@id='palette_listbox'] 
no-labelled-by
 svx/uiconfig/ui/oldcolorwindow.ui://GtkLabel[@id='label1'] orphan-label
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 689e59fa9ec1..529ab820c4c1 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/linkwarndialog \
svx/uiconfig/ui/mediaplayback \
svx/uiconfig/ui/namespacedialog \
+   svx/uiconfig/ui/numberingwindow \
svx/uiconfig/ui/oldcolorwindow \
svx/uiconfig/ui/optgridpage \
svx/uiconfig/ui/paralinespacingcontrol \
diff --git a/svx/source/sidebar/lists/ListsPropertyPanel.cxx 
b/svx/source/sidebar/lists/ListsPropertyPanel.cxx
index f739a066b711..7e871222042f 100644
--- a/svx/source/sidebar/lists/ListsPropertyPanel.cxx
+++ b/svx/source/sidebar/lists/ListsPropertyPanel.cxx
@@ -43,18 +43,22 @@ ListsPropertyPanel::Create(vcl::Window* pParent,
 
 ListsPropertyPanel::ListsPropertyPanel(vcl::Window* pParent,
const 
css::uno::Reference& rxFrame)
-: PanelLayout(pParent, "ListsPropertyPanel", "svx/ui/sidebarlists.ui", 
rxFrame)
+: PanelLayout(pParent, "ListsPropertyPanel", "svx/ui/sidebarlists.ui", 
rxFrame, true)
+, mxTBxNumBullet(m_xBuilder->weld_toolbar("numberbullet"))
+, mxNumBulletDispatcher(new ToolbarUnoDispatcher(*mxTBxNumBullet, rxFrame))
+, mxTBxOutline(m_xBuilder->weld_toolbar("outline"))
+, mxOutlineDispatcher(new ToolbarUnoDispatcher(*mxTBxOutline, rxFrame))
 {
-

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

[Stephan Bergmann (via logerrit)]

 cui/source/tabpages/tpbitmap.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e67c416d7471301ee85cebb353c9839e9238ea0a
Author: Stephan Bergmann 
AuthorDate: Tue Jan 7 18:06:09 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 8 16:29:12 2020 +0100

Fix SfxPoolItem use-after-free

...as observed with -fsanitize=address in Draw, after drawing some 
rectangle (so
that there is at least one marked object) doing "Format - Area... - Area -
Bitmap":

> ERROR: AddressSanitizer: heap-use-after-free on address 0x6030004aca50 at 
pc 0x7f14d0ef5fe1 bp 0x7ffd966c6cb0 sp 0x7ffd966c6ca8
> READ of size 4 at 0x6030004aca50 thread T0
>  #0 in CntUInt32Item::GetValue() const at include/svl/cintitem.hxx:163:42
>  #1 in SvxBitmapTabPage::Reset(SfxItemSet const*) at 
cui/source/tabpages/tpbitmap.cxx:278:124
>  #2 in SvxAreaTabPage::CreatePage(int, SfxTabPage*) at 
cui/source/tabpages/tparea.cxx:448:21
>  #3 in SvxAreaTabPage::SelectFillType(weld::ToggleButton&, SfxItemSet 
const*) at cui/source/tabpages/tparea.cxx:381:9
>  #4 in SvxAreaTabPage::SelectFillTypeHdl_Impl(weld::ToggleButton&) at 
cui/source/tabpages/tparea.cxx:364:5
>  #5 in SvxAreaTabPage::LinkStubSelectFillTypeHdl_Impl(void*, 
weld::ToggleButton&) at cui/source/tabpages/tparea.cxx:358:1
>  #6 in Link::Call(weld::ToggleButton&) const 
at include/tools/link.hxx:111:45
>  #7 in weld::ToggleButton::signal_toggled() at 
include/vcl/weld.hxx:1130:42
[...]
> 0x6030004aca50 is located 16 bytes inside of 24-byte region 
[0x6030004aca40,0x6030004aca58)
> freed by thread T0 here:
>  #0 in operator delete(void*, unsigned long) at 
~/github.com/llvm/llvm-project/compiler-rt/lib/asan/asan_new_delete.cpp:172:3
>  #1 in SfxUInt32Item::~SfxUInt32Item() at include/svl/intitem.hxx:113:21
>  #2 in SfxItemPool::Remove(SfxPoolItem const&) at 
svl/source/items/itempool.cxx:710:13
>  #3 in SfxItemSet::~SfxItemSet() at svl/source/items/itemset.cxx:252:42
>  #4 in SvxBitmapTabPage::Reset(SfxItemSet const*) at 
cui/source/tabpages/tpbitmap.cxx:276:9
>  #5 in SvxAreaTabPage::CreatePage(int, SfxTabPage*) at 
cui/source/tabpages/tparea.cxx:448:21
>  #6 in SvxAreaTabPage::SelectFillType(weld::ToggleButton&, SfxItemSet 
const*) at cui/source/tabpages/tparea.cxx:381:9
>  #7 in SvxAreaTabPage::SelectFillTypeHdl_Impl(weld::ToggleButton&) at 
cui/source/tabpages/tparea.cxx:364:5
>  #8 in SvxAreaTabPage::LinkStubSelectFillTypeHdl_Impl(void*, 
weld::ToggleButton&) at cui/source/tabpages/tparea.cxx:358:1
>  #9 in Link::Call(weld::ToggleButton&) const 
at include/tools/link.hxx:111:45

This appears to be broken ever since 
d543d66a4ee34d3b0088f45951b56c150f7206ec
"tdf#104615: there's no mpView when opening odc directly".

Change-Id: Id0b3991f3e953ca5b10f466daab890383b0428ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86368
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 4d59436258702251a881a007ccc52ffd5a3eeb38)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86423
Reviewed-by: Michael Stahl 

diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 7d1f17be236b..e7c32cb41984 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -255,8 +255,8 @@ bool SvxBitmapTabPage::FillItemSet( SfxItemSet* rAttrs )
 
 void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs )
 {
-const SfxPoolItem* pItemTransfWidth = nullptr;
-const SfxPoolItem* pItemTransfHeight = nullptr;
+double transfWidth = 0.0;
+double transfHeight = 0.0;
 double fUIScale  = 1.0;
 if (mpView)
 {
@@ -266,12 +266,12 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs )
 if (mpView->AreObjectsMarked())
 {
 SfxItemSet rGeoAttr(mpView->GetGeoAttrFromMarked());
-pItemTransfWidth = GetItem( rGeoAttr, SID_ATTR_TRANSFORM_WIDTH );
-pItemTransfHeight= GetItem( rGeoAttr, SID_ATTR_TRANSFORM_HEIGHT );
+transfWidth = static_cast(GetItem( rGeoAttr, 
SID_ATTR_TRANSFORM_WIDTH )->GetValue());
+transfHeight= static_cast(GetItem( rGeoAttr, 
SID_ATTR_TRANSFORM_HEIGHT )->GetValue());
 }
 }
-m_fObjectWidth = std::max( pItemTransfWidth ? 
static_cast(static_cast(pItemTransfWidth)->GetValue()) : 0.0, 1.0 );
-m_fObjectHeight = std::max( pItemTransfHeight ? 
static_cast(static_cast(pItemTransfHeight)->GetValue()) : 0.0, 1.0 );
+m_fObjectWidth = std::max( transfWidth, 1.0 );
+m_fObjectHeight = std::max( transfHeight, 1.0 );
 double 
fTmpWidth((OutputDevice::LogicToLogic(static_cast(m_fObjectWidth), 
mePoolUnit, MapUnit::Map100thMM )) / fUIScale);
 m_fObjectWidth = fTmpWidth;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists

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

[Stephan Bergmann (via logerrit)]

 vcl/inc/skia/salbmp.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d122a9d12d970d55f4dc9e4268e0681fd2e6786f
Author: Stephan Bergmann 
AuthorDate: Wed Jan 8 11:38:14 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 8 16:27:32 2020 +0100

Avoid -Werror,-Wundef

> In file included from C:/lo-clang/core/vcl/skia/salbmp.cxx:20:
> In file included from C:/lo-clang/core/vcl/inc\skia/salbmp.hxx:27:
> 
C:/lo-clang/core/workdir/UnpackedTarball/boost\boost/smart_ptr/shared_ptr.hpp(833,5):
 error: '__GNUC__' is not defined, evaluates to 0 [-Werror,-Wundef]
> #if __GNUC__ == 2 && __GNUC_MINOR__ <= 96
> ^

with clang-cl.  We already have external/boost/include/boost/shared_ptr.hpp
ignoring (among others) -Wundef, but don't have such a wrapper for
boost/smart_ptr/shared_ptr.hpp.

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

diff --git a/vcl/inc/skia/salbmp.hxx b/vcl/inc/skia/salbmp.hxx
index 40cbb62104d1..4550680400d7 100644
--- a/vcl/inc/skia/salbmp.hxx
+++ b/vcl/inc/skia/salbmp.hxx
@@ -24,7 +24,7 @@
 
 #include 
 
-#include 
+#include 
 
 class VCL_PLUGIN_PUBLIC SkiaSalBitmap final : public SalBitmap
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Yusuf Keten (via logerrit)]

 filter/source/graphicfilter/icgm/class1.cxx |2 +-
 filter/source/graphicfilter/icgm/class4.cxx |6 +++---
 sfx2/source/doc/oleprops.cxx|8 
 sfx2/source/view/viewfrm.cxx|4 ++--
 svx/source/dialog/_bmpmask.cxx  |6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit d66ddcffe61d90cb1472e74a040963086032bf9c
Author: Yusuf Keten 
AuthorDate: Tue Jan 7 00:05:15 2020 +0300
Commit: Michael Stahl 
CommitDate: Wed Jan 8 16:24:12 2020 +0100

tdf#75280 Convert inappropriate use of sal_uIntPtr to better integer types

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

diff --git a/filter/source/graphicfilter/icgm/class1.cxx 
b/filter/source/graphicfilter/icgm/class1.cxx
index cf9e7ed9885f..2661931d7df2 100644
--- a/filter/source/graphicfilter/icgm/class1.cxx
+++ b/filter/source/graphicfilter/icgm/class1.cxx
@@ -169,7 +169,7 @@ void CGM::ImplDoClass1()
 {
 sal_uInt32 nSize = ImplGetUI(1);
 
-if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) < nSize)
+if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) < nSize)
 throw css::uno::Exception("attempt to read past end of 
input", nullptr);
 
 pElement->aFontList.InsertName( mpSource + mnParaSize, nSize );
diff --git a/filter/source/graphicfilter/icgm/class4.cxx 
b/filter/source/graphicfilter/icgm/class4.cxx
index 0213e89542e3..4760215ebe18 100644
--- a/filter/source/graphicfilter/icgm/class4.cxx
+++ b/filter/source/graphicfilter/icgm/class4.cxx
@@ -186,7 +186,7 @@ void CGM::ImplDoClass4()
 sal_uInt32 nType = ImplGetUI16();
 sal_uInt32 nSize = ImplGetUI( 1 );
 
-if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) < nSize)
+if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) < nSize)
 throw css::uno::Exception("attempt to read past end of 
input", nullptr);
 
 OUString aStr(reinterpret_cast(mpSource) + mnParaSize, 
nSize, RTL_TEXTENCODING_ASCII_US);
@@ -223,7 +223,7 @@ void CGM::ImplDoClass4()
 sal_uInt32 nType = ImplGetUI16();
 sal_uInt32 nSize = ImplGetUI(1);
 
-if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) < nSize)
+if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) < nSize)
 throw css::uno::Exception("attempt to read past end of 
input", nullptr);
 
 OUString aStr(reinterpret_cast(mpSource) + mnParaSize, 
nSize, RTL_TEXTENCODING_ASCII_US);
@@ -240,7 +240,7 @@ void CGM::ImplDoClass4()
 (void)ImplGetUI16(); // nType
 sal_uInt32 nSize = ImplGetUI( 1 );
 
-if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) <= nSize)
+if (static_cast(mpEndValidSource - (mpSource + 
mnParaSize)) <= nSize)
 throw css::uno::Exception("attempt to read past end of 
input", nullptr);
 
 mpSource[ mnParaSize + nSize ] = 0;
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index 6ff78214d802..e194db7d2671 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -538,10 +538,10 @@ void SfxOleFileTimeProperty::ImplSave( SvStream& rStrm )
 static_cast< sal_uInt16 >( maDateTime.Month ),
 static_cast< sal_uInt16 >( maDateTime.Year ) ),
 tools::Time(
-static_cast< sal_uIntPtr >( maDateTime.Hours ),
-static_cast< sal_uIntPtr >( maDateTime.Minutes ),
-static_cast< sal_uIntPtr >( maDateTime.Seconds ),
-static_cast< sal_uIntPtr >( maDateTime.NanoSeconds ) ) );
+static_cast< sal_uInt16 >( maDateTime.Hours ),
+static_cast< sal_uInt16 >( maDateTime.Minutes ),
+static_cast< sal_uInt16 >( maDateTime.Seconds ),
+static_cast< sal_uInt32 >( maDateTime.NanoSeconds ) ) );
 // invalid time stamp is not converted to UTC
 // heuristic to detect editing durations (which we assume to be < 1 year):
 // check only the year, not the entire date
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index e7f0bbd1c3a4..94964af0ca92 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -2694,8 +2694,8 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const 
OUString& sMacro )
 aOUSource = pModule->GetSource32();
 sal_uInt16 nStart, nEnd;
 pMethod->GetLineRange( nStart, nEnd );
-sal_uIntPtr nlStart = nStart;
-sal_uIntPtr nlEnd = nEnd;
+sal_uInt16 nlS

Re: How are Jenkins builds killed exactly?

[Stephan Bergmann]

On 29/12/2019 15:17, Stephan Bergmann wrote:
Still trying to track down why sometimes zombie processes survive on the 
(Linux) Jenkins build machines (and then make later, unrelated Jenkins 
builds on those machines fail when zombie soffice.bin processes still 
hold onto named pipes that tests from the new builds want to create too).


One such recent case on tb79 was the aborted 
.  It 
left behind a zombie python.bin -> oosplash -> soffice.bin process tree 
executing UITest_calc_tests3.  (Where presumably the soffice.bin process 
had deadlocked, which then caused the Jenkins



Build timed out (after 15 minutes). Marking the build as aborted.
Build was aborted
Finished: ABORTED


reaction.  But once I noticed, the images of the involved processes had 
already been overwritten by later builds, so I couldn't use gdb to get 
backtraces.)


I think I now understand what's going on:  Assume some UITest hangs with 
a deadlock in soffice.bin.   
will kick in after the specified timeout of 900s to kill the build.


The relevant process tree is


java───sh───tb-slave-wrapper─┬─make───make───sh───sh───python.bin───oosplash───soffice.bin
 └─tee


where:

(1) java is running Jenkins' remoting.jar.

(2) The following sh is Jenkins' way of running


${LODE_HOME}/bin/tb_slave_wrapper --real --mode=config --clean


(as specified in "Build - Execute shell - Command" at 
) 
via some `/bin/sh -xe /tmp/jenkins*.sh` intermediary.


(3) tb-slave-wrapper is running the 
 
script, which at line 325 does



make ${keep_going} $target 2>&1 | tee -a ${build_log}


which explains...

(4) ...the first make and...

(5) the tee.

(6) The second make is due to gbuild calling make recursively.

(7) The following sh is running the UITest target's (heavily redacted) 
recipe line



/bin/sh -c 'S=... && I=... && W=.. && rm -rf $W/UITest/... && mkdir -p $W/UITest/... && 
... && ( TDOC=... /bin/sh $I/program/python $S/uitest/test_main.py ... || ( RET=$?; $S/solenv/bin/gdb-core-bt.sh ...))'


and...

(8) ...the following sh is running the


TDOC=... /bin/sh $I/program/python $S/uitest/test_main.py ...


part in a subshell.

(9) python.bin is running LO's uitest/test_main.py, which...

(10) ...spawns the soffice script which then execs oosplash, which...

(11) ...spawns soffice.bin.

 says at the bottom "Jenkins ver. 2.212", 
so lets assume that 
 
"[maven-release-plugin] prepare release jenkins-2.212" contains the 
source code of the remoting.jar running on the slave.


I assume the relevant starting point for the killing of the Jenkins 
job's processes is 




@Override
public void kill(Map modelEnvVars) throws 
InterruptedException {
ProcessTree.get().killAll(modelEnvVars);
}


which will try to kill all processes it finds that have inherited the 
BUILD_ID env var identifying the given Jenkins job.





public void killAll(@Nonnull Map modelEnvVars) throws 
InterruptedException {
for (OSProcess p : this)
if(p.hasMatchingEnvVars(modelEnvVars))
p.killRecursively();
}


first read the /proc file system tree to get a list of process IDs (in 
the ProcfsUnix constructor at 
), 
then iterates over the list to find processes with matching BUILD_ID and 
try to kill them.


This looks racy, in that a to-be-killed build can spawn further 
processes after /proc has been read to produce the list.  But that 
should not be relevant in our scenario of killing a hung build after a 
timeout, as that build will no longer be spawning new processes 
(everything but the deadlocked soffice.bin and its parent chain has 
already terminated).


However, what appears to be relevant here is that processes are killed 
in a random order (see below).


The actual process killing appears to take place at 




public static void destroy(int pid) throws IllegalAccessException,
InvocationTargetException {
if (JAVA8_DESTROY_PROCESS != null) {
JAVA8_DESTROY_PRO

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

[Noel Grandin (via logerrit)]

 editeng/source/xml/xmltxtimp.cxx |   24 +---
 1 file changed, 13 insertions(+), 11 deletions(-)

New commits:
commit 4506e77ff9791ef9ca42d5395300acd50f429528
Author: Noel Grandin 
AuthorDate: Wed Jan 8 13:19:46 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Jan 8 16:13:34 2020 +0100

return fast context in SvxXMLTextImportContext

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

diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index 6ebe9f235e3f..acd86b77cfee 100644
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -50,9 +50,11 @@ namespace {
 class SvxXMLTextImportContext : public SvXMLImportContext
 {
 public:
-SvxXMLTextImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const 
OUString& rLName, const uno::Reference< XText >& xText );
+SvxXMLTextImportContext( SvXMLImport& rImport, const uno::Reference< XText 
>& xText );
 
 virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix, 
const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ) 
override;
+virtual void SAL_CALL startFastElement( sal_Int32 /*nElement*/,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& ) 
override {}
 
 private:
 const uno::Reference< XText > mxText;
@@ -60,8 +62,8 @@ private:
 
 }
 
-SvxXMLTextImportContext::SvxXMLTextImportContext( SvXMLImport& rImport, 
sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XText >& xText )
-: SvXMLImportContext( rImport, nPrfx, rLName ), mxText( xText )
+SvxXMLTextImportContext::SvxXMLTextImportContext( SvXMLImport& rImport, const 
uno::Reference< XText >& xText )
+: SvXMLImportContext( rImport ), mxText( xText )
 {
 }
 
@@ -70,7 +72,7 @@ SvXMLImportContextRef 
SvxXMLTextImportContext::CreateChildContext( sal_uInt16 nP
 SvXMLImportContext* pContext = nullptr;
 if(XML_NAMESPACE_OFFICE == nPrefix && IsXMLToken( rLocalName, XML_BODY ) )
 {
-pContext = new SvxXMLTextImportContext( GetImport(), nPrefix, 
rLocalName, mxText );
+pContext = new SvxXMLTextImportContext( GetImport(), mxText );
 }
 else if( XML_NAMESPACE_OFFICE == nPrefix && IsXMLToken( rLocalName, 
XML_AUTOMATIC_STYLES ) )
 {
@@ -95,8 +97,8 @@ public:
 const css::uno::Reference< css::uno::XComponentContext >& rContext,
 const uno::Reference< XText > & rText );
 
-virtual SvXMLImportContext *CreateDocumentContext( sal_uInt16 nPrefix,
-const OUString& rLocalName, const uno::Reference< 
xml::sax::XAttributeList >& xAttrList )  override;
+virtual SvXMLImportContext* CreateFastContext(sal_Int32 nElement,
+const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList >& 
xAttrList ) override;
 
 private:
 const uno::Reference< XText > mxText;
@@ -104,15 +106,15 @@ private:
 
 }
 
-SvXMLImportContext *SvxXMLXTextImportComponent::CreateDocumentContext(
-sal_uInt16 const nPrefix, const OUString& rLocalName,
-const uno::Reference< xml::sax::XAttributeList >& /*xAttrList*/)
+SvXMLImportContext *SvxXMLXTextImportComponent::CreateFastContext(
+sal_Int32 nElement,
+const uno::Reference< xml::sax::XFastAttributeList >& /*xAttrList*/)
 {
 SvXMLImportContext* pContext = nullptr;
 
-if(XML_NAMESPACE_OFFICE == nPrefix && IsXMLToken( rLocalName, 
XML_DOCUMENT_CONTENT ) )
+if(nElement == XML_ELEMENT(OFFICE, XML_DOCUMENT_CONTENT ) )
 {
-pContext = new SvxXMLTextImportContext( *this, nPrefix, rLocalName, 
mxText );
+pContext = new SvxXMLTextImportContext( *this, mxText );
 }
 
 return pContext;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/qa sc/source

[Mike Kaganski (via logerrit)]

 sc/qa/unit/subsequent_export-test.cxx |   43 ++
 sc/source/filter/excel/xetable.cxx|7 -
 2 files changed, 44 insertions(+), 6 deletions(-)

New commits:
commit 925be88167868798c97ff1f66dcdb9bd3bbec1e2
Author: Mike Kaganski 
AuthorDate: Tue Dec 31 15:31:41 2019 +0300
Commit: Xisco Faulí 
CommitDate: Wed Jan 8 16:05:50 2020 +0100

tdf#120502: Excel doesn't increment max column for OOXML

This is obviously a result of copy-paste from XclExpColinfo::WriteBody
(where that increment existed at least since commit
92d8c6d6c4dc2a2824a0e24e22485361c3b65b54 from 2004). Implementing OOXML
export, authors of commit 64274b38f6cc50a8bb49f114f1ac9e7c1c3b3c4f likely
forgot to remove this after copying the code to XclExpColinfo::SaveXml.

This change removes the copy-pasted code incrementing column number for
the last possible column.

Change-Id: Ie2f043c4910568731cac90d89ec791ecbc8565b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86046
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit f1aec2392dba32e90f2cb0e4ad3c84bcbbd9f305)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86428
Reviewed-by: Xisco Faulí 

diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 90f2c85720be..e220803967cb 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -69,6 +69,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -230,6 +231,7 @@ public:
 void testXltxExport();
 void testRotatedImageODS();
 void testTdf128976();
+void testTdf120502();
 
 CPPUNIT_TEST_SUITE(ScExportTest);
 CPPUNIT_TEST(test);
@@ -361,6 +363,7 @@ public:
 CPPUNIT_TEST(testXltxExport);
 CPPUNIT_TEST(testRotatedImageODS);
 CPPUNIT_TEST(testTdf128976);
+CPPUNIT_TEST(testTdf120502);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -4585,6 +4588,46 @@ void ScExportTest::testTdf128976()
 xDocSh->DoClose();
 }
 
+void ScExportTest::testTdf120502()
+{
+// Create an empty worksheet; resize last column on its first sheet; 
export to XLSX, and check
+// that the last exportd column number is correct
+css::uno::Reference xDesktop
+= 
css::frame::Desktop::create(comphelper::getProcessComponentContext());
+CPPUNIT_ASSERT(xDesktop);
+
+css::uno::Sequence args(1);
+args[0].Name = "Hidden";
+args[0].Value <<= true;
+
+css::uno::Reference xComponent
+= xDesktop->loadComponentFromURL("private:factory/scalc", "_blank", 0, 
args);
+CPPUNIT_ASSERT(xComponent);
+
+// Get the document model
+SfxObjectShell* pFoundShell = 
SfxObjectShell::GetShellFromComponent(xComponent);
+CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
+
+ScDocShellRef xShell = dynamic_cast(pFoundShell);
+CPPUNIT_ASSERT(xShell);
+
+ScDocument& rDoc = xShell->GetDocument();
+const SCCOL nMaxCol = rDoc.MaxCol(); // 0-based
+
+const auto nOldWidth = rDoc.GetColWidth(nMaxCol, 0);
+rDoc.SetColWidth(nMaxCol, 0, nOldWidth + 100);
+
+std::shared_ptr pXPathFile
+= ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
+xShell->DoClose();
+const xmlDocPtr pSheet1
+= XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"xl/worksheets/sheet1.xml");
+CPPUNIT_ASSERT(pSheet1);
+
+// This was 1025 when nMaxCol+1 was 1024
+assertXPath(pSheet1, "/x:worksheet/x:cols/x:col", "max", 
OUString::number(nMaxCol + 1));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/excel/xetable.cxx 
b/sc/source/filter/excel/xetable.cxx
index 3e8ffb13bdef..0a7e5cbfbbed 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -1681,11 +1681,6 @@ void XclExpColinfo::WriteBody( XclExpStream& rStrm )
 
 void XclExpColinfo::SaveXml( XclExpXmlStream& rStrm )
 {
-// if last column is equal to last possible column, Excel adds one more
-sal_uInt16 nLastXclCol = mnLastXclCol;
-if( nLastXclCol == static_cast< sal_uInt16 >( 
rStrm.GetRoot().GetMaxPos().Col() ) )
-++nLastXclCol;
-
 const double nExcelColumnWidth = mnScWidth  / static_cast< double >( 
sc::TwipsToHMM( GetCharWidth() ) );
 
 // tdf#101363 In MS specification the output value is set with double 
precision after delimiter:
@@ -1703,7 +1698,7 @@ void XclExpColinfo::SaveXml( XclExpXmlStream& rStrm )
 XML_customWidth,ToPsz( mbCustomWidth ),
 XML_hidden, ToPsz( ::get_flag( mnFlags, EXC_COLINFO_HIDDEN 
) ),
 XML_outlineLevel,   OString::number(mnOutlineLevel),
-XML_max,OString::number(nLastXclCol + 1),
+XML_max,OString::number(mnLastXclCol + 1),
 XML_min,OString::number(mnFirstXclCol + 1),
 // OOXTODO: XML_phon

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

[Mike Kaganski (via logerrit)]

 sc/source/core/data/table4.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 8f46501233c164ff91d77a7f5adf74ea16cd0165
Author: Mike Kaganski 
AuthorDate: Wed Dec 25 10:23:41 2019 +0300
Commit: Mike Kaganski 
CommitDate: Wed Jan 8 15:57:19 2020 +0100

tdf#129606: limit precision in ScTable::FillAnalyse

... to 16th significant digit of least precise argument. This follows
the practice to only consider 16 significant digits of user-provided
values.

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

diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index c79e81af397c..5aab834a1fed 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -202,8 +202,11 @@ double approxDiff( double a, double b )
 // We now have two subtractions with a similar but not equal error. Obtain
 // the exponent of the error magnitude and round accordingly.
 const double e = fabs(d - c);
-const double fExp = floor( log10( e));
-return rtl::math::round( c, -static_cast(fExp)-1);
+const int nExp = static_cast(floor(log10(e))) + 1;
+// tdf#129606: Limit precision to the 16th significant digit of the least 
precise argument.
+// Cf. mnMaxGeneralPrecision in sc/source/core/data/column3.cxx.
+const int nExpArg = static_cast(floor(log10(std::max(aa, ab - 15;
+return rtl::math::round(c, -std::max(nExp, nExpArg));
 }
 }
 
___
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.2' - sw/qa writerfilter/source

[Mike Kaganski (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf129353.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx|   28 +++
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |   29 +++
 sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx |   12 -
 sw/qa/extras/rtfimport/rtfimport.cxx  |2 
 writerfilter/source/dmapper/DomainMapper.cxx  |   11 -
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |  180 +-
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |5 
 8 files changed, 189 insertions(+), 78 deletions(-)

New commits:
commit a1371535397f3004a05fb0083ede5319f27f8abf
Author: Mike Kaganski 
AuthorDate: Fri Dec 13 09:36:39 2019 +0300
Commit: Mike Kaganski 
CommitDate: Wed Jan 8 15:55:54 2020 +0100

tdf#129353, tdf#129402: fix node creation on index import

ToC, bibliography, and index sections import code changed to closely
follow what Word does, make sure that pre-rendered entries don't get
imported as standalone paragraphs outside of the index sections, and
paragraph count is accurate (no missing or added paragraphs as much
as possible).

In Word, an index may start and end in the middle of a paragraph:



Some text before index





 TOC ...





First pre-rendered index entry


...


Last pre-rendered index entry





Some text after index



However, normally it looks like either no runs precedig index, or no
runs of pre-rendered contents will be present. When no Std elements
are used, the typical situation is that there's a normal paragraph
(possibly with some user text), which ends with index start marker,
without any pre-rendered contents in the same paragraph; and all pre-
rendered contents goes in following paragraphs. Such index normally
ends with index end marker in the *first* run of a paragraph, which
then might have normal text runs.

When Stds are used, then no leading/trailing out-of-index runs in
paragraphs with marks are usually present; and in this case, when
paragraphs with index marks don't contain pre-rendered entries, they
still are treated as part of the index.

In Writer, indexes are node sections (and so cannot be inline with
other paragraph contents). When there was some paragraph content
already before the start-of-index mark, the paragraph is assumed
to end before the index; in this case, when current  element
ends, importer decides if a separate starting paragraph is needed
or not, depending on if there was some runs after the mark. When
there was no text runs before the starting mark, then the paragraph
is treated as leading paragraph of the index. This allows to not
miss empty paragraphs before index; and not have two paragraphs
where there was one in Word. Only in cases when user had manually
typed text both in and outside of the index in the same paragraph
in Word, we would have the paragraph split into two in Writer.

For end marks, the behaviour depends on whether it's inside Std.
When inside, the ending paragraph starting with index end mark is
considered part of the index. For out-of-Std case, it's considered
normal paragraph (and measures are taken to make sure it's not
dropped even if empty, because sometimes such paragraphs don't
have other content, and have section settings, which is usually
treated by Writer as "drop this paragraph" sign).

A special problem is multi-column index. It's wrapped into a
continuous section by Word; and in Writer, we also wrap it into
a section. It would be possibly useful to detect somehow if this
section is part of index definition, and in this case, drop the
section and put its properties into the Writer's index section.
That would avoid an explicit section in the imported document.
This is TODO, for someone who figures how to detect reliably if
the section belongs to index definition. See comment in
DomainMapper_Impl::appendTextSectionAfter. By the way, current
export code is wrong, producing an index that is single-column
in Word; this change doesn't touch that.

Several existing tests needed to be fixed, which used to test
wrong results.

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf129353.docx 
b/sw/qa/extras/ooxmlexport/

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - filter/source

[Caolán McNamara (via logerrit)]

 filter/source/graphicfilter/icgm/class7.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6bc3f02ed2378dd70f03df64f53e852e3c9dbfdd
Author: Caolán McNamara 
AuthorDate: Sun Jan 5 20:37:20 2020 +
Commit: Michael Stahl 
CommitDate: Wed Jan 8 15:42:38 2020 +0100

ofz#19803 check for negative values

Change-Id: I30036a16cf1651a7e27c7aefa086b3725d58933a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86250
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 0ab8ae4d98122f7de50365a062675d001ef0ca6a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86341
Reviewed-by: Michael Stahl 

diff --git a/filter/source/graphicfilter/icgm/class7.cxx 
b/filter/source/graphicfilter/icgm/class7.cxx
index 8c2478a308ae..b1652cc84ae0 100644
--- a/filter/source/graphicfilter/icgm/class7.cxx
+++ b/filter/source/graphicfilter/icgm/class7.cxx
@@ -80,7 +80,7 @@ void CGM::ImplDoClass7()
 
 mpChart->mDataNode[ 0 ] = 
*reinterpret_cast( pAppData );
 sal_Int8 nZoneEnum = mpChart->mDataNode[ 0 ].nZoneEnum;
-if ( nZoneEnum && ( nZoneEnum <= 6 ) )
+if (nZoneEnum > 0 && nZoneEnum <= 6)
 mpChart->mDataNode[ nZoneEnum ] = 
*reinterpret_cast( pAppData );
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - helpcontent2

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 11ab8389d4a2a05c18d23160e0ec51d559a75918
Author: Christian Lohmaier 
AuthorDate: Wed Jan 8 15:42:43 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Jan 8 15:42:43 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'libreoffice-6-4'
  to daea7016dd2410de8a610cc63a6ab3d84b256c52
  - avoid unnecessary change in po files due to use of spaces to indent

po file extraction would strip tabs, but keeps spaces when extracting
strings.

Change-Id: I2947b12787f52f65ef9981ba6a9c9ffdee503a6b
(cherry picked from commit 9fc4da0db94a4d06ab31ada262551a0a28f2859e)

diff --git a/helpcontent2 b/helpcontent2
index b69d4fce04ce..daea7016dd24 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b69d4fce04ce452840f9c4fbe0de83e7316b5900
+Subproject commit daea7016dd2410de8a610cc63a6ab3d84b256c52
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/flatpak-manifest.in

[Stephan Bergmann (via logerrit)]

 solenv/flatpak-manifest.in |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 97cae48ae9711e27eaf80058fca7f9a5d4cf547b
Author: Stephan Bergmann 
AuthorDate: Wed Jan 8 11:33:25 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 8 15:41:42 2020 +0100

Adapt solenv/flatpak-manifest.in to implicit --enable-skia

(or should it better explicitly --disable-skia?)

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

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 6536b0c5d552..b4bf47bc3971 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -572,6 +572,12 @@
 "type": "file",
 "dest-filename": 
"external/tarballs/libatomic_ops-7.6.8.tar.gz"
 },
+{
+"url": 
"https://dev-www.libreoffice.org/src/skia-m80-0af13b3caf0384981f50e073ebc7bd0f3f751711.tar.xz";,
+"sha256": 
"f1b3be9d9468c20a84fa21aea44b19daa48bca8fd2c7f9ea6fe76d6e31f54530",
+"type": "file",
+"dest-filename": 
"external/tarballs/skia-m80-0af13b3caf0384981f50e073ebc7bd0f3f751711.tar.xz"
+},
 {
 "url": 
"https://dev-www.libreoffice.org/extern/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf";,
 "sha256": 
"884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 3c9288edd5bbdbac239a236f96f6c5f83c28de10
Author: Christian Lohmaier 
AuthorDate: Wed Jan 8 15:42:21 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Wed Jan 8 15:42:21 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 9fc4da0db94a4d06ab31ada262551a0a28f2859e
  - avoid unnecessary change in po files due to use of spaces to indent

po file extraction would strip tabs, but keeps spaces when extracting
strings.

Change-Id: I2947b12787f52f65ef9981ba6a9c9ffdee503a6b

diff --git a/helpcontent2 b/helpcontent2
index 84e12edbc498..9fc4da0db94a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 84e12edbc498a2fca5a7e39eb8754196b5df
+Subproject commit 9fc4da0db94a4d06ab31ada262551a0a28f2859e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-6-4' - source/text

[Christian Lohmaier (via logerrit)]

 source/text/simpress/01/0605.xhp |   27 +--
 1 file changed, 9 insertions(+), 18 deletions(-)

New commits:
commit daea7016dd2410de8a610cc63a6ab3d84b256c52
Author: Christian Lohmaier 
AuthorDate: Wed Jan 8 15:24:26 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Jan 8 15:25:53 2020 +0100

avoid unnecessary change in po files due to use of spaces to indent

po file extraction would strip tabs, but keeps spaces when extracting
strings.

Change-Id: I2947b12787f52f65ef9981ba6a9c9ffdee503a6b
(cherry picked from commit 9fc4da0db94a4d06ab31ada262551a0a28f2859e)

diff --git a/source/text/simpress/01/0605.xhp 
b/source/text/simpress/01/0605.xhp
index 6d58c3d4b..daa401adc 100644
--- a/source/text/simpress/01/0605.xhp
+++ b/source/text/simpress/01/0605.xhp
@@ -46,8 +46,7 @@
 
 
 
-Icon
-
+Icon
 
 
 First image
@@ -61,8 +60,7 @@
 
 
 
-Icon
-
+Icon
 
 
 Backwards
@@ -76,8 +74,7 @@
 
 
 
-Icon
-
+Icon
 
 
 Stop
@@ -91,8 +88,7 @@
 
 
 
-Icon
-
+Icon
 
 
 Play
@@ -106,8 +102,7 @@
 
 
 
-Icon
-
+Icon
 
 
 Last image
@@ -133,8 +128,7 @@
 
 
 
-Icon
-
+Icon
 
 
 Apply Object
@@ -150,8 +144,7 @@
 
 
 
-Icon
-
+Icon
 
 
 Apply Objects Individually
@@ -166,8 +159,7 @@
 
 
 
-Icon
-
+Icon
 
 
 Delete Current Image
@@ -182,8 +174,7 @@
 
 
 
-Icon
-
+Icon
 
 
 Delete All Images
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier (via logerrit)]

 source/text/simpress/01/0605.xhp |   27 +--
 1 file changed, 9 insertions(+), 18 deletions(-)

New commits:
commit 9fc4da0db94a4d06ab31ada262551a0a28f2859e
Author: Christian Lohmaier 
AuthorDate: Wed Jan 8 15:24:26 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Jan 8 15:24:26 2020 +0100

avoid unnecessary change in po files due to use of spaces to indent

po file extraction would strip tabs, but keeps spaces when extracting
strings.

Change-Id: I2947b12787f52f65ef9981ba6a9c9ffdee503a6b

diff --git a/source/text/simpress/01/0605.xhp 
b/source/text/simpress/01/0605.xhp
index 6d58c3d4b..daa401adc 100644
--- a/source/text/simpress/01/0605.xhp
+++ b/source/text/simpress/01/0605.xhp
@@ -46,8 +46,7 @@
 
 
 
-Icon
-
+Icon
 
 
 First image
@@ -61,8 +60,7 @@
 
 
 
-Icon
-
+Icon
 
 
 Backwards
@@ -76,8 +74,7 @@
 
 
 
-Icon
-
+Icon
 
 
 Stop
@@ -91,8 +88,7 @@
 
 
 
-Icon
-
+Icon
 
 
 Play
@@ -106,8 +102,7 @@
 
 
 
-Icon
-
+Icon
 
 
 Last image
@@ -133,8 +128,7 @@
 
 
 
-Icon
-
+Icon
 
 
 Apply Object
@@ -150,8 +144,7 @@
 
 
 
-Icon
-
+Icon
 
 
 Apply Objects Individually
@@ -166,8 +159,7 @@
 
 
 
-Icon
-
+Icon
 
 
 Delete Current Image
@@ -182,8 +174,7 @@
 
 
 
-Icon
-
+Icon
 
 
 Delete All Images
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomáš Chvátal (via logerrit)]

 vcl/source/window/layout.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 95d7d13205c05c2114a6d3bc2c4538246b22f3e0
Author: Tomáš Chvátal 
AuthorDate: Wed Jan 8 13:25:05 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jan 8 15:40:41 2020 +0100

tdf#129879 Fix wrong order of buttons

Change-Id: I0cb135c5b8298fd7c5579673d0eaff7068a03842
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86426
Tested-by: Jenkins
Reviewed-by: Tomáš Chvátal 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 981ac621aa60..9c5a36304a21 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -718,8 +718,8 @@ static int getButtonPriority(const OString &rType)
 const OUString &rEnv = Application::GetDesktopEnvironment();
 
 if (rEnv.equalsIgnoreAsciiCase("windows") ||
-rEnv.equalsIgnoreAsciiCase("tde") ||
-rEnv.startsWithIgnoreAsciiCase("kde"))
+rEnv.equalsIgnoreAsciiCase("lxqt") ||
+rEnv.startsWithIgnoreAsciiCase("plasma"))
 {
 pOrder = &aSaveDiscardCancel[0];
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 comphelper/source/misc/meminfo.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4ddc57c4af77ae5990b1cab2201ec844d945069a
Author: Stephan Bergmann 
AuthorDate: Wed Jan 8 11:36:50 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 8 15:40:02 2020 +0100

loplugin:includeform (clang-cl)

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

diff --git a/comphelper/source/misc/meminfo.cxx 
b/comphelper/source/misc/meminfo.cxx
index 762d4ef1a9b2..72a55addd4d5 100644
--- a/comphelper/source/misc/meminfo.cxx
+++ b/comphelper/source/misc/meminfo.cxx
@@ -24,7 +24,7 @@
 
 #define WIN32_LEAN_AND_MEAN
 #include 
-#include "psapi.h"
+#include 
 
 #elif defined(UNX)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomáš Chvátal (via logerrit)]

 vcl/source/window/layout.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4f0d4c9387eb1d73f96b9072128cff2038f6c61a
Author: Tomáš Chvátal 
AuthorDate: Wed Jan 8 13:25:05 2020 +0100
Commit: Tomáš Chvátal 
CommitDate: Wed Jan 8 15:35:20 2020 +0100

tdf#129879 Fix wrong order of buttons

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

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index fbada38f6e48..be8313c12f00 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -722,8 +722,8 @@ static int getButtonPriority(const OString &rType)
 const OUString &rEnv = Application::GetDesktopEnvironment();
 
 if (rEnv.equalsIgnoreAsciiCase("windows") ||
-rEnv.equalsIgnoreAsciiCase("tde") ||
-rEnv.startsWithIgnoreAsciiCase("kde"))
+rEnv.equalsIgnoreAsciiCase("lxqt") ||
+rEnv.startsWithIgnoreAsciiCase("plasma"))
 {
 pOrder = &aSaveDiscardCancel[0];
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 loleaflet/js/w2ui-1.5.rc1.js |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 152a20df3a58fc79e79d6baa6a50e755ad3faae2
Author: Tor Lillqvist 
AuthorDate: Wed Jan 8 16:26:32 2020 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Jan 8 16:29:45 2020 +0200

Revert "tdf#129374: Make the overlay wider on iOS if it seems necessary"

There is a better fix coming.

This reverts commit ce7ad16087701adf9803f2dfd3b2da0eb2718668.

diff --git a/loleaflet/js/w2ui-1.5.rc1.js b/loleaflet/js/w2ui-1.5.rc1.js
index a9e48c1b2..687a00202 100644
--- a/loleaflet/js/w2ui-1.5.rc1.js
+++ b/loleaflet/js/w2ui-1.5.rc1.js
@@ -2388,13 +2388,6 @@ w2utils.event = {
 Y = (offset.top + w2utils.getSize(obj, 'height') + 
options.top + 7);
 offsetTop = offset.top;
 }
-
-// tdf#129374 make the overlay wider so that it is more likely 
all we want to put in it will fit. Yes, this
-// is just horrible heuristics. The sane thing would be if 
this w2ui code could itself make sure that the
-// overlay thing grows in width if necessary as stuff is added 
to it so that they all show up.
-if (window.ThisIsTheiOSApp && X > window.innerWidth - 300)
-   X = window.innerWidth - 300;
-
 div1.css({
 left:  X + 'px',
 top :  Y + 'px',
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LO 6.4 : missing file in python 3.7.6 tarball

[Jean-Baptiste Faure]

Hi Michael, all,

My current build of LibreOffice 6.4 under Ubuntu 18.04 x86-64 fails with 
the following error message:



[...]/60/external/python3/ExternalPackage_python3.mk:43: *** file 
[...]/60/workdir/UnpackedTarball/python3/LO_lib/_uuid.cpython-3.7m.so does not 
exist in the tarball. Arrêt.
Makefile:167: recipe for target 'ExternalPackage_python3' failed


I guess there is a problem in the commit " python3: upgrade to release 
3.7.6" 
https://gerrit.libreoffice.org/plugins/gitiles/core/+/853cc90f49d59a94242494c4aee2479de0865486


Best regards
JBF
--
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Miklos Vajna (via logerrit)]

 pyuno/source/module/pyuno_runtime.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 46b469d58a0e6b8fbe5888045c272159154a0705
Author: Miklos Vajna 
AuthorDate: Wed Jan 8 11:12:08 2020 +0100
Commit: Michael Stahl 
CommitDate: Wed Jan 8 14:48:57 2020 +0100

pyuno: fix build against system-python-3.6

pyuno/source/module/pyuno_runtime.cxx:984:57: error: use of undeclared 
identifier 'PyThread_get_thread_ident'

It's only an assert, so simply do it only for >=3.7.

Change-Id: Ia3fffc7a9af30780adff9bc7dbabe1727c1f8f54
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86410
Reviewed-by: Michael Stahl 
Tested-by: Jenkins
(cherry picked from commit fb4e15a89d8d8f081c0c152e5047bc0e76870b39)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86421
Tested-by: Michael Stahl 

diff --git a/pyuno/source/module/pyuno_runtime.cxx 
b/pyuno/source/module/pyuno_runtime.cxx
index 5fa923c236dc..e0987cd63cd7 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -979,9 +979,11 @@ PyThreadAttach::PyThreadAttach( PyInterpreterState *interp)
 // note: *may* be called recursively, with PyThreadDetach between  - in
 // that case, don't create *new* PyThreadState but reuse!
 #ifndef NDEBUG
+#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
 PyThreadState const*const current = _PyThreadState_UncheckedGet();
 // dereference isn't safe but let's hope it's tolerable for debugging 
purpose
 assert((current == nullptr || current->thread_id != 
PyThread_get_thread_ident()) && "recursive PyThreadAttach");
+#endif
 #endif
 tstate = PyGILState_GetThisThreadState(); // from TLS, possibly detached
 if (!tstate)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szabolcs Toth (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf129450_BottomBorder.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport3.cxx |   12 
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx  |5 +
 3 files changed, 17 insertions(+)

New commits:
commit e4b8fc7563087e82a659f6b697a986b53e51876c
Author: Szabolcs Toth 
AuthorDate: Tue Dec 17 16:06:30 2019 +0100
Commit: Xisco Faulí 
CommitDate: Wed Jan 8 14:43:54 2020 +0100

tdf#129450 DOCX import: fix bottom border of 1-row tables

Bottom border was missing in a 1-row table with disabled
inside borders. This happened because LO applied the empty
horizontal borders to the bottom border of the table.

Change-Id: I40140bf63297189edad13088f98fc5f869969c2d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85303
Reviewed-by: László Németh 
Tested-by: László Németh 
(cherry picked from commit 6b1bd2699b0bdad6dc42db741dea0717cf7c1d36)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86397
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf129450_BottomBorder.docx 
b/sw/qa/extras/ooxmlexport/data/tdf129450_BottomBorder.docx
new file mode 100644
index ..df00bfe04421
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf129450_BottomBorder.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index 8e7a7149292e..4511509e69cd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -1036,6 +1036,18 @@ DECLARE_OOXMLEXPORT_TEST(testRightBorder, 
"tdf129442_RightBorder.docx")
 assertXPath(pXmlDocument, 
"/w:document/w:body/w:tbl/w:tr[1]/w:tc/w:tcPr/w:tcBorders/w:end [@w:val = 
'nil']", 0);
 }
 
+DECLARE_OOXMLEXPORT_TEST(testBottomBorder, "tdf129450_BottomBorder.docx")
+{
+// tdf#129450: Missing bottom border in one row table.
+
+xmlDocPtr pXmlDocument = parseExport("word/document.xml");
+if (!pXmlDocument)
+return;
+
+// If there is no bottom border, it is shown in tcBorders.
+assertXPath(pXmlDocument, 
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:tcPr/w:tcBorders/w:bottom [@w:val = 
'nil']", 0);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 21472dc0eddf..b3bd18de4931 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -835,6 +835,11 @@ CellPropertyValuesSeq_t 
DomainMapperTableHandler::endTableGetCellProperties(Tabl
 {
 rInfo.pTableBorders->Erase(META_PROP_VERTICAL_BORDER);
 }
+// Do not apply horizontal borders to a one row table.
+else if (m_aCellProperties.size() == 1 && 
aRowOfCellsIterator->size() > 1)
+{
+rInfo.pTableBorders->Erase(META_PROP_HORIZONTAL_BORDER);
+}
 
 lcl_computeCellBorders( rInfo.pTableBorders, *aCellIterator, 
nCell, nRow, bIsEndCol, bIsEndRow );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - chart2/qa xmloff/source

[Tamas Bunth (via logerrit)]

 chart2/qa/extras/chart2import.cxx |   21 -
 chart2/qa/extras/data/odp/tdf123206.odp   |binary
 xmloff/source/chart/SchXMLPlotAreaContext.cxx |2 ++
 3 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit a57f273da44ec4f3a1364e77679146bf535941ff
Author: Tamas Bunth 
AuthorDate: Thu Jan 2 12:55:16 2020 +0100
Commit: Andras Timar 
CommitDate: Wed Jan 8 14:31:30 2020 +0100

tdf#123206 Add test: import custom-label-field

Add test for deprecated custom-label-field attribute of the data-point
element.

Change-Id: I9a7619898fa72900323e5b41728d2146c14203e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86103
Tested-by: Jenkins
Reviewed-by: Tamás Bunth 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86123
Reviewed-by: Andras Timar 

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index 6ff60e1e6c00..9fa051df2bc1 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -150,6 +150,7 @@ public:
 void testTdf122765();
 void testTdf121991();
 void testTdf125444PercentageCustomLabel();
+void testTdf123206CustomLabelField();
 
 CPPUNIT_TEST_SUITE(Chart2ImportTest);
 CPPUNIT_TEST(Fdo60083);
@@ -249,7 +250,7 @@ public:
 CPPUNIT_TEST(testTdf122765);
 CPPUNIT_TEST(testTdf121991);
 CPPUNIT_TEST(testTdf125444PercentageCustomLabel);
-
+CPPUNIT_TEST(testTdf123206CustomLabelField);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -2318,6 +2319,24 @@ void 
Chart2ImportTest::testTdf125444PercentageCustomLabel()
 
 }
 
+void Chart2ImportTest::testTdf123206CustomLabelField()
+{
+// File contains the deprecated "custom-label-field" attribute of the
+// "data-point" element. It should be interpreted and stored as a data 
point
+// property.
+uno::Reference< chart2::XChartDocument > 
xChartDoc(getChartDocFromImpress("/chart2/qa/extras/data/odp/", 
"tdf123206.odp"), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
+CPPUNIT_ASSERT(xChartDoc.is());
+Reference xDataSeries = 
getDataSeriesFromDoc(xChartDoc, 0);
+CPPUNIT_ASSERT(xDataSeries.is());
+Reference xDp = xDataSeries->getDataPointByIndex(1);
+Sequence> aLabelFields;
+CPPUNIT_ASSERT(xDp->getPropertyValue("CustomLabelFields") >>= 
aLabelFields);
+CPPUNIT_ASSERT_EQUAL(static_cast(1), aLabelFields.getLength());
+CPPUNIT_ASSERT_EQUAL(OUString("Kiskacsa"), aLabelFields[0]->getString());
+
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ImportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/odp/tdf123206.odp 
b/chart2/qa/extras/data/odp/tdf123206.odp
new file mode 100644
index ..1975756bce18
Binary files /dev/null and b/chart2/qa/extras/data/odp/tdf123206.odp differ
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx 
b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 9767efd933dc..f488244e142f 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -702,6 +702,8 @@ void SchXMLDataPointContext::StartElement( const 
uno::Reference< xml::sax::XAttr
 }
 else if( nPrefix == XML_NAMESPACE_LO_EXT)
 {
+// Deprecated. New documents use the chart:data-label element
+// instead in order to store custom label text.
 if( IsXMLToken( aLocalName, XML_CUSTOM_LABEL_FIELD) && 
!mbHasLabelParagraph)
 {
 sCustomLabelField = xAttrList->getValueByIndex( i );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 sw/source/filter/ww8/WW8Sttbf.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 16f8807a9255359da53e980185591e356166e414
Author: Stephan Bergmann 
AuthorDate: Wed Jan 8 11:42:59 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 8 14:24:16 2020 +0100

Missing include (Windows --disable-pch; for std::min)

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

diff --git a/sw/source/filter/ww8/WW8Sttbf.cxx 
b/sw/source/filter/ww8/WW8Sttbf.cxx
index cd253087d68a..54e05c42ac02 100644
--- a/sw/source/filter/ww8/WW8Sttbf.cxx
+++ b/sw/source/filter/ww8/WW8Sttbf.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
+#include 
 #include 
 #include "WW8Sttbf.hxx"
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

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

New commits:
commit d486d675ead6a4b4c08ac0e6b9977d280f1606e0
Author: Andrea Gelmini 
AuthorDate: Tue Jan 7 19:24:41 2020 +0100
Commit: Julien Nabet 
CommitDate: Wed Jan 8 14:09:28 2020 +0100

Fix typo

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

diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx 
b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index 42ec72d3221a..6a9e02a499bf 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -53,7 +53,7 @@ SwAnchoredObjectPosition::SwAnchoredObjectPosition( 
SdrObject& _rDrawObj )
   mbDoNotCaptureAnchoredObj( false )
 {
 #if OSL_DEBUG_LEVEL > 0
-// assert, if object isn't of excepted type
+// assert, if object isn't of expected type
 const bool bObjOfExceptedType =
 dynamic_cast( &mrDrawObj) !=  nullptr || 
// object representing fly frame
 dynamic_cast( &mrDrawObj) !=  nullptr|| 
// 'virtual' drawing object
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 svl/source/items/stylepool.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 05173782d8fd35f302db471b509c2f8389beeab1
Author: Andrea Gelmini 
AuthorDate: Tue Jan 7 19:24:36 2020 +0100
Commit: Julien Nabet 
CommitDate: Wed Jan 8 14:08:57 2020 +0100

Fix typo

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

diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index 6471212c7ff4..a7089165309f 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -363,7 +363,7 @@ public:
 DBG_ASSERT( !pIgnorableItems || !pIgnorableItems->Count(),
 " - misusage: item set 
for ignorable item should be empty. Please correct usage." );
 DBG_ASSERT( !mpIgnorableItems || !mpIgnorableItems->Count(),
-" -  does not work as excepted -  is not empty." );
+" -  does not work as expected -  is not empty." );
 }
 
 std::shared_ptr insertItemSet( const SfxItemSet& rSet, const 
OUString* pParentName = nullptr );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

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

New commits:
commit e30c8812f623f8dcfa83ed7e44b40c78ad94933b
Author: Andrea Gelmini 
AuthorDate: Tue Jan 7 19:24:42 2020 +0100
Commit: Julien Nabet 
CommitDate: Wed Jan 8 14:08:25 2020 +0100

Fix typo

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

diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx 
b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
index 402249cf8080..0a19ebc7c4ae 100644
--- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
@@ -122,7 +122,7 @@ static bool lcl_DoesVertPosFits( const SwTwips _nRelPosY,
 else if ( _pUpperOfOrientFrame->IsInTab() && _bGrowInTable )
 {
 // #i45085# - check, if upper frame would grow the
-// excepted amount of twips.
+// expected amount of twips.
 const SwTwips nTwipsGrown = 
const_cast(_pUpperOfOrientFrame)->
 Grow( _nRelPosY - _nAvail, true );
 bVertPosFits = ( nTwipsGrown == ( _nRelPosY - _nAvail ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

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

New commits:
commit 026b6dc1f195e6af797ba1bbb096130b1ebdebf4
Author: Andrea Gelmini 
AuthorDate: Tue Jan 7 19:24:39 2020 +0100
Commit: Julien Nabet 
CommitDate: Wed Jan 8 14:04:26 2020 +0100

Fix typo

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

diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx 
b/sw/source/core/layout/objectformattertxtfrm.cxx
index cc59fdd4e15c..d02cdc2edf07 100644
--- a/sw/source/core/layout/objectformattertxtfrm.cxx
+++ b/sw/source/core/layout/objectformattertxtfrm.cxx
@@ -324,7 +324,7 @@ bool SwObjectFormatterTextFrame::DoFormatObjs()
 if ( bSuccess )
 {
 // format of as-character anchored floating screen objects - no 
failure
-// excepted on the format of these objects.
+// expected on the format of these objects.
 bSuccess = FormatObjsAtFrame_();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

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

New commits:
commit 9a66bd88834494457574b7575656ae935103759e
Author: Andrea Gelmini 
AuthorDate: Tue Jan 7 19:24:44 2020 +0100
Commit: Julien Nabet 
CommitDate: Wed Jan 8 14:03:28 2020 +0100

Fix typo

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

diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index cc8c30a08a25..9f3331c1ecb4 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -4638,7 +4638,7 @@ namespace {
 const SfxStringItem& rListIdItem =
 dynamic_cast(pItem);
 OSL_ENSURE( rListIdItem.GetValue().getLength() > 0,
-" - empty list id 
attribute not excepted. Serious defect." );
+" - empty list id 
attribute not expected. Serious defect." );
 const OUString sListIdOfTextNode = rTextNode.GetListId();
 if ( rListIdItem.GetValue() != sListIdOfTextNode )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: contributing to LibreOffice

[Ilmari Lauhakangas]

Animesh Ramasami IIT bhu kirjoitti 8.1.2020 klo 12.25:
  I am interested in contributing for your organization so may I know 
what are the  prerequisites and how to get started with it...


If you are interested in contributing C++ code, follow this article: 
https://wiki.documentfoundation.org/Development/GetInvolved


If not, please specify in what way you would like to contribute.

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

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

[Andrea Gelmini (via logerrit)]

 sw/source/uibase/inc/conttree.hxx  |1 -
 sw/source/uibase/utlui/content.cxx |1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5c3b41e31e22157edab67b00efc66ec3ddafc1f7
Author: Andrea Gelmini 
AuthorDate: Tue Jan 7 15:11:39 2020 +0100
Commit: Julien Nabet 
CommitDate: Wed Jan 8 14:02:23 2020 +0100

Fix typos

Change-Id: I2f498d16882e2aa6e75d6fc0a1073f094869a2b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/77765
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Julien Nabet 

diff --git a/sw/source/uibase/inc/conttree.hxx 
b/sw/source/uibase/inc/conttree.hxx
index 9ea8f9f9ffc9..0c65e0acc407 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -216,7 +216,6 @@ public:
 voidExecCommand(const OUString& rCmd, bool bModifier);
 
 voidShowTree();
-/** folded together will not be glidled */
 voidHideTree();
 
 boolIsConstantView() const { return State::CONSTANT == 
m_eState; }
diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index eaaf40f8963a..5b69e66a50fa 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -2734,6 +2734,7 @@ void SwContentTree::Paint( vcl::RenderContext& 
rRenderContext,
 
 void SwContentTree::HideTree()
 {
+// folded together will not be idled
 m_aUpdTimer.Stop();
 SvTreeListBox::Hide();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svx/source tools/source

[Yusuf Keten (via logerrit)]

 svx/source/engine3d/obj3d.cxx  |2 +-
 svx/source/svdraw/svdobj.cxx   |2 +-
 svx/source/svdraw/svdocirc.cxx |4 ++--
 svx/source/svdraw/svdograf.cxx |2 +-
 svx/source/svdraw/svdomeas.cxx |6 +++---
 svx/source/svdraw/svdotext.cxx |2 +-
 svx/source/svdraw/svdotxdr.cxx |2 +-
 tools/source/stream/stream.cxx |2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit f69fa576c579a88853a563aed1b947319b6ffcf1
Author: Yusuf Keten 
AuthorDate: Tue Jan 7 00:12:30 2020 +0300
Commit: Michael Stahl 
CommitDate: Wed Jan 8 14:00:31 2020 +0100

 tdf#96505 Get rid of cargo cult long integer literals

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

diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index f743c58fd67b..911a9b7ff70a 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -520,7 +520,7 @@ basegfx::B2DPolyPolygon E3dCompoundObject::TakeXorPoly() 
const
 sal_uInt32 E3dCompoundObject::GetHdlCount() const
 {
 // 8 corners + 1 E3dVolumeMarker (= Wireframe representation)
-return 9L;
+return 9;
 }
 
 void E3dCompoundObject::AddToHdlList(SdrHdlList& rHdlList) const
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index db6238c704ba..d1d898379fdf 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1190,7 +1190,7 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const
 
 sal_uInt32 SdrObject::GetHdlCount() const
 {
-return 8L;
+return 8;
 }
 
 void SdrObject::AddToHdlList(SdrHdlList& rHdlList) const
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 7c5aa3bf9196..efbc2803cb2f 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -424,11 +424,11 @@ sal_uInt32 SdrCircObj::GetHdlCount() const
 {
 if(SdrCircKind::Full != meCircleKind)
 {
-return 10L;
+return 10;
 }
 else
 {
-return 8L;
+return 8;
 }
 }
 
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 135b934be8b4..67b598ce14b3 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -767,7 +767,7 @@ SdrGrafObj& SdrGrafObj::operator=( const SdrGrafObj& rObj )
 
 sal_uInt32 SdrGrafObj::GetHdlCount() const
 {
-return 8L;
+return 8;
 }
 
 void SdrGrafObj::AddToHdlList(SdrHdlList& rHdlList) const
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index e950dc8f14e3..8ac271db2904 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -749,7 +749,7 @@ basegfx::B2DPolyPolygon SdrMeasureObj::TakeXorPoly() const
 
 sal_uInt32 SdrMeasureObj::GetHdlCount() const
 {
-return 6L;
+return 6;
 }
 
 void SdrMeasureObj::AddToHdlList(SdrHdlList& rHdlList) const
@@ -1079,7 +1079,7 @@ void SdrMeasureObj::RecalcSnapRect()
 
 sal_uInt32 SdrMeasureObj::GetSnapPointCount() const
 {
-return 2L;
+return 2;
 }
 
 Point SdrMeasureObj::GetSnapPoint(sal_uInt32 i) const
@@ -1095,7 +1095,7 @@ bool SdrMeasureObj::IsPolyObj() const
 
 sal_uInt32 SdrMeasureObj::GetPointCount() const
 {
-return 2L;
+return 2;
 }
 
 Point SdrMeasureObj::GetPoint(sal_uInt32 i) const
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 4ce65ca33f61..ef76a53b1dca 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1120,7 +1120,7 @@ void SdrTextObj::RecalcSnapRect()
 
 sal_uInt32 SdrTextObj::GetSnapPointCount() const
 {
-return 4L;
+return 4;
 }
 
 Point SdrTextObj::GetSnapPoint(sal_uInt32 i) const
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index b340340a1a3c..182f4d99f9fc 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -35,7 +35,7 @@
 
 sal_uInt32 SdrTextObj::GetHdlCount() const
 {
-return 8L;
+return 8;
 }
 
 void SdrTextObj::AddToHdlList(SdrHdlList& rHdlList) const
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index a85f4d1be5a2..c39d6787e134 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -1702,7 +1702,7 @@ std::size_t SvMemoryStream::GetData( void* pData, 
std::size_t nCount )
 std::size_t SvMemoryStream::PutData( const void* pData, std::size_t nCount )
 {
 if( GetError() )
-return 0L;
+return 0;
 
 std::size_t nMaxCount = nSize-nPos;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz (via logerrit)]

 sw/uiconfig/swriter/ui/optcompatpage.ui |  126 
 1 file changed, 63 insertions(+), 63 deletions(-)

New commits:
commit d68f5c3c684ef440d537372ccf3edc30d2fa3668
Author: andreas kainz 
AuthorDate: Wed Jan 8 11:06:54 2020 +0100
Commit: andreas_kainz 
CommitDate: Wed Jan 8 13:52:51 2020 +0100

Options Dialog Compatibility options update first global than file

Change-Id: Ibd906476eb9a798b1ef290a35545e0b22c10b892
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86407
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/sw/uiconfig/swriter/ui/optcompatpage.ui 
b/sw/uiconfig/swriter/ui/optcompatpage.ui
index 29a5c6eaee75..4f7897212b39 100644
--- a/sw/uiconfig/swriter/ui/optcompatpage.ui
+++ b/sw/uiconfig/swriter/ui/optcompatpage.ui
@@ -39,54 +39,54 @@
 vertical
 12
 
-  
+  
 True
 False
 True
-True
+False
 0
 none
 
-  
+  
 True
 False
 True
-True
+False
 6
 12
 
-  
+  
 True
 False
 5
 
-  
+  
 True
 True
 True
 True
 in
 
-  
+  
 True
 True
 True
 True
 True
-liststore1
+liststore2
 False
 0
 False
 
-  
+  
 
 
-  
+  
 True
 6
 0.5
 
-  
+  
   
 3
 0
@@ -95,11 +95,11 @@
   
 
 
-  
+  
 True
 6
 
-  
+  
   
 1
   
@@ -115,26 +115,11 @@
   
 
 
-  
+  
 False
 True
 
-  Use printer metrics for document 
formatting
-  Add spacing between paragraphs and tables
-  Add paragraph and table spacing at tops of 
pages
-  Use OpenOffice.org 1.1 tabstop formatting
-  Do not add leading (extra space) between lines 
of text
-  Use OpenOffice.org 1.1 line spacing
-  Add paragraph and table spacing at bottom of 
table cells
-  Use OpenOffice.org 1.1 object positioning
-  Use OpenOffice.org 1.1 text wrapping around 
objects
-  Consider wrapping style when positioning 
objects
-  Expand word space on lines with manual line 
breaks in justified paragraphs
-  Protect form (no longer protects whole document. 
Insert write protected section instead)
-  Word-compatible trailing blanks
-  Tolerate white lines of PDF page backgrounds for 
compatibility with old documents
-  Hide paragraphs of database fields (e.g., mail 
merge) with an empty value
-  
+  Reorganize Form menu to have it MS 
compatible
 
   
   
@@ -142,29 +127,15 @@
 1
   
 
-
-  
-Use as _Default
-True
-True
-True
-end
-True
-  
-  
-0
-2
-  
-
   
 
   
 
 
-  
+  
 True
 False
-Compatibility options for “%DOCNAME”
+Global compatibility options
 
   
 
@@ -178,54 +149,54 @@
   
 
 
-  
+  
 True
 Fal

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

[andreas kainz (via logerrit)]

 sw/uiconfig/swriter/ui/optcaptionpage.ui |   17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 741594a54f5abc3bad42754363bdf59d8f0e16aa
Author: andreas kainz 
AuthorDate: Wed Jan 8 11:12:41 2020 +0100
Commit: andreas_kainz 
CommitDate: Wed Jan 8 13:52:37 2020 +0100

Options Dialog AutoCaption fix label alignment to follow HIG

Change-Id: Ia1e6370ba2c15d9ef6c940b60ebe8ada846622c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86411
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/sw/uiconfig/swriter/ui/optcaptionpage.ui 
b/sw/uiconfig/swriter/ui/optcaptionpage.ui
index 0787f53a96da..4eb7f90283e2 100644
--- a/sw/uiconfig/swriter/ui/optcaptionpage.ui
+++ b/sw/uiconfig/swriter/ui/optcaptionpage.ui
@@ -62,7 +62,7 @@
 Category:
 True
 category
-1
+0
   
   
 0
@@ -76,7 +76,7 @@
 _Numbering:
 True
 numbering
-1
+0
   
   
 0
@@ -90,7 +90,7 @@
 Numbering separator:
 True
 numseparator
-1
+0
   
   
 0
@@ -104,7 +104,7 @@
 Separator:
 True
 separator
-1
+0
   
   
 0
@@ -118,7 +118,7 @@
 Position:
 True
 position
-1
+0
   
   
 0
@@ -243,7 +243,7 @@
 Level:
 True
 level
-1
+0
   
   
 0
@@ -257,7 +257,7 @@
 Separator:
 True
 chapseparator
-1
+0
   
   
 0
@@ -340,7 +340,7 @@
 Character style:
 True
 charstyle
-1
+0
   
   
 0
@@ -501,6 +501,7 @@ when inserting:
 True
 center
 start
+12
 never
 never
 in
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source editeng/source forms/source include/svtools include/tools sal/osl sfx2/qa sfx2/source svx/source sw/qa sw/source toolkit/source

[Andrea Gelmini (via logerrit)]

 dbaccess/source/core/api/RowSetCache.cxx |2 +-
 editeng/source/editeng/impedit5.cxx  |2 +-
 forms/source/component/FormattedField.cxx|6 +++---
 forms/source/component/FormattedFieldWrapper.cxx |2 +-
 include/svtools/table/tablerenderer.hxx  |2 +-
 include/tools/date.hxx   |2 +-
 sal/osl/all/utility.cxx  |2 +-
 sfx2/qa/complex/sfx2/UndoManager.java|4 ++--
 sfx2/source/appl/newhelp.cxx |2 +-
 svx/source/fmcomp/fmgridcl.cxx   |2 +-
 svx/source/form/fmshell.cxx  |2 +-
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx|2 +-
 sw/source/core/inc/txtfly.hxx|2 +-
 toolkit/source/controls/grid/gridcontrol.cxx |2 +-
 14 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 2e5c4b4081411b77b5e0593225b805d3756f7533
Author: Andrea Gelmini 
AuthorDate: Wed Jan 8 06:57:25 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jan 8 13:25:05 2020 +0100

Grammar fixes

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

diff --git a/dbaccess/source/core/api/RowSetCache.cxx 
b/dbaccess/source/core/api/RowSetCache.cxx
index 2f71f9e4bc5d..1ca8ba61b7da 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -875,7 +875,7 @@ void ORowSetCache::moveWindow()
 bool bCheck;
 bCheck = m_xCacheSet->absolute(nNewStartPos + 1);
 
-// m_nEndPos < nNewEndPos when window not filled (e.g. there are 
less rows in total than window size)
+// m_nEndPos < nNewEndPos when window not filled (e.g. there are 
fewer rows in total than window size)
 m_nEndPos = std::min(nNewEndPos, m_nEndPos);
 const sal_Int32 nOverlapSize = m_nEndPos - m_nStartPos;
 const sal_Int32 nStartPosOffset = m_nStartPos - nNewStartPos; // 
by how much m_nStartPos moves
diff --git a/editeng/source/editeng/impedit5.cxx 
b/editeng/source/editeng/impedit5.cxx
index 975eddebf6ae..0e6b6af722fa 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -395,7 +395,7 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, 
EditEngineAttribs nOnl
 
 SfxItemSet ImpEditEngine::GetAttribs( sal_Int32 nPara, sal_Int32 nStart, 
sal_Int32 nEnd, GetAttribsFlags nFlags ) const
 {
-// Optimized function with less Puts(), which cause unnecessary cloning 
from default items.
+// Optimized function with fewer Puts(), which cause unnecessary cloning 
from default items.
 // If this works, change GetAttribs( EditSelection ) to use this for each 
paragraph and merge the results!
 
 
diff --git a/forms/source/component/FormattedField.cxx 
b/forms/source/component/FormattedField.cxx
index 805076b545d1..fb84dcb2e531 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -748,7 +748,7 @@ void OFormattedModel::read(const 
Reference& _rxInStream)
 {   // since version 3 there is a "skippable" block at this 
position
 OStreamSection aDownCompat(_rxInStream);
 _rxInStream->readShort(); // sub-version
-// version 0 and higher : the "effective value" property
+// version 0 and higher: the "effective value" property
 Any aEffectiveValue;
 {
 OStreamSection aDownCompat2(_rxInStream);
@@ -763,10 +763,10 @@ void OFormattedModel::read(const 
Reference& _rxInStream)
 case 2:
 break;
 case 3:
-OSL_FAIL("FmXFormattedModel::read : unknown 
effective value type !");
+OSL_FAIL("FmXFormattedModel::read : unknown 
effective value type!");
 }
 }
-// this property is only to be set if we have no control 
source : in all other cases the base class did a
+// this property is only to be set if we have no control 
source: in all other cases the base class made a
 // reset after it's read and this set the effective value to a 
default value
 if ( m_xAggregateSet.is() && getControlSource().isEmpty() )
 {
diff --git a/forms/source/component/FormattedFieldWrapper.cxx 
b/forms/source/component/FormattedFieldWrapper.cxx
index 1a7cf9446190..b434e1bd2e84 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -237,7 +237,7 @@ void SAL_CALL OFormattedFieldWrapper::read(const 
Reference&
 {
 SolarMutexGuard g;
 if (m_xAggregate.is())
-{   //  we already did a decision

[Libreoffice-commits] core.git: solenv/flatpak-manifest.in

[Stephan Bergmann (via logerrit)]

 solenv/flatpak-manifest.in |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cc8eeb3148b88807b4acf4ac3c829fb4f37f9a80
Author: Stephan Bergmann 
AuthorDate: Wed Jan 8 11:32:28 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 8 13:23:26 2020 +0100

Adapt solenv/flatpak-manifest.in to ffe9ff2cf63112ac04a695740a5637f25c16abe8

..."update cppunit to 1.15.1"

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

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 294bcd1a3e76..6536b0c5d552 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -171,10 +171,10 @@
 "dest-filename": "external/tarballs/CoinMP-1.7.6.tgz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz";,
-"sha256": 
"3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780",
+"url": 
"https://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz";,
+"sha256": 
"89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7",
 "type": "file",
-"dest-filename": "external/tarballs/cppunit-1.14.0.tar.gz"
+"dest-filename": "external/tarballs/cppunit-1.15.1.tar.gz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2";,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 framework/source/dispatch/dispatchprovider.cxx   |2 +-
 writerperfect/source/common/WPXSvInputStream.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 22d656a45ce3d44d775196c70e7dae8aced90b3d
Author: Andrea Gelmini 
AuthorDate: Wed Jan 8 06:53:31 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jan 8 13:18:43 2020 +0100

Fix typo/grammar

Change-Id: I8e7320224a9cb4ff9317b842a2c1c0b1a3ddcd17
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86390
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/framework/source/dispatch/dispatchprovider.cxx 
b/framework/source/dispatch/dispatchprovider.cxx
index c573cd487e48..9d86254061a7 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -325,7 +325,7 @@ css::uno::Reference< css::frame::XDispatch > 
DispatchProvider::implts_queryFrame
 {
 css::uno::Reference< css::frame::XDispatchProvider > xParent( 
xFrame->getCreator(), css::uno::UNO_QUERY );
 // In case the frame is not a top one, is not based on system 
window and has a parent,
-// the parent frame should to be queried for the correct 
dispatcher.
+// the parent frame should be queried for the correct dispatcher.
 // See i93473
 if (
 !WindowHelper::isTopWindow(xFrame->getContainerWindow()) &&
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx 
b/writerperfect/source/common/WPXSvInputStream.cxx
index f1799f56bd19..3f37c89c11c3 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -77,7 +77,7 @@ namespace
 OUString lcl_normalizeSubStreamPath(const OUString& rPath)
 {
 // accept paths which begin by '/'
-// TODO: maybe this should to a full normalization
+// TODO: maybe this should do a full normalization
 if (rPath.startsWith("/") && rPath.getLength() >= 2)
 return rPath.copy(1);
 return rPath;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 pyuno/source/module/pyuno_runtime.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 648fa0ab6bd5399422951f848ca86cb710b1bd52
Author: Michael Stahl 
AuthorDate: Wed Jan 8 10:31:37 2020 +0100
Commit: Michael Stahl 
CommitDate: Wed Jan 8 13:07:09 2020 +0100

pyuno: remove redundant if

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

diff --git a/pyuno/source/module/pyuno_runtime.cxx 
b/pyuno/source/module/pyuno_runtime.cxx
index e0987cd63cd7..3e2bb0c6b0a6 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -1001,9 +1001,7 @@ PyThreadAttach::~PyThreadAttach()
 if (m_isNewState)
 {   // Clear needs GIL!
 PyThreadState_Clear( tstate );
-}
-if (m_isNewState)
-{   // note: PyThreadState_Delete(tstate) cannot be called, it will assert
+// note: PyThreadState_Delete(tstate) cannot be called, it will assert
 // because it requires a PyThreadState to be set, but not the tstate!
 PyThreadState_DeleteCurrent();
 }
@@ -1017,6 +1015,7 @@ PyThreadDetach::PyThreadDetach()
 {
 tstate = PyThreadState_Get();
 PyEval_ReleaseThread( tstate );
+// tstate must not be deleted here! lots of pointers to it on the stack
 }
 
 /** Acquires the global interpreter lock again
___
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.2' - sw/uiconfig

[Tor Lillqvist (via logerrit)]

 sw/uiconfig/swriter/ui/sidebartableedit.ui |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit ff8cea1ca6f193f434b52361b435403a0f27d023
Author: Tor Lillqvist 
AuthorDate: Tue Jan 7 17:42:50 2020 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Jan 8 12:59:19 2020 +0100

tdf#129373: Make table column width and row height controls look better on 
iOS

For some reason the space allocated for the measurement in a
svxlo-SvxRelativeField is quite large, and it looks weird when the
plus button of the row height control bumps into the icon of the
column width control. (Changing the hexpand element to False does not
fully help.) It looks much better to have these controls on separate
rows. Hopefully the change in how it looks in web-based Online or in
desktop LibreOffice will not cause endless bikeshedding.

Change-Id: Ia8fbbbfe035a92fc5c89b27dc8c8985707a5cb0b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86358
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/sw/uiconfig/swriter/ui/sidebartableedit.ui 
b/sw/uiconfig/swriter/ui/sidebartableedit.ui
index aa01759ea491..4ca5c3a6b483 100644
--- a/sw/uiconfig/swriter/ui/sidebartableedit.ui
+++ b/sw/uiconfig/swriter/ui/sidebartableedit.ui
@@ -173,6 +173,7 @@
   
 True
 False
+vertical
 
   
 True
@@ -198,7 +199,7 @@
 True
 True
 Row Height
-True
+False
 0
 
   
@@ -244,7 +245,7 @@
 True
 True
 Column Width
-True
+False
 0
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks (via logerrit)]

 loleaflet/admin/src/AdminSocketOverview.js |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 971ed41c0ddfcf5ed193435d73b819e09dd3c338
Author: Michael Meeks 
AuthorDate: Wed Jan 8 11:50:19 2020 +
Commit: Michael Meeks 
CommitDate: Wed Jan 8 11:51:10 2020 +

admin: Kill menu uses href="#" so disable vex auto-close on popstate

Change-Id: Icc94fc0dae70718700b709b81785162254af2ed4

diff --git a/loleaflet/admin/src/AdminSocketOverview.js 
b/loleaflet/admin/src/AdminSocketOverview.js
index 9c61089cc..029b36997 100644
--- a/loleaflet/admin/src/AdminSocketOverview.js
+++ b/loleaflet/admin/src/AdminSocketOverview.js
@@ -82,6 +82,9 @@ var AdminSocketOverview = AdminSocketBase.extend({
});
}, 1000);
 
+   // Dialog uses https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 pyuno/source/module/pyuno_runtime.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit fb4e15a89d8d8f081c0c152e5047bc0e76870b39
Author: Miklos Vajna 
AuthorDate: Wed Jan 8 11:12:08 2020 +0100
Commit: Miklos Vajna 
CommitDate: Wed Jan 8 12:47:46 2020 +0100

pyuno: fix build against system-python-3.6

pyuno/source/module/pyuno_runtime.cxx:984:57: error: use of undeclared 
identifier 'PyThread_get_thread_ident'

It's only an assert, so simply do it only for >=3.7.

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

diff --git a/pyuno/source/module/pyuno_runtime.cxx 
b/pyuno/source/module/pyuno_runtime.cxx
index 5fa923c236dc..e0987cd63cd7 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -979,9 +979,11 @@ PyThreadAttach::PyThreadAttach( PyInterpreterState *interp)
 // note: *may* be called recursively, with PyThreadDetach between  - in
 // that case, don't create *new* PyThreadState but reuse!
 #ifndef NDEBUG
+#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
 PyThreadState const*const current = _PyThreadState_UncheckedGet();
 // dereference isn't safe but let's hope it's tolerable for debugging 
purpose
 assert((current == nullptr || current->thread_id != 
PyThread_get_thread_ident()) && "recursive PyThreadAttach");
+#endif
 #endif
 tstate = PyGILState_GetThisThreadState(); // from TLS, possibly detached
 if (!tstate)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamas Bunth (via logerrit)]

 include/xmloff/xmltoken.hxx   |1 
 xmloff/inc/SchXMLImport.hxx   |1 
 xmloff/source/chart/SchXMLExport.cxx  |   55 --
 xmloff/source/chart/SchXMLImport.cxx  |1 
 xmloff/source/chart/SchXMLPlotAreaContext.cxx |  100 ++
 xmloff/source/chart/SchXMLPlotAreaContext.hxx |   47 +++-
 xmloff/source/chart/SchXMLSeries2Context.cxx  |   18 ++--
 xmloff/source/chart/transporttypes.hxx|7 +
 xmloff/source/core/xmltoken.cxx   |1 
 xmloff/source/token/tokens.txt|1 
 10 files changed, 186 insertions(+), 46 deletions(-)

New commits:
commit cdacee1de7cd8d98d79ef13bc165ce016c8b2e1a
Author: Tamas Bunth 
AuthorDate: Wed Dec 18 13:08:11 2019 +0100
Commit: Andras Timar 
CommitDate: Wed Jan 8 12:44:08 2020 +0100

tdf#123206 Store custom label as chart:data-label

Use the chart:data-label element instead of using the
loext:custom-label-field attribute.

chart:data-label stores can be a child of chart:data-point and it may
contain a text:o element for holding one or more paragraphs of custom
label text.

This commit aims to export and import chart:data-label with paragraphs
put into different text:span elements. These span elements may hold a
text:style-name attribute in order to achieve formatted text.

This structure is already in the ODF format.

Change-Id: I0bea7ce1a16af9c47b33555e18545bdaae7e95ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85659
Tested-by: Jenkins
Reviewed-by: Tamás Bunth 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86122
Reviewed-by: Andras Timar 

diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 02bd9702d980..1175958548ff 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -551,6 +551,7 @@ namespace xmloff { namespace token {
 XML_DATA_BAR,
 XML_DATA_BAR_ENTRY,
 XML_DATA_CELL_RANGE_ADDRESS,
+XML_DATA_LABEL,
 XML_DATA_LABEL_NUMBER,
 XML_DATA_LABEL_SYMBOL,
 XML_DATA_LABEL_TEXT,
diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx
index 5b587a4abdb1..2978ac66b5ab 100644
--- a/xmloff/inc/SchXMLImport.hxx
+++ b/xmloff/inc/SchXMLImport.hxx
@@ -73,6 +73,7 @@ enum SchXMLPlotAreaElemTokenMap
 enum SchXMLSeriesElemTokenMap
 {
 XML_TOK_SERIES_DATA_POINT,
+XML_TOK_SERIES_DATA_LABEL,
 XML_TOK_SERIES_DOMAIN,
 XML_TOK_SERIES_MEAN_VALUE_LINE,
 XML_TOK_SERIES_REGRESSION_CURVE,
diff --git a/xmloff/source/chart/SchXMLExport.cxx 
b/xmloff/source/chart/SchXMLExport.cxx
index 4dd2bc43b6c8..e277b73758b7 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -113,11 +113,13 @@ using ::std::vector;
 
 namespace
 {
+using CustomLabelSeq = 
Sequence>;
+
 struct SchXMLDataPointStruct
 {
 OUString   maStyleName;
 sal_Int32  mnRepeat;
-OUString   msCustomLabelText;
+CustomLabelSeq   mCustomLabelText;
 
 SchXMLDataPointStruct() : mnRepeat( 1 ) {}
 };
@@ -229,6 +231,8 @@ public:
 const css::uno::Reference< css::chart2::XDiagram > & xDiagram,
 bool bExportContent );
 
+void exportCustomLabel(const CustomLabelSeq & xCustomLabel);
+
 void exportRegressionCurve(
 const css::uno::Reference& xSeries,
 const css::awt::Size& rPageSize,
@@ -277,31 +281,26 @@ public:
 namespace
 {
 
-OUString lcl_getCustomLabelField(sal_Int32 nDataPointIndex,
+CustomLabelSeq lcl_getCustomLabelField(sal_Int32 nDataPointIndex,
 const uno::Reference< chart2::XDataSeries >& rSeries)
 {
 if( !rSeries.is() )
-return OUString{};
+return CustomLabelSeq();
 
 const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion( 
SvtSaveOptions().GetODFDefaultVersion() );
 if( nCurrentODFVersion <= SvtSaveOptions::ODFVER_012 )//do not export to 
ODF 1.2 or older
-return OUString{};
+return CustomLabelSeq();
 
-// export custom label text
 if(Reference xLabels = 
rSeries->getDataPointByIndex(nDataPointIndex); xLabels.is())
 {
 if(Any aAny = xLabels->getPropertyValue("CustomLabelFields"); 
aAny.hasValue())
 {
 Sequence> 
aCustomLabels;
 aAny >>= aCustomLabels;
-OUString sLabel;
-// TODO export formatted string instead of simple characters
-for(auto& aLabel : aCustomLabels)
-sLabel += aLabel->getString();
-return sLabel;
+return aCustomLabels;
 }
 }
-return OUString{};
+return CustomLabelSeq();
 }
 
 class lcl_MatchesRole
@@ -3266,7 +3265,7 @@ void SchXMLExportHelper_Impl::exportDataPoints(
 SchXMLDataPointStruct aPoint;
 aPoint.maStyleName = maAutoStyleNameQueue.front();
 if(bExportN

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

[Samuel Mehrbrodt (via logerrit)]

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

New commits:
commit 8b6a27abe930685e99135a2ec430f8167d8cd88f
Author: Samuel Mehrbrodt 
AuthorDate: Mon Dec 23 08:33:57 2019 +0100
Commit: Michael Stahl 
CommitDate: Wed Jan 8 12:43:40 2020 +0100

.gitreview: Update default branch

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

diff --git a/.gitreview b/.gitreview
index 4cd7d22d9a83..061a30936c85 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,4 @@ host=gerrit.libreoffice.org
 port=29418
 project=core
 defaultremote=logerrit
-defaultbranch=libreoffice-6-4
-
+defaultbranch=distro/lhm/libreoffice-6-4+backports
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 filter/source/msfilter/msdffimp.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit fcf25f3b300463422a5c5c8895710d71e372878a
Author: Caolán McNamara 
AuthorDate: Wed Jan 8 08:54:38 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Jan 8 12:39:14 2020 +0100

ofz#19901 Invalid-enum-value

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

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 9fc3a35764c3..97577199628c 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4419,7 +4419,6 @@ SdrObject* SvxMSDffManager::ImportShape( const 
DffRecordHeader& rHd, SvStream& r
 {
 OUStringaObjectText;
 OUStringaFontName;
-MSO_GeoTextAligneGeoTextAlign;
 
 if ( SeekToContent( DFF_Prop_gtextFont, rSt ) )
 {
@@ -4454,7 +4453,7 @@ SdrObject* SvxMSDffManager::ImportShape( const 
DffRecordHeader& rHd, SvStream& r
 ReadObjText( aObjectText, pRet );
 }
 
-eGeoTextAlign = 
static_cast(GetPropertyValue( DFF_Prop_gtextAlign, 
mso_alignTextCenter ));
+auto eGeoTextAlign = 
GetPropertyValue(DFF_Prop_gtextAlign, mso_alignTextCenter);
 {
 SdrTextHorzAdjust eHorzAdjust;
 switch( eGeoTextAlign )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Alex Henrie (via logerrit)]

 i18nutil/source/utility/casefolding_data.h |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 41bbc4b9482df12166ba9ae88026717e6327573d
Author: Alex Henrie 
AuthorDate: Fri Dec 20 21:17:43 2019 -0700
Commit: Eike Rathke 
CommitDate: Wed Jan 8 12:35:29 2020 +0100

Fix case mapping for undefined characters in the Osage block

Regression from commit 209fc9fd7fa433947af0bf86e210d73fa7f5a045

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

diff --git a/i18nutil/source/utility/casefolding_data.h 
b/i18nutil/source/utility/casefolding_data.h
index 20c5cc714103..938fb4df9076 100644
--- a/i18nutil/source/utility/casefolding_data.h
+++ b/i18nutil/source/utility/casefolding_data.h
@@ -516,12 +516,12 @@ static const Value CaseMappingValue[] = {
 {0x6a, 0xDCE0}, {0x6a, 0xDCE1}, {0x6a, 0xDCE2}, {0x6a, 0xDCE3}, {0x6a, 
0xDCE4}, {0x6a, 0xDCE5}, {0x6a, 0xDCE6}, {0x6a, 0xDCE7}, // 104b8 - 104bf
 {0x6a, 0xDCE8}, {0x6a, 0xDCE9}, {0x6a, 0xDCEA}, {0x6a, 0xDCEB}, {0x6a, 
0xDCEC}, {0x6a, 0xDCED}, {0x6a, 0xDCEE}, {0x6a, 0xDCEF}, // 104c0 - 104c7
 {0x6a, 0xDCF0}, {0x6a, 0xDCF1}, {0x6a, 0xDCF2}, {0x6a, 0xDCF3}, {0x6a, 
0xDCF4}, {0x6a, 0xDCF5}, {0x6a, 0xDCF6}, {0x6a, 0xDCF7}, // 104c8 - 104cf
-{0x6a, 0xDCF8}, {0x6a, 0xDCF9}, {0x6a, 0xDCFA}, {0x6a, 0xDCFB}, {0x6a, 
0x}, {0x6a, 0x}, {0x6a, 0x}, {0x6a, 0x}, // 104d0 - 104d7
+{0x6a, 0xDCF8}, {0x6a, 0xDCF9}, {0x6a, 0xDCFA}, {0x6a, 0xDCFB}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 104d0 - 104d7
 {0x15, 0xDCB0}, {0x15, 0xDCB1}, {0x15, 0xDCB2}, {0x15, 0xDCB3}, {0x15, 
0xDCB4}, {0x15, 0xDCB5}, {0x15, 0xDCB6}, {0x15, 0xDCB7}, // 104d8 - 104df
 {0x15, 0xDCB8}, {0x15, 0xDCB9}, {0x15, 0xDCBA}, {0x15, 0xDCBB}, {0x15, 
0xDCBC}, {0x15, 0xDCBD}, {0x15, 0xDCBE}, {0x15, 0xDCBF}, // 104e0 - 104e7
 {0x15, 0xDCC0}, {0x15, 0xDCC1}, {0x15, 0xDCC2}, {0x15, 0xDCC3}, {0x15, 
0xDCC4}, {0x15, 0xDCC5}, {0x15, 0xDCC6}, {0x15, 0xDCC7}, // 104e8 - 104ef
 {0x15, 0xDCD0}, {0x15, 0xDCD1}, {0x15, 0xDCD2}, {0x15, 0xDCD3}, {0x15, 
0xDCD4}, {0x15, 0xDCD5}, {0x15, 0xDCD6}, {0x15, 0xDCD7}, // 104f0 - 104f7
-{0x15, 0xDCD8}, {0x15, 0xDCD9}, {0x15, 0xDCDA}, {0x15, 0xDCDB}, {0x15, 
0x}, {0x15, 0x}, {0x15, 0x}, {0x15, 0x}, // 104f8 - 104ff
+{0x15, 0xDCD8}, {0x15, 0xDCD9}, {0x15, 0xDCDA}, {0x15, 0xDCDB}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 104f8 - 104ff
 };
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Seth Chaiklin (via logerrit)]

 cui/uiconfig/ui/numberingoptionspage.ui  |   97 +++--
 cui/uiconfig/ui/numberingpositionpage.ui |  224 ---
 2 files changed, 174 insertions(+), 147 deletions(-)

New commits:
commit d54315e5cb371afd01c5f03958dda9bcf93514e5
Author: Seth Chaiklin 
AuthorDate: Tue Jan 7 01:39:49 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Jan 8 12:33:54 2020 +0100

tdf#129517 add "Preview" labels in BulletandNumberingStyle dialog box"

added GtkFrame to include label with Preview Window in Customize tab
added label in Position tab

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

diff --git a/cui/uiconfig/ui/numberingoptionspage.ui 
b/cui/uiconfig/ui/numberingoptionspage.ui
index c13f9dad950d..321602dcf693 100644
--- a/cui/uiconfig/ui/numberingoptionspage.ui
+++ b/cui/uiconfig/ui/numberingoptionspage.ui
@@ -581,49 +581,6 @@
 0
   
 
-
-  
-True
-False
-never
-never
-in
-
-  
-True
-False
-
-  
-150
-300
-True
-False
-  
-
-  
-
-  
-  
-True
-True
-1
-  
-
- 
- 
-True
-False
-Preview
-
-   
-
- 
- 
- 
-True
-True
-1
- 
   
 
   
@@ -695,5 +652,59 @@
 1
   
 
+
+  
+True
+False
+0
+none
+
+  
+True
+False
+6
+12
+
+  
+True
+False
+never
+never
+in
+
+  
+True
+False
+
+  
+150
+300
+True
+False
+  
+
+  
+
+  
+
+  
+
+
+  
+True
+False
+Preview
+
+  
+
+  
+
+  
+  
+True
+True
+2
+  
+
   
 
diff --git a/cui/uiconfig/ui/numberingpositionpage.ui 
b/cui/uiconfig/ui/numberingpositionpage.ui
index 75be42c1456b..4ab3f2226c5d 100644
--- a/cui/uiconfig/ui/numberingpositionpage.ui
+++ b/cui/uiconfig/ui/numberingpositionpage.ui
@@ -48,68 +48,6 @@
 True
 6
 12
-
-  
-True
-False
-0
-none
-
-  
-True
-False
-6
-12
-
-  
-True
-True
-in
-
-  
-True
-True
-liststore1
-False
-False
-0
-False
-
-  
-
-
-  
-
-  
-  
-0
-  
-
-  
-
-  
-
-  
-
-  
-
-
-  
-True
-False
-Level
-
-  
-
-  
-
-  
-  
-False
-True
-0
-  
-
 
   
 True
@@ -428,78 +366,156 @@ numbering and text:
   
 
 
-  
+  
 True
 False
-True
-True
-

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sw/inc sw/qa sw/source

[Miklos Vajna (via logerrit)]

 sw/inc/doc.hxx|4 +
 sw/qa/extras/tiledrendering/data/redline-notification-during-save.odt |binary
 sw/qa/extras/tiledrendering/tiledrendering.cxx|   21 
++
 sw/source/core/doc/docnew.cxx |1 
 sw/source/core/txtnode/ndtxt.cxx  |4 +
 sw/source/filter/basflt/shellio.cxx   |2 
 6 files changed, 31 insertions(+), 1 deletion(-)

New commits:
commit a32e277b0f9c7d58391d93e4cc1ce6d11fe48878
Author: Miklos Vajna 
AuthorDate: Tue Jan 7 17:26:53 2020 +0100
Commit: Miklos Vajna 
CommitDate: Wed Jan 8 12:23:52 2020 +0100

sw: don't send LOK notifications about redlines during save

SwXMLWriter::Write_() sets redline flags to show insertion and hide
deletion, but it resets those flags before the function returns. So LOK
notifications for redline changes during save is not useful.

Conflicts:
sw/qa/extras/tiledrendering/tiledrendering.cxx

Change-Id: I4bf963bbe9c7003cbe85ea6c5538be733a3e3cdf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86369
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 5afcea308e31..83f89c88db79 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -299,6 +299,7 @@ private:
frames need deletion. */
 bool mbCopyIsMove: 1;//< TRUE: Copy is a hidden Move.
 bool mbInReading : 1;//< TRUE: Document is in the process 
of being read.
+bool mbInWriting : 1; //< TRUE: Document is in the process of being 
written.
 bool mbInMailMerge   : 1;//< TRUE: Document is in the process 
of being written by mail merge.
 bool mbInXMLImport   : 1;//< TRUE: During xml import, 
attribute portion building is not necessary.
 bool mbUpdateTOX : 1;//< TRUE: After loading document, 
update TOX.
@@ -948,6 +949,9 @@ public:
 bool IsInReading() const{ return mbInReading; }
 void SetInReading( bool bNew )  { mbInReading = bNew; }
 
+bool IsInWriting() const { return mbInWriting; }
+void SetInWriting(bool bNew) { mbInWriting = bNew; }
+
 bool IsInMailMerge() const  { return mbInMailMerge; }
 void SetInMailMerge( bool bNew ){ mbInMailMerge = bNew; }
 
diff --git 
a/sw/qa/extras/tiledrendering/data/redline-notification-during-save.odt 
b/sw/qa/extras/tiledrendering/data/redline-notification-during-save.odt
new file mode 100644
index ..2bd9c814750c
Binary files /dev/null and 
b/sw/qa/extras/tiledrendering/data/redline-notification-during-save.odt differ
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index e07605770c56..e1fdbcc4b97b 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -12,6 +12,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -120,6 +121,7 @@ public:
 void testLanguageStatus();
 void testDeselectCustomShape();
 void testHyperlink();
+void testRedlineNotificationDuringSave();
 
 CPPUNIT_TEST_SUITE(SwTiledRenderingTest);
 CPPUNIT_TEST(testRegisterCallback);
@@ -182,6 +184,7 @@ public:
 CPPUNIT_TEST(testLanguageStatus);
 CPPUNIT_TEST(testDeselectCustomShape);
 CPPUNIT_TEST(testHyperlink);
+CPPUNIT_TEST(testRedlineNotificationDuringSave);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -2487,6 +2490,24 @@ void SwTiledRenderingTest::testHyperlink()
 }
 
 
+void SwTiledRenderingTest::testRedlineNotificationDuringSave()
+{
+// Load a document with redlines which are hidden at a layout level.
+// It's an empty document, just settings.xml and content.xml are custom.
+comphelper::LibreOfficeKit::setActive();
+SwXTextDocument* pXTextDocument = 
createDoc("redline-notification-during-save.odt");
+SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
+
pWrtShell->GetSfxViewShell()->registerLibreOfficeKitViewCallback(&SwTiledRenderingTest::callback,
 this);
+
+// Save the document.
+utl::MediaDescriptor aMediaDescriptor;
+aMediaDescriptor["FilterName"] <<= OUString("writer8");
+uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
+// Without the accompanying fix in place, this test would have never 
returned due to an infinite
+// loop while sending not needed LOK notifications for redline changes 
during save.
+xStorable->storeToURL(maTempFile.GetURL(), 
aMediaDescriptor.getAsConstPropertyValueList());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwTiledRenderingTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 421d49bac9a3..b176293ef3ff 100644
---

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

[Olivier Hallot (via logerrit)]

 scaddins/inc/pricing.hrc |   78 +++
 1 file changed, 39 insertions(+), 39 deletions(-)

New commits:
commit d48fb4716624766063792a5c16018b5a129618e8
Author: Olivier Hallot 
AuthorDate: Sat Dec 14 20:20:58 2019 -0300
Commit: Eike Rathke 
CommitDate: Wed Jan 8 12:21:07 2020 +0100

Make OPT_ functions string more meaningful.

Help pages on OPT_ functions have more descriptive
arguments lists and the change here is to make the
Functions Wizard param's compatible with the Help pages.

Change-Id: I0d90b0279ce24f773923935a7212fe7ab1c2c45b
PS2: remove underscores and slashes in variable names
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85157
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/scaddins/inc/pricing.hrc b/scaddins/inc/pricing.hrc
index c4c9a27913bc..5a9d18277125 100644
--- a/scaddins/inc/pricing.hrc
+++ b/scaddins/inc/pricing.hrc
@@ -26,96 +26,96 @@
 const char* PRICING_FUNCDESC_OptBarrier[] =
 {
 NC_("PRICING_FUNCDESC_OptBarrier", "Pricing of a barrier option"),
-NC_("PRICING_FUNCDESC_OptBarrier", "spot"),
+NC_("PRICING_FUNCDESC_OptBarrier", "Spot"),
 NC_("PRICING_FUNCDESC_OptBarrier", "Price/value of the underlying asset"),
-NC_("PRICING_FUNCDESC_OptBarrier", "vol"),
+NC_("PRICING_FUNCDESC_OptBarrier", "Volatility"),
 NC_("PRICING_FUNCDESC_OptBarrier", "Annual volatility of the underlying 
asset"),
-NC_("PRICING_FUNCDESC_OptBarrier", "r"),
+NC_("PRICING_FUNCDESC_OptBarrier", "Rate"),
 NC_("PRICING_FUNCDESC_OptBarrier", "Interest rate (continuously 
compounded)"),
-NC_("PRICING_FUNCDESC_OptBarrier", "rf"),
+NC_("PRICING_FUNCDESC_OptBarrier", "Foreign rate"),
 NC_("PRICING_FUNCDESC_OptBarrier", "Foreign interest rate (continuously 
compounded)"),
-NC_("PRICING_FUNCDESC_OptBarrier", "T"),
+NC_("PRICING_FUNCDESC_OptBarrier", "Maturity"),
 NC_("PRICING_FUNCDESC_OptBarrier", "Time to maturity of the option in 
years"),
-NC_("PRICING_FUNCDESC_OptBarrier", "strike"),
+NC_("PRICING_FUNCDESC_OptBarrier", "Strike"),
 NC_("PRICING_FUNCDESC_OptBarrier", "Strike level of the option"),
-NC_("PRICING_FUNCDESC_OptBarrier", "barrier_low"),
+NC_("PRICING_FUNCDESC_OptBarrier", "Lower barrier"),
 NC_("PRICING_FUNCDESC_OptBarrier", "Lower barrier (set to 0 for no lower 
barrier)"),
-NC_("PRICING_FUNCDESC_OptBarrier", "barrier_up"),
+NC_("PRICING_FUNCDESC_OptBarrier", "Upper barrier"),
 NC_("PRICING_FUNCDESC_OptBarrier", "Upper barrier (set to 0 for no upper 
barrier)"),
-NC_("PRICING_FUNCDESC_OptBarrier", "rebate"),
+NC_("PRICING_FUNCDESC_OptBarrier", "Rebate"),
 NC_("PRICING_FUNCDESC_OptBarrier", "Amount of money paid at maturity if 
barrier was hit"),
-NC_("PRICING_FUNCDESC_OptBarrier", "put/call"),
+NC_("PRICING_FUNCDESC_OptBarrier", "Put/Call"),
 NC_("PRICING_FUNCDESC_OptBarrier", "String to define if the option is a 
(p)ut or a (c)all"),
-NC_("PRICING_FUNCDESC_OptBarrier", "knock in/out"),
+NC_("PRICING_FUNCDESC_OptBarrier", "Knock-In/Out"),
 NC_("PRICING_FUNCDESC_OptBarrier", "String to define if the option is of 
type knock-(i)n or knock-(o)ut"),
-NC_("PRICING_FUNCDESC_OptBarrier", "barrier_type"),
+NC_("PRICING_FUNCDESC_OptBarrier", "Barrier type"),
 NC_("PRICING_FUNCDESC_OptBarrier", "String to define whether the barrier 
is observed (c)ontinuously or only at the (e)nd/maturity"),
-NC_("PRICING_FUNCDESC_OptBarrier", "greek"),
+NC_("PRICING_FUNCDESC_OptBarrier", "Greek"),
 NC_("PRICING_FUNCDESC_OptBarrier", "Optional parameter, if left out then 
the function simply returns the option price; if set, the function returns 
price sensitivities (Greeks) to one of the input parameters; possible values 
are (d)elta, (g)amma, (t)heta, v(e)ga, v(o)lga, v(a)nna, (r)ho, rho(f)")
 };
 
 const char* PRICING_FUNCDESC_OptTouch[] =
 {
 NC_("PRICING_FUNCDESC_OptTouch", "Pricing of a touch/no-touch option"),
-NC_("PRICING_FUNCDESC_OptTouch", "spot"),
+NC_("PRICING_FUNCDESC_OptTouch", "Spot"),
 NC_("PRICING_FUNCDESC_OptTouch", "Price/value of the underlying asset"),
-NC_("PRICING_FUNCDESC_OptTouch", "vol"),
+NC_("PRICING_FUNCDESC_OptTouch", "Volatility"),
 NC_("PRICING_FUNCDESC_OptTouch", "Annual volatility of the underlying 
asset"),
-NC_("PRICING_FUNCDESC_OptTouch", "r"),
+NC_("PRICING_FUNCDESC_OptTouch", "Rate"),
 NC_("PRICING_FUNCDESC_OptTouch", "Interest rate (continuously 
compounded)"),
-NC_("PRICING_FUNCDESC_OptTouch", "rf"),
+NC_("PRICING_FUNCDESC_OptTouch", "Foreign rate"),
 NC_("PRICING_FUNCDESC_OptTouch", "Foreign interest rate (continuously 
compounded)"),
-NC_("PRICING_FUNCDESC_OptTouch", "T"),
+NC_("PRICING_FUNCDESC_OptTouch", "Maturity"),
 NC_("PRICING_FUNCDESC_OptTouch", "Time to maturity of the option in 
years"),
-NC_("PRICING_FUNCDESC_OptTouch", "barrier_low"),
+NC_("PRICI

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

[Noel Grandin (via logerrit)]

 dbaccess/source/filter/xml/xmlfilter.cxx |  113 +--
 dbaccess/source/filter/xml/xmlfilter.hxx |6 -
 xmloff/source/core/xmlimp.cxx|2 
 3 files changed, 51 insertions(+), 70 deletions(-)

New commits:
commit 7a9ce835c9e299042813cf328e283a2c9e5742bc
Author: Noel Grandin 
AuthorDate: Wed Jan 8 09:37:10 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Jan 8 12:19:13 2020 +0100

make ODBFilter return a fast context

And
(*) use the fast parser already inside ODBFilter
(*) pass around ODBFilter explicitly to make the code easier to read

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

diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx 
b/dbaccess/source/filter/xml/xmlfilter.cxx
index 2dc7c17fefc3..d0b93e21f80d 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -39,7 +39,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -84,7 +84,7 @@ static ErrCode ReadThroughComponent(
 const uno::Reference& xInputStream,
 const uno::Reference& xModelComponent,
 const uno::Reference & rxContext,
-const uno::Reference< XDocumentHandler >& _xFilter )
+ODBFilter& _rFilter )
 {
 OSL_ENSURE(xInputStream.is(), "input stream missing");
 OSL_ENSURE(xModelComponent.is(), "document missing");
@@ -94,26 +94,13 @@ static ErrCode ReadThroughComponent(
 InputSource aParserInput;
 aParserInput.aInputStream = xInputStream;
 
-// get parser
-uno::Reference< XParser > xParser = Parser::create(rxContext);
-SAL_INFO("dbaccess", "parser created" );
-
-// get filter
-OSL_ENSURE( _xFilter.is(), "Can't instantiate filter component." );
-if( !_xFilter.is() )
-return ErrCode(1);
-
-// connect parser and filter
-xParser->setDocumentHandler( _xFilter );
-
 // connect model and filter
-uno::Reference < XImporter > xImporter( _xFilter, UNO_QUERY );
-xImporter->setTargetDocument( xModelComponent );
+_rFilter.setTargetDocument( xModelComponent );
 
 // finally, parser the stream
 try
 {
-xParser->parseStream( aParserInput );
+_rFilter.parseStream( aParserInput );
 }
 catch (const SAXParseException&)
 {
@@ -147,7 +134,7 @@ static ErrCode ReadThroughComponent(
 const char* pStreamName,
 const char* pCompatibilityStreamName,
 const uno::Reference & rxContext,
-const uno::Reference< XDocumentHandler >& _xFilter)
+ODBFilter& _rFilter)
 {
 OSL_ENSURE( xStorage.is(), "Need storage!");
 OSL_ENSURE(nullptr != pStreamName, "Please, please, give me a name!");
@@ -192,7 +179,7 @@ static ErrCode ReadThroughComponent(
 return ReadThroughComponent( xInputStream
 ,xModelComponent
 ,rxContext
-,_xFilter );
+,_rFilter );
 }
 
 // TODO/LATER: better error handling
@@ -371,7 +358,7 @@ bool ODBFilter::implImport( const Sequence< PropertyValue 
>& rDescriptor )
 ,"settings.xml"
 ,"Settings.xml"
 ,GetComponentContext()
-,this
+,*this
 );
 
 if ( nRet == ERRCODE_NONE )
@@ -380,7 +367,7 @@ bool ODBFilter::implImport( const Sequence< PropertyValue 
>& rDescriptor )
 ,"content.xml"
 ,"Content.xml"
 ,GetComponentContext()
-,this
+,*this
 );
 
 bRet = nRet == ERRCODE_NONE;
@@ -413,10 +400,8 @@ namespace {
 class DBXMLDocumentSettingsContext : public SvXMLImportContext
 {
 public:
-DBXMLDocumentSettingsContext(SvXMLImport & rImport,
-   sal_uInt16 const nPrefix,
-   const OUString& rLocalName)
-: SvXMLImportContext(rImport, nPrefix, rLocalName)
+DBXMLDocumentSettingsContext(SvXMLImport & rImport)
+: SvXMLImportContext(rImport)
 {
 }
 
@@ -430,15 +415,20 @@ public:
 }
 return nullptr;
 }
+virtual void SAL_CALL startFastElement( sal_Int32 /*nElement*/,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& ) 
override {}
+virtual uno::Reference< xml::sax::XFastContextHandler > SAL_CALL 
createFastChildContext(
+sal_Int32 /*nElement*/, const uno::Reference< 
xml::sax::XFastAttributeList >& /*xAttrList*/ ) override
+{
+return nullptr;
+}
 };
 
 class DBXMLDocumentStylesContext : public SvXMLImportContext
 {
 public:

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - external/neon

[Thorsten Behrens (via logerrit)]

 external/neon/UnpackedTarball_neon.mk |1 +
 external/neon/neon_fix_sspi_session_timeout.patch |   22 ++
 2 files changed, 23 insertions(+)

New commits:
commit 4d9305d0645bd73916d21894ad86ee5260a8d240
Author: Thorsten Behrens 
AuthorDate: Fri Dec 20 07:03:47 2019 +0100
Commit: Michael Stahl 
CommitDate: Wed Jan 8 12:18:07 2020 +0100

tdf#129519 Fix crash during WebDAV lock refresh

- NeonSession is shared amongst several files (if on the same server
  instance)
  - there's explicit code in DAVSessionFactory::createDAVSession()
to share sessions for same host/target
- so then after a while, locks get refreshed, and session timeout
  hits
- first lock -> no prob, ne_auth.c:ah_post_send() has
  auth_challenge() failing, returning error, which puts that lock
  into m_aRemoveDeferred list
- _but_ ah_post_send() then does a clean_session(), and the next
  lock refresh from the same session hits NULLPTR session host

-> so let's delay any sspi_host cleanup until session object gets
   freed, instead of just cleaned

Change-Id: Ie257310c47913aef9fcfec92c1722d64b28c4f89
Reviewed-on: https://gerrit.libreoffice.org/85614
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit df52a213277827a16793791fecc33139582c84c2)
Reviewed-on: https://gerrit.libreoffice.org/85639
Reviewed-by: Mike Kaganski 
(cherry picked from commit da9a2f68b5b7d17c0d066f2221f16ea443f2b9d5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85736
Reviewed-by: Michael Stahl 

diff --git a/external/neon/UnpackedTarball_neon.mk 
b/external/neon/UnpackedTarball_neon.mk
index dacf425fa80f..74ac2eb38c97 100644
--- a/external/neon/UnpackedTarball_neon.mk
+++ b/external/neon/UnpackedTarball_neon.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,neon,\
external/neon/ubsan.patch \
external/neon/neon_fix_lock_token_on_if.patch \
external/neon/neon_fix_lock_timeout_windows.patch \
+   external/neon/neon_fix_sspi_session_timeout.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/neon/neon_fix_sspi_session_timeout.patch 
b/external/neon/neon_fix_sspi_session_timeout.patch
new file mode 100644
index ..5003fda35022
--- /dev/null
+++ b/external/neon/neon_fix_sspi_session_timeout.patch
@@ -0,0 +1,22 @@
+--- src/ne_auth.c~ 2019-12-05 15:38:50.246997951 +0100
 src/ne_auth.c  2019-12-20 06:54:31.555836285 +0100
+@@ -300,8 +300,6 @@
+ sess->sspi_token = NULL;
+ ne_sspi_destroy_context(sess->sspi_context);
+ sess->sspi_context = NULL;
+-if (sess->sspi_host) ne_free(sess->sspi_host);
+-sess->sspi_host = NULL;
+ #endif
+ #ifdef HAVE_NTLM
+ if (sess->ntlm_context) {
+@@ -1599,6 +1597,10 @@
+ }
+ 
+ clean_session(sess);
++#ifdef HAVE_SSPI
++if (sess->sspi_host) ne_free(sess->sspi_host);
++sess->sspi_host = NULL;
++#endif
+ ne_free(sess);
+ }
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - include/test offapi/com sc/inc sc/qa sc/source sw/inc sw/PythonTest_sw_python.mk sw/qa sw/source test/source

[Samuel Mehrbrodt (via logerrit)]

 include/test/style/xstyleloader.hxx |1 
 offapi/com/sun/star/style/XStyleLoader.idl  |3 +
 sc/inc/tablink.hxx  |9 ++--
 sc/qa/extras/scstylefamiliesobj.cxx |1 
 sc/source/ui/docshell/tablink.cxx   |5 ++
 sc/source/ui/unoobj/styleuno.cxx|   22 ++-
 sw/PythonTest_sw_python.mk  |1 
 sw/inc/docsh.hxx|3 -
 sw/inc/shellio.hxx  |7 +++
 sw/qa/python/testdocuments/xstyleloader.odt |binary
 sw/qa/python/xstyleloader.py|   56 
 sw/source/core/unocore/unostyle.cxx |   24 ++--
 sw/source/uibase/app/docsh2.cxx |5 +-
 test/source/style/xstyleloader.cxx  |   30 +++
 14 files changed, 154 insertions(+), 13 deletions(-)

New commits:
commit 3871b7247f760cae30b3fb49c9efe0c9aaa95d06
Author: Samuel Mehrbrodt 
AuthorDate: Wed Dec 18 15:01:38 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Jan 8 12:12:44 2020 +0100

XStyleLoader::loadStylesFromURL Allow loading from stream

Change-Id: Iab0c301096118203466dd91c724c25f1283a0488
Reviewed-on: https://gerrit.libreoffice.org/85392
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 0322a41224a7264bbe03a068647ab093bcc88f90)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85728
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/include/test/style/xstyleloader.hxx 
b/include/test/style/xstyleloader.hxx
index 4077d30327d0..ca34a72cf4b3 100644
--- a/include/test/style/xstyleloader.hxx
+++ b/include/test/style/xstyleloader.hxx
@@ -32,6 +32,7 @@ public:
 
 // XStyleLoader
 void testLoadStylesFromURL();
+void testLoadStylesFromStream();
 // XStyleLoader2
 void testLoadStylesFromDocument();
 
diff --git a/offapi/com/sun/star/style/XStyleLoader.idl 
b/offapi/com/sun/star/style/XStyleLoader.idl
index a695b79dde21..2899f23d61b2 100644
--- a/offapi/com/sun/star/style/XStyleLoader.idl
+++ b/offapi/com/sun/star/style/XStyleLoader.idl
@@ -38,8 +38,10 @@ published interface XStyleLoader: 
com::sun::star::uno::XInterface
 defined in this document are loaded.
  @param URL
  The directory and the filename from document with the styles
+ You can also load from stream. Use "private:stream" as the URL 
and the InputStream parameter below.
  @param aOptions
  Specifies which of the Style families the method should load.
+
  The sequence has the following, optional 
items:
  
  boolean LoadCellStyles 
@@ -48,6 +50,7 @@ published interface XStyleLoader: 
com::sun::star::uno::XInterface
  boolean LoadPageStyles 
  boolean LoadNumberingStyles 
  boolean OverwriteStyles
+ com::sun::star::io::XInputStream InputStream (since LibreOffice 
6.5)
 
  As the default, all supported style families are loaded and existing 
styles are overwritten.
  */
diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx
index 7038bd345fae..eb5e2f665696 100644
--- a/sc/inc/tablink.hxx
+++ b/sc/inc/tablink.hxx
@@ -82,10 +82,11 @@ private:
 SfxMedium*  pMedium;
 
 public:
-ScDocumentLoader( const OUString& rFileName,
-  OUString& rFilterName, OUString& 
rOptions,
-  sal_uInt32 nRekCnt = 0, 
weld::Window* pInteractionParent = nullptr );
-~ScDocumentLoader();
+ScDocumentLoader(const OUString& rFileName, OUString& rFilterName, 
OUString& rOptions,
+ sal_uInt32 nRekCnt = 0, weld::Window* pInteractionParent 
= nullptr,
+ css::uno::Reference xInputStream
+ = css::uno::Reference());
+~ScDocumentLoader();
 ScDocument* GetDocument();
 ScDocShell* GetDocShell()   { return pDocShell; }
 boolIsError() const;
diff --git a/sc/qa/extras/scstylefamiliesobj.cxx 
b/sc/qa/extras/scstylefamiliesobj.cxx
index 26cbce051de5..991334d192b7 100644
--- a/sc/qa/extras/scstylefamiliesobj.cxx
+++ b/sc/qa/extras/scstylefamiliesobj.cxx
@@ -70,6 +70,7 @@ public:
 
 // XStyleLoader
 CPPUNIT_TEST(testLoadStylesFromDocument);
+CPPUNIT_TEST(testLoadStylesFromStream);
 CPPUNIT_TEST(testLoadStylesFromURL);
 
 CPPUNIT_TEST_SUITE_END();
diff --git a/sc/source/ui/docshell/tablink.cxx 
b/sc/source/ui/docshell/tablink.cxx
index 80eb7cca743a..6b430467e640 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -514,7 +514,8 @@ SfxMedium* ScDocumentLoader::CreateMedium( const OUString& 
rFileName, std::share
 
 ScDocumentLoader::ScDocumentLoader(const OUString& rFileName,
OUString& rFilterName, OUString& rOptions,
-

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

[Samuel Mehrbrodt (via logerrit)]

 vcl/source/control/combobox.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5ad310f5bdef8535d3c934f36d7d79c52a2c1619
Author: Samuel Mehrbrodt 
AuthorDate: Mon Dec 23 11:15:20 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Wed Jan 8 12:11:13 2020 +0100

tdf#129490 Fix enter key in combo box

Follow-up fix for 7de9417d5f65d35227c7f80f6d587c2a56bde4e0

Change-Id: I0b05f11b79d5fcd4e4823c1e31c087724ebc85f8
Reviewed-on: https://gerrit.libreoffice.org/85748
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 09c0dc8b80b91a4f2e7ad3569a59402ee131eaf4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86324
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 3ce77bacb950..4508d34022fc 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -739,7 +739,7 @@ bool ComboBox::EventNotify( NotifyEvent& rNEvt )
 
 case KEY_RETURN:
 {
-if (rNEvt.GetWindow() == m_pImpl->m_pSubEdit)
+if ((rNEvt.GetWindow() == m_pImpl->m_pSubEdit) && 
IsInDropDown())
 {
 m_pImpl->m_pImplLB->ProcessKeyInput( aKeyEvt );
 bDone = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 sw/qa/extras/rtfexport/data/tdf129513.rtf  |4 
 sw/qa/extras/rtfexport/rtfexport5.cxx  |   11 +++
 writerfilter/source/rtftok/rtfdispatchflag.cxx |1 -
 3 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit a3fa368f1a50463e1540619834df31f48cba6a7d
Author: Mike Kaganski 
AuthorDate: Fri Dec 20 16:07:00 2019 +0300
Commit: Xisco Faulí 
CommitDate: Wed Jan 8 11:50:18 2020 +0100

tdf#129513: drop incorrect and redundant erasure of paragraph sprm

It was introduced in commit 2499397cb39330dabeb8b7b3e0d7eb6213a0d8f4
"avoid sending duplicated paragraph flags", and supposedly was meant
to avoid having duplicating sprms in the collected properties, when
new properties were pushed back at that time. Using specific sprm id
was likely a mistake (nParam should have been used instead).

Now the new sprm is added using RTFSprms::set with eOverwrite having
default value of RTFOverwrite::YES, which takes care to avoid dupes,
so the call to erase is redundant.

This reverts commit 2499397cb39330dabeb8b7b3e0d7eb6213a0d8f4.

Change-Id: Ied19f6feb41bd17ef317812d4d295ca0542a5843
Reviewed-on: https://gerrit.libreoffice.org/85602
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 989043b0644354b92fd17e4194897c2eb0935031)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85742
Reviewed-by: Xisco Faulí 

diff --git a/sw/qa/extras/rtfexport/data/tdf129513.rtf 
b/sw/qa/extras/rtfexport/data/tdf129513.rtf
new file mode 100644
index ..cc39953491d9
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf129513.rtf
@@ -0,0 +1,4 @@
+{\rtf1
+\trowd\cellx2000\pard\intbl\pagebb
+In table
+\cell\row\pard\par }
\ No newline at end of file
diff --git a/sw/qa/extras/rtfexport/rtfexport5.cxx 
b/sw/qa/extras/rtfexport/rtfexport5.cxx
index 640cff9bec39..75678fb6971b 100644
--- a/sw/qa/extras/rtfexport/rtfexport5.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport5.cxx
@@ -1164,6 +1164,17 @@ DECLARE_RTFEXPORT_TEST(testTdf128320, "tdf128320.odt")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), nPos);
 }
 
+DECLARE_RTFEXPORT_TEST(testTdf129513, "tdf129513.rtf")
+{
+// \pagebb after \intbl must not reset the "in table" flag
+CPPUNIT_ASSERT_EQUAL(2, getParagraphs());
+// Make sure the first paragraph is imported in table
+uno::Reference xTable(getParagraphOrTable(1), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getCellNames().getLength());
+uno::Reference xCell(xTable->getCellByName("A1"), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(OUString("In table"), xCell->getString());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx 
b/writerfilter/source/rtftok/rtfdispatchflag.cxx
index 0c39866cd8df..894716b2897c 100644
--- a/writerfilter/source/rtftok/rtfdispatchflag.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx
@@ -431,7 +431,6 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
 if (nParam >= 0)
 {
 auto pValue = new RTFValue(1);
-m_aStates.top().getParagraphSprms().erase(NS_ooxml::LN_inTbl);
 m_aStates.top().getParagraphSprms().set(nParam, pValue);
 return RTFError::OK;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 sw/qa/extras/unowriter/unowriter.cxx |   35 +++
 sw/source/core/unocore/unomap1.cxx   |6 +++---
 2 files changed, 38 insertions(+), 3 deletions(-)

New commits:
commit fd3be6be5c9dc9a96834261c280fc291ed089835
Author: Mike Kaganski 
AuthorDate: Tue Jan 7 01:23:03 2020 +0300
Commit: Xisco Faulí 
CommitDate: Wed Jan 8 11:45:42 2020 +0100

tdf#129841: fix GetTextTableCursorPropertyMap cell background values

... which were accidentally broken in 2003 in commit
eba784710e92597282a2284b56dce3a45ac38776.

Change-Id: I3dc96dff0a8935f927933bb3946528fb8ac9aed0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86315
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86330
Reviewed-by: Xisco Faulí 

diff --git a/sw/qa/extras/unowriter/unowriter.cxx 
b/sw/qa/extras/unowriter/unowriter.cxx
index 630a72afa6b1..faaac078bff6 100644
--- a/sw/qa/extras/unowriter/unowriter.cxx
+++ b/sw/qa/extras/unowriter/unowriter.cxx
@@ -9,6 +9,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -762,6 +763,40 @@ CPPUNIT_TEST_FIXTURE(SwUnoWriter, testShapeAllowOverlap)
 CPPUNIT_ASSERT(getProperty(xShapeProperties, "AllowOverlap"));
 }
 
+CPPUNIT_TEST_FIXTURE(SwUnoWriter, testTdf129841)
+{
+// Create a new document and add a table
+loadURL("private:factory/swriter", nullptr);
+css::uno::Reference xTextDocument(mxComponent,
+
css::uno::UNO_QUERY_THROW);
+css::uno::Reference xFac(xTextDocument,
+  
css::uno::UNO_QUERY_THROW);
+css::uno::Reference xTable(
+xFac->createInstance("com.sun.star.text.TextTable"), 
css::uno::UNO_QUERY_THROW);
+xTable->initialize(4, 4);
+auto xSimpleText = xTextDocument->getText();
+xSimpleText->insertTextContent(xSimpleText->createTextCursor(), xTable, 
true);
+// Get SwXTextTableCursor
+css::uno::Reference 
xTableCursor(xTable->createCursorByCellName("A1"),
+   
css::uno::UNO_QUERY_THROW);
+css::uno::Reference xTableCellRange(xTable, 
css::uno::UNO_QUERY_THROW);
+// Get SwXCellRange for the same cell
+css::uno::Reference xCellRange(
+xTableCellRange->getCellRangeByName("A1:A1"), 
css::uno::UNO_QUERY_THROW);
+const OUString sBackColor = "BackColor";
+// Apply background color to table cursor, and read background color from 
cell range
+css::uno::Any aRefColor(sal_Int32(0x00FF));
+xTableCursor->setPropertyValue(sBackColor, aRefColor);
+css::uno::Any aColor = xCellRange->getPropertyValue(sBackColor);
+// This failed
+CPPUNIT_ASSERT_EQUAL(aRefColor, aColor);
+// Now the other way round
+aRefColor <<= sal_Int32(0xFF00);
+xCellRange->setPropertyValue(sBackColor, aRefColor);
+aColor = xTableCursor->getPropertyValue(sBackColor);
+CPPUNIT_ASSERT_EQUAL(aRefColor, aColor);
+}
+
 CPPUNIT_TEST_FIXTURE(SwUnoWriter, testTextConvertToTableLineSpacing)
 {
 // Load a document which has a table with a single cell.
diff --git a/sw/source/core/unocore/unomap1.cxx 
b/sw/source/core/unocore/unomap1.cxx
index 0c0e3e054bcc..7796adb8e798 100644
--- a/sw/source/core/unocore/unomap1.cxx
+++ b/sw/source/core/unocore/unomap1.cxx
@@ -971,13 +971,13 @@ const SfxItemPropertyMapEntry*  
SwUnoPropertyMapProvider::GetTextTableCursorProp
 TABSTOPS_MAP_ENTRY
 
 // attributes from PROPERTY_MAP_TABLE_CELL:
-{ OUString(UNO_NAME_BACK_COLOR), RES_BACKGROUND,
cppu::UnoType::get(),   PROPERTY_NONE , MID_BACK_COLOR   
},
+{ OUString(UNO_NAME_BACK_COLOR), FN_UNO_TABLE_CELL_BACKGROUND,
cppu::UnoType::get(),   PROPERTY_NONE , MID_BACK_COLOR   
},
 { OUString(UNO_NAME_BACK_GRAPHIC_URL), RES_BACKGROUND,  
cppu::UnoType::get(), PROPERTY_NONE ,MID_GRAPHIC_URL},
 { OUString(UNO_NAME_BACK_GRAPHIC), RES_BACKGROUND, 
cppu::UnoType::get(), PROPERTY_NONE, MID_GRAPHIC },
 { OUString(UNO_NAME_BACK_GRAPHIC_FILTER), RES_BACKGROUND,   
cppu::UnoType::get(), PROPERTY_NONE ,MID_GRAPHIC_FILTER},
-{ OUString(UNO_NAME_BACK_GRAPHIC_LOCATION), RES_BACKGROUND, 
cppu::UnoType::get(), PROPERTY_NONE 
,MID_GRAPHIC_POSITION},
+{ OUString(UNO_NAME_BACK_GRAPHIC_LOCATION), 
FN_UNO_TABLE_CELL_BACKGROUND, 
cppu::UnoType::get(), PROPERTY_NONE 
,MID_GRAPHIC_POSITION},
 { OUString(UNO_NAME_NUMBER_FORMAT), RES_BOXATR_FORMAT,  
cppu::UnoType::get(),   PropertyAttribute::MAYBEVOID ,0  
   },
-{ OUString(UNO_NAME_BACK_TRANSPARENT), RES_BACKGROUND,  
cppu::UnoType::get(), PROPERTY_NONE , MID_GRAPHIC_TRANSPARENT 
 },
+{ OUString(UNO_NAME_BACK_TRANSPARENT), FN_UNO_TABLE_CELL_BACKGROUND,  
cppu::UnoType::get(), PROPERTY_NONE , MID_GRAPHIC_TRAN

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - bin/check-elf-dynamic-objects configure.ac download.lst external/openssl external/python3 pyuno/inc pyuno/source

[Michael Stahl (via logerrit)]

 bin/check-elf-dynamic-objects  |6 
 configure.ac   |4 
 download.lst   |4 
 external/openssl/ExternalProject_openssl.mk|2 
 external/python3/ExternalPackage_python3.mk|   77 
 external/python3/ExternalProject_python3.mk|   16 +
 external/python3/UnpackedTarball_python3.mk|   13 -
 external/python3/i100492-freebsd.patch.1   |   45 -
 external/python3/python-3.3.0-pythreadstate.patch.1|   15 -
 external/python3/python-3.3.3-aix.patch.1  |  146 -
 external/python3/python-3.3.3-disable-obmalloc.patch.0 |   19 --
 external/python3/python-3.3.3-elf-rpath.patch.1|9 -
 external/python3/python-3.5.4-msvc-disable.patch.1 |   15 -
 external/python3/python-3.5.4-ssl.patch.1  |   83 -
 external/python3/python-3.7.6-msvc-ssl.patch.1 |   25 ++
 external/python3/python3-osx-avoid-new-10.13.patch.1   |   61 ---
 external/python3/ubsan.patch.0 |   22 --
 pyuno/inc/pyuno.hxx|1 
 pyuno/source/module/pyuno.cxx  |9 -
 pyuno/source/module/pyuno_runtime.cxx  |   31 +++
 20 files changed, 138 insertions(+), 465 deletions(-)

New commits:
commit 853cc90f49d59a94242494c4aee2479de0865486
Author: Michael Stahl 
AuthorDate: Mon Dec 9 14:08:19 2019 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Jan 8 11:33:15 2020 +0100

python3: upgrade to release 3.7.6

* external/python3/python-3.3.3-aix.patch.1:
  most of it doesn't apply and AIX port isn't maintained anyway so
  remove it for now
* external/python3/ubsan.patch.0:
  apparently one of the files was removed
* 0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1:
  fixed upstream
* python3-osx-avoid-new-10.13.patch.1:
  replace with simply passing ac_cv_func_utimensat=no to configure
* external/python3/python-3.5.4-ssl.patch.1:
  project files to build OpenSSL removed upstream
* There have been changes to how python locates OpenSSL; new variables
  OPENSSL_INCLUDES etc; it turns out that you have to pass one directory
  to --with-openssl, as the variables cannot be passed
* libuuid.so.1 is a new dependency of the _uuid module
* libffi.so.6 is a new dependency of the _ctypes module (the bundled
  copy of libffi for non-Darwin platforms was removed)
* python-3.3.0-pythreadstate.patch.1:
  the PyThreadState functions have been changed such that
  CppunitTest_services asserts when there is a PyThreadAttach on top of
  PyThreadDetach on top of PyThreadAttach, i.e., 2 PyThreadState per
  thread (PyGILState_Check() fails).  Instead of patching in additional
  workarounds, change PyThreadAttach so that it re-uses an existing
  PyThreadState if one exists for the thread.

Change-Id: I24c19d79b43a30709261fd9db66312b2e3872fd9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84765
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit b10be5d48433076f0b7238d818020f708553e114)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86398
Reviewed-by: Christian Lohmaier 

diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index 45bd0ecf45c6..d1b7ab5522f4 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -111,6 +111,12 @@ local file="$1"
 # skip the majority of files, no ELF binaries here
 skip=1
 ;;
+*/_ctypes.cpython-*.so)
+whitelist="${whitelist} libffi.so.6" # TODO dubious?
+;;
+*/_uuid.cpython-*.so)
+whitelist="${whitelist} libuuid.so.1"
+;;
 */libcairo.so.2)
 whitelist="${whitelist} ${x11whitelist} libxcb-shm.so.0 
libxcb.so.1 libxcb-render.so.0"
 ;;
diff --git a/configure.ac b/configure.ac
index 049e20b774ac..4a4e3821b844 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8758,8 +8758,8 @@ int main(int argc, char **argv) {
 internal)
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
-PYTHON_VERSION_MINOR=5
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.9
+PYTHON_VERSION_MINOR=7
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.6
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index f023795fcc1f..f1769774540a 100644
--- a/download.lst
+++ b/download.lst
@@ -210,8 +210,8 @@ export POPPLER_SHA256SUM := 
234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1
 export POPPLER_TARBALL := poppler-0.82.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
a754c02f7051c2f21e52f8669a42

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - compilerplugins/LICENSE.TXT cui/inc odk/docs odk/examples odk/index.html odk/index_online.html readlicense_oo/license setup_native/source sfx

[Adolfo Jayme Barrientos (via logerrit)]

 compilerplugins/LICENSE.TXT   |2 
 cui/inc/strings.hrc   |2 
 odk/docs/install.html |2 
 odk/docs/tools.html   |2 
 odk/examples/DevelopersGuide/examples.html|2 
 odk/examples/examples.html|2 
 odk/index.html|2 
 odk/index_online.html |2 
 readlicense_oo/license/license.xml|2 
 setup_native/source/packinfo/packinfo_brand.txt   |   16 +-
 setup_native/source/packinfo/packinfo_extensions.txt  |8 -
 setup_native/source/packinfo/packinfo_office.txt  |  118 +-
 setup_native/source/packinfo/packinfo_office_help.txt |2 
 setup_native/source/packinfo/packinfo_office_lang.txt |   20 +--
 setup_native/source/packinfo/packinfo_sdkoo.txt   |2 
 setup_native/source/packinfo/packinfo_ure.txt |4 
 sfx2/uiconfig/ui/licensedialog.ui |2 
 17 files changed, 95 insertions(+), 95 deletions(-)

New commits:
commit e236f90d44b1c429a470a15a0520946c12cd8487
Author: Adolfo Jayme Barrientos 
AuthorDate: Wed Jan 1 23:22:03 2020 -0600
Commit: Christian Lohmaier 
CommitDate: Wed Jan 8 11:33:41 2020 +0100

Bump copyright year to 2020

Change-Id: I6fb736591f32907c8977fbac8fbf1dcbaef1bb97
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86092
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit a526e85a0d6371781482a9b7de4e05b8b2578de2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86093
Reviewed-by: Michael Meeks 
Reviewed-by: Christian Lohmaier 

diff --git a/compilerplugins/LICENSE.TXT b/compilerplugins/LICENSE.TXT
index d3bf81a9d1c4..88b93d448864 100644
--- a/compilerplugins/LICENSE.TXT
+++ b/compilerplugins/LICENSE.TXT
@@ -1,7 +1,7 @@
 University of Illinois/NCSA
 Open Source License
 
-Copyright (c) 2012-2019 The Document Foundation
+Copyright (c) 2012-2020 The Document Foundation
 All rights reserved.
 
 Developed by:
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 1ade0c0d6b38..c9d1acec41af 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -382,7 +382,7 @@
 #define RID_SVXSTR_CANNOTCONVERTURL_ERR 
NC_("RID_SVXSTR_CANNOTCONVERTURL_ERR", "The URL <%1> cannot be converted to a 
filesystem path.")
 
 #define RID_SVXSTR_ABOUT_VERSION
NC_("aboutdialog|textbuffer1", "Version: 
%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX")
-#define RID_SVXSTR_ABOUT_COPYRIGHT  
NC_("aboutdialog|copyright", "Copyright © 2000–2019 LibreOffice contributors.")
+#define RID_SVXSTR_ABOUT_COPYRIGHT  
NC_("aboutdialog|copyright", "Copyright © 2000–2020 LibreOffice contributors.")
 #define RID_SVXSTR_ABOUT_CREDITS_URLNC_("aboutdialog|link", 
"https://www.libreoffice.org/about-us/credits/";)
 #define RID_SVXSTR_ABOUT_BUILDIDNC_("aboutdialog|buildid", 
"Build ID: $BUILDID")
 #define RID_SVXSTR_ABOUT_VENDOR NC_("aboutdialog|vendor", 
"This release was supplied by %OOOVENDOR.")
diff --git a/odk/docs/install.html b/odk/docs/install.html
index 055f4007b24a..682fd8c45b3b 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -527,7 +527,7 @@
 
 
   
-Copyright © 2000–2019 LibreOffice contributors. All rights
+Copyright © 2000–2020 LibreOffice contributors. All rights
   reserved.
   LibreOffice was created by The Document Foundation, based on
   Apache OpenOffice, which is Copyright 2011 The Apache Software
diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index 646ca80c1c4e..1e1769c8761c 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -911,7 +911,7 @@ types the specified types depend on.
 
 
 
-Copyright © 2000–2019 LibreOffice contributors. 
All rights reserved.
+Copyright © 2000–2020 LibreOffice contributors. 
All rights reserved.
 
 LibreOffice was created by The Document Foundation,
 based on Apache OpenOffice, which is Copyright 
2011,
diff --git a/odk/examples/DevelopersGuide/examples.html 
b/odk/examples/DevelopersGuide/examples.html
index 9d11058c531f..252366025f8c 100644
--- a/odk/examples/DevelopersGuide/examples.html
+++ b/odk/examples/DevelopersGuide/examples.html
@@ -2856,7 +2856,7 @@ for the Office application.
 
 
 
-Copyright © 2000–2019 LibreOffice contributors. 
All rights reserved.
+Copyright © 2000–2020 LibreOffice contributors. 
All

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

[Eike Rathke (via logerrit)]

 sc/inc/scmatrix.hxx  |   10 ++--
 sc/source/core/tool/interpr1.cxx |   22 -
 sc/source/core/tool/interpr3.cxx |   90 ---
 sc/source/core/tool/interpr4.cxx |1 
 sc/source/core/tool/interpr6.cxx |   15 +++---
 sc/source/core/tool/parclass.cxx |2 
 sc/source/core/tool/scmatrix.cxx |   88 --
 7 files changed, 166 insertions(+), 62 deletions(-)

New commits:
commit 78d4e78c43f688a3617d659774d985d466bb39dc
Author: Eike Rathke 
AuthorDate: Wed Jan 8 01:23:45 2020 +0100
Commit: Eike Rathke 
CommitDate: Wed Jan 8 11:32:39 2020 +0100

Resolves: tdf#129681 Handle array/matrix in AGGREGATE() with ignore errors

This also changes AGGREGATE() 3rd and subsequent parameters'
classification from ReferenceOrRefArray to ReferenceOrForceArray
to force the expected array mode on inline calculations.

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

diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index ca9d3496be7a..2efa73c4a975 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -362,15 +362,15 @@ public:
 double Or() const ;// logical OR of all matrix values, or NAN
 double Xor() const ;   // logical XOR of all matrix values, or NAN
 
-IterateResult Sum(bool bTextAsZero) const ;
-IterateResult SumSquare(bool bTextAsZero) const ;
-IterateResult Product(bool bTextAsZero) const ;
+IterateResult Sum( bool bTextAsZero, bool bIgnoreErrorValues = false ) 
const ;
+IterateResult SumSquare( bool bTextAsZero, bool bIgnoreErrorValues = false 
) const ;
+IterateResult Product( bool bTextAsZero, bool bIgnoreErrorValues = false ) 
const ;
 size_t Count(bool bCountStrings, bool bCountErrors) const ;
 size_t MatchDoubleInColumns(double fValue, size_t nCol1, size_t nCol2) 
const ;
 size_t MatchStringInColumns(const svl::SharedString& rStr, size_t nCol1, 
size_t nCol2) const ;
 
-double GetMaxValue( bool bTextAsZero ) const ;
-double GetMinValue( bool bTextAsZero ) const ;
+double GetMaxValue( bool bTextAsZero, bool bIgnoreErrorValues = false ) 
const ;
+double GetMinValue( bool bTextAsZero, bool bIgnoreErrorValues = false ) 
const ;
 double GetGcd() const ;
 double GetLcm() const ;
 
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 175228ccb104..b6fa53b43528 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -3721,7 +3721,7 @@ void ScInterpreter::ScMin( bool bTextAsZero )
 if (pMat)
 {
 nFuncFmtType = SvNumFormatType::NUMBER;
-nVal = pMat->GetMinValue(bTextAsZero);
+nVal = pMat->GetMinValue(bTextAsZero, bool(mnSubTotalFlags 
& SubtotalFlags::IgnoreErrVal));
 if (nMin > nVal)
 nMin = nVal;
 }
@@ -3879,7 +3879,7 @@ void ScInterpreter::ScMax( bool bTextAsZero )
 if (pMat)
 {
 nFuncFmtType = SvNumFormatType::NUMBER;
-nVal = pMat->GetMaxValue(bTextAsZero);
+nVal = pMat->GetMaxValue(bTextAsZero, bool(mnSubTotalFlags 
& SubtotalFlags::IgnoreErrVal));
 if (nMax < nVal)
 nMax = nVal;
 }
@@ -4069,6 +4069,7 @@ void ScInterpreter::GetStVarParams( bool bTextAsZero, 
double(*VarResult)( double
 ScMatrixRef pMat = GetMatrix();
 if (pMat)
 {
+const bool bIgnoreErrVal = bool(mnSubTotalFlags & 
SubtotalFlags::IgnoreErrVal);
 SCSIZE nC, nR;
 pMat->GetDimensions(nC, nR);
 for (SCSIZE nMatCol = 0; nMatCol < nC; nMatCol++)
@@ -4083,6 +4084,8 @@ void ScInterpreter::GetStVarParams( bool bTextAsZero, 
double(*VarResult)( double
 values.push_back(fVal);
 fSum += fVal;
 }
+else if (bIgnoreErrVal)
+nGlobalError = FormulaError::NONE;
 }
 else if ( bTextAsZero )
 {
@@ -7565,6 +7568,9 @@ void ScInterpreter::ScAggregate()
 sal_uInt8 nParamCount = GetByte();
 if ( MustHaveParamCountMin( nParamCount, 3 ) )
 {
+const FormulaError nErr = nGlobalError;
+nGlobalError = FormulaError::NONE;
+
 // fish the 1st parameter from the stack and push it on top.
 const FormulaToken* p = pStack[ sp - nParamCount ];
 PushWithoutError( *p );
@@ -7575,7 +7581,10 @@ void ScInterpreter::ScAggregate()
 sal_Int32 nOption = GetInt32();
 
  

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

[andreas kainz (via logerrit)]

 sw/uiconfig/swriter/ui/optformataidspage.ui |  664 +---
 1 file changed, 317 insertions(+), 347 deletions(-)

New commits:
commit 8faa519ad22db9d9db8bcf6d37dda1c7a7d7c850
Author: andreas kainz 
AuthorDate: Wed Jan 8 10:24:59 2020 +0100
Commit: andreas_kainz 
CommitDate: Wed Jan 8 11:32:20 2020 +0100

Options Dialog Formating Aid update to fulfill HIG

Change-Id: Ic42946e661f2e7e8f31a0520d895c2fa07d6a387
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86401
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/sw/uiconfig/swriter/ui/optformataidspage.ui 
b/sw/uiconfig/swriter/ui/optformataidspage.ui
index d150bf5d68d4..321ea825f91c 100644
--- a/sw/uiconfig/swriter/ui/optformataidspage.ui
+++ b/sw/uiconfig/swriter/ui/optformataidspage.ui
@@ -5,279 +5,263 @@
   
 True
 False
-True
 6
 vertical
-12
 
   
 True
 False
-6
-12
+12
+24
 
-  
+  
 True
 False
-vertical
-12
+0
+none
 
-  
+  
 True
 False
-0
-none
+6
+12
 
-  
+  
 True
 False
-6
-12
+6
+6
 
-  
+  
+Pa_ragraph end
+True
+True
+False
+True
+0
+True
+  
+  
+0
+0
+  
+
+
+  
+Soft h_yphens
+True
+True
+False
+True
+0
+True
+  
+  
+0
+1
+  
+
+
+  
+Spac_es
+True
+True
+False
+True
+0
+True
+  
+  
+0
+2
+  
+
+
+  
+Non-breaking s_paces
+True
+True
+False
+True
+0
+True
+  
+  
+0
+3
+  
+
+
+  
+Ta_bs
+True
+True
+False
+True
+0
+True
+  
+  
+0
+4
+  
+
+
+  
+Brea_ks
+True
+True
+False
+True
+0
+True
+  
+  
+0
+5
+  
+
+
+  
+Hidden characters
+True
+True
+False
+True
+0
+True
+  
+  
+0
+6
+  
+
+
+  
 True
 False
-6
-6
-
-  
-Pa_ragraph end
-True
-True
-False
-True
-0
-True
-  
-  
-0
-0
-

[no subject]

[Animesh Ramasami IIT bhu]

Dear sir,
 I am interested in contributing for your organization so may I know what
are the  prerequisites and how to get started with it...
Yours Sincerely
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Pedro Pinto Silva (via logerrit)]

 loleaflet/images/lc_insertcurrentdate.svg |1 +
 loleaflet/images/lc_insertcurrenttime.svg |1 +
 loleaflet/images/lc_insertdatefieldfix.svg|1 +
 loleaflet/images/lc_insertdatefieldvar.svg|1 +
 loleaflet/images/lc_insertfilefield.svg   |1 +
 loleaflet/images/lc_insertslidefield.svg  |1 +
 loleaflet/images/lc_insertslidesfield.svg |1 +
 loleaflet/images/lc_insertslidetitlefield.svg |1 +
 loleaflet/images/lc_inserttimefieldfix.svg|1 +
 loleaflet/images/lc_inserttimefieldvar.svg|1 +
 10 files changed, 10 insertions(+)

New commits:
commit b752bb6d4ae2956ef11fdcc58d161e0ed2ae074d
Author: Pedro Pinto Silva 
AuthorDate: Wed Jan 8 11:04:56 2020 +0100
Commit: Pedro Pinto da Silva 
CommitDate: Wed Jan 8 11:12:53 2020 +0100

Mobile: Insert: Fields: Add icons for the respective uno commands:
- added in: 86371: mobile: add insert fields for calc & impress.

Change-Id: I5ec7424b3149eca431cf5f081397ae4e5979664f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86408
Reviewed-by: Pedro Pinto da Silva 
Tested-by: Pedro Pinto da Silva 

diff --git a/loleaflet/images/lc_insertcurrentdate.svg 
b/loleaflet/images/lc_insertcurrentdate.svg
new file mode 100644
index 0..c0091b903
--- /dev/null
+++ b/loleaflet/images/lc_insertcurrentdate.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertcurrenttime.svg 
b/loleaflet/images/lc_insertcurrenttime.svg
new file mode 100644
index 0..451441911
--- /dev/null
+++ b/loleaflet/images/lc_insertcurrenttime.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
diff --git a/loleaflet/images/lc_insertdatefieldfix.svg 
b/loleaflet/images/lc_insertdatefieldfix.svg
new file mode 100644
index 0..c0091b903
--- /dev/null
+++ b/loleaflet/images/lc_insertdatefieldfix.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertdatefieldvar.svg 
b/loleaflet/images/lc_insertdatefieldvar.svg
new file mode 100644
index 0..c0091b903
--- /dev/null
+++ b/loleaflet/images/lc_insertdatefieldvar.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertfilefield.svg 
b/loleaflet/images/lc_insertfilefield.svg
new file mode 100644
index 0..81db9a080
--- /dev/null
+++ b/loleaflet/images/lc_insertfilefield.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertslidefield.svg 
b/loleaflet/images/lc_insertslidefield.svg
new file mode 100644
index 0..a2d6d0003
--- /dev/null
+++ b/loleaflet/images/lc_insertslidefield.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertslidesfield.svg 
b/loleaflet/images/lc_insertslidesfield.svg
new file mode 100644
index 0..58ac27e81
--- /dev/null
+++ b/loleaflet/images/lc_insertslidesfield.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertslidetitlefield.svg 
b/loleaflet/images/lc_insertslidetitlefield.svg
new file mode 100644
index 0..4883eca24
--- /dev/null
+++ b/loleaflet/images/lc_insertslidetitlefield.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_inserttimefieldfix.svg 
b/loleaflet/images/lc_inserttimefieldfix.svg
new file mode 100644
index 0..451441911
--- /dev/null
+++ b/loleaflet/images/lc_inserttimefieldfix.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
diff --git a/loleaflet/images/lc_inserttimefieldvar.svg 
b/loleaflet/images/lc_inserttimefieldvar.svg
new file mode 100644
index 0..451441911
--- /dev/null
+++ b/loleaflet/images/lc_inserttimefieldvar.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits