Re: "GpgME not installed correctly" in unit tests

[Jan-Marek Glogowski]

Hi Mike,

Am October 17, 2018 5:52:18 AM UTC schrieb Kaganski Mike 
:
>While doing make check on my Windows box with gpg4win 
>(default-installed, but not configured), I get these dialog boxes 
>popping up a dozen of times, e.g. in test_xmlsecurity_pdfsigning or 
>test_sw_odfexport:
>
>---
>GpgME not installed correctly
>---
>gpgme-w32spawn.exe was not found in the detected installation directory
>
>of GpgME
>   "C:\lo\src\core\workdir\LinkTarget\Executable"
>
>Crypto operations will not work.
>
>If you see this it indicates a problem with your installation.
>Please report the problem to your distributor of GpgME.
>
>Developer's Note: The install dir can be manually set with: 
>gpgme_set_global_flag
>
>What is missing in the build process to avoid the problem? I believe 
>that there should not be requirement to explicitly configure anything 
>here to avoid these errors in the middle of the build process; if 
>required, the checks/errors/suggestions must be in autogen.sh phase?

I also see these popups since I installed a local gpg4win some weeks ago. Tried 
--with-system-gpgme, but this didn't build for me at all.
Should be handled by configure.ac automatically.

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

[Libreoffice-commits] core.git: 2 commits - accessibility/inc accessibility/source chart2/source compilerplugins/clang connectivity/source cppcanvas/source editeng/source emfio/source filter/source in

[Libreoffice Gerrit user]

 accessibility/inc/standard/vclxaccessiblebox.hxx   |6 
 accessibility/source/standard/vclxaccessiblebox.cxx|   11 
 chart2/source/controller/dialogs/dlg_CreationWizard.cxx|9 
 chart2/source/controller/inc/SeriesOptionsItemConverter.hxx|1 
 chart2/source/controller/inc/dlg_CreationWizard.hxx|2 
 chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx |3 
 chart2/source/view/charttypes/BubbleChart.cxx  |3 
 chart2/source/view/charttypes/BubbleChart.hxx  |2 
 compilerplugins/clang/singlevalfields.cxx  |   37 +
 compilerplugins/clang/singlevalfields.results  |  333 
--
 compilerplugins/clang/staticvar.cxx|  204 
++
 compilerplugins/clang/test/staticvar.cxx   |   80 
++
 compilerplugins/clang/unusedfields.cxx |2 
 connectivity/source/drivers/mork/MConnection.cxx   |   10 
 connectivity/source/drivers/mork/MErrorResource.hxx|6 
 cppcanvas/source/mtfrenderer/emfpregion.cxx|4 
 cppcanvas/source/mtfrenderer/emfpregion.hxx|1 
 editeng/source/misc/svxacorr.cxx   |   16 
 emfio/source/reader/mtftools.cxx   |3 
 filter/source/graphicfilter/icgm/cgm.cxx   |   19 
 filter/source/graphicfilter/icgm/cgm.hxx   |2 
 filter/source/graphicfilter/icgm/class1.cxx|   12 
 filter/source/graphicfilter/icgm/elements.cxx  |2 
 filter/source/graphicfilter/icgm/elements.hxx  |1 
 filter/source/graphicfilter/idxf/dxf2mtf.cxx   |3 
 filter/source/graphicfilter/idxf/dxfvec.cxx|2 
 filter/source/graphicfilter/idxf/dxfvec.hxx|2 
 include/editeng/svxacorr.hxx   |3 
 include/svtools/ctrlbox.hxx|   13 
 include/tools/b3dtrans.hxx |4 
 linguistic/source/dlistimp.cxx |   13 
 sc/source/filter/excel/excform.cxx |   12 
 sc/source/filter/excel/excform8.cxx|   18 
 sc/source/filter/excel/frmbase.cxx |4 
 sc/source/filter/inc/formel.hxx|1 
 sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx  |   16 
 sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx  |1 
 solenv/CompilerTest_compilerplugins_clang.mk   |1 
 svtools/source/control/ctrlbox.cxx |  136 

 sw/inc/printdata.hxx   |9 
 tools/source/generic/b3dtrans.cxx  |   13 
 tools/source/generic/config.cxx|   21 
 ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx   |   10 
 ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx   |1 
 writerfilter/source/dmapper/GraphicImport.cxx  |6 
 writerfilter/source/dmapper/PropertyMap.cxx|5 
 writerfilter/source/dmapper/PropertyMap.hxx|1 
 47 files changed, 671 insertions(+), 393 deletions(-)

New commits:
commit 6ee4375763854e43e549aee5a35520def2e215a2
Author: Noel Grandin 
AuthorDate: Tue Oct 16 10:40:16 2018 +0200
Commit: Noel Grandin 
CommitDate: Wed Oct 17 08:25:17 2018 +0200

new loplugin staticvar

looks for variables that can be declared const and static i.e. they can
be stored in the read-only linker segment and shared between different
processes

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

diff --git a/compilerplugins/clang/staticvar.cxx 
b/compilerplugins/clang/staticvar.cxx
new file mode 100644
index ..a9db2f4dda04
--- /dev/null
+++ b/compilerplugins/clang/staticvar.cxx
@@ -0,0 +1,204 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+#include 

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

[Libreoffice Gerrit user]

 cui/source/options/personalization.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 86d70dc840b88ed827d6d8febaf512264009951d
Author: Muhammet Kara 
AuthorDate: Tue Oct 16 15:50:04 2018 +0300
Commit: Muhammet Kara 
CommitDate: Wed Oct 17 08:05:58 2018 +0200

Use curl while getting the actual persona

Change-Id: Ia2f9c3b7c68ffba1e80ecd271bc92467210fa9b5
Reviewed-on: https://gerrit.libreoffice.org/61833
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index 590537f73b98..e745b56976a3 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -1049,10 +1049,10 @@ void GetPersonaThread::execute()
 osl::Directory::createPath( gallery );
 
 if ( !xFileAccess->exists(gallery + aHeaderFile) )
-xFileAccess->copy( aHeaderURL, gallery + aHeaderFile );
+curlDownload( OUStringToOString(aHeaderURL, 
RTL_TEXTENCODING_UTF8), gallery + aHeaderFile );
 
 if ( !xFileAccess->exists(gallery + aFooterFile) )
-xFileAccess->copy( aFooterURL, gallery + aFooterFile );
+curlDownload( OUStringToOString(aFooterURL, 
RTL_TEXTENCODING_UTF8), gallery + aFooterFile );
 }
 catch ( const uno::Exception & )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

"GpgME not installed correctly" in unit tests

[Kaganski Mike]

Hi!

While doing make check on my Windows box with gpg4win 
(default-installed, but not configured), I get these dialog boxes 
popping up a dozen of times, e.g. in test_xmlsecurity_pdfsigning or 
test_sw_odfexport:

---
GpgME not installed correctly
---
gpgme-w32spawn.exe was not found in the detected installation directory 
of GpgME
"C:\lo\src\core\workdir\LinkTarget\Executable"

Crypto operations will not work.

If you see this it indicates a problem with your installation.
Please report the problem to your distributor of GpgME.

Developer's Note: The install dir can be manually set with: 
gpgme_set_global_flag
---
ОК
---

My autogen.input is

--with-distro=LibreOfficeWin64
--with-external-tar=c:/lo/src/lo-externalsrc
--with-junit=c:/lo/src/junit-4.10.jar
--with-ant-home=c:/lo/src/apache-ant-1.9.5
--with-galleries=no
--with-visual-studio=2017
--enable-pch
--enable-release-build
--enable-dbgutil
--enable-symbols
--without-help
--with-lang=ru
--with-myspell-dicts
--without-package-format
--enable-64-bit
--enable-werror
--with-gdrive-client-id=XXX
--with-gdrive-client-secret=YYY
--with-ucrt-dir=D:/Downloads/ucrt/WindowsUCRT
--enable-breakpad
--disable-mergelibs

What is missing in the build process to avoid the problem? I believe 
that there should not be requirement to explicitly configure anything 
here to avoid these errors in the middle of the build process; if 
required, the checks/errors/suggestions must be in autogen.sh phase?

-- 
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/ui/notebookbar.ui|   45 
 sd/uiconfig/sdraw/ui/notebookbar.ui|   46 
 sd/uiconfig/simpress/ui/notebookbar.ui | 2559 -
 sw/uiconfig/swriter/ui/notebookbar.ui  |   51 
 4 files changed, 1331 insertions(+), 1370 deletions(-)

New commits:
commit 14408644f9927aa092df1a2ac681ef946feb8e12
Author: andreas kainz 
AuthorDate: Wed Oct 17 02:06:19 2018 +0200
Commit: andreas_kainz 
CommitDate: Wed Oct 17 07:12:54 2018 +0200

Notebookbar: sync tabbedbar

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

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index a1c5cecedee6..ca39249bc22f 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -2001,13 +2001,13 @@
 _File
 True
 True
+False
 False
 center
 True
 immediate
 none
 True
-False
   
   
 False
@@ -2020,13 +2020,13 @@
 _Help
 True
 True
+False
 False
 center
 True
 immediate
 none
 True
-False
   
   
 False
@@ -2217,11 +2217,11 @@
   
 True
 True
+False
 False
 .uno:RecentFileList
 RecentFilesImg
 True
-False
   
   
 False
@@ -4453,12 +4453,12 @@
 _Home
 True
 False
+False
 False
 center
 True
 none
 True
-False
   
   
 False
@@ -4564,6 +4564,7 @@
   
   
   
+  
 
   
   
@@ -5495,12 +5496,12 @@
 _Insert
 True
 True
+False
 False
 center
 True
 none
 True
-False
   
   
 False
@@ -5609,12 +5610,12 @@
 Pag_e
 True
 True
+False
 False
 center
 True
 none
 True
-False
   
   
 False
@@ -7267,12 +7268,12 @@
 _Data
 True
 True
+False
 False
 center
 True
 none
 True
-False
   
   
 False
@@ -7980,12 +7981,12 @@
 _Review
 True
 True
+False
 False
 center
 True
 none
 True
-False
   
   
 False
@@ -8823,12 +8824,12 @@
 _View
 True
 

[TDF infra] Announcing Gitiles VCS browser (gitweb replacement) and https:// anon git URIs

[Guilhem Moulin]

Dear developers,

As announced a few hours ago in the infra call minutes, we deployed
another git browser — Gitiles —  alongside gitweb.  It's also what the
Google folks are using (in fact they're upstream), and IMHO has quite a
nicer feel than the venerable gitweb/cgit:

  * summary: https://gerrit.libreoffice.org/plugins/gitiles/core/
vs. https://gerrit.libreoffice.org/gitweb?p=core.git;a=summary

  * commit: https://gerrit.libreoffice.org/plugins/gitiles/core/+/master
vs. 
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=refs/heads/master

  * diff: https://gerrit.libreoffice.org/plugins/gitiles/core/+/master%5E%21/
vs. 
https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff;h=refs/heads/master

  * log: https://gerrit.libreoffice.org/plugins/gitiles/core/+log/master/
vs. 
https://gerrit.libreoffice.org/gitweb?p=core.git;a=shortlog;h=refs/heads/master

  * tree: https://gerrit.libreoffice.org/plugins/gitiles/core/+/master/
vs. 
https://gerrit.libreoffice.org/gitweb?p=core.git;a=tree;h=refs/heads/master

It also integrates better with gerrit (in the form a plugin), scales
better, and doesn't have CGI.pm's clunkiness, subtle bugs, and not so
pretty security record (yet).  And of course fancy Markdown rendering is
always a plus :-)

Right now https://gerrit.libreoffice.org/#/c/$CHANGENUM/ has both gitweb
and Gitiles links, but unless we hear strong objection we'll disable
gitweb at the end of the month, and serve requests to
‘/gitweb?p=${REPOSITORY}.git;a=${ACTION};h=${REF}’ as 302-redirections
to the corresponding Gitiles paths.

Also, while AFAIK the canonical VCS browser for LibreOffice is currently
https://cgit.freedesktop.org/libreoffice/core/ , if you'd like to use
something in TDF infra, like https://git.libreoffice.org/core/, we could
alias it to https://gerrit.libreoffice.org/plugins/gitiles/core/ .  (And
similarly for the other repos.)


Lastly, it's now possible to clone and fetch git repositories over
https:// .  While git:// URLs will remain supported for the foreseeable
future, they're intentionally no longer advertised in gerrit, and we
encourage you to upgrade the scheme of your ‘remote..url’ to
secure transports (SSH for authenticated access, or HTTPS for anonymous
access).  We'll update ‘lode’ and chase remaining git:// URLs shortly.

Cheers,
-- 
Guilhem, for The Document Foundation's infrastructure team.

PS: please preserve the CC when replying.


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

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

[Libreoffice Gerrit user]

 loleaflet/css/loleaflet.css |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 4a4a888798f03f557d76f90cc67f6bd3c6159887
Author: Henry Castro 
AuthorDate: Tue Oct 16 21:06:34 2018 -0400
Commit: Henry Castro 
CommitDate: Tue Oct 16 21:07:08 2018 -0400

loleaflet: mobile: ensure to hide the document name

Change-Id: I5285409f69f8e6568436fcc25a58eca4a24a0886

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index cd211adcb..0920701cc 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -114,6 +114,9 @@ body {
 #closebutton {
display: none;
 }
+#document-name-input {
+   display: none;
+}
 }
 
 .loleaflet-font {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 44 commits - bundled/include common/JsonUtil.hpp common/Log.cpp common/Log.hpp common/Protocol.hpp common/Seccomp.cpp common/Seccomp.hpp common/Session.cpp common/Ses

[Libreoffice Gerrit user]

 bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h |1 
 common/JsonUtil.hpp  |4 
 common/Log.cpp   |   43 +--
 common/Log.hpp   |  153 +++-
 common/Protocol.hpp  |   42 ---
 common/Seccomp.cpp   |5 
 common/Seccomp.hpp   |3 
 common/Session.cpp   |   73 +++---
 common/Session.hpp   |   16 +
 common/Util.cpp  |  121 +-
 common/Util.hpp  |  105 
 configure.ac |   34 ++
 kit/ChildSession.cpp |  119 ++
 kit/ChildSession.hpp |8 
 kit/ForKit.cpp   |   12 -
 kit/Kit.cpp  |  155 +
 kit/Kit.hpp  |6 
 kit/KitHelper.hpp|2 
 loolwsd.xml.in   |6 
 net/Socket.cpp   |   21 +
 net/Socket.hpp   |   22 +
 test/WhiteBoxTests.cpp   |  186 +++
 tools/WebSocketDump.cpp  |2 
 wsd/AdminModel.cpp   |5 
 wsd/ClientSession.cpp|   18 -
 wsd/DocumentBroker.cpp   |   90 ---
 wsd/DocumentBroker.hpp   |4 
 wsd/LOOLWSD.cpp  |  226 ---
 wsd/LOOLWSD.hpp  |   15 +
 wsd/Storage.cpp  |  224 +-
 wsd/Storage.hpp  |   24 +-
 wsd/TileCache.cpp|   10 
 32 files changed, 1336 insertions(+), 419 deletions(-)

New commits:
commit df08d6688fa076c7f6a981606790fb6ac5d9bff5
Author: Ashod Nakashian 
AuthorDate: Thu Aug 23 21:38:01 2018 -0400
Commit: Ashod Nakashian 
CommitDate: Tue Oct 16 20:12:23 2018 -0400

wsd: disable anonymization when allow_logging_pii=true

Anonymizing is useless with trace anyway, since no
trace log entry anonymizes, it's more useful to
disable anonymization to help troubleshoot (which is
the reason for enabling tracing in the first place).

Change-Id: I437207e7a798c2288a5d5eb33446cb16491bfbf6
Reviewed-on: https://gerrit.libreoffice.org/59534
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit a2809fd27277fd01d0dafdc0c4f0435fdf85db36)

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 37560a424..37ebfe4a8 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -897,16 +897,12 @@ void LOOLWSD::initialize(Application& self)
 #else
 AnonymizeUsernames = getConfigValue(conf, 
"logging.anonymize.usernames", false);
 #endif
-if (AnonymizeUsernames)
-setenv("LOOL_ANONYMIZE_USERNAMES", AnonymizeUsernames ? "1" : "0", 
true);
 
 #if LOOLWSD_ANONYMIZE_FILENAMES
 AnonymizeFilenames = true;
 #else
 AnonymizeFilenames = getConfigValue(conf, 
"logging.anonymize.filenames", false);
 #endif
-if (AnonymizeFilenames)
-setenv("LOOL_ANONYMIZE_FILENAMES", AnonymizeFilenames ? "1" : "0", 
true);
 
 if ((AnonymizeFilenames || AnonymizeUsernames) && LogLevel == "trace")
 {
@@ -914,6 +910,10 @@ void LOOLWSD::initialize(Application& self)
 {
 LOG_WRN("Enabling trace logging while anonymization is enabled due 
to logging.anonymize.allow_logging_pii setting. "
 "This will leak personally identifiable information!");
+
+// Disable anonymization as it's useless now.
+AnonymizeFilenames = false;
+AnonymizeUsernames = false;
 }
 else
 {
@@ -930,6 +930,12 @@ void LOOLWSD::initialize(Application& self)
 }
 }
 
+if (AnonymizeFilenames)
+setenv("LOOL_ANONYMIZE_FILENAMES", "1", true);
+
+if (AnonymizeUsernames)
+setenv("LOOL_ANONYMIZE_USERNAMES", "1", true);
+
 {
 std::string proto = getConfigValue(conf, "net.proto", "");
 if (!Poco::icompare(proto, "ipv4"))
commit 3eb1051777e83072a3f4513bda39a1d825c555fa
Author: Jan Holesovsky 
AuthorDate: Tue Jul 17 20:22:06 2018 +0200
Commit: Ashod Nakashian 
CommitDate: Tue Oct 16 20:12:23 2018 -0400

wsd: Don't try to anonymize the /contents at the end.

Change-Id: Ib3737f4afc6d708b7d06acb36f4044df9f5fbe84
Reviewed-on: https://gerrit.libreoffice.org/57586
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 
(cherry picked from commit 9bab03070140227

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

[Libreoffice Gerrit user]

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

New commits:
commit 452015d97789bf5fdc6dc6c58c1c30362dfbd031
Author: Henry Castro 
AuthorDate: Tue Oct 16 20:03:40 2018 -0400
Commit: Henry Castro 
CommitDate: Tue Oct 16 20:09:03 2018 -0400

loleaflet: mobile: do not focus the map after the menu item click

Change-Id: I796c81a5df3471ab2cb9bb36735ad05f6e8f4492

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 8f88f2558..2eb1d3661 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -774,7 +774,7 @@ L.Control.Menubar = L.Control.extend({
self._executeAction(item);
}
 
-   if ($(item).data('id') !== 'insertcomment')
+   if (!L.Browser.mobile && $(item).data('id') !== 'insertcomment')
self._map.focus();
},
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 loleaflet/css/loleaflet.css|2 +-
 loleaflet/src/control/Control.LokDialog.js |9 ++---
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 32c98a4c8815fd9e73842d79d4c6884889c1db74
Author: Henry Castro 
AuthorDate: Tue Oct 16 12:51:50 2018 -0400
Commit: Henry Castro 
CommitDate: Tue Oct 16 20:08:17 2018 -0400

loleaflet: mobile: fix scrolling the dialogs

Change-Id: I5279cffca4b4d66fbc35a4a8ae4b3ffdfe70a215

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 5fb1d9a0a..cd211adcb 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -401,7 +401,7 @@ body {
 
 .lokdialog.ui-dialog-content.ui-widget-content {
padding: 0px;
-   overflow: visible;
+   overflow: auto;
 }
 
 .lokdialog_canvas {
diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index 6e85da686..7684aff2b 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -251,10 +251,13 @@ L.Control.LokDialog = L.Control.extend({
if (!title)
dialogClass += ' lokdialog_notitle';
 
-   var that = this;
+   var that = this,
+   size = this._map.getSize();
$(dialogContainer).dialog({
-   minWidth: width,
-   width: width,
+   minWidth: size.x,
+   width: Math.min(width, size.x),
+   maxHeight: $(window).height(),
+   height: 'auto',
title: title ? title : '',
modal: false,
closeOnEscape: true,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loleaflet/html loleaflet/js loleaflet/src Makefile.am

[Libreoffice Gerrit user]

 Makefile.am  |7 +++
 loleaflet/html/loleaflet.html.m4 |   25 -
 loleaflet/js/global.js   |4 ++--
 loleaflet/js/main.js |4 ++--
 loleaflet/js/toolbar.js  |2 +-
 loleaflet/src/control/Control.Menubar.js |2 +-
 loleaflet/src/core/Socket.js |6 +++---
 7 files changed, 36 insertions(+), 14 deletions(-)

New commits:
commit e15dc044d7630557b009d4c0e8e38ad67ea40294
Author: Tor Lillqvist 
AuthorDate: Wed Oct 17 02:04:38 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Oct 17 02:10:14 2018 +0300

Handle the GTKAPP case, too, in loleaflet

In loleaflet.html.m4, define a macro MOBILEAPP as true if either
IOSAPP or GTKAPP is true.

Set a window.ThisIsAMobileApp property in either case, and
window.ThisIsTheGtkApp in the GTKAPP case.

The checks for ThisIsTheiOSApp in the JS could in fact all be changed
to check for ThisIsAMobileApp instead, as they were all equally valid
for the gtk+ testbed app. For instance, sending WebKit messages to the
app code works the same way in JavaScript both for iOS and
webkit-gtk+. Which is not surprising, I guess, as the underlying
WebKit is the same.

diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 61ca22426..08ac4e34a 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -12,7 +12,11 @@ 
define([_foreachq],[ifelse([$#],[3],[],[define([$1],[$4])$2[]$0([$1],[$2],shift(
 
 
 
-ifelse(IOSAPP,[],
+dnl# Define MOBILEAPP as true if this is either for the iOS aoo or for the 
gtk+ "app" testbed
+ifelse(IOSAPP,[true],[define([MOBILEAPP],[true])])
+ifelse(GTKAPP,[true],[define([MOBILEAPP],[true])])
+
+ifelse(MOBILEAPP,[],
   // Start listening for Host_PostmessageReady message and save the
   // result for future
   window.WOPIpostMessageReady = false;
@@ -41,7 +45,7 @@ var Base64ToArrayBuffer = function(base64Str) {
 }
 
 
-ifelse(IOSAPP,[true],
+ifelse(MOBILEAPP,[true],
   ifelse(DEBUG,[true],
 foreachq([fileCSS],[LOLEAFLET_CSS],[
   ]),
@@ -54,7 +58,7 @@ ifelse(IOSAPP,[true],
   ])dnl
 )dnl
  
-ifelse(IOSAPP,[true],
+ifelse(MOBILEAPP,[true],
   [


@@ -131,7 +135,7 @@ ifelse(IOSAPP,[true],
 
 
 
-ifelse(IOSAPP,[true],
+ifelse(MOBILEAPP,[true],
  [window.host = '';
   window.serviceRoot = '';
   window.accessToken = '';
@@ -150,13 +154,24 @@ ifelse(IOSAPP,[true],
   window.idleTimeoutSecs = %IDLE_TIMEOUT_SECS%;])
 
   
+
+dnl# For use in conditionals in JS: window.ThisIsAMobileApp, 
window.ThisIsTheiOSApp,
+dnl# and window.ThisIsTheGtkApp
+ifelse(MOBILEAPP,[true],
+  [window.ThisIsAMobileApp = true;],
+  [window.ThisIsAMobileApp = false;]
+)
 ifelse(IOSAPP,[true],
   [window.ThisIsTheiOSApp = true;],
   [window.ThisIsTheiOSApp = false;]
 )
+ifelse(GTKAPP,[true],
+  [window.ThisIsTheGtkApp = true;],
+  [window.ThisIsTheGtkApp = false;]
+)
   
 
-ifelse(IOSAPP,[true],
+ifelse(MOBILEAPP,[true],
   ifelse(DEBUG,[true],foreachq([fileJS],[LOLEAFLET_JS],
   [
   ]),
diff --git a/loleaflet/js/global.js b/loleaflet/js/global.js
index c8d540cc8..27a7f3dd5 100644
--- a/loleaflet/js/global.js
+++ b/loleaflet/js/global.js
@@ -29,9 +29,9 @@ global.getParameterByName = function (name) {
 };
 
 global._ = function (string) {
-   // In the iOS case we can't use the stuff from l10n-for-node, as that 
assumes HTTP.
+   // In the mobile app case we can't use the stuff from l10n-for-node, as 
that assumes HTTP.
// So bail out for now.
-   if (window.ThisIsTheiOSApp) {
+   if (window.ThisIsaMobileApp) {
return string;
} else {
return string.toLocaleString();
diff --git a/loleaflet/js/main.js b/loleaflet/js/main.js
index 3ff8edf5d..15e859606 100644
--- a/loleaflet/js/main.js
+++ b/loleaflet/js/main.js
@@ -25,10 +25,10 @@ var revHistoryEnabled = 
getParameterByName('revisionhistory');
 var alwaysActive = getParameterByName('alwaysactive');
 // Loleaflet Debug mode
 var debugMode = getParameterByName('debug');
-if (wopiSrc === '' && filePath === '' && !window.ThisIsTheiOSApp) {
+if (wopiSrc === '' && filePath === '' && !window.ThisIsAMobileApp) {
vex.dialog.alert(errorMessages.wrongwopisrc);
 }
-if (host === '' && !window.ThisIsTheiOSApp) {
+if (host === '' && !window.ThisIsAMobileApp) {
vex.dialog.alert(errorMessages.emptyhosturl);
 }
 
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 40a16b668..258aad8cd 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -1869,7 +1869,7 @@ $(document).ready(function() {
$('#closebuttonwrapper').hide();
} else {
$('#closebutton').click(function() {
-   if (window.ThisIsTheiOSApp) {
+   if (window.ThisIsAMobileApp) {

window.webkit

[Libreoffice-commits] online.git: gtk/gtk.h

[Libreoffice Gerrit user]

 gtk/gtk.h |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 1d495e626fdd41e6fb6a7774cd5244a0a0d2f57f
Author: Tor Lillqvist 
AuthorDate: Wed Oct 17 02:01:16 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Oct 17 02:01:16 2018 +0300

Forgot to commit this file

Change-Id: I6650583931f3c09a8c3d75c38a2e0dbceae5853d

diff --git a/gtk/gtk.h b/gtk/gtk.h
new file mode 100644
index 0..9bc99c2f2
--- /dev/null
+++ b/gtk/gtk.h
@@ -0,0 +1,12 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+extern int loolwsd_server_socket_fd;
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/ui/notebookbar.ui | 2464 +++-
 1 file changed, 1587 insertions(+), 877 deletions(-)

New commits:
commit d92319d2ffeaa65e31f923e0e9c7328b8d7c97bf
Author: andreas kainz 
AuthorDate: Tue Oct 16 23:46:55 2018 +0200
Commit: andreas_kainz 
CommitDate: Wed Oct 17 00:58:30 2018 +0200

Notebookbar: update calc tabbed notebookbar

Add Printpreview, Object, Media,
Update Image, Draw
Context tab

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

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 2564260cbf86..a1c5cecedee6 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -995,7 +995,7 @@
   
 True
 False
-.uno:OriginalSize
+.uno:FitCellSize
   
 
 
@@ -1012,10 +1012,10 @@
   
 
 
-  
+  
 True
 False
-.uno:NameGroup
+.uno:RenameObject
   
 
 
@@ -1186,6 +1186,37 @@
   
 
   
+  
+True
+False
+
+  
+True
+False
+.uno:AVMediaPlayer
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:RenameObject
+  
+
+
+  
+True
+False
+.uno:ObjectTitleDescription
+  
+
+  
   
 True
 False
@@ -1291,6 +1322,57 @@
   
 
   
+  
+True
+False
+
+  
+True
+False
+.uno:PreviousPage
+  
+
+
+  
+True
+False
+.uno:NextPage
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:PageFormatDialog
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:Print
+  
+
+
+  
+True
+False
+.uno:ClosePreview
+  
+
+  
   
 True
 False
@@ -8952,6 +9034,7 @@
 True
 False
 center
+5
 True
 both
 False
@@ -9935,13 +10018,13 @@
 center
 True
 
-  
+  
 True
 False
 center
 True
 
-  
+  
 True
 False
 center
@@ -9951,21 +10034,23 @@
 False
 3
 
-  
+  
 True
 False
-.uno:ObjectTitleDescription
+center
+True
+.uno:AssignMacro
   
   
 False
-True
+False
   
 
   
   
 False
 True
-1
+0
   
 
 
@@ -9975,26 +10060,15 @@
 center
 vertical
 
-  
+  
 True
 False
 center
 True
-icons
+both-horiz
 False
 
-  
-True
-False
-.uno:ToggleObjectRotateMode
-  
-  
-False
-True
-  
-
-
-  
+  
 True
 False
 

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

[Libreoffice Gerrit user]

 chart2/qa/extras/xshape/data/reference/tdf90839-1.xml |   68 +-
 chart2/qa/extras/xshape/data/reference/tdf90839-2.xml |   10 +-
 chart2/qa/extras/xshape/data/reference/tdf90839-3.xml |   10 +-
 chart2/qa/extras/xshape/data/reference/tdf90839-4.xml |   10 +-
 chart2/source/tools/DiagramHelper.cxx |6 +
 5 files changed, 54 insertions(+), 50 deletions(-)

New commits:
commit 7d17e8e1798b7120b9e8559d042de2afc0a078e3
Author: Eike Rathke 
AuthorDate: Tue Oct 16 12:03:24 2018 +0200
Commit: Andras Timar 
CommitDate: Wed Oct 17 00:48:33 2018 +0200

Resolves: tdf#115182 default Chart percentage format is integer

Regression from

commit 0f4b3cb7d3d68906de316a64dcec281da2a641bd
CommitDate: Mon Aug 10 17:12:45 2015 +0200

The chart2/qa/extras/xshape/data/reference/tdf90839-?.xml
reference files were created with the then wrong default of two
decimals so need to be adapted.

For chart2/qa/extras/xshape/data/reference/tdf90839-1.xml this
meant to regenerate because of the changed positions and sizes of
labels.

Change-Id: Ib0c2c862af9399ab2af5178d01510aa5e4fff97c
Reviewed-on: https://gerrit.libreoffice.org/61826
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit 9672d034b9e760f24ac9a6652ab45dee15ee260a)
Reviewed-on: https://gerrit.libreoffice.org/61855
Reviewed-by: Andras Timar 

diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml 
b/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml
index 7dcbab785af3..3a5070283565 100644
--- a/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml
+++ b/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml
@@ -175,15 +175,15 @@

   
  
- 
+ 
   
-   
+   
 
- 
+ 
   
-   
+   
 
- 
+ 
   
   
   
@@ -192,21 +192,21 @@
   
   
   
-   
-   
+   
+   

   
  
 
 
- 
- 
+ 
+ 
  
 

-   
+   
 
- 
+ 
   
   
   
@@ -215,21 +215,21 @@
   
   
   
-   
-   
+   
+   

   
  
 
 
- 
- 
+ 
+ 
  
 


 
- 
+ 
   
   
   
@@ -250,9 +250,9 @@
  
 

-   
+   
 
- 
+ 
   
   
   
@@ -261,21 +261,21 @@
   
   
   
-   
-   
+   
+   

   
  
 
 
- 
- 
+ 
+ 
  
 

-   
+   
 
- 
+ 
   
   
   
@@ -284,36 +284,36 @@
   
   
   
-   
-   
+   
+   

   
  
 
 
- 
- 
+ 
+ 
  
 

   
   
-   
-   
+   
+   

   
  
 
 
- 
- 
+ 
+ 
  
 

   
   
-   
-   
+   
+   

   
  
diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml 
b/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
index 489b346d4170..b90bf060b694 100644
--- a/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
+++ b/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
@@ -183,7 +183,7 @@
   

 
- 
+ 
   
   
   
@@ -206,7 +206,7 @@


 
- 
+ 
   
   
   
@@ -229,7 +229,7 @@


 
- 
+ 
   
   
   
@@ -252,7 +252,7 @@


 
- 
+ 
   
   
   
@@ -275,7 +275,7 @@


 
- 
+ 
   
 

[Libreoffice-commits] online.git: configure.ac loleaflet/Makefile.am

[Libreoffice Gerrit user]

 configure.ac  |   13 +
 loleaflet/Makefile.am |5 +
 2 files changed, 18 insertions(+)

New commits:
commit fd758496a5e32a7908333479bf5d703fbf2bf8d8
Author: Tor Lillqvist 
AuthorDate: Wed Oct 17 01:22:24 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Oct 17 01:22:24 2018 +0300

Add --enable-gtkapp configury option

Change-Id: Ib805581663aeec62d713f87ca72ab3cfe95db79f

diff --git a/configure.ac b/configure.ac
index 5d337ef42..669783ef0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,12 @@ AC_ARG_ENABLE([iosapp],
  [Use in a tree where the only purpose is to build 
the HTML and CSS stuff
   to be copied to a Mac where the iOS app is being 
built.]))
 
+AC_ARG_ENABLE([gtkapp],
+  AS_HELP_STRING([--enable-gtkapp],
+ [Use in a tree where the only purpose is to build 
the gtk+ "app" that is supposed
+  to work similarly to the iOS app, from the 
JavaScript and the pseudo WebSocket
+  message plumbing point of view.]))
+
 AC_ARG_ENABLE([seccomp],
   AS_HELP_STRING([--disable-seccomp],
  [Disable use of linux/seccomp.h header when 
kernel on target system does not support it.
@@ -165,6 +171,13 @@ fi
 AC_SUBST(ENABLE_IOSAPP)
 AM_CONDITIONAL([ENABLE_IOSAPP], [test "$ENABLE_IOSAPP" = "true"])
 
+ENABLE_GTKAPP=
+if test "$enable_gtkapp" = "yes"; then
+   ENABLE_GTKAPP=true
+fi
+AC_SUBST(ENABLE_GTKAPP)
+AM_CONDITIONAL([ENABLE_GTKAPP], [test "$ENABLE_GTKAPP" = "true"])
+
 MAX_CONNECTIONS=20
 AS_IF([test -n "$with_max_connections" && test "$with_max_connections" -gt 
"0"],
   [MAX_CONNECTIONS="$with_max_connections"])
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index a1deb0f78..5ae2ed51c 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -13,8 +13,10 @@ L10N_PO = $(wildcard $(srcdir)/po/*.po)
 # HTTP to load the message catalog .json files.
 
 if !ENABLE_IOSAPP
+if !ENABLE_GTKAPP
 L10N_JSON = $(patsubst 
$(srcdir)/po/%.po,$(builddir)/dist/l10n/%.json,$(L10N_PO))
 endif
+endif
 
 JQUERY_UI_IMAGE_PATH = node_modules/jquery-ui/themes/ui-lightness/images
 JQUERY_UI_IMAGES = $(wildcard $(JQUERY_UI_IMAGE_PATH)/*.png)
@@ -93,9 +95,11 @@ NODE_MODULES_JS =\
node_modules/vex-js/js/vex.dialog.js
 
 if !ENABLE_IOSAPP
+if !ENABLE_GTKAPP
 NODE_MODULES_JS +=\
node_modules/l10n-for-node/l10n.js
 endif
+endif
 
 NODE_MODULES_JS_SRC = $(patsubst %.js,$(builddir)/%.js,$(NODE_MODULES_JS))
 NODE_MODULES_JS_DST = $(patsubst %.js,$(builddir)/dist/%.js,$(NODE_MODULES_JS))
@@ -202,6 +206,7 @@ $(builddir)/dist/loleaflet.html: 
$(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HT
@echo "Generating loleaflet.html..."
@m4 -E -DDEBUG=$(ENABLE_DEBUG) \
-DIOSAPP=$(ENABLE_IOSAPP) \
+   -DGTKAPP=$(ENABLE_GTKAPP) \
-DLOLEAFLET_CSS="$(subst 
$(SPACE),$(COMMA),$(LOLEAFLET_CSS_M4))" \
-DLOLEAFLET_JS="$(subst $(SPACE),$(COMMA),$(GLOBAL_JS) 
$(NODE_MODULES_JS) \
$(call LOLEAFLET_JS,$(srcdir)/build/build.js) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Tinderbox @71 now failing with undefined reference to `SvMemoryStream::remainingSize()´

[Luke Benes]

After 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=b2cefc2e36925b4384eb0aea54aa2c6bcfb018a8
Most of the Linux tinderboxes went red.

This was fixed by 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=49c87270f7176312806d1759967c247a312f0acf

But @71 is still to failing with:

https://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTER&brief-log=1539640808.27465

28887 
/tinderbox/buildslave/build/workdir/CxxObject/emfio/source/reader/mtftools.o: 
In function `SvStream::TellEnd()´:
2 
/tinderbox/buildslave/source/libo-master/include/tools/stream.hxx:276: 
undefined reference to `SvMemoryStream::remainingSize()´
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: gtk/main.cpp

[Libreoffice Gerrit user]

 gtk/main.cpp |   41 +
 1 file changed, 41 insertions(+)

New commits:
commit 8ceb8950e8d635ca95d2862c2dbb7d316cdf8199
Author: Tor Lillqvist 
AuthorDate: Wed Oct 17 01:04:05 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Oct 17 01:04:05 2018 +0300

Add handlers for messages from JS

Change-Id: Ifa3acfd09e10dbee4ecf43bec5735263e3655790

diff --git a/gtk/main.cpp b/gtk/main.cpp
index e7dc9f4d6..cdc711adc 100644
--- a/gtk/main.cpp
+++ b/gtk/main.cpp
@@ -42,6 +42,39 @@ static gboolean closeWebViewCb(WebKitWebView* webView, 
GtkWidget* window);
 
 int loolwsd_server_socket_fd;
 
+static void handle_debug_message(WebKitUserContentManager *manager,
+ WebKitJavascriptResult   *js_result,
+ gpointer  user_data)
+{
+JSCValue *value = webkit_javascript_result_get_js_value(js_result);
+if (jsc_value_is_string(value))
+std::cout << "From JS: debug: " << jsc_value_to_string(value) << 
std::endl;
+else
+std::cout << "From JS: debug: some object" << std::endl;
+}
+
+static void handle_lool_message(WebKitUserContentManager *manager,
+WebKitJavascriptResult   *js_result,
+gpointer  user_data)
+{
+JSCValue *value = webkit_javascript_result_get_js_value(js_result);
+if (jsc_value_is_string(value))
+std::cout << "From JS: lool: " << jsc_value_to_string(value) << 
std::endl;
+else
+std::cout << "From JS: lool: some object" << std::endl;
+}
+
+static void handle_error_message(WebKitUserContentManager *manager,
+ WebKitJavascriptResult   *js_result,
+ gpointer  user_data)
+{
+JSCValue *value = webkit_javascript_result_get_js_value(js_result);
+if (jsc_value_is_string(value))
+std::cout << "From JS: error: " << jsc_value_to_string(value) << 
std::endl;
+else
+std::cout << "From JS: error: some object" << std::endl;
+}
+
 int main(int argc, char* argv[])
 {
 Log::initialize("Mobile", "trace", false, false, {});
@@ -61,6 +94,14 @@ int main(int argc, char* argv[])
 // Create a "user content manager"
 WebKitUserContentManager *userContentManager = 
WEBKIT_USER_CONTENT_MANAGER(webkit_user_content_manager_new());
 
+g_signal_connect(userContentManager, "script-message-received::debug", 
G_CALLBACK(handle_debug_message), NULL);
+g_signal_connect(userContentManager, "script-message-received::lool", 
G_CALLBACK(handle_lool_message), NULL);
+g_signal_connect(userContentManager, "script-message-received::error", 
G_CALLBACK(handle_error_message), NULL);
+
+
webkit_user_content_manager_register_script_message_handler(userContentManager, 
"debug");
+
webkit_user_content_manager_register_script_message_handler(userContentManager, 
"lool");
+
webkit_user_content_manager_register_script_message_handler(userContentManager, 
"error");
+
 // Create a browser instance
 WebKitWebView *webView = 
WEBKIT_WEB_VIEW(webkit_web_view_new_with_user_content_manager(userContentManager));
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: common/Util.cpp gtk/main.cpp gtk/Makefile wsd/LOOLWSD.cpp wsd/Storage.cpp

[Libreoffice Gerrit user]

 common/Util.cpp |3 +
 gtk/Makefile|   37 +++
 gtk/main.cpp|  106 
 wsd/LOOLWSD.cpp |   13 +-
 wsd/Storage.cpp |8 +---
 5 files changed, 157 insertions(+), 10 deletions(-)

New commits:
commit 58db979291da40c4016516100873ea97951a6b99
Author: Tor Lillqvist 
AuthorDate: Wed Oct 17 00:40:49 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Oct 17 00:45:35 2018 +0300

Start on a gtk+-based workalike to the iOS app

The idea is that it would work sufficiently identically, so that even
people without a Mac and without an iOS device could participate in
development of the non-iOS-specific bits, like the JavaScript, or the
online MOBILEAPP-specific plumbing. Which would be great.

No, this doesn't do anything sane yet. It does compile the same online
C++ files as the iOS app, though. (Some minor tweaks were needed in a
couple of them to silence gcc warnings.)

There is a plain Makefile, but I should change to using autofoo, too.
Eventually, this will need to be built in a separate tree from a
normal online, just like when using the --enable-iosapp configure
switch. (But for now, doesn't matter.)

Change-Id: I13e4d921acb99d802d2f9da4b0df4a237ca60ad6

diff --git a/common/Util.cpp b/common/Util.cpp
index e6a9aefec..ad510e4f1 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -292,6 +292,8 @@ namespace Util
 return std::getenv("DISPLAY") != nullptr;
 }
 
+#ifndef MOBILEAPP
+
 static const char *startsWith(const char *line, const char *tag)
 {
 size_t len = strlen(tag);
@@ -306,7 +308,6 @@ namespace Util
 return nullptr;
 }
 
-#ifndef MOBILEAPP
 std::string getHumanizedBytes(unsigned long nBytes)
 {
 constexpr unsigned factor = 1024;
diff --git a/gtk/Makefile b/gtk/Makefile
new file mode 100644
index 0..cefbeb992
--- /dev/null
+++ b/gtk/Makefile
@@ -0,0 +1,37 @@
+PROGS = mobile
+
+all : $(PROGS)
+
+WARNINGFLAGS = -Wall -Werror -Wno-parentheses -Wno-sign-compare 
-Wno-unused-variable
+INCLUDEFLAGS = -I../common -I../net -I../kit -I../wsd -I../bundled/include 
-I.. -I.
+DEFINEFLAGS = -DMOBILEAPP -DLOOLWSD_DATADIR='"/usr/local/share/loolwsd"' 
-DLOOLWSD_CONFIGDIR='"/usr/local/etc/loolwsd"' -DTOPSRCDIR='"'$(realpath 
$(PWD)/..)'"'
+
+CFLAGS = -g $(WARNINGFLAGS) `pkg-config --cflags webkit2gtk-4.0` 
$(INCLUDEFLAGS) $(DEFINEFLAGS)
+CXXFLAGS = $(CFLAGS)
+
+LIBS=`pkg-config --libs webkit2gtk-4.0` -lPocoFoundationd -lPocoUtild 
-lPocoXMLd -lPocoJSONd -lPocoNetd -lpng -lpthread -ldl
+
+common_OBJS = Unit.o FileUtil.o Log.o MessageQueue.o Protocol.o Session.o 
SigUtil.o SpookyV2.o Util.o
+kit_OBJS = ChildSession.o Kit.o
+net_OBJS = FakeSocket.o Socket.o
+wsd_OBJS = ClientSession.o DocumentBroker.o LOOLWSD.o Storage.o TileCache.o
+
+mobile_OBJS = main.o $(common_OBJS) $(kit_OBJS) $(net_OBJS) $(wsd_OBJS)
+
+$(common_OBJS) : %.o : ../common/%.cpp
+   $(CXX) $(CXXFLAGS) -c -o $@ $^
+
+$(kit_OBJS) : %.o : ../kit/%.cpp
+   $(CXX) $(CXXFLAGS) -c -o $@ $^
+
+$(net_OBJS) : %.o : ../net/%.cpp
+   $(CXX) $(CXXFLAGS) -c -o $@ $^
+
+$(wsd_OBJS) : %.o : ../wsd/%.cpp
+   $(CXX) $(CXXFLAGS) -c -o $@ $^
+
+mobile : $(mobile_OBJS)
+   $(CXX) -o $@ $(mobile_OBJS) $(LIBS)
+
+clean :
+   rm -f $(PROGS) *.o 2>/dev/null
diff --git a/gtk/main.cpp b/gtk/main.cpp
new file mode 100644
index 0..e7dc9f4d6
--- /dev/null
+++ b/gtk/main.cpp
@@ -0,0 +1,106 @@
+// -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*-
+/*
+ * Copyright (C) 2006, 2007 Apple Inc.
+ * Copyright (C) 2007 Alp Toker 
+ * Copyright (C) 2011 Lukasz Slachciak
+ * Copyright (C) 2011 Bob Murphy
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY W

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

[Libreoffice Gerrit user]

 net/FakeSocket.cpp |2 ++
 net/FakeSocket.hpp |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit e9d0b38103c56a3b331d3f9842afda3d66060cc5
Author: Tor Lillqvist 
AuthorDate: Tue Oct 16 23:56:46 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Oct 16 23:56:46 2018 +0300

Add some includes that are missing if compiling this on Linux

Change-Id: Iffe3481e56842f29f0e7838ca024b28e1f7187f3

diff --git a/net/FakeSocket.cpp b/net/FakeSocket.cpp
index 82d221cf4..639b12db0 100644
--- a/net/FakeSocket.cpp
+++ b/net/FakeSocket.cpp
@@ -11,9 +11,11 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/net/FakeSocket.hpp b/net/FakeSocket.hpp
index c29195ddb..5b02f507f 100644
--- a/net/FakeSocket.hpp
+++ b/net/FakeSocket.hpp
@@ -12,6 +12,8 @@
 
 #ifdef MOBILEAPP
 
+#include 
+
 #include 
 
 #ifndef SOCK_NONBLOCK
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Impress linespacing change

[AlicVB]

Hello,

I want to raise a discussion about the percent linespacing in impress.
The calculation has change starting from v5.4 and this commit : 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=a7e6e4b220089a2d8a58ff10393d598a8b796fa5
(see also https://bugs.documentfoundation.org/show_bug.cgi?id=114628 and 
https://bugs.documentfoundation.org/show_bug.cgi?id=120525)


I don't think this patch is the good solution for the following reasons :

1- The new font ascent is arbitrary set to 80% of the new height, 
independently of the ascent/descent ratio of the font
2- changing maxascent and height values for the first line of a 
paragraph means that linespacing change will modify the space between 
the modified paragraph and the previous one.
3- there's a problem if you you use a font with "big" descent value (see 
bug 120525)

4- it mess up all my documents created with before v5.4 ;)

Here's my proposal :

- if we care about 2, we should revert the commit and go back with the 
previous calculation (but we'll still have the problem mentioned in bug 
114628, except if there's a solution to differentiate between first line 
of paragraph and first line of a textarea)
- else, we should decide if we want to keep 1 or respect the 
ascent-descent ratio

- in that case point 3 shouldn't be to difficult to solve

I'd like to have your opinion about this before going further.

Thanks in advance

A. RENAUDIN

(this is my first post here, so please apologize if this message is 
inappropriate or if there's better ways to expose the problem)


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

[Libreoffice-commits] online.git: 10 commits - common/Util.cpp Mobile/Mobile net/FakeSocket.cpp net/Socket.cpp net/Socket.hpp wsd/LOOLWSD.cpp

[Libreoffice Gerrit user]

 Mobile/Mobile/AppDelegate.mm|3 ++-
 Mobile/Mobile/DocumentViewController.mm |2 ++
 common/Util.cpp |3 +--
 net/FakeSocket.cpp  |8 
 net/Socket.cpp  |7 ++-
 net/Socket.hpp  |2 +-
 wsd/LOOLWSD.cpp |   21 +
 7 files changed, 33 insertions(+), 13 deletions(-)

New commits:
commit 3feae5ccda42a04c2bf8bb3d9bef505f00695423
Author: Tor Lillqvist 
AuthorDate: Tue Oct 16 23:00:14 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Oct 16 23:11:45 2018 +0300

Don't talk about any 'ports' in the logging in the mobile app

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index f5839e202..e65fbd282 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2780,7 +2780,9 @@ private:
 {
 std::shared_ptr factory = 
std::make_shared();
 
+#ifndef MOBILEAPP
 LOG_INF("Trying to listen on prisoner port " << port << ".");
+#endif
 std::shared_ptr socket = getServerSocket(
 ServerSocket::Type::Local, port, PrisonerPoll, factory);
 
@@ -2803,9 +2805,11 @@ private:
 }
 
 MasterPortNumber = port;
+#ifndef MOBILEAPP
 LOG_INF("Listening to prisoner connections on port " << port);
-#ifdef MOBILEAPP
+#else
 LOOLWSD::prisonerServerSocketFD = socket->getFD();
+LOG_INF("Listening to prisoner connections on #" << 
LOOLWSD::prisonerServerSocketFD);
 #endif
 return socket;
 }
@@ -2813,8 +2817,12 @@ private:
 /// Create the externally listening public socket
 std::shared_ptr findServerPort(int port)
 {
+#ifndef MOBILEAPP
 LOG_INF("Trying to listen on client port " << port << ".");
+#endif
+
 std::shared_ptr factory;
+
 #if ENABLE_SSL
 if (LOOLWSD::isSSLEnabled())
 factory = std::make_shared();
@@ -2841,7 +2849,12 @@ private:
 }
 
 ClientPortNumber = port;
+
+#ifndef MOBILEAPP
 LOG_INF("Listening to client connections on port " << port);
+#else
+LOG_INF("Listening to client connections on #" << socket->getFD());
+#endif
 return socket;
 }
 };
commit 6316aaf0f51b3e62adb9bc4225675151c24905a9
Author: Tor Lillqvist 
AuthorDate: Tue Oct 16 22:24:19 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Oct 16 23:06:05 2018 +0300

Initialise also _threadFinished and _stop in SocketPoll::startThread()

I am trying to get a SocketPoll object to be "restartable".

Also make the lambda expression in joinThread multiple lines, so that
one can set a breakpoint in it.

diff --git a/net/Socket.cpp b/net/Socket.cpp
index 56c356221..4e87fe05a 100644
--- a/net/Socket.cpp
+++ b/net/Socket.cpp
@@ -111,6 +111,8 @@ void SocketPoll::startThread()
 if (!_threadStarted)
 {
 _threadStarted = true;
+_threadFinished = false;
+_stop = false;
 try
 {
 _thread = std::thread(&SocketPoll::pollingThreadEntry, this);
@@ -125,7 +127,10 @@ void SocketPoll::startThread()
 
 void SocketPoll::joinThread()
 {
-addCallback([this](){ removeSockets(); });
+addCallback([this]()
+{
+removeSockets();
+});
 stop();
 if (_threadStarted && _thread.joinable())
 {
commit c617a8c73fc11d2f2ae3b4023d5a24cea5fbcc6f
Author: Tor Lillqvist 
AuthorDate: Tue Oct 16 22:24:01 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Oct 16 23:05:59 2018 +0300

Improve a comment

diff --git a/net/Socket.hpp b/net/Socket.hpp
index 55f041415..72985aa35 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -715,7 +715,7 @@ private:
 int _wakeup[2];
 /// The sockets we're controlling
 std::vector> _pollSockets;
-/// Protects _newSockets
+/// Protects _newSockets and _newCallbacks
 std::mutex _mutex;
 std::vector> _newSockets;
 std::vector _newCallbacks;
commit 64c06b1f888145bfa0e96cc67e12d64a1f7e29cf
Author: Tor Lillqvist 
AuthorDate: Tue Oct 16 17:21:19 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Oct 16 23:05:50 2018 +0300

Give a name also to the main thread

diff --git a/Mobile/Mobile/AppDelegate.mm b/Mobile/Mobile/AppDelegate.mm
index eab0054f6..aef56be1e 100644
--- a/Mobile/Mobile/AppDelegate.mm
+++ b/Mobile/Mobile/AppDelegate.mm
@@ -32,7 +32,8 @@ static LOOLWSD *loolwsd = nullptr;
 }
 
 - (BOOL)application:(UIApplication *)application 
didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-Log::initialize("app", "trace", false, false, {});
+Log::initialize("Mobile", "trace", false, false, {});
+Util::setThreadName("main");
 fakeSocketSetLoggingCallback([](const std::string& line)
  {
  LOG_TRC_NOFILE(line);
commit 434a62335bb84d3001dc66992395d3b99122685f
Author: Tor Lillqvist 
AuthorDate: Tue Oct 16 17:20:55 2018 +0300
Commit: Tor 

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

[Libreoffice Gerrit user]

 chart2/qa/extras/xshape/data/reference/tdf90839-1.xml |   68 +-
 chart2/qa/extras/xshape/data/reference/tdf90839-2.xml |   10 +-
 chart2/qa/extras/xshape/data/reference/tdf90839-3.xml |   10 +-
 chart2/qa/extras/xshape/data/reference/tdf90839-4.xml |   10 +-
 chart2/source/tools/DiagramHelper.cxx |6 +
 5 files changed, 54 insertions(+), 50 deletions(-)

New commits:
commit 9672d034b9e760f24ac9a6652ab45dee15ee260a
Author: Eike Rathke 
AuthorDate: Tue Oct 16 12:03:24 2018 +0200
Commit: Eike Rathke 
CommitDate: Tue Oct 16 22:16:19 2018 +0200

Resolves: tdf#115182 default Chart percentage format is integer

Regression from

commit 0f4b3cb7d3d68906de316a64dcec281da2a641bd
CommitDate: Mon Aug 10 17:12:45 2015 +0200

The chart2/qa/extras/xshape/data/reference/tdf90839-?.xml
reference files were created with the then wrong default of two
decimals so need to be adapted.

For chart2/qa/extras/xshape/data/reference/tdf90839-1.xml this
meant to regenerate because of the changed positions and sizes of
labels.

Change-Id: Ib0c2c862af9399ab2af5178d01510aa5e4fff97c
Reviewed-on: https://gerrit.libreoffice.org/61826
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml 
b/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml
index 7dcbab785af3..3a5070283565 100644
--- a/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml
+++ b/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml
@@ -175,15 +175,15 @@

   
  
- 
+ 
   
-   
+   
 
- 
+ 
   
-   
+   
 
- 
+ 
   
   
   
@@ -192,21 +192,21 @@
   
   
   
-   
-   
+   
+   

   
  
 
 
- 
- 
+ 
+ 
  
 

-   
+   
 
- 
+ 
   
   
   
@@ -215,21 +215,21 @@
   
   
   
-   
-   
+   
+   

   
  
 
 
- 
- 
+ 
+ 
  
 


 
- 
+ 
   
   
   
@@ -250,9 +250,9 @@
  
 

-   
+   
 
- 
+ 
   
   
   
@@ -261,21 +261,21 @@
   
   
   
-   
-   
+   
+   

   
  
 
 
- 
- 
+ 
+ 
  
 

-   
+   
 
- 
+ 
   
   
   
@@ -284,36 +284,36 @@
   
   
   
-   
-   
+   
+   

   
  
 
 
- 
- 
+ 
+ 
  
 

   
   
-   
-   
+   
+   

   
  
 
 
- 
- 
+ 
+ 
  
 

   
   
-   
-   
+   
+   

   
  
diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml 
b/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
index 489b346d4170..b90bf060b694 100644
--- a/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
+++ b/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
@@ -183,7 +183,7 @@
   

 
- 
+ 
   
   
   
@@ -206,7 +206,7 @@


 
- 
+ 
   
   
   
@@ -229,7 +229,7 @@


 
- 
+ 
   
   
   
@@ -252,7 +252,7 @@


 
- 
+ 
   
   
   
@@ -275,7 +275,7 @@


 
- 
+ 
   
   
   
diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml 
b/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml
index 5355da

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

[Libreoffice Gerrit user]

 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eb04d583b77d4e8a9233b6f164428cc0594d0dae
Author: Mike Kaganski 
AuthorDate: Tue Oct 16 20:45:14 2018 +0200
Commit: Mike Kaganski 
CommitDate: Tue Oct 16 21:56:00 2018 +0200

tdf#119885: a typo fix

5d0c83fd4cf91083805f60f49e4fafd3d6ac73d4 follow-up

Change-Id: I3611172944072ac009c7c5191cbe05ec9600fd1d
Reviewed-on: https://gerrit.libreoffice.org/61847
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index fe8553e83cd9..cf3d5e62df01 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -554,7 +554,7 @@ TableStyleSheetEntry * 
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 aCellBorder->second >>= aLeftBorder;
 aCellBorder = 
m_aCellProperties[0][0]->getProperty(PROP_RIGHT_BORDER);
 if (aCellBorder)
-aCellBorder->second >>= aLeftBorder;
+aCellBorder->second >>= aRightBorder;
 }
 if (rInfo.nNestLevel == 1 && aLeftBorder.LineWidth && 
!rFrameProperties.empty())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sfx2/source/control/dispatch.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c3bb8a447199f1d65dc3f38cc00658d60813cf00
Author: Julien Nabet 
AuthorDate: Tue Oct 16 20:40:14 2018 +0200
Commit: Julien Nabet 
CommitDate: Tue Oct 16 21:37:39 2018 +0200

Fix build in sfx2

Failing build due to 27dadc070ec2c2a602d3c5b3494dd0bdc15c785f

Change-Id: I34aa67185e7889fd4ee1781b9a45c9a202e76954
Reviewed-on: https://gerrit.libreoffice.org/61846
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index cf1cd460020a..0d2b41fcecd2 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1145,7 +1145,7 @@ void SfxDispatcher::Update_Impl( bool bForce )
 {
 SfxWorkWindow *pWork = xImp->pFrame->GetFrame().GetWorkWindow_Impl();
 SfxDispatcher *pAct = pWork->GetBindings().GetDispatcher_Impl();
-if ( pAct == this || pAct == this )
+if (pAct == this)
 {
 if ( !bUpdate )
 bUpdate = !xImp->bUpdated;
@@ -1198,7 +1198,7 @@ void SfxDispatcher::Update_Impl( bool bForce )
 {
 SfxWorkWindow *pWork = xImp->pFrame->GetFrame().GetWorkWindow_Impl();
 SfxDispatcher *pAct = pWork->GetBindings().GetDispatcher_Impl();
-if ( pAct == this || pAct == this )
+if (pAct == this)
 {
 pWork->ResetObjectBars_Impl();
 pWork->ResetChildWindows_Impl();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sd/source/ui/unoidl/unomodel.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e57ab1b338af12a85166859b9f5e5b958300f867
Author: Zdibák Zoltán 
AuthorDate: Sat Oct 13 14:42:12 2018 +0200
Commit: Tamás Zolnai 
CommitDate: Tue Oct 16 20:45:04 2018 +0200

Narrowed variableScope

Change-Id: Ic3284266a021e3fe17bf99a64e75c0d5a7e662d7
Reviewed-on: https://gerrit.libreoffice.org/61739
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai 

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 05d9af5ca483..898eeda69772 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -3228,8 +3228,6 @@ void SAL_CALL SdMasterPagesAccess::remove( const 
uno::Reference< drawing::XDrawP
 if( nullptr == mpModel || mpModel->mpDoc == nullptr )
 throw lang::DisposedException();
 
-SdDrawDocument& rDoc = *mpModel->mpDoc;
-
 SdMasterPage* pSdPage = SdMasterPage::getImplementation( xPage );
 if(pSdPage == nullptr)
 return;
@@ -3246,6 +3244,8 @@ void SAL_CALL SdMasterPagesAccess::remove( const 
uno::Reference< drawing::XDrawP
 {
 sal_uInt16 nPage = pPage->GetPageNum();
 
+SdDrawDocument& rDoc = *mpModel->mpDoc;
+
 SdPage* pNotesPage = static_cast< SdPage* >( rDoc.GetMasterPage( 
nPage+1 ) );
 
 bool bUndo = rDoc.IsUndoEnabled();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa test/Library_subsequenttest.mk test/source

[Libreoffice Gerrit user]

 include/test/table/xtablechartssupplier.hxx |   34 ++
 qadevOOo/Jar_OOoRunner.mk   |1 
 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv |1 
 qadevOOo/tests/java/ifc/table/_XTableChartsSupplier.java|   51 
--
 sc/qa/extras/sctablesheetobj.cxx|5 
 test/Library_subsequenttest.mk  |1 
 test/source/table/xtablechartssupplier.cxx  |   31 ++
 7 files changed, 71 insertions(+), 53 deletions(-)

New commits:
commit 189d8ade3ca69c4eb313bdfc25182dc81b5d06e8
Author: Rahul Gurung 
AuthorDate: Mon Oct 8 20:39:08 2018 +0530
Commit: Jens Carl 
CommitDate: Tue Oct 16 20:00:13 2018 +0200

tdf#45904 Move _XTableChartsSupplier Java Tests to C++

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

diff --git a/include/test/table/xtablechartssupplier.hxx 
b/include/test/table/xtablechartssupplier.hxx
new file mode 100644
index ..9e5d45dd0d2d
--- /dev/null
+++ b/include/test/table/xtablechartssupplier.hxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+* This file is part of the LibreOffice project.
+*
+* This Source Code Form is subject to the terms of the Mozilla Public
+* License, v. 2.0. If a copy of the MPL was not distributed with this
+* file, You can obtain one at http://mozilla.org/MPL/2.0/.
+*/
+
+#ifndef INCLUDED_TEST_TABLE_XTABLECHARTSSUPPLIER_HXX
+#define INCLUDED_TEST_TABLE_XTABLECHARTSSUPPLIER_HXX
+
+#include 
+#include 
+
+#include 
+
+namespace apitest
+{
+class OOO_DLLPUBLIC_TEST XTableChartsSupplier
+{
+public:
+virtual css::uno::Reference init() = 0;
+
+void testGetCharts();
+
+protected:
+~XTableChartsSupplier() {}
+};
+}
+
+#endif // INCLUDED_TEST_TABLE_XTABLECHARTSSUPPLIER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index f7f56ae29046..afa06001eeab 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -590,7 +590,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/table/_XCellRange \
 qadevOOo/tests/java/ifc/table/_XTableChart \
 qadevOOo/tests/java/ifc/table/_XTableCharts \
-qadevOOo/tests/java/ifc/table/_XTableChartsSupplier \
 qadevOOo/tests/java/ifc/table/_XTableColumns \
 qadevOOo/tests/java/ifc/table/_XTableRows \
 qadevOOo/tests/java/ifc/task/_XInteractionHandler \
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv 
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
index 5ee16311af93..2ea4a60681cd 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScTableSheetObj.csv
@@ -109,7 +109,6 @@
 "ScTableSheetObj";"com::sun::star::util::XProtectable";"unprotect()"
 "ScTableSheetObj";"com::sun::star::util::XProtectable";"isProtected()"
 "ScTableSheetObj";"com::sun::star::table::XAutoFormattable";"autoFormat()"
-"ScTableSheetObj";"com::sun::star::table::XTableChartsSupplier";"getCharts()"
 
"ScTableSheetObj";"com::sun::star::sheet::XCellRangesQuery";"queryVisibleCells()"
 "ScTableSheetObj";"com::sun::star::sheet::XCellRangesQuery";"queryEmptyCells()"
 
"ScTableSheetObj";"com::sun::star::sheet::XCellRangesQuery";"queryContentCells()"
diff --git a/qadevOOo/tests/java/ifc/table/_XTableChartsSupplier.java 
b/qadevOOo/tests/java/ifc/table/_XTableChartsSupplier.java
deleted file mode 100644
index 0c170d4f40d9..
--- a/qadevOOo/tests/java/ifc/table/_XTableChartsSupplier.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package ifc.table;
-
-import lib.MultiMethodTest;
-
-import com.sun.star.table.XTableChartsSupplier;
-
-/**
-* Testing com.sun.star.table.XTableChartsSupplier
-* interface methods :
-* 
-*   getCharts()
-*  
-* @see com.sun.star.table.XTableChartsSupplier
-*/
-pu

[Libreoffice-commits] core.git: sal/osl

[Libreoffice Gerrit user]

 sal/osl/unx/file.cxx  |7 +--
 sal/osl/unx/file_misc.cxx |6 --
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 872f363a5926c76ed8b21dc209352cebfe955764
Author: Tor Lillqvist 
AuthorDate: Mon Oct 15 20:34:28 2018 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Oct 16 19:54:13 2018 +0200

Avoid risk of looking at an errno modified by SAL_INFO() call

Thanks to Stephan for noticing.

Change-Id: I6b90258bdc6bce7b2aeb44f9a1a136b4b9bd51c9
Reviewed-on: https://gerrit.libreoffice.org/61812
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index c3c5cd7fd655..ae1bc31c9069 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -966,7 +966,10 @@ oslFileError openFilePath(const char *cpFilePath, 
oslFileHandle* pHandle, sal_uI
 int e = errno;
 SAL_INFO("sal.file", "flock(" << fd << ",LOCK_EX|LOCK_NB): errno " 
<< e << ": " << strerror(e));
 /* Mac OSX returns ENOTSUP for webdav drives. We should try read 
lock */
-if ((e != ENOTSUP) || ((flock(fd, LOCK_SH | LOCK_NB) == 1) && 
(errno != ENOTSUP)))
+
+// Restore errno after possibly having been overwritten by the 
SAL_INFO above...
+errno = e;
+if ((errno != ENOTSUP) || ((flock(fd, LOCK_SH | LOCK_NB) == 1) && 
(errno != ENOTSUP)))
 {
 eRet = oslTranslateFileError(errno);
 (void) close(fd);
@@ -1100,7 +1103,7 @@ oslFileError SAL_CALL osl_syncFile(oslFileHandle Handle)
 {
 int e = errno;
 SAL_INFO("sal.file", "fsync(" << pImpl->m_fd << "): errno " << e << ": 
" << strerror(e));
-return oslTranslateFileError(errno);
+return oslTranslateFileError(e);
 }
 else
 SAL_INFO("sal.file", "fsync(" << pImpl->m_fd << "): OK");
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 507779c7fe6c..a45d32e4c79e 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -218,6 +218,8 @@ oslFileError SAL_CALL osl_openDirectory(rtl_uString* 
ustrDirectoryURL, oslDirect
 {
 int e = errno;
 SAL_INFO("sal.file", "opendir(" << path << "): errno " << e << 
": " << strerror(e));
+// Restore errno after possible modification by SAL_INFO above
+errno = e;
 }
 }
 }
@@ -249,7 +251,7 @@ oslFileError SAL_CALL osl_closeDirectory(oslDirectory 
pDirectory)
 {
 int e = errno;
 SAL_INFO("sal.file", "closedir(" << pDirImpl->pDirStruct << "): 
errno " << e << ": " << strerror(e));
-err = oslTranslateFileError(errno);
+err = oslTranslateFileError(e);
 }
 else
 SAL_INFO("sal.file", "closedir(" << pDirImpl->pDirStruct << "): 
OK");
@@ -819,7 +821,7 @@ static oslFileError oslDoCopy(const sal_Char* 
pszSourceFileName, const sal_Char*
 int e = errno;
 SAL_INFO("sal.file", "rename(" << pszDestFileName << ", " << 
tmpDestFile
  << "): errno " << e << ": " << strerror(e));
-if (errno == ENOENT)
+if (e == ENOENT)
 {
 DestFileExists = 0;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx   |   13 ++-
 sw/qa/extras/rtfexport/rtfexport.cxx |2 
 sw/source/filter/ww8/docxattributeoutput.cxx |9 --
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   62 +++
 4 files changed, 62 insertions(+), 24 deletions(-)

New commits:
commit 5d0c83fd4cf91083805f60f49e4fafd3d6ac73d4
Author: Mike Kaganski 
AuthorDate: Tue Oct 16 18:00:45 2018 +0300
Commit: Mike Kaganski 
CommitDate: Tue Oct 16 19:53:32 2018 +0200

tdf#119885: OOXML import: try to get cell paddings as Word does

Change-Id: I7abd715b6bb71d6e2e01939c4cf849d94eb6a103
Reviewed-on: https://gerrit.libreoffice.org/61843
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index 4db28720e0fa..794a76245525 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -1160,7 +1160,18 @@ DECLARE_OOXMLEXPORT_TEST( testTableCellMargin, 
"table-cell-margin.docx" )
 cellLeftMarginFromOffice[i], aLeftMargin - 0.5 * 
aLeftBorderLine.LineWidth, 1 );
 // The 'a' in the fourth table should not be partly hidden by the 
border
 if ( i == 3 )
-CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "Incorrect cell padding", 
0.5 * aLeftBorderLine.LineWidth, aLeftMargin, 1 );
+{
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Incorrect cell left padding",
+ 0.5 * 
aLeftBorderLine.LineWidth, aLeftMargin, 1);
+// tdf#119885: cell's edit area must touch right border
+sal_Int32 aRightMargin = -1;
+xPropSet->getPropertyValue("RightBorderDistance") >>= aRightMargin;
+uno::Any aRightBorder = xPropSet->getPropertyValue("RightBorder");
+table::BorderLine2 aRightBorderLine;
+aRightBorder >>= aRightBorderLine;
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Incorrect cell right 
padding",
+ 0.5 * 
aRightBorderLine.LineWidth, aRightMargin, 1);
+}
 }
 }
 
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 009cd00eb14d..8b6ecdb27f85 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -754,7 +754,7 @@ DECLARE_RTFEXPORT_TEST(testTdf84832, "tdf84832.docx")
 {
 uno::Reference xCell = getCell(getParagraphOrTable(2), "A1");
 // This was 0, as left padding wasn't exported.
-CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(113)),
+CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(108)),
  getProperty(xCell, "LeftBorderDistance"));
 }
 
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 0c9e4a04c63b..3d539978f096 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3175,15 +3175,6 @@ static void impl_cellMargins( FSHelperPtr const & 
pSerializer, const SvxBoxItem&
 continue;
 }
 
-if ( aBorders[i] == SvxBoxItemLine::LEFT ) {
-// Office's cell margin is measured from the right of the border.
-// While LO's cell spacing is measured from the center of the 
border.
-// So we add half left-border width to tblIndent value
-const SvxBorderLine* pLn = rBox.GetLine( *pBrd );
-if (pLn)
-nDist -= pLn->GetWidth() * 0.5;
-}
-
 if (!tagWritten) {
 pSerializer->startElementNS( XML_w, tag, FSEND );
 tagWritten = true;
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index ced27a0b80fa..fe8553e83cd9 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -266,9 +266,7 @@ void 
lcl_extractHoriOrient(std::vector& rFrameProperties,
 }
 }
 
-}
-
-static void lcl_DecrementHoriOrientPosition(std::vector& 
rFrameProperties, sal_Int32 nAmount)
+void lcl_DecrementHoriOrientPosition(std::vector& 
rFrameProperties, sal_Int32 nAmount)
 {
 // Shifts the frame left by the given value.
 for (beans::PropertyValue & rPropertyValue : rFrameProperties)
@@ -283,6 +281,42 @@ static void 
lcl_DecrementHoriOrientPosition(std::vector& r
 }
 }
 
+void lcl_adjustBorderDistance(TableInfo& rInfo, const table::BorderLine2& 
rLeftBorder,
+  const table::BorderLine2& rRightBorder)
+{
+// MS Word appears to do these things to adjust the cell horizontal area:
+//
+// bll = left borderline width
+// blr = right borderline width
+// cea = cell's edit area rectangle
+// cea_w = cea width
+// cml = cell's left margin (paddin

Build fails in UnitTest

[kalriel]

Hello.
I get the following error when building the master

Error: a unit test failed, please do one of:
make CppunitTest_sc_subsequent_filters_test CPPUNITTRACE="lldb --"   #
for interactive debugging on OS X
make CppunitTest_sc_subsequent_filters_test VALGRIND=memcheck#
for memory checking

You can limit the execution to just one particular test by:

make CppunitTest_sc_subsequent_filters_test CPPUNIT_TEST_NAME="testXYZ"
...above mentioned params...

/[...]/LibreOffice_Source/lode/dev/core/solenv/gbuild/CppunitTest.mk:120:
recipe for target
'/[...]/LibreOffice_Source/lode/dev/core/workdir/CppunitTest/sc_subsequent_filters_test.test'
failed
make[1]: ***
[/[...]/LibreOffice_Source/lode/dev/core/workdir/CppunitTest/sc_subsequent_filters_test.test]
Error 1
Makefile:167: recipe for target 'CppunitTest_sc_subsequent_filters_test'
failed
make: *** [CppunitTest_sc_subsequent_filters_test] Error 2

Best regards.
Kalriel



--
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

Master build fail in Unittest

[kalriel]

Hello.
I get the following error when building the master

Error: a unit test failed, please do one of:
make CppunitTest_sc_subsequent_filters_test CPPUNITTRACE="lldb --"   #
for interactive debugging on OS X
make CppunitTest_sc_subsequent_filters_test VALGRIND=memcheck#
for memory checking

You can limit the execution to just one particular test by:

make CppunitTest_sc_subsequent_filters_test CPPUNIT_TEST_NAME="testXYZ"
...above mentioned params...

/[...]/LibreOffice_Source/lode/dev/core/solenv/gbuild/CppunitTest.mk:120:
recipe for target
'/[...]/LibreOffice_Source/lode/dev/core/workdir/CppunitTest/sc_subsequent_filters_test.test'
failed
make[1]: ***
[/[...]/LibreOffice_Source/lode/dev/core/workdir/CppunitTest/sc_subsequent_filters_test.test]
Error 1
Makefile:167: recipe for target 'CppunitTest_sc_subsequent_filters_test'
failed
make: *** [CppunitTest_sc_subsequent_filters_test] Error 2

Best regards.
Kalriel



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

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

[Libreoffice Gerrit user]

 sd/qa/unit/data/tdf119956.odg|binary
 sd/qa/unit/misc-tests.cxx|   92 ++-
 sd/qa/unit/sdmodeltestbase.hxx   |3 -
 sd/source/ui/inc/DrawViewShell.hxx   |3 -
 sd/source/ui/inc/GraphicDocShell.hxx |3 -
 sd/source/ui/inc/LayerTabBar.hxx |   10 ++-
 sd/source/ui/inc/ViewShell.hxx   |2 
 7 files changed, 94 insertions(+), 19 deletions(-)

New commits:
commit c8b68f7d63df9335ab4ef90441d3d2815bb4ddd6
Author: Regina Henschel 
AuthorDate: Mon Oct 8 19:42:56 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Oct 16 19:21:49 2018 +0200

tdf#119956 unit test, LayerTabBar, adapt focus if Alt+Click

The test simulates Alt+Click and checks which tab is current.
Some methods have been exported, so that they can be used in
the test. The test classes have been changed to get an odg
document really opened in Draw.

Change-Id: I6ece8594f297c48c862693ead049e6e1f9edbc31
Reviewed-on: https://gerrit.libreoffice.org/61545
Tested-by: Jenkins
Reviewed-by: Regina Henschel 
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sd/qa/unit/data/tdf119956.odg b/sd/qa/unit/data/tdf119956.odg
new file mode 100644
index ..eb1104035f1a
Binary files /dev/null and b/sd/qa/unit/data/tdf119956.odg differ
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index df038e5fde65..2bfd5789407a 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -20,6 +20,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -46,10 +47,17 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+
 
 using namespace ::com::sun::star;
 
@@ -68,6 +76,7 @@ public:
 void testTdf101242_settings();
 void testTdf119392();
 void testTdf67248();
+void testTdf119956();
 
 CPPUNIT_TEST_SUITE(SdMiscTest);
 CPPUNIT_TEST(testTdf96206);
@@ -81,6 +90,7 @@ public:
 CPPUNIT_TEST(testTdf101242_settings);
 CPPUNIT_TEST(testTdf119392);
 CPPUNIT_TEST(testTdf67248);
+CPPUNIT_TEST(testTdf119956);
 CPPUNIT_TEST_SUITE_END();
 
 virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override
@@ -118,6 +128,17 @@ sd::DrawDocShellRef SdMiscTest::Load(const OUString& rURL, 
sal_Int32 nFormat)
 uno::Reference< frame::XFrame > xTargetFrame = 
xDesktop->findFrame("_blank", 0);
 CPPUNIT_ASSERT(xTargetFrame.is());
 
+// This ContainerWindow corresponds to the outermost window of a running 
LibreOffice.
+// It needs a non-zero size and must be shown. Otherwise visible elements 
like the
+// LayerTabBar in Draw have zero size and cannot get mouse events.
+// The here used size is freely chosen.
+uno::Reference xContainerWindow = 
xTargetFrame->getContainerWindow();
+CPPUNIT_ASSERT(xContainerWindow.is());
+xContainerWindow->setPosSize(0, 0, 1024, 768, awt::PosSize::SIZE);
+VclPtr pContainerWindow = 
VCLUnoHelper::GetWindow(xContainerWindow);
+CPPUNIT_ASSERT(pContainerWindow);
+pContainerWindow->Show(true);
+
 // 1. Open the document
 sd::DrawDocShellRef xDocSh = loadURL(rURL, nFormat);
 CPPUNIT_ASSERT_MESSAGE("Failed to load file.", xDocSh.is());
@@ -137,16 +158,27 @@ sd::DrawDocShellRef SdMiscTest::Load(const OUString& 
rURL, sal_Int32 nFormat)
 
 sd::ViewShell *pViewShell = xDocSh->GetViewShell();
 CPPUNIT_ASSERT(pViewShell);
-sd::slidesorter::SlideSorterViewShell* pSSVS = nullptr;
-for (int i = 0; i < 1000; i++)
+
+// Draw has no slidesorter, Impress never shows a LayerTabBar
+if (sd::ViewShell::ST_DRAW == pViewShell->GetShellType())
 {
-// Process all Tasks - slide sorter is created here
-while (Scheduler::ProcessTaskScheduling());
-if ((pSSVS = 
sd::slidesorter::SlideSorterViewShell::GetSlideSorter(pViewShell->GetViewShellBase()))
 != nullptr)
-break;
-osl::Thread::wait(std::chrono::milliseconds(100));
+sd::LayerTabBar* pLayerTabBar = 
static_cast(pViewShell)->GetLayerTabControl();
+CPPUNIT_ASSERT(pLayerTabBar);
+pLayerTabBar->StateChanged(StateChangedType::InitShow);
+}
+else
+{
+sd::slidesorter::SlideSorterViewShell* pSSVS = nullptr;
+for (int i = 0; i < 1000; i++)
+{
+// Process all Tasks - slide sorter is created here
+while (Scheduler::ProcessTaskScheduling());
+if ((pSSVS = 
sd::slidesorter::SlideSorterViewShell::GetSlideSorter(pViewShell->GetViewShellBase()))
 != nullptr)
+break;
+osl::Thread::wait(std::chrono::milliseconds(100));
+}
+CPPUNIT_ASSERT(pSSVS);
 }
-CPPUNIT_ASSERT(pSSVS);
 
 return xDocSh;
 }
@@ -497,7 +529,7 @@ void SdMiscTest::testTdf119392()
 // Loads a document which has two user layers "V--" and "V-L". Inserts a 
new layer "

[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_3' - 5 commits - sw/inc sw/qa sw/source

[Libreoffice Gerrit user]

 sw/inc/doc.hxx  |4 
 sw/inc/fmtftn.hxx   |7 
 sw/inc/ftnidx.hxx   |   10 
 sw/inc/txtftn.hxx   |4 
 sw/qa/extras/layout/layout.cxx  |   16 -
 sw/source/core/access/accfootnote.cxx   |4 
 sw/source/core/doc/DocumentContentOperationsManager.cxx |2 
 sw/source/core/doc/DocumentRedlineManager.cxx   |7 
 sw/source/core/doc/docdesc.cxx  |2 
 sw/source/core/doc/docftn.cxx   |   14 -
 sw/source/core/doc/ftnidx.cxx   |  176 +---
 sw/source/core/edit/edattr.cxx  |4 
 sw/source/core/fields/reffld.cxx|2 
 sw/source/core/inc/UndoAttribute.hxx|3 
 sw/source/core/inc/rootfrm.hxx  |4 
 sw/source/core/inc/txtfrm.hxx   |2 
 sw/source/core/layout/ftnfrm.cxx|   26 ++
 sw/source/core/layout/wsfrm.cxx |   13 +
 sw/source/core/text/txtftn.cxx  |9 
 sw/source/core/txtnode/atrftn.cxx   |   25 +-
 sw/source/core/txtnode/modeltoviewhelper.cxx|2 
 sw/source/core/undo/unattr.cxx  |7 
 sw/source/core/undo/unredln.cxx |4 
 sw/source/core/unocore/unoftn.cxx   |2 
 sw/source/filter/html/htmlftn.cxx   |4 
 sw/source/filter/ww8/ww8par2.cxx|2 
 26 files changed, 268 insertions(+), 87 deletions(-)

New commits:
commit 264b4a053177723fe3ec3c58983fffc235090a1e
Author: Michael Stahl 
AuthorDate: Tue Oct 16 17:31:25 2018 +0200
Commit: Michael Stahl 
CommitDate: Tue Oct 16 18:15:49 2018 +0200

sw_redlinehide_3: invalidate footnotes in UnHideRedlines

... so the numbers are repainted, both in the document body and in
the footnotes.

Change-Id: I4164f1bace1b984a841f520f4832a324b811ab3f

diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx
index 4a3408c5e290..01aa9c5801d5 100644
--- a/sw/inc/txtftn.hxx
+++ b/sw/inc/txtftn.hxx
@@ -57,6 +57,8 @@ public:
 // Check conditional paragraph styles.
 void CheckCondColl();
 
+void InvalidateNumberInLayout();
+
 // For references to footnotes.
 void SetSeqRefNo();
 void SetSeqNo( sal_uInt16 n )   { m_nSeqNo = n; }   // For Readers.
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 14ada1f0d5d4..7aff243c691a 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -4482,6 +4483,18 @@ void SwRootFrame::SetHideRedlines(bool const 
bHideRedlines)
 }
 }
 
+// invalidate all footnotes to reformat their numbers
+SwFootnoteIdxs const& rFootnotes(rDoc.GetFootnoteIdxs());
+for (SwTextFootnote *const pFootnote : rFootnotes)
+{
+SwFormatFootnote const& rFootnote(pFootnote->GetFootnote());
+if (rFootnote.GetNumber() != rFootnote.GetNumberRLHidden()
+&& rFootnote.GetNumStr().isEmpty())
+{
+pFootnote->InvalidateNumberInLayout();
+}
+}
+
 //InvalidateAllContent(SwInvalidateFlags::Size); // ??? TODO what to 
invalidate?  this is the big hammer
 }
 
diff --git a/sw/source/core/txtnode/atrftn.cxx 
b/sw/source/core/txtnode/atrftn.cxx
index 3a9d02439f91..de299bcc0cc8 100644
--- a/sw/source/core/txtnode/atrftn.cxx
+++ b/sw/source/core/txtnode/atrftn.cxx
@@ -345,8 +345,13 @@ void SwTextFootnote::SetNumber(const sal_uInt16 nNewNum,
 rFootnote.m_nNumber = nNewNum;
 rFootnote.m_nNumberRLHidden = nNumberRLHidden;
 }
+InvalidateNumberInLayout();
+}
 
-OSL_ENSURE( m_pTextNode, "SwTextFootnote: where is my TextNode?" );
+void SwTextFootnote::InvalidateNumberInLayout()
+{
+assert(m_pTextNode);
+SwFormatFootnote const& rFootnote(GetFootnote());
 SwNodes &rNodes = m_pTextNode->GetDoc()->GetNodes();
 m_pTextNode->ModifyNotification( nullptr, &rFootnote );
 if ( m_pStartNode )
commit 6fadb93aab965a2430cfe1f1522c4e858c07fb75
Author: Michael Stahl 
AuthorDate: Tue Oct 16 16:28:19 2018 +0200
Commit: Michael Stahl 
CommitDate: Tue Oct 16 18:15:49 2018 +0200

sw_redlinehide_3: update footnote numbers on redline ops

Needed for FTNNUM_CHAPTER and FTNNUM_DOC, as well as end-notes.

It should be enough to update from the start node until the end.

Change-Id: I47414f93b9ad29bc4ab4ee0fc25ae40fae160427

diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 63b38d75bc86..97c693372940 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -

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

[Libreoffice Gerrit user]

 oox/source/export/drawingml.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 78313adecc5c9ec9ec0d54c1f4b181cd6ac53813
Author: Caolán McNamara 
AuthorDate: Tue Oct 16 15:30:50 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 18:09:48 2018 +0200

crashtesting: exception on exporting fdo77519-2.odt to docx

since...

commit 761308edb65a6cf44ef84cebc387e77af8b70f83
Date:   Thu Sep 13 04:04:41 2018 -0400

tdf#108064 OOXML export: fixing linestyle export in charts

Change-Id: I3b1a43246adaa1476ddba1b67f37d0e933a44345
Reviewed-on: https://gerrit.libreoffice.org/61842
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 4eef5ecd2ff1..092832844155 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -666,9 +666,8 @@ void DrawingML::WriteOutline( const 
Reference& rXPropSet, Referenc
 GET(aLineDashName, LineDashName);
 if (!aLineDashName.isEmpty()) {
 if (xModel) {
-css::uno::Any aAny;
-aAny = getLineDash(xModel, aLineDashName);
-aLineDash = aAny.get();
+css::uno::Any aAny = getLineDash(xModel, 
aLineDashName);
+aAny >>= aLineDash;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: New Defects reported by Coverity Scan for LibreOffice

[Stephan Bergmann]

On 16/10/2018 16:03, Caolán McNamara wrote:

On Tue, 2018-10-16 at 12:33 +, scan-ad...@coverity.com wrote:


** CID 1440303:  Error handling issues  (UNCAUGHT_EXCEPT)
/sc/source/core/data/column3.cxx: 2394 in
::FormulaToValueHandler::Entry::Entry(::FormulaToVa
lueHandler::Entry&&)()


FWIW I think the const-ing up of loplugin:constfields effectively
disables move constructors


https://www.chromium.org/rvalue-references?tmpl=%2Fsystem%2Fapp%2Ftemplates%2Fprint%2F&showPrintDialog=1#TOC-8.-Move-constructors-will-only-bind-to-non-const-rvalues
.


the poor consequences of loplugin:constfields notwithstanding, i think 
the coverity warning is bogus or incomplete:  ScCellValue's both copy 
and move ctors are potentially throwing, so Entry's impl defined move 
ctor may indeed throw an exception, but will impl have a potentially 
throwing exception spec (whether or not Entry's



ScCellValue const maValue;


member is const).  and the coverity analysis doesnt show that such an 
exception isnt caught, but claims "If the exception is ever thrown, the 
program will crash."

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

Re: problems with LayerTabBar in unit tests

[Regina Henschel]

Hi Thorsten,

Thorsten Behrens schrieb am 10-Oct-18 um 23:20:

Hi Regina,

Regina Henschel wrote:

So I still need to investigate what is missing.


If you can make it - perhaps something to look into for the Munich
Hackfest?

https://wiki.documentfoundation.org/Hackfest/Muenchen2018


I will not come to Munich Hackfest. Besides that, I have a solution now. 
You can examine it in https://gerrit.libreoffice.org/#/c/61545/


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

Re: unit test LayerTabBar, now linker problem

[Regina Henschel]

Hi Michael, hi Stephan, hi all,

I have dropped "dynamic". It is only a unit-test and cannot produce a 
crash in a release. With a static_cast all works now as intended. From 
my side it is finished now. But please have a look at the current 
version, whether you think that I should change something.

https://gerrit.libreoffice.org/#/c/61545/7

Kind regards
Regina


Michael Stahl schrieb am 15-Oct-18 um 15:45:

On 15.10.18 14:56, Regina Henschel wrote:

Hallo Michael,

Michael Stahl schrieb am 14-Oct-18 um 13:49:

On 13/10/2018 21:04, Regina Henschel wrote:



linker cannot find typeinfo for sd::GraphicViewShell (
https://ci.libreoffice.org/job/gerrit_linux_gcc_release/17086/ )

What is wrong there?


apparently GCC can't find the type information for GraphicViewShell
because it isn't exported from the shared library "sd".

it is needed because of dynamic_cast in the test.

you could use SAL_DLLPUBLIC_RTTI on GraphicViewShell, which will export
just enough so that dynamic_cast and type_info works, or use
SD_DLLPUBLIC on it, which will make all its member functions available
as well.


Both do not work, SD_DLLPUBLIC does not compile here, and
SAL_DLLPUBLIC_RTTI fails too, see Jenkins for patch set 5.


hmmm...

clang plugin dyncastvisibility did trigger. dynamic_cast from
"sd::ViewShell" with hidden type visibility to "sd::GraphicViewShell"
with default type visibility

... so probably you'd need to put the SAL_DLLPUBLIC_RTTI on the
superclass sd::ViewShell as well.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


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

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

[Libreoffice Gerrit user]

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

New commits:
commit 469902211317ca7d94c500a761f3f7d53a43a35a
Author: Caolán McNamara 
AuthorDate: Tue Oct 16 14:53:14 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 17:14:11 2018 +0200

coverity#1440303 use emplace_back instead of push_back

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

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 5cc446357e69..29ee998ebc35 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2409,9 +2409,9 @@ public:
 {
 ScFormulaCell* p2 = const_cast(p);
 if (p2->IsValue())
-maEntries.push_back(Entry(nRow, p2->GetValue()));
+maEntries.emplace_back(nRow, p2->GetValue());
 else
-maEntries.push_back(Entry(nRow, p2->GetString()));
+maEntries.emplace_back(nRow, p2->GetString());
 }
 
 void commitCells(ScColumn& rColumn)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sd/source/ui/view/viewshel.cxx |3 +++
 starmath/source/view.cxx   |6 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 0c1f93f3a2884d52b2ef329e87c7713bced17c33
Author: Caolán McNamara 
AuthorDate: Tue Oct 16 14:44:26 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 17:12:23 2018 +0200

coverity#1440240 Uncaught exception

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

diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index ddf9623a0656..60a74840a233 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -851,12 +851,16 @@ SmCmdBoxWrapper::SmCmdBoxWrapper(vcl::Window 
*pParentWindow, sal_uInt16 nId,
 
 struct SmViewShell_Impl
 {
+private:
+SmViewShell_Impl& operator=(const SmViewShell_Impl&) = delete;
+SmViewShell_Impl(const SmViewShell_Impl&) = delete;
+public:
+SmViewShell_Impl() = default;
 std::unique_ptr pDocInserter;
 std::unique_ptr pRequest;
 SvtMiscOptions constaOpts;
 };
 
-
 SFX_IMPL_SUPERCLASS_INTERFACE(SmViewShell, SfxViewShell)
 
 void SmViewShell::InitInterface_Impl()
commit ab79dc909ac755dd66c08c942f8be6957b9d0cfc
Author: Caolán McNamara 
AuthorDate: Tue Oct 16 14:41:14 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 17:12:11 2018 +0200

coverity#1440239 Uncaught exception

Change-Id: Ibecc931a53a58fc78f400e23e980f75def0f5935
Reviewed-on: https://gerrit.libreoffice.org/61838
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 3486f9be2013..47917c01647f 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -1213,6 +1213,9 @@ class KeepSlideSorterInSyncWithPageChanges
 sd::slidesorter::controller::PageSelector::UpdateLock const m_aUpdateLock;
 sd::slidesorter::controller::SelectionObserver::Context const m_aContext;
 
+KeepSlideSorterInSyncWithPageChanges& operator=(const 
KeepSlideSorterInSyncWithPageChanges&) = delete;
+KeepSlideSorterInSyncWithPageChanges(const 
KeepSlideSorterInSyncWithPageChanges&) = delete;
+
 public:
 explicit KeepSlideSorterInSyncWithPageChanges(sd::slidesorter::SlideSorter 
const & rSlideSorter)
 : m_aDrawLock(rSlideSorter)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/unx/generic/glyphs/freetype_glyphcache.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5d34a6efc6b7be5f89b9beee39af32b85498b177
Author: Caolán McNamara 
AuthorDate: Tue Oct 16 14:15:39 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 17:05:11 2018 +0200

coverity#1440242 silence Useless call

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

diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx 
b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index 8a5314ff697b..90a04e904379 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -278,7 +278,7 @@ void GlyphCache::InitFreetype()
 if( pEnv )
 nDefaultPrioAutoHint  = pEnv[0] - '0';
 
-vclFontFileList::get();
+(void)vclFontFileList::get();
 }
 
 FT_Face FreetypeFont::GetFtFace() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/source/window/dlgctrl.cxx |   21 -
 1 file changed, 12 insertions(+), 9 deletions(-)

New commits:
commit 5b554b31827ca378e1ff8beef8d4a9fef539bf4d
Author: Caolán McNamara 
AuthorDate: Tue Oct 16 14:14:08 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 17:04:57 2018 +0200

coverity#1440300 rework to silence Using invalid iterator

Change-Id: Icf887a54f0e999c633e4e3f514086c29842427fc
Reviewed-on: https://gerrit.libreoffice.org/61835
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index c46106f7665e..ccfb6a17c840 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -538,17 +538,20 @@ namespace
 ++aI;
 
 aI = std::find_if(aI, rGroup.end(), isSuitableDestination);
-if (aI == rGroup.end())
+if (aI != rGroup.end())
 {
-aI = std::find_if(rGroup.begin(), aStart, isSuitableDestination);
-if (aI == aStart)
-return false;
+vcl::Window *pWindow = *aI;
+pWindow->ImplControlFocus( GetFocusFlags::CURSOR | 
GetFocusFlags::Forward );
+return true;
 }
-
-vcl::Window *pWindow = *aI;
-
-pWindow->ImplControlFocus( GetFocusFlags::CURSOR | 
GetFocusFlags::Forward );
-return true;
+aI = std::find_if(rGroup.begin(), aStart, isSuitableDestination);
+if (aI != aStart)
+{
+vcl::Window *pWindow = *aI;
+pWindow->ImplControlFocus( GetFocusFlags::CURSOR | 
GetFocusFlags::Forward );
+return true;
+}
+return false;
 }
 
 bool nextInGroup(RadioButton *pSourceWindow, bool bBackward)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/libnumbertext offapi/com solenv/flatpak-manifest.in

[Libreoffice Gerrit user]

 download.lst |4 ++--
 external/libnumbertext/ExternalPackage_numbertext.mk |1 +
 offapi/com/sun/star/linguistic2/XNumberText.idl  |7 +++
 solenv/flatpak-manifest.in   |6 +++---
 4 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 469e3b5d9f0d4b118ca9237b79401a2b1152eb7d
Author: László Németh 
AuthorDate: Tue Oct 9 15:24:58 2018 +0200
Commit: László Németh 
CommitDate: Tue Oct 16 16:13:29 2018 +0200

bump to libnumbertext 1.0.5

with Estonian support and language fixes. Extend offapi also with
the missing Albanian, Galician, Norwegian, (Bokmål, Nynorsk) and
Ukrainian.

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

diff --git a/download.lst b/download.lst
index 01f56e61aec6..48bf64aa74f2 100644
--- a/download.lst
+++ b/download.lst
@@ -150,8 +150,8 @@ export LIBGPGERROR_SHA256SUM := 
4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf
 export LIBGPGERROR_TARBALL := libgpg-error-1.27.tar.bz2
 export LIBLANGTAG_SHA256SUM := 
d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e
 export LIBLANGTAG_TARBALL := liblangtag-0.6.2.tar.bz2
-export LIBNUMBERTEXT_SHA256SUM := 
349258f4c3a8b090893e847b978b22e8dc1343d4ada3bfba811b97144f1dd67b
-export LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.4.tar.xz
+export LIBNUMBERTEXT_SHA256SUM := 
e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7
+export LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.5.tar.xz
 export LIBTOMMATH_SHA256SUM := 
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
 export LIBTOMMATH_TARBALL := ltm-1.0.zip
 export XMLSEC_SHA256SUM := 
8d8276c9c720ca42a3b0023df8b7ae41a2d6c5f9aa8d20ed1672d84cc8982d50
diff --git a/external/libnumbertext/ExternalPackage_numbertext.mk 
b/external/libnumbertext/ExternalPackage_numbertext.mk
index 995b97f7c87b..330a7fe21a3e 100644
--- a/external/libnumbertext/ExternalPackage_numbertext.mk
+++ b/external/libnumbertext/ExternalPackage_numbertext.mk
@@ -20,6 +20,7 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,libnumbertext_numbertext,$(L
data/en.sor \
data/eo.sor \
data/es.sor \
+   data/et.sor \
data/fi.sor \
data/fr.sor \
data/fr.sor \
diff --git a/offapi/com/sun/star/linguistic2/XNumberText.idl 
b/offapi/com/sun/star/linguistic2/XNumberText.idl
index 43a0935ae230..0c304acebb1c 100644
--- a/offapi/com/sun/star/linguistic2/XNumberText.idl
+++ b/offapi/com/sun/star/linguistic2/XNumberText.idl
@@ -46,10 +46,12 @@ module com { module sun { module star { module linguistic2 {
 en-NZ : New Zealand English
 eo : Esperanto
 es : Spanish
+et : Estonian
 fi : Finnish
 fr : French
 fr-BE : Belgian French
 fr-CH : Swiss French
+gl : Galician
 he : Hebrew
 hr : Croatian
 hu : Hungarian
@@ -64,7 +66,10 @@ module com { module sun { module star { module linguistic2 {
 lt : Lithuanian
 lv : Latvian
 ms : Malay
+nb : Bokmål (Norwegian)
 nl : Dutch
+nn : Nynorsk (Norwegian)
+no : Norwegian (Bokmål)
 pl : Polish
 pt-BR : Portuguese (Brasilian)
 pt-PT : Portuguese (Portugal)
@@ -73,11 +78,13 @@ module com { module sun { module star { module linguistic2 {
 ru : Russian
 sh : Serbian (written with latin characters)
 sl : Slovenian
+sq : Albanian
 sr : Serbian (written with cyrillic characters) (added with OOo 
3.4)
 Suzhou : Suzhou numerals
 sv : Swedish
 th : Thai
 tr : Turkish
+uk : Ukrainian
 vi : Vietnamese
 zh : Chinese
 
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index d9c397de4318..d0eb3c8f616b 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -582,10 +582,10 @@
 "dest-filename": 
"external/tarballs/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libnumbertext-1.0.4.tar.xz";,
-"sha256": 
"349258f4c3a8b090893e847b978b22e8dc1343d4ada3bfba811b97144f1dd67b",
+"url": 
"https://dev-www.libreoffice.org/src/libnumbertext-1.0.5.tar.xz";,
+"sha256": 
"e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7",
 "type": "file",
-"dest-filename": 
"external/tarballs/libnumbertext-1.0.4.tar.xz"
+"dest-filename": 
"external/tarballs/libnumbertext-1.0.5.tar.xz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/extern/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf

Re: New Defects reported by Coverity Scan for LibreOffice

[Caolán McNamara]

On Tue, 2018-10-16 at 12:33 +, scan-ad...@coverity.com wrote:
> 
> ** CID 1440303:  Error handling issues  (UNCAUGHT_EXCEPT)
> /sc/source/core/data/column3.cxx: 2394 in
> ::FormulaToValueHandler::Entry::Entry(::FormulaToVa
> lueHandler::Entry&&)()

FWIW I think the const-ing up of loplugin:constfields effectively
disables move constructors


https://www.chromium.org/rvalue-references?tmpl=%2Fsystem%2Fapp%2Ftemplates%2Fprint%2F&showPrintDialog=1#TOC-8.-Move-constructors-will-only-bind-to-non-const-rvalues
.

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

[Libreoffice-commits] core.git: basctl/uiconfig cui/uiconfig dbaccess/uiconfig extensions/uiconfig fpicker/uiconfig sc/uiconfig sd/uiconfig sfx2/uiconfig svx/uiconfig sw/uiconfig

[Libreoffice Gerrit user]

 basctl/uiconfig/basicide/ui/exportdialog.ui   |1 +
 basctl/uiconfig/basicide/ui/importlibdialog.ui|1 +
 basctl/uiconfig/basicide/ui/managebreakpoints.ui  |1 +
 cui/uiconfig/ui/fmsearchdialog.ui |3 +++
 cui/uiconfig/ui/hangulhanjaeditdictdialog.ui  |3 +++
 dbaccess/uiconfig/ui/choosedatasourcedialog.ui|1 +
 dbaccess/uiconfig/ui/parametersdialog.ui  |1 +
 dbaccess/uiconfig/ui/password.ui  |1 +
 dbaccess/uiconfig/ui/textconnectionsettings.ui|1 +
 extensions/uiconfig/spropctrlr/ui/datatypedialog.ui   |1 +
 extensions/uiconfig/spropctrlr/ui/labelselectiondialog.ui |1 +
 fpicker/uiconfig/ui/remotefilesdialog.ui  |3 +++
 sc/uiconfig/scalc/ui/analysisofvariancedialog.ui  |1 +
 sc/uiconfig/scalc/ui/chisquaretestdialog.ui   |1 +
 sc/uiconfig/scalc/ui/condformatmanager.ui |1 +
 sc/uiconfig/scalc/ui/correlationdialog.ui |1 +
 sc/uiconfig/scalc/ui/covariancedialog.ui  |1 +
 sc/uiconfig/scalc/ui/datafielddialog.ui   |1 +
 sc/uiconfig/scalc/ui/dataform.ui  |1 +
 sc/uiconfig/scalc/ui/definename.ui|1 +
 sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui   |1 +
 sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui|1 +
 sc/uiconfig/scalc/ui/formulacalculationoptions.ui |1 +
 sc/uiconfig/scalc/ui/movingaveragedialog.ui   |1 +
 sc/uiconfig/scalc/ui/pivotfielddialog.ui  |1 +
 sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui|1 +
 sc/uiconfig/scalc/ui/randomnumbergenerator.ui |1 +
 sc/uiconfig/scalc/ui/regressiondialog.ui  |1 +
 sc/uiconfig/scalc/ui/samplingdialog.ui|1 +
 sc/uiconfig/scalc/ui/scenariodialog.ui|1 +
 sc/uiconfig/scalc/ui/ttestdialog.ui   |1 +
 sc/uiconfig/scalc/ui/xmlsourcedialog.ui   |1 +
 sc/uiconfig/scalc/ui/ztestdialog.ui   |1 +
 sd/uiconfig/sdraw/ui/namedesign.ui|1 +
 sd/uiconfig/simpress/ui/masterlayoutdlg.ui|1 +
 sd/uiconfig/simpress/ui/remotedialog.ui   |1 +
 sfx2/uiconfig/ui/checkin.ui   |1 +
 sfx2/uiconfig/ui/newstyle.ui  |1 +
 svx/uiconfig/ui/compressgraphicdialog.ui  |1 +
 svx/uiconfig/ui/safemodedialog.ui |3 +++
 sw/uiconfig/swriter/ui/insertbookmark.ui  |3 +++
 41 files changed, 51 insertions(+)

New commits:
commit f0ca3ee62dce657293c85764931b0f5183a292c4
Author: Caolán McNamara 
AuthorDate: Tue Oct 16 12:11:47 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 16:01:34 2018 +0200

Related: tdf#120612 help response missing from other help buttons

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

diff --git a/basctl/uiconfig/basicide/ui/exportdialog.ui 
b/basctl/uiconfig/basicide/ui/exportdialog.ui
index a345c436a5aa..a56239c9e16c 100644
--- a/basctl/uiconfig/basicide/ui/exportdialog.ui
+++ b/basctl/uiconfig/basicide/ui/exportdialog.ui
@@ -128,6 +128,7 @@
 
   ok
   cancel
+  help
 
   
 
diff --git a/basctl/uiconfig/basicide/ui/importlibdialog.ui 
b/basctl/uiconfig/basicide/ui/importlibdialog.ui
index a8d015d3f962..a13849b75743 100644
--- a/basctl/uiconfig/basicide/ui/importlibdialog.ui
+++ b/basctl/uiconfig/basicide/ui/importlibdialog.ui
@@ -199,6 +199,7 @@
 
   ok
   cancel
+  help
 
   
 
diff --git a/basctl/uiconfig/basicide/ui/managebreakpoints.ui 
b/basctl/uiconfig/basicide/ui/managebreakpoints.ui
index ba7ca5bb2e00..1f8246616693 100644
--- a/basctl/uiconfig/basicide/ui/managebreakpoints.ui
+++ b/basctl/uiconfig/basicide/ui/managebreakpoints.ui
@@ -285,6 +285,7 @@
   delete
   ok
   cancel
+  help
 
   
 
diff --git a/cui/uiconfig/ui/fmsearchdialog.ui 
b/cui/uiconfig/ui/fmsearchdialog.ui
index fa3c7ac6a0dc..b4069f14da26 100644
--- a/cui/uiconfig/ui/fmsearchdialog.ui
+++ b/cui/uiconfig/ui/fmsearchdialog.ui
@@ -796,6 +796,9 @@
 
   
 
+
+  help
+
   
   
 
diff --git a/cui/uiconfig/ui/hangulhanjaeditdictdialog.ui 
b/cui/uiconfig/ui/hangulhanjaeditdictdialog.ui
index 923dad4d0e0a..dda3a5219479 100644
--- a/cui/uiconfig/ui/hangulhanjaeditdictdialog.ui
+++ b/cui/uiconfig/ui/hangulhanjaeditdictdialog.ui
@@ -347,5 +347,8 @@
 
   
 
+
+  help
+
   
 
diff --git a/dbaccess/uiconfig/ui/choosedatasourcedialog.ui 
b/dbaccess/uiconfig

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

[Libreoffice Gerrit user]

 sfx2/source/sidebar/FocusManager.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 0db54833da1048c0454b8bb564025b9072ee36d1
Author: Caolán McNamara 
AuthorDate: Tue Oct 16 13:09:37 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 16:01:07 2018 +0200

crashtesting: bad sidebar index during teardown as decks are removed

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

diff --git a/sfx2/source/sidebar/FocusManager.cxx 
b/sfx2/source/sidebar/FocusManager.cxx
index ab9afcfa6d93..85a9a7741630 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -65,6 +65,11 @@ void FocusManager::GrabFocusPanel()
 
 void FocusManager::GrabFocusButton(const sal_Int32 nIndex)
 {
+if (static_cast(nIndex) >= maButtons.size())
+{
+SAL_WARN("sfx.sidebar", "invalid focus index, probably during 
teardown");
+return;
+}
 FocusButton(nIndex);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: New Defects reported by Coverity Scan for LibreOffice

[Caolán McNamara]

On Tue, 2018-10-16 at 16:14 +0300, Arkadiy Illarionov wrote:
> 
> I suppose it's FP since aI ∈ [rGroup.begin(); aStart) ∪
> (aStart; rGroup.end()).

Seems a false positive to me anyway.

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

Re: New Defects reported by Coverity Scan for LibreOffice

[Arkadiy Illarionov]

вт, 16 окт. 2018 г. в 15:34, :

> ** CID 1440300:  API usage errors  (INVALIDATE_ITERATOR)
> /vcl/source/window/dlgctrl.cxx: 548 in ::focusNextInGroup(const
> __gnu_cxx::__normal_iterator *,
> std::vector, std::allocator>>> &,
> std::vector, std::allocator>> &)()
>
>
>
> 
> *** CID 1440300:  API usage errors  (INVALIDATE_ITERATOR)
> /vcl/source/window/dlgctrl.cxx: 548 in ::focusNextInGroup(const
> __gnu_cxx::__normal_iterator *,
> std::vector, std::allocator>>> &,
> std::vector, std::allocator>> &)()
> 542 {
> 543 aI = std::find_if(rGroup.begin(), aStart,
> isSuitableDestination);
> 544 if (aI == aStart)
> 545 return false;
> 546 }
> 547
> >>> CID 1440300:  API usage errors  (INVALIDATE_ITERATOR)
> >>> Dereferencing iterator "aI" though it is already past the end of
> its container.
> 548 vcl::Window *pWindow = *aI;
> 549
> 550 pWindow->ImplControlFocus( GetFocusFlags::CURSOR |
> GetFocusFlags::Forward );
> 551 return true;
> 552 }
> 553
>

I suppose it's FP since aI ∈ [rGroup.begin(); aStart) ∪
(aStart; rGroup.end()).
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx |2 +-
 xmlscript/source/xml_helper/xml_byteseq.cxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6d7ffb35c4a18542f81011886cd1d8816b32f572
Author: Noel Grandin 
AuthorDate: Tue Oct 16 10:45:51 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 16 14:44:00 2018 +0200

clang-tidy readability-simplify-subscript-expr

error: accessing an element of the container does not require a call to
'data()'; did you mean to use 'operator[]'?

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

diff --git a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx 
b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx
index 6bcab2d41d62..a9ce3995cec9 100644
--- a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx
+++ b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx
@@ -52,7 +52,7 @@ void OOXMLBinaryObjectReference::read()
 nSize += nBytesRead;
 mSequence.resize(nSize);
 
-memcpy(&mSequence.data()[nOldSize], aSeq.getArray(), nBytesRead);
+memcpy(&mSequence[nOldSize], aSeq.getArray(), nBytesRead);
 }
 
 mbRead = true;
diff --git a/xmlscript/source/xml_helper/xml_byteseq.cxx 
b/xmlscript/source/xml_helper/xml_byteseq.cxx
index e0d5ec272466..8dec2ce0e8db 100644
--- a/xmlscript/source/xml_helper/xml_byteseq.cxx
+++ b/xmlscript/source/xml_helper/xml_byteseq.cxx
@@ -63,7 +63,7 @@ sal_Int32 BSeqInputStream::readBytes(
 if (rData.getLength() != nBytesToRead)
 rData.realloc( nBytesToRead );
 if (nBytesToRead != 0) {
-memcpy(rData.getArray(), &_seq.data()[_nPos], nBytesToRead);
+memcpy(rData.getArray(), &_seq[_nPos], nBytesToRead);
 }
 _nPos += nBytesToRead;
 return nBytesToRead;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

4 new defect(s) introduced to LibreOffice found with Coverity Scan.
5 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent 
build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 4 of 4 defect(s)


** CID 1440303:  Error handling issues  (UNCAUGHT_EXCEPT)
/sc/source/core/data/column3.cxx: 2394 in 
::FormulaToValueHandler::Entry::Entry(::FormulaToValueHandler::Entry&&)()



*** CID 1440303:  Error handling issues  (UNCAUGHT_EXCEPT)
/sc/source/core/data/column3.cxx: 2394 in 
::FormulaToValueHandler::Entry::Entry(::FormulaToValueHandler::Entry&&)()
2388 }
2389 
2390 namespace {
2391 
2392 class FormulaToValueHandler
2393 {
>>> CID 1440303:  Error handling issues  (UNCAUGHT_EXCEPT)
>>> An exception of type "com::sun::star::uno::RuntimeException" is thrown 
>>> but the throw list "throw()" doesn't allow it to be thrown. This will cause 
>>> a call to unexpected() which usually calls terminate().
2394 struct Entry
2395 {
2396 SCROW const mnRow;
2397 ScCellValue const maValue;
2398 
2399 Entry(SCROW nRow, double f) : mnRow(nRow), maValue(f) {}

** CID 1440302:  Error handling issues  (UNCAUGHT_EXCEPT)
/oox/qa/unit/vba_compression.cxx: 20 in 
TestVbaCompression::TestVbaCompression()()



*** CID 1440302:  Error handling issues  (UNCAUGHT_EXCEPT)
/oox/qa/unit/vba_compression.cxx: 20 in 
TestVbaCompression::TestVbaCompression()()
14 #include 
15 #include 
16 #include 
17 #include 
18 #include 
19 
>>> CID 1440302:  Error handling issues  (UNCAUGHT_EXCEPT)
>>> An exception of type "CppUnit::Exception" is thrown but the throw list 
>>> "throw()" doesn't allow it to be thrown. This will cause a call to 
>>> unexpected() which usually calls terminate().
20 class TestVbaCompression : public CppUnit::TestFixture
21 {
22 public:
23 // just a sequence of bytes that should not be compressed at all
24 void testSimple1();
25 

** CID 1440301:  Error handling issues  (UNCAUGHT_EXCEPT)
/sc/source/core/data/column3.cxx: 2394 in 
::FormulaToValueHandler::Entry::Entry(const 
::FormulaToValueHandler::Entry&)()



*** CID 1440301:  Error handling issues  (UNCAUGHT_EXCEPT)
/sc/source/core/data/column3.cxx: 2394 in 
::FormulaToValueHandler::Entry::Entry(const 
::FormulaToValueHandler::Entry&)()
2388 }
2389 
2390 namespace {
2391 
2392 class FormulaToValueHandler
2393 {
>>> CID 1440301:  Error handling issues  (UNCAUGHT_EXCEPT)
>>> An exception of type "com::sun::star::uno::RuntimeException" is thrown 
>>> but the throw list "throw()" doesn't allow it to be thrown. This will cause 
>>> a call to unexpected() which usually calls terminate().
2394 struct Entry
2395 {
2396 SCROW const mnRow;
2397 ScCellValue const maValue;
2398 
2399 Entry(SCROW nRow, double f) : mnRow(nRow), maValue(f) {}

** CID 1440300:  API usage errors  (INVALIDATE_ITERATOR)
/vcl/source/window/dlgctrl.cxx: 548 in ::focusNextInGroup(const 
__gnu_cxx::__normal_iterator *, 
std::vector, std::allocator>>> &, 
std::vector, std::allocator>> &)()



*** CID 1440300:  API usage errors  (INVALIDATE_ITERATOR)
/vcl/source/window/dlgctrl.cxx: 548 in ::focusNextInGroup(const 
__gnu_cxx::__normal_iterator *, 
std::vector, std::allocator>>> &, 
std::vector, std::allocator>> &)()
542 {
543 aI = std::find_if(rGroup.begin(), aStart, 
isSuitableDestination);
544 if (aI == aStart)
545 return false;
546 }
547 
>>> CID 1440300:  API usage errors  (INVALIDATE_ITERATOR)
>>> Dereferencing iterator "aI" though it is already past the end of its 
>>> container.
548 vcl::Window *pWindow = *aI;
549 
550 pWindow->ImplControlFocus( GetFocusFlags::CURSOR | 
GetFocusFlags::Forward );
551 return true;
552 }
553 



To view the defects in Coverity Scan visit, 
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRZBnDJeNb0HijxaS4JNJPxk3kpyAm2AYqo71yXmnOxB72ibeUH-2F-2F1Lhi9AZq3dRu-2F4-3D_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpyrqxNmtDNMQOfRHSvcL0NvhMePqxge-2FwBFwmy9hgwTQtBv-2FtrqR2NYOlBEj2Gst1NdyE

[Libreoffice-commits] core.git: setup.cfg

[Libreoffice Gerrit user]

 setup.cfg |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c081264c84ab7515653655aaddb5630d5c46d38c
Author: Miklos Vajna 
AuthorDate: Tue Oct 16 12:25:38 2018 +0200
Commit: Miklos Vajna 
CommitDate: Tue Oct 16 14:29:06 2018 +0200

pep8 -> pycodestyle

To silence this warning:

/usr/lib/python3.6/site-packages/pycodestyle.py:2190: UserWarning: [pep8] 
section is deprecated. Use [pycodestyle].
  warnings.warn('[pep8] section is deprecated. Use [pycodestyle].')

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

diff --git a/setup.cfg b/setup.cfg
index 5c0df0dd0ebb..62e73811c732 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,2 @@
-[pep8]
+[pycodestyle]
 max-line-length = 100
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/ui/notebookbar.ui| 1475 +++--
 sd/uiconfig/sdraw/ui/notebookbar.ui|  263 -
 sd/uiconfig/simpress/ui/notebookbar.ui |  234 -
 sw/uiconfig/swriter/ui/notebookbar.ui  |  163 ---
 4 files changed, 765 insertions(+), 1370 deletions(-)

New commits:
commit 8c4facf89499ede01b43de34b4285c2f08a1708d
Author: andreas kainz 
AuthorDate: Mon Oct 15 18:47:36 2018 +0200
Commit: andreas_kainz 
CommitDate: Tue Oct 16 14:25:57 2018 +0200

Notebookbar: update tabbed toolbar for calc

remove separator in other tabbedbars

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

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 5f331d60e864..2564260cbf86 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -659,132 +659,6 @@
   
 
   
-  
-True
-False
-
-  
-True
-False
-.uno:Crop
-  
-
-
-  
-True
-False
-.uno:ExternalEdit
-  
-
-
-  
-True
-False
-.uno:ChangePicture
-  
-
-
-  
-True
-False
-.uno:CompressGraphic
-  
-
-
-  
-True
-False
-.uno:SaveGraphic
-  
-
-
-  
-True
-False
-  
-
-
-  
-True
-False
-.uno:ObjectMirrorVertical
-  
-
-
-  
-True
-False
-.uno:ObjectMirrorHorizontal
-  
-
-
-  
-True
-False
-  
-
-
-  
-True
-False
-.uno:EditShapeHyperlink
-  
-
-
-  
-True
-False
-.uno:DeleteShapeHyperlink
-  
-
-
-  
-True
-False
-.uno:OpenHyperlinkOnCursor
-  
-
-
-  
-True
-False
-  
-
-
-  
-True
-False
-.uno:ImageMapDialog
-  
-
-
-  
-True
-False
-.uno:AssignMacro
-  
-
-
-  
-True
-False
-  
-
-
-  
-True
-False
-.uno:ObjectTitleDescription
-  
-
-
-  
-True
-False
-.uno:RenameObject
-  
-
-  
   
 True
 False
@@ -854,7 +728,7 @@
 True
 False
 vnd.sun.star.job:alias=UpdateCheck
-_Check for Updates...
+_Check for Updates...
   
 
 
@@ -1066,6 +940,99 @@
   
 
   
+  
+True
+False
+
+  
+True
+False
+.uno:Crop
+  
+
+
+  
+True
+False
+.uno:ExternalEdit
+  
+
+
+  
+True
+False
+.uno:ChangePicture
+  
+
+
+  
+True
+False
+.uno:CompressGraphic
+  
+
+
+  
+True
+False
+.uno:SaveGraphic
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:OriginalSize
+  
+
+
+  
+True
+False
+.uno:OriginalSize
+  
+
+
+  
+True
+False
+.uno:ImageMapDialog
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:NameGroup
+  
+
+
+  
+True
+False
+.uno:ObjectTitleDescription
+  
+
+
+  
+True
+False
+.uno:AssignMacro
+  
+
+  
   
 True
 False
@@ -1675,7 +1642,7 @@
 True
 False
 vnd.sun.star.job:alias=UpdateCheck
-_Check for Updates...
+_Check for Updates...
   
 
 
@@ -1866,7 +1833,7 @@
 True
 False
 
-  
+  
 True
 False
 end
@@ -1949,7 +1916,7 @@
 vertical
 
   
-_File
+_File
 True
 True
 False
@@ -1968,7 +1935,7 @@
 
 
   
-_Help
+_Help
 True
 True
 False
@@ -2001,58 +1968,66 @@
   
 
 
-  
-True
-False
-end
-5
-5
-   

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

[Libreoffice Gerrit user]

 sfx2/uiconfig/ui/linkeditdialog.ui |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 7415495021a2f63d2d05895f3f91d818ce77a7b9
Author: Caolán McNamara 
AuthorDate: Tue Oct 16 10:39:04 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 14:12:25 2018 +0200

tdf#120610 add title to DDE Link dialog

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

diff --git a/sfx2/uiconfig/ui/linkeditdialog.ui 
b/sfx2/uiconfig/ui/linkeditdialog.ui
index 45c6f90a3a66..437d5f92330f 100644
--- a/sfx2/uiconfig/ui/linkeditdialog.ui
+++ b/sfx2/uiconfig/ui/linkeditdialog.ui
@@ -1,14 +1,18 @@
 
-
+
 
   
   
 False
 6
+Modify DDE Link
 True
 0
 0
 dialog
+
+  
+
 
   
 False
@@ -200,8 +204,5 @@
   cancel
   help
 
-
-  
-
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 00358845506ad90bd784cb6723651908ad8f52a3
Author: Olivier Hallot 
AuthorDate: Tue Oct 16 09:06:35 2018 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Oct 16 14:08:44 2018 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - tdf#120612 (related) update DDE link Help page

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

diff --git a/helpcontent2 b/helpcontent2
index 4ae4af1388c0..f41adf3e2e94 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4ae4af1388c05830d6dc018a571d5430893bcf89
+Subproject commit f41adf3e2e942af9ec6c0687cf3490f6b7e5f6fc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/shared/00/0402.xhp |2 +-
 source/text/shared/01/02180100.xhp |   28 
 2 files changed, 17 insertions(+), 13 deletions(-)

New commits:
commit f41adf3e2e942af9ec6c0687cf3490f6b7e5f6fc
Author: Olivier Hallot 
AuthorDate: Tue Oct 16 09:06:35 2018 -0300
Commit: Olivier Hallot 
CommitDate: Tue Oct 16 14:08:44 2018 +0200

tdf#120612 (related) update DDE link Help page

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

diff --git a/source/text/shared/00/0402.xhp 
b/source/text/shared/00/0402.xhp
index 52b456241..1ecb8347f 100644
--- a/source/text/shared/00/0402.xhp
+++ b/source/text/shared/00/0402.xhp
@@ -208,7 +208,7 @@
 
 Choose Tools - Bibliography 
Database.
 Choose Edit - Links.
-Choose Edit - Links - Modify Link (DDE links 
only).
+Choose Edit - Links to External Files - Modify... (DDE 
links only).
 
 Select a 
frame, then choose Edit - Object - Properties.
 Open context 
menu of selected frame, choose Properties.
diff --git a/source/text/shared/01/02180100.xhp 
b/source/text/shared/01/02180100.xhp
index 2c8c1a5f4..4f6ea9609 100644
--- a/source/text/shared/01/02180100.xhp
+++ b/source/text/shared/01/02180100.xhp
@@ -20,7 +20,7 @@
 
 
   
-Modify Links
+Modify DDE Links
 /text/shared/01/02180100.xhp
   
   
@@ -30,21 +30,25 @@
 
 
 
-links; modifying
-changing; links
-MW changed "modifying;..." to "changing;..."
-Modify 
Links
+
+DDE links; modifying
+changing; DDE links
+
+Modify DDE 
Links
   Change the 
properties for the selected DDE link.
 
   
 
-Edit 
Links
+Modify 
Link
   Lets you set 
the properties for the selected link.
-Application:
-  Lists the application that last saved the 
source file.
-File:
-  Lists the path to the source 
file.
-Section
-  Lists the section that the link refers to 
in the source file. If you want, you can enter a new section 
here.
+  
+Application
+Lists the application that last saved the 
source file. %PRODUCTNAME applications have the server name 
soffice.
+
+File
+Path to the source file. Relative 
paths must be expressed by full URI, for example, with 
file://.
+
+Category
+  Lists the section or object that the link 
refers to in the source file. If you want, you can enter a new section or 
object here.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/qa/unit/ucalc.hxx   |2 +
 sc/qa/unit/ucalc_sharedformula.cxx |   42 +
 2 files changed, 44 insertions(+)

New commits:
commit e77f63d6ab56d526bebaa409b9b03eee5a05609d
Author: Eike Rathke 
AuthorDate: Tue Oct 16 11:22:20 2018 +0200
Commit: Eike Rathke 
CommitDate: Tue Oct 16 13:50:24 2018 +0200

Unit test deleting shared formula group top cell, tdf#119623

Change-Id: I9a497b9d9ae09c8764f62549a60c8a2a952bc9e9
Reviewed-on: https://gerrit.libreoffice.org/61822
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index a59483e0789c..9f69783ad815 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -406,6 +406,7 @@ public:
 void testSharedFormulaUnshareAreaListeners();
 void testSharedFormulaListenerDeleteArea();
 void testSharedFormulaUpdateOnReplacement();
+void testSharedFormulaDeleteTopCell();
 void testFormulaPosition();
 void testFormulaWizardSubformula();
 
@@ -755,6 +756,7 @@ public:
 CPPUNIT_TEST(testSharedFormulaUnshareAreaListeners);
 CPPUNIT_TEST(testSharedFormulaListenerDeleteArea);
 CPPUNIT_TEST(testSharedFormulaUpdateOnReplacement);
+CPPUNIT_TEST(testSharedFormulaDeleteTopCell);
 CPPUNIT_TEST(testFormulaPosition);
 CPPUNIT_TEST(testFormulaWizardSubformula);
 CPPUNIT_TEST(testMixData);
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx 
b/sc/qa/unit/ucalc_sharedformula.cxx
index f05929e570cb..853f54c30ff9 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -1898,5 +1898,47 @@ void Test::testSharedFormulaUpdateOnReplacement()
 m_pDoc->DeleteTab(0);
 }
 
+void Test::testSharedFormulaDeleteTopCell()
+{
+sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn on auto calc.
+
+m_pDoc->InsertTab(0, "Test");
+
+const char* pData[][2] = {
+{ "=SUM(B$1:B$2)", "1" },
+{ "=SUM(B$1:B$2)", "2" }
+};
+
+insertRangeData( m_pDoc, ScAddress(0,0,0), pData, SAL_N_ELEMENTS(pData));
+
+// Check that A1:A2 is a formula group.
+const ScFormulaCell* pFC = m_pDoc->GetFormulaCell( ScAddress(0,0,0));
+CPPUNIT_ASSERT(pFC);
+CPPUNIT_ASSERT_EQUAL(static_cast(0), pFC->GetSharedTopRow());
+CPPUNIT_ASSERT_EQUAL(static_cast(2), pFC->GetSharedLength());
+
+// Check results A1:A2.
+CPPUNIT_ASSERT_EQUAL( 3.0, m_pDoc->GetValue( ScAddress(0,0,0)));
+CPPUNIT_ASSERT_EQUAL( 3.0, m_pDoc->GetValue( ScAddress(0,1,0)));
+
+// Delete cell A1.
+ScMarkData aMark;
+aMark.SelectOneTable(0);
+getDocShell().GetDocFunc().DeleteCell( ScAddress(0,0,0), aMark, 
InsertDeleteFlags::CONTENTS, false);
+// Check it's gone.
+CPPUNIT_ASSERT(!m_pDoc->GetFormulaCell( ScAddress(0,0,0)));
+
+// Check result A2.
+CPPUNIT_ASSERT_EQUAL( 3.0, m_pDoc->GetValue( ScAddress(0,1,0)));
+
+// Replace B1 with 4.
+m_pDoc->SetString( ScAddress(1,0,0), "4");
+
+// Check result A2.
+CPPUNIT_ASSERT_EQUAL( 6.0, m_pDoc->GetValue( ScAddress(0,1,0)));
+
+m_pDoc->DeleteTab(0);
+}
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sfx2/uiconfig/ui/linkeditdialog.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 83cc4a58fd672d83ed020c2697288c7948f1538b
Author: Caolán McNamara 
AuthorDate: Tue Oct 16 10:40:28 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 13:47:38 2018 +0200

Resolves: tdf#120612 help response missing

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

diff --git a/sfx2/uiconfig/ui/linkeditdialog.ui 
b/sfx2/uiconfig/ui/linkeditdialog.ui
index de9602b39bb9..45c6f90a3a66 100644
--- a/sfx2/uiconfig/ui/linkeditdialog.ui
+++ b/sfx2/uiconfig/ui/linkeditdialog.ui
@@ -198,6 +198,7 @@
 
   ok
   cancel
+  help
 
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Problem with C# and LibreOffice SDK

[Jean Leno Heidemann]

Hi all!

Can someone help me with my C# integration with LibreOffice SDK?

I am developing a desktop application in .NET (C#) and my machine works 
correctly, I can make the LibreOffice call, open a file and customize the 
interface all through my .NET application, but in order to work, it is 
necessary the version of the SDK is the same as that of LibreOffice installed 
on the machine, and the architecture of the application should be the same as 
that of LibreOffice (32 or 64 bits).
To work the integration, I had to add in the references of my project the DLLs 
that comes along with the SDK:
* cli_basetypes.dll
* cli_cppuhelper.dll
* cli_oootypes.dll
* cli_ure.dll
* cli_uretypes.dll
So at first all right, but my question is this: I developed the application 
using LibreOffice 6.1 along with the SDK of the same version and now I need the 
application to run on another machine with a lower version of LibreOffice, 
which I can not currently get, with the following error occurring:
* System.IO.FileNotFoundException: Could not load file or assembly 
'cli_cppuhelper.dll' or one of its dependencies. The specified module could not 
be found.
Is it possible to run the application on another machine with a different 
version of LibreOffice? How? Also, is it possible to avoid errors because the 
application is developed in 64bit and LibreOffice installed is 32bit for 
example?



Jean Leno Heidemann
Desenvolvimento
Tel.: +55 (47)30329781
SoftExpert Software
www.softexpert.com.br

[http://www.softexpert.com/ext/assinatura-email/assinatura-email.jpg]

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

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

[Libreoffice Gerrit user]

 include/vcl/slider.hxx   |1 
 include/vcl/status.hxx   |3 
 lotuswordpro/inc/xfilter/xfborders.hxx   |1 
 lotuswordpro/inc/xfilter/xfcellstyle.hxx |2 
 lotuswordpro/inc/xfilter/xfdrawstyle.hxx |1 
 lotuswordpro/inc/xfilter/xffont.hxx  |8 -
 lotuswordpro/inc/xfilter/xfnumberstyle.hxx   |3 
 lotuswordpro/inc/xfilter/xfparastyle.hxx |6 -
 lotuswordpro/source/filter/xfilter/xfborders.cxx |3 
 lotuswordpro/source/filter/xfilter/xfcellstyle.cxx   |   17 ---
 lotuswordpro/source/filter/xfilter/xfdrawstyle.cxx   |   26 
 lotuswordpro/source/filter/xfilter/xffont.cxx|   92 
 lotuswordpro/source/filter/xfilter/xfnumberstyle.cxx |   29 -
 lotuswordpro/source/filter/xfilter/xfparastyle.cxx   |   57 --
 svx/source/stbctrls/modctrl.cxx  |3 
 svx/source/stbctrls/pszctrl.cxx  |3 
 svx/source/stbctrls/xmlsecctrl.cxx   |3 
 svx/source/stbctrls/zoomsliderctrl.cxx   |3 
 sw/source/uibase/utlui/viewlayoutctrl.cxx|3 
 vcl/inc/listbox.hxx  |1 
 vcl/source/control/imp_listbox.cxx   |   35 +++---
 vcl/source/control/slider.cxx|8 -
 vcl/source/filter/wmf/wmfwr.cxx  |8 -
 vcl/source/filter/wmf/wmfwr.hxx  |1 
 vcl/source/window/status.cxx |  106 ++-
 25 files changed, 70 insertions(+), 353 deletions(-)

New commits:
commit 4b1d185de3cdab97805391a41c778cce9c5fce19
Author: Noel Grandin 
AuthorDate: Tue Oct 16 10:14:40 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 16 13:25:17 2018 +0200

loplugin:singlevalfields in vcl

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

diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx
index cc4919b58fea..6549b4c0ac54 100644
--- a/include/vcl/slider.hxx
+++ b/include/vcl/slider.hxx
@@ -48,7 +48,6 @@ private:
 sal_uInt16  mnStateFlags;
 ScrollType  meScrollType;
 boolmbCalcSize;
-boolmbFullDrag;
 boolmbScrollTypeSet;
 
 VclPtr mpLinkedField;
diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx
index 1fe0935fc622..bbd270cc4f88 100644
--- a/include/vcl/status.hxx
+++ b/include/vcl/status.hxx
@@ -75,7 +75,6 @@ private:
 sal_uInt16  mnCurItemId;
 sal_uInt16  mnPercent;
 sal_uInt16  mnPercentCount;
-boolmbVisibleItems;
 boolmbFormat;
 boolmbProgressMode;
 boolmbInUserDraw;
@@ -129,8 +128,6 @@ public:
 voidHideItem( sal_uInt16 nItemId );
 boolIsItemVisible( sal_uInt16 nItemId ) const;
 
-boolAreItemsVisible() const { return mbVisibleItems; }
-
 voidRedrawItem( sal_uInt16 nItemId );
 
 voidClear();
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index b7d92a7063da..81711ff62232 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -111,8 +111,7 @@ IMPL_LINK( SvxModifyControl, OnTimer, Timer *, pTimer, void 
)
 
 void SvxModifyControl::_repaint()
 {
-if ( GetStatusBar().AreItemsVisible() )
-GetStatusBar().SetItemData( GetId(), nullptr );// force repaint
+GetStatusBar().SetItemData( GetId(), nullptr );// force repaint
 }
 
 /**
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 018f353a6021..98fce9a6bdba 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -327,8 +327,7 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 
nSID, SfxItemState eSt
 pImpl->bTable = false;
 }
 
-if ( GetStatusBar().AreItemsVisible() )
-GetStatusBar().SetItemData( GetId(), nullptr );
+GetStatusBar().SetItemData( GetId(), nullptr );
 
 //  set only strings as text at the statusBar, so that the Help-Tips
 //  can work with the text, when it is too long for the statusBar
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx 
b/svx/source/stbctrls/xmlsecctrl.cxx
index be0763e6d9a8..4784739c7079 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -82,8 +82,7 @@ void XmlSecStatusBarControl::StateChanged( sal_uInt16, 
SfxItemState eState, cons
 mpImpl->mnState = SignatureState::UNKNOWN;
 }
 
-if( GetStatusBar().AreItemsVisible() )  // necessary ?
-GetStatusBar().SetItemData( GetId(), nullptr );
+GetStatusBar().SetItemData( GetId(), nullptr ); // necessary ?
 
 GetStatusB

Zdibák Zoltán

[Zoltán Zdibák]

All of my past & future contributions to Libreoffice may be licensed under
the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

 sw/source/filter/ww8/ww8par.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8b0631fe118acc458fe7f94a47ded3dcbf7019be
Author: Caolán McNamara 
AuthorDate: Tue Oct 16 09:57:36 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 13:11:30 2018 +0200

ofz#10994 move the reset of trailing fly paras to before redline processing

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

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 32638e8cd51e..3435ae2e7292 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5300,6 +5300,9 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const 
*pGloss)
 // stacks etc. are destroyed, and before fields
 // are updated
 m_aExtraneousParas.delete_all_from_doc();
+// ofz#10994 remove any trailing fly paras before processing redlines
+m_xWFlyPara.reset();
+m_xSFlyPara.reset();
 m_xRedlineStack->closeall(*m_pPaM->GetPoint());
 while (!m_aFrameRedlines.empty())
 m_aFrameRedlines.pop();
@@ -5393,9 +5396,6 @@ ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const 
*pGloss)
 
 UpdateFields();
 
-m_xWFlyPara.reset();
-m_xSFlyPara.reset();
-
 // delete the pam before the call for hide all redlines (Bug 73683)
 if (m_bNewDoc)
   m_rDoc.getIDocumentRedlineAccess().SetRedlineFlags(eMode);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/CppunitTest_sw_unoapi.mk  |   62 -
 sw/Module_sw.mk  |1 
 sw/qa/extras/unowriter/unowriter.cxx |  230 --
 sw/qa/unit/unoapi.cxx|  235 ---
 4 files changed, 217 insertions(+), 311 deletions(-)

New commits:
commit 48d22544be09bf63ded8eb48d1f8252b456f7fd5
Author: Vasily Melenchuk 
AuthorDate: Mon Oct 15 16:14:02 2018 +0200
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 12:35:28 2018 +0200

sw: merge test suites sw_unoapi and sw_unowriter

Both test suites have the same propose "Test to assert
UNO API call results of Writer" so better to keep them
together.

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

diff --git a/sw/CppunitTest_sw_unoapi.mk b/sw/CppunitTest_sw_unoapi.mk
deleted file mode 100644
index 3a7403169ec3..
--- a/sw/CppunitTest_sw_unoapi.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-#*
-
-$(eval $(call gb_CppunitTest_CppunitTest,sw_unoapi))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sw_unoapi, \
-   sw/qa/unit/unoapi \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,sw_unoapi, \
-   comphelper \
-   cppu \
-   cppuhelper \
-   editeng \
-   i18nlangtag \
-   sal \
-   sfx \
-   svl \
-   svt \
-   sw \
-   test \
-   tl \
-   unotest \
-   utl \
-   vcl \
-))
-
-$(eval $(call gb_CppunitTest_use_externals,sw_unoapi,\
-   boost_headers \
-   libxml2 \
-))
-
-$(eval $(call gb_CppunitTest_set_include,sw_unoapi,\
-   -I$(SRCDIR)/sw/inc \
-   -I$(SRCDIR)/sw/source/core/inc \
-   -I$(SRCDIR)/sw/source/uibase/inc \
-   -I$(SRCDIR)/sw/qa/extras/inc \
-   $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_use_api,sw_unoapi,\
-   udkapi \
-   offapi \
-   oovbaapi \
-))
-
-$(eval $(call gb_CppunitTest_use_ure,sw_unoapi))
-$(eval $(call gb_CppunitTest_use_vcl,sw_unoapi))
-
-$(eval $(call gb_CppunitTest_use_rdb,sw_unoapi,services))
-
-$(eval $(call gb_CppunitTest_use_configuration,sw_unoapi))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 0d41a854c66a..43f2abdc60ce 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -97,7 +97,6 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 CppunitTest_sw_accessible_relation_set \
 CppunitTest_sw_apitests \
 CppunitTest_sw_unowriter \
-CppunitTest_sw_unoapi \
 ))
 
 ifneq ($(DISABLE_GUI),TRUE)
diff --git a/sw/qa/unit/data/xautotextgroup.odt 
b/sw/qa/extras/unowriter/data/xautotextgroup.odt
similarity index 100%
rename from sw/qa/unit/data/xautotextgroup.odt
rename to sw/qa/extras/unowriter/data/xautotextgroup.odt
diff --git a/sw/qa/extras/unowriter/unowriter.cxx 
b/sw/qa/extras/unowriter/unowriter.cxx
index 96945d25a40f..933e17b928bb 100644
--- a/sw/qa/extras/unowriter/unowriter.cxx
+++ b/sw/qa/extras/unowriter/unowriter.cxx
@@ -10,6 +10,14 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::text;
 
 namespace
 {
@@ -20,18 +28,55 @@ char const DATA_DIRECTORY[] = 
"/sw/qa/extras/unowriter/data/";
 class SwUnoWriter : public SwModelTestBase
 {
 public:
-void testDefaultCharStyle();
-void testGraphicDesciptorURL();
-void testGraphicDesciptorURLBitmap();
-
-CPPUNIT_TEST_SUITE(SwUnoWriter);
-CPPUNIT_TEST(testDefaultCharStyle);
-CPPUNIT_TEST(testGraphicDesciptorURL);
-CPPUNIT_TEST(testGraphicDesciptorURLBitmap);
-CPPUNIT_TEST_SUITE_END();
+SwUnoWriter()
+: SwModelTestBase(DATA_DIRECTORY, "writer8")
+{
+}
 };
 
-void SwUnoWriter::testDefaultCharStyle()
+/**
+ * Macro to declare a new test with preloaded file
+ * (similar to DECLARE_SW_ROUNDTRIP_TEST)
+ */
+#define DECLARE_UNOAPI_TEST_FILE(TestName, filename)   
\
+class TestName : public SwUnoWriter
\
+{  
\
+protected: 
\
+virtual OUString getTestName() override { return OUString(#TestName); 
}  

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

[Libreoffice Gerrit user]

 sw/source/uibase/sidebar/PageFormatPanel.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 577e16a03f689ac906cbe68e8528b422ecccf99b
Author: Ilhan Yesil 
AuthorDate: Thu Aug 30 09:21:36 2018 +0200
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 12:34:41 2018 +0200

tdf#113848 Sidebar: Get user-defined sizes while changing orientation

If the orientation of the page is changed, the user
defined page sizes are now accessed directly to swap the sizes
correctly.

Change-Id: I91d256d35dcd910a8c3151a3f9e669413c9a57db
Reviewed-on: https://gerrit.libreoffice.org/59577
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 
(cherry picked from commit 32bf352c61754fe5ef39e0794b5d6dc71be99194)
Reviewed-on: https://gerrit.libreoffice.org/61667
Reviewed-by: Thorsten Behrens 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/uibase/sidebar/PageFormatPanel.cxx 
b/sw/source/uibase/sidebar/PageFormatPanel.cxx
index 82c182dd8a36..3c0dbeaeebe1 100644
--- a/sw/source/uibase/sidebar/PageFormatPanel.cxx
+++ b/sw/source/uibase/sidebar/PageFormatPanel.cxx
@@ -215,9 +215,14 @@ void PageFormatPanel::NotifyItemUpdate(
 IMPL_LINK_NOARG(PageFormatPanel, PaperFormatModifyHdl, ListBox&, void)
 {
 Paper ePaper = mpPaperSizeBox->GetSelection();
-Size  aSize(SvxPaperInfo::GetPaperSize(ePaper, meUnit));
+Size  aSize;
 
-if(mpPaperOrientation->GetSelectedEntryPos() == 1)
+if(ePaper!=PAPER_USER)
+   aSize = SvxPaperInfo::GetPaperSize(ePaper, meUnit);
+else
+   aSize = Size(GetCoreValue( *mpPaperWidth, meUnit ), GetCoreValue( 
*mpPaperHeight, meUnit));
+
+if(mpPaperOrientation->GetSelectedEntryPos() == 1 || ePaper==PAPER_USER)
 Swap(aSize);
 
 mpPageItem->SetLandscape(mpPaperOrientation->GetSelectedEntryPos() == 1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/svx/fmview.hxx |6 ++
 reportdesign/source/ui/report/ReportController.cxx |   51 -
 svx/source/form/fmview.cxx |4 -
 svx/source/form/fmvwimp.cxx|   32 ++---
 svx/source/inc/fmvwimp.hxx |6 ++
 5 files changed, 78 insertions(+), 21 deletions(-)

New commits:
commit 2cf13c31c6aa262e4bb4b075597f3543ecd3c4a6
Author: Armin Le Grand 
AuthorDate: Fri Jul 27 13:38:46 2018 +0200
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 12:32:24 2018 +0200

tdf#118963 Hand over a SdrModel to createControlLabelPair

Change-Id: I34a35ff0700d14474fa9946851812c25c4eb4bc1
Reviewed-on: https://gerrit.libreoffice.org/58187
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 
(cherry picked from commit e5ee79b5c089e72e6b24c04c7c820d706bd39993)
Reviewed-on: https://gerrit.libreoffice.org/61316
Reviewed-by: Thorsten Behrens 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx
index c47267f6a968..90125b46f5b0 100644
--- a/include/svx/fmview.hxx
+++ b/include/svx/fmview.hxx
@@ -97,7 +97,11 @@ public:
 sal_uInt16 _nLabelObjectID,
 SdrPage* _pLabelPage,
 SdrPage* _pControlPage,
-SdrModel* _pModel,
+
+// tdf#118963 Need a SdrModel for SdrObject creation. To make the
+// demand clear, hand over a SdrMldel&
+SdrModel& _rModel,
+
 SdrUnoObj*& _rpLabel,
 SdrUnoObj*& _rpControl
 );
diff --git a/reportdesign/source/ui/report/ReportController.cxx 
b/reportdesign/source/ui/report/ReportController.cxx
index ab76f3f14616..5a6fa67586df 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -3137,11 +3137,26 @@ void OReportController::createControl(const Sequence< 
PropertyValue >& _aArgs,co
 {
 SdrUnoObj* pLabel( nullptr );
 SdrUnoObj* pControl( nullptr );
-FmFormView::createControlLabelPair( getDesignView()
-,nLeftMargin,0
-
,nullptr,nullptr,_nObjectId,SdrInventor::ReportDesign,OBJ_DLG_FIXEDTEXT,
- 
nullptr,pSectionWindow->getReportSection().getPage(),m_aReportModel.get(),
- pLabel,pControl);
+
+FmFormView::createControlLabelPair(
+getDesignView(),
+nLeftMargin,
+0,
+nullptr,
+nullptr,
+_nObjectId,
+SdrInventor::ReportDesign,
+OBJ_DLG_FIXEDTEXT,
+nullptr,
+pSectionWindow->getReportSection().getPage(),
+
+// tdf#118963 Need a SdrModel for SdrObject creation. Dereferencing
+// m_aReportModel seems pretty safe, it's done in other places, 
initialized
+// in impl_initialize and throws a RuntimeException if not 
existing.
+*m_aReportModel,
+
+pLabel,
+pControl);
 
 // always use SdrObject::Free(...) for SdrObjects (!)
 SdrObject* pTemp(pLabel);
@@ -3434,12 +3449,28 @@ void OReportController::addPairControls(const Sequence< 
PropertyValue >& aArgs)
 OSectionView* pSectionViews[2];
 pSectionViews[0] = 
&pSectionWindow[1]->getReportSection().getSectionView();
 pSectionViews[1] = 
&pSectionWindow[0]->getReportSection().getSectionView();
+
 // find this in svx
-FmFormView::createControlLabelPair( getDesignView()
-,nLeftMargin,0
-
,xField,xNumberFormats,nOBJID,SdrInventor::ReportDesign,OBJ_DLG_FIXEDTEXT,
-
pSectionWindow[1]->getReportSection().getPage(),pSectionWindow[0]->getReportSection().getPage(),m_aReportModel.get(),
-pControl[0],pControl[1]);
+FmFormView::createControlLabelPair(
+getDesignView(),
+nLeftMargin,
+0,
+xField,
+xNumberFormats,
+nOBJID,
+SdrInventor::ReportDesign,
+OBJ_DLG_FIXEDTEXT,
+pSectionWindow[1]->getReportSection().getPage(),
+pSectionWindow[0]->getReportSection().getPage(),
+
+// tdf#118963 Need a SdrModel for SdrObject creation. 
Dereferencing
+// m_aReportModel seems pretty safe, it's done in other 
places, initialized
+// in impl_initialize and throws a RuntimeException if not 
existing.
+*m_aReportModel,
+
+pControl[0],
+pControl[1]);
+
 if ( pControl[0] && pControl[1] )
 {
 SdrPageView* pPgViews[2];
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 1d9aadc0ab90..15df6aa0adfb 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - config_host.mk.in configure.ac dbaccess/CppunitTest_dbaccess_firebird_regression_test.mk dbaccess/CppunitTest_dbaccess_firebird_test.mk dbacc

[Libreoffice Gerrit user]

 config_host.mk.in |1 
 configure.ac  |7 
 dbaccess/CppunitTest_dbaccess_firebird_regression_test.mk |   70 +
 dbaccess/CppunitTest_dbaccess_firebird_test.mk|   18 +-
 dbaccess/Module_dbaccess.mk   |6 
 dbaccess/qa/unit/data/firebird_empty.odb  |binary
 dbaccess/qa/unit/data/firebird_empty_le.odb   |binary
 dbaccess/qa/unit/data/firebird_integer_ods12.odb  |binary
 dbaccess/qa/unit/firebird-regression.cxx  |  108 ++
 dbaccess/qa/unit/firebird.cxx |2 
 solenv/clang-format/blacklist |1 
 11 files changed, 203 insertions(+), 10 deletions(-)

New commits:
commit d5d09bb733842252b3e2d6e7480b211e67136a75
Author: Rene Engelhard 
AuthorDate: Fri Sep 28 23:02:17 2018 +0200
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 12:30:44 2018 +0200

tdf#72987 split firebird test into a regression test and a "new" test

former with endianness and latter with the new fbk format.
Add new endianness-independent firebird test odbs

This squashes

tdf#72987 run firebird test for little endian only for now
since those old(er) files still use the endianness-depending format.
And remove x64 from the filename...

Change-Id: I24e56cd8561c2ec6a1f77a66907c14cdea8248b6
Reviewed-on: https://gerrit.libreoffice.org/60916
Tested-by: Jenkins
Reviewed-by: Rene Engelhard 

and

tdf#72987 split firebird test into a regression test and a "new" 
testHEADmaster
former with endianness and latter with the new fbk format.
Add new endianness-independent firebird test odbs

Change-Id: I29be2e6916fcca74744211dba04463376fb6b8d5
Reviewed-on: https://gerrit.libreoffice.org/60917
Reviewed-by: Rene Engelhard 
Tested-by: Rene Engelhard 

Change-Id: I29be2e6916fcca74744211dba04463376fb6b8d5
Reviewed-on: https://gerrit.libreoffice.org/61285
Tested-by: Rene Engelhard 
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/config_host.mk.in b/config_host.mk.in
index 5d08d21e9b8a..683abbff2e05 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -175,6 +175,7 @@ export ENABLE_SYMBOLS=@ENABLE_SYMBOLS@
 export ENABLE_VALGRIND=@ENABLE_VALGRIND@
 export ENABLE_VLC=@ENABLE_VLC@
 export ENABLE_WERROR=@ENABLE_WERROR@
+export ENDIANNESS=@ENDIANNESS@
 export EPM=@EPM@
 export EPM_FLAGS=@EPM_FLAGS@
 export EPUBGEN_CFLAGS=$(gb_SPACE)@EPUBGEN_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 4176ef077b0a..38a39a35ebbb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -812,6 +812,13 @@ haiku*)
 ;;
 esac
 
+if test "$_os" != "WINNT"; then
+AC_C_BIGENDIAN([ENDIANNESS=big], [ENDIANNESS=little])
+else
+ENDIANNESS=little
+fi
+AC_SUBST(ENDIANNESS)
+
 if test "$_os" = "Android" ; then
 # Verify that the NDK and SDK options are proper
 if test -z "$with_android_ndk"; then
diff --git a/dbaccess/CppunitTest_dbaccess_firebird_regression_test.mk 
b/dbaccess/CppunitTest_dbaccess_firebird_regression_test.mk
new file mode 100644
index ..654d2f6168cc
--- /dev/null
+++ b/dbaccess/CppunitTest_dbaccess_firebird_regression_test.mk
@@ -0,0 +1,70 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,dbaccess_firebird_regression))
+
+$(eval $(call 
gb_CppunitTest_use_external,dbaccess_firebird_regression,boost_headers))
+
+$(eval $(call 
gb_CppunitTest_add_exception_objects,dbaccess_firebird_regression, \
+dbaccess/qa/unit/firebird-regression \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,dbaccess_firebird_regression, \
+comphelper \
+cppu \
+dbaxml \
+firebird_sdbc \
+sal \
+subsequenttest \
+svt \
+test \
+unotest \
+utl \
+xo \
+))
+
+$(eval $(call gb_CppunitTest_use_api,dbaccess_firebird_regression,\
+offapi \
+oovbaapi \
+udkapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,dbaccess_firebird_regression))
+$(eval $(call gb_CppunitTest_use_vcl,dbaccess_firebird_regression))
+
+$(eval $(call gb_CppunitTest_use_components,dbaccess_firebird_regression,\
+basic/util/sb \
+comphelper/util/comphelp \
+configmgr/source/configmgr \
+connectivity/source/drivers/firebird/firebird_sdbc \
+connectivity/source/manager/sdbc2 \
+dbaccess/util/dba \
+dbaccess/source/filter/xml/dbaxml \
+dbaccess/util/dbu \
+filter/source/config/cache/filterconfig1 \
+framework/util/fwk \
+i18npool/util/i18npool \
+linguistic/source/ln

LibreOffice ESC call, Thur - 16:00 central European (local) time

[Michael Meeks]

Hi everyone,

Prototype agenda below, bug metrics also at the link below;
extra items appreciated as last-week:

https://demo.collaboracloudsuite.com/tdf/

Lets use the new TDF jitsi goodness this week at:

http://jitsi.documentfoundation.org/esc

ATB,

Michael.

* Completed Action Items:

* Pending Action Items:
+ investigate missing crash report signatures in 6.1.2 (Cloph)
+ disable editing for the android viewer except in alpha programme 
(Christian)
+ add screenshot builder to basic build stats (Cloph)
+ default bitergia filter for master + libreoffice-* (Christian)
[ enabled for gerrit (default) view enabled, but default git
  view needs improving with external script ]

* Release Engineering update (Christian, Xisco)
+ 6.1.3 RC1 - Week start Oct 8th
+ tagged today, builds mostly done, waiting for the 32bit windows
  and linux  
+ 6.2 Alpha 1
+ due in ~1 week. (week Oct 15th)
+ Remotes
+ Android viewer
  crash w/editingrelatedto exception handling and llvmc++ runtime 
  (i.e. bridges module)  
+ Online

* Documentation (Olivier)

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
257(257) (topicUI) bugs open, 302(302) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month   3 months   12 months  
 added 10(1) 27(4) 45(4)  100(3)  
 commented 57(12)   162(31)   384(30)1566(19) 
   removed  0(0)  0(0)  0(0)5(0)  
  resolved  2(-2) 9(1) 30(-1) 131(-3) 
+ top 10 contributors:
  Thomas Lendo made 118 changes in 1 month, and 317 changes in 1 year
  Zolnai, Tamás made 94 changes in 1 month, and 190 changes in 1 year
  Tietze, Heiko made 42 changes in 1 month, and 552 changes in 1 year
  Foote, V Stuart made 25 changes in 1 month, and 223 changes in 1 year
  Xisco Faulí made 20 changes in 1 month, and 290 changes in 1 year
  Cor Nouws made 16 changes in 1 month, and 93 changes in 1 year
  kompilainenn made 12 changes in 1 month, and 43 changes in 1 year
  Buovjaga made 9 changes in 1 month, and 140 changes in 1 year
  Harald Koester made 8 changes in 1 month, and 18 changes in 1 year
* Crash Testing (Caolan)
+ 2 (+1) import failure, 37(-6) export failures
+ ??? 9 (+9) coverity issues
+ ??? Google / ossfuzz: down for a while, build fixed again
+ 5 issues, 0 serious
+ ??? ForcePoint, round 9
+ 4 writer layout issues (-1)

* Crash Reporting (Xisco)
+ http://crashreport.libreoffice.org/stats/version/5.4.7.2
 + 503 (last 7 days) (-33)
+ http://crashreport.libreoffice.org/stats/version/6.0.6.2
 + 1155 (last 7 days) (+81)
+ http://crashreport.libreoffice.org/stats/version/6.1.0.3
 + 1421 (last 7 days) (-160)
+ http://crashreport.libreoffice.org/stats/version/6.1.1.2
 + 1360 (last 7 days) (-282)
+ http://crashreport.libreoffice.org/stats/version/6.1.2.1
 + 2670 (last 7 days) (+868)

* Hackfests & Events (Thorsten)
   + if you need help with travel - TDF can help fund that, poke Thorsten
   + DINAcon - Bern / Switzerland –
  + Hackfest ~ October 20th Saturday Night (Michael)
  + https://hacknight.dinacon.ch/event/1
  + cloph can setup VMs (for how many users?)
   + Munich (Thorsten)
  + https://wiki.documentfoundation.org/Hackfest/Muenchen2018
  + Oct 26-28th, CIB main office
  + an Open Gov’t meeting from the City of Munich
  + good to have a hack-fest back-to-back there largely
for local types.

* mentoring/easyhack update
  committer...   1 week   1 month 3 months 12 months   
  open   74(-22) 144(-16) 148(-17) 159(-17)
   reviews 1205(-137)   4176(-73)   12732(-83)   30311(643)
merged  235(-82)1081(-70)3640(-44)   15115(126)
 abandoned   11(0)60(5)   140(2)   956(6)  
   own commits  265(-38)1200(-61)3456(27)15601(106)
review commits   55(6)   209(2)   844(12) 3697(15) 
contributor...   1 week   1 month   3 months   12 months
  open 30(19)53(12)53(11)   56(11)  
   reviews 81(22)   236(19)   428(4) 22660(-243)
merged 17(-2)88(-5)   342(-1) 1558(3)   
 abandoned  3(-1)15(-9)47(-16) 283(-13) 
   own commits 22(0)109(1)429(4)  1488(10)  
review commits  0(0)  0(0)  0(0) 0(0)   
+ easyHack statistics:
   needsDevEval 61(61)   needsUXEval 1(1)   cleanup_comments 230(230)   
   total 290(290)   assigned 28(28)   open 199(199)   
+ top 10 contributors:
  G

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

[Libreoffice Gerrit user]

 sd/inc/CustomAnimationEffect.hxx |3 ++-
 sd/source/core/CustomAnimationEffect.cxx |   18 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit f3961ea18cf4f80d231f6bc63320af1454d1e7e9
Author: Caolán McNamara 
AuthorDate: Tue Oct 16 09:20:42 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 12:24:07 2018 +0200

tdf#120626 'rewind' doesn't stick when effect duration is changed

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

diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index c18d1437e730..b70bbdd07f91 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -81,7 +81,7 @@ public:
 SAL_DLLPRIVATE css::uno::Any   getEnd() const;
 SAL_DLLPRIVATE voidsetEnd( const css::uno::Any& rEnd );
 
-SAL_DLLPRIVATE sal_Int16   getFill() const;
+SAL_DLLPRIVATE sal_Int16   getFill() const { return mnFill; }
 SAL_DLLPRIVATE voidsetFill( sal_Int16 nFill );
 
 SAL_DLLPRIVATE double  getBegin() const { return mfBegin; }
@@ -176,6 +176,7 @@ private:
 OUStringmaPresetSubType;
 OUStringmaProperty;
 sal_Int16   mnPresetClass;
+sal_Int16   mnFill;
 double  mfBegin;
 double  mfDuration; // this is the maximum 
duration of the subeffects
 double  mfAbsoluteDuration; // this is the maximum 
duration of the subeffects including possible iterations
diff --git a/sd/source/core/CustomAnimationEffect.cxx 
b/sd/source/core/CustomAnimationEffect.cxx
index e7890a5780d2..8835e7feabb4 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -129,6 +129,7 @@ private:
 CustomAnimationEffect::CustomAnimationEffect( const css::uno::Reference< 
css::animations::XAnimationNode >& xNode )
 :   mnNodeType(-1),
 mnPresetClass(-1),
+mnFill(AnimationFill::HOLD),
 mfBegin(-1.0),
 mfDuration(-1.0),
 mfAbsoluteDuration(-1.0),
@@ -195,6 +196,8 @@ void CustomAnimationEffect::setNode( const 
css::uno::Reference< css::animations:
 mfDecelerate = mxNode->getDecelerate();
 mbAutoReverse = mxNode->getAutoReverse();
 
+mnFill = mxNode->getFill();
+
 // get iteration data
 Reference< XIterateContainer > xIter( mxNode, UNO_QUERY );
 if( xIter.is() )
@@ -819,6 +822,7 @@ void CustomAnimationEffect::replaceNode( const 
css::uno::Reference< css::animati
 sal_Int16 nNodeType = mnNodeType;
 Any aTarget = maTarget;
 
+sal_Int16 nFill = mnFill;
 double fBegin = mfBegin;
 double fDuration = mfDuration;
 double fAcceleration = mfAcceleration;
@@ -837,6 +841,7 @@ void CustomAnimationEffect::replaceNode( const 
css::uno::Reference< css::animati
 setTargetSubItem( nSubItem );
 setDuration( fDuration );
 setBegin( fBegin );
+setFill( nFill );
 
 setAcceleration( fAcceleration );
 setDecelerate( fDecelerate );
@@ -889,14 +894,6 @@ Any CustomAnimationEffect::getEnd() const
 }
 }
 
-sal_Int16 CustomAnimationEffect::getFill() const
-{
-if( mxNode.is() )
-return mxNode->getFill();
-else
-return 0;
-}
-
 void CustomAnimationEffect::setRepeatCount( const Any& rRepeatCount )
 {
 if( mxNode.is() )
@@ -916,8 +913,11 @@ void CustomAnimationEffect::setEnd( const Any& rEnd )
 
 void CustomAnimationEffect::setFill( sal_Int16 nFill )
 {
-if( mxNode.is() )
+if (mxNode.is())
+{
+mnFill = nFill;
 mxNode->setFill( nFill );
+}
 }
 
 Reference< XAnimationNode > CustomAnimationEffect::createAfterEffectNode() 
const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 svtools/source/brwbox/editbrowsebox.cxx |   22 --
 1 file changed, 20 insertions(+), 2 deletions(-)

New commits:
commit 3e69c24b4f4a8d4bbf1e2e76177e503f1d6d5840
Author: Caolán McNamara 
AuthorDate: Wed Oct 3 16:42:15 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 11:02:09 2018 +0200

Resolves: tdf#93372 format table in base is ignored

since...

commit b4bbb5e5d7b31caad2fbcc00382ad27df3c81001
Date:   Sun May 17 22:56:46 2015 +0900

refactor how font, fg. and bg. are applied in widgets/controls

revert the relevant piece, in this case there are two Windows/Contexts 
getting
their settings manipulated, rather than the usual one

Change-Id: I0a228aee6aaf1f58b2235fccf14dc63ffa96dd2d
Reviewed-on: https://gerrit.libreoffice.org/61317
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 0be3a5eea3089c2b63cc821ffb282fd4ab8ec455)
Reviewed-on: https://gerrit.libreoffice.org/61525

diff --git a/svtools/source/brwbox/editbrowsebox.cxx 
b/svtools/source/brwbox/editbrowsebox.cxx
index eb092d16c51f..1b9f0bfdb0f9 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -763,12 +763,30 @@ return;
 
 if (bFont)
 {
-GetDataWindow().ApplyControlFont(GetDataWindow(), 
rStyleSettings.GetFieldFont());
+vcl::Font aFont = rStyleSettings.GetFieldFont();
+if (IsControlFont())
+{
+GetDataWindow().SetControlFont(GetControlFont());
+aFont.Merge(GetControlFont());
+}
+else
+GetDataWindow().SetControlFont();
+
+GetDataWindow().SetZoomedPointFont(GetDataWindow(), aFont);
 }
 
 if (bFont || bForeground)
 {
-GetDataWindow().ApplyControlForeground(GetDataWindow(), 
rStyleSettings.GetFieldTextColor());
+Color aTextColor = rStyleSettings.GetFieldTextColor();
+if (IsControlForeground())
+{
+aTextColor = GetControlForeground();
+GetDataWindow().SetControlForeground(aTextColor);
+}
+else
+GetDataWindow().SetControlForeground();
+
+GetDataWindow().SetTextColor( aTextColor );
 }
 
 if (!bBackground) // FIXME: Outside of Paint Hierarchy
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit 8fe6de4886e2b44c73a423bae41e15011b2be055
Author: Jan-Marek Glogowski 
AuthorDate: Sat Aug 25 02:35:26 2018 +0200
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 11:01:22 2018 +0200

tdf#90376 revert the dock windows' Idles to Timers

The dock windows' Timers were converted to Idles in commit
eef25e0e7c03 ("changed timers to idles"). Since the Idles poll
the mouse buttons, they starve all lower priority events.

From the comment in ImplDockFloatWin2::Move, this is a hack to
get the mouse release event from the window decorations in X11.

Change-Id: Ibba3c58dd8b3d95dbd9296cc111ab32968bee230
Reviewed-on: https://gerrit.libreoffice.org/59590
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit afd49c198769b5e7fc01a68ce7a6847aa0d0ddd8)
Reviewed-on: https://gerrit.libreoffice.org/60720
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit e3a745f7604b084a7bb5fb6f18d5b50b5e137a98)
Reviewed-on: https://gerrit.libreoffice.org/61466

diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 57b83e568215..e21d5693cda7 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -42,8 +42,8 @@ class ImplDockFloatWin2 : public FloatingWindow
 private:
 ImplDockingWindowWrapper*  mpDockWin;
 sal_uInt64  mnLastTicks;
-IdlemaDockIdle;
-IdlemaEndDockIdle;
+Timer   m_aDockTimer;
+Timer   m_aEndDockTimer;
 Point   maDockPos;
 tools::Rectangle   maDockRect;
 boolmbInMove;
@@ -86,13 +86,15 @@ ImplDockFloatWin2::ImplDockFloatWin2( vcl::Window* pParent, 
WinBits nWinBits,
 
 SetBackground( GetSettings().GetStyleSettings().GetFaceColor() );
 
-maDockIdle.SetInvokeHandler( LINK( this, ImplDockFloatWin2, DockTimerHdl ) 
);
-maDockIdle.SetPriority( TaskPriority::HIGH_IDLE );
-maDockIdle.SetDebugName( "vcl::ImplDockFloatWin2 maDockIdle" );
+m_aDockTimer.SetInvokeHandler( LINK( this, ImplDockFloatWin2, DockTimerHdl 
) );
+m_aDockTimer.SetPriority( TaskPriority::HIGH_IDLE );
+m_aDockTimer.SetTimeout( 50 );
+m_aDockTimer.SetDebugName( "vcl::ImplDockFloatWin2 m_aDockTimer" );
 
-maEndDockIdle.SetInvokeHandler( LINK( this, ImplDockFloatWin2, 
EndDockTimerHdl ) );
-maEndDockIdle.SetPriority( TaskPriority::HIGH_IDLE );
-maEndDockIdle.SetDebugName( "vcl::ImplDockFloatWin2 maEndDockIdle" );
+m_aEndDockTimer.SetInvokeHandler( LINK( this, ImplDockFloatWin2, 
EndDockTimerHdl ) );
+m_aEndDockTimer.SetPriority( TaskPriority::HIGH_IDLE );
+m_aEndDockTimer.SetTimeout( 50 );
+m_aEndDockTimer.SetDebugName( "vcl::ImplDockFloatWin2 m_aEndDockTimer" );
 }
 
 ImplDockFloatWin2::~ImplDockFloatWin2()
@@ -111,7 +113,6 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl, Timer *, 
void)
 {
 SAL_WARN_IF( !mpDockWin->IsFloatingMode(), "vcl", "docktimer called but 
not floating" );
 
-maDockIdle.Stop();
 PointerState aState = GetPointerState();
 
 if( aState.mnState & KEY_MOD1 )
@@ -119,7 +120,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl, Timer *, 
void)
 // i43499 CTRL disables docking now
 
mpDockWin->GetWindow()->GetParent()->ImplGetFrameWindow()->HideTracking();
 if( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) )
-maDockIdle.Start();
+m_aDockTimer.Start();
 }
 else if( ! ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) 
) )
 {
@@ -129,7 +130,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl, Timer *, 
void)
 else
 {
 
mpDockWin->GetWindow()->GetParent()->ImplGetFrameWindow()->ShowTracking( 
maDockRect, ShowTrackFlags::Big | ShowTrackFlags::TrackWindow );
-maDockIdle.Start();
+m_aDockTimer.Start();
 }
 }
 
@@ -137,7 +138,6 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, EndDockTimerHdl, Timer 
*, void)
 {
 SAL_WARN_IF( !mpDockWin->IsFloatingMode(), "vcl", "enddocktimer called but 
not floating" );
 
-maEndDockIdle.Stop();
 PointerState aState = GetPointerState();
 if( ! ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) )
 {
@@ -145,9 +145,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, EndDockTimerHdl, Timer 
*, void)
 mpDockWin->EndDocking( maDockRect, true );
 }
 else
-{
-maEndDockIdle.Start();
-}
+m_aEndDockTimer.Start();
 }
 
 IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl, void*, void)
@@ -204,14 +202,14 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl, void*, 
void)
 maDockRect.SetPos( 
mpDockWin->GetWindow()->GetParent()->ImplGetFrameWindow()->ScreenToOutputPixel(
  maDockRect.TopLeft() ) );
 
mpDockWin->GetWindow()->GetP

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/uiconfig

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/ui/recalcquerydialog.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit dbba4c85e13ecd226f17550ca458738b9be24872
Author: Adolfo Jayme Barrientos 
AuthorDate: Sat Oct 13 01:27:41 2018 -0500
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 11:00:37 2018 +0200

Fix a weird checkbox label in Calc’s recalculation prompt

GTK+’s dumb defaults strike again!

Similar to 7da61ec6d8ab6312b45ef7d683f3ec24e6b2b570.
Found while triaging tdf#120513.

Change-Id: I9ade695184cbcc9f1de9f11b20aa751754263586
(cherry picked from commit b9234b43ed259a10cf9077032af0f79740f01d8b)
Reviewed-on: https://gerrit.libreoffice.org/61736
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/uiconfig/scalc/ui/recalcquerydialog.ui 
b/sc/uiconfig/scalc/ui/recalcquerydialog.ui
index 05c1ccc60ff0..04c185f63326 100644
--- a/sc/uiconfig/scalc/ui/recalcquerydialog.ui
+++ b/sc/uiconfig/scalc/ui/recalcquerydialog.ui
@@ -31,6 +31,7 @@
 True
 True
 False
+start
 True
 True
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/core/data/column4.cxx |   16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

New commits:
commit fbec372ba829b3f32b3c0874920b2ee36220ef9d
Author: Eike Rathke 
AuthorDate: Mon Oct 15 23:10:07 2018 +0200
Commit: Eike Rathke 
CommitDate: Tue Oct 16 10:46:19 2018 +0200

Resolves: tdf#119623 record group positions also for top cells

So listeners can be re-established for remaining grouped cells if
top cell is deleted (which ends listening and probably was the
cause to exclude them here).

Change-Id: Ic91b74c65013452d56b5cfbc132722c4314743c8
Reviewed-on: https://gerrit.libreoffice.org/61808
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index d751131251c8..7e9eb0b63e23 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -1542,10 +1542,12 @@ void ScColumn::EndListeningIntersectedGroups(
 {
 ScFormulaCell* pFC = sc::formula_block::at(*it->data, aPos.second);
 ScFormulaCellGroupRef xGroup = pFC->GetCellGroup();
-if (xGroup && !pFC->IsSharedTop())
+if (xGroup)
 {
-// End listening.
-pFC->EndListeningTo(rCxt);
+if (!pFC->IsSharedTop())
+// End listening.
+pFC->EndListeningTo(rCxt);
+
 if (pGroupPos)
 // Record the position of the top cell of the group.
 pGroupPos->push_back(xGroup->mpTopCell->aPos);
@@ -1558,10 +1560,12 @@ void ScColumn::EndListeningIntersectedGroups(
 {
 ScFormulaCell* pFC = sc::formula_block::at(*it->data, aPos.second);
 ScFormulaCellGroupRef xGroup = pFC->GetCellGroup();
-if (xGroup && !pFC->IsSharedTop())
+if (xGroup)
 {
-// End listening.
-pFC->EndListeningTo(rCxt);
+if (!pFC->IsSharedTop())
+// End listening.
+pFC->EndListeningTo(rCxt);
+
 if (pGroupPos)
 {
 // Record the position of the bottom cell of the group.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: officecfg/registry

[Libreoffice Gerrit user]

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2b0cb3cf4ac35dbe29b203d24adf5604a860cde5
Author: Cor Nouws 
AuthorDate: Thu Sep 27 23:45:04 2018 +0200
Commit: Heiko Tietze 
CommitDate: Tue Oct 16 10:44:05 2018 +0200

tdf#113241 better default for number recognition options in Writer tables

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

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 164d74e24dc5..f922e54e80ba 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -2296,7 +2296,7 @@
 Specifies whether only entries with the defined format are 
accepted. This option is only available if the number format recognition is 
active (Number_recognition = True).
 Number format recognition
   
-  false
+  true
 
 
   
@@ -2306,7 +2306,7 @@
 Specifies whether all numbers are aligned below right of the 
cell and not above left (as in the case of text). This option is only available 
if number format recognition is active (Number_recognition = True).
 Alignment
   
-  false
+  true
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 91/6e40069d27ff96cb84209e465489d2b639d91e

[Libreoffice Gerrit user]

 91/6e40069d27ff96cb84209e465489d2b639d91e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e498f24abafe407cfc592aee8d6e5d3ae080410c
Author: Caolán McNamara 
AuthorDate: Tue Oct 16 09:28:17 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 09:28:17 2018 +0100

Notes added by 'git notes add'

diff --git a/91/6e40069d27ff96cb84209e465489d2b639d91e 
b/91/6e40069d27ff96cb84209e465489d2b639d91e
new file mode 100644
index ..a33af61cf9a1
--- /dev/null
+++ b/91/6e40069d27ff96cb84209e465489d2b639d91e
@@ -0,0 +1 @@
+prefer: 5918816d98fee8172aada474e10434ba398a9414
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - cb/5459e4895e7bbef9552b94d405f210c0e52032

[Libreoffice Gerrit user]

 cb/5459e4895e7bbef9552b94d405f210c0e52032 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4917a80ca988744c3ee836831dc995b736fa1571
Author: Caolán McNamara 
AuthorDate: Tue Oct 16 09:27:44 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 09:27:44 2018 +0100

Notes added by 'git notes add'

diff --git a/cb/5459e4895e7bbef9552b94d405f210c0e52032 
b/cb/5459e4895e7bbef9552b94d405f210c0e52032
new file mode 100644
index ..167ebd0bb6ff
--- /dev/null
+++ b/cb/5459e4895e7bbef9552b94d405f210c0e52032
@@ -0,0 +1 @@
+prefer: c814036604810e84d2b20f1407020cf6f003ab78
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e7/98a3177976806b4b726d2845251f2b11ae7bcd

[Libreoffice Gerrit user]

 e7/98a3177976806b4b726d2845251f2b11ae7bcd |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4dbd91572ddbcb0da1d255e70c924402e7a4ec2f
Author: Caolán McNamara 
AuthorDate: Tue Oct 16 09:27:28 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 09:27:28 2018 +0100

Notes added by 'git notes add'

diff --git a/e7/98a3177976806b4b726d2845251f2b11ae7bcd 
b/e7/98a3177976806b4b726d2845251f2b11ae7bcd
new file mode 100644
index ..a70e388f26a4
--- /dev/null
+++ b/e7/98a3177976806b4b726d2845251f2b11ae7bcd
@@ -0,0 +1 @@
+prefer: 91da17722924dc505553120750712d491b238343
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 53/da1e10878dab6d01e0e49dc8b37d65b60b25c7

[Libreoffice Gerrit user]

 53/da1e10878dab6d01e0e49dc8b37d65b60b25c7 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 86a7f11c233a3472d9c9529c95e7a5120d56efa8
Author: Caolán McNamara 
AuthorDate: Tue Oct 16 09:26:11 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 09:26:11 2018 +0100

Notes added by 'git notes add'

diff --git a/53/da1e10878dab6d01e0e49dc8b37d65b60b25c7 
b/53/da1e10878dab6d01e0e49dc8b37d65b60b25c7
new file mode 100644
index ..a70e388f26a4
--- /dev/null
+++ b/53/da1e10878dab6d01e0e49dc8b37d65b60b25c7
@@ -0,0 +1 @@
+prefer: 91da17722924dc505553120750712d491b238343
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 3 commits - 1a/f1316ff68444084fa19402da483d223ed89503 97/0fe081158a12d0db4fc6bad9449b8c9aa51f1d ae/1f34be5c9a49fae1eacdb3c1e5267acea53441

[Libreoffice Gerrit user]

 1a/f1316ff68444084fa19402da483d223ed89503 |1 +
 97/0fe081158a12d0db4fc6bad9449b8c9aa51f1d |1 +
 ae/1f34be5c9a49fae1eacdb3c1e5267acea53441 |1 +
 3 files changed, 3 insertions(+)

New commits:
commit ae934da3e165d8792728e457c7862bf1aa53fbb0
Author: Caolán McNamara 
AuthorDate: Tue Oct 16 09:23:59 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 09:23:59 2018 +0100

Notes added by 'git notes add'

diff --git a/97/0fe081158a12d0db4fc6bad9449b8c9aa51f1d 
b/97/0fe081158a12d0db4fc6bad9449b8c9aa51f1d
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/97/0fe081158a12d0db4fc6bad9449b8c9aa51f1d
@@ -0,0 +1 @@
+ignore: aoo
commit aacd3c63b91bc2ec3a390548be08f05fe5879315
Author: Caolán McNamara 
AuthorDate: Tue Oct 16 09:23:45 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 09:23:45 2018 +0100

Notes added by 'git notes add'

diff --git a/1a/f1316ff68444084fa19402da483d223ed89503 
b/1a/f1316ff68444084fa19402da483d223ed89503
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/1a/f1316ff68444084fa19402da483d223ed89503
@@ -0,0 +1 @@
+ignore: aoo
commit 566bfa25055359698a9a5790ebd26d5ed9227d6c
Author: Caolán McNamara 
AuthorDate: Tue Oct 16 09:23:31 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 09:23:31 2018 +0100

Notes added by 'git notes add'

diff --git a/ae/1f34be5c9a49fae1eacdb3c1e5267acea53441 
b/ae/1f34be5c9a49fae1eacdb3c1e5267acea53441
new file mode 100644
index ..720c001c8078
--- /dev/null
+++ b/ae/1f34be5c9a49fae1eacdb3c1e5267acea53441
@@ -0,0 +1 @@
+merged as: 99c59c594ff6747abef4529fbb2251751737eb7e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 include/sfx2/dispatch.hxx|4 
 include/sfx2/printer.hxx |3 
 include/sfx2/progress.hxx|1 
 sfx2/source/appl/app.cxx |1 
 sfx2/source/appl/workwin.cxx |  148 +---
 sfx2/source/bastyp/progress.cxx  |   52 
 sfx2/source/control/bindings.cxx |2 
 sfx2/source/control/dispatch.cxx |  157 +--
 sfx2/source/control/statcach.cxx |2 
 sfx2/source/control/unoctitm.cxx |3 
 sfx2/source/dialog/splitwin.cxx  |3 
 sfx2/source/inc/workwin.hxx  |8 -
 sfx2/source/view/printer.cxx |   30 ---
 sfx2/source/view/viewfrm2.cxx|2 
 14 files changed, 54 insertions(+), 362 deletions(-)

New commits:
commit 27dadc070ec2c2a602d3c5b3494dd0bdc15c785f
Author: Noel Grandin 
AuthorDate: Tue Oct 16 09:13:14 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 16 10:15:36 2018 +0200

loplugin:singlevalfields in sfx2

pParent in SfxDispatch_Impl was always nullptr, which led to a bunch of
dead code
similarly with pParent in SfxWorkWindow

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

diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index 9d91d7f60966..9e2f0a0379a2 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -101,7 +101,7 @@ friend class SfxHelp;
 SAL_DLLPRIVATE void Update_Impl_( bool,bool,bool,SfxWorkWindow*);
 
 
-boolFindServer_( sal_uInt16 nId, SfxSlotServer &rServer, 
bool bModal );
+boolFindServer_( sal_uInt16 nId, SfxSlotServer &rServer );
 boolFillState_( const SfxSlotServer &rServer,
 SfxItemSet &rState, const SfxSlot 
*pRealSlot );
 voidExecute_( SfxShell &rShell, const SfxSlot &rSlot,
@@ -176,7 +176,7 @@ public:
 SAL_DLLPRIVATE void Update_Impl( bool bForce = false ); // ObjectBars etc.
 SAL_DLLPRIVATE bool IsUpdated_Impl() const;
 SAL_DLLPRIVATE bool GetShellAndSlot_Impl( sal_uInt16 nSlot, SfxShell 
**ppShell, const SfxSlot **ppSlot,
-  bool bOwnShellsOnly, bool 
bModal, bool bRealSlot=true );
+  bool bOwnShellsOnly, bool 
bRealSlot );
 SAL_DLLPRIVATE void SetReadOnly_Impl( bool  bOn );
 SAL_DLLPRIVATE bool GetReadOnly_Impl() const;
 SAL_DLLPRIVATE SfxSlotFilterState IsSlotEnabledByFilter_Impl( sal_uInt16 
nSID ) const;
diff --git a/include/sfx2/printer.hxx b/include/sfx2/printer.hxx
index 9704a73562db..d7d690e78ea8 100644
--- a/include/sfx2/printer.hxx
+++ b/include/sfx2/printer.hxx
@@ -28,15 +28,12 @@
 class SfxTabPage;
 class SfxItemSet;
 
-struct SfxPrinter_Impl;
-
 // class SfxPrinter --
 
 class SFX2_DLLPUBLIC SfxPrinter : public Printer
 {
 private:
 std::unique_ptr pOptions;
-std::unique_ptr< SfxPrinter_Impl >  pImpl;
 boolbKnown;
 
 SAL_DLLPRIVATE void operator =(SfxPrinter &) = delete;
diff --git a/include/sfx2/progress.hxx b/include/sfx2/progress.hxx
index ba945002a64d..dbe529cdab29 100644
--- a/include/sfx2/progress.hxx
+++ b/include/sfx2/progress.hxx
@@ -55,7 +55,6 @@ public:
 voidSuspend();
 boolIsSuspended() const { return bSuspended; }
 
-voidUnLock();
 voidReschedule();
 
 voidStop();
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 605de4d76195..6ff4e5c5cea6 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -353,7 +353,6 @@ void SfxApplication::SetProgress_Impl
 if ( pImpl->pProgress && pProgress )
 {
 pImpl->pProgress->Suspend();
-pImpl->pProgress->UnLock();
 delete pImpl->pProgress;
 }
 
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 7128131c141b..363b3005d1f9 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -339,19 +339,6 @@ static OUString GetResourceURLFromToolbarId(ToolbarId eId)
 return theFilledToolBarResIdToResourceURLMap::get().findURL(eId);
 }
 
-static bool IsAppWorkWinToolbox_Impl( sal_uInt16 nPos )
-{
-switch ( nPos )
-{
-case SFX_OBJECTBAR_APPLICATION :
-case SFX_OBJECTBAR_MACRO:
-case SFX_OBJECTBAR_FULLSCREEN:
-return true;
-default:
-return false;
-}
-}
-
 static sal_uInt16 TbxMatch( sal_uInt16 nPos )
 {
 switch ( nPos )
@@ -463,7 +450,6 @@ static constexpr OUStringLiteral g_aProgressBarResName( 
"private:resource/progre
 // constructor for workwin of a Frame
 
 SfxWorkWindow::SfxWorkWindow( vcl::Window *pWin, SfxFrame *pFrm, SfxFrame* 
pMaster ) :
-pParent( nullptr ),
 pBinding

[Libreoffice-commits] core.git: framework/source include/vcl svtools/source vcl/README.lifecycle vcl/source

[Libreoffice Gerrit user]

 framework/source/uielement/toolbarmanager.cxx |9 -
 include/vcl/lazydelete.hxx|  152 --
 include/vcl/window.hxx|8 -
 svtools/source/uno/popupwindowcontroller.cxx  |3 
 vcl/README.lifecycle  |2 
 vcl/source/app/svapp.cxx  |   11 -
 vcl/source/helper/lazydelete.cxx  |   35 -
 vcl/source/window/menu.cxx|8 -
 vcl/source/window/menubarwindow.cxx   |4 
 vcl/source/window/menufloatingwindow.cxx  |4 
 vcl/source/window/window.cxx  |   14 --
 vcl/source/window/window2.cxx |4 
 12 files changed, 28 insertions(+), 226 deletions(-)

New commits:
commit 8a2f7704cd0e43304e54bf2281232335cc0979a3
Author: Caolán McNamara 
AuthorDate: Fri Oct 12 15:42:59 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 09:54:13 2018 +0200

drop LazyDeletor

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

diff --git a/framework/source/uielement/toolbarmanager.cxx 
b/framework/source/uielement/toolbarmanager.cxx
index 5ca1bb8daa69..1ee4797d889b 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -232,13 +232,10 @@ void ToolBarManager::Destroy()
 delete static_cast< AddonsParams* >( m_pToolBar->GetItemData( 
nItemId ));
 }
 
-// Hide toolbar as lazy delete can destroy the toolbar much later.
-m_pToolBar->Hide();
-// #i93173# delete toolbar lazily as we can still be in one of its handlers
 // tdf#119390 this will reparent the toolbar, so focus is restored from a
 // floating toolbar to the last focused control of the application window.
-m_pToolBar->doLazyDelete();
-
+m_pToolBar->SetParentToDefaultWindow();
+// #i93173# note we can still be in one of the toolbar's handlers
 m_pToolBar->SetSelectHdl( Link() );
 m_pToolBar->SetActivateHdl( Link() );
 m_pToolBar->SetDeactivateHdl( Link() );
@@ -248,7 +245,7 @@ void ToolBarManager::Destroy()
 m_pToolBar->SetStateChangedHdl( Link() );
 m_pToolBar->SetDataChangedHdl( Link() );
 
-m_pToolBar.clear();
+m_pToolBar.disposeAndClear();
 
 SvtMiscOptions().RemoveListenerLink( LINK( this, ToolBarManager, 
MiscOptionsChanged ) );
 }
diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx
index 89c88cbf4cc2..f7d74573de66 100644
--- a/include/vcl/lazydelete.hxx
+++ b/include/vcl/lazydelete.hxx
@@ -35,158 +35,8 @@
 
 namespace vcl
 {
-/* Helpers for lazy object deletion
-
-With vcl it is often necessary to delete objects (especially Windows)
-in the right order as well as in a way ensuring that the deleted objects
-are not still on the stack (e.g. deleting a Window in its key handler). To
-make this easier a helper class is given here which takes care of both
-sorting as well as lazy deletion.
-
-The grisly details:
-LazyDelete is a class that LazyDeletor register to. When vcl's event
-loop (that is Application::Yield or Application::Reschedule) comes out
-of the last level, the LazyDelete::flush is called. This will cause
-LazyDelete to delete all registered LazyDeletor objects.
-
-LazyDeletor is a one instance object that contains a list of
- objects to be deleted in sorted order. It is derived from
-LazyDeletorBase as to be able to register itself in LazyDelete.
-
-The user calls the static method LazyDeletor::Delete( T* ) with the
-object to be destroyed lazy. The static method creates the LazyDeletor
-(which in turn registers itself in LazyDelete) if this is the first time
-a T* is to be destroyed lazy. It then inserts the object. When the 
LazyDeletor
-gets delete it will delete the stored objects in a fashion
-that will ensure the correct order of deletion via the specialized is_less 
method
-(e.g. if a Window is a child of another Window and therefore should be 
destroyed
-first it is "less" in this sense)
-
-LazyDelete::flush will be called when the top of the nested event loop is
-reached again and will then destroy each registered LazyDeletor which
-in turn destroys the objects needed to be destroyed lazily. After this
-the state is as before entering the event loop.
-
-Preconditions:
-- The class  of which objects are to be destroyed needs a virtual
-destructor or must be final, else the wrong type will be destroyed.
-- The destructor of  should call LazyDeletor::Undelete( this ). This
-prevents duplicate deletion in case someone destroys the object 
prematurely.
-*/
-
-class LazyDeletorBase;
-class VCL_DLLPUBLIC LazyDelete
-{
-public:
-/** flush all registered object lists
-*/
-stat

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

[Libreoffice Gerrit user]

 sd/source/ui/animations/CustomAnimationDialog.cxx |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 20a872d21602409cda873bb1f4830d50be3b6f8b
Author: Caolán McNamara 
AuthorDate: Mon Oct 15 21:17:14 2018 +0100
Commit: Caolán McNamara 
CommitDate: Tue Oct 16 09:54:29 2018 +0200

tdf#120626 unable to set direction in custom animation dialog

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

diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx 
b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 85a14a373463..2423a19e1497 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -188,7 +188,7 @@ public:
 virtual void setValue( const Any& rValue, const OUString& rPresetId ) 
override;
 
 private:
-std::map< sal_uInt16, OUString > maPropertyValues;
+std::vector maPropertyValues;
 Link maModifyLink;
 std::unique_ptr mxControl;
 
@@ -235,9 +235,9 @@ void SdPresetPropertyBox::setValue( const Any& rValue, 
const OUString& rPresetId
 for( auto& aSubType : aSubTypes )
 {
 
mxControl->append_text(rPresets.getUINameForProperty(aSubType));
-if(aSubType == aPropertyValue)
-nPos = mxControl->get_count() - 1;
-maPropertyValues[nPos] = aSubType;
+maPropertyValues.push_back(aSubType);
+if (aSubType == aPropertyValue)
+nPos = maPropertyValues.size() - 1;
 }
 }
 else
@@ -252,7 +252,10 @@ void SdPresetPropertyBox::setValue( const Any& rValue, 
const OUString& rPresetId
 
 Any SdPresetPropertyBox::getValue()
 {
-return makeAny(maPropertyValues[mxControl->get_active()]);
+const int nIndex = mxControl->get_active();
+if (nIndex == -1)
+return Any();
+return makeAny(maPropertyValues[nIndex]);
 }
 
 class ColorPropertyBox  : public PropertySubControl
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp

[Libreoffice Gerrit user]

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

New commits:
commit a959056967d354243e7eaa6c52357efc4d5adba7
Author: Miklos Vajna 
AuthorDate: Tue Oct 16 09:12:53 2018 +0200
Commit: Miklos Vajna 
CommitDate: Tue Oct 16 09:14:13 2018 +0200

wsd: unnecesary value parameter in LOOLWSD

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index e7d99b5ca..6a559f025 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2758,7 +2758,7 @@ private:
 /// to the @clientSockets' poll when created with @factory.
 std::shared_ptr getServerSocket(ServerSocket::Type type, int 
port,
   SocketPoll &clientSocket,
-  
std::shared_ptr factory)
+  const 
std::shared_ptr& factory)
 {
 auto serverSocket = std::make_shared(
 type == ServerSocket::Type::Local ? Socket::Type::IPv4 : 
ClientPortProto,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/IwyuFilter_sc.yaml |   86 
++
 sc/qa/unit/datacache.cxx  |1 
 sc/qa/unit/dataproviders_test.cxx |3 
 sc/qa/unit/datatransformation_test.cxx|1 
 sc/qa/unit/helper/qahelper.cxx|1 
 sc/qa/unit/range.cxx  |1 
 sc/qa/unit/rangelst_test.cxx  |1 
 sc/qa/unit/subsequent_export-test.cxx |1 
 sc/qa/unit/subsequent_filters-test.cxx|1 
 sc/qa/unit/ucalc.cxx  |1 
 sc/qa/unit/ucalc_formula.cxx  |2 
 sc/qa/unit/ucalc_sort.cxx |1 
 sc/source/filter/excel/excel.cxx  |1 
 sc/source/filter/oox/workbookfragment.cxx |1 
 sc/source/filter/xml/xmlimprt.cxx |1 
 sc/source/ui/Accessibility/AccessibleCell.cxx |1 
 sc/source/ui/Accessibility/AccessibleContextBase.cxx  |1 
 sc/source/ui/Accessibility/AccessibleFilterMenu.cxx   |1 
 sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx   |1 
 sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx  |1 
 sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx  |1 
 sc/source/ui/Accessibility/AccessibleTableBase.cxx|1 
 sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx |3 
 sc/source/ui/app/scdll.cxx|1 
 sc/source/ui/attrdlg/scdlgfact.cxx|1 
 sc/source/ui/condformat/condformatdlg.cxx |1 
 sc/source/ui/condformat/condformatdlgentry.cxx|3 
 sc/source/ui/condformat/condformathelper.cxx  |1 
 sc/source/ui/condformat/condformatmgr.cxx |2 
 sc/source/ui/dataprovider/csvdataprovider.cxx |3 
 sc/source/ui/dataprovider/dataprovider.cxx|3 
 sc/source/ui/dataprovider/htmldataprovider.cxx|3 
 sc/source/ui/dataprovider/sqldataprovider.cxx |3 
 sc/source/ui/dataprovider/xmldataprovider.cxx |2 
 sc/source/ui/dbgui/PivotLayoutDialog.cxx  |2 
 sc/source/ui/dbgui/csvruler.cxx   |1 
 sc/source/ui/docshell/docsh.cxx   |3 
 sc/source/ui/docshell/docsh3.cxx  |1 
 sc/source/ui/docshell/docsh6.cxx  |1 
 sc/source/ui/formdlg/dwfunctr.cxx |1 
 sc/source/ui/inc/AccessibilityHints.hxx   |1 
 sc/source/ui/inc/AccessibleCell.hxx   |6 
 sc/source/ui/inc/AccessibleCellBase.hxx   |1 
 sc/source/ui/inc/AccessibleContextBase.hxx|6 
 sc/source/ui/inc/AccessibleEditObject.hxx |4 
 sc/source/ui/inc/AccessiblePageHeader.hxx |1 
 sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx  |1 
 sc/source/ui/inc/AccessibleSpreadsheet.hxx|1 
 sc/source/ui/inc/AccessibleTableBase.hxx  |1 
 sc/source/ui/inc/AccessibleText.hxx   |2 
 sc/source/ui/inc/AnalysisOfVarianceDialog.hxx |6 
 sc/source/ui/inc/ExponentialSmoothingDialog.hxx   |6 
 sc/source/ui/inc/IAnyRefDialog.hxx|1 
 sc/source/ui/inc/MatrixComparisonGenerator.hxx|6 
 sc/source/ui/inc/MovingAverageDialog.hxx  |6 
 sc/source/ui/inc/PivotLayoutDialog.hxx|4 
 sc/source/ui/inc/PivotLayoutTreeListBase.hxx  |2 
 sc/source/ui/inc/RandomNumberGeneratorDialog.hxx  |4 
 sc/source/ui/inc/SamplingDialog.hxx   |3 
 sc/source/ui/inc/StatisticsInputOutputDialog.hxx  |3 
 sc/source/ui/inc/StatisticsTwoVariableDialog.hxx  |3 
 sc/source/ui/inc/TableFillingAndNavigationTools.hxx   |5 
 sc/source/ui/inc/acredlin.hxx |   11 -
 sc/source/ui/inc/anyrefdg.hxx |9 -
 sc/source/ui/inc/areasdlg.hxx |3 
 sc/source/ui/inc/attrdlg.hxx  |1 
 sc/source/ui/inc/auditsh.hxx   

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

[Libreoffice Gerrit user]

 sw/qa/extras/rtfexport/data/tdf112520.docx |binary
 sw/qa/extras/rtfexport/rtfexport3.cxx  |   21 +
 sw/source/filter/ww8/rtfsdrexport.cxx  |   12 +---
 sw/source/filter/ww8/rtfsdrexport.hxx  |2 ++
 4 files changed, 32 insertions(+), 3 deletions(-)

New commits:
commit 2b920bdc12f3bf3a196ec0d6d59043a68e663e33
Author: Miklos Vajna 
AuthorDate: Mon Oct 15 21:11:24 2018 +0200
Commit: Miklos Vajna 
CommitDate: Tue Oct 16 09:02:46 2018 +0200

tdf#112520 RTF export: write ZOrder only for toplevel shapes

RTF export at the moment exports children of group shapes as a flat
shape list. This means that the order inside the group shape is not
relevant for the toplevel ZOrder, so just don't write it.

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

diff --git a/sw/qa/extras/rtfexport/data/tdf112520.docx 
b/sw/qa/extras/rtfexport/data/tdf112520.docx
new file mode 100644
index ..31c5a0afc21e
Binary files /dev/null and b/sw/qa/extras/rtfexport/data/tdf112520.docx differ
diff --git a/sw/qa/extras/rtfexport/rtfexport3.cxx 
b/sw/qa/extras/rtfexport/rtfexport3.cxx
index 45be1c450cb4..26bbc8121372 100644
--- a/sw/qa/extras/rtfexport/rtfexport3.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport3.cxx
@@ -16,6 +16,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class Test : public SwModelTestBase
 {
@@ -172,6 +173,26 @@ DECLARE_RTFEXPORT_TEST(testTdf117505, "tdf117505.odt")
  getProperty(xFirstPage, "HeaderHeight"));
 }
 
+DECLARE_RTFEXPORT_TEST(testTdf112520, "tdf112520.docx")
+{
+if (!mbExported)
+return;
+
+// Assert that the white shape is on top of the yellow one.
+CPPUNIT_ASSERT_EQUAL(static_cast(0x00),
+ getProperty(getShape(2), "FillColor"));
+CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER,
+ getProperty(getShape(2), 
"AnchorType"));
+CPPUNIT_ASSERT_EQUAL(static_cast(0xff),
+ getProperty(getShape(3), "FillColor"));
+// Without the accompanying fix in place, this test would have failed with
+// 'expected: 4, actual: 2'.
+// This means the draw page was 0/at-char/white, 1/at-char/yellow, 
2/at-page/white,
+// instead of the good 0/at-page/white, 1/at-char/yellow, 2/at-char/white.
+CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER,
+ getProperty(getShape(3), 
"AnchorType"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx 
b/sw/source/filter/ww8/rtfsdrexport.cxx
index 51ec0f3f638e..55395917d739 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -90,10 +90,11 @@ void RtfSdrExport::CloseContainer()
 sal_uInt32 RtfSdrExport::EnterGroup(const OUString& /*rShapeName*/,
 const tools::Rectangle* /*pRect*/)
 {
+m_bInGroup = true;
 return GenerateShapeId();
 }
 
-void RtfSdrExport::LeaveGroup() { /* noop */}
+void RtfSdrExport::LeaveGroup() { m_bInGroup = false; }
 
 void RtfSdrExport::AddShape(sal_uInt32 nShapeType, ShapeFlag nShapeFlags, 
sal_uInt32 /*nShapeId*/)
 {
@@ -562,8 +563,13 @@ sal_Int32 RtfSdrExport::StartShape()
 m_rAttrOutput.RunText().append(OOO_STRING_SVTOOLS_RTF_SHPBYIGNORE);
 
 // Write ZOrder.
-m_rAttrOutput.RunText().append(OOO_STRING_SVTOOLS_RTF_SHPZ);
-m_rAttrOutput.RunText().append(OString::number(m_pSdrObject->GetOrdNum()));
+if (!m_bInGroup)
+{
+// Order inside the group shape is not relevant for the flat shape list
+// we write.
+m_rAttrOutput.RunText().append(OOO_STRING_SVTOOLS_RTF_SHPZ);
+
m_rAttrOutput.RunText().append(OString::number(m_pSdrObject->GetOrdNum()));
+}
 
 for (auto it = m_aShapeProps.rbegin(); it != m_aShapeProps.rend(); ++it)
 lcl_AppendSP(m_rAttrOutput.RunText(), (*it).first.getStr(), 
(*it).second);
diff --git a/sw/source/filter/ww8/rtfsdrexport.hxx 
b/sw/source/filter/ww8/rtfsdrexport.hxx
index c2c33de4aca2..b0c9f151e790 100644
--- a/sw/source/filter/ww8/rtfsdrexport.hxx
+++ b/sw/source/filter/ww8/rtfsdrexport.hxx
@@ -56,6 +56,8 @@ class RtfSdrExport final : public EscherEx
 /// Remember which shape types we had already written.
 std::unique_ptr m_pShapeTypeWritten;
 
+bool m_bInGroup = false;
+
 public:
 explicit RtfSdrExport(RtfExport& rExport);
 ~RtfSdrExport() override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits