date:20191022

 codemaker/source/commonjava/commonjava.cxx|2 
 codemaker/source/cppumaker/cpputype.cxx   |   55 --
 codemaker/source/javamaker/javatype.cxx   |   25 ++-
 comphelper/qa/unit/base64_test.cxx|   16 ---
 comphelper/source/misc/docpasswordhelper.cxx  |2 
 editeng/source/editeng/editdoc.cxx|2 
 editeng/source/editeng/impedit2.cxx   |2 
 i18npool/qa/cppunit/test_breakiterator.cxx|   16 +++
 i18npool/source/breakiterator/xdictionary.cxx |   10 ++--
 i18npool/source/collator/gencoll_rule.cxx |6 ++
 i18npool/source/indexentry/genindex_data.cxx  |3 -
 idlc/source/aststructinstance.cxx |3 -
 idlc/source/idlccompile.cxx   |   12 +
 idlc/source/idlcproduce.cxx   |2 
 include/comphelper/unwrapargs.hxx |   14 +++---
 registry/source/keyimpl.cxx   |3 -
 registry/source/regimpl.cxx   |2 
 sax/qa/cppunit/test_converter.cxx |6 +-
 sax/source/fastparser/fastparser.cxx  |3 -
 tools/source/ref/globname.cxx |2 
 xmloff/source/core/nmspmap.cxx|2 
 21 files changed, 123 insertions(+), 65 deletions(-)

New commits:
commit c68be56c295c8dda3043c80d4641575ec2799e55
Author: Noel Grandin 
AuthorDate: Thu Oct 17 20:33:50 2019 +0200
Commit: Noel Grandin 
CommitDate: Wed Oct 23 08:55:00 2019 +0200

size some stringbuffer to prevent re-alloc

Change-Id: I385587a922c555c320a45dcc6d644315b72510e9
Reviewed-on: https://gerrit.libreoffice.org/81278
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/codemaker/source/commonjava/commonjava.cxx 
b/codemaker/source/commonjava/commonjava.cxx
index 955a0ba5e7cd..bdb1b02b63a7 100644
--- a/codemaker/source/commonjava/commonjava.cxx
+++ b/codemaker/source/commonjava/commonjava.cxx
@@ -39,7 +39,7 @@ namespace codemaker { namespace java {
 OString translateUnoToJavaType(
 codemaker::UnoType::Sort sort, OString const & nucleus, bool referenceType)
 {
-OStringBuffer buf;
+OStringBuffer buf(128);
 if (sort <= codemaker::UnoType::Sort::Any) {
 OString const 
javaTypes[static_cast(codemaker::UnoType::Sort::Any) + 1][2] = {
 { "void", "java/lang/Void" },
diff --git a/codemaker/source/cppumaker/cpputype.cxx 
b/codemaker/source/cppumaker/cpputype.cxx
index a16256d4c353..dcec84ccdc3f 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -2400,6 +2400,28 @@ void PolyStructType::dumpLightGetCppuType(FileStream & 
out)
 << "static ::typelib_TypeDescriptionReference * the_type = 0;\n"
 << indent() << "if (the_type == 0) {\n";
 inc();
+
+out << "#ifdef LIBO_INTERNAL_ONLY\n";
+
+out << indent() << "::rtl::OString the_buffer = \"" << name_
+<< "<\" +\n";
+for (std::vector< OUString >::const_iterator i(
+ entity_->getTypeParameters().begin());
+ i != entity_->getTypeParameters().end();) {
+out << indent()
+<< ("::rtl::OUStringToOString("
+"::cppu::getTypeFavourChar(static_cast< ");
+dumpTypeParameterName(out, *i);
+out << " * >(0)).getTypeName(), RTL_TEXTENCODING_UTF8) +\n";
+++i;
+if (i != entity_->getTypeParameters().end()) {
+out << indent() << "\",\" +\n";
+}
+}
+out << indent() << "\">\";\n";
+
+out << "#else\n";
+
 out << indent() << "::rtl::OStringBuffer the_buffer(\"" << name_
 << "<\");\n";
 for (std::vector< OUString >::const_iterator i(
@@ -2415,9 +2437,14 @@ void PolyStructType::dumpLightGetCppuType(FileStream & 
out)
 out << indent() << "the_buffer.append(',');\n";
 }
 }
-out << indent() << "the_buffer.append('>');\n" << indent()
+out << indent() << "the_buffer.append('>');\n";
+
+out << "#endif\n";
+
+out << indent()
 << "::typelib_static_type_init(&the_type, " << getTypeClass(name_, 
true)
 << ", the_buffer.getStr());\n";
+
 dec();
 out << indent() << "}\n" << indent()
 << "return *reinterpret_cast< ::css::uno::Type * >(&the_type);\n";
@@ -2506,6 +2533,27 @@ void 
PolyStructType::dumpComprehensiveGetCppuType(FileStream & out)
 out << indent() << "::css::uno::Type * operator()() const\n"
 << indent() << "{\n";
 inc();
+
+out << "#ifdef LIBO_INTERNAL_ONLY\n";
+out << indent()
+<< "::rtl::OUString the_name =\n";
+out << indent() << "\"" << name_ << "<\" +\n";
+for (std::vector< OUString >::const_iterator i(
+ entity_->getTypeParameters().begin());
+ i != entity_->getTypeParameters().end();) {
+out << indent()
+<< "::cppu::getTypeFavourChar(static_cast< ";
+dumpTypeParameterName(out, *i);
+out << " * >(0)).getTypeName() +\n";
+++i;
+if (i != entity_->

Re: clang 10 error: use of overloaded operator '!=' is ambiguous

2019-10-22 Thread Stephan Bergmann


On 23/10/2019 00:18, Luke Benes wrote:

False positive, suppress, or something that needs fixing?


 
"Make comparison operator member functions const"


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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - dictionaries

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

New commits:
commit b72f5c80352d7810ad2bf14b8cd03e57d6e3d128
Author: Ricardo Palomares 
AuthorDate: Tue Oct 22 21:07:42 2019 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Oct 23 08:18:42 2019 +0200

Update git submodules

* Update dictionaries from branch 'libreoffice-6-3'
  - Bring shipped Spanish dictionary up to version 2.5

Change-Id: I4cd5921b88f61611ba2220d2db4aa3adee7d2d17
Reviewed-on: https://gerrit.libreoffice.org/81349
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit f46d0decbf5aec3f7eaa1d4017ed332cb421371d)
Reviewed-on: https://gerrit.libreoffice.org/81357
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/dictionaries b/dictionaries
index dafee09a01cd..b29122518a4d 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit dafee09a01cd7a3fc5442df614436205ff3975d3
+Subproject commit b29122518a4d462aad03cd8b7cb3b2aa0b4a844a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-6-3' - es/description.xml es/es_ANY.aff es/es_ANY.dic es/package-description.txt es/README_es_ANY.txt

 es/README_es_ANY.txt   |   23 -
 es/description.xml |2 
 es/es_ANY.aff  |   11 
 es/es_ANY.dic  |  767 +++--
 es/package-description.txt |2 
 5 files changed, 771 insertions(+), 34 deletions(-)

New commits:
commit b29122518a4d462aad03cd8b7cb3b2aa0b4a844a
Author: Ricardo Palomares 
AuthorDate: Tue Oct 22 21:07:42 2019 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Oct 23 08:18:42 2019 +0200

Bring shipped Spanish dictionary up to version 2.5

Change-Id: I4cd5921b88f61611ba2220d2db4aa3adee7d2d17
Reviewed-on: https://gerrit.libreoffice.org/81349
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit f46d0decbf5aec3f7eaa1d4017ed332cb421371d)
Reviewed-on: https://gerrit.libreoffice.org/81357
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/es/README_es_ANY.txt b/es/README_es_ANY.txt
index 8a780a5..8717d2c 100644
--- a/es/README_es_ANY.txt
+++ b/es/README_es_ANY.txt
@@ -7,7 +7,7 @@
   **  VERSIÓN GENÉRICA PARA TODAS LAS LOCALIZACIONES**
   
 
-  Versión 2.4
+  Versión 2.5
 
 SUMARIO
 
@@ -92,16 +92,17 @@ comillas). El código de región depende de cómo tenga 
configurado su sistema
 (por lo general será el del país donde reside), elegible entre uno de los
 siguientes:
 
-   Argentina:  "AR"Honduras:   "HN"
-   Bolivia:"BO"México: "MX"
-   Chile:  "CL"Nicaragua:  "NI"
-   Colombia:   "CO"Panamá: "PA"
-   Costa Rica: "CR"Perú:   "PE"
-   Cuba:   "CU"Puerto Rico:"PR"
-   Rep. Dominicana:"DO"Paraguay:   "PY"
-   Ecuador:"EC"El Salvador:"SV"
-   España: "ES"Uruguay:"UY"
-   Guatemala:  "GT"Venezuela:  "VE"
+   Argentina:  "AR"México: "MX"
+   Bolivia:"BO"Nicaragua:  "NI"
+   Chile:  "CL"Panamá: "PA"
+   Colombia:   "CO"Perú:   "PE"
+   Costa Rica: "CR"Filipinas:  "PH"
+   Cuba:   "CU"Puerto Rico:"PR"
+   Rep. Dominicana:"DO"Paraguay:   "PY"
+   Ecuador:"EC"El Salvador:"SV"
+   España: "ES"Estados Unidos: "US"
+   Guatemala:  "GT"Uruguay:"UY"
+   Honduras:   "HN"Venezuela:  "VE"
 
(El código de región se escribe en mayúsculas sin las comillas).
 
diff --git a/es/description.xml b/es/description.xml
index 71830b4..371d661 100644
--- a/es/description.xml
+++ b/es/description.xml
@@ -1,7 +1,7 @@
 
 http://openoffice.org/extensions/description/2006"; 
xmlns:d="http://openoffice.org/extensions/description/2006";  
xmlns:xlink="http://www.w3.org/1999/xlink";>
 
-
+
 
 
 
diff --git a/es/es_ANY.aff b/es/es_ANY.aff
index bf55d9d..b0c0be9 100644
--- a/es/es_ANY.aff
+++ b/es/es_ANY.aff
@@ -202,13 +202,14 @@ SFX M o eza/S nto
 SFX M o eza/S [aie]sto
 SFX M o ez/S usto
 SFX M o uez/S go
-SFX N Y 18
+SFX N Y 19
 SFX N a illa/S [bdfhjlmnprstv]a
 SFX N o illo/S [bdhjlmnprstv]o
 SFX N 0 cilla/S ve
 SFX N za cilla/S za
 SFX N 0 ecilla/S d
-SFX N ón oncillo/S ón
+SFX N ión ioncilla/S [cglnstx]ión
+SFX N ón oncillo/S [^i]ón
 SFX N 0 cillo/S or
 SFX N zo cillo/S zo
 SFX N 0 cillo/S [djlnu]e
@@ -4275,7 +4276,7 @@ SFX Ó ostrar uéstrasela ostrar
 SFX Ó ostrar uéstraselas ostrar
 SFX Ó ostrar uéstraselo ostrar
 SFX Ó ostrar uéstraselos ostrar
-SFX Ô Y 60
+SFX Ô Y 64
 SFX Ô aer áela aer
 SFX Ô aer áelas aer
 SFX Ô aer áelo aer
@@ -4300,6 +4301,10 @@ SFX Ô edir ídela edir
 SFX Ô edir ídelas edir
 SFX Ô edir ídelo edir
 SFX Ô edir ídelos edir
+SFX Ô egir ígela egir
+SFX Ô egir ígelas egir
+SFX Ô egir ígelo egir
+SFX Ô egir ígelos egir
 SFX Ô eguir íguela eguir
 SFX Ô eguir íguelas eguir
 SFX Ô eguir íguelo eguir
diff --git a/es/es_ANY.dic b/es/es_ANY.dic
index cc04fe0..a7b4694 100644
--- a/es/es_ANY.dic
+++ b/es/es_ANY.dic
@@ -1,4 +1,4 @@
-67495
+68226
 a
 ababa/S
 ababillar/RED
@@ -419,6 +419,7 @@ abreviar/REDñ
 abreviatura/S
 abrezar/RED
 Abriaquí
+abriaquiceño/GS
 abridero/GS
 abridero/S
 abridla
@@ -917,6 +918,7 @@ acetoso/GS
 acetre/S
 acetrinar/RED
 Acevedo
+aceveduno/GS
 acezante/S
 acezar/RED
 Acha
@@ -2030,6 +2032,7 @@ agradecido/hGS
 agradecimiento/Sh
 Agrado
 agrado/hS
+agraduno/GS
 agrafia/S
 ágrafo/GS
 agramadera/S
@@ -2096,6 +2099,7 @@ agrumar/RED
 agrupador/SG
 agrupamiento/pS
 agrupar/REDÀÁÄñTA
+agrura/S

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

 vcl/inc/unx/saltype.h |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 437dc68285dab0f08a1ded2193d86d64f560cd9b
Author: Stephan Bergmann 
AuthorDate: Tue Oct 22 23:24:12 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Oct 23 07:09:57 2019 +0200

Make comparison operator member functions const

...which avoids overload resolution ambiguities in C++20, when a synthesized
candidate of operator == for a reversed-argument rewrite conflicts with the
actual operator ==, due to the asymmetric const-ness of the implicit object
parameter and the RHS parameter.  (As observed with recent Clang 10 trunk 
with
-std=c++2a:

> vcl/unx/generic/gdi/salgdi.cxx:138:18: error: use of overloaded operator 
'!=' is ambiguous (with operand types 'SalX11Screen' and 'SalX11Screen')
> if( nXScreen != m_nXScreen )
>  ^  ~~
> vcl/inc/unx/saltype.h:22:10: note: candidate function
> bool operator!=(const SalX11Screen &rOther) { return rOther.mnXScreen 
!= mnXScreen; }
>  ^
> vcl/inc/unx/saltype.h:21:10: note: candidate function
> bool operator==(const SalX11Screen &rOther) { return rOther.mnXScreen 
== mnXScreen; }
>  ^
> vcl/inc/unx/saltype.h:21:10: note: candidate function (with reversed 
parameter order)

)

Change-Id: I5dab4fecfbb7badab06ebd0d779527de9672a02a
Reviewed-on: https://gerrit.libreoffice.org/81352
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/vcl/inc/unx/saltype.h b/vcl/inc/unx/saltype.h
index 97d9f1a4bb93..e62bdd25e1e2 100644
--- a/vcl/inc/unx/saltype.h
+++ b/vcl/inc/unx/saltype.h
@@ -18,8 +18,8 @@ class SalX11Screen {
 public:
 explicit SalX11Screen(unsigned int nXScreen) : mnXScreen( nXScreen ) {}
 unsigned int getXScreen() const { return mnXScreen; }
-bool operator==(const SalX11Screen &rOther) { return rOther.mnXScreen == 
mnXScreen; }
-bool operator!=(const SalX11Screen &rOther) { return rOther.mnXScreen != 
mnXScreen; }
+bool operator==(const SalX11Screen &rOther) const { return 
rOther.mnXScreen == mnXScreen; }
+bool operator!=(const SalX11Screen &rOther) const { return 
rOther.mnXScreen != mnXScreen; }
 };
 
 #endif // INCLUDED_VCL_INC_UNX_SALTYPE_H
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-22 Thread Jim Raykowski (via logerrit)

 include/vcl/treelist.hxx   |1 +
 sw/inc/strings.hrc |2 ++
 sw/source/uibase/utlui/content.cxx |   16 
 vcl/source/treelist/svimpbox.cxx   |2 +-
 vcl/source/treelist/treelist.cxx   |   17 +
 5 files changed, 37 insertions(+), 1 deletion(-)

New commits:
commit 3ed56f407235feb97ee2565a613e5f1d2bb2d925
Author: Jim Raykowski 
AuthorDate: Thu Oct 17 19:09:18 2019 -0800
Commit: Jim Raykowski 
CommitDate: Wed Oct 23 04:38:36 2019 +0200

tdf#128058 Add Expand Collapse All to Navigator context menu

Change-Id: I8c68865c8bc95a9ef6d1bea565e635e288f728e6
Reviewed-on: https://gerrit.libreoffice.org/81003
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 
Tested-by: Jenkins

diff --git a/include/vcl/treelist.hxx b/include/vcl/treelist.hxx
index 2d8fc7b4379d..15931d79f9d6 100644
--- a/include/vcl/treelist.hxx
+++ b/include/vcl/treelist.hxx
@@ -288,6 +288,7 @@ public:
 { return pModel->IsEntryVisible(this,pEntry); }
 
 boolIsExpanded( SvTreeListEntry* pEntry ) const;
+boolIsAllExpanded( SvTreeListEntry* pEntry) const;
 boolIsSelected( SvTreeListEntry* pEntry ) const;
 voidSetEntryFocus( SvTreeListEntry* pEntry, bool bFocus );
 const SvViewDataEntry* GetViewData( const SvTreeListEntry* pEntry 
) const;
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index e6355c4cbb3d..b77225641089 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -631,6 +631,8 @@
 #define STR_OUTLINE_LEVEL   NC_("STR_OUTLINE_LEVEL", 
"Outline Level")
 #define STR_DRAGMODENC_("STR_DRAGMODE", "Drag 
Mode")
 #define STR_SEND_OUTLINE_TO_CLIPBOARD_ENTRY 
NC_("STR_SEND_OUTLINE_TO_CLIPBOARD_ENTRY", "Send Outline to Clipboard")
+#define STR_EXPANDALL   NC_("STR_EXPANDALL", "Expand 
All")
+#define STR_COLLAPSEALL NC_("STR_COLLAPSEALL", 
"Collapse All")
 #define STR_HYPERLINK   NC_("STR_HYPERLINK", "Insert 
as Hyperlink")
 #define STR_LINK_REGION NC_("STR_LINK_REGION", "Insert 
as Link")
 #define STR_COPY_REGION NC_("STR_COPY_REGION", "Insert 
as Copy")
diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 7ee2789a4f9f..0381b2101281 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1207,6 +1207,16 @@ sal_Int8 SwContentTree::ExecuteDrop( const 
ExecuteDropEvent& rEvt )
 
 // Handler for Dragging and ContextMenu
 
+static void lcl_InsertExpandCollapseAllItem(SwContentTree* pContentTree, 
SvTreeListEntry* pEntry, PopupMenu* pPop)
+{
+if(pEntry->HasChildren() || pEntry->HasChildrenOnDemand())
+{
+pPop->InsertSeparator();
+pPop->InsertItem(800, pContentTree->IsAllExpanded(pEntry) ? 
SwResId(STR_COLLAPSEALL) : SwResId(STR_EXPANDALL));
+pPop->SetAccelKey(800, vcl::KeyCode(KEY_MULTIPLY, false, true, false, 
false));
+}
+}
+
 VclPtr SwContentTree::CreateContextMenu()
 {
 auto pPop = VclPtr::Create();
@@ -1348,6 +1358,8 @@ VclPtr SwContentTree::CreateContextMenu()
 pPop->SetPopupMenu(4, pSubPop4);
 }
 }
+else if(ContentTypeId::OUTLINE == nContentType)
+lcl_InsertExpandCollapseAllItem(this, pEntry, pPop);
 }
 else if( pEntry )
 {
@@ -1355,6 +1367,7 @@ VclPtr SwContentTree::CreateContextMenu()
 SwContentType* pType = 
static_cast(pEntry->GetUserData());
 if(ContentTypeId::OUTLINE == pType->GetType())
 {
+lcl_InsertExpandCollapseAllItem(this, pEntry, pPop);
 pPop->InsertSeparator();
 pPop->InsertItem(700, 
m_aContextStrings[IDX_STR_SEND_OUTLINE_TO_CLIPBOARD_ENTRY]);
 }
@@ -3291,6 +3304,9 @@ void SwContentTree::ExecuteContextMenuAction( sal_uInt16 
nSelectedPopupEntry )
 
m_pActiveShell->GetView().GetViewFrame()->GetDispatcher()->Execute(FN_OUTLINE_TO_CLIPBOARD);
 break;
 }
+case 800:
+KeyInput(KeyEvent(0, KEY_MOD1|KEY_MULTIPLY));
+break;
 //Display
 default:
 if(nSelectedPopupEntry > 300 && nSelectedPopupEntry < 400)
diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index a936c4a3f9e4..5a7308b8a3a3 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -2473,7 +2473,7 @@ bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
 // otherwise ignore the key press
 if( IsExpandable() )
 {
-if (!m_pView->IsExpanded(m_pCursor))
+if (!m_pView->IsAllExpanded(m_pCursor))
 {
 m_pView->Expand(m_pCursor);
 ExpandAll();
diff --git a/vcl/source/treeli

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

2019-10-22 Thread Jens Carl (via logerrit)

 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv |5 
-
 sc/qa/extras/scannotationshapeobj.cxx|   10 
+-
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 7fe58f64cd8b58918cae92aed536d266f63b4c71
Author: Jens Carl 
AuthorDate: Mon Oct 21 21:39:30 2019 -0700
Commit: Jens Carl 
CommitDate: Wed Oct 23 03:36:53 2019 +0200

tdf#45904 Move XTextRange Java test to C++

Move XTextRange Java test to C++ for ScAnnotationShapeObj.

Change-Id: If280b4e621fedd1023457ff626c6db8ef9a9f7ad
Reviewed-on: https://gerrit.libreoffice.org/81295
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git 
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
index fa1477b94f04..16d4d6f432d7 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
@@ -152,11 +152,6 @@
 
"ScAnnotationShapeObj";"com::sun::star::drawing::ShadowProperties";"ShadowTransparence"
 
"ScAnnotationShapeObj";"com::sun::star::drawing::ShadowProperties";"ShadowXDistance"
 
"ScAnnotationShapeObj";"com::sun::star::drawing::ShadowProperties";"ShadowYDistance"
-"ScAnnotationShapeObj";"com::sun::star::text::XTextRange";"getText()"
-"ScAnnotationShapeObj";"com::sun::star::text::XTextRange";"getStart()"
-"ScAnnotationShapeObj";"com::sun::star::text::XTextRange";"getEnd()"
-"ScAnnotationShapeObj";"com::sun::star::text::XTextRange";"getString()"
-"ScAnnotationShapeObj";"com::sun::star::text::XTextRange";"setString()"
 
"ScAnnotationShapeObj";"com::sun::star::style::CharacterProperties";"CharFontName"
 
"ScAnnotationShapeObj";"com::sun::star::style::CharacterProperties";"CharFontStyleName"
 
"ScAnnotationShapeObj";"com::sun::star::style::CharacterProperties";"CharFontFamily"
diff --git a/sc/qa/extras/scannotationshapeobj.cxx 
b/sc/qa/extras/scannotationshapeobj.cxx
index 567a7a904d3e..5a7a7258e04a 100644
--- a/sc/qa/extras/scannotationshapeobj.cxx
+++ b/sc/qa/extras/scannotationshapeobj.cxx
@@ -14,6 +14,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -42,7 +43,8 @@ class ScAnnotationShapeObj : public CalcUnoApiTest,
  public apitest::XShape,
  public apitest::XShapeDescriptor,
  public apitest::XSimpleText,
- public apitest::XText
+ public apitest::XText,
+ public apitest::XTextRange
 {
 public:
 ScAnnotationShapeObj();
@@ -76,6 +78,12 @@ public:
 // XText
 CPPUNIT_TEST(testInsertRemoveTextContent);
 
+// XTextRange
+CPPUNIT_TEST(testGetEnd);
+CPPUNIT_TEST(testGetSetString);
+CPPUNIT_TEST(testGetStart);
+CPPUNIT_TEST(testGetText);
+
 CPPUNIT_TEST_SUITE_END();
 
 private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svtools svtools/CppunitTest_svtools_dialogs_test.mk svtools/inc svtools/Library_svt.mk svtools/qa svtools/source

 include/svtools/valueset.hxx|1 
 svtools/CppunitTest_svtools_dialogs_test.mk |2 
 svtools/Library_svt.mk  |1 
 svtools/inc/uitest/uiobject.hxx |   36 +++
 svtools/qa/unit/svtools-dialogs-test.cxx|   35 ++
 svtools/source/control/valueset.cxx |6 ++
 svtools/source/uitest/uiobject.cxx  |   66 
 7 files changed, 146 insertions(+), 1 deletion(-)

New commits:
commit 7c6226bee72805db7f0e567ca9f06c786a7d0da2
Author: Henry Castro 
AuthorDate: Sat Oct 19 14:58:56 2019 -0400
Commit: Henry Castro 
CommitDate: Wed Oct 23 02:38:33 2019 +0200

lok: svtools: create ValueSetUIObject class

The ValueSet control is used in Layouts panel inside Sidebar of the
impress document. Once the LO server sends the UI data to the client side
that is transformed to mobile view using Mobile Wizard framework.
The loleaflet client side has to send commands for the user interactions
like to touch an item.

e.g.  Send "WindowId SELECT ID=300"

The unit test simulates the scenario, so the ValueSet control executes
the action.

Change-Id: Ib6ec5db6ce2777e819f81a9dae74c4641bb7053b
Reviewed-on: https://gerrit.libreoffice.org/81141
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 
Reviewed-on: https://gerrit.libreoffice.org/81354
Tested-by: Jenkins

diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 3855795d0627..eb3ad8d80cf8 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -296,6 +296,7 @@ public:
 virtual voidStateChanged( StateChangedType nStateChange ) override;
 virtual voidDataChanged( const DataChangedEvent& rDCEvt ) override;
 virtual boost::property_tree::ptree DumpAsPropertyTree() override;
+virtual FactoryFunction GetUITestFactory() const override;
 
 virtual voidSelect();
 virtual voidUserDraw( const UserDrawEvent& rUDEvt );
diff --git a/svtools/CppunitTest_svtools_dialogs_test.mk 
b/svtools/CppunitTest_svtools_dialogs_test.mk
index 28c4db4742ea..70f8a00e4bf7 100644
--- a/svtools/CppunitTest_svtools_dialogs_test.mk
+++ b/svtools/CppunitTest_svtools_dialogs_test.mk
@@ -17,7 +17,7 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,svtools_dialogs_test, \
 
 $(eval $(call gb_CppunitTest_use_sdk_api,svtools_dialogs_test))
 
-$(eval $(call gb_CppunitTest_set_include,desktop_dialogs_test,\
+$(eval $(call gb_CppunitTest_set_include,svtools_dialogs_test,\
 -I$(SRCDIR)/svtools/source/inc \
 -I$(SRCDIR)/svtools/inc \
 $$(INCLUDE) \
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 95486e42b328..c631190904b2 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -166,6 +166,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
 svtools/source/table/mousefunction \
 svtools/source/table/cellvalueconversion \
 svtools/source/table/tablegeometry \
+svtools/source/uitest/uiobject \
 svtools/source/uno/addrtempuno \
 svtools/source/uno/fpicker \
 svtools/source/uno/framestatuslistener \
diff --git a/svtools/inc/uitest/uiobject.hxx b/svtools/inc/uitest/uiobject.hxx
new file mode 100644
index ..c1a2ecf1f9f5
--- /dev/null
+++ b/svtools/inc/uitest/uiobject.hxx
@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 
+
+class ValueSet;
+
+class ValueSetUIObject : public WindowUIObject
+{
+private:
+VclPtr mxValueSet;
+
+public:
+ValueSetUIObject(const VclPtr& xValueSet);
+virtual ~ValueSetUIObject() override;
+
+virtual void execute(const OUString& rAction, const StringMap& 
rParameters) override;
+
+virtual StringMap get_state() override;
+
+static std::unique_ptr create(vcl::Window* pWindow);
+
+virtual OUString get_action(VclEventId nEvent) const override;
+
+protected:
+virtual OUString get_name() const override;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/qa/unit/svtools-dialogs-test.cxx 
b/svtools/qa/unit/svtools-dialogs-test.cxx
index 3c4efa419426..897455b2ff23 100644
--- a/svtools/qa/unit/svtools-dialogs-test.cxx
+++ b/svtools/qa/unit/svtools-dialogs-test.cxx
@@ -10,6 +10,10 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -30,9 +34,11 @@ public:
 
 // try to open a dialog
 void openAnyDialog();
+void testValueSetControl();
 
 CPPUNIT_TEST_SUITE(SvtoolsDialogsTest);
 CPPUNIT_TEST(openAnyDialog);
+CPPUNIT_TEST(testValueSetControl);
 CPPUNI

clang 10 error: use of overloaded operator '!=' is ambiguous

2019-10-22 Thread Luke Benes

clang version 10.0.0 (https://github.com/llvm/llvm-project.git 
8e050e41a4b1193592f9b4298f14935f5878ae5f / r375496)

 is failing with the following new errors:

[CXX] vcl/unx/generic/gdi/salgdi.cxx
/core/vcl/unx/generic/gdi/salgdi.cxx:138:18: error: use of overloaded operator 
'!=' is ambiguous (with operand types 'SalX11Screen' and 'SalX11Screen')
if( nXScreen != m_nXScreen )
 ^  ~~
/core/vcl/inc/unx/saltype.h:22:10: note: candidate function
bool operator!=(const SalX11Screen &rOther) { return rOther.mnXScreen != 
mnXScreen; }
 ^
/core/vcl/inc/unx/saltype.h:21:10: note: candidate function
bool operator==(const SalX11Screen &rOther) { return rOther.mnXScreen == 
mnXScreen; }
 ^
/core/vcl/inc/unx/saltype.h:21:10: note: candidate function (with reversed 
parameter order)
1 error generated.
/core/solenv/gbuild/LinkTarget.mk:294: recipe for target 
'/core/workdir/CxxObject/vcl/unx/generic/gdi/salgdi.o' failed
make[1]: *** [/core/workdir/CxxObject/vcl/unx/generic/gdi/salgdi.o] Error 1
make[1]: *** Waiting for unfinished jobs
/core/vcl/unx/generic/window/salframe.cxx:2377:34: error: use of overloaded 
operator '!=' is ambiguous (with operand types 'SalX11Screen' and 
'SalX11Screen')
if( mpParent->m_nXScreen != m_nXScreen )
 ^  ~~
/core/vcl/inc/unx/saltype.h:22:10: note: candidate function
bool operator!=(const SalX11Screen &rOther) { return rOther.mnXScreen != 
mnXScreen; }
 ^
/core/vcl/inc/unx/saltype.h:21:10: note: candidate function
bool operator==(const SalX11Screen &rOther) { return rOther.mnXScreen == 
mnXScreen; }
 ^
/core/vcl/inc/unx/saltype.h:21:10: note: candidate function (with reversed 
parameter order)
/core/vcl/unx/generic/window/salframe.cxx:2452:34: error: use of overloaded 
operator '!=' is ambiguous (with operand types 'SalX11Screen' and 
'SalX11Screen')
if( mpParent->m_nXScreen != m_nXScreen )
 ^  ~~
/core/vcl/inc/unx/saltype.h:22:10: note: candidate function
bool operator!=(const SalX11Screen &rOther) { return rOther.mnXScreen != 
mnXScreen; }
 ^
/core/vcl/inc/unx/saltype.h:21:10: note: candidate function
bool operator==(const SalX11Screen &rOther) { return rOther.mnXScreen == 
mnXScreen; }
 ^
/core/vcl/inc/unx/saltype.h:21:10: note: candidate function (with reversed 
parameter order)
2 errors generated.
/core/solenv/gbuild/LinkTarget.mk:294: recipe for target 
'/core/workdir/CxxObject/vcl/unx/generic/window/salframe.o' failed
make[1]: *** [/core/workdir/CxxObject/vcl/unx/generic/window/salframe.o] Error 1
Makefile:282: recipe for target 'build' failed
make: *** [build] Error 2

False positive, suppress, or something that needs fixing?

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

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

 sd/source/ui/sidebar/LayoutMenu.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d2b5ab3498a78c6d164a15b3bf2b947553ea2743
Author: Henry Castro 
AuthorDate: Sun Oct 20 09:50:48 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Oct 22 23:10:35 2019 +0200

sd: sidebar: force to set the id of the LayoutMenu control

Otherwise, the function std::unique_ptr
WindowUIObject::get_child(const OUString& rID)
will not find the control with the rID.

Change-Id: Ie571eb351bb0c59654f577cef1961247273d7608
Reviewed-on: https://gerrit.libreoffice.org/81345
Tested-by: Jenkins
Reviewed-by: Henry Castro 

diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx 
b/sd/source/ui/sidebar/LayoutMenu.cxx
index ab58af558cf1..bacfa1c5f261 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -135,6 +135,7 @@ LayoutMenu::LayoutMenu (
   mxSidebar(rxSidebar),
   mbIsDisposed(false)
 {
+set_id("sd::LayoutMenu");
 implConstruct( *mrBase.GetDocument()->GetDocSh() );
 SAL_INFO("sd.ui", "created LayoutMenu at " << this);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

 RepositoryExternal.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5447117899e688a6b0003ebbd256e92bcefd76c8
Author: Stephan Bergmann 
AuthorDate: Sat Oct 19 15:50:07 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 22 22:44:05 2019 +0200

Missing test dependency

Noticed when executing CppunitTest_sccomp_solver that it apparently 
depended on
ExternalProject_lpsolve but not on ExternalPackage_lpsolve.
(LpSolverTest::testLpSolver in sccomp/qa/unit/solver.cxx instantiates UNO
service com.sun.star.comp.Calc.LpsolveSolver in Library_solver, which uses
lpsolve as an external.)

Thanks to mst for showing me the right place to fix.

Change-Id: I71a1c3552473ff6fea616805eea1fb68143d255b
Reviewed-on: https://gerrit.libreoffice.org/81133
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5ce23a10c6db..8561ba84a0ea 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2470,7 +2470,7 @@ endef
 else # !SYSTEM_LPSOLVE
 
 define gb_LinkTarget__use_lpsolve
-$(call gb_LinkTarget_use_external_project,$(1),lpsolve)
+$(call gb_LinkTarget_use_package,$(1),lpsolve)
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
$(call gb_UnpackedTarball_get_dir,lpsolve)/lpsolve55/lpsolve55.lib \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-22 Thread andreas kainz (via logerrit)

 sw/uiconfig/swriter/ui/viewoptionspage.ui |   15 +++
 1 file changed, 15 insertions(+)

New commits:
commit c0a7554f7c757dc62df7c39d5dcc81aecdf28a36
Author: andreas kainz 
AuthorDate: Mon Oct 21 01:25:09 2019 +0200
Commit: andreas_kainz 
CommitDate: Tue Oct 22 22:05:09 2019 +0200

sw Options Dialog View sizegroup update

Change-Id: Id7d673d11f8a3790874c010e65d02959899b567d
Reviewed-on: https://gerrit.libreoffice.org/81191
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/sw/uiconfig/swriter/ui/viewoptionspage.ui 
b/sw/uiconfig/swriter/ui/viewoptionspage.ui
index 780db2e433e5..8ba0678ab3f6 100644
--- a/sw/uiconfig/swriter/ui/viewoptionspage.ui
+++ b/sw/uiconfig/swriter/ui/viewoptionspage.ui
@@ -5,6 +5,7 @@
   
 True
 False
+True
 6
 vertical
 12
@@ -12,6 +13,7 @@
   
 True
 False
+True
 6
 12
 True
@@ -294,6 +296,7 @@
   
 True
 False
+True
 vertical
 12
 
@@ -332,7 +335,9 @@
   
 True
 False
+True
 6
+12
 
   
 Verti_cal ruler
@@ -352,6 +357,7 @@
   
 True
 False
+True
   
   
 1
@@ -362,6 +368,7 @@
   
 True
 False
+True
   
   
 1
@@ -447,6 +454,7 @@
   
 True
 False
+True
   
   
 1
@@ -499,4 +507,11 @@
   
 
   
+  
+
+  
+  
+  
+
+  
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-22 Thread andreas kainz (via logerrit)

 cui/uiconfig/ui/paragalignpage.ui |6 ++
 cui/uiconfig/ui/paratabspage.ui   |4 -
 sw/uiconfig/swriter/ui/numparapage.ui |   91 --
 3 files changed, 51 insertions(+), 50 deletions(-)

New commits:
commit 48e68eddb9bc1d8356eaf493cfd4a520f64ce4d1
Author: andreas kainz 
AuthorDate: Fri Oct 18 22:56:30 2019 +0200
Commit: andreas_kainz 
CommitDate: Tue Oct 22 22:04:30 2019 +0200

tdf#128239 Paragraph Dialog: Update Alignment tab

Change-Id: Ia2649902e4ad8c2990ffef5fd0c22df32484fcd7
Reviewed-on: https://gerrit.libreoffice.org/81113
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/cui/uiconfig/ui/paragalignpage.ui 
b/cui/uiconfig/ui/paragalignpage.ui
index ddc3690fffa7..289585fa390c 100644
--- a/cui/uiconfig/ui/paragalignpage.ui
+++ b/cui/uiconfig/ui/paragalignpage.ui
@@ -440,4 +440,10 @@
   
 
   
+  
+
+  
+  
+
+  
 
commit 5456719e2a2cc4f3d9bfc2f107a054c593cd5480
Author: andreas kainz 
AuthorDate: Fri Oct 18 22:07:44 2019 +0200
Commit: andreas_kainz 
CommitDate: Tue Oct 22 22:04:22 2019 +0200

tdf#128239 Paragraph Dialog: Update Outline tab

Change-Id: Icb22f2a9f24852898ab4550bc0cec32732ad32dd
Reviewed-on: https://gerrit.libreoffice.org/81103
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/sw/uiconfig/swriter/ui/numparapage.ui 
b/sw/uiconfig/swriter/ui/numparapage.ui
index 0ff72c8eadfd..5339ba2ae8b9 100644
--- a/sw/uiconfig/swriter/ui/numparapage.ui
+++ b/sw/uiconfig/swriter/ui/numparapage.ui
@@ -17,7 +17,6 @@
   
 True
 False
-True
 6
 vertical
 12
@@ -25,28 +24,23 @@
   
 True
 False
-True
 0
 none
 
   
 True
 False
-True
 6
 12
 
   
 True
 False
-True
 12
 
   
 True
 False
-start
-True
 Outline level:
 True
 comboLB_OUTLINE_LEVEL
@@ -62,7 +56,6 @@
   
 True
 False
-True
 
   Text Body
   Level 1
@@ -108,28 +101,24 @@
   
 True
 False
-True
 0
 none
 
   
 True
 False
-True
 6
 12
 
   
 True
 False
-True
 vertical
 6
 
   
 True
 False
-True
 12
 
   
@@ -149,13 +138,37 @@
   
 
 
-  
+  
 True
 False
-True
-
-  None
-
+12
+
+  
+True
+False
+
+  None
+
+  
+  
+False
+True
+0
+  
+
+
+  
+Edit Style
+True
+True
+False
+  
+  
+False
+True
+1
+  
+
   
   
 False
@@ -163,19 +176,6 @@
 1
   
 
-
-  
-Edit Style
-True
-True
-False
-  
-  
-False
-True
-2
-  
-
   
   
 False
@@ -206,13 +206,11 @@
   
 False
 False
-True
 12
 
   
 True
 False
-

[Libreoffice-commits] core.git: dictionaries

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

New commits:
commit 138e8b5d8816d76121ea6d698f4a4fd34a26d519
Author: Ricardo Palomares 
AuthorDate: Tue Oct 22 21:07:42 2019 +0200
Commit: Gerrit Code Review 
CommitDate: Tue Oct 22 21:26:40 2019 +0200

Update git submodules

* Update dictionaries from branch 'master'
  - Bring shipped Spanish dictionary up to version 2.5

Change-Id: I4cd5921b88f61611ba2220d2db4aa3adee7d2d17
Reviewed-on: https://gerrit.libreoffice.org/81349
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/dictionaries b/dictionaries
index e2f020e6e2f1..f46d0decbf5a 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit e2f020e6e2f18991c42d15d9496dd6d5b7c844d6
+Subproject commit f46d0decbf5aec3f7eaa1d4017ed332cb421371d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: es/description.xml es/es_ANY.aff es/es_ANY.dic es/package-description.txt es/README_es_ANY.txt

 es/README_es_ANY.txt   |   23 -
 es/description.xml |2 
 es/es_ANY.aff  |   11 
 es/es_ANY.dic  |  767 +++--
 es/package-description.txt |2 
 5 files changed, 771 insertions(+), 34 deletions(-)

New commits:
commit f46d0decbf5aec3f7eaa1d4017ed332cb421371d
Author: Ricardo Palomares 
AuthorDate: Tue Oct 22 21:07:42 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Oct 22 21:26:40 2019 +0200

Bring shipped Spanish dictionary up to version 2.5

Change-Id: I4cd5921b88f61611ba2220d2db4aa3adee7d2d17
Reviewed-on: https://gerrit.libreoffice.org/81349
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/es/README_es_ANY.txt b/es/README_es_ANY.txt
index 8a780a5..8717d2c 100644
--- a/es/README_es_ANY.txt
+++ b/es/README_es_ANY.txt
@@ -7,7 +7,7 @@
   **  VERSIÓN GENÉRICA PARA TODAS LAS LOCALIZACIONES**
   
 
-  Versión 2.4
+  Versión 2.5
 
 SUMARIO
 
@@ -92,16 +92,17 @@ comillas). El código de región depende de cómo tenga 
configurado su sistema
 (por lo general será el del país donde reside), elegible entre uno de los
 siguientes:
 
-   Argentina:  "AR"Honduras:   "HN"
-   Bolivia:"BO"México: "MX"
-   Chile:  "CL"Nicaragua:  "NI"
-   Colombia:   "CO"Panamá: "PA"
-   Costa Rica: "CR"Perú:   "PE"
-   Cuba:   "CU"Puerto Rico:"PR"
-   Rep. Dominicana:"DO"Paraguay:   "PY"
-   Ecuador:"EC"El Salvador:"SV"
-   España: "ES"Uruguay:"UY"
-   Guatemala:  "GT"Venezuela:  "VE"
+   Argentina:  "AR"México: "MX"
+   Bolivia:"BO"Nicaragua:  "NI"
+   Chile:  "CL"Panamá: "PA"
+   Colombia:   "CO"Perú:   "PE"
+   Costa Rica: "CR"Filipinas:  "PH"
+   Cuba:   "CU"Puerto Rico:"PR"
+   Rep. Dominicana:"DO"Paraguay:   "PY"
+   Ecuador:"EC"El Salvador:"SV"
+   España: "ES"Estados Unidos: "US"
+   Guatemala:  "GT"Uruguay:"UY"
+   Honduras:   "HN"Venezuela:  "VE"
 
(El código de región se escribe en mayúsculas sin las comillas).
 
diff --git a/es/description.xml b/es/description.xml
index 71830b4..371d661 100644
--- a/es/description.xml
+++ b/es/description.xml
@@ -1,7 +1,7 @@
 
 http://openoffice.org/extensions/description/2006"; 
xmlns:d="http://openoffice.org/extensions/description/2006";  
xmlns:xlink="http://www.w3.org/1999/xlink";>
 
-
+
 
 
 
diff --git a/es/es_ANY.aff b/es/es_ANY.aff
index bf55d9d..b0c0be9 100644
--- a/es/es_ANY.aff
+++ b/es/es_ANY.aff
@@ -202,13 +202,14 @@ SFX M o eza/S nto
 SFX M o eza/S [aie]sto
 SFX M o ez/S usto
 SFX M o uez/S go
-SFX N Y 18
+SFX N Y 19
 SFX N a illa/S [bdfhjlmnprstv]a
 SFX N o illo/S [bdhjlmnprstv]o
 SFX N 0 cilla/S ve
 SFX N za cilla/S za
 SFX N 0 ecilla/S d
-SFX N ón oncillo/S ón
+SFX N ión ioncilla/S [cglnstx]ión
+SFX N ón oncillo/S [^i]ón
 SFX N 0 cillo/S or
 SFX N zo cillo/S zo
 SFX N 0 cillo/S [djlnu]e
@@ -4275,7 +4276,7 @@ SFX Ó ostrar uéstrasela ostrar
 SFX Ó ostrar uéstraselas ostrar
 SFX Ó ostrar uéstraselo ostrar
 SFX Ó ostrar uéstraselos ostrar
-SFX Ô Y 60
+SFX Ô Y 64
 SFX Ô aer áela aer
 SFX Ô aer áelas aer
 SFX Ô aer áelo aer
@@ -4300,6 +4301,10 @@ SFX Ô edir ídela edir
 SFX Ô edir ídelas edir
 SFX Ô edir ídelo edir
 SFX Ô edir ídelos edir
+SFX Ô egir ígela egir
+SFX Ô egir ígelas egir
+SFX Ô egir ígelo egir
+SFX Ô egir ígelos egir
 SFX Ô eguir íguela eguir
 SFX Ô eguir íguelas eguir
 SFX Ô eguir íguelo eguir
diff --git a/es/es_ANY.dic b/es/es_ANY.dic
index cc04fe0..a7b4694 100644
--- a/es/es_ANY.dic
+++ b/es/es_ANY.dic
@@ -1,4 +1,4 @@
-67495
+68226
 a
 ababa/S
 ababillar/RED
@@ -419,6 +419,7 @@ abreviar/REDñ
 abreviatura/S
 abrezar/RED
 Abriaquí
+abriaquiceño/GS
 abridero/GS
 abridero/S
 abridla
@@ -917,6 +918,7 @@ acetoso/GS
 acetre/S
 acetrinar/RED
 Acevedo
+aceveduno/GS
 acezante/S
 acezar/RED
 Acha
@@ -2030,6 +2032,7 @@ agradecido/hGS
 agradecimiento/Sh
 Agrado
 agrado/hS
+agraduno/GS
 agrafia/S
 ágrafo/GS
 agramadera/S
@@ -2096,6 +2099,7 @@ agrumar/RED
 agrupador/SG
 agrupamiento/pS
 agrupar/REDÀÁÄñTA
+agrura/S
 Agua
 Aguablanca
 Aguabonita
@@ -2116,6 +2120,7 @@ Aguada
 aguadar/RED
 aguada/S
 Aguadas
+aguadeño/GS
 aguadero/GS
 aguadija/S
 Aguadita
@@ -2174,6 +2179,7 @@ aguaza/S
 aguazo/S
 aguazoso/GS
 Aguazul
+aguazuleño/GS
 agu

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

2019-10-22 Thread Caolán McNamara (via logerrit)

 sw/uiconfig/swriter/ui/characterproperties.ui |5 +++--
 sw/uiconfig/swriter/ui/paradialog.ui  |3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit ad0a97ca200328d336a3cd58942f71a824b1f23a
Author: Caolán McNamara 
AuthorDate: Tue Oct 22 13:53:27 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 22 21:08:23 2019 +0200

Resolves: tdf#128318 'Standard' buttons should not be shown by default

Change-Id: Ic1af3895c1815a50fd26f74db8f5d4d006414643
Reviewed-on: https://gerrit.libreoffice.org/81329
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/uiconfig/swriter/ui/characterproperties.ui 
b/sw/uiconfig/swriter/ui/characterproperties.ui
index 363227d7465a..5b18eb1c8b71 100644
--- a/sw/uiconfig/swriter/ui/characterproperties.ui
+++ b/sw/uiconfig/swriter/ui/characterproperties.ui
@@ -38,10 +38,11 @@
 
 
   
-_Standard
-True
+_Standard
+False
 True
 True
+True
 True
   
   
diff --git a/sw/uiconfig/swriter/ui/paradialog.ui 
b/sw/uiconfig/swriter/ui/paradialog.ui
index bf9d51b4ce54..c9791fec33b2 100644
--- a/sw/uiconfig/swriter/ui/paradialog.ui
+++ b/sw/uiconfig/swriter/ui/paradialog.ui
@@ -39,9 +39,10 @@
 
   
 _Standard
-True
+False
 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: sc/source

 sc/source/ui/vba/vbarange.cxx  |8 +---
 sc/source/ui/view/cellsh.cxx   |   10 +-
 sc/source/ui/view/cellsh1.cxx  |   15 ---
 sc/source/ui/view/cellsh2.cxx  |4 ++--
 sc/source/ui/view/colrowba.cxx |   22 --
 sc/source/ui/view/dbfunc3.cxx  |   29 +++--
 6 files changed, 47 insertions(+), 41 deletions(-)

New commits:
commit 5d3b6e482e72451bd508b3a4db9f182ab4da388d
Author: Noel Grandin 
AuthorDate: Tue Oct 22 14:21:05 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 22 20:45:14 2019 +0200

sc: rowcol: tdf#50916 convert cellsh

Change-Id: If0a44e8bfd3195f2631c2fbcb7c5aa036aae7a40
Reviewed-on: https://gerrit.libreoffice.org/81331
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 311cb9c1fc22..4dc452bb4844 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -2853,6 +2853,7 @@ ScVbaRange::getEntireColumnOrRow( bool bColumn )
 ScCellRangesBase* pUnoRangesBase = getCellRangesBase();
 // copy the range list
 ScRangeList aCellRanges = pUnoRangesBase->GetRangeList();
+ScDocument& rDoc = getScDocument();
 
 for ( size_t i = 0, nRanges = aCellRanges.size(); i < nRanges; ++i )
 {
@@ -2860,12 +2861,12 @@ ScVbaRange::getEntireColumnOrRow( bool bColumn )
 if ( bColumn )
 {
 rRange.aStart.SetRow( 0 );
-rRange.aEnd.SetRow( MAXROW );
+rRange.aEnd.SetRow( rDoc.MaxRow() );
 }
 else
 {
 rRange.aStart.SetCol( 0 );
-rRange.aEnd.SetCol( MAXCOL );
+rRange.aEnd.SetCol( rDoc.MaxCol() );
 }
 }
 if ( aCellRanges.size() > 1 ) // Multi-Area
@@ -3640,7 +3641,8 @@ ScVbaRange::Delete( const uno::Any& Shift )
 }
 else
 {
-bool bFullRow = ( thisAddress.StartColumn == 0 && 
thisAddress.EndColumn == MAXCOL );
+ScDocument& rDoc = getScDocument();
+bool bFullRow = ( thisAddress.StartColumn == 0 && 
thisAddress.EndColumn == rDoc.MaxCol() );
 sal_Int32 nCols = thisAddress.EndColumn - thisAddress.StartColumn;
 sal_Int32 nRows = thisAddress.EndRow - thisAddress.StartRow;
 if ( mbIsRows || bFullRow || ( nCols >=  nRows ) )
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 949c81e47a3d..67908ba1ba68 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -137,7 +137,7 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
 break;
 case FID_FILL_TO_TOP:
 {
-bDisable = (!bSimpleArea) || (nRow1 == MAXROW && nRow2 == 
MAXROW);
+bDisable = (!bSimpleArea) || (nRow1 == pDoc->MaxRow() && nRow2 
== pDoc->MaxRow());
 if (!bDisable && GetViewData()->SelectionForbidsCellFill())
 bDisable = true;
 if ( !bDisable && bEditable )
@@ -161,7 +161,7 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
 break;
 case FID_FILL_TO_LEFT:
 {
-bDisable = (!bSimpleArea) || (nCol1 == MAXCOL && nCol2 == 
MAXCOL);
+bDisable = (!bSimpleArea) || (nCol1 == pDoc->MaxCol() && nCol2 
== pDoc->MaxCol());
 if (!bDisable && GetViewData()->SelectionForbidsCellFill())
 bDisable = true;
 if ( !bDisable && bEditable )
@@ -235,7 +235,7 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
 eAction = sc::ColRowEditAction::InsertRowsAfter;
 
 bDisable = (!bSimpleArea) || GetViewData()->SimpleColMarked();
-if (!bEditable && nCol1 == 0 && nCol2 == MAXCOL)
+if (!bEditable && nCol1 == 0 && nCol2 == pDoc->MaxCol())
 {
 // See if row insertions are allowed.
 bEditable = pDoc->IsEditActionAllowed(eAction, rMark, 
nRow1, nRow2);
@@ -255,7 +255,7 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
 eAction = sc::ColRowEditAction::InsertColumnsAfter;
 
 bDisable = (!bSimpleArea) || GetViewData()->SimpleRowMarked();
-if (!bEditable && nRow1 == 0 && nRow2 == MAXROW)
+if (!bEditable && nRow1 == 0 && nRow2 == pDoc->MaxRow())
 {
 // See if row insertions are allowed.
 bEditable = pDoc->IsEditActionAllowed(eAction, rMark, 
nCol1, nCol2);
@@ -1108,7 +1108,7 @@ void ScCellShell::GetState(SfxItemSet &rSet)
 if (pDoc->HasTabNotes( rTab ))
 {
 bHasNotes = true;
-
aRanges.push_back(ScRange(0,0,rTab,MAXCOL,MAXROW,rTab));
+
aRanges.push_back(ScRange(0,0,rTab,pDoc->MaxCol(),pDoc->MaxRow(),rTab));
 }

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

2019-10-22 Thread Miklos Vajna (via logerrit)

 sw/qa/extras/layout/data/tdf124770.docx |binary
 sw/qa/extras/layout/layout.cxx  |   51 
 sw/source/core/text/guess.cxx   |8 +
 3 files changed, 59 insertions(+)

New commits:
commit dc83c34989b366a9740da062e7d7bdca73fd9890
Author: Miklos Vajna 
AuthorDate: Tue Oct 22 16:53:06 2019 +0200
Commit: Miklos Vajna 
CommitDate: Tue Oct 22 20:06:35 2019 +0200

tdf#124770 sw layout: handle Word's take on italic formatting vs text break

When it comes to finding out if a piece of text fits the currently line
or not, Word simply measures the text width and the line width, and
decides if we fit or not. This can have an effect that italic text (e.g.
a "H" character) is slightly over the margin, but simplifies the layout.

Writer tries to reserve a bit more space, so italic text is kept inside
the margin, which leads to different layout in edge cases.

This somewhat arbitrary "reserve a bit more space: decrease the usable
line width by height / 12" mechanism was there since the initial import.
Reuse a related compatibility flag (tab-over-margin, already set for
imported-from-Word documents) to avoid this compensation to match what
Word does.

Change-Id: I0af178c75bb9a1e85d9f1393f010c890cb1cbc08
Reviewed-on: https://gerrit.libreoffice.org/81341
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/qa/extras/layout/data/tdf124770.docx 
b/sw/qa/extras/layout/data/tdf124770.docx
new file mode 100644
index ..dd354943739f
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf124770.docx differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 98eed78ca56a..5adaf5a54492 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -18,6 +18,10 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -30,6 +34,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 static char const DATA_DIRECTORY[] = "/sw/qa/extras/layout/data/";
 
@@ -3284,6 +3290,51 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf124601b)
 CPPUNIT_ASSERT_LESS(nLastCellRight, nFlyRight);
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf124770)
+{
+// Enable content over margin.
+SwDoc* pDoc = createDoc();
+pDoc->getIDocumentSettingAccess().set(DocumentSettingId::TAB_OVER_MARGIN, 
true);
+
+// Set page width.
+SwPageDesc& rPageDesc = pDoc->GetPageDesc(0);
+SwFrameFormat& rPageFormat = rPageDesc.GetMaster();
+const SwAttrSet& rPageSet = rPageFormat.GetAttrSet();
+SwFormatFrameSize aPageSize = rPageSet.GetFrameSize();
+aPageSize.SetWidth(3703);
+rPageFormat.SetFormatAttr(aPageSize);
+
+// Set left and right margin.
+SvxLRSpaceItem aLRSpace = rPageSet.GetLRSpace();
+aLRSpace.SetLeft(1418);
+aLRSpace.SetRight(1418);
+rPageFormat.SetFormatAttr(aLRSpace);
+pDoc->ChgPageDesc(0, rPageDesc);
+
+// Set font to italic 20pt Liberation Serif.
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+SfxItemSet aTextSet(pWrtShell->GetView().GetPool(),
+svl::Items{});
+SvxFontItem aFont(RES_CHRATR_FONT);
+aFont.SetFamilyName("Liberation Serif");
+aTextSet.Put(aFont);
+SvxFontHeightItem aHeight(400, 100, RES_CHRATR_FONTSIZE);
+aTextSet.Put(aHeight);
+SvxPostureItem aItalic(ITALIC_NORMAL, RES_CHRATR_POSTURE);
+aTextSet.Put(aItalic);
+pWrtShell->SetAttrSet(aTextSet);
+
+// Insert the text.
+pWrtShell->Insert2("HHH");
+
+xmlDocPtr pXmlDoc = parseLayoutDump();
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 1
+// - Actual  : 2
+// i.e. the italic string was broken into 2 lines, while Word kept it in a 
single line.
+assertXPath(pXmlDoc, "/root/page/body/txt[1]/LineBreak", 1);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index c28cccfb65bc..7d2f4a3b1010 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -136,6 +136,14 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor, 
SwTextFormatInfo &rInf,
 bAddItalic = false;
 }
 
+if (rInf.GetTextFrame()->GetDoc().getIDocumentSettingAccess().get(
+DocumentSettingId::TAB_OVER_MARGIN))
+{
+// Content is allowed over the margin: in this case over-margin 
content caused by italic
+// formatting is OK.
+bAddItalic = false;
+}
+
 nItalic = bAddItalic ? nPorHeight / 12 : 0;
 
 nLineWidth -= nItalic;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 desktop/source/lib/init.cxx |   74 +---
 1 file changed, 30 insertions(+), 44 deletions(-)

New commits:
commit 762ee9c8339695ff9471124b448a25a83638bfba
Author: Henry Castro 
AuthorDate: Sun Oct 20 10:06:20 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Oct 22 19:50:39 2019 +0200

lok: convert JSON to StringMap in sent DialogEvent function

The StringMap type is used to the class UIObject methods to get state
and execute actions. So the idea is the loleaflet client side send
a raw JSON string:

{
  ctrl: "id_control",
  cmd: "SELECT",
  ID: "item_id",
  ...   // more parameters
}

Then it is transformed with a simple JSON to StringMap, finally
it is dispatched to execute the actions.

Change-Id: Icd628598fe46ae28b4afa3ca17ac75797c1b9308
Reviewed-on: https://gerrit.libreoffice.org/81167
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 200be4cf465f..d316997bab46 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -413,6 +413,25 @@ std::vector 
desktop::jsonToPropertyValuesVector(const char
 return aArguments;
 }
 
+
+static StringMap jsonToStringMap(const char* pJSON)
+{
+StringMap aArgs;
+if (pJSON && pJSON[0] != '\0')
+{
+std::stringstream aStream(pJSON);
+boost::property_tree::ptree aTree;
+boost::property_tree::read_json(aStream, aTree);
+
+for (const auto& rPair : aTree)
+{
+aArgs[OUString::fromUtf8(rPair.first.c_str())] = 
OUString::fromUtf8(rPair.second.get_value(".").c_str());
+}
+}
+return aArgs;
+}
+
+
 static boost::property_tree::ptree unoAnyToPropertyTree(const uno::Any& 
anyItem)
 {
 boost::property_tree::ptree aTree;
@@ -3272,34 +3291,14 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 {
 SolarMutexGuard aGuard;
 
-char* pCopy = strdup(pArguments);
-if (!pCopy)
-{
-SetLastExceptionMsg("String copying error.");
-return;
-}
-
-char* pIdChar = strtok(pCopy, " ");
-char* pOptionalEventType = strtok(nullptr, " ");
-char* pOptionalData = strtok(nullptr, " ");
-
-if (!pIdChar)
-{
-SetLastExceptionMsg("Error parsing the command.");
-free(pCopy);
-return;
-}
-
-OUString sId = OUString::createFromAscii(pIdChar);
-
+StringMap aMap(jsonToStringMap(pArguments));
 VclPtr pWindow = vcl::Window::FindLOKWindow(nWindowId);
 if (!pWindow)
 {
 SetLastExceptionMsg("Document doesn't support dialog rendering, or 
window not found.");
-free(pCopy);
 return;
 }
-else
+else if (aMap.find("id") != aMap.end())
 {
 const OUString sClickAction("CLICK");
 const OUString sSelectAction("SELECT");
@@ -3311,40 +3310,29 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 try
 {
 WindowUIObject aUIObject(pWindow);
-std::unique_ptr pUIWindow(aUIObject.get_child(sId));
+std::unique_ptr 
pUIWindow(aUIObject.get_child(aMap["id"]));
 if (pUIWindow) {
 bool bIsClickAction = false;
-StringMap aMap;
 
-if (pOptionalEventType) {
-if (strcmp(pOptionalEventType, "selected") == 0 && 
pOptionalData)
+if (aMap.find("cmd") != aMap.end()) {
+if (aMap["cmd"] == "selected")
 {
-char* pPos = strtok(pOptionalData, ";");
-char* pText = strtok(nullptr, ";");
-
-if (!pPos || !pText)
-{
-SetLastExceptionMsg("Error parsing the command.");
-free(pCopy);
-return;
-}
-
-aMap["POS"] = OUString::createFromAscii(pPos);
-aMap["TEXT"] = OUString::createFromAscii(pText);
+aMap["POS"] = aMap["data"];
+aMap["TEXT"] = aMap["data"];
 
 pUIWindow->execute(sSelectAction, aMap);
 }
-else if (strcmp(pOptionalEventType, "plus") == 0)
+else if (aMap["cmd"] == "plus")
 {
 pUIWindow->execute(sUpAction, aMap);
 }
-else if (strcmp(pOptionalEventType, "minus") == 0)
+else if (aMap["cmd"] == "minus")
 {
 pUIWindow->execute(sDownAction, aMap);
 }
-else if (pOptionalData)
+else if (aMap["cmd"] == "set")
 {
-aMap["TE

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

 common/Log.cpp |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7c325c0fb32951dfc8786df98d72e72c92443088
Author: Ashod Nakashian 
AuthorDate: Tue Oct 22 10:30:48 2019 -0400
Commit: Andras Timar 
CommitDate: Tue Oct 22 19:24:01 2019 +0200

wsd: warning logging on the console is now magenta for visibility

Change-Id: I8756a0c38d529495826131a3d2dcd1ab70d8c289
Reviewed-on: https://gerrit.libreoffice.org/81337
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/common/Log.cpp b/common/Log.cpp
index 36cd9c126..424ef826c 100644
--- a/common/Log.cpp
+++ b/common/Log.cpp
@@ -163,6 +163,7 @@ namespace Log
 {
 channel = static_cast(new 
Poco::ColorConsoleChannel());
 channel->setProperty("traceColor", "green");
+channel->setProperty("warningColor", "magenta");
 }
 else
 channel = static_cast(new Poco::ConsoleChannel());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4-0' - 2 commits - loolwsd.xml.in wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp wsd/LOOLWSD.cpp

 loolwsd.xml.in |1 
 wsd/DocumentBroker.cpp |   52 +++--
 wsd/DocumentBroker.hpp |9 ++--
 wsd/LOOLWSD.cpp|1 
 4 files changed, 42 insertions(+), 21 deletions(-)

New commits:
commit f2913f20b03e916ce8a70f927ca3f5655a3768a8
Author: Ashod Nakashian 
AuthorDate: Tue Oct 22 10:28:57 2019 -0400
Commit: Andras Timar 
CommitDate: Tue Oct 22 19:23:44 2019 +0200

wsd: upload to storage when per_document.always_save_on_exit is set

Saving the document on exit is not enough, we also need
to send it to the storage. We now force doing that,
even when there is no modifiction to the document
(i.e. a new version wasn't really saved).

Change-Id: Ic4e1b1424f32d3141e98c936a51e47c9e4b9f753
Reviewed-on: https://gerrit.libreoffice.org/81336
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 9c35e4de1..6650593b7 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -774,13 +774,20 @@ bool DocumentBroker::saveToStorage(const std::string& 
sessionId,
 {
 assertCorrectThread();
 
-if (force)
+// Force saving on exit, if enabled.
+if (!force && isMarkedToDestroy())
 {
-LOG_TRC("Document will be saved forcefully to storage.");
-_storage->forceSave();
+static const bool always_save = 
LOOLWSD::getConfigValue("per_document.always_save_on_exit", false);
+if (always_save)
+{
+LOG_TRC("Enabling forced saving to storage per always_save_on_exit 
config.");
+force = true;
+}
 }
 
-const bool res = saveToStorageInternal(sessionId, success, result);
+constexpr bool isRename = false;
+const bool res = saveToStorageInternal(sessionId, success, result, 
/*saveAsPath*/ std::string(),
+   /*saveAsFilename*/ std::string(), 
isRename, force);
 
 // If marked to destroy, or session is disconnected, remove.
 const auto it = _sessions.find(sessionId);
@@ -804,22 +811,21 @@ bool DocumentBroker::saveAsToStorage(const std::string& 
sessionId, const std::st
 return saveToStorageInternal(sessionId, true, "", saveAsPath, 
saveAsFilename, isRename);
 }
 
-bool DocumentBroker::saveToStorageInternal(const std::string& sessionId,
-   bool success, const std::string& 
result,
-   const std::string& saveAsPath, 
const std::string& saveAsFilename, const bool isRename)
+bool DocumentBroker::saveToStorageInternal(const std::string& sessionId, bool 
success,
+   const std::string& result, const 
std::string& saveAsPath,
+   const std::string& saveAsFilename, 
const bool isRename,
+   const bool force)
 {
 assertCorrectThread();
 
 // Record that we got a response to avoid timeing out on saving.
 _lastSaveResponseTime = std::chrono::steady_clock::now();
 
-const bool isSaveAs = !saveAsPath.empty();
-
 // If save requested, but core didn't save because document was unmodified
 // notify the waiting thread, if any.
-LOG_TRC("Saving to storage docKey [" << _docKey << "] for session [" << 
sessionId <<
-"]. Success: " << success << ", result: " << result);
-if (!success && result == "unmodified" && !isRename)
+LOG_TRC("Uploading to storage docKey [" << _docKey << "] for session [" << 
sessionId <<
+"]. Success: " << success << ", result: " << result << ", force: " 
<< force);
+if (!success && result == "unmodified" && !isRename && !force)
 {
 LOG_DBG("Save skipped as document [" << _docKey << "] was not 
modified.");
 _lastSaveTime = std::chrono::steady_clock::now();
@@ -830,18 +836,24 @@ bool DocumentBroker::saveToStorageInternal(const 
std::string& sessionId,
 const auto it = _sessions.find(sessionId);
 if (it == _sessions.end())
 {
-LOG_ERR("Session with sessionId [" << sessionId << "] not found while 
saving docKey [" << _docKey << "].");
+LOG_ERR("Session with sessionId [" << sessionId << "] not found while 
storing document docKey [" << _docKey << "]. The document ");
 return false;
 }
 
 // Check that we are actually about to upload a successfully saved 
document.
-if (!success)
+if (!success && !force)
 {
-LOG_ERR("Cannot save docKey [" << _docKey << "], the .uno:Save has 
failed in LOK.");
+LOG_ERR("Cannot store docKey [" << _docKey << "] as .uno:Save has 
failed in LOK.");
 it->second->sendTextFrame("error: cmd=storage kind=savefailed");
 return false;
 }
 
+if (force)
+{
+LOG_DBG("Document docKey [" << _docKey << "] will be saved forcefully 
to storage.");
+}
+
+const bool isSaveAs = !saveAsPath.empty();

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4-0' - test/httpwstest.cpp test/TileCacheTests.cpp

 test/TileCacheTests.cpp |   38 ++
 test/httpwstest.cpp |   18 --
 2 files changed, 34 insertions(+), 22 deletions(-)

New commits:
commit a6e2dff35a4f1234066c66cb64f7e3bcd034ed58
Author: Ashod Nakashian 
AuthorDate: Mon Oct 21 11:42:03 2019 -0400
Commit: Andras Timar 
CommitDate: Tue Oct 22 19:23:11 2019 +0200

test: improve tests

This fixes up some minor issues, improves stability
and logging of tests.

Change-Id: I906922c1c74427a53f9017f7be73c1f85ecf4cd7
Reviewed-on: https://gerrit.libreoffice.org/81259
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/test/TileCacheTests.cpp b/test/TileCacheTests.cpp
index add630168..9d528998b 100644
--- a/test/TileCacheTests.cpp
+++ b/test/TileCacheTests.cpp
@@ -124,6 +124,7 @@ class TileCacheTests : public CPPUNIT_NS::TestFixture
 const std::string& name = "checkTiles ");
 
 void requestTiles(std::shared_ptr& socket,
+  const std::string& docType,
   const int part,
   const int docWidth,
   const int docHeight,
@@ -1032,7 +1033,10 @@ void 
TileCacheTests::checkTiles(std::shared_ptr& socket, const st
 std::getline(istr, line);
 
 Poco::StringTokenizer tokens(line, " ", 
Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM);
-CPPUNIT_ASSERT_EQUAL(static_cast(6), tokens.count());
+if (docType == "presentation")
+CPPUNIT_ASSERT_EQUAL(static_cast(7), tokens.count()); // 
We have an extra field.
+else
+CPPUNIT_ASSERT_EQUAL(static_cast(6), tokens.count());
 
 // Expected format is something like 'type= parts= current= width= 
height='.
 const std::string text = tokens[0].substr(type.size());
@@ -1051,7 +1055,7 @@ void 
TileCacheTests::checkTiles(std::shared_ptr& socket, const st
 {
 // request tiles
 std::cerr << "Requesting Impress tiles." << std::endl;
-requestTiles(socket, currentPart, docWidth, docHeight, name);
+requestTiles(socket, docType, currentPart, docWidth, docHeight, name);
 }
 
 // random setclientpart
@@ -1071,7 +1075,7 @@ void 
TileCacheTests::checkTiles(std::shared_ptr& socket, const st
 // issue a new tile request as a response, which a real client 
would do).
 assertResponseString(socket, "setpart:", name);
 
-requestTiles(socket, it, docWidth, docHeight, name);
+requestTiles(socket, docType, it, docWidth, docHeight, name);
 
 if (++requests >= 3)
 {
@@ -1084,7 +1088,9 @@ void 
TileCacheTests::checkTiles(std::shared_ptr& socket, const st
 }
 }
 
-void TileCacheTests::requestTiles(std::shared_ptr& socket, 
const int part, const int docWidth, const int docHeight, const std::string& 
name)
+void TileCacheTests::requestTiles(std::shared_ptr& socket,
+  const std::string& , const int part, const 
int docWidth,
+  const int docHeight, const std::string& name)
 {
 // twips
 const int tileSize = 3840;
@@ -1131,7 +1137,7 @@ void 
TileCacheTests::requestTiles(std::shared_ptr& socket, const
 // expected tile: part= width= height= tileposx= tileposy= 
tilewidth= tileheight=
 Poco::StringTokenizer tokens(tile, " ", 
Poco::StringTokenizer::TOK_IGNORE_EMPTY | Poco::StringTokenizer::TOK_TRIM);
 CPPUNIT_ASSERT_EQUAL(std::string("tile:"), tokens[0]);
-CPPUNIT_ASSERT_EQUAL(part, 
std::stoi(tokens[1].substr(std::string("nviewid=").size(;
+CPPUNIT_ASSERT_EQUAL(0, 
std::stoi(tokens[1].substr(std::string("nviewid=").size(;
 CPPUNIT_ASSERT_EQUAL(part, 
std::stoi(tokens[2].substr(std::string("part=").size(;
 CPPUNIT_ASSERT_EQUAL(pixTileSize, 
std::stoi(tokens[3].substr(std::string("width=").size(;
 CPPUNIT_ASSERT_EQUAL(pixTileSize, 
std::stoi(tokens[4].substr(std::string("height=").size(;
@@ -1225,9 +1231,9 @@ void TileCacheTests::testTileWireIDHandling()
 CPPUNIT_ASSERT_MESSAGE("Expected at least two tiles.", 
countMessages(socket, "tile:", testname, 500) > 1);
 
 // Let WSD know we got these so it wouldn't stop sending us modified tiles 
automatically.
-sendTextFrame(socket, "tileprocessed tile=0:0:0:3840:3840:0");
-sendTextFrame(socket, "tileprocessed tile=0:3840:0:3840:3840:0");
-sendTextFrame(socket, "tileprocessed tile=0:7680:0:3840:3840:0");
+sendTextFrame(socket, "tileprocessed tile=0:0:0:3840:3840:0", testname);
+sendTextFrame(socket, "tileprocessed tile=0:3840:0:3840:3840:0", testname);
+sendTextFrame(socket, "tileprocessed tile=0:7680:0:3840:3840:0", testname);
 
 // Type an other character
 sendChar(socket, 'y', skNone, testname);
@@ -1294,7 +1300,7 @@ void TileCacheTests::testTileProcessed()
 
 for(std::s

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4-0' - test/httpwstest.cpp

 test/httpwstest.cpp |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit a12092c85d3b8e8e3b3c54b0eabb6bd3725b9542
Author: Ashod Nakashian 
AuthorDate: Mon Oct 21 00:47:55 2019 -0400
Commit: Andras Timar 
CommitDate: Tue Oct 22 19:03:24 2019 +0200

test: improve HTTPWSTest::testUndoConflict

Failure rate is now reduced.

Change-Id: I46c26582126c7dba2a3fc86dbbf6ec5f12aa740f
Reviewed-on: https://gerrit.libreoffice.org/81197
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index 8b3688166..92110fbc9 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -2690,22 +2690,22 @@ void HTTPWSTest::testUndoConflict()
 response = getResponseString(socket1, "invalidatecursor:", testname + 
"1 ");
 
 // edit first view
-sendTextFrame(socket0, "key type=input char=97 key=0", testname);
-response = getResponseString(socket0, "invalidatecursor:", testname + 
"0 ");
+sendChar(socket0, 'A', skNone, testname + "0 ");
+response = getResponseString(socket0, "invalidateviewcursor: ", 
testname + "0 ");
 // edit second view
-sendTextFrame(socket1, "key type=input char=98 key=0", testname);
-response = getResponseString(socket1, "invalidatecursor:", testname + 
"1 ");
+sendChar(socket1, 'B', skNone, testname + "1 ");
+response = getResponseString(socket1, "invalidateviewcursor: ", 
testname + "1 ");
 // try to undo first view
 sendTextFrame(socket0, "uno .uno:Undo", testname);
 // undo conflict
 response = getResponseString(socket0, "unocommandresult:", testname + 
"0 ");
 Poco::JSON::Object::Ptr objJSON = 
parser.parse(response.substr(17)).extract();
-CPPUNIT_ASSERT_EQUAL(objJSON->get("commandName").toString(), 
std::string(".uno:Undo"));
-CPPUNIT_ASSERT_EQUAL(objJSON->get("success").toString(), 
std::string("true"));
+CPPUNIT_ASSERT_EQUAL(std::string(".uno:Undo"), 
objJSON->get("commandName").toString());
+CPPUNIT_ASSERT_EQUAL(std::string("true"), 
objJSON->get("success").toString());
 CPPUNIT_ASSERT(objJSON->has("result"));
 const Poco::Dynamic::Var parsedResultJSON = objJSON->get("result");
 const auto& resultObj = 
parsedResultJSON.extract();
-CPPUNIT_ASSERT_EQUAL(resultObj->get("type").toString(), 
std::string("long"));
+CPPUNIT_ASSERT_EQUAL(std::string("long"), 
resultObj->get("type").toString());
 CPPUNIT_ASSERT(Poco::strToInt(resultObj->get("value").toString(), 
conflict, 10));
 CPPUNIT_ASSERT(conflict > 0); /*UNDO_CONFLICT*/
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4-0' - common/Png.hpp kit/Kit.cpp test/helpers.hpp test/TileCacheTests.cpp

 common/Png.hpp  |2 
 kit/Kit.cpp |   14 ++---
 test/TileCacheTests.cpp |  129 
 test/helpers.hpp|   20 +++
 4 files changed, 83 insertions(+), 82 deletions(-)

New commits:
commit 9603597fd1aaecb27893792cfd2d243e450b58b8
Author: Ashod Nakashian 
AuthorDate: Sat Oct 19 12:33:22 2019 -0400
Commit: Andras Timar 
CommitDate: Tue Oct 22 19:01:43 2019 +0200

test: improve TileCacheTests

Sometimes core renderes with sub-pixel differences
(the crosshair at the corners of the Writer pages
show line anti-aliasing differences). This causes
failure of the tests that count the tile deduplication.

We now tolerate when we get an unchanged tile twice,
assuming it was due to such a rendering difference,
but we re-trigger another change and this time we
don't expect any extra tiles, no more than two
variations of the anti-aliased crosshair was
observed.

We also move some duplicate code into utility
functions to improve readability and reuse.

Change-Id: I1a66732dd3443bfbd770d8dc65721571dfa08615
Reviewed-on: https://gerrit.libreoffice.org/81196
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/common/Png.hpp b/common/Png.hpp
index 34328ce8c..dd3c70d09 100644
--- a/common/Png.hpp
+++ b/common/Png.hpp
@@ -205,7 +205,7 @@ inline bool encodeSubBufferToPNG(unsigned char* pixmap, 
size_t startX, size_t st
 ++nCalls;
 LOG_TRC("PNG compression took "
 << duration << " ms (" << output.size() << " bytes). Average 
after " << nCalls
-<< " calls: " << (totalDuration / 
static_cast(nCalls)));
+<< " calls: " << (totalDuration / static_cast(nCalls)) 
<< " ms.");
 }
 
 return res;
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 72937196f..66042d9d3 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -477,9 +477,9 @@ class PngCache
 for (auto it = _cache.begin(); it != _cache.end(); ++it)
 avgHits += it->second.getHitCount();
 
-LOG_DBG("cache " << _cache.size() << " items total size " <<
+LOG_DBG("Cache " << _cache.size() << " items total size " <<
 _cacheSize << " current hits " << avgHits << ", total hit 
rate " <<
-(_cacheHits * 100. / _cacheTests) << "% at balance start");
+(_cacheHits * 100. / _cacheTests) << "% at balance 
start.");
 avgHits /= _cache.size();
 
 for (auto it = _cache.begin(); it != _cache.end();)
@@ -500,8 +500,8 @@ class PngCache
 }
 }
 
-LOG_DBG("cache " << _cache.size() << " items total size " <<
-_cacheSize << " after balance");
+LOG_DBG("Cache " << _cache.size() << " items with total size of " 
<<
+_cacheSize << " bytes after balance.");
 }
 
 if (_hashToWireId.size() > CacheWidHardLimit)
@@ -539,6 +539,7 @@ class PngCache
 }
 }
 
+LOG_DBG("PNG cache with hash " << hash << " missed.");
 return false;
 }
 
@@ -548,7 +549,6 @@ class PngCache
std::vector& output, 
LibreOfficeKitTileMode mode,
TileBinaryHash hash, TileWireId wid, 
TileWireId /*oldWid*/)
 {
-LOG_DBG("PNG cache with hash " << hash << " missed.");
 /*
  *Disable for now - pushed in error.
  *
@@ -558,7 +558,7 @@ class PngCache
 return true;
 */
 
-LOG_DBG("Encode a new png for this tile.");
+LOG_DBG("Encode a new png for this tile (" << startX << ',' << startY 
<< ").");
 CacheEntry newEntry(bufferWidth * bufferHeight * 1, wid);
 if (Png::encodeSubBufferToPNG(pixmap, startX, startY, width, height,
   bufferWidth, bufferHeight,
@@ -569,6 +569,8 @@ class PngCache
 newEntry.getData()->shrink_to_fit();
 _cache.emplace(hash, newEntry);
 _cacheSize += newEntry.getData()->size();
+LOG_TRC("Cached new tile (" << startX << ',' << startY << ") 
with hash " << hash
+<< ". New size: " << _cacheSize);
 }
 
 output.insert(output.end(),
diff --git a/test/TileCacheTests.cpp b/test/TileCacheTests.cpp
index 575caf9f0..add630168 100644
--- a/test/TileCacheTests.cpp
+++ b/test/TileCacheTests.cpp
@@ -1128,7 +1128,7 @@ void 
TileCacheTests::requestTiles(std::shared_ptr& socket, const
 
 sendTextFrame(socket, text, name);
 tile = assertResponseString(socket, "tile:", name);
-// expected tile: nviewid= part= width= height= tileposx= 
tileposy= tilewidth= tileheight=
+// expected tile: part= width= height= tileposx= tileposy= 
tilewidth= tileheight=
 Poco::StringTokenizer tokens(tile, " ", 
Poco:

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4-0' - common/Common.hpp wsd/DocumentBroker.cpp wsd/LOOLWSD.cpp

 common/Common.hpp  |2 +-
 wsd/DocumentBroker.cpp |7 ++-
 wsd/LOOLWSD.cpp|   16 
 3 files changed, 19 insertions(+), 6 deletions(-)

New commits:
commit 32fa1d95fc2ec65866d0cb47d619885182db7040
Author: Ashod Nakashian 
AuthorDate: Fri Oct 18 08:10:12 2019 -0400
Commit: Andras Timar 
CommitDate: Tue Oct 22 19:01:03 2019 +0200

wsd: dynamic child timeout

The initial child spawning takes significantly longer
than subsequent ones (for obvious reasons) and this
lead to unit-tests being sensitive to the timeout
we use for child spawning. Too short, and we
spawn more than we want on startup, too long
and crash-recovery tests fail (we don't
recover fast enough, as we wait too long before
spawning new children).

Dynamically setting the timeout allows us to give
longer timeout at startup, and reduce it afterwards.

Change-Id: I8423f5c6619e57030ab43d519aaa41d8712c36d3
Reviewed-on: https://gerrit.libreoffice.org/81194
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/common/Common.hpp b/common/Common.hpp
index 599de0779..84b5eaae2 100644
--- a/common/Common.hpp
+++ b/common/Common.hpp
@@ -15,7 +15,7 @@ constexpr int DEFAULT_CLIENT_PORT_NUMBER = 9980;
 constexpr int DEFAULT_MASTER_PORT_NUMBER = 9981;
 
 constexpr int COMMAND_TIMEOUT_MS = 5000;
-constexpr int CHILD_TIMEOUT_MS = COMMAND_TIMEOUT_MS * 2;
+constexpr int CHILD_TIMEOUT_MS = COMMAND_TIMEOUT_MS;
 constexpr int CHILD_REBALANCE_INTERVAL_MS = CHILD_TIMEOUT_MS / 10;
 constexpr int POLL_TIMEOUT_MS = COMMAND_TIMEOUT_MS / 5;
 constexpr int WS_SEND_TIMEOUT_MS = 1000;
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 657ea999b..0c423bc52 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -373,7 +373,12 @@ void DocumentBroker::pollThread()
 }
 
 // Flush socket data first.
-const int flushTimeoutMs = POLL_TIMEOUT_MS * 2; // ~1000ms
+constexpr int flushTimeoutMs = POLL_TIMEOUT_MS * 2; // ~1000ms
+LOG_INF("Flushing socket for doc ["
+<< _docKey << "] for " << flushTimeoutMs << " ms. stop: " << _stop
+<< ", continuePolling: " << _poll->continuePolling() << ", 
ShutdownRequestFlag: "
+<< ShutdownRequestFlag << ", TerminationFlag: " << TerminationFlag
+<< ". Terminating child with reason: [" << _closeReason << "].");
 const auto flushStartTime = std::chrono::steady_clock::now();
 while (_poll->getSocketCount())
 {
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 5b8f43949..af101523c 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -206,6 +206,8 @@ extern "C" { void dump_state(void); /* easy for gdb */ }
 static int careerSpanMs = 0;
 #endif
 
+/// The timeout for a child to spawn, initially high, then reset to the 
default.
+int ChildSpawnTimeoutMs = CHILD_TIMEOUT_MS * 4;
 bool LOOLWSD::NoCapsForKit = false;
 bool LOOLWSD::TileCachePersistent = true;
 std::atomic LOOLWSD::NumConnections;
@@ -422,7 +424,7 @@ static int rebalanceChildren(int balance)
 
 const auto duration = (std::chrono::steady_clock::now() - 
LastForkRequestTime);
 const std::chrono::milliseconds::rep durationMs = 
std::chrono::duration_cast(duration).count();
-if (OutstandingForks != 0 && durationMs >= CHILD_TIMEOUT_MS)
+if (OutstandingForks != 0 && durationMs >= ChildSpawnTimeoutMs)
 {
 // Children taking too long to spawn.
 // Forget we had requested any, and request anew.
@@ -504,7 +506,7 @@ std::shared_ptr getNewChild_Blocks(
 }
 
 // With valgrind we need extended time to spawn kits.
-const size_t timeoutMs = CHILD_TIMEOUT_MS / 2;
+const size_t timeoutMs = ChildSpawnTimeoutMs / 2;
 LOG_TRC("Waiting for a new child for a max of " << timeoutMs << " ms.");
 const auto timeout = std::chrono::milliseconds(timeoutMs);
 #else
@@ -1642,7 +1644,10 @@ bool LOOLWSD::createForKit()
 Admin::instance().setForKitPid(ForKitProcId);
 Admin::instance().setForKitWritePipe(ForKitWritePipe);
 
-rebalanceChildren(LOOLWSD::NumPreSpawnedChildren - 1);
+const int balance = LOOLWSD::NumPreSpawnedChildren - OutstandingForks;
+if (balance > 0)
+rebalanceChildren(balance);
+
 return ForKitProcId != -1;
 #endif
 }
@@ -3191,7 +3196,7 @@ int LOOLWSD::innerMain()
 }
 else
 {
-const int timeoutMs = CHILD_TIMEOUT_MS * (LOOLWSD::NoCapsForKit ? 
150 : 50);
+const int timeoutMs = ChildSpawnTimeoutMs * (LOOLWSD::NoCapsForKit 
? 150 : 50);
 const auto timeout = std::chrono::milliseconds(timeoutMs);
 LOG_TRC("Waiting for a new child for a max of " << timeoutMs << " 
ms.");
 if (!NewChildrenCV.wait_for(lock, timeout, []() { return 
!NewChildren.empty(); }))
@@ -3229,6 +3234,9 @@ int LOOLWSD::innerMain()
 std::cerr << "Ready to accept connections on port " << ClientPortNumber << 
 ".\n" << std::endl;
 #endif
 
+

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4-0' - test/helpers.hpp test/httpwstest.cpp

 test/helpers.hpp|   16 +++-
 test/httpwstest.cpp |7 ---
 2 files changed, 15 insertions(+), 8 deletions(-)

New commits:
commit 9903229918d07eee2f6c1ad22ee5a287f4fd0884
Author: Ashod Nakashian 
AuthorDate: Sat Oct 19 12:32:43 2019 -0400
Commit: Andras Timar 
CommitDate: Tue Oct 22 19:01:21 2019 +0200

test: improve getAllText to match an expected payload

Change-Id: I4159f1e21f581ccdf90bcacf489580c8887931e5
Reviewed-on: https://gerrit.libreoffice.org/81195
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/test/helpers.hpp b/test/helpers.hpp
index caa3390e3..6dfd5315e 100644
--- a/test/helpers.hpp
+++ b/test/helpers.hpp
@@ -708,20 +708,26 @@ inline void deleteAll(const 
std::shared_ptr& socket, const std::s
 }
 
 inline std::string getAllText(const std::shared_ptr& socket,
-  const std::string& testname, int retry = 
COMMAND_RETRY_COUNT)
+  const std::string& testname,
+  const std::string expected = std::string(),
+  int retry = COMMAND_RETRY_COUNT)
 {
-std::string text;
+static const std::string prefix = "textselectioncontent: ";
+
 for (int i = 0; i < retry; ++i)
 {
 selectAll(socket, testname);
 
 sendTextFrame(socket, "gettextselection 
mimetype=text/plain;charset=utf-8", testname);
-text = assertResponseString(socket, "textselectioncontent:", testname);
+const std::string text = getResponseString(socket, prefix, testname);
 if (!text.empty())
-break;
+{
+if (expected.empty() || (prefix + expected) == text)
+return text;
+}
 }
 
-return text;
+return std::string();
 }
 
 }
diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index d95c61a3a..8b3688166 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -701,8 +701,9 @@ void HTTPWSTest::testGetTextSelection()
 std::shared_ptr socket = loadDocAndGetSocket(_uri, 
documentURL, testname);
 std::shared_ptr socket2 = loadDocAndGetSocket(_uri, 
documentURL, testname);
 
-const std::string selection = getAllText(socket, testname);
-CPPUNIT_ASSERT_EQUAL(std::string("textselectioncontent: Hello world"), 
selection);
+static const std::string expected = "Hello world";
+const std::string selection = getAllText(socket, testname, expected);
+CPPUNIT_ASSERT_EQUAL("textselectioncontent: " + expected, selection);
 }
 catch (const Poco::Exception& exc)
 {
@@ -766,7 +767,7 @@ void HTTPWSTest::testSaveOnDisconnect()
 CPPUNIT_ASSERT_EQUAL(kitcount, countLoolKitProcesses(kitcount));
 
 // Check if the document contains the pasted text.
-const std::string selection = getAllText(socket, testname);
+const std::string selection = getAllText(socket, testname, text);
 CPPUNIT_ASSERT_EQUAL("textselectioncontent: " + text, selection);
 }
 catch (const Poco::Exception& exc)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4-0' - net/Socket.cpp test/integration-http-server.cpp wsd/LOOLWSD.cpp

 net/Socket.cpp   |2 +-
 test/integration-http-server.cpp |   36 ++--
 wsd/LOOLWSD.cpp  |   26 ++
 3 files changed, 45 insertions(+), 19 deletions(-)

New commits:
commit ae085428dfb11b7965b73df0f40ac4fd1ec98a75
Author: Ashod Nakashian 
AuthorDate: Mon Oct 21 00:48:51 2019 -0400
Commit: Andras Timar 
CommitDate: Tue Oct 22 19:03:53 2019 +0200

test: improve HTTPServerTest::testConvertToWithForwardedClientIP

Extend the timeout, as often DNS lookup takes several seconds
and that delays the response from WSD.

Change-Id: Ie51bff31782fa33eb5559d28af1477e1947382a3
Reviewed-on: https://gerrit.libreoffice.org/81198
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/net/Socket.cpp b/net/Socket.cpp
index 9d647dd43..1766eb41f 100644
--- a/net/Socket.cpp
+++ b/net/Socket.cpp
@@ -590,7 +590,7 @@ bool StreamSocket::parseHeader(const char *clientName,
 }
 catch (const std::exception& exc)
 {
-LOG_DBG("parseHeader exception caught.");
+LOG_DBG("parseHeader exception caught: " << exc.what());
 // Probably don't have enough data just yet.
 // TODO: timeout if we never get enough.
 return false;
diff --git a/test/integration-http-server.cpp b/test/integration-http-server.cpp
index 08e755eaf..c38f65261 100644
--- a/test/integration-http-server.cpp
+++ b/test/integration-http-server.cpp
@@ -361,11 +361,17 @@ void HTTPServerTest::testConvertTo()
 
 void HTTPServerTest::testConvertToWithForwardedClientIP()
 {
+const std::string testname = "convertToWithForwardedClientIP-";
+constexpr int TimeoutSeconds = 10; // Sometimes dns resolving is slow.
+
 // Test a forwarded IP which is not allowed to use convert-to feature
+try
 {
-const std::string srcPath = FileUtil::getTempFilePath(TDOC, 
"hello.odt", "testConvertToWithForwardedClientIP_");
+TST_LOG("Converting from a disallowed IP.");
+
+const std::string srcPath = FileUtil::getTempFilePath(TDOC, 
"hello.odt", testname + "disallowed");
 std::unique_ptr 
session(helpers::createSession(_uri));
-session->setTimeout(Poco::Timespan(2, 0)); // 2 seconds.
+session->setTimeout(Poco::Timespan(TimeoutSeconds, 0));
 
 Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_POST, 
"/lool/convert-to");
 CPPUNIT_ASSERT(!request.has("X-Forwarded-For"));
@@ -388,12 +394,19 @@ void HTTPServerTest::testConvertToWithForwardedClientIP()
 std::string actualString = actualStream.str();
 CPPUNIT_ASSERT(actualString.empty()); // <- we did not get the 
converted file
 }
+catch(const Poco::Exception& exc)
+{
+CPPUNIT_FAIL(exc.displayText() + ": " + (exc.nested() ? 
exc.nested()->displayText() : ""));
+}
 
 // Test a forwarded IP which is allowed to use convert-to feature
+try
 {
-const std::string srcPath = FileUtil::getTempFilePath(TDOC, 
"hello.odt", "testConvertToWithForwardedClientIP_");
+TST_LOG("Converting from an allowed IP.");
+
+const std::string srcPath = FileUtil::getTempFilePath(TDOC, 
"hello.odt", testname + "allowed");
 std::unique_ptr 
session(helpers::createSession(_uri));
-session->setTimeout(Poco::Timespan(2, 0)); // 2 seconds.
+session->setTimeout(Poco::Timespan(TimeoutSeconds, 0));
 
 Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_POST, 
"/lool/convert-to");
 CPPUNIT_ASSERT(!request.has("X-Forwarded-For"));
@@ -424,12 +437,19 @@ void HTTPServerTest::testConvertToWithForwardedClientIP()
 actualString = actualString.substr(3);
 CPPUNIT_ASSERT_EQUAL(expectedStream.str(), actualString); // <- we got 
the converted file
 }
+catch(const Poco::Exception& exc)
+{
+CPPUNIT_FAIL(exc.displayText() + ": " + (exc.nested() ? 
exc.nested()->displayText() : ""));
+}
 
 // Test a forwarded header with three IPs, one is not allowed -> request 
is denied.
+try
 {
-const std::string srcPath = FileUtil::getTempFilePath(TDOC, 
"hello.odt", "testConvertToWithForwardedClientIP_");
+TST_LOG("Converting from multiple IPs, on disallowed.");
+
+const std::string srcPath = FileUtil::getTempFilePath(TDOC, 
"hello.odt", testname + "disallowed-multi");
 std::unique_ptr 
session(helpers::createSession(_uri));
-session->setTimeout(Poco::Timespan(2, 0)); // 2 seconds.
+session->setTimeout(Poco::Timespan(TimeoutSeconds, 0));
 
 Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_POST, 
"/lool/convert-to");
 CPPUNIT_ASSERT(!request.has("X-Forwarded-For"));
@@ -454,6 +474,10 @@ void HTTPServerTest::testConvertToWithForwardedClientIP()
 std::string actualString = actualStream.str();
 CPPUNIT_ASSERT(actualString.empty()); // <- we did not get the 
converted file
 }
+

[Bug 75025] LibreOffice 4.3 most annoying bugs

2019-10-22 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=75025

--- Comment #120 from tommy27  ---
Almost one year and few months later 27 of the 30 residual historical MABs are
still left.

here's the updated list, feel free to retest to see if some of them is still
reproducible of not.
Bug 36799: If you insert an envelope into a document only the envelope is
printed (Mac OS X)

Bug 37315: cropped pictures in .docx file are mangled and in wrong place

Bug 44725: VIEWING: Heading - Footer - Pagebreak lines appear somewhere in
the page

Bug 48409: FILEOPEN LibO 3.3 documents shows Writer OLE object contents shifted
right/down in object after edit of object because of page border issue

Bug 53473: Embedded HSQLDB calls flush (CHECKPOINT) too often

Bug 54933: EDITING Report builder: mouse-move control: gap between mouse
position

Bug 55018: FILESAVE: Joined cells in table cause table distortion after save to
DOC, DOCX

Bug 66209: inserting/deleting rows: data integrity problem when sum of the
charts of the opened documents exceeds the Options->Memory->Number of objects

Bug 66581: XLSX embedded objects do not get imported (just icons, not
 clickable)

Bug 67347: FILEOPEN: MS .pptx Textbox with stacked text imported wrong size

Bug 69593: FILEOPEN: PPTX import with shapes causes text to disappear

Bug 70809: EDITING: Selecting with mouse: too fast changing to next/previous

Bug 72504: EDITING: Unable to edit .odb file with non-local URL

Bug 72604: Fax-Wizard - Personal Data are only partial adopted

Bug 72776: FILEOPEN writer doesn't show the chart numbers nor parts of this
docx file

Bug 72988: Impress template not rendered correctly (vintage, metropolis,
sunset)

Bug 73805: EDITING: Layout Loop when writing into a section with 3 columns

Bug 74934: 'Install' button in update dialog is never activated

Bug 75209: FILEOPEN: Impress pictures not displayed in slideshow

Bug 76389: Calc: Used AutoFilter not highlighted when set in Calc and saved
as XLS

Bug 78370: RTF File Imported Incorrectly - Pages Being Merged (Overlapping)

Bug 79538: PRINTING: Images move when printing/creating PDF

Bug 83309: FILEOPEN: text paragraph indentation/tab stops in .DOCX displayed
incorrectly

Bug 86321: EDITING, FORMATTING: diagram didn't automatic update when change
variabele (recalculation not triggered)

Bug 87360: Spacing to content should be disabled for images

Bug 89853: When opening .PPTX impress file, and then resaving as .PPT file.
The Smiley/drawing clipart is not shown.

Bug 90070: Adding a border and spacing to content shrinks the size on an
image

-- 
You are receiving this mail because:
You are on the CC list for the bug.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 
external/breakpad/0001-Fix-double-declaration-of-tgkill-when-using-Android-.patch.1
 |   49 ++
 external/breakpad/UnpackedTarball_breakpad.mk  
 |1 
 2 files changed, 50 insertions(+)

New commits:
commit 8bb9d282bd249a4c310f864e733b10f3baeeb60c
Author: Stephan Bergmann 
AuthorDate: Thu Sep 26 22:09:56 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Oct 22 18:53:25 2019 +0200

external/breakpad: glibc 2.30 declares tgkill

...so building against glibc-headers-2.30-4.fc31.x86_64 fails with

> src/client/linux/handler/exception_handler.cc:109:12: error: static 
declaration of 'tgkill' follows non-static declaration
> static int tgkill(pid_t tgid, pid_t tid, int sig) {
>^
> /usr/include/bits/signal_ext.h:29:12: note: previous declaration is here
> extern int tgkill (__pid_t __tgid, __pid_t __tid, int __signal);
>^
> 1 error generated.

Upstream commit  "Fix double declaration of
tgkill when using Android NDK Headers" looks like the perfect fit.

Change-Id: I1b4805886fb7c770cf9733f34a31296e6b859d92
Reviewed-on: https://gerrit.libreoffice.org/79661
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
Reviewed-on: https://gerrit.libreoffice.org/81226
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git 
a/external/breakpad/0001-Fix-double-declaration-of-tgkill-when-using-Android-.patch.1
 
b/external/breakpad/0001-Fix-double-declaration-of-tgkill-when-using-Android-.patch.1
new file mode 100644
index ..7c8a68c2451a
--- /dev/null
+++ 
b/external/breakpad/0001-Fix-double-declaration-of-tgkill-when-using-Android-.patch.1
@@ -0,0 +1,49 @@
+From 7e3c165000d44fa153a3270870ed500bc8bbb461 Mon Sep 17 00:00:00 2001
+From: Nicholas Baldwin 
+Date: Fri, 27 Oct 2017 11:44:36 -0700
+Subject: [PATCH] Fix double declaration of tgkill when using Android NDK
+ Headers.
+
+As of Android API level 16 tgkill is declared in the NDK version of
+signal.h, which conflicts with the static definition found in
+src/client/linux/handler/exception_handler.cc. This change removes
+the static tgkill definition and replaces its use with sys_tgkill
+from the linux syscall support library.
+
+Bug:
+Change-Id: Ic70addd8a064cfa36345d86b7e36409e2089e909
+Reviewed-on: https://chromium-review.googlesource.com/738912
+Reviewed-by: Mike Frysinger 
+---
+ src/client/linux/handler/exception_handler.cc | 8 +---
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/src/client/linux/handler/exception_handler.cc 
b/src/client/linux/handler/exception_handler.cc
+index 95005209..cd94e3b5 100644
+--- a/src/client/linux/handler/exception_handler.cc
 b/src/client/linux/handler/exception_handler.cc
+@@ -105,12 +105,6 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+ 
+-// A wrapper for the tgkill syscall: send a signal to a specific thread.
+-static int tgkill(pid_t tgid, pid_t tid, int sig) {
+-  return syscall(__NR_tgkill, tgid, tid, sig);
+-  return 0;
+-}
+-
+ namespace google_breakpad {
+ 
+ namespace {
+@@ -400,7 +394,7 @@ void ExceptionHandler::SignalHandler(int sig, siginfo_t* 
info, void* uc) {
+ // In order to retrigger it, we have to queue a new signal by calling
+ // kill() ourselves.  The special case (si_pid == 0 && sig == SIGABRT) is
+ // due to the kernel sending a SIGABRT from a user request via SysRQ.
+-if (tgkill(getpid(), syscall(__NR_gettid), sig) < 0) {
++if (sys_tgkill(getpid(), syscall(__NR_gettid), sig) < 0) {
+   // If we failed to kill ourselves (e.g. because a sandbox disallows us
+   // to do so), we instead resort to terminating our process. This will
+   // result in an incorrect exit code.
+-- 
+2.23.0
+
diff --git a/external/breakpad/UnpackedTarball_breakpad.mk 
b/external/breakpad/UnpackedTarball_breakpad.mk
index b70510234e38..633574cd34a7 100644
--- a/external/breakpad/UnpackedTarball_breakpad.mk
+++ b/external/breakpad/UnpackedTarball_breakpad.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,breakpad,\
external/breakpad/breakpad-stackwalk.patch.1 \
external/breakpad/ucontext.patch \

external/breakpad/0001-Handle-race-between-ExceptionHandler-SignalHandler-a.patch.1
 \
+   
external/breakpad/0001-Fix-double-declaration-of-tgkill-when-using-Android-.patch.1
 \
 ))
 
 ifeq ($(COM_IS_CLANG),TRUE)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-22 Thread Tor Lillqvist (via logerrit)

 external/libpng/StaticLibrary_libpng.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c8671a691f6810566bc715bb8eb00cbae4ee17c3
Author: Tor Lillqvist 
AuthorDate: Mon May 6 12:37:11 2019 +0300
Commit: Andras Timar 
CommitDate: Tue Oct 22 18:55:58 2019 +0200

Compile also the palette_neon_intrinsics file for ARM

Change-Id: I26deeefc8cf335f53aa55c8523cd08687f27b63b
Reviewed-on: https://gerrit.libreoffice.org/79248
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/external/libpng/StaticLibrary_libpng.mk 
b/external/libpng/StaticLibrary_libpng.mk
index dbbc3848c541..f43a462c7935 100644
--- a/external/libpng/StaticLibrary_libpng.mk
+++ b/external/libpng/StaticLibrary_libpng.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,libpng,\
$(if $(filter ARM ARM64,$(CPUNAME)),\
UnpackedTarball/libpng/arm/arm_init \
UnpackedTarball/libpng/arm/filter_neon_intrinsics \
+   UnpackedTarball/libpng/arm/palette_neon_intrinsics \
) \
 ))
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 Package_html_media.mk   |5 
+
 source/media/screenshots/cui/ui/opthtmlpage/OptHtmlPage.png |binary
 source/media/screenshots/cui/ui/opthtmlpage/af/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/am/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/ar/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/as/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/ast/OptHtmlPage.png |binary
 source/media/screenshots/cui/ui/opthtmlpage/be/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/bg/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/bn-IN/OptHtmlPage.png   |binary
 source/media/screenshots/cui/ui/opthtmlpage/bn/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/bo/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/br/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/brx/OptHtmlPage.png |binary
 source/media/screenshots/cui/ui/opthtmlpage/bs/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/ca-valencia/OptHtmlPage.png |binary
 source/media/screenshots/cui/ui/opthtmlpage/ca/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/cs/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/cy/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/da/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/de/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/dgo/OptHtmlPage.png |binary
 source/media/screenshots/cui/ui/opthtmlpage/dsb/OptHtmlPage.png |binary
 source/media/screenshots/cui/ui/opthtmlpage/dz/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/el/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/en-GB/OptHtmlPage.png   |binary
 source/media/screenshots/cui/ui/opthtmlpage/en-ZA/OptHtmlPage.png   |binary
 source/media/screenshots/cui/ui/opthtmlpage/eo/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/es/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/et/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/eu/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/fa/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/fi/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/fr/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/fy/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/ga/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/gd/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/gl/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/gu/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/gug/OptHtmlPage.png |binary
 source/media/screenshots/cui/ui/opthtmlpage/he/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/hi/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/hr/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/hsb/OptHtmlPage.png |binary
 source/media/screenshots/cui/ui/opthtmlpage/hu/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/id/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/is/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/it/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/ja/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/ka/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/kab/OptHtmlPage.png |binary
 source/media/screenshots/cui/ui/opthtmlpage/kk/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/km/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/kmr-Latn/OptHtmlPage.png|binary
 source/media/screenshots/cui/ui/opthtmlpage/kn/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/ko/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/kok/OptHtmlPage.png |binary
 source/media/screenshots/cui/ui/opthtmlpage/ks/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/lb/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/lo/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/lt/OptHtmlPage.png  |binary
 source/media/screenshots/cui/ui/opthtmlpage/lv/OptHtmlP

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 8da2e5825486bec2378f47e527a3df691fbf499d
Author: Olivier Hallot 
AuthorDate: Tue Oct 22 12:18:44 2019 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Oct 22 18:39:26 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Add screenshot for Option HTML Help page

Change-Id: Iffabc73b4d0a48c2c89b9b43d54fd1344f233cbd
Reviewed-on: https://gerrit.libreoffice.org/81342
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 1c2c0582a652..d3e7a9e4955c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1c2c0582a652308f072aa9ecc0878bc2f25095bb
+Subproject commit d3e7a9e4955ce7c31501f6db9d3dae246da4b932
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - include/svtools svtools/CppunitTest_svtools_dialogs_test.mk svtools/inc svtools/qa svtools/source

 include/svtools/valueset.hxx|1 
 svtools/CppunitTest_svtools_dialogs_test.mk |2 
 svtools/inc/uitest/uiobject.hxx |   25 
 svtools/qa/unit/svtools-dialogs-test.cxx|   35 
 svtools/source/control/valueset.cxx |6 ++
 svtools/source/uitest/uiobject.cxx  |   58 
 6 files changed, 126 insertions(+), 1 deletion(-)

New commits:
commit 76b4615a44bcbf1fe3d6dc4c70d2abbe687e3e81
Author: Henry Castro 
AuthorDate: Sat Oct 19 14:58:56 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Oct 22 18:30:50 2019 +0200

lok: svtools: create ValueSetUIObject class

The ValueSet control is used in Layouts panel inside Sidebar of the
impress document. Once the LO server sends the UI data to the client side
that is transformed to mobile view using Mobile Wizard framework.
The loleaflet client side has to send commands for the user interactions
like to touch an item.

e.g.  Send "WindowId SELECT ID=300"

The unit test simulates the scenario, so the ValueSet control executes
the action.

Change-Id: Ib6ec5db6ce2777e819f81a9dae74c4641bb7053b
Reviewed-on: https://gerrit.libreoffice.org/81141
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 7e05633314b2..ec7b3ba79eda 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -297,6 +297,7 @@ public:
 virtual voidStateChanged( StateChangedType nStateChange ) override;
 virtual voidDataChanged( const DataChangedEvent& rDCEvt ) override;
 virtual boost::property_tree::ptree DumpAsPropertyTree() override;
+virtual FactoryFunction GetUITestFactory() const override;
 
 virtual voidSelect();
 virtual voidUserDraw( const UserDrawEvent& rUDEvt );
diff --git a/svtools/CppunitTest_svtools_dialogs_test.mk 
b/svtools/CppunitTest_svtools_dialogs_test.mk
index 28c4db4742ea..70f8a00e4bf7 100644
--- a/svtools/CppunitTest_svtools_dialogs_test.mk
+++ b/svtools/CppunitTest_svtools_dialogs_test.mk
@@ -17,7 +17,7 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,svtools_dialogs_test, \
 
 $(eval $(call gb_CppunitTest_use_sdk_api,svtools_dialogs_test))
 
-$(eval $(call gb_CppunitTest_set_include,desktop_dialogs_test,\
+$(eval $(call gb_CppunitTest_set_include,svtools_dialogs_test,\
 -I$(SRCDIR)/svtools/source/inc \
 -I$(SRCDIR)/svtools/inc \
 $$(INCLUDE) \
diff --git a/svtools/inc/uitest/uiobject.hxx b/svtools/inc/uitest/uiobject.hxx
index 16a137da7c7c..2bb82dabd5f1 100644
--- a/svtools/inc/uitest/uiobject.hxx
+++ b/svtools/inc/uitest/uiobject.hxx
@@ -11,6 +11,7 @@
 #include 
 
 class SvSimpleTable;
+class ValueSet;
 
 class SimpleTableUIObject : public TreeListUIObject
 {
@@ -28,4 +29,28 @@ private:
 VclPtr mxTable;
 };
 
+class ValueSetUIObject : public WindowUIObject
+{
+private:
+VclPtr mxValueSet;
+
+public:
+
+ValueSetUIObject(const VclPtr& xValueSet);
+virtual ~ValueSetUIObject() override;
+
+virtual void execute(const OUString& rAction,
+const StringMap& rParameters) override;
+
+virtual StringMap get_state() override;
+
+static std::unique_ptr create(vcl::Window* pWindow);
+
+virtual OUString get_action(VclEventId nEvent) const override;
+
+protected:
+
+virtual OUString get_name() const override;
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/qa/unit/svtools-dialogs-test.cxx 
b/svtools/qa/unit/svtools-dialogs-test.cxx
index 35d04bc0c379..692453335794 100644
--- a/svtools/qa/unit/svtools-dialogs-test.cxx
+++ b/svtools/qa/unit/svtools-dialogs-test.cxx
@@ -13,6 +13,10 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -33,9 +37,11 @@ public:
 
 // try to open a dialog
 void openAnyDialog();
+void testValueSetControl();
 
 CPPUNIT_TEST_SUITE(SvtoolsDialogsTest);
 CPPUNIT_TEST(openAnyDialog);
+CPPUNIT_TEST(testValueSetControl);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -59,6 +65,35 @@ void SvtoolsDialogsTest::openAnyDialog()
 processDialogBatchFile("svtools/qa/unit/data/svtools-dialogs-test.txt");
 }
 
+void SvtoolsDialogsTest::testValueSetControl()
+{
+VclPtr pWorkWindow = VclPtr::Create(nullptr, 
WB_APP | WB_STDWORK);
+VclPtr pValueSet = VclPtr::Create(pWorkWindow, 
WB_ITEMBORDER);
+pValueSet->InsertItem(100, 0);
+pValueSet->InsertItem(200, 1);
+pValueSet->InsertItem(300, 2);
+pValueSet->Show();
+pWorkWindow->Show();
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT(pValueSet->IsEnabled());
+CPPUNIT_ASSERT(pValueSet->IsReallyVisible());
+CPPUNIT_ASSERT_EQUAL(false, pValueSet->IsItemSelected(300));
+{
+std::unique_ptr pUIObject = 
pValueSet->GetUITestFactory()(pValueS

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

 sc/source/core/tool/interpr3.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit f26178b17691ccc9d3da9c25cec9ef08a633b3a7
Author: Stephan Bergmann 
AuthorDate: Tue Oct 22 09:52:26 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 22 18:25:57 2019 +0200

-Werror,-Wimplicit-int-float-conversion

> sc/source/core/tool/interpr3.cxx:3659:36: error: implicit conversion from 
'unsigned long' to 'double' changes value from 18446744073709551615 to 
18446744073709551616 [-Werror,-Wimplicit-int-float-conversion]
> if (f < 1.0 || f > std::numeric_limits::max())
>  ~ ^~

since 475165e431b5392e426db0de4cea50efc2513875 "Resolves: tdf#127982
SMALL()/LARGE() rank array can be larger than data array"

(This supersedes 1b0cba8c2cd672b0d5a59a215961c5136a6e656b
"-Wimplicit-int-float-conversion", which would have incurred UB if f is 
larger
than std::numeric_limits::max().)

Change-Id: I1eeb75d73169ac89ec4bf9562edcf99d9925f607
Reviewed-on: https://gerrit.libreoffice.org/81309
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index ae99d1a79ef6..f219beca9386 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -3656,7 +3657,7 @@ void ScInterpreter::CalculateSmallLarge(bool bSmall)
 [](double f) {
 f = rtl::math::approxFloor(f);
 // Valid ranks are >= 1.
-if (f < 1.0 || static_cast(f) > 
std::numeric_limits::max())
+if (f < 1.0 || !o3tl::convertsToAtMost(f, 
std::numeric_limits::max()))
 return static_cast(0);
 return static_cast(f);
 });
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/ui/inc/gridwin.hxx   |2 -
 sc/source/ui/view/gridwin.cxx  |   72 +
 sc/source/ui/view/gridwin2.cxx |   14 +++
 sc/source/ui/view/gridwin4.cxx |   44 -
 4 files changed, 68 insertions(+), 64 deletions(-)

New commits:
commit bef71336399f1dc678eee16b5d6d7bf26a17f491
Author: Noel Grandin 
AuthorDate: Tue Oct 22 14:05:06 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 22 18:13:32 2019 +0200

sc: rowcol: tdf#50916 convert gridwin

Change-Id: Ifaaddbf17430cf7f2b64785f80afd3cfaa80cdd8
Reviewed-on: https://gerrit.libreoffice.org/81325
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index dfbfdaef2793..bd4ca07159c5 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -123,7 +123,7 @@ class SAL_DLLPUBLIC_RTTI ScGridWindow : public vcl::Window, 
public DropTargetHel
 SCROW mnRow1;
 SCROW mnRow2;
 
-VisibleRange();
+VisibleRange(const ScDocument*);
 
 bool isInside(SCCOL nCol, SCROW nRow) const;
 bool set(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 18c83970a895..777a9ed220f1 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -157,11 +157,11 @@ struct ScGridWindow::MouseEventState
 
 #define SC_FILTERLISTBOX_LINES  12
 
-ScGridWindow::VisibleRange::VisibleRange()
+ScGridWindow::VisibleRange::VisibleRange(const ScDocument* pDoc)
 : mnCol1(0)
-, mnCol2(MAXCOL)
+, mnCol2(pDoc->MaxCol())
 , mnRow1(0)
-, mnRow2(MAXROW)
+, mnRow2(pDoc->MaxRow())
 {
 }
 
@@ -407,6 +407,7 @@ ScGridWindow::ScGridWindow( vcl::Window* pParent, 
ScViewData* pData, ScSplitPos
 mpOODragRect(),
 mpOOHeader(),
 mpOOShrink(),
+maVisibleRange(pData->GetDocument()),
 pViewData( pData ),
 eWhich( eWhichPos ),
 mpNoteMarker(),
@@ -921,6 +922,7 @@ void ScGridWindow::LaunchDPFieldMenu( SCCOL nCol, SCROW 
nRow )
 
 void ScGridWindow::DoScenarioMenu( const ScRange& rScenRange )
 {
+ScDocument* pDoc = pViewData->GetDocument();
 mpFilterBox.disposeAndClear();
 mpFilterFloat.disposeAndClear();
 
@@ -929,11 +931,10 @@ void ScGridWindow::DoScenarioMenu( const ScRange& 
rScenRange )
 if (nRow == 0)
 {
 nRow = rScenRange.aEnd.Row() + 1;   // Range at very the top -> Button 
below
-if (nRow>MAXROW) nRow = MAXROW;
+if (nRow>pDoc->MaxRow()) nRow = pDoc->MaxRow();
 //! Add text height (if it is stored in the View...)
 }
 
-ScDocument* pDoc = pViewData->GetDocument();
 SCTAB nTab = pViewData->GetTabNo();
 bool bLayoutRTL = pDoc->IsLayoutRTL( nTab );
 
@@ -3330,6 +3331,7 @@ void ScGridWindow::UpdateInputContext()
 
 void ScGridWindow::DropScroll( const Point& rMousePos )
 {
+ScDocument* pDoc = pViewData->GetDocument();
 SCCOL nDx = 0;
 SCROW nDy = 0;
 Size aSize = GetOutputSizePixel();
@@ -3339,7 +3341,7 @@ void ScGridWindow::DropScroll( const Point& rMousePos )
 if ( rMousePos.X() < SCROLL_SENSITIVE && 
pViewData->GetPosX(WhichH(eWhich)) > 0 )
 nDx = -1;
 if ( rMousePos.X() >= aSize.Width() - SCROLL_SENSITIVE
-&& pViewData->GetPosX(WhichH(eWhich)) < MAXCOL )
+&& pViewData->GetPosX(WhichH(eWhich)) < pDoc->MaxCol() )
 nDx = 1;
 }
 if (aSize.Height() > SCROLL_SENSITIVE * 3)
@@ -3347,7 +3349,7 @@ void ScGridWindow::DropScroll( const Point& rMousePos )
 if ( rMousePos.Y() < SCROLL_SENSITIVE && 
pViewData->GetPosY(WhichV(eWhich)) > 0 )
 nDy = -1;
 if ( rMousePos.Y() >= aSize.Height() - SCROLL_SENSITIVE
-&& pViewData->GetPosY(WhichV(eWhich)) < MAXROW )
+&& pViewData->GetPosY(WhichV(eWhich)) < pDoc->MaxRow() )
 nDy = 1;
 }
 
@@ -3388,21 +3390,21 @@ static bool lcl_TestScenarioRedliningDrop( const 
ScDocument* pDoc, const ScRange
 return bReturn;
 }
 
-static ScRange lcl_MakeDropRange( SCCOL nPosX, SCROW nPosY, SCTAB nTab, const 
ScRange& rSource )
+static ScRange lcl_MakeDropRange( const ScDocument* pDoc, SCCOL nPosX, SCROW 
nPosY, SCTAB nTab, const ScRange& rSource )
 {
 SCCOL nCol1 = nPosX;
 SCCOL nCol2 = nCol1 + ( rSource.aEnd.Col() - rSource.aStart.Col() );
-if ( nCol2 > MAXCOL )
+if ( nCol2 > pDoc->MaxCol() )
 {
-nCol1 -= nCol2 - MAXCOL;
-nCol2 = MAXCOL;
+nCol1 -= nCol2 - pDoc->MaxCol();
+nCol2 = pDoc->MaxCol();
 }
 SCROW nRow1 = nPosY;
 SCROW nRow2 = nRow1 + ( rSource.aEnd.Row() - rSource.aStart.Row() );
-if ( nRow2 > MAXROW )
+if ( nRow2 > pDoc->MaxRow() )
 {
-nRow1 -= nRow2 - MAXROW;
-nRow2 = MAXROW;
+nRow1 -= nRow2 - pDoc->MaxRow();
+nRow2

[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang fpicker/source include/vcl sc/source sw/source vcl/source

 compilerplugins/clang/unusedenumconstants.readonly.results  |   64 
 compilerplugins/clang/unusedenumconstants.untouched.results |   50 
 compilerplugins/clang/unusedenumconstants.writeonly.results | 6894 +---
 fpicker/source/office/fileview.cxx  |5 
 include/vcl/headbar.hxx |4 
 include/vcl/salnativewidgets.hxx|6 
 sc/source/ui/view/hdrcont.cxx   |   23 
 sc/source/ui/view/output.cxx|   22 
 sc/source/ui/view/output2.cxx   |   14 
 sw/source/core/inc/swblocks.hxx |1 
 sw/source/core/swg/swblocks.cxx |2 
 vcl/source/outdev/nativecontrols.cxx|8 
 vcl/source/treelist/headbar.cxx |   23 
 13 files changed, 3528 insertions(+), 3588 deletions(-)

New commits:
commit 0dc168dfc3a693510e5776109e989ff5f956f7db
Author: Noel Grandin 
AuthorDate: Mon Oct 21 16:31:05 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 22 18:13:16 2019 +0200

loplugin:unusedenumconstants

Change-Id: I76aadeefce66df93f21b7e45c0e87ab92df45131
Reviewed-on: https://gerrit.libreoffice.org/81324
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results 
b/compilerplugins/clang/unusedenumconstants.readonly.results
index eb41cdfcc907..81aca172e382 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -5,7 +5,7 @@ bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx:78
 bridges/source/cpp_uno/gcc3_linux_x86-64/abi.cxx:79
 enum x86_64_reg_class X86_64_X87UP_CLASS
 chart2/source/inc/CharacterProperties.hxx:121
-enum chart::CharacterProperties::(anonymous at 
/home/noel/libo2/chart2/source/inc/CharacterProperties.hxx:42:5) 
FAST_PROPERTY_ID_END_CHAR_PROP
+enum chart::CharacterProperties::(anonymous at 
/media/disk2/libo7/chart2/source/inc/CharacterProperties.hxx:42:5) 
FAST_PROPERTY_ID_END_CHAR_PROP
 chart2/source/inc/TitleHelper.hxx:48
 enum chart::TitleHelper::eTitleType NORMAL_TITLE_END
 chart2/source/view/inc/ShapeFactory.hxx:50
@@ -39,18 +39,18 @@ chart2/source/view/inc/ShapeFactory.hxx:63
 chart2/source/view/inc/ShapeFactory.hxx:64
 enum chart::SymbolEnum Symbol_VerticalBar
 configmgr/source/access.hxx:445
-enum configmgr::Access::(anonymous at 
/home/noel/libo2/configmgr/source/access.hxx:443:5) IS_GROUP_MEMBER
+enum configmgr::Access::(anonymous at 
/media/disk2/libo7/configmgr/source/access.hxx:443:5) IS_SET_MEMBER
 configmgr/source/access.hxx:445
-enum configmgr::Access::(anonymous at 
/home/noel/libo2/configmgr/source/access.hxx:443:5) IS_SET_MEMBER
+enum configmgr::Access::(anonymous at 
/media/disk2/libo7/configmgr/source/access.hxx:443:5) IS_GROUP_MEMBER
 configmgr/source/parsemanager.hxx:44
-enum configmgr::ParseManager::(anonymous at 
/home/noel/libo2/configmgr/source/parsemanager.hxx:44:5) NAMESPACE_XS
+enum configmgr::ParseManager::(anonymous at 
/media/disk2/libo7/configmgr/source/parsemanager.hxx:44:5) NAMESPACE_XS
 configmgr/source/parsemanager.hxx:44
-enum configmgr::ParseManager::(anonymous at 
/home/noel/libo2/configmgr/source/parsemanager.hxx:44:5) NAMESPACE_XSI
+enum configmgr::ParseManager::(anonymous at 
/media/disk2/libo7/configmgr/source/parsemanager.hxx:44:5) NAMESPACE_OOR
 configmgr/source/parsemanager.hxx:44
-enum configmgr::ParseManager::(anonymous at 
/home/noel/libo2/configmgr/source/parsemanager.hxx:44:5) NAMESPACE_OOR
+enum configmgr::ParseManager::(anonymous at 
/media/disk2/libo7/configmgr/source/parsemanager.hxx:44:5) NAMESPACE_XSI
 connectivity/source/drivers/evoab2/NConnection.hxx:41
 connectivity::evoab::SDBCAddress::sdbc_address_type Unknown
-cui/source/options/optgenrl.cxx:65
+cui/source/options/optgenrl.cxx:62
 enum (anonymous namespace)::RowType nRowCount
 dbaccess/source/core/inc/SingleSelectQueryComposer.hxx:72
 enum dbaccess::OSingleSelectQueryComposer::EColumnType SelectColumns
@@ -120,8 +120,6 @@ emfio/inc/mtftools.hxx:48
 enum emfio::BkMode Transparent
 emfio/inc/mtftools.hxx:82
 enum emfio::WMFRasterOp Nop
-extensions/source/update/check/updatehdl.hxx:59
-enum UpdateState UPDATESTATE_AUTO_START
 framework/inc/xml/imagesdocumenthandler.hxx:43
 enum framework::OReadImagesDocumentHandler::Image_XML_Entry 
IMG_ELEMENT_IMAGECONTAINER
 framework/inc/xml/imagesdocumenthandler.hxx:44
@@ -236,10 +234,6 @@ include/LibreOfficeKit/LibreOfficeKitEnums.h:40
 LibreOfficeKitTileMode LOK_TILEMODE_RGBA
 include/LibreOfficeKit/LibreOfficeKitEnums.h:99
 LibreOfficeKitOptionalFeatures LOK_FEATURE_RANGE_HEADERS
-include/LibreOfficeKit/LibreOfficeKitEnums.h:703
-LibreOfficeKitExtTextInputType LOK_EXT_TEXTINPUT
-include/LibreOfficeKit/L

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

2019-10-22 Thread László Németh (via logerrit)

 sw/qa/extras/layout/data/tdf42748.fodt |   57 +
 sw/qa/extras/layout/layout.cxx |   17 
 sw/source/core/text/txtfld.cxx |   64 +
 3 files changed, 138 insertions(+)

New commits:
commit 173b7fcaae86980809889db30ddb82f8ba883103
Author: László Németh 
AuthorDate: Mon Oct 21 17:46:11 2019 +0200
Commit: László Németh 
CommitDate: Tue Oct 22 18:02:32 2019 +0200

tdf#42748 show changes of list numbers and bullets

At splitting or joining list items or adding new ones, the
removed or new list number or bullet didn't show the change,
only a vertical line added to the left margin of the list
items. Moreover, deleting only the text of the list
item (keeping its number) looked like the full deletion of
the item.

Change-Id: I4568713b5c94584761609d891b3eb36c45f8502c
Reviewed-on: https://gerrit.libreoffice.org/81258
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/layout/data/tdf42748.fodt 
b/sw/qa/extras/layout/data/tdf42748.fodt
new file mode 100644
index ..e8bcb257db87
--- /dev/null
+++ b/sw/qa/extras/layout/data/tdf42748.fodt
@@ -0,0 +1,57 @@
+
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
+ 
+  
+   
+  
+  
+   
+
+ 
+
+   
+  
+ 
+ 
+  
+   
+   
+
+ 
+  
+   Unknown Author
+   2019-10-22T08:48:10
+  
+ 
+
+
+ 
+  
+   Unknown Author 2
+   2019-10-22T08:48:12
+  
+ 
+
+   
+   
+
+
+
+
+
+   
+   
+
+ It
+
+
+ em
+
+
+ Item
+
+   
+  
+ 
+
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 073cd2baf066..98eed78ca56a 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2161,6 +2161,23 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, 
testRedlineCharAttributes)
 CheckRedlineCharAttributesHidden();
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineNumberInNumbering)
+{
+SwDoc* pDoc = createDoc("tdf42748.fodt");
+SwDocShell* pShell = pDoc->GetDocShell();
+
+// Dump the rendering of the first page as an XML file.
+std::shared_ptr xMetaFile = pShell->GetPreviewMetaFile();
+MetafileXmlDump dumper;
+
+xmlDocPtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+CPPUNIT_ASSERT(pXmlDoc);
+
+// Assert the tracked deletion of the number of joined list item and
+// the tracked insertion of the number after a split list item as not 
black elements
+assertXPath(pXmlDoc, 
"/metafile/push/push/push/textcolor[not(@color='#00')]", 6);
+}
+
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf116830)
 {
 SwDoc* pDoc = createDoc("tdf116830.odt");
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index 1cd40e555c93..c5d1816200df 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include "porfld.hxx"
 #include "porftn.hxx"
@@ -52,8 +53,13 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 static bool lcl_IsIn

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

 sd/source/ui/sidebar/LayoutMenu.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7e43a5376647723071e7d212fc90f2caacde439f
Author: Henry Castro 
AuthorDate: Sun Oct 20 09:50:48 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Oct 22 17:52:36 2019 +0200

sd: sidebar: force to set the id of the LayoutMenu control

Otherwise, the function std::unique_ptr
WindowUIObject::get_child(const OUString& rID)
will not find the control with the rID.

Change-Id: Ie571eb351bb0c59654f577cef1961247273d7608
Reviewed-on: https://gerrit.libreoffice.org/81166
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 

diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx 
b/sd/source/ui/sidebar/LayoutMenu.cxx
index c336dcd1cfaa..02957cd56f88 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -135,6 +135,7 @@ LayoutMenu::LayoutMenu (
   mxSidebar(rxSidebar),
   mbIsDisposed(false)
 {
+set_id("sd::LayoutMenu");
 implConstruct( *mrBase.GetDocument()->GetDocSh() );
 SAL_INFO("sd.ui", "created LayoutMenu at " << this);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-22 Thread Christian Lohmaier (via logerrit)

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

New commits:
commit d4f5e55e7a732f4cb34bcddc189a92d1e37c00fa
Author: Christian Lohmaier 
AuthorDate: Tue Oct 22 15:34:10 2019 +0200
Commit: Gerrit Code Review 
CommitDate: Tue Oct 22 17:39:11 2019 +0200

Update git submodules

* Update translations from branch 'libreoffice-6-3-3'
  - update translations for 6.3.3 rc2

and force-fix errors using pocheck

Change-Id: Ib0214e1ca97d2fbac297258dfe82795eb6e77afa
(cherry picked from commit c7858b0e1cbda51f96034e7fd42009d7fda9e99e)

diff --git a/translations b/translations
index 8c5610026a99..cdb7264f78fa 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 8c5610026a99ed78534f98aebbb4d7a0fdcc6b95
+Subproject commit cdb7264f78fa572a6730b348e614095941daf53a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-22 Thread Christian Lohmaier (via logerrit)

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

New commits:
commit cf4ff1fff1add93f2bd97babe81b63b9b91f795b
Author: Christian Lohmaier 
AuthorDate: Tue Oct 22 15:34:10 2019 +0200
Commit: Gerrit Code Review 
CommitDate: Tue Oct 22 17:36:56 2019 +0200

Update git submodules

* Update translations from branch 'libreoffice-6-3'
  - update translations for 6.3.3 rc2

and force-fix errors using pocheck

Change-Id: Ib0214e1ca97d2fbac297258dfe82795eb6e77afa

diff --git a/translations b/translations
index e2fcd2bbcf2f..c7858b0e1cbd 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit e2fcd2bbcf2f20ec11f6cee3fc92d5ada6709b70
+Subproject commit c7858b0e1cbda51f96034e7fd42009d7fda9e99e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-22 Thread Caolán McNamara (via logerrit)

 offapi/com/sun/star/ui/dialogs/XFilePreview.idl |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 5cb4f1e757b5db7f21622d3fad9b23857a1e589b
Author: Caolán McNamara 
AuthorDate: Tue Oct 22 12:03:42 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 22 17:11:52 2019 +0200

document contemporary uselessness of getTargetColorDepth

Change-Id: I60ab61df29445681a8ddc3a1b2005e7c43f70d3c
Reviewed-on: https://gerrit.libreoffice.org/81322
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/offapi/com/sun/star/ui/dialogs/XFilePreview.idl 
b/offapi/com/sun/star/ui/dialogs/XFilePreview.idl
index 63e653a287c0..baaa033dbffc 100644
--- a/offapi/com/sun/star/ui/dialogs/XFilePreview.idl
+++ b/offapi/com/sun/star/ui/dialogs/XFilePreview.idl
@@ -44,6 +44,8 @@ published interface XFilePreview: 
com::sun::star::uno::XInterface
 
 /** The method returns the supported color depth of the target device.
 
+@deprecated - typically now just returns 0
+
 @returns
 The color depth in bit, e.g. 8 bit, 16 bit, 32 bit.
 */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-22 Thread Michael Stahl (via logerrit)

 sw/source/core/unocore/unobkm.cxx |3 ++-
 writerfilter/source/dmapper/FormControlHelper.cxx |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 6314e7bf21cb220fa84a6483f96caa75368773c5
Author: Michael Stahl 
AuthorDate: Thu Oct 17 12:39:00 2019 +0200
Commit: Michael Stahl 
CommitDate: Tue Oct 22 17:09:30 2019 +0200

sw: what is that exception about

Change-Id: I00bce4bead3d593b2c2ceb06da49fd90d6fd213f
Reviewed-on: https://gerrit.libreoffice.org/81080
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/source/core/unocore/unobkm.cxx 
b/sw/source/core/unocore/unobkm.cxx
index f81ca649384f..28af288deef4 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -342,7 +342,8 @@ void SAL_CALL SwXBookmark::setName(const OUString& rName)
 m_pImpl->m_pDoc->getIDocumentMarkAccess();
 if(pMarkAccess->findMark(rName) != pMarkAccess->getAllMarksEnd())
 {
-throw uno::RuntimeException();
+throw uno::RuntimeException("setName(): name already in use",
+static_cast<::cppu::OWeakObject*>(this));
 }
 
 SwPaM aPam(m_pImpl->m_pRegisteredBookmark->GetMarkPos());
diff --git a/writerfilter/source/dmapper/FormControlHelper.cxx 
b/writerfilter/source/dmapper/FormControlHelper.cxx
index 98e7bb0ba319..c916d9baa7c4 100644
--- a/writerfilter/source/dmapper/FormControlHelper.cxx
+++ b/writerfilter/source/dmapper/FormControlHelper.cxx
@@ -245,7 +245,7 @@ void 
FormControlHelper::processField(uno::Reference const& xFo
 }
 catch ( uno::Exception& )
 {
-DBG_UNHANDLED_EXCEPTION("writerfilter","Set Formfield name 
failed");
+TOOLS_INFO_EXCEPTION("writerfilter", "Set Formfield name 
failed");
 }
 
 sTmp = m_pFFData->getTextType();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 compilerplugins/clang/simplifybool.cxx  |   35 
 compilerplugins/clang/test/simplifybool.cxx |   10 
 cui/source/tabpages/tpline.cxx  |2 -
 3 files changed, 36 insertions(+), 11 deletions(-)

New commits:
commit 54f292d1d199dae36257a1ceb0ff30f32a7e0824
Author: Stephan Bergmann 
AuthorDate: Tue Oct 22 12:18:34 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 22 16:57:30 2019 +0200

Avoid C++20 operator overloading ambiguity

...which is reported now by Clang 10 trunk with -std=c++2a:

> cui/source/tabpages/tpline.cxx:481:80: error: use of overloaded operator 
'==' is ambiguous (with operand types 'const XLineEndItem' and 'XLineStartItem')
> if( pItem && ( !pOld || !( *static_cast(pOld) == *pItem ) ) )
>
~~~ ^  ~~
> include/svx/xlnstit.hxx:43:29: note: candidate function (with reversed 
parameter order)
> virtual booloperator==(const SfxPoolItem& rItem) const 
override;
> ^
> include/svx/xlnedit.hxx:43:29: note: candidate function
> virtual booloperator==(const SfxPoolItem& rItem) const 
override;
> ^

But the base SfxPoolItem::operator == is virtual anyway, so no need to cast
pOld to a derived type.

And once the expression is changed to

  !( *pOld == *pItem )

loplugin:simplifybool would kick in, but only with old compilers.  So update
loplugin:simplifybool to also kick in on that with latest Clang trunk with
-std=c++2a, and simplify the expression accordingly.

Change-Id: I3de9175b30d8645ed7a52f87cfac320144576cc8
Reviewed-on: https://gerrit.libreoffice.org/81203
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/compilerplugins/clang/simplifybool.cxx 
b/compilerplugins/clang/simplifybool.cxx
index 36c4854e96e8..83cbf2dc56f6 100644
--- a/compilerplugins/clang/simplifybool.cxx
+++ b/compilerplugins/clang/simplifybool.cxx
@@ -241,7 +241,30 @@ bool SimplifyBool::VisitUnaryLNot(UnaryOperator const * 
expr) {
 << expr->getSourceRange();
 return true;
 }
-if (auto binaryOp = 
dyn_cast(expr->getSubExpr()->IgnoreParenImpCasts())) {
+auto sub = expr->getSubExpr()->IgnoreParenImpCasts();
+auto reversed = false;
+#if CLANG_VERSION >= 10
+if (auto const rewritten = dyn_cast(sub)) {
+if (rewritten->isReversed()) {
+if (rewritten->getOperator() == BO_EQ) {
+auto const sem = rewritten->getSemanticForm();
+bool match;
+if (auto const op1 = dyn_cast(sem)) {
+match = op1->getOpcode() == BO_EQ;
+} else if (auto const op2 = 
dyn_cast(sem)) {
+match = op2->getOperator() == OO_EqualEqual;
+} else {
+match = false;
+}
+if (match) {
+sub = sem;
+reversed = true;
+}
+}
+}
+}
+#endif
+if (auto binaryOp = dyn_cast(sub)) {
 // Ignore macros, otherwise
 //OSL_ENSURE(!b, ...);
 // triggers.
@@ -289,7 +312,7 @@ bool SimplifyBool::VisitUnaryLNot(UnaryOperator const * 
expr) {
 << binaryOp->getSourceRange();
 }
 }
-if (auto binaryOp = 
dyn_cast(expr->getSubExpr()->IgnoreParenImpCasts())) {
+if (auto binaryOp = dyn_cast(sub)) {
 // Ignore macros, otherwise
 //OSL_ENSURE(!b, ...);
 // triggers.
@@ -301,8 +324,8 @@ bool SimplifyBool::VisitUnaryLNot(UnaryOperator const * 
expr) {
 if (!(op == OO_EqualEqual || op == OO_ExclaimEqual))
 return true;
 BinaryOperator::Opcode negatedOpcode = 
BinaryOperator::negateComparisonOp(BinaryOperator::getOverloadedOpcode(op));
-auto lhs = 
binaryOp->getArg(0)->IgnoreImpCasts()->getType()->getUnqualifiedDesugaredType();
-auto rhs = 
binaryOp->getArg(1)->IgnoreImpCasts()->getType()->getUnqualifiedDesugaredType();
+auto lhs = binaryOp->getArg(reversed ? 1 : 
0)->IgnoreImpCasts()->getType()->getUnqualifiedDesugaredType();
+auto rhs = binaryOp->getArg(reversed ? 0 : 
1)->IgnoreImpCasts()->getType()->getUnqualifiedDesugaredType();
 auto const negOp = findOperator(compiler, negatedOpcode, lhs, rhs);
 if (!negOp)
 return true;
@@ -323,8 +346,10 @@ bool SimplifyBool::VisitUnaryLNot(UnaryOperator const * 
expr) {
 << expr->getSourceRange();
 if (negOp != ASSUME_OPERATOR_EXISTS)
 report(
-DiagnosticsEngine::Note, "the presumed corresponding negated 
operator is declared here",
+DiagnosticsEngine::Note, "the presumed corresponding negated 
operator for %0 and %1 is declared here",

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

 external/lpsolve/lpsolve-ubsan.patch.0 |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 65b239f8cab7e5a82438a617d8d9e022fc441138
Author: Stephan Bergmann 
AuthorDate: Tue Oct 22 11:54:02 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 22 16:50:31 2019 +0200

external/lpsolve: Avoid UBSan nullptr-with-nonzero-offset

...(new with Clang 10 trunk), as seen during CppunitTest_sccomp_solver:

> ../lp_presolve.c:171:34: runtime error: applying non-zero offset 8 to 
null pointer
>  #0 in presolve_rebuildUndo at 
workdir/UnpackedTarball/lpsolve/lpsolve55/../lp_presolve.c:171:34
>  #1 in postsolve at 
workdir/UnpackedTarball/lpsolve/lpsolve55/../lp_presolve.c:5673:5
>  #2 in spx_solve at 
workdir/UnpackedTarball/lpsolve/lpsolve55/../lp_simplex.c:2067:9
>  #3 in lin_solve at 
workdir/UnpackedTarball/lpsolve/lpsolve55/../lp_simplex.c:2159:12
>  #4 in LpsolveSolver::solve() at 
sccomp/source/solver/LpsolveSolver.cxx:295:19
>  #5 in (anonymous namespace)::LpSolverTest::testSolver(rtl::OUString 
const&) at sccomp/qa/unit/solver.cxx:106:14
>  #6 in (anonymous namespace)::LpSolverTest::testLpSolver() at 
sccomp/qa/unit/solver.cxx:69:5

I have no idea whether this even remotely resembles a useful fix, though.

Change-Id: I1a2796d3849967576f400737082e7377566aece9
Reviewed-on: https://gerrit.libreoffice.org/81321
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/lpsolve/lpsolve-ubsan.patch.0 
b/external/lpsolve/lpsolve-ubsan.patch.0
index 29e9ad3b3c1a..7a5e308c6efd 100644
--- a/external/lpsolve/lpsolve-ubsan.patch.0
+++ b/external/lpsolve/lpsolve-ubsan.patch.0
@@ -1,3 +1,14 @@
+--- lp_presolve.c
 lp_presolve.c
+@@ -168,7 +168,7 @@
+   if(isprimal) {
+ if(psdata->primalundo != NULL)
+   mat = psdata->primalundo->tracker;
+-solution = lp->full_solution + lp->presolve_undo->orig_rows;
++solution = lp->full_solution == NULL ? NULL : lp->full_solution + 
lp->presolve_undo->orig_rows;
+ slacks   = lp->full_solution;
+   }
+   else {
 --- lp_pricePSE.c
 +++ lp_pricePSE.c
 @@ -145,7 +147,7 @@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 3331b91f78519b6c208be9318983d741f4e2ea6b
Author: Olivier Hallot 
AuthorDate: Mon Oct 21 19:45:27 2019 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Oct 22 16:32:14 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Fix image dmensions in page

Change-Id: I64c4550d47c05ad05f6cfdf65a642e502dd51d03
Reviewed-on: https://gerrit.libreoffice.org/81289
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 559cb6ee4b3a..1c2c0582a652 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 559cb6ee4b3acafc6e2233c18e40ddc40a6786e2
+Subproject commit 1c2c0582a652308f072aa9ecc0878bc2f25095bb
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 source/text/simpress/guide/animated_slidechange.xhp |   20 +++-
 1 file changed, 7 insertions(+), 13 deletions(-)

New commits:
commit 1c2c0582a652308f072aa9ecc0878bc2f25095bb
Author: Olivier Hallot 
AuthorDate: Mon Oct 21 19:45:27 2019 -0300
Commit: Olivier Hallot 
CommitDate: Tue Oct 22 16:32:14 2019 +0200

Fix image dmensions in page

Change-Id: I64c4550d47c05ad05f6cfdf65a642e502dd51d03
Reviewed-on: https://gerrit.libreoffice.org/81289
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/simpress/guide/animated_slidechange.xhp 
b/source/text/simpress/guide/animated_slidechange.xhp
index ba42e6caa..b9a726d19 100644
--- a/source/text/simpress/guide/animated_slidechange.xhp
+++ b/source/text/simpress/guide/animated_slidechange.xhp
@@ -1,7 +1,4 @@
 
-
-
-
 
-
-
 
 
 
@@ -35,10 +30,10 @@
 transition effects
 deleting; slide transition effects
 effects;animated slide transitions
-MW changed "removing;..." to 
"deleting;..."Animating Slide Transitions
-
+MW changed "removing;..." to "deleting;..."Animating Slide Transitions
+
 You can apply 
a special effect that plays when you display a slide.
-To 
apply a transition effect to a slide
+To apply a transition effect to a slide
 
 
 In 
Normal view, select the slide that you want to add the transition 
effect to.
@@ -51,14 +46,13 @@
 
 
 You can 
preview the transition effect in the document window.
-On Slide Pane an 
 
icon appears next to the preview of those slides, which have slide transition. 
When you present the slide show with the Presenter Console,  icon 
indicates that the next slide has slide transition.
-To 
apply the same transition effect to more than one slide
+On Slide Pane an  icon appears next to the preview of those slides, which 
have slide transition. When you present the slide show with the Presenter 
Console,  icon indicates that the next slide has slide 
transition.
+To apply the same transition effect to more than one 
slide
 
 
 In Slide 
Sorter view, select the slides that you want to add the transition 
effect to.
 If you want, 
you can use the Zoom toolbar
-Icon
-to change the view magnification for the slides.
+Icon 
Zoom to change the view magnification for the slides.
 
 
 On the Tasks 
pane, click Slide Transition.
@@ -68,7 +62,7 @@
 
 
 To preview the 
transition effect for a slide, click the small icon underneath the slide on the 
Slides Pane.
-To 
remove a transition effect
+To remove a transition effect
 
 
 In Slide 
Sorter View, select the slides that you want to remove the transition 
effect from.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - helpcontent2

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

New commits:
commit 951a6e3e3375c96fec4d711552a58794aa9eec8a
Author: Olivier Hallot 
AuthorDate: Mon Oct 21 20:35:59 2019 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Oct 22 16:30:41 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Give note,tip,warning same children as paragraph

But narrow attributes not necessary (role, heading...)

Change-Id: Icb022d0694a442186bef46fae172631a96662353
Reviewed-on: https://gerrit.libreoffice.org/81292
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index fbfb839983b6..559cb6ee4b3a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fbfb839983b6d08291c3f49cf30d8c3b45b41507
+Subproject commit 559cb6ee4b3acafc6e2233c18e40ddc40a6786e2
commit 5b899701c857670851cafa97349e0007408a0434
Author: Olivier Hallot 
AuthorDate: Mon Oct 21 20:15:54 2019 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Oct 22 16:30:09 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Add screenshot to Option load VBA Help page

Change-Id: I35aab763f42ae1f4670f82900dd8ea25ca256f6e
Reviewed-on: https://gerrit.libreoffice.org/81290
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 0dc045bd9c85..fbfb839983b6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0dc045bd9c85db452d996f589202088dfc82ceec
+Subproject commit fbfb839983b6d08291c3f49cf30d8c3b45b41507
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: 2 commits - helpers/xmlhelp.dtd Package_html_media.mk source/media source/text

 Package_html_media.mk   |4 
+
 helpers/xmlhelp.dtd |   26 
+++---
 source/media/screenshots/cui/ui/optfltrpage/OptFltrPage.png |binary
 source/media/screenshots/cui/ui/optfltrpage/af/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/am/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/ar/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/as/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/ast/OptFltrPage.png |binary
 source/media/screenshots/cui/ui/optfltrpage/be/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/bg/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/bn-IN/OptFltrPage.png   |binary
 source/media/screenshots/cui/ui/optfltrpage/bn/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/bo/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/br/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/brx/OptFltrPage.png |binary
 source/media/screenshots/cui/ui/optfltrpage/bs/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/ca-valencia/OptFltrPage.png |binary
 source/media/screenshots/cui/ui/optfltrpage/ca/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/cs/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/cy/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/da/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/de/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/dgo/OptFltrPage.png |binary
 source/media/screenshots/cui/ui/optfltrpage/dsb/OptFltrPage.png |binary
 source/media/screenshots/cui/ui/optfltrpage/dz/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/el/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/en-GB/OptFltrPage.png   |binary
 source/media/screenshots/cui/ui/optfltrpage/en-ZA/OptFltrPage.png   |binary
 source/media/screenshots/cui/ui/optfltrpage/eo/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/es/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/et/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/eu/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/fa/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/fi/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/fr/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/fy/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/ga/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/gd/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/gl/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/gu/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/gug/OptFltrPage.png |binary
 source/media/screenshots/cui/ui/optfltrpage/he/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/hi/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/hr/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/hsb/OptFltrPage.png |binary
 source/media/screenshots/cui/ui/optfltrpage/hu/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/id/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/is/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/it/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/ja/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/ka/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/kab/OptFltrPage.png |binary
 source/media/screenshots/cui/ui/optfltrpage/kk/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/km/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/kmr-Latn/OptFltrPage.png|binary
 source/media/screenshots/cui/ui/optfltrpage/kn/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/ko/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/kok/OptFltrPage.png |binary
 source/media/screenshots/cui/ui/optfltrpage/ks/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/lb/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/lo/OptFltrPage.png  |binary
 source/media/screenshots/cui/ui/optfltrpage/

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 9d27912cb87e18a2c03fc958b3932f1f05be5e3d
Author: Olivier Hallot 
AuthorDate: Mon Oct 21 18:58:42 2019 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Oct 22 16:28:15 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - Add Option View help page screenshot

+ tweak CSS for images

Change-Id: Iaa304a0ccecb6cdea2421de4ffaed52d71a0c76b
Reviewed-on: https://gerrit.libreoffice.org/81287
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 7c3eed27fda4..0dc045bd9c85 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7c3eed27fda495e3b373623eb723cccb690a1470
+Subproject commit 0dc045bd9c85db452d996f589202088dfc82ceec
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: AllLangHelp_shared.mk help3xsl/default.css help3xsl/online_transform.xsl Package_html_media.mk source/media source/text

 AllLangHelp_shared.mk   |1 
 Package_html_media.mk   |4 
 help3xsl/default.css|   10 
++
 help3xsl/online_transform.xsl   |   18 

 source/media/screenshots/cui/ui/optviewpage/OptViewPage.png |binary
 source/media/screenshots/cui/ui/optviewpage/af/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/am/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/ar/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/as/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/ast/OptViewPage.png |binary
 source/media/screenshots/cui/ui/optviewpage/be/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/bg/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/bn-IN/OptViewPage.png   |binary
 source/media/screenshots/cui/ui/optviewpage/bn/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/bo/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/br/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/brx/OptViewPage.png |binary
 source/media/screenshots/cui/ui/optviewpage/bs/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/ca-valencia/OptViewPage.png |binary
 source/media/screenshots/cui/ui/optviewpage/ca/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/cs/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/cy/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/da/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/de/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/dgo/OptViewPage.png |binary
 source/media/screenshots/cui/ui/optviewpage/dsb/OptViewPage.png |binary
 source/media/screenshots/cui/ui/optviewpage/dz/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/el/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/en-GB/OptViewPage.png   |binary
 source/media/screenshots/cui/ui/optviewpage/en-ZA/OptViewPage.png   |binary
 source/media/screenshots/cui/ui/optviewpage/eo/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/es/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/et/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/eu/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/fa/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/fi/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/fr/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/fy/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/ga/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/gd/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/gl/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/gu/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/gug/OptViewPage.png |binary
 source/media/screenshots/cui/ui/optviewpage/he/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/hi/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/hr/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/hsb/OptViewPage.png |binary
 source/media/screenshots/cui/ui/optviewpage/hu/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/id/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/is/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/it/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/ja/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/ka/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/kab/OptViewPage.png |binary
 source/media/screenshots/cui/ui/optviewpage/kk/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/km/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/kmr-Latn/OptViewPage.png|binary
 source/media/screenshots/cui/ui/optviewpage/kn/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/ko/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/kok/OptViewPage.png |binary
 source/media/screenshots/cui/ui/optviewpage/ks/OptViewPage.png  |binary
 source/media/screenshots/cui/ui/optviewpage/lb/Op

[Bug 35673] LibreOffice 3.4 most annoying bugs

2019-10-22 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=35673
Bug 35673 depends on bug 42097, which changed state.

Bug 42097 Summary: Formula: Search criteria fail with parenthesis and bracket 
characters
https://bugs.documentfoundation.org/show_bug.cgi?id=42097

   What|Removed |Added

 Status|CLOSED  |REOPENED
 Resolution|WORKSFORME  |---

-- 
You are receiving this mail because:
You are on the CC list for the bug.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2019-10-22 Thread Samuel Mehrbrodt (via logerrit)

 oox/source/core/filterdetect.cxx |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit a2c94755d883ed807efa4a60302762cf4c6fbefe
Author: Samuel Mehrbrodt 
AuthorDate: Mon Oct 21 17:12:28 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Oct 22 15:42:56 2019 +0200

Rather not put unencrypted doc in a tempfile

Keep it in memory instead

Change-Id: I25e5cb7183a4d192938110323e27f2f5d1d006fc
Reviewed-on: https://gerrit.libreoffice.org/81253
Reviewed-by: Tomaž Vajngerl 
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit bd3929da20b5a536b82b15af552864e7549f91ef)
Reviewed-on: https://gerrit.libreoffice.org/81298
Reviewed-by: Thorsten Behrens 

diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index c5ea4b385849..4537e61a93c8 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -327,20 +327,23 @@ Reference< XInputStream > 
FilterDetect::extractUnencryptedPackage( MediaDescript
 }
 else
 {
-// create temporary file for unencrypted package
-Reference xTempFile( TempFile::create(mxContext), 
UNO_QUERY_THROW );
+// create MemoryStream for unencrypted package - rather 
not put this in a tempfile
+Reference const xTempStream(
+
mxContext->getServiceManager()->createInstanceWithContext(
+"com.sun.star.comp.MemoryStream", mxContext),
+UNO_QUERY_THROW);
 
 // if decryption was unsuccessful (corrupted file or any 
other reason)
-if (!aDecryptor.decrypt(xTempFile))
+if (!aDecryptor.decrypt(xTempStream))
 {
 rMediaDescriptor[ MediaDescriptor::PROP_ABORTED() ] 
<<= true;
 }
 else
 {
 // store temp file in media descriptor to keep it alive
-rMediaDescriptor.setComponentDataEntry( 
"DecryptedPackage", Any( xTempFile ) );
+rMediaDescriptor.setComponentDataEntry( 
"DecryptedPackage", Any( xTempStream ) );
 
-Reference xDecryptedInputStream = 
xTempFile->getInputStream();
+Reference xDecryptedInputStream = 
xTempStream->getInputStream();
 if( lclIsZipPackage( mxContext, xDecryptedInputStream 
) )
 return xDecryptedInputStream;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Crash test update

2019-10-22 Thread Dennis Francis

Update : Crash on tdf77970-1.ods is fixed, but still working on
fdo31831-1.ods.

Thanks,
Dennis

On Sat, Oct 5, 2019 at 10:55 PM Dennis Francis 
wrote:

> At least the below two crashes are due to commit
> 845e1cdca3349c72e3083186502285d5b776abbe, and I'm working on a fix.
>
> Crash:/srv/crashtestdata/files/ods/tdf77970-1.ods through disposed
> Crash:/srv/crashtestdata/files/ods/fdo31831-1.ods through disposed
>
> Thanks,
> Dennis
>
> On Sat, Oct 5, 2019 at 9:22 PM Crashtest VM <
> crashtest.libreoff...@gmail.com> wrote:
>
>> New crashtest update available at
>> http://dev-builds.libreoffice.org/crashtest/314958decf4491ca7b11c2ef014d29ea2ae14d69/
>> ___
>> LibreOffice mailing list
>> LibreOffice@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 external/redland/ExternalProject_redland.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 541815fcdbe49817a8ef8162fcceaaf7c790d296
Author: Stephan Bergmann 
AuthorDate: Tue Oct 22 11:52:00 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 22 15:08:37 2019 +0200

Pass ENABLE_DEBUG into ExternalProject_redland

Change-Id: Ifaacb82478b16e102108d32488a2807489c46901
Reviewed-on: https://gerrit.libreoffice.org/81320
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/redland/ExternalProject_redland.mk 
b/external/redland/ExternalProject_redland.mk
index 8c840ef87997..166b31cfe08a 100644
--- a/external/redland/ExternalProject_redland.mk
+++ b/external/redland/ExternalProject_redland.mk
@@ -40,6 +40,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM) \
$(if $(filter INTEL 
ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
+   $(if $(ENABLE_DEBUG),--enable-debug) \
$(if $(DISABLE_DYNLOADING), \
--enable-static --disable-shared \
, \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/core/tool/interpr3.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1b0cba8c2cd672b0d5a59a215961c5136a6e656b
Author: Noel Grandin 
AuthorDate: Tue Oct 22 11:40:43 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 22 14:40:39 2019 +0200

-Wimplicit-int-float-conversion

with clang trunk

implicit conversion from 'unsigned long' to 'double' changes value from
18446744073709551615 to 18446744073709551616
[-Werror,-Wimplicit-int-float-conversion]
if (f < 1.0 || f > std::numeric_limits::max())
 ~ ^~

Change-Id: Ief0eb55ed1ade9fb88f5749774790aebbb27e085
Reviewed-on: https://gerrit.libreoffice.org/81319
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 3e41643e6c50..ae99d1a79ef6 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -3656,7 +3656,7 @@ void ScInterpreter::CalculateSmallLarge(bool bSmall)
 [](double f) {
 f = rtl::math::approxFloor(f);
 // Valid ranks are >= 1.
-if (f < 1.0 || f > std::numeric_limits::max())
+if (f < 1.0 || static_cast(f) > 
std::numeric_limits::max())
 return static_cast(0);
 return static_cast(f);
 });
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/uibase/app/docsh.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b6fa378951a1b4e44b83622db73e0d1fdc6dbb5c
Author: Gabor Kelemen 
AuthorDate: Mon Oct 21 19:21:00 2019 +0200
Commit: László Németh 
CommitDate: Tue Oct 22 14:44:10 2019 +0200

tdf#128229 Disable Accept All & Reject All if redlines are password 
protected

Change-Id: If0a2781565b41aff1b502c293f89e2005b47cce8
Reviewed-on: https://gerrit.libreoffice.org/81265
Tested-by: Jenkins
Reviewed-by: László Németh 
Tested-by: László Németh 

diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index a373ec9e3a71..d9b49fc7789b 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -1140,7 +1140,8 @@ void SwDocShell::GetState(SfxItemSet& rSet)
 case FN_REDLINE_ACCEPT_ALL:
 case FN_REDLINE_REJECT_ALL:
 {
-if 
(GetDoc()->getIDocumentRedlineAccess().GetRedlineTable().empty())
+if 
(GetDoc()->getIDocumentRedlineAccess().GetRedlineTable().empty() ||
+HasChangeRecordProtection()) // tdf#128229 Disable Accept / 
Reject all if redlines are password protected
 rSet.DisableItem(nWhich);
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-22 Thread Balazs Varga (via logerrit)

 chart2/qa/extras/chart2export.cxx|   25 +
 chart2/qa/extras/chart2import.cxx|3 --
 oox/source/drawingml/chart/converterbase.cxx |   32 ---
 oox/source/export/chartexport.cxx|   11 -
 4 files changed, 60 insertions(+), 11 deletions(-)

New commits:
commit 9ff954d5f780cae5df6942e97b713cfc19449145
Author: Balazs Varga 
AuthorDate: Thu Oct 17 12:37:04 2019 +0200
Commit: László Németh 
CommitDate: Tue Oct 22 14:33:46 2019 +0200

tdf#127908 tdf#128193 Chart OOXML: Fix Custom Y axis title position

Import part: set the anchor position to the TOP_LEFT corner of the rectangle
during the import, if the textbox is rotated with 90 or 270 degree. Because
the OOXML files always contains the TOP_LEFT coordinates of a textbox, even 
if
they are rotated.

Note: Unfortunatelly we do not know the shape size, so this fix
cannot handle rotations different than 0, 90 or 270 degrees.

Export part: export the top left corner coordinates of axis title shape
as the OOXML Standerd requires.

Change-Id: Id0875d65884f6bfef8726135a7c03418d2ce3f23
Reviewed-on: https://gerrit.libreoffice.org/80939
Tested-by: Jenkins
Reviewed-by: László Németh 
Tested-by: László Németh 

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 8a0705f7d140..694ba5501043 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -123,6 +123,7 @@ public:
 void testCrossBetweenXLSX();
 void testCrossBetweenODS();
 void testAxisTitleRotationXLSX();
+void testAxisTitlePositionDOCX();
 void testAxisCrossBetweenXSLX();
 void testPieChartDataPointExplosionXLSX();
 void testCustomDataLabel();
@@ -228,6 +229,7 @@ public:
 CPPUNIT_TEST(testCrossBetweenXLSX);
 CPPUNIT_TEST(testCrossBetweenODS);
 CPPUNIT_TEST(testAxisTitleRotationXLSX);
+CPPUNIT_TEST(testAxisTitlePositionDOCX);
 CPPUNIT_TEST(testAxisCrossBetweenXSLX);
 CPPUNIT_TEST(testPieChartDataPointExplosionXLSX);
 CPPUNIT_TEST(testCustomDataLabel);
@@ -1932,6 +1934,29 @@ void Chart2ExportTest::testAxisTitleRotationXLSX()
 assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:title/c:tx/c:rich/a:bodyPr", "rot", 
"0");
 }
 
+void Chart2ExportTest::testAxisTitlePositionDOCX()
+{
+load("/chart2/qa/extras/data/docx/", "testAxisTitlePosition.docx");
+xmlDocPtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML 
Text");
+CPPUNIT_ASSERT(pXmlDoc);
+
+// test X Axis title position
+OUString aXVal = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:title/c:layout/c:manualLayout/c:x", 
"val");
+double nX = aXVal.toDouble();
+CPPUNIT_ASSERT(nX > 0.698208 && nX < 0.698209);
+OUString aYVal = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:title/c:layout/c:manualLayout/c:y", 
"val");
+double nY = aYVal.toDouble();
+CPPUNIT_ASSERT(nY > 0.805152 && nY < 0.805153);
+
+// test Y Axis title position
+aXVal = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:title/c:layout/c:manualLayout/c:x", 
"val");
+nX = aXVal.toDouble();
+CPPUNIT_ASSERT(nX > 0.025395 && nX < 0.025396);
+aYVal = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:title/c:layout/c:manualLayout/c:y", 
"val");
+nY = aYVal.toDouble();
+CPPUNIT_ASSERT(nY > 0.384407 && nY < 0.384408);
+}
+
 void Chart2ExportTest::testAxisCrossBetweenXSLX()
 {
 load("/chart2/qa/extras/data/odt/", "axis-position.odt");
diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index d0fcb34faafd..ab1233b13110 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -1539,8 +1539,7 @@ void Chart2ImportTest::testAxisTitlePositionDOCX()
 
 aPos = xAxisTitle->getPosition();
 CPPUNIT_ASSERT_EQUAL(sal_Int32(387), static_cast(aPos.X));
-// y coordinate is still wrong because of another older bug!
-/*CPPUNIT_ASSERT_EQUAL(sal_Int32(1535), static_cast(aPos.Y));*/
+CPPUNIT_ASSERT_EQUAL(sal_Int32(6378), static_cast(aPos.Y));
 }
 
 void Chart2ImportTest::testCombinedChartAttachedAxisXLSX()
diff --git a/oox/source/drawingml/chart/converterbase.cxx 
b/oox/source/drawingml/chart/converterbase.cxx
index 8acf77c619df..0b6b876a11a0 100644
--- a/oox/source/drawingml/chart/converterbase.cxx
+++ b/oox/source/drawingml/chart/converterbase.cxx
@@ -405,18 +405,34 @@ void LayoutConverter::convertFromModel( const Reference< 
XShape >& rxShape, doub
 lclCalcPosition( aChartSize.Height, mrModel.mfY, mrModel.mnYMode ) 
);
 if( (aShapePos.X >= 0) && (aShapePos.Y >= 0) )
 {
+bool bPropSet = false;
 // the call to XShape.getSize() may recalc the chart view
 awt::Size aShapeSize = rxShape->getSize();
 // rotated shapes need special hand

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

2019-10-22 Thread Marco Cecchetti (via logerrit)

 loleaflet/src/control/ColorPicker.js |2 ++
 loleaflet/src/control/Control.JSDialogBuilder.js |1 +
 2 files changed, 3 insertions(+)

New commits:
commit 4c80e125f200dd01517c107756067ebe299e2a0b
Author: Marco Cecchetti 
AuthorDate: Tue Oct 22 14:26:50 2019 +0200
Commit: Marco Cecchetti 
CommitDate: Tue Oct 22 14:27:18 2019 +0200

loleaflet: color picker: add a specific class for selected basic color

Change-Id: I6af2cf744db0dd33e1c604fd88972434e244d48d

diff --git a/loleaflet/src/control/ColorPicker.js 
b/loleaflet/src/control/ColorPicker.js
index 2826e93ba..7c230bf0b 100644
--- a/loleaflet/src/control/ColorPicker.js
+++ b/loleaflet/src/control/ColorPicker.js
@@ -246,6 +246,7 @@ L.ColorPicker = L.Class.extend({
if (sampleElem && sampleElem.firstChild) {
if (colorType === L.ColorPicker.BASIC_COLOR) {
sampleElem.removeChild(sampleElem.firstChild);
+   L.DomUtil.removeClass(sampleElem, 
'colors-container-selected-basic-color');
} else if (colorType === L.ColorPicker.TINT) {
sampleElem.firstChild.style.visibility = 
'hidden';
}
@@ -257,6 +258,7 @@ L.ColorPicker = L.Class.extend({
if (sampleElem) {
if (colorType === L.ColorPicker.BASIC_COLOR) {

sampleElem.appendChild(this._basicColorSelectionMark);
+   L.DomUtil.addClass(sampleElem, 
'colors-container-selected-basic-color');
} else if (colorType === L.ColorPicker.TINT && 
sampleElem.firstChild) {
sampleElem.firstChild.style.visibility = 
'visible';
}
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index a59d5d6f8..bd3e1f047 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -666,6 +666,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
}
} else if (data.selected && data.mark) {
colorSample.appendChild(data.mark);
+   L.DomUtil.addClass(colorSample, 
'colors-container-selected-basic-color');
}
 
 builder._setupHandlers(colorSample, data.handlers);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 external/redland/raptor/ubsan.patch |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 6fff5e07f63213b711d5ddd25e47e9593e306643
Author: Stephan Bergmann 
AuthorDate: Tue Oct 22 11:30:39 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 22 14:21:29 2019 +0200

external/redland: Avoid UBSan nullptr-with-nonzero-offset

...(new with Clang 10 trunk), as seen during CppunitTest_sw_ooxmlexport:

> raptor_rfc2396.c:389:23: runtime error: applying non-zero offset 2 to 
null pointer
>  #0 in raptor_uri_normalize_path at 
workdir/UnpackedTarball/raptor/src/raptor_rfc2396.c:389:23
>  #1 in raptor_uri_resolve_uri_reference at 
workdir/UnpackedTarball/raptor/src/raptor_rfc2396.c:617:21
>  #2 in raptor_new_uri_relative_to_base_counted at 
workdir/UnpackedTarball/raptor/src/raptor_uri.c:293:19
>  #3 in raptor_new_uri_relative_to_base at 
workdir/UnpackedTarball/raptor/src/raptor_uri.c:319:10
>  #4 in raptor_rdfxml_end_element_grammar at 
workdir/UnpackedTarball/raptor/src/raptor_rdfxml.c:2613:32
>  #5 in raptor_rdfxml_end_element_handler at 
workdir/UnpackedTarball/raptor/src/raptor_rdfxml.c:850:5
>  #6 in raptor_sax2_end_element at 
workdir/UnpackedTarball/raptor/src/raptor_sax2.c:867:7
>  #7 in xmlParseTryOrFinish at 
workdir/UnpackedTarball/libxml2/parser.c:11386:8
>  #8 in xmlParseChunk__internal_alias at 
workdir/UnpackedTarball/libxml2/parser.c:12244:13
>  #9 in raptor_sax2_parse_chunk at 
workdir/UnpackedTarball/raptor/src/raptor_sax2.c:534:10
>  #10 in raptor_rdfxml_parse_chunk at 
workdir/UnpackedTarball/raptor/src/raptor_rdfxml.c:1169:8
>  #11 in raptor_parser_parse_chunk at 
workdir/UnpackedTarball/raptor/src/raptor_parse.c:482:10
>  #12 in librdf_parser_raptor_parse_as_stream_common at  
(instdir/program/librdf-lo.so.0 +0x11ee39)
>  #13 in librdf_parser_raptor_parse_counted_string_as_stream at  
(instdir/program/librdf-lo.so.0 +0x117ca4)
>  #14 in librdf_parser_parse_counted_string_as_stream at  
(instdir/program/librdf-lo.so.0 +0x111967)
>  #15 in (anonymous namespace)::librdf_Repository::importGraph(short, 
com::sun::star::uno::Reference const&, 
com::sun::star::uno::Reference const&, 
com::sun::star::uno::Reference const&) at 
unoxml/source/rdf/librdf_repository.cxx:1048:9
>  #17 in sfx2::readStream(sfx2::DocumentMetadataAccess_Impl&, 
com::sun::star::uno::Reference const&, 
rtl::OUString const&, rtl::OUString const&) at 
sfx2/source/doc/DocumentMetadataAccess.cxx:606:36
>  #18 in sfx2::initLoading(sfx2::DocumentMetadataAccess_Impl&, 
com::sun::star::uno::Reference const&, 
com::sun::star::uno::Reference const&, 
com::sun::star::uno::Reference 
const&) at sfx2/source/doc/DocumentMetadataAccess.cxx:763:9
>  #19 in 
sfx2::DocumentMetadataAccess::loadMetadataFromStorage(com::sun::star::uno::Reference
 const&, com::sun::star::uno::Reference const&, 
com::sun::star::uno::Reference 
const&) at sfx2/source/doc/DocumentMetadataAccess.cxx:1126:5
>  #20 in 
SfxBaseModel::loadMetadataFromStorage(com::sun::star::uno::Reference
 const&, com::sun::star::uno::Reference const&, 
com::sun::star::uno::Reference 
const&) at sfx2/source/doc/sfxbasemodel.cxx:4411:15
>  #21 in XMLReader::Read(SwDoc&, rtl::OUString const&, SwPaM&, 
rtl::OUString const&) at sw/source/filter/xml/swxml.cxx:810:19
>  #22 in SwReader::Read(Reader const&) at 
sw/source/filter/basflt/shellio.cxx:188:22
>  #23 in SwDocShell::Load(SfxMedium&) at 
sw/source/uibase/app/docshini.cxx:546:37
>  #24 in SfxObjectShell::LoadOwnFormat(SfxMedium&) at 
sfx2/source/doc/objstor.cxx:3040:20
>  #25 in SfxObjectShell::DoLoad(SfxMedium*) at 
sfx2/source/doc/objstor.cxx:696:40
>  #26 in 
SfxBaseModel::load(com::sun::star::uno::Sequence
 const&) at sfx2/source/doc/sfxbasemodel.cxx:1851:36
>  #27 in (anonymous 
namespace)::SfxFrameLoader_Impl::load(com::sun::star::uno::Sequence
 const&, com::sun::star::uno::Reference const&) 
at sfx2/source/view/frmload.cxx:691:28
>  #28 in framework::LoadEnv::impl_loadContent() at 
framework/source/loadenv/loadenv.cxx:1157:37
>  #29 in framework::LoadEnv::startLoading() at 
framework/source/loadenv/loadenv.cxx:390:20
>  #30 in 
framework::LoadEnv::loadComponentFromURL(com::sun::star::uno::Reference
 const&, com::sun::star::uno::Reference 
const&, rtl::OUString const&, rtl::OUString const&, int, 
com::sun::star::uno::Sequence const&) at 
framework/source/loadenv/loadenv.cxx:171:14
>  #31 in framework::Desktop::loadComponentFromURL(rtl::OUString const&, 
rtl::OUString const&, int, 
com::sun::star::uno::Sequence const&) at 
framework/source/services/desktop.cxx:621:12
>  #32 in non-virtual thunk to 
framework::Desktop::loadComponentFromURL(rtl::OUString const&, rtl::OUString 
const&, int, 
com::sun::star::uno::Sequence const&) at 
framework/source/services/desktop.cxx
>  #33 in unotest::MacrosTest::loadFromDesktop(rtl::OUString const&, 
rtl::OUString cons

[Libreoffice-commits] core.git: Branch 'feature/cib_contract3756' - odk/settings

2019-10-22 Thread Thorsten Behrens (via logerrit)

 odk/settings/settings.mk |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 246e521150f00e0ddbb3dbaa58fc70a81f726f03
Author: Thorsten Behrens 
AuthorDate: Tue Oct 22 14:19:39 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Oct 22 14:19:39 2019 +0200

ODK: cleanup windows linker debug args

This was a somehow confused & partially commented-out setup

Change-Id: Iad5ef6721cda6f85ded3296650ee9a7df9ec59fd

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 49e8f18e51a1..25e5cb4af4b4 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -124,21 +124,20 @@ CC_OUTPUT_SWITCH=-Fo
 
 LIBO_SDK_LDFLAGS_STDLIBS = $(LIBO_SDK_DETAIL_LDFLAGS_MSVCRT) kernel32.lib
 
-LIBRARY_LINK_FLAGS=/DLL /DEBUGTYPE:cv
-COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) /DEF:$(PRJ)/settings/component.uno.def
+LIBRARY_LINK_FLAGS=/DLL
+COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) 
/DEF:$(OO_SDK_HOME)/settings/component.uno.def
 EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1b00 
/DEBUGTYPE:cv $(LIBO_SDK_LDFLAGS_STDLIBS)
 ifeq "$(DEBUG)" "yes"
-LIBRARY_LINK_FLAGS+=/DEBUG
+LIBRARY_LINK_FLAGS+=/DEBUGTYPE:cv /DEBUG
 EXE_LINK_FLAGS+=/DEBUG
+else
+EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x110
 endif
 
 LINK_JAVA_LIBS=/LIBPATH:"$(OO_SDK_JAVA_HOME)/lib"
 
 URE_MISC=${OFFICE_PROGRAM_PATH}
 
-# use this for release version
-#EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x110
-#LIBRARY_LINK_FLAGS=/DLL
 endif  
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-22 Thread Szymon Kłos (via logerrit)

 loleaflet/src/control/Control.JSDialogBuilder.js |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ec2cd78bcb3387e977bffea5640beb2291ab8cf3
Author: Szymon Kłos 
AuthorDate: Tue Oct 22 11:09:18 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 22 14:19:54 2019 +0200

jsdialogs: change event message to JSON

- also differentiate set(editfield) from change (checkbox) event type

Change-Id: I76d69f29cbe84368770d308f7cfd15c828bd8a89
Reviewed-on: https://gerrit.libreoffice.org/81312
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 210d528db..a59d5d6f8 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -101,7 +101,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
if (objectType == 'toolbutton' && eventType == 'click') {
builder.map.sendUnoCommand(data);
} else if (object) {
-   var message = 'dialogevent ' + window.sidebarId + ' ' + 
object.id + ' ' + eventType + ' ' + data;
+   var message = 'dialogevent ' + window.sidebarId + ' 
{\"id\":\"' + object.id + '\", \"cmd\": \"' + eventType + '\", \"data\":\"' + 
data + '\"}';
builder.map._socket.sendMessage(message);
}
},
@@ -441,7 +441,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
if (customCallback)
customCallback();
else
-   builder.callback('spinfield', 'change', div, 
this.value, builder);
+   builder.callback('spinfield', 'set', div, 
this.value, builder);
});
 
plus.addEventListener('click', function() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-22 Thread Jan Holesovsky (via logerrit)

 vcl/source/filter/graphicfilter.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 105d98caa70389c12ad4f9a2a2b7474a4be73aa2
Author: Jan Holesovsky 
AuthorDate: Fri Oct 18 00:40:59 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Tue Oct 22 14:20:08 2019 +0200

pdfium: Switch the condition for better readibility.

Change-Id: I8acf1e98f032f6943b2e7d09ac276f0f1ac4b120
Reviewed-on: https://gerrit.libreoffice.org/81061
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/vcl/source/filter/graphicfilter.cxx 
b/vcl/source/filter/graphicfilter.cxx
index 0aea92f7ad36..4a8f5a80cfff 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -2013,12 +2013,12 @@ ErrCode GraphicFilter::ImportGraphic( Graphic& 
rGraphic, const OUString& rPath,
 nStatus = ERRCODE_GRFILTER_FILTERERROR;
 }
 }
-else if (aFilterName == IMP_PDF)
+else if (aFilterName.equalsIgnoreAsciiCase(IMP_PDF))
 {
-if (!vcl::ImportPDF(rIStream, rGraphic))
-nStatus = ERRCODE_GRFILTER_FILTERERROR;
-else
+if (vcl::ImportPDF(rIStream, rGraphic))
 eLinkType = GfxLinkType::NativePdf;
+else
+nStatus = ERRCODE_GRFILTER_FILTERERROR;
 }
 else
 nStatus = ERRCODE_GRFILTER_FILTERERROR;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - android/source configure.ac external/libpng

2019-10-22 Thread Tor Lillqvist (via logerrit)

 android/source/build.gradle |3 +--
 android/source/gradle/wrapper/gradle-wrapper.properties |2 +-
 configure.ac|4 ++--
 external/libpng/StaticLibrary_libpng.mk |2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit caa1da1f3b6c5d708534963d1447e05004497c47
Author: Tor Lillqvist 
AuthorDate: Tue Feb 12 15:28:53 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Tue Oct 22 14:18:48 2019 +0200

The ARM Neon stuff is needed for ARM64, too (iOS at least)

Not sure why the code has now started to require that, even if have
used the same bundled libpng as for a long time.

Change-Id: I2da223bc46c24563ce9d170643c28cc5c93f7d56
Reviewed-on: https://gerrit.libreoffice.org/81229
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/external/libpng/StaticLibrary_libpng.mk 
b/external/libpng/StaticLibrary_libpng.mk
index f500720616a2..dbbc3848c541 100644
--- a/external/libpng/StaticLibrary_libpng.mk
+++ b/external/libpng/StaticLibrary_libpng.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,libpng,\
UnpackedTarball/libpng/pngwrite \
UnpackedTarball/libpng/pngwtran \
UnpackedTarball/libpng/pngwutil \
-   $(if $(filter ARM,$(CPUNAME)),\
+   $(if $(filter ARM ARM64,$(CPUNAME)),\
UnpackedTarball/libpng/arm/arm_init \
UnpackedTarball/libpng/arm/filter_neon_intrinsics \
) \
commit 246f1b5b4485b7db9f9584e4b3b819c87e331c0e
Author: Jan Holesovsky 
AuthorDate: Thu Jul 4 08:55:17 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Tue Oct 22 14:18:28 2019 +0200

android: Allow using SDK and NDK directly from the Android Studio.

Just specify:

--with-android-ndk=$HOME/Android/Sdk/ndk-bundle
--with-android-sdk=$HOME/Android/Sdk

in your autogen.input, install the appropriate components via Android
Studio and you are done.

Change-Id: Ic99790b781b9017eb4e642380e230d6f7b49e9b7
Reviewed-on: https://gerrit.libreoffice.org/81228
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/android/source/build.gradle b/android/source/build.gradle
index 1ea328c4e6cf..a5fd073f7aeb 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -33,8 +33,7 @@ dependencies {
 "unoloader.jar"
 ])
 implementation files("${liboInstdir}/${liboShareJavaFolder}/unoil.jar")
-debugImplementation(name:'owncloud_android_lib-debug', ext:'aar')
-releaseImplementation(name:'owncloud_android_lib-release', ext:'aar')
+implementation(name:'owncloud_android_lib', ext:'aar')
 implementation 'com.android.support:design:27.1.1' // also pulls-in 
corresponding support libraries
 implementation 'com.android.support.constraint:constraint-layout:1.1.2'
 }
diff --git a/android/source/gradle/wrapper/gradle-wrapper.properties 
b/android/source/gradle/wrapper/gradle-wrapper.properties
index 1490158923d0..617dcf1065c3 100644
--- a/android/source/gradle/wrapper/gradle-wrapper.properties
+++ b/android/source/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
diff --git a/configure.ac b/configure.ac
index 80ca6532ceea..a013d4593cfb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -380,7 +380,7 @@ if test -z "$with_android_ndk" -a -e 
"$SRC_ROOT/external/android-ndk" -a "$build
 with_android_ndk="$SRC_ROOT/external/android-ndk"
 fi
 if test -n "$with_android_ndk"; then
-ANDROID_NDK_HOME=$with_android_ndk
+eval ANDROID_NDK_HOME=$with_android_ndk
 
 # Set up a lot of pre-canned defaults
 
@@ -520,7 +520,7 @@ if test -z "$with_android_sdk" -a -e 
"$SRC_ROOT/external/android-sdk-linux" -a "
 with_android_sdk="$SRC_ROOT/external/android-sdk-linux"
 fi
 if test -n "$with_android_sdk"; then
-ANDROID_SDK_HOME=$with_android_sdk
+eval ANDROID_SDK_HOME=$with_android_sdk
 PATH="$ANDROID_SDK_HOME/platform-tools:$ANDROID_SDK_HOME/tools:$PATH"
 fi
 AC_SUBST(ANDROID_SDK_HOME)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac

2019-10-22 Thread Jan Holesovsky (via logerrit)

 configure.ac |   15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 59eee888bf7174114e5749855d95e8ff7dd15013
Author: Jan Holesovsky 
AuthorDate: Thu Jul 4 09:06:49 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Tue Oct 22 14:18:10 2019 +0200

android: Allow specification of the API level.

Change-Id: Icf33e2703f42a7866ce895437cf5f276066eeebe
Reviewed-on: https://gerrit.libreoffice.org/81227
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/configure.ac b/configure.ac
index be8a5be03ed4..80ca6532ceea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -370,6 +370,11 @@ AC_ARG_WITH(android-sdk,
 [Specify location of the Android SDK. Mandatory when building for 
Android.]),
 ,)
 
+AC_ARG_WITH(android-api-level,
+AS_HELP_STRING([--with-android-api-level],
+[Specify the API level when building for Android. Defaults to 16 for 
ARM and x86 and to 21 for ARM64 and x86-64]),
+,)
+
 ANDROID_NDK_HOME=
 if test -z "$with_android_ndk" -a -e "$SRC_ROOT/external/android-ndk" -a 
"$build" != "$host"; then
 with_android_ndk="$SRC_ROOT/external/android-ndk"
@@ -406,6 +411,10 @@ if test -n "$with_android_ndk"; then
 esac
 
 ANDROID_API_LEVEL=16
+if test -n "$with_android_api_level" ; then
+ANDROID_API_LEVEL="$with_android_api_level"
+fi
+
 android_cpu=$host_cpu
 if test $host_cpu = arm; then
 android_platform_prefix=arm-linux-androideabi
@@ -418,7 +427,9 @@ if test -n "$with_android_ndk"; then
 android_gnu_prefix=$android_platform_prefix
 LLVM_TRIPLE=$android_platform_prefix
 # minimum android version that supports aarch64
-ANDROID_API_LEVEL=21
+if test "$ANDROID_API_LEVEL" -lt "21" ; then
+ANDROID_API_LEVEL=21
+fi
 ANDROID_APP_ABI=arm64-v8a
 elif test $host_cpu = x86_64; then
 android_platform_prefix=x86_64-linux-android
@@ -445,6 +456,8 @@ if test -n "$with_android_ndk"; then
 AC_MSG_ERROR([Unrecognized value for the 
--with-android-ndk-toolchain-version option. Building for Android is only 
supported with Clang 5.*])
 esac
 
+AC_MSG_NOTICE([using the Android API level... $ANDROID_API_LEVEL])
+
 # NDK 15 or later toolchain is 64bit-only, except for Windows that we 
don't support. Using a 64-bit
 # linker is required if you compile large parts of the code with -g. A 
32-bit linker just won't
 # manage to link the (app-specific) single huge .so that is built for the 
app in
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - android/Bootstrap android/source bridges/Library_cpp_uno.mk configure.ac external/nss external/owncloud-android-lib READM

2019-10-22 Thread Miklos Vajna (via logerrit)

 README.md|2 
 android/Bootstrap/Makefile.shared|2 
 android/source/build.gradle  |6 +-
 bridges/Library_cpp_uno.mk   |4 -
 configure.ac |   78 +--
 external/nss/ExternalProject_nss.mk  |2 
 external/owncloud-android-lib/build.gradle   |   16 -
 solenv/gbuild/platform/ANDROID_GODSON_GCC.mk |   17 -
 solenv/gbuild/platform/android.mk|9 ---
 9 files changed, 50 insertions(+), 86 deletions(-)

New commits:
commit 016141db1deea005c7963d2f4c9e934fe2d85817
Author: Miklos Vajna 
AuthorDate: Mon Aug 26 12:34:53 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Tue Oct 22 14:17:04 2019 +0200

Android: document one NDK version that works

The baseline info was silent on Android, and at least my old r16b was
too old to build master, while updating to r19c fixes the build, so
document that finding.

Change-Id: I8713d68a9cfe62ca241f0047f46da496acb85acd
Reviewed-on: https://gerrit.libreoffice.org/78119
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/81224
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/README.md b/README.md
index 1e32005147d3..fdf385b6c7b8 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,8 @@ run and compile LibreOffice, also used by the TDF builds:
 * iOS (only for LibreOfficeKit):
 * Runtime: 11.4 (only support for newer i devices == 64 bit)
 * Build: Xcode 9.3 and iPhone SDK 11.4
+* Android:
+* Build: NDK r19c
 
 At least Clang 3.4.2 is known to be too old to pass the configure.ac check 
"whether $CXX supports
 C++17, C++14, or C++11" in its current form (due to the #pragma GCC diagnostic 
ignored "-Wpragmas"
commit f99b9e38ffca72d0b13e0eec6e385c27c953f0d7
Author: Christian Lohmaier 
AuthorDate: Wed Aug 7 12:06:25 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Tue Oct 22 14:16:50 2019 +0200

android: support NDK 19 and above (20 as of this commit)

support for targeting API 14 and 15 was removed in NDK 18, so set
minimum version to 16
mips support was removed in NDK 17

Clang now takes care about correct linking with libc++ shared or
static, so don't manually specify them anymore.
Same with __ANDROID_API_LEVEL__ define and the sysroot / isystem
handling, that is all covered by a single -target 
simplifying things quite a bit.

also align ownloud sdk values with main build.gradle

Change-Id: Ib3ae4484e52214677e826270b731ecf7c5c15445
Reviewed-on: https://gerrit.libreoffice.org/77104
Reviewed-by: Jan Holesovsky 
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
Reviewed-on: https://gerrit.libreoffice.org/81223
Tested-by: Jenkins CollaboraOffice 

diff --git a/android/Bootstrap/Makefile.shared 
b/android/Bootstrap/Makefile.shared
index 942f5f8179ee..0be8e1e14250 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -59,7 +59,7 @@ WHOLELIBS = \
 $(OBJLOCAL)/liblo-native-code.so : native-code.cxx $(ALL_STATIC_LIBS)
@echo "Linking $@"
mkdir -p $(OBJLOCAL)
-   $(CXX) -Wl,--build-id=sha1 -Wl,--gc-sections 
-Wl,--version-script=../Bootstrap/version.map -Wl,--no-keep-files-mapped 
-Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared 
-Wl,-soname,liblo-native-code.so -o $(OBJLOCAL)/liblo-native-code.so 
-I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx 
-L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lc++_static -lc++abi 
-landroid_support $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-lunwind) 
$(addprefix -l,$(NSSLIBS)) -lGLESv2 -landroid -ljnigraphics -llog -lz
+   $(CXX) -Wl,--build-id=sha1 -Wl,--gc-sections 
-Wl,--version-script=../Bootstrap/version.map -Wl,--no-keep-files-mapped 
-Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared 
-Wl,-soname,liblo-native-code.so -o $(OBJLOCAL)/liblo-native-code.so 
-I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx 
-L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -static-libstdc++ 
$(addprefix -l,$(NSSLIBS)) -lGLESv2 -landroid -ljnigraphics -llog -lz
 
 $(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so
mkdir -p $(SODEST)
diff --git a/android/source/build.gradle b/android/source/build.gradle
index e1358684b05a..1ea328c4e6cf 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -61,7 +61,7 @@ android {
 strippedUIEditing.assets.srcDirs 'assets_strippedUI'
 }
 defaultConfig {
-minSdkVersion 14
+minSdkVersion 16
 targetSdkVersion 26
 vectorDrawables.useSupportLibrary = true
 }
@@ -92,6 +92,10 @@ android {
 }
 fullUI.dimension "default"
 }
+lintOptions {
+// don't error-out on missing translations
+warning 'MissingTr

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - bridges/Library_cpp_uno.mk bridges/source configure.ac distro-configs/LibreOfficeAndroidX86_64.conf external/nss solenv/gbuild

2019-10-22 Thread Christian Lohmaier (via logerrit)

 bridges/Library_cpp_uno.mk|2 +-
 bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx |   10 ++
 configure.ac  |   12 
 distro-configs/LibreOfficeAndroidX86_64.conf  |   10 ++
 external/nss/ExternalProject_nss.mk   |2 +-
 external/nss/nss-android.patch.1  |3 ++-
 solenv/gbuild/platform/ANDROID_X86_64_GCC.mk  |   15 +++
 7 files changed, 51 insertions(+), 3 deletions(-)

New commits:
commit 7d8f0a8fdef91f7f46fc6b5d86a169a55c934519
Author: Christian Lohmaier 
AuthorDate: Thu Sep 5 16:43:14 2019 +0200
Commit: Jan Holesovsky 
CommitDate: Tue Oct 22 14:17:32 2019 +0200

android: add support for 64bit build

Change-Id: Id8aae84308f6128351ae2f93c8fbc8941a0c7fc6
Reviewed-on: https://gerrit.libreoffice.org/79085
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 
Reviewed-on: https://gerrit.libreoffice.org/81225
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 4efba804b7d2..d4e942496830 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -159,7 +159,7 @@ bridge_exception_objects := except
 
 else ifeq ($(CPUNAME),X86_64)
 
-ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD HAIKU,$(OS)),)
+ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD HAIKU,$(OS)),)
 bridges_SELECTED_BRIDGE := gcc3_linux_x86-64
 bridge_asm_objects := call
 bridge_noncallexception_noopt_objects := callvirtualmethod
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx 
b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
index 038f88f1d18e..39cf5bd13218 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
@@ -81,7 +81,9 @@ class RTTI
 std::vector m_rttiNames;
 std::unordered_map> m_generatedRttis;
 
+#if !defined ANDROID
 void * m_hApp;
+#endif
 
 public:
 RTTI();
@@ -91,13 +93,17 @@ public:
 };
 
 RTTI::RTTI()
+#if !defined ANDROID
 : m_hApp( dlopen( nullptr, RTLD_LAZY ) )
+#endif
 {
 }
 
 RTTI::~RTTI()
 {
+#if !defined ANDROID
 dlclose( m_hApp );
+#endif
 }
 
 std::type_info * RTTI::getRTTI(typelib_TypeDescription const & pTypeDescr)
@@ -125,7 +131,11 @@ std::type_info * RTTI::getRTTI(typelib_TypeDescription 
const & pTypeDescr)
 buf.append( 'E' );
 
 OString symName( buf.makeStringAndClear() );
+#if !defined ANDROID
 rtti = static_cast(dlsym( m_hApp, symName.getStr() 
));
+#else
+rtti = static_cast(dlsym( RTLD_DEFAULT, 
symName.getStr() ));
+#endif
 
 if (rtti)
 {
diff --git a/configure.ac b/configure.ac
index 1cdc3df08f80..be8a5be03ed4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -420,6 +420,13 @@ if test -n "$with_android_ndk"; then
 # minimum android version that supports aarch64
 ANDROID_API_LEVEL=21
 ANDROID_APP_ABI=arm64-v8a
+elif test $host_cpu = x86_64; then
+android_platform_prefix=x86_64-linux-android
+android_gnu_prefix=$android_platform_prefix
+LLVM_TRIPLE=$android_platform_prefix
+# minimum android version that supports x86_64
+ANDROID_API_LEVEL=21
+ANDROID_APP_ABI=x86_64
 else
 # host_cpu is something like "i386" or "i686" I guess, NDK uses
 # "x86" in some contexts
@@ -4315,6 +4322,11 @@ linux-android*)
 RTL_ARCH=x86
 PLATFORMID=android_x86
 ;;
+x86_64)
+CPUNAME=X86_64
+RTL_ARCH=X86_64
+PLATFORMID=android_x86_64
+;;
 *)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
diff --git a/distro-configs/LibreOfficeAndroidX86_64.conf 
b/distro-configs/LibreOfficeAndroidX86_64.conf
new file mode 100644
index ..efbbdbb1e945
--- /dev/null
+++ b/distro-configs/LibreOfficeAndroidX86_64.conf
@@ -0,0 +1,10 @@
+--host=x86_64-linux-android
+--disable-cairo-canvas
+--disable-cups
+--disable-gstreamer-1-0
+--disable-randr
+--without-export-validation
+--without-helppack-integration
+--without-junit
+--disable-largefile
+--with-theme=colibre
diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index e97756aca831..2e93d7000c3a 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -33,7 +33,7 @@ else # OS!=WNT
 # OTOH specify e.g. CC and NSINSTALL as arguments (after make command), so 
they will overrule nss makefile values
 $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecutable_get_dependencies,python)
$(call gb_ExternalProject_run,build,\
-   $(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter 
X86_64,$(CPUNAME)),USE_64=1)) \
+   $(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter 
X86_64,$(CPUNAME)),USE_64=1)) \

[Libreoffice-commits] core.git: compilerplugins/clang cui/source dbaccess/source include/svx include/vcl sfx2/source svx/source sw/inc sw/source vcl/source

 compilerplugins/clang/constantparam.bitmask.results  |   19 
 compilerplugins/clang/constantparam.booleans.results |  870 +++
 compilerplugins/clang/constantparam.constructors.results |  162 +-
 compilerplugins/clang/constantparam.numbers.results  |  636 +-
 cui/source/customize/SvxMenuConfigPage.cxx   |4 
 cui/source/customize/SvxToolbarConfigPage.cxx|2 
 cui/source/customize/cfg.cxx |   15 
 cui/source/dialogs/hangulhanjadlg.cxx|   49 
 cui/source/inc/cfg.hxx   |5 
 dbaccess/source/ui/control/opendoccontrols.cxx   |   10 
 dbaccess/source/ui/inc/opendoccontrols.hxx   |2 
 include/svx/DescriptionGenerator.hxx |   21 
 include/svx/colorbox.hxx |2 
 include/svx/txencbox.hxx |   14 
 include/vcl/bitmapex.hxx |3 
 include/vcl/texteng.hxx  |2 
 sfx2/source/sidebar/SidebarController.cxx|4 
 svx/source/accessibility/AccessibleControlShape.cxx  |4 
 svx/source/accessibility/DescriptionGenerator.cxx|   20 
 svx/source/dialog/_contdlg.cxx   |2 
 svx/source/dialog/txencbox.cxx   |5 
 svx/source/tbxctrls/tbcontrl.cxx |6 
 sw/inc/calbck.hxx|5 
 sw/source/core/crsr/crsrsh.cxx   |4 
 sw/source/core/doc/DocumentContentOperationsManager.cxx  |   10 
 sw/source/core/doc/docfmt.cxx|2 
 sw/source/core/fields/fldbas.cxx |2 
 sw/source/core/inc/DocumentContentOperationsManager.hxx  |3 
 sw/source/core/layout/pagedesc.cxx   |4 
 sw/source/core/txtnode/atrftn.cxx|2 
 sw/source/core/txtnode/atrref.cxx|4 
 sw/source/uibase/docvw/edtwin.cxx|6 
 sw/source/uibase/inc/edtwin.hxx  |3 
 vcl/source/edit/texteng.cxx  |7 
 vcl/source/gdi/bitmapex.cxx  |   87 -
 35 files changed, 927 insertions(+), 1069 deletions(-)

New commits:
commit 7fb43031b7eec663768f5a4e78e60da86379df41
Author: Noel Grandin 
AuthorDate: Mon Oct 21 13:38:33 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 22 14:14:48 2019 +0200

loplugin:constantparam

Change-Id: Ibfe70492683ff3ec208cee95d8a11155ec54f690
Reviewed-on: https://gerrit.libreoffice.org/81314
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/constantparam.bitmask.results 
b/compilerplugins/clang/constantparam.bitmask.results
index 2686f7b15969..f18bbf6b392a 100644
--- a/compilerplugins/clang/constantparam.bitmask.results
+++ b/compilerplugins/clang/constantparam.bitmask.results
@@ -13,20 +13,17 @@ include/basegfx/polygon/b2dpolygontools.hxx:144
 include/framework/framelistanalyzer.hxx:184
 void framework::FrameListAnalyzer::FrameListAnalyzer(const class 
com::sun::star::uno::Reference 
&,const class com::sun::star::uno::Reference &,enum FrameAnalyzerFlags)
 enum FrameAnalyzerFlags eDetectMode setBits=0x4
-include/sfx2/objsh.hxx:451
+include/sfx2/objsh.hxx:456
 void SfxObjectShell::FinishedLoading(enum SfxLoadedFlags)
 enum SfxLoadedFlags nWhich setBits=0x1
 include/svtools/brwbox.hxx:431
 void BrowseBox::InsertDataColumn(unsigned short,const class rtl::OUString 
&,long,enum HeaderBarItemBits,unsigned short)
 enum HeaderBarItemBits nBits setBits=0x400 clearBits=0x3ec
-include/svtools/wizardmachine.hxx:178
-void svt::OWizardMachine::OWizardMachine(class vcl::Window *,enum 
WizardButtonFlags)
+include/vcl/wizardmachine.hxx:140
+void vcl::WizardMachine::WizardMachine(class weld::Window *,enum 
WizardButtonFlags)
 enum WizardButtonFlags _nButtonFlags setBits=0xf
-include/vcl/gdimtf.hxx:194
-_Bool GDIMetaFile::CreateThumbnail(class BitmapEx &,enum 
BmpConversion,enum BmpScaleFlag) const
-enum BmpScaleFlag nScaleFlag setBits=0x1
 sc/inc/rangelst.hxx:48
-void ScRangeList::Format(class rtl::OUString &,enum ScRefFlags,class 
ScDocument *,enum formula::FormulaGrammar::AddressConvention,char16_t,_Bool) 
const
+void ScRangeList::Format(class rtl::OUString &,enum ScRefFlags,const class 
ScDocument *,enum formula::FormulaGrammar::AddressConvention,char16_t,_Bool) 
const
 enum ScRefFlags nFlags setBits=0x8000 clearBits=0x7f80
 sc/inc/rangeutl.hxx:162
 void ScRangeStringConverter::GetStringFromAddress(class rtl::OUString 
&,const class ScAddress &,const class ScDocument *,enum 
formula::FormulaGrammar::AddressConvention,char16_t,_Bool,enum ScRefFlags)
@@ -34,13 +31,13 @@ sc/inc/rangeutl.hxx:162
 sc/inc/xmlwrap.hxx:89
 _Bool

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

 desktop/source/lib/init.cxx |   74 +---
 1 file changed, 30 insertions(+), 44 deletions(-)

New commits:
commit 61ea11e51ceeaec7bf197a076cf40d96bd65ad07
Author: Henry Castro 
AuthorDate: Sun Oct 20 10:06:20 2019 -0400
Commit: Henry Castro 
CommitDate: Tue Oct 22 14:08:56 2019 +0200

lok: convert JSON to StringMap in sent DialogEvent function

The StringMap type is used to the class UIObject methods to get state
and execute actions. So the idea is the loleaflet client side send
a raw JSON string:

{
  ctrl: "id_control",
  cmd: "SELECT",
  ID: "item_id",
  ...   // more parameters
}

Then it is transformed with a simple JSON to StringMap, finally
it is dispatched to execute the actions.

Change-Id: Icd628598fe46ae28b4afa3ca17ac75797c1b9308
Reviewed-on: https://gerrit.libreoffice.org/81313
Tested-by: Jenkins
Reviewed-by: Henry Castro 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 6cb4303d4439..3884dbc98882 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -413,6 +413,25 @@ std::vector 
desktop::jsonToPropertyValuesVector(const char
 return aArguments;
 }
 
+
+static StringMap jsonToStringMap(const char* pJSON)
+{
+StringMap aArgs;
+if (pJSON && pJSON[0] != '\0')
+{
+std::stringstream aStream(pJSON);
+boost::property_tree::ptree aTree;
+boost::property_tree::read_json(aStream, aTree);
+
+for (const auto& rPair : aTree)
+{
+aArgs[OUString::fromUtf8(rPair.first.c_str())] = 
OUString::fromUtf8(rPair.second.get_value(".").c_str());
+}
+}
+return aArgs;
+}
+
+
 static boost::property_tree::ptree unoAnyToPropertyTree(const uno::Any& 
anyItem)
 {
 boost::property_tree::ptree aTree;
@@ -3272,34 +3291,14 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 {
 SolarMutexGuard aGuard;
 
-char* pCopy = strdup(pArguments);
-if (!pCopy)
-{
-SetLastExceptionMsg("String copying error.");
-return;
-}
-
-char* pIdChar = strtok(pCopy, " ");
-char* pOptionalEventType = strtok(nullptr, " ");
-char* pOptionalData = strtok(nullptr, " ");
-
-if (!pIdChar)
-{
-SetLastExceptionMsg("Error parsing the command.");
-free(pCopy);
-return;
-}
-
-OUString sId = OUString::createFromAscii(pIdChar);
-
+StringMap aMap(jsonToStringMap(pArguments));
 VclPtr pWindow = vcl::Window::FindLOKWindow(nWindowId);
 if (!pWindow)
 {
 SetLastExceptionMsg("Document doesn't support dialog rendering, or 
window not found.");
-free(pCopy);
 return;
 }
-else
+else if (aMap.find("id") != aMap.end())
 {
 const OUString sClickAction("CLICK");
 const OUString sSelectAction("SELECT");
@@ -3311,40 +3310,29 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 try
 {
 WindowUIObject aUIObject(pWindow);
-std::unique_ptr pUIWindow(aUIObject.get_child(sId));
+std::unique_ptr 
pUIWindow(aUIObject.get_child(aMap["id"]));
 if (pUIWindow) {
 bool bIsClickAction = false;
-StringMap aMap;
 
-if (pOptionalEventType) {
-if (strcmp(pOptionalEventType, "selected") == 0 && 
pOptionalData)
+if (aMap.find("cmd") != aMap.end()) {
+if (aMap["cmd"] == "selected")
 {
-char* pPos = strtok(pOptionalData, ";");
-char* pText = strtok(nullptr, ";");
-
-if (!pPos || !pText)
-{
-SetLastExceptionMsg("Error parsing the command.");
-free(pCopy);
-return;
-}
-
-aMap["POS"] = OUString::createFromAscii(pPos);
-aMap["TEXT"] = OUString::createFromAscii(pText);
+aMap["POS"] = aMap["data"];
+aMap["TEXT"] = aMap["data"];
 
 pUIWindow->execute(sSelectAction, aMap);
 }
-else if (strcmp(pOptionalEventType, "plus") == 0)
+else if (aMap["cmd"] == "plus")
 {
 pUIWindow->execute(sUpAction, aMap);
 }
-else if (strcmp(pOptionalEventType, "minus") == 0)
+else if (aMap["cmd"] == "minus")
 {
 pUIWindow->execute(sDownAction, aMap);
 }
-else if (pOptionalData)
+else if (aMap["cmd"] == "set")
 {
-aMap["TEXT"] = 
OUString:

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

2019-10-22 Thread Julien Nabet (via logerrit)

 external/nss/ExternalProject_nss.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 93c82f48fc0d572f3dd818cb448283cdfb20fe5a
Author: Julien Nabet 
AuthorDate: Tue Jan 29 18:32:54 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Oct 22 14:09:19 2019 +0200

Disable NSS GTESTS also for Windows

Following 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=02623af4f5e0049ec5988df8ff6c7ff0f32f3fb1
See details here:

http://document-foundation-mail-archive.969070.n3.nabble.com/fatal-error-LNK1561-on-nss-Visual-Studio-2017-td4256601.html

Change-Id: I75f2c8a5409e484a8a5a12a6f12d5c20b244d2b2
Reviewed-on: https://gerrit.libreoffice.org/67092
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
Reviewed-on: https://gerrit.libreoffice.org/81222
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index ef807d503e58..211fa1d64437 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -25,6 +25,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecuta
XCFLAGS="-arch:SSE $(SOLARINC)" \
$(MAKE) -j1 nss_build_all RC="rc.exe $(SOLARINC)" \
NSINSTALL='$(call 
gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \
+   NSS_DISABLE_GTESTS=1 \
,nss)
 
 else # OS!=WNT
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-22 Thread Miklos Vajna (via logerrit)

 external/nss/ExternalProject_nss.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c252189e3a17e128de99b7721c12e2ecf28271fe
Author: Miklos Vajna 
AuthorDate: Thu Jan 3 21:31:14 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Tue Oct 22 14:08:32 2019 +0200

nss: disable gtests

We don't run them and building them takes a while, especially with -j1.

Old time: 2m35,809s

New time: 1m12,858s

(With ccache disabled.) I.e. 47% of baseline.

Change-Id: I3e2d75b27be3c5995b5e6db9812c9f82d33f42fd
Reviewed-on: https://gerrit.libreoffice.org/65843
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
Reviewed-on: https://gerrit.libreoffice.org/81221
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index a270e1f7de87..ef807d503e58 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -52,6 +52,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecuta
CC="$(CC)$(if $(filter ANDROID,$(OS)), 
-D_PR_NO_LARGE_FILES=1 -DSQLITE_DISABLE_LFS=1)" CCC="$(CXX)" \
$(if $(CROSS_COMPILING),NSINSTALL="$(call 
gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") 
\
$(if $(filter ANDROID,$(OS)),OS_TARGET=Android 
OS_TARGET_RELEASE=14 ARCHFLAG="" DEFAULT_COMPILER=clang 
ANDROID_NDK=$(ANDROID_NDK_HOME) 
ANDROID_TOOLCHAIN_VERSION=$(ANDROID_GCC_TOOLCHAIN_VERSION) 
ANDROID_PREFIX=$(HOST_PLATFORM) ANDROID_SYSROOT=$(SYSBASE) 
ANDROID_TOOLCHAIN=$(ANDROID_BINUTILS_PREBUILT_ROOT)) \
+   NSS_DISABLE_GTESTS=1 \
nss_build_all \
&& rm -f $(call 
gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.a \
$(if $(filter MACOSX,$(OS)),\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-22 Thread Pedro (via logerrit)

 loleaflet/css/spreadsheet-mobile.css |   17 +
 loleaflet/css/toolbar-mobile.css |   12 
 2 files changed, 29 insertions(+)

New commits:
commit 23e71b56aca7de3d58486dd8d8ad6442a94e37b6
Author: Pedro 
AuthorDate: Mon Oct 21 17:31:45 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 22 14:04:24 2019 +0200

Fix how formula input looks on Firefox and Firefox mobile

Change-Id: Idb362dde1872f2ed934f67d349eb1693c6c9c074
Reviewed-on: https://gerrit.libreoffice.org/81257
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 

diff --git a/loleaflet/css/spreadsheet-mobile.css 
b/loleaflet/css/spreadsheet-mobile.css
index e69de29bb..e85520ed5 100644
--- a/loleaflet/css/spreadsheet-mobile.css
+++ b/loleaflet/css/spreadsheet-mobile.css
@@ -0,0 +1,17 @@
+@media (max-width: 767px), (max-device-height: 767px) {
+
+   @-moz-document url-prefix() {
+   #spreadsheet-row-column-frame.readonly {
+   top: 39px !important;
+   }
+   #document-container.spreadsheet-document.readonly {
+   top: 59px !important;
+   }
+   #spreadsheet-row-column-frame {
+   top: 75px !important
+   }
+   #document-container.spreadsheet-document {
+   top: 95px !important;
+   }
+   }
+}
diff --git a/loleaflet/css/toolbar-mobile.css b/loleaflet/css/toolbar-mobile.css
index e69de29bb..59c308ec7 100644
--- a/loleaflet/css/toolbar-mobile.css
+++ b/loleaflet/css/toolbar-mobile.css
@@ -0,0 +1,12 @@
+@-moz-document url-prefix() {
+   #formulabar #formulaInput, #formulabar #addressInput{
+   border-radius: 0px;
+   border:1px solid #bb !important;
+   }
+   #toolbar-wrapper{
+   border-top: none;
+   }
+   #toolbar-up{
+   top:-1px;
+   }
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-22 Thread Pedro (via logerrit)

 loleaflet/css/mobilewizard.css |2 +-
 loleaflet/images/lc_downloadas-odp.svg |   20 
 loleaflet/images/lc_downloadas-ods.svg |   25 +
 loleaflet/images/lc_downloadas-odt.svg |   17 +
 loleaflet/images/lc_downloadas-pdf.svg |8 +++-
 loleaflet/images/lc_downloadas-rtf.svg |1 +
 loleaflet/images/lc_insertrowbreak.svg |1 +
 loleaflet/images/lc_showresolved.svg   |9 +
 8 files changed, 81 insertions(+), 2 deletions(-)

New commits:
commit 837e72e7ab77c7e33099a0a899758ba212532e1f
Author: Pedro 
AuthorDate: Tue Oct 22 11:36:13 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 22 14:01:49 2019 +0200

Hamburger menu: Add missing icons and optimize svg

Change-Id: I17aad9d0ceb6d37eb2b7f21f701a74257609
Reviewed-on: https://gerrit.libreoffice.org/81317
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 

diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 0cbcb1570..5081c4476 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -35,7 +35,7 @@ span#main-menu-btn-icon {
 #leadingzeroes .spinfieldimage, #decimalplaces .spinfieldimage{
display: none;
 }
-.ui-header.level-1.mobile-wizard.ui-widget img[src^="images/lc_downloadas"], 
.ui-header.level-2.mobile-wizard.ui-widget img[src="images/lc_showdetail.svg"], 
.ui-header.level-2.mobile-wizard.ui-widget img[src="images/lc_hidedetail.svg"], 
.ui-header.level-2.mobile-wizard.ui-widget 
img[src="images/lc_clearoutline.svg"], 
.ui-header.level-2.mobile-wizard.ui-widget 
img[src="images/lc_deleterowbreak.svg"], 
.ui-header.level-2.mobile-wizard.ui-widget 
img[src="images/lc_deletecolumnbreak.svg"], 
.ui-header.level-2.mobile-wizard.ui-widget 
img[src="images/lc_insertrowbreak.svg"]{
+.ui-header.level-1.mobile-wizard.ui-widget 
img[src^="images/lc_downloadas-doc"], 
.ui-header.level-1.mobile-wizard.ui-widget 
img[src^="images/lc_downloadas-pp"],.ui-header.level-1.mobile-wizard.ui-widget 
img[src^="images/lc_downloadas-xls"], 
.ui-header.level-2.mobile-wizard.ui-widget img[src="images/lc_showdetail.svg"], 
.ui-header.level-2.mobile-wizard.ui-widget img[src="images/lc_hidedetail.svg"], 
.ui-header.level-2.mobile-wizard.ui-widget 
img[src="images/lc_clearoutline.svg"], 
.ui-header.level-2.mobile-wizard.ui-widget 
img[src="images/lc_deleterowbreak.svg"], 
.ui-header.level-2.mobile-wizard.ui-widget 
img[src="images/lc_deletecolumnbreak.svg"]{
visibility: hidden;
 }
 .ui-header.level-1.mobile-wizard.ui-widget 
img[src="images/lc_downloadas-pdf.svg"]{
diff --git a/loleaflet/images/lc_downloadas-odp.svg 
b/loleaflet/images/lc_downloadas-odp.svg
new file mode 100644
index 0..c2aafd07e
--- /dev/null
+++ b/loleaflet/images/lc_downloadas-odp.svg
@@ -0,0 +1,20 @@
+
+http://www.w3.org/2000/svg";>
+ 
+  
+   
+   
+   
+   
+   
+   
+  
+  
+   
+   
+   
+   
+   
+  
+ 
+
diff --git a/loleaflet/images/lc_downloadas-ods.svg 
b/loleaflet/images/lc_downloadas-ods.svg
new file mode 100644
index 0..e81b32892
--- /dev/null
+++ b/loleaflet/images/lc_downloadas-ods.svg
@@ -0,0 +1,25 @@
+
+http://www.w3.org/2000/svg";>
+ 
+  
+  
+  
+   
+   
+   
+  
+ 
+ 
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+
diff --git a/loleaflet/images/lc_downloadas-odt.svg 
b/loleaflet/images/lc_downloadas-odt.svg
new file mode 100644
index 0..08116f3a9
--- /dev/null
+++ b/loleaflet/images/lc_downloadas-odt.svg
@@ -0,0 +1,17 @@
+
+http://www.w3.org/2000/svg";>
+ 
+  
+  
+  
+  
+ 
+ 
+  
+  
+  
+  
+ 
+ 
+ 
+
diff --git a/loleaflet/images/lc_downloadas-pdf.svg 
b/loleaflet/images/lc_downloadas-pdf.svg
index 9c0b9ebc3..10637c714 100644
--- a/loleaflet/images/lc_downloadas-pdf.svg
+++ b/loleaflet/images/lc_downloadas-pdf.svg
@@ -1 +1,7 @@
-http://www.w3.org/2000/svg";>
+
+http://www.w3.org/2000/svg";>
+ 
+ 
+ 
+ 
+
diff --git a/loleaflet/images/lc_downloadas-rtf.svg 
b/loleaflet/images/lc_downloadas-rtf.svg
new file mode 100644
index 0..ec6205902
--- /dev/null
+++ b/loleaflet/images/lc_downloadas-rtf.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertrowbreak.svg 
b/loleaflet/images/lc_insertrowbreak.svg
new file mode 100644
index 0..65af4963c
--- /dev/null
+++ b/loleaflet/images/lc_insertrowbreak.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/loleaflet/images/lc_showresolved.svg 
b/loleaflet/images/lc_showresolved.svg
new file mode 100644
index 0..f766ff057
--- /dev/null
+++ b/loleaflet/images/lc_showresolved.svg
@@ -0,0 +1,9 @@
+http://www.w3.org/2000/svg";>
+  
+  
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Unit Test: CppunitTest_sc_opencl_test failing on Windows

2019-10-22 Thread Caolán McNamara

On Tue, 2019-10-22 at 17:16 +0530, Dennis Francis wrote:
> The following commit should fix the failures.
> 
> https://cgit.freedesktop.org/libreoffice/core/commit/?id=de817cb48cf550c5cdfb0e83cf914f37454c3622

Excellent, thanks. New run underway.

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

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

2019-10-22 Thread Marco Cecchetti (via logerrit)

 loleaflet/src/control/ColorPicker.js |8 
 loleaflet/src/control/Control.JSDialogBuilder.js |8 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 02fe006eade4d20f2a296b16687a7d3839dfaf3c
Author: Marco Cecchetti 
AuthorDate: Tue Oct 22 13:47:55 2019 +0200
Commit: Marco Cecchetti 
CommitDate: Tue Oct 22 13:50:57 2019 +0200

loleaflet: color picker: on open show the tint set with selected tint

Change-Id: Ia69b40aac7287a9472050733e032abc600175bd5

diff --git a/loleaflet/src/control/ColorPicker.js 
b/loleaflet/src/control/ColorPicker.js
index 4a820df70..2826e93ba 100644
--- a/loleaflet/src/control/ColorPicker.js
+++ b/loleaflet/src/control/ColorPicker.js
@@ -48,6 +48,7 @@ L.ColorPicker = L.Class.extend({
this._selectedColor = this.options.selectedColor;
this._initIndexes();
this._container = this._createControl();
+   this._initialized = true;
},
 
getId: function () {
@@ -62,6 +63,13 @@ L.ColorPicker = L.Class.extend({
return this._container;
},
 
+   onShow: function () {
+   if (!this._initialized || this._selectedColor === '#')
+   return;
+   this._initIndexes();
+   this._updateTintsView();
+   },
+
_initIndexes: function () {
for (var i = 0; i < this._getBasicColorCount(); ++i) {
var tintSet = this._getTintSet(i);
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 997bc51a6..210d528db 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -210,7 +210,11 @@ L.Control.JSDialogBuilder = L.Control.extend({
 
$(contentDiv).hide();
if (builder.wizard) {
-   $(sectionTitle).click(function() { 
builder.wizard.goLevelDown(contentDiv); });
+   $(sectionTitle).click(function() {
+   builder.wizard.goLevelDown(contentDiv);
+   if (contentNode.onshow)
+   contentNode.onshow();
+   });
} else {
console.debug('Builder used outside of mobile wizard: 
please implement the click handler');
}
@@ -691,7 +695,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
// color control panel
var colorsContainer = colorPickerControl.getContainer();
 
-   var contentNode = {type: 'container', children: 
[colorsContainer]};
+   var contentNode = {type: 'container', children: 
[colorsContainer], onshow: L.bind(colorPickerControl.onShow, 
colorPickerControl)};
 
builder._explorableEntry(parentContainer, title, contentNode, 
builder, valueNode, iconPath);
return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Unit Test: CppunitTest_sc_opencl_test failing on Windows

2019-10-22 Thread Dennis Francis

The following commit should fix the failures.

https://cgit.freedesktop.org/libreoffice/core/commit/?id=de817cb48cf550c5cdfb0e83cf914f37454c3622

Thanks,
Dennis


On Sun, Oct 20, 2019 at 10:22 PM Dennis Francis 
wrote:

> Hi Luke,
>
> On Sun, Oct 20, 2019 at 10:09 PM Luke Benes  wrote:
>
>> After
>> https://cgit.freedesktop.org/libreoffice/core/commit/?id=4ee424b3ddc6
>> Pre-allocate an ScInterpreter object for each thread...
>>
>> Both 32 and 64-bit windows builds are failing with the following error:
>> D:/lode/dev/core/sc/qa/unit/opencl-test.cxx(573) : error : Assertion
>> Test name: ScOpenCLTest::testCompilerNested
>> double equality assertion failed
>> - Expected: 629
>> - Actual  : 609
>> - Delta   : 0.0629
>>
>> You can limit the execution to just one particular test by:
>>
>> make CppunitTest_sc_opencl_test CPPUNIT_TEST_NAME="testXYZ"
>>
>>
>> Dennis, Could you take a look at this?
>>
>
> Sure, I will look into this tomorrow. Thanks a lot for testing.
>
> Thanks,
> Dennis
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2019-10-22 Thread Tünde Tóth (via logerrit)

 sw/qa/extras/ooxmlexport/data/tdf127741.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx|   10 +++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   28 +++---
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |3 --
 4 files changed, 24 insertions(+), 17 deletions(-)

New commits:
commit ccb38977541c304ff08ebe1a1b24c512ab670acf
Author: Tünde Tóth 
AuthorDate: Tue Oct 8 13:58:44 2019 +0200
Commit: Xisco Faulí 
CommitDate: Tue Oct 22 13:44:16 2019 +0200

tdf#127741 DOCX import: format hyperlink with Default character style

according to correct hyperlink handling, avoiding various editing
and layout problems; "sticky" and not easily removable character style
around the hyperlink and multiple blue hyperlink colors.

Set also Visited/Unvisited link character styles when the style of
the hyperlink is not the requested "Internet Link".

Change-Id: I3d7ba8dd225c693cc9f521b37767cf1e1e09d7c0
Reviewed-on: https://gerrit.libreoffice.org/80449
Reviewed-by: László Németh 
Tested-by: László Németh 
Reviewed-on: https://gerrit.libreoffice.org/80907
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf127741.docx 
b/sw/qa/extras/ooxmlexport/data/tdf127741.docx
new file mode 100644
index ..1bedb9ade516
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf127741.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 9a5c10f01748..8539548fc22c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -458,6 +458,16 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf121663, 
"tdf121663.docx")
 assertXPath(pXmlDoc, "//w:lnNumType", "distance", "283");
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf127741, "tdf127741.docx")
+{
+uno::Reference xPara = getParagraph(1);
+uno::Reference xRun(getRun(xPara,1), uno::UNO_QUERY);
+OUString unVisitedStyleName = getProperty(xRun, 
"UnvisitedCharStyleName");
+CPPUNIT_ASSERT(unVisitedStyleName.equalsIgnoreAsciiCase("Internet Link"));
+OUString visitedStyleName = getProperty(xRun, 
"VisitedCharStyleName");
+CPPUNIT_ASSERT(visitedStyleName.equalsIgnoreAsciiCase("Visited Internet 
Link"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index d9e93f8a848b..a32991c6a4cc 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1678,15 +1678,6 @@ void DomainMapper_Impl::appendTextPortion( const 
OUString& rString, const Proper
 }
 else
 {
-if (IsOpenField() && GetTopFieldContext()->GetFieldId() == 
FIELD_HYPERLINK)
-{
-// It is content of hyperlink field. We need to create 
and remember
-// character style for later applying to hyperlink
-PropertyValueVector_t aProps = 
comphelper::sequenceToContainer< PropertyValueVector_t 
>(GetTopContext()->GetPropertyValues());
-OUString sHyperlinkStyleName = 
GetStyleSheetTable()->getOrCreateCharStyle(aProps, /*bAlwaysCreate=*/false);
-
GetTopFieldContext()->SetHyperlinkStyle(sHyperlinkStyleName);
-}
-
 xTextRange = xTextAppend->appendTextPortion(rString, 
aValues);
 }
 }
@@ -5241,11 +5232,20 @@ void DomainMapper_Impl::PopFieldContext()
 }
 else
 {
-if (!pContext->GetHyperlinkStyle().isEmpty())
-{
-
xCrsrProperties->setPropertyValue("VisitedCharStyleName", 
uno::makeAny(pContext->GetHyperlinkStyle()));
-
xCrsrProperties->setPropertyValue("UnvisitedCharStyleName", 
uno::makeAny(pContext->GetHyperlinkStyle()));
-}
+uno::Any aAny = 
xCrsrProperties->getPropertyValue("CharStyleName");
+OUString charStyle;
+if (css::uno::fromAny(aAny, &charStyle))
+{
+if(!charStyle.isEmpty() && 
charStyle.equalsIgnoreAsciiCase("Internet Link"))
+{
+
xCrsrProperties->setPropertyValue("CharStyleName", 
uno::makeAny(OUString("Default Style")));
+}
+else
+{
+

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

 sfx2/source/dialog/securitypage.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 47a3a8042d79a8b287b9efec532f5d14049553d0
Author: Gabor Kelemen 
AuthorDate: Mon Oct 21 22:34:40 2019 +0200
Commit: Caolán McNamara 
CommitDate: Tue Oct 22 13:10:44 2019 +0200

tdf#128230 Require password if the Unprotect button is visible

Regression from commit a2279bb2f52ee5bbe8d38433aac55aa1a16661fb

Before that requiring password depended on the current text of
the Protect/Unprotect button, which was changed dynamically.

This commit changed that logic and introduced two buttons in the
new .ui file that are hidden/shown dynamically.

The password condition however was changed to check the visibility
of the new Protect button instead of the Unprotect button.

Change-Id: Ie24e1b2d45fa92a375a29b7bc71689f9b83ae9dc
Reviewed-on: https://gerrit.libreoffice.org/81310
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/sfx2/source/dialog/securitypage.cxx 
b/sfx2/source/dialog/securitypage.cxx
index fcafc1638afc..8dcc830e8cee 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -331,7 +331,7 @@ IMPL_LINK_NOARG(SfxSecurityPage_Impl, 
RecordChangesCBToggleHdl, weld::ToggleButt
 }
 
 const bool bNeedPasssword = !m_bOrigPasswordIsConfirmed
-&& m_xProtectPB->get_visible();
+&& m_xUnProtectPB->get_visible(); // tdf#128230 Require password 
if the Unprotect button is visible
 if (!bAlreadyDone && bNeedPasssword)
 {
 OUString aPasswordText;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/skia' - vcl/inc vcl/skia

2019-10-22 Thread Luboš Luňák (via logerrit)

Rebased ref, commits from common ancestor:
commit 189959c0b09daa26298b70b3d4d22aced1d7b247
Author: Luboš Luňák 
AuthorDate: Tue Oct 22 12:01:31 2019 +0200
Commit: Luboš Luňák 
CommitDate: Tue Oct 22 12:45:41 2019 +0200

remove some obsolete Skia TODO's

Change-Id: I11ec226a627e98552bd35753aa5a8fbcfca66186

diff --git a/vcl/inc/skia/win/gdiimpl.hxx b/vcl/inc/skia/win/gdiimpl.hxx
index 05cacb69d230..bc177337b3de 100644
--- a/vcl/inc/skia/win/gdiimpl.hxx
+++ b/vcl/inc/skia/win/gdiimpl.hxx
@@ -53,7 +53,6 @@ public:
 
 virtual void Init() override;
 virtual void DeInit() override;
-virtual void copyBits(const SalTwoRect& rPosAry, SalGraphics* 
pSrcGraphics) override;
 
 virtual void freeResources() override;
 
diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index 8d5a61d32e83..dfe12f57db91 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -216,7 +216,6 @@ BitmapBuffer* SkiaSalBitmap::AcquireBuffer(BitmapAccessMode 
nMode)
 break;
 }
 case 32:
-// TODO are these correct?
 buffer->mnFormat = mBitmap.colorType() == kRGBA__SkColorType
? ScanlineFormat::N32BitTcRgba
: ScanlineFormat::N32BitTcBgra;
diff --git a/vcl/skia/win/gdiimpl.cxx b/vcl/skia/win/gdiimpl.cxx
index 92af2fcad42f..9a41ffc7da27 100644
--- a/vcl/skia/win/gdiimpl.cxx
+++ b/vcl/skia/win/gdiimpl.cxx
@@ -19,13 +19,6 @@ 
WinSkiaSalGraphicsImpl::WinSkiaSalGraphicsImpl(WinSalGraphics& rGraphics,
 {
 }
 
-void WinSkiaSalGraphicsImpl::copyBits(const SalTwoRect& rPosAry, SalGraphics* 
pSrcGraphics)
-{
-(void)rPosAry;
-(void)pSrcGraphics;
-// TODO
-}
-
 void WinSkiaSalGraphicsImpl::Init()
 {
 #if 0 // TODO
diff --git a/vcl/skia/x11/gdiimpl.cxx b/vcl/skia/x11/gdiimpl.cxx
index 36dc8d5ecf13..d1eee613501f 100644
--- a/vcl/skia/x11/gdiimpl.cxx
+++ b/vcl/skia/x11/gdiimpl.cxx
@@ -18,10 +18,6 @@
 
 #include 
 
-// TODO
-#define SK_ASSUME_GL 1
-#define SK_ASSUME_GL_ES 0
-
 #include 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-22 Thread Dennis Francis (via logerrit)

 sc/source/core/data/formulacell.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit f1379133177b2c157019913d2fcdb075859adeb6
Author: Dennis Francis 
AuthorDate: Tue Oct 22 13:15:02 2019 +0530
Commit: Dennis Francis 
CommitDate: Tue Oct 22 12:16:16 2019 +0200

Ensure all formula-groups in the collection are threadable.

When doing a multi-formula-group threading, add the missing check
that all of the groups are themselves threadable.

This was caught by crashtest document of tdf#77970.

Change-Id: I42b83ef99ba30909df2b6d8c09d933916784844b
Reviewed-on: https://gerrit.libreoffice.org/81307
Tested-by: Jenkins
Reviewed-by: Dennis Francis 

diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 9eb36602d319..fafccf9dc769 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -4713,6 +4713,9 @@ static SCCOL lcl_probeLeftOrRightFGs(const 
ScFormulaCellGroupRef& xGroup, const
 if (!xNGroup)
 break;
 
+if (!pCell->GetCode()->IsEnabledForThreading())
+break;
+
 if (xNGroup->mpTopCell->aPos.Row() != aAddr.Row())
 break;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-22 Thread Dennis Francis (via logerrit)

 sc/qa/unit/parallelism.cxx |   39 +++
 1 file changed, 39 insertions(+)

New commits:
commit 3e9ee3803535cde4c6f5de4fb7edf36e5ed6fac4
Author: Dennis Francis 
AuthorDate: Tue Oct 22 11:04:15 2019 +0530
Commit: Dennis Francis 
CommitDate: Tue Oct 22 12:12:51 2019 +0200

Add a unit test for SUMPRODUCT with group-threading

This test protects the fix in commit :

2d2ea50e0de1df635d176d8032d2f9f8744e3abe
Cleanup the array-formula related members in ScInterpreter...

Change-Id: Ib98c49513e3edabdd2d2ebd1bfaf9718abb4e517
Reviewed-on: https://gerrit.libreoffice.org/81301
Tested-by: Jenkins
Reviewed-by: Dennis Francis 

diff --git a/sc/qa/unit/parallelism.cxx b/sc/qa/unit/parallelism.cxx
index 9758836d8b9a..aebd1575b5c3 100644
--- a/sc/qa/unit/parallelism.cxx
+++ b/sc/qa/unit/parallelism.cxx
@@ -40,6 +40,7 @@ public:
 void testMultipleFGColumn();
 void testFormulaGroupSpanEval();
 void testFormulaGroupSpanEvalNonGroup();
+void testArrayFormulaGroup();
 
 CPPUNIT_TEST_SUITE(ScParallelismTest);
 CPPUNIT_TEST(testSUMIFS);
@@ -53,6 +54,7 @@ public:
 CPPUNIT_TEST(testMultipleFGColumn);
 CPPUNIT_TEST(testFormulaGroupSpanEval);
 CPPUNIT_TEST(testFormulaGroupSpanEvalNonGroup);
+CPPUNIT_TEST(testArrayFormulaGroup);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -659,6 +661,43 @@ void ScParallelismTest::testFormulaGroupSpanEvalNonGroup()
 m_pDoc->DeleteTab(0);
 }
 
+void ScParallelismTest::testArrayFormulaGroup()
+{
+sc::AutoCalcSwitch aACSwitch(*m_pDoc, false);
+m_pDoc->InsertTab(0, "1");
+
+m_pDoc->SetValue(1, 0, 0, 2.0);  // B1 <== 2
+m_pDoc->SetValue(2, 0, 0, 1.0);  // C1 <== 1
+OUString aFormula;
+
+for (size_t nRow = 1; nRow < 16; ++nRow)
+{
+m_pDoc->SetValue(0, nRow, 0, 1.0);  // A2:A16 <== 1
+
+if (nRow > 10)
+continue;
+
+aFormula = "=SUMPRODUCT(($A" + OUString::number(1 + nRow) +
+":$A" + OUString::number(499 + nRow) + ")*B$1+C$1)";
+// Formula-group in B2:B11 with first cell = 
"=SUMPRODUCT(($A2:$A500)*B$1+C$1)"
+m_pDoc->SetFormula(ScAddress(1, nRow, 0), aFormula,
+   formula::FormulaGrammar::GRAM_NATIVE_UI);
+}
+
+m_xDocShell->DoHardRecalc();
+
+size_t nExpected = 529;
+OString aMsg;
+for (size_t nRow = 1; nRow < 11; ++nRow)
+{
+aMsg = "Value at Cell B" + OString::number(nRow+1);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(aMsg.getStr(), nExpected, 
static_cast(m_pDoc->GetValue(1, nRow, 0)));
+nExpected -= 2;
+}
+
+m_pDoc->DeleteTab(0);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScParallelismTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 external/icu/UnpackedTarball_icu.mk |1 
 external/icu/c++20-comparison.patch |  171 
 2 files changed, 172 insertions(+)

New commits:
commit cde9b22a9225801d58ed0ab56fbd065f4e51eb92
Author: Stephan Bergmann 
AuthorDate: Tue Oct 22 09:19:17 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 22 12:13:34 2019 +0200

exernal/icu: Various C++20 comparison operator fixes

There are three patterns here:

* Missing const (source/common/uvector.cpp, source/common/uvector.h):  
Overload
  resolution ambiguities when a synthesized canditate of operator == for a
  reversed-argument rewrite conflicts with the actual operator ==, due to 
the
  asymmetric const-ness of the implicit object parameter and the RHS 
parameter:

> uniset.cpp:360:18: error: use of overloaded operator '!=' is ambiguous 
(with operand types 'icu_63::UVector' and 'icu_63::UVector')
> if (*strings != *o.strings) return FALSE;
>  ^  ~~
> ./uvector.h:385:23: note: candidate function
> inline UBool UVector::operator!=(const UVector& other) {
>   ^
> ./uvector.h:116:11: note: candidate function
> UBool operator==(const UVector& other);
>   ^
> ./uvector.h:116:11: note: candidate function (with reversed parameter 
order)

* UBool -> bool (source/i18n/tzrule.cpp, source/i18n/unicode/tzrule.h):
  [over.match.oper]/9 (of the current C++20 draft) states:  "If a rewritten
  operator== candidate is selected [...], its return type shall be cv bool":

> basictz.cpp:411:37: error: return type 'UBool' (aka 'signed char') of 
selected 'operator==' function for rewritten '==' comparison is not 'bool'
> if (*(tzt0.getTo()) == *tar) {
> ~~~ ^  
> ./unicode/tzrule.h:675:19: note: declared here
> virtual UBool operator==(const TimeZoneRule& that) const;
>   ^

* Additional operator != (source/i18n/unicode/rbtz.h,
  source/i18n/unicode/simpletz.h, source/i18n/unicode/smpdtfmt.h,
  source/i18n/unicode/stsearch.h, source/i18n/unicode/tzrule.h,
  source/i18n/unicode/vtzone.h):  Similar to the previous pattern, but here 
the
  original operator used was !=, so an alternative fix (that reqires fewer
  changes to the code overall) is to add specific operator != overloads:

> rbtz.cpp:79:15: error: use of overloaded operator '!=' is ambiguous (with 
operand types 'icu_63::RuleBasedTimeZone' and 'const icu_63::RuleBasedTimeZone')
> if (*this != right) {
> ~ ^  ~
> ./unicode/rbtz.h:87:19: note: candidate function
> virtual UBool operator!=(const TimeZone& that) const;
>   ^
> ./unicode/rbtz.h:77:19: note: candidate function
> virtual UBool operator==(const TimeZone& that) const;
>   ^
> ./unicode/rbtz.h:77:19: note: candidate function (with reversed parameter 
order)
> rbtz.cpp:101:23: error: use of overloaded operator '!=' is ambiguous 
(with operand types 'icu_63::InitialTimeZoneRule' and 
'icu_63::InitialTimeZoneRule')
> if (*fInitialRule != *(rbtz->fInitialRule)) {
> ~ ^  ~
> ./unicode/tzrule.h:257:19: note: candidate function
> virtual UBool operator!=(const TimeZoneRule& that) const;
>   ^
> ./unicode/tzrule.h:248:18: note: candidate function
> virtual bool operator==(const TimeZoneRule& that) const;
>  ^
> ./unicode/tzrule.h:248:18: note: candidate function (with reversed 
parameter order)
> rbtz.cpp:535:23: error: use of overloaded operator '!=' is ambiguous 
(with operand types 'icu_63::InitialTimeZoneRule' and 
'icu_63::InitialTimeZoneRule')
> if (*fInitialRule != *(that.fInitialRule)) {
> ~ ^  
> ./unicode/tzrule.h:257:19: note: candidate function
> virtual UBool operator!=(const TimeZoneRule& that) const;
>   ^
> ./unicode/tzrule.h:248:18: note: candidate function
> virtual bool operator==(const TimeZoneRule& that) const;
>  ^
> ./unicode/tzrule.h:248:18: note: candidate function (with reversed 
parameter order)
>
> olsontz.cpp:630:69: error: return type 'UBool' (aka 'signed char') of 
selected 'operator==' function for rewritten '!=' comparison is not 'bool'
> || (finalZone != NULL && z->finalZone != NULL && *finalZone != 
*z->finalZone)) {
>  ~~ ^  
~
> ./unicode/simpletz.h:112:19: note: declared here
> virtual UBool operator==(const TimeZone& that) const;
>   ^

> dtitvfmt.cpp:223:62: error: return type 'UBool' (aka 'signed char') of 
selected 'operato

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

2019-10-22 Thread Dennis Francis (via logerrit)

 sc/source/core/tool/interpr4.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit de817cb48cf550c5cdfb0e83cf914f37454c3622
Author: Dennis Francis 
AuthorDate: Tue Oct 22 11:01:21 2019 +0530
Commit: Dennis Francis 
CommitDate: Tue Oct 22 12:11:02 2019 +0200

Cleanup the array-formula related members in ScInterpreter...

too in Init(). This is a follow-up of the commit :

7fbe8e8213e4b435aeb9b2035c1dcc633b873659
Pre-allocate an ScInterpreter object for each thread...

Change-Id: I3f7617f63938499c18c0ddfdfad3622cf03815fb
Reviewed-on: https://gerrit.libreoffice.org/81300
Tested-by: Jenkins
Reviewed-by: Dennis Francis 

diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index fc419d4a5935..0cbf9b10e154 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3835,6 +3835,8 @@ void ScInterpreter::Init( ScFormulaCell* pCell, const 
ScAddress& rPos, ScTokenAr
 aPos = rPos;
 pArr = &rTokArray;
 xResult = nullptr;
+pJumpMatrix = nullptr;
+pTokenMatrixMap.reset();
 pMyFormulaCell = pCell;
 pCur = nullptr;
 nGlobalError = FormulaError::NONE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/skia' - vcl/skia

2019-10-22 Thread Luboš Luňák (via logerrit)

 vcl/skia/salbmp.cxx  |1 -
 vcl/skia/win/gdiimpl.cxx |7 ---
 vcl/skia/x11/gdiimpl.cxx |4 
 3 files changed, 12 deletions(-)

New commits:
commit 9307c54baa58cc7aa92bbdce9533bdf8e4009b27
Author: Luboš Luňák 
AuthorDate: Tue Oct 22 12:01:31 2019 +0200
Commit: Luboš Luňák 
CommitDate: Tue Oct 22 12:03:17 2019 +0200

remove some obsolete Skia TODO's

Change-Id: I11ec226a627e98552bd35753aa5a8fbcfca66186

diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index 8d5a61d32e83..dfe12f57db91 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -216,7 +216,6 @@ BitmapBuffer* SkiaSalBitmap::AcquireBuffer(BitmapAccessMode 
nMode)
 break;
 }
 case 32:
-// TODO are these correct?
 buffer->mnFormat = mBitmap.colorType() == kRGBA__SkColorType
? ScanlineFormat::N32BitTcRgba
: ScanlineFormat::N32BitTcBgra;
diff --git a/vcl/skia/win/gdiimpl.cxx b/vcl/skia/win/gdiimpl.cxx
index 92af2fcad42f..9a41ffc7da27 100644
--- a/vcl/skia/win/gdiimpl.cxx
+++ b/vcl/skia/win/gdiimpl.cxx
@@ -19,13 +19,6 @@ 
WinSkiaSalGraphicsImpl::WinSkiaSalGraphicsImpl(WinSalGraphics& rGraphics,
 {
 }
 
-void WinSkiaSalGraphicsImpl::copyBits(const SalTwoRect& rPosAry, SalGraphics* 
pSrcGraphics)
-{
-(void)rPosAry;
-(void)pSrcGraphics;
-// TODO
-}
-
 void WinSkiaSalGraphicsImpl::Init()
 {
 #if 0 // TODO
diff --git a/vcl/skia/x11/gdiimpl.cxx b/vcl/skia/x11/gdiimpl.cxx
index 36dc8d5ecf13..d1eee613501f 100644
--- a/vcl/skia/x11/gdiimpl.cxx
+++ b/vcl/skia/x11/gdiimpl.cxx
@@ -18,10 +18,6 @@
 
 #include 
 
-// TODO
-#define SK_ASSUME_GL 1
-#define SK_ASSUME_GL_ES 0
-
 #include 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-22 Thread Michael Meeks (via logerrit)

 libreofficekit/qa/tilebench/tilebench.cxx |   69 --
 1 file changed, 48 insertions(+), 21 deletions(-)

New commits:
commit 397729426498a82f55794d23e08dbd7391a085ab
Author: Michael Meeks 
AuthorDate: Mon Oct 21 18:10:22 2019 +0100
Commit: Michael Meeks 
CommitDate: Tue Oct 22 12:01:31 2019 +0200

tilebench: output a helpful delta image and highlight the diffs.

Change-Id: I545b3b262805361851ed2c829110c6a4f852e25e
Reviewed-on: https://gerrit.libreoffice.org/81267
Tested-by: Jenkins
Reviewed-by: Michael Meeks 

diff --git a/libreofficekit/qa/tilebench/tilebench.cxx 
b/libreofficekit/qa/tilebench/tilebench.cxx
index ac5e5d387173..a1d415fe56bb 100644
--- a/libreofficekit/qa/tilebench/tilebench.cxx
+++ b/libreofficekit/qa/tilebench/tilebench.cxx
@@ -247,27 +247,50 @@ static void testTile( Document *pDocument, int max_parts,
 }
 }
 
-static bool subTileIdentical( const std::vector &vBase,
-  long nBaseRowStride,
-  const std::vector &vCompare,
-  long nCompareRowStride,
-  long nTilePixelHeight,
-  long nPosX, long nPosY )
+static uint32_t fade(uint32_t col)
 {
+uint8_t a = (col >> 24) & 0xff;
+uint8_t b = (col >> 16) & 0xff;
+uint8_t g = (col >>  8) & 0xff;
+uint8_t r = (col >>  0) & 0xff;
+uint8_t grey = (r+g+b)/6;
+return (a<<24) + (grey<<16) + (grey<<8) + grey;
+}
+
+// Count and build a picture of any differences into rDiff
+static int diffTiles( const std::vector &vBase,
+   long nBaseRowPixelWidth,
+   const std::vector &vCompare,
+   long nCompareRowPixelWidth,
+   long nTilePixelHeight,
+   long nPosX, long nPosY,
+   std::vector &rDiff )
+{
+int nDifferent = 0;
+const uint32_t *pBase = reinterpret_cast(vBase.data());
+const uint32_t *pCompare = reinterpret_cast(vCompare.data());
+uint32_t *pDiff = reinterpret_cast(rDiff.data());
+long left = 0, mid = nCompareRowPixelWidth, right = 
nCompareRowPixelWidth*2;
 for (long y = 0; y < nTilePixelHeight; ++y)
 {
-long nBaseOffset = nBaseRowStride * (y + nPosY) + nPosX * 
nCompareRowStride;
-long nCompareOffset = nCompareRowStride * y;
-for (long x = 0; x < nCompareRowStride; ++x)
+long nBaseOffset = nBaseRowPixelWidth * (y + nPosY) + nPosX * 
nCompareRowPixelWidth;
+long nCompareOffset = nCompareRowPixelWidth * y;
+long nDiffRowStart = nCompareOffset * 3;
+for (long x = 0; x < nCompareRowPixelWidth; ++x)
 {
-if (vBase[nBaseOffset + x] != vCompare[nCompareOffset + x])
+pDiff[nDiffRowStart + left  + x] = pBase[nBaseOffset + x];
+pDiff[nDiffRowStart + mid   + x] = pCompare[nCompareOffset + x];
+pDiff[nDiffRowStart + right + x] = fade(pBase[nBaseOffset + x]);
+if (pBase[nBaseOffset + x] != pCompare[nCompareOffset + x])
 {
-fprintf (stderr, "Mismatching pixel at %ld (bytes) into row 
%ld\n", x, y);
-return false;
+pDiff[nDiffRowStart + right + x] = 0x00ff;
+if (!nDifferent)
+fprintf (stderr, "First mismatching pixel at %ld (pixels) 
into row %ld\n", x, y);
+nDifferent++;
 }
 }
 }
-return true;
+return nDifferent;
 }
 
 static bool testJoinsAt( Document *pDocument, long nX, long nY,
@@ -306,21 +329,25 @@ static bool testJoinsAt( Document *pDocument, long nX, 
long nY,
   initPosX + rPos.X * nTileTwipWidth,
   initPosY + rPos.Y * nTileTwipHeight,
   nTileTwipWidth, nTileTwipHeight );
-if ( !subTileIdentical( vBase, nTilePixelWidth * 2 * 4,
-vCompare, nTilePixelWidth * 4,
-nTilePixelHeight,
-rPos.X, rPos.Y * nTilePixelHeight ) )
+std::vector vDiff( nTilePixelWidth * 3 * 
nTilePixelHeight * 4 );
+int nDifferences = diffTiles( vBase, nTilePixelWidth * 2,
+  vCompare, nTilePixelWidth,
+  nTilePixelHeight,
+  rPos.X, rPos.Y * nTilePixelHeight,
+  vDiff );
+if ( nDifferences > 0 )
 {
-fprintf( stderr, "  sub-tile pixel mismatch at %ld, %ld at offset 
%ld, %ld (twips)\n",
- rPos.X, rPos.Y, initPosX, initPosY );
+fprintf( stderr, "  %d differences in sub-tile pixel mismatch at 
%ld, %ld at offset %ld, %ld (twips)\n",
+ nDifferences, rPos.X, rPos.Y, initPosX, initPosY );
 dumpTile("_base", nTilePixelWidth * 2

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

2019-10-22 Thread Michael Stahl (via logerrit)

 sw/qa/extras/odfexport/data/footnote-collect-at-end-of-section.fodt |  192 
++
 sw/qa/extras/odfexport/odfexport.cxx|   25 +
 sw/source/core/doc/ftnidx.cxx   |2 
 3 files changed, 218 insertions(+), 1 deletion(-)

New commits:
commit c123e945166d7f122d65d9ea9f41a4baee17ff95
Author: Michael Stahl 
AuthorDate: Mon Oct 21 13:53:29 2019 +0200
Commit: Michael Stahl 
CommitDate: Tue Oct 22 12:01:39 2019 +0200

tdf#128188 sw_redlinehide: fix off-by-1 footnote numbers...

... in sections with "Collect at end of text" set when "Track
Changes->Show" is off; the pre-increment erroneously became a
post-increment.

(regression from fe1d3328997741b55202aca7b3dc566ca833a5f4)

Reviewed-on: https://gerrit.libreoffice.org/81234
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 891b8036c746f7eab9ef3380c049eecf3860acac)

Change-Id: Ie438418883bdf91a519d553c10e8d9952a94a52d
Reviewed-on: https://gerrit.libreoffice.org/81311
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git 
a/sw/qa/extras/odfexport/data/footnote-collect-at-end-of-section.fodt 
b/sw/qa/extras/odfexport/data/footnote-collect-at-end-of-section.fodt
new file mode 100644
index ..b9910334855f
--- /dev/null
+++ b/sw/qa/extras/odfexport/data/footnote-collect-at-end-of-section.fodt
@@ -0,0 +1,192 @@
+
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
+ 
2019-10-21T13:59:35.8473398492019-10-21T14:28:45.221080424PT23M48S2LibreOffice_powered_by_CIBDev/6.1.7.5$Linux_X86_64
 
LibreOffice_project/3ab5486449d1f3ca0247a9c133da746401c57e28
+ 
+  
+   false
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+
+   
+   
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+   
+  
+  
+   
+   
+  
+  
+  
+   
+  
+  
+  
+   
+  
+  
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+   
+
+ 
+
+   
+  
+  
+  
+  
+ 
+ 
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+
+
+   
+  
+  
+   
+
+
+   
+  
+  
+   
+
+   
+   
+   
+  
+  
+   
+
+   
+   
+   
+  
+ 
+ 
+  
+  
+  
+ 
+ 
+  
+   
+
+ 
+  
+   Unknown Author
+   2019-10-21T14:28:28
+  
+  2
+ two3
+ three
+ 
+
+   
+   
+1
+   one2
+   two
+   
+   
+1
+   one2
+   four
+   
+   
+  
+ 
+
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index 25e3fe8260cb..ad91e8aa6461 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -38,6 +38,8 @@
 #include 
 #include 
 #include  // for SwHiddenTextField::ParseIfFieldDefinition() 
method call
+#include 
+#include 
 
 class Test : public SwModelTestBase
 {
@@ -909,6 +911,29 @@ DECLARE_ODFEXPORT_TEST(testProtectionKey, 
"protection-key.fodt")
 }
 }
 
+DECLARE_ODFEXPORT_TEST(t

[Libreoffice-commits] core.git: Branch 'feature/skia' - 4 commits - cui/source cui/uiconfig include/svtools officecfg/registry solenv/sanitizers svtools/source svtools/uiconfig vcl/inc vcl/skia vcl/so

2019-10-22 Thread Luboš Luňák (via logerrit)

 cui/source/options/optgdlg.cxx |  139 +
 cui/source/options/optgdlg.hxx |8 
 cui/uiconfig/ui/optviewpage.ui |   56 +
 include/svtools/restartdialog.hxx  |3 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   15 +
 solenv/sanitizers/ui/svt.suppr |1 
 svtools/source/dialogs/restartdialog.cxx   |3 
 svtools/uiconfig/ui/restartdialog.ui   |   15 +
 vcl/inc/skia/gdiimpl.hxx   |   11 +
 vcl/inc/strings.hrc|1 
 vcl/skia/SkiaHelper.cxx|   10 
 vcl/skia/gdiimpl.cxx   |   40 ++-
 vcl/skia/win/gdiimpl.cxx   |   24 +-
 vcl/skia/x11/gdiimpl.cxx   |   15 +
 vcl/source/app/svapp.cxx   |5 
 15 files changed, 322 insertions(+), 24 deletions(-)

New commits:
commit 727a67beda83a7073a66cd6bdf03f6d0f5de1aaa
Author: Luboš Luňák 
AuthorDate: Tue Oct 22 11:48:08 2019 +0200
Commit: Luboš Luňák 
CommitDate: Tue Oct 22 11:53:08 2019 +0200

add GUI and configuration options for Skia

Pretty much a copy&paste of OpenGL. There are no settings for choosing
which backend Skia should use, as the plan is that simply the "best"
one will be selected.

Change-Id: I44fa876ab85de98de482a6ed9f814024334686ce

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index fb320a25c289..185603f38e41 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -75,6 +75,7 @@
 #if HAVE_FEATURE_OPENGL
 #include 
 #endif
+#include 
 #include "optgdlg.hxx"
 #include 
 #include 
@@ -170,6 +171,86 @@ void OpenGLCfg::setForceOpenGL(bool bOpenGL)
 }
 }
 
+class SkiaCfg
+{
+private:
+bool mbUseSkia;
+bool mbForceSkia;
+bool mbModified;
+
+public:
+SkiaCfg();
+~SkiaCfg();
+
+bool useSkia() const;
+bool forceSkia() const;
+
+void setUseSkia(bool bSkia);
+void setForceSkia(bool bSkia);
+
+void reset();
+};
+
+SkiaCfg::SkiaCfg():
+mbModified(false)
+{
+reset();
+}
+
+void SkiaCfg::reset()
+{
+mbUseSkia = officecfg::Office::Common::VCL::UseSkia::get();
+mbForceSkia = officecfg::Office::Common::VCL::ForceSkia::get();
+mbModified = false;
+}
+
+SkiaCfg::~SkiaCfg()
+{
+if (mbModified)
+{
+try
+{
+std::shared_ptr 
batch(comphelper::ConfigurationChanges::create());
+if (!officecfg::Office::Common::VCL::UseSkia::isReadOnly())
+officecfg::Office::Common::VCL::UseSkia::set(mbUseSkia, batch);
+if (!officecfg::Office::Common::VCL::ForceSkia::isReadOnly())
+officecfg::Office::Common::VCL::ForceSkia::set(mbForceSkia, 
batch);
+batch->commit();
+}
+catch (...)
+{
+}
+}
+}
+
+bool SkiaCfg::useSkia() const
+{
+return mbUseSkia;
+}
+
+bool SkiaCfg::forceSkia() const
+{
+return mbForceSkia;
+}
+
+void SkiaCfg::setUseSkia(bool bSkia)
+{
+if (bSkia != mbUseSkia)
+{
+mbUseSkia = bSkia;
+mbModified = true;
+}
+}
+
+void SkiaCfg::setForceSkia(bool bSkia)
+{
+if (mbForceSkia != bSkia)
+{
+mbForceSkia = bSkia;
+mbModified = true;
+}
+}
+
 }
 
 // class OfaMiscTabPage --
@@ -505,6 +586,7 @@ CanvasSettings::CanvasSettings() :
 bool CanvasSettings::IsHardwareAccelerationAvailable() const
 {
 #if HAVE_FEATURE_OPENGL
+// TODO SKIA
 if (OpenGLWrapper::isVCLOpenGLEnabled() && Application::GetToolkitName() 
!= "gtk3")
 mbHWAccelAvailable = false;
 
@@ -609,6 +691,7 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage, 
weld::DialogController* p
 , pCanvasSettings(new CanvasSettings)
 , mpDrawinglayerOpt(new SvtOptionsDrawinglayer)
 , mpOpenGLConfig(new svt::OpenGLCfg)
+, mpSkiaConfig(new svt::SkiaCfg)
 , m_xIconSizeLB(m_xBuilder->weld_combo_box("iconsize"))
 , m_xSidebarIconSizeLB(m_xBuilder->weld_combo_box("sidebariconsize"))
 , 
m_xNotebookbarIconSizeLB(m_xBuilder->weld_combo_box("notebookbariconsize"))
@@ -624,8 +707,12 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage, 
weld::DialogController* p
 , m_xUseAntiAliase(m_xBuilder->weld_check_button("useaa"))
 , m_xUseOpenGL(m_xBuilder->weld_check_button("useopengl"))
 , m_xForceOpenGL(m_xBuilder->weld_check_button("forceopengl"))
+, m_xUseSkia(m_xBuilder->weld_check_button("useskia"))
+, m_xForceSkia(m_xBuilder->weld_check_button("forceskia"))
 , m_xOpenGLStatusEnabled(m_xBuilder->weld_label("openglenabled"))
 , m_xOpenGLStatusDisabled(m_xBuilder->weld_label("opengldisabled"))
+, m_xSkiaStatusEnabled(m_xBuilder->weld_

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

2019-10-22 Thread Szymon Kłos (via logerrit)

 desktop/source/lib/init.cxx |   23 +--
 1 file changed, 21 insertions(+), 2 deletions(-)

New commits:
commit cf76e876c37384a6583f4f9681c8c192c34f615a
Author: Szymon Kłos 
AuthorDate: Mon Oct 21 13:16:50 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 22 11:16:41 2019 +0200

jsdialogs: handle spinfields

Change-Id: I9b845917ff1a7cb2242d7ef2b6b370007d0091b4
Reviewed-on: https://gerrit.libreoffice.org/81230
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 
(cherry picked from commit af9238d913c24d3bb326d3b0834c5008c9745446)
Reviewed-on: https://gerrit.libreoffice.org/81305
Tested-by: Szymon Kłos 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 43dfaf896259..200be4cf465f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3303,6 +3303,10 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 {
 const OUString sClickAction("CLICK");
 const OUString sSelectAction("SELECT");
+const OUString sClearAction("CLEAR");
+const OUString sTypeAction("TYPE");
+const OUString sUpAction("UP");
+const OUString sDownAction("DOWN");
 
 try
 {
@@ -3310,6 +3314,7 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 std::unique_ptr pUIWindow(aUIObject.get_child(sId));
 if (pUIWindow) {
 bool bIsClickAction = false;
+StringMap aMap;
 
 if (pOptionalEventType) {
 if (strcmp(pOptionalEventType, "selected") == 0 && 
pOptionalData)
@@ -3324,12 +3329,26 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 return;
 }
 
-StringMap aMap;
 aMap["POS"] = OUString::createFromAscii(pPos);
 aMap["TEXT"] = OUString::createFromAscii(pText);
 
 pUIWindow->execute(sSelectAction, aMap);
 }
+else if (strcmp(pOptionalEventType, "plus") == 0)
+{
+pUIWindow->execute(sUpAction, aMap);
+}
+else if (strcmp(pOptionalEventType, "minus") == 0)
+{
+pUIWindow->execute(sDownAction, aMap);
+}
+else if (pOptionalData)
+{
+aMap["TEXT"] = 
OUString::createFromAscii(pOptionalData);
+
+pUIWindow->execute(sClearAction, aMap);
+pUIWindow->execute(sTypeAction, aMap);
+}
 else
 bIsClickAction = true;
 }
@@ -3337,7 +3356,7 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 bIsClickAction = true;
 
 if (bIsClickAction)
-pUIWindow->execute(sClickAction, StringMap());
+pUIWindow->execute(sClickAction, aMap);
 }
 } catch(...) {}
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 compilerplugins/clang/singlevalfields.could-be-bool.results |   12 
 compilerplugins/clang/singlevalfields.results   |  302 
 sw/source/core/inc/UndoSplitMove.hxx|1 
 sw/source/core/undo/unmove.cxx  |   14 
 4 files changed, 125 insertions(+), 204 deletions(-)

New commits:
commit 8d686c1e6afd1e09534dcd1ef9d299455f52836a
Author: Noel Grandin 
AuthorDate: Mon Oct 21 13:06:02 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 22 11:16:19 2019 +0200

loplugin:singlevalfields

Change-Id: I92c5634b16862abe1c73c20cfe66abe92f58bb88
Reviewed-on: https://gerrit.libreoffice.org/81303
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/singlevalfields.could-be-bool.results 
b/compilerplugins/clang/singlevalfields.could-be-bool.results
index 986c5d4b1766..26ab650d1206 100644
--- a/compilerplugins/clang/singlevalfields.could-be-bool.results
+++ b/compilerplugins/clang/singlevalfields.could-be-bool.results
@@ -11,7 +11,7 @@ dbaccess/source/ui/inc/tabletree.hxx:149
 dbaui::TableTreeListBox m_nTextColumn
 int
 desktop/source/app/main.c:29
-/media/disk2/libo4/desktop/source/app/main.c g_Exiting
+/media/disk2/libo7/desktop/source/app/main.c g_Exiting
 int
 editeng/source/misc/hangulhanja.cxx:79
 editeng::HangulHanjaConversion_Impl m_eConvType
@@ -74,10 +74,10 @@ sd/qa/unit/tiledrendering/tiledrendering.cxx:956
 ViewCallback m_nPart
 int
 soltools/cpp/_tokens.c:35
-/media/disk2/libo4/soltools/cpp/_tokens.c EBCDIC_ExternTokenDetected
+/media/disk2/libo7/soltools/cpp/_tokens.c EBCDIC_ExternTokenDetected
 int
 soltools/cpp/_tokens.c:36
-/media/disk2/libo4/soltools/cpp/_tokens.c EBCDIC_StartTokenDetected
+/media/disk2/libo7/soltools/cpp/_tokens.c EBCDIC_StartTokenDetected
 int
 soltools/cpp/cpp.h:121
 includelist always
@@ -100,7 +100,7 @@ sw/source/uibase/inc/tautofmt.hxx:48
 vcl/inc/unx/i18n_ic.hxx:32
 SalI18N_InputContext mbUseable
 int
-vcl/inc/unx/salframe.h:128
+vcl/inc/unx/salframe.h:127
 X11SalFrame mbInputFocus
 int
 vcl/unx/generic/app/saldata.cxx:449
@@ -110,13 +110,13 @@ vcl/unx/generic/app/saldata.cxx:502
 X11SalData::XError bOnce
 int
 vcl/unx/generic/app/sm.cxx:184
-/media/disk2/libo4/vcl/unx/generic/app/sm.cxx nSmDel
+/media/disk2/libo7/vcl/unx/generic/app/sm.cxx nSmDel
 int
 vcl/workben/icontest.cxx:145
 IconTestApp nRet
 int
 workdir/LexTarget/l10ntools/source/cfglex.cxx:2293
-/media/disk2/libo4/workdir/LexTarget/l10ntools/source/cfglex.cxx bText
+/media/disk2/libo7/workdir/LexTarget/l10ntools/source/cfglex.cxx bText
 int
 writerfilter/source/dmapper/PageBordersHandler.hxx:54
 writerfilter::dmapper::PageBordersHandler m_eOffsetFrom
diff --git a/compilerplugins/clang/singlevalfields.results 
b/compilerplugins/clang/singlevalfields.results
index f7ff385efe8a..6f557d352558 100644
--- a/compilerplugins/clang/singlevalfields.results
+++ b/compilerplugins/clang/singlevalfields.results
@@ -7,9 +7,6 @@ avmedia/source/framework/soundhandler.hxx:123
 basctl/source/basicide/baside2.hxx:88
 basctl::EditorWindow aHighlighter
 0
-basctl/source/inc/bastype2.hxx:182
-basctl::TreeListBox nMode
-7
 basctl/source/inc/dlged.hxx:132
 basctl::DlgEditor aMarkIdle
 basctl DlgEditor Mark
@@ -43,9 +40,6 @@ bridges/source/jni_uno/jni_uno2java.cxx:389
 chart2/source/controller/dialogs/DataBrowser.cxx:211
 chart::impl::SeriesHeader m_aUpdateDataTimer
 UpdateDataTimer
-chart2/source/controller/dialogs/DataBrowser.hxx:161
-chart::DataBrowser m_bLiveUpdate
-1
 chart2/source/controller/inc/ChartController.hxx:382
 chart::ChartController m_aLifeTimeManager
 0
@@ -127,7 +121,7 @@ cui/source/inc/linkdlg.hxx:46
 cui/source/inc/thesdlg.hxx:32
 SvxThesaurusDialog m_aModifyIdle
 cui SvxThesaurusDialog LookUp Modify
-cui/source/options/optgdlg.cxx:1054
+cui/source/options/optgdlg.cxx:1056
 LanguageConfig_Impl aLanguageOptions
 0
 cui/source/options/optjava.hxx:60
@@ -136,10 +130,7 @@ cui/source/options/optjava.hxx:60
 dbaccess/source/ui/inc/directsql.hxx:64
 dbaui::DirectSQLDialog m_aHighlighter
 1
-dbaccess/source/ui/inc/indexdialog.hxx:43
-dbaui::DbaIndexDialog m_bEditingActive
-0
-desktop/source/app/app.cxx:503
+desktop/source/app/app.cxx:505
 desktop::Desktop::Init bTryHardOfficeconfigBroken
 0
 desktop/source/app/cmdlineargs.hxx:137
@@ -203,19 +194,19 @@ helpcompiler/inc/BasCodeTagger.hxx:29
 BasicCodeTagger m_Highlighter
 0
 i18npool/source/localedata/localedata.cxx:51
-/media/disk2/libo4/i18npool/source/localedata/localedata.cxx lcl_DATA_EN
+/media/disk2/libo7/i18npool/source/localedata/localedata.cxx lcl_DATA_EN
 localedata_en
 i18npool/source/localedata/localedata.cxx:52
-/media/disk2/libo4/i18npool/source/localedata/localedata.cxx lcl_DATA_ES
+/media/disk2/libo7/i18np

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

 external/libxml2/ubsan.patch.0 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 79e15d33c8c4d5488d353de7d440c65601049d5c
Author: Stephan Bergmann 
AuthorDate: Tue Oct 22 08:35:28 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Oct 22 11:06:12 2019 +0200

external/libxml2: Simplify UBSan nullptr-with-offset fix

...that had been added with fcb2d8a87ad696f7f2fe069f0ed68a88803e1b54
"external/libxml2: Avoid UBSan nullptr-with-offset"

Change-Id: I7ee234c8c6a868ed825a8ed3fa0dcdc69decb7ba
Reviewed-on: https://gerrit.libreoffice.org/81299
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/libxml2/ubsan.patch.0 b/external/libxml2/ubsan.patch.0
index 234f66baddc2..b52259719673 100644
--- a/external/libxml2/ubsan.patch.0
+++ b/external/libxml2/ubsan.patch.0
@@ -5,7 +5,7 @@
  
stream = xmlPatterncompile(str, dict, XML_PATTERN_XPATH,
 -  &namespaces[0]);
-+  namespaces == NULL ? NULL : &namespaces[0]);
++  namespaces); // i.e., &namespaces[0] if namespaces != 
NULL
if (namespaces != NULL) {
xmlFree((xmlChar **)namespaces);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: build 6.3.2.2 pdfium: No rule to make target

2019-10-22 Thread David L. Craig

On 19Oct22:1023+0200, Miklos Vajna wrote:

> Reviewing the libreoffice-6.3.2.1..libreoffice-6.3.2.2 diff, I don't see
> anything related. Perhaps you just get this problem randomly?

I'm not sure how many attempts I made, but they've all failed so far.

> Distros typically use --disable-fetch-external, download external
> tarballs before the build starts and place them in external/tarballs/.
> 
> So in case pdfium's tarball is missing from external/tarballs/, that
> sounds like a problem with your build script, rather than a problem in
> LO itself.

That is possible.  The port maintainer is being copied on this discussion
and will hopefully chime in soon.
-- 

May the LORD God bless you exceedingly abundantly!

Dave_Craig__
"So the universe is not quite as you thought it was.
 You'd better rearrange your beliefs, then.
 Because you certainly can't rearrange the universe."
__--from_Nightfall_by_Asimov/Silverberg_

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

Re: build 6.3.2.2 pdfium: No rule to make target

2019-10-22 Thread Miklos Vajna

Hi David,

On Tue, Oct 22, 2019 at 08:04:09AM +, "David L. Craig"  
wrote:
> What built for 6.3.2.1 doesn't for 6.3.2.2 and 6.3.3.1

Reviewing the libreoffice-6.3.2.1..libreoffice-6.3.2.2 diff, I don't see
anything related. Perhaps you just get this problem randomly?

> Gets message "[...] \
> target'[...]tarballs/pdfium-3794.tar.bz2', \
> needed by 
> '[...]libreoffice-6.3.3.1/workdir/UnpackedTarget/pdfium-3794.tar.bz2'."
> 
> Builds with '--disable-pdfium' specified.
> 
> Steps to Reproduce:
> 1. Run standard CRUX 3.5 (GNU/Linux ports-based build-from-source distro)
>install/update package management tools for distro-canonical libreoffice
>port (contrib repo).

Distros typically use --disable-fetch-external, download external
tarballs before the build starts and place them in external/tarballs/.

So in case pdfium's tarball is missing from external/tarballs/, that
sounds like a problem with your build script, rather than a problem in
LO itself.

Regards,

Miklos

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

build 6.3.2.2 pdfium: No rule to make target

2019-10-22 Thread David L. Craig

What built for 6.3.2.1 doesn't for 6.3.2.2 and 6.3.3.1
Gets message "[...] \
target'[...]tarballs/pdfium-3794.tar.bz2', \
needed by
'[...]libreoffice-6.3.3.1/workdir/UnpackedTarget/pdfium-3794.tar.bz2'."

Builds with '--disable-pdfium' specified.

Steps to Reproduce:
1. Run standard CRUX 3.5 (GNU/Linux ports-based build-from-source distro)
install/update package management tools for distro-canonical libreoffice
port (contrib repo).
2.
3.

Actual Results:
[build XSL] CustomTarget/officecfg/registry/officecfg/ucb/Store.hxx
make[1]: *** No rule to make target
'/usr/ports/work/libreoffice/src/tarballs/pdfium-3794.tar.bz2', needed by
'/usr/ports/work/libreoffice/src/libreoffice-6.3.3.1/workdir/UnpackedTarget/pdfium-3794.tar.bz2'.
Stop.
make[1]: *** Waiting for unfinished jobs
make: *** [Makefile:274: build] Error 2

Expected Results:
The install/update script completes normally as it did for 6.3.2.1. (Note patch
for Bug 128189 is needed and installed for 6.3.2.2 and 6.3.3.1 as well, since
qmake-qt5 is in /usr/bin which is the last directory in PATH--an empty directory
could be added to PATH to circumvent the need for the 128189 patch).

Reproducible:
Always on bug reporter's platform
Never on the platforn of the canonical port's maintainer
Configure tracing on both platforms has revealed few differences;
* inclusion of
--enable-kde5
--enable-gtk3-kde5
on the port maintainer's platform,
* different PATH definitions and the like, and
* application of the 128189 patch on the bug reporter's platform (the
maintainer's PATH has not usr/bin as the last directory)

Note this problem is still encountered when the bug reporter's platform has not
installed the configure script tracing modifications described in the 129189 bug
report. As the issue does not seem to be related to configure, the config.log
file is probably adequate for troubleshooting.
--

May the LORD God bless you exceedingly abundantly!

Dave_Craig__
"So the universe is not quite as you thought it was.
You'd better rearrange your beliefs, then.
Because you certainly can't rearrange the universe."
__--from_Nightfall_by_Asimov/Silverberg_

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

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

 sfx2/source/dialog/securitypage.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e7bb875b3e9b5d35e8077484b4b43fcca79d30b7
Author: Gabor Kelemen 
AuthorDate: Mon Oct 21 22:34:40 2019 +0200
Commit: Caolán McNamara 
CommitDate: Tue Oct 22 09:58:55 2019 +0200

tdf#128230 Require password if the Unprotect button is visible

Regression from commit a2279bb2f52ee5bbe8d38433aac55aa1a16661fb

Before that requiring password depended on the current text of
the Protect/Unprotect button, which was changed dynamically.

This commit changed that logic and introduced two buttons in the
new .ui file that are hidden/shown dynamically.

The password condition however was changed to check the visibility
of the new Protect button instead of the Unprotect button.

Change-Id: Ie24e1b2d45fa92a375a29b7bc71689f9b83ae9dc
Reviewed-on: https://gerrit.libreoffice.org/81283
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sfx2/source/dialog/securitypage.cxx 
b/sfx2/source/dialog/securitypage.cxx
index 53197688fa68..2e673538d913 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -331,7 +331,7 @@ IMPL_LINK_NOARG(SfxSecurityPage_Impl, 
RecordChangesCBToggleHdl, weld::ToggleButt
 }
 
 const bool bNeedPasssword = !m_bOrigPasswordIsConfirmed
-&& m_xProtectPB->get_visible();
+&& m_xUnProtectPB->get_visible(); // tdf#128230 Require password 
if the Unprotect button is visible
 if (!bAlreadyDone && bNeedPasssword)
 {
 OUString aPasswordText;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-22 Thread Szymon Kłos (via logerrit)

 desktop/source/lib/init.cxx |   20 +++-
 1 file changed, 15 insertions(+), 5 deletions(-)

New commits:
commit 7eb60b0d656679e88619084103e5c3eca2dde511
Author: Szymon Kłos 
AuthorDate: Mon Oct 21 10:55:29 2019 +0200
Commit: Szymon Kłos 
CommitDate: Tue Oct 22 09:39:26 2019 +0200

jsdialogs: use click event if not a combobox

Change-Id: I377de66bd086fa2cb5ef70514f5f1613a3fcb5cd
Reviewed-on: https://gerrit.libreoffice.org/81214
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 12cd3a40d86a..43dfaf896259 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3273,7 +3273,8 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 SolarMutexGuard aGuard;
 
 char* pCopy = strdup(pArguments);
-if (!pCopy) {
+if (!pCopy)
+{
 SetLastExceptionMsg("String copying error.");
 return;
 }
@@ -3282,7 +3283,8 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 char* pOptionalEventType = strtok(nullptr, " ");
 char* pOptionalData = strtok(nullptr, " ");
 
-if (!pIdChar) {
+if (!pIdChar)
+{
 SetLastExceptionMsg("Error parsing the command.");
 free(pCopy);
 return;
@@ -3307,8 +3309,11 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 WindowUIObject aUIObject(pWindow);
 std::unique_ptr pUIWindow(aUIObject.get_child(sId));
 if (pUIWindow) {
+bool bIsClickAction = false;
+
 if (pOptionalEventType) {
-if (strcmp(pOptionalEventType, "selected") == 0 && 
pOptionalData) {
+if (strcmp(pOptionalEventType, "selected") == 0 && 
pOptionalData)
+{
 char* pPos = strtok(pOptionalData, ";");
 char* pText = strtok(nullptr, ";");
 
@@ -3325,9 +3330,14 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 
 pUIWindow->execute(sSelectAction, aMap);
 }
-} else {
-pUIWindow->execute(sClickAction, StringMap());
+else
+bIsClickAction = true;
 }
+else
+bIsClickAction = true;
+
+if (bIsClickAction)
+pUIWindow->execute(sClickAction, StringMap());
 }
 } catch(...) {}
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: fpicker/IwyuFilter_fpicker.yaml fpicker/qa fpicker/source