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

2020-02-20 Thread Aron Budea (via logerrit)
 sc/source/ui/view/gridwin.cxx |9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 341cc6b29bffa477f3b1fcbb4184f7503478efbf
Author: Aron Budea 
AuthorDate: Fri Feb 21 07:01:15 2020 +0100
Commit: Miklos Vajna 
CommitDate: Fri Feb 21 08:42:38 2020 +0100

Blind build fix for Android

After 9bfa939f87f28cdaed2a24c3dc5f9a21004b19da

Also, replace chained OStringBuffer::append() with operator+

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

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 1232a8fa3626..8946dfc204b4 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2204,13 +2204,8 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& 
rMEvt )
 OString aCursor = 
pForTabView->GetViewData().describeCellCursorAt(nPosX, nPosY);
 double fPPTX = pForTabView->GetViewData().GetPPTX();
 int mouseX = aPos.X() / fPPTX;
-OStringBuffer aBuf;
-aBuf.append(aUrl.toUtf8().getStr());
-aBuf.append(" coordinates: ");
-aBuf.append(aCursor);
-aBuf.append(", ");
-aBuf.append(mouseX);
-
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_HYPERLINK_CLICKED, 
aBuf.makeStringAndClear().getStr());
+OString aMsg(aUrl.toUtf8() + " coordinates: " + aCursor + 
", " + OString::number(mouseX));
+
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_HYPERLINK_CLICKED, 
aMsg.getStr());
 } else
 ScGlobal::OpenURL(aUrl, aTarget);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: solenv/bin xmloff/inc xmloff/source xmloff/util

2020-02-20 Thread Miklos Vajna (via logerrit)
 solenv/bin/native-code.py|1 +
 xmloff/inc/facreg.hxx|5 -
 xmloff/source/chart/SchXMLImport.cxx |   16 
 xmloff/source/core/facreg.cxx|3 +--
 xmloff/util/xo.component |3 ++-
 5 files changed, 8 insertions(+), 20 deletions(-)

New commits:
commit 2b64e3e9a9010b10ecf374903f377a5bb9c0cbe5
Author: Miklos Vajna 
AuthorDate: Thu Feb 20 21:12:05 2020 +0100
Commit: Miklos Vajna 
CommitDate: Fri Feb 21 08:40:38 2020 +0100

xmloff: create SchXMLImport_Meta instances with an uno constructor

See tdf#74608 for motivation.

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

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 63802e5c5528..c85b4b197a43 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -319,6 +319,7 @@ core_constructor_list = [
 "com_sun_star_comp_DrawingLayer_XMLExporter_get_implementation",
 "com_sun_star_comp_Impress_XMLClipboardExporter_get_implementation",
 "com_sun_star_comp_Chart_XMLOasisImporter_get_implementation",
+"com_sun_star_comp_Chart_XMLOasisMetaImporter_get_implementation",
 # xmlscript/util/xmlscript.component
 "com_sun_star_comp_xmlscript_XMLBasicExporter",
 "com_sun_star_comp_xmlscript_XMLBasicImporter",
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index aed6215198a0..0dd5f1392d41 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -32,11 +32,6 @@ namespace com { namespace sun { namespace star {
 } } }
 
 // chart oasis import
-OUString SchXMLImport_Meta_getImplementationName() throw();
-css::uno::Sequence SchXMLImport_Meta_getSupportedServiceNames() 
throw();
-/// @throws css::uno::Exception
-css::uno::Reference SchXMLImport_Meta_createInstance(
-css::uno::Reference const & rSMgr);
 OUString SchXMLImport_Styles_getImplementationName() throw();
 css::uno::Sequence SchXMLImport_Styles_getSupportedServiceNames() 
throw();
 /// @throws css::uno::Exception
diff --git a/xmloff/source/chart/SchXMLImport.cxx 
b/xmloff/source/chart/SchXMLImport.cxx
index 25cf41deb021..1187fd35c804 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -621,19 +621,11 @@ Reference< uno::XInterface > 
SchXMLImport_Content_createInstance(const Reference
 return static_cast(new SchXMLImport( 
comphelper::getComponentContext(rSMgr), 
SchXMLImport_Content_getImplementationName(), SvXMLImportFlags::CONTENT | 
SvXMLImportFlags::AUTOSTYLES | SvXMLImportFlags::FONTDECLS ));
 }
 
-Sequence< OUString > SchXMLImport_Meta_getSupportedServiceNames() throw()
-{
-return Sequence< OUString > { 
"com.sun.star.comp.Chart.XMLOasisMetaImporter" };
-}
-
-OUString SchXMLImport_Meta_getImplementationName() throw()
-{
-return "SchXMLImport.Meta";
-}
-
-Reference< uno::XInterface > SchXMLImport_Meta_createInstance(const Reference< 
lang::XMultiServiceFactory > & rSMgr)
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
+com_sun_star_comp_Chart_XMLOasisMetaImporter_get_implementation(
+uno::XComponentContext* pCtx, uno::Sequence const& /*rSeq*/)
 {
-return static_cast(new SchXMLImport( 
comphelper::getComponentContext(rSMgr), 
SchXMLImport_Meta_getImplementationName(), SvXMLImportFlags::META ));
+return cppu::acquire(new SchXMLImport(pCtx, "SchXMLImport.Meta", 
SvXMLImportFlags::META));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 2326a0a1a446..fee9e1c431e7 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -55,8 +55,7 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const char * 
pImplName, void *
 const sal_Int32 nImplNameLen = strlen( pImplName );
 
 // chart oasis import
-SINGLEFACTORY( SchXMLImport_Meta )
-else SINGLEFACTORY( SchXMLImport_Styles )
+SINGLEFACTORY( SchXMLImport_Styles )
 else SINGLEFACTORY( SchXMLImport_Content )
 
 // chart oasis export
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index c4caa340c594..272e6d22ff12 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -47,7 +47,8 @@
   
 
   
-  
+  
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: compilerplugins/clang include/svtools include/svx include/vcl svtools/source svx/source sw/source vcl/source

2020-02-20 Thread Noel Grandin (via logerrit)
 compilerplugins/clang/unusedmethods.results |  322 ++--
 include/svtools/imagemgr.hxx|1 
 include/svx/langbox.hxx |1 
 include/vcl/accel.hxx   |1 
 include/vcl/combobox.hxx|5 
 include/vcl/field.hxx   |4 
 include/vcl/lstbox.hxx  |2 
 include/vcl/quickselectionengine.hxx|1 
 include/vcl/toolbox.hxx |1 
 include/vcl/toolkit/field.hxx   |1 
 include/vcl/toolkit/svtabbx.hxx |2 
 include/vcl/treelistbox.hxx |1 
 svtools/source/control/valueacc.cxx |   20 -
 svtools/source/control/valueimp.hxx |2 
 svtools/source/misc/imagemgr.cxx|7 
 svx/source/dialog/langbox.cxx   |5 
 sw/source/uibase/inc/navipi.hxx |1 
 vcl/source/control/combobox.cxx |   12 -
 vcl/source/control/field.cxx|   21 -
 vcl/source/control/quickselectionengine.cxx |5 
 vcl/source/treelist/svtabbx.cxx |   50 
 vcl/source/treelist/treelistbox.cxx |5 
 vcl/source/window/toolbox.cxx   |5 
 23 files changed, 172 insertions(+), 303 deletions(-)

New commits:
commit 4a08d20ee58a6ade7dce58e45432cde73d9eb7b8
Author: Noel Grandin 
AuthorDate: Thu Feb 20 16:52:06 2020 +0200
Commit: Noel Grandin 
CommitDate: Fri Feb 21 07:16:46 2020 +0100

loplugin:unusedmethods

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

diff --git a/compilerplugins/clang/unusedmethods.results 
b/compilerplugins/clang/unusedmethods.results
index 3f1635f5f34d..27bf2b07ad75 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -1,18 +1,18 @@
-basctl/source/inc/bastype2.hxx:328
+basctl/source/inc/bastype2.hxx:262
 void basctl::SbTreeListBox::make_unsorted()
-basctl/source/inc/bastype2.hxx:329
+basctl/source/inc/bastype2.hxx:263
 _Bool basctl::SbTreeListBox::get_sort_order() const
-basctl/source/inc/bastype2.hxx:330
+basctl/source/inc/bastype2.hxx:264
 void basctl::SbTreeListBox::set_sort_order(_Bool)
-basctl/source/inc/bastype2.hxx:332
+basctl/source/inc/bastype2.hxx:266
 void basctl::SbTreeListBox::set_sort_indicator(enum TriState,int)
-basctl/source/inc/bastype2.hxx:336
+basctl/source/inc/bastype2.hxx:270
 enum TriState basctl::SbTreeListBox::get_sort_indicator(int)
-basctl/source/inc/bastype2.hxx:341
+basctl/source/inc/bastype2.hxx:275
 int basctl::SbTreeListBox::get_sort_column() const
-basctl/source/inc/bastype2.hxx:342
+basctl/source/inc/bastype2.hxx:276
 void basctl::SbTreeListBox::set_sort_column(int)
-basctl/source/inc/bastype2.hxx:344
+basctl/source/inc/bastype2.hxx:278
 void basctl::SbTreeListBox::set_sort_func(const class std::function &)
 basegfx/source/range/b2drangeclipper.cxx:687
 type-parameter-?-? basegfx::(anonymous 
namespace)::eraseFromList(type-parameter-?-? &,const type-parameter-?-? &)
@@ -26,10 +26,42 @@ bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:171
 void CPPU_CURRENT_NAMESPACE::raiseException(struct _uno_Any *,struct 
_uno_Mapping *)
 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx:174
 void CPPU_CURRENT_NAMESPACE::fillUnoException(struct _uno_Any *,struct 
_uno_Mapping *)
+canvas/inc/rendering/icolorbuffer.hxx:48
+unsigned char * canvas::IColorBuffer::lock() const
+canvas/inc/rendering/icolorbuffer.hxx:52
+void canvas::IColorBuffer::unlock() const
+canvas/inc/rendering/icolorbuffer.hxx:67
+unsigned int canvas::IColorBuffer::getStride() const
+canvas/inc/rendering/icolorbuffer.hxx:71
+enum canvas::IColorBuffer::Format canvas::IColorBuffer::getFormat() const
+canvas/inc/rendering/isurfaceproxy.hxx:38
+void canvas::ISurfaceProxy::setColorBufferDirty()
+canvas/inc/rendering/isurfaceproxy.hxx:51
+_Bool canvas::ISurfaceProxy::draw(double,const class basegfx::B2DPoint 
&,const class basegfx::B2DHomMatrix &)
+canvas/inc/rendering/isurfaceproxy.hxx:71
+_Bool canvas::ISurfaceProxy::draw(double,const class basegfx::B2DPoint 
&,const class basegfx::B2DRange &,const class basegfx::B2DHomMatrix &)
+canvas/inc/rendering/isurfaceproxy.hxx:91
+_Bool canvas::ISurfaceProxy::draw(double,const class basegfx::B2DPoint 
&,const class basegfx::B2DPolyPolygon &,const class basegfx::B2DHomMatrix &)
+canvas/inc/rendering/isurfaceproxymanager.hxx:57
+class std::shared_ptr 
canvas::ISurfaceProxyManager::createSurfaceProxy(const class 
std::shared_ptr &) const
+canvas/inc/rendering/isurfaceproxymanager.hxx:63
+class std::shared_ptr 
canvas::createSurfaceProxyManager(const class std::shared_ptr &)
+canvas/inc/vclwrapper.hxx:65
+ 
canvas::vcltools::VCLObject::VCLObject(unique_ptr >)
+canvas/inc/vclwrapper.hxx:1

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

2020-02-20 Thread Henry Castro (via logerrit)
 loleaflet/src/map/Clipboard.js |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 5bc28a9d3047e47c5b7210522e9d5729524c1f0e
Author: Henry Castro 
AuthorDate: Thu Feb 20 16:58:40 2020 -0400
Commit: Henry Castro 
CommitDate: Fri Feb 21 00:49:29 2020 +0100

loleafet: ignore the paste event when a vex dialog...

has the focus

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

diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index 335314223..315fa1e90 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -3,7 +3,7 @@
  * L.Clipboard is used to abstract our storage and management of
  * local & remote clipboard data.
  */
-/* global _ vex brandProductName */
+/* global _ vex brandProductName isAnyVexDialogActive */
 
 // Get all interesting clipboard related events here, and handle
 // download logic in one place ...
@@ -648,6 +648,10 @@ L.Clipboard = L.Class.extend({
 
paste: function(ev) {
console.log('Paste');
+
+   if (isAnyVexDialogActive() && !this._map.hasFocus())
+   return;
+
if (this._map._activeDialog)
ev.usePasteKeyEvent = true;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Henry Castro (via logerrit)
 loleaflet/.eslintignore|1 
 loleaflet/Makefile.am  |5 
 loleaflet/js/Autolinker.js | 4187 +
 3 files changed, 4191 insertions(+), 2 deletions(-)

New commits:
commit c537bea9389be67479f6347740fcbbe5b8ac4e87
Author: Henry Castro 
AuthorDate: Thu Feb 20 12:21:44 2020 -0400
Commit: Henry Castro 
CommitDate: Fri Feb 21 00:49:04 2020 +0100

loleaflet: import Autolinker.js library

The file was imported from node_modules/autolinker/dist/Autolinker.js
the main reason is to analyze the source code, debug and patch
if necessary

To get the source code from npm repository

make libs

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

diff --git a/loleaflet/.eslintignore b/loleaflet/.eslintignore
index ca03adc2e..64caf1af1 100644
--- a/loleaflet/.eslintignore
+++ b/loleaflet/.eslintignore
@@ -1,4 +1,5 @@
 # We only directly edit toolbar.js in dist/
+**/js/Autolinker.js
 **/js/json2.js
 **/js/select2.js
 **/js/vex.combined.js
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 413ef7f66..ea6e31621 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -72,6 +72,7 @@ define npm_source
 endef
 
 NODE_MODULES_SRC =\
+   autolinker@1.4.3 \
json-js@1.1.2 \
select2@4.0.1 \
vex-js@4.1.0 \
@@ -122,10 +123,10 @@ NODE_MODULES_JS =\
node_modules/jquery-mousewheel/jquery.mousewheel.js \
node_modules/jquery-contextmenu/dist/jquery.contextMenu.js \
node_modules/jquery-ui/jquery-ui.js \
-   node_modules/smartmenus/dist/jquery.smartmenus.js \
-   node_modules/autolinker/dist/Autolinker.js
+   node_modules/smartmenus/dist/jquery.smartmenus.js
 
 LOLEAFLET_LIBS_JS =\
+   Autolinker.js \
json2.js \
select2.js \
vex.combined.js \
diff --git a/loleaflet/js/Autolinker.js b/loleaflet/js/Autolinker.js
new file mode 100644
index 0..d463c331a
--- /dev/null
+++ b/loleaflet/js/Autolinker.js
@@ -0,0 +1,4187 @@
+/*!
+ * Autolinker.js
+ * 1.4.3
+ *
+ * Copyright(c) 2017 Gregory Jacobs 
+ * MIT License
+ *
+ * https://github.com/gregjacobs/Autolinker.js
+ */
+;(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+define([], factory);
+  } else if (typeof exports === 'object') {
+module.exports = factory();
+  } else {
+root.Autolinker = factory();
+  }
+}(this, function() {
+/**
+ * @class Autolinker
+ * @extends Object
+ *
+ * Utility class used to process a given string of text, and wrap the matches 
in
+ * the appropriate anchor () tags to turn them into links.
+ *
+ * Any of the configuration options may be provided in an Object (map) provided
+ * to the Autolinker constructor, which will configure how the {@link #link 
link()}
+ * method will process the links.
+ *
+ * For example:
+ *
+ * var autolinker = new Autolinker( {
+ * newWindow : false,
+ * truncate  : 30
+ * } );
+ *
+ * var html = autolinker.link( "Joe went to www.yahoo.com" );
+ * // produces: 'Joe went to http://www.yahoo.com";>yahoo.com'
+ *
+ *
+ * The {@link #static-link static link()} method may also be used to inline
+ * options into a single call, which may be more convenient for one-off uses.
+ * For example:
+ *
+ * var html = Autolinker.link( "Joe went to www.yahoo.com", {
+ * newWindow : false,
+ * truncate  : 30
+ * } );
+ * // produces: 'Joe went to http://www.yahoo.com";>yahoo.com'
+ *
+ *
+ * ## Custom Replacements of Links
+ *
+ * If the configuration options do not provide enough flexibility, a {@link 
#replaceFn}
+ * may be provided to fully customize the output of Autolinker. This function 
is
+ * called once for each URL/Email/Phone#/Hashtag/Mention (Twitter, Instagram)
+ * match that is encountered.
+ *
+ * For example:
+ *
+ * var input = "...";  // string with URLs, Email Addresses, Phone #s, 
Hashtags, and Mentions (Twitter, Instagram)
+ *
+ * var linkedText = Autolinker.link( input, {
+ * replaceFn : function( match ) {
+ * console.log( "href = ", match.getAnchorHref() );
+ * console.log( "text = ", match.getAnchorText() );
+ *
+ * switch( match.getType() ) {
+ * case 'url' :
+ * console.log( "url: ", match.getUrl() );
+ *
+ * if( match.getUrl().indexOf( 'mysite.com' ) === -1 ) {
+ * var tag = match.buildTag();  // returns an 
`Autolinker.HtmlTag` instance, which provides mutator methods for easy changes
+ * tag.setAttr( 'rel', 'nofollow' );
+ * tag.addClass( 'external-link' );
+ *
+ * return tag;
+ *
+ * } else {
+ * return true;  // le

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

2020-02-20 Thread Stephan Bergmann (via logerrit)
 external/firebird/asan.patch |   11 ---
 external/firebird/firebird-cygwin-msvc.patch |4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 285d275816e58798a0a830f356cc76ef5ef506e1
Author: Stephan Bergmann 
AuthorDate: Thu Feb 20 18:32:42 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Feb 21 00:04:34 2020 +0100

external/firebird: Remove dead conditionals

For one, Clang appears to support __has_feature since at least 3.x times.  
That
simplifies the first check, from 14955ed91b282ccbb395cb47c6d76e3b42b34748
"external/firebird: Support Clang ASan".

And for another, the second check, from 
25764ffd4db0e5db6f9cc9f3da8691e607f48b83
"external/firebird: Better workaround for Clang alignment expectations", 
can be
simplified now that we no longer support neither Clang < 4 on Linux (since
685aca47da835e80f34b295c5d6389df03d1a8c2 "Bump (Linux) Clang baseline to 
5.0.2")
nor Xcode < 9 on macOS (since b4f666f2e677b05cab8395fe7972b45b15f60c3f "Bump
Xcode baseline to 9.3").

But that means we are always setting USE_ASAN when building with Clang now 
(to
work around certain Clang alignment expectations, regardless of whether or 
not
we build with -fsanitize=address).  Nevertheless, keep the
__has_feature(address_sanitizer) check as a comment, to make this a bit 
clearer.

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

diff --git a/external/firebird/asan.patch b/external/firebird/asan.patch
index a4ef7075a884..5ee7744e1038 100644
--- a/external/firebird/asan.patch
+++ b/external/firebird/asan.patch
@@ -204,17 +204,14 @@
  #ifdef DEBUG_GDS_ALLOC
 --- src/include/firebird.h
 +++ src/include/firebird.h
-@@ -38,8 +38,20 @@
+@@ -38,8 +38,17 @@
  #include "gen/autoconfig.h"
  #endif
  
-+#if defined __clang__ && defined __has_feature
-+#if __has_feature(address_sanitizer)
-+#define USE_ASAN
-+#endif
-+#endif
-+#if defined __clang__ && (defined __apple_build_version__ ? __clang_major__ 
>= 9 : __clang_major__ >= 4)
++#if defined __clang__
++//#if __has_feature(address_sanitizer)
 +#define USE_ASAN
++//#endif
 +#endif
 +#if defined __SANITIZE_ADDRESS__
 +#define USE_ASAN
diff --git a/external/firebird/firebird-cygwin-msvc.patch 
b/external/firebird/firebird-cygwin-msvc.patch
index 12dcb3c9513a..317ea8026b5d 100644
--- a/external/firebird/firebird-cygwin-msvc.patch
+++ b/external/firebird/firebird-cygwin-msvc.patch
@@ -10,8 +10,8 @@
  #include "gen/autoconfig.h"
 -#endif
  
- #if defined __clang__ && defined __has_feature
- #if __has_feature(address_sanitizer)
+ #if defined __clang__
+ //#if __has_feature(address_sanitizer)
 --- src/misc/writeBuildNum.sh  2016-07-07 15:57:04.538983200 +0200
 +++ src/misc/writeBuildNum.sh  2016-07-13 11:31:18.132820200 +0200
 @@ -95,9 +95,9 @@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Stephan Bergmann (via logerrit)
 sw/qa/core/uwriter.cxx |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 023ec0495e93deb1303f02ba53617b666b8c0687
Author: Stephan Bergmann 
AuthorDate: Thu Feb 20 18:24:52 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 20 23:17:50 2020 +0100

Remove dead conditional

Clang 4 is no longer supported on Linux since
685aca47da835e80f34b295c5d6389df03d1a8c2 "Bump (Linux) Clang baseline to 
5.0.2"
and Xcode 9 is no longer supported on macOS since
358146bbbd1b9775c12770fb5e497b6ec5adfc51 "Bump macOS build baseline to
Xcode 11.3 and macOS 10.14.4".

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

diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 1d7c131c4d5a..079f7e311245 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -1462,16 +1462,9 @@ void SwDocTest::testTableAutoFormats()
 CPPUNIT_ASSERT( bool( pLoadAF->GetBoxFormat(0).GetLinebreak() == aLBreak ) 
);
 //Get m_aRotateAngle
 CPPUNIT_ASSERT( bool( pLoadAF->GetBoxFormat(0).GetRotateAngle() == aRAngle 
) );
-#if !((defined(__clang__) && __clang_major__ == 4 && __clang_minor__ == 0) \
-  || (defined __APPLE__ && defined __clang__ \
-  && defined __apple_build_version__ \
-  && __apple_build_version__ >= 900 \
-  && __apple_build_version__ <= 999))
-// Temporary fix for mysterious problem with Clang in F26 and Xcode 9
 //Get m_aRotateMode
 //SvxRotateModeItem aRMode = aBoxAF.m_aRotateMode;GetRotateMode
 CPPUNIT_ASSERT( bool( pLoadAF->GetBoxFormat(0).GetRotateMode() == 
aSvxRotateModeItem ) );
-#endif
 //Get m_sNumFormatString
 CPPUNIT_ASSERT( bool( pLoadAF->GetBoxFormat(0).GetNumFormatString() == 
aNFString ) );
 //Get m_eSysLanguage
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: config_host.mk.in configure.ac desktop/Executable_soffice_bin.mk

2020-02-20 Thread Stephan Bergmann (via logerrit)
 config_host.mk.in |1 -
 configure.ac  |   12 
 desktop/Executable_soffice_bin.mk |2 +-
 3 files changed, 1 insertion(+), 14 deletions(-)

New commits:
commit c96855088af32849e0155e201dceb0e7c13ab05b
Author: Stephan Bergmann 
AuthorDate: Thu Feb 20 18:18:40 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 20 23:15:52 2020 +0100

macOS Xcode ld is known to always support -platform_version now

...after 358146bbbd1b9775c12770fb5e497b6ec5adfc51 "Bump macOS build 
baseline to
Xcode 11.3 and macOS 10.14.4".

This effectively reverts b7fd89100d8653dc73955780358fe31d38b68ebf 
"tdf#122218:
Baseline Xcode 9.3 ld presumably doesn't support -platform_version".

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

diff --git a/config_host.mk.in b/config_host.mk.in
index 9e8b0c2304e9..215212a6f06a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -268,7 +268,6 @@ export 
HAVE_GCC_STACK_CLASH_PROTECTION=@HAVE_GCC_STACK_CLASH_PROTECTION@
 export HAVE_GNUMAKE_FILE_FUNC=@HAVE_GNUMAKE_FILE_FUNC@
 export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@
 export HAVE_LD_HASH_STYLE=@HAVE_LD_HASH_STYLE@
-export HAVE_MACOS_LD_PLATFORMVERSION=@HAVE_MACOS_LD_PLATFORMVERSION@
 export HAVE_POSIX_FALLOCATE=@HAVE_POSIX_FALLOCATE@
 export HAVE_WDEPRECATED_COPY_DTOR=@HAVE_WDEPRECATED_COPY_DTOR@
 export HELP_ONLINE=@HELP_ONLINE@
diff --git a/configure.ac b/configure.ac
index 77e4619f5022..afc41c0c555a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2793,7 +2793,6 @@ dnl 
===
 dnl Check macOS SDK and compiler
 dnl ===
 
-HAVE_MACOS_LD_PLATFORMVERSION=
 if test $_os = Darwin; then
 
 # If no --with-macosx-sdk option is given, look for one
@@ -3028,16 +3027,6 @@ if test $_os = Darwin; then
 AC_MSG_CHECKING([what macOS app bundle identifier to use])
 MACOSX_BUNDLE_IDENTIFIER=$with_macosx_bundle_identifier
 AC_MSG_RESULT([$MACOSX_BUNDLE_IDENTIFIER])
-
-AC_MSG_CHECKING([whether the linker supports -platform_version])
-save_LDFLAGS=$LDFLAGS
-LDFLAGS="$LDFLAGS -Xlinker -platform_version -Xlinker macos -Xlinker 
$MACOSX_DEPLOYMENT_TARGET \
--Xlinker 0.0.0"
-AC_LINK_IFELSE([AC_LANG_PROGRAM()],
-[AC_MSG_RESULT([yes])
- HAVE_MACOS_LD_PLATFORMVERSION=TRUE],
-[AC_MSG_RESULT([no])])
-LDFLAGS=$save_LDFLAGS
 fi
 AC_SUBST(MACOSX_SDK_PATH)
 AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
@@ -3049,7 +3038,6 @@ AC_SUBST(MACOSX_CODESIGNING_IDENTITY)
 AC_SUBST(MACOSX_PACKAGE_SIGNING_IDENTITY)
 AC_SUBST(ENABLE_MACOSX_SANDBOX)
 AC_SUBST(MACOSX_BUNDLE_IDENTIFIER)
-AC_SUBST(HAVE_MACOS_LD_PLATFORMVERSION)
 
 dnl ===
 dnl Check iOS SDK and compiler
diff --git a/desktop/Executable_soffice_bin.mk 
b/desktop/Executable_soffice_bin.mk
index e4f987fd8f13..5c895ed0e7cb 100644
--- a/desktop/Executable_soffice_bin.mk
+++ b/desktop/Executable_soffice_bin.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_Executable_add_cobjects,soffice_bin,\
 desktop/source/app/main \
 ))
 
-ifeq ($(OS)-$(HAVE_MACOS_LD_PLATFORMVERSION),MACOSX-TRUE)
+ifeq ($(OS),MACOSX)
 # At least when building against SDK 10.15, changing the LC_VERSION_MIN_MACOSX 
load command's sdk
 # value from 10.15 to "n/a" (i.e., 0.0.0) is necessary to avoid blurry text in 
the LO UI (see
 # 

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


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

2020-02-20 Thread Vasily Melenchuk (via logerrit)
 chart2/source/controller/main/ControllerCommandDispatch.cxx |   14 
 1 file changed, 5 insertions(+), 9 deletions(-)

New commits:
commit d4e359cc4d01e761565e1dc3194e67a6dd8f
Author: Vasily Melenchuk 
AuthorDate: Fri Dec 27 14:55:11 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Feb 20 23:09:38 2020 +0100

tdf#121458: chart: change "Data Ranges" button enabled condition.

"Data Ranges" button right now enabled if chart has no own table
(as it was before 0074951704022d173a5fdb9df933f47be1dcbb91)
or own table exists and it is possible to create data provider
(LibreOffice will warn later about destroying data table).

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86391
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

Conflicts:
chart2/source/controller/main/ControllerCommandDispatch.cxx

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

diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx 
b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index 2e655741eac5..93ec82bb0936 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -552,13 +552,8 @@ void ControllerCommandDispatch::updateCommandAvailability()
 if ( xChartDoc.is() )
 {
 ChartModel& rModel = dynamic_cast(*xChartDoc.get());
-Reference< lang::XServiceInfo > 
xParentServiceInfo(rModel.getParent(), uno::UNO_QUERY);
-OSL_ENSURE(xParentServiceInfo.is(), "Invalid XServiceInfo");
-if ( xParentServiceInfo.is() )
-{
-css::uno::Reference< 
com::sun::star::chart2::XDataProviderAccess > xCreatorDoc(rModel.getParent(), 
uno::UNO_QUERY);
-bCanCreateDataProvider = xCreatorDoc.is();
-}
+css::uno::Reference< com::sun::star::chart2::XDataProviderAccess > 
xCreatorDoc(rModel.getParent(), uno::UNO_QUERY);
+bCanCreateDataProvider = xCreatorDoc.is();
 }
 }
 
@@ -631,8 +626,9 @@ void ControllerCommandDispatch::updateCommandAvailability()
 m_aCommandAvailability[ ".uno:FormatChartArea" ] = m_aCommandAvailability[ 
".uno:DiagramArea" ];
 m_aCommandAvailability[ ".uno:FormatLegend" ] = m_aCommandAvailability[ 
".uno:Legend" ];
 
-// depending on own data
-m_aCommandAvailability[".uno:DataRanges"] = bIsWritable && 
bModelStateIsValid && !m_apModelState->bHasDataFromPivotTable && 
bCanCreateDataProvider;
+// depending on own data and ability to create new data provider
+m_aCommandAvailability[".uno:DataRanges"] = bIsWritable && 
bModelStateIsValid && !m_apModelState->bHasDataFromPivotTable
+&& ((m_apModelState->bHasOwnData && bCanCreateDataProvider) || 
!m_apModelState->bHasOwnData);
 m_aCommandAvailability[ ".uno:DiagramData" ] = bIsWritable && 
bModelStateIsValid &&  m_apModelState->bHasOwnData && bEnableDataTableDialog;
 
 // titles
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Christian Lohmaier (via logerrit)
Tag 'libreoffice-6.4.1.2' created by Christian Lohmaier 
 at 2020-02-20 21:43 +

Tag libreoffice-6.4.1.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl5O/ZQACgkQ9DSh76/u
rqNZ8RAAqnyeKZyesUFub3N+sjMrDPd319zcZTXP/vFYcYUwwJZrnHH/yHhdM+ka
YPuVhY350JEUxCIb8aO1FS4DrA9/ces2AyNV+1IBKkxB2w9AukkZGQoAHnMVSmzQ
3W4xEXk3cktgue1diDy9CVlOLVCCz1B+ShzcpOLgRzzD0V+4XkLrIFUF0e+8BMw1
7l2EOoF66cD5jRtTeT58Zj47s+QJI//+VosXdaFfL+fuBFfb1SUiFCEs2XzgJIhW
xaCbl1Er+6BugPj1NREQWmKsJ9xI3HBwoZsR37Gpl1d8i4PSjBcP2rrgn8wcpH9a
i55mlABbmbwpMFli43gVsTpg1sMPxo0DLDjb5SP5pbseARwTOB9t5b5t0gXy8Jb+
IyyOgUpLKiWo0vMTFLiusoNMFNYpJ8dIQAXXFMoj+y4FHg/m2DoQ5gbdM7sHd8LZ
YHEeV8iRumOnOM3e6Lps0cQMk8xL1h66uLno34Na+mSOlfYkGhoGMD33BuCFEtSG
UNMe2uVZ1DnZ0PRhJr+Cm0e4UNDH8mQG6T0R7KDhLJZzl81n9niXDtgcJiwzpvQE
yYsZ/KuTJbinpGLoC4X6qDYc199zTwRHSyNOoPX9kJqwtA8d1OvqXTcD8JAda8TP
eqKiYFL1Gv265iZSHxC62EEsLVMbK85DS6ALgKd5XDbqoL2C3IQ=
=H1j7
-END PGP SIGNATURE-

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


[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-6.4.1.2'

2020-02-20 Thread Christian Lohmaier (via logerrit)
Tag 'libreoffice-6.4.1.2' created by Christian Lohmaier 
 at 2020-02-20 21:43 +

Tag libreoffice-6.4.1.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl5O/ZcACgkQ9DSh76/u
rqN5iA/9Eu8lHeBmMo/e4mP6mTpadCxxhndTFfSdcz/rcF0jVOiMXytb7v6MzWlA
zf6uP+3R2WzLjrQ0jAZuZXSR8Tf4WhqPjPln+PRTviT3JOM7jOqgx0zBiscjhZ3E
WulnR8vh7CRdwhbtlOSSL2C6vfziYfRFvshBeXsaOG9i9CcPK/BF4WRo83A102+B
NXmyOlFoE95hSLIO92/yaxfJuy4I2bJ4l1y07knR2QKXl5KilBlA8YTmcLuxCp9Z
exL9OWP9OI79UjMekJR74LQNC86yFu8MpvAXPVNC2byhwLH8rJil6yU6OjO/XjNQ
FyaoXFZY8vPXPWQ1h5JDXYyDKqf5J0AS2RiK8Jl+piuz9RSvGEKyH2jOauHKksfH
hkIDpKEOYtcLzhMPT1biME0p1zfCMWtaYDkXRNGNhSKc00VUxSsBuec2BKiy/4Io
+TsuLYry1Jzd7tQvz/jcFse9Mij6GDHjqVDho+TElMxCteg89pbjvWnEAzqS3vgN
ovByCpdhj/zfrGcXQTSGnM0ifUEhBLgKlqZLCTvTCBz70CPa+mSwtPEwd91jW3Pf
XO1esBZ0r3NtyFitUV4RC6c6nF06l6WiQ5iz96Fpbo8YU2ZdBTQXgxz4L9TeVKsP
t11GbDCArlBL9/SDT2vR3NXJ3Lyjr79uxL0aEIOU65fBxI8/U30=
=FEpN
-END PGP SIGNATURE-

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


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

2020-02-20 Thread Christian Lohmaier (via logerrit)
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 24efa49127dcfb5e1d75527f1020c3123f565871
Author: Christian Lohmaier 
AuthorDate: Thu Feb 20 22:44:12 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Feb 20 22:44:12 2020 +0100

bump product version to 6.4.1.2.0+

Change-Id: I2eb58f4b35ca7833c7c74d099090ba4e3ea5ab47

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


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

2020-02-20 Thread Christian Lohmaier (via logerrit)
Tag 'libreoffice-6.4.1.2' created by Christian Lohmaier 
 at 2020-02-20 21:43 +

Tag libreoffice-6.4.1.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl5O/ZcACgkQ9DSh76/u
rqMuyg/9EhjSG1By+Y7MDXEwV+3hqfZCIHr7FLEVShRu3u8qcKiEgnEKiRLWIAnW
+k2wfktzUaoG76wllk/OnY+cvjAFmGINJTpxiuj3O0A0CNuy46VtuuZf1GQDYAHK
E4VeUSehROLWIcElm0uriwOPYoIKC5se0ICl9UeqZOXrB66jRWHCWkbwvDcMMAGq
NMKHnvrBGPcwzGDc7krUQ92+57XOWAmYZfeiRPoMXEM6GKWicxzjBupOnrw7jAbV
vW+grHpa9KmT9oD/Tu4v0st2IKaaGSChtBiUt8mDNfHYzQGFquKpGzq1wWl6EvU3
sg3+nWNSYSlK668OizZb1bX10VD8sf+9b7xd0OZ6f7alfvXb6M4WpvwMjXR7chBj
Fs0iyD/KXCZ+fhmFTJDWsrMoGGSkthrVYHmeEkS8LW+AhWbIE1jJf8o90iilWkNW
RJD/ido1u8TblB16iBvgBx0Xw9wDGjlTtaLsK+Z0cGb+AOy2fbp9ZFNKJKcE6b+X
Fcqi5i9EbmPen4RAiZFB5z1DPQ9qEQ1Tjjp3K9tzL/XBLC/N3WcI+zokBJ4UcFFa
4KfmTIHF397oqAwj6TBWiqK1M62i+1EuknBujw+VLPVxeqOx0HXqxt9WYJZBdQJ3
atP88nGMe0e02dpwlSAMpafzF+eSrJVPjBH7+hJL+9Hhkc0IfcA=
=skN3
-END PGP SIGNATURE-

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


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

2020-02-20 Thread Christian Lohmaier (via logerrit)
Tag 'libreoffice-6.4.1.2' created by Christian Lohmaier 
 at 2020-02-20 21:43 +

Tag libreoffice-6.4.1.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl5O/ZcACgkQ9DSh76/u
rqPtBw//XDO1oiZpPlIR4ZGD5yBETm9GunOu0A7lWnks6XhOfHflbYEeK1PeT/SL
e7W5GCSQGdYuEr7STF8TsPHaJqgM2+Ue7+IQLbM9wO4uv/znZWALj1eZwuopiMjf
GMt0TiIio7K/eMxNQ2Zg2G6RkOYhEPGgdg19CcdA4Jx+yxIZuV+e57/mLn5IEycR
l1XyrgZZsTxqiKTOJxlgv+y1m4K+Ev+s6wRmKKirCMJoPgiqlM6UJQpOZOR1J1e0
YuZzeNVEQHMOXMVivQWpatCN2RfClsx/IxQcBNt5ZFAwU83pRktOG/G/BbYAoJXR
Rqmc+assPgUfU3lfkd2hWYFZbdPjL3DjsCb6l8FjYRFAMtD5plYlG6bJlK/pkle8
oIQBWB0eHfk1x8HpTB058mCXxfI35L+S6kAn97sqPhwc6ubCbJItrYER5I1tzDNa
CqfigJBkNxatoKxMoLVX9QwVp+xjIjymDlaP3aFvRX5TSyIdzIGwHNQaQmgumkRo
NNNqWBz1QSm6cbdgAexiepWe+B7ey6Lhy7zGeoXLFwrlbO6SuaSaa4PbbrvHHxtv
qUmA/eaRus8UylYsyB7E82erLTrQqJVtc2d+gYVBfhtmzj4jWbrZVnwPMCvG/kWg
OfNVEATRuYCOva7kdmxOa0O5qtfmvGes+6lNM9Jsws9Hd5PEc4g=
=44u6
-END PGP SIGNATURE-

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


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

2020-02-20 Thread Stephan Bergmann (via logerrit)
 compilerplugins/clang/plugin.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 4c11b51b349c2ad8e9019b4a84299e0cfd21b357
Author: Stephan Bergmann 
AuthorDate: Thu Feb 20 21:04:11 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 20 22:42:38 2020 +0100

Adapt structurallyIdentical to current needs

...since aad94d48b19135a2e46ac7b2c0f41f3bb29bb5a7 "Silence warnings in
salvtables.hxx", where --enable-compiler-plugins=debug had started to fail 
with

> In file included from vcl/source/app/salvtables.cxx:75:
> vcl/inc/salvtables.hxx:128:69: fatal error: TODO: Unexpected 
'IdenticalDefaultArgumentsResult::Maybe' [loplugin:overrideparam]
> weld_drawing_area(const OString& id, const a11yref& rA11yImpl = 
nullptr,
> 
^~~
> include/vcl/weld.hxx:2138:69: note: TODO: second argument is here 
[loplugin:overrideparam]
> weld_drawing_area(const OString& id, const a11yref& rA11yImpl = 
nullptr,
> 
^~~
> MaterializeTemporaryExpr 0x7fdff3111360 'const a11yref':'const class 
com::sun::star::uno::Reference' lvalue
> `-CXXBindTemporaryExpr 0x7fdff3111340 'const a11yref':'const class 
com::sun::star::uno::Reference' (CXXTemporary 0x7fdff3111340)
>   `-CXXConstructExpr 0x7fdff3111308 'const a11yref':'const class 
com::sun::star::uno::Reference' 'void (class 
com::sun::star::accessibility::XAccessible *)'
> `-ImplicitCastExpr 0x7fdff31112f0 'class 
com::sun::star::accessibility::XAccessible *' 
>   `-CXXNullPtrLiteralExpr 0x7fdff31112b0 'nullptr_t'
> MaterializeTemporaryExpr 0x7fdff39275d8 'const a11yref':'const class 
com::sun::star::uno::Reference' lvalue
> `-CXXBindTemporaryExpr 0x7fdff39275b8 'const a11yref':'const class 
com::sun::star::uno::Reference' (CXXTemporary 0x7fdff39275b8)
>   `-CXXConstructExpr 0x7fdff3927580 'const a11yref':'const class 
com::sun::star::uno::Reference' 'void (class 
com::sun::star::accessibility::XAccessible *)'
> `-ImplicitCastExpr 0x7fdff3927568 'class 
com::sun::star::accessibility::XAccessible *' 
>   `-CXXNullPtrLiteralExpr 0x7fdff3927528 'nullptr_t'

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

diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx
index 41767369211a..c6591d6b4fd5 100644
--- a/compilerplugins/clang/plugin.cxx
+++ b/compilerplugins/clang/plugin.cxx
@@ -95,8 +95,11 @@ bool structurallyIdentical(Stmt const * stmt1, Stmt const * 
stmt2) {
 }
 break;
 case Stmt::MaterializeTemporaryExprClass:
+case Stmt::CXXBindTemporaryExprClass:
 case Stmt::ParenExprClass:
 break;
+case Stmt::CXXNullPtrLiteralExprClass:
+return true;
 default:
 // Conservatively assume non-identical for expressions that don't 
happen for us in practice
 // when compiling the LO code base (and for which the above set of 
supported classes would
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-1' - include/vcl sc/source sfx2/source sw/source vcl/source

2020-02-20 Thread Mike Kaganski (via logerrit)
 include/vcl/notebookbar.hxx|7 +++---
 sc/source/ui/view/prevwsh.cxx  |4 +--
 sfx2/source/notebookbar/SfxNotebookBar.cxx |   15 ++---
 sw/source/uibase/uiview/pview.cxx  |4 +--
 vcl/source/control/notebookbar.cxx |   32 ++---
 5 files changed, 36 insertions(+), 26 deletions(-)

New commits:
commit 1d51690ffd51cff963a3b083abb288f505f5cc64
Author: Mike Kaganski 
AuthorDate: Mon Jan 6 10:49:31 2020 +0300
Commit: Christian Lohmaier 
CommitDate: Thu Feb 20 22:42:14 2020 +0100

tdf#130187: Don't crash on exiting print preview with Notebookbar

Crash caused by this sequence (tested in Writer):

1. Closing print preview, frame is attached to controller;
2. This calls SfxNotebookBar::StateMethod
3. There notebookbar's listener is added to list of the controller's
   context change event listeners
4. Then in SwPagePreview::~SwPagePreview, notebookbar's listener is
   added to that list again
5. ContextChangeEventMultiplexer::addContextChangeEventListener
   detects second addition, and throws an unhandled exception.

I don't know why starting listening is needed in SwPagePreview dtor;
unfortunately commit d05b7b32d9ecb6fcb4a268eb68cdcee09bafa6dd doesn't
say much about context and reasons.

ControlListener is renamed to ControlListenerForCurrentController to
emphasize that it operates on the current controller of notebookbar's
frame; and its bListen parameter meaning was reverted: previously its
"true" value awkwardly meant "stop listening". All direct operations
with listener of notebookbar are replaced with calls to notebookbar's
methods.

In ContextChangeEventMultiplexer::addContextChangeEventListener,
uno::UNO_QUERY_THROW was replaced with uno::UNO_QUERY, because not
only chart controller may appear here, and it's not an error: e.g.
SfxBaseController doesn't implement lang::XServiceInfo.

Regression after commit d05b7b32d9ecb6fcb4a268eb68cdcee09bafa6dd.

Change-Id: Ief1aed188d8f02a6cfe3ea25f4d082dfdf449f32
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86257
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87582
(cherry picked from commit fb2382ad4f33b885650ad5156ccaec4e90661806)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88229
Reviewed-by: Miklos Vajna 
Reviewed-by: Christian Lohmaier 
Tested-by: Christian Lohmaier 

diff --git a/include/vcl/notebookbar.hxx b/include/vcl/notebookbar.hxx
index af904ca2ae5f..457a64b9a206 100644
--- a/include/vcl/notebookbar.hxx
+++ b/include/vcl/notebookbar.hxx
@@ -14,6 +14,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 namespace com { namespace sun { namespace star { namespace ui { class 
XContextChangeEventListener; } } } }
@@ -39,17 +40,17 @@ public:
 
 void SetSystemWindow(SystemWindow* pSystemWindow);
 
-const css::uno::Reference& 
getContextChangeEventListener() const { return m_pEventListener; }
-
 void StateChanged(const StateChangedType nStateChange ) override;
 
 void DataChanged(const DataChangedEvent& rDCEvt) override;
 
-void ControlListener(bool bListen);
+void ControlListenerForCurrentController(bool bListen);
+void StopListeningAllControllers();
 
 private:
 VclPtr m_pSystemWindow;
 css::uno::Reference m_pEventListener;
+std::set> 
m_alisteningControllers;
 std::vector m_pContextContainers;
 css::uno::Reference mxFrame;
 
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 493ce87228ce..fe3688abdd43 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -160,7 +160,7 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame,
 
 auto& pNotebookBar = 
pViewFrame->GetWindow().GetSystemWindow()->GetNotebookBar();
 if (pNotebookBar)
-pNotebookBar->ControlListener(true);
+pNotebookBar->ControlListenerForCurrentController(false); // stop 
listening
 
 if ( auto pTabViewShell = dynamic_cast( pOldSh) )
 {
@@ -189,7 +189,7 @@ ScPreviewShell::~ScPreviewShell()
 mpFrameWindow->SetCloseHdl(Link()); // Remove 
close handler.
 
 if (auto& pBar = 
GetViewFrame()->GetWindow().GetSystemWindow()->GetNotebookBar())
-pBar->ControlListener(false);
+pBar->ControlListenerForCurrentController(true); // let it start 
listening now
 
 // #108333#; notify Accessibility that Shell is dying and before destroy 
all
 BroadcastAccessibility( SfxHint( SfxHintId::Dying ) );
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx 
b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index 538886f202a1..a2d7f1f39b17 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -400,15 +400,7 @@ bool SfxNotebookBar::StateMetho

Re: [global-libreoffice-ci] Tinderbox on Master for Windows-Debug - Build # 25612 - Still Failing!

2020-02-20 Thread Stephan Bergmann

On 20/02/2020 19:44, c...@libreoffice.org wrote:

Tinderbox on Master for Windows-Debug - Build # 25612 - Still Failing:
Identified problems:
* VS compiler error: Visual studio complained about error C2220: warning 
treated as error - no 'object' file generated in file 
C:/cygwin/home/tdf/lode/jenkins/workspace/lo_tb_master_win_dbg/slideshow/source/engine/smilfunctionparser.cxx
   * Indication 1:
 



Check console output at 
https://ci.libreoffice.org/job/lo_tb_master_win_dbg/25612/ to view the results.

Changes for Build #25611
[michael.meeks] sidebar: provide indent field boxes with useful id for hiding 
on mobile.

[tchvatal] Move Boost.Spirit usage away from legacy namespace


Changes for Build #25612
[szymon.klos] Fix build


Why can Windows --enable-pch apparently not cope with 
 
"Move Boost.Spirit usage away from legacy namespace"?


:

C:/cygwin/home/tdf/lode/jenkins/workspace/lo_tb_master_win_dbg/slideshow/source/engine/smilfunctionparser.cxx:
 error C2220: warning treated as error - no 'object' file generated
C:/cygwin/home/tdf/lode/jenkins/workspace/lo_tb_master_win_dbg/slideshow/source/engine/smilfunctionparser.cxx:
 warning C4651: '/DBOOST_SPIRIT_USE_OLD_NAMESPACE' specified for precompiled 
header but not for current compile


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


Re: Bump macOS Xcode baseline to 11?

2020-02-20 Thread Stephan Bergmann

On 17/02/2020 14:48, Tor Lillqvist wrote:


(For iOS, our baseline is documented as Xcode 9.3, too.  I have no
opinion whether or not we would want to bump that as well.


Oh, definitely yes. IMHO we shouldn't even mention any specific version 
but just tell people who want to build for iOS to use the latest Xcode.


I'm not going to touch that.  Whoever cares about the iOS build, please 
go ahead.


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


Re: Bump macOS Xcode baseline to 11?

2020-02-20 Thread Stephan Bergmann

On 17/02/2020 14:43, Stephan Bergmann wrote:

On 17/02/2020 11:59, Stephan Bergmann wrote:
Any opinions on bumping the macOS build baseline to Xcode 11.3 and 
macOS 10.4.4?


"10.14.4" of course (here and above)


Done now, 
 
"Bump macOS build baseline to Xcode 11.3 and macOS 10.14.4".


(: 
"Seen at least all three non-offline (out of the currently seven total) 
builders of  
serving  to actually run 
Xcode >= 11.3:
* " on tb81: 'checking 
whether Xcode is new enough... yes (11.3.1)'
* " on tb82: 'checking 
whether Xcode is new enough... yes (11.3)'
* " on tb84: 'checking 
whether Xcode is new enough... yes (11.3)'")


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


GSoC 2020

2020-02-20 Thread Drew Jensen
Howdy,

Noticed that Google has just released the selection for this years GSoC
mentoring projects; LibreOffice has been selected.

https://opensource.googleblog.com/2020/02/google-summer-of-code-2020-mentoring.html

Best wishes,

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


[Libreoffice-commits] core.git: configure.ac README.md

2020-02-20 Thread Stephan Bergmann (via logerrit)
 README.md|2 +-
 configure.ac |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 358146bbbd1b9775c12770fb5e497b6ec5adfc51
Author: Stephan Bergmann 
AuthorDate: Thu Feb 20 18:12:51 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 20 21:19:26 2020 +0100

Bump macOS build baseline to Xcode 11.3 and macOS 10.14.4

...as discussed at


"Bump macOS Xcode baseline to 11?" and


"ESC meeting minutes: 2020-02-20".

(Code that might no longer be relevant will be cleaned up in follow-up 
commits.)

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

diff --git a/README.md b/README.md
index 2f56b8fdde93..87de8f4baee4 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ run and compile LibreOffice, also used by the TDF builds:
 * Build: Cygwin + Visual Studio 2017 version 15.7
 * macOS:
 * Runtime: 10.10
-* Build: 10.13.2 + Xcode 9.3
+* Build: 10.14.4 + Xcode 11.3
 * Linux:
 * Runtime: RHEL 7 or CentOS 7
 * Build: either GCC 7.0.0; or Clang 5.0.2 with libstdc++ 7.3.0
diff --git a/configure.ac b/configure.ac
index 0b728af2e5fb..77e4619f5022 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2858,10 +2858,10 @@ if test $_os = Darwin; then
 my_xcode_ver1=$(xcrun xcodebuild -version | head -n 1)
 my_xcode_ver2=${my_xcode_ver1#Xcode }
 my_xcode_ver3=$(printf %s "$my_xcode_ver2" | $AWK -F. '{ print 
$1*100+($2<100?$2:99) }')
-if test "$my_xcode_ver3" -ge 903; then
+if test "$my_xcode_ver3" -ge 1103; then
 AC_MSG_RESULT([yes ($my_xcode_ver2)])
 else
-AC_MSG_ERROR(["$my_xcode_ver1" is too old or unrecognized, must be at 
least Xcode 9.3])
+AC_MSG_ERROR(["$my_xcode_ver1" is too old or unrecognized, must be at 
least Xcode 11.3])
 fi
 
 case "$with_macosx_version_min_required" in
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-1' - readlicense_oo/license

2020-02-20 Thread Christian Lohmaier (via logerrit)
 readlicense_oo/license/CREDITS.fodt | 3302 ++--
 1 file changed, 1668 insertions(+), 1634 deletions(-)

New commits:
commit 48e58b3cedad3b5d6cb89df5d3d6576690690bf0
Author: Christian Lohmaier 
AuthorDate: Thu Feb 20 20:37:40 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Feb 20 20:46:40 2020 +0100

update credits

Change-Id: I35d24b2ace80622fc81935039a833121f1da2795
(cherry picked from commit be3de666fd452e5c9d61411ecd9d4815a99419b3)
(cherry picked from commit 2efa404bcbcf472627fd198db8e341836229659f)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 20a1d9e2ca32..dc6127004489 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.
 0" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d: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:rpt="http://op
 enoffice.org/2005/report" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.4.0.3$Linux_X86_64
 
LibreOffice_project/b0a288ab3d2d4774cb44b62f04d5d28733ac6df82012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.4.0.3$Linux_X86_64
 
LibreOffice_project/b0a288ab3d2d4774cb44b62f04d5d28733ac6df82012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   547
+   601
501
22257
-   19717
+   20625
true
true

@@ -16,9 +16,9 @@
  1293
  3434
  501
- 547
+ 601
  22756
- 20262
+ 21225
  0
  0
  false
@@ -113,7 +113,7 @@
true
false
true
-   9044876
+   9048160
false
false
false
@@ -156,7 +156,7 @@
  
   

-   
+   
 


@@ -337,21 +337,21 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -421,21 +421,21 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1070,8 +1070,8 @@
 pEmTJk2aNGnSpEmTJk2aNGmqif4fv2ovuUlKae4ASUVORK5CYII=

   
- Credits
-1507 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2020-02-09 16:45:40.
+ Credits
+1513 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2020-02-20 15:36:35.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1095,16 +1095,16 @@
  
  
   
-   Caolán 
McNamaraCommits: 27785Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 27882Joined: 
2000-10-10
   
   
Vladimir 
Gla

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - 2 commits - readlicense_oo/license

2020-02-20 Thread Christian Lohmaier (via logerrit)
 readlicense_oo/license/CREDITS.fodt | 3649 +++-
 1 file changed, 1996 insertions(+), 1653 deletions(-)

New commits:
commit 2efa404bcbcf472627fd198db8e341836229659f
Author: Christian Lohmaier 
AuthorDate: Thu Feb 20 20:37:40 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Feb 20 20:41:45 2020 +0100

update credits

Change-Id: I35d24b2ace80622fc81935039a833121f1da2795
(cherry picked from commit be3de666fd452e5c9d61411ecd9d4815a99419b3)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 20a1d9e2ca32..dc6127004489 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.
 0" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d: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:rpt="http://op
 enoffice.org/2005/report" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.4.0.3$Linux_X86_64
 
LibreOffice_project/b0a288ab3d2d4774cb44b62f04d5d28733ac6df82012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.4.0.3$Linux_X86_64
 
LibreOffice_project/b0a288ab3d2d4774cb44b62f04d5d28733ac6df82012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   547
+   601
501
22257
-   19717
+   20625
true
true

@@ -16,9 +16,9 @@
  1293
  3434
  501
- 547
+ 601
  22756
- 20262
+ 21225
  0
  0
  false
@@ -113,7 +113,7 @@
true
false
true
-   9044876
+   9048160
false
false
false
@@ -156,7 +156,7 @@
  
   

-   
+   
 


@@ -337,21 +337,21 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -421,21 +421,21 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1070,8 +1070,8 @@
 pEmTJk2aNGnSpEmTJk2aNGmqif4fv2ovuUlKae4ASUVORK5CYII=

   
- Credits
-1507 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2020-02-09 16:45:40.
+ Credits
+1513 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2020-02-20 15:36:35.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1095,16 +1095,16 @@
  
  
   
-   Caolán 
McNamaraCommits: 27785Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 27882Joined: 
2000-10-10
   
   
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Stephan 
B

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - readlicense_oo/license

2020-02-20 Thread Christian Lohmaier (via logerrit)
 readlicense_oo/license/CREDITS.fodt | 3302 ++--
 1 file changed, 1668 insertions(+), 1634 deletions(-)

New commits:
commit 9641fa741fda91085ce379e177f9d861f04e5a1e
Author: Christian Lohmaier 
AuthorDate: Thu Feb 20 20:37:40 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Feb 20 20:39:21 2020 +0100

update credits

Change-Id: I35d24b2ace80622fc81935039a833121f1da2795
(cherry picked from commit be3de666fd452e5c9d61411ecd9d4815a99419b3)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 20a1d9e2ca32..dc6127004489 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.
 0" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d: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:rpt="http://op
 enoffice.org/2005/report" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.4.0.3$Linux_X86_64
 
LibreOffice_project/b0a288ab3d2d4774cb44b62f04d5d28733ac6df82012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.4.0.3$Linux_X86_64
 
LibreOffice_project/b0a288ab3d2d4774cb44b62f04d5d28733ac6df82012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   547
+   601
501
22257
-   19717
+   20625
true
true

@@ -16,9 +16,9 @@
  1293
  3434
  501
- 547
+ 601
  22756
- 20262
+ 21225
  0
  0
  false
@@ -113,7 +113,7 @@
true
false
true
-   9044876
+   9048160
false
false
false
@@ -156,7 +156,7 @@
  
   

-   
+   
 


@@ -337,21 +337,21 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -421,21 +421,21 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1070,8 +1070,8 @@
 pEmTJk2aNGnSpEmTJk2aNGmqif4fv2ovuUlKae4ASUVORK5CYII=

   
- Credits
-1507 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2020-02-09 16:45:40.
+ Credits
+1513 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2020-02-20 15:36:35.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1095,16 +1095,16 @@
  
  
   
-   Caolán 
McNamaraCommits: 27785Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 27882Joined: 
2000-10-10
   
   
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Stephan 
B

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

2020-02-20 Thread Christian Lohmaier (via logerrit)
 readlicense_oo/license/CREDITS.fodt | 3302 ++--
 1 file changed, 1668 insertions(+), 1634 deletions(-)

New commits:
commit be3de666fd452e5c9d61411ecd9d4815a99419b3
Author: Christian Lohmaier 
AuthorDate: Thu Feb 20 20:37:40 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Feb 20 20:37:40 2020 +0100

update credits

Change-Id: I35d24b2ace80622fc81935039a833121f1da2795

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index 20a1d9e2ca32..dc6127004489 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/2003/g/data-view#"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.
 0" 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d: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:rpt="http://op
 enoffice.org/2005/report" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.4.0.3$Linux_X86_64
 
LibreOffice_project/b0a288ab3d2d4774cb44b62f04d5d28733ac6df82012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/6.4.0.3$Linux_X86_64
 
LibreOffice_project/b0a288ab3d2d4774cb44b62f04d5d28733ac6df82012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   547
+   601
501
22257
-   19717
+   20625
true
true

@@ -16,9 +16,9 @@
  1293
  3434
  501
- 547
+ 601
  22756
- 20262
+ 21225
  0
  0
  false
@@ -113,7 +113,7 @@
true
false
true
-   9044876
+   9048160
false
false
false
@@ -156,7 +156,7 @@
  
   

-   
+   
 


@@ -337,21 +337,21 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -421,21 +421,21 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
@@ -1070,8 +1070,8 @@
 pEmTJk2aNGnSpEmTJk2aNGmqif4fv2ovuUlKae4ASUVORK5CYII=

   
- Credits
-1507 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2020-02-09 16:45:40.
+ Credits
+1513 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2020-02-20 15:36:35.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
@@ -1095,16 +1095,16 @@
  
  
   
-   Caolán 
McNamaraCommits: 27785Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 27882Joined: 
2000-10-10
   
   
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Stephan 
BergmannCommits: 17873Joined: 
2000-10-04
+   Stephan 
BergmannCommits

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

2020-02-20 Thread Noel Grandin (via logerrit)
 compilerplugins/clang/unusedfields.only-used-in-constructor.results |   58 
+++
 compilerplugins/clang/unusedfields.readonly.results |   64 
+++
 compilerplugins/clang/unusedfields.untouched.results|   50 
+++---
 compilerplugins/clang/unusedfields.writeonly.results|   82 
+-
 cui/source/inc/cfg.hxx  |1 
 include/svtools/valueset.hxx|2 
 6 files changed, 133 insertions(+), 124 deletions(-)

New commits:
commit b0aae2e6b6a634fef3a1e174659b39d643d22841
Author: Noel Grandin 
AuthorDate: Thu Feb 20 16:36:35 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 20 20:27:24 2020 +0100

loplugin:unusedfields

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

diff --git 
a/compilerplugins/clang/unusedfields.only-used-in-constructor.results 
b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index 72335ea1c78a..069b0766f54f 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -9,12 +9,12 @@ avmedia/source/vlc/wrapper/Types.hxx:44
 avmedia/source/vlc/wrapper/Types.hxx:45
 libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char *
 avmedia/source/vlc/wrapper/Types.hxx:46
-libvlc_event_t::(anonymous) padding struct (anonymous struct at 
/media/disk2/libo7/avmedia/source/vlc/wrapper/Types.hxx:43:7)
+libvlc_event_t::(anonymous) padding struct (anonymous struct at 
/home/noel/libo2/avmedia/source/vlc/wrapper/Types.hxx:43:7)
 avmedia/source/vlc/wrapper/Types.hxx:47
-libvlc_event_t u union (anonymous union at 
/media/disk2/libo7/avmedia/source/vlc/wrapper/Types.hxx:41:5)
+libvlc_event_t u union (anonymous union at 
/home/noel/libo2/avmedia/source/vlc/wrapper/Types.hxx:41:5)
 avmedia/source/vlc/wrapper/Types.hxx:53
 libvlc_track_description_t psz_name char *
-basegfx/source/polygon/b2dtrapezoid.cxx:207
+basegfx/source/polygon/b2dtrapezoid.cxx:205
 basegfx::trapezoidhelper::(anonymous namespace)::PointBlockAllocator 
maFirstStackBlock class basegfx::B2DPoint [32]
 basic/qa/cppunit/basictest.hxx:28
 MacroSnippet maDll class BasicDLL
@@ -124,7 +124,7 @@ cppu/source/uno/check.cxx:138
 (anonymous namespace)::Char4 chars struct (anonymous namespace)::Char3
 cui/source/dialogs/colorpicker.cxx:737
 cui::(anonymous namespace)::ColorPickerDialog m_aColorPrevious class 
cui::(anonymous namespace)::ColorPreviewControl
-cui/source/factory/dlgfact.cxx:1394
+cui/source/factory/dlgfact.cxx:1408
 (anonymous namespace)::SvxMacroAssignDialog m_aItems class SfxItemSet
 cui/source/inc/cfgutil.hxx:239
 SvxScriptSelectorDialog m_aStylesInfo struct SfxStylesInfo_Impl
@@ -164,8 +164,6 @@ dbaccess/source/core/dataaccess/connection.hxx:102
 dbaccess::OConnection m_nInAppend std::atomic
 dbaccess/source/core/inc/databasecontext.hxx:95
 dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
-desktop/qa/desktop_lib/test_desktop_lib.cxx:2771
-  class AllSettings &
 drawinglayer/source/tools/emfphelperdata.hxx:198
 emfplushelper::EmfPlusHelperData mnFrameRight sal_Int32
 drawinglayer/source/tools/emfphelperdata.hxx:199
@@ -188,7 +186,7 @@ helpcompiler/inc/HelpCompiler.hxx:196
 HelpCompiler lang const std::string
 include/basic/basmgr.hxx:56
 BasicError nReason enum BasicErrorReason
-include/drawinglayer/primitive2d/textlayoutdevice.hxx:58
+include/drawinglayer/primitive2d/textlayoutdevice.hxx:57
 drawinglayer::primitive2d::TextLayouterDevice maSolarGuard class 
SolarMutexGuard
 include/drawinglayer/texture/texture3d.hxx:62
 drawinglayer::texture::GeoTexSvxBitmapEx maBitmap class Bitmap
@@ -310,32 +308,34 @@ include/sfx2/msg.hxx:144
 SfxType14 pType const std::type_info *
 include/sfx2/msg.hxx:144
 SfxType14 createSfxPoolItemFunc std::function
-include/sfx2/msg.hxx:145
-SfxType16 aAttrib struct SfxTypeAttrib [16]
 include/sfx2/msg.hxx:145
 SfxType16 createSfxPoolItemFunc std::function
+include/sfx2/msg.hxx:145
+SfxType16 aAttrib struct SfxTypeAttrib [16]
 include/sfx2/msg.hxx:145
 SfxType16 nAttribs sal_uInt16
 include/sfx2/msg.hxx:145
 SfxType16 pType const std::type_info *
 include/sfx2/msg.hxx:146
 SfxType17 pType const std::type_info *
-include/sfx2/msg.hxx:146
-SfxType17 createSfxPoolItemFunc std::function
 include/sfx2/msg.hxx:146
 SfxType17 nAttribs sal_uInt16
+include/sfx2/msg.hxx:146
+SfxType17 createSfxPoolItemFunc std::function
 include/sfx2/msg.hxx:146
 SfxType17 aAttrib struct SfxTypeAttrib [17]
 include/sfx2/msg.hxx:147
 SfxType23 nAttribs sal_uInt16
 include/sfx2/msg.hxx:147
 SfxType23 pType const std::type_info *
-include/sfx2/msg.hxx:147
-SfxType23 createSfxPoolItemFunc std::functio

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

2020-02-20 Thread Michael Stahl (via logerrit)
 sw/source/core/layout/laycache.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit fef72fe382d04068cc5480f682125411c54d5dc2
Author: Michael Stahl 
AuthorDate: Thu Feb 20 14:17:19 2020 +0100
Commit: Xisco Faulí 
CommitDate: Thu Feb 20 20:21:28 2020 +0100

tdf#129529 sw_redlinehide: infinite loop in SwLayHelper::CheckInsert()

The bugdoc has this in meta.xml:

meta:page-count="819" meta:paragraph-count="302"

... for which SwLayHelper::CalcPageCount() cunningly estimates a maximum
of 0 paragraphs per page, and at that rate an infinite number of pages
are required...

Not sure what a reasonable minimum should be, paragraphs could be 16
pages long even with 64k limit, but it does appear unlikely.

(regression from 7e8b4756d95057f069467b34e7849f9354856578 which disabled
 the use of the layout-cache in the bugdoc)

Change-Id: Icd9ab145cc2f0714b50de9b5b4a1ef10ac1d49a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89106
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit a9f2f4b4c9e1fa4e4c4a69517c31d0b8e2063f01)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88964
Reviewed-by: Xisco Faulí 

diff --git a/sw/source/core/layout/laycache.cxx 
b/sw/source/core/layout/laycache.cxx
index 58a1fc3e3391..f78f0a4e9a47 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -601,7 +601,9 @@ sal_uLong SwLayHelper::CalcPageCount()
 if ( nNdCount > 100 ) // no estimation below this value
 {
 if ( nPgCount > 0 )
-mnMaxParaPerPage = nNdCount / nPgCount;
+{   // tdf#129529 avoid 0...
+mnMaxParaPerPage = std::max(3, nNdCount / nPgCount);
+}
 else
 {
 mnMaxParaPerPage = std::max( sal_uLong(20),
___
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' - oox/source sd/qa

2020-02-20 Thread Gülşah Köse (via logerrit)
 oox/source/drawingml/textparagraphproperties.cxx  |3 ++
 sd/qa/unit/data/pptx/smartart-missing-bullet.pptx |binary
 sd/qa/unit/import-tests-smartart.cxx  |   26 ++
 3 files changed, 29 insertions(+)

New commits:
commit 09a027f682e873f572df533ed558ee99965f5839
Author: Gülşah Köse 
AuthorDate: Wed Feb 19 09:08:45 2020 +0300
Commit: Gülşah Köse 
CommitDate: Thu Feb 20 20:17:40 2020 +0100

tdf#130776 Show the bullet on second level in smartart.

Change-Id: Ie35867862d30d490a97dc6f245b50c7311dafe50
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88993
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 
(cherry picked from commit 7865c662a4fdc9dc07f59d6ecd76b9c56d0020ae)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88963

diff --git a/oox/source/drawingml/textparagraphproperties.cxx 
b/oox/source/drawingml/textparagraphproperties.cxx
index 48e3b486e8b8..ae4fe98c8ff9 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -396,7 +396,10 @@ void TextParagraphProperties::pushToPropSet( const 
::oox::core::XmlFilterBase* p
 
 sal_Int32 nNumberingType = NumberingType::NUMBER_NONE;
 if ( maBulletList.mnNumberingType.hasValue() )
+{
 maBulletList.mnNumberingType >>= nNumberingType;
+aPropSet.setProperty< sal_Int16 >( PROP_NumberingLevel, getLevel() );
+}
 else if ( pMasterBuList && pMasterBuList->mnNumberingType.hasValue() )
 pMasterBuList->mnNumberingType >>= nNumberingType;
 if ( nNumberingType == NumberingType::NUMBER_NONE )
diff --git a/sd/qa/unit/data/pptx/smartart-missing-bullet.pptx 
b/sd/qa/unit/data/pptx/smartart-missing-bullet.pptx
new file mode 100644
index ..2917875a005a
Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-missing-bullet.pptx 
differ
diff --git a/sd/qa/unit/import-tests-smartart.cxx 
b/sd/qa/unit/import-tests-smartart.cxx
index 9226bbe79152..842cc979ca9c 100644
--- a/sd/qa/unit/import-tests-smartart.cxx
+++ b/sd/qa/unit/import-tests-smartart.cxx
@@ -101,6 +101,7 @@ public:
 void testFontSize();
 void testVerticalBlockList();
 void testBulletList();
+void testMissingBullet();
 void testRecursion();
 void testDataFollow();
 void testOrgChart2();
@@ -144,6 +145,7 @@ public:
 CPPUNIT_TEST(testFontSize);
 CPPUNIT_TEST(testVerticalBlockList);
 CPPUNIT_TEST(testBulletList);
+CPPUNIT_TEST(testMissingBullet);
 CPPUNIT_TEST(testRecursion);
 CPPUNIT_TEST(testDataFollow);
 CPPUNIT_TEST(testOrgChart2);
@@ -1276,6 +1278,30 @@ void SdImportTestSmartArt::testVerticalBlockList()
 xDocShRef->DoClose();
 }
 
+void SdImportTestSmartArt::testMissingBullet()
+{
+sd::DrawDocShellRef xDocShRef = loadURL(
+
m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-missing-bullet.pptx"),
+PPTX);
+uno::Reference xGroup(getShapeFromPage(0, 0, xDocShRef), 
uno::UNO_QUERY);
+uno::Reference xGroup1(xGroup->getByIndex(2), 
uno::UNO_QUERY);
+uno::Reference xGroup2(xGroup1->getByIndex(0), 
uno::UNO_QUERY);
+uno::Reference xText(xGroup2->getByIndex(0), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xText.is());
+
+uno::Reference xParasAccess(xText, 
uno::UNO_QUERY);
+uno::Reference xParas = 
xParasAccess->createEnumeration();
+xParas->nextElement();// skip parent
+
+uno::Reference xPara1(xParas->nextElement(), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xPara1.is());
+
+sal_Int16 nNumberingLevel = -1;
+xPara1->getPropertyValue("NumberingLevel")>>= nNumberingLevel;
+
+CPPUNIT_ASSERT_EQUAL(sal_Int16(1), nNumberingLevel);
+}
+
 void SdImportTestSmartArt::testBulletList()
 {
 sd::DrawDocShellRef xDocShRef = loadURL(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Miklos Vajna (via logerrit)
 sw/CppunitTest_sw_uibase_shells.mk   |3 ++
 sw/qa/uibase/shells/shells.cxx   |   52 +++
 sw/source/uibase/shells/drwtxtex.cxx |   18 
 3 files changed, 61 insertions(+), 12 deletions(-)

New commits:
commit 21b531f5dc2452a0bd42273ce0aa1d7809a4ebec
Author: Miklos Vajna 
AuthorDate: Fri Feb 7 17:54:50 2020 +0100
Commit: Michael Weghorn 
CommitDate: Thu Feb 20 20:07:58 2020 +0100

tdf#130482 sw: fix text alignment in shape text

Regression from commit a3c7a8282ddd08c7ed4a15d23089d09e418f8fae
(jsdialogs: apply .uno:Color and CharBackColor to floating text frames,
2019-11-08), the problem was that the original code populated aNewAttr, 
while
SetAttrToMarked() was only invoked in case there were arguments.

Fix this by making pNewAttrs a copy, so lcl_convertStringArguments() can
work on it in place, and then restore the old code that copied from
pNewAttrs to aNewAttr.  This fixes the no-arguments case and keeps the
lcl_convertStringArguments() case working.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88227
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit b03504bf054bd4094b985ef8ebb9ac55fa69a487)

Change-Id: If7bf2d7b21e48d513a512ec6127b61ee74635ef5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88296
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 
(cherry picked from commit 942c0d71a91839fc1762c7e93417e7bb703ea3cf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88303
Reviewed-by: Michael Stahl 
Reviewed-by: Michael Weghorn 
Tested-by: Michael Weghorn 

diff --git a/sw/CppunitTest_sw_uibase_shells.mk 
b/sw/CppunitTest_sw_uibase_shells.mk
index a4bb21c3d67e..9734b395bca6 100644
--- a/sw/CppunitTest_sw_uibase_shells.mk
+++ b/sw/CppunitTest_sw_uibase_shells.mk
@@ -21,9 +21,12 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_uibase_shells, 
\
 comphelper \
 cppu \
 cppuhelper \
+editeng \
 sal \
 sfx \
 svl \
+svx \
+svxcore \
 sw \
 test \
 unotest \
diff --git a/sw/qa/uibase/shells/shells.cxx b/sw/qa/uibase/shells/shells.cxx
index 8701db9a052e..05b5c6b5e27b 100644
--- a/sw/qa/uibase/shells/shells.cxx
+++ b/sw/qa/uibase/shells/shells.cxx
@@ -13,12 +13,22 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
+#include 
 
 static char const DATA_DIRECTORY[] = "/sw/qa/uibase/shells/data/";
 
@@ -69,6 +79,48 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testTdf130179)
 CPPUNIT_ASSERT(!pItem);
 }
 
+CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testShapeTextAlignment)
+{
+// FIXME find out why this fails on macOS
+#ifndef MACOSX
+// Create a document with a rectangle in it.
+SwDoc* pDoc = createDoc();
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+Point aStartPos(1000, 1000);
+pWrtShell->BeginCreate(static_cast(OBJ_RECT), aStartPos);
+Point aMovePos(2000, 2000);
+pWrtShell->MoveCreate(aMovePos);
+pWrtShell->EndCreate(SdrCreateCmd::ForceEnd);
+
+// Start shape text edit.
+SwView* pView = pDoc->GetDocShell()->GetView();
+// Select the shape.
+pView->GetViewFrame()->GetDispatcher()->Execute(FN_CNTNT_TO_NEXT_FRAME, 
SfxCallMode::SYNCHRON);
+pView->StopShellTimer();
+// Start the actual text edit.
+SdrPage* pPage = 
pWrtShell->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
+CPPUNIT_ASSERT_EQUAL(static_cast(1), pPage->GetObjCount());
+SdrObject* pObject = pPage->GetObj(0);
+pView->EnterShapeDrawTextMode(pObject);
+pView->AttrChangedNotify(nullptr);
+
+// Change paragraph adjustment to center.
+
pView->GetViewFrame()->GetDispatcher()->Execute(SID_ATTR_PARA_ADJUST_CENTER,
+SfxCallMode::SYNCHRON);
+
+// End shape text edit.
+pWrtShell->EndTextEdit();
+
+const OutlinerParaObject* pOutliner = pObject->GetOutlinerParaObject();
+// Without the accompanying fix in place, this test would have failed, 
because the shape had no
+// text or text formatting. In other words the paragraph adjustment 
command was ignored.
+CPPUNIT_ASSERT(pOutliner);
+const SfxItemSet& rParaAttribs = 
pOutliner->GetTextObject().GetParaAttribs(0);
+SvxAdjust eAdjust = rParaAttribs.GetItem(EE_PARA_JUST)->GetAdjust();
+CPPUNIT_ASSERT_EQUAL(SvxAdjust::Center, eAdjust);
+#endif
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/shells/drwtxtex.cxx 
b/sw/source/uibase/shells/drwtxtex.cxx
index fae34754fe5a..60bdf16380be 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -152,7 +152,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
 const sal_uInt16 nSlot = rR

[Libreoffice-commits] translations.git: Branch 'libreoffice-6-4-1' - source/an source/ast source/bg source/ca source/da source/el source/en-GB source/eo source/es source/eu source/gl source/gug source

2020-02-20 Thread Christian Lohmaier (via logerrit)
 source/an/cui/messages.po  
 |7 
 source/an/sc/messages.po   
 |5 
 source/an/sfx2/messages.po 
 |   12 
 source/an/svtools/messages.po  
 |7 
 source/an/svx/messages.po  
 |7 
 source/an/wizards/source/resources.po  
 |7 
 source/ast/basctl/messages.po  
 |  104 
 source/ast/basic/messages.po   
 |   34 
 source/ast/connectivity/messages.po
 |   10 
 source/ast/connectivity/registry/mork/org/openoffice/Office/DataAccess.po  
 |   10 
 
source/ast/connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess.po 
|   22 
 source/ast/desktop/messages.po 
 |   10 
 source/ast/dictionaries/bo.po  
 |   16 
 source/ast/dictionaries/cs_CZ.po   
 |   15 
 source/ast/helpcontent2/source/text/sbasic/shared.po   
 |6 
 source/ast/helpcontent2/source/text/shared/00.po   
 |6 
 source/ast/reportdesign/messages.po
 |6 
 source/ast/sc/messages.po  
 |4 
 source/ast/scp2/source/calc.po 
 |   38 
 source/ast/svx/messages.po 
 |6 
 source/ast/sw/messages.po  
 |   27 
 source/bg/helpcontent2/source/text/swriter/guide.po
 |   10 
 source/ca/cui/messages.po  
 |4 
 source/ca/helpcontent2/source/text/sbasic/shared.po
 |   10 
 source/ca/helpcontent2/source/text/scalc/01.po 
 |6 
 source/ca/helpcontent2/source/text/simpress/01.po  
 |6 
 source/ca/svx/messages.po  
 |4 
 source/da/filter/messages.po   
 |6 
 source/da/helpcontent2/source/text/sbasic/shared.po
 |   17 
 source/da/helpcontent2/source/text/sdraw.po
 |   35 
 source/da/helpcontent2/source/text/swriter/04.po   
 |7 
 source/el/helpcontent2/source/text/scalc/01.po 
 |   62 
 source/el/wizards/source/resources.po  
 |  566 +++
 source/en-GB/helpcontent2/source/text/sbasic/shared.po 
 |  194 -
 source/en-GB/helpcontent2/source/text/shared/02.po 
 |   10 
 source/en-GB/helpcontent2/source/text/shared/guide.po  
 |  168 -
 source/eo/cui/messages.po  
 |   18 
 source/es/helpcontent2/source/text/sbasic/shared.po
 |   24 
 source/es/helpcontent2/source/text/scalc/01.po 
 |4 
 source/es/helpcontent2/source/text/sdraw.po
 |6 
 source/es/helpcontent2/source/text/sdraw/guide.po  
 |6 
 source/es/helpcontent2/source/text/shared/01.po
 |6 
 source/es/helpcontent2/source/text/shared/02.po
 |6 
 source/es/helpcontent2/source/text/shared/04.po
 |8 
 source/es/helpcontent2/source/text/shared/explorer/database.po 
 |6 
 source/es/helpcontent2/source/text/simpress.po 
 |6 
 source/es/helpcontent2/source/text/simpress/02.po  
 |   12 
 source/es/helpcontent2/source/text/swriter/01.po   
 |8 
 source/es/helpcontent2/source/text/swriter/guide.po
 |4 
 source/eu/helpcontent2/source/text/shared/01.po
 |6 
 source/eu/helpcontent2/source/text/shared/06.po
 |6 
 source/gl/chart2/messages.po   
 |6 
 source/gl/connectivity/registry/evoab2/org/openoffice/Office/DataAccess.po 
 |   18 
 source/gl/connectivity/registry/macab/org/openoffice/Office/DataAccess.po  
 |   16 
 source/gl/helpcontent2/source/text/sbasic/python.po
 |   10 
 source/gl/helpcontent2/source/text/scalc/0

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

2020-02-20 Thread Christian Lohmaier (via logerrit)
 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7329e216e2131a85a1303d16e75079c55e258871
Author: Christian Lohmaier 
AuthorDate: Thu Feb 20 20:08:31 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Feb 20 20:08:31 2020 +0100

Update git submodules

* Update translations from branch 'libreoffice-6-4-1'
  to e0ab576083bd57c682b7a4dab7865f9ded9864a3
  - another update of translations for 6.4.1 rc2

Change-Id: I3be9f0c9e9dcb3d45e0900ab788aebc542b72a92
(cherry picked from commit 862fedc0284368cd404a9157d20dda48f09f21f2)

diff --git a/translations b/translations
index 5c5a417c8f0d..e0ab576083bd 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 5c5a417c8f0d5778c8e2cdbc8fbb655e53c42aea
+Subproject commit e0ab576083bd57c682b7a4dab7865f9ded9864a3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Christian Lohmaier (via logerrit)
 translations |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b09b60ce32927e539f4b86fe933802fba6368217
Author: Christian Lohmaier 
AuthorDate: Thu Feb 20 20:06:35 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Feb 20 20:06:35 2020 +0100

Update git submodules

* Update translations from branch 'libreoffice-6-4'
  to 862fedc0284368cd404a9157d20dda48f09f21f2
  - another update of translations for 6.4.1 rc2

Change-Id: I3be9f0c9e9dcb3d45e0900ab788aebc542b72a92

diff --git a/translations b/translations
index bf63f313ef10..862fedc02843 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit bf63f313ef100e20d4c7e1f74ea90fc8f9b6387e
+Subproject commit 862fedc0284368cd404a9157d20dda48f09f21f2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] translations.git: Branch 'libreoffice-6-4' - source/an source/ast source/bg source/ca source/da source/el source/en-GB source/eo source/es source/eu source/gl source/gug source/h

2020-02-20 Thread Christian Lohmaier (via logerrit)
 source/an/cui/messages.po  
 |7 
 source/an/sc/messages.po   
 |5 
 source/an/sfx2/messages.po 
 |   12 
 source/an/svtools/messages.po  
 |7 
 source/an/svx/messages.po  
 |7 
 source/an/wizards/source/resources.po  
 |7 
 source/ast/basctl/messages.po  
 |  104 
 source/ast/basic/messages.po   
 |   34 
 source/ast/connectivity/messages.po
 |   10 
 source/ast/connectivity/registry/mork/org/openoffice/Office/DataAccess.po  
 |   10 
 
source/ast/connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess.po 
|   22 
 source/ast/desktop/messages.po 
 |   10 
 source/ast/dictionaries/bo.po  
 |   16 
 source/ast/dictionaries/cs_CZ.po   
 |   15 
 source/ast/helpcontent2/source/text/sbasic/shared.po   
 |6 
 source/ast/helpcontent2/source/text/shared/00.po   
 |6 
 source/ast/reportdesign/messages.po
 |6 
 source/ast/sc/messages.po  
 |4 
 source/ast/scp2/source/calc.po 
 |   38 
 source/ast/svx/messages.po 
 |6 
 source/ast/sw/messages.po  
 |   27 
 source/bg/helpcontent2/source/text/swriter/guide.po
 |   10 
 source/ca/cui/messages.po  
 |4 
 source/ca/helpcontent2/source/text/sbasic/shared.po
 |   10 
 source/ca/helpcontent2/source/text/scalc/01.po 
 |6 
 source/ca/helpcontent2/source/text/simpress/01.po  
 |6 
 source/ca/svx/messages.po  
 |4 
 source/da/filter/messages.po   
 |6 
 source/da/helpcontent2/source/text/sbasic/shared.po
 |   17 
 source/da/helpcontent2/source/text/sdraw.po
 |   35 
 source/da/helpcontent2/source/text/swriter/04.po   
 |7 
 source/el/helpcontent2/source/text/scalc/01.po 
 |   62 
 source/el/wizards/source/resources.po  
 |  566 +++
 source/en-GB/helpcontent2/source/text/sbasic/shared.po 
 |  194 -
 source/en-GB/helpcontent2/source/text/shared/02.po 
 |   10 
 source/en-GB/helpcontent2/source/text/shared/guide.po  
 |  168 -
 source/eo/cui/messages.po  
 |   18 
 source/es/helpcontent2/source/text/sbasic/shared.po
 |   24 
 source/es/helpcontent2/source/text/scalc/01.po 
 |4 
 source/es/helpcontent2/source/text/sdraw.po
 |6 
 source/es/helpcontent2/source/text/sdraw/guide.po  
 |6 
 source/es/helpcontent2/source/text/shared/01.po
 |6 
 source/es/helpcontent2/source/text/shared/02.po
 |6 
 source/es/helpcontent2/source/text/shared/04.po
 |8 
 source/es/helpcontent2/source/text/shared/explorer/database.po 
 |6 
 source/es/helpcontent2/source/text/simpress.po 
 |6 
 source/es/helpcontent2/source/text/simpress/02.po  
 |   12 
 source/es/helpcontent2/source/text/swriter/01.po   
 |8 
 source/es/helpcontent2/source/text/swriter/guide.po
 |4 
 source/eu/helpcontent2/source/text/shared/01.po
 |6 
 source/eu/helpcontent2/source/text/shared/06.po
 |6 
 source/gl/chart2/messages.po   
 |6 
 source/gl/connectivity/registry/evoab2/org/openoffice/Office/DataAccess.po 
 |   18 
 source/gl/connectivity/registry/macab/org/openoffice/Office/DataAccess.po  
 |   16 
 source/gl/helpcontent2/source/text/sbasic/python.po
 |   10 
 source/gl/helpcontent2/source/text/scalc/0

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-1' - sw/CppunitTest_sw_core_doc.mk sw/inc sw/Module_sw.mk sw/qa sw/source

2020-02-20 Thread Miklos Vajna (via logerrit)
 sw/CppunitTest_sw_core_doc.mk   |   72 
 sw/Module_sw.mk |1 
 sw/inc/IDocumentContentOperations.hxx   |2 
 sw/inc/fesh.hxx |2 
 sw/qa/core/doc/doc.cxx  |   65 ++
 sw/source/core/doc/DocumentContentOperationsManager.cxx |   10 ++
 sw/source/core/frmedt/fefly1.cxx|2 
 sw/source/core/inc/DocumentContentOperationsManager.hxx |2 
 8 files changed, 151 insertions(+), 5 deletions(-)

New commits:
commit d16adf8df1b74b1054359ee3c6497cde20287e25
Author: Miklos Vajna 
AuthorDate: Tue Feb 4 14:33:37 2020 +0100
Commit: Michael Weghorn 
CommitDate: Thu Feb 20 20:05:11 2020 +0100

tdf#130362 sw: fix anchoring of inline math objects

Regression from a7528cd6f17ea5c5b29e7d607e54c62de0d9e7db (sw: insert
image: set anchor to at-char by default, 2019-11-18), that defaulted to
at-char anchoring for charts and images.

What was not considered is that math objects had a previous as-char
default (not to-para), and that is supposed to be unchanged.

(cherry picked from commit a2f85c062aafb3fd9dfb1c6c6e87e1e73e7545a3)

Change-Id: I2a91af6425035b48a0e47ad9b10939945855cd16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87997
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 
(cherry picked from commit 282cf1507d51573e5e9a4611b1e775b433168ca7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88228
Reviewed-by: Michael Stahl 
Reviewed-by: Michael Weghorn 
Tested-by: Michael Weghorn 

diff --git a/sw/CppunitTest_sw_core_doc.mk b/sw/CppunitTest_sw_core_doc.mk
new file mode 100644
index ..487e02322ef4
--- /dev/null
+++ b/sw/CppunitTest_sw_core_doc.mk
@@ -0,0 +1,72 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_core_doc))
+
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_core_doc))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_core_doc, \
+sw/qa/core/doc/doc \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_core_doc, \
+comphelper \
+cppu \
+cppuhelper \
+sal \
+sfx \
+sw \
+test \
+unotest \
+utl \
+vcl \
+svt \
+tl \
+svl \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_core_doc,\
+boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_core_doc,\
+-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/core/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
+-I$(SRCDIR)/sw/qa/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_core_doc,\
+   udkapi \
+   offapi \
+   oovbaapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_core_doc))
+$(eval $(call gb_CppunitTest_use_vcl,sw_core_doc))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_core_doc,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_core_doc,\
+officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_core_doc))
+
+$(eval $(call gb_CppunitTest_use_uiconfigs,sw_core_doc, \
+modules/swriter \
+))
+
+$(eval $(call gb_CppunitTest_use_more_fonts,sw_core_doc))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index fa571852aea5..06ab4c8f8fa3 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -105,6 +105,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 CppunitTest_sw_apitests \
 CppunitTest_sw_unowriter \
 CppunitTest_sw_core_text \
+CppunitTest_sw_core_doc \
 CppunitTest_sw_uibase_shells \
 ))
 
diff --git a/sw/inc/IDocumentContentOperations.hxx 
b/sw/inc/IDocumentContentOperations.hxx
index 6ba51df9f740..b6857c346a33 100644
--- a/sw/inc/IDocumentContentOperations.hxx
+++ b/sw/inc/IDocumentContentOperations.hxx
@@ -180,7 +180,7 @@ public:
 */
 virtual SwFlyFrameFormat* InsertEmbObject(
 const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj,
-const SfxItemSet* pFlyAttrSet) = 0;
+SfxItemSet* pFlyAttrSet) = 0;
 
 virtual SwFlyFrameFormat* InsertOLE(
 const SwPaM &rRg, const OUString& rObjName, sal_Int64 nAspect,
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index b928420ea824..17348494d6d6 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -622,7 +622,7 @@ public:
 bool GetPageNumber( long nYPos, bool bAtCursorPos, sal_uInt16& rPhyNum, 
sal_uInt16& rVirtNum, OUString &rDisplay ) const;
 
 SwFlyFr

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

2020-02-20 Thread Szymon Kłos (via logerrit)
 svx/uiconfig/ui/sidebarparagraph.ui |4 
 1 file changed, 4 deletions(-)

New commits:
commit d7cab304e7dd22fd12443a1ee3b6a9c463bf9a3d
Author: Szymon Kłos 
AuthorDate: Thu Feb 20 19:17:39 2020 +0100
Commit: Szymon Kłos 
CommitDate: Thu Feb 20 19:17:39 2020 +0100

Fix build

Change-Id: Ia38f9a66c5743b524e84887e5dc23535710f2db6

diff --git a/svx/uiconfig/ui/sidebarparagraph.ui 
b/svx/uiconfig/ui/sidebarparagraph.ui
index 6433ab60612c..ce0b0dda1379 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -381,11 +381,7 @@
   
 
 
-<<< HEAD   (aad94d Silence warnings in salvtables.hxx)
-  
-===
   
->>> CHANGE (8b9246 sidebar: provide indent field boxes with useful id for 
hidin)
 True
 False
 vertical
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Interested in applying to GSoC 2020

2020-02-20 Thread Sarper Akdemir
Hello,

I'm Sarper Akdemir, a 2nd year undergraduate in Electronics and
Communication Engineering Department at Istanbul Technical University.

I've tried to tackle a few easyHacks one classified as an interesting one.
My gerrit dashboard: https://gerrit.libreoffice.org/dashboard/1002376

I am interested in applying to this year's GSoC by contributing to
LibreOffice.
Ideas named "Add Impress shape animations that use a real physics engine"
(1) and "Tests for the VCL graphic backends" (2) caught my attention while
going through
GSoC ideas wiki page.
(1)
https://wiki.documentfoundation.org/Development/GSoC/Ideas#Add_Impress_shape_animations_that_use_a_real_physics_engine
(2)
https://wiki.documentfoundation.org/Development/GSoC/Ideas#Tests_for_the_VCL_graphic_backends

I'd like to ask your suggestions on some easyHacks, bugs or feature
requests that I can work on, which will help me familiarize parts of the
code base related to these GSoC ideas.

With best regards,
Sarper Akdemir
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2020-02-20 Thread Michael Stahl (via logerrit)
 sw/source/core/inc/rolbck.hxx  |4 ++--
 sw/source/core/undo/rolbck.cxx |   12 
 sw/source/core/undo/undobj.cxx |   10 +-
 sw/source/core/undo/untbl.cxx  |2 +-
 4 files changed, 16 insertions(+), 12 deletions(-)

New commits:
commit 783ff7aacf72d907b43b26926131966b199ebb90
Author: Michael Stahl 
AuthorDate: Tue Nov 19 10:54:57 2019 +0100
Commit: Miklos Vajna 
CommitDate: Thu Feb 20 18:52:08 2020 +0100

sw: fix invalid downcast of SwDrawFrameFormat in DelContentIndex()

failure in UITest_writer_tests6:

sw/source/core/undo/undobj.cxx:1021:47: runtime error: downcast of address 
0x61300019d3c0 which does not point to an object of type 'SwFlyFrameFormat'
0x61300019d3c0:m note: object is of type 'SwDrawFrameFormat'
 a2 01 80 19  50 ac d1 9e 14 7f 00 00  00 af 19 00 30 61 00 00  e8 4f 
0b 00 b0 61 00 00  40 dd 40 00
  ^~~
  vptr for 'SwDrawFrameFormat'
 in SwUndoSaveContent::DelContentIndex(SwPosition const&, SwPosition 
const&, DelContentType) at sw/source/core/undo/undobj.cxx:1021:47 
(instdir/program/../program/libswlo.so +0xf8e5833)

Also lose the ridiculous overloading across derived classes.

(cherry picked from commit 8f7274682661baec4c9b160ee2165972bbfa9881)

Conflicts:
sw/source/core/undo/undobj.cxx

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

diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index 2feec7e6d973..619b0577c613 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -361,8 +361,8 @@ public:
 void Add( SwTextAttr* pTextHt, sal_uLong nNodeIdx, bool bNewAttr );
 void Add( SwFormatColl*, sal_uLong nNodeIdx, SwNodeType nWhichNd );
 void Add( const ::sw::mark::IMark&, bool bSavePos, bool bSaveOtherPos );
-void Add( SwFrameFormat& rFormat );
-void Add( SwFlyFrameFormat&, sal_uInt16& rSetPos );
+void AddChangeFlyAnchor( SwFrameFormat& rFormat );
+void AddDeleteFly( SwFrameFormat&, sal_uInt16& rSetPos );
 void Add( const SwTextFootnote& );
 void Add( const SfxItemSet & rSet, const SwCharFormat & rCharFormat);
 
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index 495ce724032d..973054c47664 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -1067,18 +1067,21 @@ void SwHistory::Add(const ::sw::mark::IMark& rBkmk, 
bool bSavePos, bool bSaveOth
 m_SwpHstry.push_back( std::move(pHt) );
 }
 
-void SwHistory::Add( SwFrameFormat& rFormat )
+void SwHistory::AddChangeFlyAnchor(SwFrameFormat& rFormat)
 {
 std::unique_ptr pHt(new SwHistoryChangeFlyAnchor( rFormat 
));
 m_SwpHstry.push_back( std::move(pHt) );
 }
 
-void SwHistory::Add( SwFlyFrameFormat& rFormat, sal_uInt16& rSetPos )
+void SwHistory::AddDeleteFly(SwFrameFormat& rFormat, sal_uInt16& rSetPos)
 {
 OSL_ENSURE( !m_nEndDiff, "History was not deleted after REDO" );
 
 const sal_uInt16 nWh = rFormat.Which();
-if( RES_FLYFRMFMT == nWh || RES_DRAWFRMFMT == nWh )
+(void) nWh;
+// only Flys!
+assert((RES_FLYFRMFMT == nWh && dynamic_cast(&rFormat))
+|| (RES_DRAWFRMFMT == nWh && 
dynamic_cast(&rFormat)));
 {
 std::unique_ptr pHint(new SwHistoryTextFlyCnt( &rFormat 
));
 m_SwpHstry.push_back( std::move(pHint) );
@@ -1087,10 +1090,11 @@ void SwHistory::Add( SwFlyFrameFormat& rFormat, 
sal_uInt16& rSetPos )
 if( SfxItemState::SET == rFormat.GetItemState( RES_CHAIN, false,
 reinterpret_cast(&pChainItem) ))
 {
+assert(RES_FLYFRMFMT == nWh); // not supported on SdrObjects
 if( pChainItem->GetNext() || pChainItem->GetPrev() )
 {
 std::unique_ptr pHt(
-new SwHistoryChangeFlyChain( rFormat, *pChainItem ));
+new 
SwHistoryChangeFlyChain(static_cast(rFormat), *pChainItem));
 m_SwpHstry.insert( m_SwpHstry.begin() + rSetPos++, 
std::move(pHt) );
 if ( pChainItem->GetNext() )
 {
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 452091c548f8..dcbe3a4a04cc 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -992,7 +992,7 @@ void SwUndoSaveContent::DelContentIndex( const SwPosition& 
rMark,
 // Do not try to move the anchor to a 
table!
 && rMark.nNode.GetNode().IsTextNode())
 {
-pHistory->Add( *pFormat );
+pHistory->AddChangeFlyAnchor(*pFormat);
 SwFormatAnchor aAnch( *pAnchor );
 

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

2020-02-20 Thread Michael Stahl (via logerrit)
 sw/inc/undobj.hxx 
|6 
 sw/qa/core/uwriter.cxx
|3 
 sw/qa/extras/uiwriter/data/redline_fly_at_para_one_paragraph.odt  
|binary
 sw/qa/extras/uiwriter/data/redline_fly_duplication_at_para_2nd_paragraph.fodt 
|  222 ++
 sw/qa/extras/uiwriter/uiwriter.cxx
|   16 
 sw/qa/uitest/writer_tests4/tdf108124.py   
|   15 
 sw/source/core/access/accframebase.cxx
|3 
 sw/source/core/access/accmap.cxx  
|   12 
 sw/source/core/doc/DocumentContentOperationsManager.cxx   
|   45 --
 sw/source/core/doc/docedt.cxx 
|   57 --
 sw/source/core/edit/edglbldc.cxx  
|2 
 sw/source/core/layout/trvlfrm.cxx 
|   17 
 sw/source/core/undo/undobj.cxx
|   96 +++-
 sw/source/core/undo/untblk.cxx
|   17 
 14 files changed, 371 insertions(+), 140 deletions(-)

New commits:
commit 1c31d13fe0b74336b242f8ee41c28b3fe672e44c
Author: Michael Stahl 
AuthorDate: Thu Dec 5 16:49:33 2019 +0100
Commit: Miklos Vajna 
CommitDate: Thu Feb 20 18:52:24 2020 +0100

tdf#121300 sw: consistent fly at-pargraph selection

As a follow-up to commit 28b77c89dfcafae82cf2a6d85731b643ff9290e5, add
IsSelectFrameAnchoredAtPara() function and use it to harmonize at-para
fly selection across all relevant operations:

* CopyImpl:
  - it had a pre-existing bugs that would lose a fly anchored to the
2nd (1st fully selected) node of a redline
  - remove a bunch of code for finding the last node of the body content,
which doesn't matter for the remaining at-fly checks
  - flys that already existed at the insert position need to have their
anchors corrected

* DeleteRange:
  - get rid of the bDelFwrd checks

* MoveRange:
  - the ALLFLYS flag would be obsoleted by the new selection, were it
not for the writerfiler "special hack", see below

* also adapt A11y and UI selection, SwRootFrame::CalcFrameRects()

The selection behavior is changed:

* the bDelFwrd case is quite odd, some code was checking whether a
  deletion was "forward" or "backward" and removing only the flys at the
  point node while retaining the flys at the mark node; this worked in a
  very non-obvious way relying on sw_GetJoinFlags actually calling
  Exchange() on the cursor, and then SwUndoDelete stored it in
  m_bJoinNext, but it turns out that only SwUndoMove also has a
  m_bJoinNext and it's dead, and no other Undo has such a flag, so this
  only worked for "delete". It's not obvious what the value of this is,
  let's just ignore the "direction".

* Selections exclude the start and end position except if it's a fully
  selected node or at the start or end of a section (i.e. Ctrl+A should
  also select every at-para fly).

* An exception is made in case the selection looks like it's a
  backspace/delete joining 2 paragraphs; flys are not deleted in that
  case because it seemed annoying (and as it happens, Word does not
  appear to delete flys in that case), particularly if both of the nodes
  are already empty. This is done with a heuristic, it's conceivable to
  pass down some flag from DelLeft()/DelRight() but probably this is
  good enough.

A special hack is needed to keep writerfilter happy for now; it likes to
anchor flys at nodes which it then deletes in RemoveLastParagraph(),
which likely could be improved there.  The ALLFLYS usage in
SwRangeRedline::MoveFromSection() could be removed (because the
end-of-section check already handles the case) except for this, because
it turns out that the ODF import runs SetRedlineFlags with a temporarily
reset IsInXMLImport() flag because of its effect in thints.cxx, so
during the move IsSelectFrameAnchoredAtPara() can't check it.

tdf#108124 scenario works better, now everything that's selected is both
copied and deleted.

Fixes the problem where an at-para fly at the 2nd node of a redline
where the 1st node is partially deleted was lost on ODF export.

(cherry picked from commit 91b2325808a75174f284c48c8b8afc118fad74e4)

Conflicts:
sw/source/core/undo/undobj.cxx
sw/source/core/undo/untblk.cxx

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

diff --git a/sw

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

2020-02-20 Thread Michael Stahl (via logerrit)
 sw/qa/extras/ooxmlexport/data/ooo39250-1-min.rtf |   42 +++
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx   |   16 
 sw/source/core/access/accframebase.cxx   |8 
 sw/source/core/access/accmap.cxx |   17 -
 sw/source/core/layout/trvlfrm.cxx|   16 +++-
 sw/source/filter/ww8/docxsdrexport.cxx   |   14 +++
 6 files changed, 100 insertions(+), 13 deletions(-)

New commits:
commit 53b9c0a13ce71a0fc04533d701a8d6e49a170380
Author: Michael Stahl 
AuthorDate: Thu Jul 18 18:27:18 2019 +0200
Commit: Miklos Vajna 
CommitDate: Thu Feb 20 18:51:55 2020 +0100

(related: tdf#110442) sw: fix a11y/UI selection of at-char flys

SwAccessibleFrameBase::GetSelectedState() and SwAccessibleMap ignored
FLY_AT_CHAR flys for no apparent reason.

SwRootFrame::CalcFrameRects() is the function that determines the
selection overlay painted in the view.

(cherry picked from commit be55b1915fd0374f8f25c2c1be2b39744666d052)

Conflicts:
sw/source/core/access/accmap.cxx
sw/source/core/layout/trvlfrm.cxx

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

diff --git a/sw/source/core/access/accframebase.cxx 
b/sw/source/core/access/accframebase.cxx
index f53edaa4ea3b..c08e255a6725 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -38,6 +38,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -343,6 +344,13 @@ bool SwAccessibleFrameBase::GetSelectedState( )
 && (nHere < nEndIndex ) )
 return true;
 }
+else if (rAnchor.GetAnchorId() == 
RndStdIds::FLY_AT_CHAR)
+{
+if (IsDestroyFrameAnchoredAtChar(*pPos, *pStart, 
*pEnd))
+{
+return true;
+}
+}
 break;
 }
 // else: this PaM doesn't point to this paragraph
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index bd77f85b5edb..5b42a664f0c2 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -73,6 +73,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
@@ -1196,7 +1197,6 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
 sal_uLong nEndIndex = pEnd->nNode.GetIndex();
 if ((nStartIndex <= nLastNode) && (nFirstNode 
<= nEndIndex))
 {
-// FIXME: what about missing FLY_AT_CHAR?
 if( rAnchor.GetAnchorId() == 
RndStdIds::FLY_AS_CHAR )
 {
 if( ( ((nHere == nStartIndex) && 
(nIndex >= pStart->nContent.GetIndex())) || (nHere > nStartIndex) )
@@ -1230,6 +1230,21 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
 static_cast < 
::accessibility::AccessibleShape* >(xAcc.get())->ResetState( 
AccessibleStateType::SELECTED );
 }
 }
+else if (rAnchor.GetAnchorId() == 
RndStdIds::FLY_AT_CHAR)
+{
+uno::Reference const 
xAcc((*aIter).second);
+if (xAcc.is())
+{
+if 
(IsDestroyFrameAnchoredAtChar(*pPos, *pStart, *pEnd))
+{
+
static_cast<::accessibility::AccessibleShape*>(xAcc.get())->SetState( 
AccessibleStateType::SELECTED );
+}
+else
+{
+
static_cast<::accessibility::AccessibleShape*>(xAcc.get())->ResetState( 
AccessibleStateType::SELECTED );
+}
+}
+}
 }
 }
 }
diff --git a/sw/source/core/layout/trvlfrm.cxx 
b/sw/source/core/layout/trvlfrm.cxx
index 343b2c01b788..5c466862c816 100644
--- a/sw/source/core/layout/trvlfrm.cxx
+++ b/sw/source/core/layout/trvlfrm.cxx
@@ -47,6 +47,7 

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

2020-02-20 Thread Michael Stahl (via logerrit)
 sw/source/core/doc/DocumentContentOperationsManager.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 5ae142a2169e3db0fd138e91e71e3d696580d453
Author: Michael Stahl 
AuthorDate: Fri Aug 9 12:11:17 2019 +0200
Commit: Miklos Vajna 
CommitDate: Thu Feb 20 18:51:21 2020 +0100

tdf#126626 sw: fix duplicate SwUndoInsLayFormat in single-node Copy

Fly Undo created later in SwUndoInserts::SetInsertRange(); suppress it
in DocumentContentOperationsManager::CopyImpl().

(regression from 28b77c89dfcafae82cf2a6d85731b643ff9290e5)

(cherry picked from commit 844f9fa6ba7108b12758202c5fd08daa2a707641)

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

diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx 
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 5b07f7b48fb8..137eb9a593ec 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -4608,6 +4608,8 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& 
rPam, SwPosition& rPos,
 
 // copy at-char flys in rPam
 aInsPos = *pDestTextNd; // update to new (start) node for 
flys
+// tdf#126626 prevent duplicate Undos
+::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo());
 CopyFlyInFlyImpl(aRg, &rPam, aInsPos, false);
 
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Michael Stahl (via logerrit)
 sw/inc/undobj.hxx   |   15 +
 sw/source/core/doc/DocumentContentOperationsManager.cxx |  217 ++--
 sw/source/core/doc/DocumentLayoutManager.cxx|2 
 sw/source/core/doc/doccomp.cxx  |2 
 sw/source/core/doc/docdesc.cxx  |4 
 sw/source/core/doc/docedt.cxx   |   99 +--
 sw/source/core/doc/docfmt.cxx   |2 
 sw/source/core/doc/docglbl.cxx  |2 
 sw/source/core/doc/docredln.cxx |2 
 sw/source/core/doc/tblcpy.cxx   |2 
 sw/source/core/doc/tblrwcl.cxx  |2 
 sw/source/core/docnode/section.cxx  |2 
 sw/source/core/inc/DocumentContentOperationsManager.hxx |3 
 sw/source/core/inc/frmtool.hxx  |6 
 sw/source/core/inc/mvsave.hxx   |   18 -
 sw/source/core/layout/frmtool.cxx   |  105 ++-
 sw/source/core/layout/wsfrm.cxx |   13 
 sw/source/core/txtnode/atrftn.cxx   |2 
 sw/source/core/undo/undobj.cxx  |   58 +++-
 sw/source/core/undo/untblk.cxx  |  139 +++---
 sw/source/filter/basflt/shellio.cxx |   24 -
 21 files changed, 510 insertions(+), 209 deletions(-)

New commits:
commit 5e79482c28db7d8e479c603eb3e9eb276ad4ad7d
Author: Michael Stahl 
AuthorDate: Thu Jul 11 18:37:28 2019 +0200
Commit: Miklos Vajna 
CommitDate: Thu Feb 20 18:51:02 2020 +0100

tdf#117185 tdf#110442 sw: bring harmony & peace to fly at-char selection

Use IsDestroyFrameAnchoredAtChar() to harmonize the at-char fly
selection across all relevant operations:

* CopyImpl: this is the most tricky one:
- the code in CopyWithFlyInFly() and CopyFlyInFlyImpl() is quite con-
  voluted as it needs to do some things ignoring a partially selected
  start node, while including it in other cases
- it had pre-existing bugs too that would lose a fly anchored to the
  2nd (1st fully selected) node of a redline
- now it needs to copy the flys in the selection if it is inside a
  single node
- another complication is that flys that already existed at the
  insert position need to have their anchors corrected
- SwUndoInsLayFormat need to be created for the appropriate flys
- SwUndoInserts Undo/Redo needs to run the nested SwUndoInsLayFormat
  at the appropriate time
- SwUndoInserts::UndoImpl() needs a special case to *never* delete
  flys at the start/end of the selection because those are handled by
  nested SwUndoInsLayFormat
- Insert File (shellio.cxx) needs adapting to the SwUndoInserts change

* DeleteRange: this just needs to delete the flys via DelFlyInRange()

* MoveRange:
- this is used by the old SwRangeRedline Show/Hide, i.e. on ODF export
- the SaveFlyInRange()/RestFlyInRange() was rather inadequate and
  didn't even restore content indexes at all...

* IsShown: the sw_redlinehide code needs to check visibility against
  the (inverted) extents

The selection behavior is changed so that at-char flys in the start and
end node of the selection are also selected, instead of having their
anchor moved to a different content index by the operation. This appears
more obvious and user-friendly, fixes tdf#110442, and is also more like
what Word does.

Selections exclude the start and end position except if it's a fully
selected node or at the start or end of a section (i.e. Ctrl+A should
also select every at-char fly).

A special hack is needed to keep writerfilter happy for now; it likes to
anchor flys at nodes which it then deletes in RemoveLastParagraph(),
which likely could be improved there (disposing the SwXParagraph runs
into the same problem...).

Crashes fixed by this:
tdf#117185
tdf#117215 except comment#12
tdf#124720
tdf#124721
tdf#124739

Previously fixed bugs tested:
i#97570 plus the 2 bugs that already have UITests

(cherry picked from commit 28b77c89dfcafae82cf2a6d85731b643ff9290e5)

Conflicts:
sw/qa/uitest/writer_tests6/tdf107975.py
sw/source/core/doc/docedt.cxx
sw/source/core/inc/frmtool.hxx
sw/source/core/layout/frmtool.cxx

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

diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 8610ab3d38a6..2d8b02ce6e12 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -35,6 +35,7 @@ struct SwPosition;
 class SwDoc;
 class SwTextFormatColl;
 class SwFrameFormat;
+class Sw

[Libreoffice-commits] core.git: connectivity/Library_dbtools.mk connectivity/source sdext/Library_pdfimport.mk sdext/source slideshow/Library_slideshow.mk slideshow/source svx/Library_svxcore.mk svx/L

2020-02-20 Thread Adam Majer (via logerrit)
 connectivity/Library_dbtools.mk   |1 
 connectivity/source/commontools/RowFunctionParser.cxx |   36 +++
 sdext/Library_pdfimport.mk|1 
 sdext/source/pdfimport/pdfparse/pdfparse.cxx  |   14 +-
 slideshow/Library_slideshow.mk|4 
 slideshow/source/engine/smilfunctionparser.cxx|   42 
 svx/Library_svx.mk|1 
 svx/Library_svxcore.mk|1 
 svx/Module_svx.mk |1 
 svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx |   50 +-
 10 files changed, 71 insertions(+), 80 deletions(-)

New commits:
commit a7be9479a04de2f0059c5769bbd9dc354c84136b
Author: Adam Majer 
AuthorDate: Wed Feb 19 15:29:06 2020 +0100
Commit: Tomáš Chvátal 
CommitDate: Thu Feb 20 18:50:24 2020 +0100

Move Boost.Spirit usage away from legacy namespace

Remove BOOST_SPIRIT_USE_OLD_NAMESPACE defines and move all usage
of Boost.Spirit to boost::spirit::classic namespace.

Change-Id: I7dc5bed4d1b51f4a0bd1a4ae40c2024222127ce3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89079
Tested-by: Jenkins
Reviewed-by: Tomáš Chvátal 

diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index d91cdfc553fe..6869cd0bbc6b 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Library_Library,dbtools))
 
 $(eval $(call gb_Library_add_defs,dbtools,\
-DOOO_DLLIMPLEMENTATION_DBTOOLS \
-   -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
 ))
 
 $(eval $(call 
gb_Library_set_componentfile,dbtools,connectivity/source/dbtools/dbtools))
diff --git a/connectivity/source/commontools/RowFunctionParser.cxx 
b/connectivity/source/commontools/RowFunctionParser.cxx
index 2246b7636797..21f5e638a651 100644
--- a/connectivity/source/commontools/RowFunctionParser.cxx
+++ b/connectivity/source/commontools/RowFunctionParser.cxx
@@ -282,7 +282,7 @@ public:
( '-' 
multiplicative_expression )* )
 
 */
-class ExpressionGrammar : public ::boost::spirit::grammar< ExpressionGrammar >
+class ExpressionGrammar : public ::boost::spirit::classic::grammar< 
ExpressionGrammar >
 {
 public:
 /** Create an arithmetic expression grammar
@@ -301,14 +301,14 @@ public:
 // grammar definition
 explicit definition( const ExpressionGrammar& self )
 {
-using ::boost::spirit::space_p;
-using ::boost::spirit::range_p;
-using ::boost::spirit::lexeme_d;
-using ::boost::spirit::ch_p;
-using ::boost::spirit::int_p;
-using ::boost::spirit::as_lower_d;
-using ::boost::spirit::strlit;
-using ::boost::spirit::inhibit_case;
+using ::boost::spirit::classic::space_p;
+using ::boost::spirit::classic::range_p;
+using ::boost::spirit::classic::lexeme_d;
+using ::boost::spirit::classic::ch_p;
+using ::boost::spirit::classic::int_p;
+using ::boost::spirit::classic::as_lower_d;
+using ::boost::spirit::classic::strlit;
+using ::boost::spirit::classic::inhibit_case;
 
 
 typedef inhibit_case > token_t;
@@ -360,7 +360,7 @@ public:
 BOOST_SPIRIT_DEBUG_RULE(andExpression);
 }
 
-const ::boost::spirit::rule< ScannerT >& start() const
+const ::boost::spirit::classic::rule< ScannerT >& start() const
 {
 return basicExpression;
 }
@@ -368,11 +368,11 @@ public:
 private:
 // the constituents of the Spirit arithmetic expression grammar.
 // For the sake of readability, without 'ma' prefix.
-::boost::spirit::rule< ScannerT >   basicExpression;
-::boost::spirit::rule< ScannerT >   unaryFunction;
-::boost::spirit::rule< ScannerT >   assignment;
-::boost::spirit::rule< ScannerT >   integer,argument;
-::boost::spirit::rule< ScannerT >   orExpression,andExpression;
+::boost::spirit::classic::rule< ScannerT >   basicExpression;
+::boost::spirit::classic::rule< ScannerT >   unaryFunction;
+::boost::spirit::classic::rule< ScannerT >   assignment;
+::boost::spirit::classic::rule< ScannerT >   integer,argument;
+::boost::spirit::classic::rule< ScannerT >   
orExpression,andExpression;
 };
 
 const ParserContextSharedPtr& getContext() const
@@ -415,11 +415,11 @@ std::shared_ptr const & 
FunctionParser::parseFunction( const OUS
 
 ExpressionGrammar aExpressionGrammer( pContext );
 
-const ::boost::spirit::parse_info aParseInfo(
-::boost::spirit::parse( aStart,
+const ::boost::spirit::classic::parse_info aParseInfo(
+::boost

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

2020-02-20 Thread Michael Meeks (via logerrit)
 svx/uiconfig/ui/sidebarparagraph.ui |4 
 1 file changed, 4 insertions(+)

New commits:
commit 578667856462c9f7374b0714c5cc311191122b00
Author: Michael Meeks 
AuthorDate: Thu Feb 20 16:43:43 2020 +
Commit: Michael Meeks 
CommitDate: Thu Feb 20 18:43:06 2020 +0100

sidebar: provide indent field boxes with useful id for hiding on mobile.

Change-Id: I45feb65dbc48810f27e4f7151de46bafcb54af00
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89128
Tested-by: Michael Meeks 
Reviewed-by: Michael Meeks 

diff --git a/svx/uiconfig/ui/sidebarparagraph.ui 
b/svx/uiconfig/ui/sidebarparagraph.ui
index 4e0a7df6836f..6433ab60612c 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -381,7 +381,11 @@
   
 
 
+<<< HEAD   (aad94d Silence warnings in salvtables.hxx)
   
+===
+  
+>>> CHANGE (8b9246 sidebar: provide indent field boxes with useful id for 
hidin)
 True
 False
 vertical
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Michael Meeks (via logerrit)
 loleaflet/src/control/Control.MobileWizard.js |   15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit a5297847888a2f0f54a2a81c9012c9fd687454b9
Author: Michael Meeks 
AuthorDate: Thu Feb 20 17:08:01 2020 +
Commit: Michael Meeks 
CommitDate: Thu Feb 20 18:42:30 2020 +0100

mobile: hide impress indent paragraph properties.

Users confused between outline and indent settings.

Change-Id: I693e41d4d456e47f53d7f6392cde9bec6b038029
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89149
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/loleaflet/src/control/Control.MobileWizard.js 
b/loleaflet/src/control/Control.MobileWizard.js
index 0c6859d0d..e18b8ccdf 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -367,7 +367,7 @@ L.Control.MobileWizard = L.Control.extend({
var textIdx = this._findIdxInParentById(deck, textName);
 
if (stylesIdx >= 0 && this.map.getDocType() === 
'spreadsheet')
-   {   // remove rather useless styles panel
+   {   // remove rather useless calc styles panel
deck.children.splice(stylesIdx, 1);
}
else if (stylesIdx >= 0 && textIdx >= 0)
@@ -376,10 +376,15 @@ L.Control.MobileWizard = L.Control.extend({
deck.children[textIdx].children[0].children = 
moveContent.concat(deck.children[textIdx].children[0].children);
deck.children.splice(stylesIdx, 1); //remove 
the styles property
}
-   this._removeItems(deck, ['cellbordertype', 
'borderlinestyle', 'borderlinecolor',
-'editcontour', 'spacingbar', 
'linespacing',
-'stylenew', 'styleupdate',
-'beginarrowstyle', 
'endarrowstyle']);
+   var removeItems = ['cellbordertype', 'borderlinestyle', 
'borderlinecolor',
+  'editcontour', 'spacingbar', 
'linespacing',
+  'stylenew', 'styleupdate',
+  'beginarrowstyle', 'endarrowstyle'];
+
+   if (this.map.getDocType() === 'presentation')
+   removeItems.push('indentfieldbox');
+
+   this._removeItems(deck, removeItems);
}
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Henry Castro (via logerrit)
 loleaflet/.eslintignore |1 
 loleaflet/Makefile.am   |5 
 loleaflet/js/json2.js   |  519 
 3 files changed, 523 insertions(+), 2 deletions(-)

New commits:
commit 87ff57fe5b2aeb7ae3f4c762085253ca1c891161
Author: Henry Castro 
AuthorDate: Thu Feb 20 12:04:32 2020 -0400
Commit: Henry Castro 
CommitDate: Thu Feb 20 18:32:48 2020 +0100

loleaflet: import json2.js library

The file was imported from node_modules/json-js/json2.js
the main reason is to analyze the source code, debug and patch
if necessary

To get the source code from npm repository

make libs

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

diff --git a/loleaflet/.eslintignore b/loleaflet/.eslintignore
index 3ea0222dc..ca03adc2e 100644
--- a/loleaflet/.eslintignore
+++ b/loleaflet/.eslintignore
@@ -1,4 +1,5 @@
 # We only directly edit toolbar.js in dist/
+**/js/json2.js
 **/js/select2.js
 **/js/vex.combined.js
 **/js/sanitize-url.js
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index a74a47a9c..413ef7f66 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -72,6 +72,7 @@ define npm_source
 endef
 
 NODE_MODULES_SRC =\
+   json-js@1.1.2 \
select2@4.0.1 \
vex-js@4.1.0 \
l10n-for-node@0.0.1 \
@@ -122,10 +123,10 @@ NODE_MODULES_JS =\
node_modules/jquery-contextmenu/dist/jquery.contextMenu.js \
node_modules/jquery-ui/jquery-ui.js \
node_modules/smartmenus/dist/jquery.smartmenus.js \
-   node_modules/autolinker/dist/Autolinker.js \
-   node_modules/json-js/json2.js
+   node_modules/autolinker/dist/Autolinker.js
 
 LOLEAFLET_LIBS_JS =\
+   json2.js \
select2.js \
vex.combined.js \
sanitize-url.js
diff --git a/loleaflet/js/json2.js b/loleaflet/js/json2.js
new file mode 100644
index 0..d7cde8417
--- /dev/null
+++ b/loleaflet/js/json2.js
@@ -0,0 +1,519 @@
+/*
+json2.js
+2015-05-03
+
+Public Domain.
+
+NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
+
+See http://www.JSON.org/js.html
+
+
+This code should be minified before deployment.
+See http://javascript.crockford.com/jsmin.html
+
+USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
+NOT CONTROL.
+
+
+This file creates a global JSON object containing two methods: stringify
+and parse. This file is provides the ES5 JSON capability to ES3 systems.
+If a project might run on IE8 or earlier, then this file should be 
included.
+This file does nothing on ES5 systems.
+
+JSON.stringify(value, replacer, space)
+value   any JavaScript value, usually an object or array.
+
+replaceran optional parameter that determines how object
+values are stringified for objects. It can be a
+function or an array of strings.
+
+space   an optional parameter that specifies the indentation
+of nested structures. If it is omitted, the text will
+be packed without extra whitespace. If it is a number,
+it will specify the number of spaces to indent at each
+level. If it is a string (such as '\t' or ' '),
+it contains the characters used to indent at each 
level.
+
+This method produces a JSON text from a JavaScript value.
+
+When an object value is found, if the object contains a toJSON
+method, its toJSON method will be called and the result will be
+stringified. A toJSON method does not serialize: it returns the
+value represented by the name/value pair that should be serialized,
+or undefined if nothing should be serialized. The toJSON method
+will be passed the key associated with the value, and this will be
+bound to the value
+
+For example, this would serialize Dates as ISO strings.
+
+Date.prototype.toJSON = function (key) {
+function f(n) {
+// Format integers to have at least two digits.
+return n < 10 
+? '0' + n 
+: n;
+}
+
+return this.getUTCFullYear()   + '-' +
+ f(this.getUTCMonth() + 1) + '-' +
+ f(this.getUTCDate())  + 'T' +
+ f(this.getUTCHours()) + ':' +
+ f(this.getUTCMinutes())   + ':' +
+ f(this.getUTCSeconds())   + 'Z';
+};
+
+You can provide an optional replacer method. It will be passed the
+ 

[Libreoffice-commits] core.git: compilerplugins/clang include/svtools include/vcl

2020-02-20 Thread Noel Grandin (via logerrit)
 compilerplugins/clang/unnecessaryvirtual-dead.results |   22 -
 compilerplugins/clang/unnecessaryvirtual.results  |  254 --
 include/svtools/valueset.hxx  |2 
 include/vcl/field.hxx |4 
 include/vcl/treelistbox.hxx   |2 
 5 files changed, 241 insertions(+), 43 deletions(-)

New commits:
commit 6ed374acf4b4ef11f7336d8bf04e9d9f245305d8
Author: Noel Grandin 
AuthorDate: Thu Feb 20 16:16:14 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 20 18:31:41 2020 +0100

loplugin:unnecessaryvirtual

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

diff --git a/compilerplugins/clang/unnecessaryvirtual-dead.results 
b/compilerplugins/clang/unnecessaryvirtual-dead.results
index a219ee8c5882..979b850593bd 100644
--- a/compilerplugins/clang/unnecessaryvirtual-dead.results
+++ b/compilerplugins/clang/unnecessaryvirtual-dead.results
@@ -1,16 +1,14 @@
 basic/source/comp/codegen.cxx:478
 void (anonymous namespace)::OffSetAccumulator::start(const unsigned char 
*,)
-include/basegfx/utils/unopolypolygon.hxx:97
-void basegfx::unotools::UnoPolyPolygon::modifying()const
-include/canvas/base/bufferedgraphicdevicebase.hxx:108
+canvas/inc/base/bufferedgraphicdevicebase.hxx:107
 void canvas::BufferedGraphicDeviceBase::destroyBuffers()
-include/canvas/base/graphicdevicebase.hxx:306
+canvas/inc/base/graphicdevicebase.hxx:305
 void canvas::GraphicDeviceBase::removePropertyChangeListener(const class 
rtl::OUString &,const class com::sun::star::uno::Reference &,)
-include/canvas/base/graphicdevicebase.hxx:319
+canvas/inc/base/graphicdevicebase.hxx:318
 void canvas::GraphicDeviceBase::removeVetoableChangeListener(const class 
rtl::OUString &,const class com::sun::star::uno::Reference &,)
-include/svtools/valueset.hxx:301
-void ValueSet::UserDraw(const class UserDrawEvent &,)
-sc/source/core/opencl/formulagroupcl.cxx:1062
+include/basegfx/utils/unopolypolygon.hxx:97
+void basegfx::unotools::UnoPolyPolygon::modifying()const
+sc/source/core/opencl/formulagroupcl.cxx:1069
 void sc::opencl::(anonymous 
namespace)::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class 
std::__cxx11::basic_stringstream &,)
 slideshow/source/engine/animationfactory.cxx:437
 void slideshow::internal::(anonymous 
namespace)::GenericAnimation::prefetch()
@@ -22,11 +20,11 @@ vcl/inc/salmenu.hxx:81
 void SalMenu::RemoveMenuBarButton(unsigned short,)
 vcl/inc/salobj.hxx:49
 void SalObject::Enable(_Bool,)
-writerfilter/source/ooxml/OOXMLFactory.hxx:72
+writerfilter/source/ooxml/OOXMLFactory.hxx:67
 void writerfilter::ooxml::OOXMLFactory_ns::startAction(class 
writerfilter::ooxml::OOXMLFastContextHandler *,)
-writerfilter/source/ooxml/OOXMLFactory.hxx:73
+writerfilter/source/ooxml/OOXMLFactory.hxx:68
 void writerfilter::ooxml::OOXMLFactory_ns::charactersAction(class 
writerfilter::ooxml::OOXMLFastContextHandler *,const class rtl::OUString &,)
-writerfilter/source/ooxml/OOXMLFactory.hxx:74
+writerfilter/source/ooxml/OOXMLFactory.hxx:69
 void writerfilter::ooxml::OOXMLFactory_ns::endAction(class 
writerfilter::ooxml::OOXMLFastContextHandler *,)
-writerfilter/source/ooxml/OOXMLFactory.hxx:75
+writerfilter/source/ooxml/OOXMLFactory.hxx:70
 void writerfilter::ooxml::OOXMLFactory_ns::attributeAction(class 
writerfilter::ooxml::OOXMLFastContextHandler *,int,const class 
tools::SvRef &,)
diff --git a/compilerplugins/clang/unnecessaryvirtual.results 
b/compilerplugins/clang/unnecessaryvirtual.results
index bf1f92f1c9d7..c72b7718cdca 100644
--- a/compilerplugins/clang/unnecessaryvirtual.results
+++ b/compilerplugins/clang/unnecessaryvirtual.results
@@ -18,6 +18,200 @@ basic/source/comp/codegen.cxx:531
 void (anonymous namespace)::BufferTransformer::processOpCode2(enum 
SbiOpcode,type-parameter-0-0,type-parameter-0-0,)
 basic/source/comp/codegen.cxx:540
 _Bool (anonymous namespace)::BufferTransformer::processParams()
+canvas/inc/base/basemutexhelper.hxx:58
+void canvas::BaseMutexHelper::disposing()
+canvas/inc/base/bitmapcanvasbase.hxx:72
+struct com::sun::star::geometry::IntegerSize2D 
canvas::BitmapCanvasBase::getSize()
+canvas/inc/base/bitmapcanvasbase.hxx:79
+unsigned char canvas::BitmapCanvasBase::hasAlpha()
+canvas/inc/base/bitmapcanvasbase.hxx:84
+class com::sun::star::uno::Reference 
canvas::BitmapCanvasBase::getScaledBitmap(const struct 
com::sun::star::geometry::RealSize2D &,unsigned char,)
+canvas/inc/base/bitmapcanvasbase.hxx:105
+void canvas::BitmapCanvasBase2::copyRect(const class 
com::sun::star::uno::Reference 
&,const struct com::sun::star::geometry::RealRectangle2D &,const struct 
com::sun::star::rendering::ViewState &,const struct 
com::sun::star::rendering::RenderState &,const struct 
com::sun::star::geometry::RealRect

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

2020-02-20 Thread Noel Grandin (via logerrit)
 compilerplugins/clang/singlevalfields.could-be-bool.results |   10 -
 compilerplugins/clang/singlevalfields.results   |   78 +---
 include/svtools/valueset.hxx|1 
 svtools/source/control/valueacc.cxx |1 
 svtools/source/control/valueimp.hxx |1 
 svtools/source/control/valueset.cxx |   48 +++
 6 files changed, 61 insertions(+), 78 deletions(-)

New commits:
commit e6da8c07dd5584b2d385cbd50f065fecb9b76038
Author: Noel Grandin 
AuthorDate: Thu Feb 20 16:24:33 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 20 18:31:05 2020 +0100

loplugin:singlevalfields

Change-Id: I9ff752b06facfbb04c10c8f9b46b650143b02ca4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89117
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 7c0d9d3961b7..096e5431b48a 100644
--- a/compilerplugins/clang/singlevalfields.could-be-bool.results
+++ b/compilerplugins/clang/singlevalfields.could-be-bool.results
@@ -34,15 +34,15 @@ include/tools/ref.hxx:126
 include/vbahelper/vbapagesetupbase.hxx:50
 VbaPageSetupBase mnOrientPortrait
 sal_Int32
-include/vcl/dialog.hxx:48
-Dialog mnMousePositioned
-long
 include/vcl/headbar.hxx:208
 HeaderBar mnBorderOff1
 long
 include/vcl/headbar.hxx:209
 HeaderBar mnBorderOff2
 long
+include/vcl/toolkit/dialog.hxx:52
+Dialog mnMousePositioned
+long
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx:191
 (anonymous) g_bInGetJavaVM
 sig_atomic_t
@@ -88,7 +88,7 @@ svx/source/inc/cell.hxx:204
 svx/source/table/tablertfimporter.cxx:57
 sdr::table::(anonymous namespace)::RTFCellDefault mnRowSpan
 sal_Int32
-sw/source/filter/ww8/docxexport.hxx:98
+sw/source/filter/ww8/docxexport.hxx:99
 DocxExport m_nHeadersFootersInSection
 sal_Int32
 sw/source/filter/ww8/ww8scan.hxx:58
@@ -118,6 +118,6 @@ vcl/workben/icontest.cxx:147
 workdir/LexTarget/l10ntools/source/cfglex.cxx:2293
 /home/noel/libo2/workdir/LexTarget/l10ntools/source/cfglex.cxx bText
 int
-writerfilter/source/dmapper/PageBordersHandler.hxx:53
+writerfilter/source/dmapper/PageBordersHandler.hxx:51
 writerfilter::dmapper::PageBordersHandler m_eOffsetFrom
 class SectionPropertyMap::BorderOffsetFrom
diff --git a/compilerplugins/clang/singlevalfields.results 
b/compilerplugins/clang/singlevalfields.results
index 5c4f47158587..3f00bed44f28 100644
--- a/compilerplugins/clang/singlevalfields.results
+++ b/compilerplugins/clang/singlevalfields.results
@@ -1,13 +1,13 @@
-avmedia/inc/mediacontrol.hxx:72
+avmedia/inc/mediacontrol.hxx:64
 avmedia::MediaControl maIdle
 avmedia MediaControl Idle
-avmedia/inc/mediacontrol.hxx:73
+avmedia/inc/mediacontrol.hxx:65
 avmedia::MediaControl maChangeTimeIdle
 avmedia MediaControl Change Time Idle
-avmedia/source/framework/soundhandler.hxx:115
+avmedia/source/framework/soundhandler.hxx:114
 avmedia::SoundHandler m_aUpdateIdle
 avmedia SoundHandler Update
-basctl/source/basicide/baside2.hxx:86
+basctl/source/basicide/baside2.hxx:81
 basctl::EditorWindow aHighlighter
 0
 basctl/source/inc/dlged.hxx:132
@@ -40,6 +40,18 @@ bridges/source/jni_uno/jni_bridge.h:53
 bridges/source/jni_uno/jni_uno2java.cxx:391
 jni_uno::(anonymous namespace)::UNO_proxy m_ref
 1
+canvas/inc/rendering/irendermodule.hxx:35
+canvas::Vertex g
+1
+canvas/inc/rendering/irendermodule.hxx:35
+canvas::Vertex r
+1
+canvas/inc/rendering/irendermodule.hxx:35
+canvas::Vertex b
+1
+canvas/inc/rendering/irendermodule.hxx:37
+canvas::Vertex z
+0
 chart2/source/controller/dialogs/DataBrowser.cxx:209
 chart::impl::SeriesHeader m_aUpdateDataTimer
 UpdateDataTimer
@@ -58,7 +70,7 @@ chart2/source/controller/inc/TitleDialogData.hxx:36
 chart2/source/model/main/DataPoint.hxx:108
 chart::DataPoint m_bNoParentPropAllowed
 0
-comphelper/source/misc/threadpool.cxx:39
+comphelper/source/misc/threadpool.cxx:40
 comphelper gbIsWorkerThread
 1
 connectivity/source/inc/dbase/DIndexIter.hxx:36
@@ -109,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:1237
+cui/source/options/optgdlg.cxx:1277
 LanguageConfig_Impl aLanguageOptions
 0
 cui/source/options/optjava.hxx:60
@@ -196,18 +208,6 @@ include/basegfx/pixel/bpixel.hxx:43
 include/basic/sbxvar.hxx:73
 SbxValues::(anonymous) pData
 0
-include/canvas/rendering/irendermodule.hxx:36
-canvas::Vertex g
-1
-include/canvas/rendering/irendermodule.hxx:36
-canvas::Vertex r
-1
-include/canvas/rendering/irendermodule.hxx:36
-canvas::Vertex b
-1
-include/canvas/rendering/irendermodule.hxx:38
-can

[Libreoffice-commits] online.git: common/Unit.hpp

2020-02-20 Thread Miklos Vajna (via logerrit)
 common/Unit.hpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d8e6fa411cf4e1e14665456ec172a1837a43a4a9
Author: Miklos Vajna 
AuthorDate: Thu Feb 20 15:31:19 2020 +0100
Commit: Miklos Vajna 
CommitDate: Thu Feb 20 18:03:10 2020 +0100

fuzzer: fix this up so it works again

After fixing this single assertion failure, the

./loolwsd_fuzzer --config-file=loolwsd.xml 
--o:storage.filesystem[@allow]=true --o:logging.level=fatal

invocation works. (It does not really fuzz anything, but it's a single
unpriviliged process at least.)

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

diff --git a/common/Unit.hpp b/common/Unit.hpp
index c403100c2..3e75f8b24 100644
--- a/common/Unit.hpp
+++ b/common/Unit.hpp
@@ -270,7 +270,7 @@ public:
 static UnitKit& get()
 {
 assert(Global);
-#if !MOBILEAPP
+#if !MOBILEAPP && !defined(KIT_IN_PROCESS)
 assert(Global->_type == UnitType::Kit);
 #endif
 return *static_cast(Global);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Henry Castro (via logerrit)
 loleaflet/.eslintignore |1 
 loleaflet/Makefile.am   |5 
 loleaflet/js/select2.js | 5570 
 3 files changed, 5574 insertions(+), 2 deletions(-)

New commits:
commit a75c8f3e71e5df6fb545441cfb05aeb9a97d86ac
Author: Henry Castro 
AuthorDate: Thu Feb 20 09:54:53 2020 -0400
Commit: Henry Castro 
CommitDate: Thu Feb 20 17:37:14 2020 +0100

loleaflet: import select2.js library

The file was imported fromnode_modules/select2/dist/js/select2.js
the main reason is to analyze the source code, debug and patch
if necessary

To get the source code from npm repository

make libs

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

diff --git a/loleaflet/.eslintignore b/loleaflet/.eslintignore
index 40ef65124..3ea0222dc 100644
--- a/loleaflet/.eslintignore
+++ b/loleaflet/.eslintignore
@@ -1,4 +1,5 @@
 # We only directly edit toolbar.js in dist/
+**/js/select2.js
 **/js/vex.combined.js
 **/js/sanitize-url.js
 **/js/l10n.js
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 09e0c1e89..a74a47a9c 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -72,6 +72,7 @@ define npm_source
 endef
 
 NODE_MODULES_SRC =\
+   select2@4.0.1 \
vex-js@4.1.0 \
l10n-for-node@0.0.1 \
@braintree/sanitize-url@3.0.0
@@ -122,10 +123,10 @@ NODE_MODULES_JS =\
node_modules/jquery-ui/jquery-ui.js \
node_modules/smartmenus/dist/jquery.smartmenus.js \
node_modules/autolinker/dist/Autolinker.js \
-   node_modules/json-js/json2.js \
-   node_modules/select2/dist/js/select2.js
+   node_modules/json-js/json2.js
 
 LOLEAFLET_LIBS_JS =\
+   select2.js \
vex.combined.js \
sanitize-url.js
 
diff --git a/loleaflet/js/select2.js b/loleaflet/js/select2.js
new file mode 100644
index 0..09af93ea5
--- /dev/null
+++ b/loleaflet/js/select2.js
@@ -0,0 +1,5570 @@
+/*!
+ * Select2 4.0.1
+ * https://select2.github.io
+ *
+ * Released under the MIT license
+ * https://github.com/select2/select2/blob/master/LICENSE.md
+ */
+(function (factory) {
+  if (typeof define === 'function' && define.amd) {
+// AMD. Register as an anonymous module.
+define(['jquery'], factory);
+  } else if (typeof exports === 'object') {
+// Node/CommonJS
+factory(require('jquery'));
+  } else {
+// Browser globals
+factory(jQuery);
+  }
+}(function (jQuery) {
+  // This is needed so we can catch the AMD loader configuration and use it
+  // The inner file should be wrapped (by `banner.start.js`) in a function that
+  // returns the AMD loader references.
+  var S2 =
+(function () {
+  // Restore the Select2 AMD loader so it can be used
+  // Needed mostly in the language files, where the loader is not inserted
+  if (jQuery && jQuery.fn && jQuery.fn.select2 && jQuery.fn.select2.amd) {
+var S2 = jQuery.fn.select2.amd;
+  }
+var S2;(function () { if (!S2 || !S2.requirejs) {
+if (!S2) { S2 = {}; } else { require = S2; }
+/**
+ * @license almond 0.3.1 Copyright (c) 2011-2014, The Dojo Foundation All 
Rights Reserved.
+ * Available via the MIT or new BSD license.
+ * see: http://github.com/jrburke/almond for details
+ */
+//Going sloppy to avoid 'use strict' string cost, but strict practices should
+//be followed.
+/*jslint sloppy: true */
+/*global setTimeout: false */
+
+var requirejs, require, define;
+(function (undef) {
+var main, req, makeMap, handlers,
+defined = {},
+waiting = {},
+config = {},
+defining = {},
+hasOwn = Object.prototype.hasOwnProperty,
+aps = [].slice,
+jsSuffixRegExp = /\.js$/;
+
+function hasProp(obj, prop) {
+return hasOwn.call(obj, prop);
+}
+
+/**
+ * Given a relative module name, like ./something, normalize it to
+ * a real name that can be mapped to a path.
+ * @param {String} name the relative name
+ * @param {String} baseName a real name that the name arg is relative
+ * to.
+ * @returns {String} normalized name
+ */
+function normalize(name, baseName) {
+var nameParts, nameSegment, mapValue, foundMap, lastIndex,
+foundI, foundStarMap, starI, i, j, part,
+baseParts = baseName && baseName.split("/"),
+map = config.map,
+starMap = (map && map['*']) || {};
+
+//Adjust any relative paths.
+if (name && name.charAt(0) === ".") {
+//If have a base name, try to normalize against it,
+//otherwise, assume it is a top-level require that will
+//be relative to baseUrl in the end.
+if (baseName) {
+name = name.split('/');
+lastIndex = name.length - 1;
+
+// Node .js allowance:
+if (config.nodeIdCom

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

2020-02-20 Thread Szymon Kłos (via logerrit)
 vcl/inc/salvtables.hxx|  498 ++
 vcl/source/app/salvtables.cxx | 3413 ++
 2 files changed, 1980 insertions(+), 1931 deletions(-)

New commits:
commit aad94d48b19135a2e46ac7b2c0f41f3bb29bb5a7
Author: Szymon Kłos 
AuthorDate: Thu Feb 20 10:34:59 2020 +0100
Commit: Szymon Kłos 
CommitDate: Thu Feb 20 17:32:27 2020 +0100

Silence warnings in salvtables.hxx

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

diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index a239f3f3f8b6..3d41d3589871 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -17,120 +17,123 @@ private:
 public:
 SalInstanceBuilder(vcl::Window* pParent, const OUString& rUIRoot, const 
OUString& rUIFile);
 
-virtual std::unique_ptr weld_message_dialog(const 
OString& id,
- bool 
bTakeOwnership) override;
+virtual std::unique_ptr
+weld_message_dialog(const OString& id, bool bTakeOwnership = true) 
override;
 
-virtual std::unique_ptr weld_about_dialog(const 
OString& id,
- bool 
bTakeOwnership) override;
+virtual std::unique_ptr
+weld_about_dialog(const OString& id, bool bTakeOwnership = true) override;
 
 virtual std::unique_ptr weld_dialog(const OString& id,
-  bool bTakeOwnership) 
override;
+  bool bTakeOwnership = 
true) override;
 
 virtual std::unique_ptr weld_assistant(const OString& id,
-bool 
bTakeOwnership) override;
+bool 
bTakeOwnership = true) override;
 
 virtual std::unique_ptr create_screenshot_window() override;
 
 virtual std::unique_ptr weld_window(const OString& id,
-  bool bTakeOwnership) 
override;
+  bool bTakeOwnership = 
true) override;
 
 virtual std::unique_ptr weld_widget(const OString& id,
-  bool bTakeOwnership) 
override;
+  bool bTakeOwnership = 
false) override;
 
 virtual std::unique_ptr weld_container(const OString& id,
-bool 
bTakeOwnership) override;
+bool 
bTakeOwnership = false) override;
 
-virtual std::unique_ptr weld_box(const OString& id, bool 
bTakeOwnership) override;
+virtual std::unique_ptr weld_box(const OString& id,
+bool bTakeOwnership = false) 
override;
 
 virtual std::unique_ptr weld_frame(const OString& id,
-bool bTakeOwnership) 
override;
+bool bTakeOwnership = 
false) override;
 
 virtual std::unique_ptr
-weld_scrolled_window(const OString& id, bool bTakeOwnership) override;
+weld_scrolled_window(const OString& id, bool bTakeOwnership = false) 
override;
 
 virtual std::unique_ptr weld_notebook(const OString& id,
-  bool bTakeOwnership) 
override;
+  bool bTakeOwnership 
= false) override;
 
 virtual std::unique_ptr weld_button(const OString& id,
-  bool bTakeOwnership) 
override;
+  bool bTakeOwnership = 
false) override;
 
-virtual std::unique_ptr weld_menu_button(const OString& 
id,
-   bool 
bTakeOwnership) override;
+virtual std::unique_ptr
+weld_menu_button(const OString& id, bool bTakeOwnership = false) override;
 
-virtual std::unique_ptr weld_link_button(const OString& 
id,
-   bool 
bTakeOwnership) override;
+virtual std::unique_ptr
+weld_link_button(const OString& id, bool bTakeOwnership = false) override;
 
-virtual std::unique_ptr weld_toggle_button(const 
OString& id,
-   bool 
bTakeOwnership) override;
+virtual std::unique_ptr
+weld_toggle_button(const OString& id, bool bTakeOwnership = false) 
override;
 
-virtual std::unique_ptr weld_radio_button(const 
OString& id,
- bool 
bTakeOwnership) override;
+virtual std::unique_ptr
+weld_radio_button(const OString&

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

2020-02-20 Thread Tamás Zolnai (via logerrit)
 cypress_test/integration_tests/mobile/writer/shape_properties_spec.js |2 --
 1 file changed, 2 deletions(-)

New commits:
commit f6a5b906120410f157b29251927e4a4a96ac3511
Author: Tamás Zolnai 
AuthorDate: Thu Feb 20 17:10:17 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Thu Feb 20 17:10:24 2020 +0100

cypress: remove obsolete comment.

Change-Id: I9d8293ed27cb756325ffde48f3bcf37f390a1651

diff --git 
a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js 
b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
index 88fb512d3..3b2b182ba 100644
--- a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
@@ -52,7 +52,6 @@ describe('Change shape properties via mobile wizard.', 
function() {
cy.get('#tb_actionbar_item_mobile_wizard')
.click();
 
-   // Do mirroring
cy.get('#PosSizePropertyPanel')
.click();
 
@@ -69,7 +68,6 @@ describe('Change shape properties via mobile wizard.', 
function() {
cy.get('#mobile-wizard')
.should('be.visible');
 
-   // Do mirroring
cy.get('#LinePropertyPanel')
.click();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Tamás Zolnai (via logerrit)
 
cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js 
|3 
 cypress_test/integration_tests/mobile/writer/insert_field_spec.js  
 |   44 --
 cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
 |   51 --
 cypress_test/integration_tests/mobile/writer/shape_properties_spec.js  
 |  179 ++
 cypress_test/integration_tests/mobile/writer/table_properties_spec.js  
 |  131 +--
 5 files changed, 101 insertions(+), 307 deletions(-)

New commits:
commit 389720d9484a7bfd98c8a0ab06e855350e8ff290
Author: Tamás Zolnai 
AuthorDate: Thu Feb 20 14:51:51 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Thu Feb 20 17:08:05 2020 +0100

cypress: mobile: make mobile wizard navigation more stable.

When we open a new panel in the mobile wizard the new
content appears after a short animation.
I suspect that this animation makes tests to fail sometimes
with 'detached from DOM' error. Waiting the end of the animation
seems help on this issue.

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

diff --git 
a/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
 
b/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
index e86e3b92f..df8cc63a3 100644
--- 
a/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
+++ 
b/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
@@ -22,7 +22,8 @@ describe('Apply paragraph properties.', function() {
.click();
 
cy.get('#Paragraph')
-   .should('have.class', 'selected');
+   .should('have.class', 'selected')
+   .wait(100);
});
 
afterEach(function() {
diff --git a/cypress_test/integration_tests/mobile/writer/insert_field_spec.js 
b/cypress_test/integration_tests/mobile/writer/insert_field_spec.js
index 9cd7296fb..91cb9d15c 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_field_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_field_spec.js
@@ -13,6 +13,15 @@ describe('Insert fields via insertion wizard.', function() {
cy.get('#tb_actionbar_item_insertion_mobile_wizard')
.should('not.have.class', 'disabled')
.click();
+
+   // Open fields submenu
+   cy.get('.sub-menu-title')
+   .contains('More Fields...')
+   .click();
+
+   cy.get('.ui-content.level-0.mobile-wizard')
+   .should('be.visible')
+   .wait(100);
});
 
afterEach(function() {
@@ -20,11 +29,6 @@ describe('Insert fields via insertion wizard.', function() {
});
 
it('Insert page number field.', function() {
-   // Open fields submenu
-   cy.get('.sub-menu-title')
-   .contains('More Fields...')
-   .click();
-
// Insert field
cy.get('.menu-entry-with-icon')
.contains('Page Number')
@@ -38,11 +42,6 @@ describe('Insert fields via insertion wizard.', function() {
});
 
it('Insert page count field.', function() {
-   // Open fields submenu
-   cy.get('.sub-menu-title')
-   .contains('More Fields...')
-   .click();
-
// Insert field
cy.get('.menu-entry-with-icon')
.contains('Page Count')
@@ -56,11 +55,6 @@ describe('Insert fields via insertion wizard.', function() {
});
 
it('Insert date field.', function() {
-   // Open fields submenu
-   cy.get('.sub-menu-title')
-   .contains('More Fields...')
-   .click();
-
// Insert field
cy.get('.menu-entry-with-icon')
.contains('Date')
@@ -74,11 +68,6 @@ describe('Insert fields via insertion wizard.', function() {
});
 
it('Insert time field.', function() {
-   // Open fields submenu
-   cy.get('.sub-menu-title')
-   .contains('More Fields...')
-   .click();
-
// Insert field
cy.get('.menu-entry-with-icon')
.contains('Time')
@@ -92,11 +81,6 @@ describe('Insert fields via insertion wizard.', function() {
});
 
it('Insert title field.', function() {
-   // Open fields submenu
-   cy.get('.sub-menu-title')
-   .contains('More Fields...')
-   .click();
-
// In

Re: Status of Windows builds TB77

2020-02-20 Thread Christian Lohmaier
Hi Stuart, *,

On Wed, Feb 19, 2020 at 4:05 PM V Stuart Foote  wrote:
>
> The Jenkins hosted TB77 nightly for 64bit Windows builds has not posted a 
> package since 14 Feb, does it need a nudge?

The last builds all did fail.
[…]

cat: 
'C:/cygwin/home/tdf/lode/jenkins/workspace/lo_gerrit/tb/build_master/workdir/LinkTarget/L':
No such file or directory
make[1]: *** 
[C:/cygwin/home/tdf/lode/jenkins/workspace/lo_gerrit/tb/src_master/Library_merged.mk:11:
C:/cygwin/home/tdf/lode/jenkins/workspace/lo_gerrit/tb/build_master/instdir/program/mergedlo.dll]
Error 1
make[1]: *** Deleting file
'C:/cygwin/home/tdf/lode/jenkins/workspace/lo_gerrit/tb/build_master/instdir/program/mergedlo.dll'
make: *** [Makefile:282: build] Error 2


seems like a command-line length limitation, as previous build failed with
cat: 
'C:/cygwin/home/tdf/lode/jenkins/workspace/lo_gerrit/tb/build_master/workdir/LinkTarget/Library/utllo.dll.objectli':
No such file or directory

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


ESC meeting minutes: 2020-02-20

2020-02-20 Thread Miklos Vajna

* Present:
+ Michael W, Ilmari, Cloph, Michael S, Sophie, Heiko, Thorsten, Xisco, 
Stephan, Miklos, Gabriel, Eike, Kendy, Michael M

* Completed Action Items:
   + None

* Pending Action Items:
   + Propose new certified developers (Kendy, Stephan, Thorsten)
 + still waiting
   + Automated reminder email to the dev list for this meeting (Xisco)

* Release Engineering update (Cloph)
   + 7.0 release plan added to the wiki
 + feature freeze is last week of May
   + 6.4 status
 + 6.4.1 rc2 will be tagged later today
 + please review patches! 
https://gerrit.libreoffice.org/q/project:core+branch:libreoffice-6-4-1+status:open
 + 6.4.2 would be built with xcode11 on macOS (Mojave/10.14)
   + 6.3 status
 + 6.3.5 final is now announced
 + 6.3. in April
   + Remotes
   + Android viewer: core.git java viewer is currently broken on master
 + both arch64 and x86 (crash on doc load, will investigate)
   + Online

* Documentation (Olivier)
   + absent (sick)

* UX Update (Heiko)
   + Bugzilla (topicUI) statistics
   241(241) (topicUI) bugs open, 263(263) (needsUXEval) needs to be 
evaluated by the UXteam
   + Updates:
   BZ changes   1 week   1 month   3 months   12 months
added  7(-6)30(-9) 53(-8)121(-6)
commented 96(17)   443(49)   1039(31)   2864(79)
  removed  4(4)  5(3)  11(3)  21(3)
 resolved 13(1) 44(6)  99(2) 258(8)
   + top 10 contributors:
 Heiko Tietze made 260 changes in 1 month, and 1371 changes in 1 year
 Seth Chaiklin made 101 changes in 1 month, and 182 changes in 1 year
 Dieter Praas made 84 changes in 1 month, and 422 changes in 1 year
 Foote, V Stuart made 79 changes in 1 month, and 515 changes in 1 year
 Xisco Faulí made 71 changes in 1 month, and 452 changes in 1 year
 Roman Kuznetsov made 53 changes in 1 month, and 328 changes in 1 year
 Kainz, Andreas made 40 changes in 1 month, and 270 changes in 1 year
 锁琨珑 made 28 changes in 1 month, and 32 changes in 1 year
 Cor Nouws made 15 changes in 1 month, and 170 changes in 1 year
 Muhammet Kara made 13 changes in 1 month, and 44 changes in 1 year

   + 22 new tickets with needsUXEval since Feb/07

   + Add Sukapura icon Theme to Core and Set It to Default for macOS
 + https://bugs.documentfoundation.org/show_bug.cgi?id=130500
 + make it the default on macOS
 + mostly UX domain (Miklos)
   => no objections (all)

   + Add possibility to define tab positions in percentage of paragraph area
 width
 + https://bugs.documentfoundation.org/show_bug.cgi?id=130420
 + needsDevEval
 + Word has something similar, paragraph tabs (can e.g. center)
   + if somebody wants to work on this, go ahead (Miklos)

   * Dark theme for the welcome window
 + https://bugs.documentfoundation.org/show_bug.cgi?id=129725
 + accepted regression
 + would suggest checking why it was introduced, to understand who needs it 
(Miklos)


* Crash Testing (Caolan)
   + we’re missing Caolan
   + 1(-26) import failure, 2(-2) export failures
   + ??? coverity issues
   + Google / ossfuzz: ?? fuzzers active now
   + crashtesting machine status
 + probably nothing changed, still no results (Michael S)
 + https://dev-builds.libreoffice.org/crashtest/?C=M&O=D
   + result from yesterday? (Miklos)
 + it’s probably the limited set (Cloph)

* Crash Reporting (Xisco)
    + https://crashreport.libreoffice.org/stats/version/6.2.8.2
    + (-537) 1045 1582 1639 1645 1157 1172 1195 1082 973 815 568 375 320 198
    + https://crashreport.libreoffice.org/stats/version/6.3.3.2
    + (-929) 1430 2359 2830 3068 2555 3302 4368 3674 3312 2629 1820 854 0
    + https://crashreport.libreoffice.org/stats/version/6.3.4.2
    + (-1113) 2188 3301 3769 3222 2057 984 0
    + https://crashreport.libreoffice.org/stats/version/6.4.0.3
    + (+1932) 6774 4842 419 0

   + numbers are lower then usual, service was down for 2 days (Xisco)
 + the reproducible crashes are now fixed, waiting for the next release

* Update baseline to VS2019 on master before 7.0 (Cloph)
   + Noel lists benefits on the list:
 + ASan support, faster linking, better C++ conforming
   + Did somebody tried the Asan support? (Michael S)
 + no idea yet (Stephan)

=> re-visit this in 1 week, make a decision by then / by 27th

Update macOS Xcode baseline to 11 (Stephan)
   + and build-baseline to macOS 10.14.4
   + assumed that TDF Macs are using xcode11 anyway
   + benefits: we know how to fix the blurry text issue with Xcode 11
   (but not with Xcode 10)
 + also better c++ library support (e.g. std::optional)
   + OK to require xcode 11 on master (Cloph)
AI: + actually require xcode 11 on master (Stephan)

* GSoC 2020 (Ilmari)
   + 
https://opensource.googleblog.com/2019/12/announcing-google-summer-of-code-2020.html
   + https://wiki.documentfou

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

2020-02-20 Thread Mert Tumer (via logerrit)
 sc/source/ui/view/gridwin.cxx |   26 +-
 1 file changed, 25 insertions(+), 1 deletion(-)

New commits:
commit 9bfa939f87f28cdaed2a24c3dc5f9a21004b19da
Author: Mert Tumer 
AuthorDate: Thu Feb 20 18:33:04 2020 +0300
Commit: Michael Meeks 
CommitDate: Thu Feb 20 16:47:37 2020 +0100

send hyperlinkclicked callback on calc mobile

for opening links ctrl+click must be pressed
but in mobile this cant be done
This patch allows it to send the callback and also
cell coordinates for hyperlink popup

Change-Id: I8c0fac167627ef449d9cf20a36a7a5a77978ae0f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89121
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index d416607a379e..1232a8fa3626 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -2189,7 +2189,31 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& 
rMEvt )
 // ScGlobal::OpenURL() only understands Calc A1 style syntax.
 // Convert it to Calc A1 before calling OpenURL().
 if (pDoc->GetAddressConvention() == 
formula::FormulaGrammar::CONV_OOO)
-ScGlobal::OpenURL(aUrl, aTarget);
+{
+// in mobile view there is no ctrl+click and for hyperlink 
popup
+// the cell coordinates must be sent along with click position 
for elegance
+if (comphelper::LibreOfficeKit::isActive() &&
+ 
comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()))
+{
+ScTabViewShell* pViewShell = pViewData->GetViewShell();
+Point aPos = rMEvt.GetPosPixel();
+SCCOL nPosX;
+SCROW nPosY;
+pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, 
nPosX, nPosY );
+auto pForTabView = dynamic_cast(pViewShell);
+OString aCursor = 
pForTabView->GetViewData().describeCellCursorAt(nPosX, nPosY);
+double fPPTX = pForTabView->GetViewData().GetPPTX();
+int mouseX = aPos.X() / fPPTX;
+OStringBuffer aBuf;
+aBuf.append(aUrl.toUtf8().getStr());
+aBuf.append(" coordinates: ");
+aBuf.append(aCursor);
+aBuf.append(", ");
+aBuf.append(mouseX);
+
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_HYPERLINK_CLICKED, 
aBuf.makeStringAndClear().getStr());
+} else
+ScGlobal::OpenURL(aUrl, aTarget);
+}
 else
 {
 ScAddress aTempAddr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Tor Lillqvist (via logerrit)
 vcl/source/window/window.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 97ac276728a2397a444ae7b1cb402ae741a0b1ee
Author: Tor Lillqvist 
AuthorDate: Thu Feb 20 17:36:24 2020 +0200
Commit: Tor Lillqvist 
CommitDate: Thu Feb 20 17:36:24 2020 +0200

'rational' is an adjective, 'rationale' is a noun

Change-Id: I38678a74603729b63ac7a164249586e0891b74e2

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index d18acc024625..c4ef69e6d07c 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3880,7 +3880,7 @@ void Window::RequestDoubleBuffering(bool bRequest)
 }
 
 /*
- * The rational here is that we moved destructors to
+ * The rationale here is that we moved destructors to
  * dispose and this altered a lot of code paths, that
  * are better left unchanged for now.
  */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: helpcontent2

2020-02-20 Thread Stephan Bergmann (via logerrit)
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a545e25314d464c190d9d504d78ec6cb67ead4fd
Author: Stephan Bergmann 
AuthorDate: Thu Feb 20 16:00:42 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Thu Feb 20 16:00:42 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to bf2dff69f84ad28836924d3bf311910248aca1f9
  - tdf#130426 Update documentation for Basic Chr and ChrW functions

...for  "tdf#130426 
Support Basic
Chr(&H8000), ..., Chr(&H) again"

Change-Id: I425a55ba1b055f94d993bb99c5412cc0414dc48d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/89100
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/helpcontent2 b/helpcontent2
index ffa172bf7f37..bf2dff69f84a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ffa172bf7f370d7450cca3d45c9f8138a7d3c139
+Subproject commit bf2dff69f84ad28836924d3bf311910248aca1f9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Stephan Bergmann (via logerrit)
 basic/qa/basic_coverage/test_chr_method.vb |   64 +
 basic/source/runtime/methods.cxx   |   11 
 2 files changed, 73 insertions(+), 2 deletions(-)

New commits:
commit 5fc8b470f22bc7a8a5dc9a6bd86a591090abfcf3
Author: Stephan Bergmann 
AuthorDate: Thu Feb 20 12:40:49 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 20 15:59:49 2020 +0100

tdf#130426 Support Basic Chr(&H8000), ..., Chr(&H) again

...after it had been broken by d5b7627a0e738c0866b819910153b96b611813f8
"tdf#62326 - Macros: Converting Hex strings of negative value".

The corresponding help update is 

"tdf#130426 Update documentation for Basic Chr and ChrW functions".

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

diff --git a/basic/qa/basic_coverage/test_chr_method.vb 
b/basic/qa/basic_coverage/test_chr_method.vb
new file mode 100644
index ..8e8179463535
--- /dev/null
+++ b/basic/qa/basic_coverage/test_chr_method.vb
@@ -0,0 +1,64 @@
+' 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/.
+
+Function overflow1 as Integer
+On Error GoTo handler
+Chr(-32769)
+overflow1 = 0
+Exit Function
+handler:
+if (Err <> 6) Then
+overflow1 = 0
+Exit Function
+Endif
+overflow1 = 1
+End Function
+
+Function overflow2 as Integer
+On Error GoTo handler
+Chr(65536)
+overflow2 = 0
+Exit Function
+handler:
+if (Err <> 6) Then
+overflow2 = 0
+Exit Function
+Endif
+overflow2 = 1
+End Function
+
+Function overflow3 as Integer
+On Error GoTo handler
+Chr(&H1)
+overflow3 = 0
+Exit Function
+handler:
+if (Err <> 6) Then
+overflow3 = 0
+Exit Function
+Endif
+overflow3 = 1
+End Function
+
+Function doUnitTest as Integer
+Chr(-32768)
+Chr(65535)
+Chr(&H8000)
+Chr(&H)
+if (overflow1 = 0) Then
+doUnitTest = 0
+Exit Function
+Endif
+if (overflow2 = 0) Then
+doUnitTest = 0
+Exit Function
+Endif
+if (overflow3 = 0) Then
+doUnitTest = 0
+Exit Function
+Endif
+doUnitTest = 1
+End Function
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 8543c0817762..3214dd28602c 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -330,8 +330,15 @@ static void implChr( SbxArray& rPar, bool bChrW )
 }
 else
 {
-sal_Unicode aCh = static_cast(pArg->GetUShort());
-aStr = OUString(aCh);
+// Map negative 16-bit values to large positive ones, so that code 
like Chr(&H8000)
+// still works after the fix for tdf#62326 changed those 
four-digit hex notations to
+// produce negative values:
+sal_Int32 aCh = pArg->GetLong();
+if (aCh < -0x8000 || aCh > 0x) {
+StarBASIC::Error(ERRCODE_BASIC_MATH_OVERFLOW);
+aCh = 0;
+}
+aStr = OUString(static_cast(aCh));
 }
 rPar.Get32(0)->PutString( aStr );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Stephan Bergmann (via logerrit)
 source/text/sbasic/shared/03120102.xhp |2 +-
 source/text/sbasic/shared/03120112.xhp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bf2dff69f84ad28836924d3bf311910248aca1f9
Author: Stephan Bergmann 
AuthorDate: Thu Feb 20 13:51:22 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 20 16:00:42 2020 +0100

tdf#130426 Update documentation for Basic Chr and ChrW functions

...for  "tdf#130426 Support 
Basic
Chr(&H8000), ..., Chr(&H) again"

Change-Id: I425a55ba1b055f94d993bb99c5412cc0414dc48d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/89100
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/source/text/sbasic/shared/03120102.xhp 
b/source/text/sbasic/shared/03120102.xhp
index b516500fe..a18c3beb1 100644
--- a/source/text/sbasic/shared/03120102.xhp
+++ b/source/text/sbasic/shared/03120102.xhp
@@ -42,7 +42,7 @@
 String
 
 
- 
Expression: a numeric expression that represents a valid 8-bit 
ASCII value (0-255) or a 16-bit Unicode value.
+ 
Expression: a numeric expression that represents a valid 8-bit 
ASCII value (0-255) or a 16-bit Unicode value. (To support expressions with a 
nominally negative argument like Chr(&H8000) in a 
backwards-compatible way, values in the range −32768 to −1 are internally 
mapped to the range 32768 to 65535.)
 
 When VBA compatibility mode is enabled 
(OPTION 
VBASUPPORT 1), Expression is a numeric expression 
that represents a valid 8-bit ASCII value (0-255) only.
 
diff --git a/source/text/sbasic/shared/03120112.xhp 
b/source/text/sbasic/shared/03120112.xhp
index cb3394dab..39f9cebee 100644
--- a/source/text/sbasic/shared/03120112.xhp
+++ b/source/text/sbasic/shared/03120112.xhp
@@ -45,7 +45,7 @@
 
 String
 
- 
Expression: Numeric variables that represent a valid 16 bit 
Unicode value (0-65535). An empty value returns error code 5. A value out of 
the range [0,65535] returns error code 6.
+ 
Expression: Numeric variables that represent a valid 16 bit 
Unicode value (0-65535). (To support expressions with a nominally negative 
argument like ChrW(&H8000) in a backwards-compatible way, 
values in the range −32768 to −1 are internally mapped to the range 32768 to 
65535.) An empty value returns error code 5. A value out of the range [0,65535] 
returns error code 6.
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Michael Stahl (via logerrit)
 sw/source/core/layout/laycache.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a9f2f4b4c9e1fa4e4c4a69517c31d0b8e2063f01
Author: Michael Stahl 
AuthorDate: Thu Feb 20 14:17:19 2020 +0100
Commit: Michael Stahl 
CommitDate: Thu Feb 20 15:45:07 2020 +0100

tdf#129529 sw_redlinehide: infinite loop in SwLayHelper::CheckInsert()

The bugdoc has this in meta.xml:

meta:page-count="819" meta:paragraph-count="302"

... for which SwLayHelper::CalcPageCount() cunningly estimates a maximum
of 0 paragraphs per page, and at that rate an infinite number of pages
are required...

Not sure what a reasonable minimum should be, paragraphs could be 16
pages long even with 64k limit, but it does appear unlikely.

(regression from 7e8b4756d95057f069467b34e7849f9354856578 which disabled
 the use of the layout-cache in the bugdoc)

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

diff --git a/sw/source/core/layout/laycache.cxx 
b/sw/source/core/layout/laycache.cxx
index 8cee8dd31fc2..94c2ff2ae12a 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -601,7 +601,9 @@ sal_uLong SwLayHelper::CalcPageCount()
 if ( nNdCount > 100 ) // no estimation below this value
 {
 if ( nPgCount > 0 )
-mnMaxParaPerPage = nNdCount / nPgCount;
+{   // tdf#129529 avoid 0...
+mnMaxParaPerPage = std::max(3, nNdCount / nPgCount);
+}
 else
 {
 mnMaxParaPerPage = std::max( sal_uLong(20),
___
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' - vcl/qt5

2020-02-20 Thread Michael Weghorn (via logerrit)
 vcl/qt5/Qt5Widget.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2bc83c9691701ffa486babc161e945b285a5d7f1
Author: Michael Weghorn 
AuthorDate: Thu Feb 20 08:14:36 2020 +0100
Commit: Katarina Behrens 
CommitDate: Thu Feb 20 15:30:24 2020 +0100

tdf#130794 qt5: Actually, ignore non-spontaneous QEvent::ShortcutOverride

In fact, the assumption in commit
034f56015c1c7a61faede33fb5306f63b5585632
("tdf#126785 qt5: Ignore external QEvent::ShortcutOverride") was
a fallacy and it's exactly the other way around:

"Normal" typing leads to "spontaneous" events of type
QEvent::ShortcutOverride, since those originate from
outside, are triggered via X11 events or Wayland equivalent,
and the non-spontaneous ones are the additional ones that
happen when e.g. the Orca screen reader is enabled.

In a short test, no non-spontaneous QEvent::ShortcutOverride
ever occured when using LibreOffice a bit with Orca disabled
on X11 or Wayland (and on Wayland also not with Orca enabled,
since Qt accessibility is broken there, s. QTBUG-73945 [1]).

(Side note: In a quick test with Qt 5.12.5 and Plasma on Wayland,
'xcbSourceDispatch' from Qt library's qxcbeventdispatcher.cpp
was also used in the Wayland case to when processing the keyboard
events).

[1] https://bugreports.qt.io/browse/QTBUG-73945

Change-Id: I1be1977e67f84fa657f6fc197e0b91822b6a3a2a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89073
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit 69e708868f6046cada955a16bca966370ce3218a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88961
Reviewed-by: Katarina Behrens 

diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 8c0c5244c2bb..4f596033e724 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -449,12 +449,12 @@ bool Qt5Widget::handleEvent(Qt5Frame& rFrame, const 
QWidget& rWidget, QEvent* pE
 {
 if (pEvent->type() == QEvent::ShortcutOverride)
 {
-// ignore QEvent::ShortcutOverride events originating from outside the 
application,
+// ignore non-spontaneous QEvent::ShortcutOverride events,
 // since such an extra event is sent e.g. with Orca screen reader 
enabled,
-// so that two events of that kind (the "real one" and one from 
outside)
+// so that two events of that kind (the "real one" and a 
non-spontaneous one)
 // would otherwise be processed, resulting in duplicate input as 
'handleKeyEvent'
 // is called below (s. tdf#122053)
-if (pEvent->spontaneous())
+if (!pEvent->spontaneous())
 {
 return false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Aron Budea (via logerrit)
 loleaflet/src/control/Control.Menubar.js |5 ++---
 loleaflet/src/unocommands.js |1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit c5f7a503f6cdf2a19ad136099d07b8ebe43c8e30
Author: Aron Budea 
AuthorDate: Wed Feb 19 13:24:25 2020 +0100
Commit: Aron Budea 
CommitDate: Thu Feb 20 15:03:00 2020 +0100

Revert "tdf#121457 Move "Fullscreen Presentation" to "Slideshow" menu"

This reverts commit 52775325f55d785b42011c34802ff9c5ce620f2c.

Slide Show menu had a single item, and Slide menu only had a few.
Revert in favor of saving on menu width for now.

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

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index d91723c3a..8f2d230ad 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -326,9 +326,8 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:SlideMenu', 'presentation'), type: 
'menu', menu: [
{name: _UNO('.uno:InsertSlide', 
'presentation'), id: 'insertpage', type: 'action'},
{name: _UNO('.uno:DuplicateSlide', 
'presentation'), id: 'duplicatepage', type: 'action'},
-   {name: _UNO('.uno:DeleteSlide', 
'presentation'), id: 'deletepage', type: 'action'} ]
-   },
-   {name: _UNO('.uno:SlideShowMenu', 'presentation'), 
type: 'menu', menu: [
+   {name: _UNO('.uno:DeleteSlide', 
'presentation'), id: 'deletepage', type: 'action'},
+   {type: 'separator', id: 
'fullscreen-presentation-separator'},
{name: _('Fullscreen presentation'), id: 
'fullscreen-presentation', type: 'action'}]
},
{name: _UNO('.uno:ToolsMenu', 'presentation'), id: 
'tools', type: 'menu', menu: [
diff --git a/loleaflet/src/unocommands.js b/loleaflet/src/unocommands.js
index 82a07e0a9..6c214d64a 100644
--- a/loleaflet/src/unocommands.js
+++ b/loleaflet/src/unocommands.js
@@ -287,7 +287,6 @@ var unoCommandsArray = {
SlideChangeWindow:{presentation:{menu:_('Slide Transition'),},},
SlideMasterPage:{presentation:{menu:_('~Master Slide'),},},
SlideMenu:{presentation:{menu:_('S~lide'),},},
-   SlideShowMenu:{presentation:{menu:_('~Slide Show'),},},
SmallCaps:{global:{menu:_('Small capitals'),},},
SortAscending:{spreadsheet:{menu:_('Sort Ascending'),},},
SortDescending:{spreadsheet:{menu:_('Sort Descending'),},},
___
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

2020-02-20 Thread Tünde Tóth (via logerrit)
 chart2/qa/extras/chart2export.cxx   |   14 ++
 chart2/qa/extras/data/xlsx/auto_marker_excel10.xlsx |binary
 oox/source/export/chartexport.cxx   |2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit bae73c0726e7fdf7f427a8254c9d6d4b4c510daf
Author: Tünde Tóth 
AuthorDate: Tue Feb 11 15:16:34 2020 +0100
Commit: László Németh 
CommitDate: Thu Feb 20 15:02:54 2020 +0100

tdf#126076 XLSX export: fix automatic line chart markers

The default automatic line chart markers in XLSX spreadsheets
created with Microsoft Excel 2010 became squares after export.

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

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 88c7d154d170..469e25618b5f 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -156,6 +156,7 @@ public:
 void testTdf123206_customLabelText();
 void testDeletedLegendEntries();
 void testTdf130225();
+void testTdf126076();
 
 CPPUNIT_TEST_SUITE(Chart2ExportTest);
 CPPUNIT_TEST(testErrorBarXLSX);
@@ -275,6 +276,7 @@ public:
 CPPUNIT_TEST(testTdf123206_customLabelText);
 CPPUNIT_TEST(testDeletedLegendEntries);
 CPPUNIT_TEST(testTdf130225);
+CPPUNIT_TEST(testTdf126076);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -2516,6 +2518,18 @@ void Chart2ExportTest::testTdf130225()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), deletedLegendEntriesSeq[0]);
 }
 
+void Chart2ExportTest::testTdf126076()
+{
+load("/chart2/qa/extras/data/xlsx/", "auto_marker_excel10.xlsx");
+xmlDocPtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
+CPPUNIT_ASSERT(pXmlDoc);
+
+// This was 12: all series exported with square markers
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:marker/c:symbol[@val='square']",
 0);
+// instead of skipping markers
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:marker", 0);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/xlsx/auto_marker_excel10.xlsx 
b/chart2/qa/extras/data/xlsx/auto_marker_excel10.xlsx
new file mode 100644
index ..c15756257251
Binary files /dev/null and 
b/chart2/qa/extras/data/xlsx/auto_marker_excel10.xlsx differ
diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index fbeb2a892672..c4a3827ea4fc 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -3810,7 +3810,7 @@ void ChartExport::exportMarker(const Reference< 
XPropertySet >& xPropSet)
 if( GetProperty( xPropSet, "Symbol" ) )
 mAny >>= aSymbol;
 
-if(aSymbol.Style != chart2::SymbolStyle_STANDARD && aSymbol.Style != 
chart2::SymbolStyle_AUTO && aSymbol.Style != chart2::SymbolStyle_NONE)
+if(aSymbol.Style != chart2::SymbolStyle_STANDARD && aSymbol.Style != 
chart2::SymbolStyle_NONE)
 return;
 
 FSHelperPtr pFS = GetFS();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] online.git: 13 commits - android/app android/lib

2020-02-20 Thread Jan Holesovsky (via logerrit)
 android/app/build.gradle   
 |9 
 android/app/src/main/AndroidManifest.xml   
 |4 
 
android/app/src/main/java/org/libreoffice/androidapp/storage/DocumentProviderFactory.java
   |  118 -
 
android/app/src/main/java/org/libreoffice/androidapp/storage/DocumentProviderSettingsActivity.java
  |  107 -
 
android/app/src/main/java/org/libreoffice/androidapp/storage/IDocumentProvider.java
 |   72 
 android/app/src/main/java/org/libreoffice/androidapp/storage/IFile.java
 |  118 -
 android/app/src/main/java/org/libreoffice/androidapp/storage/IOUtils.java  
 |   56 
 
android/app/src/main/java/org/libreoffice/androidapp/storage/external/BrowserSelectorActivity.java
  |  173 --
 
android/app/src/main/java/org/libreoffice/androidapp/storage/external/DirectoryBrowserActivity.java
 |   43 
 
android/app/src/main/java/org/libreoffice/androidapp/storage/external/DirectoryBrowserFragment.java
 |  200 --
 
android/app/src/main/java/org/libreoffice/androidapp/storage/external/ExternalFile.java
 |  176 --
 
android/app/src/main/java/org/libreoffice/androidapp/storage/external/ExtsdDocumentsProvider.java
   |  184 --
 
android/app/src/main/java/org/libreoffice/androidapp/storage/external/IExternalDocumentProvider.java
|   22 
 
android/app/src/main/java/org/libreoffice/androidapp/storage/external/OTGDocumentsProvider.java
 |   93 -
 
android/app/src/main/java/org/libreoffice/androidapp/storage/local/LocalDocumentsDirectoryProvider.java
 |   74 
 
android/app/src/main/java/org/libreoffice/androidapp/storage/local/LocalDocumentsProvider.java
  |   60 
 
android/app/src/main/java/org/libreoffice/androidapp/storage/local/LocalFile.java
   |  103 -
 
android/app/src/main/java/org/libreoffice/androidapp/storage/owncloud/OwnCloudFile.java
 |  196 --
 
android/app/src/main/java/org/libreoffice/androidapp/storage/owncloud/OwnCloudProvider.java
 |  192 --
 android/app/src/main/java/org/libreoffice/androidapp/ui/FileUtilities.java 
 |4 
 
android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
  |  811 ++
 
android/app/src/main/java/org/libreoffice/androidapp/ui/RecentFilesAdapter.java 
|   87 -
 android/app/src/main/res/drawable/ic_list_black_24dp.xml   
 |9 
 android/app/src/main/res/drawable/ic_view_module_black_24dp.xml
 |9 
 android/app/src/main/res/layout/activity_document_browser.xml  
 |   74 
 android/app/src/main/res/layout/file_explorer_grid_item.xml
 |   28 
 android/app/src/main/res/menu/view_menu.xml
 |   11 
 android/app/src/main/res/values/arrays.xml 
 |9 
 android/app/src/main/res/values/integers.xml   
 |4 
 android/app/src/main/res/xml/libreoffice_preferences.xml   
 |8 
 android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java   
 |   66 
 31 files changed, 409 insertions(+), 2711 deletions(-)

New commits:
commit bd3aba415db6feac272134be2c822b05efadd045
Author: Jan Holesovsky 
AuthorDate: Thu Feb 20 12:41:14 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Thu Feb 20 14:53:06 2020 +0100

android shell: Avoid deadlock when saving to Nextcloud.

The actual saving to Nextcloud takes time, so what happened was that the
LOOLWSD instance managed to tear down itself, new one was created, and
only after that the onPause() was called - which then tried to send the
"save ...", but there was nothing that could actually receive that.

Change-Id: I3c503461dc7d7e9c2e784911931ddc36b382cc5e

diff --git 
a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java 
b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
index 23758b23e..9b6c5d168 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
@@ -532,6 +532,7 @@ public class LOActivity extends AppCompatActivity {
 // Most probably the native part has already got a 'BYE' from
 // finishWithProgress(), but it is actually better to send it twice
 // than never, so let's call it from here too anyway
+documentLoaded = false;
 postMobileMessageNative("BYE");
 }
 
@@ -620,6 +621,7 @@ public 

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

2020-02-20 Thread Henry Castro (via logerrit)
 loleaflet/.eslintignore  |1 
 loleaflet/Makefile.am|9 
 loleaflet/js/vex.combined.js | 1628 +++
 3 files changed, 1634 insertions(+), 4 deletions(-)

New commits:
commit 05d433b500e76e2a55c044d4c747fc06d8571d9f
Author: Henry Castro 
AuthorDate: Thu Feb 20 08:25:27 2020 -0400
Commit: Henry Castro 
CommitDate: Thu Feb 20 14:51:54 2020 +0100

loleaflet: import vex.combined.js library

The file was imported from node_modules/vex-js/dist/js/vex.combined.js
the main reason is to analyze the source code, debug and patch
if necessary

To get the source code from npm repository

make libs

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

diff --git a/loleaflet/.eslintignore b/loleaflet/.eslintignore
index 04f898987..40ef65124 100644
--- a/loleaflet/.eslintignore
+++ b/loleaflet/.eslintignore
@@ -1,4 +1,5 @@
 # We only directly edit toolbar.js in dist/
+**/js/vex.combined.js
 **/js/sanitize-url.js
 **/js/l10n.js
 **/js/w2ui-1.5.rc1.js
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 8eee500ab..09e0c1e89 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -72,8 +72,9 @@ define npm_source
 endef
 
 NODE_MODULES_SRC =\
-   @braintree/sanitize-url@3.0.0 \
-   l10n-for-node@0.0.1
+   vex-js@4.1.0 \
+   l10n-for-node@0.0.1 \
+   @braintree/sanitize-url@3.0.0
 
 LOLEAFLET_CSS =\
$(builddir)/node_modules/select2/dist/css/select2.css \
@@ -122,10 +123,10 @@ NODE_MODULES_JS =\
node_modules/smartmenus/dist/jquery.smartmenus.js \
node_modules/autolinker/dist/Autolinker.js \
node_modules/json-js/json2.js \
-   node_modules/select2/dist/js/select2.js \
-   node_modules/vex-js/dist/js/vex.combined.js
+   node_modules/select2/dist/js/select2.js
 
 LOLEAFLET_LIBS_JS =\
+   vex.combined.js \
sanitize-url.js
 
 if !ENABLE_MOBILEAPP
diff --git a/loleaflet/js/vex.combined.js b/loleaflet/js/vex.combined.js
new file mode 100644
index 0..2e09a5497
--- /dev/null
+++ b/loleaflet/js/vex.combined.js
@@ -0,0 +1,1628 @@
+(function(f){if(typeof exports==="object"&&typeof 
module!=="undefined"){module.exports=f()}else if(typeof 
define==="function"&&define.amd){define([],f)}else{var g;if(typeof 
window!=="undefined"){g=window}else if(typeof 
global!=="undefined"){g=global}else if(typeof 
self!=="undefined"){g=self}else{g=this}g.vex = f()}})(function(){var 
define,module,exports;return (function(){function e(t,n,r){function 
s(o,u){if(!n[o]){if(!t[o]){var a=typeof 
require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var 
f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var 
l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return 
s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof 
require=="function"&&require;for(var o=0;ohttp://eligrey.com
+ * License: Dedicated to the public domain.
+ *   See https://github.com/eligrey/classList.js/blob/master/LICENSE.md
+ */
+
+/*global self, document, DOMException */
+
+/*! @source 
http://purl.eligrey.com/github/classList.js/blob/master/classList.js */
+
+if ("document" in window.self) {
+
+// Full polyfill for browsers with no classList support
+// Including IE < Edge missing SVGElement.classList
+if (!("classList" in document.createElement("_")) 
+   || document.createElementNS && !("classList" in 
document.createElementNS("http://www.w3.org/2000/svg","g";))) {
+
+(function (view) {
+
+"use strict";
+
+if (!('Element' in view)) return;
+
+var
+ classListProp = "classList"
+   , protoProp = "prototype"
+   , elemCtrProto = view.Element[protoProp]
+   , objCtr = Object
+   , strTrim = String[protoProp].trim || function () {
+   return this.replace(/^\s+|\s+$/g, "");
+   }
+   , arrIndexOf = Array[protoProp].indexOf || function (item) {
+   var
+ i = 0
+   , len = this.length
+   ;
+   for (; i < len; i++) {
+   if (i in this && this[i] === item) {
+   return i;
+   }
+   }
+   return -1;
+   }
+   // Vendors: please allow content code to instantiate DOMExceptions
+   , DOMEx = function (type, message) {
+   this.name = type;
+   this.code = DOMException[type];
+   this.message = message;
+   }
+   , checkTokenAndGetIndex = function (classList, token) {
+   if (token === "") {
+   throw new DOMEx(
+ "SYNTAX_ERR"
+   , "An invalid or illegal string was specified"
+   );
+ 

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

2020-02-20 Thread Michael Weghorn (via logerrit)
 vcl/qt5/Qt5Widget.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 620c7ddea10649b03250cd07a050ce4e1935c7b5
Author: Michael Weghorn 
AuthorDate: Thu Feb 20 08:14:36 2020 +0100
Commit: Katarina Behrens 
CommitDate: Thu Feb 20 14:14:35 2020 +0100

tdf#130794 qt5: Actually, ignore non-spontaneous QEvent::ShortcutOverride

In fact, the assumption in commit
034f56015c1c7a61faede33fb5306f63b5585632
("tdf#126785 qt5: Ignore external QEvent::ShortcutOverride") was
a fallacy and it's exactly the other way around:

"Normal" typing leads to "spontaneous" events of type
QEvent::ShortcutOverride, since those originate from
outside, are triggered via X11 events or Wayland equivalent,
and the non-spontaneous ones are the additional ones that
happen when e.g. the Orca screen reader is enabled.

In a short test, no non-spontaneous QEvent::ShortcutOverride
ever occured when using LibreOffice a bit with Orca disabled
on X11 or Wayland (and on Wayland also not with Orca enabled,
since Qt accessibility is broken there, s. QTBUG-73945 [1]).

(Side note: In a quick test with Qt 5.12.5 and Plasma on Wayland,
'xcbSourceDispatch' from Qt library's qxcbeventdispatcher.cpp
was also used in the Wayland case to when processing the keyboard
events).

[1] https://bugreports.qt.io/browse/QTBUG-73945

Change-Id: I1be1977e67f84fa657f6fc197e0b91822b6a3a2a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89073
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit 69e708868f6046cada955a16bca966370ce3218a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88960
Reviewed-by: Katarina Behrens 

diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index a17bcb0ca7ce..8c3d15b14efa 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -450,12 +450,12 @@ bool Qt5Widget::handleEvent(Qt5Frame& rFrame, const 
QWidget& rWidget, QEvent* pE
 {
 if (pEvent->type() == QEvent::ShortcutOverride)
 {
-// ignore QEvent::ShortcutOverride events originating from outside the 
application,
+// ignore non-spontaneous QEvent::ShortcutOverride events,
 // since such an extra event is sent e.g. with Orca screen reader 
enabled,
-// so that two events of that kind (the "real one" and one from 
outside)
+// so that two events of that kind (the "real one" and a 
non-spontaneous one)
 // would otherwise be processed, resulting in duplicate input as 
'handleKeyEvent'
 // is called below (s. tdf#122053)
-if (pEvent->spontaneous())
+if (!pEvent->spontaneous())
 {
 return false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Michael Stahl (via logerrit)
 sw/source/core/crsr/findtxt.cxx |   62 ++--
 1 file changed, 29 insertions(+), 33 deletions(-)

New commits:
commit 796aeeb0f4c26824f3477b45e0d3bae9cf2c4648
Author: Michael Stahl 
AuthorDate: Thu Feb 20 13:22:12 2020 +0100
Commit: Michael Stahl 
CommitDate: Thu Feb 20 14:12:29 2020 +0100

tdf#129553 sw_redlinehide follow-up: simplify ReplaceBackReferences()

In the special case of bParaEnd the nStart/nEnd aren't actually used so
it's pointless go to to all this trouble; refactor this so it's more
obvious.

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

diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 817091462d51..cda6ef6161b3 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -1117,45 +1117,41 @@ o3tl::optional ReplaceBackReferences(const 
i18nutil::SearchOptions2& r
 : pTextNode == pMarkTextNode))
 {
 utl::TextSearch aSText( utl::TextSearch::UpgradeToSearchOptions2( 
rSearchOpt) );
-OUString rStr = pLayout
-? pFrame->GetText()
-: pTextNode->GetTextNode()->GetText();
-AmbiguousIndex nStart;
-AmbiguousIndex nEnd;
-if (pLayout)
+SearchResult aResult;
+OUString aReplaceStr( rSearchOpt.replaceString );
+if (bParaEnd)
 {
-SwTextFrame const*const pStartFrame(
-bParaEnd && *pPam->GetMark() < *pPam->GetPoint()
-? static_cast(pMarkTextNode->getLayoutFrame(pLayout))
-: pFrame);
-SwTextFrame const*const pEndFrame(
-bParaEnd && *pPam->GetPoint() <= *pPam->GetMark()
-? static_cast(pMarkTextNode->getLayoutFrame(pLayout))
-: pFrame);
-
nStart.SetFrameIndex(pStartFrame->MapModelToViewPos(*pPam->Start()));
-nEnd.SetFrameIndex(pEndFrame->MapModelToViewPos(*pPam->End()));
+OUString const aStr("\\n");
+aResult.subRegExpressions = 1;
+aResult.startOffset.realloc(1);
+aResult.endOffset.realloc(1);
+aResult.startOffset[0] = 0;
+aResult.endOffset[0] = aStr.getLength();
+aSText.ReplaceBackReferences( aReplaceStr, aStr, aResult );
+xRet = aReplaceStr;
 }
 else
 {
-nStart.SetModelIndex(pPam->Start()->nContent.GetIndex());
-nEnd.SetModelIndex(pPam->End()->nContent.GetIndex());
-}
-SearchResult aResult;
-if (bParaEnd ||
-aSText.SearchForward(rStr, &nStart.GetAnyIndex(), 
&nEnd.GetAnyIndex(), &aResult))
-{
-if ( bParaEnd )
+OUString const aStr(pLayout
+? pFrame->GetText()
+: pTextNode->GetTextNode()->GetText());
+AmbiguousIndex nStart;
+AmbiguousIndex nEnd;
+if (pLayout)
 {
-rStr = "\\n";
-aResult.subRegExpressions = 1;
-aResult.startOffset.realloc(1);
-aResult.endOffset.realloc(1);
-aResult.startOffset[0] = 0;
-aResult.endOffset[0] = rStr.getLength();
+
nStart.SetFrameIndex(pFrame->MapModelToViewPos(*pPam->Start()));
+
nEnd.SetFrameIndex(pFrame->MapModelToViewPos(*pPam->End()));
+}
+else
+{
+nStart.SetModelIndex(pPam->Start()->nContent.GetIndex());
+nEnd.SetModelIndex(pPam->End()->nContent.GetIndex());
+}
+if (aSText.SearchForward(aStr, &nStart.GetAnyIndex(), 
&nEnd.GetAnyIndex(), &aResult))
+{
+aSText.ReplaceBackReferences( aReplaceStr, aStr, aResult );
+xRet = aReplaceStr;
 }
-OUString aReplaceStr( rSearchOpt.replaceString );
-aSText.ReplaceBackReferences( aReplaceStr, rStr, aResult );
-xRet = aReplaceStr;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] online.git: docker/l10n-docker-nightly.sh

2020-02-20 Thread Marco Marinello (via logerrit)
 docker/l10n-docker-nightly.sh |4 
 1 file changed, 4 insertions(+)

New commits:
commit fdba30ea4d8d1070e2a1ad8c2fc0d5c44e011dfb
Author: Marco Marinello 
AuthorDate: Thu Feb 20 10:45:14 2020 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Thu Feb 20 14:07:30 2020 +0100

Add more flags to docker compilation

Signed-off-by: Marco Marinello 
Change-Id: Ib5a49613ed36eec0d8ab8178b13e302cd5d8da4e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89080
Tested-by: Samuel Mehrbrodt 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/docker/l10n-docker-nightly.sh b/docker/l10n-docker-nightly.sh
index 4bb588823..598282e94 100755
--- a/docker/l10n-docker-nightly.sh
+++ b/docker/l10n-docker-nightly.sh
@@ -13,6 +13,7 @@
 # * LIBREOFFICE_BUILD_TARGET - which make target to run (in core repo)
 # * ONLINE_EXTRA_BUILD_OPTIONS - extra build options for online
 # * NO_DOCKER_IMAGE - if set, don't build the docker image itself, just do all 
the preps
+# * NO_DOCKER_PUSH - don't push to docker hub
 
 # check we can sudo without asking a pwd
 echo "Trying if sudo works without a password"
@@ -101,6 +102,9 @@ if [ -z "$NO_DOCKER_IMAGE" ]; then
   cd "$SRCDIR"
   docker build --no-cache -t $DOCKER_HUB_REPO:$DOCKER_HUB_TAG . || exit 1
   docker push $DOCKER_HUB_REPO:$DOCKER_HUB_TAG || exit 1
+  if [ -z "$NO_DOCKER_PUSH" ]; then
+docker push $DOCKER_HUB_REPO:$DOCKER_HUB_TAG || exit 1
+  fi;
 else
   echo "Skipping docker image build"
 fi;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Tamás Zolnai (via logerrit)
 
cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js 
|3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 7810825e6b2265dc88819cd8fbe4d4f3f4e9891f
Author: Tamás Zolnai 
AuthorDate: Thu Feb 20 12:38:00 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Thu Feb 20 13:41:29 2020 +0100

cypress: mobile: make paragraph panel related tests more stable.

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

diff --git 
a/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
 
b/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
index c8c093a41..e86e3b92f 100644
--- 
a/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
+++ 
b/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
@@ -20,6 +20,9 @@ describe('Apply paragraph properties.', function() {
// Open paragraph properties
cy.get('#Paragraph')
.click();
+
+   cy.get('#Paragraph')
+   .should('have.class', 'selected');
});
 
afterEach(function() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Noel Grandin (via logerrit)
 sax/source/tools/fastattribs.cxx|4 
 xmloff/Library_xo.mk|2 
 xmloff/source/script/xmlbasici.cxx  |  147 --
 xmloff/source/script/xmlbasici.hxx  |   74 ---
 xmloff/source/script/xmlbasicscript.cxx |  323 
 xmloff/source/script/xmlbasicscript.hxx |  116 +++
 xmloff/source/script/xmlscripti.cxx |   21 --
 7 files changed, 451 insertions(+), 236 deletions(-)

New commits:
commit 4e97fa0f4e73acdf522643aeec486b1395e63727
Author: Noel Grandin 
AuthorDate: Thu Feb 20 13:09:32 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Feb 20 13:37:48 2020 +0100

use fast-parser APIs for embedded script parsing

essentially, this duplicates and converts the service in
xmlscript/source/xmlflat_impexp/
and then converts it to use SvXMLImport APIs, stripping about 3 layers
of unnecessary indirection in the process.

Also improve some exception throwing in sax/ to make the next
programmers life easier when finding the source of exceptions.

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

diff --git a/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx
index 9b65718764fc..587749938c6b 100644
--- a/sax/source/tools/fastattribs.cxx
+++ b/sax/source/tools/fastattribs.cxx
@@ -144,7 +144,7 @@ sal_Int32 FastAttributeList::getValueToken( ::sal_Int32 
Token )
getFastAttributeValue(i),
AttributeValueLength( i ) );
 
-throw SAXException();
+throw SAXException("FastAttributeList::getValueToken: unknown token " + 
OUString::number(Token), nullptr, Any());
 }
 
 sal_Int32 FastAttributeList::getOptionalValueToken( ::sal_Int32 Token, 
::sal_Int32 Default )
@@ -216,7 +216,7 @@ OUString FastAttributeList::getValue( ::sal_Int32 Token )
 if (maAttributeTokens[i] == Token)
 return OUString( getFastAttributeValue(i), 
AttributeValueLength(i), RTL_TEXTENCODING_UTF8 );
 
-throw SAXException();
+throw SAXException("FastAttributeList::getValue: unknown token " + 
OUString::number(Token), nullptr, Any());
 }
 
 OUString FastAttributeList::getValueByIndex( ::sal_Int32 nTokenIndex ) const
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 9cee6c131e83..3ea643c4be8f 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -193,7 +193,7 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
 xmloff/source/script/XMLScriptExportHandler \
 xmloff/source/script/XMLStarBasicContextFactory \
 xmloff/source/script/XMLStarBasicExportHandler \
-xmloff/source/script/xmlbasici \
+xmloff/source/script/xmlbasicscript \
 xmloff/source/script/xmlscripti \
 xmloff/source/style/AttributeContainerHandler \
 xmloff/source/style/DashStyle \
diff --git a/xmloff/source/script/xmlbasici.cxx 
b/xmloff/source/script/xmlbasici.cxx
deleted file mode 100644
index 0a69889f7218..
--- a/xmloff/source/script/xmlbasici.cxx
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "xmlbasici.hxx"
-#include 
-#include 
-#include 
-#include 
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-
-// XMLBasicImportContext
-
-XMLBasicImportContext::XMLBasicImportContext( SvXMLImport& rImport, sal_uInt16 
nPrfx, const OUString& rLName,
-const Reference< frame::XModel >& rxModel )
-:SvXMLImportContext( rImport, nPrfx, rLName )
-,m_xModel( rxModel )
-{
-Reference< uno::XComponentContext > xContext = 
GetImport().GetComponentContext();
-m_xHandler = document::XMLOasisBasicImporter::create( xContext );
-
-m_xHandler->setTargetDocument( m_xModel );
-}
-
-XMLBasicImportContext::~XMLBasicImportContext()
-{
-}
-
-SvXMLImportContextRef XMLBasicImportContext::CreateChildContext(
-sal_uInt16 nPrefix, const OUString& rLocalName,
-const Reference< xml::sax::XAttributeList >& )
-{
-SvXMLImportContext* pContext = nullptr;
-
- 

[Libreoffice-commits] online.git: loleaflet/.eslintignore loleaflet/js loleaflet/Makefile.am loleaflet/package.json loleaflet/README

2020-02-20 Thread Henry Castro (via logerrit)
 loleaflet/.eslintignore  |1 
 loleaflet/Makefile.am|7 +++---
 loleaflet/README |3 ++
 loleaflet/js/sanitize-url.js |   45 +++
 loleaflet/package.json   |3 --
 5 files changed, 53 insertions(+), 6 deletions(-)

New commits:
commit 5cc7ba2d77361d8c963576e1ef6d97f8eb0ead86
Author: Henry Castro 
AuthorDate: Wed Feb 19 15:08:17 2020 -0400
Commit: Henry Castro 
CommitDate: Thu Feb 20 13:20:44 2020 +0100

loleaflet: import sanitize-url.js library

The file was imported from node_modules/@braintree/sanitize-url/index.js
the main reason is to analyze the source code, debug and patch
if necessary

To obtain the source code from npm repository

make libs

To bundle the file sanitize-url.js

browserify braintree-sanitize-url/index.js --standalone sanitizeUrl > 
sanitize-url.js

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

diff --git a/loleaflet/.eslintignore b/loleaflet/.eslintignore
index 4d6c90ac9..04f898987 100644
--- a/loleaflet/.eslintignore
+++ b/loleaflet/.eslintignore
@@ -1,4 +1,5 @@
 # We only directly edit toolbar.js in dist/
+**/js/sanitize-url.js
 **/js/l10n.js
 **/js/w2ui-1.5.rc1.js
 **/src/unocommands.js
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index e52c2288a..8eee500ab 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -72,6 +72,7 @@ define npm_source
 endef
 
 NODE_MODULES_SRC =\
+   @braintree/sanitize-url@3.0.0 \
l10n-for-node@0.0.1
 
 LOLEAFLET_CSS =\
@@ -122,10 +123,10 @@ NODE_MODULES_JS =\
node_modules/autolinker/dist/Autolinker.js \
node_modules/json-js/json2.js \
node_modules/select2/dist/js/select2.js \
-   node_modules/vex-js/dist/js/vex.combined.js \
-   node_modules/@braintree/sanitize-url/dist.js
+   node_modules/vex-js/dist/js/vex.combined.js
 
-LOLEAFLET_LIBS_JS =
+LOLEAFLET_LIBS_JS =\
+   sanitize-url.js
 
 if !ENABLE_MOBILEAPP
 LOLEAFLET_LIBS_JS +=\
diff --git a/loleaflet/README b/loleaflet/README
index d9a3dbddc..0ac0571df 100644
--- a/loleaflet/README
+++ b/loleaflet/README
@@ -41,6 +41,9 @@ in node_modules/.bin/shrinkpack, so you can use the binary 
from there.
 If you need to get the sources:
make libs
 
+To bundle the file sanitize-url.js
+   browserify braintree-sanitize-url/index.js --standalone sanitizeUrl > 
sanitize-url.js
+
 Building
 
 
diff --git a/loleaflet/js/sanitize-url.js b/loleaflet/js/sanitize-url.js
new file mode 100644
index 0..ee8975589
--- /dev/null
+++ b/loleaflet/js/sanitize-url.js
@@ -0,0 +1,45 @@
+(function(f){if(typeof exports==="object"&&typeof 
module!=="undefined"){module.exports=f()}else if(typeof 
define==="function"&&define.amd){define([],f)}else{var g;if(typeof 
window!=="undefined"){g=window}else if(typeof 
global!=="undefined"){g=global}else if(typeof 
self!=="undefined"){g=self}else{g=this}g.sanitizeUrl = f()}})(function(){var 
define,module,exports;return (function(){function r(e,n,t){function 
o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof 
require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new 
Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var 
p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return 
o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof 
require&&require,i=0;i -1;
+}
+
+function sanitizeUrl(url) {
+  if (!url) {
+return 'about:blank';
+  }
+
+  var urlScheme, urlSchemeParseResults;
+  var sanitizedUrl = url.replace(ctrlCharactersRegex, '');
+  
+  if (isRelativeUrl(sanitizedUrl)) {
+return sanitizedUrl;
+  }
+  
+  urlSchemeParseResults = sanitizedUrl.match(urlSchemeRegex);
+
+  if (!urlSchemeParseResults) {
+return 'about:blank';
+  }
+
+  urlScheme = urlSchemeParseResults[0];
+
+  if (invalidPrototcolRegex.test(urlScheme)) {
+return 'about:blank';
+  }
+
+  return sanitizedUrl;
+}
+
+module.exports = {
+  sanitizeUrl: sanitizeUrl
+};
+
+},{}]},{},[1])(1)
+});
diff --git a/loleaflet/package.json b/loleaflet/package.json
index 420c8bd8f..a52a754fc 100644
--- a/loleaflet/package.json
+++ b/loleaflet/package.json
@@ -36,8 +36,5 @@
 "libreoffice",
 "lool"
   ],
-  "scripts": {
-"postinstall": "browserify node_modules/@braintree/sanitize-url/index.js 
--standalone sanitizeUrl > node_modules/@braintree/sanitize-url/dist.js"
-  },
   "license": "BSD-2-Clause"
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Tamás Zolnai (via logerrit)
 cypress_test/integration_tests/mobile/writer/shape_properties_spec.js |   26 
--
 1 file changed, 12 insertions(+), 14 deletions(-)

New commits:
commit c211ce95e2264f0b1973fdb88bcb6634d23a86bb
Author: Tamás Zolnai 
AuthorDate: Thu Feb 20 12:31:24 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Thu Feb 20 13:14:38 2020 +0100

cypress: mobile: enable some shape related test which are stable now.

First issue was rendering the mobile wizard twice by
opening. I added a workaround for this issue:
20b5825ce59345e3ad769d83cb63734a1cf5b0e5

The second issue was with the animation when moving
one level down in the mobile wizard. Checking the next
level content makes these tests more stable.

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

diff --git 
a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js 
b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
index 3411ec597..59217ebba 100644
--- a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
@@ -139,11 +139,6 @@ describe('Change shape properties via mobile wizard.', 
function() {
});
 
it('Vertical mirroring', function() {
-   // TODO: The sidebar's content is send twice when opening the 
mobile
-   // wizard.
-   if (Cypress.env('LO_CORE_VERSION') === 'master')
-   return;
-
// Open mobile wizard
cy.get('#tb_actionbar_item_mobile_wizard')
.click();
@@ -152,6 +147,10 @@ describe('Change shape properties via mobile wizard.', 
function() {
cy.get('#PosSizePropertyPanel')
.click();
 
+   cy.get('.ui-content.level-0.mobile-wizard')
+   .should('be.visible')
+   .wait(100);
+
cy.get('#FlipVertical')
.click();
 
@@ -160,10 +159,6 @@ describe('Change shape properties via mobile wizard.', 
function() {
});
 
it('Horizontal mirroring', function() {
-   // TODO: The sidebar's content is send twice when opening the 
mobile
-   // wizard.
-   if (Cypress.env('LO_CORE_VERSION') === 'master')
-   return;
 
// Open mobile wizard
cy.get('#tb_actionbar_item_mobile_wizard')
@@ -173,6 +168,10 @@ describe('Change shape properties via mobile wizard.', 
function() {
cy.get('#PosSizePropertyPanel')
.click();
 
+   cy.get('.ui-content.level-0.mobile-wizard')
+   .should('be.visible')
+   .wait(100);
+
cy.get('#FlipHorizontal')
.click();
 
@@ -181,11 +180,6 @@ describe('Change shape properties via mobile wizard.', 
function() {
});
 
it('Trigger moving backward / forward', function() {
-   // TODO: The sidebar's content is send twice when opening the 
mobile
-   // wizard.
-   if (Cypress.env('LO_CORE_VERSION') === 'master')
-   return;
-
// Open mobile wizard
cy.get('#tb_actionbar_item_mobile_wizard')
.click();
@@ -193,6 +187,10 @@ describe('Change shape properties via mobile wizard.', 
function() {
cy.get('#PosSizePropertyPanel')
.click();
 
+   cy.get('.ui-content.level-0.mobile-wizard')
+   .should('be.visible')
+   .wait(100);
+
// We can't test the result, so we just trigger
// the events to catch crashes, consoler errors.
cy.get('#BringToFront')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Tamás Zolnai (via logerrit)
 cypress_test/Makefile.am |   16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

New commits:
commit be9333bf5bc41403f369b0543a353eb9381f1e23
Author: Tamás Zolnai 
AuthorDate: Thu Feb 20 10:03:42 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Thu Feb 20 13:13:52 2020 +0100

cypress: try harder to kill loolwsd server.

pkill uses SIGTERM signal by default, which is good because
using that makes loolwsd to clean up things before shut down.
For example it removes the pid file.
However, when loolwsd stuck for any reason, then SIGTERM might
not be effective. In this case use SIGKILL.

Change-Id: I3ed4bd24d6e73169b4d04dd7c9b4ac03bee8fdd1

diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index f0a4804e1..e7ca4d75b 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -17,25 +17,27 @@ MOBILE_WORKDIR = ${abs_builddir}/workdir/mobile/
 ALLOWED_PORTS = $(shell seq 9900 1 9980)
 FREE_PORT=$(shell node_modules/get-port-cli/cli.js --host=127.0.0.1 
$(ALLOWED_PORTS))
 
+KILL_COMMAND=pkill -F $(PID_FILE) || pkill --signal SIGKILL -F $(PID_FILE)
+
 if HAVE_LO_PATH
 check-local: @JAILS_PATH@ node_modules
$(call run_JS_error_check)
$(call start_loolwsd)
$(call run_desktop_tests)
$(call run_mobile_tests)
-   @pkill -F $(PID_FILE) || true
+   @$(KILL_COMMAND) || true
 
 check-desktop: @JAILS_PATH@ node_modules
$(call run_JS_error_check)
$(call start_loolwsd)
$(call run_desktop_tests,$(spec))
-   @pkill -F $(PID_FILE) || true
+   @$(KILL_COMMAND) || true
 
 check-mobile: @JAILS_PATH@ node_modules
$(call run_JS_error_check)
$(call start_loolwsd)
$(call run_mobile_tests,$(spec))
-   @pkill -F $(PID_FILE) || true
+   @$(KILL_COMMAND) || true
 
 run-desktop: @JAILS_PATH@ node_modules
$(call start_loolwsd)
@@ -45,7 +47,7 @@ run-desktop: @JAILS_PATH@ node_modules
$(CYPRESS_BINARY) open --config 
integrationFolder=$(DESKTOP_TEST_FOLDER),userAgent=$(DESKTOP_USER_AGENT) \
--env 
DATA_FOLDER=$(DESKTOP_DATA_FOLDER),WORKDIR=$(DESKTOP_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT)
 \
|| true
-   @pkill -F $(PID_FILE) || true
+   @$(KILL_COMMAND) || true
 
 run-mobile: @JAILS_PATH@ node_modules
$(call start_loolwsd)
@@ -55,7 +57,7 @@ run-mobile: @JAILS_PATH@ node_modules
$(CYPRESS_BINARY) open --config 
integrationFolder=$(MOBILE_TEST_FOLDER),userAgent=$(MOBILE_USER_AGENT) \
--env 
DATA_FOLDER=$(MOBILE_DATA_FOLDER),WORKDIR=$(MOBILE_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT)
 \
|| true
-   @pkill -F $(PID_FILE) || true
+   @$(KILL_COMMAND) || true
 
 define run_JS_error_check
@echo "Checking for JS errors in test code..."
@@ -91,7 +93,7 @@ define run_desktop_tests
--headless \
--env 
DATA_FOLDER=$(DESKTOP_DATA_FOLDER),WORKDIR=$(DESKTOP_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT)
 \
$(if $(1), 
--spec=${abs_dir}/integration_tests/desktop/$(1)) \
-   || (@pkill -F $(PID_FILE) && false)
+   || ($(KILL_COMMAND) && false)
 endef
 
 define run_mobile_tests
@@ -103,7 +105,7 @@ define run_mobile_tests
--headless \
--env 
DATA_FOLDER=$(MOBILE_DATA_FOLDER),WORKDIR=$(MOBILE_WORKDIR),WSD_VERSION_HASH=$(LOOLWSD_VERSION_HASH),SERVER_PORT=$(FREE_PORT)
 \
$(if $(1), 
--spec=$(abs_dir)/integration_tests/mobile/$(1)) \
-   || (@pkill -F $(PID_FILE) && false)
+   || ($(KILL_COMMAND) && false)
 endef
 
 node_modules:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Stephan Bergmann (via logerrit)
 offapi/com/sun/star/drawing/framework/XConfigurationController.idl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4ee389d1ecf0de90fe3ab433d0d5b6f208fa0951
Author: Stephan Bergmann 
AuthorDate: Thu Feb 20 11:45:14 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Feb 20 12:40:07 2020 +0100

Revert typo in documentation

...that had been introduced with c66fe94d3e9cc1394dd4b569a3d8f374208a729b 
"Fix
typos"

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

diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl 
b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
index b41e24a8140b..eaac2123baff 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
@@ -152,7 +152,7 @@ interface XConfigurationController
 @param eMode
 When eMode is REPLACE then, before adding the
 resource activation to the request queue, similar resources
-linked to the same anchor are removed.  This make it easier to
+linked to the same anchor are removed.  This makes it easier to
 switch between resources whose activation is mutually exclusive.
 For example, there can only be one view per pane, so before
 activating a new view the old one has to be deactivated.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Tamás Zolnai (via logerrit)
 cypress_test/integration_tests/mobile/writer/styles_spec.js |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit bde5059f199c6783d9af868a2179ef93e562849b
Author: Tamás Zolnai 
AuthorDate: Thu Feb 20 09:43:29 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Thu Feb 20 12:00:18 2020 +0100

cypress: mobile: update test title.

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

diff --git a/cypress_test/integration_tests/mobile/writer/styles_spec.js 
b/cypress_test/integration_tests/mobile/writer/styles_spec.js
index 48023b2bf..21d0321dd 100644
--- a/cypress_test/integration_tests/mobile/writer/styles_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/styles_spec.js
@@ -85,10 +85,7 @@ describe('Apply/modify styles.', function() {
.should('have.attr', 'style', 'margin-bottom: 0in; 
line-height: 100%');
});
 
-   it('New style item is hidden.', function() {
-   // New style item opens a tunneled dialog
-   // what we try to avoid.
-
+   it('New style and update style items are hidden.', function() {
// Open mobile wizard
cy.get('#tb_actionbar_item_mobile_wizard')
.click();
___
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/svx svx/source sw/qa sw/source

2020-02-20 Thread Miklos Vajna (via logerrit)
 include/svx/framelink.hxx  |7 +
 svx/source/dialog/framelink.cxx|  117 +
 sw/qa/core/layout/data/border-collapse-compat.docx |binary
 sw/qa/core/layout/layout.cxx   |   21 +++
 sw/source/core/layout/paintfrm.cxx |   12 ++
 5 files changed, 156 insertions(+), 1 deletion(-)

New commits:
commit 37bf72bac52ba98a29c1d29f3fe9e667c4222d06
Author: Miklos Vajna 
AuthorDate: Wed Feb 19 18:03:59 2020 +0100
Commit: Miklos Vajna 
CommitDate: Thu Feb 20 11:27:32 2020 +0100

sw table cell borders: add optional Word-compatible border collapsing

We always compared border width and other aspects only after that, Word
works with border weight according to their implementer notes.

So extend svx::frame::Style to be able to collapse borders using weights
and opt in for that from sw/ in case a compat mode (which is related to
tables, off by default and is set by the DOC/DOCX import) is set.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89052
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit e6fa52c2c371c7adc9c2c2cb18c3a8cf782cfa4b)

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

diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx
index fa629fc24ad2..cab0b59e371d 100644
--- a/include/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
@@ -123,6 +123,7 @@ private:
 double  mfSecn; /// Width of secondary (right or 
bottom) line.
 double  mfPatternScale; /// Scale used for line pattern 
spacing.
 SvxBorderLineStyle  mnType;
+bool mbWordTableCell;
 
 public:
 /** Constructs an invisible frame style. */
@@ -136,7 +137,8 @@ private:
 mfDist(0.0),
 mfSecn(0.0),
 mfPatternScale(1.0),
-mnType(SvxBorderLineStyle::SOLID)
+mnType(SvxBorderLineStyle::SOLID),
+mbWordTableCell(false)
 {}
 };
 
@@ -194,6 +196,9 @@ public:
 /** Mirrors this style (exchanges primary and secondary), if it is a 
double frame style. */
 Style& MirrorSelf();
 
+/** Enables the Word-compatible Style comparison code. */
+void SetWordTableCell(bool bWordTableCell);
+
 bool operator==( const Style& rOther) const;
 bool operator<( const Style& rOther) const;
 };
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index b4548c6ebed9..c8696b063e0b 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -267,6 +267,16 @@ Style& Style::MirrorSelf()
 return *this;
 }
 
+void Style::SetWordTableCell(bool bWordTableCell)
+{
+if (!maImplStyle)
+{
+implEnsureImplStyle();
+}
+
+maImplStyle->mbWordTableCell = bWordTableCell;
+}
+
 bool Style::operator==( const Style& rOther) const
 {
 if(!maImplStyle && !rOther.maImplStyle)
@@ -290,6 +300,101 @@ bool Style::operator==( const Style& rOther) const
 && Type() == rOther.Type());
 }
 
+namespace
+{
+/**
+ * Gets the weight of rStyle, according to [MS-OI29500] v20171130, 2.1.168 
Part 1 Section 17.4.66,
+ * tcBorders (Table Cell Borders).
+ */
+double GetWordTableCellBorderWeight(const Style& rStyle)
+{
+double fWidth = rStyle.GetWidth();
+int nBorderNumber = 0;
+
+// See lcl_convertBorderStyleFromToken() in writerfilter/ and 
ConvertBorderStyleFromWord() in
+// editeng/, this is the opposite of the combination of those functions.
+switch (rStyle.Type())
+{
+case SvxBorderLineStyle::NONE:
+return 0.0;
+case SvxBorderLineStyle::DOTTED:
+case SvxBorderLineStyle::DASHED:
+return 1.0;
+case SvxBorderLineStyle::SOLID:
+// single = 1
+// thick = 2
+// wave = 20
+nBorderNumber = 1;
+break;
+case SvxBorderLineStyle::DOUBLE:
+case SvxBorderLineStyle::DOUBLE_THIN:
+// double = 3
+// triple = 10
+// doubleWave = 21
+// dashDotStroked = 23
+nBorderNumber = 3;
+break;
+case SvxBorderLineStyle::DASH_DOT:
+// dotDash = 8
+nBorderNumber = 8;
+break;
+case SvxBorderLineStyle::DASH_DOT_DOT:
+// dotDotDash = 9
+nBorderNumber = 9;
+break;
+case SvxBorderLineStyle::THINTHICK_SMALLGAP:
+// thinThickSmallGap = 11
+nBorderNumber = 11;
+break;
+case SvxBorderLineStyle::THICKTHIN_SMALLGAP:
+// thickThinSmallGap = 12
+// thinThickThinSmallGap = 13
+nBorderNumber = 12;
+break;
+case SvxBorderLineStyle::THINTHICK_MEDIUMGAP:
+ 

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

2020-02-20 Thread Michael Stahl (via logerrit)
 sw/source/core/text/frmpaint.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit ba16bb44668b9088926be759c457757c8e90dd53
Author: Michael Stahl 
AuthorDate: Wed Feb 19 17:09:33 2020 +0100
Commit: Michael Stahl 
CommitDate: Thu Feb 20 11:22:25 2020 +0100

sw: fix unintended change in SwExtraPainter::SwExtraPainter()

nVirtPageNum was an obfuscated optional, by assigning 1 and 2 instead of
1 and 0... probably the only difference is that this saves a function
call?

(regression from a26c4dbd9ca17578fd5c165bd89b618751fabb3c)

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

diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 2f25dfed2b44..f69fdfbfc5b9 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -112,7 +112,7 @@ SwExtraPainter::SwExtraPainter( const SwTextFrame *pFrame, 
SwViewShell *pVwSh,
 if( m_aRect.Bottom() > nBottom )
 m_aRect.Bottom( nBottom );
 }
-bool isRightPage(false);
+o3tl::optional oIsRightPage;
 if( bLineNum )
 {
 /* Initializes the Members necessary for line numbering:
@@ -138,13 +138,13 @@ SwExtraPainter::SwExtraPainter( const SwTextFrame 
*pFrame, SwViewShell *pVwSh,
 {
 if( pFrame->FindPageFrame()->OnRightPage() )
 {
-isRightPage = true;
+oIsRightPage = true;
 ePos = ePos == LINENUMBER_POS_INSIDE ?
 LINENUMBER_POS_LEFT : LINENUMBER_POS_RIGHT;
 }
 else
 {
-isRightPage = false;
+oIsRightPage = false;
 ePos = ePos == LINENUMBER_POS_OUTSIDE ?
 LINENUMBER_POS_LEFT : LINENUMBER_POS_RIGHT;
 }
@@ -164,9 +164,9 @@ SwExtraPainter::SwExtraPainter( const SwTextFrame *pFrame, 
SwViewShell *pVwSh,
 {
 if( text::HoriOrientation::INSIDE == eHor || 
text::HoriOrientation::OUTSIDE == eHor )
 {
-if (!isRightPage)
-isRightPage = pFrame->FindPageFrame()->OnRightPage();
-if (isRightPage)
+if (!oIsRightPage)
+oIsRightPage = pFrame->FindPageFrame()->OnRightPage();
+if (*oIsRightPage)
 eHor = eHor == text::HoriOrientation::INSIDE ? 
text::HoriOrientation::LEFT : text::HoriOrientation::RIGHT;
 else
 eHor = eHor == text::HoriOrientation::OUTSIDE ? 
text::HoriOrientation::LEFT : text::HoriOrientation::RIGHT;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Balazs Varga (via logerrit)
 chart2/qa/extras/chart2export.cxx|   14 
 chart2/qa/extras/data/xlsx/testTdf90749.xlsx |binary
 chart2/source/view/charttypes/VSeriesPlotter.cxx |   36 +++
 oox/source/core/xmlfilterbase.cxx|2 +
 oox/source/drawingml/chart/seriesconverter.cxx   |3 +
 oox/source/export/chartexport.cxx|9 +
 oox/source/token/namespaces-strict.txt   |1 
 oox/source/token/namespaces.hxx.tail |1 
 oox/source/token/namespaces.txt  |1 
 oox/source/token/properties.txt  |1 
 oox/source/token/tokens.txt  |1 
 11 files changed, 68 insertions(+), 1 deletion(-)

New commits:
commit 769433ad93040bc81f06672c8a2c01e2b76fece3
Author: Balazs Varga 
AuthorDate: Wed Feb 12 13:47:50 2020 +0100
Commit: László Németh 
CommitDate: Thu Feb 20 11:18:40 2020 +0100

tdf#90749 chart: add leader lines to custom data label positions

also export them as CustomXML extension for MSO interoperability.

Note: pie chart is not yet supported.

See commit 4223ff2be69f03e571464b0b09ad0d278918631b
( tdf#48436 Chart: add CustomLabelPosition UNO API property)

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

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index b9d5873052ba..88c7d154d170 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -136,6 +136,7 @@ public:
 void testCustomDataLabel();
 void testCustomPositionofDataLabel();
 void testCustomDataLabelMultipleSeries();
+void testLeaderLines();
 void testNumberFormatExportPPTX();
 void testLabelSeparatorExportDOCX();
 void testChartTitlePropertiesColorFillPPTX();
@@ -254,6 +255,7 @@ public:
 CPPUNIT_TEST(testCustomDataLabel);
 CPPUNIT_TEST(testCustomPositionofDataLabel);
 CPPUNIT_TEST(testCustomDataLabelMultipleSeries);
+CPPUNIT_TEST(testLeaderLines);
 CPPUNIT_TEST(testNumberFormatExportPPTX);
 CPPUNIT_TEST(testLabelSeparatorExportDOCX);
 CPPUNIT_TEST(testChartTitlePropertiesColorFillPPTX);
@@ -349,7 +351,8 @@ void 
Chart2ExportTest::registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx)
 { "office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0" },
 { "table", "urn:oasis:names:tc:opendocument:xmlns:table:1.0" },
 { "text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0" },
-{ "xlink", "http://www.w3c.org/1999/xlink"; }
+{ "xlink", "http://www.w3c.org/1999/xlink"; },
+{ "c15", "http://schemas.microsoft.com/office/drawing/2012/chart"; }
 };
 for(size_t i = 0; i < SAL_N_ELEMENTS(aNamespaces); ++i)
 {
@@ -2246,6 +2249,15 @@ void 
Chart2ExportTest::testCustomDataLabelMultipleSeries()
 
 }
 
+void Chart2ExportTest::testLeaderLines()
+{
+load("/chart2/qa/extras/data/xlsx/", "testTdf90749.xlsx");
+xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
+CPPUNIT_ASSERT(pXmlDoc);
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:dLbls/c:extLst/c:ext/c15:showLeaderLines",
 "val", "1");
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[2]/c:dLbls/c:extLst/c:ext/c15:showLeaderLines",
 "val", "1");
+}
+
 void Chart2ExportTest::testNumberFormatExportPPTX()
 {
 load("/chart2/qa/extras/data/pptx/", "tdf115859.pptx");
diff --git a/chart2/qa/extras/data/xlsx/testTdf90749.xlsx 
b/chart2/qa/extras/data/xlsx/testTdf90749.xlsx
new file mode 100644
index ..ca3bc806c03c
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/testTdf90749.xlsx differ
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx 
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index b6382943b418..2c46743696f6 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -19,6 +19,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -86,6 +87,7 @@
 namespace chart {
 
 using namespace ::com::sun::star;
+using namespace ::com::sun::star::chart;
 using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
@@ -721,7 +723,41 @@ uno::Reference< drawing::XShape > 
VSeriesPlotter::createDataLabel( const uno::Re
 {
 awt::Point aRelPos = rDataSeries.getLabelPosition(aTextShapePos, 
nPointIndex);
 if( aRelPos.X != -1 )
+{
 xTextShape->setPosition(aRelPos);
+if( 
!m_xChartTypeModel->getChartType().equalsIgnoreAsciiCase(CHART2_SERVICE_NAME_CHARTTYPE_PIE)
 )
+{
+sal_Int32 nX1 = rScreenPosition2D.X;
+sal_Int32 nY1 = rScreenPosition2D.Y;
+

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

2020-02-20 Thread Eda Nur Var (via logerrit)
 toolkit/source/awt/asynccallback.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit c6f5e12ee3f91234b06472d756670f3bb207
Author: Eda Nur Var 
AuthorDate: Mon Jan 27 15:38:48 2020 +0300
Commit: Michael Stahl 
CommitDate: Thu Feb 20 11:13:51 2020 +0100

tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor

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

diff --git a/toolkit/source/awt/asynccallback.cxx 
b/toolkit/source/awt/asynccallback.cxx
index 93eff62f1fe5..6934fbcae19f 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.cxx
@@ -76,8 +76,7 @@ sal_Bool SAL_CALL AsyncCallback::supportsService(OUString 
const & serviceName)
 
 css::uno::Sequence< OUString > SAL_CALL 
AsyncCallback::getSupportedServiceNames()
 {
-css::uno::Sequence< OUString > s { "com.sun.star.awt.AsyncCallback" };
-return s;
+return css::uno::Sequence< OUString >{ "com.sun.star.awt.AsyncCallback" };
 }
 
 // css::awt::XRequestCallback:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Faruk Demirbaş (via logerrit)
 connectivity/source/drivers/firebird/Table.cxx  |2 +-
 connectivity/source/drivers/firebird/Tables.cxx |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit eee035a7c0d8923134d0e3a8520d13706ce9bf9f
Author: Faruk Demirbaş 
AuthorDate: Tue Jan 28 10:43:36 2020 +0300
Commit: Michael Stahl 
CommitDate: Thu Feb 20 11:00:38 2020 +0100

tdf#42982: Improve UNO API error reporting

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

diff --git a/connectivity/source/drivers/firebird/Table.cxx 
b/connectivity/source/drivers/firebird/Table.cxx
index df523235e2ac..0220a8458264 100644
--- a/connectivity/source/drivers/firebird/Table.cxx
+++ b/connectivity/source/drivers/firebird/Table.cxx
@@ -225,7 +225,7 @@ void SAL_CALL Table::alterColumnByName(const OUString& 
rColName,
 // - XRename --
 void SAL_CALL Table::rename(const OUString&)
 {
-throw RuntimeException(); // Firebird doesn't support this.
+throw RuntimeException("Table renaming not supported by Firebird.");
 }
 
 // - XInterface ---
diff --git a/connectivity/source/drivers/firebird/Tables.cxx 
b/connectivity/source/drivers/firebird/Tables.cxx
index dc8255dbda61..7be79b5a2d4a 100644
--- a/connectivity/source/drivers/firebird/Tables.cxx
+++ b/connectivity/source/drivers/firebird/Tables.cxx
@@ -51,7 +51,7 @@ ObjectType Tables::createObject(const OUString& rName)
   
uno::Sequence< OUString >());
 
 if (!xTables.is())
-throw RuntimeException();
+throw RuntimeException("Could not acquire table.");
 
 uno::Reference< XRow > xRow(xTables,UNO_QUERY_THROW);
 
@@ -66,7 +66,7 @@ ObjectType Tables::createObject(const OUString& rName)
   xRow->getString(5))); // Description / Remarks / 
Comments
 
 if (xTables->next())
-throw RuntimeException(); // Only one table should be returned
+throw RuntimeException("Found more tables than expected.");
 
 return xRet;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Xisco Fauli (via logerrit)
 sd/qa/uitest/impress_tests/tdf130440.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d07dc2bc0488dfa451dd3f456f2da78c8da26a70
Author: Xisco Fauli 
AuthorDate: Thu Feb 20 09:58:27 2020 +0100
Commit: Xisco Faulí 
CommitDate: Thu Feb 20 10:51:10 2020 +0100

uitest: forgot to uncomment this line

introduced in ae17b8481532fa192f3f93a6dcf687fed394cf58
Thanks to Stephan for pointing out

Change-Id: I4124762e4cb600773e4f471a10a8b4736434679f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89075
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sd/qa/uitest/impress_tests/tdf130440.py 
b/sd/qa/uitest/impress_tests/tdf130440.py
index f724ed9a78da..31bf83c196ea 100644
--- a/sd/qa/uitest/impress_tests/tdf130440.py
+++ b/sd/qa/uitest/impress_tests/tdf130440.py
@@ -33,7 +33,7 @@ class tdf129346(UITestCase):
 self.xUITest.executeCommand(".uno:Redo")
 # usually passes, but sometimes it asserts with AssertionError: 1 != 2
 #self.assertEqual(document.CurrentController.getCurrentPage().Number, 
2)
-#self.xUITest.executeCommand(".uno:Redo")
+self.xUITest.executeCommand(".uno:Redo")
 
 xDoc = self.xUITest.getTopFocusWindow()
 xEdit = xDoc.getChild("impress_win")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Burak Bala (via logerrit)
 vbahelper/source/msforms/vbanewfont.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7aaa3109edfc2e1fadc533d4d276ee7c14b80dea
Author: Burak Bala 
AuthorDate: Tue Jan 28 20:00:52 2020 +0300
Commit: Michael Stahl 
CommitDate: Thu Feb 20 10:42:28 2020 +0100

tdf#42982 Make UNO error reporting more descriptive

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

diff --git a/vbahelper/source/msforms/vbanewfont.cxx 
b/vbahelper/source/msforms/vbanewfont.cxx
index 2e7e1efbfb2f..b966d8454a81 100644
--- a/vbahelper/source/msforms/vbanewfont.cxx
+++ b/vbahelper/source/msforms/vbanewfont.cxx
@@ -71,7 +71,7 @@ void SAL_CALL VbaNewFont::setCharset( sal_Int16 nCharset )
 if( (0 <= nCharset) && (nCharset <= SAL_MAX_UINT8) )
 eFontEnc = rtl_getTextEncodingFromWindowsCharset( static_cast< 
sal_uInt8 >( nCharset ) );
 if( eFontEnc == RTL_TEXTENCODING_DONTKNOW )
-throw uno::RuntimeException();
+throw uno::RuntimeException("an unknown or missing encoding");
 mxProps->setPropertyValue( "FontCharset" , uno::Any( static_cast< 
sal_Int16 >( eFontEnc ) ) );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Minutes from the UX/design meeting 2020-Feb-19

2020-02-20 Thread Heiko Tietze
Present: Cor, Heiko
Comments from: Thomas, Stuart, Regina, Seth

Tickets

 * Dark theme for the welcome window
   + https://bugs.documentfoundation.org/show_bug.cgi?id=129725
   + drop customization and use system color (Heiko)
   + might be difficult (Stuart)
   + alternatively use application background and document background from 
tools > app. color
   => do it

 * UI: Add option to set default for Paste to as "text without formatting"
   + https://bugs.documentfoundation.org/show_bug.cgi?id=76943
   + resolved as dup of 62950, which is wfm as customization works now (Heiko)
   + suggest an option to select what default is for Paste "(o) LibO document ( 
) Unformatted"
 and have the opposite with Paste Special (Cor)
   + customization of ctrl+v allows to always show the paste special dialog 
(ctrl+v is 
 hard-coded though)
   => that's sufficient (Cor)

 * Styled source text copied to footnote should use footnote's paragraph style
   + https://bugs.documentfoundation.org/show_bug.cgi?id=100018
   + introduce a special behavior by preserving the target style (footnote) 
 when pasting formatted text (eg. using text body) into the footnote area
   + more flexible approach is to have a checkbox on all paragraph styles like
 "[x] Paste with Style" that behaves as today when checked but always 
applies 
 the source style when off (and changes the target paragraph style)
   + see also https://bugs.documentfoundation.org/show_bug.cgi?id=98381 with
 similar request
   + another solution is to ignore all white-spaces (has likely negative 
bearings)
   + and last but not least we could introduce a paste special option "with 
style" that
 overrides the paragraph (could also be a new UNO command so user may 
customize
 the shortcut)
   + prefer the hard-coded solution with special behavior for footnotes and 
endnotes (Cor)
   + flag with the paragraph style is most flexible (Heiko)
   => up to devs

 * Draw: Move "Color replacer" item from "Tools" menu to "Format-Image-Filter" 
submenu
   + https://bugs.documentfoundation.org/show_bug.cgi?id=130367
   + Images are special objects and all commands belong to Tools (Regina)
   + users may not understand why image got moved to tools; color replacer
 is just a nice tool (Cor)
   => don't change the menu; WF

 * default sidebar width
   + https://bugs.documentfoundation.org/show_bug.cgi?id=130102
   + would be nice but our content is just too variable (Cor)
   => WF



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


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

2020-02-20 Thread Michael Weghorn (via logerrit)
 vcl/qt5/Qt5Widget.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 69e708868f6046cada955a16bca966370ce3218a
Author: Michael Weghorn 
AuthorDate: Thu Feb 20 08:14:36 2020 +0100
Commit: Michael Weghorn 
CommitDate: Thu Feb 20 10:38:45 2020 +0100

tdf#130794 qt5: Actually, ignore non-spontaneous QEvent::ShortcutOverride

In fact, the assumption in commit
034f56015c1c7a61faede33fb5306f63b5585632
("tdf#126785 qt5: Ignore external QEvent::ShortcutOverride") was
a fallacy and it's exactly the other way around:

"Normal" typing leads to "spontaneous" events of type
QEvent::ShortcutOverride, since those originate from
outside, are triggered via X11 events or Wayland equivalent,
and the non-spontaneous ones are the additional ones that
happen when e.g. the Orca screen reader is enabled.

In a short test, no non-spontaneous QEvent::ShortcutOverride
ever occured when using LibreOffice a bit with Orca disabled
on X11 or Wayland (and on Wayland also not with Orca enabled,
since Qt accessibility is broken there, s. QTBUG-73945 [1]).

(Side note: In a quick test with Qt 5.12.5 and Plasma on Wayland,
'xcbSourceDispatch' from Qt library's qxcbeventdispatcher.cpp
was also used in the Wayland case to when processing the keyboard
events).

[1] https://bugreports.qt.io/browse/QTBUG-73945

Change-Id: I1be1977e67f84fa657f6fc197e0b91822b6a3a2a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89073
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 0bca51ea55c8..27b617a91568 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -450,12 +450,12 @@ bool Qt5Widget::handleEvent(Qt5Frame& rFrame, const 
QWidget& rWidget, QEvent* pE
 {
 if (pEvent->type() == QEvent::ShortcutOverride)
 {
-// ignore QEvent::ShortcutOverride events originating from outside the 
application,
+// ignore non-spontaneous QEvent::ShortcutOverride events,
 // since such an extra event is sent e.g. with Orca screen reader 
enabled,
-// so that two events of that kind (the "real one" and one from 
outside)
+// so that two events of that kind (the "real one" and a 
non-spontaneous one)
 // would otherwise be processed, resulting in duplicate input as 
'handleKeyEvent'
 // is called below (s. tdf#122053)
-if (pEvent->spontaneous())
+if (!pEvent->spontaneous())
 {
 return false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Tamás Zolnai (via logerrit)
 cypress_test/integration_tests/mobile/writer/styles_spec.js |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 9eaecc1b0634604e5b8f0761659e7aa39076d4ee
Author: Tamás Zolnai 
AuthorDate: Thu Feb 20 09:41:41 2020 +0100
Commit: Tamás Zolnai 
CommitDate: Thu Feb 20 10:19:38 2020 +0100

cypress: mobile: Fix-up hidden style items test.

Without waiting for the mobile wizard to be opened
the not exist check will allways pass no matter
whether the items are actually hidden or not.
First we need an indicator that the mobile wizard
is opened and then we can check whether the removed
styles items are not there.

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

diff --git a/cypress_test/integration_tests/mobile/writer/styles_spec.js 
b/cypress_test/integration_tests/mobile/writer/styles_spec.js
index 6d0a25064..48023b2bf 100644
--- a/cypress_test/integration_tests/mobile/writer/styles_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/styles_spec.js
@@ -93,6 +93,9 @@ describe('Apply/modify styles.', function() {
cy.get('#tb_actionbar_item_mobile_wizard')
.click();
 
+   cy.get('#applystyle')
+   .should('exist');
+
cy.get('#StyleUpdateByExample')
.should('not.exist');
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Samuel Mehrbrodt (via logerrit)
 sw/source/filter/ww8/docxexport.hxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 91df0fcf7642059c5c2e5a98eabdff348b6254dd
Author: Samuel Mehrbrodt 
AuthorDate: Wed Feb 19 11:55:14 2020 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Thu Feb 20 09:59:10 2020 +0100

Turn fprintf into warning

so that this does not show up in release builds

Change-Id: I7d95a85e596818fcdafbf37891f3e0ae24aa7155
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88952
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sw/source/filter/ww8/docxexport.hxx 
b/sw/source/filter/ww8/docxexport.hxx
index f659cd1244f4..d5d610f70f99 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -22,6 +22,7 @@
 
 #include "wrtww8.hxx"
 
+#include 
 #include 
 #include 
 
@@ -155,7 +156,7 @@ public:
 OString AddRelation( const OUString& rType, const OUString& rTarget );
 
 virtual void WriteCR( ww8::WW8TableNodeInfoInner::Pointer_t 
/*pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t()*/ ) 
override { /* FIXME no-op for docx, most probably should not even be in 
MSWordExportBase */ }
-virtual void WriteChar( sal_Unicode ) override { /* FIXME */ fprintf( 
stderr, "HACK! WriteChar() has nothing to do for docx.\n" ); }
+virtual void WriteChar( sal_Unicode ) override { SAL_WARN("sw.ww8", 
"FIXME: WriteChar() has nothing to do for docx."); }
 
 /// Return value indicates if an inherited outline numbering is suppressed.
 virtual bool DisallowInheritingOutlineNumbering( const SwFormat &rFormat ) 
override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2020-02-20 Thread Samuel Mehrbrodt (via logerrit)
 sfx2/source/view/viewfrm.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit a9634d6cb31d7aa9184c5f234fb6f8c1c6885357
Author: Samuel Mehrbrodt 
AuthorDate: Mon Feb 17 17:00:27 2020 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Thu Feb 20 09:58:26 2020 +0100

Revert "Don't display reload as toggle command"

Turns out the reload toggle is used to turn off html documents meta refresh
https://www.w3schools.com/TAGS/att_meta_http_equiv.asp where LibreOffice 
honours that html refresh and toggling this off will stop it doing that

This reverts commit 89b80daec907a456f08946dd9ebbc6efbd9b5391.

Change-Id: I6928a693d5ffde9ea01020be4e59631e8b10be93
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88793
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 3534e2b889aa..4d697710c0af 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -931,6 +931,13 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet )
 {
 if ( !pSh->CanReload_Impl() || pSh->GetCreateMode() == 
SfxObjectCreateMode::EMBEDDED )
 rSet.DisableItem(nWhich);
+else
+{
+// If any ChildFrame is reloadable, the slot is enabled,
+// so you can perform CTRL-Reload
+rSet.Put( SfxBoolItem( nWhich, false));
+}
+
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


getting started with contributions in libreoffice online android app

2020-02-20 Thread RUTUJA BHAGWAN KENDRE
Hello Everyone,

  I want to contribute to the libreoffice android online app but I
don’t see any specific easy hacks listed in it. How do I get started? Do I
need to find bugs on my own and start fixing them?

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


Re: FYI: Building LibreOffice - Missing Library On Debian

2020-02-20 Thread rene . engelhard
Hi,

Am 19. Februar 2020 18:46:27 MEZ schrieb Andreas Mantke :
>I tried to build LibreOffice on Debian bullseye/sid i686 from source
>(master) (git checkout from yesterday evening). I got no warning about
>missing libraries and ran into an error:
>
>(...)/workdir/UnpackedTarball/skia/tools/sk_app/unix/VulkanWindowContext_unix.cpp:19:10:
>fatal error: X11/Xlib-xcb.h: Datei oder Verzeichnis nicht gefunden
>
>19 | #include 
>
>| ^~~~
>
>compilation terminated.
>
>
>There the package libx11-xcb-dev was missing. Once I installed that
>package manually the error message disappeared.
>I don't know if this dependency has already been added to the
>build-deps
>for Debian.

Long ago.
 
https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/commit/ce99ac10cd39d22fd74644411821f2acdfcf1cf4

Of course not in any repo yet so apt build-dep doesn't see it.

Regards

Rene

-- 
Diese Nachricht wurde von meinem Android-Gerät mit K-9 Mail gesendet.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


About putting Firebird creation option experimental

2020-02-20 Thread julien2412
Hello,

About 8 months ago, I had proposed to put Firebird experimental, at least
the migration process.
It's been done but Firebird bugs kept on piling up (I don't talk about
migration process one) and too rare fixes happened.
I know that some bugs may be due to the fact we use an old Firebird version.
Indeed we use first version version of 3.0.0 Firebird library whereas 3.0.5
and even 4.0 beta have been released.
(I had tried twice to upgrade:
- towards 3.0.2 https://gerrit.libreoffice.org/c/core/+/37488 but there were
SSE4 pbs on Mac
- towards 3.0.4 https://gerrit.libreoffice.org/c/core/+/67180 but there were
failing LO test 
)

Anyway, I propose to make Firebird entry appear in embedded database
creation part only in Experimental part.

Anyone against this?

Julien




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


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

2020-02-20 Thread Xisco Fauli (via logerrit)
 sd/qa/uitest/impress_tests/tdf130440.py |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit bea50dda06f0c92e5a31594adb6f0225580f8d7c
Author: Xisco Fauli 
AuthorDate: Wed Feb 19 17:32:50 2020 +0100
Commit: Xisco Faulí 
CommitDate: Thu Feb 20 09:23:12 2020 +0100

uitest: comment out problematic assert

> The new test appears to be unreliable.  At least
> ,
> , and
>  all failed
> with
>
> > FAIL: test_run (tdf130440.tdf129346)
> > --
> > Traceback (most recent call last):
> >   File 
"/home/tdf/lode/jenkins/workspace/lo_tb_master_linux_dbg/sd/qa/uitest/impress_tests/tdf130440.py",
 line 34, in test_run
> > 
self.assertEqual(document.CurrentController.getCurrentPage().Number, 2)
> > AssertionError: 1 != 2

7ed602a3b8c0ffe922b4f082cd4cdaa5a8f0d64c aimed to fix it but it still fails 
sometimes
I believe it fails because both slides are selected at the same time in the 
slide pane.

Change-Id: Ie9757d1122e278b0d49ca9a09caf1765d2df154d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89048
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sd/qa/uitest/impress_tests/tdf130440.py 
b/sd/qa/uitest/impress_tests/tdf130440.py
index f290d9c5d400..f724ed9a78da 100644
--- a/sd/qa/uitest/impress_tests/tdf130440.py
+++ b/sd/qa/uitest/impress_tests/tdf130440.py
@@ -31,8 +31,9 @@ class tdf129346(UITestCase):
 self.xUITest.executeCommand(".uno:Undo")
 self.assertEqual(document.CurrentController.getCurrentPage().Number, 1)
 self.xUITest.executeCommand(".uno:Redo")
-self.assertEqual(document.CurrentController.getCurrentPage().Number, 2)
-self.xUITest.executeCommand(".uno:Redo")
+# usually passes, but sometimes it asserts with AssertionError: 1 != 2
+#self.assertEqual(document.CurrentController.getCurrentPage().Number, 
2)
+#self.xUITest.executeCommand(".uno:Redo")
 
 xDoc = self.xUITest.getTopFocusWindow()
 xEdit = xDoc.getChild("impress_win")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] online.git: android/lib

2020-02-20 Thread Andras Timar (via logerrit)
 android/lib/build.gradle |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 28633057887770ee16a24d150f9ba8bc6dc82e0c
Author: Andras Timar 
AuthorDate: Thu Feb 20 09:04:16 2020 +0100
Commit: Andras Timar 
CommitDate: Thu Feb 20 09:05:10 2020 +0100

We need also share/gallery for the Android app for inserting some shapes 
defined there

Change-Id: I8fcbc78c17753607351580b97f931f3a2c59a091
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89072
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/android/lib/build.gradle b/android/lib/build.gradle
index e2758100d..857d4add6 100644
--- a/android/lib/build.gradle
+++ b/android/lib/build.gradle
@@ -150,7 +150,7 @@ task copyAssets(type: Copy) {
 into('share') {
 from "${liboInstdir}/share"
 // Filter data is needed by e.g. the drawingML preset shape import.
-includes = ['registry/**', 'filter/**']
+includes = ['registry/**', 'filter/**', 'gallery/**']
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits