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

[Caolán McNamara (via logerrit)]

 sc/qa/unit/data/xls/pass/ofz20904-1.xls |binary
 sc/source/core/data/dociter.cxx |   11 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 74def786fe5c20c5415060209e56ee30cde8e266
Author: Caolán McNamara 
AuthorDate: Thu Feb 27 09:17:11 2020 +
Commit: Noel Grandin 
CommitDate: Thu Jun 18 08:54:42 2020 +0200

tdf#134019: ofz#20904 check bounds

Change-Id: I5d6d381ebd359b233b309e08131f3dda21310d80
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89620
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 8e3a29110c8ad739bedeea90932663608d8d3935)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96573
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
Reviewed-by: Noel Grandin 

diff --git a/sc/qa/unit/data/xls/pass/ofz20904-1.xls 
b/sc/qa/unit/data/xls/pass/ofz20904-1.xls
new file mode 100644
index ..44dbe8f6e222
Binary files /dev/null and b/sc/qa/unit/data/xls/pass/ofz20904-1.xls differ
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index f501bb8da0d0..5331e8ac33ae 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -892,14 +892,17 @@ void ScCellIterator::init()
 if (maStartPos.Tab() > maEndPos.Tab())
 maStartPos.SetTab(maEndPos.Tab());
 
-maCurPos = maStartPos;
-
-if (!mpDoc->maTabs[maCurPos.Tab()])
+if (!mpDoc->maTabs[maStartPos.Tab()])
 {
 OSL_FAIL("Table not found");
 maStartPos = ScAddress(mpDoc->MaxCol()+1, mpDoc->MaxRow()+1, 
MAXTAB+1); // -> Abort on GetFirst.
-maCurPos = maStartPos;
 }
+else
+{
+
maStartPos.SetCol(mpDoc->maTabs[maStartPos.Tab()]->ClampToAllocatedColumns(maStartPos.Col()));
+}
+
+maCurPos = maStartPos;
 }
 
 bool ScCellIterator::getCurrent()
___
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/source

[Michael Stahl (via logerrit)]

 sw/source/core/doc/DocumentRedlineManager.cxx |   22 ++
 sw/source/core/inc/UndoDelete.hxx |3 +++
 sw/source/core/undo/undel.cxx |   26 +++---
 3 files changed, 48 insertions(+), 3 deletions(-)

New commits:
commit 1e04dd3bca5b3bd3ea94af3304bdce87b705451b
Author: Michael Stahl 
AuthorDate: Fri Jun 12 19:08:19 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Jun 18 00:47:51 2020 +0200

tdf#132944 sw_redlinehide: delete of insert redline

Because of an existing insert redline with SwComparePosition::Equal
this hits the DeleteAndJoin() call in AppendRedline() and so what
happens on Undo is that the SwUndoDelete first creates all the layout
frames and then the SwUndoRedlineDelete creates the frames a 2nd time.

Because this can happen not only for Equal but also Inside case, it
appears best to prevent the "inner" Undo from recreating the frames;
it's always SwUndoDelete.

This is quite hacky...

Change-Id: I4438dd09bb6c2edf8154d333de403483768755fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96233
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit ad0351b84926075297fb74abbe9b31a0455782af)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96517
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index fb6a54d5cec2..d23a69717f66 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -25,6 +25,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -887,6 +889,21 @@ namespace
 static_cast(m_rRedline) = *m_pCursor;
 }
 };
+
+auto UndoDeleteDisableFrames(SwDoc & rDoc) -> void
+{
+// inside AppendRedline(), a SwUndoDelete was created;
+// prevent it from creating duplicate layout frames on Undo
+auto & rUndo(rDoc.GetUndoManager());
+if (rUndo.DoesUndo())
+{
+SwUndo *const pUndo(rUndo.GetLastUndo());
+assert(pUndo);
+SwUndoDelete *const pUndoDel(dynamic_cast(pUndo));
+assert(pUndoDel);
+pUndoDel->DisableMakeFrames(); // tdf#132944
+}
+}
 }
 
 namespace sw
@@ -1556,12 +1573,14 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* 
pNewRedl, bool const bCall
 }
 else
 
m_rDoc.getIDocumentContentOperations().DeleteAndJoin( *pNewRedl );
+UndoDeleteDisableFrames(m_rDoc); // tdf#132944
 
 bCompress = true;
 }
 if( !bCallDelete && !bDec && *pEnd == *pREnd )
 {
 
m_rDoc.getIDocumentContentOperations().DeleteAndJoin( *pNewRedl );
+UndoDeleteDisableFrames(m_rDoc);
 bCompress = true;
 }
 else if ( bCallDelete || !bDec )
@@ -1581,6 +1600,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* 
pNewRedl, bool const bCall
 {
 TemporaryRedlineUpdater const u(m_rDoc, 
*pNewRedl);
 
m_rDoc.getIDocumentContentOperations().DeleteAndJoin( *pRedl );
+UndoDeleteDisableFrames(m_rDoc);
 n = 0;  // re-initialize
 }
 delete pRedl;
@@ -1605,6 +1625,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* 
pNewRedl, bool const bCall
 {
 TemporaryRedlineUpdater const u(m_rDoc, 
*pNewRedl);
 
m_rDoc.getIDocumentContentOperations().DeleteAndJoin( aPam );
+UndoDeleteDisableFrames(m_rDoc);
 n = 0;  // re-initialize
 }
 bDec = true;
@@ -1627,6 +1648,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* 
pNewRedl, bool const bCall
 {
 TemporaryRedlineUpdater const u(m_rDoc, 
*pNewRedl);
 
m_rDoc.getIDocumentContentOperations().DeleteAndJoin( aPam );
+UndoDeleteDisableFrames(m_rDoc);
 n = 0;  // re-initialize
 bDec = true;
 }
diff --git a/sw/source/core/inc/UndoDelete.hxx 
b/sw/source/core/inc/UndoDelete.h

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - connectivity/CppunitTest_connectivity_mysql_test.mk connectivity/qa connectivity/README

[Michael Stahl (via logerrit)]

 connectivity/CppunitTest_connectivity_mysql_test.mk |   18 +-
 connectivity/README |   12 +++-
 connectivity/qa/connectivity/mysql/mysql.cxx|7 +--
 3 files changed, 25 insertions(+), 12 deletions(-)

New commits:
commit ea2cc67e3d1d1dea452345a18086b58004236e7d
Author: Michael Stahl 
AuthorDate: Wed Jun 17 14:59:51 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Jun 18 00:47:26 2020 +0200

connectivity: fix mysql test

* rename the gbuild target according to conventions
* fix -Werror=unused-but-set-variable
* disable assert in testMultipleResultsets() that fails presumably since
  commit 86c86719782243275b65f1f7f2cfdcc0e56c8cd4
* document how to set up mariadb for dummies like me in README

Change-Id: I7f92b80fef90b47e69e4e9a7a02187882a4cab06
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96537
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 0c07d849a4709f896072cb9c707af17c309c2f7f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96571
Reviewed-by: Thorsten Behrens 

diff --git a/connectivity/CppunitTest_connectivity_mysql_test.mk 
b/connectivity/CppunitTest_connectivity_mysql_test.mk
index 5d9a8bb05d58..8733315f466d 100644
--- a/connectivity/CppunitTest_connectivity_mysql_test.mk
+++ b/connectivity/CppunitTest_connectivity_mysql_test.mk
@@ -7,15 +7,15 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CppunitTest_CppunitTest,mysql_test))
+$(eval $(call gb_CppunitTest_CppunitTest,connectivity_mysql_test))
 
-$(eval $(call gb_CppunitTest_use_external,mysql_test,boost_headers))
+$(eval $(call 
gb_CppunitTest_use_external,connectivity_mysql_test,boost_headers))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,mysql_test, \
+$(eval $(call gb_CppunitTest_add_exception_objects,connectivity_mysql_test, \
 connectivity/qa/connectivity/mysql/mysql \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,mysql_test, \
+$(eval $(call gb_CppunitTest_use_libraries,connectivity_mysql_test, \
 comphelper \
 cppu \
 dbaxml \
@@ -28,16 +28,16 @@ $(eval $(call gb_CppunitTest_use_libraries,mysql_test, \
 xo \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,mysql_test,\
+$(eval $(call gb_CppunitTest_use_api,connectivity_mysql_test,\
 offapi \
 oovbaapi \
 udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,mysql_test))
-$(eval $(call gb_CppunitTest_use_vcl,mysql_test))
+$(eval $(call gb_CppunitTest_use_ure,connectivity_mysql_test))
+$(eval $(call gb_CppunitTest_use_vcl,connectivity_mysql_test))
 
-$(eval $(call gb_CppunitTest_use_components,mysql_test,\
+$(eval $(call gb_CppunitTest_use_components,connectivity_mysql_test,\
 basic/util/sb \
 comphelper/util/comphelp \
 configmgr/source/configmgr \
@@ -61,6 +61,6 @@ $(eval $(call gb_CppunitTest_use_components,mysql_test,\
 xmloff/util/xo \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,mysql_test))
+$(eval $(call gb_CppunitTest_use_configuration,connectivity_mysql_test))
 
 # vim: set noet sw=4 ts=4:
diff --git a/connectivity/README b/connectivity/README
index 4a523c8d706b..ebae354523ca 100644
--- a/connectivity/README
+++ b/connectivity/README
@@ -11,4 +11,14 @@ Contains database pieces, drivers, etc.
   the environment variable "CONNECTIVITY_TEST_MYSQL_DRIVER".
   
 - The environment variable should contain a URL of the following format:
-  [user]/[passwd]@sdbc:mysql:mysqlc:[host]:[port]/[db_name]
+  [user]/[passwd]@sdbc:mysql:mysqlc:[host]:[port]/db_name
+
+- tl;dr:
+
+  podman pull mariadb/server
+  podman run --name=mariadb -e MYSQL_ROOT_PASSWORD=foobarbaz -p 
127.0.0.1:3306:3306 mariadb/server
+  podman exec -it mariadb /bin/bash -c "echo -e CREATE DATABASE test | 
/usr/bin/mysql -u root"
+  (cd connectivity && make -srj8 CppunitTest_connectivity_mysql_test 
CONNECTIVITY_TEST_MYSQL_DRIVER="root/foobarbaz@sdbc:mysql:mysqlc:127.0.0.1:3306/test")
+  podman stop mariadb
+  podman rm mariadb
+
diff --git a/connectivity/qa/connectivity/mysql/mysql.cxx 
b/connectivity/qa/connectivity/mysql/mysql.cxx
index 47d1d7929e44..7291c9f444d3 100644
--- a/connectivity/qa/connectivity/mysql/mysql.cxx
+++ b/connectivity/qa/connectivity/mysql/mysql.cxx
@@ -304,7 +304,10 @@ void MysqlTestDriver::testMultipleResultsets()
 Reference xRowSecond(xResultSet2, UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL(2l, xRowSecond->getLong(1));
 // now use the first result set again
+#if 0
+// FIXME this was broken by 86c86719782243275b65f1f7f2cfdcc0e56c8cd4 
adding closeResultSet() in execute()
 CPPUNIT_ASSERT_EQUAL(1l, xRowFirst->getLong(1));
+#endif
 
 xStatement->executeUpdate("DROP TABLE myTestTable");
 xStatement->executeUpdate("DROP TABLE otherTable");
@@ -319,7 +322,7 @@ void MysqlTestDriver::testDBMetaData()
 CPPUNIT_ASSERT(xStatement.is());
 xStatement->executeUpdate("DROP TABLE IF EXISTS myTestTable");
 
-au

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

[Shiko (via logerrit)]

 sw/qa/uitest/writer_tests/comments.py |  156 ++
 1 file changed, 156 insertions(+)

New commits:
commit ba33a51ff1eb34a5983870dcb50e975002e6d3a4
Author: Shiko 
AuthorDate: Sun Jun 14 20:33:20 2020 +0200
Commit: Ahmed ElShreif 
CommitDate: Thu Jun 18 00:19:00 2020 +0200

uitest: Add demo for Writer-comments

Change-Id: Iaf7c4c646a1f64f0a97c95fd7133da89da44c7d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96295
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/sw/qa/uitest/writer_tests/comments.py 
b/sw/qa/uitest/writer_tests/comments.py
new file mode 100644
index ..e62e4f050738
--- /dev/null
+++ b/sw/qa/uitest/writer_tests/comments.py
@@ -0,0 +1,156 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-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/.
+#
+
+from uitest.framework import UITestCase
+import time
+from uitest.uihelper.common import get_state_as_dict, type_text
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.debug import sleep
+#test comments
+
+class Comments(UITestCase):
+
+def test_comments_features(self):
+
+xMainDoc = self.ui_test.create_doc_in_start_center("writer")
+
+xMainWindow = self.xUITest.getTopFocusWindow()
+
+xwriter_edit = xMainWindow.getChild("writer_edit")
+xwriter_edit.executeAction("TYPE", mkPropertyValues({"TEXT": "Before 
"}))
+
+# adding new Comment
+self.xUITest.executeCommandWithParameters(".uno:InsertAnnotation", 
mkPropertyValues({"KeyModifier" : 0 }) )
+
+xComment1 = xMainWindow.getChild("Comment1")
+xComment1.executeAction("TYPE", mkPropertyValues({"TEXT": "This is the 
First Comment"}))
+self.assertEqual(get_state_as_dict(xComment1)["Text"], "This is the 
First Comment" )
+self.assertEqual(get_state_as_dict(xComment1)["Resolved"], "false" )
+self.assertEqual(get_state_as_dict(xComment1)["Author"], "Unknown 
Author" )
+self.assertEqual(get_state_as_dict(xComment1)["ReadOnly"], "false" )
+
+xComment1.executeAction("LEAVE", mkPropertyValues({}))
+
+xwriter_edit.executeAction("TYPE", mkPropertyValues({"TEXT": "After"}))
+xwriter_edit.executeAction("SELECT", mkPropertyValues({"END_POS": "0", 
"START_POS": "13"}))
+self.assertEqual(get_state_as_dict(xwriter_edit)["SelectedText"], 
"Before After" )
+
+# test Resolve Comment
+xComment1.executeAction("RESOLVE", mkPropertyValues({}))
+self.assertEqual(get_state_as_dict(xComment1)["Resolved"], "true" )
+
+# test Select text from Comment
+xComment1.executeAction("SELECT", mkPropertyValues({"FROM": "0", "TO": 
"4"}))
+self.assertEqual(get_state_as_dict(xComment1)["SelectedText"], "This" )
+
+# test Hide then Show Comment
+xComment1.executeAction("HIDE", mkPropertyValues({}))
+self.assertEqual(get_state_as_dict(xComment1)["Visible"], "false" )
+xComment1.executeAction("SHOW", mkPropertyValues({}))
+self.assertEqual(get_state_as_dict(xComment1)["Visible"], "true" )
+
+# test delete Comment
+number_of_items = len(xMainWindow.getChildren())
+xComment1.executeAction("DELETE", mkPropertyValues({}))
+self.assertTrue("Comment1" not in xMainWindow.getChildren())
+
+self.ui_test.close_doc()
+
+def test_multi_comments(self):
+
+xMainDoc = self.ui_test.create_doc_in_start_center("writer")
+
+xMainWindow = self.xUITest.getTopFocusWindow()
+
+xwriter_edit = xMainWindow.getChild("writer_edit")
+
+# adding 3 new Comment
+xwriter_edit.executeAction("TYPE", mkPropertyValues({"TEXT": "Line 
1"}))
+self.xUITest.executeCommandWithParameters(".uno:InsertAnnotation", 
mkPropertyValues({"KeyModifier" : 0 }) )
+xMainWindow = self.xUITest.getTopFocusWindow()
+xComment1 = xMainWindow.getChild("Comment1")
+xComment1.executeAction("TYPE", mkPropertyValues({"TEXT": "First 
Comment"}))
+xComment1.executeAction("LEAVE", mkPropertyValues({}))
+xwriter_edit.executeAction("TYPE", mkPropertyValues({"KEYCODE": 
"RETURN"}))
+
+xwriter_edit.executeAction("TYPE", mkPropertyValues({"TEXT": "Line 
2"}))
+self.xUITest.executeCommandWithParameters(".uno:InsertAnnotation", 
mkPropertyValues({"KeyModifier" : 0 }) )
+xMainWindow = self.xUITest.getTopFocusWindow()
+xComment2 = xMainWindow.getChild("Comment2")
+xComment2.executeAction("TYPE", mkPropertyValues({"TEXT": "Second 
Comment"}))
+xComment2.executeAction("LEAVE", mkPropertyValues({}))
+xwriter_edit.executeAction("TYPE", mkPropertyValues({"KEYCODE": 
"RETURN"}))
+
+xwrit

[Libreoffice-commits] core.git: helpcontent2

[Alain Romedenne (via logerrit)]

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

New commits:
commit 46fb0a3b3881210d05f8114cacfa64ae44a71bb5
Author: Alain Romedenne 
AuthorDate: Wed Jun 17 23:58:49 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Jun 17 23:58:49 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to c4c2ae468886b8a38465b9969d8293b677672481
  - fix to deprecated API example

cf. 
https://api.libreoffice.org/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1ui_1_1dialogs_1_1XFilePicker.html#ae368e8b36ffdb8f8f7ba45d93556a60d

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

diff --git a/helpcontent2 b/helpcontent2
index fcf75206c5f8..c4c2ae468886 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fcf75206c5f8f59ac464dc3b9b9ca869ce3a7bd5
+Subproject commit c4c2ae468886b8a38465b9969d8293b677672481
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Alain Romedenne (via logerrit)]

 source/text/sbasic/shared/03131600.xhp |   10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

New commits:
commit c4c2ae468886b8a38465b9969d8293b677672481
Author: Alain Romedenne 
AuthorDate: Wed Jun 17 14:57:20 2020 +0200
Commit: Olivier Hallot 
CommitDate: Wed Jun 17 23:58:49 2020 +0200

fix to deprecated API example

cf. 
https://api.libreoffice.org/docs/idl/ref/interfacecom_1_1sun_1_1star_1_1ui_1_1dialogs_1_1XFilePicker.html#ae368e8b36ffdb8f8f7ba45d93556a60d

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

diff --git a/source/text/sbasic/shared/03131600.xhp 
b/source/text/sbasic/shared/03131600.xhp
index b0c499b8c..1d168f8a4 100644
--- a/source/text/sbasic/shared/03131600.xhp
+++ b/source/text/sbasic/shared/03131600.xhp
@@ -17,14 +17,12 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
-
 
   
 CreateUnoService Function
 /text/sbasic/shared/03131600.xhp
   
 
-
 
 
 
@@ -32,16 +30,12 @@
 API;FilePicker
 API;FunctionAccess
 
-
 CreateUnoService Function
 Instantiates a 
Uno service with the ProcessServiceManager.
 
-
 
 oService = 
CreateUnoService( Uno service name )
-
 For a list of 
available services, go to: https://api.libreoffice.org/docs/idl/ref/namespacecom_1_1sun_1_1star.html";
 name="api.libreoffice.org com::sun::star Module 
Reference">https://api.libreoffice.org/docs/idl/ref/namespacecom_1_1sun_1_1star.html
-
 
 
 Calc functions;API Service
@@ -74,7 +68,7 @@
 filepicker = 
createUnoService("com.sun.star.ui.dialogs.FilePicker")
 filepicker.Title = title
 filepicker.execute()
-files = filepicker.getFiles()
+files = filepicker.getSelectedFiles()
 FileOpenDialog=files(0)
 End Function
 
@@ -82,4 +76,4 @@
 
 
 
-
+
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Alain Romedenne (via logerrit)]

 AllLangHelp_sbasic.mk  |1 
 source/auxiliary/sbasic.tree   |3 +
 source/text/sbasic/shared/Compiler_options.xhp |   49 +
 3 files changed, 52 insertions(+), 1 deletion(-)

New commits:
commit fcf75206c5f8f59ac464dc3b9b9ca869ce3a7bd5
Author: Alain Romedenne 
AuthorDate: Wed Jun 17 08:32:31 2020 +0200
Commit: Olivier Hallot 
CommitDate: Wed Jun 17 23:57:21 2020 +0200

Basic compiler/runtime options aggregation

- Base
- Explicit
- ClassModule
- Compatible
- Private Module
- VBASupport

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

diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk
index 6dcb58d11..b24b4901b 100644
--- a/AllLangHelp_sbasic.mk
+++ b/AllLangHelp_sbasic.mk
@@ -362,6 +362,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\
 helpcontent2/source/text/sbasic/shared/classmodule \
 helpcontent2/source/text/sbasic/shared/compatible \
 helpcontent2/source/text/sbasic/shared/compatibilitymode \
+helpcontent2/source/text/sbasic/shared/Compiler_options \
 helpcontent2/source/text/sbasic/shared/enum \
 helpcontent2/source/text/sbasic/shared/ErrVBA \
 helpcontent2/source/text/sbasic/shared/fragments \
diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree
index fc7df973d..04a13398b 100644
--- a/source/auxiliary/sbasic.tree
+++ b/source/auxiliary/sbasic.tree
@@ -34,6 +34,7 @@
 Working 
with VBA Macros
 
 
+Compiler options
 Using 
Procedures and Functions
 Libraries, 
Modules and Dialogs
 
@@ -177,7 +178,7 @@
 HasUnoInterfaces Function
 Hex 
Function
 Hour 
Function
-IIf 
Statement
+IIf 
Function
 If...Then...Else Statement
 Imp-Operator
 InStr 
Function
diff --git a/source/text/sbasic/shared/Compiler_options.xhp 
b/source/text/sbasic/shared/Compiler_options.xhp
new file mode 100644
index 0..675c1891c
--- /dev/null
+++ b/source/text/sbasic/shared/Compiler_options.xhp
@@ -0,0 +1,49 @@
+
+
+
+   
+  
+ Compiler Options
+ /text/sbasic/shared/Compiler_options.xhp
+  
+   
+   
+  
+ Compiler Options
+ Runtime conditions
+  
+
+   
+  Compiler 
Options, Runtime Conditions
+  Compiler options specified at the 
module level affect %PRODUCTNAME Basic compiler checks and error 
messages. Basic syntax as well as Basic set of instructions can be different 
according to the options that are in use. The less Option, 
the easiest and tolerant %PRODUCTNAME Basic language is. The more 
Option, the richer and controlled Basic language 
gets.
+   
+  Compiler options must be specified 
before the executable program code in a module.
+  
+  Option Statement 
diagram
+ 
+  
+  
+  
+  
+  
+ 
+  Option Private Module
+  Specifies that 
the scope of the module is that of the Basic library it belongs to.
+  
+  Options specified at the module 
level also affect %PRODUCTNAME Basic runtime conditions. The 
behaviour of %PRODUCTNAME Basic instructions can differ.
+
+   
+  Property 
statement
+  
+  
+   
+
+   
+
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Alain Romedenne (via logerrit)]

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

New commits:
commit 9597f961f47c2f9450554e13a72781162fb8ff2e
Author: Alain Romedenne 
AuthorDate: Wed Jun 17 23:57:21 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Jun 17 23:57:21 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to fcf75206c5f8f59ac464dc3b9b9ca869ce3a7bd5
  - Basic compiler/runtime options aggregation

- Base
- Explicit
- ClassModule
- Compatible
- Private Module
- VBASupport

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

diff --git a/helpcontent2 b/helpcontent2
index 7af288d0fa90..fcf75206c5f8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7af288d0fa90e5e31c29014501f06f776a00366a
+Subproject commit fcf75206c5f8f59ac464dc3b9b9ca869ce3a7bd5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 include/vcl/treelistbox.hxx |4 
 vcl/inc/treeglue.hxx|2 +-
 vcl/source/treelist/treelistbox.cxx |   22 ++
 3 files changed, 27 insertions(+), 1 deletion(-)

New commits:
commit 8c74d9b30aacec2207dd6c7960c81280c79e2c31
Author: Caolán McNamara 
AuthorDate: Wed Jun 17 16:47:15 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Jun 17 22:15:48 2020 +0200

ignore positions on top of scrollbars for GetTargetAtPoint

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

diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx
index ac24996221cc..1fe73c689610 100644
--- a/include/vcl/treelistbox.hxx
+++ b/include/vcl/treelistbox.hxx
@@ -557,6 +557,10 @@ protected:
 voidImplEditEntry( SvTreeListEntry* pEntry );
 
 voidAdjustEntryHeightAndRecalc();
+
+// true if rPos is over the SvTreeListBox body, i.e. not over a
+// scrollbar
+VCL_DLLPRIVATE bool PosOverBody(const Point& rPos) const;
 public:
 
 voidSetNoAutoCurEntry( bool b );
diff --git a/vcl/inc/treeglue.hxx b/vcl/inc/treeglue.hxx
index 11c61944f5e1..ea643635faee 100644
--- a/vcl/inc/treeglue.hxx
+++ b/vcl/inc/treeglue.hxx
@@ -130,7 +130,7 @@ public:
 SvTreeListEntry* GetTargetAtPoint(const Point& rPos, bool bHighLightTarget)
 {
 SvTreeListEntry* pOldTargetEntry = pTargetEntry;
-pTargetEntry = pImpl->GetEntry(rPos);
+pTargetEntry = PosOverBody(rPos) ? pImpl->GetEntry(rPos) : nullptr;
 if (pOldTargetEntry != pTargetEntry)
 ImplShowTargetEmphasis(pOldTargetEntry, false);
 
diff --git a/vcl/source/treelist/treelistbox.cxx 
b/vcl/source/treelist/treelistbox.cxx
index e41a11d0f103..a31f86e81f45 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -1996,6 +1996,28 @@ void SvTreeListBox::ModelHasCleared()
 SvListView::ModelHasCleared();
 }
 
+bool SvTreeListBox::PosOverBody(const Point& rPos) const
+{
+if (rPos.X() < 0 || rPos.Y() < 0)
+return false;
+Size aSize(GetSizePixel());
+if (rPos.X() > aSize.Width() || rPos.Y() > aSize.Height())
+return false;
+if (pImpl->m_aVerSBar->IsVisible())
+{
+tools::Rectangle aRect(pImpl->m_aVerSBar->GetPosPixel(), 
pImpl->m_aVerSBar->GetSizePixel());
+if (aRect.IsInside(rPos))
+return false;
+}
+if (pImpl->m_aHorSBar->IsVisible())
+{
+tools::Rectangle aRect(pImpl->m_aHorSBar->GetPosPixel(), 
pImpl->m_aHorSBar->GetSizePixel());
+if (aRect.IsInside(rPos))
+return false;
+}
+return true;
+}
+
 void SvTreeListBox::ScrollOutputArea( short nDeltaEntries )
 {
 if( !nDeltaEntries || !pImpl->m_aVerSBar->IsVisible() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/source/app/salvtables.cxx |   33 ++---
 1 file changed, 30 insertions(+), 3 deletions(-)

New commits:
commit 65cc604f68963705baca6906daa1b264b657e5a2
Author: Caolán McNamara 
AuthorDate: Wed Jun 17 16:37:06 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Jun 17 22:15:28 2020 +0200

translate child co-ords to parent space

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

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 222def7b8bdf..8b3677da1c86 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -534,34 +534,61 @@ void 
SalInstanceWidget::HandleEventListener(VclWindowEvent& rEvent)
 m_aSizeAllocateHdl.Call(m_xWidget->GetSizePixel());
 }
 
+namespace
+{
+MouseEvent TransformEvent(const MouseEvent& rEvent, const vcl::Window* 
pParent, const vcl::Window* pChild)
+{
+return 
MouseEvent(pParent->ScreenToOutputPixel(pChild->OutputToScreenPixel(rEvent.GetPosPixel())),
+  rEvent.GetClicks(), rEvent.GetMode(), 
rEvent.GetButtons(), rEvent.GetModifier());
+}
+}
+
 void SalInstanceWidget::HandleMouseEventListener(VclSimpleEvent& rEvent)
 {
 if (rEvent.GetId() == VclEventId::WindowMouseButtonDown)
 {
 auto& rWinEvent = static_cast(rEvent);
-if (m_xWidget->IsWindowOrChild(rWinEvent.GetWindow()))
+if (m_xWidget == rWinEvent.GetWindow())
 {
 const MouseEvent* pMouseEvent = static_cast(rWinEvent.GetData());
 m_aMousePressHdl.Call(*pMouseEvent);
 }
+else if (m_xWidget->ImplIsChild(rWinEvent.GetWindow()))
+{
+const MouseEvent* pMouseEvent = static_cast(rWinEvent.GetData());
+const MouseEvent aTransformedEvent(TransformEvent(*pMouseEvent, 
m_xWidget, rWinEvent.GetWindow()));
+m_aMousePressHdl.Call(aTransformedEvent);
+}
 }
 else if (rEvent.GetId() == VclEventId::WindowMouseButtonUp)
 {
 auto& rWinEvent = static_cast(rEvent);
-if (m_xWidget->IsWindowOrChild(rWinEvent.GetWindow()))
+if (m_xWidget == rWinEvent.GetWindow())
 {
 const MouseEvent* pMouseEvent = static_cast(rWinEvent.GetData());
 m_aMouseReleaseHdl.Call(*pMouseEvent);
 }
+else if (m_xWidget->ImplIsChild(rWinEvent.GetWindow()))
+{
+const MouseEvent* pMouseEvent = static_cast(rWinEvent.GetData());
+const MouseEvent aTransformedEvent(TransformEvent(*pMouseEvent, 
m_xWidget, rWinEvent.GetWindow()));
+m_aMouseReleaseHdl.Call(aTransformedEvent);
+}
 }
 else if (rEvent.GetId() == VclEventId::WindowMouseMove)
 {
 auto& rWinEvent = static_cast(rEvent);
-if (m_xWidget->IsWindowOrChild(rWinEvent.GetWindow()))
+if (m_xWidget == rWinEvent.GetWindow())
 {
 const MouseEvent* pMouseEvent = static_cast(rWinEvent.GetData());
 m_aMouseMotionHdl.Call(*pMouseEvent);
 }
+else if (m_xWidget->ImplIsChild(rWinEvent.GetWindow()))
+{
+const MouseEvent* pMouseEvent = static_cast(rWinEvent.GetData());
+const MouseEvent aTransformedEvent(TransformEvent(*pMouseEvent, 
m_xWidget, rWinEvent.GetWindow()));
+m_aMouseMotionHdl.Call(aTransformedEvent);
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit c438f489093b082d28082e60042102ebf2c0d480
Author: Caolán McNamara 
AuthorDate: Wed Jun 17 15:47:40 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Jun 17 22:15:08 2020 +0200

avoid gtk_tree_view_get_dest_row_at_pos: assertion 'drag_x >= 0'

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index f394a04fba84..e1c7aa4e7260 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -11233,6 +11233,12 @@ public:
 
 virtual bool get_dest_row_at_pos(const Point &rPos, weld::TreeIter* 
pResult, bool bHighLightTarget) override
 {
+if (rPos.X() < 0 || rPos.Y() < 0)
+{
+// short-circuit to avoid "gtk_tree_view_get_dest_row_at_pos: 
assertion 'drag_x >= 0'" g_assert
+return false;
+}
+
 const bool bAsTree = gtk_tree_view_get_enable_tree_lines(m_pTreeView);
 
 // to keep it simple we'll default to always drop before the current 
row
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

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

New commits:
commit f170faf8d07edb548f70092c0a694ec48a8982e4
Author: Caolán McNamara 
AuthorDate: Wed Jun 17 15:29:14 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Jun 17 22:14:36 2020 +0200

don't highlight the row under the searched for point

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

diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 7232929e6663..b1449a811d93 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -956,7 +956,7 @@ sal_uInt32 GalleryBrowser2::ImplGetSelectedItemId( const 
Point* pSelPos, Point&
 std::unique_ptr xIter = mxListView->make_iterator();
 if( pSelPos )
 {
-if (mxListView->get_dest_row_at_pos(*pSelPos, xIter.get()))
+if (mxListView->get_dest_row_at_pos(*pSelPos, xIter.get(), false))
 nRet = mxListView->get_iter_index_in_parent(*xIter) + 1;
 rSelPos = *pSelPos;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Shiko (via logerrit)]

 sw/inc/AnnotationWin.hxx |3 +
 sw/source/uibase/docvw/AnnotationWin.cxx |9 +++
 sw/source/uibase/inc/uiobject.hxx|   23 +
 sw/source/uibase/uitest/uiobject.cxx |   75 +++
 4 files changed, 110 insertions(+)

New commits:
commit 75704068032174bde83c995e445342faaa04b9c7
Author: Shiko 
AuthorDate: Fri Jun 12 17:58:05 2020 +0200
Commit: Ahmed ElShreif 
CommitDate: Wed Jun 17 21:35:01 2020 +0200

uitest: Add support for Writer comments

Change-Id: I88ed2894c3665fb421c5d8ea0f278c54ccd0d0e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96230
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
Reviewed-by: Markus Mohrhard 

diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index 080d8de42ef0..715d01ea95ee 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -102,6 +102,7 @@ class SAL_DLLPUBLIC_RTTI SwAnnotationWin : public 
vcl::Window
 SwSidebarItem& GetSidebarItem() { return mrSidebarItem; }
 
 OutlinerView* GetOutlinerView() { return mpOutlinerView.get();}
+Outliner* GetOutliner() { return mpOutliner.get();}
 bool HasScrollbar() const;
 bool IsScrollbarVisible() const;
 ScrollBar* Scrollbar() { return mpVScrollbar; }
@@ -198,6 +199,8 @@ class SAL_DLLPUBLIC_RTTI SwAnnotationWin : public 
vcl::Window
 /// This may be the same annotation as this one.
 SwAnnotationWin*   GetTopReplyNote();
 
+virtual FactoryFunction GetUITestFactory() const override;
+
 private:
 VclPtr CreateMenuButton();
 virtual voidLoseFocus() override;
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx 
b/sw/source/uibase/docvw/AnnotationWin.cxx
index da900ec54237..29a7e6cac33f 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -24,6 +24,8 @@
 
 #include 
 
+#include 
+
 #include 
 #include 
 #include 
@@ -100,6 +102,8 @@ SwAnnotationWin::SwAnnotationWin( SwEditWin& rEditWin,
 , mpField( static_cast(aField->GetField()))
 , mpButtonPopup(nullptr)
 {
+set_id("Comment"+OUString::number(mpField->GetPostItId()));
+
 mpShadow = sidebarwindows::ShadowOverlayObject::CreateShadowOverlayObject( 
mrView );
 if ( mpShadow )
 {
@@ -502,6 +506,11 @@ tools::Time SwAnnotationWin::GetTime() const
 return mpField->GetTime();
 }
 
+FactoryFunction SwAnnotationWin::GetUITestFactory() const
+{
+return CommentUIObject::create;
+}
+
 } // end of namespace sw::annotation
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/uiobject.hxx 
b/sw/source/uibase/inc/uiobject.hxx
index 97362b51ae0f..944384a595e7 100644
--- a/sw/source/uibase/inc/uiobject.hxx
+++ b/sw/source/uibase/inc/uiobject.hxx
@@ -16,6 +16,8 @@
 #include "edtwin.hxx"
 #include "navipi.hxx"
 
+#include 
+
 class SwEditWinUIObject : public WindowUIObject
 {
 public:
@@ -59,6 +61,27 @@ protected:
 OUString get_name() const override;
 };
 
+// This class handles the Comments as a UIObject to be used in UITest Framework
+class CommentUIObject : public WindowUIObject
+{
+VclPtr mxCommentUIObject;
+
+public:
+
+CommentUIObject(const VclPtr& 
xCommentUIObject);
+
+virtual StringMap get_state() override;
+
+virtual void execute(const OUString& rAction,
+const StringMap& rParameters) override;
+
+static std::unique_ptr create(vcl::Window* pWindow);
+
+protected:
+
+OUString get_name() const override;
+
+};
 
 #endif
 
diff --git a/sw/source/uibase/uitest/uiobject.cxx 
b/sw/source/uibase/uitest/uiobject.cxx
index 7f922dc9ce16..85b261ea87b9 100644
--- a/sw/source/uibase/uitest/uiobject.cxx
+++ b/sw/source/uibase/uitest/uiobject.cxx
@@ -16,6 +16,11 @@
 #include 
 #include 
 
+#include 
+#include 
+#include 
+#include 
+
 SwEditWinUIObject::SwEditWinUIObject(const VclPtr& xEditWin):
 WindowUIObject(xEditWin),
 mxEditWin(xEditWin)
@@ -168,5 +173,75 @@ OUString SwNavigationPIUIObject::get_name() const
 return "SwNavigationPIUIObject";
 }
 
+CommentUIObject::CommentUIObject(const 
VclPtr& xCommentUIObject):
+WindowUIObject(xCommentUIObject),
+mxCommentUIObject(xCommentUIObject)
+{
+}
+
+StringMap CommentUIObject::get_state()
+{
+StringMap aMap = WindowUIObject::get_state();
+aMap["Author"] = mxCommentUIObject->GetAuthor();
+aMap["ReadOnly"] = OUString::boolean(mxCommentUIObject->IsReadOnly());
+aMap["Resolved"] = OUString::boolean(mxCommentUIObject->IsResolved());
+aMap["Visible"] = OUString::boolean(mxCommentUIObject->IsVisible());
+
+aMap["Text"] = mxCommentUIObject->GetOutliner()->GetEditEngine().GetText();
+aMap["SelectedText"] = 
mxCommentUIObject->GetOutlinerView()->GetEditView().GetSelected();
+return aMap;
+}
+
+void CommentUIObject::execute(const OUString& rAction,
+const StringMap& rParameters)
+{
+if (rAction == "SELECT")
+{
+if (rParamete

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

[Mike Kaganski (via logerrit)]

 chart2/source/controller/sidebar/ChartSeriesPanel.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2ef9f5c15be1cb8f296ac4a3281e4ff10187aeeb
Author: Mike Kaganski 
AuthorDate: Wed Jun 17 18:07:04 2020 +0200
Commit: Mike Kaganski 
CommitDate: Wed Jun 17 21:09:09 2020 +0200

It may also be OBJECTTYPE_DATA_CURVE for a trend line

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

diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx 
b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index d014337a9d8a..7bb5646c21a5 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -264,7 +264,8 @@ OUString getCID(const 
css::uno::Reference& xModel)
 
 #if defined DBG_UTIL && !defined NDEBUG
 ObjectType eType = ObjectIdentifier::getObjectType(aCID);
-assert(eType == OBJECTTYPE_DATA_SERIES || eType == OBJECTTYPE_DATA_POINT);
+assert(eType == OBJECTTYPE_DATA_SERIES || eType == OBJECTTYPE_DATA_POINT
+   || eType == OBJECTTYPE_DATA_CURVE);
 #endif
 
 return aCID;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 external/clucene/UnpackedTarball_clucene.mk |1 +
 external/clucene/patches/c++20.patch|   11 +++
 2 files changed, 12 insertions(+)

New commits:
commit 5558256e777b00ac38f455081425fc5b1ee53375
Author: Stephan Bergmann 
AuthorDate: Wed Jun 17 17:34:39 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Jun 17 19:51:38 2020 +0200

external/clucene: Adapt to C++20 CWG2237

... "Can 
a
template-id name a constructor?", as implemented by GCC 11 trunk since
 "c++: C++20 DR 2237, disallow
simple-template-id in cdtor."

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

diff --git a/external/clucene/UnpackedTarball_clucene.mk 
b/external/clucene/UnpackedTarball_clucene.mk
index 1dc64a78faa3..1a373b48b49e 100644
--- a/external/clucene/UnpackedTarball_clucene.mk
+++ b/external/clucene/UnpackedTarball_clucene.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,clucene,\

external/clucene/patches/clucene-mixes-uptemplate-parameter-msvc-14.patch \
external/clucene/patches/ostream-wchar_t.patch \
external/clucene/patches/heap-buffer-overflow.patch \
+   external/clucene/patches/c++20.patch \
 ))
 
 ifneq ($(OS),WNT)
diff --git a/external/clucene/patches/c++20.patch 
b/external/clucene/patches/c++20.patch
new file mode 100644
index ..c982e861e1b4
--- /dev/null
+++ b/external/clucene/patches/c++20.patch
@@ -0,0 +1,11 @@
+--- src/core/CLucene/util/_bufferedstream.h
 src/core/CLucene/util/_bufferedstream.h
+@@ -68,7 +68,7 @@
+ void setMinBufSize(int32_t s) {
+ buffer.makeSpace(s);
+ }
+-BufferedStreamImpl();
++BufferedStreamImpl();
+ public:
+ int32_t read(const T*& start, int32_t min, int32_t max);
+ int64_t reset(int64_t pos);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 include/vbahelper/vbahelperinterface.hxx |2 +-
 vcl/inc/vclstatuslistener.hxx|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1dbb338842a9725cfbad73007f69244a13a0bea7
Author: Stephan Bergmann 
AuthorDate: Wed Jun 17 17:29:09 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Jun 17 19:51:04 2020 +0200

Adapt to C++20 CWG2237

... "Can 
a
template-id name a constructor?", as implemented by GCC 11 trunk since
 "c++: C++20 DR 2237, disallow
simple-template-id in cdtor."

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

diff --git a/include/vbahelper/vbahelperinterface.hxx 
b/include/vbahelper/vbahelperinterface.hxx
index 5feb4ab83eba..0bbf18992ec3 100644
--- a/include/vbahelper/vbahelperinterface.hxx
+++ b/include/vbahelper/vbahelperinterface.hxx
@@ -108,7 +108,7 @@ class SAL_DLLPUBLIC_TEMPLATE 
InheritedHelperInterfaceWeakImpl : public Inherited
 {
 typedef InheritedHelperInterfaceImpl< ::cppu::WeakImplHelper< Ifc... > > 
Base;
 public:
-InheritedHelperInterfaceWeakImpl< Ifc... >( const css::uno::Reference< 
ov::XHelperInterface >& xParent, const css::uno::Reference< 
css::uno::XComponentContext >& xContext ) : Base( xParent, xContext ) {}
+InheritedHelperInterfaceWeakImpl( const css::uno::Reference< 
ov::XHelperInterface >& xParent, const css::uno::Reference< 
css::uno::XComponentContext >& xContext ) : Base( xParent, xContext ) {}
 };
 
 
diff --git a/vcl/inc/vclstatuslistener.hxx b/vcl/inc/vclstatuslistener.hxx
index 2652befcd4cc..fb6d876ef6a2 100644
--- a/vcl/inc/vclstatuslistener.hxx
+++ b/vcl/inc/vclstatuslistener.hxx
@@ -24,7 +24,7 @@
 template  class VclStatusListener final : public cppu::WeakImplHelper 
< css::frame::XStatusListener>
 {
 public:
-VclStatusListener(T* widget, const OUString& aCommand);
+VclStatusListener(T* widget, const OUString& aCommand);
 
 private:
 VclPtr mWidget; /** The widget on which actions are performed */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Aron Budea (via logerrit)]

 loleaflet/src/control/Control.UIManager.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0613c93272bff6df16f7bf3727c7180f5bc0844f
Author: Aron Budea 
AuthorDate: Wed Jun 17 09:12:16 2020 +0200
Commit: Aron Budea 
CommitDate: Wed Jun 17 19:41:16 2020 +0200

loleaflet: Show presentation controls on tablets

regression from an unknown commit

Change-Id: Iad36563c9a6c7588f12610ccd2fe18eef38628bb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96514
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Aron Budea 

diff --git a/loleaflet/src/control/Control.UIManager.js 
b/loleaflet/src/control/Control.UIManager.js
index 9c1b3e7f6..5cb657a25 100644
--- a/loleaflet/src/control/Control.UIManager.js
+++ b/loleaflet/src/control/Control.UIManager.js
@@ -90,7 +90,7 @@ L.Control.UIManager = L.Control.extend({
this.map.addControl(L.control.formulaBar());
}
 
-   if (isDesktop && docType === 'presentation') {
+   if (docType === 'presentation' && (isDesktop || 
window.mode.isTablet())) {
this.map.addControl(L.control.presentationBar());
}
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/quwex/gsoc-box2d-experimental' - 6 commits - external/box2d slideshow/Library_slideshow.mk slideshow/source slideshow/test

[Sarper Akdemir (via logerrit)]

Rebased ref, commits from common ancestor:
commit 537d748f4466f0f4c94a107bb49e911fe9e763bf
Author: Sarper Akdemir 
AuthorDate: Wed Jun 17 13:08:03 2020 +0300
Commit: Sarper Akdemir 
CommitDate: Wed Jun 17 20:36:22 2020 +0300

override creation of PathMotionNode for testing

Change-Id: Iaa1c28f00c090dda4734675e549911c711003758

diff --git a/slideshow/source/engine/animationnodes/animationnodefactory.cxx 
b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
index a88c3a8ab7e0..f07dfd2f3572 100644
--- a/slideshow/source/engine/animationnodes/animationnodefactory.cxx
+++ b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
@@ -480,7 +480,8 @@ BaseNodeSharedPtr implCreateAnimationNode(
 break;
 
 case animations::AnimationNodeType::ANIMATEMOTION:
-pCreatedNode = std::make_shared(
+//pCreatedNode = std::make_shared(
+pCreatedNode = std::make_shared(
 xNode, rParent, rContext );
 break;
 
commit 1ddb602857eda6ff29b8bc1cce125c0b92aa4fde
Author: Sarper Akdemir 
AuthorDate: Thu Jun 11 19:29:38 2020 +0300
Commit: Sarper Akdemir 
CommitDate: Wed Jun 17 20:36:22 2020 +0300

make simulated animations part of the animation engine

Wiring up and creating required classes for simulated
animations to be part of the animation engine.

Creating a new animation node AnimationSimulationNode
for simulated animations and SimulatedAnimation class
that inherits from NumberAnimation in the animation
factory.

Change-Id: I1f125df5324673e9937b8164c0fc267c9683afa0

diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 53324ea25dcc..398f82bd1f51 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -75,6 +75,7 @@ $(eval $(call gb_Library_add_exception_objects,slideshow,\
 slideshow/source/engine/animationnodes/animationnodefactory \
 slideshow/source/engine/animationnodes/animationpathmotionnode \
 slideshow/source/engine/animationnodes/animationsetnode \
+slideshow/source/engine/animationnodes/animationsimulatednode \
 slideshow/source/engine/animationnodes/animationtransformnode \
 slideshow/source/engine/animationnodes/animationtransitionfilternode \
 slideshow/source/engine/animationnodes/basecontainernode \
diff --git a/slideshow/source/engine/animationfactory.cxx 
b/slideshow/source/engine/animationfactory.cxx
index f81c37b77df3..85263c35edcb 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -341,6 +342,166 @@ namespace slideshow::internal
 sal_Int16  mnAdditive;
 };
 
+class SimulatedAnimation : public NumberAnimation
+{
+public:
+SimulatedAnimation( const double fDuration,
+sal_Int16nAdditive,
+const ShapeManagerSharedPtr& rShapeManager,
+const ::basegfx::B2DVector&  rSlideSize,
+int  nFlags ) :
+mfDuration(fDuration),
+mpShape(),
+mpAttrLayer(),
+mpShapeManager( rShapeManager ),
+maPageSize( rSlideSize ),
+maShapeOrig(),
+mnFlags( nFlags ),
+mbAnimationStarted( false ),
+mnAdditive( nAdditive ),
+mpBox2DBody(),
+mpBox2DWorld(),
+mfPreviousElapsedTime(0.00f)
+{
+ENSURE_OR_THROW( rShapeManager,
+ 
"SimulatedAnimation::SimulatedAnimation(): Invalid ShapeManager" );
+}
+
+virtual ~SimulatedAnimation() override
+{
+end_();
+}
+
+// Animation interface
+
+virtual void prefetch() override
+{}
+
+virtual void start( const AnimatableShapeSharedPtr& rShape,
+const ShapeAttributeLayerSharedPtr& 
rAttrLayer ) override
+{
+OSL_ENSURE( !mpShape,
+"PathAnimation::start(): Shape already set" );
+OSL_ENSURE( !mpAttrLayer,
+"PathAnimation::start(): Attribute layer 
already set" );
+
+mpShape = rShape;
+mpAttrLayer = rAttrLayer;
+
+mpBox2DWorld = std::make_shared( 
maPageSize );
+mpBox2DBody = std::make_shared( 
mpBox2DWorld->createDynamicBodyFromBoun

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

[Miklos Vajna (via logerrit)]

 vcl/source/filter/ipdf/pdfdocument.cxx |   28 ++--
 1 file changed, 18 insertions(+), 10 deletions(-)

New commits:
commit 59482c5323ff9164eb1515b46adc1deef300e9b0
Author: Miklos Vajna 
AuthorDate: Wed Jun 17 17:34:08 2020 +0200
Commit: Miklos Vajna 
CommitDate: Wed Jun 17 18:39:50 2020 +0200

sd signature line: separate alloc and write of xref entry

The problem is that we need an object ID for the appearance object
early, but by the time we ask for that we don't yet know the offset of
the object, as we typically have object dependencies we have to copy
over first.

Solve that by separating the ID allocation and the final object update
(remembering its offset).

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

diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx 
b/vcl/source/filter/ipdf/pdfdocument.cxx
index 928f22d8a8c7..ca6d8aa6e486 100644
--- a/vcl/source/filter/ipdf/pdfdocument.cxx
+++ b/vcl/source/filter/ipdf/pdfdocument.cxx
@@ -294,21 +294,29 @@ sal_Int32 
PDFDocument::WriteAppearanceObject(tools::Rectangle& rSignatureRectang
 }
 m_aSignatureLine.clear();
 
-// Write appearance object.
+// Write appearance object: allocate an ID.
 sal_Int32 nAppearanceId = m_aXRef.size();
+m_aXRef[nAppearanceId] = XRefEntry();
+
+// Write the object content.
+SvMemoryStream aEditBuffer;
+aEditBuffer.WriteUInt32AsString(nAppearanceId);
+aEditBuffer.WriteCharPtr(" 0 obj\n");
+aEditBuffer.WriteCharPtr("<>\n");
+aEditBuffer.WriteCharPtr("stream\n\nendstream\nendobj\n\n");
+
+// Add the object to the doc-level edit buffer and update the offset.
+aEditBuffer.Seek(0);
 XRefEntry aAppearanceEntry;
 aAppearanceEntry.SetOffset(m_aEditBuffer.Tell());
 aAppearanceEntry.SetDirty(true);
 m_aXRef[nAppearanceId] = aAppearanceEntry;
-m_aEditBuffer.WriteUInt32AsString(nAppearanceId);
-m_aEditBuffer.WriteCharPtr(" 0 obj\n");
-m_aEditBuffer.WriteCharPtr("<>\n");
-m_aEditBuffer.WriteCharPtr("stream\n\nendstream\nendobj\n\n");
+m_aEditBuffer.WriteStream(aEditBuffer);
 
 return nAppearanceId;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: télécharger dictionnaire synonymes

[Jean-Baptiste Faure]

Le 16/06/2020 à 04:41, BUISSON Yves a écrit :

Bonjour,

Le dictionnaire des synonymes en français dans Libre Office a 
soudainement disparu, et je ne sais comment le télécharger de nouveau




This is a developer mailing-list. You can ask for help in French 
language here:

1/ mailing list:  u...@fr.libreoffice.org
or
2/ https://ask.libreoffice.org/fr/

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-5' - sc/uiconfig

[Caolán McNamara (via logerrit)]

 sc/uiconfig/scalc/ui/mergecellsdialog.ui |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 5f7bfbd6a3a66239b54ec67b7beb91db4143f104
Author: Caolán McNamara 
AuthorDate: Sun Jun 14 17:24:51 2020 +0100
Commit: Xisco Fauli 
CommitDate: Wed Jun 17 18:16:21 2020 +0200

Resolves: tdf#133985 make ok the default

Change-Id: I5fa0db660c03fb85a6a661b70fa9c14014c92579
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96279
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit dd23501e2f8ec3ad9ffe6dd1e5557b7bb2a55245)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96283
Reviewed-by: Michael Stahl 
Reviewed-by: Xisco Fauli 
Tested-by: Xisco Fauli 

diff --git a/sc/uiconfig/scalc/ui/mergecellsdialog.ui 
b/sc/uiconfig/scalc/ui/mergecellsdialog.ui
index d646474ca7f2..917138a76033 100644
--- a/sc/uiconfig/scalc/ui/mergecellsdialog.ui
+++ b/sc/uiconfig/scalc/ui/mergecellsdialog.ui
@@ -44,7 +44,6 @@
 True
 True
 True
-True
 True
 True
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/quwex/gsoc-box2d-experimental' - 6 commits - external/box2d slideshow/Library_slideshow.mk slideshow/source slideshow/test

[Sarper Akdemir (via logerrit)]

Rebased ref, commits from common ancestor:
commit bff8798226248f0d0d2ea2613b183c355be26e51
Author: Sarper Akdemir 
AuthorDate: Wed Jun 17 13:08:03 2020 +0300
Commit: Sarper Akdemir 
CommitDate: Wed Jun 17 19:15:13 2020 +0300

override creation of PathMotionNode for testing

Change-Id: Iaa1c28f00c090dda4734675e549911c711003758

diff --git a/slideshow/source/engine/animationnodes/animationnodefactory.cxx 
b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
index a88c3a8ab7e0..f07dfd2f3572 100644
--- a/slideshow/source/engine/animationnodes/animationnodefactory.cxx
+++ b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
@@ -480,7 +480,8 @@ BaseNodeSharedPtr implCreateAnimationNode(
 break;
 
 case animations::AnimationNodeType::ANIMATEMOTION:
-pCreatedNode = std::make_shared(
+//pCreatedNode = std::make_shared(
+pCreatedNode = std::make_shared(
 xNode, rParent, rContext );
 break;
 
commit 6c1f866bc97ab67e7e51c47be58a9da32fded7e1
Author: Sarper Akdemir 
AuthorDate: Thu Jun 11 19:29:38 2020 +0300
Commit: Sarper Akdemir 
CommitDate: Wed Jun 17 19:15:13 2020 +0300

make simulated animations part of the animation engine

Wiring up and creating required classes for simulated
animations to be part of the animation engine.

Creating a new animation node AnimationSimulationNode
for simulated animations and SimulatedAnimation class
that inherits from NumberAnimation in the animation
factory.

Change-Id: I1f125df5324673e9937b8164c0fc267c9683afa0

diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 53324ea25dcc..398f82bd1f51 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -75,6 +75,7 @@ $(eval $(call gb_Library_add_exception_objects,slideshow,\
 slideshow/source/engine/animationnodes/animationnodefactory \
 slideshow/source/engine/animationnodes/animationpathmotionnode \
 slideshow/source/engine/animationnodes/animationsetnode \
+slideshow/source/engine/animationnodes/animationsimulatednode \
 slideshow/source/engine/animationnodes/animationtransformnode \
 slideshow/source/engine/animationnodes/animationtransitionfilternode \
 slideshow/source/engine/animationnodes/basecontainernode \
diff --git a/slideshow/source/engine/animationfactory.cxx 
b/slideshow/source/engine/animationfactory.cxx
index f81c37b77df3..85263c35edcb 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -341,6 +342,166 @@ namespace slideshow::internal
 sal_Int16  mnAdditive;
 };
 
+class SimulatedAnimation : public NumberAnimation
+{
+public:
+SimulatedAnimation( const double fDuration,
+sal_Int16nAdditive,
+const ShapeManagerSharedPtr& rShapeManager,
+const ::basegfx::B2DVector&  rSlideSize,
+int  nFlags ) :
+mfDuration(fDuration),
+mpShape(),
+mpAttrLayer(),
+mpShapeManager( rShapeManager ),
+maPageSize( rSlideSize ),
+maShapeOrig(),
+mnFlags( nFlags ),
+mbAnimationStarted( false ),
+mnAdditive( nAdditive ),
+mpBox2DBody(),
+mpBox2DWorld(),
+mfPreviousElapsedTime(0.00f)
+{
+ENSURE_OR_THROW( rShapeManager,
+ 
"SimulatedAnimation::SimulatedAnimation(): Invalid ShapeManager" );
+}
+
+virtual ~SimulatedAnimation() override
+{
+end_();
+}
+
+// Animation interface
+
+virtual void prefetch() override
+{}
+
+virtual void start( const AnimatableShapeSharedPtr& rShape,
+const ShapeAttributeLayerSharedPtr& 
rAttrLayer ) override
+{
+OSL_ENSURE( !mpShape,
+"PathAnimation::start(): Shape already set" );
+OSL_ENSURE( !mpAttrLayer,
+"PathAnimation::start(): Attribute layer 
already set" );
+
+mpShape = rShape;
+mpAttrLayer = rAttrLayer;
+
+mpBox2DWorld = std::make_shared( 
maPageSize );
+mpBox2DBody = std::make_shared( 
mpBox2DWorld->createDynamicBodyFromBoun

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

[Gülşah Köse (via logerrit)]

 sfx2/source/doc/objstor.cxx   |   28 +
 sw/source/ui/dbui/mmresultdialogs.cxx |   77 --
 sw/source/ui/inc/mmresultdialogs.hxx  |4 +
 sw/uiconfig/swriter/ui/mmresultemaildialog.ui |   45 +++
 4 files changed, 149 insertions(+), 5 deletions(-)

New commits:
commit 32eb3a73843ef2eb46e88a71e8864f48fde05790
Author: Gülşah Köse 
AuthorDate: Sun Jun 14 19:21:22 2020 +0300
Commit: Andras Timar 
CommitDate: Wed Jun 17 18:05:11 2020 +0200

Add an option to send email encrypted PDF files via mailmerge.

Change-Id: I002e054b685bd3367c4183014adc1dbd0843a365
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96303
Reviewed-by: Gülşah Köse 
Tested-by: Gülşah Köse 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96535
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 1ec0039c2a7c..66ec9a8d16f6 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2816,7 +2816,35 @@ bool SfxObjectShell::PreDoSaveAs_Impl(const OUString& 
rFileName, const OUString&
 
 // set filter; if no filter is given, take the default filter of the 
factory
 if ( !aFilterName.isEmpty() )
+{
 pNewFile->SetFilter( 
GetFactory().GetFilterContainer()->GetFilter4FilterName( aFilterName ) );
+
+if(aFilterName == "writer_pdf_Export" && pNewFile->GetItemSet())
+{
+uno::Sequence< beans::PropertyValue > aSaveToFilterDataOptions(2);
+bool bRet = false;
+
+for(int i = 0 ; i< rArgs.getLength() ; ++i)
+{
+auto aProp = rArgs[i];
+if(aProp.Name == "EncryptFile")
+{
+aSaveToFilterDataOptions[0].Name = aProp.Name;
+aSaveToFilterDataOptions[0].Value = aProp.Value;
+bRet = true;
+}
+if(aProp.Name == "DocumentOpenPassword")
+{
+aSaveToFilterDataOptions[1].Name = aProp.Name;
+aSaveToFilterDataOptions[1].Value = aProp.Value;
+bRet = true;
+}
+}
+
+if( bRet )
+pNewFile->GetItemSet()->Put( SfxUnoAnyItem(SID_FILTER_DATA, 
uno::makeAny(aSaveToFilterDataOptions)));
+}
+}
 else
 pNewFile->SetFilter( GetFactory().GetFilterContainer()->GetAnyFilter( 
SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT ) );
 
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx 
b/sw/source/ui/dbui/mmresultdialogs.cxx
index d102faec4103..adc586132f0c 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -289,6 +289,9 @@ SwMMResultEmailDialog::SwMMResultEmailDialog(weld::Window* 
pParent)
 , m_xSendAsPB(m_xBuilder->weld_button("sendassettings"))
 , m_xAttachmentGroup(m_xBuilder->weld_widget("attachgroup"))
 , m_xAttachmentED(m_xBuilder->weld_entry("attach"))
+, m_xPasswordFT(m_xBuilder->weld_label("passwordft"))
+, m_xPasswordLB(m_xBuilder->weld_combo_box("password"))
+, m_xPasswordCB(m_xBuilder->weld_check_button("passwordcb"))
 , m_xSendAllRB(m_xBuilder->weld_radio_button("sendallrb"))
 , m_xFromRB(m_xBuilder->weld_radio_button("fromrb"))
 , m_xFromNF(m_xBuilder->weld_spin_button("from"))
@@ -299,6 +302,7 @@ SwMMResultEmailDialog::SwMMResultEmailDialog(weld::Window* 
pParent)
 m_xCopyToPB->connect_clicked(LINK(this, SwMMResultEmailDialog, 
CopyToHdl_Impl));
 m_xSendAsPB->connect_clicked(LINK(this, SwMMResultEmailDialog, 
SendAsHdl_Impl));
 m_xSendAsLB->connect_changed(LINK(this, SwMMResultEmailDialog, 
SendTypeHdl_Impl));
+m_xPasswordCB->connect_toggled( LINK( this, SwMMResultEmailDialog, 
CheckHdl ));
 
 Link aLink = LINK(this, SwMMResultEmailDialog, 
DocumentSelectionHdl_Impl);
 m_xSendAllRB->connect_toggled(aLink);
@@ -308,6 +312,10 @@ SwMMResultEmailDialog::SwMMResultEmailDialog(weld::Window* 
pParent)
 
 m_xOKButton->connect_clicked(LINK(this, SwMMResultEmailDialog, 
SendDocumentsHdl_Impl));
 
+m_xPasswordCB->hide();
+m_xPasswordFT->hide();
+m_xPasswordLB->hide();
+
 FillInEmailSettings();
 }
 
@@ -387,9 +395,14 @@ void SwMMResultEmailDialog::FillInEmailSettings()
 aFields = xColAccess->getElementNames();
 const OUString* pFields = aFields.getConstArray();
 for (sal_Int32 nField = 0; nField < aFields.getLength(); ++nField)
+{
 m_xMailToLB->append_text(pFields[nField]);
+m_xPasswordLB->append_text(pFields[nField]);
+}
 
 m_xMailToLB->set_active(0);
+m_xPasswordLB->set_active(0);
+
 // then select the right one - may not be available
 const std::vector>& rHeaders = 
xConfigItem->GetDefaultAddressHeaders();
 OUString sEMailColumn = rHeaders[MM_PART_E_MAIL].first;
@@ -412,6 +425,14 @@ IMPL_LINK_NOARG(SwMMResul

Re: télécharger dictionnaire synonymes

[julien2412]

Hello Yves,

This is dev LO forum so it's about programming related to a specific bug or
not.

Please create a new bugtracker here:
https://bugs.documentfoundation.org/ by providing your env, version, etc.

Julien



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: connectivity/CppunitTest_connectivity_mysql_test.mk connectivity/qa connectivity/README

[Michael Stahl (via logerrit)]

 connectivity/CppunitTest_connectivity_mysql_test.mk |   18 +-
 connectivity/README |   12 +++-
 connectivity/qa/connectivity/mysql/mysql.cxx|7 +--
 3 files changed, 25 insertions(+), 12 deletions(-)

New commits:
commit 0c07d849a4709f896072cb9c707af17c309c2f7f
Author: Michael Stahl 
AuthorDate: Wed Jun 17 14:59:51 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Jun 17 17:54:17 2020 +0200

connectivity: fix mysql test

* rename the gbuild target according to conventions
* fix -Werror=unused-but-set-variable
* disable assert in testMultipleResultsets() that fails presumably since
  commit 86c86719782243275b65f1f7f2cfdcc0e56c8cd4
* document how to set up mariadb for dummies like me in README

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

diff --git a/connectivity/CppunitTest_connectivity_mysql_test.mk 
b/connectivity/CppunitTest_connectivity_mysql_test.mk
index 5d9a8bb05d58..8733315f466d 100644
--- a/connectivity/CppunitTest_connectivity_mysql_test.mk
+++ b/connectivity/CppunitTest_connectivity_mysql_test.mk
@@ -7,15 +7,15 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CppunitTest_CppunitTest,mysql_test))
+$(eval $(call gb_CppunitTest_CppunitTest,connectivity_mysql_test))
 
-$(eval $(call gb_CppunitTest_use_external,mysql_test,boost_headers))
+$(eval $(call 
gb_CppunitTest_use_external,connectivity_mysql_test,boost_headers))
 
-$(eval $(call gb_CppunitTest_add_exception_objects,mysql_test, \
+$(eval $(call gb_CppunitTest_add_exception_objects,connectivity_mysql_test, \
 connectivity/qa/connectivity/mysql/mysql \
 ))
 
-$(eval $(call gb_CppunitTest_use_libraries,mysql_test, \
+$(eval $(call gb_CppunitTest_use_libraries,connectivity_mysql_test, \
 comphelper \
 cppu \
 dbaxml \
@@ -28,16 +28,16 @@ $(eval $(call gb_CppunitTest_use_libraries,mysql_test, \
 xo \
 ))
 
-$(eval $(call gb_CppunitTest_use_api,mysql_test,\
+$(eval $(call gb_CppunitTest_use_api,connectivity_mysql_test,\
 offapi \
 oovbaapi \
 udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_use_ure,mysql_test))
-$(eval $(call gb_CppunitTest_use_vcl,mysql_test))
+$(eval $(call gb_CppunitTest_use_ure,connectivity_mysql_test))
+$(eval $(call gb_CppunitTest_use_vcl,connectivity_mysql_test))
 
-$(eval $(call gb_CppunitTest_use_components,mysql_test,\
+$(eval $(call gb_CppunitTest_use_components,connectivity_mysql_test,\
 basic/util/sb \
 comphelper/util/comphelp \
 configmgr/source/configmgr \
@@ -61,6 +61,6 @@ $(eval $(call gb_CppunitTest_use_components,mysql_test,\
 xmloff/util/xo \
 ))
 
-$(eval $(call gb_CppunitTest_use_configuration,mysql_test))
+$(eval $(call gb_CppunitTest_use_configuration,connectivity_mysql_test))
 
 # vim: set noet sw=4 ts=4:
diff --git a/connectivity/README b/connectivity/README
index 4a523c8d706b..ebae354523ca 100644
--- a/connectivity/README
+++ b/connectivity/README
@@ -11,4 +11,14 @@ Contains database pieces, drivers, etc.
   the environment variable "CONNECTIVITY_TEST_MYSQL_DRIVER".
   
 - The environment variable should contain a URL of the following format:
-  [user]/[passwd]@sdbc:mysql:mysqlc:[host]:[port]/[db_name]
+  [user]/[passwd]@sdbc:mysql:mysqlc:[host]:[port]/db_name
+
+- tl;dr:
+
+  podman pull mariadb/server
+  podman run --name=mariadb -e MYSQL_ROOT_PASSWORD=foobarbaz -p 
127.0.0.1:3306:3306 mariadb/server
+  podman exec -it mariadb /bin/bash -c "echo -e CREATE DATABASE test | 
/usr/bin/mysql -u root"
+  (cd connectivity && make -srj8 CppunitTest_connectivity_mysql_test 
CONNECTIVITY_TEST_MYSQL_DRIVER="root/foobarbaz@sdbc:mysql:mysqlc:127.0.0.1:3306/test")
+  podman stop mariadb
+  podman rm mariadb
+
diff --git a/connectivity/qa/connectivity/mysql/mysql.cxx 
b/connectivity/qa/connectivity/mysql/mysql.cxx
index 47d1d7929e44..7291c9f444d3 100644
--- a/connectivity/qa/connectivity/mysql/mysql.cxx
+++ b/connectivity/qa/connectivity/mysql/mysql.cxx
@@ -304,7 +304,10 @@ void MysqlTestDriver::testMultipleResultsets()
 Reference xRowSecond(xResultSet2, UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL(2l, xRowSecond->getLong(1));
 // now use the first result set again
+#if 0
+// FIXME this was broken by 86c86719782243275b65f1f7f2cfdcc0e56c8cd4 
adding closeResultSet() in execute()
 CPPUNIT_ASSERT_EQUAL(1l, xRowFirst->getLong(1));
+#endif
 
 xStatement->executeUpdate("DROP TABLE myTestTable");
 xStatement->executeUpdate("DROP TABLE otherTable");
@@ -319,7 +322,7 @@ void MysqlTestDriver::testDBMetaData()
 CPPUNIT_ASSERT(xStatement.is());
 xStatement->executeUpdate("DROP TABLE IF EXISTS myTestTable");
 
-auto nUpdateCount = xStatement->executeUpdate(
+xStatement->executeUpdate(
 "CREATE TABLE myTestTable (id INTEGER PRIMARY KEY, name VARCHAR(20))");
 Reference x

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - external/mariadb-connector-c

[Michael Stahl (via logerrit)]

 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk   |1 +
 external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk |5 
-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 0dd4e5d3556b08f04f48a6a6b7321ea497cf556a
Author: Michael Stahl 
AuthorDate: Wed Jun 17 14:59:30 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Jun 17 17:53:31 2020 +0200

mariadb: the "pvio_socket" plugin turns out to be important

... otherwise can't connect to a TCP socket.

(regression from fe041bbc343ee08c6e901f63985d55a90da71c8b)

Change-Id: I2a1f2968321aae108bfef67f602f06efcf3affd8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96536
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 82a1650683df7d5c1769dfd68a26a4d071f1a546)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96508

diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk 
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index d32eda7f71d1..b0c62e1b160e 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -64,6 +64,7 @@ $(eval $(call 
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_stmt \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_client_plugin \
UnpackedTarball/mariadb-connector-c/plugins/auth/my_auth \
+   UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_socket \
$(if $(filter $(OS),WNT), \
UnpackedTarball/mariadb-connector-c/libmariadb/win32_errmsg \
UnpackedTarball/mariadb-connector-c/win-iconv/win_iconv) \
diff --git 
a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk 
b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
index cf0d2eb06cfa..3d8ca9295131 100644
--- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
@@ -31,7 +31,10 @@ $(eval $(call 
gb_UnpackedTarball_add_patches,mariadb-connector-c,\
 
 # TODO are any "plugins" needed?
 $(eval $(call gb_UnpackedTarball_set_post_action,mariadb-connector-c, \
-   < libmariadb/ma_client_plugin.c.in sed -e 's/@EXTERNAL_PLUGINS@//' -e 
's/@BUILTIN_PLUGINS@//' > libmariadb/ma_client_plugin.c  \
+   < libmariadb/ma_client_plugin.c.in sed \
+   -e 's/@EXTERNAL_PLUGINS@/extern struct st_mysql_client_plugin 
pvio_socket_client_plugin;/' \
+   -e 's/@BUILTIN_PLUGINS@/(struct st_mysql_client_plugin 
*)\&pvio_socket_client_plugin$(COMMA)/' \
+   > libmariadb/ma_client_plugin.c  \
 ))
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Makefile.in

[Caolán McNamara (via logerrit)]

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

New commits:
commit e19b67dcf5e987e58ce4252d8d1c8313d111df85
Author: Caolán McNamara 
AuthorDate: Wed Jun 17 14:54:06 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Jun 17 17:38:10 2020 +0200

allow building as root inside a container without complaint

add a check for $container

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

diff --git a/Makefile.in b/Makefile.in
index 6af416b8a2f9..fe64e37dee7f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,7 +59,7 @@ else # MAKE_RESTARTS
 .DEFAULT_GOAL := build
 
 check-if-root:
-   @if test ! `uname` = 'Haiku' -a `id -u` = 0 && ! grep -q 'lxc\|docker' 
/proc/self/cgroup && ! grep -q 'libpod_parent' /proc/self/cgroup; then \
+   @if test ! `uname` = 'Haiku' -a `id -u` = 0 && test -z $$container && ! 
grep -q 'lxc\|docker' /proc/self/cgroup && ! grep -q 'libpod_parent' 
/proc/self/cgroup; then \
echo; \
echo 'Building LibreOffice as root is a very bad idea, use a 
regular user.'; \
echo; \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 include/vcl/filter/pdfdocument.hxx |   10 +++-
 vcl/source/filter/ipdf/pdfdocument.cxx |   77 ++---
 2 files changed, 79 insertions(+), 8 deletions(-)

New commits:
commit 4db25ccc736185c304f1bd090b8539868932700a
Author: Miklos Vajna 
AuthorDate: Wed Jun 17 16:05:36 2020 +0200
Commit: Miklos Vajna 
CommitDate: Wed Jun 17 17:34:51 2020 +0200

sd signature line: implement non-empty geometry during pdf sign

Parse the pdf output which contains just the signature line shape on a
page, take the same from it and use it at both places where previously
the position / size was just a stub.

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

diff --git a/include/vcl/filter/pdfdocument.hxx 
b/include/vcl/filter/pdfdocument.hxx
index 8700e4892df2..aaf64ae908fe 100644
--- a/include/vcl/filter/pdfdocument.hxx
+++ b/include/vcl/filter/pdfdocument.hxx
@@ -29,6 +29,11 @@ namespace com::sun::star::uno
 template  class Reference;
 }
 
+namespace tools
+{
+class Rectangle;
+}
+
 namespace vcl::filter
 {
 class PDFTrailerElement;
@@ -353,10 +358,11 @@ class VCL_DLLPUBLIC PDFDocument
 sal_Int32 WriteSignatureObject(const OUString& rDescription, bool bAdES,
sal_uInt64& rLastByteRangeOffset, 
sal_Int64& rContentOffset);
 /// Write the appearance object as part of signing.
-sal_Int32 WriteAppearanceObject();
+sal_Int32 WriteAppearanceObject(tools::Rectangle& rSignatureRectangle);
 /// Write the annot object as part of signing.
 sal_Int32 WriteAnnotObject(PDFObjectElement const& rFirstPage, sal_Int32 
nSignatureId,
-   sal_Int32 nAppearanceId);
+   sal_Int32 nAppearanceId,
+   const tools::Rectangle& rSignatureRectangle);
 /// Write the updated Page object as part of signing.
 bool WritePageObject(PDFObjectElement& rFirstPage, sal_Int32 nAnnotId);
 /// Write the updated Catalog object as part of signing.
diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx 
b/vcl/source/filter/ipdf/pdfdocument.cxx
index 316b8c74d169..928f22d8a8c7 100644
--- a/vcl/source/filter/ipdf/pdfdocument.cxx
+++ b/vcl/source/filter/ipdf/pdfdocument.cxx
@@ -236,8 +236,62 @@ sal_Int32 PDFDocument::WriteSignatureObject(const 
OUString& rDescription, bool b
 return nSignatureId;
 }
 
-sal_Int32 PDFDocument::WriteAppearanceObject()
+sal_Int32 PDFDocument::WriteAppearanceObject(tools::Rectangle& 
rSignatureRectangle)
 {
+if (!m_aSignatureLine.empty())
+{
+// Parse the PDF data of signature line: we can set the signature 
rectangle to non-empty
+// based on it.
+SvMemoryStream aPDFStream;
+aPDFStream.WriteBytes(m_aSignatureLine.data(), 
m_aSignatureLine.size());
+aPDFStream.Seek(0);
+filter::PDFDocument aPDFDocument;
+if (!aPDFDocument.Read(aPDFStream))
+{
+SAL_WARN("vcl.filter",
+ "PDFDocument::WriteAppearanceObject: failed to read the 
PDF document");
+return -1;
+}
+
+std::vector aPages = 
aPDFDocument.GetPages();
+if (aPages.empty())
+{
+SAL_WARN("vcl.filter", "PDFDocument::WriteAppearanceObject: no 
pages");
+return -1;
+}
+
+filter::PDFObjectElement* pPage = aPages[0];
+if (!pPage)
+{
+SAL_WARN("vcl.filter", "PDFDocument::WriteAppearanceObject: no 
page");
+return -1;
+}
+
+// Calculate the bounding box.
+PDFElement* pMediaBox = pPage->Lookup("MediaBox");
+auto pMediaBoxArray = dynamic_cast(pMediaBox);
+if (!pMediaBoxArray || pMediaBoxArray->GetElements().size() < 4)
+{
+SAL_WARN("vcl.filter",
+ "PDFDocument::WriteAppearanceObject: MediaBox is not an 
array of 4");
+return -1;
+}
+const std::vector& rMediaBoxElements = 
pMediaBoxArray->GetElements();
+auto pWidth = dynamic_cast(rMediaBoxElements[2]);
+if (!pWidth)
+{
+SAL_WARN("vcl.filter", "PDFDocument::WriteAppearanceObject: 
MediaBox has no width");
+return -1;
+}
+rSignatureRectangle.setWidth(pWidth->GetValue());
+auto pHeight = dynamic_cast(rMediaBoxElements[3]);
+if (!pHeight)
+{
+SAL_WARN("vcl.filter", "PDFDocument::WriteAppearanceObject: 
MediaBox has no height");
+return -1;
+}
+rSignatureRectangle.setHeight(pHeight->GetValue());
+}
 m_aSignatureLine.clear();
 
 // Write appearance object.
@@ -249,14 +303,19 @@ sal_Int32 PDFDocument::WriteAppearanceObject()
 m_aEditBuffer.WriteUInt32AsString(nAppearanceId);
 m_aEditBuffer.WriteCharPtr(" 0 obj\n");
 m_aEditBuffer.WriteCharPtr("<>\n"

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

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js |   59 
++
 1 file changed, 59 insertions(+)

New commits:
commit fde2a23de7a1f132005486c2f4ef360aec9c31b0
Author: Tamás Zolnai 
AuthorDate: Wed Jun 17 14:40:39 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Wed Jun 17 17:02:46 2020 +0200

cypress: test for resolved comments menu option (writer, mobile).

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

diff --git 
a/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js 
b/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js
index 249624174..c9fd4f69e 100644
--- a/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js
@@ -788,6 +788,65 @@ describe('Trigger hamburger menu options.', function() {
helper.imageShouldBeFullWhiteOrNot(centerTile, true);
});
 
+   it('Resolved comments.', function() {
+   // Insert comment first
+   mobileHelper.openInsertionWizard();
+
+   cy.contains('.menu-entry-with-icon', 'Comment')
+   .click();
+
+   cy.get('.loleaflet-annotation-table')
+   .should('exist');
+
+   cy.get('.loleaflet-annotation-textarea')
+   .type('some text');
+
+   cy.get('.vex-dialog-button-primary')
+   .click();
+
+   cy.get('.loleaflet-annotation:nth-of-type(2)')
+   .should('have.attr', 'style')
+   .should('not.contain', 'visibility: hidden');
+
+   // Resolve comment
+   cy.get('.loleaflet-annotation-menu')
+   .click({force: true});
+
+   cy.contains('.context-menu-link', 'Resolve')
+   .click();
+
+   cy.get('.loleaflet-annotation:nth-of-type(2)')
+   .should('have.attr', 'style')
+   .should('contain', 'visibility: hidden');
+
+   // Show resolved comments
+   mobileHelper.openHamburgerMenu();
+
+   cy.contains('.menu-entry-with-icon', 'View')
+   .click();
+
+   cy.contains('.menu-entry-with-icon', 'Resolved Comments')
+   .click();
+
+   cy.get('.loleaflet-annotation:nth-of-type(2)')
+   .should('have.attr', 'style')
+   .should('not.contain', 'visibility: hidden');
+
+   // Hide resolved comments
+   mobileHelper.openHamburgerMenu();
+
+   cy.contains('.menu-entry-with-icon', 'View')
+   .click();
+
+   cy.contains('.menu-entry-with-icon', 'Resolved Comments')
+   .click();
+
+   // TODO: can't hide resolved comments again.
+   //cy.get('.loleaflet-annotation:nth-of-type(2)')
+   //  .should('have.attr', 'style')
+   //  .should('contain', 'visibility: hidden');
+   });
+
it('Check version information.', function() {
mobileHelper.openHamburgerMenu();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Vasily Melenchuk (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf134063.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport15.cxx   |   13 +
 sw/source/core/text/txttab.cxx   |   15 ++-
 3 files changed, 19 insertions(+), 9 deletions(-)

New commits:
commit 02c0e015f84ddcc6fa94433f603ef89f358a0391
Author: Vasily Melenchuk 
AuthorDate: Wed Jun 17 13:42:37 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Wed Jun 17 17:01:08 2020 +0200

tdf#134063: sw: redesigned support for tab at zero position

Initial support for tab position at zero (d2e428d1) was not
taking into account hack for tab positions below zero. So
previous behavior is restored (search is started from 0) but
we also taking into account potential tabs at zero position
in SwLineInfo::GetTabStop()

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

diff --git a/sw/qa/extras/ooxmlexport/data/tdf134063.docx 
b/sw/qa/extras/ooxmlexport/data/tdf134063.docx
new file mode 100644
index ..372fed20e57f
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf134063.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 0f3a428c5985..92c5423a2b25 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -39,6 +39,19 @@ DECLARE_OOXMLEXPORT_TEST(testTdf133370_columnBreak, 
"tdf133370_columnBreak.odt")
 CPPUNIT_ASSERT_EQUAL(1, getPages());
 }
 
+
+DECLARE_OOXMLEXPORT_TEST(testTdf134063, "tdf134063.docx")
+{
+CPPUNIT_ASSERT_EQUAL(2, getPages());
+
+xmlDocUniquePtr pDump = parseLayoutDump();
+
+// There are three tabs with default width
+CPPUNIT_ASSERT_EQUAL(sal_Int32(720), getXPath(pDump, 
"//page[1]/body/txt[1]/Text[1]", "nWidth").toInt32());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(720), getXPath(pDump, 
"//page[1]/body/txt[1]/Text[2]", "nWidth").toInt32());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(720), getXPath(pDump, 
"//page[1]/body/txt[1]/Text[3]", "nWidth").toInt32());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index 616a919eb2e0..df8b5ee4ce75 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -48,6 +48,11 @@ const SvxTabStop *SwLineInfo::GetTabStop( const SwTwips 
nSearchPos, const SwTwip
 if( rTabStop.GetTabPos() > SwTwips(nRight) )
 return i ? nullptr : &rTabStop;
 
+// If we are starting search from zero position,
+// than we should include tabstop at zero position
+if ((nSearchPos == 0) && (rTabStop.GetTabPos() == 0))
+return &rTabStop;
+
 if( rTabStop.GetTabPos() > nSearchPos )
 return &rTabStop;
 }
@@ -119,7 +124,7 @@ SwTabPortion *SwTextFormatter::NewTabPortion( 
SwTextFormatInfo &rInf, bool bAuto
 
 // #i24363# tab stops relative to indent
 // nSearchPos: The current position relative to the tabs origin
-SwTwips nSearchPos = bRTL ?
+const SwTwips nSearchPos = bRTL ?
nTabLeft - nCurrentAbsPos :
nCurrentAbsPos - nTabLeft;
 
@@ -127,14 +132,6 @@ SwTabPortion *SwTextFormatter::NewTabPortion( 
SwTextFormatInfo &rInf, bool bAuto
 // any hard set tab stops:
 // Note: If there are no user defined tab stops, there is always a
 // default tab stop.
-
-// If search is started from zero position (beginning of line), than
-// lets do it from -1: this will allow to include into account 
potential
-// tab stop at zero position. Yes, it will be zero width tab useless
-// mostly, but this have sense in case of lists.
-if (nSearchPos == 0)
-nSearchPos = -1;
-
 const SvxTabStop* pTabStop = m_aLineInf.GetTabStop( nSearchPos, 
nMyRight );
 if ( pTabStop )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Serge Krot (via logerrit)]

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |   12 ++
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |   26 -
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx |   29 --
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx  |   35 ++-
 sw/qa/extras/ooxmlexport/ooxmlexport8.cxx  |   33 +--
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |4 
 writerfilter/source/dmapper/SdtHelper.cxx  |   60 +
 7 files changed, 157 insertions(+), 42 deletions(-)

New commits:
commit 33ad3ee258587904afaa03550858beac25b883f7
Author: Serge Krot 
AuthorDate: Tue Jun 16 17:11:12 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Jun 17 17:00:46 2020 +0200

tdf#134043 DOCX import: DropDown text field instead of ComboBox form control

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

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 8b76534d540d..6beb18105b08 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -5899,6 +5899,18 @@
 true
   
 
+
+  
+Contains settings for importing DOCX.
+  
+  
+
+  Specifies whether ComboBox form control should be imported 
as DropDown text field.
+  Import ComboBox as DropDown
+
+true
+  
+
   
 
 
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 5ff581743ccd..133c2add7822 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -264,12 +264,26 @@ DECLARE_OOXMLEXPORT_TEST(testDropdownInCell, 
"dropdown-in-cell.docx")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
 
 // Second problem: dropdown shape wasn't anchored inside the B1 cell.
-uno::Reference xShape(getShape(1), uno::UNO_QUERY);
-uno::Reference xAnchor = xShape->getAnchor();
-uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
-uno::Reference xCell(xTable->getCellByName("B1"), 
uno::UNO_QUERY);
-uno::Reference xTextRangeCompare(xCell, 
uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(sal_Int16(0), 
xTextRangeCompare->compareRegionStarts(xAnchor, xCell));
+if (getShapes() > 0)
+{
+uno::Reference xShape(getShape(1), uno::UNO_QUERY);
+uno::Reference xAnchor = xShape->getAnchor();
+uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
+uno::Reference xCell(xTable->getCellByName("B1"), 
uno::UNO_QUERY);
+uno::Reference xTextRangeCompare(xCell, 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(0), 
xTextRangeCompare->compareRegionStarts(xAnchor, xCell));
+}
+else
+{
+// ComboBox was imported as DropDown text field
+uno::Reference 
xTextFieldsSupplier(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xFieldsAccess(xTextFieldsSupplier->getTextFields());
+uno::Reference 
xFields(xFieldsAccess->createEnumeration());
+CPPUNIT_ASSERT(xFields->hasMoreElements());
+uno::Any aField = xFields->nextElement();
+uno::Reference xServiceInfo(aField, 
uno::UNO_QUERY);
+
CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.text.textfield.DropDown"));
+}
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTableAlignment, "table-alignment.docx")
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 272daae72c78..430749768862 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -560,7 +560,7 @@ DECLARE_OOXMLEXPORT_TEST(testParaAdjustDistribute, 
"para-adjust-distribute.docx"
 DECLARE_OOXMLEXPORT_TEST(testInputListExport, "tdf122186_input_list.odt")
 {
 CPPUNIT_ASSERT_EQUAL(1, getPages());
-if (!mbExported) // importing the ODT, an input field
+if (!mbExported || getShapes() == 0) // importing the ODT, an input field
 {
 uno::Reference 
xTextFieldsSupplier(mxComponent, uno::UNO_QUERY);
 uno::Reference 
xFieldsAccess(xTextFieldsSupplier->getTextFields());
@@ -1032,11 +1032,28 @@ DECLARE_OOXMLEXPORT_TEST(tdf127085, "tdf127085.docx")
 DECLARE_OOXMLEXPORT_TEST(tdf119809, "tdf119809.docx")
 {
 // Combobox without an item list lost during import
-uno::Reference xControlShape(getShape(1), 
uno::UNO_QUERY);
-uno::Reference 
xPropertySet(xControlShape->getControl(), uno::UNO_QUERY);
-uno::Reference xServiceInfo(xPropertySet, 
uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(true, 
bool(xServiceInfo->supportsService("com.sun.star.form.component.ComboBox")));
-

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

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

 sw/qa/extras/uiwriter/data2/tdf76817.fodt|   77 
 sw/qa/extras/uiwriter/uiwriter2.cxx  |   87 +++
 writerfilter/source/dmapper/NumberingManager.cxx |   10 ++
 3 files changed, 172 insertions(+), 2 deletions(-)

New commits:
commit 5568d92c5c705b4d728af859dc44afdd64e72195
Author: László Németh 
AuthorDate: Tue Jun 16 18:52:56 2020 +0200
Commit: László Németh 
CommitDate: Wed Jun 17 16:58:40 2020 +0200

tdf#76817 DOCX: fix round-tripped outline numbering

Fix automatic chapter numbering in DOCX documents
created by Writer.

Follow-up of commit de1b634a151c198584dc152676183f519c50a2da
(tdf#76817: DOCX import: fix custom chapter numbering).

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

diff --git a/sw/qa/extras/uiwriter/data2/tdf76817.fodt 
b/sw/qa/extras/uiwriter/data2/tdf76817.fodt
new file mode 100644
index ..4b6decb1a82a
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data2/tdf76817.fodt
@@ -0,0 +1,77 @@
+
+http://openoffice.org/2009/office"; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text">
+ 
+  
+  
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+  
+ 
+ 
+  
+   Should be 
1
+   Should be 
1.1
+   Should be 
2
+   Should be 
2.1
+  
+ 
+
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 68470cecdc72..01d05d963b3c 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -1225,6 +1225,93 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf76817)
  getProperty(getParagraph(4), 
"ListLabelString"));
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf76817_round_trip)
+{
+load(DATA_DIRECTORY, "tdf76817.fodt");
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+// save it to DOCX
+reload("Office Open XML Text", "tdf76817.docx");
+pTextDoc = dynamic_cast(mxComponent.get());
+
+SwViewShell* pViewShell
+= 
pTextDoc->GetDocShell()->GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell();
+pViewShell->Reformat();
+
+CPPUNIT_ASSERT(pTextDoc);
+
+CPPUNIT_ASSERT_EQUAL(OUString("Heading 2"),
+ getProperty(getParagraph(2), 
"ParaStyleName"));
+CPPUNIT_ASSERT_EQUAL(static_cast(2),
+ getProperty(getParagraph(2), 
"OutlineLevel"));
+CPPUNIT_ASSERT_EQUAL(OUString("1.1"),
+ getProperty(getParagraph(2), 
"ListLabelString"));
+
+CPPUNIT_ASSERT_EQUAL(OUString("Heading 2"),
+ getProperty(getParagraph(4), 
"ParaStyleName"));
+CPPUNIT_ASSERT_EQUAL(static_cast(2),
+ getProperty(getParagraph(4), 
"OutlineLevel"));
+CPPUNIT_ASSERT_EQUAL(OUString("2.1"),
+ getProperty(getParagraph(4), 
"ListLabelString"));
+
+// set Heading 2 style of paragraph 2 to Heading 1
+
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+pWrtShell->Down(/*bSelect=*/false);
+
+uno::Sequence aPropertyValues = 
comphelper::InitPropertySequence({
+{ "Style", uno::makeAny(OUString("Heading 1")) },
+{ "FamilyName", uno::makeAny(OUString("ParagraphStyles")) },
+});
+dispatchCommand(mxComponent, ".uno:StyleApply", aPropertyValues);
+
+CPPUNIT_ASSERT_EQUAL(OUString("Heading 1"),
+ getProperty(getParagraph(2), 
"ParaStyleName"));
+CPPUNIT_ASSERT_EQUAL(static_cast(1),
+ getProperty(getParagraph(2), 
"OutlineLevel"));
+// This was "1 Heading" instead of "2 Heading"
+CPPUNIT_ASSERT_EQUAL(OUString("2"), getProperty(getParagraph(2), 
"ListLabelString"));
+
+CPPUNIT_ASSERT_EQUAL(OUString("Heading 2"),
+ getProperty(getParagraph(4), 
"ParaStyleName"));
+CPPUNIT_ASSERT_EQUAL(static_cast(2),
+ getProperty(getParagraph(4), 
"OutlineLevel"));
+// This was "2.1 Heading"
+CPPUNIT_ASSERT_EQUAL(OUString("3.1"),
+ getProperty(getParagraph(4), 
"ListLabelString"));
+
+// set Heading 1 style of paragraph 3 to Heading 2
+
+pWrtShell->Down(/*bSelect=*/false);
+
+CPPUNIT_ASSERT_EQUAL(OUString("Heading 1"),
+ getProperty(getParagraph(3), 
"ParaStyleName"));
+CPPUNIT_ASSERT_EQUAL(static_cast(1),
+ getProperty(getParagraph(3), 
"OutlineLevel")

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

[Caolán McNamara (via logerrit)]

 cui/inc/strings.hrc|1 
 cui/source/dialogs/passwdomdlg.cxx |   30 +
 cui/source/inc/passwdomdlg.hxx |7 +
 cui/uiconfig/ui/password.ui|  222 -
 4 files changed, 209 insertions(+), 51 deletions(-)

New commits:
commit 4331e659b71e303f92a62db0dd3b908a67b733b2
Author: Caolán McNamara 
AuthorDate: Wed Jun 17 14:09:29 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Jun 17 16:56:45 2020 +0200

tdf#43452 indicate when maximum password length has been reached

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

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 6312f38b6d53..dcfbcc0f4e9c 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -210,6 +210,7 @@
 #define RID_SVXSTR_TWO_PASSWORDS_MISMATCH   
NC_("RID_SVXSTR_TWO_PASSWORDS_MISMATCH", "The confirmation passwords did not 
match the original passwords. Set the passwords again.")
 #define RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON  
NC_("RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON", "Please enter a password to open 
or to modify, or check the open read-only option to continue.")
 #define RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2   
NC_("RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2", "Set the password by entering 
the same password in both boxes.")
+#define RID_SVXSTR_PASSWORD_LEN_INDICATOR   
NC_("RID_SVXSTR_PASSWORD_LEN_INDICATOR", "Password length limit of %1 reached")
 
 #define STR_AUTOLINKNC_("STR_AUTOLINK", 
"Automatic")
 #define STR_MANUALLINK  NC_("STR_MANUALLINK", 
"Manual")
diff --git a/cui/source/dialogs/passwdomdlg.cxx 
b/cui/source/dialogs/passwdomdlg.cxx
index f7b359bac237..250f9e728253 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -69,21 +69,43 @@ IMPL_LINK_NOARG(PasswordToOpenModifyDialog, OkBtnClickHdl, 
weld::Button&, void)
 }
 }
 
+IMPL_LINK(PasswordToOpenModifyDialog, ChangeHdl, weld::Entry&, rEntry, void)
+{
+weld::Label* pIndicator = nullptr;
+int nLength = rEntry.get_text().getLength();
+if (&rEntry == m_xPasswdToOpenED.get())
+pIndicator = m_xPasswdToOpenInd.get();
+else if (&rEntry == m_xReenterPasswdToOpenED.get())
+pIndicator = m_xReenterPasswdToOpenInd.get();
+else if (&rEntry == m_xPasswdToModifyED.get())
+pIndicator = m_xPasswdToModifyInd.get();
+else if (&rEntry == m_xReenterPasswdToModifyED.get())
+pIndicator = m_xReenterPasswdToModifyInd.get();
+assert(pIndicator);
+pIndicator->set_visible(nLength >= m_nMaxPasswdLen);
+}
+
 PasswordToOpenModifyDialog::PasswordToOpenModifyDialog(weld::Window * pParent, 
sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify)
 : SfxDialogController(pParent, "cui/ui/password.ui", "PasswordDialog")
 , m_xPasswdToOpenED(m_xBuilder->weld_entry("newpassEntry"))
+, m_xPasswdToOpenInd(m_xBuilder->weld_label("newpassIndicator"))
 , m_xReenterPasswdToOpenED(m_xBuilder->weld_entry("confirmpassEntry"))
+, m_xReenterPasswdToOpenInd(m_xBuilder->weld_label("confirmpassIndicator"))
 , m_xOptionsExpander(m_xBuilder->weld_expander("expander"))
 , m_xOk(m_xBuilder->weld_button("ok"))
 , m_xOpenReadonlyCB(m_xBuilder->weld_check_button("readonly"))
 , m_xPasswdToModifyFT(m_xBuilder->weld_label("label7"))
 , m_xPasswdToModifyED(m_xBuilder->weld_entry("newpassroEntry"))
+, m_xPasswdToModifyInd(m_xBuilder->weld_label("newpassroIndicator"))
 , m_xReenterPasswdToModifyFT(m_xBuilder->weld_label("label8"))
 , m_xReenterPasswdToModifyED(m_xBuilder->weld_entry("confirmropassEntry"))
+, 
m_xReenterPasswdToModifyInd(m_xBuilder->weld_label("confirmropassIndicator"))
 , m_aOneMismatch( CuiResId( RID_SVXSTR_ONE_PASSWORD_MISMATCH ) )
 , m_aTwoMismatch( CuiResId( RID_SVXSTR_TWO_PASSWORDS_MISMATCH ) )
 , m_aInvalidStateForOkButton( CuiResId( 
RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON ) )
 , m_aInvalidStateForOkButton_v2( CuiResId( 
RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2 ) )
+, 
m_aIndicatorTemplate(CuiResId(RID_SVXSTR_PASSWORD_LEN_INDICATOR).replaceFirst("%1",
 OUString::number(nMaxPasswdLen)))
+, m_nMaxPasswdLen(nMaxPasswdLen)
 , m_bIsPasswordToModify( bIsPasswordToModify )
 {
 m_xOk->connect_clicked(LINK(this, PasswordToOpenModifyDialog, 
OkBtnClickHdl));
@@ -91,9 +113,17 @@ 
PasswordToOpenModifyDialog::PasswordToOpenModifyDialog(weld::Window * pParent, s
 if (nMaxPasswdLen)
 {
 m_xPasswdToOpenED->set_max_length( nMaxPasswdLen );
+m_xPasswdToOpenED->connect_changed(LINK(this, 
PasswordToOpenModifyDialog, ChangeHdl));
+m_xPasswdToOpenInd->set_label(m_aIndicatorTemplate);
 m_xReenterPasswdToOpenED->set_max_length( nMaxPasswdLen );
+m_xReenterPasswdToOpenED->connect_changed(LINK(this, 
Pas

[Libreoffice-commits] core.git: external/mariadb-connector-c

[Michael Stahl (via logerrit)]

 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk   |1 +
 external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk |5 
-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 82a1650683df7d5c1769dfd68a26a4d071f1a546
Author: Michael Stahl 
AuthorDate: Wed Jun 17 14:59:30 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Jun 17 16:56:50 2020 +0200

mariadb: the "pvio_socket" plugin turns out to be important

... otherwise can't connect to a TCP socket.

(regression from fe041bbc343ee08c6e901f63985d55a90da71c8b)

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

diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk 
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index d32eda7f71d1..b0c62e1b160e 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -64,6 +64,7 @@ $(eval $(call 
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/mariadb_stmt \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_client_plugin \
UnpackedTarball/mariadb-connector-c/plugins/auth/my_auth \
+   UnpackedTarball/mariadb-connector-c/plugins/pvio/pvio_socket \
$(if $(filter $(OS),WNT), \
UnpackedTarball/mariadb-connector-c/libmariadb/win32_errmsg \
UnpackedTarball/mariadb-connector-c/win-iconv/win_iconv) \
diff --git 
a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk 
b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
index cf0d2eb06cfa..3d8ca9295131 100644
--- a/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk
@@ -31,7 +31,10 @@ $(eval $(call 
gb_UnpackedTarball_add_patches,mariadb-connector-c,\
 
 # TODO are any "plugins" needed?
 $(eval $(call gb_UnpackedTarball_set_post_action,mariadb-connector-c, \
-   < libmariadb/ma_client_plugin.c.in sed -e 's/@EXTERNAL_PLUGINS@//' -e 
's/@BUILTIN_PLUGINS@//' > libmariadb/ma_client_plugin.c  \
+   < libmariadb/ma_client_plugin.c.in sed \
+   -e 's/@EXTERNAL_PLUGINS@/extern struct st_mysql_client_plugin 
pvio_socket_client_plugin;/' \
+   -e 's/@BUILTIN_PLUGINS@/(struct st_mysql_client_plugin 
*)\&pvio_socket_client_plugin$(COMMA)/' \
+   > libmariadb/ma_client_plugin.c  \
 ))
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js |   32 
++
 loleaflet/src/layer/tile/TileLayer.js   |2 
 2 files changed, 33 insertions(+), 1 deletion(-)

New commits:
commit 5ae113c7bf7335633e8a0151d2a5d1c8d5f2b1b9
Author: Tamás Zolnai 
AuthorDate: Wed Jun 17 15:34:20 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Wed Jun 17 16:56:10 2020 +0200

cypress: test save / print menu options (writer, mobile).

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

diff --git 
a/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js 
b/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js
index d70e11c60..249624174 100644
--- a/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js
@@ -39,6 +39,38 @@ describe('Trigger hamburger menu options.', function() {
.click();
}
 
+   it('Save', function() {
+   mobileHelper.openHamburgerMenu();
+
+   cy.contains('.menu-entry-with-icon', 'File')
+   .click();
+
+   cy.contains('.menu-entry-with-icon', 'Save')
+   .click();
+
+   // TODO: we have no visual indicator of save was done
+   // So just trigger saving to catch any exception / console error
+   cy.wait(500);
+   });
+
+   it('Print', function() {
+   // A new window should be opened with the PDF.
+   cy.window()
+   .then(function(win) {
+   cy.stub(win, 'open');
+   });
+
+   mobileHelper.openHamburgerMenu();
+
+   cy.contains('.menu-entry-with-icon', 'File')
+   .click();
+
+   cy.contains('.menu-entry-with-icon', 'Print')
+   .click();
+
+   cy.window().its('open').should('be.called');
+   });
+
it('Download as PDF', function() {
mobileHelper.openHamburgerMenu();
 
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 2275206a5..eb0a7b14a 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -917,7 +917,7 @@ L.TileLayer = L.GridLayer.extend({
this._map.fire('postMessage', {msgId: 'Download_As', 
args: {Type: command.id, URL: url}});
}
else if (command.id === 'print') {
-   if (L.Browser.gecko || L.Browser.edge || L.Browser.ie 
|| this._map.options.print === false) {
+   if (L.Browser.gecko || L.Browser.edge || L.Browser.ie 
|| this._map.options.print === false || L.Browser.cypressTest) {
// the print dialog doesn't work well on firefox
// due to a pdf.js issue - 
https://github.com/mozilla/pdf.js/issues/5397
// open the pdf file in a new tab so that that 
user can print it directly in the browser's
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai (via logerrit)]

 cypress_test/data/mobile/writer/hamburger_menu.odt  |binary
 cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js |   93 
+-
 2 files changed, 87 insertions(+), 6 deletions(-)

New commits:
commit b9b4b6e5ef5fb123690ab7535926a772b029eb89
Author: Tamás Zolnai 
AuthorDate: Tue Jun 16 15:38:59 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Wed Jun 17 16:51:04 2020 +0200

cypress: add tests for Formmating marks / spellchecking menus (writer, 
mobile)

We use the tile images to check whether something appears
on the tiles. In case of formatting marks it's the blue
space indicators. In case of spell checking it's the red
underlining.

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

diff --git a/cypress_test/data/mobile/writer/hamburger_menu.odt 
b/cypress_test/data/mobile/writer/hamburger_menu.odt
index bc1afc2f0..feb8f09cc 100644
Binary files a/cypress_test/data/mobile/writer/hamburger_menu.odt and 
b/cypress_test/data/mobile/writer/hamburger_menu.odt differ
diff --git 
a/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js 
b/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js
index 7ad042a2c..d70e11c60 100644
--- a/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js
@@ -18,6 +18,27 @@ describe('Trigger hamburger menu options.', function() {
helper.afterAll(testFileName);
});
 
+   function hideText() {
+   // Change text color to white to hide text.
+   writerMobileHelper.selectAllMobile();
+
+   mobileHelper.openMobileWizard();
+
+   cy.get('#FontColor')
+   .click();
+
+   mobileHelper.selectFromColorPalette(0, 0, 7);
+
+   // End remove spell checking red lines
+   mobileHelper.openHamburgerMenu();
+
+   cy.contains('.menu-entry-with-icon', 'View')
+   .click();
+
+   cy.contains('.menu-entry-with-icon', 'Automatic Spell Checking')
+   .click();
+   }
+
it('Download as PDF', function() {
mobileHelper.openHamburgerMenu();
 
@@ -650,31 +671,91 @@ describe('Trigger hamburger menu options.', function() {
 
// Selected counts
cy.get('#selectwords')
-   .should('have.text', '61');
+   .should('have.text', '106');
 
cy.get('#selectchars')
-   .should('have.text', '689');
+   .should('have.text', '1,174');
 
cy.get('#selectcharsnospaces')
-   .should('have.text', '629');
+   .should('have.text', '1,069');
 
cy.get('#selectcjkchars')
.should('have.text', '0');
 
// General counts
cy.get('#docwords')
-   .should('have.text', '61');
+   .should('have.text', '106');
 
cy.get('#docchars')
-   .should('have.text', '689');
+   .should('have.text', '1,174');
 
cy.get('#doccharsnospaces')
-   .should('have.text', '629');
+   .should('have.text', '1,069');
 
cy.get('#doccjkchars')
.should('have.text', '0');
});
 
+   it('Show formatting marks.', function() {
+   // Hide text so the center tile is full white.
+   hideText();
+
+   var centerTile = '.leaflet-tile-loaded[style=\'width: 256px; 
height: 256px; left: 255px; top: 261px;\']';
+   helper.imageShouldBeFullWhiteOrNot(centerTile, true);
+
+   // Enable it first -> spaces will be visible.
+   mobileHelper.openHamburgerMenu();
+
+   cy.contains('.menu-entry-with-icon', 'View')
+   .click();
+
+   cy.contains('.menu-entry-with-icon', 'Formatting Marks')
+   .click();
+
+   helper.imageShouldBeFullWhiteOrNot(centerTile, false);
+
+   // Then disable it again.
+   mobileHelper.openHamburgerMenu();
+
+   cy.contains('.menu-entry-with-icon', 'View')
+   .click();
+
+   cy.contains('.menu-entry-with-icon', 'Formatting Marks')
+   .click();
+
+   helper.imageShouldBeFullWhiteOrNot(centerTile, true);
+   });
+
+   it('Automatic spell checking.', function() {
+   // Hide text so the center tile is full white.
+   hideText();
+
+   var centerTile = '.leaflet-tile-loa

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

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/common/helper.js|   32 
+-
 cypress_test/integration_tests/mobile/impress/slide_properties_spec.js |   28 

 2 files changed, 33 insertions(+), 27 deletions(-)

New commits:
commit 0994b2f1be060700bcd7b79392ab5f413bc5a925
Author: Tamás Zolnai 
AuthorDate: Mon Jun 15 16:35:09 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Wed Jun 17 16:50:41 2020 +0200

cypress: extract imageShouldBeFullWhiteOrNot() method.

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

diff --git a/cypress_test/integration_tests/common/helper.js 
b/cypress_test/integration_tests/common/helper.js
index f8bdd7209..00490c9bd 100644
--- a/cypress_test/integration_tests/common/helper.js
+++ b/cypress_test/integration_tests/common/helper.js
@@ -1,4 +1,4 @@
-/* global cy Cypress*/
+/* global cy Cypress expect */
 
 function loadTestDoc(fileName, subFolder, mobile) {
cy.log('Loading test document - start.');
@@ -242,6 +242,35 @@ function getLOVersion() {
return 'master';
 }
 
+function imageShouldBeFullWhiteOrNot(selector, fullWhite = true) {
+   cy.get(selector)
+   .should(function(images) {
+   var img = images[0];
+
+   // Create an offscreen canvas to check the image's 
pixels
+   var canvas = document.createElement('canvas');
+   canvas.width = img.width;
+   canvas.height = img.height;
+   canvas.getContext('2d').drawImage(img, 0, 0, img.width, 
img.height);
+   var context = canvas.getContext('2d');
+
+   // Ignore a small zone on the edges, to ignore border.
+   var ignoredPixels = 2;
+   var pixelData = context.getImageData(ignoredPixels, 
ignoredPixels,
+   img.width - 2 * ignoredPixels,
+   img.height - 2 * ignoredPixels).data;
+
+   var allIsWhite = true;
+   for (var i = 0; i < pixelData.length; ++i) {
+   allIsWhite = allIsWhite && pixelData[i] == 255;
+   }
+   if (fullWhite)
+   expect(allIsWhite).to.be.true;
+   else
+   expect(allIsWhite).to.be.false;
+   });
+}
+
 module.exports.loadTestDoc = loadTestDoc;
 module.exports.assertCursorAndFocus = assertCursorAndFocus;
 module.exports.assertNoKeyboardInput = assertNoKeyboardInput;
@@ -259,3 +288,4 @@ module.exports.isWriter = isWriter;
 module.exports.beforeAllDesktop = beforeAllDesktop;
 module.exports.typeText = typeText;
 module.exports.getLOVersion = getLOVersion;
+module.exports.imageShouldBeFullWhiteOrNot = imageShouldBeFullWhiteOrNot;
diff --git 
a/cypress_test/integration_tests/mobile/impress/slide_properties_spec.js 
b/cypress_test/integration_tests/mobile/impress/slide_properties_spec.js
index 5a869a821..fb18d99bf 100644
--- a/cypress_test/integration_tests/mobile/impress/slide_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/slide_properties_spec.js
@@ -21,32 +21,8 @@ describe('Changing slide properties.', function() {
});
 
function previewShouldBeFullWhite(fullWhite = true, slideNumber = 1) {
-   cy.get('.preview-frame:nth-of-type(' + (slideNumber + 
1).toString() + ') img')
-   .should(function(preview) {
-   var img = preview[0];
-
-   // Create an offscreen canvas to check the 
preview's pixels
-   var canvas = document.createElement('canvas');
-   canvas.width = img.width;
-   canvas.height = img.height;
-   canvas.getContext('2d').drawImage(img, 0, 0, 
img.width, img.height);
-   var context = canvas.getContext('2d');
-
-   // There is a border around the preview, ignore 
that
-   var ignoredPixels = 2;
-   var pixelData = 
context.getImageData(ignoredPixels, ignoredPixels,
-   img.width - 2 * ignoredPixels,
-   img.height - 2 * ignoredPixels).data;
-
-   var allIsWhite = true;
-   for (var i = 0; i < pixelData.length; ++i) {
-   allIsWhite = allIsWhite && pixelData[i] 
== 255;
-   }
-   if (fullWhite)
-   expect(allIsWhite).to.be.true;
- 

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

[Caolán McNamara (via logerrit)]

 cui/inc/strings.hrc|1 
 cui/source/dialogs/passwdomdlg.cxx |   30 +
 cui/source/inc/passwdomdlg.hxx |7 +
 cui/uiconfig/ui/password.ui|  222 -
 4 files changed, 209 insertions(+), 51 deletions(-)

New commits:
commit a81d7c4e0379a021664f8f6c5e9032a47fcf61d6
Author: Caolán McNamara 
AuthorDate: Wed Jun 17 14:09:29 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Jun 17 16:37:17 2020 +0200

tdf#43452 indicate when maximum password length has been reached

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

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 6312f38b6d53..dcfbcc0f4e9c 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -210,6 +210,7 @@
 #define RID_SVXSTR_TWO_PASSWORDS_MISMATCH   
NC_("RID_SVXSTR_TWO_PASSWORDS_MISMATCH", "The confirmation passwords did not 
match the original passwords. Set the passwords again.")
 #define RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON  
NC_("RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON", "Please enter a password to open 
or to modify, or check the open read-only option to continue.")
 #define RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2   
NC_("RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2", "Set the password by entering 
the same password in both boxes.")
+#define RID_SVXSTR_PASSWORD_LEN_INDICATOR   
NC_("RID_SVXSTR_PASSWORD_LEN_INDICATOR", "Password length limit of %1 reached")
 
 #define STR_AUTOLINKNC_("STR_AUTOLINK", 
"Automatic")
 #define STR_MANUALLINK  NC_("STR_MANUALLINK", 
"Manual")
diff --git a/cui/source/dialogs/passwdomdlg.cxx 
b/cui/source/dialogs/passwdomdlg.cxx
index f7b359bac237..250f9e728253 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -69,21 +69,43 @@ IMPL_LINK_NOARG(PasswordToOpenModifyDialog, OkBtnClickHdl, 
weld::Button&, void)
 }
 }
 
+IMPL_LINK(PasswordToOpenModifyDialog, ChangeHdl, weld::Entry&, rEntry, void)
+{
+weld::Label* pIndicator = nullptr;
+int nLength = rEntry.get_text().getLength();
+if (&rEntry == m_xPasswdToOpenED.get())
+pIndicator = m_xPasswdToOpenInd.get();
+else if (&rEntry == m_xReenterPasswdToOpenED.get())
+pIndicator = m_xReenterPasswdToOpenInd.get();
+else if (&rEntry == m_xPasswdToModifyED.get())
+pIndicator = m_xPasswdToModifyInd.get();
+else if (&rEntry == m_xReenterPasswdToModifyED.get())
+pIndicator = m_xReenterPasswdToModifyInd.get();
+assert(pIndicator);
+pIndicator->set_visible(nLength >= m_nMaxPasswdLen);
+}
+
 PasswordToOpenModifyDialog::PasswordToOpenModifyDialog(weld::Window * pParent, 
sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify)
 : SfxDialogController(pParent, "cui/ui/password.ui", "PasswordDialog")
 , m_xPasswdToOpenED(m_xBuilder->weld_entry("newpassEntry"))
+, m_xPasswdToOpenInd(m_xBuilder->weld_label("newpassIndicator"))
 , m_xReenterPasswdToOpenED(m_xBuilder->weld_entry("confirmpassEntry"))
+, m_xReenterPasswdToOpenInd(m_xBuilder->weld_label("confirmpassIndicator"))
 , m_xOptionsExpander(m_xBuilder->weld_expander("expander"))
 , m_xOk(m_xBuilder->weld_button("ok"))
 , m_xOpenReadonlyCB(m_xBuilder->weld_check_button("readonly"))
 , m_xPasswdToModifyFT(m_xBuilder->weld_label("label7"))
 , m_xPasswdToModifyED(m_xBuilder->weld_entry("newpassroEntry"))
+, m_xPasswdToModifyInd(m_xBuilder->weld_label("newpassroIndicator"))
 , m_xReenterPasswdToModifyFT(m_xBuilder->weld_label("label8"))
 , m_xReenterPasswdToModifyED(m_xBuilder->weld_entry("confirmropassEntry"))
+, 
m_xReenterPasswdToModifyInd(m_xBuilder->weld_label("confirmropassIndicator"))
 , m_aOneMismatch( CuiResId( RID_SVXSTR_ONE_PASSWORD_MISMATCH ) )
 , m_aTwoMismatch( CuiResId( RID_SVXSTR_TWO_PASSWORDS_MISMATCH ) )
 , m_aInvalidStateForOkButton( CuiResId( 
RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON ) )
 , m_aInvalidStateForOkButton_v2( CuiResId( 
RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2 ) )
+, 
m_aIndicatorTemplate(CuiResId(RID_SVXSTR_PASSWORD_LEN_INDICATOR).replaceFirst("%1",
 OUString::number(nMaxPasswdLen)))
+, m_nMaxPasswdLen(nMaxPasswdLen)
 , m_bIsPasswordToModify( bIsPasswordToModify )
 {
 m_xOk->connect_clicked(LINK(this, PasswordToOpenModifyDialog, 
OkBtnClickHdl));
@@ -91,9 +113,17 @@ 
PasswordToOpenModifyDialog::PasswordToOpenModifyDialog(weld::Window * pParent, s
 if (nMaxPasswdLen)
 {
 m_xPasswdToOpenED->set_max_length( nMaxPasswdLen );
+m_xPasswdToOpenED->connect_changed(LINK(this, 
PasswordToOpenModifyDialog, ChangeHdl));
+m_xPasswdToOpenInd->set_label(m_aIndicatorTemplate);
 m_xReenterPasswdToOpenED->set_max_length( nMaxPasswdLen );
+m_xReenterPasswdToOpenED->connect_changed(LINK(this, 
Pas

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - extras/Package_gallmytheme.mk extras/Package_gallsystem.mk extras/source

[Heiko Tietze (via logerrit)]

 dev/null  |binary
 extras/Package_gallmytheme.mk |   21 -
 extras/Package_gallsystem.mk  |   42 ++
 extras/source/gallery/share/gallery_names.ulf |   29 ++---
 4 files changed, 40 insertions(+), 52 deletions(-)

New commits:
commit a6718454e6a0ab6f7eb35c4b1f5d8234a704f554
Author: Heiko Tietze 
AuthorDate: Mon Jun 15 16:52:58 2020 +0200
Commit: Heiko Tietze 
CommitDate: Wed Jun 17 16:06:02 2020 +0200

Resolves tdf#132904 and tdf#133788 - Gallery clean-up

Rename
* sg1  -> bullets
* sg24 -> symbolshapes
* sg36 -> fontwork

Delete
* sg3 (backgrounds) -> 7273bb3534264867e818c13baffcdf3862189cd2
* sg4 (www-graf)-> 82ab7a1559170889c5647a04dc3e85edc38a4e0f

Translation
* ulf completed

Visibility
* New gallery content moved to share/

Change-Id: I718c627a71d4ed0d9eef61ff53814da7ec3922be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96382
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 86b1b062cfc2768a971bb842de1c16f8646d4b4b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96501
Reviewed-by: Heiko Tietze 

diff --git a/extras/Package_gallmytheme.mk b/extras/Package_gallmytheme.mk
index c4e8744ddf44..88149916095d 100644
--- a/extras/Package_gallmytheme.mk
+++ b/extras/Package_gallmytheme.mk
@@ -12,25 +12,4 @@ $(eval $(call 
gb_Package_Package,extras_gallmytheme,$(SRCDIR)/extras/source/gall
 $(eval $(call 
gb_Package_add_files,extras_gallmytheme,$(LIBO_SHARE_PRESETS_FOLDER)/gallery,\
sg30.sdv \
sg30.thm \
-   arrows.sdg \
-   arrows.sdv \
-   arrows.thm \
-   bpmn.sdg \
-   bpmn.sdv \
-   bpmn.thm \
-   flowchart.sdg \
-   flowchart.sdv \
-   flowchart.thm \
-   icons.sdg \
-   icons.sdv \
-   icons.thm \
-   shapes.sdg \
-   shapes.sdv \
-   shapes.thm \
-   network.sdg \
-   network.sdv \
-   network.thm \
-   diagrams.sdg \
-   diagrams.sdv \
-   diagrams.thm \
 ))
diff --git a/extras/Package_gallsystem.mk b/extras/Package_gallsystem.mk
index 1f499213afd1..c17099ce7050 100644
--- a/extras/Package_gallsystem.mk
+++ b/extras/Package_gallsystem.mk
@@ -10,18 +10,36 @@
 $(eval $(call 
gb_Package_Package,extras_gallsystem,$(SRCDIR)/extras/source/gallery/gallery_system))
 
 $(eval $(call 
gb_Package_add_files,extras_gallsystem,$(LIBO_SHARE_FOLDER)/gallery,\
-   sg1.sdg \
-   sg1.sdv \
-   sg1.thm \
-   sg4.sdg \
-   sg4.sdv \
-   sg4.thm \
-   sg24.sdg \
-   sg24.sdv \
-   sg24.thm \
-   sg36.sdg \
-   sg36.sdv \
-   sg36.thm \
+   arrows.sdg \
+   arrows.sdv \
+   arrows.thm \
+   bpmn.sdg \
+   bpmn.sdv \
+   bpmn.thm \
+   bullets.sdg \
+   bullets.sdv \
+   bullets.thm \
+   diagrams.sdg \
+   diagrams.sdv \
+   diagrams.thm \
+   flowchart.sdg \
+   flowchart.sdv \
+   flowchart.thm \
+   fontwork.sdg \
+   fontwork.sdv \
+   fontwork.thm \
+   icons.sdg \
+   icons.sdv \
+   icons.thm \
+   network.sdg \
+   network.sdv \
+   network.thm \
+   shapes.sdg \
+   shapes.sdv \
+   shapes.thm \
+   symbolshapes.sdg \
+   symbolshapes.sdv \
+   symbolshapes.thm \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/extras/source/gallery/gallery_mytheme/arrows.sdg 
b/extras/source/gallery/gallery_system/arrows.sdg
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/arrows.sdg
rename to extras/source/gallery/gallery_system/arrows.sdg
diff --git a/extras/source/gallery/gallery_mytheme/arrows.sdv 
b/extras/source/gallery/gallery_system/arrows.sdv
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/arrows.sdv
rename to extras/source/gallery/gallery_system/arrows.sdv
diff --git a/extras/source/gallery/gallery_mytheme/arrows.thm 
b/extras/source/gallery/gallery_system/arrows.thm
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/arrows.thm
rename to extras/source/gallery/gallery_system/arrows.thm
diff --git a/extras/source/gallery/gallery_mytheme/bpmn.sdg 
b/extras/source/gallery/gallery_system/bpmn.sdg
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/bpmn.sdg
rename to extras/source/gallery/gallery_system/bpmn.sdg
diff --git a/extras/source/gallery/gallery_mytheme/bpmn.sdv 
b/extras/source/gallery/gallery_system/bpmn.sdv
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/bpmn.sdv
rename to extras/source/gallery/gallery_system/bpmn.sdv
diff --git a/extras/source/gallery/gallery_mytheme/bpmn.thm 
b/extras/source/gallery/gallery_system/bpmn.thm
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/bpmn.thm
rename to extras/source/gallery/gallery_system/bpmn.thm
diff --git a/extras/source/g

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

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js |4 
++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4145a216ecfb45145e0d4df832f0dfd5169e5d70
Author: Tamás Zolnai 
AuthorDate: Wed Jun 17 14:45:48 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Wed Jun 17 16:02:04 2020 +0200

cypress: these test are failing recently.

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

diff --git 
a/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js 
b/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
index 2b3ae2e85..16d2703e8 100644
--- a/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
+++ b/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js
@@ -208,7 +208,7 @@ describe('Impress insertion wizard.', function() {
helper.expectTextForClipboard('Tap to edit text');
});
 
-   it('Insert date field (fixed).', function() {
+   it.skip('Insert date field (fixed).', function() {
mobileHelper.openInsertionWizard();
 
cy.contains('.menu-entry-with-icon', 'More Fields...')
@@ -228,7 +228,7 @@ describe('Impress insertion wizard.', function() {
helper.matchClipboardText(regex);
});
 
-   it('Insert date field (variable).', function() {
+   it.skip('Insert date field (variable).', function() {
mobileHelper.openInsertionWizard();
 
cy.contains('.menu-entry-with-icon', 'More Fields...')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 include/svx/srchdlg.hxx|7 +++
 sc/source/ui/dialogs/searchresults.cxx |2 +-
 svx/source/dialog/srchdlg.cxx  |   17 +
 3 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit 9da14cf5461a1883718da9f92e03dd0dd6e28efd
Author: Caolán McNamara 
AuthorDate: Tue Jun 16 21:37:46 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Jun 17 15:55:53 2020 +0200

tdf#133807 re-present search dialog after a short timeout

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

diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 6b45e838dcf9..8982e4d37a2b 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -132,8 +133,12 @@ public:
 
 void SetSearchLabel(const OUString& rStr);
 
+// bring this window back to the foreground
+void Present();
+
 private:
 SfxBindings&rBindings;
+Timer   m_aPresentIdle;
 boolbWriter;
 boolbSearch;
 boolbFormat;
@@ -255,6 +260,8 @@ private:
 SVX_DLLPRIVATE bool IsOtherOptionsExpanded() const;
 
 SVX_DLLPRIVATE short executeSubDialog(VclAbstractDialog * dialog);
+
+DECL_DLLPRIVATE_LINK(PresentTimeoutHdl_Impl, Timer*, void);
 };
 
 #endif
diff --git a/sc/source/ui/dialogs/searchresults.cxx 
b/sc/source/ui/dialogs/searchresults.cxx
index b1b0e45aec5f..950726a18c4e 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -55,7 +55,7 @@ SearchResultsDlg::~SearchResultsDlg()
 SvxSearchDialog* pSearchDlg = 
static_cast(pChildWindow->GetController().get());
 if (!pSearchDlg)
 return;
-pSearchDlg->getDialog()->present();
+pSearchDlg->Present();
 }
 
 namespace
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index adab6f86b642..6653be858078 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -255,6 +255,7 @@ SvxSearchDialog::SvxSearchDialog(weld::Window* pParent, 
SfxChildWindow* pChildWi
 : SfxModelessDialogController(&rBind, pChildWin, pParent,
   "svx/ui/findreplacedialog.ui", 
"FindReplaceDialog")
 , rBindings(rBind)
+, m_aPresentIdle("Bring SvxSearchDialog to Foreground")
 , bWriter(false)
 , bSearch(true)
 , bFormat(false)
@@ -312,6 +313,9 @@ SvxSearchDialog::SvxSearchDialog(weld::Window* pParent, 
SfxChildWindow* pChildWi
 , m_xAllSheetsCB(m_xBuilder->weld_check_button("allsheets"))
 , m_xCalcStrFT(m_xBuilder->weld_label("entirecells"))
 {
+m_aPresentIdle.SetTimeout(50);
+m_aPresentIdle.SetInvokeHandler(LINK(this, SvxSearchDialog, 
PresentTimeoutHdl_Impl));
+
 m_xSearchTmplLB->make_sorted();
 m_xSearchAttrText->hide();
 m_xSearchLabel->show();
@@ -338,6 +342,18 @@ SvxSearchDialog::SvxSearchDialog(weld::Window* pParent, 
SfxChildWindow* pChildWi
 Construct_Impl();
 }
 
+IMPL_LINK_NOARG(SvxSearchDialog, PresentTimeoutHdl_Impl, Timer*, void)
+{
+getDialog()->present();
+}
+
+void SvxSearchDialog::Present()
+{
+PresentTimeoutHdl_Impl(nullptr);
+// tdf#133807 try again in a short timeout
+m_aPresentIdle.Start();
+}
+
 void SvxSearchDialog::ChildWinDispose()
 {
 rBindings.EnterRegistrations();
@@ -350,6 +366,7 @@ void SvxSearchDialog::ChildWinDispose()
 
 SvxSearchDialog::~SvxSearchDialog()
 {
+m_aPresentIdle.Stop();
 }
 
 void SvxSearchDialog::Construct_Impl()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar (via logerrit)]

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

New commits:
commit 059adbe7ab7b3334641752419b93e5b1eddfe40d
Author: Andras Timar 
AuthorDate: Wed Jun 17 15:34:53 2020 +0200
Commit: Andras Timar 
CommitDate: Wed Jun 17 15:40:28 2020 +0200

Revert "Revert "Restore original $licensepath of the optional EULA of MSI 
package""

This reverts commit ce7c473dfb6a0eeab99811b29e205fa8b5379f9d.
I don't remember why I had to revert my original patch on master a year ago.
But for Collabora Office builds it has to be like this, apparently.

diff --git a/solenv/bin/modules/installer/environment.pm 
b/solenv/bin/modules/installer/environment.pm
index b45227f8a1a4..05dfdbfb6787 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -59,7 +59,7 @@ sub create_pathvariables
 my $filelistpath = $environment->{'WORKDIR'};
 $variables{'filelistpath'} = $filelistpath;
 
-my $licensepath = $environment->{'WORKDIR'} . 
$installer::globals::separator . "CustomTarget/readlicense_oo/license";
+my $licensepath = $environment->{'SRCDIR'} . 
$installer::globals::separator . "readlicense_oo/license";
 $variables{'licensepath'} = $licensepath;
 
 my $packinfopath = $environment->{'SRCDIR'} . 
$installer::globals::separator . "setup_native/source/packinfo";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Aditya (via logerrit)]

 include/svx/gallery1.hxx|   13 +---
 include/svx/gallerybinaryengine.hxx |7 
 include/svx/galtheme.hxx|1 
 svx/inc/galobj.hxx  |2 +
 svx/source/gallery2/gallery1.cxx|   18 +++
 svx/source/gallery2/gallerybinaryengine.cxx |   43 
 svx/source/gallery2/galtheme.cxx|   42 +--
 7 files changed, 74 insertions(+), 52 deletions(-)

New commits:
commit f9383f75af46efbb319110921158dcd6b5e91913
Author: Aditya 
AuthorDate: Wed Jun 17 16:43:49 2020 +0530
Commit: Tomaž Vajngerl 
CommitDate: Wed Jun 17 15:36:06 2020 +0200

svx: Refactor GalleryTheme class

Change-Id: I60ce3b5a9ca5a28e499015c3ac118d2f6a091f16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96527
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index 0cb9700f5462..f34a707cd712 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -36,7 +36,7 @@ class GalleryThemeEntry
 {
 private:
 
-GalleryBinaryEngine maGalleryBinaryEngine;
+std::unique_ptr mpGalleryBinaryEngine;
 OUStringaName;
 sal_uInt32  nId;
 boolbReadOnly;
@@ -50,12 +50,15 @@ public:
bool bReadOnly, bool bNewFile,
sal_uInt32 nId, bool 
bThemeNameFromResource );
 
+static std::unique_ptr createGalleryBinaryEngine();
+const std::unique_ptr& getGalleryBinaryEngine() const 
{ return mpGalleryBinaryEngine; }
+
 const OUString& GetThemeName() const { return aName; }
 
-const INetURLObject&GetThmURL() const { return 
maGalleryBinaryEngine.GetThmURL(); }
-const INetURLObject&GetSdgURL() const { return 
maGalleryBinaryEngine.GetSdgURL(); }
-const INetURLObject&GetSdvURL() const { return 
maGalleryBinaryEngine.GetSdvURL(); }
-const INetURLObject&GetStrURL() const { return 
maGalleryBinaryEngine.GetStrURL(); }
+const INetURLObject&GetThmURL() const { return 
mpGalleryBinaryEngine->GetThmURL(); }
+const INetURLObject&GetSdgURL() const { return 
mpGalleryBinaryEngine->GetSdgURL(); }
+const INetURLObject&GetSdvURL() const { return 
mpGalleryBinaryEngine->GetSdvURL(); }
+const INetURLObject&GetStrURL() const { return 
mpGalleryBinaryEngine->GetStrURL(); }
 
 boolIsReadOnly() const { return bReadOnly; }
 boolIsDefault() const;
diff --git a/include/svx/gallerybinaryengine.hxx 
b/include/svx/gallerybinaryengine.hxx
index 15aa8957d510..f658b248735c 100644
--- a/include/svx/gallerybinaryengine.hxx
+++ b/include/svx/gallerybinaryengine.hxx
@@ -21,6 +21,9 @@
 
 #include 
 #include 
+#include 
+
+struct GalleryObject;
 
 class SVXCORE_DLLPUBLIC GalleryBinaryEngine
 {
@@ -46,6 +49,10 @@ public:
 const INetURLObject& GetSdgURL() const { return aSdgURL; }
 const INetURLObject& GetSdvURL() const { return aSdvURL; }
 const INetURLObject& GetStrURL() const { return aStrURL; }
+
+bool ImplWriteSgaObject(const SgaObject& rObj, sal_uInt32 nPos, 
GalleryObject* pExistentEntry,
+OUString& aDestDir,
+::std::vector>& 
aObjectList);
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index c7c248d22344..3af46ca2431e 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -87,7 +87,6 @@ private:
 
 SAL_DLLPRIVATE void ImplCreateSvDrawStorage();
 std::unique_ptr  ImplReadSgaObject( GalleryObject const * 
pEntry );
-SAL_DLLPRIVATE bool ImplWriteSgaObject(const SgaObject& rObj, 
sal_uInt32 nPos, GalleryObject* pExistentEntry);
 SAL_DLLPRIVATE void ImplWrite();
 SAL_DLLPRIVATE const GalleryObject* ImplGetGalleryObject(sal_uInt32 nPos) 
const
 {
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index 77869d28a1f6..6501b49ff1c7 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define S_THUMB 80
 
@@ -44,6 +45,7 @@ enum GalSoundType
 class UNLESS_MERGELIBS(SVXCORE_DLLPUBLIC) SgaObject
 {
 friend class GalleryTheme;
+friend class GalleryBinaryEngine;
 
 private:
 
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index a7c86c3ef9a3..3bd04dbeb527 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -121,15 +121,15 @@ GalleryThemeEntry::GalleryThemeEntry( bool 
bCreateUniqueURL,
 {
 GalleryBinaryEngine::CreateUniqueURL(rBaseURL,aURL);
 }
-
-maGalleryBinaryEngine.SetThmExtension(aURL);
-maGalleryBinaryEngine.SetSdgExtension(aURL);
-maGalleryBinaryEngine.SetSdvExtension(aURL);
- 

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

[Administrator (via logerrit)]

 pyuno/source/module/pyuno.cxx  |   10 ++
 pyuno/source/module/pyuno_callable.cxx |   10 ++
 pyuno/source/module/pyuno_iterator.cxx |   22 --
 pyuno/source/module/pyuno_runtime.cxx  |   10 ++
 pyuno/source/module/pyuno_struct.cxx   |   10 ++
 5 files changed, 60 insertions(+), 2 deletions(-)

New commits:
commit e9ec91f32e3320f0d23840fdc95bafbf2255fd9a
Author: Administrator 
AuthorDate: Wed Jun 17 07:16:37 2020 +0300
Commit: Stephan Bergmann 
CommitDate: Wed Jun 17 15:05:02 2020 +0200

python 3.8--only compile: add tp_print to PyTypeObject

This is a backport of four commits to allow Ubuntu 20.04 to compile.
50ccb7e82b7053306721cbe220323be072306a29
d1786724b8e8e474e1f7e39012c1f19611841dc0
893a5249b934f92f072b89b9b558c9de593aa557
23d9966751566028c50ca95ca203d20f36c64f30

Thanks to Stephan and Noel who corrected various portions
of my initial patch.

Change-Id: I15f016024754165fd093ef95c52d7ba3f6d34397
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96521
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Stephan Bergmann 

diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index a6a875addc46..7246658df6ca 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -1684,6 +1684,16 @@ static PyTypeObject PyUNOType =
 , nullptr
 #if PY_VERSION_HEX >= 0x0308
 , nullptr // vectorcallfunc tp_vectorcall
+#if PY_VERSION_HEX < 0x0309
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+, nullptr // tp_print
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
+#endif
 #endif
 #endif
 };
diff --git a/pyuno/source/module/pyuno_callable.cxx 
b/pyuno/source/module/pyuno_callable.cxx
index 656d1c84cb0e..73bec5d34b5b 100644
--- a/pyuno/source/module/pyuno_callable.cxx
+++ b/pyuno/source/module/pyuno_callable.cxx
@@ -231,6 +231,16 @@ static PyTypeObject PyUNO_callable_Type =
 , nullptr
 #if PY_VERSION_HEX >= 0x0308
 , nullptr // vectorcallfunc tp_vectorcall
+#if PY_VERSION_HEX < 0x0309
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+, nullptr // tp_print
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
+#endif
 #endif
 #endif
 };
diff --git a/pyuno/source/module/pyuno_iterator.cxx 
b/pyuno/source/module/pyuno_iterator.cxx
index a7862857d719..840fc977014a 100644
--- a/pyuno/source/module/pyuno_iterator.cxx
+++ b/pyuno/source/module/pyuno_iterator.cxx
@@ -110,7 +110,6 @@ static PyObject* PyUNO_iterator_next( PyObject *self )
 return nullptr;
 }
 
-
 static PyTypeObject PyUNO_iterator_Type =
 {
 PyVarObject_HEAD_INIT( &PyType_Type, 0 )
@@ -168,6 +167,16 @@ static PyTypeObject PyUNO_iterator_Type =
 , nullptr
 #if PY_VERSION_HEX >= 0x0308
 , nullptr // vectorcallfunc tp_vectorcall
+#if PY_VERSION_HEX < 0x0309
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+, nullptr // tp_print
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
+#endif
 #endif
 #endif
 };
@@ -247,7 +256,6 @@ static PyObject* PyUNO_list_iterator_next( PyObject *self )
 return nullptr;
 }
 
-
 static PyTypeObject PyUNO_list_iterator_Type =
 {
 PyVarObject_HEAD_INIT( &PyType_Type, 0 )
@@ -305,6 +313,16 @@ static PyTypeObject PyUNO_list_iterator_Type =
 , nullptr
 #if PY_VERSION_HEX >= 0x0308
 , nullptr // vectorcallfunc tp_vectorcall
+#if PY_VERSION_HEX < 0x0309
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+, nullptr // tp_print
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
+#endif
 #endif
 #endif
 };
diff --git a/pyuno/source/module/pyuno_runtime.cxx 
b/pyuno/source/module/pyuno_runtime.cxx
index 6cee574c77f5..973c95e57184 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -126,6 +126,16 @@ static PyTypeObject RuntimeImpl_Type =
 , nullptr
 #if PY_VERSION_HEX >= 0x0308
 , nullptr // vectorcallfunc tp_vectorcall
+#if PY_VERSION_HEX < 0x0309
+#if defined __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+, nullptr // tp_print
+#if defined __clang__
+#pragma clang diagnostic pop
+#endif
+#endif
 #endif
 #endif
 };
diff --git a/pyuno/source/module/pyuno_struct.cxx 
b/pyuno/source/module/pyuno_struct.cxx
index 50b74126bee9..f420575e5e5b 100644
--- a/pyuno/source/module/pyuno_struct.cxx
+++ b/pyuno/source/module/pyuno_struct.cxx
@@ -347,6 +347,16 @@ static PyTypeObject PyUNOStructType =
 , nullptr
 #if PY_VERSION_HEX >= 0x0308
 , nullptr // vectorcallfunc tp_vectorcall
+#if 

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

[Caolán McNamara (via logerrit)]

 include/svx/srchdlg.hxx|7 +++
 sc/source/ui/dialogs/searchresults.cxx |2 +-
 svx/source/dialog/srchdlg.cxx  |   17 +
 3 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit 981b4e32933c9d3083f20bcb09ead4e4e2161768
Author: Caolán McNamara 
AuthorDate: Tue Jun 16 21:37:46 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Jun 17 14:49:35 2020 +0200

tdf#133807 re-present search dialog after a short timeout

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

diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 6b45e838dcf9..8982e4d37a2b 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -132,8 +133,12 @@ public:
 
 void SetSearchLabel(const OUString& rStr);
 
+// bring this window back to the foreground
+void Present();
+
 private:
 SfxBindings&rBindings;
+Timer   m_aPresentIdle;
 boolbWriter;
 boolbSearch;
 boolbFormat;
@@ -255,6 +260,8 @@ private:
 SVX_DLLPRIVATE bool IsOtherOptionsExpanded() const;
 
 SVX_DLLPRIVATE short executeSubDialog(VclAbstractDialog * dialog);
+
+DECL_DLLPRIVATE_LINK(PresentTimeoutHdl_Impl, Timer*, void);
 };
 
 #endif
diff --git a/sc/source/ui/dialogs/searchresults.cxx 
b/sc/source/ui/dialogs/searchresults.cxx
index b1b0e45aec5f..950726a18c4e 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -55,7 +55,7 @@ SearchResultsDlg::~SearchResultsDlg()
 SvxSearchDialog* pSearchDlg = 
static_cast(pChildWindow->GetController().get());
 if (!pSearchDlg)
 return;
-pSearchDlg->getDialog()->present();
+pSearchDlg->Present();
 }
 
 namespace
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index adab6f86b642..6653be858078 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -255,6 +255,7 @@ SvxSearchDialog::SvxSearchDialog(weld::Window* pParent, 
SfxChildWindow* pChildWi
 : SfxModelessDialogController(&rBind, pChildWin, pParent,
   "svx/ui/findreplacedialog.ui", 
"FindReplaceDialog")
 , rBindings(rBind)
+, m_aPresentIdle("Bring SvxSearchDialog to Foreground")
 , bWriter(false)
 , bSearch(true)
 , bFormat(false)
@@ -312,6 +313,9 @@ SvxSearchDialog::SvxSearchDialog(weld::Window* pParent, 
SfxChildWindow* pChildWi
 , m_xAllSheetsCB(m_xBuilder->weld_check_button("allsheets"))
 , m_xCalcStrFT(m_xBuilder->weld_label("entirecells"))
 {
+m_aPresentIdle.SetTimeout(50);
+m_aPresentIdle.SetInvokeHandler(LINK(this, SvxSearchDialog, 
PresentTimeoutHdl_Impl));
+
 m_xSearchTmplLB->make_sorted();
 m_xSearchAttrText->hide();
 m_xSearchLabel->show();
@@ -338,6 +342,18 @@ SvxSearchDialog::SvxSearchDialog(weld::Window* pParent, 
SfxChildWindow* pChildWi
 Construct_Impl();
 }
 
+IMPL_LINK_NOARG(SvxSearchDialog, PresentTimeoutHdl_Impl, Timer*, void)
+{
+getDialog()->present();
+}
+
+void SvxSearchDialog::Present()
+{
+PresentTimeoutHdl_Impl(nullptr);
+// tdf#133807 try again in a short timeout
+m_aPresentIdle.Start();
+}
+
 void SvxSearchDialog::ChildWinDispose()
 {
 rBindings.EnterRegistrations();
@@ -350,6 +366,7 @@ void SvxSearchDialog::ChildWinDispose()
 
 SvxSearchDialog::~SvxSearchDialog()
 {
+m_aPresentIdle.Stop();
 }
 
 void SvxSearchDialog::Construct_Impl()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet (via logerrit)]

 sw/inc/modcfg.hxx  |4 ++--
 sw/inc/swabstdlg.hxx   |2 +-
 sw/source/ui/dialog/swdlgfact.cxx  |4 ++--
 sw/source/ui/dialog/swdlgfact.hxx  |2 +-
 sw/source/ui/envelp/mailmrge.cxx   |2 +-
 sw/source/uibase/config/modcfg.cxx |8 
 sw/source/uibase/dbui/dbmgr.cxx|2 +-
 sw/source/uibase/inc/mailmrge.hxx  |2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 83a4d3272aa4a4bd875abc9964f4e4e7aadd1b4e
Author: Julien Nabet 
AuthorDate: Thu May 28 14:14:41 2020 +0200
Commit: Andras Timar 
CommitDate: Wed Jun 17 14:39:32 2020 +0200

Fix 983db96a17630be906b868d2be811663f0d846f6


warn:unotools.config:172285:172285:unotools/source/config/configitem.cxx:409:
ignoring XHierarchicalNameAccess to

/org.openoffice.Office.Writer/FormLetter/PrintOutput/AskForMergeFormLetter/FileOutput/FilePassword/FromDatabaseField
com.sun.star.container.NoSuchElementException message:

FormLetter/PrintOutput/AskForMergeFormLetter/FileOutput/FilePassword/FromDatabaseField
/home/julien/lo/libreoffice/configmgr/source/access.cxx:436

missing comma + confusion in switch cases in SwMiscConfig::Load

+ typo Encyrpted->Encrypted

Author: Gülşah Köse 
Date:   Fri May 22 11:51:33 2020 +0300

Add an option to create encyrpted PDF files with mailmerge.

With that option user can create encyrpted pdf files with
a password column in database via mailmerge.

Change-Id: I1ae9bbeb3f69ed9c0ba51709852f8edd5f2dc683
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95033
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 90d3311b08cef7418376d183b7116223db3e627d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95248
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index cb197d0f1a91..b7271e051040 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -341,8 +341,8 @@ public:
 voidSetNameFromColumn( const OUString& rSet )   { 
m_aMiscConfig.m_sNameFromColumn = rSet;
   
m_aMiscConfig.SetModified();}
 
-boolIsFileEncyrptedFromColumn() const{ return 
m_aMiscConfig.m_bIsPasswordFromColumn;}
-voidSetIsFileEncyrptedFromColumn( bool bSet )
+boolIsFileEncryptedFromColumn() const{ return 
m_aMiscConfig.m_bIsPasswordFromColumn;}
+voidSetIsFileEncryptedFromColumn( bool bSet )
 {
 m_aMiscConfig.SetModified();
 m_aMiscConfig.m_bIsPasswordFromColumn = bSet;
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 7b691ce16bf7..c7d1114ed6ae 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -152,7 +152,7 @@ public:
 virtual css::uno::Reference< css::sdbc::XResultSet> GetResultSet() const = 
0;
 virtual bool IsSaveSingleDoc() const = 0;
 virtual bool IsGenerateFromDataBase() const = 0;
-virtual bool IsFileEncyrptedFromDataBase() const = 0;
+virtual bool IsFileEncryptedFromDataBase() const = 0;
 virtual OUString GetColumnName() const = 0;
 virtual OUString GetPasswordColumnName() const = 0;
 virtual OUString GetTargetURL() const = 0;
diff --git a/sw/source/ui/dialog/swdlgfact.cxx 
b/sw/source/ui/dialog/swdlgfact.cxx
index 2bffa03bd995..e053a69086cf 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -656,9 +656,9 @@ bool AbstractMailMergeDlg_Impl::IsGenerateFromDataBase() 
const
 return m_xDlg->IsGenerateFromDataBase();
 }
 
-bool AbstractMailMergeDlg_Impl::IsFileEncyrptedFromDataBase() const
+bool AbstractMailMergeDlg_Impl::IsFileEncryptedFromDataBase() const
 {
-return m_xDlg->IsFileEncyrptedFromDataBase();
+return m_xDlg->IsFileEncryptedFromDataBase();
 }
 
 OUString AbstractMailMergeDlg_Impl::GetColumnName() const
diff --git a/sw/source/ui/dialog/swdlgfact.hxx 
b/sw/source/ui/dialog/swdlgfact.hxx
index 6f7a8b226416..15b865ccc5bc 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -517,7 +517,7 @@ public:
 virtual css::uno::Reference< css::sdbc::XResultSet> GetResultSet() const 
override;
 virtual bool IsSaveSingleDoc() const override;
 virtual bool IsGenerateFromDataBase() const override;
-virtual bool IsFileEncyrptedFromDataBase() const override;
+virtual bool IsFileEncryptedFromDataBase() const override;
 virtual OUString GetColumnName() const override;
 virtual OUString GetPasswordColumnName() const override;
 virtual OUString GetTargetURL() const override;
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index ef4a35257aed..20dbba6c 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -

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

[Thorsten Wagner (via logerrit)]

 sc/source/ui/app/inputwin.cxx |   17 ++---
 vcl/source/window/toolbox.cxx |   12 +++-
 2 files changed, 17 insertions(+), 12 deletions(-)

New commits:
commit 4366fdf8cb7b18bfc8f4665aa09f35e20467d3a5
Author: Thorsten Wagner 
AuthorDate: Tue Jun 16 00:28:41 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jun 17 14:38:40 2020 +0200

tdf#133692: Spacing within Calc formulabar reworked

Change-Id: I4f590589fdc390bfa11f7db86e65ccab3dd084fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96403
Tested-by: Jenkins
Tested-by: Andreas Kainz 
Tested-by: Heiko Tietze 
Reviewed-by: Heiko Tietze 
(cherry picked from commit 45261267964d6fa1e820b0e4a7745e2e10fcb5f7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96503
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index cb2b00b51d58..2c19415363ea 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -81,6 +81,7 @@ const long BUTTON_OFFSET = 2;// Space between 
input line and button
 const long MULTILINE_BUTTON_WIDTH = 20;  // Width of the button which opens 
multiline dropdown
 const long INPUTWIN_MULTILINES = 6;  // Initial number of lines within 
multiline dropdown
 const long TOOLBOX_WINDOW_HEIGHT = 22;   // Height of toolbox window in pixels 
- TODO: The same on all systems?
+const long POSITION_COMBOBOX_WIDTH = 18; // Width of position combobox in 
characters
 
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::UNO_QUERY;
@@ -162,7 +163,7 @@ static VclPtr lcl_chooseRuntimeImpl( 
vcl::Window* pParent, const
 
 ScInputWindow::ScInputWindow( vcl::Window* pParent, const SfxBindings* pBind ) 
:
 // With WB_CLIPCHILDREN otherwise we get flickering
-ToolBox ( pParent, WinBits(WB_CLIPCHILDREN) ),
+ToolBox ( pParent, WinBits(WB_CLIPCHILDREN | WB_BORDER | 
WB_NOSHADOW) ),
 aWndPos ( VclPtr::Create(this) ),
 pRuntimeWindow  ( lcl_chooseRuntimeImpl( this, pBind ) ),
 aTextWindow ( *pRuntimeWindow ),
@@ -203,11 +204,7 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, const 
SfxBindings* pBind ) :
 InsertItem  (SID_INPUT_OK,   Image(StockImage::Yes, 
RID_BMP_INPUT_OK), ToolBoxItemBits::NONE, 6);
 }
 
-if (!comphelper::LibreOfficeKit::isActive())
-{
-InsertSeparator (7);
-}
-InsertWindow(7, &aTextWindow, ToolBoxItemBits::NONE, 8);
+InsertWindow(7, &aTextWindow, ToolBoxItemBits::NONE, 7);
 SetDropdownClickHdl( LINK( this, ScInputWindow, DropdownClickHdl ));
 
 if (!comphelper::LibreOfficeKit::isActive())
@@ -2115,7 +2112,13 @@ ScPosWnd::ScPosWnd(vcl::Window* pParent)
 , nTipVisible(nullptr)
 , bFormulaMode(false)
 {
-m_xWidget->set_entry_width_chars(15);
+
+// Use calculation according to tdf#132338 to align combobox width to 
width of fontname comboxbox within formatting toolbar;
+// formatting toolbar is placed above formulabar when using multiple 
toolbars typically
+
+m_xWidget->set_entry_width_chars(1);
+Size aSize(LogicToPixel(Size(POSITION_COMBOBOX_WIDTH * 4, 0), 
MapMode(MapUnit::MapAppFont)));
+m_xWidget->set_size_request(aSize.Width(), -1);
 SetSizePixel(m_xContainer->get_preferred_size());
 
 FillRangeNames();
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 182c085a152e..8ddb536f7bb4 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -189,10 +189,10 @@ void ToolBox::ImplCalcBorder( WindowAlign eAlign, long& 
rLeft, long& rTop,
 ImplDockingWindowWrapper *pWrapper = 
ImplGetDockingManager()->GetDockingWindowWrapper( this );
 
 // reserve DragArea only for dockable toolbars
-intdragwidth = ( pWrapper && !pWrapper->IsLocked() ) ? 
ImplGetDragWidth() : 0;
+int dragwidth = ( pWrapper && !pWrapper->IsLocked() ) ? ImplGetDragWidth() 
: 0;
 
-// no shadow border for dockable toolbars
-intborderwidth = pWrapper ? 0: 2;
+// no shadow border for dockable toolbars and toolbars with WB_NOSHADOW 
bit set, e.g. Calc's formulabar
+int borderwidth = ( pWrapper || mnWinStyle & WB_NOSHADOW ) ? 0 : 2;
 
 if ( eAlign == WindowAlign::Top )
 {
@@ -551,8 +551,10 @@ void ToolBox::ImplDrawBorder(vcl::RenderContext& 
rRenderContext)
 
 ImplDockingWindowWrapper* pWrapper = 
ImplGetDockingManager()->GetDockingWindowWrapper(this);
 
-// draw borders for ordinary toolbars only (not dockable)
-if( pWrapper )
+// draw borders for ordinary toolbars only (not dockable), do not draw 
borders for toolbars with WB_NOSHADOW bit set,
+// e.g. Calc's formulabar
+
+if( pWrapper || mnWinStyle & WB_NOSHADOW )
 return;
 
 if (meAlign == WindowAlign::Bottom)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedeskt

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

[Szymon Kłos (via logerrit)]

 desktop/source/lib/init.cxx  |   27 ++-
 sfx2/source/control/unoctitm.cxx |   27 +++
 2 files changed, 53 insertions(+), 1 deletion(-)

New commits:
commit 27381dc1b76e4aee5459b3d85e6fc5919d2b8f98
Author: Szymon Kłos 
AuthorDate: Fri May 8 09:25:13 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Jun 17 14:13:43 2020 +0200

notebookbar: send uno items state update

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 1b8013350983..8b3ba76bfaf9 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2695,7 +2695,32 @@ static void doc_iniUnoCommands ()
 OUString(".uno:TransformPosX"),
 OUString(".uno:TransformPosY"),
 OUString(".uno:TransformWidth"),
-OUString(".uno:TransformHeight")
+OUString(".uno:TransformHeight"),
+OUString(".uno:ObjectBackOne"),
+OUString(".uno:SendToBack"),
+OUString(".uno:ObjectForwardOne"),
+OUString(".uno:BringToFront"),
+OUString(".uno:WrapRight"),
+OUString(".uno:WrapThrough"),
+OUString(".uno:WrapLeft"),
+OUString(".uno:WrapIdeal"),
+OUString(".uno:WrapOn"),
+OUString(".uno:WrapOff"),
+OUString(".uno:UpdateCurIndex"),
+OUString(".uno:InsertCaptionDialog"),
+OUString(".uno:FormatGroup"),
+OUString(".uno:SplitTable"),
+OUString(".uno:MergeCells"),
+OUString(".uno:DeleteNote"),
+OUString(".uno:AcceptChanges"),
+OUString(".uno:FormatPaintbrush"),
+OUString(".uno:SetDefault"),
+OUString(".uno:ParaLeftToRight"),
+OUString(".uno:ParaRightToLeft"),
+OUString(".uno:ParaspaceIncrease"),
+OUString(".uno:ParaspaceDecrease"),
+OUString(".uno:AcceptTrackedChange"),
+OUString(".uno:RejectTrackedChange")
 };
 
 util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 00b9c7188d67..c9ae7b6e32fe 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1085,6 +1085,33 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 
nSID, SfxViewFrame* pViewFra
  aEvent.FeatureURL.Path == "SortDescending" ||
  aEvent.FeatureURL.Path == "AcceptAllTrackedChanges" ||
  aEvent.FeatureURL.Path == "RejectAllTrackedChanges" ||
+ aEvent.FeatureURL.Path == "AcceptTrackedChange" ||
+ aEvent.FeatureURL.Path == "RejectTrackedChange" ||
+ aEvent.FeatureURL.Path == "NextTrackedChange" ||
+ aEvent.FeatureURL.Path == "PreviousTrackedChange" ||
+ aEvent.FeatureURL.Path == "FormatGroup" ||
+ aEvent.FeatureURL.Path == "ObjectBackOne" ||
+ aEvent.FeatureURL.Path == "SendToBack" ||
+ aEvent.FeatureURL.Path == "ObjectForwardOne" ||
+ aEvent.FeatureURL.Path == "BringToFront" ||
+ aEvent.FeatureURL.Path == "WrapRight" ||
+ aEvent.FeatureURL.Path == "WrapThrough" ||
+ aEvent.FeatureURL.Path == "WrapLeft" ||
+ aEvent.FeatureURL.Path == "WrapIdeal" ||
+ aEvent.FeatureURL.Path == "WrapOn" ||
+ aEvent.FeatureURL.Path == "WrapOff" ||
+ aEvent.FeatureURL.Path == "UpdateCurIndex" ||
+ aEvent.FeatureURL.Path == "InsertCaptionDialog" ||
+ aEvent.FeatureURL.Path == "MergeCells" ||
+ aEvent.FeatureURL.Path == "SplitTable" ||
+ aEvent.FeatureURL.Path == "DeleteNote" ||
+ aEvent.FeatureURL.Path == "AcceptChanges" ||
+ aEvent.FeatureURL.Path == "FormatPaintbrush" ||
+ aEvent.FeatureURL.Path == "SetDefault" ||
+ aEvent.FeatureURL.Path == "ParaLeftToRight" ||
+ aEvent.FeatureURL.Path == "ParaRightToLeft" ||
+ aEvent.FeatureURL.Path == "ParaspaceIncrease" ||
+ aEvent.FeatureURL.Path == "ParaspaceDecrease" ||
  aEvent.FeatureURL.Path == "TableDialog" ||
  aEvent.FeatureURL.Path == "FormatCellDialog" ||
  aEvent.FeatureURL.Path == "FontDialog" ||
___
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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/layout/data/continuous-endnotes-move-backwards.doc |binary
 sw/qa/extras/layout/layout.cxx  |   17 
+
 sw/source/core/layout/ftnfrm.cxx|   18 
++
 3 files changed, 35 insertions(+)

New commits:
commit 7caa0003b0dc71ed676cc8fa84585c49f8ac5031
Author: Miklos Vajna 
AuthorDate: Mon Jun 15 21:04:56 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jun 17 14:00:15 2020 +0200

tdf#133145 sw ContinuousEndnotes: fix moving endnotes to a previous page

Regression from commit 4814e8caa5f06c4fe438dfd7d7315e4a2410ea18
(tdf#124601 sw: add ContinuousEndnotes layout compat option,
2019-09-30), the problem was that SwFrame::GetPrevFootnoteLeaf() did not
take the new compat flag into account when determining the previous
footnote page for endnotes.

Do the same pattern here as the cases already handled in the above
commit, just try to get the "last but one" and not the "last" page,
since we try to move these endnotes to a previous page.

(cherry picked from commit 35bb0594b2d977312ef06fc5262cc7592bc13d0f)

Conflicts:
sw/qa/core/layout/layout.cxx

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

diff --git a/sw/qa/extras/layout/data/continuous-endnotes-move-backwards.doc 
b/sw/qa/extras/layout/data/continuous-endnotes-move-backwards.doc
new file mode 100644
index ..3ee6c56aa370
Binary files /dev/null and 
b/sw/qa/extras/layout/data/continuous-endnotes-move-backwards.doc differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index e33eaf66e108..4583df8680b8 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -3810,6 +3810,23 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, 
testBtlrTableRowSpan)
 assertXPathContent(pXmlDoc, "//textarray[1]/text", "USA");
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testContinuousEndnotesMoveBackwards)
+{
+// Load a document with the ContinuousEndnotes flag turned on.
+load(DATA_DIRECTORY, "continuous-endnotes-move-backwards.doc");
+xmlDocPtr pLayout = parseLayoutDump();
+// We have 2 pages.
+assertXPath(pLayout, "/root/page", 2);
+// No endnote container on page 1.
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 0
+// - Actual  : 1
+// i.e. there were unexpected endnotes on page 1.
+assertXPath(pLayout, "/root/page[1]/ftncont", 0);
+// All endnotes are in a container on page 2.
+assertXPath(pLayout, "/root/page[2]/ftncont", 1);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 767ead4c6ef1..9573944b71d1 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -718,13 +718,31 @@ SwLayoutFrame *SwFrame::GetPrevFootnoteLeaf( MakePageType 
eMakeFootnote )
 {
 bool bEndn = pFootnote->GetAttr()->GetFootnote().IsEndNote();
 SwFrame* pTmpRef = nullptr;
+const IDocumentSettingAccess& rSettings
+= pFootnote->GetAttrSet()->GetDoc()->getIDocumentSettingAccess();
 if( bEndn && pFootnote->IsInSct() )
 {
 SwSectionFrame* pSect = pFootnote->FindSctFrame();
 if( pSect->IsEndnAtEnd() )
+// Endnotes at the end of the section.
 pTmpRef = pSect->FindLastContent( SwFindMode::LastCnt );
 }
+else if (bEndn && 
rSettings.get(DocumentSettingId::CONTINUOUS_ENDNOTES))
+{
+// Endnotes at the end of the document.
+SwPageFrame* pPage = getRootFrame()->GetLastPage();
+assert(pPage);
+SwFrame* pPrevPage = pPage->GetPrev();
+if (pPrevPage)
+{
+// Have a last but one page, use that since we try to get a 
preceding frame.
+assert(pPrevPage->IsPageFrame());
+pPage = static_cast(pPrevPage);
+}
+pTmpRef = pPage->FindLastBodyContent();
+}
 if( !pTmpRef )
+// Endnotes on a separate page.
 pTmpRef = pFootnote->GetRef();
 SwFootnoteBossFrame* pStop = pTmpRef->FindFootnoteBossFrame( !bEndn );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - readlicense_oo/license

[Andras Timar (via logerrit)]

 readlicense_oo/license/license.xml |  292 -
 1 file changed, 291 insertions(+), 1 deletion(-)

New commits:
commit 401a24378dab1d06ce305b7b090938a706720957
Author: Andras Timar 
AuthorDate: Tue Jun 16 11:11:27 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jun 17 13:55:48 2020 +0200

license: add Belarusian hyphenation dictionary

Change-Id: I3dfbefcb8554bacf0a1b1747fc24e8d96ee09037
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96440
Tested-by: Jenkins
Reviewed-by: Andras Timar 
(cherry picked from commit 60ea3aeba38912510506ebb0ee3ca5431ed35d28)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96502
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/readlicense_oo/license/license.xml 
b/readlicense_oo/license/license.xml
index 5cc67a533e37..113861737455 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -47,7 +47,7 @@
 The LaTeX Project Public License
 
 Creative Commons Attribution-ShareAlike 3.0 
Unported
- 
+Creative Commons Attribution-ShareAlike 4.0 
International
 
 Third 
Party Code Additional Copyright
 Notices and License Terms
@@ -2764,6 +2764,12 @@
 Creative Commons CC-BY-SA
 Author: Mikalai Udodau 
 Origin: Словазбор аўтарскі; арфаграфія паводле ТСБМ-2005
+Hyphenation Dictionary
+The following software may be included in this product: Belarusian 
hyphenation dictionary. Use of any of this
+software is governed by the terms of the license below:
+Creative Commons CC-BY-SA or LGPLv3
+Created by: Alex Buloichik 
+Hyphenation rules according to 'Pravapis 2008'
 Bengali
 Spelling dictionary
 The following software may be included in this product: Bengali 
spelling dictionary. Use of any of this
@@ -6903,5 +6909,289 @@ under either the MPL or the [___] License."
 Creative Commons may be contacted at https://creativecommons.org/";>https://creativecommons.org/.
 
+Creative Commons 
Attribution-ShareAlike 4.0 International
+
+Creative Commons Corporation (“Creative Commons”) is not a law firm 
and does not provide legal services or
+legal advice. Distribution of Creative Commons public licenses 
does not create a lawyer-client or other
+relationship. Creative Commons makes its licenses and related 
information available on an “as-is” basis.
+Creative Commons gives no warranties regarding its licenses, any 
material licensed under their terms and
+conditions, or any related information. Creative Commons disclaims 
all liability for damages resulting from
+their use to the fullest extent possible.
+
+Using Creative Commons Public Licenses
+Creative Commons public licenses provide a standard set of terms and 
conditions that creators and other rights
+holders may use to share original works of authorship and other 
material subject to copyright and certain other
+rights specified in the public license below. The following 
considerations are for informational purposes only,
+are not exhaustive, and do not form part of our licenses.
+Considerations for 
licensors: Our public licenses are intended for
+use by those authorized to give the public permission to use material 
in ways otherwise restricted by copyright
+and certain other rights. Our licenses are irrevocable. Licensors 
should read and understand the terms and
+conditions of the license they choose before applying it. Licensors 
should also secure all rights necessary
+before applying our licenses so that the public can reuse the material 
as expected. Licensors should clearly
+mark any material not subject to the license. This includes other 
CC-licensed material, or material used under
+an exception or limitation to copyright. https://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensors";>More
+considerations for licensors.
+Considerations for the 
public: By using one of our public
+licenses, a licensor grants the public permission to use the licensed 
material under specified terms and
+conditions. If the licensor’s permission is not necessary for any 
reason–for example, because of any applicable
+exception or limitation to copyright–then that use is not regulated by 
the license. Our licenses grant only
+permissions under copyright and certain other rights that a licensor 
has authority to grant. Use of the
+licensed material may still be restricted for other reasons, including 
because others have copyright or other
+rights in the material. A licensor may make special requests, such as 
asking that all changes be marked or
+described

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

[Olivier Hallot (via logerrit)]

 AllLangHelp_sbasic.mk|1 
 source/auxiliary/sbasic.tree |1 
 source/text/sbasic/shared/03131600.xhp   |   11 
 source/text/sbasic/shared/calc_functions.xhp |  865 +++
 source/text/scalc/01/04060115.xhp|   43 -
 source/text/scalc/01/04060116.xhp|1 
 6 files changed, 896 insertions(+), 26 deletions(-)

New commits:
commit cc69c3dde48f5038567ae0b964b9ef9b5f302748
Author: Olivier Hallot 
AuthorDate: Tue Jun 16 23:57:06 2020 -0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jun 17 13:53:35 2020 +0200

tdf#134032 Calling Calc function from basic

Change-Id: I7c3c64e0df4d89b46e49afb869f3e2de0825a6e2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96485
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 7af288d0fa90e5e31c29014501f06f776a00366a)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96504
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk
index 6a53d6bea..6dcb58d11 100644
--- a/AllLangHelp_sbasic.mk
+++ b/AllLangHelp_sbasic.mk
@@ -358,6 +358,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\
 helpcontent2/source/text/sbasic/shared/03170010 \
 helpcontent2/source/text/sbasic/shared/05060700 \
 helpcontent2/source/text/sbasic/shared/code-stubs \
+helpcontent2/source/text/sbasic/shared/calc_functions \
 helpcontent2/source/text/sbasic/shared/classmodule \
 helpcontent2/source/text/sbasic/shared/compatible \
 helpcontent2/source/text/sbasic/shared/compatibilitymode \
diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree
index 804b8613b..fc7df973d 100644
--- a/source/auxiliary/sbasic.tree
+++ b/source/auxiliary/sbasic.tree
@@ -50,6 +50,7 @@
 Comparison Operators
 Strings
 UNO 
Objects, Functions and Services
+Calling Calc functions
 Exclusive VBA 
functions
 Other 
Commands
 
diff --git a/source/text/sbasic/shared/03131600.xhp 
b/source/text/sbasic/shared/03131600.xhp
index ddf4fe234..b0c499b8c 100644
--- a/source/text/sbasic/shared/03131600.xhp
+++ b/source/text/sbasic/shared/03131600.xhp
@@ -33,7 +33,7 @@
 API;FunctionAccess
 
 
-CreateUnoService Function
+CreateUnoService Function
 Instantiates a 
Uno service with the ProcessServiceManager.
 
 
@@ -45,11 +45,11 @@
 
 
 Calc functions;API Service
-Calling Calc functions in Basic
-CreateUnoService function; Calling Calc 
functions
 
 Calling Calc functions 
in Basic:
+
 
+REM 
The code below does not work for add-in functions, which have a different 
calling procedure.
 Function MyVlook(item, InRange As Object, FromCol As 
Integer)
 Dim oService As Object
 oService = 
createUnoService("com.sun.star.sheet.FunctionAccess")
@@ -57,7 +57,7 @@
 MyVlook = oService.callFunction("VLOOKUP",Array(item, 
InRange, FromCol, True))
 End Function
 
-
+
 
 oIntrospection = CreateUnoService( 
"com.sun.star.beans.Introspection" )
 
@@ -78,5 +78,8 @@
 FileOpenDialog=files(0)
 End Function
 
+
+
+
 
 
diff --git a/source/text/sbasic/shared/calc_functions.xhp 
b/source/text/sbasic/shared/calc_functions.xhp
new file mode 100644
index 0..7f0169fd7
--- /dev/null
+++ b/source/text/sbasic/shared/calc_functions.xhp
@@ -0,0 +1,865 @@
+
+
+
+
+
+  
+Calling Calc Functions in Macros
+/text/sbasic/shared/calc_functions.xhp
+  
+
+
+
+calling Calc function;macros
+macros;calling Calc function
+createUNOservice function;calling Calc 
function
+API;addin.Analysis
+
+Calling Calc Functions
+In addition to the 
native BASIC functions, you can call Calc functions in your macros and 
scripts.
+Calling Internal Calc functions in Basic
+  Use the 
CreateUNOService function to access the 
com.sun.star.sheet.FunctionAccess service.
+
+
+Calling Add-In Calc Functions in BASIC
+The Calc Add-In 
functions are in service 
com.sun.star.sheet.addin.Analysis.
+  
+
+REM Example calling Addin 
function SQRTPI
+Function MySQRTPI(arg as 
double) as double
+   Dim oService as 
Object
+   oService = 
createUNOService("com.sun.star.sheet.addin.Analysis")
+   MySQRTPI = 
oService.getSqrtPi(arg)
+End Function
+
+
+
+
+
+Calc Function name
+
+
+UNO service  name
+
+
+
+
+ACCRINT
+
+
+com.sun.star.sheet.addin.Analysis.getAccrint
+
+
+
+
+ACCRINTM
+
+
+com.sun.star.sheet.addin.Analysis.getAccrintm
+
+
+
+
+AMORDEGRC
+
+
+com.sun.star.sheet.addin.Analysis.getAmordegrc
+
+
+
+
+AMORLINC
+
+
+com.sun.star.sheet.addin.Analysis.get

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

[Olivier Hallot (via logerrit)]

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

New commits:
commit bfa1b9b27bf4835b6589bf809076c3bb07d06234
Author: Olivier Hallot 
AuthorDate: Wed Jun 17 08:53:35 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Wed Jun 17 13:53:35 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to cc69c3dde48f5038567ae0b964b9ef9b5f302748
  - tdf#134032 Calling Calc function from basic

Change-Id: I7c3c64e0df4d89b46e49afb869f3e2de0825a6e2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96485
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 7af288d0fa90e5e31c29014501f06f776a00366a)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96504
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index dd0e652538a4..cc69c3dde48f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit dd0e652538a4bf17352c5aa47ac7ef14f222fd2e
+Subproject commit cc69c3dde48f5038567ae0b964b9ef9b5f302748
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth (via logerrit)]

 sw/source/uibase/docvw/edtwin.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit df4585686eb56d95a871dd528ad06fd980a58591
Author: Justin Luth 
AuthorDate: Wed Jun 17 09:00:33 2020 +0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jun 17 13:49:08 2020 +0200

tdf#134023 sw ui: stay at footer ONLY when showing control

This adds a missing piece to LO 6.4's
commit 342a5890dbcddccb4013e201e3ff3d9e6967e733

That tdf#84929 commit message suggested:
  One additional limitation could be added to only apply this
  if it is dealing with the footer, since in the case of a
  header there would be no screen-jump.

and this bug report shows why that is necessary.
I'm not sure why I didn't apply that immediately.
Perhaps to help identify situations where the entire
concept might be bad?

Change-Id: Icea861bec45262eed88c38bb7eea910289c06870
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96487
Tested-by: Justin Luth 
Reviewed-by: Justin Luth 
(cherry picked from commit c3cf3e908add6b6617eb0ee12385fbd8a70a9887)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96494
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index dda54d5ae71e..507919f601d7 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -2821,10 +2821,12 @@ void SwEditWin::MouseButtonDown(const MouseEvent& 
_rMEvt)
 // Repaint everything
 Invalidate();
 
-// If the control had not been showing, do not return to 
the cursor position,
+// tdf#84929. If the footer control had not been showing, 
do not change the cursor position,
 // because the user may have scrolled to turn on the 
separator control and
-// if the cursor is now off-screen, then the user would 
need to scroll back again to use the control.
-if ( !bSeparatorWasVisible && 
rSh.GetViewOptions()->IsUseHeaderFooterMenu() && 
!Application::IsHeadlessModeEnabled() )
+// if the cursor cannot be positioned on-screen, then the 
user would need to scroll back again to use the control.
+// This should only be done for the footer. The cursor can 
always be re-positioned near the header. tdf#134023.
+if ( eControl == FrameControlType::Footer && 
!bSeparatorWasVisible
+ && rSh.GetViewOptions()->IsUseHeaderFooterMenu() && 
!Application::IsHeadlessModeEnabled() )
 return;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: unexpected EOF error: WinResTarget.mk

[Chetan Aru]

Hi Eike,

Thanks, this option is indeed helping.

On Wed, 17 Jun 2020 at 4:21 PM, Eike Rathke  wrote:

> Hi Chetan,
>
> On Wednesday, 2020-06-17 12:47:04 +0530, Chetan Aru wrote:
>
> > Suspect this is because OOO_VENDOR environment variable. It somehow has
> > ‘machinename$’ in it. And suspect $ has something to do with it.
> > Where does this get populated from?
>
> See ./configure
>
> If you use the ./autogen.sh --with-vendor=... option it gets populated
> with that value, otherwise the $USERNAME environment variable is taken
> and if that is empty then the output of `id -u -n` which is supposed to
> return the effective user name.
>
> So check whatever is wrong in your ./autogen.sh call or on your system,
> "machinename$" is odd.
>
>   Eike
>
> --
> GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563
> 2D3A
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 987c0f49263d01c66d388896286519326cfc254d
Author: Olivier Hallot 
AuthorDate: Wed Jun 17 08:38:36 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Wed Jun 17 13:38:36 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 7af288d0fa90e5e31c29014501f06f776a00366a
  - tdf#134032 Calling Calc function from basic

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

diff --git a/helpcontent2 b/helpcontent2
index 8eb924f68ccb..7af288d0fa90 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8eb924f68ccbee88e782c135a79c675b8927f73a
+Subproject commit 7af288d0fa90e5e31c29014501f06f776a00366a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

 AllLangHelp_sbasic.mk|1 
 source/auxiliary/sbasic.tree |1 
 source/text/sbasic/shared/03131600.xhp   |   11 
 source/text/sbasic/shared/calc_functions.xhp |  865 +++
 source/text/scalc/01/04060115.xhp|   43 -
 source/text/scalc/01/04060116.xhp|1 
 6 files changed, 896 insertions(+), 26 deletions(-)

New commits:
commit 7af288d0fa90e5e31c29014501f06f776a00366a
Author: Olivier Hallot 
AuthorDate: Tue Jun 16 23:57:06 2020 -0300
Commit: Olivier Hallot 
CommitDate: Wed Jun 17 13:38:36 2020 +0200

tdf#134032 Calling Calc function from basic

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

diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk
index 6a53d6bea..6dcb58d11 100644
--- a/AllLangHelp_sbasic.mk
+++ b/AllLangHelp_sbasic.mk
@@ -358,6 +358,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\
 helpcontent2/source/text/sbasic/shared/03170010 \
 helpcontent2/source/text/sbasic/shared/05060700 \
 helpcontent2/source/text/sbasic/shared/code-stubs \
+helpcontent2/source/text/sbasic/shared/calc_functions \
 helpcontent2/source/text/sbasic/shared/classmodule \
 helpcontent2/source/text/sbasic/shared/compatible \
 helpcontent2/source/text/sbasic/shared/compatibilitymode \
diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree
index 804b8613b..fc7df973d 100644
--- a/source/auxiliary/sbasic.tree
+++ b/source/auxiliary/sbasic.tree
@@ -50,6 +50,7 @@
 Comparison Operators
 Strings
 UNO 
Objects, Functions and Services
+Calling Calc functions
 Exclusive VBA 
functions
 Other 
Commands
 
diff --git a/source/text/sbasic/shared/03131600.xhp 
b/source/text/sbasic/shared/03131600.xhp
index ddf4fe234..b0c499b8c 100644
--- a/source/text/sbasic/shared/03131600.xhp
+++ b/source/text/sbasic/shared/03131600.xhp
@@ -33,7 +33,7 @@
 API;FunctionAccess
 
 
-CreateUnoService Function
+CreateUnoService Function
 Instantiates a 
Uno service with the ProcessServiceManager.
 
 
@@ -45,11 +45,11 @@
 
 
 Calc functions;API Service
-Calling Calc functions in Basic
-CreateUnoService function; Calling Calc 
functions
 
 Calling Calc functions 
in Basic:
+
 
+REM 
The code below does not work for add-in functions, which have a different 
calling procedure.
 Function MyVlook(item, InRange As Object, FromCol As 
Integer)
 Dim oService As Object
 oService = 
createUnoService("com.sun.star.sheet.FunctionAccess")
@@ -57,7 +57,7 @@
 MyVlook = oService.callFunction("VLOOKUP",Array(item, 
InRange, FromCol, True))
 End Function
 
-
+
 
 oIntrospection = CreateUnoService( 
"com.sun.star.beans.Introspection" )
 
@@ -78,5 +78,8 @@
 FileOpenDialog=files(0)
 End Function
 
+
+
+
 
 
diff --git a/source/text/sbasic/shared/calc_functions.xhp 
b/source/text/sbasic/shared/calc_functions.xhp
new file mode 100644
index 0..7f0169fd7
--- /dev/null
+++ b/source/text/sbasic/shared/calc_functions.xhp
@@ -0,0 +1,865 @@
+
+
+
+
+
+  
+Calling Calc Functions in Macros
+/text/sbasic/shared/calc_functions.xhp
+  
+
+
+
+calling Calc function;macros
+macros;calling Calc function
+createUNOservice function;calling Calc 
function
+API;addin.Analysis
+
+Calling Calc Functions
+In addition to the 
native BASIC functions, you can call Calc functions in your macros and 
scripts.
+Calling Internal Calc functions in Basic
+  Use the 
CreateUNOService function to access the 
com.sun.star.sheet.FunctionAccess service.
+
+
+Calling Add-In Calc Functions in BASIC
+The Calc Add-In 
functions are in service 
com.sun.star.sheet.addin.Analysis.
+  
+
+REM Example calling Addin 
function SQRTPI
+Function MySQRTPI(arg as 
double) as double
+   Dim oService as 
Object
+   oService = 
createUNOService("com.sun.star.sheet.addin.Analysis")
+   MySQRTPI = 
oService.getSqrtPi(arg)
+End Function
+
+
+
+
+
+Calc Function name
+
+
+UNO service  name
+
+
+
+
+ACCRINT
+
+
+com.sun.star.sheet.addin.Analysis.getAccrint
+
+
+
+
+ACCRINTM
+
+
+com.sun.star.sheet.addin.Analysis.getAccrintm
+
+
+
+
+AMORDEGRC
+
+
+com.sun.star.sheet.addin.Analysis.getAmordegrc
+
+
+
+
+AMORLINC
+
+
+com.sun.star.sheet.addin.Analysis.getAmorlinc
+
+
+
+
+BESSELI
+
+
+com.sun.star.sheet.addin.Analysis.getBesseli
+
+
+
+
+BE

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 4c0ff2829a2afa76c0709d22bec5002a4fcd3104
Author: Johnny_M 
AuthorDate: Wed Jun 17 13:13:49 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Jun 17 13:13:49 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 8eb924f68ccbee88e782c135a79c675b8927f73a
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index be0cdbd01369..8eb924f68ccb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit be0cdbd01369daeef3e41c0870f9637bf84343a5
+Subproject commit 8eb924f68ccbee88e782c135a79c675b8927f73a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/0309.xhp |2 +-
 source/text/sbasic/shared/03090300.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit be0cdbd01369daeef3e41c0870f9637bf84343a5
Author: Johnny_M 
AuthorDate: Tue Jun 16 14:29:55 2020 +0200
Commit: Olivier Hallot 
CommitDate: Wed Jun 17 13:13:16 2020 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/sbasic/shared/0309.xhp 
b/source/text/sbasic/shared/0309.xhp
index fbb8139f3..25ef80889 100644
--- a/source/text/sbasic/shared/0309.xhp
+++ b/source/text/sbasic/shared/0309.xhp
@@ -39,7 +39,7 @@
   A program 
generally executes from the first line of code to the last line of code. You 
can also execute certain procedures within the program according to specific 
conditions, or repeat a section of the program within a sub-procedure or 
function. You can use loops to repeat parts of a program as many times as 
necessary, or until a certain condition is met. These type of control 
statements are classified as Condition, Loop, or Jump statements.
   
   
-  
+  
   
  
 
diff --git a/source/text/sbasic/shared/03090300.xhp 
b/source/text/sbasic/shared/03090300.xhp
index c0d96aa8d..c4e2a5e62 100644
--- a/source/text/sbasic/shared/03090300.xhp
+++ b/source/text/sbasic/shared/03090300.xhp
@@ -32,7 +32,7 @@
 
   
   
-  
+  
   Jumps
   The 
following statements execute jumps.
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/0003.xhp |2 +-
 source/text/sbasic/shared/0100.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8eb924f68ccbee88e782c135a79c675b8927f73a
Author: Johnny_M 
AuthorDate: Tue Jun 16 14:37:48 2020 +0200
Commit: Olivier Hallot 
CommitDate: Wed Jun 17 13:13:49 2020 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/sbasic/shared/0003.xhp 
b/source/text/sbasic/shared/0003.xhp
index efa7db761..1f25f8290 100644
--- a/source/text/sbasic/shared/0003.xhp
+++ b/source/text/sbasic/shared/0003.xhp
@@ -36,7 +36,7 @@
 The same 
applies to the locale settings for date, time and currency formats. The Basic 
format code will be interpreted and displayed according to your locale 
setting.
 
 
-
+
 The color 
values of the 16 basic colors are as follows:
 
 
diff --git a/source/text/sbasic/shared/0100.xhp 
b/source/text/sbasic/shared/0100.xhp
index 37d02f0ef..786937634 100644
--- a/source/text/sbasic/shared/0100.xhp
+++ b/source/text/sbasic/shared/0100.xhp
@@ -32,7 +32,7 @@
 
   
   
-  
+  
   Programming with $[officename] Basic 
   This is 
where you find general information about working with macros and $[officename] 
Basic.
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit b670fa80242cae44b6f824ae03ebf5bae348539b
Author: Johnny_M 
AuthorDate: Wed Jun 17 13:13:16 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Jun 17 13:13:16 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to be0cdbd01369daeef3e41c0870f9637bf84343a5
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 424385e09992..be0cdbd01369 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 424385e099927a3b91b9499bf4910af317699dd1
+Subproject commit be0cdbd01369daeef3e41c0870f9637bf84343a5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 3a9737e82ffa9bc787977a0c26404ab6f20df47b
Author: Johnny_M 
AuthorDate: Wed Jun 17 13:12:41 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Jun 17 13:12:41 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 424385e099927a3b91b9499bf4910af317699dd1
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index de054848fdd9..424385e09992 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit de054848fdd963bad31e2d6d065cb570b365925b
+Subproject commit 424385e099927a3b91b9499bf4910af317699dd1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/0103.xhp |2 +-
 source/text/sbasic/shared/01030400.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 424385e099927a3b91b9499bf4910af317699dd1
Author: Johnny_M 
AuthorDate: Tue Jun 16 14:34:14 2020 +0200
Commit: Olivier Hallot 
CommitDate: Wed Jun 17 13:12:41 2020 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/sbasic/shared/0103.xhp 
b/source/text/sbasic/shared/0103.xhp
index bfc4c77c0..c0b00fbbc 100644
--- a/source/text/sbasic/shared/0103.xhp
+++ b/source/text/sbasic/shared/0103.xhp
@@ -38,7 +38,7 @@
 This section 
describes the Integrated Development Environment for $[officename] 
Basic.
 
 
-
+
 
 
 
diff --git a/source/text/sbasic/shared/01030400.xhp 
b/source/text/sbasic/shared/01030400.xhp
index 73f4ccdaa..bdf594ae3 100644
--- a/source/text/sbasic/shared/01030400.xhp
+++ b/source/text/sbasic/shared/01030400.xhp
@@ -24,7 +24,7 @@
 
 
 
-
+
 
 libraries;organizing
 libraries;containers
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/0307.xhp |2 +-
 source/text/sbasic/shared/03070100.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit de054848fdd963bad31e2d6d065cb570b365925b
Author: Johnny_M 
AuthorDate: Tue Jun 16 14:23:51 2020 +0200
Commit: Olivier Hallot 
CommitDate: Wed Jun 17 13:11:00 2020 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/sbasic/shared/0307.xhp 
b/source/text/sbasic/shared/0307.xhp
index 508efa894..b78baf68a 100644
--- a/source/text/sbasic/shared/0307.xhp
+++ b/source/text/sbasic/shared/0307.xhp
@@ -37,7 +37,7 @@
   The 
following mathematical operators are supported in $[officename] 
Basic.
   
   This chapter 
provides a short overview of all of the arithmetical operators that you may 
need for calculations within a program.
-  
+  
   
   
   
diff --git a/source/text/sbasic/shared/03070100.xhp 
b/source/text/sbasic/shared/03070100.xhp
index f2d94d433..f54561edb 100644
--- a/source/text/sbasic/shared/03070100.xhp
+++ b/source/text/sbasic/shared/03070100.xhp
@@ -28,7 +28,7 @@
 
 
 
-
+
 
   "-" operator (mathematical)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 9dbd2c88e43e9c1c18d7d66e7d5b71d04fe1a926
Author: Johnny_M 
AuthorDate: Wed Jun 17 13:11:00 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Jun 17 13:11:00 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to de054848fdd963bad31e2d6d065cb570b365925b
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 0213f0c63b7c..de054848fdd9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0213f0c63b7ce0b8ed055bf81549b11ca7da54d1
+Subproject commit de054848fdd963bad31e2d6d065cb570b365925b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit a5bc51d870594bb720d31bb914187c3567310784
Author: Johnny_M 
AuthorDate: Wed Jun 17 13:10:33 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Jun 17 13:10:33 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 0213f0c63b7ce0b8ed055bf81549b11ca7da54d1
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index f0c1fbca3e72..0213f0c63b7c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f0c1fbca3e7262493d3384a93adebf9b3bb68a8f
+Subproject commit 0213f0c63b7ce0b8ed055bf81549b11ca7da54d1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/0308.xhp |4 ++--
 source/text/sbasic/shared/03080600.xhp |2 +-
 source/text/sbasic/shared/03080700.xhp |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0213f0c63b7ce0b8ed055bf81549b11ca7da54d1
Author: Johnny_M 
AuthorDate: Tue Jun 16 14:27:59 2020 +0200
Commit: Olivier Hallot 
CommitDate: Wed Jun 17 13:10:33 2020 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/sbasic/shared/0308.xhp 
b/source/text/sbasic/shared/0308.xhp
index 14ae28acd..5be4c6704 100644
--- a/source/text/sbasic/shared/0308.xhp
+++ b/source/text/sbasic/shared/0308.xhp
@@ -41,8 +41,8 @@
   
   
   
-  
-  
+  
+  
   
  
 
diff --git a/source/text/sbasic/shared/03080600.xhp 
b/source/text/sbasic/shared/03080600.xhp
index 416e2964d..ec743146f 100644
--- a/source/text/sbasic/shared/03080600.xhp
+++ b/source/text/sbasic/shared/03080600.xhp
@@ -32,7 +32,7 @@
 
   
   
-  
+  
   Absolute 
Values
   This 
function returns absolute values.
   
diff --git a/source/text/sbasic/shared/03080700.xhp 
b/source/text/sbasic/shared/03080700.xhp
index 789135e9b..d578e1cdf 100644
--- a/source/text/sbasic/shared/03080700.xhp
+++ b/source/text/sbasic/shared/03080700.xhp
@@ -32,7 +32,7 @@
 
   
   
-  
+  
   Expression 
Signs
   This 
function returns the algebraic sign of a numeric expression.
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 34da8aaa311afb71c1025ccd006f711330a4eb0b
Author: Johnny_M 
AuthorDate: Wed Jun 17 13:09:56 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Jun 17 13:09:56 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to f0c1fbca3e7262493d3384a93adebf9b3bb68a8f
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 86accd858a35..f0c1fbca3e72 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 86accd858a3597ce0eb69040299af4dee1c74038
+Subproject commit f0c1fbca3e7262493d3384a93adebf9b3bb68a8f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 0c38d85e56aee90c335e975d4385ed07e272a53c
Author: Johnny_M 
AuthorDate: Wed Jun 17 13:08:49 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Jun 17 13:08:49 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 86accd858a3597ce0eb69040299af4dee1c74038
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 97ba99e57552..86accd858a35 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 97ba99e57552181ef93b1041ecbabd5b43bdd409
+Subproject commit 86accd858a3597ce0eb69040299af4dee1c74038
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/0307.xhp |2 +-
 source/text/sbasic/shared/03070500.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f0c1fbca3e7262493d3384a93adebf9b3bb68a8f
Author: Johnny_M 
AuthorDate: Tue Jun 16 13:58:57 2020 +0200
Commit: Olivier Hallot 
CommitDate: Wed Jun 17 13:09:56 2020 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/sbasic/shared/0307.xhp 
b/source/text/sbasic/shared/0307.xhp
index 56d84658c..508efa894 100644
--- a/source/text/sbasic/shared/0307.xhp
+++ b/source/text/sbasic/shared/0307.xhp
@@ -41,7 +41,7 @@
   
   
   
-  
+  
   
  
 
diff --git a/source/text/sbasic/shared/03070500.xhp 
b/source/text/sbasic/shared/03070500.xhp
index 798cf06c2..e69cee190 100644
--- a/source/text/sbasic/shared/03070500.xhp
+++ b/source/text/sbasic/shared/03070500.xhp
@@ -28,7 +28,7 @@
 
 
 
-
+
 
   "^" operator (mathematical)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/0300.xhp |2 +-
 source/text/sbasic/shared/0305.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 86accd858a3597ce0eb69040299af4dee1c74038
Author: Johnny_M 
AuthorDate: Tue Jun 16 13:54:08 2020 +0200
Commit: Olivier Hallot 
CommitDate: Wed Jun 17 13:08:49 2020 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/sbasic/shared/0300.xhp 
b/source/text/sbasic/shared/0300.xhp
index a604f3bb9..2f667e12a 100644
--- a/source/text/sbasic/shared/0300.xhp
+++ b/source/text/sbasic/shared/0300.xhp
@@ -37,7 +37,7 @@
 
 
 
-
+
 
 
 
diff --git a/source/text/sbasic/shared/0305.xhp 
b/source/text/sbasic/shared/0305.xhp
index 3c72c3ebf..36ae4e2da 100644
--- a/source/text/sbasic/shared/0305.xhp
+++ b/source/text/sbasic/shared/0305.xhp
@@ -27,7 +27,7 @@
 
   
 
-  
+  
   Error-Handling Functions
   Use the 
following statements and functions to define the way %PRODUCTNAME Basic reacts 
to run-time errors.
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit dc9ed124f23bdcebf1650448f3835abbba8b259d
Author: Johnny_M 
AuthorDate: Wed Jun 17 13:08:01 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Jun 17 13:08:01 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 97ba99e57552181ef93b1041ecbabd5b43bdd409
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 38e1dd4f2933..97ba99e57552 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 38e1dd4f293343ebdb3104405a7b96041d4f2e84
+Subproject commit 97ba99e57552181ef93b1041ecbabd5b43bdd409
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/0300.xhp |4 ++--
 source/text/sbasic/shared/0307.xhp |2 +-
 source/text/sbasic/shared/0308.xhp |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 97ba99e57552181ef93b1041ecbabd5b43bdd409
Author: Johnny_M 
AuthorDate: Tue Jun 16 14:45:16 2020 +0200
Commit: Olivier Hallot 
CommitDate: Wed Jun 17 13:08:01 2020 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/sbasic/shared/0300.xhp 
b/source/text/sbasic/shared/0300.xhp
index 61107a52d..a604f3bb9 100644
--- a/source/text/sbasic/shared/0300.xhp
+++ b/source/text/sbasic/shared/0300.xhp
@@ -39,8 +39,8 @@
 
 
 
-
-
+
+
 
 
 
diff --git a/source/text/sbasic/shared/0307.xhp 
b/source/text/sbasic/shared/0307.xhp
index ecf4df3bd..56d84658c 100644
--- a/source/text/sbasic/shared/0307.xhp
+++ b/source/text/sbasic/shared/0307.xhp
@@ -32,7 +32,7 @@
 
   
   
-  
+  
   Mathematical Operators
   The 
following mathematical operators are supported in $[officename] 
Basic.
   
diff --git a/source/text/sbasic/shared/0308.xhp 
b/source/text/sbasic/shared/0308.xhp
index b82bc21f0..14ae28acd 100644
--- a/source/text/sbasic/shared/0308.xhp
+++ b/source/text/sbasic/shared/0308.xhp
@@ -32,7 +32,7 @@
 
   
   
-  
+  
   Numeric 
Functions
   The 
following numeric functions perform calculations. Mathematical and Boolean 
operators are described in a separate section. Functions differ from operators 
in that functions pass arguments and return a result, instead of operators that 
return a result by combining two numeric expressions.
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit fb1d77cab37aef958ef213767a7871934c48dac6
Author: Johnny_M 
AuthorDate: Wed Jun 17 13:07:20 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Jun 17 13:07:20 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 38e1dd4f293343ebdb3104405a7b96041d4f2e84
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 666ef2f8304a..38e1dd4f2933 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 666ef2f8304a6a2f37d8bb0afd8630baea0cc3ec
+Subproject commit 38e1dd4f293343ebdb3104405a7b96041d4f2e84
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/02/1102.xhp |4 ++--
 source/text/sbasic/shared/main0211.xhp|4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 38e1dd4f293343ebdb3104405a7b96041d4f2e84
Author: Johnny_M 
AuthorDate: Tue Jun 16 14:48:16 2020 +0200
Commit: Olivier Hallot 
CommitDate: Wed Jun 17 13:07:20 2020 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/sbasic/shared/02/1102.xhp 
b/source/text/sbasic/shared/02/1102.xhp
index eb78c2348..ce53ee438 100644
--- a/source/text/sbasic/shared/02/1102.xhp
+++ b/source/text/sbasic/shared/02/1102.xhp
@@ -29,12 +29,12 @@
 
 
 
-  
+  
 
 Compile
   Compiles the Basic macro. 
You need to compile a macro after you make changes to it, or if the macro uses 
single or procedure steps.
   
-  
+  
   
 
 
diff --git a/source/text/sbasic/shared/main0211.xhp 
b/source/text/sbasic/shared/main0211.xhp
index b960b910c..18344f360 100644
--- a/source/text/sbasic/shared/main0211.xhp
+++ b/source/text/sbasic/shared/main0211.xhp
@@ -38,8 +38,8 @@
   
   
   
-  
-  
+  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/sbasic/shared/0105.xhp|4 ++--
 source/text/sbasic/shared/01050100.xhp|2 +-
 source/text/sbasic/shared/01050200.xhp|2 +-
 source/text/sbasic/shared/02/1108.xhp |4 ++--
 source/text/sbasic/shared/main0211.xhp|4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 666ef2f8304a6a2f37d8bb0afd8630baea0cc3ec
Author: Johnny_M 
AuthorDate: Tue Jun 16 13:47:29 2020 +0200
Commit: Olivier Hallot 
CommitDate: Wed Jun 17 13:06:13 2020 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/sbasic/shared/0105.xhp 
b/source/text/sbasic/shared/0105.xhp
index 6ae469c36..d243b6102 100644
--- a/source/text/sbasic/shared/0105.xhp
+++ b/source/text/sbasic/shared/0105.xhp
@@ -38,8 +38,8 @@
 Opens the Basic IDE where you can write and edit 
macros.
 
 
-
-
+
+
 
 
 Commands From the Context menu of the Module Tabs
diff --git a/source/text/sbasic/shared/01050100.xhp 
b/source/text/sbasic/shared/01050100.xhp
index acbd67cb9..572fa6619 100644
--- a/source/text/sbasic/shared/01050100.xhp
+++ b/source/text/sbasic/shared/01050100.xhp
@@ -30,7 +30,7 @@
 
 
 
-
+
 Watch Window
 The Watch 
window allows you to observe the value of variables during the execution of a 
program. Define the variable in the Watch text box. Click on Enable Watch to add the 
variable to the list box and to display its values.
 
diff --git a/source/text/sbasic/shared/01050200.xhp 
b/source/text/sbasic/shared/01050200.xhp
index be2374454..ef0810332 100644
--- a/source/text/sbasic/shared/01050200.xhp
+++ b/source/text/sbasic/shared/01050200.xhp
@@ -30,7 +30,7 @@
 
 
 
-
+
 
 Call 
Stack Window (Calls)
 Displays the sequence 
of procedures and functions during the execution of a program. The 
Call Stack allows you to monitor the sequence of procedures and 
functions during the execution of a program. The procedures are functions are 
displayed bottom to top with the most recent function or procedure call at the 
top of the list.
diff --git a/source/text/sbasic/shared/02/1108.xhp 
b/source/text/sbasic/shared/02/1108.xhp
index dcb2355b6..98643b7db 100644
--- a/source/text/sbasic/shared/02/1108.xhp
+++ b/source/text/sbasic/shared/02/1108.xhp
@@ -30,13 +30,13 @@
 
 
 
-
+
 
 Enable 
Watch
 Click this icon to view the variables in a macro. The 
contents of the variable are displayed in a separate window.
 
 Click the name 
of a variable to select it, then click the Enable Watch icon. The 
value that is assigned to the variable is displayed next to its name. This 
value is constantly updated.
-
+
 
 
 
diff --git a/source/text/sbasic/shared/main0211.xhp 
b/source/text/sbasic/shared/main0211.xhp
index 85c48d171..b960b910c 100644
--- a/source/text/sbasic/shared/main0211.xhp
+++ b/source/text/sbasic/shared/main0211.xhp
@@ -54,8 +54,8 @@
   
   
   
-  
-  
+  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit 4b38cbf11ff3ec3d433614904a392c3964286fe0
Author: Johnny_M 
AuthorDate: Wed Jun 17 13:06:13 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Jun 17 13:06:13 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 666ef2f8304a6a2f37d8bb0afd8630baea0cc3ec
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 456d9b054d29..666ef2f8304a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 456d9b054d29362667b0f3acc391c46293312751
+Subproject commit 666ef2f8304a6a2f37d8bb0afd8630baea0cc3ec
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host/config_skia.h.in vcl/skia

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

 config_host/config_skia.h.in |1 -
 vcl/skia/gdiimpl.cxx |   15 ++-
 vcl/skia/salbmp.cxx  |3 ---
 vcl/skia/win/gdiimpl.cxx |2 +-
 4 files changed, 3 insertions(+), 18 deletions(-)

New commits:
commit 52a889241313da27eaeefc6493f8ee663abcb5dd
Author: Luboš Luňák 
AuthorDate: Wed Jun 17 13:01:45 2020 +0200
Commit: Luboš Luňák 
CommitDate: Wed Jun 17 13:03:19 2020 +0200

remove outdated Skia todo comments

Change-Id: Ib2a9e4c25421c20e52ee65b2ec8fb3a190bcb75b

diff --git a/config_host/config_skia.h.in b/config_host/config_skia.h.in
index f262161b1a46..5e24def6beaf 100644
--- a/config_host/config_skia.h.in
+++ b/config_host/config_skia.h.in
@@ -25,7 +25,6 @@ are the same.
 #define SKIA_USE_BITMAP32 0
 
 
-/* TODO SKIA check all these */
 
 #define SK_SUPPORT_GPU 1
 
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index 7acb0f35d07f..c9e420057fd4 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -881,20 +881,17 @@ bool SkiaSalGraphicsImpl::drawPolyLine(const 
basegfx::B2DHomMatrix& rObjectToDev
 
 bool SkiaSalGraphicsImpl::drawPolyLineBezier(sal_uInt32, const SalPoint*, 
const PolyFlags*)
 {
-// TODO?
 return false;
 }
 
 bool SkiaSalGraphicsImpl::drawPolygonBezier(sal_uInt32, const SalPoint*, const 
PolyFlags*)
 {
-// TODO?
 return false;
 }
 
 bool SkiaSalGraphicsImpl::drawPolyPolygonBezier(sal_uInt32, const sal_uInt32*,
 const SalPoint* const*, const 
PolyFlags* const*)
 {
-// TODO?
 return false;
 }
 
@@ -1250,11 +1247,7 @@ void SkiaSalGraphicsImpl::invert(sal_uInt32 nPoints, 
const SalPoint* pPointArray
 invert(aPolygon, eFlags);
 }
 
-bool SkiaSalGraphicsImpl::drawEPS(long, long, long, long, void*, sal_uInt32)
-{
-// TODO?
-return false;
-}
+bool SkiaSalGraphicsImpl::drawEPS(long, long, long, long, void*, sal_uInt32) { 
return false; }
 
 // Create SkImage from a bitmap and possibly an alpha mask (the usual VCL 
one-minus-alpha),
 // with the given target size. Result will be possibly cached, unless disabled.
@@ -1440,11 +1433,7 @@ bool SkiaSalGraphicsImpl::drawAlphaRect(long nX, long 
nY, long nWidth, long nHei
 return true;
 }
 
-bool SkiaSalGraphicsImpl::drawGradient(const tools::PolyPolygon&, const 
Gradient&)
-{
-// TODO?
-return false;
-}
+bool SkiaSalGraphicsImpl::drawGradient(const tools::PolyPolygon&, const 
Gradient&) { return false; }
 
 static double toRadian(int degree10th) { return (3600 - degree10th) * M_PI / 
1800.0; }
 static double toCos(int degree10th) { return 
SkScalarCos(toRadian(degree10th)); }
diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index 1bf0f77bfc2a..0474b4859405 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -164,7 +164,6 @@ bool SkiaSalBitmap::Create(const SalBitmap& rSalBmp, 
sal_uInt16 nNewBitCount)
 
 bool SkiaSalBitmap::Create(const 
css::uno::Reference&, Size&, bool)
 {
-// TODO?
 return false;
 }
 
@@ -276,7 +275,6 @@ bool SkiaSalBitmap::GetSystemData(BitmapSystemData&)
 #ifdef DBG_UTIL
 assert(mWriteAccessCount == 0);
 #endif
-// TODO?
 return false;
 }
 
@@ -336,7 +334,6 @@ bool SkiaSalBitmap::Replace(const Color&, const Color&, 
sal_uInt8)
 #ifdef DBG_UTIL
 assert(mWriteAccessCount == 0);
 #endif
-// TODO?
 return false;
 }
 
diff --git a/vcl/skia/win/gdiimpl.cxx b/vcl/skia/win/gdiimpl.cxx
index 6129c8e266da..94879d14bcac 100644
--- a/vcl/skia/win/gdiimpl.cxx
+++ b/vcl/skia/win/gdiimpl.cxx
@@ -324,7 +324,7 @@ sk_sp SkiaCompatibleDC::getAsImageDiff(const 
SkiaCompatibleDC& white) c
 // keep the alpha channel as transparent. Therefore the alpha is actually 
computed
 // from the difference in the premultiplied red channels when drawn one 
black and on white.
 // Alpha is computed as "alpha = 1.0 - abs(black.red - white.red)".
-// TODO I doubt this can be done using Skia, so do it manually here. 
Fortunately
+// I doubt this can be done using Skia, so do it manually here. Fortunately
 // the bitmaps should be fairly small and are cached.
 uint32_t* dest = tmpBitmap.getAddr32(0, 0);
 assert(dest == tmpBitmap.getPixels());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Thorsten Wagner (via logerrit)]

 sc/source/ui/app/inputwin.cxx |   17 ++---
 vcl/source/window/toolbox.cxx |   12 +++-
 2 files changed, 17 insertions(+), 12 deletions(-)

New commits:
commit f24e64e8b55b695565109a6742598bcc90e4d9d0
Author: Thorsten Wagner 
AuthorDate: Tue Jun 16 00:28:41 2020 +0200
Commit: Heiko Tietze 
CommitDate: Wed Jun 17 12:57:50 2020 +0200

tdf#133692: Spacing within Calc formulabar reworked

Change-Id: I4f590589fdc390bfa11f7db86e65ccab3dd084fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96403
Tested-by: Jenkins
Tested-by: Andreas Kainz 
Tested-by: Heiko Tietze 
Reviewed-by: Heiko Tietze 

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 58a8a9e861d1..9eb17bcee389 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -82,6 +82,7 @@ const long BUTTON_OFFSET = 2;// Space between 
input line and button
 const long MULTILINE_BUTTON_WIDTH = 20;  // Width of the button which opens 
multiline dropdown
 const long INPUTWIN_MULTILINES = 6;  // Initial number of lines within 
multiline dropdown
 const long TOOLBOX_WINDOW_HEIGHT = 22;   // Height of toolbox window in pixels 
- TODO: The same on all systems?
+const long POSITION_COMBOBOX_WIDTH = 18; // Width of position combobox in 
characters
 
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::UNO_QUERY;
@@ -163,7 +164,7 @@ static VclPtr lcl_chooseRuntimeImpl( 
vcl::Window* pParent, const
 
 ScInputWindow::ScInputWindow( vcl::Window* pParent, const SfxBindings* pBind ) 
:
 // With WB_CLIPCHILDREN otherwise we get flickering
-ToolBox ( pParent, WinBits(WB_CLIPCHILDREN) ),
+ToolBox ( pParent, WinBits(WB_CLIPCHILDREN | WB_BORDER | 
WB_NOSHADOW) ),
 aWndPos ( VclPtr::Create(this) ),
 pRuntimeWindow  ( lcl_chooseRuntimeImpl( this, pBind ) ),
 aTextWindow ( *pRuntimeWindow ),
@@ -204,11 +205,7 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, const 
SfxBindings* pBind ) :
 InsertItem  (SID_INPUT_OK,   Image(StockImage::Yes, 
RID_BMP_INPUT_OK), ToolBoxItemBits::NONE, 6);
 }
 
-if (!comphelper::LibreOfficeKit::isActive())
-{
-InsertSeparator (7);
-}
-InsertWindow(7, &aTextWindow, ToolBoxItemBits::NONE, 8);
+InsertWindow(7, &aTextWindow, ToolBoxItemBits::NONE, 7);
 SetDropdownClickHdl( LINK( this, ScInputWindow, DropdownClickHdl ));
 
 if (!comphelper::LibreOfficeKit::isActive())
@@ -2116,7 +2113,13 @@ ScPosWnd::ScPosWnd(vcl::Window* pParent)
 , nTipVisible(nullptr)
 , bFormulaMode(false)
 {
-m_xWidget->set_entry_width_chars(15);
+
+// Use calculation according to tdf#132338 to align combobox width to 
width of fontname comboxbox within formatting toolbar;
+// formatting toolbar is placed above formulabar when using multiple 
toolbars typically
+
+m_xWidget->set_entry_width_chars(1);
+Size aSize(LogicToPixel(Size(POSITION_COMBOBOX_WIDTH * 4, 0), 
MapMode(MapUnit::MapAppFont)));
+m_xWidget->set_size_request(aSize.Width(), -1);
 SetSizePixel(m_xContainer->get_preferred_size());
 
 FillRangeNames();
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 182c085a152e..8ddb536f7bb4 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -189,10 +189,10 @@ void ToolBox::ImplCalcBorder( WindowAlign eAlign, long& 
rLeft, long& rTop,
 ImplDockingWindowWrapper *pWrapper = 
ImplGetDockingManager()->GetDockingWindowWrapper( this );
 
 // reserve DragArea only for dockable toolbars
-intdragwidth = ( pWrapper && !pWrapper->IsLocked() ) ? 
ImplGetDragWidth() : 0;
+int dragwidth = ( pWrapper && !pWrapper->IsLocked() ) ? ImplGetDragWidth() 
: 0;
 
-// no shadow border for dockable toolbars
-intborderwidth = pWrapper ? 0: 2;
+// no shadow border for dockable toolbars and toolbars with WB_NOSHADOW 
bit set, e.g. Calc's formulabar
+int borderwidth = ( pWrapper || mnWinStyle & WB_NOSHADOW ) ? 0 : 2;
 
 if ( eAlign == WindowAlign::Top )
 {
@@ -551,8 +551,10 @@ void ToolBox::ImplDrawBorder(vcl::RenderContext& 
rRenderContext)
 
 ImplDockingWindowWrapper* pWrapper = 
ImplGetDockingManager()->GetDockingWindowWrapper(this);
 
-// draw borders for ordinary toolbars only (not dockable)
-if( pWrapper )
+// draw borders for ordinary toolbars only (not dockable), do not draw 
borders for toolbars with WB_NOSHADOW bit set,
+// e.g. Calc's formulabar
+
+if( pWrapper || mnWinStyle & WB_NOSHADOW )
 return;
 
 if (meAlign == WindowAlign::Bottom)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar (via logerrit)]

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

New commits:
commit 0e2ac129c8d149b6071548eeb9d9e0016b6120d8
Author: Andras Timar 
AuthorDate: Wed Jun 17 12:55:40 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Jun 17 12:55:40 2020 +0200

Update git submodules

* Update translations from branch 'libreoffice-7-0'
  to 3b2a6b526022924a448fdcb3508245e4783b50e7
  - Updated Slovenian translation

Change-Id: I4cb2d2e033980088a74325d6d6d9c3d45e13dc54

diff --git a/translations b/translations
index 61ae324a5285..3b2a6b526022 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 61ae324a5285cefb659db03d1f69134182ff9532
+Subproject commit 3b2a6b526022924a448fdcb3508245e4783b50e7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-7-0' - source/sl

[Andras Timar (via logerrit)]

 source/sl/cui/messages.po   |  151 +-
 source/sl/helpcontent2/source/text/scalc/01.po  |  674 
--
 source/sl/helpcontent2/source/text/shared/00.po |4 
 source/sl/helpcontent2/source/text/shared/01.po |4 
 source/sl/helpcontent2/source/text/shared/04.po |   44 
 source/sl/helpcontent2/source/text/shared/06.po |4 
 source/sl/helpcontent2/source/text/shared/guide.po  |   42 
 source/sl/helpcontent2/source/text/shared/optionen.po   |4 
 source/sl/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po |6 
 source/sl/sc/messages.po|   22 
 source/sl/sd/messages.po|   62 
 source/sl/svtools/messages.po   |  168 +-
 source/sl/svx/messages.po   |   14 
 source/sl/sw/messages.po|   30 
 source/sl/vcl/messages.po   |   22 
 15 files changed, 641 insertions(+), 610 deletions(-)

New commits:
commit 3b2a6b526022924a448fdcb3508245e4783b50e7
Author: Andras Timar 
AuthorDate: Wed Jun 17 12:55:32 2020 +0200
Commit: Andras Timar 
CommitDate: Wed Jun 17 12:55:32 2020 +0200

Updated Slovenian translation

Change-Id: I4cb2d2e033980088a74325d6d6d9c3d45e13dc54

diff --git a/source/sl/cui/messages.po b/source/sl/cui/messages.po
index c435366abfe..099cea5b327 100644
--- a/source/sl/cui/messages.po
+++ b/source/sl/cui/messages.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 7.0\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2020-05-28 23:19+0200\n"
-"PO-Revision-Date: 2020-05-24 15:51+0200\n"
+"POT-Creation-Date: 2020-06-15 09:44+0200\n"
+"PO-Revision-Date: 2020-06-17 10:12+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -1470,242 +1470,247 @@ msgid "Format ordinal numbers suffixes (1st -> 1^st)"
 msgstr "Oblikuj pripone vrstilnih števnikov (1st -> 1^st)"
 
 #: cui/inc/strings.hrc:334
+msgctxt "RID_SVXSTR_OLD_HUNGARIAN"
+msgid "Transliterate to Old Hungarian if the text direction is from right to 
left"
+msgstr "Prečrkuj staro madžarsko besedilo, če poteka od desne proti levi"
+
+#: cui/inc/strings.hrc:335
 msgctxt "RID_SVXSTR_DEL_EMPTY_PARA"
 msgid "Remove blank paragraphs"
 msgstr "Odstrani prazne odstavke"
 
-#: cui/inc/strings.hrc:335
+#: cui/inc/strings.hrc:336
 msgctxt "RID_SVXSTR_USER_STYLE"
 msgid "Replace Custom Styles"
 msgstr "Zamenjaj sloge po meri"
 
-#: cui/inc/strings.hrc:336
+#: cui/inc/strings.hrc:337
 msgctxt "RID_SVXSTR_BULLET"
 msgid "Replace bullets with: %1"
 msgstr "Zamenjaj vrstične oznake z: %1"
 
 #. To translators: %1 will be replaced with a percentage, e.g. "10%"
-#: cui/inc/strings.hrc:338
+#: cui/inc/strings.hrc:339
 msgctxt "RID_SVXSTR_RIGHT_MARGIN"
 msgid "Combine single line paragraphs if length greater than %1"
 msgstr "Združi enovrstične odstavke, če je dolžina večja od %1"
 
-#: cui/inc/strings.hrc:339
+#: cui/inc/strings.hrc:340
 msgctxt "RID_SVXSTR_NUM"
 msgid "Bulleted and numbered lists. Bullet symbol: %1"
 msgstr "Označeni in oštevilčeni seznami. Simbol za oznako: %1"
 
-#: cui/inc/strings.hrc:340
+#: cui/inc/strings.hrc:341
 msgctxt "RID_SVXSTR_BORDER"
 msgid "Apply border"
 msgstr "Uporabi robove"
 
-#: cui/inc/strings.hrc:341
+#: cui/inc/strings.hrc:342
 msgctxt "RID_SVXSTR_CREATE_TABLE"
 msgid "Create table"
 msgstr "Ustvari tabelo"
 
-#: cui/inc/strings.hrc:342
+#: cui/inc/strings.hrc:343
 msgctxt "RID_SVXSTR_REPLACE_TEMPLATES"
 msgid "Apply Styles"
 msgstr "Uporabi sloge"
 
-#: cui/inc/strings.hrc:343
+#: cui/inc/strings.hrc:344
 msgctxt "RID_SVXSTR_DEL_SPACES_AT_STT_END"
 msgid "Delete spaces and tabs at beginning and end of paragraph"
 msgstr "Izbriši presledke in tabulatorje na začetku in koncu odstavka"
 
-#: cui/inc/strings.hrc:344
+#: cui/inc/strings.hrc:345
 msgctxt "RID_SVXSTR_DEL_SPACES_BETWEEN_LINES"
 msgid "Delete spaces and tabs at end and start of line"
 msgstr "Izbriši presledke in tabulatorje na začetku in koncu vrstice"
 
-#: cui/inc/strings.hrc:345
+#: cui/inc/strings.hrc:346
 msgctxt "RID_SVXSTR_CONNECTOR"
 msgid "Connector"
 msgstr "Konektor"
 
-#: cui/inc/strings.hrc:346
+#: cui/inc/strings.hrc:347
 msgctxt "RID_SVXSTR_DIMENSION_LINE"
 msgid "Dimension line"
 msgstr "Kotirna črta"
 
-#: cui/inc/strings.hrc:347
+#: cui/inc/strings.hrc:348
 msgctxt "RID_SVXSTR_STARTQUOTE"
 msgid "Start Quote"
 msgst

Re: unexpected EOF error: WinResTarget.mk

[Eike Rathke]

Hi Chetan,

On Wednesday, 2020-06-17 12:47:04 +0530, Chetan Aru wrote:

> Suspect this is because OOO_VENDOR environment variable. It somehow has
> ‘machinename$’ in it. And suspect $ has something to do with it.
> Where does this get populated from?

See ./configure

If you use the ./autogen.sh --with-vendor=... option it gets populated
with that value, otherwise the $USERNAME environment variable is taken
and if that is empty then the output of `id -u -n` which is supposed to
return the effective user name.

So check whatever is wrong in your ./autogen.sh call or on your system,
"machinename$" is odd.

  Eike

-- 
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A


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

[Libreoffice-commits] core.git: readlicense_oo/license

[Andras Timar (via logerrit)]

 readlicense_oo/license/license.xml |  292 -
 1 file changed, 291 insertions(+), 1 deletion(-)

New commits:
commit 60ea3aeba38912510506ebb0ee3ca5431ed35d28
Author: Andras Timar 
AuthorDate: Tue Jun 16 11:11:27 2020 +0200
Commit: Andras Timar 
CommitDate: Wed Jun 17 12:50:34 2020 +0200

license: add Belarusian hyphenation dictionary

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

diff --git a/readlicense_oo/license/license.xml 
b/readlicense_oo/license/license.xml
index 5cc67a533e37..113861737455 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -47,7 +47,7 @@
 The LaTeX Project Public License
 
 Creative Commons Attribution-ShareAlike 3.0 
Unported
- 
+Creative Commons Attribution-ShareAlike 4.0 
International
 
 Third 
Party Code Additional Copyright
 Notices and License Terms
@@ -2764,6 +2764,12 @@
 Creative Commons CC-BY-SA
 Author: Mikalai Udodau 
 Origin: Словазбор аўтарскі; арфаграфія паводле ТСБМ-2005
+Hyphenation Dictionary
+The following software may be included in this product: Belarusian 
hyphenation dictionary. Use of any of this
+software is governed by the terms of the license below:
+Creative Commons CC-BY-SA or LGPLv3
+Created by: Alex Buloichik 
+Hyphenation rules according to 'Pravapis 2008'
 Bengali
 Spelling dictionary
 The following software may be included in this product: Bengali 
spelling dictionary. Use of any of this
@@ -6903,5 +6909,289 @@ under either the MPL or the [___] License."
 Creative Commons may be contacted at https://creativecommons.org/";>https://creativecommons.org/.
 
+Creative Commons 
Attribution-ShareAlike 4.0 International
+
+Creative Commons Corporation (“Creative Commons”) is not a law firm 
and does not provide legal services or
+legal advice. Distribution of Creative Commons public licenses 
does not create a lawyer-client or other
+relationship. Creative Commons makes its licenses and related 
information available on an “as-is” basis.
+Creative Commons gives no warranties regarding its licenses, any 
material licensed under their terms and
+conditions, or any related information. Creative Commons disclaims 
all liability for damages resulting from
+their use to the fullest extent possible.
+
+Using Creative Commons Public Licenses
+Creative Commons public licenses provide a standard set of terms and 
conditions that creators and other rights
+holders may use to share original works of authorship and other 
material subject to copyright and certain other
+rights specified in the public license below. The following 
considerations are for informational purposes only,
+are not exhaustive, and do not form part of our licenses.
+Considerations for 
licensors: Our public licenses are intended for
+use by those authorized to give the public permission to use material 
in ways otherwise restricted by copyright
+and certain other rights. Our licenses are irrevocable. Licensors 
should read and understand the terms and
+conditions of the license they choose before applying it. Licensors 
should also secure all rights necessary
+before applying our licenses so that the public can reuse the material 
as expected. Licensors should clearly
+mark any material not subject to the license. This includes other 
CC-licensed material, or material used under
+an exception or limitation to copyright. https://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensors";>More
+considerations for licensors.
+Considerations for the 
public: By using one of our public
+licenses, a licensor grants the public permission to use the licensed 
material under specified terms and
+conditions. If the licensor’s permission is not necessary for any 
reason–for example, because of any applicable
+exception or limitation to copyright–then that use is not regulated by 
the license. Our licenses grant only
+permissions under copyright and certain other rights that a licensor 
has authority to grant. Use of the
+licensed material may still be restricted for other reasons, including 
because others have copyright or other
+rights in the material. A licensor may make special requests, such as 
asking that all changes be marked or
+described. Although not required by our licenses, you are encouraged 
to respect those requests where
+reasonable. https://wiki.creativecommons.org/Considerations_for_licensors_and_licensees

[Libreoffice-commits] core.git: extras/Package_gallmytheme.mk extras/Package_gallsystem.mk extras/source

[Heiko Tietze (via logerrit)]

 dev/null  |binary
 extras/Package_gallmytheme.mk |   21 -
 extras/Package_gallsystem.mk  |   42 ++
 extras/source/gallery/share/gallery_names.ulf |   29 ++---
 4 files changed, 40 insertions(+), 52 deletions(-)

New commits:
commit 86b1b062cfc2768a971bb842de1c16f8646d4b4b
Author: Heiko Tietze 
AuthorDate: Mon Jun 15 16:52:58 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Jun 17 12:35:56 2020 +0200

Resolves tdf#132904 and tdf#133788 - Gallery clean-up

Rename
* sg1  -> bullets
* sg24 -> symbolshapes
* sg36 -> fontwork

Delete
* sg3 (backgrounds) -> 7273bb3534264867e818c13baffcdf3862189cd2
* sg4 (www-graf)-> 82ab7a1559170889c5647a04dc3e85edc38a4e0f

Translation
* ulf completed

Visibility
* New gallery content moved to share/

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

diff --git a/extras/Package_gallmytheme.mk b/extras/Package_gallmytheme.mk
index c4e8744ddf44..88149916095d 100644
--- a/extras/Package_gallmytheme.mk
+++ b/extras/Package_gallmytheme.mk
@@ -12,25 +12,4 @@ $(eval $(call 
gb_Package_Package,extras_gallmytheme,$(SRCDIR)/extras/source/gall
 $(eval $(call 
gb_Package_add_files,extras_gallmytheme,$(LIBO_SHARE_PRESETS_FOLDER)/gallery,\
sg30.sdv \
sg30.thm \
-   arrows.sdg \
-   arrows.sdv \
-   arrows.thm \
-   bpmn.sdg \
-   bpmn.sdv \
-   bpmn.thm \
-   flowchart.sdg \
-   flowchart.sdv \
-   flowchart.thm \
-   icons.sdg \
-   icons.sdv \
-   icons.thm \
-   shapes.sdg \
-   shapes.sdv \
-   shapes.thm \
-   network.sdg \
-   network.sdv \
-   network.thm \
-   diagrams.sdg \
-   diagrams.sdv \
-   diagrams.thm \
 ))
diff --git a/extras/Package_gallsystem.mk b/extras/Package_gallsystem.mk
index 1f499213afd1..c17099ce7050 100644
--- a/extras/Package_gallsystem.mk
+++ b/extras/Package_gallsystem.mk
@@ -10,18 +10,36 @@
 $(eval $(call 
gb_Package_Package,extras_gallsystem,$(SRCDIR)/extras/source/gallery/gallery_system))
 
 $(eval $(call 
gb_Package_add_files,extras_gallsystem,$(LIBO_SHARE_FOLDER)/gallery,\
-   sg1.sdg \
-   sg1.sdv \
-   sg1.thm \
-   sg4.sdg \
-   sg4.sdv \
-   sg4.thm \
-   sg24.sdg \
-   sg24.sdv \
-   sg24.thm \
-   sg36.sdg \
-   sg36.sdv \
-   sg36.thm \
+   arrows.sdg \
+   arrows.sdv \
+   arrows.thm \
+   bpmn.sdg \
+   bpmn.sdv \
+   bpmn.thm \
+   bullets.sdg \
+   bullets.sdv \
+   bullets.thm \
+   diagrams.sdg \
+   diagrams.sdv \
+   diagrams.thm \
+   flowchart.sdg \
+   flowchart.sdv \
+   flowchart.thm \
+   fontwork.sdg \
+   fontwork.sdv \
+   fontwork.thm \
+   icons.sdg \
+   icons.sdv \
+   icons.thm \
+   network.sdg \
+   network.sdv \
+   network.thm \
+   shapes.sdg \
+   shapes.sdv \
+   shapes.thm \
+   symbolshapes.sdg \
+   symbolshapes.sdv \
+   symbolshapes.thm \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/extras/source/gallery/gallery_mytheme/arrows.sdg 
b/extras/source/gallery/gallery_system/arrows.sdg
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/arrows.sdg
rename to extras/source/gallery/gallery_system/arrows.sdg
diff --git a/extras/source/gallery/gallery_mytheme/arrows.sdv 
b/extras/source/gallery/gallery_system/arrows.sdv
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/arrows.sdv
rename to extras/source/gallery/gallery_system/arrows.sdv
diff --git a/extras/source/gallery/gallery_mytheme/arrows.thm 
b/extras/source/gallery/gallery_system/arrows.thm
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/arrows.thm
rename to extras/source/gallery/gallery_system/arrows.thm
diff --git a/extras/source/gallery/gallery_mytheme/bpmn.sdg 
b/extras/source/gallery/gallery_system/bpmn.sdg
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/bpmn.sdg
rename to extras/source/gallery/gallery_system/bpmn.sdg
diff --git a/extras/source/gallery/gallery_mytheme/bpmn.sdv 
b/extras/source/gallery/gallery_system/bpmn.sdv
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/bpmn.sdv
rename to extras/source/gallery/gallery_system/bpmn.sdv
diff --git a/extras/source/gallery/gallery_mytheme/bpmn.thm 
b/extras/source/gallery/gallery_system/bpmn.thm
similarity index 100%
rename from extras/source/gallery/gallery_mytheme/bpmn.thm
rename to extras/source/gallery/gallery_system/bpmn.thm
diff --git a/extras/source/gallery/gallery_system/sg1.sdg 
b/extras/source/gallery/gallery_system/bullets.sdg
similarity index 100%
rename from extras/source/gallery/gallery_system/sg1.sdg
re

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - cui/uiconfig vcl/inc vcl/source

[Caolán McNamara (via logerrit)]

 cui/uiconfig/ui/spellingdialog.ui |2 +-
 vcl/inc/bitmaps.hlst  |2 ++
 vcl/source/window/builder.cxx |   18 ++
 3 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 34e1eb170e394b464b9686cfbc0a56fb07d85893
Author: Caolán McNamara 
AuthorDate: Mon Jun 15 20:03:47 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Jun 17 12:31:49 2020 +0200

support gtk-copy and gtk-paste stock ids

Change-Id: I0d9dc30c62bdfb5976c86bc5a08d5f030eb216e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96394
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit baa55eca0b653d4f661c08f5b6593caa3b186e89)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96418
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/cui/uiconfig/ui/spellingdialog.ui 
b/cui/uiconfig/ui/spellingdialog.ui
index 6e437a1145b2..7673d262e21c 100644
--- a/cui/uiconfig/ui/spellingdialog.ui
+++ b/cui/uiconfig/ui/spellingdialog.ui
@@ -272,7 +272,7 @@
 False
 Paste
 True
-cmd/sc_paste.png
+gtk-paste
   
   
 False
diff --git a/vcl/inc/bitmaps.hlst b/vcl/inc/bitmaps.hlst
index 5ce994a0c384..68f23533eae0 100644
--- a/vcl/inc/bitmaps.hlst
+++ b/vcl/inc/bitmaps.hlst
@@ -138,6 +138,8 @@
 #define IMG_INFO"dbaccess/res/exinfo.png"
 #define IMG_ADD "extensions/res/scanner/plus.png"
 #define IMG_REMOVE  "extensions/res/scanner/minus.png"
+#define IMG_COPY"cmd/sc_copy.png"
+#define IMG_PASTE   "cmd/sc_paste.png"
 
 #define RID_BMP_TREENODE_COLLAPSED  "res/plus.png"
 #define RID_BMP_TREENODE_EXPANDED   "res/minus.png"
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 8410e67871a3..dd57672d8b18 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -95,6 +95,10 @@ namespace
 return IMG_ADD;
 else if (sType == "gtk-remove")
 return IMG_REMOVE;
+else if (sType == "gtk-copy")
+return IMG_COPY;
+else if (sType == "gtk-paste")
+return IMG_PASTE;
 return OUString();
 }
 
@@ -1066,6 +1070,18 @@ namespace
 return sIconName;
 }
 
+OUString extractStockId(VclBuilder::stringmap &rMap)
+{
+OUString sIconName;
+VclBuilder::stringmap::iterator aFind = rMap.find(OString("stock-id"));
+if (aFind != rMap.end())
+{
+sIconName = aFind->second;
+rMap.erase(aFind);
+}
+return sIconName;
+}
+
 OUString getStockText(const OUString &rType)
 {
 if (rType == "gtk-ok")
@@ -2384,6 +2400,8 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 pToolBox->SetQuickHelpText(nItemId, sTooltip);
 
 OUString sIconName(extractIconName(rMap));
+if (sIconName.isEmpty())
+sIconName = mapStockToImageResource(extractStockId(rMap));
 if (!sIconName.isEmpty())
 pToolBox->SetItemImage(nItemId, 
FixedImage::loadThemeImage(sIconName));
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andreas Heinisch (via logerrit)]

 basic/qa/basic_coverage/test_numeric_constant_parameter.vb|   34 ++
 basic/qa/basic_coverage/test_optional_paramters_basic.vb  |   20 ++---
 basic/qa/basic_coverage/test_optional_paramters_compatible.vb |   26 +++
 basic/qa/vba_tests/optional_paramters.vb  |6 -
 basic/source/runtime/runtime.cxx  |2 
 5 files changed, 60 insertions(+), 28 deletions(-)

New commits:
commit b62d73ccb04da2c4cf7f68a23742d0670ef7eb90
Author: Andreas Heinisch 
AuthorDate: Mon Jun 15 22:44:27 2020 +0200
Commit: Xisco Fauli 
CommitDate: Wed Jun 17 12:15:07 2020 +0200

tdf#133913 - create variable with Variant/Type in StepLOADNC

During the loading of numeric constants in StepLOADNC, create variables
of type Variant and convert them to the requested type, i.e.
Variant/Type in order to prevent type conversion errors, when they are
passed to a method with variant parameter types.

Change-Id: I2ab0111b5b53dd2de9523ba7cf12bd2519d050b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96402
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 0f6e012057bf0d1cc339154e8af6586d9615a37f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96498
Reviewed-by: Xisco Fauli 

diff --git a/basic/qa/basic_coverage/test_numeric_constant_parameter.vb 
b/basic/qa/basic_coverage/test_numeric_constant_parameter.vb
new file mode 100644
index ..96a7e8f9c4fd
--- /dev/null
+++ b/basic/qa/basic_coverage/test_numeric_constant_parameter.vb
@@ -0,0 +1,34 @@
+'
+' 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/.
+'
+
+' assigns a numeric constant (integer) to a parameter of type variant
+Function assignInteger( numericConstant ) As String
+numericConstant = 1
+assignInteger = TypeName( numericConstant )
+End Function
+
+' assigns a numeric constant (long) to a parameter of type variant
+Function assignLong( numericConstant ) As String
+numericConstant = 32768
+assignLong = TypeName( numericConstant )
+End Function
+
+Function doUnitTest() As Integer
+' tdf#133913 - check if numeric constants are converted correctly to
+' their respective types, if they are passed as arguments to a function
+' with variant parameter types.
+On Error GoTo errorHandler
+If (assignInteger( 1 ) = "Integer" And assignLong( 1 ) = "Long") Then
+doUnitTest = 1
+Else
+doUnitTest = 0
+End If
+Exit Function
+errorHandler:
+doUnitTest = 0
+End Function
\ No newline at end of file
diff --git a/basic/qa/basic_coverage/test_optional_paramters_basic.vb 
b/basic/qa/basic_coverage/test_optional_paramters_basic.vb
index 39aeb62b27a4..92a81a861d71 100644
--- a/basic/qa/basic_coverage/test_optional_paramters_basic.vb
+++ b/basic/qa/basic_coverage/test_optional_paramters_basic.vb
@@ -40,13 +40,13 @@ Function verify_testOptionalsBasic() As String
 TestLog_ASSERT TestOptDouble(), 0, "TestOptDouble()"
 TestLog_ASSERT TestOptDouble(123.4), 123.4, "TestOptDouble(123.4)"
 TestLog_ASSERT TestOptDouble(, 567.8), 567.8, "TestOptDouble(, 567.8)"
-TestLog_ASSERT Format(TestOptDouble(123.4, 567.8), "0.0"), 691.2, 
"TestOptDouble(123.4, 567.8)"
+TestLog_ASSERT CDbl(Format(TestOptDouble(123.4, 567.8), "0.0")), 691.2, 
"TestOptDouble(123.4, 567.8)"
 
 ' optionals with double datatypes (ByRef and ByVal)
 TestLog_ASSERT TestOptDoubleByRefByVal(), 0, "TestOptDouble()"
 TestLog_ASSERT TestOptDoubleByRefByVal(123.4), 123.4, 
"TestOptDouble(123.4)"
 TestLog_ASSERT TestOptDoubleByRefByVal(, 567.8), 567.8, 
"TestOptDoubleByRefByVal(, 567.8)"
-TestLog_ASSERT Format(TestOptDoubleByRefByVal(123.4, 567.8), "0.0"), 
691.2, "TestOptDoubleByRefByVal(123.4, 567.8)"
+TestLog_ASSERT CDbl(Format(TestOptDoubleByRefByVal(123.4, 567.8), "0.0")), 
691.2, "TestOptDoubleByRefByVal(123.4, 567.8)"
 
 ' optionals with integer datatypes
 TestLog_ASSERT TestOptInteger(), 0, "TestOptInteger()"
@@ -81,14 +81,14 @@ Function verify_testOptionalsBasic() As String
 cB.Add (567.8)
 TestLog_ASSERT TestOptObject(), 0, "TestOptObject()"
 TestLog_ASSERT TestOptObject(cA), 579, "TestOptObject(A)"
-TestLog_ASSERT Format(TestOptObject(, cB), "0.0"), 691.2, "TestOptObject(, 
B)"
-TestLog_ASSERT Format(TestOptObject(cA, cB), "0.0"), 1270.2, 
"TestOptObject(A, B)"
+TestLog_ASSERT CDbl(Format(TestOptObject(, cB), "0.0")), 691.2, 
"TestOptObject(, B)"
+TestLog_ASSERT CDbl(Format(TestOptObject(cA, cB), "0.0")), 1270.2, 
"TestOptObject(A, B)"
 
 ' optionals with object datatypes (ByRef and ByVal)
 TestLog_ASSERT TestOptObjectByRefByVal(), 0, "TestOptObjectByRefByVal()"
 TestLog_ASSERT TestOptObjectByRefByVal(cA), 579, 
"TestOptObjectByR

[Libreoffice-commits] core.git: Branch 'private/quwex/gsoc-box2d-experimental' - 2 commits - slideshow/Library_slideshow.mk slideshow/source

[Sarper Akdemir (via logerrit)]

Rebased ref, commits from common ancestor:
commit 5889e6fabb464d74d9e901e04dbeb35b10808852
Author: Sarper Akdemir 
AuthorDate: Wed Jun 17 13:08:03 2020 +0300
Commit: Sarper Akdemir 
CommitDate: Wed Jun 17 13:08:03 2020 +0300

override creation of PathMotionNode for testing

Change-Id: Iaa1c28f00c090dda4734675e549911c711003758

diff --git a/slideshow/source/engine/animationnodes/animationnodefactory.cxx 
b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
index a88c3a8ab7e0..f07dfd2f3572 100644
--- a/slideshow/source/engine/animationnodes/animationnodefactory.cxx
+++ b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
@@ -480,7 +480,8 @@ BaseNodeSharedPtr implCreateAnimationNode(
 break;
 
 case animations::AnimationNodeType::ANIMATEMOTION:
-pCreatedNode = std::make_shared(
+//pCreatedNode = std::make_shared(
+pCreatedNode = std::make_shared(
 xNode, rParent, rContext );
 break;
 
commit 88833f4faf201b227400fb89756ad4c885cb3537
Author: Sarper Akdemir 
AuthorDate: Thu Jun 11 19:29:38 2020 +0300
Commit: Sarper Akdemir 
CommitDate: Wed Jun 17 12:54:12 2020 +0300

make simulated animations part of the animation engine

Wiring up and creating required classes for simulated
animations to be part of the animation engine.

Creating a new animation node AnimationSimulationNode
for simulated animations and SimulatedAnimation class
that inherits from NumberAnimation in the animation
factory.

Change-Id: I1f125df5324673e9937b8164c0fc267c9683afa0

diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 53324ea25dcc..398f82bd1f51 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -75,6 +75,7 @@ $(eval $(call gb_Library_add_exception_objects,slideshow,\
 slideshow/source/engine/animationnodes/animationnodefactory \
 slideshow/source/engine/animationnodes/animationpathmotionnode \
 slideshow/source/engine/animationnodes/animationsetnode \
+slideshow/source/engine/animationnodes/animationsimulatednode \
 slideshow/source/engine/animationnodes/animationtransformnode \
 slideshow/source/engine/animationnodes/animationtransitionfilternode \
 slideshow/source/engine/animationnodes/basecontainernode \
diff --git a/slideshow/source/engine/animationfactory.cxx 
b/slideshow/source/engine/animationfactory.cxx
index f81c37b77df3..85263c35edcb 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -341,6 +342,166 @@ namespace slideshow::internal
 sal_Int16  mnAdditive;
 };
 
+class SimulatedAnimation : public NumberAnimation
+{
+public:
+SimulatedAnimation( const double fDuration,
+sal_Int16nAdditive,
+const ShapeManagerSharedPtr& rShapeManager,
+const ::basegfx::B2DVector&  rSlideSize,
+int  nFlags ) :
+mfDuration(fDuration),
+mpShape(),
+mpAttrLayer(),
+mpShapeManager( rShapeManager ),
+maPageSize( rSlideSize ),
+maShapeOrig(),
+mnFlags( nFlags ),
+mbAnimationStarted( false ),
+mnAdditive( nAdditive ),
+mpBox2DBody(),
+mpBox2DWorld(),
+mfPreviousElapsedTime(0.00f)
+{
+ENSURE_OR_THROW( rShapeManager,
+ 
"SimulatedAnimation::SimulatedAnimation(): Invalid ShapeManager" );
+}
+
+virtual ~SimulatedAnimation() override
+{
+end_();
+}
+
+// Animation interface
+
+virtual void prefetch() override
+{}
+
+virtual void start( const AnimatableShapeSharedPtr& rShape,
+const ShapeAttributeLayerSharedPtr& 
rAttrLayer ) override
+{
+OSL_ENSURE( !mpShape,
+"PathAnimation::start(): Shape already set" );
+OSL_ENSURE( !mpAttrLayer,
+"PathAnimation::start(): Attribute layer 
already set" );
+
+mpShape = rShape;
+mpAttrLayer = rAttrLayer;
+
+mpBox2DWorld = std::make_shared( 
maPageSize );
+mpBox2DBody = std::make_shared( 
mpBox2DWorld->createDynamicBodyFromBoun

[Libreoffice-commits] core.git: include/vcl officecfg/registry solenv/bin svx/Library_svxcore.mk svx/source svx/uiconfig svx/UIConfig_svx.mk svx/util

[Szymon Kłos (via logerrit)]

 include/vcl/customweld.hxx   |1 
 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu  |   11 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |8 
 solenv/bin/native-code.py|1 
 svx/Library_svxcore.mk   |2 
 svx/UIConfig_svx.mk  |1 
 svx/source/inc/StylesPreviewToolBoxControl.hxx   |   72 +
 svx/source/inc/StylesPreviewWindow.hxx   |  123 ++
 svx/source/tbxctrls/StylesPreviewToolBoxControl.cxx  |  184 +++
 svx/source/tbxctrls/StylesPreviewWindow.cxx  |  504 
++
 svx/uiconfig/ui/stylespreview.ui |  142 ++
 svx/util/svxcore.component   |4 
 12 files changed, 1053 insertions(+)

New commits:
commit b982be12281f2eaf63cb9d18a5b3362502c3a1dc
Author: Szymon Kłos 
AuthorDate: Wed May 27 16:25:10 2020 +0200
Commit: Szymon Kłos 
CommitDate: Wed Jun 17 12:08:55 2020 +0200

Styles preview widget

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

diff --git a/include/vcl/customweld.hxx b/include/vcl/customweld.hxx
index 85829f35d6ff..3e6835b8f864 100644
--- a/include/vcl/customweld.hxx
+++ b/include/vcl/customweld.hxx
@@ -154,6 +154,7 @@ public:
 void set_grid_left_attach(int nAttach) { 
m_xDrawingArea->set_grid_left_attach(nAttach); }
 int get_grid_left_attach() const { return 
m_xDrawingArea->get_grid_left_attach(); }
 void set_help_id(const OString& rHelpId) { 
m_xDrawingArea->set_help_id(rHelpId); }
+void set_tooltip_text(const OUString& rTip) { 
m_xDrawingArea->set_tooltip_text(rTip); }
 };
 }
 #endif
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 48ed82b932aa..c18e2d1fb44a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -1712,6 +1712,17 @@
   com.sun.star.comp.svx.StyleToolBoxControl
 
   
+  
+
+  .uno:StylesPreview
+  
+  
+  
+
+
+  com.sun.star.comp.svx.StylesPreviewToolBoxControl
+
+  
   
 
   .uno:Open
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 7c4898dfa272..8735fb5eb8a2 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3028,6 +3028,14 @@
   1
 
   
+  
+
+  Styles Preview
+
+
+  1
+
+  
   
 
   Date Field
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 908d50787754..661d64894c37 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -257,6 +257,7 @@ core_constructor_list = [
 "com_sun_star_comp_Svx_GraphicExportHelper_get_implementation",
 "com_sun_star_comp_Svx_GraphicImportHelper_get_implementation",
 "com_sun_star_comp_svx_StyleToolBoxControl_get_implementation",
+"com_sun_star_comp_svx_StylesPreviewToolBoxControl_get_implementation",
 # toolkit/util/tk.component
 "stardiv_Toolkit_StdTabController_get_implementation",
 "stardiv_Toolkit_UnoButtonControl_get_implementation",
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 430b35e9299c..7ed0705102be 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -376,6 +376,8 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
 svx/source/tbxctrls/tbxcolorupdate \
 svx/source/tbxctrls/SvxColorValueSet \
 svx/source/tbxctrls/SvxPresetListBox \
+svx/source/tbxctrls/StylesPreviewToolBoxControl \
+svx/source/tbxctrls/StylesPreviewWindow \
 svx/source/toolbars/extrusionbar \
 svx/source/toolbars/fontworkbar \
 svx/source/unodraw/gluepts \
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index fdc7d1b3bc52..f7f02ad2f126 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -132,6 +132,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/stylemenu \
svx/uiconfig/ui/surfacewindow \
svx/uiconfig/ui/tablewindow \
+   svx/uiconfig/ui/stylespreview \
svx/uiconfig/ui/textcharacterspacingcontrol \
svx/uiconfig/ui/textcontrolchardialog \
svx/uiconfig/ui/textcontrolparadialog \
diff --git a/svx/source/inc/StylesPreviewToolBoxControl.hxx 
b/svx/source/inc/StylesPreviewTool

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkframe.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 17971fbdc89f7218c6bf5c3c88796927c71856bb
Author: Caolán McNamara 
AuthorDate: Tue Jun 16 21:37:46 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Jun 17 12:06:31 2020 +0200

tdf#130449 allow gdk_window_move_to_rect to try GDK_ANCHOR_SLIDE

as well as GDK_ANCHOR_FLIP if the window placement will put part of the
floating window off screen

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

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index d372391fec2a..09c99caf81fd 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -2983,7 +2983,7 @@ void GtkSalFrame::signalRealize(GtkWidget*, gpointer 
frame)
static_cast(aFloatRect.GetWidth()), 
static_cast(aFloatRect.GetHeight())};
 
 GdkWindow* gdkWindow = gtk_widget_get_window(pThis->m_pWindow);
-window_move_to_rect(gdkWindow, &rect, rect_anchor, menu_anchor, 
GDK_ANCHOR_FLIP, 0, 0);
+window_move_to_rect(gdkWindow, &rect, rect_anchor, menu_anchor, 
static_cast(GDK_ANCHOR_FLIP | GDK_ANCHOR_SLIDE), 0, 0);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - solenv/flatpak-manifest.in

[Michael Stahl (via logerrit)]

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

New commits:
commit b2c9b64aa146520cd8098e2ffd630cc453325473
Author: Michael Stahl 
AuthorDate: Wed Jun 17 10:42:45 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Jun 17 12:03:28 2020 +0200

mariadb: forgot to adapt flatpak-manifest.in

Change-Id: I60e61b7444d90a8fe7e99154a3cf3a526fb87f09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96518
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 
(cherry picked from commit 01b47d4e73023d7f17a939c67959d959d6fad8ac)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96499

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 309ca6d8bc45..aec05edaa8bc 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -339,10 +339,10 @@
 "dest-filename": 
"external/tarballs/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz";,
-"sha256": 
"fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60",
+"url": 
"https://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz";,
+"sha256": 
"431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b",
 "type": "file",
-"dest-filename": 
"external/tarballs/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"
+"dest-filename": 
"external/tarballs/mariadb-connector-c-3.1.8-src.tar.gz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/mdds-1.6.0.tar.bz2";,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - download.lst external/mariadb-connector-c RepositoryExternal.mk solenv/clang-format

[Michael Stahl (via logerrit)]

 RepositoryExternal.mk   |7 
 download.lst|4 
 external/mariadb-connector-c/README |   18 
 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk   |  112 
+
 external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk |   23 -
 external/mariadb-connector-c/clang-cl.patch.0   |4 
 external/mariadb-connector-c/configs/linux_my_config.h  |  212 
+
 external/mariadb-connector-c/configs/mac_my_config.h|  217 
+-
 external/mariadb-connector-c/configs/mariadb_version.h  |   38 +
 external/mariadb-connector-c/configs/mysql_version.h|   27 -
 external/mariadb-connector-c/configs/wnt_ma_config.h|  154 
+++
 external/mariadb-connector-c/mariadb-CONC-104.patch.1   |   49 --
 external/mariadb-connector-c/mariadb-inline.patch.1 |   23 -
 external/mariadb-connector-c/mariadb-msvc.patch.1   |   13 
 external/mariadb-connector-c/mariadb-swap.patch |   24 -
 solenv/clang-format/blacklist   |2 
 16 files changed, 332 insertions(+), 595 deletions(-)

New commits:
commit 3ef68518ec95a177ace883ef2976fc5ef7307543
Author: Michael Stahl 
AuthorDate: Tue Jun 16 15:09:50 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Jun 17 12:02:34 2020 +0200

mariadb: upgrade to release 3.1.8

Fixes CVE-2018-3081 CVE-2020-2574 CVE-2020-2752 CVE-2020-2922 CVE-2020-13249

Remove obsolete patches:
* mariadb-msvc.patch.1
* mariadb-swap.patch
* mariadb-inline.patch.1
* mariadb-CONC-104.patch.1

Don't build anything from plugins/ in the hope that it's not needed.

Change-Id: I1c8633866b7108a8bb22dae0e0dd5f4a44bf5150
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96466
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit fe041bbc343ee08c6e901f63985d55a90da71c8b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96497
Reviewed-by: Michael Stahl 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ba6437276f28..e052d70d5136 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -295,6 +295,13 @@ $(call gb_LinkTarget_add_libs,$(1),\
-liconv \
 )
 endif
+$(call gb_LinkTarget_use_system_win32_libs,$(1),\
+   ws2_32 \
+   advapi32 \
+   kernel32 \
+   shlwapi \
+   crypt32 \
+)
 
 endef
 define gb_ExternalProject__use_mariadb-connector-c
diff --git a/download.lst b/download.lst
index 334ace22182e..d152214ff4e3 100644
--- a/download.lst
+++ b/download.lst
@@ -176,8 +176,8 @@ export LPSOLVE_SHA256SUM := 
171816288f14215c69e730f7a4f1c325739873e21f946ff83884
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export LXML_SHA256SUM := 
940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e
 export LXML_TARBALL := lxml-4.1.1.tgz
-export MARIADB_CONNECTOR_C_SHA256SUM := 
fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60
-export MARIADB_CONNECTOR_C_TARBALL := 
a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
+export MARIADB_CONNECTOR_C_SHA256SUM := 
431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b
+export MARIADB_CONNECTOR_C_TARBALL := mariadb-connector-c-3.1.8-src.tar.gz
 export MDDS_SHA256SUM := 
f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d
 export MDDS_TARBALL := mdds-1.6.0.tar.bz2
 export MDNSRESPONDER_SHA256SUM := 
e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0
diff --git a/external/mariadb-connector-c/README 
b/external/mariadb-connector-c/README
index 03a1138b47f8..25209f97f4d2 100644
--- a/external/mariadb-connector-c/README
+++ b/external/mariadb-connector-c/README
@@ -1,16 +1,8 @@
-Update to new upstream bzr snapshot:
+MariaDB Connector/C
 
-Don't use 'bzr diff', it will not put renames in the diff in a way
-that patch understands.
+https://mariadb.com/kb/en/mariadb-connector-c-release-notes/
+https://downloads.mariadb.com/Connectors/c/
 
-bzr -Ossl.cert_reqs=none branch lp:mariadb-native-client
-mv mariadb-native-client mariadb-native-client.trunk
-cp -R mariadb-native-client.trunk mariadb-native-client.release
-cd mariadb-native-client.release
-bzr revert -r mariadb-native-client-1.0.0
-cd ..
-diff -x .bzr -u --recursive -N mariadb-native-client.release/ 
mariadb-native-client.trunk/  > 
/path/to/libreoffice_tree/libmariadb/mariadb-trunk-NNN.patch
-sed -i -e 's@^\([+-]\{3\} 
\)mariadb-native-client.\(trunk\|release\)/@\1mariadb/@' 
/path/to/libreoffice_tree/libmariadb/mariadb-trunk-NNN.patch
-dos2unix -f /path/to/libreoffice_tree/libmariadb/mariadb-trunk-NNN.patch
+configs/ generated like this:
 
-regenerate configs
\ No newline at end of file
+cmake -DWITH_CURL=OFF -DWITH_SSL=OFF -DWITH

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

[Michael Stahl (via logerrit)]

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

New commits:
commit 01b47d4e73023d7f17a939c67959d959d6fad8ac
Author: Michael Stahl 
AuthorDate: Wed Jun 17 10:42:45 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Jun 17 12:01:12 2020 +0200

mariadb: forgot to adapt flatpak-manifest.in

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

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 309ca6d8bc45..aec05edaa8bc 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -339,10 +339,10 @@
 "dest-filename": 
"external/tarballs/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz";,
-"sha256": 
"fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60",
+"url": 
"https://dev-www.libreoffice.org/src/mariadb-connector-c-3.1.8-src.tar.gz";,
+"sha256": 
"431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b",
 "type": "file",
-"dest-filename": 
"external/tarballs/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"
+"dest-filename": 
"external/tarballs/mariadb-connector-c-3.1.8-src.tar.gz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/mdds-1.6.0.tar.bz2";,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 sw/source/core/doc/DocumentRedlineManager.cxx |   22 ++
 sw/source/core/inc/UndoDelete.hxx |3 +++
 sw/source/core/undo/undel.cxx |   26 +++---
 3 files changed, 48 insertions(+), 3 deletions(-)

New commits:
commit 854bd553740891cac19e2fea2293dc99a4aded51
Author: Michael Stahl 
AuthorDate: Fri Jun 12 19:08:19 2020 +0200
Commit: Michael Stahl 
CommitDate: Wed Jun 17 11:26:36 2020 +0200

tdf#132944 sw_redlinehide: delete of insert redline

Because of an existing insert redline with SwComparePosition::Equal
this hits the DeleteAndJoin() call in AppendRedline() and so what
happens on Undo is that the SwUndoDelete first creates all the layout
frames and then the SwUndoRedlineDelete creates the frames a 2nd time.

Because this can happen not only for Equal but also Inside case, it
appears best to prevent the "inner" Undo from recreating the frames;
it's always SwUndoDelete.

This is quite hacky...

Change-Id: I4438dd09bb6c2edf8154d333de403483768755fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96233
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit ad0351b84926075297fb74abbe9b31a0455782af)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96496

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index b8b85c984546..6bce5c1d9364 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -25,6 +25,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -889,6 +891,21 @@ namespace
 static_cast(m_rRedline) = *m_pCursor;
 }
 };
+
+auto UndoDeleteDisableFrames(SwDoc & rDoc) -> void
+{
+// inside AppendRedline(), a SwUndoDelete was created;
+// prevent it from creating duplicate layout frames on Undo
+auto & rUndo(rDoc.GetUndoManager());
+if (rUndo.DoesUndo())
+{
+SwUndo *const pUndo(rUndo.GetLastUndo());
+assert(pUndo);
+SwUndoDelete *const pUndoDel(dynamic_cast(pUndo));
+assert(pUndoDel);
+pUndoDel->DisableMakeFrames(); // tdf#132944
+}
+}
 }
 
 namespace sw
@@ -1558,12 +1575,14 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* 
pNewRedl, bool const bCall
 }
 else
 
m_rDoc.getIDocumentContentOperations().DeleteAndJoin( *pNewRedl );
+UndoDeleteDisableFrames(m_rDoc); // tdf#132944
 
 bCompress = true;
 }
 if( !bCallDelete && !bDec && *pEnd == *pREnd )
 {
 
m_rDoc.getIDocumentContentOperations().DeleteAndJoin( *pNewRedl );
+UndoDeleteDisableFrames(m_rDoc);
 bCompress = true;
 }
 else if ( bCallDelete || !bDec )
@@ -1583,6 +1602,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* 
pNewRedl, bool const bCall
 {
 TemporaryRedlineUpdater const u(m_rDoc, 
*pNewRedl);
 
m_rDoc.getIDocumentContentOperations().DeleteAndJoin( *pRedl );
+UndoDeleteDisableFrames(m_rDoc);
 n = 0;  // re-initialize
 }
 delete pRedl;
@@ -1607,6 +1627,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* 
pNewRedl, bool const bCall
 {
 TemporaryRedlineUpdater const u(m_rDoc, 
*pNewRedl);
 
m_rDoc.getIDocumentContentOperations().DeleteAndJoin( aPam );
+UndoDeleteDisableFrames(m_rDoc);
 n = 0;  // re-initialize
 }
 bDec = true;
@@ -1629,6 +1650,7 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* 
pNewRedl, bool const bCall
 {
 TemporaryRedlineUpdater const u(m_rDoc, 
*pNewRedl);
 
m_rDoc.getIDocumentContentOperations().DeleteAndJoin( aPam );
+UndoDeleteDisableFrames(m_rDoc);
 n = 0;  // re-initialize
 bDec = true;
 }
diff --git a/sw/source/core/inc/UndoDelete.hxx 
b/sw/source/core/inc/UndoDelete.hxx
index c99939a5d0ec..ce38a4d99e03 10

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

[Vasily Melenchuk (via logerrit)]

 sw/qa/extras/ww8export/data/tdf120394.doc |binary
 sw/qa/extras/ww8export/ww8export3.cxx |   30 +
 sw/source/filter/ww8/ww8par.hxx   |3 
 sw/source/filter/ww8/ww8par3.cxx  |  157 ++
 4 files changed, 63 insertions(+), 127 deletions(-)

New commits:
commit 7e605bc3ff0cfea76be4683f0170d821fcae7203
Author: Vasily Melenchuk 
AuthorDate: Tue May 19 10:24:35 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Wed Jun 17 11:19:35 2020 +0200

tdf#120394: doc import: use list format string

Since introducion of list level format string there is
no need in complex parsing of doc level string and convering
it to prefix-number-suffix format. We can just replace there
special chars by %n placeholders (used in docx and now in LO)
and this should be enough.

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

diff --git a/sw/qa/extras/ww8export/data/tdf120394.doc 
b/sw/qa/extras/ww8export/data/tdf120394.doc
new file mode 100644
index ..2ee9058a59ef
Binary files /dev/null and b/sw/qa/extras/ww8export/data/tdf120394.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx 
b/sw/qa/extras/ww8export/ww8export3.cxx
index 96547e30133a..f998ffe1d85a 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -561,6 +561,36 @@ DECLARE_WW8EXPORT_TEST(testPresetDash, 
"tdf127166_prstDash_Word97.doc")
 }
 }
 
+DECLARE_WW8EXPORT_TEST(testTdf120394, "tdf120394.doc")
+{
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+{
+uno::Reference xPara(getParagraph(1), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(static_cast(2), 
getProperty(xPara, "NumberingLevel"));
+CPPUNIT_ASSERT_EQUAL(OUString("1.1.1"), getProperty(xPara, 
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(5), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(static_cast(0), 
getProperty(xPara, "NumberingLevel"));
+CPPUNIT_ASSERT_EQUAL(OUString(CHAR_ZWSP), getProperty(xPara, 
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(8), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(static_cast(2), 
getProperty(xPara, "NumberingLevel"));
+CPPUNIT_ASSERT_EQUAL(OUString(CHAR_ZWSP), getProperty(xPara, 
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(9), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(static_cast(2), 
getProperty(xPara, "NumberingLevel"));
+CPPUNIT_ASSERT_EQUAL(OUString("1.1.2"), getProperty(xPara, 
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(10), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(static_cast(2), 
getProperty(xPara, "NumberingLevel"));
+CPPUNIT_ASSERT_EQUAL(OUString(CHAR_ZWSP), getProperty(xPara, 
"ListLabelString"));
+}
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 679c56a01ad5..810b692ee6aa 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -176,8 +176,7 @@ private:
 //the rParaSprms returns back the original word paragraph indent
 //sprms which are attached to this numbering level
 bool ReadLVL(SwNumFormat& rNumFormat, std::unique_ptr& 
rpItemSet, sal_uInt16 nLevelStyle,
-bool bSetStartNo, std::deque &rNotReallyThere, sal_uInt16 nLevel,
-ww::bytes &rParaSprms);
+bool bSetStartNo, sal_uInt16 nLevel, ww::bytes &rParaSprms);
 
 // character attributes from GrpprlChpx
 typedef std::unique_ptr WW8aISet[nMaxLevel];
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index d35adc6ca42e..02c02ecc459d 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -70,6 +70,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace com::sun::star;
 using namespace sw::util;
@@ -489,18 +490,6 @@ WW8LSTInfo* WW8ListManager::GetLSTByListId( sal_uInt32 
nIdLst ) const
 return aResult->get();
 }
 
-static void lcl_CopyGreaterEight(OUString &rDest, OUString const &rSrc,
-sal_Int32 nStart, sal_Int32 nLen = SAL_MAX_INT32)
-{
-const sal_Int32 nMaxLen = std::min(rSrc.getLength(), nLen);
-for( sal_Int32 nI = nStart; nI < nMaxLen; ++nI)
-{
-sal_Unicode nChar = rSrc[nI];
-if (nChar > WW8ListManager::nMaxLevel)
-rDest += OUStringChar(nChar);
-}
-}
-
 static OUString sanitizeString(const OUString& rString)
 {
 sal_Int32 i=0;
@@ -628,20 +617,15 @@ SvxNumType 
WW8ListManager::GetSvxNumTypeFromMSONFC(sal_uInt16 nNFC)
 }
 
 bool WW8ListManager::ReadLVL(SwNumFormat& rNumFormat, 
std::unique_ptr& rpItemSet,
-sal_uInt16 nLevelStyle, bool bSetStartNo,
-std::deque &rNotReallyThere, sal_uInt16 nLevel,
-ww::bytes 

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

[yakovru (via logerrit)]

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

New commits:
commit 37a58527c9b59bb1146813fcc766e3b4fb864f18
Author: yakovru 
AuthorDate: Wed Jun 17 11:08:47 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Jun 17 11:08:47 2020 +0200

Update git submodules

* Update dictionaries from branch 'libreoffice-7-0'
  to 024b189f2f3756516245ad8a7581d02b900750da
  - Update be_BY dictionary to 0.58 and add be-BY hyphenation

3 commits:

Change-Id: I6541c93b6b23cfdc85bf887905c0c9f07d43a32b
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/96409
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

fix dict name

Change-Id: Ie30c442fe704504502c11418c491af2c938d261e
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/96430
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

Add be-BY hyphenation

Change-Id: Iaf6d42b393b1a35c3f7d48fbe3a0b0508fcb2981
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/96431
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/96520

diff --git a/dictionaries b/dictionaries
index 9c569da82e61..024b189f2f37 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 9c569da82e61f36885fd507d2c34d79b04957c81
+Subproject commit 024b189f2f3756516245ad8a7581d02b900750da
___
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-7.0.0.0.beta2'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.0.0.0.beta2' created by Christian Lohmaier 
 at 2020-06-17 09:01 +

Tag libreoffice-7.0.0.0.beta2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl7p2/0ACgkQ9DSh76/u
rqPQBQ//YbZVuxAn81P6Yoyz35QP9GcFbyK3C2vdVsSwrBWaIGI8xcc/BcoG6tlm
u/c8rLzV0j0MRa7silH519cB3QEZP0kuEIzZMZScqwS7emG/JEfWq4JMU0Qxw122
GvtDcbpOO0hZJte/yTtRd1ikQ9C23JIguPnQzRNF97bqtnFHOVweCXsF7xL/UbMs
mI1k2mx7xIEITIITL1EE1CmAUCErY1gK9mJmc+YLZ+U1ppYw2244GjdxegTriSsm
ph49AK3uju5PMpEYazooBPUHfZA6dk7Yn9pwJCXZ85UbE8cFEtE2W4mQzMqx+xXG
qLPEsYh/+LptXw/Ohm1HEYWz8E6+v02+y14dqAxxZZzSuWhAF2N2AuKwenD/mor5
e6x3Zt/kq2GqYQlLPBohQtUhGBXZvDNv35C/KQvoZVbymtjc6xDtPkjQpQtQSjXc
kNMAKJfrnR4NTxtOkvw99UquZPmIEi727WcHV0VypuSvk5BKWnQQui5hBqZWxu6z
7S/p7ZpIxB8di+SqitBhgYB7ne09JdmEtt6l3WX3+Z2Dz3S/rXqMKc2zvSPykHxZ
oZRT2AtTNSYyn9iVPgK1a4XRpwbJbl2Sn6UVV9JRW5tzmnGTWepQUWIWHf5S96F/
UHHWvluHV2ayioIrPFMng/4csT/mIalIsa40m+ZPCn0wlsm8k5w=
=taiR
-END PGP SIGNATURE-

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

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

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.0.0.0.beta2' created by Christian Lohmaier 
 at 2020-06-17 09:01 +

Tag libreoffice-7.0.0.0.beta2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl7p2/kACgkQ9DSh76/u
rqMBvA//fH/iCM26TKZf3sPBfuGSiPRxVe0/XtuSMvtsRQyfzTZOjfhmSkGPr7He
TpDj8MxsjDYOSZfXUVM3JuJA1A+eFZKX+oDEAJYFC8HXwukUFeTs/dJwLpkqva/v
jIN1/QPMvUmck2M1FCZvC93+7uIMq8em4hXnj7My/e/t4ZBRxh9OVJFZRHAtRts8
mDOjCLRYA2kwIDGN5mCzMR7wh4G49EE1GelHdy38U5tcVEQ1dk/8pd++mMXoH6Z8
lVInqKSuGLyKQFjlKqS5dPnK2fRqnZZqykSgc5lEjTeU0z152VtvgKJof490Mpdc
qkVEl7eDDeMSNTsWFljW+CBfhagEWJvge/ulDF1g+A/iXTANotps7xf1T9woQ36W
qBa7s7SCB6z5/EcnQjEyBR/ek3BN9/hZPn18MPg1x0YsXmJFGe2lt2lWrxw3ofDE
Ct2NYMcxG2yzkwy1rFOev6xrcntl/mk/UVg0viwc53uxZYb+6xRz3dqFk3MwiKmc
ZedvFngmI2O5uj9LsNYU7oUs39K/W0oQ8fcTNgchBe8Dc+gT1lfNXjDPACbPTcFS
+8C6hH6Np/K/ea8/bYDBgvKEeBidCe8pt5m33OJDQCb8Px720/POMBVUR0Pz3qbf
Y6tGkVKbC0rqbS3cGzC385lg1KQ2qR32EoaNEXDp2a3DRYAlBYA=
=oAl4
-END PGP SIGNATURE-

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

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-7.0.0.0.beta2'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.0.0.0.beta2' created by Christian Lohmaier 
 at 2020-06-17 09:01 +

Tag libreoffice-7.0.0.0.beta2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl7p2/0ACgkQ9DSh76/u
rqOcPQ/9EurOiT2qF6I5kieDcEy2sN0jtcnJ5KBZagJcaumI6R21W1C/6d7akTpL
QOB2aP41AdS2xn+C7BRdffuFFdYB9ErpoJRBHkCkinNhSszDDiCsl1/jWC5u8dcP
qDYkN8JJl5nPreQuwdXjrszviQ2mvqHT91i8Xc6zG9usEsQb6eSlzIwEEHC+hBEG
SC5nw6bhF8dYTEvC08MWJx0VceNQL8FLTIpUrzIJB1xVjyMa/TcPvRjt8fxinjp+
hYeNBNvgEMaDFjiHh9HLignAmWJYbubMQLtpeWKBhLy/930Fq4ZX9YXLaGbwjfkc
ZVbSSVRgfj6UCHpbFmQPaEJ6HpGiMXSSd+jxYpkyhhGNzETkcTldhrItsmBKuAGO
S8D2JFUzWsRhGnSOGntMFTntXYgK8Zfh1f79WWmR71t3+BSUtjOnufLuCwz0RSp0
xupMMl9XkHXvg+vmO838skk8vRHTuSpkqN36yHTgFXX8Wc1f9hb8mRQO/ok3GmXg
PM4SQZSMF1QBfjuk1h6qzhufk73YQicKoghGIgJYzeAMxzqNQYD1OtNazMXZj93+
2l2SoetTnK9MUFjbL1LTOoKRCTPJr1bfnLR1FVLvfZ0dDgoZaqC4W/9/d57k12yC
uQtNkj1imVQCliJT08BK9BpI+5yo8jVdcNNqAQt1bVeCcBX77bU=
=4UjD
-END PGP SIGNATURE-

Changes since libreoffice-7-0-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-7.0.0.0.beta2'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-7.0.0.0.beta2' created by Christian Lohmaier 
 at 2020-06-17 09:01 +

Tag libreoffice-7.0.0.0.beta2
-BEGIN PGP SIGNATURE-

iQIyBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl7p2/0ACgkQ9DSh76/u
rqN77A/2PQGauWBX3Ne0Tze0LcrWM3EaZcCoOXu0rF6G0H3vf+HjuBwVCW5GDyd4
xWqMRDkyyi82ydKFM0QVTIlQJn0P+//iu2WXxSgROdMtJU25cnhVJ0UBS6E3z0Lg
geVly6TggUEKKwOtPVj37oMMXxV9tgNQbShFPo30eC4I3V68OwAS/MYC1bgtYhOn
CAU98uAOfSu3Ilq9QfgMzsOsn07JwrczAWGS+rGhnY/Fbx1mitE12HxCJn8gse13
vxnFoCPM6afe8wLCys3bXWtCozAOQC3zgzvyRCd0OxwBtzmO12HQuGHCTZbXc9d3
SgHlnS9Y2wOUcAEF5Ybh6HIlEXxDpvRAyH0GID+g/kQ2YMwNh1wbtE6bcT2GsD7k
mGceTMZFQzcssABKh8/41XLNXcR67qUhRsqa9ee1KeAxwPr/QVzRpvOPN4fTO1+k
yntkFhB3N/197YgvTLq8N3ug7eAKwv7OmjoJho50MuW5wpcAb2UC+n2DKFOe5PqQ
e8FMCC1cmGLTf3P3BrIlQZ6HpZTBsX0zql3Fudg+kdDljRjrZ2MiudcsB4oQuDwt
OXQZzIkFL7KzFKKeMUd3sPfEy5wiZLqRrgzHY2VbokXRYYPync7EcTkN8+DcZ300
wczSoxQ2z964GXBZC8QCEGFCC1SUEdICn9shazS6i1GTOe90vQ==
=5r0A
-END PGP SIGNATURE-

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

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

[Christian Lohmaier (via logerrit)]

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

New commits:
commit acef8049fa6baee5e12cf5853e4efbc76157ff1b
Author: Christian Lohmaier 
AuthorDate: Wed Jun 17 11:02:08 2020 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Jun 17 11:02:08 2020 +0200

bump product version to 7.0.0.0.beta2+

Change-Id: I3fe3143080ac0ae74d21a8e615f348f9b6f3b217

diff --git a/configure.ac b/configure.ac
index 6ebe3856333d..4243c7242120 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],[7.0.0.0.beta1+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[7.0.0.0.beta2+],[],[],[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] core.git: 2 commits - dictionaries

[yakovru (via logerrit)]

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

New commits:
commit e52263a8d3e61eae82b6345010162427fc5ed7ad
Author: yakovru 
AuthorDate: Wed Jun 17 11:01:58 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Jun 17 11:01:58 2020 +0200

Update git submodules

* Update dictionaries from branch 'master'
  to d4a80b15edc905f6e1213fa8d95300b8299fffec
  - Add be-BY hyphenation

Change-Id: Iaf6d42b393b1a35c3f7d48fbe3a0b0508fcb2981
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/96431
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/dictionaries b/dictionaries
index 887cac8ec1a1..d4a80b15edc9 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 887cac8ec1a143d299347e034814c0f9c2595412
+Subproject commit d4a80b15edc905f6e1213fa8d95300b8299fffec
commit 554975e3d25433a39bfce3d5af68ac46e5d00da0
Author: yakovru 
AuthorDate: Wed Jun 17 12:01:42 2020 +0300
Commit: Gerrit Code Review 
CommitDate: Wed Jun 17 11:01:42 2020 +0200

Update git submodules

* Update dictionaries from branch 'master'
  to 887cac8ec1a143d299347e034814c0f9c2595412
  - fix dict name

Change-Id: Ie30c442fe704504502c11418c491af2c938d261e
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/96430
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/dictionaries b/dictionaries
index bf3ada34b722..887cac8ec1a1 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit bf3ada34b722c1ade8b1f08aba79b04dda0791a8
+Subproject commit 887cac8ec1a143d299347e034814c0f9c2595412
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits