Re: compiling Libreoffice online android doesn't display document.

[Michael Weghorn]

Hi Miklos and Chetan,

On 17/09/2020 09.07, Miklos Vajna wrote:
> Hi Michael,
> 
> On Wed, Sep 16, 2020 at 01:12:19PM +0200, Michael Weghorn 
>  wrote:
>> (Maybe somebody else can say more on whether including all services into
>> liblo-native-code that are required to support all file formats that
>> LibreOffice supports is fine or would be problematic, e.g. for APK
>> size,...).
> 
> My understanding is that there is no automated way to find out which
> services are needed to support import of exotic file formats, so
> addition / removal of such UNO service ctors have to be considered on a
> case by case basis.
> 
> It's always a good idea to document (in the commit message) what is
> fixed when adding a new one. Removing ctors reduces code size.

thanks for the explanation.

Chetan, I'd personally suggest you start with a simple ODT file and once
your self-built Android app works in general, continue with more
difficult tasks, like looking why specific files are not supported yet.

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

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

[Tor Lillqvist (via logerrit)]

 bridges/source/cpp_uno/gcc3_ios/except.cxx   |   34 +--
 bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h |   17 -
 2 files changed, 48 insertions(+), 3 deletions(-)

New commits:
commit 7c0bc17fb5871ffaa9497ab9e0917fe0c00c0e98
Author: Tor Lillqvist 
AuthorDate: Thu Sep 17 14:02:24 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Fri Sep 18 01:31:21 2020 +0200

Add Stephan's "Very bad HACK" to the iOS code, too, for iOS 14

Change-Id: Ie05d2dc77bfdcd323037d2e94b523808df4e1c9c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102916
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102980
Tested-by: Tor Lillqvist 

diff --git a/bridges/source/cpp_uno/gcc3_ios/except.cxx 
b/bridges/source/cpp_uno/gcc3_ios/except.cxx
index 2ef8ef49b966..d5c49859db27 100644
--- a/bridges/source/cpp_uno/gcc3_ios/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios/except.cxx
@@ -267,10 +267,14 @@ static void deleteException( void * pExc )
 // size 8 in front of that member (changing its offset from 88 to 96,
 // sizeof(__cxa_exception) from 120 to 128, and alignof(__cxa_exception)
 // from 8 to 16); a hack to dynamically determine whether we run against a
-// new libcxxabi is to look at the exceptionDestructor member, which must
+// LLVM 5 libcxxabi is to look at the exceptionDestructor member, which 
must
 // point to this function (the use of __cxa_exception in fillUnoException 
is
 // unaffected, as it only accesses members towards the start of the struct,
-// through a pointer known to actually point at the start):
+// through a pointer known to actually point at the start).  The libcxxabi 
commit
+// 

+// "Insert padding before the __cxa_exception header to ensure the thrown" 
in LLVM 6
+// removes the need for this hack, so it can be removed again once we can 
be sure that we only
+// run against libcxxabi from LLVM >= 6:
 if (header->exceptionDestructor != &deleteException) {
 header = reinterpret_cast<__cxa_exception const *>(
 reinterpret_cast(header) - 8);
@@ -347,6 +351,32 @@ void fillUnoException(uno_Any * pUnoExc, uno_Mapping * 
pCpp2Uno)
 return;
 }
 
+// Very bad HACK to find out whether we run against a libcxxabi that has a 
new
+// __cxa_exception::reserved member at the start, introduced with LLVM 10
+// 

+// "[libcxxabi] Insert padding in __cxa_exception struct for 
compatibility".  The layout of the
+// start of __cxa_exception is
+//
+//  [8 byte  void *reserve]
+//   8 byte  size_t referenceCount
+//
+// where the (bad, hacky) assumption is that reserve (if present) is null
+// (__cxa_allocate_exception in at least LLVM 11 zero-fills the object, 
and nothing actively
+// sets reserve) while referenceCount is non-null (__cxa_throw sets it to 
1, and
+// __cxa_decrement_exception_refcount destroys the exception as soon as it 
drops to 0; for a
+// __cxa_dependent_exception, the referenceCount member is rather
+//
+//   8 byte  void* primaryException
+//
+// but which also will always be set to a non-null value in 
__cxa_rethrow_primary_exception).
+// As described in the definition of __cxa_exception
+// (bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx), this hack 
(together with the "#if 0"
+// there) can be dropped once we can be sure that we only run against new 
libcxxabi that has the
+// reserve member:
+if (*reinterpret_cast(header) == nullptr) {
+header = reinterpret_cast<__cxa_exception *>(reinterpret_cast(header) + 1);
+}
+
 std::type_info *exceptionType = __cxxabiv1::__cxa_current_exception_type();
 
 typelib_TypeDescription * pExcTypeDescr = nullptr;
diff --git a/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h 
b/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h
index 9a700445c12a..83ed084860fd 100644
--- a/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h
+++ b/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h
@@ -59,8 +59,23 @@ namespace __cxxabiv1
 // followed by the exception object itself.
 
 struct __cxa_exception
-{ 
+{
 #if __LP64__
+#if 0
+// This is a new field added with LLVM 10
+// 

+// "[libcxxabi] Insert padding in __cxa_exception struct for 
compatibility".  The HACK in
+// fillUnoException (bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx) 
tries to find out at
+// runtime whether a __cxa_exception has this member.  Once we can be sure 
that we only run
+// against new libcxxabi that has this member, we can drop the "#if 0" 
here and drop the hack
+// in fillUnoException.
+
+   

[Libreoffice-commits] core.git: cui/Library_cui.mk cui/qa cui/source cui/uiconfig cui/UIConfig_cui.mk include/svx officecfg/registry reportdesign/inc reportdesign/source reportdesign/uiconfig reportde

[Heiko Tietze (via logerrit)]

 cui/Library_cui.mk  |1 
 cui/UIConfig_cui.mk |2 
 cui/qa/unit/data/cui-dialogs-test.txt   |2 
 cui/source/factory/dlgfact.cxx  |   21 
 cui/source/factory/dlgfact.hxx  |   18 
 cui/source/inc/dstribut.hxx |   69 
-
 cui/source/tabpages/dstribut.cxx|  152 
---
 cui/uiconfig/ui/distributiondialog.ui   |   90 
--
 cui/uiconfig/ui/distributionpage.ui |  439 
--
 include/svx/svdedtv.hxx |2 
 include/svx/svxdlg.hxx  |   12 
 include/svx/svxids.hrc  |   10 
 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu |   28 
 officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu|   11 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu|  110 
++
 officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu |   11 
 officecfg/registry/data/org/openoffice/Office/UI/ReportCommands.xcu |5 
 reportdesign/UIConfig_dbreport.mk   |1 
 reportdesign/inc/rptui_slotid.hrc   |2 
 reportdesign/source/ui/report/ReportController.cxx  |   31 
 reportdesign/uiconfig/dbreport/menubar/menubar.xml  |2 
 reportdesign/uiconfig/dbreport/popupmenu/report.xml |2 
 reportdesign/uiconfig/dbreport/toolbar/distributebar.xml|   21 
 sd/UIConfig_sdraw.mk|1 
 sd/UIConfig_simpress.mk |1 
 sd/sdi/_drvwsh.sdi  |   40 
 sd/source/ui/view/drviews2.cxx  |   12 
 sd/source/ui/view/drviewsj.cxx  |   28 
 sd/uiconfig/sdraw/toolbar/distributebar.xml |   21 
 sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml  |2 
 sd/uiconfig/simpress/toolbar/distributebar.xml  |   21 
 sd/uiconfig/simpress/toolbar/drawingobjectbar.xml   |2 
 solenv/clang-format/excludelist |2 
 svx/sdi/svx.sdi |  137 
+++
 svx/source/svdraw/svdedtv2.cxx  |   26 
 35 files changed, 484 insertions(+), 851 deletions(-)

New commits:
commit 705226338beeabd214f260c00f1a6db2cfb52475
Author: Heiko Tietze 
AuthorDate: Tue Sep 1 10:45:05 2020 +0200
Commit: Maxim Monastirsky 
CommitDate: Fri Sep 18 01:11:18 2020 +0200

Resolves tdf#97918 - Individual UNO commands for distribution options

New UNO commands added, SID_DISTRIBUTE_DLG bend to dropdown, ui removed
Menus and toolbars adjusted

Change-Id: Ic0a3cc299f745a1a0cd18edead1f410ff57a1f1f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102272
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 583cc5c74346..ec2d222a34d9 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -199,7 +199,6 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
 cui/source/tabpages/border \
 cui/source/tabpages/chardlg \
 cui/source/tabpages/connect \
-cui/source/tabpages/dstribut \
 cui/source/tabpages/grfpage \
 cui/source/tabpages/labdlg \
 cui/source/tabpages/macroass \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 62291eff5acf..a6dcd3bfb88f 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -64,8 +64,6 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/gradientpage \
cui/uiconfig/ui/customizedialog \
cui/uiconfig/ui/dbregisterpage \
-   cui/uiconfig/ui/distributiondialog \
-   cui/uiconfig/ui/distributionpage \
cui/uiconfig/ui/effectspage \
cui/uiconfig/ui/eventsconfigpage \
cui/uiconfig/ui/formatcellsdialog \
diff --git a/cui/qa/unit/data/cui-dialogs-test.txt 
b/cui/qa/unit/data/cui-dialogs-test.txt
index f85ce1d12514..ee0413efcc37 100644
--- a/cui/qa/unit/data/cui-dialogs-test.txt
+++ b/cui/qa/unit/data/cui-dialogs-test.txt
@@ -88,8 +88,6 @@ cui/ui/customizedialog.ui
 cui/ui/databaselinkdialog.ui
 cui/ui/dbregisterpage.ui
 cui/ui/dimensionlinestabpage.ui
-cui/ui/distributiondialog.ui
-cui/ui/distributionpage.ui
 cui/ui/editdictionarydialog.ui
 cui/ui/editmodulesdialog.ui
 cui/ui/effectspage.ui
diff

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

[Alain Romedenne (via logerrit)]

 source/text/sbasic/shared/0104.xhp |  330 +
 1 file changed, 178 insertions(+), 152 deletions(-)

New commits:
commit 5c93f0a8c1233c584aac64be9dc77d49bf074ade
Author: Alain Romedenne 
AuthorDate: Fri Sep 11 14:59:03 2020 +0200
Commit: Olivier Hallot 
CommitDate: Fri Sep 18 00:46:14 2020 +0200

tdf#92183 Documents events refresher

Removed items: JScript runtime error, Print mail merge, Message received
Added items: too many to mention

This wiki WiP page details the - very limited - API sources I used:

https://wiki.documentfoundation.org/User:LibreOfficiant/Events#Events_in_Documents


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

diff --git a/source/text/sbasic/shared/0104.xhp 
b/source/text/sbasic/shared/0104.xhp
index c9b9c9b86..87b04a6a5 100644
--- a/source/text/sbasic/shared/0104.xhp
+++ b/source/text/sbasic/shared/0104.xhp
@@ -18,210 +18,236 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
- 
-   
+
 
   
- Event-Driven Macros
+ Document Event-Driven Macros
  /text/sbasic/shared/0104.xhp
   


   
-deleting; macro assignments to 
events
+ 
+ deleting; macro assignments to events
  macros; assigning to events
  assigning macros to events
+ documents; events
  events; assigning macros
-
-Event-Driven 
Macros
- This 
section describes how to assign Basic programs to program events.
+ 
+  Document Event-Driven Macros
+ This section describes 
how to assign scripts to application, document or form events.
   
-  You can 
automatically execute a macro when a specified software event occurs by 
assigning the desired macro to the event. The following table provides an 
overview of program events and at what point an assigned macro is 
executed.
+  You can automatically 
execute a macro when a specified software event occurs by assigning the desired 
macro to the event. The following table provides an overview of document events 
and at what point an assigned macro is executed.
+
   
  
-
-   Event
-
-
-   An assigned macro is executed...
-
+Event
+An 
assigned macro is executed...
+routine
+ 
+ 
+Start 
Application
+...after a $[officename] application is 
started.
+OnStartApp
+ 
+ 
+Close 
Application
+...before a $[officename] application is 
terminated.
+OnCloseApp
+ 
+ 
+   Document created
+   ...New document created with File - New or 
with the New icon. Note that this event also fires when Basic IDE 
opens.
+   OnCreate
+ 
+ 
+New 
Document
+...after a new document is created with File - 
New or with the New icon.
+OnNew
+ 
+ 
+Document loading finished
+...before a document is opened with File - 
Open or with the Open icon.
+OnLoadFinished
+ 
+ 
+Open 
Document
+...after a document is opened with File - Open 
or with the Open icon.
+OnLoad
+ 
+ 
+Document is going to be closed
+...before a document is closed.
+OnPrepareUnload
+ 
+ 
+Document closed
+...after a document was closed. Note that the "Save 
Document" event may also occur when the document is saved before 
closing.
+OnUnload
+
+
+   -no UI-
+   
+   OnLayoutFinished
+ 
+ 
+View created
+Document is displayed. Note that this event also happens 
when a document is duplicated.
+OnViewCreated
  
  
-
-   Program Start
-
-
-   ... after a $[officename] application is 
started.
-
+View is going to be closed
+Document layout is getting removed.
+OnPrepareViewClosing
  
  
-
-   Program End
-
-
-   ...before a $[officename] application is 
terminated.
-
+View closed
+Document layout is cleared prior to the document 
closure.
+OnViewClosed
  
  
-
-   Create Document
-
-
-   ...after a new document is created with File - 
New or with the New icon.
-
+

[Libreoffice-commits] core.git: helpcontent2

[Alain Romedenne (via logerrit)]

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

New commits:
commit 90a5b6844409ee46b8cb4d87ad8446994a546575
Author: Alain Romedenne 
AuthorDate: Fri Sep 18 00:46:14 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Sep 18 00:46:14 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 5c93f0a8c1233c584aac64be9dc77d49bf074ade
  - tdf#92183 Documents events refresher

Removed items: JScript runtime error, Print mail merge, Message received
Added items: too many to mention

This wiki WiP page details the - very limited - API sources I used:

https://wiki.documentfoundation.org/User:LibreOfficiant/Events#Events_in_Documents


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

diff --git a/helpcontent2 b/helpcontent2
index f44071b2e41f..5c93f0a8c123 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f44071b2e41f0956301b435fc009b4349c13cba0
+Subproject commit 5c93f0a8c1233c584aac64be9dc77d49bf074ade
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 external/nss/UnpackedTarball_nss.mk |1 +
 external/nss/nss.getopt.patch.0 |   25 +
 2 files changed, 26 insertions(+)

New commits:
commit fe15bdc86aa759096c4581401f0e361e576416aa
Author: Tor Lillqvist 
AuthorDate: Tue Jun 23 01:19:23 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Fri Sep 18 00:38:59 2020 +0200

Add getopt declarations

Avoids: implicit declaration of function 'getopt' is invalid in C99
[-Werror,-Wimplicit-function-declaration].

Change-Id: Ic178f53d1002425df52e220b1723fb12edca13df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96910
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102924
Tested-by: Jenkins CollaboraOffice 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102977

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 8fa1edd530cc..b6fcd1346b82 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/nss.bzmozilla1238154.patch \
external/nss/nss-bz1646594.patch.1 \
 external/nss/macos-dlopen.patch.0 \
+   external/nss/nss.getopt.patch.0 \
 $(if $(filter iOS,$(OS)), \
 external/nss/nss-ios.patch) \
 $(if $(filter ANDROID,$(OS)), \
diff --git a/external/nss/nss.getopt.patch.0 b/external/nss/nss.getopt.patch.0
new file mode 100644
index ..aeabb33f9b97
--- /dev/null
+++ b/external/nss/nss.getopt.patch.0
@@ -0,0 +1,25 @@
+# pr/tests/sel_spd.c:427:20: error: implicit declaration of function 'getopt' 
is invalid in C99 [-Werror,-Wimplicit-function-declaration]
+--- nspr/pr/tests/sel_spd.c
 nspr/pr/tests/sel_spd.c
+@@ -15,6 +15,9 @@
+ #include 
+ #include 
+ #include 
++
++extern char *optarg;
++int getopt(int argc, char *const argv[], const char *optstring);
+ 
+ #ifdef DEBUG
+ #define PORT_INC_DO +100
+--- nspr/pr/tests/testfile.c
 nspr/pr/tests/testfile.c
+@@ -23,6 +23,9 @@
+ #include 
+ #include 
+ #endif /* XP_OS2 */
++
++extern char *optarg;
++int getopt(int argc, char *const argv[], const char *optstring);
+ 
+ static int _debug_on = 0;
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/CppunitTest_sd_tiledrendering.mk

[Stephan Bergmann (via logerrit)]

 sd/CppunitTest_sd_tiledrendering.mk |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 9ef3c8241b5c9bdaa5dce86c0d26e5769f6b6859
Author: Stephan Bergmann 
AuthorDate: Thu Sep 17 19:09:44 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Sep 18 00:02:59 2020 +0200

Missing test dependencies

From-scratch `make CppunitTest_sd_tiledrendering` had failed for me on Linux
with

> warn:vcl.builder:964054:964054:vcl/source/window/builder.cxx:467: 
DBG_UNHANDLED_EXCEPTION in VclBuilder
> when: Unable to read .ui file exception: 
com.sun.star.container.NoSuchElementException message: 
file:///.../instdir/share/config/soffice.cfg/modules/simpress/ui/sidebarslidebackground.ui
 xmlreader/source/xmlreader.cxx:66

and

> warn:vcl.builder:977272:977272:vcl/source/window/builder.cxx:467: 
DBG_UNHANDLED_EXCEPTION in VclBuilder
> when: Unable to read .ui file exception: 
com.sun.star.container.NoSuchElementException message: 
file:///.../instdir/share/config/soffice.cfg/svx/ui/sidebartextpanel.ui 
xmlreader/source/xmlreader.cxx:66

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

diff --git a/sd/CppunitTest_sd_tiledrendering.mk 
b/sd/CppunitTest_sd_tiledrendering.mk
index 3b555860f963..3c5e12e2b265 100644
--- a/sd/CppunitTest_sd_tiledrendering.mk
+++ b/sd/CppunitTest_sd_tiledrendering.mk
@@ -58,4 +58,9 @@ $(eval $(call 
gb_CppunitTest_use_rdb,sd_tiledrendering,services))
 
 $(eval $(call gb_CppunitTest_use_configuration,sd_tiledrendering))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,sd_tiledrendering, \
+modules/simpress \
+svx \
+))
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz (via logerrit)]

 vcl/source/window/splitwin.cxx |   19 ++-
 1 file changed, 2 insertions(+), 17 deletions(-)

New commits:
commit b6d2db52ea963615c1323a031694123c9d2a2534
Author: andreas kainz 
AuthorDate: Thu Sep 17 18:35:57 2020 +0200
Commit: Andreas Kainz 
CommitDate: Thu Sep 17 22:50:50 2020 +0200

tdf#133690 Hide surrounding border frame at sidebar

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

diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 66d64e7fd343..a099ed4b9a03 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -181,10 +181,6 @@ void SplitWindow::ImplDrawBorder(vcl::RenderContext& 
rRenderContext)
 switch (meAlign)
 {
 case WindowAlign::Bottom:
-rRenderContext.SetLineColor(rStyleSettings.GetShadowColor());
-rRenderContext.DrawLine(Point(0, 0), Point(nDX - 1, 0));
-rRenderContext.DrawLine(Point(0, nDY - 2), Point(nDX - 1, nDY - 2));
-
 rRenderContext.SetLineColor(rStyleSettings.GetLightColor());
 rRenderContext.DrawLine(Point(0, 1), Point(nDX - 1, 1));
 rRenderContext.DrawLine(Point(0, nDY - 1), Point(nDX - 1, nDY - 1));
@@ -211,14 +207,8 @@ void SplitWindow::ImplDrawBorder(vcl::RenderContext& 
rRenderContext)
 break;
 default:
 rRenderContext.SetLineColor(rStyleSettings.GetShadowColor());
-rRenderContext.DrawLine(Point(0, 0), Point( 0, nDY - 2));
-rRenderContext.DrawLine(Point(0, 0), Point( nDX - 1, 0));
-rRenderContext.DrawLine(Point(0, nDY - 2), Point(nDX - 1, nDY - 2));
-
-rRenderContext.SetLineColor( rStyleSettings.GetLightColor());
-rRenderContext.DrawLine(Point(1, 1), Point(1, nDY - 3));
-rRenderContext.DrawLine(Point(1, 1), Point(nDX - 1, 1));
-rRenderContext.DrawLine(Point(0, nDY - 1), Point(nDX - 1, nDY - 1));
+rRenderContext.DrawLine(Point(0, 0), Point( 0, nDY));
+rRenderContext.DrawLine(Point(0, nDY), Point(nDX, nDY));
 }
 }
 
@@ -241,11 +231,6 @@ void SplitWindow::ImplDrawBorderLine(vcl::RenderContext& 
rRenderContext)
 rRenderContext.DrawLine( Point( nDX-SPLITWIN_SPLITSIZEEXLN, 1 ), 
Point( nDX-SPLITWIN_SPLITSIZEEXLN, nDY-3 ) );
 break;
 case WindowAlign::Right:
-rRenderContext.SetLineColor( rStyleSettings.GetShadowColor() );
-rRenderContext.DrawLine( Point( SPLITWIN_SPLITSIZEEXLN-1, 0 ), Point( 
SPLITWIN_SPLITSIZEEXLN-1, nDY-2 ) );
-
-rRenderContext.SetLineColor( rStyleSettings.GetLightColor() );
-rRenderContext.DrawLine( Point( SPLITWIN_SPLITSIZEEXLN, 1 ), Point( 
SPLITWIN_SPLITSIZEEXLN, nDY-3 ) );
 break;
 case WindowAlign::Top:
 rRenderContext.SetLineColor( rStyleSettings.GetShadowColor() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 chart2/source/controller/dialogs/DataBrowser.cxx |   36 
 chart2/uiconfig/ui/chartdatadialog.ui|   68 ---
 2 files changed, 61 insertions(+), 43 deletions(-)

New commits:
commit b70b1636b0c71dbb6f6f4f07ebdafeba94261dee
Author: Caolán McNamara 
AuthorDate: Thu Sep 17 19:31:53 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 22:13:13 2020 +0200

tdf#133482 don't increase dialog width when new columns added

gtk will expand to fit all children, while vcl will clip.
insert a borderless ScrolledWindow with "external" scrolling
to allow the dialog to clip the children (same thing we do
for our menubar to shrink down past its natural size)

adjust the width calculation to avoid logictopixel rounding

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

diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx 
b/chart2/source/controller/dialogs/DataBrowser.cxx
index ab967c92408d..6f7ada12cbec 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -102,9 +102,6 @@ public:
 
 bool HasFocus() const { return m_xControl->has_focus(); }
 
-void Hide() { m_xControl->hide(); }
-void Show() { m_xControl->show(); }
-
 void set_size_request(int nWidth, int nHeight) { 
m_xControl->set_size_request(nWidth, nHeight); }
 void set_margin_left(int nLeft) { m_xControl->set_margin_left(nLeft); }
 
@@ -296,23 +293,18 @@ void SeriesHeader::SetPos()
 m_spSymbol->set_size_request(aSize.Width(), aSize.Height());
 
 // series name edit field
-aSize.setWidth(nSymbolDistance);
-aSize = m_xDevice->LogicToPixel(aSize, MapMode(MapUnit::MapAppFont));
-m_spSeriesName->set_margin_left(aSize.Width() + 2);
-aSize.setWidth( m_nWidth - nSymbolHeight - nSymbolDistance );
-sal_Int32 nHeight = 12;
-aSize.setHeight( nHeight );
+m_spSeriesName->set_margin_left(2);
+
+aSize.setWidth(nSymbolHeight);
+aSize.setHeight(12);
 aSize = m_xDevice->LogicToPixel(aSize, MapMode(MapUnit::MapAppFont));
+aSize.setWidth(m_nWidth - aSize.Width() - 2);
 m_spSeriesName->set_size_request(aSize.Width(), aSize.Height());
 
 // color bar
-aSize.setWidth(1);
-aSize = m_xDevice->LogicToPixel(aSize, MapMode(MapUnit::MapAppFont));
-m_spColorBar->set_margin_left(aSize.Width() + 2);
-nHeight = 3;
-aSize.setWidth( m_nWidth - 1 );
-aSize.setHeight( nHeight );
+aSize.setHeight(3);
 aSize = m_xDevice->LogicToPixel(aSize, MapMode(MapUnit::MapAppFont));
+aSize.setWidth(m_nWidth);
 m_spColorBar->set_size_request(aSize.Width(), aSize.Height());
 
 auto xVirDev(m_spColorBar->create_virtual_device());
@@ -331,7 +323,7 @@ void SeriesHeader::SetWidth( sal_Int32 nWidth )
 
 void SeriesHeader::SetPixelWidth( sal_Int32 nWidth )
 {
-SetWidth( m_xDevice->PixelToLogic(Size(nWidth, 0), 
MapMode(MapUnit::MapAppFont)).getWidth());
+SetWidth(nWidth);
 }
 
 void SeriesHeader::SetChartType(
@@ -356,16 +348,14 @@ void SeriesHeader::SetRange( sal_Int32 nStartCol, 
sal_Int32 nEndCol )
 
 void SeriesHeader::Show()
 {
-m_spSymbol->show();
-m_spSeriesName->Show();
-m_spColorBar->show();
+m_xContainer1->show();
+m_xContainer2->show();
 }
 
 void SeriesHeader::Hide()
 {
-m_spSymbol->hide();
-m_spSeriesName->Hide();
-m_spColorBar->hide();
+m_xContainer1->hide();
+m_xContainer2->hide();
 }
 
 void SeriesHeader::SetEditChangedHdl( const Link & 
rLink )
@@ -1346,7 +1336,7 @@ void DataBrowser::ImplAdjustHeaderControls()
 {
 if( nStartPos < nMaxPos )
 {
-(*aIt)->SetPixelWidth( nCurrentPos - nStartPos - 3 );
+(*aIt)->SetPixelWidth( nCurrentPos - nStartPos );
 (*aIt)->Show();
 
 if (pWin)
diff --git a/chart2/uiconfig/ui/chartdatadialog.ui 
b/chart2/uiconfig/ui/chartdatadialog.ui
index b790f4d912c9..b696cd19847a 100644
--- a/chart2/uiconfig/ui/chartdatadialog.ui
+++ b/chart2/uiconfig/ui/chartdatadialog.ui
@@ -252,18 +252,32 @@
 vertical
 6
 
-  
+  
 True
-False
-True
-
-  
-
+True
+external
+never
 
-  
-
-
-  
+  
+True
+False
+
+  
+True
+False
+True
+
+  
+  

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

[Caolán McNamara (via logerrit)]

 sc/inc/rangeutl.hxx|2 +-
 sc/source/core/tool/rangeutl.cxx   |8 
 sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx |2 +-
 sc/source/filter/xml/XMLConsolidationContext.cxx   |4 +++-
 sc/source/filter/xml/XMLTableShapeImportHelper.cxx |4 +++-
 sc/source/filter/xml/xmldpimp.cxx  |2 +-
 sc/source/filter/xml/xmlimprt.cxx  |   17 +++--
 sc/source/ui/uitest/uiobject.cxx   |2 +-
 8 files changed, 21 insertions(+), 20 deletions(-)

New commits:
commit 20ee99fce1ea00cff54a3f3362e5ceadc71db933
Author: Caolán McNamara 
AuthorDate: Wed Sep 16 09:14:51 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 22:10:52 2020 +0200

GetAddressFromString never passed a null ScDocument*

for the xml case this isn't immediately obvious, but pDoc should
only be null between Init and Destroy.

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

diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx
index a47ce79fefd0..2212d6bb9a41 100644
--- a/sc/inc/rangeutl.hxx
+++ b/sc/inc/rangeutl.hxx
@@ -120,7 +120,7 @@ public:
 static bool GetAddressFromString(
 ScAddress& rAddress,
 const OUString& rAddressStr,
-const ScDocument* pDocument,
+const ScDocument& rDocument,
 formula::FormulaGrammar::AddressConvention eConv,
 sal_Int32& nOffset,
 sal_Unicode cSeparator = ' ',
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 034c0063a492..7582479dc05d 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -437,7 +437,7 @@ sal_Int32 ScRangeStringConverter::GetTokenCount( const 
OUString& rString, sal_Un
 bool ScRangeStringConverter::GetAddressFromString(
 ScAddress& rAddress,
 const OUString& rAddressStr,
-const ScDocument* pDocument,
+const ScDocument& rDocument,
 FormulaGrammar::AddressConvention eConv,
 sal_Int32& nOffset,
 sal_Unicode cSeparator,
@@ -447,11 +447,11 @@ bool ScRangeStringConverter::GetAddressFromString(
 GetTokenByOffset( sToken, rAddressStr, nOffset, cSeparator, cQuote );
 if( nOffset >= 0 )
 {
-if ((rAddress.Parse( sToken, pDocument, eConv ) & ScRefFlags::VALID) 
== ScRefFlags::VALID)
+if ((rAddress.Parse( sToken, &rDocument, eConv ) & ScRefFlags::VALID) 
== ScRefFlags::VALID)
 return true;
-::formula::FormulaGrammar::AddressConvention eConvUI = 
pDocument->GetAddressConvention();
+::formula::FormulaGrammar::AddressConvention eConvUI = 
rDocument.GetAddressConvention();
 if (eConv != eConvUI)
-return ((rAddress.Parse(sToken, pDocument, eConvUI) & 
ScRefFlags::VALID) == ScRefFlags::VALID);
+return ((rAddress.Parse(sToken, &rDocument, eConvUI) & 
ScRefFlags::VALID) == ScRefFlags::VALID);
 }
 return false;
 }
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx 
b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
index 37becac3a72d..d2d00b35df44 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
@@ -57,7 +57,7 @@ const ScCellValue& ScMyCellInfo::CreateCell(ScDocument& rDoc)
 {
 ScAddress aPos;
 sal_Int32 nOffset(0);
-ScRangeStringConverter::GetAddressFromString(aPos, sFormulaAddress, 
&rDoc, ::formula::FormulaGrammar::CONV_OOO, nOffset);
+ScRangeStringConverter::GetAddressFromString(aPos, sFormulaAddress, 
rDoc, ::formula::FormulaGrammar::CONV_OOO, nOffset);
 maCell.meType = CELLTYPE_FORMULA;
 maCell.mpFormula = new ScFormulaCell(rDoc, aPos, sFormula, eGrammar, 
nMatrixFlag);
 maCell.mpFormula->SetMatColsRows(static_cast(nMatrixCols), 
static_cast(nMatrixRows));
diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx 
b/sc/source/filter/xml/XMLConsolidationContext.cxx
index 18d5c49a5718..610a3e27591e 100644
--- a/sc/source/filter/xml/XMLConsolidationContext.cxx
+++ b/sc/source/filter/xml/XMLConsolidationContext.cxx
@@ -53,8 +53,10 @@ ScXMLConsolidationContext::ScXMLConsolidationContext(
 case XML_ELEMENT( TABLE, XML_TARGET_CELL_ADDRESS ):
 {
 sal_Int32 nOffset(0);
+ScDocument* pDoc = GetScImport().GetDocument();
+assert(pDoc);
 bTargetAddr = ScRangeStringConverter::GetAddressFromString(
-aTargetAddr, aIter.toString(), 
GetScImport().GetDocument(), ::formula::FormulaGrammar::CONV_OOO, nOffs

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

[Miklos Vajna (via logerrit)]

 writerperfect/source/writer/exp/xmlimp.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit efe8082b888ddd7c5c8f18ebf8df4cd8b300bd40
Author: Miklos Vajna 
AuthorDate: Thu Sep 17 17:39:05 2020 +0200
Commit: Miklos Vajna 
CommitDate: Thu Sep 17 22:06:22 2020 +0200

writerperfect: include sal/config.h first

To confirm to the convention outlined at

.

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

diff --git a/writerperfect/source/writer/exp/xmlimp.cxx 
b/writerperfect/source/writer/exp/xmlimp.cxx
index 4654fde4204e..5f22f372b9ad 100644
--- a/writerperfect/source/writer/exp/xmlimp.cxx
+++ b/writerperfect/source/writer/exp/xmlimp.cxx
@@ -7,10 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "xmlimp.hxx"
-
 #include 
 
+#include "xmlimp.hxx"
+
 #include 
 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 emfio/inc/emfreader.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit be8b12eb14d5e0346c5aa69ad8d92dbf8d6c2456
Author: Andrea Gelmini 
AuthorDate: Thu Sep 17 19:33:08 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Sep 17 22:04:53 2020 +0200

Fix typo

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

diff --git a/emfio/inc/emfreader.hxx b/emfio/inc/emfreader.hxx
index 75a77211ea61..ec2c5273f650 100644
--- a/emfio/inc/emfreader.hxx
+++ b/emfio/inc/emfreader.hxx
@@ -32,7 +32,7 @@ namespace emfio
 boolmbRecordPath : 1;
 boolmbEMFPlus : 1;
 boolmbEMFPlusDualMode : 1;
-/// An other format is read already, can ignore actual EMF data.
+/// Another format is read already, can ignore actual EMF data.
 bool mbReadOtherGraphicFormat = false;
 
 boolReadHeader();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/cp-4.2.9-1'

[Andras Timar (via logerrit)]

Tag 'cp-4.2.9-1' created by Andras Timar  at 
2020-09-17 19:56 +

cp-4.2.9-1

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

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - configure.ac debian/changelog

[Andras Timar (via logerrit)]

 configure.ac |2 +-
 debian/changelog |6 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 847e8f6150d9ebc49ad30917d10a806e8ed4af20
Author: Andras Timar 
AuthorDate: Thu Sep 17 21:55:50 2020 +0200
Commit: Andras Timar 
CommitDate: Thu Sep 17 21:55:50 2020 +0200

Bump package version to 4.2.9-1

Change-Id: I352bd574a155a09a53507d630b69dc52bb1d7e9c

diff --git a/configure.ac b/configure.ac
index bf20c0dba..f1ca594b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([loolwsd], [4.2.8], [libreoffice@lists.freedesktop.org])
+AC_INIT([loolwsd], [4.2.9], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
diff --git a/debian/changelog b/debian/changelog
index a20c53e8c..21ef22a5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.2.9-1) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.9-1
+
+ -- Andras Timar   Wed, 17 Sep 2020 21:20:00 +0200
+
 loolwsd (4.2.8-1) unstable; urgency=medium
 
   * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.8-1
___
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/cp-6.2-24'

[Tor Lillqvist (via logerrit)]

Tag 'cp-6.2-24' created by Andras Timar  at 
2020-09-17 19:52 +

cp-6.2-24

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

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.2-24'

[Andras Timar (via logerrit)]

Tag 'cp-6.2-24' created by Andras Timar  at 
2020-09-17 19:52 +

cp-6.2-24

Changes since CODE-4.2.2-2:
Andras Timar (1):
  [cp] add info about xapian omega search and the cp-query template

---
 xapian/cp-query   |  141 ++
 xapian/xapian.txt |  109 +
 2 files changed, 250 insertions(+)
---
___
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/cp-6.2-24'

[Andras Timar (via logerrit)]

Tag 'cp-6.2-24' created by Andras Timar  at 
2020-09-17 19:52 +

cp-6.2-24

Changes since cp-6.2-23:
Andras Timar (1):
  Update mobile Word Count dialog translations and some more

---
 source/ar/sw/messages.po  | 1364 +++-
 source/as/sw/messages.po  | 1364 +++-
 source/ast/sw/messages.po | 1426 --
 source/bg/sw/messages.po  | 1374 +++--
 source/bn-IN/sw/messages.po   | 1364 +++-
 source/br/sw/messages.po  | 1364 +++-
 source/ca-valencia/sw/messages.po | 1794 --
 source/ca/sw/messages.po  | 1374 +++--
 source/cs/sw/messages.po  | 1374 +++--
 source/cy/sw/messages.po  | 1374 +++--
 source/da/sw/messages.po  | 1374 +++--
 source/de/sw/messages.po  | 1370 +++--
 source/el/sw/messages.po  | 1374 +++--
 source/es/sw/messages.po  |  113 +-
 source/et/sw/messages.po  | 1410 +++--
 source/eu/sw/messages.po  | 1374 +++--
 source/fi/sw/messages.po  | 1384 +++--
 source/fr/sw/messages.po  | 1374 +++--
 source/ga/sw/messages.po  | 1364 +++-
 source/gd/sw/messages.po  | 1364 +++-
 source/gl/sw/messages.po  | 1374 +++--
 source/gu/sw/messages.po  | 1364 +++-
 source/he/sw/messages.po  | 1374 +++--
 source/hi/sw/messages.po  | 1364 +++-
 source/hr/sw/messages.po  | 1374 +++--
 source/hu/sw/messages.po  | 1364 +++-
 source/id/sw/messages.po  | 1390 +++--
 source/is/sw/messages.po  | 1368 +++-
 source/it/sw/messages.po  | 1374 +++--
 source/ja/sw/messages.po  | 1404 +++--
 source/km/sw/messages.po  | 1364 +++-
 source/kn/sw/messages.po  | 1364 +++-
 source/ko/sw/messages.po  | 1364 +++-
 source/lt/sw/messages.po  | 1388 +++--
 source/lv/sw/messages.po  | 1374 +++--
 source/ml/sw/messages.po  | 1364 +++-
 source/mr/sw/messages.po  | 1364 +++-
 source/nb/sw/messages.po  | 1374 +++--
 source/nl/sw/messages.po  | 1374 +++--
 source/nn/sw/messages.po  | 1374 +++--
 source/oc/sw/messages.po  | 1364 +++-
 source/or/sw/messages.po  | 1364 +++-
 source/pa-IN/sw/messages.po   | 1366 +++-
 source/pl/sw/messages.po  | 1400 +++--
 source/pt-BR/sw/messages.po   |  121 +-
 source/pt/sw/messages.po  | 1374 +++--
 source/ro/sw/messages.po  | 1364 +++-
 source/ru/sw/messages.po  | 1374 +++--
 source/sk/sw/messages.po  | 1374 +++--
 source/sl/sw/messages.po  | 1374 +++--
 source/sr-Latn/sw/messages.po | 1363 +++-
 source/sr/sw/messages.po  | 1378 +++--
 source/sv/sw/messages.po  | 1404 +++--
 source/ta/sw/messages.po  | 1364 +++-
 source/te/sw/messages.po  | 1364 +++-
 source/tr/sw/messages.po  | 1387 +++--
 source/uk/sw/messages.po  | 1376 +++--
 source/vi/sw/messages.po  | 1364 +++-
 source/zh-CN/sw/messages.po   | 1374 +++--
 source/zh-TW/sw/messages.po   | 1376 +++--
 60 files changed, 43140 insertions(+), 37212 deletions(-)
---
___
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/cp-6.2-24'

[Andras Timar (via logerrit)]

Tag 'cp-6.2-24' created by Andras Timar  at 
2020-09-17 19:52 +

cp-6.2-24

Changes since CP-Android-iOS-4.2.0:
Andras Timar (1):
  tdf#130999 fix registration of Greek dictionary

---
 el_GR/META-INF/manifest.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/inc/address.hxx|2 +-
 sc/qa/extras/anchor.cxx   |   12 ++--
 sc/qa/unit/copy_paste_test.cxx|6 +++---
 sc/qa/unit/helper/qahelper.cxx|2 +-
 sc/qa/unit/range.cxx  |2 +-
 sc/qa/unit/subsequent_filters-test.cxx|2 +-
 sc/qa/unit/ucalc_formula.cxx  |   30 +++---
 sc/source/core/tool/address.cxx   |   12 ++--
 sc/source/core/tool/compiler.cxx  |2 +-
 sc/source/core/tool/rangenam.cxx  |4 ++--
 sc/source/core/tool/rangeutl.cxx  |2 +-
 sc/source/filter/excel/xename.cxx |4 ++--
 sc/source/filter/oox/revisionfragment.cxx |2 +-
 sc/source/filter/orcus/interface.cxx  |2 +-
 sc/source/filter/xcl97/xcl97rec.cxx   |   14 +++---
 sc/source/ui/app/inputhdl.cxx |2 +-
 sc/source/ui/app/inputwin.cxx |2 +-
 sc/source/ui/dbgui/PivotLayoutDialog.cxx  |2 +-
 sc/source/ui/dbgui/sfiltdlg.cxx   |6 +++---
 sc/source/ui/docshell/docsh4.cxx  |2 +-
 sc/source/ui/docshell/impex.cxx   |2 +-
 sc/source/ui/docshell/servobj.cxx |2 +-
 sc/source/ui/formdlg/formula.cxx  |2 +-
 sc/source/ui/miscdlgs/datastreamdlg.cxx   |2 +-
 sc/source/ui/pagedlg/areasdlg.cxx |2 +-
 sc/source/ui/unoobj/docuno.cxx|2 +-
 sc/source/ui/view/tabvwsh3.cxx|   22 +++---
 27 files changed, 73 insertions(+), 73 deletions(-)

New commits:
commit a242a8bb064f38b5ce4ca8c71aca5d50cc77df0b
Author: Caolán McNamara 
AuthorDate: Tue Sep 15 20:52:42 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 21:36:25 2020 +0200

ScRange::Parse never passed a null ScDocument*

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

diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 03d60bf97ee4..fce2fc648275 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -551,7 +551,7 @@ public:
 inline bool In( const ScAddress& ) const;   ///< is Address& in Range?
 inline bool In( const ScRange& ) const; ///< is Range& in Range?
 
-SC_DLLPUBLIC ScRefFlags Parse( const OUString&, const ScDocument*,
+SC_DLLPUBLIC ScRefFlags Parse( const OUString&, const ScDocument&,
const ScAddress::Details& rDetails = 
ScAddress::detailsOOOa1,
ScAddress::ExternalInfo* pExtInfo = nullptr,
const 
css::uno::Sequence* pExternalLinks = nullptr,
diff --git a/sc/qa/extras/anchor.cxx b/sc/qa/extras/anchor.cxx
index 8801e9690b3d..7fdb6a33d23d 100644
--- a/sc/qa/extras/anchor.cxx
+++ b/sc/qa/extras/anchor.cxx
@@ -267,13 +267,13 @@ void ScAnchorTest::testCopyColumnWithImages()
 {
 // 1. Copy source range
 ScRange aSrcRange;
-aSrcRange.Parse("A1:A11", pDoc, pDoc->GetAddressConvention());
+aSrcRange.Parse("A1:A11", *pDoc, pDoc->GetAddressConvention());
 pViewShell->GetViewData().GetMarkData().SetMarkArea(aSrcRange);
 pViewShell->GetViewData().GetView()->CopyToClip(&aClipDoc, false, 
false, true, false);
 
 // 2. Paste to target range
 ScRange aDstRange;
-aDstRange.Parse("D1:D11", pDoc, pDoc->GetAddressConvention());
+aDstRange.Parse("D1:D11", *pDoc, pDoc->GetAddressConvention());
 pViewShell->GetViewData().GetMarkData().SetMarkArea(aDstRange);
 
pViewShell->GetViewData().GetView()->PasteFromClip(InsertDeleteFlags::ALL, 
&aClipDoc);
 
@@ -290,13 +290,13 @@ void ScAnchorTest::testCopyColumnWithImages()
 {
 // 1. Copy source cells
 ScRange aSrcRange;
-aSrcRange.Parse("A3:B3", pDoc, pDoc->GetAddressConvention());
+aSrcRange.Parse("A3:B3", *pDoc, pDoc->GetAddressConvention());
 pViewShell->GetViewData().GetMarkData().SetMarkArea(aSrcRange);
 pViewShell->GetViewData().GetView()->CopyToClip(&aClipDoc, false, 
false, true, false);
 
 // 2. Paste to target cells
 ScRange aDstRange;
-aDstRange.Parse("G3:H3", pDoc, pDoc->GetAddressConvention());
+aDstRange.Parse("G3:H3", *pDoc, pDoc->GetAddressConvention());
 pViewShell->GetViewData().GetMarkData().SetMarkArea(aDstRange);
 
pViewShell->GetViewData().GetView()->PasteFromClip(InsertDeleteFlags::ALL, 
&aClipDoc);
 
@@ -337,7 +337,7 @@ void ScAnchorTest::testCutWithImages()
 {
 // Cut source range
 ScRange aSrcRange;
-aSrcRange.Parse("A1:A11", pDoc, pDoc->GetAddressConvention());
+aSrcRange.Parse("A1:A11", *pDoc, pDoc->GetAddressConvention());
 pViewShell->GetViewData().GetMarkData().SetMarkArea(aSrcRange);
 pViewShell->GetViewData().GetView()->CutToClip();
 
@@ -355,7 +3

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

[Michael Meeks (via logerrit)]

 loleaflet/src/layer/tile/CanvasTileLayer.js |   24 ++--
 1 file changed, 18 insertions(+), 6 deletions(-)

New commits:
commit 058835d0dcd71fc6aca066e7c6e9facedde83f61
Author: Michael Meeks 
AuthorDate: Wed Sep 16 16:58:57 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Thu Sep 17 21:35:00 2020 +0200

tilecombine: should pass back oldwid to save bandwidth.

Don't re-send un-changed tiles that we can detect easily.
Also avoids some PNG compression / CPU overhead server-side.

Change-Id: Ieca05680d9194e0bfc177b8db338010e5ffafe75
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102954
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/loleaflet/src/layer/tile/CanvasTileLayer.js 
b/loleaflet/src/layer/tile/CanvasTileLayer.js
index 435525793..15d813939 100644
--- a/loleaflet/src/layer/tile/CanvasTileLayer.js
+++ b/loleaflet/src/layer/tile/CanvasTileLayer.js
@@ -902,6 +902,7 @@ L.CanvasTileLayer = L.TileLayer.extend({
 
var tilePositionsX = '';
var tilePositionsY = '';
+   var tileWids = '';
 
for (i = 0; i < queue.length; i++) {
coords = queue[i];
@@ -946,6 +947,7 @@ L.CanvasTileLayer = L.TileLayer.extend({
}
}
 
+   // FIXME console.debug('Crass code duplication here in 
_updateOnChangePart');
if (tilePositionsX !== '' && tilePositionsY !== '') {
var message = 'tilecombine ' +
'nviewid=0 ' +
@@ -954,8 +956,9 @@ L.CanvasTileLayer = L.TileLayer.extend({
'height=' + this._tileHeightPx + ' ' +
'tileposx=' + tilePositionsX + ' ' +
'tileposy=' + tilePositionsY + ' ' +
+   'wid=' + tileWids + ' ' +
'tilewidth=' + this._tileWidthTwips + ' 
' +
-   'tileheight=' + this._tileHeightTwips;
+   'tileheight=' + this._tileHeightTwips;
 
this._map._socket.sendMessage(message, '');
}
@@ -1039,6 +1042,7 @@ L.CanvasTileLayer = L.TileLayer.extend({
// save tile in cache
this._tiles[key] = {
el: tile,
+   wid: 0,
coords: coords,
current: true
};
@@ -1130,19 +1134,25 @@ L.CanvasTileLayer = L.TileLayer.extend({
rectQueue = rectangles[r];
var tilePositionsX = '';
var tilePositionsY = '';
+   var tileWids = '';
for (i = 0; i < rectQueue.length; i++) {
coords = rectQueue[i];
+   key = this._tileCoordsToKey(coords);
+
twips = this._coordsToTwips(coords);
 
-   if (tilePositionsX !== '') {
+   if (tilePositionsX !== '')
tilePositionsX += ',';
-   }
tilePositionsX += twips.x;
 
-   if (tilePositionsY !== '') {
+   if (tilePositionsY !== '')
tilePositionsY += ',';
-   }
tilePositionsY += twips.y;
+
+   tile = 
this._tiles[this._tileCoordsToKey(coords)];
+   if (tileWids !== '')
+   tileWids += ',';
+   tileWids += tile && tile.wireId !== undefined ? 
tile.wireId : 0;
}
 
twips = this._coordsToTwips(coords);
@@ -1153,6 +1163,7 @@ L.CanvasTileLayer = L.TileLayer.extend({
'height=' + this._tileHeightPx + ' ' +
'tileposx=' + tilePositionsX + ' ' +
'tileposy=' + tilePositionsY + ' ' +
+   'oldwid=' + tileWids + ' ' +
'tilewidth=' + this._tileWidthTwips + ' ' +
'tileheight=' + this._tileHeightTwips;
this._map._socket.sendMessage(msg, '');
@@ -1363,6 +1374,7 @@ L.CanvasTileLayer = L.TileLayer.extend({
this._tiles[key]._invalid

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

[Jan Holesovsky (via logerrit)]

 loleaflet/src/layer/tile/CalcTileLayer.js   |   61 -
 loleaflet/src/layer/tile/CanvasTileLayer.js |   66 
 2 files changed, 66 insertions(+), 61 deletions(-)

New commits:
commit 3a93ada13f4030b20601ecd4a345b931bf670c0b
Author: Jan Holesovsky 
AuthorDate: Thu Sep 17 17:47:07 2020 +0200
Commit: Jan Holesovsky 
CommitDate: Thu Sep 17 21:34:10 2020 +0200

grid lines: Setup renderBackground only after _painter exists.

This fixes setup of many cypress tests.

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

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index 54abd8731..439f0d8cd 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -739,67 +739,6 @@ L.CalcTileLayer = BaseTileLayer.extend({
converter: this._twipsToPixels,
context: this
});
-   var that = this;
-   this._painter.renderBackground = function(canvas, ctx)
-   {
-   if (this._layer._debug)
-   this._canvasCtx.fillStyle = 'rgba(255, 0, 0, 
0.5)';
-   else
-   this._canvasCtx.fillStyle = 'white'; // FIXME: 
sheet bg color
-   this._canvasCtx.fillRect(0, 0, ctx.canvasSize.x, 
ctx.canvasSize.y);
-
-   if (that._debug)
-   canvas.strokeStyle = 'blue';
-   else // now fr some grid-lines ...
-   canvas.strokeStyle = '#c0c0c0';
-   canvas.lineWidth = 1.0;
-
-   canvas.beginPath();
-   for (var i = 0; i < ctx.paneBoundsList.length; ++i) {
-   // FIXME: de-duplicate before firing myself:
-
-   // co-ordinates of this pane in core document 
pixels
-   var paneBounds = 
that._cssBoundsToCore(ctx.paneBoundsList[i]);
-   // co-ordinates of the main-(bottom right) pane 
in core document pixels
-   var viewBounds = 
that._cssBoundsToCore(ctx.viewBounds);
-   // into real pixel-land ...
-   paneBounds.round();
-   viewBounds.round();
-
-   var paneOffset = paneBounds.getTopLeft(); // 
allocates
-   // Cute way to detect the in-canvas pixel 
offset of each pane
-   paneOffset.x = Math.min(paneOffset.x, 
viewBounds.min.x);
-   paneOffset.y = Math.min(paneOffset.y, 
viewBounds.min.y);
-
-   // when using the pinch to zoom, set additional 
translation based */
-   // on the pinch movement
-   if (that._map._animatingZoom) {
-   var centerOffset = 
this._map._getCenterOffset(this._map._animateToCenter);
-   paneOffset.x += 
Math.round(centerOffset.x);
-   paneOffset.y += 
Math.round(centerOffset.y);
-   }
-
-   // URGH -> zooming etc. (!?) ...
-   if (that.sheetGeometry._columns)
-   
that.sheetGeometry._columns.forEachInCorePixelRange(
-   paneBounds.min.x, 
paneBounds.max.x,
-   function(pos) {
-   canvas.moveTo(pos - 
paneOffset.x - 0.5, paneBounds.min.y - paneOffset.y - 0.5);
-   canvas.lineTo(pos - 
paneOffset.x - 0.5, paneBounds.max.y - paneOffset.y - 0.5);
-   canvas.stroke();
-   });
-
-   if (that.sheetGeometry._rows)
-   
that.sheetGeometry._rows.forEachInCorePixelRange(
-   paneBounds.min.y, 
paneBounds.max.y,
-   function(pos) {
-   
canvas.moveTo(paneBounds.min.x - paneOffset.x - 0.5, pos - paneOffset.y - 0.5);
-   
canvas.lineTo(paneBounds.max.x - paneOffset.x - 0.5, pos - paneOffset.y - 0.5);
-   canvas.stroke();
-  

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

[Michael Meeks (via logerrit)]

 loleaflet/src/layer/tile/CalcTileLayer.js   |6 --
 loleaflet/src/layer/tile/CanvasTileLayer.js |1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit a5f44dfad8fb90e90d3c67fac0dec23537c10dc8
Author: Michael Meeks 
AuthorDate: Tue Sep 15 19:53:16 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Thu Sep 17 21:34:43 2020 +0200

calc grid: re-render the canvas when we get grid details.

Change-Id: I3d1d1485e561d8c807daa0dfe0a9f2cb5651d31b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102952
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/loleaflet/src/layer/tile/CanvasTileLayer.js 
b/loleaflet/src/layer/tile/CanvasTileLayer.js
index 4b0123ba2..b9700987c 100644
--- a/loleaflet/src/layer/tile/CanvasTileLayer.js
+++ b/loleaflet/src/layer/tile/CanvasTileLayer.js
@@ -375,6 +375,7 @@ L.CanvasTileLayer = L.TileLayer.extend({
}
this._map.on('resize zoomend', this._painter.update, 
this._painter);
this._map.on('splitposchanged', this._painter.update, 
this._painter);
+   this._map.on('sheetgeometrychanged', this._painter.update, 
this._painter);
this._map.on('move', this._syncTilePanePos, this);
 
this._map.on('viewrowcolumnheaders', 
this._updateRenderBackground, this);
commit b70d9f6c1052ed5a86f309032ed818861027b676
Author: Michael Meeks 
AuthorDate: Tue Sep 15 11:02:54 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Thu Sep 17 21:34:35 2020 +0200

calc grid: fix this interleaving.

When the span starts in the middle of the view don't render backwards.

Change-Id: Icc97fef88a65c0ca83167ddb72c03bece9a8e047
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102951
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index 439f0d8cd..ed7ab0d5d 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -1782,8 +1782,10 @@ L.SheetDimension = L.Class.extend({
(spanData.data.sizecore * (spanData.end - 
spanData.start + 1));
if (spanFirstCorePx < endPix && spanData.data.poscorepx 
> startPix)
{
-   var firstCorePx = startPix + 
spanData.data.sizecore -
-   ((startPix - spanFirstCorePx) % 
spanData.data.sizecore);
+   var firstCorePx = Math.max(
+   spanFirstCorePx,
+   startPix + spanData.data.sizecore -
+   ((startPix - spanFirstCorePx) % 
spanData.data.sizecore));
var lastCorePx = Math.min(endPix, 
spanData.data.poscorepx);
 
for (var pos = firstCorePx; pos <= lastCorePx; 
pos += spanData.data.sizecore) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks (via logerrit)]

 loleaflet/src/layer/tile/CalcTileLayer.js   |  101 ++--
 loleaflet/src/layer/tile/CanvasTileLayer.js |   23 +++---
 2 files changed, 109 insertions(+), 15 deletions(-)

New commits:
commit 8093b8941a30ebff087f5563a1115e3438de3dc3
Author: Michael Meeks 
AuthorDate: Wed Sep 9 10:05:44 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Thu Sep 17 21:33:22 2020 +0200

calc canvas: start of direct grid rendering.

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

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index 66e264817..54abd8731 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -739,6 +739,67 @@ L.CalcTileLayer = BaseTileLayer.extend({
converter: this._twipsToPixels,
context: this
});
+   var that = this;
+   this._painter.renderBackground = function(canvas, ctx)
+   {
+   if (this._layer._debug)
+   this._canvasCtx.fillStyle = 'rgba(255, 0, 0, 
0.5)';
+   else
+   this._canvasCtx.fillStyle = 'white'; // FIXME: 
sheet bg color
+   this._canvasCtx.fillRect(0, 0, ctx.canvasSize.x, 
ctx.canvasSize.y);
+
+   if (that._debug)
+   canvas.strokeStyle = 'blue';
+   else // now fr some grid-lines ...
+   canvas.strokeStyle = '#c0c0c0';
+   canvas.lineWidth = 1.0;
+
+   canvas.beginPath();
+   for (var i = 0; i < ctx.paneBoundsList.length; ++i) {
+   // FIXME: de-duplicate before firing myself:
+
+   // co-ordinates of this pane in core document 
pixels
+   var paneBounds = 
that._cssBoundsToCore(ctx.paneBoundsList[i]);
+   // co-ordinates of the main-(bottom right) pane 
in core document pixels
+   var viewBounds = 
that._cssBoundsToCore(ctx.viewBounds);
+   // into real pixel-land ...
+   paneBounds.round();
+   viewBounds.round();
+
+   var paneOffset = paneBounds.getTopLeft(); // 
allocates
+   // Cute way to detect the in-canvas pixel 
offset of each pane
+   paneOffset.x = Math.min(paneOffset.x, 
viewBounds.min.x);
+   paneOffset.y = Math.min(paneOffset.y, 
viewBounds.min.y);
+
+   // when using the pinch to zoom, set additional 
translation based */
+   // on the pinch movement
+   if (that._map._animatingZoom) {
+   var centerOffset = 
this._map._getCenterOffset(this._map._animateToCenter);
+   paneOffset.x += 
Math.round(centerOffset.x);
+   paneOffset.y += 
Math.round(centerOffset.y);
+   }
+
+   // URGH -> zooming etc. (!?) ...
+   if (that.sheetGeometry._columns)
+   
that.sheetGeometry._columns.forEachInCorePixelRange(
+   paneBounds.min.x, 
paneBounds.max.x,
+   function(pos) {
+   canvas.moveTo(pos - 
paneOffset.x - 0.5, paneBounds.min.y - paneOffset.y - 0.5);
+   canvas.lineTo(pos - 
paneOffset.x - 0.5, paneBounds.max.y - paneOffset.y - 0.5);
+   canvas.stroke();
+   });
+
+   if (that.sheetGeometry._rows)
+   
that.sheetGeometry._rows.forEachInCorePixelRange(
+   paneBounds.min.y, 
paneBounds.max.y,
+   function(pos) {
+   
canvas.moveTo(paneBounds.min.x - paneOffset.x - 0.5, pos - paneOffset.y - 0.5);
+   
canvas.lineTo(paneBounds.max.x - paneOffset.x - 0.5, pos - paneOffset.y - 0.5);
+   canvas.stroke();
+   });
+   }
+   canvas.closePath();
+   

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

[Caolán McNamara (via logerrit)]

 sfx2/source/dialog/templdlg.cxx |   55 
 sfx2/source/inc/templdgi.hxx|3 --
 2 files changed, 24 insertions(+), 34 deletions(-)

New commits:
commit 0df22a9e42f4b1a3d6febe309be0debaba1006df
Author: Caolán McNamara 
AuthorDate: Thu Sep 17 12:24:10 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 20:20:46 2020 +0200

factor out the special FmtSelect with nullptr arg case

as its own separate thing

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

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 753fd6d23a9c..62d02b67aae7 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -911,8 +911,8 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const 
OUString &rStr, bool bIsCal
 
 if (!bIsCallback)
 {
-// tdf#134598 call FmtSelect to update watercan
-FmtSelect(nullptr, false);
+// tdf#134598 call UpdateStyleDependents to update watercan
+UpdateStyleDependents();
 }
 }
 
@@ -1949,41 +1949,32 @@ IMPL_LINK_NOARG(SfxCommonTemplateDialog_Impl, 
PreviewHdl, weld::Button&, void)
 // Selection of a template during the Watercan-Status
 IMPL_LINK(SfxCommonTemplateDialog_Impl, FmtSelectHdl, weld::TreeView&, 
rListBox, void)
 {
-FmtSelect(&rListBox, true);
+std::unique_ptr xHdlEntry = rListBox.make_iterator();
+if (!rListBox.get_cursor(xHdlEntry.get()))
+return;
+
+if (rListBox.is_selected(*xHdlEntry))
+UpdateStyleDependents();
+
+SelectStyle(rListBox.get_text(*xHdlEntry), true);
 }
 
-void SfxCommonTemplateDialog_Impl::FmtSelect(weld::TreeView* pListBox, bool 
bIsCallback)
+void SfxCommonTemplateDialog_Impl::UpdateStyleDependents()
 {
-std::unique_ptr xHdlEntry;
-if (pListBox)
-{
-xHdlEntry = pListBox->make_iterator();
-if (!pListBox->get_cursor(xHdlEntry.get()))
-return;
-}
-
-// Trigger Help PI, if this is permitted of call handlers and field
-if (!pListBox || pListBox->is_selected(*xHdlEntry))
+// Trigger Help PI. Only when the watercan is on
+if ( IsInitialized() &&
+ IsCheckedItem("watercan") &&
+ // only if that region is allowed
+ nullptr != pFamilyState[nActFamily-1] && (mxTreeBox || 
mxFmtLb->count_selected_rows() <= 1) )
 {
-// Only when the watercan is on
-if ( IsInitialized() &&
- IsCheckedItem("watercan") &&
- // only if that region is allowed
- nullptr != pFamilyState[nActFamily-1] && (mxTreeBox || 
mxFmtLb->count_selected_rows() <= 1) )
-{
-Execute_Impl(SID_STYLE_WATERCAN,
- "", "", 0);
-Execute_Impl(SID_STYLE_WATERCAN,
- GetSelectedEntry(), "",
- 
static_cast(GetFamilyItem_Impl()->GetFamily()));
-}
-EnableItem("watercan", !bWaterDisabled);
-EnableDelete();
+Execute_Impl(SID_STYLE_WATERCAN,
+ "", "", 0);
+Execute_Impl(SID_STYLE_WATERCAN,
+ GetSelectedEntry(), "",
+ 
static_cast(GetFamilyItem_Impl()->GetFamily()));
 }
-if( !pListBox )
-return;
-
-SelectStyle(pListBox->get_text(*xHdlEntry), bIsCallback);
+EnableItem("watercan", !bWaterDisabled);
+EnableDelete();
 }
 
 void SfxCommonTemplateDialog_Impl::MenuSelect(const OString& rIdent)
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 8f303fce10b5..7f7f3aba1b47 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -125,8 +125,6 @@ protected:
 bool m_bWantHierarchical :1;
 bool bBindingUpdate :1;
 
-void FmtSelect(weld::TreeView* pTreeView, bool bIsCallback);
-
 DECL_LINK(FilterSelectHdl, weld::ComboBox&, void );
 DECL_LINK(FmtSelectHdl, weld::TreeView&, void);
 DECL_LINK(TreeListApplyHdl, weld::TreeView&, bool);
@@ -185,6 +183,7 @@ protected:
 bool IsSafeForWaterCan() const;
 
 void SelectStyle(const OUString& rStyle, bool bIsCallback);
+void UpdateStyleDependents();
 bool HasSelectedStyle() const;
 void GetSelectedStyle() const;
 void FillTreeBox();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 cui/uiconfig/ui/insertrowcolumn.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 429d4e1c70c71e898de293647c7623303ffe960b
Author: Caolán McNamara 
AuthorDate: Thu Sep 17 15:24:41 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 20:20:13 2020 +0200

tdf#136729 raise insert row/col from 99 to 200

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

diff --git a/cui/uiconfig/ui/insertrowcolumn.ui 
b/cui/uiconfig/ui/insertrowcolumn.ui
index 24daa2b019c1..67e3eb27f6a4 100644
--- a/cui/uiconfig/ui/insertrowcolumn.ui
+++ b/cui/uiconfig/ui/insertrowcolumn.ui
@@ -4,7 +4,7 @@
   
   
 1
-99
+200
 1
 1
 10
___
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

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/common/helper.js |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 011efb4ac4733c437dabfc7b3c31208fd777c1bc
Author: Tamás Zolnai 
AuthorDate: Thu Sep 17 17:06:46 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Sep 17 19:10:54 2020 +0200

cypress: improve moveCursor() helper method.

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

diff --git a/cypress_test/integration_tests/common/helper.js 
b/cypress_test/integration_tests/common/helper.js
index 505108bac..38edadbf2 100644
--- a/cypress_test/integration_tests/common/helper.js
+++ b/cypress_test/integration_tests/common/helper.js
@@ -692,6 +692,9 @@ function moveCursor(direction) {
}
typeIntoDocument(key);
 
+   cy.get('.blinking-cursor')
+   .should('be.visible');
+
cy.get('@origCursorPos')
.then(function(origCursorPos) {
cy.get('.blinking-cursor')
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andreas Kainz (via logerrit)]

 vcl/source/window/splitwin.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 84bbfa54da7bfdb46ae974c0da5e1d7ecc46c006
Author: Andreas Kainz 
AuthorDate: Thu Sep 17 13:11:23 2020 +0200
Commit: Andreas Kainz 
CommitDate: Thu Sep 17 18:34:06 2020 +0200

Revert "remove border line from sidebar"

This reverts commit 1349e66ef629bfc8aed23434108339bdba5013bb.

Reason for revert: 

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

diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 58b4c01921a6..66d64e7fd343 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -181,6 +181,10 @@ void SplitWindow::ImplDrawBorder(vcl::RenderContext& 
rRenderContext)
 switch (meAlign)
 {
 case WindowAlign::Bottom:
+rRenderContext.SetLineColor(rStyleSettings.GetShadowColor());
+rRenderContext.DrawLine(Point(0, 0), Point(nDX - 1, 0));
+rRenderContext.DrawLine(Point(0, nDY - 2), Point(nDX - 1, nDY - 2));
+
 rRenderContext.SetLineColor(rStyleSettings.GetLightColor());
 rRenderContext.DrawLine(Point(0, 1), Point(nDX - 1, 1));
 rRenderContext.DrawLine(Point(0, nDY - 1), Point(nDX - 1, nDY - 1));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - ios/Mobile

[Tor Lillqvist (via logerrit)]

 ios/Mobile/Info.plist.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b99b7e7cdbff036341d8369280adbb72e4cc3d5e
Author: Tor Lillqvist 
AuthorDate: Thu Sep 17 19:03:43 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Sep 17 19:03:43 2020 +0300

Bump CFBundleShortVersionString to 4.2.9

This is necessary as we have released 4.2.8. Otherwise when validating
a new build you get an error: "The value for key
CFBundleShortVersionString [4.2.8] in the Info.plist file must contain
a higher version than that of the previously approved version [4.2.8]."

Change-Id: I0ce5c7f4e70bef8b14181bc62b060cd131d86a67

diff --git a/ios/Mobile/Info.plist.in b/ios/Mobile/Info.plist.in
index ae9f5b51a..fb33a9fc1 100644
--- a/ios/Mobile/Info.plist.in
+++ b/ios/Mobile/Info.plist.in
@@ -214,7 +214,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
-   4.2.8
+   4.2.9
CFBundleVersion
@IOSAPP_BUNDLE_VERSION@
LSRequiresIPhoneOS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

 loleaflet/src/layer/tile/CalcTileLayer.js |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6a70aeaad8c6a01d53f9ebb16b7d7327ebf688a2
Author: Henry Castro 
AuthorDate: Mon Sep 14 13:37:29 2020 -0400
Commit: Henry Castro 
CommitDate: Thu Sep 17 17:58:58 2020 +0200

loleaflet: Hide the visibility of the cursor by default

When loading a spreadsheet document, the server should send a message
to show the cursor appropriately

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

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index e6813ad65..66e264817 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -54,6 +54,7 @@ L.CalcTileLayer = BaseTileLayer.extend({
},
 
beforeAdd: function (map) {
+   map._isCursorVisible = false;
map._addZoomLimit(this);
map.on('zoomend', this._onZoomRowColumns, this);
map.on('updateparts', this._onUpdateParts, this);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extensions/Executable_twain32shim.mk include/oox shell/Library_spsupp_x86.mk

[Noel Grandin (via logerrit)]

 extensions/Executable_twain32shim.mk |   10 ++
 include/oox/token/tokenmap.hxx   |3 ++-
 shell/Library_spsupp_x86.mk  |   10 ++
 3 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit 7adf79c2dd4af72e6af321336ef79914364bc882
Author: Noel Grandin 
AuthorDate: Thu Sep 17 14:20:19 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Sep 17 17:55:23 2020 +0200

fix LTO+mergedlibs on windows

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

diff --git a/extensions/Executable_twain32shim.mk 
b/extensions/Executable_twain32shim.mk
index 6f53ca3924ab..3ac3ce8d43ed 100644
--- a/extensions/Executable_twain32shim.mk
+++ b/extensions/Executable_twain32shim.mk
@@ -13,6 +13,16 @@ $(eval $(call 
gb_Executable_set_targettype_gui,twain32shim,YES))
 
 $(eval $(call gb_Executable_set_x86,twain32shim,YES))
 
+# when building with link-time optimisation on, we need to turn it off for the 
helper
+ifeq ($(ENABLE_LTO),TRUE)
+$(eval $(call gb_Executable_add_cxxflags,twain32shim,\
+   -GL- \
+))
+$(eval $(call gb_Executable_add_ldflags,twain32shim,\
+   -LTCG:OFF \
+))
+endif
+
 $(eval $(call gb_Executable_use_externals,twain32shim,\
 sane_headers \
 ))
diff --git a/include/oox/token/tokenmap.hxx b/include/oox/token/tokenmap.hxx
index cc4705e6a046..1ab9a99758cc 100644
--- a/include/oox/token/tokenmap.hxx
+++ b/include/oox/token/tokenmap.hxx
@@ -24,6 +24,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -32,7 +33,7 @@
 namespace oox {
 
 
-class TokenMap
+class OOX_DLLPUBLIC TokenMap
 {
 public:
 explicitTokenMap();
diff --git a/shell/Library_spsupp_x86.mk b/shell/Library_spsupp_x86.mk
index ba101b7bb4ec..17183d8b92da 100644
--- a/shell/Library_spsupp_x86.mk
+++ b/shell/Library_spsupp_x86.mk
@@ -11,6 +11,16 @@ $(eval $(call gb_Library_Library,spsupp_x86))
 
 $(eval $(call gb_Library_set_x86,spsupp_x86,YES))
 
+# when building with link-time optimisation on, we need to turn it off for the 
helper
+ifeq ($(ENABLE_LTO),TRUE)
+$(eval $(call gb_Library_add_cxxflags,spsupp_x86,\
+   -GL- \
+))
+$(eval $(call gb_Library_add_ldflags,spsupp_x86,\
+   -LTCG:OFF \
+))
+endif
+
 $(eval $(call gb_Library_use_custom_headers,spsupp_x86,\
shell/source/win32/spsupp/idl \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

ESC meeting minutes: 2020-09-17

[Miklos Vajna]

* Present:
+ Stephan, Xisco, Caolan, Heiko, Michael W, Olivier, Miklos, Kendy, Michael 
S

* Completed Action Items:
+ make a decision on what notebookbar variant to promote (Heiko)
  + see tdf#135501 for details
  + no decision yet
[ note done, but needs more time ]

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

* Release Engineering update (Cloph/Xisco)
+ 7.0 status
  + 7.0.2.1 was tagged yesterday
+ 6.4 status
   + 6.4.7 rc1, to be tagged next week
+ Remotes
+ Android viewer
+ Online

* Documentation (Olivier)
+ New Help
   + CSS tweaks (fitoshido)
+ Helpcontent2
   + Maintenance of pages (ohallot)
+ Google Seasons of doc 2020
   + Progress in wiki pages for Calc (Ronnie Gandhi)
   + First lessons expected for E-Leaning next week (Prashant )
+ Guides
   + Work on going.

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
249(249) (topicUI) bugs open, 286(286) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week 1 month3 months12 months
 added  10(-8) 55(-26) 82(-21)193(-24)
 commented 102(-12)   374(-29)   1049(13)3785(-18)
   removed   1(1)   2(1)9(1)   55(1)
  resolved  10(-1) 29(3)   96(5)  395(8)
+ top 10 contributors:
  Telesto made 168 changes in 1 month, and 537 changes in 1 year
  Heiko Tietze made 126 changes in 1 month, and 2099 changes in 1 year
  Kainz, Andreas made 73 changes in 1 month, and 470 changes in 1 year
  Dieter Praas made 68 changes in 1 month, and 551 changes in 1 year
  BogdanB made 63 changes in 1 month, and 144 changes in 1 year
  Foote, V Stuart made 60 changes in 1 month, and 627 changes in 1 year
  Ilmari Lauhakangas made 35 changes in 1 month, and 209 changes in 1 
year
  Roman Kuznetsov made 32 changes in 1 month, and 254 changes in 1 year
  Timur made 22 changes in 1 month, and 250 changes in 1 year
  Clarc made 19 changes in 1 month, and 19 changes in 1 year

* 15 new tickets with needsUXEval Sep/10-17

 ->   + tdf#136837: Fileopen and filesave to DOCX: Table Title not read and
saved as Alt Text
+ helps a11y
  + tdf#136812: Adding more than 1 paragraph style to chapter numbering
level
 ->   + tdf#136563: Selection of the text should also include footnotes
+ word count of selection: should or should not include footnotes?
+ request to include it
+ would make sense to check what the competition does (Miklos)
  + tdf#136788: compare document file selection - add ability to select
from LO recent files in profile as alternative to os/DE file manager
  + tdf#136786: Hide Navigator window in Impress/Draw and always show only
Navigator Sidebar section
  + tdf#136182: LibreOffice does not properly convert -- to em-dash by
default
  + tdf#136719: Pressing Enter after Heading inserts a text body formatting;
DF of heading inherited
  + tdf#136741: Default page style rotation changes to landscape after DOCX
export
  + tdf#136713: Select content gets a table click More Options
  + tdf#136537: excel formulas get corrupted with Drag & Drop
  + tdf#136654: Next Style does not get triggered if there is Text after the
cursor.
  + tdf#82438: No synchronization between color attributes in the toolbar
and sidebar
  + tdf#136653: Sidebar paragraph style doesn't consistently show current
style
  + tdf#136554: Footnote/endnote anchors don't respond to new "Position"
properties when another character style is applied
  + tdf#136646: Add Luciole font to support accessibility

* Crash testing (Caolan)
+ 8(+4) import failure, 3(+0) export failures
  + 2 of them in RTF export, but not when converting manually
+ 1 coverity issue
+ 12 oss-fuzz issues

* Crash Reporting (Xisco)
   + https://crashreport.libreoffice.org/stats/version/6.4.5.2
+ (-126) 1618 1744 1814 2208 2552 2315 1761 1162 0
   + https://crashreport.libreoffice.org/stats/version/6.4.6.2
+ (+253) 1306 1053 874 0
   + https://crashreport.libreoffice.org/stats/version/7.0.0.3
+ (-913) 4171 5084 6489 3840 788 0
   + https://crashreport.libreoffice.org/stats/version/7.0.1.2
+ (+1237) 3223 1986 0

- Since 7.0 without steps
https://crashreport.libreoffice.org/stats/signature/sw::util::GetPoolItems(SfxItemSet%20const%20&,std::map%3Cunsigned%20short,SfxPoolItem%20const%20*,sw::util::ItemSort,std::allocator%3Cstd::pair%3Cunsigned%20short%20const%20,SfxPoolItem%20const%20*%3E%20%3E%20%3E%20&,bool)

  + numbers don’t look bad
  + export to DOC, but no steps to reproduce yet

* Mentoring/easyhack update
  committer...   1 week 1 month3

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

[Miklos Vajna (via logerrit)]

 emfio/inc/emfreader.hxx   |4 +
 emfio/source/reader/emfreader.cxx |   86 ++
 2 files changed, 82 insertions(+), 8 deletions(-)

New commits:
commit d75c5b38911557173c54a78f42ff220ab3918573
Author: Miklos Vajna 
AuthorDate: Thu Sep 17 13:21:52 2020 +0200
Commit: Miklos Vajna 
CommitDate: Thu Sep 17 17:21:44 2020 +0200

tdf#136836 emfio: speed up import of EMF import when the orig PDF is 
available

The PPTX bugdoc has a 17MB EMF file, which has enough instructions to
keep Impress busy for minutes during import.

Take advantage of the detail that this EMF has a
EMR_COMMENT_MULTIFORMATS record that contains the original PDF, which
can be rendered much faster:

- old cost: 122.153 seconds
- new cost: 1.952 seconds (1.6% of baseline)

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

diff --git a/emfio/inc/emfreader.hxx b/emfio/inc/emfreader.hxx
index 90d8969ae70c..75a77211ea61 100644
--- a/emfio/inc/emfreader.hxx
+++ b/emfio/inc/emfreader.hxx
@@ -32,6 +32,8 @@ namespace emfio
 boolmbRecordPath : 1;
 boolmbEMFPlus : 1;
 boolmbEMFPlusDualMode : 1;
+/// An other format is read already, can ignore actual EMF data.
+bool mbReadOtherGraphicFormat = false;
 
 boolReadHeader();
 // reads and converts the rectangle
@@ -43,6 +45,8 @@ namespace emfio
 
 bool ReadEnhWMF();
 void ReadGDIComment(sal_uInt32 nCommentId);
+/// Parses EMR_COMMENT_MULTIFORMATS.
+void ReadMultiformatsComment();
 
 private:
 template  void ReadAndDrawPolyPolygon(sal_uInt32 nNextPos);
diff --git a/emfio/source/reader/emfreader.cxx 
b/emfio/source/reader/emfreader.cxx
index 8c128d2965c6..7bb4d408203a 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -24,6 +24,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #ifdef DBG_UTIL
 #include 
@@ -163,6 +165,8 @@ using namespace std;
 #define EMR_SETLINKEDUFIS  119
 #define EMR_SETTEXTJUSTIFICATION   120
 
+#define PDF_SIGNATURE 0x50444620 // "PDF "
+
 namespace
 {
 
@@ -381,16 +385,13 @@ namespace emfio
 {
 }
 
-#if OSL_DEBUG_LEVEL > 0
 const sal_uInt32 EMR_COMMENT_BEGINGROUP = 0x0002;
 const sal_uInt32 EMR_COMMENT_ENDGROUP = 0x0003;
 const sal_uInt32 EMR_COMMENT_MULTIFORMATS = 0x4004;
 const sal_uInt32 EMR_COMMENT_WINDOWS_METAFILE = 0x8001;
-#endif
 
 void EmfReader::ReadGDIComment(sal_uInt32 nCommentId)
 {
-#if OSL_DEBUG_LEVEL > 0
 sal_uInt32 nPublicCommentIdentifier;
 mpInputStream->ReadUInt32(nPublicCommentIdentifier);
 
@@ -433,7 +434,7 @@ namespace emfio
 break;
 
 case EMR_COMMENT_MULTIFORMATS:
-SAL_WARN("emfio", "\t\tEMR_COMMENT_MULTIFORMATS not 
implemented");
+ReadMultiformatsComment();
 break;
 
 case EMR_COMMENT_WINDOWS_METAFILE:
@@ -444,9 +445,78 @@ namespace emfio
 SAL_WARN("emfio", "\t\tEMR_COMMENT_PUBLIC not implemented, id: 
0x" << std::hex << nCommentId << std::dec);
 break;
 }
-#else
-(void) nCommentId;
-#endif
+}
+
+void EmfReader::ReadMultiformatsComment()
+{
+tools::Rectangle aOutputRect = EmfReader::ReadRectangle();
+
+sal_uInt32 nCountFormats;
+mpInputStream->ReadUInt32(nCountFormats);
+if (nCountFormats < 1)
+{
+return;
+}
+
+// Read the first EmrFormat.
+sal_uInt32 nSignature;
+mpInputStream->ReadUInt32(nSignature);
+if (nSignature != PDF_SIGNATURE)
+{
+return;
+}
+
+sal_uInt32 nVersion;
+mpInputStream->ReadUInt32(nVersion);
+if (nVersion != 1)
+{
+return;
+}
+
+sal_uInt32 nSizeData;
+mpInputStream->ReadUInt32(nSizeData);
+if (!nSizeData || nSizeData > mpInputStream->remainingSize())
+{
+return;
+}
+
+sal_uInt32 nOffData;
+mpInputStream->ReadUInt32(nOffData);
+if (!nOffData)
+{
+return;
+}
+
+std::vector aPdfData(nSizeData);
+mpInputStream->ReadBytes(aPdfData.data(), aPdfData.size());
+if (!mpInputStream->good())
+{
+return;
+}
+
+SvMemoryStream aPdfStream;
+aPdfStream.WriteBytes(aPdfData.data(), aPdfData.size());
+aPdfStream.Seek(0);
+Graphic aGraphic;
+if (!vcl::ImportPDF(aPdfStream, aGraphic))
+{
+return;
+}
+
+maBmpSaveList.emplace_back(new BSaveStruct(aGraphic.GetBitmapEx(), 
aOutputRect, SRCCOPY));
+const std::shared_ptr pVectorGraphicData

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

[Michael Weghorn (via logerrit)]

 vcl/inc/qt5/Qt5Graphics_Controls.hxx |6 +-
 vcl/qt5/Qt5Graphics_Controls.cxx |  100 +--
 2 files changed, 53 insertions(+), 53 deletions(-)

New commits:
commit 007e6063931bd87d6ce15deb65b9adc823f74ce0
Author: Michael Weghorn 
AuthorDate: Thu Sep 17 11:45:45 2020 +0200
Commit: Michael Weghorn 
CommitDate: Thu Sep 17 17:16:09 2020 +0200

qt5: Pass QStyleOption by reference instead of pointer

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

diff --git a/vcl/inc/qt5/Qt5Graphics_Controls.hxx 
b/vcl/inc/qt5/Qt5Graphics_Controls.hxx
index b9034fd8ea03..515cae7be70b 100644
--- a/vcl/inc/qt5/Qt5Graphics_Controls.hxx
+++ b/vcl/inc/qt5/Qt5Graphics_Controls.hxx
@@ -66,13 +66,13 @@ private:
 QStyle::SubControl subControl);
 static QRect subElementRect(QStyle::SubElement element, const 
QStyleOption* option);
 
-void draw(QStyle::ControlElement element, QStyleOption* option, QImage* 
image,
+void draw(QStyle::ControlElement element, QStyleOption& rOption, QImage* 
image,
   const Color& rBackgroundColor, QStyle::State const state = 
QStyle::State_None,
   QRect rect = QRect());
-void draw(QStyle::PrimitiveElement element, QStyleOption* option, QImage* 
image,
+void draw(QStyle::PrimitiveElement element, QStyleOption& rOption, QImage* 
image,
   const Color& rBackgroundColor, QStyle::State const state = 
QStyle::State_None,
   QRect rect = QRect());
-void draw(QStyle::ComplexControl element, QStyleOptionComplex* option, 
QImage* image,
+void draw(QStyle::ComplexControl element, QStyleOptionComplex& rOption, 
QImage* image,
   const Color& rBackgroundColor, QStyle::State const state = 
QStyle::State_None);
 void drawFrame(QStyle::PrimitiveElement element, QImage* image, const 
Color& rBackGroundColor,
QStyle::State const& state, bool bClip = true,
diff --git a/vcl/qt5/Qt5Graphics_Controls.cxx b/vcl/qt5/Qt5Graphics_Controls.cxx
index 361050929d77..732c25e241cb 100644
--- a/vcl/qt5/Qt5Graphics_Controls.cxx
+++ b/vcl/qt5/Qt5Graphics_Controls.cxx
@@ -63,14 +63,14 @@ static QStyle::State vclStateValue2StateFlag(ControlState 
nControlState,
 return nState;
 }
 
-static void lcl_ApplyBackgroundColorToStyleOption(QStyleOption* pOption,
+static void lcl_ApplyBackgroundColorToStyleOption(QStyleOption& rOption,
   const Color& 
rBackgroundColor)
 {
 if (rBackgroundColor != COL_AUTO)
 {
 QColor aColor = toQColor(rBackgroundColor);
 for (QPalette::ColorRole role : { QPalette::Window, QPalette::Button, 
QPalette::Base })
-pOption->palette.setColor(role, aColor);
+rOption.palette.setColor(role, aColor);
 }
 }
 
@@ -154,49 +154,49 @@ inline QRect 
Qt5Graphics_Controls::subElementRect(QStyle::SubElement element,
 return QApplication::style()->subElementRect(element, option);
 }
 
-void Qt5Graphics_Controls::draw(QStyle::ControlElement element, QStyleOption* 
option, QImage* image,
-const Color& rBackgroundColor, QStyle::State 
const state,
-QRect rect)
+void Qt5Graphics_Controls::draw(QStyle::ControlElement element, QStyleOption& 
rOption,
+QImage* image, const Color& rBackgroundColor,
+QStyle::State const state, QRect rect)
 {
 const QRect& targetRect = !rect.isNull() ? rect : image->rect();
 
-option->state |= state;
-option->rect = downscale(targetRect);
+rOption.state |= state;
+rOption.rect = downscale(targetRect);
 
-lcl_ApplyBackgroundColorToStyleOption(option, rBackgroundColor);
+lcl_ApplyBackgroundColorToStyleOption(rOption, rBackgroundColor);
 
 QPainter painter(image);
-QApplication::style()->drawControl(element, option, &painter);
+QApplication::style()->drawControl(element, &rOption, &painter);
 }
 
-void Qt5Graphics_Controls::draw(QStyle::PrimitiveElement element, 
QStyleOption* option,
+void Qt5Graphics_Controls::draw(QStyle::PrimitiveElement element, 
QStyleOption& rOption,
 QImage* image, const Color& rBackgroundColor,
 QStyle::State const state, QRect rect)
 {
 const QRect& targetRect = !rect.isNull() ? rect : image->rect();
 
-option->state |= state;
-option->rect = downscale(targetRect);
+rOption.state |= state;
+rOption.rect = downscale(targetRect);
 
-lcl_ApplyBackgroundColorToStyleOption(option, rBackgroundColor);
+lcl_ApplyBackgroundColorToStyleOption(rOption, rBackgroundColor);
 
 QPainter painter(image);
-QApplication::style()->drawPrimitive(element, option, &painter);
+QApplication::style()->drawPrimitive(element

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

[Michael Weghorn (via logerrit)]

 vcl/inc/qt5/Qt5Graphics_Controls.hxx |   12 ++--
 vcl/qt5/Qt5Graphics_Controls.cxx |  101 +--
 2 files changed, 69 insertions(+), 44 deletions(-)

New commits:
commit 391f17a5fbcf9cd918efa10321219f87409d2412
Author: Michael Weghorn 
AuthorDate: Thu Sep 17 09:42:38 2020 +0200
Commit: Michael Weghorn 
CommitDate: Thu Sep 17 17:15:38 2020 +0200

tdf#136094 qt5: Handle bg color in drawNativeControl

This adds handling for the background color when
drawing controls in the qt5 VCL plugin, as was done
in the following commit for the gtk3 VCL plugin:

commit 2c9052802ea411dffbf5906c4914611fcbfbc6a5
Author: Michael Weghorn 
Date:   Mon Aug 24 17:18:03 2020 +0200

tdf#136094 Handle background color in drawNativeControl

For some reason, the proper background color is not passed
to 'Qt5Graphics_Controls::drawNativeControl' for the
multiline edit in the sample document ('rBackgroundColor
is 'COL_AUTO' instead), while it works as expected for the
gtk3 case. Setting a color inside
'Qt5Graphics_Controls::drawNativeControl' for testing purposes
made that one show up, so the problem is elsewhere.
I'll create a separate bug report to keep track of this and
reference it in tdf#136094.

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

diff --git a/vcl/inc/qt5/Qt5Graphics_Controls.hxx 
b/vcl/inc/qt5/Qt5Graphics_Controls.hxx
index 325e5c351046..b9034fd8ea03 100644
--- a/vcl/inc/qt5/Qt5Graphics_Controls.hxx
+++ b/vcl/inc/qt5/Qt5Graphics_Controls.hxx
@@ -67,13 +67,15 @@ private:
 static QRect subElementRect(QStyle::SubElement element, const 
QStyleOption* option);
 
 void draw(QStyle::ControlElement element, QStyleOption* option, QImage* 
image,
-  QStyle::State const state = QStyle::State_None, QRect rect = 
QRect());
+  const Color& rBackgroundColor, QStyle::State const state = 
QStyle::State_None,
+  QRect rect = QRect());
 void draw(QStyle::PrimitiveElement element, QStyleOption* option, QImage* 
image,
-  QStyle::State const state = QStyle::State_None, QRect rect = 
QRect());
+  const Color& rBackgroundColor, QStyle::State const state = 
QStyle::State_None,
+  QRect rect = QRect());
 void draw(QStyle::ComplexControl element, QStyleOptionComplex* option, 
QImage* image,
-  QStyle::State const state = QStyle::State_None);
-void drawFrame(QStyle::PrimitiveElement element, QImage* image, 
QStyle::State const& state,
-   bool bClip = true,
+  const Color& rBackgroundColor, QStyle::State const state = 
QStyle::State_None);
+void drawFrame(QStyle::PrimitiveElement element, QImage* image, const 
Color& rBackGroundColor,
+   QStyle::State const& state, bool bClip = true,
QStyle::PixelMetric eLineMetric = 
QStyle::PM_DefaultFrameWidth);
 
 static void fillQStyleOptionTab(const ImplControlValue& value, 
QStyleOptionTab& sot);
diff --git a/vcl/qt5/Qt5Graphics_Controls.cxx b/vcl/qt5/Qt5Graphics_Controls.cxx
index dce9c1687e42..361050929d77 100644
--- a/vcl/qt5/Qt5Graphics_Controls.cxx
+++ b/vcl/qt5/Qt5Graphics_Controls.cxx
@@ -63,6 +63,17 @@ static QStyle::State vclStateValue2StateFlag(ControlState 
nControlState,
 return nState;
 }
 
+static void lcl_ApplyBackgroundColorToStyleOption(QStyleOption* pOption,
+  const Color& 
rBackgroundColor)
+{
+if (rBackgroundColor != COL_AUTO)
+{
+QColor aColor = toQColor(rBackgroundColor);
+for (QPalette::ColorRole role : { QPalette::Window, QPalette::Button, 
QPalette::Base })
+pOption->palette.setColor(role, aColor);
+}
+}
+
 Qt5Graphics_Controls::Qt5Graphics_Controls(const Qt5GraphicsBase& rGraphics)
 : m_rGraphics(rGraphics)
 {
@@ -144,44 +155,53 @@ inline QRect 
Qt5Graphics_Controls::subElementRect(QStyle::SubElement element,
 }
 
 void Qt5Graphics_Controls::draw(QStyle::ControlElement element, QStyleOption* 
option, QImage* image,
-QStyle::State const state, QRect rect)
+const Color& rBackgroundColor, QStyle::State 
const state,
+QRect rect)
 {
 const QRect& targetRect = !rect.isNull() ? rect : image->rect();
 
 option->state |= state;
 option->rect = downscale(targetRect);
 
+lcl_ApplyBackgroundColorToStyleOption(option, rBackgroundColor);
+
 QPainter painter(image);
 QApplication::style()->drawControl(element, option, &painter);
 }
 
 void Qt5Graphics_Controls::draw(QStyle::PrimitiveElement element, 
QStyleOption* option,
-QImage* image, QStyle::State const state, 
QRect rect)
+  

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

[Tor Lillqvist (via logerrit)]

 external/nss/UnpackedTarball_nss.mk |1 +
 external/nss/nss.getopt.patch.0 |   25 +
 2 files changed, 26 insertions(+)

New commits:
commit 78949d668ea900726be9f491e9739d19bbe7f8c1
Author: Tor Lillqvist 
AuthorDate: Tue Jun 23 01:19:23 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Sep 17 16:48:47 2020 +0200

Add getopt declarations

Avoids: implicit declaration of function 'getopt' is invalid in C99
[-Werror,-Wimplicit-function-declaration].

Change-Id: Ic178f53d1002425df52e220b1723fb12edca13df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96910
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102924
Tested-by: Jenkins CollaboraOffice 

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 8fa1edd530cc..b6fcd1346b82 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/nss.bzmozilla1238154.patch \
external/nss/nss-bz1646594.patch.1 \
 external/nss/macos-dlopen.patch.0 \
+   external/nss/nss.getopt.patch.0 \
 $(if $(filter iOS,$(OS)), \
 external/nss/nss-ios.patch) \
 $(if $(filter ANDROID,$(OS)), \
diff --git a/external/nss/nss.getopt.patch.0 b/external/nss/nss.getopt.patch.0
new file mode 100644
index ..aeabb33f9b97
--- /dev/null
+++ b/external/nss/nss.getopt.patch.0
@@ -0,0 +1,25 @@
+# pr/tests/sel_spd.c:427:20: error: implicit declaration of function 'getopt' 
is invalid in C99 [-Werror,-Wimplicit-function-declaration]
+--- nspr/pr/tests/sel_spd.c
 nspr/pr/tests/sel_spd.c
+@@ -15,6 +15,9 @@
+ #include 
+ #include 
+ #include 
++
++extern char *optarg;
++int getopt(int argc, char *const argv[], const char *optstring);
+ 
+ #ifdef DEBUG
+ #define PORT_INC_DO +100
+--- nspr/pr/tests/testfile.c
 nspr/pr/tests/testfile.c
+@@ -23,6 +23,9 @@
+ #include 
+ #include 
+ #endif /* XP_OS2 */
++
++extern char *optarg;
++int getopt(int argc, char *const argv[], const char *optstring);
+ 
+ static int _debug_on = 0;
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski (via logerrit)]

 vcl/inc/pdf/XmpMetadata.hxx   |3 ++
 vcl/source/gdi/pdfwriter_impl.cxx |   47 +-
 vcl/source/pdf/XmpMetadata.cxx|   15 
 3 files changed, 35 insertions(+), 30 deletions(-)

New commits:
commit 749b206f1d2e31128762be9d727f1dc4c764aed5
Author: Jan-Marek Glogowski 
AuthorDate: Wed Sep 16 23:40:51 2020 +0200
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 16:39:17 2020 +0200

tdf#136805 PDF export: re-add XMP basic meta data

VeraPDF complains about:


  If a document information dictionary does appear
at a document, then all of its entries that have analogous
properties in predefined XMP schemas, shall also be embedded
in the file in XMP form with equivalent values.
  CosDocument
  doesInfoMatchXMP
  
root
  


The regressing commit dropped the XMP Basic schema meta data
(http://ns.adobe.com/xap/1.0/";). FWIW: xmp is the referred prefix,
so we'll continue to use it.

Regressed-by: d016e052ddf30649ad9b729b59134ce1e90a0263
Change-Id: I11b06fdafcb07732b92f0bd99b18afa3a9e498ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102888
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 06e35b3289090ec623fe5284976ee6f40681e1d5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102771
Reviewed-by: Michael Stahl 
(cherry picked from commit 4684f8e09ac540a85b843b2306a9e9edeb8c17ec)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102773
Reviewed-by: Thorsten Behrens 
Reviewed-by: Tomaž Vajngerl 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/inc/pdf/XmpMetadata.hxx b/vcl/inc/pdf/XmpMetadata.hxx
index cc3f8da1a34c..61438e0e50b8 100644
--- a/vcl/inc/pdf/XmpMetadata.hxx
+++ b/vcl/inc/pdf/XmpMetadata.hxx
@@ -30,6 +30,9 @@ public:
 OString msSubject;
 OString msProducer;
 OString msKeywords;
+OString m_sCreatorTool;
+OString m_sCreateDate;
+
 sal_Int32 mnPDF_A;
 bool mbPDF_UA;
 
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 03553d7aa6ee..7e02762d6e36 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -5122,6 +5122,16 @@ static void escapeStringXML( const OUString& rStr, 
OUString &rValue)
 }
 }
 
+static void lcl_assignMeta(const OUString& aValue, OString& aMeta)
+{
+if (!aValue.isEmpty())
+{
+OUString aTempString;
+escapeStringXML(aValue, aTempString);
+aMeta = OUStringToOString(aTempString, RTL_TEXTENCODING_UTF8);
+}
+}
+
 // emits the document metadata
 sal_Int32 PDFWriterImpl::emitDocumentMetadata()
 {
@@ -5144,36 +5154,13 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata()
 
 aMetadata.mbPDF_UA = m_bIsPDF_UA;
 
-if (!m_aContext.DocumentInfo.Title.isEmpty())
-{
-OUString aTempString;
-escapeStringXML(m_aContext.DocumentInfo.Title, aTempString);
-aMetadata.msTitle = OUStringToOString(aTempString, 
RTL_TEXTENCODING_UTF8);
-}
-if (!m_aContext.DocumentInfo.Author.isEmpty())
-{
-OUString aTempString;
-escapeStringXML(m_aContext.DocumentInfo.Author, aTempString);
-aMetadata.msAuthor = OUStringToOString(aTempString, 
RTL_TEXTENCODING_UTF8);
-}
-if (!m_aContext.DocumentInfo.Subject.isEmpty())
-{
-OUString aTempString;
-escapeStringXML(m_aContext.DocumentInfo.Subject, aTempString);
-aMetadata.msSubject = OUStringToOString(aTempString, 
RTL_TEXTENCODING_UTF8);
-}
-if (!m_aContext.DocumentInfo.Producer.isEmpty())
-{
-OUString aTempString;
-escapeStringXML(m_aContext.DocumentInfo.Producer, aTempString);
-aMetadata.msProducer = OUStringToOString(aTempString, 
RTL_TEXTENCODING_UTF8);
-}
-if (!m_aContext.DocumentInfo.Keywords.isEmpty())
-{
-OUString aTempString;
-escapeStringXML(m_aContext.DocumentInfo.Keywords, aTempString);
-aMetadata.msKeywords = OUStringToOString(aTempString, 
RTL_TEXTENCODING_UTF8);
-}
+lcl_assignMeta(m_aContext.DocumentInfo.Title, aMetadata.msTitle);
+lcl_assignMeta(m_aContext.DocumentInfo.Author, aMetadata.msAuthor);
+lcl_assignMeta(m_aContext.DocumentInfo.Subject, aMetadata.msSubject);
+lcl_assignMeta(m_aContext.DocumentInfo.Producer, aMetadata.msProducer);
+lcl_assignMeta(m_aContext.DocumentInfo.Keywords, aMetadata.msKeywords);
+lcl_assignMeta(m_aContext.DocumentInfo.Creator, 
aMetadata.m_sCreatorTool);
+aMetadata.m_sCreateDate = m_aCreationMetaDateString;
 
 OStringBuffer aMetadataObj( 1024 );
 
diff --git a/vcl/source/pdf/XmpMetadata.cxx b/vcl/source/pdf/XmpMetadata.cxx
index 281183c205e8..70588dab31cd 100644
---

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

[Tor Lillqvist (via logerrit)]

 bridges/source/cpp_uno/gcc3_ios/except.cxx   |   34 +--
 bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h |   17 -
 2 files changed, 48 insertions(+), 3 deletions(-)

New commits:
commit 6c8a84978725eb9efb06d4cf3e99c64f151e6c56
Author: Tor Lillqvist 
AuthorDate: Thu Sep 17 14:02:24 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Sep 17 16:32:32 2020 +0200

Add Stephan's "Very bad HACK" to the iOS code, too, for iOS 14

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

diff --git a/bridges/source/cpp_uno/gcc3_ios/except.cxx 
b/bridges/source/cpp_uno/gcc3_ios/except.cxx
index 2ef8ef49b966..d5c49859db27 100644
--- a/bridges/source/cpp_uno/gcc3_ios/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios/except.cxx
@@ -267,10 +267,14 @@ static void deleteException( void * pExc )
 // size 8 in front of that member (changing its offset from 88 to 96,
 // sizeof(__cxa_exception) from 120 to 128, and alignof(__cxa_exception)
 // from 8 to 16); a hack to dynamically determine whether we run against a
-// new libcxxabi is to look at the exceptionDestructor member, which must
+// LLVM 5 libcxxabi is to look at the exceptionDestructor member, which 
must
 // point to this function (the use of __cxa_exception in fillUnoException 
is
 // unaffected, as it only accesses members towards the start of the struct,
-// through a pointer known to actually point at the start):
+// through a pointer known to actually point at the start).  The libcxxabi 
commit
+// 

+// "Insert padding before the __cxa_exception header to ensure the thrown" 
in LLVM 6
+// removes the need for this hack, so it can be removed again once we can 
be sure that we only
+// run against libcxxabi from LLVM >= 6:
 if (header->exceptionDestructor != &deleteException) {
 header = reinterpret_cast<__cxa_exception const *>(
 reinterpret_cast(header) - 8);
@@ -347,6 +351,32 @@ void fillUnoException(uno_Any * pUnoExc, uno_Mapping * 
pCpp2Uno)
 return;
 }
 
+// Very bad HACK to find out whether we run against a libcxxabi that has a 
new
+// __cxa_exception::reserved member at the start, introduced with LLVM 10
+// 

+// "[libcxxabi] Insert padding in __cxa_exception struct for 
compatibility".  The layout of the
+// start of __cxa_exception is
+//
+//  [8 byte  void *reserve]
+//   8 byte  size_t referenceCount
+//
+// where the (bad, hacky) assumption is that reserve (if present) is null
+// (__cxa_allocate_exception in at least LLVM 11 zero-fills the object, 
and nothing actively
+// sets reserve) while referenceCount is non-null (__cxa_throw sets it to 
1, and
+// __cxa_decrement_exception_refcount destroys the exception as soon as it 
drops to 0; for a
+// __cxa_dependent_exception, the referenceCount member is rather
+//
+//   8 byte  void* primaryException
+//
+// but which also will always be set to a non-null value in 
__cxa_rethrow_primary_exception).
+// As described in the definition of __cxa_exception
+// (bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx), this hack 
(together with the "#if 0"
+// there) can be dropped once we can be sure that we only run against new 
libcxxabi that has the
+// reserve member:
+if (*reinterpret_cast(header) == nullptr) {
+header = reinterpret_cast<__cxa_exception *>(reinterpret_cast(header) + 1);
+}
+
 std::type_info *exceptionType = __cxxabiv1::__cxa_current_exception_type();
 
 typelib_TypeDescription * pExcTypeDescr = nullptr;
diff --git a/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h 
b/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h
index 9a700445c12a..83ed084860fd 100644
--- a/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h
+++ b/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h
@@ -59,8 +59,23 @@ namespace __cxxabiv1
 // followed by the exception object itself.
 
 struct __cxa_exception
-{ 
+{
 #if __LP64__
+#if 0
+// This is a new field added with LLVM 10
+// 

+// "[libcxxabi] Insert padding in __cxa_exception struct for 
compatibility".  The HACK in
+// fillUnoException (bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx) 
tries to find out at
+// runtime whether a __cxa_exception has this member.  Once we can be sure 
that we only run
+// against new libcxxabi that has this member, we can drop the "#if 0" 
here and drop the hack
+// in fillUnoException.
+
+// Now _Unwind_Exception is marked with __attribute__((aligned)),
+// which implies __cxa

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

[Caolán McNamara (via logerrit)]

 svtools/source/control/valueset.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit eb162ea75724269ffc6b97d7f31d96aa1cbd6da8
Author: Caolán McNamara 
AuthorDate: Thu Sep 17 12:38:41 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 16:29:44 2020 +0200

tdf#136737 grid in change icon dialog ends up oversized

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

diff --git a/svtools/source/control/valueset.cxx 
b/svtools/source/control/valueset.cxx
index 2eb875e55d53..8d0c1713c0e4 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -554,6 +554,8 @@ void ValueSet::RemoveItem( sal_uInt16 nItemId )
 
 void ValueSet::TurnOffScrollBar()
 {
+if (mxScrolledWindow->get_vpolicy() == VclPolicyType::NEVER)
+return;
 mxScrolledWindow->set_vpolicy(VclPolicyType::NEVER);
 weld::DrawingArea* pDrawingArea = GetDrawingArea();
 Size aPrefSize(pDrawingArea->get_preferred_size());
@@ -562,6 +564,8 @@ void ValueSet::TurnOffScrollBar()
 
 void ValueSet::TurnOnScrollBar()
 {
+if (mxScrolledWindow->get_vpolicy() == VclPolicyType::ALWAYS)
+return;
 mxScrolledWindow->set_vpolicy(VclPolicyType::ALWAYS);
 weld::DrawingArea* pDrawingArea = GetDrawingArea();
 Size aPrefSize(pDrawingArea->get_preferred_size());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 svtools/source/control/valueset.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit d9ae83e596e94c4d4967c5de653c2060b0648c78
Author: Caolán McNamara 
AuthorDate: Thu Sep 17 12:38:41 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 16:27:22 2020 +0200

tdf#136737 grid in change icon dialog ends up oversized

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

diff --git a/svtools/source/control/valueset.cxx 
b/svtools/source/control/valueset.cxx
index dde904d2b9a2..4070630fe44a 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -541,6 +541,8 @@ void ValueSet::RemoveItem( sal_uInt16 nItemId )
 
 void ValueSet::TurnOffScrollBar()
 {
+if (mxScrolledWindow->get_vpolicy() == VclPolicyType::NEVER)
+return;
 mxScrolledWindow->set_vpolicy(VclPolicyType::NEVER);
 weld::DrawingArea* pDrawingArea = GetDrawingArea();
 Size aPrefSize(pDrawingArea->get_preferred_size());
@@ -549,6 +551,8 @@ void ValueSet::TurnOffScrollBar()
 
 void ValueSet::TurnOnScrollBar()
 {
+if (mxScrolledWindow->get_vpolicy() == VclPolicyType::ALWAYS)
+return;
 mxScrolledWindow->set_vpolicy(VclPolicyType::ALWAYS);
 weld::DrawingArea* pDrawingArea = GetDrawingArea();
 Size aPrefSize(pDrawingArea->get_preferred_size());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/inc/address.hxx|2 +-
 sc/source/ui/app/inputhdl.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d372c0be9d7f8156a3892d6eed7c5790a4bf87cc
Author: Caolán McNamara 
AuthorDate: Mon Sep 14 15:07:34 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 15:38:36 2020 +0200

provide a ScDocument arg for ScRange::Parse

been like this since the initial import.
It seems reasonable to pass the available ScDocument
to ScRange::Parse to bring this use of ScRange into
line with all the other cases.

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

diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 5fc9a361cb66..03d60bf97ee4 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -551,7 +551,7 @@ public:
 inline bool In( const ScAddress& ) const;   ///< is Address& in Range?
 inline bool In( const ScRange& ) const; ///< is Range& in Range?
 
-SC_DLLPUBLIC ScRefFlags Parse( const OUString&, const ScDocument* = 
nullptr,
+SC_DLLPUBLIC ScRefFlags Parse( const OUString&, const ScDocument*,
const ScAddress::Details& rDetails = 
ScAddress::detailsOOOa1,
ScAddress::ExternalInfo* pExtInfo = nullptr,
const 
css::uno::Sequence* pExternalLinks = nullptr,
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 6712b3c97930..9c008807e3b4 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1756,7 +1756,7 @@ static OUString lcl_Calculate( const OUString& rFormula, 
ScDocument& rDoc, const
 }
 
 ScRange aTestRange;
-if ( bColRowName || (aTestRange.Parse(rFormula) & ScRefFlags::VALID) )
+if ( bColRowName || (aTestRange.Parse(rFormula, &rDoc) & 
ScRefFlags::VALID) )
 aValue += " ...";
 
 return aValue;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: net/WebSocketHandler.hpp

[Ashod Nakashian (via logerrit)]

 net/WebSocketHandler.hpp |   22 +++---
 1 file changed, 7 insertions(+), 15 deletions(-)

New commits:
commit 4c954973273624f80d92cf6190ea064bac41bdb9
Author: Ashod Nakashian 
AuthorDate: Thu Sep 17 07:54:00 2020 -0400
Commit: Andras Timar 
CommitDate: Thu Sep 17 15:37:21 2020 +0200

wsd: allow pings from clients

Per the rfc (https://tools.ietf.org/html/rfc6455#section-5.5.2):
"An endpoint MAY send a Ping frame any time after the connection
is established and before the connection is closed."

And "Upon receipt of a Ping frame, an endpoint MUST send a Pong
frame in response, unless it already received a Close frame."

Here we allow for pings to come from clients and we respond
to them by pongs, as required by rfc 6455.

Change-Id: I8e285f095526e4b67373ecb3ae1efc9c8717d756
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102948
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index 7fb38c86d..7a9ec902c 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -287,33 +287,25 @@ public:
 switch (code)
 {
 case WSOpCode::Pong:
-if (_isClient)
-{
-LOG_ERR('#' << socket->getFD() << ": Servers should not 
send pongs, only clients");
-shutdown(StatusCodes::POLICY_VIOLATION);
-return true;
-}
-else
 {
+if (_isClient)
+LOG_WRN('#' << socket->getFD() << ": Servers should 
not send pongs, only clients");
+
 _pingTimeUs = 
std::chrono::duration_cast
 (std::chrono::steady_clock::now() - 
_lastPingSentTime).count();
 LOG_TRC('#' << socket->getFD() << ": Pong received: " << 
_pingTimeUs << " microseconds");
 }
 break;
 case WSOpCode::Ping:
-if (_isClient)
 {
-auto now = std::chrono::steady_clock::now();
+if (!_isClient)
+LOG_ERR('#' << socket->getFD() << ": Clients should 
not send pings, only servers");
+
+const auto now = std::chrono::steady_clock::now();
 _pingTimeUs = 
std::chrono::duration_cast
 (now - _lastPingSentTime).count();
 sendPong(now, &ctrlPayload[0], payloadLen, socket);
 }
-else
-{
-LOG_ERR('#' << socket->getFD() << ": Clients should not 
send pings, only servers");
-shutdown(StatusCodes::POLICY_VIOLATION);
-return true;
-}
 break;
 case WSOpCode::Close:
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sfx2/source/dialog/templdlg.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 0e46ba3aa1822ba04a319b28bdc1ca4df6805064
Author: Caolán McNamara 
AuthorDate: Thu Sep 17 12:14:25 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 15:34:36 2020 +0200

tdf#134598 call FmtSelect to update watercan

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

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 18aa04187fcb..753fd6d23a9c 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -867,7 +867,7 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const 
OUString &rStr, bool bIsCal
 {
 mxTreeBox->scroll_to_row(*xEntry);
 mxTreeBox->select(*xEntry);
-return;
+break;
 }
 bEntry = mxTreeBox->iter_next(*xEntry);
 }
@@ -893,7 +893,6 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const 
OUString &rStr, bool bIsCal
 mxFmtLb->unselect_all();
 mxFmtLb->scroll_to_row(*xEntry);
 mxFmtLb->select(*xEntry);
-FmtSelect(nullptr, bIsCallback);
 }
 }
 }
@@ -909,6 +908,12 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const 
OUString &rStr, bool bIsCal
 }
 
 bWaterDisabled = !IsSafeForWaterCan();
+
+if (!bIsCallback)
+{
+// tdf#134598 call FmtSelect to update watercan
+FmtSelect(nullptr, false);
+}
 }
 
 OUString SfxCommonTemplateDialog_Impl::GetSelectedEntry() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/inc/rangeutl.hxx  |8 ++---
 sc/source/core/tool/rangeutl.cxx |   32 +++
 sc/source/filter/oox/extlstcontext.cxx   |2 -
 sc/source/filter/xml/XMLConsolidationContext.cxx |4 ++
 sc/source/filter/xml/XMLDetectiveContext.cxx |4 ++
 sc/source/filter/xml/datastreamimport.cxx|3 +-
 sc/source/filter/xml/xmlcondformat.cxx   |6 ++--
 sc/source/filter/xml/xmldpimp.cxx|7 +++--
 sc/source/filter/xml/xmldrani.cxx|3 +-
 sc/source/filter/xml/xmlfilti.cxx|5 ++-
 sc/source/filter/xml/xmlimprt.cxx|7 ++---
 sc/source/filter/xml/xmlsceni.cxx|6 +++-
 sc/source/filter/xml/xmlsorti.cxx|4 ++
 sc/source/filter/xml/xmltabi.cxx |2 -
 sc/source/ui/uitest/uiobject.cxx |2 -
 sc/source/ui/unoobj/docuno.cxx   |2 -
 sc/source/ui/view/tabview3.cxx   |2 -
 17 files changed, 59 insertions(+), 40 deletions(-)

New commits:
commit 9a31b606d39f90c72dd674b0f4f6a37c44fac5ef
Author: Caolán McNamara 
AuthorDate: Tue Sep 15 20:40:27 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 15:34:22 2020 +0200

GetRangeFromString, etc. never passed a null ScDocument*

for the xml case this isn't immediately obvious, but pDoc should
only be null between Init and Destroy.

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

diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx
index a09cded44e51..a47ce79fefd0 100644
--- a/sc/inc/rangeutl.hxx
+++ b/sc/inc/rangeutl.hxx
@@ -128,7 +128,7 @@ public:
 static bool GetRangeFromString(
 ScRange& rRange,
 const OUString& rRangeStr,
-const ScDocument* pDocument,
+const ScDocument& rDocument,
 formula::FormulaGrammar::AddressConvention eConv,
 sal_Int32& nOffset,
 sal_Unicode cSeparator = ' ',
@@ -136,7 +136,7 @@ public:
 static bool GetRangeListFromString(
 ScRangeList& rRangeList,
 const OUString& rRangeListStr,
-const ScDocument* pDocument,
+const ScDocument& rDocument,
 formula::FormulaGrammar::AddressConvention eConv,
 sal_Unicode cSeparator = ' ',
 sal_Unicode cQuote = '\'');
@@ -144,7 +144,7 @@ public:
 static bool GetAreaFromString(
 ScArea& rArea,
 const OUString& rRangeStr,
-const ScDocument* pDocument,
+const ScDocument& rDocument,
 formula::FormulaGrammar::AddressConvention eConv,
 sal_Int32& nOffset,
 sal_Unicode cSeparator = ' ');
@@ -153,7 +153,7 @@ public:
 static bool GetRangeFromString(
 css::table::CellRangeAddress& rRange,
 const OUString& rRangeStr,
-const ScDocument* pDocument,
+const ScDocument& rDocument,
 formula::FormulaGrammar::AddressConvention eConv,
 sal_Int32& nOffset,
 sal_Unicode cSeparator = ' ');
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index a9e8399e351a..49a5d227614b 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -459,7 +459,7 @@ bool ScRangeStringConverter::GetAddressFromString(
 bool ScRangeStringConverter::GetRangeFromString(
 ScRange& rRange,
 const OUString& rRangeStr,
-const ScDocument* pDocument,
+const ScDocument& rDocument,
 FormulaGrammar::AddressConvention eConv,
 sal_Int32& nOffset,
 sal_Unicode cSeparator,
@@ -477,11 +477,11 @@ bool ScRangeStringConverter::GetRangeFromString(
 {
 if ( aUIString[0] == '.' )
 aUIString = aUIString.copy( 1 );
-bResult = (rRange.aStart.Parse( aUIString, pDocument, eConv) & 
ScRefFlags::VALID) ==
+bResult = (rRange.aStart.Parse( aUIString, &rDocument, eConv) & 
ScRefFlags::VALID) ==

  ScRefFlags::VALID;
-::formula::FormulaGrammar::AddressConvention eConvUI = 
pDocument->GetAddressConvention();
+::formula::FormulaGrammar::AddressConvention eConvU

[Libreoffice-commits] online.git: 37 commits - cypress_test/integration_tests loleaflet/css loleaflet/images loleaflet/js loleaflet/src

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js   |8 
 cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js |   16 
 loleaflet/css/leaflet.css   |8 
 loleaflet/css/spreadsheet.css   |2 
 loleaflet/css/toolbar.css   |4 
 loleaflet/images/lc_freezepanes.svg |1 
 loleaflet/images/lc_freezepanescolumn.svg   |1 
 loleaflet/images/lc_freezepanesrow.svg  |1 
 loleaflet/js/global.js  |4 
 loleaflet/src/control/Control.ColumnHeader.js   |   10 
 loleaflet/src/control/Control.Header.js |   14 
 loleaflet/src/control/Control.Menubar.js|6 
 loleaflet/src/control/Control.NotebookbarCalc.js|   57 +
 loleaflet/src/control/Control.RowHeader.js  |8 
 loleaflet/src/core/Util.js  |7 
 loleaflet/src/geometry/Bounds.js|7 
 loleaflet/src/layer/marker/Marker.Drag.js   |6 
 loleaflet/src/layer/marker/Marker.js|7 
 loleaflet/src/layer/tile/CalcTileLayer.js   |  148 +--
 loleaflet/src/layer/tile/CanvasTileLayer.js |  466 
+-
 loleaflet/src/layer/tile/GridLayer.js   |4 
 loleaflet/src/layer/vector/SplitterLine.js  |   20 
 loleaflet/src/map/Map.js|   51 -
 loleaflet/src/map/anim/Map.ZoomAnimation.js |3 
 loleaflet/src/unocommands.js|4 
 25 files changed, 523 insertions(+), 340 deletions(-)

New commits:
commit d29ad2b57f2ae139f246ae8afa81a26fed996a91
Author: Tamás Zolnai 
AuthorDate: Thu Sep 17 13:28:34 2020 +0200
Commit: Jan Holesovsky 
CommitDate: Thu Sep 17 15:03:54 2020 +0200

cypress: update tile / marker positions.

It seems the tile container was moved to right with one
pixel. Update the test accordingly.

Change-Id: Ie8c370419e0b19abaafda379e95f405eea27b64f

diff --git a/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js 
b/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js
index 19d49cdab..d57805f04 100644
--- a/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js
@@ -518,7 +518,7 @@ describe('Trigger hamburger menu options.', function() {
// Select B2 cell
calcHelper.clickOnFirstCell();
 
-   cy.get('.spreadsheet-cell-resize-marker[style=\'transform: 
translate3d(76px, 11px, 0px); z-index: 11;\']')
+   cy.get('.spreadsheet-cell-resize-marker[style=\'transform: 
translate3d(77px, 11px, 0px); z-index: 11;\']')
.then(function(marker) {
expect(marker).to.have.lengthOf(1);
var XPos = 
marker[0].getBoundingClientRect().right + 2;
@@ -565,7 +565,7 @@ describe('Trigger hamburger menu options.', function() {
// Select B2 cell
calcHelper.clickOnFirstCell();
 
-   cy.get('.spreadsheet-cell-resize-marker[style=\'transform: 
translate3d(76px, 11px, 0px); z-index: 11;\']')
+   cy.get('.spreadsheet-cell-resize-marker[style=\'transform: 
translate3d(77px, 11px, 0px); z-index: 11;\']')
.then(function(marker) {
expect(marker).to.have.lengthOf(1);
var XPos = 
marker[0].getBoundingClientRect().right + 2;
@@ -881,8 +881,8 @@ describe('Trigger hamburger menu options.', function() {
 
mobileHelper.selectFromColorPalette(0, 0, 7);
 
-   var firstTile = '.leaflet-tile-loaded[style=\'width: 256px; 
height: 256px; left: -1px; top: 5px;\']';
-   var centerTile = '.leaflet-tile-loaded[style=\'width: 256px; 
height: 256px; left: 255px; top: 5px;\']';
+   var firstTile = '.leaflet-tile-loaded[style=\'width: 256px; 
height: 256px; left: 0px; top: 5px;\']';
+   var centerTile = '.leaflet-tile-loaded[style=\'width: 256px; 
height: 256px; left: 256px; top: 5px;\']';
helper.imageShouldBeFullWhiteOrNot(centerTile, true);
helper.imageShouldBeFullWhiteOrNot(firstTile, false);
 
diff --git 
a/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js 
b/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js
index 8e46bfb95..7202c06b7 100644
--- a/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js
+++ b/cy

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

[Julien Nabet (via logerrit)]

 dtrans/source/win32/clipb/WinClipbImpl.cxx   |2 +-
 offapi/com/sun/star/datatransfer/clipboard/RenderingCapabilities.idl |6 
++
 offapi/com/sun/star/datatransfer/clipboard/XSystemClipboard.idl  |2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit e738683f98559af330a1cc36d8d0a1be11abb355
Author: Julien Nabet 
AuthorDate: Sat Sep 12 12:00:49 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 17 15:20:27 2020 +0200

Add "Persistent", deprecate "Persistant" in RenderingCapabilities

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

diff --git a/dtrans/source/win32/clipb/WinClipbImpl.cxx 
b/dtrans/source/win32/clipb/WinClipbImpl.cxx
index 8d59be7ca430..e991a81cecd8 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.cxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.cxx
@@ -145,7 +145,7 @@ OUString CWinClipbImpl::getName(  )
 
 sal_Int8 CWinClipbImpl::getRenderingCapabilities(  )
 {
-return ( Delayed | Persistant );
+return ( Delayed | Persistent );
 }
 
 void CWinClipbImpl::flushClipboard( )
diff --git 
a/offapi/com/sun/star/datatransfer/clipboard/RenderingCapabilities.idl 
b/offapi/com/sun/star/datatransfer/clipboard/RenderingCapabilities.idl
index 6b0cdc96c230..b254cbf5f39d 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/RenderingCapabilities.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/RenderingCapabilities.idl
@@ -36,8 +36,14 @@ published constants RenderingCapabilities
 
 /** The implementation is able to store the data persistent in the system
 so that it does not get lost when the source application no longer 
exist.
+@deprecated since 7.1, rather use "Persistent" const
 */
 const byte Persistant = 2;
+
+/** The implementation is able to store the data persistent in the system
+so that it does not get lost when the source application no longer 
exist.
+*/
+const byte Persistent = 2;
 };
 
 
diff --git a/offapi/com/sun/star/datatransfer/clipboard/XSystemClipboard.idl 
b/offapi/com/sun/star/datatransfer/clipboard/XSystemClipboard.idl
index 1cb96db1ece8..32f8bf39db4e 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/XSystemClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/XSystemClipboard.idl
@@ -46,7 +46,7 @@ published interface XSystemClipboard
 /** Provides the ability to render the complete clipboard content. This
 interface is only available if the method
 
com::sun::star::datatransfer::clipboard::XClipboardEx::getRenderingCapabilities()
-returns Persistant
+returns Persistent
 */
 [optional] interface XFlushableClipboard;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 sd/qa/unit/import-tests.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b33f22678431a57be7e77822e977b66c33680290
Author: Stephan Bergmann 
AuthorDate: Thu Sep 17 12:10:41 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 17 15:15:59 2020 +0200

Adapt CPPUNIT_ASSERT to C++20 deleted ostream << for sal_Unicode (aka 
char16_t)

...after f580114e9da5b96a2ba61bbf527e33ab127b2a8d "tdf#49856 Add a test" 
(cf.
5d8f0fad50f90195a11873c70ddab4644f5839ea "Adapt CPPUNIT_ASSERT to C++20 
deleted
ostream << for sal_Unicode (aka char16_t)")

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

diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index a6aa1c134738..5d7e6893ddf8 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -17,6 +17,7 @@
 
 #include "sdmodeltestbase.hxx"
 
+#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/test/unusedvarsglobal.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ccd073e04478e5c72571dfa302055f6d1153e5aa
Author: Stephan Bergmann 
AuthorDate: Thu Sep 17 09:14:14 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 17 15:15:32 2020 +0200

Adapt compilerplugins/clang/test/unusedvarsglobal.cxx

...to e6dfaf9f44f9939abc338c83b3024108431d0f69 "Turn OUStringLiteral into a
consteval'ed, static-refcound rtl_uString".  (The original code would have
started to fail with

> error: 'error' diagnostics seen but not expected:
>   File compilerplugins/clang/test/unusedvarsglobal.cxx Line 22: 
declaration of variable 'literal1' with deduced type 'const OUStringLiteral' 
requires an initializer

when built with Clang >= 11.)

Change-Id: If51a39c8fb42200f064d62f472e8cddcc6e4c434
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102898
Reviewed-by: Noel Grandin 
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins

diff --git a/compilerplugins/clang/test/unusedvarsglobal.cxx 
b/compilerplugins/clang/test/unusedvarsglobal.cxx
index 98a9970a06df..58c18d0de84c 100644
--- a/compilerplugins/clang/test/unusedvarsglobal.cxx
+++ b/compilerplugins/clang/test/unusedvarsglobal.cxx
@@ -14,14 +14,14 @@
 // expected-no-diagnostics
 #else
 
-#include 
+#include 
 
 namespace something
 {
 // expected-error@+1 {{write [loplugin:unusedvarsglobal]}}
-extern const OUStringLiteral literal1;
+extern const std::u16string_view literal1;
 }
-const OUStringLiteral something::literal1(u"xxx");
+const std::u16string_view something::literal1(u"xxx");
 
 #endif
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/inc/AnnotationWin.hxx|3 +++
 sw/source/uibase/docvw/AnnotationMenuButton.cxx |7 +++
 sw/source/uibase/docvw/AnnotationWin2.cxx   |   15 +++
 3 files changed, 21 insertions(+), 4 deletions(-)

New commits:
commit 1b672e44c234f7ca396f7d593abfa74d766a2774
Author: Caolán McNamara 
AuthorDate: Thu Sep 17 11:24:37 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 15:05:03 2020 +0200

tdf#136682 set the sidebar of the menubutton as active on execute command

so the command will be executed on the expected sidebar window

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

diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index 1410ad5d689b..c2cc2298fcd3 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -195,6 +195,9 @@ class SAL_DLLPUBLIC_RTTI SwAnnotationWin : public 
vcl::Window
 bool IsResolved() const;
 bool IsThreadResolved();
 
+// Set this SwAnnotationWin as the currently active one
+void SetActiveSidebarWin();
+
 /// Find the first annotation for the thread which this annotation is 
in.
 /// This may be the same annotation as this one.
 SwAnnotationWin*   GetTopReplyNote();
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx 
b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
index f56e745c1641..58e4f7a8a610 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
@@ -67,6 +67,13 @@ void AnnotationMenuButton::dispose()
 void AnnotationMenuButton::Select()
 {
 OString sIdent = GetCurItemIdent();
+if (sIdent.isEmpty())
+return;
+
+// tdf#136682 ensure this is the currently active sidebar win so the 
command
+// operates in an active sidebar context
+mrSidebarWin.SetActiveSidebarWin();
+
 if (sIdent == "reply")
 mrSidebarWin.ExecuteCommand(FN_REPLY);
 if (sIdent == "resolve" || sIdent == "unresolve")
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx 
b/sw/source/uibase/docvw/AnnotationWin2.cxx
index f5430214479f..d9ec987b58b9 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -1332,14 +1332,21 @@ IMPL_LINK( SwAnnotationWin, WindowEventListener, 
VclWindowEvent&, rEvent, void )
 else if ( rEvent.GetId() == VclEventId::WindowActivate &&
   rEvent.GetWindow() == mpSidebarTextControl )
 {
-const bool bLockView = mrView.GetWrtShell().IsViewLocked();
-mrView.GetWrtShell().LockView( true );
-mrMgr.SetActiveSidebarWin( this );
-mrView.GetWrtShell().LockView( bLockView );
+SetActiveSidebarWin();
 mrMgr.MakeVisible( this );
 }
 }
 
+void SwAnnotationWin::SetActiveSidebarWin()
+{
+if (mrMgr.GetActiveSidebarWin() == this)
+return;
+const bool bLockView = mrView.GetWrtShell().IsViewLocked();
+mrView.GetWrtShell().LockView( true );
+mrMgr.SetActiveSidebarWin(this);
+mrView.GetWrtShell().LockView( bLockView );
+}
+
 IMPL_LINK(SwAnnotationWin, ScrollHdl, ScrollBar*, pScroll, void)
 {
 long nDiff = GetOutlinerView()->GetEditView().GetVisArea().Top() - 
pScroll->GetThumbPos();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/inc/compiler.hxx|4 ++--
 sc/qa/unit/helper/qahelper.cxx |4 ++--
 sc/qa/unit/ucalc_condformat.cxx|   12 ++--
 sc/qa/unit/ucalc_formula.cxx   |   12 ++--
 sc/source/core/data/column.cxx |2 +-
 sc/source/core/data/column4.cxx|   12 ++--
 sc/source/core/data/conditio.cxx   |6 +++---
 sc/source/core/data/formulacell.cxx|   18 +-
 sc/source/core/data/simpleformulacalc.cxx  |4 ++--
 sc/source/core/opencl/formulagroupcl.cxx   |2 +-
 sc/source/core/tool/compiler.cxx   |   12 ++--
 sc/source/core/tool/interpr1.cxx   |4 ++--
 sc/source/core/tool/rangenam.cxx   |   10 +-
 sc/source/core/tool/reftokenhelper.cxx |2 +-
 sc/source/filter/excel/xechart.cxx |2 +-
 sc/source/filter/excel/xename.cxx  |2 +-
 sc/source/filter/excel/xeroot.cxx  |2 +-
 sc/source/filter/excel/xichart.cxx |2 +-
 sc/source/filter/oox/defnamesbuffer.cxx|2 +-
 sc/source/filter/oox/formulabuffer.cxx |6 +++---
 sc/source/filter/oox/revisionfragment.cxx  |2 +-
 sc/source/filter/orcus/interface.cxx   |4 ++--
 sc/source/filter/xml/xmlcondformat.cxx |3 ++-
 sc/source/filter/xml/xmlimprt.cxx  |2 +-
 sc/source/ui/app/inputhdl.cxx  |2 +-
 sc/source/ui/condformat/condformatdlgentry.cxx |2 +-
 sc/source/ui/docshell/docfunc.cxx  |2 +-
 sc/source/ui/docshell/impex.cxx|2 +-
 sc/source/ui/formdlg/formula.cxx   |6 +++---
 sc/source/ui/miscdlgs/anyrefdg.cxx |2 +-
 sc/source/ui/namedlg/namedefdlg.cxx|2 +-
 sc/source/ui/namedlg/namedlg.cxx   |2 +-
 sc/source/ui/unoobj/chart2uno.cxx  |4 ++--
 sc/source/ui/unoobj/condformatuno.cxx  |4 ++--
 sc/source/ui/unoobj/funcuno.cxx|2 +-
 sc/source/ui/unoobj/servuno.cxx|2 +-
 sc/source/ui/unoobj/tokenuno.cxx   |8 
 sc/source/ui/vba/vbaname.cxx   |2 +-
 sc/source/ui/vba/vbanames.cxx  |2 +-
 sc/source/ui/vba/vbarange.cxx  |4 ++--
 sc/source/ui/view/tabvwsha.cxx |2 +-
 sc/source/ui/view/viewfun2.cxx |2 +-
 sc/source/ui/view/viewfun4.cxx |2 +-
 sc/source/ui/view/viewfunc.cxx |2 +-
 44 files changed, 94 insertions(+), 93 deletions(-)

New commits:
commit 44af87f7392792e045e5afe5df19e946ef81241b
Author: Caolán McNamara 
AuthorDate: Tue Sep 15 19:16:12 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 15:04:06 2020 +0200

ScCompiler ctors never passed a null ScDocument*

add one assert to ScXMLConditionalFormatContext where this isn't
immediately certain.

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

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 79b8c2cd2ff1..887c3c426792 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -361,7 +361,7 @@ public:
 /** If eGrammar == GRAM_UNSPECIFIED then the grammar of pDocument is used,
 if pDocument==nullptr then GRAM_DEFAULT.
  */
-ScCompiler( ScDocument* pDocument, const ScAddress&,
+ScCompiler( ScDocument& rDocument, const ScAddress&,
 formula::FormulaGrammar::Grammar eGrammar = 
formula::FormulaGrammar::GRAM_UNSPECIFIED,
 bool bComputeII = false, bool bMatrixFlag = false, const 
ScInterpreterContext* pContext = nullptr );
 
@@ -371,7 +371,7 @@ public:
 /** If eGrammar == GRAM_UNSPECIFIED then the grammar of pDocument is used,
 if pDocument==nullptr then GRAM_DEFAULT.
  */
-ScCompiler( ScDocument* pDocument, const ScAddress&, ScTokenArray& rArr,
+ScCompiler( ScDocument& rDocument, const ScAddress&, ScTokenArray& rArr,
 formula::FormulaGrammar::Grammar eGrammar = 
formula::FormulaGrammar::GRAM_UNSPECIFIED,
 bool bComputeII = false, bool bMatrixFlag = false, const 
ScInterpreterContext* pContext = nullptr );
 
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index cc675cdb593d..560d4c51fd21 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -489,7 +489,7 @@ std::unique_ptr compileFormula(
 formula::FormulaGrammar::Grammar eGram )
 {
 ScAddress aPos(0,0,0);
-ScCompiler aComp(pDoc, aPos, eGram);
+ScCompiler aComp(*pDoc, aPos, eGram);
 return aComp.CompileString(rFormula);
 }
 
@@ -562,7 +562,7 @@ bool isFormulaWithoutError(ScDocument& rDoc, const 
ScAddress& rPos)
 OUString toString(
 

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

[Caolán McNamara (via logerrit)]

 sc/inc/compiler.hxx  |8 -
 sc/source/core/tool/compiler.cxx |  249 +++
 2 files changed, 125 insertions(+), 132 deletions(-)

New commits:
commit 05ce868e4d576185e95e5b98691c61b29842a475
Author: Caolán McNamara 
AuthorDate: Tue Sep 15 19:41:44 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 15:04:31 2020 +0200

ScCompiler always has a ScDocument&

so various nullptr checks can go

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

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 887c3c426792..5aa44c82d3e1 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -266,7 +266,7 @@ private:
 } g_aAddInMap[];
 static size_t GetAddInMapCount();
 
-ScDocument* pDoc;
+ScDocument& rDoc;
 ScAddress   aPos;
 
 SvNumberFormatter* mpFormatter;
@@ -358,8 +358,7 @@ public:
 ScCompiler( sc::CompileFormulaContext& rCxt, const ScAddress& rPos,
 bool bComputeII = false, bool bMatrixFlag = false, const 
ScInterpreterContext* pContext = nullptr );
 
-/** If eGrammar == GRAM_UNSPECIFIED then the grammar of pDocument is used,
-if pDocument==nullptr then GRAM_DEFAULT.
+/** If eGrammar == GRAM_UNSPECIFIED then the grammar of rDocument is used,
  */
 ScCompiler( ScDocument& rDocument, const ScAddress&,
 formula::FormulaGrammar::Grammar eGrammar = 
formula::FormulaGrammar::GRAM_UNSPECIFIED,
@@ -368,8 +367,7 @@ public:
 ScCompiler( sc::CompileFormulaContext& rCxt, const ScAddress& rPos, 
ScTokenArray& rArr,
 bool bComputeII = false, bool bMatrixFlag = false, const 
ScInterpreterContext* pContext = nullptr );
 
-/** If eGrammar == GRAM_UNSPECIFIED then the grammar of pDocument is used,
-if pDocument==nullptr then GRAM_DEFAULT.
+/** If eGrammar == GRAM_UNSPECIFIED then the grammar of rDocument is used,
  */
 ScCompiler( ScDocument& rDocument, const ScAddress&, ScTokenArray& rArr,
 formula::FormulaGrammar::Grammar eGrammar = 
formula::FormulaGrammar::GRAM_UNSPECIFIED,
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index ab7077eca06e..134f89d68612 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -246,9 +246,9 @@ std::vector &ScCompiler::GetSetupTabNames() const
 {
 std::vector &rTabNames = const_cast(this)->maTabNames;
 
-if (pDoc && rTabNames.empty())
+if (rTabNames.empty())
 {
-rTabNames = pDoc->GetAllTableNames();
+rTabNames = rDoc.GetAllTableNames();
 for (auto& rTabName : rTabNames)
 ScCompiler::CheckTabQuotes(rTabName, 
formula::FormulaGrammar::extractRefConvention(meGrammar));
 }
@@ -284,12 +284,7 @@ void ScCompiler::SetGrammarAndRefConvention(
 meGrammar = eNewGrammar;// SetRefConvention needs the new grammar set!
 FormulaGrammar::AddressConvention eConv = 
FormulaGrammar::extractRefConvention( meGrammar);
 if (eConv == FormulaGrammar::CONV_UNSPECIFIED && eOldGrammar == 
FormulaGrammar::GRAM_UNSPECIFIED)
-{
-if (pDoc)
-SetRefConvention( pDoc->GetAddressConvention());
-else
-SetRefConvention( GetRefConvention( FormulaGrammar::CONV_OOO ) );
-}
+SetRefConvention( rDoc.GetAddressConvention());
 else
 SetRefConvention( eConv );
 }
@@ -1811,9 +1806,9 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, 
public ConventionXL
 ScCompiler::ScCompiler( sc::CompileFormulaContext& rCxt, const ScAddress& 
rPos, ScTokenArray& rArr,
 bool bComputeII, bool bMatrixFlag, const 
ScInterpreterContext* pContext )
 : FormulaCompiler(rArr, bComputeII, bMatrixFlag),
-pDoc(&rCxt.getDoc()),
+rDoc(rCxt.getDoc()),
 aPos(rPos),
-mpFormatter(pContext ? pContext->GetFormatTable() : 
pDoc->GetFormatTable()),
+mpFormatter(pContext ? pContext->GetFormatTable() : rDoc.GetFormatTable()),
 mpInterpreterContext(pContext),
 mnCurrentSheetTab(-1),
 mnCurrentSheetEndPos(0),
@@ -1833,9 +1828,9 @@ ScCompiler::ScCompiler( ScDocument& rDocument, const 
ScAddress& rPos, ScTokenArr
 formula::FormulaGrammar::Grammar eGrammar,
 bool bComputeII, bool bMatrixFlag, const 
ScInterpreterContext* pContext )
 : FormulaCompiler(rArr, bComputeII, bMatrixFlag),
-pDoc( &rDocument ),
+rDoc( rDocument ),
 aPos( rPos ),
-mpFormatter(pContext ? pContext->GetFormatTable() : 
pDoc->GetFormatTable()),
+mpFormatter(pContext ? pContext->GetFormatTable() : 
rDoc.GetFormatTable()),
 mpInterpreterContext(pContext),
 mnCurrentSheetTab(-1),
 mnCurrentSheetEndPos(0),
@@ -1856,9 +1851,9 @@ ScCompiler::ScCompiler( ScDocument& rDocument, const 
ScAddress& rPos, Sc

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

[Jan-Marek Glogowski (via logerrit)]

 vcl/source/pdf/XmpMetadata.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d7ef802bbb3b2f01fdbf7af6da50d272bcf0abd1
Author: Jan-Marek Glogowski 
AuthorDate: Thu Sep 17 14:52:18 2020 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Thu Sep 17 14:52:21 2020 +0200

Add schema comment to XML namespaced block

Just for reference, like all other namespaces.

Change-Id: I1931063039e90c37ba54debb89d4e8994054f745

diff --git a/vcl/source/pdf/XmpMetadata.cxx b/vcl/source/pdf/XmpMetadata.cxx
index 70588dab31cd..180a8d037b46 100644
--- a/vcl/source/pdf/XmpMetadata.cxx
+++ b/vcl/source/pdf/XmpMetadata.cxx
@@ -144,6 +144,7 @@ void XmpMetadata::write()
 aXmlWriter.endElement();
 }
 
+// XMP Basic schema
 aXmlWriter.startElement("rdf:Description");
 aXmlWriter.attribute("rdf:about", OString(""));
 aXmlWriter.attribute("xmlns:xmp", 
OString("http://ns.adobe.com/xap/1.0/";));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai (via logerrit)]

 cypress_test/README |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit 584d50b8ea90124d53e0795841577ca6a0fcd04a
Author: Tamás Zolnai 
AuthorDate: Thu Sep 17 13:00:50 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Sep 17 14:46:28 2020 +0200

cypress: add some note to README about php-proxy.

Change-Id: Iecbd80f9d145bf5c9d617f6ce6ada94c0bd9d91b

diff --git a/cypress_test/README b/cypress_test/README
index c604b32cd..8e1dde937 100644
--- a/cypress_test/README
+++ b/cypress_test/README
@@ -145,6 +145,19 @@ Limitations:
 * NC integration uses iframes which makes harder to test with cypress.
 * cy.document() and cy.window() not properly works by now.
 
+Running tests with php-proxy
+
+
+You can run any test runner command with php-proxy with setting
+CYPRESS_INTEGRATION environment variable. For example:
+
+CYPRESS_INTEGRATION="php-proxy" make check
+
+Prerequisites:
+* Download php-proxy script:
+https://github.com/CollaboraOnline/richdocumentscode/blob/master/proxy.php
+* Put it under /srv/www/htdocs/richproxy/ folder.
+
 Known issues
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: kit/ChildSession.cpp loleaflet/css loleaflet/src

[gokaysatir (via logerrit)]

 kit/ChildSession.cpp  |3 +++
 loleaflet/css/leaflet.css |   22 ++
 loleaflet/src/layer/tile/TileLayer.js |   31 +++
 3 files changed, 56 insertions(+)

New commits:
commit f05906aac5af7043cac477b84cd2114097557fcf
Author: gokaysatir 
AuthorDate: Tue Sep 15 17:10:15 2020 +0300
Commit: Andras Timar 
CommitDate: Thu Sep 17 14:23:13 2020 +0200

Online: Show input help on Online / Online part.

Change-Id: Ida8c5e8baccf87dae68c1c6d8f5302b1288741e7
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102747
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 96bf87372..54d900da6 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -2594,6 +2594,9 @@ void ChildSession::loKitCallback(const int type, const 
std::string& payload)
 case LOK_CALLBACK_VALIDITY_LIST_BUTTON:
 sendTextFrame("validitylistbutton: " + payload);
 break;
+case LOK_CALLBACK_VALIDITY_INPUT_HELP:
+sendTextFrame("validityinputhelp: " + payload);
+break;
 case LOK_CALLBACK_CLIPBOARD_CHANGED:
 {
 std::string selection;
diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css
index c2c35430c..d8d8bd651 100644
--- a/loleaflet/css/leaflet.css
+++ b/loleaflet/css/leaflet.css
@@ -1001,3 +1001,25 @@ path.leaflet-pane-splitter:hover {
stroke: #cdcdcd;
fill: #cdcdcd;
 }
+
+.input-help {
+   border-radius: 15px;
+   padding: 5px;
+   box-sizing: content-box;
+   border: 1px solid black;
+   color: black;
+   background-color: wheat;
+   min-width: 200px;
+   text-align: center;
+}
+
+.input-help > h4 {
+   display: block;
+   font-weight: 900;
+}
+
+.input-help > p {
+   display: block;
+   text-indent: 20px;
+   text-align: justify;
+}
\ No newline at end of file
diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index bdd3f3486..6f4445084 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -704,6 +704,9 @@ L.TileLayer = L.GridLayer.extend({
else if (textMsg.startsWith('validitylistbutton:')) {
this._onValidityListButtonMsg(textMsg);
}
+   else if (textMsg.startsWith('validityinputhelp:')) {
+   this._onValidityInputHelpMsg(textMsg);
+   }
else if (textMsg.startsWith('signaturestatus:')) {
var signstatus = 
textMsg.substring('signaturestatus:'.length + 1);
this._map.onChangeSignStatus(signstatus);
@@ -1200,6 +1203,16 @@ L.TileLayer = L.GridLayer.extend({
}
 
this._onUpdateCellCursor(horizontalDirection, 
verticalDirection, onPgUpDn);
+
+   // Remove input help if there is any:
+   this._removeInputHelpMarker();
+   },
+
+   _removeInputHelpMarker: function() {
+   if (this._inputHelpPopUp) {
+   this._map.removeLayer(this._inputHelpPopUp);
+   this._inputHelpPopUp = null;
+   }
},
 
_onDocumentRepair: function (textMsg) {
@@ -3108,6 +3121,24 @@ L.TileLayer = L.GridLayer.extend({
}
},
 
+   _onValidityInputHelpMsg: function(textMsg) {
+   var message = textMsg.replace('validityinputhelp: ', '');
+   message = JSON.parse(message);
+
+   var icon = L.divIcon({
+   html: '',
+   iconSize: [0, 0],
+   iconAnchor: [0, 0]
+   });
+
+   this._removeInputHelpMarker();
+   var inputHelpMarker = L.marker(this._cellCursor.getNorthEast(), 
{ icon: icon });
+   inputHelpMarker.addTo(this._map);
+   document.getElementById('input-help-title').innerText = 
message.title;
+   document.getElementById('input-help-content').innerText = 
message.content;
+   this._inputHelpPopUp = inputHelpMarker;
+   },
+
_addDropDownMarker: function () {
if (this._validatedCellXY && this._cellCursorXY && 
this._validatedCellXY.equals(this._cellCursorXY)) {
var pos = this._cellCursor.getNorthEast();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tünde Tóth (via logerrit)]

 chart2/source/view/charttypes/VSeriesPlotter.cxx |8 +++-
 sw/qa/extras/layout/data/tdf134866.docx  |binary
 sw/qa/extras/layout/layout.cxx   |   16 
 3 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit a3f1a891ba347f4035ba2925f9f05aa6f1cf9bf1
Author: Tünde Tóth 
AuthorDate: Fri Jul 24 10:06:40 2020 +0200
Commit: Gabor Kelemen 
CommitDate: Thu Sep 17 14:02:34 2020 +0200

tdf#134866 Chart OOXML import: fix percentage in custom pie chart label

Custom pie chart label showed incorrect percentage value.

Follow-up of commit 8c1dc30cc9fc96ef3d3ab0c4445959473248ae4d
(tdf#125444 Percentage as custom chart label).

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99353
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit c0fac974cefffb16e811259fbc66148712533190)

Change-Id: I2fe9cbca876da26a7c3a371c1e711b9e1fc33b1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102770
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx 
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 5acd2d587914..e0b25ba74811 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -530,7 +530,13 @@ uno::Reference< drawing::XShape > 
VSeriesPlotter::createDataLabel( const uno::Re
 }
 case DataPointCustomLabelFieldType_PERCENTAGE:
 {
-aTextList[i] = getLabelTextForValue( rDataSeries, 
nPointIndex, fValue, true );
+if(fSumValue == 0.0)
+   fSumValue = 1.0;
+fValue /= fSumValue;
+if(fValue < 0)
+   fValue *= -1.0;
+
+aTextList[i] = getLabelTextForValue(rDataSeries, 
nPointIndex, fValue, true);
 break;
 }
 case DataPointCustomLabelFieldType_CELLREF:
diff --git a/sw/qa/extras/layout/data/tdf134866.docx 
b/sw/qa/extras/layout/data/tdf134866.docx
new file mode 100644
index ..3358b527133c
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf134866.docx differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index adb19aee2646..ade9607847de 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2687,6 +2687,22 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf129173)
 pXmlDoc, 
"/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[22]/text", "56");
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf134866)
+{
+SwDoc* pDoc = createDoc("tdf134866.docx");
+SwDocShell* pShell = pDoc->GetDocShell();
+
+// Dump the rendering of the first page as an XML file.
+std::shared_ptr xMetaFile = pShell->GetPreviewMetaFile();
+MetafileXmlDump dumper;
+xmlDocPtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+CPPUNIT_ASSERT(pXmlDoc);
+
+// Check the data label of pie chart.
+assertXPathContent(
+pXmlDoc, 
"/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[2]/text", "100%");
+}
+
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf129095)
 {
 SwDoc* pDoc = createDoc("tdf129095.docx");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 desktop/source/lib/init.cxx |2 +-
 include/vcl/uitest/uiobject.hxx |2 ++
 vcl/source/uitest/uiobject.cxx  |   33 -
 3 files changed, 31 insertions(+), 6 deletions(-)

New commits:
commit 7b922966bf6bcf16f34cc22f60f0f962deb5f24a
Author: Szymon Kłos 
AuthorDate: Thu Sep 17 10:18:23 2020 +0200
Commit: Szymon Kłos 
CommitDate: Thu Sep 17 13:33:34 2020 +0200

jsdialog: use window only if visible

When there is a name conflict we should take
currently visible window.

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index ca825da01637..a2cf174ba599 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3742,7 +3742,7 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned nWin
 if (!bIsWeldedDialog || bContinueWithLOKWindow)
 {
 WindowUIObject aUIObject(pWindow);
-std::unique_ptr 
pUIWindow(aUIObject.get_child(aMap["id"]));
+std::unique_ptr 
pUIWindow(aUIObject.get_visible_child(aMap["id"]));
 if (pUIWindow) {
 bool bIsClickAction = false;
 
diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx
index c7ab3d51af93..4d4f98478adc 100644
--- a/include/vcl/uitest/uiobject.hxx
+++ b/include/vcl/uitest/uiobject.hxx
@@ -117,6 +117,8 @@ public:
 
 virtual std::unique_ptr get_child(const OUString& rID) override;
 
+virtual std::unique_ptr get_visible_child(const OUString& rID);
+
 virtual std::set get_children() const override;
 
 virtual OUString dumpState() const override;
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index efbf8e06dcf4..77f4014eea7c 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -374,7 +374,7 @@ OUString WindowUIObject::get_type() const
 
 namespace {
 
-vcl::Window* findChild(vcl::Window* pParent, const OUString& rID)
+vcl::Window* findChild(vcl::Window* pParent, const OUString& rID, bool 
bRequireVisible = false)
 {
 if (!pParent)
 return nullptr;
@@ -386,12 +386,16 @@ vcl::Window* findChild(vcl::Window* pParent, const 
OUString& rID)
 for (size_t i = 0; i < nCount; ++i)
 {
 vcl::Window* pChild = pParent->GetChild(i);
-if (pChild && pChild->get_id() == rID)
+if (pChild && pChild->get_id() == rID
+&& (!bRequireVisible || pChild->IsVisible()))
 return pChild;
 
-vcl::Window* pResult = findChild(pChild, rID);
-if (pResult)
-return pResult;
+if (!bRequireVisible || pChild->IsVisible())
+{
+vcl::Window* pResult = findChild(pChild, rID);
+if (pResult)
+return pResult;
+}
 }
 
 return nullptr;
@@ -441,6 +445,25 @@ std::unique_ptr WindowUIObject::get_child(const 
OUString& rID)
 return aFunction(pWindow);
 }
 
+std::unique_ptr WindowUIObject::get_visible_child(const OUString& 
rID)
+{
+// in a first step try the real children before moving to the top level 
parent
+// This makes it easier to handle cases with the same ID as there is a way
+// to resolve conflicts
+vcl::Window* pWindow = findChild(mxWindow.get(), rID, true);
+if (!pWindow)
+{
+vcl::Window* pDialogParent = get_top_parent(mxWindow.get());
+pWindow = findChild(pDialogParent, rID, true);
+}
+
+if (!pWindow)
+throw css::uno::RuntimeException("Could not find child with id: " + 
rID);
+
+FactoryFunction aFunction = pWindow->GetUITestFactory();
+return aFunction(pWindow);
+}
+
 std::set WindowUIObject::get_children() const
 {
 vcl::Window* pDialogParent = get_top_parent(mxWindow.get());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 sw/source/uibase/sidebar/TableEditPanel.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit f532087b4787ac0b6564cd3a002e59c8709082c6
Author: Szymon Kłos 
AuthorDate: Mon Sep 7 09:40:29 2020 +0200
Commit: Szymon Kłos 
CommitDate: Thu Sep 17 13:33:43 2020 +0200

Hide InsertFormula in Writer online

Change-Id: I5875559b46d242434b8e47f214e7f7f7a4a3db6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102146
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102861
Tested-by: Jenkins

diff --git a/sw/source/uibase/sidebar/TableEditPanel.cxx 
b/sw/source/uibase/sidebar/TableEditPanel.cxx
index 46f75cd9a9d6..896f09412219 100644
--- a/sw/source/uibase/sidebar/TableEditPanel.cxx
+++ b/sw/source/uibase/sidebar/TableEditPanel.cxx
@@ -19,6 +19,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -134,6 +135,9 @@ TableEditPanel::TableEditPanel(vcl::Window* pParent,
 
 InitRowHeightToolitem();
 InitColumnWidthToolitem();
+
+if (comphelper::LibreOfficeKit::isActive())
+m_xMisc->set_item_visible(".uno:InsertFormula", true);
 }
 
 TableEditPanel::~TableEditPanel() { disposeOnce(); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai (via logerrit)]

 cypress_test/plugins/blacklists.js |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 08ae0508f2b31c46e7f1f84aeb7a5e449921182b
Author: Tamás Zolnai 
AuthorDate: Thu Sep 17 03:16:09 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Sep 17 13:17:12 2020 +0200

cypress: php-proxy: blacklist formulabar related test.

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

diff --git a/cypress_test/plugins/blacklists.js 
b/cypress_test/plugins/blacklists.js
index bbef59fcc..4101d9172 100644
--- a/cypress_test/plugins/blacklists.js
+++ b/cypress_test/plugins/blacklists.js
@@ -98,6 +98,9 @@ var phpProxyBlackList = [
['mobile/writer/table_properties_spec.js',
[]
],
+   ['desktop/calc/focus_spec.js',
+   []
+   ],
 ];
 
 module.exports.coreBlackLists = coreBlackLists;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/gbuild-to-ide

[Miklos Vajna (via logerrit)]

 bin/gbuild-to-ide |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0bd92e6314b799afec447c1e30260d9a8dfad894
Author: Miklos Vajna 
AuthorDate: Thu Sep 17 10:55:26 2020 +0200
Commit: Miklos Vajna 
CommitDate: Thu Sep 17 13:10:29 2020 +0200

make vim-ide-integration: fix ResourceWarning

Exception ignored in: <_io.FileIO name='compile_commands.json' mode='wb' 
closefd=True>
ResourceWarning: unclosed file <_io.TextIOWrapper 
name='compile_commands.json' mode='w' encoding='UTF-8'>

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

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 7a6964abd454..bba9a9896b8a 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -548,8 +548,8 @@ class VimIntegrationGenerator(IdeIntegrationGenerator):
 entry = {'directory': lib.location, 'file': filePath, 
'command': self.generateCommand(lib, filePath)}
 entries.append(entry)
 global_list.extend(entries)
-export_file = open('compile_commands.json', 'w')
-json.dump(global_list, export_file)
+with open('compile_commands.json', 'w') as export_file:
+json.dump(global_list, export_file)
 
 def generateCommand(self, lib, file):
 command = 'clang++ -Wall'
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - include/LibreOfficeKit libreofficekit/source sc/source

[gokaysatir (via logerrit)]

 include/LibreOfficeKit/LibreOfficeKitEnums.h |9 +
 libreofficekit/source/gtk/lokdocview.cxx |1 +
 sc/source/ui/inc/gridwin.hxx |1 +
 sc/source/ui/view/gridwin.cxx|   13 +
 sc/source/ui/view/tabview3.cxx   |1 +
 5 files changed, 25 insertions(+)

New commits:
commit 110069adbba4d272450b30fa03c56efbd478e84c
Author: gokaysatir 
AuthorDate: Tue Sep 15 11:35:16 2020 +0300
Commit: Andras Timar 
CommitDate: Thu Sep 17 13:04:21 2020 +0200

Online: Show input help on Online / Core part.

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

diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 86ca9de556af..cabea69a29be 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -766,6 +766,13 @@ typedef enum
  * and row-groups data have changed.
  */
 LOK_CALLBACK_INVALIDATE_SHEET_GEOMETRY = 50,
+
+/**
+ * When for the current cell is defined an input help text.
+ *
+ * The payload format is JSON: { "title": "title text", "content": 
"content text" }
+ */
+LOK_CALLBACK_VALIDITY_INPUT_HELP = 51,
 }
 LibreOfficeKitCallbackType;
 
@@ -870,6 +877,8 @@ static inline const char* lokCallbackTypeToString(int nType)
 return "LOK_CALLBACK_WINDOW";
 case LOK_CALLBACK_VALIDITY_LIST_BUTTON:
 return "LOK_CALLBACK_VALIDITY_LIST_BUTTON";
+case LOK_CALLBACK_VALIDITY_INPUT_HELP:
+return "LOK_CALLBACK_VALIDITY_INPUT_HELP";
 case LOK_CALLBACK_CLIPBOARD_CHANGED:
 return "LOK_CALLBACK_CLIPBOARD_CHANGED";
 case LOK_CALLBACK_CONTEXT_CHANGED:
diff --git a/libreofficekit/source/gtk/lokdocview.cxx 
b/libreofficekit/source/gtk/lokdocview.cxx
index 2b2e4b85e89c..4ebcd6806d19 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1372,6 +1372,7 @@ callback (gpointer pData)
 case LOK_CALLBACK_DOCUMENT_PASSWORD:
 case LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY:
 case LOK_CALLBACK_VALIDITY_LIST_BUTTON:
+case LOK_CALLBACK_VALIDITY_INPUT_HELP:
 case LOK_CALLBACK_SIGNATURE_STATUS:
 case LOK_CALLBACK_CONTEXT_MENU:
 case LOK_CALLBACK_PROFILE_FRAME:
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 3d0050d12212..3a2a41d556ab 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -471,6 +471,7 @@ public:
 virtual FactoryFunction GetUITestFactory() const override;
 
 void updateLOKValListButton(bool bVisible, const ScAddress& rPos) const;
+void updateLOKInputHelp(const OUString& title, const OUString& content) 
const;
 
 protected:
 void ImpCreateOverlayObjects();
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index ec67eab92d28..e8b1bba90bf4 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -4704,6 +4704,19 @@ void ScGridWindow::UpdateAutoFillMark(bool bMarked, 
const ScRange& rMarkRange)
 }
 }
 
+void ScGridWindow::updateLOKInputHelp(const OUString& title, const OUString& 
content) const
+{
+ScTabViewShell* pViewShell = pViewData->GetViewShell();
+
+boost::property_tree::ptree aTree;
+aTree.put("title", title);
+aTree.put("content", content);
+
+std::stringstream aStream;
+boost::property_tree::write_json(aStream, aTree);
+pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_VALIDITY_INPUT_HELP, 
aStream.str().c_str());
+}
+
 void ScGridWindow::updateLOKValListButton( bool bVisible, const ScAddress& 
rPos ) const
 {
 SCCOL nX = rPos.Col();
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index f512e8dd9127..01c363903004 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -816,6 +816,7 @@ void ScTabView::TestHintWindow()
 if (pWindow == pWin)
 {
 xOverlayManager->add(*pOverlay);
+pWindow->updateLOKInputHelp(aTitle, aMessage);
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist (via logerrit)]

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9f92ec593ea41c6a7469af4bfd4d2a64f5dca197
Author: Tor Lillqvist 
AuthorDate: Thu Sep 17 13:42:25 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Sep 17 13:42:25 2020 +0300

Accept iOS SDK 14.0

Change-Id: I63bac82f1c5bbc00d637041b1e428d00b4c9dff5

diff --git a/configure.ac b/configure.ac
index f2122b0ec2ee..a941f1d5d093 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2992,8 +2992,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=13.7
-older_sdk_vers="13.6 13.5 13.4 13.2 13.1 13.0 12.4 12.2"
+current_sdk_ver=14.0
+older_sdk_vers="13.7 13.6 13.5 13.4 13.2 13.1 13.0 12.4 12.2"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=12.2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: ESC meeting agenda: 2020-09-17 16:00 Berlin time

[julien2412]

I don't know if it must be indicated in the ESC because it's public API
change but, just for information, I remove unused and deprecated
sal_Char/sal_sChar/sal_uChar from include/sal/types.h. (see
http://document-foundation-mail-archive.969070.n3.nabble.com/About-removing-long-time-deprecated-types-from-public-API-tt4287268.html)

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

[SOLVED] Re: About removing long time deprecated types from public API

[julien2412]

The types have been removed and I put a comment in
https://wiki.documentfoundation.org/ReleaseNotes/7.1 in SDK part.

Thank you Stephan!



--
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: Branch 'distro/collabora/cp-6.4' - configure.ac

[Tor Lillqvist (via logerrit)]

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8b8c5d2550690f15106b5b593375b8b3289c0f5f
Author: Tor Lillqvist 
AuthorDate: Thu Sep 17 13:39:01 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Sep 17 13:39:01 2020 +0300

Accept iOS SDK 14.0

Change-Id: I63bac82f1c5bbc00d637041b1e428d00b4c9dff5

diff --git a/configure.ac b/configure.ac
index db0ff12308a5..e8d33b6c3958 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3062,8 +3062,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=13.7
-older_sdk_vers="13.6 13.5 13.4 13.2 13.1 13.0 12.4 12.2"
+current_sdk_ver=14.0
+older_sdk_vers="13.7 13.6 13.5 13.4 13.2 13.1 13.0 12.4 12.2"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=12.2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/inc/consoli.hxx  |2 -
 sc/inc/tokenarray.hxx   |8 +++---
 sc/source/core/data/document10.cxx  |   20 
 sc/source/core/data/formulacell.cxx |   24 +--
 sc/source/core/tool/consoli.cxx |   44 ++--
 sc/source/core/tool/token.cxx   |   26 ++---
 sc/source/ui/docshell/docsh5.cxx|2 -
 sc/source/ui/unoobj/chart2uno.cxx   |   28 +++---
 sc/source/ui/vba/vbarange.cxx   |   16 ++---
 9 files changed, 85 insertions(+), 85 deletions(-)

New commits:
commit 0e6d7959afc72475c8cfabfd8dce9141e6932794
Author: Caolán McNamara 
AuthorDate: Tue Sep 15 16:01:38 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 12:35:51 2020 +0200

Tokens2RangeStringXML ctor never called with null ScDocument*

and some more similar

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

diff --git a/sc/inc/consoli.hxx b/sc/inc/consoli.hxx
index c00081a305b3..8d6bf621b3ef 100644
--- a/sc/inc/consoli.hxx
+++ b/sc/inc/consoli.hxx
@@ -83,7 +83,7 @@ public:
 SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 
);
 voidAddName( const OUString& rName );
 
-voidOutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW 
nRow, SCTAB nTab );
+voidOutputToDocument( ScDocument& rDestDoc, SCCOL nCol, SCROW 
nRow, SCTAB nTab );
 
 voidGetSize( SCCOL& rCols, SCROW& rRows ) const;
 SCROW   GetInsertCount() const;
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index 3af5fbcb5ca1..eb3fa0dc4a8f 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -135,18 +135,18 @@ public:
 /**
  * Make all absolute references external references pointing to the old 
document
  *
- * @param pOldDoc old document
- * @param pNewDoc new document
+ * @param rOldDoc old document
+ * @param rNewDoc new document
  * @param rPos position of the cell to determine if the reference is in 
the copied area
  * @param bRangeName set for range names, range names have special 
handling for absolute sheet ref + relative col/row ref
  */
-void ReadjustAbsolute3DReferences( const ScDocument* pOldDoc, ScDocument* 
pNewDoc, const ScAddress& rPos, bool bRangeName = false );
+void ReadjustAbsolute3DReferences( const ScDocument& rOldDoc, ScDocument& 
rNewDoc, const ScAddress& rPos, bool bRangeName = false );
 
 /**
  * Make all absolute references pointing to the copied range if the range 
is copied too
  * @param bCheckCopyArea should reference pointing into the copy area be 
adjusted independently from being absolute, should be true only for copy&paste 
between documents
  */
-void AdjustAbsoluteRefs( const ScDocument* pOldDoc, const ScAddress& 
rOldPos, const ScAddress& rNewPos, bool bCheckCopyArea );
+void AdjustAbsoluteRefs( const ScDocument& rOldDoc, const ScAddress& 
rOldPos, const ScAddress& rNewPos, bool bCheckCopyArea );
 
 /** When copying a sheet-local named expression, move sheet references that
 point to the originating sheet to point to the new sheet instead.
diff --git a/sc/source/core/data/document10.cxx 
b/sc/source/core/data/document10.cxx
index c0b909b349d0..1a90b64938cf 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -666,7 +666,7 @@ MightReferenceSheet mightRangeNameReferenceSheet( 
ScRangeData* pData, SCTAB nRef
 MightReferenceSheet::CODE : MightReferenceSheet::NONE;
 }
 
-ScRangeData* copyRangeName( const ScRangeData* pOldRangeData, ScDocument& 
rNewDoc, const ScDocument* pOldDoc,
+ScRangeData* copyRangeName( const ScRangeData* pOldRangeData, ScDocument& 
rNewDoc, const ScDocument& rOldDoc,
 const ScAddress& rNewPos, const ScAddress& rOldPos, bool 
bGlobalNamesToLocal,
 SCTAB nOldSheet, const SCTAB nNewSheet, bool bSameDoc)
 {
@@ -689,8 +689,8 @@ ScRangeData* copyRangeName( const ScRangeData* 
pOldRangeData, ScDocument& rNewDo
 }
 if (!bSameDoc)
 {
-pRangeNameToken->ReadjustAbsolute3DReferences(pOldDoc, &rNewDoc, 
pRangeData->GetPos(), true);
-pRangeNameToken->AdjustAbsoluteRefs(pOldDoc, rOldPos, rNewPos, true);
+pRangeNameToken->ReadjustAbsolute3DReferences(rOldDoc, rNewDoc, 
pRangeData->GetPos(), true);
+pRangeNameToken->AdjustAbsoluteRefs(rOldDoc, rOldPos, rNewPos, true);
 }
 
 bool bInserted;
@@ -722,12 +722,12 @@ typedef std::map< SheetIndex, SheetIndex > SheetIndexMap;
 
 ScRangeData* copyRangeNames( SheetIndexMap& rSheetIndexMap, 
std::vector& rRangeDataVec,
 const sc::UpdatedRangeNames& rReferencingNames, SCTAB nTab,
-const ScRangeData* pOldRangeData, ScDocument& rNewDoc, const 
ScDocument* pOldDoc,
+const ScRangeData* pOldRange

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

[Michael Stahl (via logerrit)]

 sw/source/uibase/ribbar/inputwin.cxx |   23 ++-
 1 file changed, 22 insertions(+), 1 deletion(-)

New commits:
commit 806b82d89f3bdf7ac0f9c25df15d40f8817f3353
Author: Michael Stahl 
AuthorDate: Wed Sep 16 16:53:03 2020 +0200
Commit: Michael Stahl 
CommitDate: Thu Sep 17 12:32:27 2020 +0200

sw: fix crash in SwInputWindow::ApplyFormula()

pView is null because the constructor is called from:

10 0x7fcf1e4d5796 in SfxDispatcher::Update_Impl(bool) (this=0x70a8f40, 
bForce=false) at sfx2/source/control/dispatch.cxx:1112
11 0x7fcf1e975c97 in 
SfxBaseController::ConnectSfxFrame_Impl(SfxBaseController::ConnectSfxFrame) 
(this=0x72684f0, i_eConnect=SfxBaseController::E_CONNECT) at 
sfx2/source/view/sfxbasecontroller.cxx:1249

but the active is set later, from:

0  SfxApplication::SetViewFrame_Impl(SfxViewFrame*) (this=0x38f32d0, 
pFrame=0x7255b30) at sfx2/source/appl/app.cxx:265
1  0x7fcf1e99025c in SfxViewFrame::SetViewFrame(SfxViewFrame*) 
(pFrame=0x7255b30) at sfx2/source/view/viewfrm.cxx:3326
2  0x7fcf1e989181 in SfxViewFrame::MakeActive_Impl(bool) 
(this=0x7255b30, bGrabFocus=true) at sfx2/source/view/viewfrm.cxx:1931
3  0x7fcf1e975d2d in 
SfxBaseController::ConnectSfxFrame_Impl(SfxBaseController::ConnectSfxFrame) 
(this=0x72684f0, i_eConnect=SfxBaseController::E_CONNECT) at 
sfx2/source/view/sfxbasecontroller.cxx:1253

This can only be reproduced if the SwInputWindow is visible in the
configuration, but it is closed automatically on document close, so not
sure how i got into this situation; Ctrl+C while it's visible can
reproduce this anyway.

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

diff --git a/sw/source/uibase/ribbar/inputwin.cxx 
b/sw/source/uibase/ribbar/inputwin.cxx
index de00c7fc7108..b84681e353f9 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -333,6 +333,18 @@ void SwInputWindow::Click( )
 
 void  SwInputWindow::ApplyFormula()
 {
+// in case it was created while loading the document, the active view
+// wasn't initialised at that time, so ShowWin() didn't initialise anything
+// either - nothing to do
+if (!pView)
+{
+// presumably there must be an active view now since the event arrived
+SwView *const pActiveView = ::GetActiveView();
+// this just makes the input window go away, so that the next time it 
works
+pActiveView->GetViewFrame()->GetDispatcher()->Execute(FN_EDIT_FORMULA, 
SfxCallMode::ASYNCHRON);
+return;
+}
+
 pView->GetViewFrame()->GetDispatcher()->Lock(false);
 pView->GetEditWin().LockKeyInput(false);
 CleanupUglyHackWithUndo();
@@ -354,8 +366,17 @@ void  SwInputWindow::ApplyFormula()
 
 void  SwInputWindow::CancelFormula()
 {
-if(!pView)
+// in case it was created while loading the document, the active view
+// wasn't initialised at that time, so ShowWin() didn't initialise anything
+// either - nothing to do
+if (!pView)
+{
+// presumably there must be an active view now since the event arrived
+SwView *const pActiveView = ::GetActiveView();
+// this just makes the input window go away, so that the next time it 
works
+pActiveView->GetViewFrame()->GetDispatcher()->Execute(FN_EDIT_FORMULA, 
SfxCallMode::ASYNCHRON);
 return;
+}
 
 pView->GetViewFrame()->GetDispatcher()->Lock( false );
 pView->GetEditWin().LockKeyInput(false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter.cxx  |   14 ++-
 sw/qa/extras/uiwriter/uiwriter3.cxx |  134 
 2 files changed, 117 insertions(+), 31 deletions(-)

New commits:
commit b1f76c872eb7927ddaedb2de9099ae1916d74c2f
Author: Caolán McNamara 
AuthorDate: Wed Sep 16 13:19:11 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 12:26:43 2020 +0200

avoid uno:Paste in tests

clipboard is a shared resource (except for svp) so interleaved
tests are not guaranteed to get out what they put in

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

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 54ae76383693..e824be2ae56c 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1020,7 +1020,7 @@ void SwUiWriterTest::testExportRTF()
 pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/true, 3, 
/*bBasicCall=*/false);
 
 // Create the clipboard document.
-std::shared_ptr xClpDoc(new SwDoc, o3tl::default_delete());
+rtl::Reference xClpDoc(new SwDoc());
 xClpDoc->SetClipBoard(true);
 pWrtShell->Copy(xClpDoc.get());
 
@@ -1309,8 +1309,16 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf134250)
 dispatchCommand(mxComponent, ".uno:SelectAll", {});
 dispatchCommand(mxComponent, ".uno:SelectAll", {});
 dispatchCommand(mxComponent, ".uno:SelectAll", {});
-dispatchCommand(mxComponent, ".uno:Copy", {});
-dispatchCommand(mxComponent, ".uno:Paste", {});
+
+// .uno:Copy without touching shared clipboard
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+rtl::Reference xTransfer = new SwTransferable(*pWrtShell);
+xTransfer->Copy();
+
+// .uno:Paste without touching shared clipboard
+TransferableDataHelper aHelper(xTransfer.get());
+SwTransferable::Paste(*pWrtShell, aHelper);
+
 Scheduler::ProcessEventsToIdle();
 
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index bddb827de74b..da425a13e071 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -13,9 +13,10 @@
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
 #include 
-#include 
 #include 
 
 #include 
@@ -39,11 +40,19 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf129382)
 
 CPPUNIT_ASSERT_EQUAL(8, getShapes());
 CPPUNIT_ASSERT_EQUAL(2, getPages());
+
 dispatchCommand(mxComponent, ".uno:SelectAll", {});
-dispatchCommand(mxComponent, ".uno:Cut", {});
+
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+rtl::Reference xTransfer = new SwTransferable(*pWrtShell);
+xTransfer->Cut();
+
 CPPUNIT_ASSERT_EQUAL(3, getShapes());
 CPPUNIT_ASSERT_EQUAL(1, getPages());
-dispatchCommand(mxComponent, ".uno:Paste", {});
+
+TransferableDataHelper aHelper(xTransfer.get());
+SwTransferable::Paste(*pWrtShell, aHelper);
+
 CPPUNIT_ASSERT_EQUAL(8, getShapes());
 CPPUNIT_ASSERT_EQUAL(2, getPages());
 dispatchCommand(mxComponent, ".uno:Undo", {});
@@ -80,18 +89,27 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf126626)
 CPPUNIT_ASSERT(pTextDoc);
 
 CPPUNIT_ASSERT_EQUAL(2, getShapes());
+
 dispatchCommand(mxComponent, ".uno:SelectAll", {});
-dispatchCommand(mxComponent, ".uno:Copy", {});
+
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+rtl::Reference xTransfer = new SwTransferable(*pWrtShell);
+xTransfer->Copy();
+
 CPPUNIT_ASSERT_EQUAL(2, getShapes());
-dispatchCommand(mxComponent, ".uno:Paste", {});
+
+TransferableDataHelper aHelper(xTransfer.get());
+SwTransferable::Paste(*pWrtShell, aHelper);
 CPPUNIT_ASSERT_EQUAL(2, getShapes());
-dispatchCommand(mxComponent, ".uno:Paste", {});
+
+SwTransferable::Paste(*pWrtShell, aHelper);
 CPPUNIT_ASSERT_EQUAL(4, getShapes());
+
 dispatchCommand(mxComponent, ".uno:Undo", {});
 CPPUNIT_ASSERT_EQUAL(2, getShapes());
 
 // without the fix, it crashes
-dispatchCommand(mxComponent, ".uno:Paste", {});
+SwTransferable::Paste(*pWrtShell, aHelper);
 CPPUNIT_ASSERT_EQUAL(4, getShapes());
 }
 
@@ -131,13 +149,19 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132187)
 CPPUNIT_ASSERT(pTextDoc);
 
 CPPUNIT_ASSERT_EQUAL(1, getPages());
+
 dispatchCommand(mxComponent, ".uno:SelectAll", {});
-dispatchCommand(mxComponent, ".uno:Copy", {});
+
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+rtl::Reference xTransfer = new SwTransferable(*pWrtShell);
+xTransfer->Copy();
+
 dispatchCommand(mxComponent, ".uno:GoToEndOfDoc", {});
 
+TransferableDataHelper aHelper(xTrans

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

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/common/helper.js   |   11 
+-
 cypress_test/integration_tests/mobile/writer/shape_properties_spec.js |   16 
--
 cypress_test/plugins/blacklists.js|3 +
 cypress_test/plugins/index.js |4 ++
 4 files changed, 22 insertions(+), 12 deletions(-)

New commits:
commit 228d8af5635629f23390776f29375c90d812c8b2
Author: Tamás Zolnai 
AuthorDate: Wed Sep 16 16:54:00 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Sep 17 12:23:45 2020 +0200

cypress: php-proxy: blacklist table related tests.

The application freezes with tables, beacuse of an
invalidate tiles loop. With php-proxy the lot of invalidate
tile messages blocks the execution.

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

diff --git a/cypress_test/plugins/blacklists.js 
b/cypress_test/plugins/blacklists.js
index 6efced9e7..bbef59fcc 100644
--- a/cypress_test/plugins/blacklists.js
+++ b/cypress_test/plugins/blacklists.js
@@ -95,6 +95,9 @@ var phpProxyBlackList = [
'Insert local image.'
]
],
+   ['mobile/writer/table_properties_spec.js',
+   []
+   ],
 ];
 
 module.exports.coreBlackLists = coreBlackLists;
commit 1fa089901e80597cdabfa6e2014cbb7e8a1392ff
Author: Tamás Zolnai 
AuthorDate: Wed Sep 16 16:01:46 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Sep 17 12:23:32 2020 +0200

cypress: php-proxy: fix shape related tests.

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

diff --git a/cypress_test/integration_tests/common/helper.js 
b/cypress_test/integration_tests/common/helper.js
index 9c1823b81..505108bac 100644
--- a/cypress_test/integration_tests/common/helper.js
+++ b/cypress_test/integration_tests/common/helper.js
@@ -665,7 +665,8 @@ function moveCursor(direction) {
.invoke('offset')
.its('top')
.as('origCursorPos');
-   } else if (direction === 'left' || direction === 'right') {
+   } else if (direction === 'left' || direction === 'right'
+   || direction === 'home' || direction === 'end') {
cy.get('.blinking-cursor')
.invoke('offset')
.its('left')
@@ -684,6 +685,10 @@ function moveCursor(direction) {
key = '{leftarrow}';
} else if (direction === 'right') {
key = '{rightarrow}';
+   } else if (direction === 'home') {
+   key = '{home}';
+   } else if (direction === 'end') {
+   key = '{end}';
}
typeIntoDocument(key);
 
@@ -695,9 +700,9 @@ function moveCursor(direction) {

expect(cursor.offset().top).to.be.lessThan(origCursorPos);
} else if (direction === 'down') {

expect(cursor.offset().top).to.be.greaterThan(origCursorPos);
-   } else if (direction === 'left') {
+   } else if (direction === 'left' || 
direction === 'home') {

expect(cursor.offset().left).to.be.lessThan(origCursorPos);
-   } else if (direction === 'right') {
+   } else if (direction === 'right' || 
direction === 'end') {

expect(cursor.offset().left).to.be.greaterThan(origCursorPos);
}
});
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 6f3748ed6..e957e92e9 100644
--- a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
@@ -1,4 +1,4 @@
-/* global describe it cy beforeEach require afterEach */
+/* global describe it cy beforeEach require afterEach Cypress */
 
 var helper = require('../../common/helper');
 var mobileHelper = require('../../common/mobile_helper');
@@ -13,15 +13,13 @@ describe('Change shape properties via mobile wizard.', 
function() {
// Click on edit button
mobileHelper.enableEditingMobile();
 
-   helper.typeIntoDocument('{end}');
+   helper.moveCursor('end');
 
-   cy.get('.blinking-cursor')
-   .should('be.visible');
-
-   helper.ty

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

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/mobile/writer/insert_object_spec.js |4 +-
 cypress_test/plugins/blacklists.js |   19 
++
 cypress_test/plugins/index.js  |5 ++
 3 files changed, 27 insertions(+), 1 deletion(-)

New commits:
commit 980e2a16493831f95df1c92e4fa90f822190d2dd
Author: Tamás Zolnai 
AuthorDate: Wed Sep 16 15:08:19 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Sep 17 12:23:19 2020 +0200

cypress: php-proxy: fix insert header test.

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

diff --git a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js 
b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
index b9ffa6294..c2731075d 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
@@ -135,7 +135,9 @@ describe('Insert objects via insertion wizard.', function() 
{
 
it('Insert header.', function() {
// Get the blinking cursor pos
-   helper.typeIntoDocument('');
+   helper.typeIntoDocument('xx{enter}');
+
+   helper.typeText('body', '', 500);
 
getCursorPos('left', 'cursorOrigLeft');
 
commit bdcfb9a1f0468db1c2869c4008165929ac95ae1f
Author: Tamás Zolnai 
AuthorDate: Wed Sep 16 14:23:54 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Thu Sep 17 12:23:05 2020 +0200

cypress: php-proxy: blacklist image insertion tests.

For some reasion cypress image loading mechnism is not
working with php-proxy. Without cypress image insertion
works. So now I disable this test, later we can fix-up
cypress test to handle this scenario.

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

diff --git a/cypress_test/plugins/blacklists.js 
b/cypress_test/plugins/blacklists.js
index b389f6260..6efced9e7 100644
--- a/cypress_test/plugins/blacklists.js
+++ b/cypress_test/plugins/blacklists.js
@@ -79,5 +79,24 @@ var nextcloudBlackList = [
],
 ];
 
+var phpProxyBlackList = [
+   ['mobile/calc/insertion_wizard_spec.js',
+   [
+   'Inset local image.'
+   ]
+   ],
+   ['mobile/writer/insert_object_spec.js',
+   [
+   'Insert local image.'
+   ]
+   ],
+   ['mobile/impress/insertion_wizard_spec.js',
+   [
+   'Insert local image.'
+   ]
+   ],
+];
+
 module.exports.coreBlackLists = coreBlackLists;
 module.exports.nextcloudBlackList = nextcloudBlackList;
+module.exports.phpProxyBlackList = phpProxyBlackList;
diff --git a/cypress_test/plugins/index.js b/cypress_test/plugins/index.js
index ae7640370..ec2ca4586 100644
--- a/cypress_test/plugins/index.js
+++ b/cypress_test/plugins/index.js
@@ -79,6 +79,11 @@ function pickTests(filename, foundTests, config) {
testsToRun = removeBlacklistedTest(filename, testsToRun, 
NCblackList);
}
 
+   if (process.env.CYPRESS_INTEGRATION === 'php-proxy') {
+   var ProxyblackList = blacklists.phpProxyBlackList;
+   testsToRun = removeBlacklistedTest(filename, testsToRun, 
ProxyblackList);
+   }
+
return testsToRun;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[mert (via logerrit)]

 wsd/ClientSession.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e4c65866cccbbd87a68f52d791cd0e2973580928
Author: mert 
AuthorDate: Thu Sep 17 11:51:16 2020 +0300
Commit: Andras Timar 
CommitDate: Thu Sep 17 11:40:36 2020 +0200

fix loadwithpassword parsing password token on mobile

Change-Id: Ia3ca58f9fb08b9d1568feb2655cd03e17bf92b5a
Signed-off-by: mert 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102905
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index c00c7dbea..9b5ed4998 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -400,7 +400,7 @@ bool ClientSession::_handleInput(const char *buffer, int 
length)
 if (!docPassword.empty())
 {
 setHaveDocPassword(true);
-setDocPassword(tokens[1]);
+setDocPassword(docPassword);
 }
 }
 return loadDocument(buffer, length, tokens, docBroker);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter3.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit bfd4ffdc7d168c00c040e1986e3d2a0ffc9501a2
Author: Caolán McNamara 
AuthorDate: Thu Sep 17 09:05:07 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 11:08:46 2020 +0200

drop dubious looking ProcessEventsToIdle

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

diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 1474e89a67b9..dca99f9e3c4c 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -288,7 +288,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf126626)
 CPPUNIT_ASSERT_EQUAL(2, getShapes());
 
 dispatchCommand(mxComponent, ".uno:SelectAll", {});
-Scheduler::ProcessEventsToIdle();
 
 SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
 rtl::Reference xTransfer = new SwTransferable(*pWrtShell);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/inc/compiler.hxx|2 +-
 sc/source/core/tool/compiler.cxx   |3 ++-
 sc/source/core/tool/tokenstringcontext.cxx |2 +-
 sc/source/ui/docshell/docsh6.cxx   |2 +-
 sc/source/ui/vba/vbawsfunction.cxx |7 +++
 5 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit ee236b2c6738e34be86052fb819a31dc00d54541
Author: Caolán McNamara 
AuthorDate: Tue Sep 15 16:46:11 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 11:08:31 2020 +0200

base-class formula::FormulaCompiler is sufficient here

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

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index f702749d36a8..79b8c2cd2ff1 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -394,7 +394,7 @@ public:
 sal_Unicode GetNativeAddressSymbol( Convention::SpecialSymbolType eType ) 
const;
 
 // Check if it is a valid english function name
-bool IsEnglishSymbol( const OUString& rName );
+static bool IsEnglishSymbol( const OUString& rName );
 
 bool IsErrorConstant( const OUString& ) const;
 bool IsTableRefItem( const OUString& ) const;
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index f47d142e4382..00602e665030 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -181,7 +181,8 @@ bool ScCompiler::IsEnglishSymbol( const OUString& rName )
 OUString aUpper = ScGlobal::getCharClassPtr()->uppercase(rName);
 
 // 1. built-in function name
-OpCode eOp = ScCompiler::GetEnglishOpCode( aUpper );
+formula::FormulaCompiler aCompiler;
+OpCode eOp = aCompiler.GetEnglishOpCode( aUpper );
 if ( eOp != ocNone )
 {
 return true;
diff --git a/sc/source/core/tool/tokenstringcontext.cxx 
b/sc/source/core/tool/tokenstringcontext.cxx
index 8d3503804d08..5a4430c155a3 100644
--- a/sc/source/core/tool/tokenstringcontext.cxx
+++ b/sc/source/core/tool/tokenstringcontext.cxx
@@ -36,7 +36,7 @@ TokenStringContext::TokenStringContext( const ScDocument& 
rDoc, formula::Formula
 meGram(eGram),
 
mpRefConv(ScCompiler::GetRefConvention(formula::FormulaGrammar::extractRefConvention(eGram)))
 {
-ScCompiler aComp(nullptr, ScAddress());
+formula::FormulaCompiler aComp;
 mxOpCodeMap = 
aComp.GetOpCodeMap(formula::FormulaGrammar::extractFormulaLanguage(eGram));
 if (mxOpCodeMap)
 maErrRef = mxOpCodeMap->getSymbol(ocErrRef);
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index 905ac7ef84c2..2c4765ef64dc 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -448,7 +448,7 @@ void ScDocShell::SetFormulaOptions( const ScFormulaOptions& 
rOpt, bool bForLoadi
 if (rOpt.GetUseEnglishFuncName())
 {
 // switch native symbols to English.
-ScCompiler aComp(nullptr, ScAddress());
+formula::FormulaCompiler aComp;
 ScCompiler::OpCodeMapPtr xMap = 
aComp.GetOpCodeMap(css::sheet::FormulaLanguage::ENGLISH);
 ScCompiler::SetNativeSymbols(xMap);
 }
diff --git a/sc/source/ui/vba/vbawsfunction.cxx 
b/sc/source/ui/vba/vbawsfunction.cxx
index 42c5382cee08..350be038192b 100644
--- a/sc/source/ui/vba/vbawsfunction.cxx
+++ b/sc/source/ui/vba/vbawsfunction.cxx
@@ -136,7 +136,7 @@ ScVbaWSFunction::invoke(const OUString& FunctionName, const 
uno::Sequence< uno::
 bool bAsArray = true;
 
 // special handing for some functions that don't work correctly in 
FunctionAccess
-ScCompiler aCompiler( nullptr, ScAddress() );
+formula::FormulaCompiler aCompiler;
 OpCode eOpCode = aCompiler.GetEnglishOpCode( 
FunctionName.toAsciiUpperCase() );
 switch( eOpCode )
 {
@@ -251,11 +251,10 @@ ScVbaWSFunction::hasMethod(const OUString& Name)
 bool bIsFound = false;
 try
 {
-// the function name contained in the 
com.sun.star.sheet.FunctionDescription service is alwayse localized.
+// the function name contained in the 
com.sun.star.sheet.FunctionDescription service is alwayse localized.
 // but the function name used in WorksheetFunction is a programmatic 
name (seems English).
 // So m_xNameAccess->hasByName( Name ) may fail to find name when a 
function name has a localized name.
-ScCompiler aCompiler( nullptr, ScAddress() );
-if( aCompiler.IsEnglishSymbol( Name ) )
+if( ScCompiler::IsEnglishSymbol( Name ) )
 bIsFound = true;
 }
 catch( uno::Exception& /*e*/ )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 writerperfect/source/writer/exp/xmlimp.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fb4c53a1bbe57de93a92abc04736c0afdfd16170
Author: Miklos Vajna 
AuthorDate: Thu Sep 17 09:26:47 2020 +0200
Commit: Miklos Vajna 
CommitDate: Thu Sep 17 10:53:44 2020 +0200

writerperfect: make sure "own" header is the first one

So that we have a build-time check that the header is self-contained.

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

diff --git a/writerperfect/source/writer/exp/xmlimp.cxx 
b/writerperfect/source/writer/exp/xmlimp.cxx
index 009e1f590a9b..4654fde4204e 100644
--- a/writerperfect/source/writer/exp/xmlimp.cxx
+++ b/writerperfect/source/writer/exp/xmlimp.cxx
@@ -7,12 +7,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include "xmlimp.hxx"
+
 #include 
 
 #include 
 
-#include "xmlimp.hxx"
-
 #include 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/inc/tokenstringcontext.hxx  |2 +-
 sc/qa/unit/subsequent_export-test.cxx  |2 +-
 sc/qa/unit/ucalc_formula.cxx   |   14 +++---
 sc/source/core/data/column2.cxx|2 +-
 sc/source/core/data/formulacell.cxx|2 +-
 sc/source/core/tool/formulalogger.cxx  |2 +-
 sc/source/core/tool/tokenstringcontext.cxx |   17 +++--
 sc/source/filter/oox/formulabuffer.cxx |2 +-
 sc/source/ui/view/cellsh1.cxx  |2 +-
 9 files changed, 21 insertions(+), 24 deletions(-)

New commits:
commit f7df7a6efcc6fe31915e031e6dbab0ad8633ac48
Author: Caolán McNamara 
AuthorDate: Tue Sep 15 15:54:53 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 10:49:28 2020 +0200

TokenStringContext never called with a null ScDocument*

so we can drop the nullptr check

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

diff --git a/sc/inc/tokenstringcontext.hxx b/sc/inc/tokenstringcontext.hxx
index a29f26fc2515..34d9bc99b50f 100644
--- a/sc/inc/tokenstringcontext.hxx
+++ b/sc/inc/tokenstringcontext.hxx
@@ -43,7 +43,7 @@ struct SC_DLLPUBLIC TokenStringContext
 std::vector maExternalFileNames;
 IndexNamesMapType maExternalCachedTabNames;
 
-TokenStringContext( const ScDocument* pDoc, 
formula::FormulaGrammar::Grammar eGram );
+TokenStringContext( const ScDocument& rDoc, 
formula::FormulaGrammar::Grammar eGram );
 };
 
 class SC_DLLPUBLIC CompileFormulaContext
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 64ddcd550ef5..37e32930848d 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -3006,7 +3006,7 @@ void ScExportTest::testSharedFormulaExportXLS()
 {
 formula::FormulaGrammar::Grammar eGram = 
formula::FormulaGrammar::GRAM_ENGLISH_XL_R1C1;
 rDoc.SetGrammar(eGram);
-sc::TokenStringContext aCxt(&rDoc, eGram);
+sc::TokenStringContext aCxt(rDoc, eGram);
 
 // Check the title row.
 
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 08fe30987e7f..371692f01a56 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -174,7 +174,7 @@ void Test::testFormulaCreateStringFromTokens()
 };
 (void) aTests;
 
-sc::TokenStringContext aCxt(m_pDoc, formula::FormulaGrammar::GRAM_ENGLISH);
+sc::TokenStringContext aCxt(*m_pDoc, 
formula::FormulaGrammar::GRAM_ENGLISH);
 
 // Artificially add external reference data after the context object is
 // initialized.
@@ -3682,7 +3682,7 @@ void Test::testFormulaRefUpdateNameDeleteRow()
 const ScRangeData* pName = 
m_pDoc->GetRangeName()->findByUpperName("MYRANGE");
 CPPUNIT_ASSERT(pName);
 
-sc::TokenStringContext aCxt(m_pDoc, formula::FormulaGrammar::GRAM_ENGLISH);
+sc::TokenStringContext aCxt(*m_pDoc, 
formula::FormulaGrammar::GRAM_ENGLISH);
 const ScTokenArray* pCode = pName->GetCode();
 OUString aExpr = pCode->CreateString(aCxt, ScAddress(0,0,0));
 CPPUNIT_ASSERT_EQUAL(OUString("$B$2:$B$4"), aExpr);
@@ -3694,7 +3694,7 @@ void Test::testFormulaRefUpdateNameDeleteRow()
 const ScRangeData* pName2 = 
m_pDoc->GetRangeName()->findByUpperName("MYADDRESS");
 CPPUNIT_ASSERT(pName2);
 
-sc::TokenStringContext aCxt2(m_pDoc, 
formula::FormulaGrammar::GRAM_ENGLISH);
+sc::TokenStringContext aCxt2(*m_pDoc, 
formula::FormulaGrammar::GRAM_ENGLISH);
 const ScTokenArray* pCode2 = pName2->GetCode();
 OUString aExpr2 = pCode2->CreateString(aCxt2, ScAddress(0,0,0));
 CPPUNIT_ASSERT_EQUAL(OUString("$B$3"), aExpr2);
@@ -4175,7 +4175,7 @@ void Test::testFormulaRefUpdateNameDelete()
 
 m_pDoc->DeleteCol(1, 0, 3, 0, 0, 1);
 const ScTokenArray* pCode = pName->GetCode();
-sc::TokenStringContext aCxt(m_pDoc, formula::FormulaGrammar::GRAM_ENGLISH);
+sc::TokenStringContext aCxt(*m_pDoc, 
formula::FormulaGrammar::GRAM_ENGLISH);
 OUString aExpr = pCode->CreateString(aCxt, ScAddress(0,0,0));
 CPPUNIT_ASSERT_EQUAL(OUString("$Test.$B$1"), aExpr);
 
@@ -4312,7 +4312,7 @@ void Test::testTokenArrayRefUpdateMove()
 
 ScAddress aPos(0,0,0); // A1
 
-sc::TokenStringContext aCxt(m_pDoc, m_pDoc->GetGrammar());
+sc::TokenStringContext aCxt(*m_pDoc, m_pDoc->GetGrammar());
 
 // Emulate cell movement from Sheet1.C3 to Sheet2.C3.
 sc::RefUpdateContext aRefCxt(*m_pDoc);
@@ -8618,7 +8618,7 @@ void Test::testRefR1C1WholeCol()
 ScAddress aPos(1, 1, 1);
 ScCompiler aComp(m_pDoc, aPos, FormulaGrammar::GRAM_ENGLISH_XL_R1C1);
 std::unique_ptr pTokens(aComp.CompileString("=C[10]"));
-sc::TokenStringContext aCxt(m_pDoc, formula::FormulaGrammar::GRAM_ENGLISH);
+sc::TokenStringContext aCxt(*m_pDoc, 
formula::FormulaGrammar::GRAM_ENGLISH);
 OUString 

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

[Caolán McNamara (via logerrit)]

 sc/source/core/data/column2.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5774c6f4bb365a690049713307481d9a63aa20a6
Author: Caolán McNamara 
AuthorDate: Tue Sep 15 15:48:09 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 10:49:09 2020 +0200

ColumnStorageDumper ctor never called with null ScDocument*

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

diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index ef354cd943bf..8e209b65eeb1 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1661,9 +1661,9 @@ namespace {
 
 struct ColumnStorageDumper
 {
-const ScDocument* mpDoc;
+const ScDocument& mrDoc;
 
-ColumnStorageDumper( const ScDocument* pDoc ) : mpDoc(pDoc) {}
+ColumnStorageDumper( const ScDocument& rDoc ) : mrDoc(rDoc) {}
 
 void operator() (const sc::CellStoreType::value_type& rNode) const
 {
@@ -1732,7 +1732,7 @@ struct ColumnStorageDumper
 
 void printFormula(const ScFormulaCell* pCell) const
 {
-sc::TokenStringContext aCxt(mpDoc, mpDoc->GetGrammar());
+sc::TokenStringContext aCxt(&mrDoc, mrDoc.GetGrammar());
 OUString aFormula = pCell->GetCode()->CreateString(aCxt, pCell->aPos);
 cout << "  * formula: " << aFormula << endl;
 }
@@ -1773,7 +1773,7 @@ struct ColumnStorageDumper
 void ScColumn::DumpColumnStorage() const
 {
 cout << "-- table: " << nTab << "; column: " << nCol << endl;
-std::for_each(maCells.begin(), maCells.end(), 
ColumnStorageDumper(&GetDoc()));
+std::for_each(maCells.begin(), maCells.end(), 
ColumnStorageDumper(GetDoc()));
 cout << "--" << endl;
 }
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski (via logerrit)]

 vcl/inc/pdf/XmpMetadata.hxx   |3 ++
 vcl/source/gdi/pdfwriter_impl.cxx |   47 +-
 vcl/source/pdf/XmpMetadata.cxx|   15 
 3 files changed, 35 insertions(+), 30 deletions(-)

New commits:
commit 4684f8e09ac540a85b843b2306a9e9edeb8c17ec
Author: Jan-Marek Glogowski 
AuthorDate: Wed Sep 16 23:40:51 2020 +0200
Commit: Michael Stahl 
CommitDate: Thu Sep 17 10:47:14 2020 +0200

tdf#136805 PDF export: re-add XMP basic meta data

VeraPDF complains about:


  If a document information dictionary does appear
at a document, then all of its entries that have analogous
properties in predefined XMP schemas, shall also be embedded
in the file in XMP form with equivalent values.
  CosDocument
  doesInfoMatchXMP
  
root
  


The regressing commit dropped the XMP Basic schema meta data
(http://ns.adobe.com/xap/1.0/";). FWIW: xmp is the referred prefix,
so we'll continue to use it.

Regressed-by: d016e052ddf30649ad9b729b59134ce1e90a0263
Change-Id: I11b06fdafcb07732b92f0bd99b18afa3a9e498ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102888
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 06e35b3289090ec623fe5284976ee6f40681e1d5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102771
Reviewed-by: Michael Stahl 

diff --git a/vcl/inc/pdf/XmpMetadata.hxx b/vcl/inc/pdf/XmpMetadata.hxx
index cc3f8da1a34c..61438e0e50b8 100644
--- a/vcl/inc/pdf/XmpMetadata.hxx
+++ b/vcl/inc/pdf/XmpMetadata.hxx
@@ -30,6 +30,9 @@ public:
 OString msSubject;
 OString msProducer;
 OString msKeywords;
+OString m_sCreatorTool;
+OString m_sCreateDate;
+
 sal_Int32 mnPDF_A;
 bool mbPDF_UA;
 
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 03553d7aa6ee..7e02762d6e36 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -5122,6 +5122,16 @@ static void escapeStringXML( const OUString& rStr, 
OUString &rValue)
 }
 }
 
+static void lcl_assignMeta(const OUString& aValue, OString& aMeta)
+{
+if (!aValue.isEmpty())
+{
+OUString aTempString;
+escapeStringXML(aValue, aTempString);
+aMeta = OUStringToOString(aTempString, RTL_TEXTENCODING_UTF8);
+}
+}
+
 // emits the document metadata
 sal_Int32 PDFWriterImpl::emitDocumentMetadata()
 {
@@ -5144,36 +5154,13 @@ sal_Int32 PDFWriterImpl::emitDocumentMetadata()
 
 aMetadata.mbPDF_UA = m_bIsPDF_UA;
 
-if (!m_aContext.DocumentInfo.Title.isEmpty())
-{
-OUString aTempString;
-escapeStringXML(m_aContext.DocumentInfo.Title, aTempString);
-aMetadata.msTitle = OUStringToOString(aTempString, 
RTL_TEXTENCODING_UTF8);
-}
-if (!m_aContext.DocumentInfo.Author.isEmpty())
-{
-OUString aTempString;
-escapeStringXML(m_aContext.DocumentInfo.Author, aTempString);
-aMetadata.msAuthor = OUStringToOString(aTempString, 
RTL_TEXTENCODING_UTF8);
-}
-if (!m_aContext.DocumentInfo.Subject.isEmpty())
-{
-OUString aTempString;
-escapeStringXML(m_aContext.DocumentInfo.Subject, aTempString);
-aMetadata.msSubject = OUStringToOString(aTempString, 
RTL_TEXTENCODING_UTF8);
-}
-if (!m_aContext.DocumentInfo.Producer.isEmpty())
-{
-OUString aTempString;
-escapeStringXML(m_aContext.DocumentInfo.Producer, aTempString);
-aMetadata.msProducer = OUStringToOString(aTempString, 
RTL_TEXTENCODING_UTF8);
-}
-if (!m_aContext.DocumentInfo.Keywords.isEmpty())
-{
-OUString aTempString;
-escapeStringXML(m_aContext.DocumentInfo.Keywords, aTempString);
-aMetadata.msKeywords = OUStringToOString(aTempString, 
RTL_TEXTENCODING_UTF8);
-}
+lcl_assignMeta(m_aContext.DocumentInfo.Title, aMetadata.msTitle);
+lcl_assignMeta(m_aContext.DocumentInfo.Author, aMetadata.msAuthor);
+lcl_assignMeta(m_aContext.DocumentInfo.Subject, aMetadata.msSubject);
+lcl_assignMeta(m_aContext.DocumentInfo.Producer, aMetadata.msProducer);
+lcl_assignMeta(m_aContext.DocumentInfo.Keywords, aMetadata.msKeywords);
+lcl_assignMeta(m_aContext.DocumentInfo.Creator, 
aMetadata.m_sCreatorTool);
+aMetadata.m_sCreateDate = m_aCreationMetaDateString;
 
 OStringBuffer aMetadataObj( 1024 );
 
diff --git a/vcl/source/pdf/XmpMetadata.cxx b/vcl/source/pdf/XmpMetadata.cxx
index 281183c205e8..70588dab31cd 100644
--- a/vcl/source/pdf/XmpMetadata.cxx
+++ b/vcl/source/pdf/XmpMetadata.cxx
@@ -143,6 +143,21 @@ void XmpMetadata::write()
 }
 aXmlWriter.endElement();
 }
+
+aXmlWriter.startElement("rdf:Description");
+aXmlWriter.attribute("rdf:a

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/odfexport/data/tdf129520.docx |binary
 sw/qa/extras/odfexport/odfexport.cxx   |   12 
 2 files changed, 12 insertions(+)

New commits:
commit d8ca58f46a99d4502f75ce8177b09d2841ce3489
Author: Xisco Fauli 
AuthorDate: Wed Sep 16 19:11:02 2020 +0200
Commit: Xisco Fauli 
CommitDate: Thu Sep 17 10:41:22 2020 +0200

tdf#129520 : sw_odfexport: Add unittest

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

diff --git a/sw/qa/extras/odfexport/data/tdf129520.docx 
b/sw/qa/extras/odfexport/data/tdf129520.docx
new file mode 100644
index ..4f74826ada5c
Binary files /dev/null and b/sw/qa/extras/odfexport/data/tdf129520.docx differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index bf7b02e13704..264edddea196 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -1620,6 +1620,18 @@ DECLARE_ODFEXPORT_TEST(testBtlrFrame, "btlr-frame.odt")
 CPPUNIT_ASSERT(!pFlyFrame->IsVertLRBT());
 }
 
+DECLARE_ODFEXPORT_TEST(testTdf129520, "tdf129520.docx")
+{
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+CPPUNIT_ASSERT_EQUAL(OUString("M"), getParagraph(1)->getString());
+
+// Without this fix in place, this test would have failed with
+// - Expected: Ma
+// - Actual  :
+CPPUNIT_ASSERT_EQUAL(OUString("Ma"), getParagraph(2)->getString());
+CPPUNIT_ASSERT_EQUAL(OUString("1815"), getParagraph(3)->getString());
+}
+
 DECLARE_ODFEXPORT_TEST(testFdo86963, "fdo86963.odt")
 {
 CPPUNIT_ASSERT_EQUAL(1, getPages());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - ios/Mobile

[Tor Lillqvist (via logerrit)]

 ios/Mobile/DocumentViewController.mm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit da9d108bef8793f4e08a52263abb9d66dc97b8b9
Author: Tor Lillqvist 
AuthorDate: Wed Sep 16 16:07:17 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Thu Sep 17 11:17:03 2020 +0300

Unconditionally print any debug messages posted from the JS

We don't have any such messages permanently in the code anyway, so we
don't win anything by doing it through the LOOL loggin mechanism at
level "trace".

Change-Id: I2c18e1cd561f797d2c4c20b403d5faedce695062

diff --git a/ios/Mobile/DocumentViewController.mm 
b/ios/Mobile/DocumentViewController.mm
index eab598c2a..7dbf181ee 100644
--- a/ios/Mobile/DocumentViewController.mm
+++ b/ios/Mobile/DocumentViewController.mm
@@ -284,7 +284,7 @@ static IMP standardImpOfInputAccessoryView = nil;
 if ([message.name isEqualToString:@"error"]) {
 LOG_ERR("Error from WebView: " << [message.body UTF8String]);
 } else if ([message.name isEqualToString:@"debug"]) {
-LOG_TRC_NOFILE("==> " << [message.body UTF8String]);
+std::cerr << "==> " << [message.body UTF8String] << std::endl;
 } else if ([message.name isEqualToString:@"lool"]) {
 NSString *subBody = [message.body substringToIndex:std::min(100ul, 
((NSString*)message.body).length)];
 if (subBody.length < ((NSString*)message.body).length)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/inc/reftokenhelper.hxx |2 +-
 sc/source/core/tool/reftokenhelper.cxx|   12 ++--
 sc/source/filter/xml/XMLTableShapeResizer.cxx |2 +-
 sc/source/ui/unoobj/chart2uno.cxx |   14 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit cded40e436340163fd537946749019b68800be4d
Author: Caolán McNamara 
AuthorDate: Tue Sep 15 15:36:46 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 09:41:42 2020 +0200

compileRangeRepresentation never called with null ScDocument*

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

diff --git a/sc/inc/reftokenhelper.hxx b/sc/inc/reftokenhelper.hxx
index a63d882011d7..c8ba9acca9b0 100644
--- a/sc/inc/reftokenhelper.hxx
+++ b/sc/inc/reftokenhelper.hxx
@@ -37,7 +37,7 @@ namespace ScRefTokenHelper
  * The source range may consist of multiple ranges separated by ';'s.
  */
 void compileRangeRepresentation(
-::std::vector& rRefTokens, const OUString& rRangeStr, 
ScDocument* pDoc,
+::std::vector& rRefTokens, const OUString& rRangeStr, 
ScDocument& rDoc,
 const sal_Unicode cSep, ::formula::FormulaGrammar::Grammar eGrammar, 
bool bOnly3DRef = false);
 
 bool getRangeFromToken(const ScDocument* pDoc, ScRange& rRange, const 
ScTokenRef& pToken, const ScAddress& rPos, bool bExternal = false);
diff --git a/sc/source/core/tool/reftokenhelper.cxx 
b/sc/source/core/tool/reftokenhelper.cxx
index bddb458f5004..a1ae5510e2d3 100644
--- a/sc/source/core/tool/reftokenhelper.cxx
+++ b/sc/source/core/tool/reftokenhelper.cxx
@@ -34,7 +34,7 @@ using namespace formula;
 using ::std::vector;
 
 void ScRefTokenHelper::compileRangeRepresentation(
-vector& rRefTokens, const OUString& rRangeStr, ScDocument* 
pDoc,
+vector& rRefTokens, const OUString& rRangeStr, ScDocument& 
rDoc,
 const sal_Unicode cSep, FormulaGrammar::Grammar eGrammar, bool bOnly3DRef)
 {
 // #i107275# ignore parentheses
@@ -51,7 +51,7 @@ void ScRefTokenHelper::compileRangeRepresentation(
 if (nOffset < 0)
 break;
 
-ScCompiler aCompiler(pDoc, ScAddress(0,0,0), eGrammar);
+ScCompiler aCompiler(&rDoc, ScAddress(0,0,0), eGrammar);
 std::unique_ptr pArray(aCompiler.CompileString(aToken));
 
 // There MUST be exactly one reference per range token and nothing
@@ -77,7 +77,7 @@ void ScRefTokenHelper::compileRangeRepresentation(
 case svSingleRef:
 {
 const ScSingleRefData& rRef = *p->GetSingleRef();
-if (!rRef.Valid(pDoc))
+if (!rRef.Valid(&rDoc))
 bFailure = true;
 else if (bOnly3DRef && !rRef.IsFlag3D())
 bFailure = true;
@@ -86,7 +86,7 @@ void ScRefTokenHelper::compileRangeRepresentation(
 case svDoubleRef:
 {
 const ScComplexRefData& rRef = *p->GetDoubleRef();
-if (!rRef.Valid(pDoc))
+if (!rRef.Valid(&rDoc))
 bFailure = true;
 else if (bOnly3DRef && !rRef.Ref1.IsFlag3D())
 bFailure = true;
@@ -94,13 +94,13 @@ void ScRefTokenHelper::compileRangeRepresentation(
 break;
 case svExternalSingleRef:
 {
-if (!p->GetSingleRef()->ValidExternal(pDoc))
+if (!p->GetSingleRef()->ValidExternal(&rDoc))
 bFailure = true;
 }
 break;
 case svExternalDoubleRef:
 {
-if (!p->GetDoubleRef()->ValidExternal(pDoc))
+if (!p->GetDoubleRef()->ValidExternal(&rDoc))
 bFailure = true;
 }
 break;
diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx 
b/sc/source/filter/xml/XMLTableShapeResizer.cxx
index bac71f2ab82d..84bc25588cdd 100644
--- a/sc/source/filter/xml/XMLTableShapeResizer.cxx
+++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx
@@ -84,7 +84,7 @@ void ScMyOLEFixer::CreateChartListener(ScDocument* pDoc,
 unique_ptr< vector > pRefTokens(new vector);
 const sal_Unicode cSep = ScCompiler::GetNativeSymbolChar(ocSep);
 ScRefTokenHelper::compileRangeRepresentation(
-*pRefTokens, aRangeStr, pDoc, cSep, pDoc->GetGrammar());
+*pRefTokens, aRangeStr, *pDoc, cSep, pDoc->GetGrammar());
 if (pRefTokens->empty())
 return;
 
diff --git a/sc/source/ui/unoobj/chart2uno.cxx 
b/sc/source/ui/unoobj/chart2uno.cxx
index 8b13cbc19304..75593140747d 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -1001,7 +1001,7 @@ sal_Bool SAL_CALL 
ScChart2DataProvider::createDataSourcePossible( const uno::Seq

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

[Caolán McNamara (via logerrit)]

 sc/inc/formulacell.hxx|   10 
 sc/source/core/data/colorscale.cxx|   10 
 sc/source/core/data/formulacell.cxx   |  504 +-
 sc/source/core/tool/cellform.cxx  |4 
 sc/source/core/tool/chgtrack.cxx  |2 
 sc/source/core/tool/sharedformula.cxx |8 
 6 files changed, 269 insertions(+), 269 deletions(-)

New commits:
commit fd5470a12a33683a69cc580b6f6e297fbec45245
Author: Caolán McNamara 
AuthorDate: Tue Sep 15 15:18:02 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 09:41:23 2020 +0200

ScFormulaCell always has a ScDocument&

allowing us to drop some checks of it against null

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

diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 778de268aaf6..68176a37cd5b 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -131,7 +131,7 @@ private:
 // If this cell is in a cell group (mxGroup!=nullptr), then this pCode is 
a not-owning pointer
 // to the mxGroup's mpCode, which owns the array. If the cell is not in a 
group, this is an owning pointer.
 ScTokenArray*   pCode;  // The token array
-ScDocument* pDocument;
+ScDocument& rDocument;
 ScFormulaCell*  pPrevious;
 ScFormulaCell*  pNext;
 ScFormulaCell*  pPreviousTrack;
@@ -230,7 +230,7 @@ public:
 
 bool IsDirtyOrInTableOpDirty() const
 {
-return bDirty || (bTableOpDirty && 
pDocument->IsInInterpreterTableOp());
+return bDirty || (bTableOpDirty && rDocument.IsInInterpreterTableOp());
 }
 
 bool GetDirty() const { return bDirty; }
@@ -363,7 +363,7 @@ public:
 virtual void Query( SvtListener::QueryBase& rQuery ) const override;
 
 void SetCompile( bool bVal );
-ScDocument* GetDocument() const { return pDocument;}
+ScDocument& GetDocument() const { return rDocument;}
 voidSetMatColsRows( SCCOL nCols, SCROW nRows );
 voidGetMatColsRows( SCCOL& nCols, SCROW& nRows ) const;
 
@@ -434,14 +434,14 @@ public:
 if (!IsDirtyOrInTableOpDirty())
 return false;
 
-return (pDocument->GetAutoCalc() || (cMatrixFlag != 
ScMatrixMode::NONE));
+return (rDocument.GetAutoCalc() || (cMatrixFlag != 
ScMatrixMode::NONE));
 }
 
 bool MaybeInterpret()
 {
 if (NeedsInterpret())
 {
-assert(!pDocument->IsThreadedGroupCalcInProgress());
+assert(!rDocument.IsThreadedGroupCalcInProgress());
 Interpret();
 return true;
 }
diff --git a/sc/source/core/data/colorscale.cxx 
b/sc/source/core/data/colorscale.cxx
index 5287ecfdf397..f12220ce110e 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -26,7 +26,7 @@
 
 ScFormulaListener::ScFormulaListener(ScFormulaCell* pCell):
 mbDirty(false),
-mrDoc(*pCell->GetDocument())
+mrDoc(pCell->GetDocument())
 {
 startListening( pCell->GetCode(), pCell->aPos );
 }
@@ -174,8 +174,8 @@ ScColorScaleEntry::ScColorScaleEntry(const 
ScColorScaleEntry& rEntry):
 setListener();
 if(rEntry.mpCell)
 {
-mpCell.reset(new ScFormulaCell(*rEntry.mpCell, 
*rEntry.mpCell->GetDocument(), rEntry.mpCell->aPos, 
ScCloneFlags::NoMakeAbsExternal));
-mpCell->StartListeningTo( *mpCell->GetDocument() );
+mpCell.reset(new ScFormulaCell(*rEntry.mpCell, 
rEntry.mpCell->GetDocument(), rEntry.mpCell->aPos, 
ScCloneFlags::NoMakeAbsExternal));
+mpCell->StartListeningTo(mpCell->GetDocument());
 mpListener.reset(new ScFormulaListener(mpCell.get()));
 }
 }
@@ -190,7 +190,7 @@ ScColorScaleEntry::ScColorScaleEntry(ScDocument* pDoc, 
const ScColorScaleEntry&
 setListener();
 if(rEntry.mpCell)
 {
-mpCell.reset(new ScFormulaCell(*rEntry.mpCell, 
*rEntry.mpCell->GetDocument(), rEntry.mpCell->aPos, 
ScCloneFlags::NoMakeAbsExternal));
+mpCell.reset(new ScFormulaCell(*rEntry.mpCell, 
rEntry.mpCell->GetDocument(), rEntry.mpCell->aPos, 
ScCloneFlags::NoMakeAbsExternal));
 mpCell->StartListeningTo( *pDoc );
 mpListener.reset(new ScFormulaListener(mpCell.get()));
 if (mpFormat)
@@ -201,7 +201,7 @@ ScColorScaleEntry::ScColorScaleEntry(ScDocument* pDoc, 
const ScColorScaleEntry&
 ScColorScaleEntry::~ScColorScaleEntry() COVERITY_NOEXCEPT_FALSE
 {
 if(mpCell)
-mpCell->EndListeningTo(*mpCell->GetDocument());
+mpCell->EndListeningTo(mpCell->GetDocument());
 }
 
 void ScColorScaleEntry::SetFormula( const OUString& rFormula, ScDocument& 
rDoc, const ScAddress& rAddr, formula::FormulaGrammar::Grammar eGrammar )
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index 30442b6d2337..915a0468b242 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/c

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

[Caolán McNamara (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter.cxx  |   14 +-
 sw/qa/extras/uiwriter/uiwriter3.cxx |  200 +++-
 2 files changed, 166 insertions(+), 48 deletions(-)

New commits:
commit 9d08a0cea018226ce155104d8df146dc2a412aac
Author: Caolán McNamara 
AuthorDate: Wed Sep 16 13:19:11 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 17 09:40:31 2020 +0200

avoid uno:Paste in tests

clipboard is a shared resource (except for svp) so interleaved
tests are not guaranteed to get out what they put in

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

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 34fd549c9948..d74def305a0b 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1020,7 +1020,7 @@ void SwUiWriterTest::testExportRTF()
 pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/true, 3, 
/*bBasicCall=*/false);
 
 // Create the clipboard document.
-auto xClpDoc = o3tl::make_shared();
+rtl::Reference xClpDoc(new SwDoc());
 xClpDoc->SetClipBoard(true);
 pWrtShell->Copy(xClpDoc.get());
 
@@ -1308,8 +1308,16 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testTdf134250)
 dispatchCommand(mxComponent, ".uno:SelectAll", {});
 dispatchCommand(mxComponent, ".uno:SelectAll", {});
 dispatchCommand(mxComponent, ".uno:SelectAll", {});
-dispatchCommand(mxComponent, ".uno:Copy", {});
-dispatchCommand(mxComponent, ".uno:Paste", {});
+
+// .uno:Copy without touching shared clipboard
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+rtl::Reference xTransfer = new SwTransferable(*pWrtShell);
+xTransfer->Copy();
+
+// .uno:Paste without touching shared clipboard
+TransferableDataHelper aHelper(xTransfer.get());
+SwTransferable::Paste(*pWrtShell, aHelper);
+
 Scheduler::ProcessEventsToIdle();
 
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 5cfe6beb3aa4..1474e89a67b9 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -18,9 +18,10 @@
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -48,11 +49,19 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf129382)
 
 CPPUNIT_ASSERT_EQUAL(8, getShapes());
 CPPUNIT_ASSERT_EQUAL(2, getPages());
+
 dispatchCommand(mxComponent, ".uno:SelectAll", {});
-dispatchCommand(mxComponent, ".uno:Cut", {});
+
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+rtl::Reference xTransfer = new SwTransferable(*pWrtShell);
+xTransfer->Cut();
+
 CPPUNIT_ASSERT_EQUAL(3, getShapes());
 CPPUNIT_ASSERT_EQUAL(1, getPages());
-dispatchCommand(mxComponent, ".uno:Paste", {});
+
+TransferableDataHelper aHelper(xTransfer.get());
+SwTransferable::Paste(*pWrtShell, aHelper);
+
 CPPUNIT_ASSERT_EQUAL(8, getShapes());
 CPPUNIT_ASSERT_EQUAL(2, getPages());
 dispatchCommand(mxComponent, ".uno:Undo", {});
@@ -74,10 +83,18 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf135412)
 CPPUNIT_ASSERT_EQUAL(4, getShapes());
 uno::Reference xShape(getShape(1), uno::UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL(OUString("X"), xShape->getString());
+
 dispatchCommand(mxComponent, ".uno:SelectAll", {});
-dispatchCommand(mxComponent, ".uno:Cut", {});
+
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+rtl::Reference xTransfer = new SwTransferable(*pWrtShell);
+xTransfer->Cut();
+
 CPPUNIT_ASSERT_EQUAL(0, getShapes());
-dispatchCommand(mxComponent, ".uno:Paste", {});
+
+TransferableDataHelper aHelper(xTransfer.get());
+SwTransferable::Paste(*pWrtShell, aHelper);
+
 CPPUNIT_ASSERT_EQUAL(4, getShapes());
 
 // Without the fix in place, the text in the shape wouldn't be pasted
@@ -107,18 +124,24 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132911)
 CPPUNIT_ASSERT_EQUAL(4, getShapes());
 
 dispatchCommand(mxComponent, ".uno:SelectAll", {});
-dispatchCommand(mxComponent, ".uno:Cut", {});
+
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+rtl::Reference xTransfer = new SwTransferable(*pWrtShell);
+xTransfer->Cut();
 Scheduler::ProcessEventsToIdle();
+
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount());
 CPPUNIT_ASSERT_EQUAL(0, getShapes());
 
-dispatchCommand(mxComponent, ".uno:Paste", {});
+TransferableDataHelper aHelper(xTransfer.get());
+SwTransferable::Paste(*pWrtShell, aHelper);
 Scheduler::ProcessEventsToIdle();
+
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
 CPPUNIT_ASSERT_EQUAL(4, getShapes());
 
 // Without the fix in place, it would have crashed 

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

[Stephan Bergmann (via logerrit)]

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

New commits:
commit 2e25b8c814b23ffb2904c2ad0866aeeb23b0f1fa
Author: Stephan Bergmann 
AuthorDate: Thu Sep 17 08:26:46 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Sep 17 09:29:27 2020 +0200

Report each value of LO_TEST_LOCALE in localized CppunitTest

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

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index a287fc513aa3..1c0e8d3dfe93 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -124,7 +124,8 @@ else
$(if $(value gb_CppunitTest_postprocess), \
rm -fr $@.core && mkdir $@.core && cd $@.core 
&&)) \
{ \
-   $(if $(gb_CppunitTest_localized),for l in $(WITH_LANG_LIST) ; 
do LO_TEST_LOCALE="$$l" ) \
+   $(if $(gb_CppunitTest_localized),for l in $(WITH_LANG_LIST) ; 
do \
+   printf 'LO_TEST_LOCALE=%s\n' "$$l" && 
LO_TEST_LOCALE="$$l" ) \
$(if 
$(gb_CppunitTest_PREGDBTRACE),$(gb_CppunitTest_PREGDBTRACE) &&) \
$(if $(gb_CppunitTest__vcl_no_svp), \
$(filter-out 
SAL_USE_VCLPLUGIN=svp,$(gb_TEST_ENV_VARS)),$(gb_TEST_ENV_VARS)) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski (via logerrit)]

 basic/source/runtime/dllmgr.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b25aa1cd813478f1cb08bf4f2a79ed83852a33e9
Author: Jan-Marek Glogowski 
AuthorDate: Sat Sep 12 18:17:08 2020 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Thu Sep 17 09:24:32 2020 +0200

basic: use dummy DLL mgr for Windows Arm64 build

This will need a real implementation to do system calls, but for
the initial compilation the dummy is sufficient.

Change-Id: Ia16e47fdb8fbf4855f7c5abb0d36d9c922cd1de7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102860
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx
index 08927843a98d..368fa3d10a2f 100644
--- a/basic/source/runtime/dllmgr.hxx
+++ b/basic/source/runtime/dllmgr.hxx
@@ -42,7 +42,7 @@ public:
 void FreeDll(OUString const & library);
 
 private:
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(_ARM64_)
 struct Impl;
 
 std::unique_ptr< Impl > impl_;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: kit/ChildSession.hpp kit/Kit.cpp test/WhiteBoxTests.cpp

[Miklos Vajna (via logerrit)]

 kit/ChildSession.hpp   |2 +-
 kit/Kit.cpp|2 +-
 test/WhiteBoxTests.cpp |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 07629f0d7cc628ffbeeaafbddbe021eb6496b3ab
Author: Miklos Vajna 
AuthorDate: Thu Sep 17 08:57:18 2020 +0200
Commit: Miklos Vajna 
CommitDate: Thu Sep 17 09:24:44 2020 +0200

Mark getMobileAppDocId() as const

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

diff --git a/kit/ChildSession.hpp b/kit/ChildSession.hpp
index 3b6226d8f..c828fcce2 100644
--- a/kit/ChildSession.hpp
+++ b/kit/ChildSession.hpp
@@ -72,7 +72,7 @@ public:
 
 virtual void alertAllUsers(const std::string& cmd, const std::string& 
kind) = 0;
 
-virtual unsigned getMobileAppDocId() = 0;
+virtual unsigned getMobileAppDocId() const = 0;
 };
 
 struct RecordedEvent
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index c955a3339..a68b40e1d 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -708,7 +708,7 @@ public:
 alertAllUsers("errortoall: cmd=" + cmd + " kind=" + kind);
 }
 
-unsigned getMobileAppDocId() override
+unsigned getMobileAppDocId() const override
 {
 return _mobileAppDocId;
 }
diff --git a/test/WhiteBoxTests.cpp b/test/WhiteBoxTests.cpp
index 1982f328a..445a7134a 100644
--- a/test/WhiteBoxTests.cpp
+++ b/test/WhiteBoxTests.cpp
@@ -666,7 +666,7 @@ public:
 {
 }
 
-unsigned getMobileAppDocId() override
+unsigned getMobileAppDocId() const override
 {
 return 0;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski (via logerrit)]

 jvmfwk/inc/vendorbase.hxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 451f346d0b918dcc83c3209deab7ff3ed0aa4ee9
Author: Jan-Marek Glogowski 
AuthorDate: Mon Aug 3 07:08:56 2020 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Thu Sep 17 09:24:12 2020 +0200

jvmfwk: add vendorbase entry for Windows Arm64

Change-Id: Iea89befded02ecfd7513cc3d8f116dd6ac2913be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102859
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/jvmfwk/inc/vendorbase.hxx b/jvmfwk/inc/vendorbase.hxx
index df536bc3477e..7e98a2409c35 100644
--- a/jvmfwk/inc/vendorbase.hxx
+++ b/jvmfwk/inc/vendorbase.hxx
@@ -39,6 +39,8 @@ namespace jfw_plugin
 #define JFW_PLUGIN_ARCH "sparc"
 #elif defined X86_64
 #define JFW_PLUGIN_ARCH "amd64"
+#elif defined ARM64
+#define JFW_PLUGIN_ARCH "arm64"
 #elif defined INTEL
 #define JFW_PLUGIN_ARCH "i386"
 #elif defined POWERPC64
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cli_ure/Module_cli_ure.mk Repository.mk scp2/source unoil/Module_unoil.mk

[Jan-Marek Glogowski (via logerrit)]

 Repository.mk|2 +-
 cli_ure/Module_cli_ure.mk|2 ++
 scp2/source/ooo/file_library_ooo.scp |9 +
 scp2/source/ooo/ure.scp  |2 +-
 unoil/Module_unoil.mk|2 ++
 5 files changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 26372c9ad0c11a1cfa23d151af6dda5a4604a9c4
Author: Jan-Marek Glogowski 
AuthorDate: Mon Aug 3 07:06:36 2020 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Thu Sep 17 09:23:55 2020 +0200

cli_ure: Disable .NET for Windows Arm64 build

The current .NET 5.0 Arm64 preview doesn't have a mscoree.lib,
so linking the climaker isn't possible.

Change-Id: Ibbac88aa465a9ca2eb8fb0efaad91d20f358229b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102858
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/Repository.mk b/Repository.mk
index dbb628f2a6b3..06f8588e2a19 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -546,7 +546,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
 
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
affine_uno_uno \
-   $(if $(filter MSC,$(COM)),cli_uno) \
+   $(if $(filter MSC,$(COM)),$(if $(filter-out ARM64,$(CPUNAME)),cli_uno)) 
\
i18nlangtag \
$(if $(ENABLE_JAVA), \
java_uno \
diff --git a/cli_ure/Module_cli_ure.mk b/cli_ure/Module_cli_ure.mk
index d1ff09073a18..91863abb59c9 100644
--- a/cli_ure/Module_cli_ure.mk
+++ b/cli_ure/Module_cli_ure.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_Module_Module,cli_ure))
 
 ifeq ($(COM),MSC)
+ifneq ($(CPUNAME),ARM64)
 $(eval $(call gb_Module_add_targets,cli_ure,\
CliLibrary_cli_basetypes \
CliLibrary_cli_ure \
@@ -22,5 +23,6 @@ $(eval $(call gb_Module_add_targets,cli_ure,\
Package_cli_basetypes_copy \
 ))
 endif
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 350b0363a763..f1ddc7c62977 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -26,7 +26,7 @@
  /
 #include "macros.inc"
 
-#if defined _MSC_VER
+#if defined _MSC_VER && ! defined _ARM64_
 
 File gid_File_Lib_Cli_Oootypes_Assembly
 TXT_FILE_BODY;
@@ -41,9 +41,6 @@ File gid_File_Lib_Cli_Oootypes_Assembly
 ProcessorArchitecture = "MSIL";
 End
 
-#endif
-
-#if defined _MSC_VER
 File gid_File_Lib_Policy_Cli_Oootypes_Assembly
 TXT_FILE_BODY;
 Styles = (PACKED, ASSEMBLY);
@@ -57,10 +54,6 @@ File gid_File_Lib_Policy_Cli_Oootypes_Assembly
 ProcessorArchitecture = "MSIL";
 End
 
-#endif
-
-#if defined _MSC_VER
-
 File gid_File_Lib_Policy_Cli_Oootypes_Config
 TXT_FILE_BODY;
 Styles = (PACKED, ASSIGNCOMPONENT);
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 09109ebc41e6..30e06e4942f9 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -81,7 +81,7 @@ End
 
 // Private Dynamic Libraries:
 
-#if defined _MSC_VER
+#if defined _MSC_VER && ! defined _ARM64_
 File gid_File_Dl_Cli_Ure_Assembly
 TXT_FILE_BODY;
 Styles = (PACKED, ASSEMBLY);
diff --git a/unoil/Module_unoil.mk b/unoil/Module_unoil.mk
index 5977368f2dab..6b1cb5fd064f 100644
--- a/unoil/Module_unoil.mk
+++ b/unoil/Module_unoil.mk
@@ -17,9 +17,11 @@ $(eval $(call gb_Module_add_targets,unoil,\
 endif
 
 ifeq ($(COM),MSC)
+ifneq ($(CPUNAME),ARM64)
 $(eval $(call gb_Module_add_targets,unoil,\
 CliUnoApi_oootypes \
 ))
 endif
+endif
 
 # vim:set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: compiling Libreoffice online android doesn't display document.

[Miklos Vajna]

Hi Michael,

On Wed, Sep 16, 2020 at 01:12:19PM +0200, Michael Weghorn  
wrote:
> (Maybe somebody else can say more on whether including all services into
> liblo-native-code that are required to support all file formats that
> LibreOffice supports is fine or would be problematic, e.g. for APK
> size,...).

My understanding is that there is no automated way to find out which
services are needed to support import of exotic file formats, so
addition / removal of such UNO service ctors have to be considered on a
case by case basis.

It's always a good idea to document (in the commit message) what is
fixed when adding a new one. Removing ctors reduces code size.

Regards,

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

Re: ESC meeting agenda: 2020-09-17 16:00 Berlin time

[Miklos Vajna]

Hi Julien,

On Wed, Sep 16, 2020 at 11:43:04PM -0700, julien2412  
wrote:
> I don't know if it must be indicated in the ESC because it's public API
> change but, just for information, I remove unused and deprecated
> sal_Char/sal_sChar/sal_uChar from include/sal/types.h. (see
> http://document-foundation-mail-archive.969070.n3.nabble.com/About-removing-long-time-deprecated-types-from-public-API-tt4287268.html)

I've added it to the agenda so that more people are aware, why not.

Regards,

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