date:20200608

Re: 6.4.4.4 libssl error

2020-06-08 Thread Michael Weghorn

On 09/06/2020 08.40, Chetan Aru wrote:
> I have been asked to produce a build from any of the tags 6.4.3.x or later.
> So looks like my best bet is wait for 6.4.5.x or figure out a way to get
> around the build error.

In case you really don't have the option to add that commit for some
reason or wait until 6.4.5 has been tagged, the build log of the Jenkins
build of the parent commit (i.e. which doesn't contain the fix) might
help to see what's the relevant difference in your setup (since this one
worked while yours fails):

https://ci.libreoffice.org/job/gerrit_windows/65734/consoleFull
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Recalculate and Recalculate Hard in Calc

2020-06-08 Thread Mike Kaganski

Hi,

On 08.06.2020 13:01, Steve Fanning wrote:
> I’m having a problem understanding the Help information for these
> functions (search for “recalculate” in the Help index).
> 
> The Help seems to state that choosing Data > Calculate > Recalculate (or
> its equivalent shortcut F9) “recalculates the currently selected cells
> and formula cells that depend on them”. Whatever I try in Calc, these
> interactions affect lots of cells, not just those currently selected.
> 
> In an empty spreadsheet, try the following:
> (a) Set Data > Calculate > AutoCalculate to off.
> (b) Type =a1+1 into cell a2.
> (c) Type the value 1 into cell a1.
> (d) Type =e5+1 into cell e6.
> (e) Type the value 1 into cell e5.
> (f) Select cells e5 and e6.
> (g) Choose Data > Calculate > Recalculate or press F9.
> When I do this, the value in the unselected cell a2 is updated.
> 
> Is the Help inaccurate or am I muddled?
> 
> And, if my example above is valid, what does Recalculate Hard do that
> Recalculate doesn’t?

FTR: the code for Recalculate (F9) is ScDocShell::DoRecalc; for
Recalculate Hard (Ctrl+Shift+F9) is ScDocShell::DoHardRecalc.

The former first sets current cell "dirty", then calls
ScDocument::CalcFormulaTree (that recalcs *all* *dirty* cells in the
document) and ScDBFunc::UpdateCharts (to make sure the changes get into
charts).

Thus, if the document contains many dirty cells (as working in disabled
AutoCalculate mode), F9 would make sure that currently selected cell is
dirty (to make sure it recalcs), but then will recalc not only it, but
all other dirty cells. But called next time in the same mode, only
current cell plus cells made dirty after last recalc will update (not
all formulas, which might be many thousands).

ScDocShell::DoHardRecalc calls ScDocument::CalcAll (that recalcs *all*
formula cells, not only dirty ones), then ScDocFunc::DetectiveRefresh,
then ScDBFunc::UpdateCharts.

Thus Ctrl+Shift+F9 will take much longer than F9 in documents where most
cells are up-to-date.

HTH.

-- 
Best regards,
Mike Kaganski

pEpkey.asc
Description: application/pgp-keys
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Building skia with clang(-cl)

2020-06-08 Thread Michael Weghorn

On 09/06/2020 08.32, Rene Engelhard wrote:
> Hi,
> 
> Am 09.06.20 um 08:18 schrieb Michael Weghorn:
>> On 08/06/2020 15.16, Rene Engelhard wrote:
>>> (I consider the existence of gen a problem, too, maybe I should just
>>> make -gtk3 a non-optional part.
>>>
>>> But still then afaik the desktop detector will still use "gen" on e.g.
>>> fluxbox or so, didn't actually check lately?)
>> IIRC, Caolán mentioned that on IRC yesterday already:
>> Unless explicitly specified otherwise (like setting SAL_USE_VCLPLUGIN
>> env variable), "gen" is the last choice, so won't be used if another VCL
>> plugin is present and can be loaded, s. [1].
> 
> And as I also said yesterday on IRC it is possible to install LO in
> Debian without gtk3 or qt5/kf5 present.
> 
> That also can be deliberate (some random WM which doesn't "need" gtk3,
> KDE people who do not want gtk3 stuff on their system, ..), or
> accidentially (apt install libreoffice doesn't "force" gtk3 on people.
> If you choose -gnome you get -gtk3 recommended and thus installed, as
> does the installer for "desktop" installs)
> 
> Yes, I know people advocate on ignoring those dependencies and just ship
> it in -core or so and let the loading mechanism figure it out. I think
> this is bad (packages should express their library linkage in dependencies.)

Yes, you mentioned that indeed; I was just referring to the part of the
email I quoted where you were mentioning what would happen if -gtk3 was
made non-optional in Debian. (So this was not really news, more of a
"for the records" comment, since probably not everybody on the mailing
list also reads all IRC messages).

(And I personally agree that VCL plugin packages in Debian should
actually depend on the libraries they need to be usable.)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2020-06-08 Thread Jan Holesovsky (via logerrit)

 loleaflet/src/control/Toolbar.js |3 ++-
 wsd/LOOLWSD.cpp  |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 9f830d3f9d96999b83d4a57d9ab03610cf41abde
Author: Jan Holesovsky 
AuthorDate: Fri Jun 5 21:36:24 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jun 8 23:49:30 2020 +0200

One more check that should be overriden with --disable-lool-user-checking.

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

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 12898f506..457e109b5 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -852,7 +852,7 @@ LOOLWSD::~LOOLWSD()
 void LOOLWSD::initialize(Application& self)
 {
 #if !MOBILEAPP
-if (geteuid() == 0)
+if (geteuid() == 0 && CheckLoolUser)
 {
 throw std::runtime_error("Do not run as root. Please run as lool 
user.");
 }
commit d8a7d443b687791fb13ea3abe7a846ffe1170838
Author: Szymon Kłos 
AuthorDate: Mon Jun 8 08:00:31 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jun 8 23:49:21 2020 +0200

Allow to open word count in readonly mode

Change-Id: I1277dc815c2cee7e133a2c283e1e7bab9bb4a174
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95786
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 11f07f8f6..fdeec58af 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -157,7 +157,8 @@ L.Map.include({
},
 
sendUnoCommand: function (command, json) {
-   if (this._permission === 'edit') {
+   var isAllowedInReadOnly = command == '.uno:WordCountDialog';
+   if (this._permission === 'edit' || isAllowedInReadOnly) {
this._socket.sendMessage('uno ' + command + (json ? ' ' 
+ JSON.stringify(json) : ''));
}
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: 6.4.4.4 libssl error

2020-06-08 Thread Chetan Aru

I have been asked to produce a build from any of the tags 6.4.3.x or later.
So looks like my best bet is wait for 6.4.5.x or figure out a way to get
around the build error.

On Tue, 9 Jun 2020 at 11:53 AM, Michael Weghorn  wrote:

> On 09/06/2020 08.18, Chetan Aru wrote:
> > Thanks for pointing it out.
> > How do I get my build of 6.4.4.2 to ignore these errors then? I can
> > build with VS17 as well as VS19.
> > Is there any flag that I need to setup during build?
>
> I can't tell what the exact circumstances were that made it work for
> "some people" while it broke for others (and am not building on Windows
> myself usually).
> Anyway, is there any specific reason to not just apply the patch that
> fixes the issue (or build a branch that already has it)?
>
> >
> > On Tue, 9 Jun 2020 at 11:35 AM, Michael Weghorn  > > wrote:
> >
> > On 09/06/2020 06.48, Chetan Aru wrote:
> > > I am trying to build the LibreOffice 6.4.4.4 tag on Windows machine
> > > (Virtual Machine). I have installed cygwin 64-bit and doing 64-bit
> > > build. I am getting the following errors. Can someone please help?
> > Seems
> > > that having this patch (
> > https://gerrit.libreoffice.org/c/core/+/95559)
> > > helps, but how is it that 6.4.4.4 was built on Windows machine
> > without this?
> >
> > The commit message of the commit you're pointing to says:
> >
> > "For other people these failures are silently ignored, but they
> > show up in their python3 build.log. But my msbuild version
> > 15.9.21+g9802d43bc3 from VS2017 fails hard on these errors."
> >
> >
> > ___
> > 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

Re: Building skia with clang(-cl)

2020-06-08 Thread Rene Engelhard

Hi,

Am 09.06.20 um 08:18 schrieb Michael Weghorn:
> On 08/06/2020 15.16, Rene Engelhard wrote:
>> (I consider the existence of gen a problem, too, maybe I should just
>> make -gtk3 a non-optional part.
>>
>> But still then afaik the desktop detector will still use "gen" on e.g.
>> fluxbox or so, didn't actually check lately?)
> IIRC, Caolán mentioned that on IRC yesterday already:
> Unless explicitly specified otherwise (like setting SAL_USE_VCLPLUGIN
> env variable), "gen" is the last choice, so won't be used if another VCL
> plugin is present and can be loaded, s. [1].

And as I also said yesterday on IRC it is possible to install LO in
Debian without gtk3 or qt5/kf5 present.

That also can be deliberate (some random WM which doesn't "need" gtk3,
KDE people who do not want gtk3 stuff on their system, ..), or
accidentially (apt install libreoffice doesn't "force" gtk3 on people.
If you choose -gnome you get -gtk3 recommended and thus installed, as
does the installer for "desktop" installs)

Yes, I know people advocate on ignoring those dependencies and just ship
it in -core or so and let the loading mechanism figure it out. I think
this is bad (packages should express their library linkage in dependencies.)

Regards,

Rene

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

Re: 6.4.4.4 libssl error

2020-06-08 Thread Michael Weghorn

On 09/06/2020 08.18, Chetan Aru wrote:
> Thanks for pointing it out.
> How do I get my build of 6.4.4.2 to ignore these errors then? I can
> build with VS17 as well as VS19.
> Is there any flag that I need to setup during build?

I can't tell what the exact circumstances were that made it work for
"some people" while it broke for others (and am not building on Windows
myself usually).
Anyway, is there any specific reason to not just apply the patch that
fixes the issue (or build a branch that already has it)?

> 
> On Tue, 9 Jun 2020 at 11:35 AM, Michael Weghorn  > wrote:
> 
> On 09/06/2020 06.48, Chetan Aru wrote:
> > I am trying to build the LibreOffice 6.4.4.4 tag on Windows machine
> > (Virtual Machine). I have installed cygwin 64-bit and doing 64-bit
> > build. I am getting the following errors. Can someone please help?
> Seems
> > that having this patch (
> https://gerrit.libreoffice.org/c/core/+/95559)
> > helps, but how is it that 6.4.4.4 was built on Windows machine
> without this?
> 
> The commit message of the commit you're pointing to says:
> 
> "For other people these failures are silently ignored, but they
> show up in their python3 build.log. But my msbuild version
> 15.9.21+g9802d43bc3 from VS2017 fails hard on these errors."
> 
> 
> ___
> 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

Re: 6.4.4.4 libssl error

2020-06-08 Thread Chetan Aru

Thanks for pointing it out.
How do I get my build of 6.4.4.2 to ignore these errors then? I can build
with VS17 as well as VS19.
Is there any flag that I need to setup during build?

On Tue, 9 Jun 2020 at 11:35 AM, Michael Weghorn  wrote:

> On 09/06/2020 06.48, Chetan Aru wrote:
> > I am trying to build the LibreOffice 6.4.4.4 tag on Windows machine
> > (Virtual Machine). I have installed cygwin 64-bit and doing 64-bit
> > build. I am getting the following errors. Can someone please help? Seems
> > that having this patch ( https://gerrit.libreoffice.org/c/core/+/95559)
> > helps, but how is it that 6.4.4.4 was built on Windows machine without
> this?
>
> The commit message of the commit you're pointing to says:
>
> "For other people these failures are silently ignored, but they
> show up in their python3 build.log. But my msbuild version
> 15.9.21+g9802d43bc3 from VS2017 fails hard on these errors."
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Building skia with clang(-cl)

2020-06-08 Thread Michael Weghorn

On 08/06/2020 15.16, Rene Engelhard wrote:
> (I consider the existence of gen a problem, too, maybe I should just
> make -gtk3 a non-optional part.
> 
> But still then afaik the desktop detector will still use "gen" on e.g.
> fluxbox or so, didn't actually check lately?)

IIRC, Caolán mentioned that on IRC yesterday already:
Unless explicitly specified otherwise (like setting SAL_USE_VCLPLUGIN
env variable), "gen" is the last choice, so won't be used if another VCL
plugin is present and can be loaded, s. [1].

[1]
https://git.libreoffice.org/core/+/4c4b3218b8595a9809ffade0cfd064f3d9335dff/vcl/source/app/salplug.cxx#228
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - icon-themes/colibre icon-themes/colibre_svg

2020-06-08 Thread Rizal Muttaqin (via logerrit)

 icon-themes/colibre/links.txt   |2 --
 icon-themes/colibre/sfx2/res/indexoff_big.png   |binary
 icon-themes/colibre/sfx2/res/indexoff_small.png |binary
 icon-themes/colibre/sfx2/res/indexon_big.png|binary
 icon-themes/colibre/sfx2/res/indexon_small.png  |binary
 icon-themes/colibre/sfx2/res/vendor01.png   |binary
 icon-themes/colibre/svx/res/frmsel1.png |binary
 icon-themes/colibre/svx/res/frmsel10.png|binary
 icon-themes/colibre/svx/res/frmsel11.png|binary
 icon-themes/colibre/svx/res/frmsel12.png|binary
 icon-themes/colibre/svx/res/frmsel13.png|binary
 icon-themes/colibre/svx/res/frmsel14.png|binary
 icon-themes/colibre/svx/res/frmsel15.png|binary
 icon-themes/colibre/svx/res/frmsel16.png|binary
 icon-themes/colibre/svx/res/frmsel2.png |binary
 icon-themes/colibre/svx/res/frmsel3.png |binary
 icon-themes/colibre/svx/res/frmsel4.png |binary
 icon-themes/colibre/svx/res/frmsel5.png |binary
 icon-themes/colibre/svx/res/frmsel6.png |binary
 icon-themes/colibre/svx/res/frmsel7.png |binary
 icon-themes/colibre/svx/res/frmsel8.png |binary
 icon-themes/colibre/svx/res/frmsel9.png |binary
 icon-themes/colibre/svx/res/fwbhcirc.png|binary
 icon-themes/colibre/svx/res/fwbotarc.png|binary
 icon-themes/colibre/svx/res/fwbuttn1.png|binary
 icon-themes/colibre/svx/res/fwbuttn2.png|binary
 icon-themes/colibre/svx/res/fwbuttn3.png|binary
 icon-themes/colibre/svx/res/fwbuttn4.png|binary
 icon-themes/colibre/svx/res/fwlftarc.png|binary
 icon-themes/colibre/svx/res/fwlhcirc.png|binary
 icon-themes/colibre/svx/res/fwrgtarc.png|binary
 icon-themes/colibre/svx/res/fwrhcirc.png|binary
 icon-themes/colibre/svx/res/fwtoparc.png|binary
 icon-themes/colibre_svg/sfx2/res/indexoff_big.svg   |2 +-
 icon-themes/colibre_svg/sfx2/res/indexoff_small.svg |3 ++-
 icon-themes/colibre_svg/sfx2/res/indexon_big.svg|1 +
 icon-themes/colibre_svg/sfx2/res/indexon_small.svg  |2 ++
 icon-themes/colibre_svg/sfx2/res/vendor01.svg   |1 +
 icon-themes/colibre_svg/svx/res/frmsel1.svg |1 +
 icon-themes/colibre_svg/svx/res/frmsel10.svg|1 +
 icon-themes/colibre_svg/svx/res/frmsel11.svg|1 +
 icon-themes/colibre_svg/svx/res/frmsel12.svg|1 +
 icon-themes/colibre_svg/svx/res/frmsel13.svg|1 +
 icon-themes/colibre_svg/svx/res/frmsel14.svg|1 +
 icon-themes/colibre_svg/svx/res/frmsel15.svg|1 +
 icon-themes/colibre_svg/svx/res/frmsel16.svg|1 +
 icon-themes/colibre_svg/svx/res/frmsel2.svg |1 +
 icon-themes/colibre_svg/svx/res/frmsel3.svg |1 +
 icon-themes/colibre_svg/svx/res/frmsel4.svg |1 +
 icon-themes/colibre_svg/svx/res/frmsel5.svg |1 +
 icon-themes/colibre_svg/svx/res/frmsel6.svg |1 +
 icon-themes/colibre_svg/svx/res/frmsel7.svg |1 +
 icon-themes/colibre_svg/svx/res/frmsel8.svg |1 +
 icon-themes/colibre_svg/svx/res/frmsel9.svg |1 +
 icon-themes/colibre_svg/svx/res/fwbhcirc.svg|1 +
 icon-themes/colibre_svg/svx/res/fwbotarc.svg|1 +
 icon-themes/colibre_svg/svx/res/fwbuttn1.svg|1 +
 icon-themes/colibre_svg/svx/res/fwbuttn2.svg|1 +
 icon-themes/colibre_svg/svx/res/fwbuttn3.svg|1 +
 icon-themes/colibre_svg/svx/res/fwbuttn4.svg|1 +
 icon-themes/colibre_svg/svx/res/fwlftarc.svg|1 +
 icon-themes/colibre_svg/svx/res/fwlhcirc.svg|1 +
 icon-themes/colibre_svg/svx/res/fwrgtarc.svg|1 +
 icon-themes/colibre_svg/svx/res/fwrhcirc.svg|1 +
 icon-themes/colibre_svg/svx/res/fwtoparc.svg|1 +
 65 files changed, 34 insertions(+), 4 deletions(-)

New commits:
commit c46a704943be830d603ba0421a329ccb58b8b209
Author: Rizal Muttaqin 
AuthorDate: Mon Jun 8 12:00:56 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Tue Jun 9 07:01:27 2020 +0200

Colibre:tdf#133753 add svx icons

Change-Id: Iffc335098e497e1248c296bb34b1e970da51676b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95778
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 
(cherry picked from commit 4c4b3218b8595a9809ffade0cfd064f3d9335dff)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95870

diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index 0f20acba079f..a5cc816cc087 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -2316,8 +2316,6 @@ sfx2/res/exec_action.png cmd/sc_optionstreedialog.png
 sfx2/res/favourite.png cmd/sc_insertbookmark.png
 sfx2/res/favourite_big.png cmd/lc_insertbookmark.png
 sfx2/res/hlpdoc.pn

6.4.4.4 libssl error

2020-06-08 Thread Chetan Aru

I am trying to build the LibreOffice 6.4.4.4 tag on Windows machine
(Virtual Machine). I have installed cygwin 64-bit and doing 64-bit build. I
am getting the following errors. Can someone please help? Seems that having
this patch ( https://gerrit.libreoffice.org/c/core/+/95559) helps, but how
is it that 6.4.4.4 was built on Windows machine without this?


 
D:\LibreOfficeBuild\Build\workdir\UnpackedTarball\python3\PCBuild\openssl.props(24,5):
error MSB3030: Could not copy the file
"D:/LibreOfficeBuild/Build/workdir/UnpackedTarball/openssl/out32dll\libcrypto-1_1.dll"
because it was not found.
[D:\LibreOfficeBuild\Build\workdir\UnpackedTarball\python3\PCBuild\_ssl.vcxproj]

 
D:\LibreOfficeBuild\Build\workdir\UnpackedTarball\python3\PCBuild\openssl.props(24,5):
error MSB3030: Could not copy the file
"D:/LibreOfficeBuild/Build/workdir/UnpackedTarball/openssl/out32dll\libssl-1_1.pdb"
because it was not found.
[D:\LibreOfficeBuild\Build\workdir\UnpackedTarball\python3\PCBuild\_ssl.vcxproj]

 
D:\LibreOfficeBuild\Build\workdir\UnpackedTarball\python3\PCBuild\openssl.props(24,5):
error MSB3030: Could not copy the file
"D:/LibreOfficeBuild/Build/workdir/UnpackedTarball/openssl/out32dll\libcrypto-1_1.pdb"
because it was not found.
[D:\LibreOfficeBuild\Build\workdir\UnpackedTarball\python3\PCBuild\_ssl.vcxproj]

 
D:\LibreOfficeBuild\Build\workdir\UnpackedTarball\python3\PCBuild\openssl.props(24,5):
error MSB3030: Could not copy the file
"D:/LibreOfficeBuild/Build/workdir/UnpackedTarball/openssl/out32dll\libssl-1_1.dll"
because it was not found.
[D:\LibreOfficeBuild\Build\workdir\UnpackedTarball\python3\PCBuild\_ssl.vcxproj]
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2020-06-08 Thread Tor Lillqvist (via logerrit)

 external/libwpd/libwpd-bundled-soname.patch.0 |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 37c9f427cb9dbebd0c145cd531c6d2afdc088488
Author: Tor Lillqvist 
AuthorDate: Thu Apr 23 17:19:48 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Jun 9 06:39:36 2020 +0200

Use equal number of leading and trailing context lines in patch

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

diff --git a/external/libwpd/libwpd-bundled-soname.patch.0 
b/external/libwpd/libwpd-bundled-soname.patch.0
index 2a669748f21d..ad7cc3fb446f 100644
--- a/external/libwpd/libwpd-bundled-soname.patch.0
+++ b/external/libwpd/libwpd-bundled-soname.patch.0
@@ -1,6 +1,7 @@
 --- src/lib/Makefile.in.orig   2015-08-06 21:41:41.073622494 +0200
 +++ src/lib/Makefile.in2015-08-06 21:42:09.377622009 +0200
-@@ -429,6 +429,6 @@
+@@ -429,7 +429,7 @@
+   -DLIBWPD_BUILD=1 $(am__append_1)
  libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) 
@LIBWPD_WIN32_RESOURCE@
  libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_DEPENDENCIES = 
@LIBWPD_WIN32_RESOURCE@
 -libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LDFLAGS = $(version_info) 
-export-dynamic $(no_undefined)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg

2020-06-08 Thread Rizal Muttaqin (via logerrit)

 icon-themes/colibre/links.txt   |2 --
 icon-themes/colibre/sfx2/res/indexoff_big.png   |binary
 icon-themes/colibre/sfx2/res/indexoff_small.png |binary
 icon-themes/colibre/sfx2/res/indexon_big.png|binary
 icon-themes/colibre/sfx2/res/indexon_small.png  |binary
 icon-themes/colibre/sfx2/res/vendor01.png   |binary
 icon-themes/colibre/svx/res/frmsel1.png |binary
 icon-themes/colibre/svx/res/frmsel10.png|binary
 icon-themes/colibre/svx/res/frmsel11.png|binary
 icon-themes/colibre/svx/res/frmsel12.png|binary
 icon-themes/colibre/svx/res/frmsel13.png|binary
 icon-themes/colibre/svx/res/frmsel14.png|binary
 icon-themes/colibre/svx/res/frmsel15.png|binary
 icon-themes/colibre/svx/res/frmsel16.png|binary
 icon-themes/colibre/svx/res/frmsel2.png |binary
 icon-themes/colibre/svx/res/frmsel3.png |binary
 icon-themes/colibre/svx/res/frmsel4.png |binary
 icon-themes/colibre/svx/res/frmsel5.png |binary
 icon-themes/colibre/svx/res/frmsel6.png |binary
 icon-themes/colibre/svx/res/frmsel7.png |binary
 icon-themes/colibre/svx/res/frmsel8.png |binary
 icon-themes/colibre/svx/res/frmsel9.png |binary
 icon-themes/colibre/svx/res/fwbhcirc.png|binary
 icon-themes/colibre/svx/res/fwbotarc.png|binary
 icon-themes/colibre/svx/res/fwbuttn1.png|binary
 icon-themes/colibre/svx/res/fwbuttn2.png|binary
 icon-themes/colibre/svx/res/fwbuttn3.png|binary
 icon-themes/colibre/svx/res/fwbuttn4.png|binary
 icon-themes/colibre/svx/res/fwlftarc.png|binary
 icon-themes/colibre/svx/res/fwlhcirc.png|binary
 icon-themes/colibre/svx/res/fwrgtarc.png|binary
 icon-themes/colibre/svx/res/fwrhcirc.png|binary
 icon-themes/colibre/svx/res/fwtoparc.png|binary
 icon-themes/colibre_svg/sfx2/res/indexoff_big.svg   |2 +-
 icon-themes/colibre_svg/sfx2/res/indexoff_small.svg |3 ++-
 icon-themes/colibre_svg/sfx2/res/indexon_big.svg|1 +
 icon-themes/colibre_svg/sfx2/res/indexon_small.svg  |2 ++
 icon-themes/colibre_svg/sfx2/res/vendor01.svg   |1 +
 icon-themes/colibre_svg/svx/res/frmsel1.svg |1 +
 icon-themes/colibre_svg/svx/res/frmsel10.svg|1 +
 icon-themes/colibre_svg/svx/res/frmsel11.svg|1 +
 icon-themes/colibre_svg/svx/res/frmsel12.svg|1 +
 icon-themes/colibre_svg/svx/res/frmsel13.svg|1 +
 icon-themes/colibre_svg/svx/res/frmsel14.svg|1 +
 icon-themes/colibre_svg/svx/res/frmsel15.svg|1 +
 icon-themes/colibre_svg/svx/res/frmsel16.svg|1 +
 icon-themes/colibre_svg/svx/res/frmsel2.svg |1 +
 icon-themes/colibre_svg/svx/res/frmsel3.svg |1 +
 icon-themes/colibre_svg/svx/res/frmsel4.svg |1 +
 icon-themes/colibre_svg/svx/res/frmsel5.svg |1 +
 icon-themes/colibre_svg/svx/res/frmsel6.svg |1 +
 icon-themes/colibre_svg/svx/res/frmsel7.svg |1 +
 icon-themes/colibre_svg/svx/res/frmsel8.svg |1 +
 icon-themes/colibre_svg/svx/res/frmsel9.svg |1 +
 icon-themes/colibre_svg/svx/res/fwbhcirc.svg|1 +
 icon-themes/colibre_svg/svx/res/fwbotarc.svg|1 +
 icon-themes/colibre_svg/svx/res/fwbuttn1.svg|1 +
 icon-themes/colibre_svg/svx/res/fwbuttn2.svg|1 +
 icon-themes/colibre_svg/svx/res/fwbuttn3.svg|1 +
 icon-themes/colibre_svg/svx/res/fwbuttn4.svg|1 +
 icon-themes/colibre_svg/svx/res/fwlftarc.svg|1 +
 icon-themes/colibre_svg/svx/res/fwlhcirc.svg|1 +
 icon-themes/colibre_svg/svx/res/fwrgtarc.svg|1 +
 icon-themes/colibre_svg/svx/res/fwrhcirc.svg|1 +
 icon-themes/colibre_svg/svx/res/fwtoparc.svg|1 +
 65 files changed, 34 insertions(+), 4 deletions(-)

New commits:
commit 4c4b3218b8595a9809ffade0cfd064f3d9335dff
Author: Rizal Muttaqin 
AuthorDate: Mon Jun 8 12:00:56 2020 +0700
Commit: Rizal Muttaqin 
CommitDate: Tue Jun 9 01:48:24 2020 +0200

Colibre:tdf#133753 add svx icons

Change-Id: Iffc335098e497e1248c296bb34b1e970da51676b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95778
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index aae468327624..6c0d795d22f9 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -2315,8 +2315,6 @@ sfx2/res/exec_action.png cmd/sc_optionstreedialog.png
 sfx2/res/favourite.png cmd/sc_insertbookmark.png
 sfx2/res/favourite_big.png cmd/lc_insertbookmark.png
 sfx2/res/hlpdoc.png cmd/sc_helpindex.png
-sfx2/res/indexon_big.png cmd/lc_sidebar.png
-sfx2/res/indexon_small.png cmd/sc_sidebar.png
 sfx2/res/minus.png r

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

2020-06-08 Thread Tamás Zolnai (via logerrit)

 cypress_test/integration_tests/desktop/writer/form_field_spec.js |8 

 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b289a2d3c589e3ddf5f49fef60439f56f46ca804
Author: Tamás Zolnai 
AuthorDate: Mon Jun 8 21:38:30 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Tue Jun 9 00:05:08 2020 +0200

cypress: allow equality here.

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

diff --git a/cypress_test/integration_tests/desktop/writer/form_field_spec.js 
b/cypress_test/integration_tests/desktop/writer/form_field_spec.js
index 2b17e3049..4c37068f9 100644
--- a/cypress_test/integration_tests/desktop/writer/form_field_spec.js
+++ b/cypress_test/integration_tests/desktop/writer/form_field_spec.js
@@ -49,10 +49,10 @@ describe('Form field button tests.', function() {
.should(function(frames) {

expect(frames).to.have.lengthOf(1);
var frameRect = 
frames[0].getBoundingClientRect();
-   
expect(frameRect.top).to.be.lessThan(cursorRect.top);
-   
expect(frameRect.bottom).to.be.greaterThan(cursorRect.bottom);
-   
expect(frameRect.left).to.be.lessThan(cursorRect.left);
-   
expect(frameRect.right).to.be.greaterThan(cursorRect.right);
+   
expect(frameRect.top).to.at.most(cursorRect.top);
+   
expect(frameRect.bottom).to.be.at.least(cursorRect.bottom);
+   
expect(frameRect.left).to.at.most(cursorRect.left);
+   
expect(frameRect.right).to.be.at.least(cursorRect.right);
});
});
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Tamás Zolnai (via logerrit)

 cypress_test/Makefile.am |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 7da449d23cc1333e03337f93069102cdeac23b45
Author: Tamás Zolnai 
AuthorDate: Mon Jun 8 20:09:55 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Tue Jun 9 00:04:50 2020 +0200

cypress: improve error matcher.

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

diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am
index 77b270325..23878852a 100644
--- a/cypress_test/Makefile.am
+++ b/cypress_test/Makefile.am
@@ -213,15 +213,17 @@ define run_mobile_tests
)
 endef
 
+ERROR_MATCHER = "Error:\|Command failed:\|Timed out retrying"
+
 define execute_run_parallel
@mkdir -p $(dir $(2)) && touch $(2) && \
echo "`echo $(1) && $(1)`" > $(2) 2>&1 && \
-   if [ -z `grep -o -m 1 "Error:\|Command failed:" $(2)` ];\
+   if [ -z `grep -o -m 1 $(ERROR_MATCHER) $(2)` ];\
then cat $(2);\
elif [ -z $(CYPRESS_NO_SECOND_CHANCE) ]; \
then echo "Second chance!" > $(2) && \
 echo "`echo $(1) && $(1)`" >> $(2) 2>&1 && \
-if [ -z `grep -o -m 1 "Error:\|Command failed:" $(2)` ];\
+if [ -z `grep -o -m 1 $(ERROR_MATCHER) $(2)` ];\
then cat $(2);\
else cat $(2) >> $(ERROR_LOG) && \
 echo -e $(call error_output_string,$(3),$(4)) >> 
$(ERROR_LOG); \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'refs/tags/cp-4.2.4-3' - 0 commits -

2020-06-08 Thread (via logerrit)

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Jan Holesovsky (via logerrit)

Tag 'cp-4.2.4-3' created by Andras Timar  at 
2020-06-08 21:50 +

cp-4.2.4-3

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

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

2020-06-08 Thread Jan Holesovsky (via logerrit)

 loleaflet/src/control/Toolbar.js |3 ++-
 wsd/LOOLWSD.cpp  |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 9f830d3f9d96999b83d4a57d9ab03610cf41abde
Author: Jan Holesovsky 
AuthorDate: Fri Jun 5 21:36:24 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jun 8 23:49:30 2020 +0200

One more check that should be overriden with --disable-lool-user-checking.

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

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 12898f506..457e109b5 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -852,7 +852,7 @@ LOOLWSD::~LOOLWSD()
 void LOOLWSD::initialize(Application& self)
 {
 #if !MOBILEAPP
-if (geteuid() == 0)
+if (geteuid() == 0 && CheckLoolUser)
 {
 throw std::runtime_error("Do not run as root. Please run as lool 
user.");
 }
commit d8a7d443b687791fb13ea3abe7a846ffe1170838
Author: Szymon Kłos 
AuthorDate: Mon Jun 8 08:00:31 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jun 8 23:49:21 2020 +0200

Allow to open word count in readonly mode

Change-Id: I1277dc815c2cee7e133a2c283e1e7bab9bb4a174
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95786
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 11f07f8f6..fdeec58af 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -157,7 +157,8 @@ L.Map.include({
},
 
sendUnoCommand: function (command, json) {
-   if (this._permission === 'edit') {
+   var isAllowedInReadOnly = command == '.uno:WordCountDialog';
+   if (this._permission === 'edit' || isAllowedInReadOnly) {
this._socket.sendMessage('uno ' + command + (json ? ' ' 
+ JSON.stringify(json) : ''));
}
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Xisco Fauli (via logerrit)

 sc/qa/unit/data/xls/tdf81470.xls  |binary
 sc/qa/unit/subsequent_export-test.cxx |   24 
 2 files changed, 24 insertions(+)

New commits:
commit 43ba50e1ce8d4dfb94650abf562c1db9be3405e5
Author: Xisco Fauli 
AuthorDate: Mon Jun 8 14:31:15 2020 +0200
Commit: Xisco Fauli 
CommitDate: Mon Jun 8 23:05:08 2020 +0200

tdf#81470: sc: Add unittest

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

diff --git a/sc/qa/unit/data/xls/tdf81470.xls b/sc/qa/unit/data/xls/tdf81470.xls
new file mode 100644
index ..5389fbbe22d5
Binary files /dev/null and b/sc/qa/unit/data/xls/tdf81470.xls differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 9e685e502093..95b69860433b 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -247,6 +247,7 @@ public:
 void testTdf128976();
 void testTdf120502();
 void testTdf131372();
+void testTdf81470();
 void testTdf122331();
 void testTdf83779();
 
@@ -394,6 +395,7 @@ public:
 CPPUNIT_TEST(testTdf128976);
 CPPUNIT_TEST(testTdf120502);
 CPPUNIT_TEST(testTdf131372);
+CPPUNIT_TEST(testTdf81470);
 CPPUNIT_TEST(testTdf122331);
 CPPUNIT_TEST(testTdf83779);
 
@@ -5030,6 +5032,28 @@ void ScExportTest::testTdf131372()
 assertXPathContent(pSheet, "/x:worksheet/x:sheetData/x:row/x:c[1]/x:f", 
"NA()");
 assertXPathContent(pSheet, "/x:worksheet/x:sheetData/x:row/x:c[2]/x:f", 
"#N/A");
 
+xShell->DoClose();
+
+}
+void ScExportTest::testTdf81470()
+{
+ScDocShellRef xShell = loadDoc("tdf81470.", FORMAT_XLS);
+CPPUNIT_ASSERT(xShell);
+
+//without the fix in place, it would have crashed at export time
+auto pXPathFile = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
+
+//also check revisions are exported
+xmlDocUniquePtr pHeaders = XPathHelper::parseExport(pXPathFile, 
m_xSFactory, "xl/revisions/revisionHeaders.xml");
+CPPUNIT_ASSERT(pHeaders);
+
+assertXPath(pHeaders, "/x:headers/x:header[1]", "dateTime", 
"2014-07-11T13:46:00.0Z");
+assertXPath(pHeaders, "/x:headers/x:header[1]", "userName", "Kohei 
Yoshida");
+assertXPath(pHeaders, "/x:headers/x:header[2]", "dateTime", 
"2014-07-11T18:38:00.0Z");
+assertXPath(pHeaders, "/x:headers/x:header[2]", "userName", "Kohei 
Yoshida");
+assertXPath(pHeaders, "/x:headers/x:header[3]", "dateTime", 
"2014-07-11T18:43:00.0Z");
+assertXPath(pHeaders, "/x:headers/x:header[3]", "userName", "Kohei 
Yoshida");
+
 xShell->DoClose();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - 52 commits - android/app android/lib common/Authorization.cpp common/Crypto.cpp common/FileUtil.cpp common/JsonUtil.hpp common/Log.

2020-06-08 Thread Andras Timar (via logerrit)

Rebased ref, commits from common ancestor:
commit 73e40db867e78301cb1882c5fd469a735dcf6675
Author: Andras Timar 
AuthorDate: Mon Jun 8 22:42:38 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jun 8 22:42:38 2020 +0200

Bump package version to 4.2.4-3

Change-Id: I7c49f4d89522a01fa737978e1831c5900406f772

diff --git a/debian/changelog b/debian/changelog
index 241e84064..1e0a86899 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.2.4-3) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.4-3
+
+ -- Andras Timar   Mon, 08 Jun 2020 22:00:00 +0200
+
 loolwsd (4.2.4-2) unstable; urgency=medium
 
   * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.4-2
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 2da566289..8cc3a2ce3 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:   loolwsd%{name_suffix}
 Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
-Release:2%{?dist}
+Release:3%{?dist}
 Vendor: %{vendor}
 Summary:LibreOffice Online WebSocket Daemon
 License:EULA
commit d5f77d46554908d44e3328ca49272e5664e3dc55
Author: Michael Meeks 
AuthorDate: Mon Jun 8 15:46:29 2020 +0100
Commit: Andras Timar 
CommitDate: Mon Jun 8 22:22:16 2020 +0200

Proxy: handle server startup / un-responsive DocumentBroker creation.

If our 'open' request fails - then we could get this loop:

loadDocument (proxy.php?req=/loleaflet/d2d049224/src/map/Map.js:318)
_activate (proxy.php?req=/loleaflet/d2d049224/src/map/Map.js:1233)
_onSocketClose (proxy.php?req=/loleaflet/d2d049224/src/core/Socket.js:1045)
_signalErrorClose 
(proxy.php?req=/loleaflet/0acb00fc2/loleaflet.html?file_path=file:///tmp/copy.odt:576)
(anonymous) 
(proxy.php?req=/loleaflet/0acb00fc2/loleaflet.html?file_path=file:///tmp/copy.odt:688)
load (async)
getSessionId 
(proxy.php?req=/loleaflet/0acb00fc2/loleaflet.html?file_path=file:///tmp/copy.odt:682)
global.ProxySocket 
(proxy.php?req=/loleaflet/0acb00fc2/loleaflet.html?file_path=file:///tmp/copy.odt:753)
global.createWebSocket 
(proxy.php?req=/loleaflet/0acb00fc2/loleaflet.html?file_path=file:///tmp/copy.odt:798)
connect (proxy.php?req=/loleaflet/d2d049224/src/core/Socket.js:52)
loadDocument (proxy.php?req=/loleaflet/d2d049224/src/map/Map.js:318)

Which would hammer the server with large numbers of requests triggering
DoS protection in some cases, so:
1. only allow one 'open' in-flight at a time
2. global time-accounting to not allow >1 new ProxySocket every 250ms
3. handle error returns from 'open' correctly.

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

diff --git a/loleaflet/js/global.js b/loleaflet/js/global.js
index 9036da5e5..0cafa649c 100644
--- a/loleaflet/js/global.js
+++ b/loleaflet/js/global.js
@@ -221,6 +221,7 @@
this.id = window.proxySocketCounter++;
this.sendCounter = 0;
this.msgInflight = 0;
+   this.openInflight = 0;
this.inSerial = 0;
this.outSerial = 0;
this.minPollMs = 25; // Anything less than ~25 ms can overwhelm 
the HTTP server.
@@ -354,8 +355,13 @@
this.onerror();
this.onclose();
clearInterval(this.waitInterval);
+   clearTimeout(this.delaySession);
this.waitInterval = undefined;
this.sessionId = 'open';
+   this.inSerial = 0;
+   this.outSerial = 0;
+   this.msgInflight = 0;
+   this.openInflight = 0;
}
this.readyState = 3; // CLOSED
};
@@ -371,9 +377,6 @@
console.debug('Session closed, opening 
a new one.');
that.getSessionId();
}
-   else
-   console.debug('New session not 
completed.');
-
return;
}
 
@@ -448,14 +451,41 @@
that.msgInflight++;
};
this.getSessionId = function() {
+   if (this.openInflight > 0)
+   {
+   console.debug('Waiting for session open');
+   return;
+   }
+
+   if (this.delaySession)
+   return;
+
+   //

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

2020-06-08 Thread Andras Timar (via logerrit)

Tag 'cp-4.2.4-3' created by Andras Timar  at 
2020-06-08 20:43 +

cp-4.2.4-3

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

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - debian/changelog loolwsd.spec.in

2020-06-08 Thread Andras Timar (via logerrit)

 debian/changelog |6 ++
 loolwsd.spec.in  |2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 73e40db867e78301cb1882c5fd469a735dcf6675
Author: Andras Timar 
AuthorDate: Mon Jun 8 22:42:38 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jun 8 22:42:38 2020 +0200

Bump package version to 4.2.4-3

Change-Id: I7c49f4d89522a01fa737978e1831c5900406f772

diff --git a/debian/changelog b/debian/changelog
index 241e84064..1e0a86899 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.2.4-3) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.4-3
+
+ -- Andras Timar   Mon, 08 Jun 2020 22:00:00 +0200
+
 loolwsd (4.2.4-2) unstable; urgency=medium
 
   * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.4-2
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 2da566289..8cc3a2ce3 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:   loolwsd%{name_suffix}
 Name:   loolwsd
 %endif
 Version:@PACKAGE_VERSION@
-Release:2%{?dist}
+Release:3%{?dist}
 Vendor: %{vendor}
 Summary:LibreOffice Online WebSocket Daemon
 License:EULA
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - 9 commits - comphelper/source external/python3 forms/source framework/source package/source sal/osl sfx2/source sw/qa sw

2020-06-08 Thread Thorsten Behrens (via logerrit)

Rebased ref, commits from common ancestor:
commit 5d8e933b877128432077e18841f412f75c4b
Author: Thorsten Behrens 
AuthorDate: Thu Mar 12 11:01:55 2020 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Jun 8 22:25:21 2020 +0200

comphelper: fix build against CentOS6 baseline

Change-Id: Ice8a27dc92c923b3d2c62a6989e13720ff044749
(cherry picked from commit 25e7d4a47171ec68202269a8f94fae002b7715c9)

diff --git a/comphelper/source/misc/docpasswordhelper.cxx 
b/comphelper/source/misc/docpasswordhelper.cxx
index 660ce8aea89c..2b52c1400f60 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -451,11 +451,11 @@ Sequence< sal_Int8 > 
DocPasswordHelper::GetXLHashAsSequence(
 
 if (eResult == DocPasswordVerifierResult::OK && !aPassword.isEmpty())
 {
-if (std::find_if(std::cbegin(aEncData), std::cend(aEncData),
+if (std::find_if(aEncData.begin(), aEncData.end(),
  [](const css::beans::NamedValue& val) {
  return val.Name == 
PACKAGE_ENCRYPTIONDATA_SHA256UTF8;
  })
-== std::cend(aEncData))
+== aEncData.end())
 {
 // tdf#118639: We need ODF encryption data for autorecovery, where 
password
 // will already be unavailable, so generate and append it here
commit 68e3167b3f1cd6923d58fd8c03225a7667aca8b9
Author: Stephan Bergmann 
AuthorDate: Sat Apr 7 12:19:43 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Mon Jun 8 22:25:21 2020 +0200

external/python3: Drop nis.cpython-*m.so

At least Fedora 28 glibc-2.27-8.fc28 no longer provides the nis development
headers and libraries.  (It only still contains some binaries for backwards
compatibility, in the libnsl sub-package: "This package provides the legacy
version of libnsl library, for accessing NIS services.")

There is probably no real need to have nis.cpython-*m.so contained in
external/python3/ExternalPackage_python3.mk (it probably just happened to 
build
fine when that list was originally created, so was included).

Change-Id: Ic6128fd872432005c0ded76640c5b56781ca69a1
Reviewed-on: https://gerrit.libreoffice.org/52535
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 93e6a823bd8543d30621769c7b34d6261ea5cb01)

diff --git a/external/python3/ExternalPackage_python3.mk 
b/external/python3/ExternalPackage_python3.mk
index 9da2ed4d1957..bab1451693e5 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -87,7 +87,6 @@ $(eval $(call 
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-cor
LO_lib/mmap.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so 
\

LO_lib/_multibytecodec.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so
 \

LO_lib/_multiprocessing.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so
 \
-   LO_lib/nis.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \

LO_lib/_opcode.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \

LO_lib/ossaudiodev.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \

LO_lib/parser.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
commit a2a9aa5ed7b9fa513b1c9919e5827914dfda6ec4
Author: Vasily Melenchuk 
AuthorDate: Mon Feb 17 10:52:11 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Mon Jun 8 22:25:21 2020 +0200

tdf#129096: Document Recovery: Use TypeDetection on load

Loading of recovered document happend before via XFilter::filter
is not updating media descriptor of document. But this is
important for password protected documents to store entered password
and used encryption type.

To avoid this problem let's use TypeDetection which during its work
will ask user for password and store all the info in modified media
descriptor before actual recovery attempt.

Change-Id: Ide2ebf0955e0937cdc7c9d7165593b71f904649b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88844
Reviewed-by: Mike Kaganski 
Reviewed-by: Thorsten Behrens 
Tested-by: Jenkins
(cherry picked from commit 8461127750e1fe92a615409505256132e54fb8e8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89789
Reviewed-by: Vasily Melenchuk 
(cherry picked from commit b05c87f00433987b10542866696f0b4aaad015cc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93835
Tested-by: Thorsten Behrens 

diff --git a/framework/source/services/autorecovery.cxx 
b/framework/source/services/autorecovery.cxx
index e5563c508782..5b089449a3cb 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -55,6 +55,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -3438,6 +3439,37 @@ void AutoRecover

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - 4 commits - loleaflet/js loleaflet/src wsd/LOOLWSD.cpp

2020-06-08 Thread Michael Meeks (via logerrit)

 loleaflet/js/global.js   |   50 ---
 loleaflet/src/control/Control.JSDialogBuilder.js |2 
 wsd/LOOLWSD.cpp  |   15 ++
 3 files changed, 60 insertions(+), 7 deletions(-)

New commits:
commit d5f77d46554908d44e3328ca49272e5664e3dc55
Author: Michael Meeks 
AuthorDate: Mon Jun 8 15:46:29 2020 +0100
Commit: Andras Timar 
CommitDate: Mon Jun 8 22:22:16 2020 +0200

Proxy: handle server startup / un-responsive DocumentBroker creation.

If our 'open' request fails - then we could get this loop:

loadDocument (proxy.php?req=/loleaflet/d2d049224/src/map/Map.js:318)
_activate (proxy.php?req=/loleaflet/d2d049224/src/map/Map.js:1233)
_onSocketClose (proxy.php?req=/loleaflet/d2d049224/src/core/Socket.js:1045)
_signalErrorClose 
(proxy.php?req=/loleaflet/0acb00fc2/loleaflet.html?file_path=file:///tmp/copy.odt:576)
(anonymous) 
(proxy.php?req=/loleaflet/0acb00fc2/loleaflet.html?file_path=file:///tmp/copy.odt:688)
load (async)
getSessionId 
(proxy.php?req=/loleaflet/0acb00fc2/loleaflet.html?file_path=file:///tmp/copy.odt:682)
global.ProxySocket 
(proxy.php?req=/loleaflet/0acb00fc2/loleaflet.html?file_path=file:///tmp/copy.odt:753)
global.createWebSocket 
(proxy.php?req=/loleaflet/0acb00fc2/loleaflet.html?file_path=file:///tmp/copy.odt:798)
connect (proxy.php?req=/loleaflet/d2d049224/src/core/Socket.js:52)
loadDocument (proxy.php?req=/loleaflet/d2d049224/src/map/Map.js:318)

Which would hammer the server with large numbers of requests triggering
DoS protection in some cases, so:
1. only allow one 'open' in-flight at a time
2. global time-accounting to not allow >1 new ProxySocket every 250ms
3. handle error returns from 'open' correctly.

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

diff --git a/loleaflet/js/global.js b/loleaflet/js/global.js
index 9036da5e5..0cafa649c 100644
--- a/loleaflet/js/global.js
+++ b/loleaflet/js/global.js
@@ -221,6 +221,7 @@
this.id = window.proxySocketCounter++;
this.sendCounter = 0;
this.msgInflight = 0;
+   this.openInflight = 0;
this.inSerial = 0;
this.outSerial = 0;
this.minPollMs = 25; // Anything less than ~25 ms can overwhelm 
the HTTP server.
@@ -354,8 +355,13 @@
this.onerror();
this.onclose();
clearInterval(this.waitInterval);
+   clearTimeout(this.delaySession);
this.waitInterval = undefined;
this.sessionId = 'open';
+   this.inSerial = 0;
+   this.outSerial = 0;
+   this.msgInflight = 0;
+   this.openInflight = 0;
}
this.readyState = 3; // CLOSED
};
@@ -371,9 +377,6 @@
console.debug('Session closed, opening 
a new one.');
that.getSessionId();
}
-   else
-   console.debug('New session not 
completed.');
-
return;
}
 
@@ -448,14 +451,41 @@
that.msgInflight++;
};
this.getSessionId = function() {
+   if (this.openInflight > 0)
+   {
+   console.debug('Waiting for session open');
+   return;
+   }
+
+   if (this.delaySession)
+   return;
+
+   // avoid attempting to re-connect too quickly
+   if (global.lastCreatedProxySocket)
+   {
+   var msSince = performance.now() - 
global.lastCreatedProxySocket;
+   if (msSince < 250) {
+   var delay = 250 - msSince;
+   console.debug('Wait to re-try session 
creation for ' + delay + 'ms');
+   this.curPollMs = delay; // ms
+   this.delaySession = 
setTimeout(function() {
+   that.delaySession = undefined;
+   that.getSessionId();
+   }, delay);
+   return;
+   }
+

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - 22 commits - common/Authorization.cpp common/Crypto.cpp common/FileUtil.cpp common/JsonUtil.hpp common/Log.cpp common/LOOLWebSock

2020-06-08 Thread Michael Meeks (via logerrit)

 Makefile.am  |1 
 common/Authorization.cpp |2 
 common/Crypto.cpp|8 
 common/FileUtil.cpp  |4 
 common/JsonUtil.hpp  |4 
 common/LOOLWebSocket.hpp |6 
 common/Log.cpp   |4 
 common/Message.hpp   |8 
 common/MessageQueue.cpp  |   29 -
 common/Protocol.cpp  |6 
 common/Protocol.hpp  |   88 ---
 common/Rectangle.hpp |1 
 common/Seccomp.cpp   |   12 
 common/Session.cpp   |6 
 common/SigUtil.cpp   |2 
 common/StringVector.cpp  |   90 ---
 common/StringVector.hpp  |   89 ++-
 common/Util.cpp  |8 
 common/Util.hpp  |   85 +++
 fuzzer/ClientSession.cpp |7 
 kit/ChildSession.cpp |   31 -
 kit/Delta.hpp|6 
 kit/ForKit.cpp   |   14 
 kit/Kit.cpp  |   58 +-
 kit/KitHelper.hpp|4 
 loleaflet/js/global.js   |   11 
 loleaflet/src/control/Control.JSDialogBuilder.js |   10 
 loleaflet/src/control/Ruler.js   |   97 ++-
 net/DelaySocket.cpp  |   28 -
 net/FakeSocket.cpp   |   24 
 net/ServerSocket.hpp |2 
 net/Socket.cpp   |   74 +--
 net/Socket.hpp   |   44 -
 net/Ssl.cpp  |6 
 net/WebSocketHandler.hpp |   48 -
 net/clientnb.cpp |   10 
 test/DeltaTests.cpp  |   12 
 test/Makefile.am |1 
 test/TileCacheTests.cpp  |   24 
 test/UnitAdmin.cpp   |   18 
 test/UnitBadDocLoad.cpp  |2 
 test/UnitClient.cpp  |2 
 test/UnitClose.cpp   |2 
 test/UnitConvert.cpp |2 
 test/UnitCopyPaste.cpp   |   18 
 test/UnitCursor.cpp  |2 
 test/UnitHTTP.cpp|7 
 test/UnitInsertDelete.cpp|6 
 test/UnitLoad.cpp|2 
 test/UnitPasswordProtected.cpp   |4 
 test/UnitRenderingOptions.cpp|2 
 test/UnitSession.cpp |4 
 test/UnitTyping.cpp  |   12 
 test/UnitUNOCommand.cpp  |2 
 test/UnitWOPITemplate.cpp|4 
 test/UnitWOPIWatermark.cpp   |2 
 test/WhiteBoxTests.cpp   |  558 ++-
 test/WopiTestServer.hpp  |2 
 test/countloolkits.hpp   |2 
 test/fakesockettest.cpp  |2 
 test/helpers.hpp |   14 
 test/lokassert.hpp   |2 
 tools/Config.cpp |   10 
 tools/Connect.cpp|4 
 tools/KitClient.cpp  |4 
 tools/Replay.hpp |4 
 tools/Tool.cpp   |6 
 tools/WebSocketDump.cpp  |   12 
 tools/map.cpp|2 
 wsd/Admin.cpp|   31 -
 wsd/Admin.hpp|3 
 wsd/AdminModel.cpp   |   65 +-
 wsd/AdminModel.hpp   |   15 
 wsd/Auth.cpp |2 
 wsd/ClientSession.cpp|   26 -
 wsd/ClientSession.hpp|2 
 wsd/DocumentBroker.cpp   |   60 +-
 wsd/FileServer.cpp   |   20 
 wsd/LOOLWSD.cpp  |  169 +++---
 wsd/LOOLWSD.hpp  |7 
 wsd/ProxyProtocol.cpp|   27 -
 wsd/ProxyProtocol.hpp|   13 
 wsd/QueueHandler.hpp |   70 --
 wsd/RequestDetails.cpp   |  165 +-
 wsd/RequestDetails.hpp   |  151 +

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

2020-06-08 Thread Marco Cecchetti (via logerrit)

 loleaflet/src/control/Ruler.js|7 ++-
 loleaflet/src/layer/tile/GridLayer.js |7 +--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 54f9727bdbf3990b02c8cc85ee36c28f20cd2cc3
Author: Marco Cecchetti 
AuthorDate: Sun May 24 19:03:47 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jun 8 22:13:13 2020 +0200

loleaflet: writer zoom flickers

Change-Id: I9186bbae55269870fc693b65c3e90b149375eba9
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95496
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Tested-by: Michael Meeks 
Reviewed-by: Michael Meeks 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95766
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js
index b3cb520b9..040ec3442 100644
--- a/loleaflet/src/control/Ruler.js
+++ b/loleaflet/src/control/Ruler.js
@@ -409,7 +409,12 @@ L.Control.Ruler = L.Control.extend({
var firstTileXTranslate = parseInt(firstTile.style.left) - 
this._map._docLayer._tileWidthPx * columnNumber;
 
var tileContainer = 
mapPane.getElementsByClassName('leaflet-tile-container');
-   tileContainer = tileContainer[tileContainer.length - 1];
+   for (var i = 0; i < tileContainer.length; ++i) {
+   if (parseInt(tileContainer[i].style.zIndex) === 
this._map.getMaxZoom()) {
+   tileContainer = tileContainer[i];
+   break;
+   }
+   }
var tileContainerXTranslate = 
parseInt(tileContainer.style.transform.match(/\(([-0-9]*)/)[1]);
var mapPaneXTranslate = 
parseInt(mapPane.style.transform.match(/\(([-0-9]*)/)[1]);
 
diff --git a/loleaflet/src/layer/tile/GridLayer.js 
b/loleaflet/src/layer/tile/GridLayer.js
index 850981777..91dd404e8 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -211,12 +211,7 @@ L.GridLayer = L.Layer.extend({
maxZoom = this.options.maxZoom;
 
for (var z in this._levels) {
-   if (this._levels[z].el.children.length || z === zoom) {
-   this._levels[z].el.style.zIndex = maxZoom - 
Math.abs(zoom - z);
-   } else {
-   L.DomUtil.remove(this._levels[z].el);
-   delete this._levels[z];
-   }
+   this._levels[z].el.style.zIndex = maxZoom - 
Math.abs(zoom - z);
}
 
var level = this._levels[zoom],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - loleaflet/html loleaflet/src

2020-06-08 Thread Michael Meeks (via logerrit)

 loleaflet/html/loleaflet.html.m4|2 +
 loleaflet/src/control/Control.JSDialogBuilder.js|   36 ++--
 loleaflet/src/control/Control.NotebookbarBuilder.js |2 -
 loleaflet/src/core/LOUtil.js|   19 ++
 loleaflet/src/layer/FormFieldButtonLayer.js |2 -
 loleaflet/src/layer/marker/Annotation.js|2 -
 loleaflet/src/layer/tile/TileLayer.js   |2 -
 loleaflet/src/map/Map.js|2 -
 8 files changed, 44 insertions(+), 23 deletions(-)

New commits:
commit 8bfa1318b246d7c9df2b1d22d2e8094205a53acd
Author: Michael Meeks 
AuthorDate: Mon Jun 8 13:28:55 2020 +0100
Commit: Andras Timar 
CommitDate: Mon Jun 8 22:12:39 2020 +0200

Proxy: centralize URL building and use absolute URL for images.

Fixes missing images on mobile.

Change-Id: If5f858cec5fc81ea50c4679162b36eb000f6d872
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95803
Tested-by: Jenkins
Reviewed-by: Michael Meeks 
(cherry picked from commit 33ae2bec0fddd3f21ef2278ada0b8ac62252d87d)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95821
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 547c603c5..d3c3e21de 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -231,6 +231,7 @@ m4_ifelse(MOBILEAPP,[true],
 m4_ifelse(MOBILEAPP,[true],
  [window.host = '';
   window.serviceRoot = '';
+  window.versionPath = '%VERSION%';
   window.accessToken = '';
   window.accessTokenTTL = '';
   window.accessHeader = '';
@@ -246,6 +247,7 @@ m4_ifelse(MOBILEAPP,[true],
   window.tileSize = 256;],
  [window.host = '%HOST%';
   window.serviceRoot = '%SERVICE_ROOT%';
+  window.versionPath = '%VERSION%';
   window.accessToken = '%ACCESS_TOKEN%';
   window.accessTokenTTL = '%ACCESS_TOKEN_TTL%';
   window.accessHeader = '%ACCESS_HEADER%';
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js 
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 5498d04dd..71bf67726 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -53,7 +53,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
var commandName = data.id ? 
data.id.substring('.uno:'.length) : data.id;
if (commandName && commandName.length && 
L.LOUtil.existsIconForCommand(commandName, builder.map.getDocType())) {
var image = L.DomUtil.create('img', 
'spinfieldimage', div);
-   var icon = builder._createIconPath(data.id);
+   var icon = builder._createIconURL(data.id);
image.src = icon;
icon.alt = '';
}
@@ -396,7 +396,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
}
},
 
-   _explorableEntry: function(parentContainer, data, content, builder, 
valueNode, iconPath, updateCallback) {
+   _explorableEntry: function(parentContainer, data, content, builder, 
valueNode, iconURL, updateCallback) {
var sectionTitle = L.DomUtil.create('div', 'ui-header level-' + 
builder._currentDepth + ' ' + builder.options.cssClass + ' ui-widget', 
parentContainer);
$(sectionTitle).css('justify-content', 'space-between');
if (data && data.id)
@@ -409,10 +409,10 @@ L.Control.JSDialogBuilder = L.Control.extend({
var titleClass = '';
console.debug('sectionTitle.id' + sectionTitle.id);
if (sectionTitle.id === 'paperformat' || sectionTitle.id === 
'orientation' || sectionTitle.id === 'masterslide' || sectionTitle.id === 
'SdTableDesignPanel')
-   iconPath = 'images/lc_'+ sectionTitle.id.toLowerCase() 
+'.svg';
-   if (iconPath) {
+   iconURL = L.LOUtil.getImageURL('lc_'+ 
sectionTitle.id.toLowerCase() +'.svg');
+   if (iconURL) {
var icon = L.DomUtil.create('img', 'menu-entry-icon', 
leftDiv);
-   icon.src = iconPath;
+   icon.src = iconURL;
icon.alt = '';
titleClass = 'menu-entry-with-icon';
}
@@ -567,9 +567,9 @@ L.Control.JSDialogBuilder = L.Control.extend({
if (commandName && commandName.length && 
L.LOUtil.existsIconForCommand(commandName, builder.map.getDocType())) {
var iconName = 
builder._generateMenuIconName(commandName);
var iconSpan = L.DomUtil.create('span', 
'menu-entry-icon ' + iconName, sectionTitle);
-   var iconPath = 'images/lc_' + iconName + '.svg';
+

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

2020-06-08 Thread Tor Lillqvist (via logerrit)

 wsd/RequestDetails.cpp |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 2e51ecb0a4e81b3370a52bc214cf377e58570eec
Author: Tor Lillqvist 
AuthorDate: Fri Jun 5 14:20:47 2020 +0300
Commit: Andras Timar 
CommitDate: Mon Jun 8 22:01:58 2020 +0200

Avoid assertion failure in the iOS app

Change-Id: I5e0733579db01616f8c6e7743bb01a9a2feca8aa
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95591
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95768
Reviewed-by: Andras Timar 

diff --git a/wsd/RequestDetails.cpp b/wsd/RequestDetails.cpp
index 5249b8470..d97371578 100644
--- a/wsd/RequestDetails.cpp
+++ b/wsd/RequestDetails.cpp
@@ -74,13 +74,16 @@ RequestDetails::RequestDetails(Poco::Net::HTTPRequest 
&request)
 }
 
 RequestDetails::RequestDetails(const std::string &mobileURI)
-: _isGet(false)
+: _isGet(true)
 , _isHead(false)
 , _isProxy(false)
 , _isWebSocket(false)
 {
 _isMobile = true;
 _uriString = mobileURI;
+// Not sure if these are correct in the case of file names that need 
URI-encoding.
+_fields[Field::LegacyDocumentURI] = _uriString;
+_fields[Field::DocumentURI] = _uriString;
 }
 
 std::string RequestDetails::getDocumentURI() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Michael Meeks (via logerrit)

 loleaflet/js/global.js |   46 +-
 1 file changed, 41 insertions(+), 5 deletions(-)

New commits:
commit 58e5016917e325248fdb01a83030051c3a3df975
Author: Michael Meeks 
AuthorDate: Mon Jun 8 15:46:29 2020 +0100
Commit: Michael Meeks 
CommitDate: Mon Jun 8 21:18:47 2020 +0200

Proxy: handle server startup / un-responsive DocumentBroker creation.

If our 'open' request fails - then we could get this loop:

loadDocument (proxy.php?req=/loleaflet/d2d049224/src/map/Map.js:318)
_activate (proxy.php?req=/loleaflet/d2d049224/src/map/Map.js:1233)
_onSocketClose (proxy.php?req=/loleaflet/d2d049224/src/core/Socket.js:1045)
_signalErrorClose 
(proxy.php?req=/loleaflet/0acb00fc2/loleaflet.html?file_path=file:///tmp/copy.odt:576)
(anonymous) 
(proxy.php?req=/loleaflet/0acb00fc2/loleaflet.html?file_path=file:///tmp/copy.odt:688)
load (async)
getSessionId 
(proxy.php?req=/loleaflet/0acb00fc2/loleaflet.html?file_path=file:///tmp/copy.odt:682)
global.ProxySocket 
(proxy.php?req=/loleaflet/0acb00fc2/loleaflet.html?file_path=file:///tmp/copy.odt:753)
global.createWebSocket 
(proxy.php?req=/loleaflet/0acb00fc2/loleaflet.html?file_path=file:///tmp/copy.odt:798)
connect (proxy.php?req=/loleaflet/d2d049224/src/core/Socket.js:52)
loadDocument (proxy.php?req=/loleaflet/d2d049224/src/map/Map.js:318)

Which would hammer the server with large numbers of requests triggering
DoS protection in some cases, so:
1. only allow one 'open' in-flight at a time
2. global time-accounting to not allow >1 new ProxySocket every 250ms
3. handle error returns from 'open' correctly.

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

diff --git a/loleaflet/js/global.js b/loleaflet/js/global.js
index 47bc7b648..d50739193 100644
--- a/loleaflet/js/global.js
+++ b/loleaflet/js/global.js
@@ -221,6 +221,7 @@
this.id = window.proxySocketCounter++;
this.sendCounter = 0;
this.msgInflight = 0;
+   this.openInflight = 0;
this.inSerial = 0;
this.outSerial = 0;
this.minPollMs = 25; // Anything less than ~25 ms can overwhelm 
the HTTP server.
@@ -354,8 +355,13 @@
this.onerror();
this.onclose();
clearInterval(this.waitInterval);
+   clearTimeout(this.delaySession);
this.waitInterval = undefined;
this.sessionId = 'open';
+   this.inSerial = 0;
+   this.outSerial = 0;
+   this.msgInflight = 0;
+   this.openInflight = 0;
}
this.readyState = 3; // CLOSED
};
@@ -371,9 +377,6 @@
console.debug('Session closed, opening 
a new one.');
that.getSessionId();
}
-   else
-   console.debug('New session not 
completed.');
-
return;
}
 
@@ -448,14 +451,41 @@
that.msgInflight++;
};
this.getSessionId = function() {
+   if (this.openInflight > 0)
+   {
+   console.debug('Waiting for session open');
+   return;
+   }
+
+   if (this.delaySession)
+   return;
+
+   // avoid attempting to re-connect too quickly
+   if (global.lastCreatedProxySocket)
+   {
+   var msSince = performance.now() - 
global.lastCreatedProxySocket;
+   if (msSince < 250) {
+   var delay = 250 - msSince;
+   console.debug('Wait to re-try session 
creation for ' + delay + 'ms');
+   this.curPollMs = delay; // ms
+   this.delaySession = 
setTimeout(function() {
+   that.delaySession = undefined;
+   that.getSessionId();
+   }, delay);
+   return;
+   }
+   }
+   global.lastCreatedProxySocket = performance.now();
+
var

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

2020-06-08 Thread Andras Timar (via logerrit)

 kit/ChildSession.cpp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 821029da14b89650ae3cd263e7075c3d74ca9379
Author: Andras Timar 
AuthorDate: Thu Jun 4 08:54:19 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jun 8 20:54:16 2020 +0200

fix bogus -Werror=maybe-uninitialized

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

diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index ba8bdf8ee..3c153a225 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -1314,9 +1314,9 @@ bool ChildSession::gestureEvent(const char* /*buffer*/, 
int /*length*/,
 bool success = true;
 
 unsigned int windowID = 0;
-int x;
-int y;
-int offset;
+int x = 0;
+int y = 0;
+int offset = 0;
 std::string type;
 
 if (tokens.size() < 6)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread gokaysatir (via logerrit)

 loleaflet/src/control/Ruler.js |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d88c28203f8c10c634e5a428281672fdc0b0b104
Author: gokaysatir 
AuthorDate: Sat May 30 11:50:34 2020 +0300
Commit: Andras Timar 
CommitDate: Mon Jun 8 20:47:55 2020 +0200

tdf#111535 fix mispositioning bug when the page is resized.

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

diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js
index f5c3dda4d..b3cb520b9 100644
--- a/loleaflet/src/control/Ruler.js
+++ b/loleaflet/src/control/Ruler.js
@@ -418,6 +418,7 @@ L.Control.Ruler = L.Control.extend({
this._rFace.style.marginLeft = rulerOffset + 'px';
 
this.rulerOffset = rulerOffset; // Needed on different parts 
too..
+   this._updateParagraphIndentations();
},
 
_moveIndentation: function(e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Tomaž Vajngerl (via logerrit)

 loleaflet/src/control/Ruler.js |   91 -
 1 file changed, 72 insertions(+), 19 deletions(-)

New commits:
commit 01a074d66e4d9786e5cf0b1cc07b9189a23726ce
Author: Tomaž Vajngerl 
AuthorDate: Mon Jun 1 23:15:11 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jun 8 20:47:02 2020 +0200

Add "delete tabstop" function to Ruler

Change-Id: I34d381f6d3e12b0444b9c7778ef6b8c87794cbd6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95341
Tested-by: Tomaž Vajngerl 
Reviewed-by: Tomaž Vajngerl 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95750
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/control/Ruler.js b/loleaflet/src/control/Ruler.js
index a5537055e..f5c3dda4d 100644
--- a/loleaflet/src/control/Ruler.js
+++ b/loleaflet/src/control/Ruler.js
@@ -606,9 +606,30 @@ L.Control.Ruler = L.Control.extend({
this._map._socket.sendMessage('uno .uno:RulerChangeState ' + 
JSON.stringify(unoObj));
},
 
+   _getTabStopHit: function(tabstopContainer, pointX) {
+   var tabstop = null;
+   var margin = 10;
+   var tabstopDiffFromCenter = 1; // just a big initial 
condition
+
+   for (var i = 0; i < tabstopContainer.tabStops.length; i++) {
+   var current = tabstopContainer.tabStops[i];
+   var location = current.tabStopLocation;
+   if (pointX >= location.left - margin && pointX <= 
location.right + margin) {
+   var diff = Math.abs(pointX - location.center);
+   if (diff < tabstopDiffFromCenter) {
+   tabstop = current;
+   tabstopDiffFromCenter = diff;
+   }
+   }
+   }
+   return tabstop;
+   },
_initiateTabstopDrag: function(event) {
// console.log('===> _initiateTabstopDrag ' + event.type);
 
+   this.currentPositionInTwips = null;
+   this.currentTabStopIndex = null;
+
var tabstopContainer = null;
var pointX = null;
 
@@ -622,18 +643,37 @@ L.Control.Ruler = L.Control.extend({
}
tabstopContainer.tabStopMarkerBeingDragged = null;
 
+   // check if we hit any tabstop
+   var tabstop = this._getTabStopHit(tabstopContainer, pointX);
+
// Check what to do when a mouse buttons is clicked, ignore 
touch
if (event.type !== 'panstart') {
// right-click inside tabstop container
if (event.button === 2) {
-   this.currentPositionInTwips = 
this._map._docLayer._pixelsToTwips({x: pointX, y:0}).x;
+   if (tabstop == null) {
+   this.currentPositionInTwips = 
this._map._docLayer._pixelsToTwips({x: pointX, y:0}).x;
+   }
+   else {
+   this.currentTabStopIndex = 
tabstop.tabStopNumber;
+   }
+   var self = this;
$.contextMenu({
selector: 
'.loleaflet-ruler-tabstopcontainer',
className: 'loleaflet-font',
items: {
inserttabstop: {
name: _('Insert 
tabstop'),
-   callback: 
(this._insertTabstop).bind(this)
+   callback: 
(this._insertTabstop).bind(this),
+   visible: function() {
+   return 
self.currentPositionInTwips != null;
+   }
+   },
+   removetabstop: {
+   name: _('Delete 
tabstop'),
+   callback: 
(this._deleteTabstop).bind(this),
+   visible: function() {
+   return 
self.currentTabStopIndex != null;
+   }
}
}
});
@@ -646,23 +686,6 @@ L.Control.Ruler = L.Control.extend({
}
}
 
-

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

2020-06-08 Thread Tor Lillqvist (via logerrit)

 ios/Mobile/DocumentViewController.mm |   26 +-
 1 file changed, 17 insertions(+), 9 deletions(-)

New commits:
commit 33d4ad03526da850e3ebc9c1619bcf1d544bada6
Author: Tor Lillqvist 
AuthorDate: Mon Jun 1 16:54:36 2020 +0300
Commit: Andras Timar 
CommitDate: Mon Jun 8 20:46:45 2020 +0200

tdf#133278: Don't overwrite the copy of the document that we are editing

When exporting a copy, let core write the copy to a temp subdirectory
before invoking UIDocumentPickerViewController to select where to
store it permanently.

Change-Id: I3d2292414a3c824515ba6d98ad09b296e543cea9
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95295
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95708
Reviewed-by: Andras Timar 

diff --git a/ios/Mobile/DocumentViewController.mm 
b/ios/Mobile/DocumentViewController.mm
index 54932be3f..c94161c02 100644
--- a/ios/Mobile/DocumentViewController.mm
+++ b/ios/Mobile/DocumentViewController.mm
@@ -16,6 +16,7 @@
 #import 
 
 #import 
+#import 
 
 #import "ios.h"
 #import "FakeSocket.hpp"
@@ -465,8 +466,13 @@ static IMP standardImpOfInputAccessoryView = nil;
 // First save it in the requested format to a temporary 
location. First remove any
 // leftover identically named temporary file.
 
+NSURL *tmpFileDirectory = [[NSFileManager.defaultManager 
temporaryDirectory] URLByAppendingPathComponent:@"export"];
+if (![NSFileManager.defaultManager 
createDirectoryAtURL:tmpFileDirectory withIntermediateDirectories:YES 
attributes:nil error:nil]) {
+LOG_ERR("Could not create directory " << 
[[tmpFileDirectory path] UTF8String]);
+return;
+}
 NSString *tmpFileName = [[[self.document->copyFileURL 
lastPathComponent] stringByDeletingPathExtension] stringByAppendingString:[@"." 
stringByAppendingString:format]];
-downloadAsTmpURL = [[NSFileManager.defaultManager 
temporaryDirectory] URLByAppendingPathComponent:tmpFileName];
+downloadAsTmpURL = [tmpFileDirectory 
URLByAppendingPathComponent:tmpFileName];
 
 std::remove([[downloadAsTmpURL path] UTF8String]);
 
@@ -479,15 +485,15 @@ static IMP standardImpOfInputAccessoryView = nil;
 struct stat statBuf;
 if (stat([[downloadAsTmpURL path] UTF8String], &statBuf) == 
-1) {
 LOG_ERR("Could apparently not save to '" <<  
[[downloadAsTmpURL path] UTF8String] << "'");
-} else {
-UIDocumentPickerViewController *picker =
-[[UIDocumentPickerViewController alloc] 
initWithURL:downloadAsTmpURL
- 
inMode:UIDocumentPickerModeExportToService];
-picker.delegate = self;
-[self presentViewController:picker
-   animated:YES
- completion:nil];
+return;
 }
+UIDocumentPickerViewController *picker =
+[[UIDocumentPickerViewController alloc] 
initWithURL:downloadAsTmpURL
+ 
inMode:UIDocumentPickerModeExportToService];
+picker.delegate = self;
+[self presentViewController:picker
+   animated:YES
+ completion:nil];
 return;
 }
 }
@@ -504,10 +510,12 @@ static IMP standardImpOfInputAccessoryView = nil;
 
 - (void)documentPicker:(UIDocumentPickerViewController *)controller 
didPickDocumentsAtURLs:(NSArray *)urls {
 std::remove([[downloadAsTmpURL path] UTF8String]);
+std::remove([[[downloadAsTmpURL URLByDeletingLastPathComponent] path] 
UTF8String]);
 }
 
 - (void)documentPickerWasCancelled:(UIDocumentPickerViewController 
*)controller {
 std::remove([[downloadAsTmpURL path] UTF8String]);
+std::remove([[[downloadAsTmpURL URLByDeletingLastPathComponent] path] 
UTF8String]);
 }
 
 - (void)scrollViewWillBeginZooming:(UIScrollView *)scrollView withView:(UIView 
*)view {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Pedro Pinto Silva (via logerrit)

 loleaflet/css/loleaflet.css |3 ++-
 loleaflet/css/toolbar.css   |   16 +---
 2 files changed, 15 insertions(+), 4 deletions(-)

New commits:
commit e6e928a57677f79b30f2ae0b9741707a8fb6ffc7
Author: Pedro Pinto Silva 
AuthorDate: Mon Jun 1 12:59:03 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jun 8 20:46:26 2020 +0200

Desktop: Improve document-name-input states and discoverability

- display element as an input field (some users didn't know they could 
rename the document)
- use box-shadows instead of borders to increase the difference between 
states and so the text does not jump

Change-Id: Id00bbcb3be27688603afdedeb25f14ba515bfe33
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95277
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Tested-by: Pedro Silva 
Reviewed-by: Pedro Silva 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95707
Reviewed-by: Andras Timar 

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index cc80202e6..45b1531ec 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -157,14 +157,24 @@ w2ui-toolbar {
width: 200px;
 }
 
+#document-name-input.editable {
+   border: none;
+   box-shadow: 0 0 0.1px 1px #ebebeb, 0 0 2px 1px #f0f0f0;
+   background-image: url('images/baseline-edit.svg');
+   background-position: right;
+   background-repeat: no-repeat;
+}
+
 #document-name-input.editable:focus {
-   border: 1px solid #bb;
+   border: none;
+   box-shadow: inset 0 0 2px 1px #f0f0f0, 0 0 0.1px 1px #bbb;
background-color: white;
width: 200px;
 }
 
-#document-name-input.editable:hover {
-   border: 1px solid #bb;
+#document-name-input.editable:hover:not(:focus) {
+   border: none;
+   box-shadow: 0 0 0.1px 1px #d7d7d7, 0 0 3px 2px #f0f0f0;
background-color: white;
background-image: url('images/baseline-edit.svg');
background-position: right;
commit 8072efed2d177b6392c78db649dbd6daa79bc9ed
Author: Pedro Pinto Silva 
AuthorDate: Fri May 29 15:25:03 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jun 8 20:46:12 2020 +0200

Sidebar-panel has fixed width that is bigger than its contents

causing a white placeholder to appear sometimes after the side panel (when 
it's open) and sometimes before (when it's closed)

Change-Id: I6247b2bbb90943c3520dc4f22ee07966bf03d1e3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95143
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Pedro Silva 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95706
Reviewed-by: Andras Timar 

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 3ec71f0f1..0773c624d 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -152,10 +152,11 @@ body {
 }
 
 #sidebar-panel {
+   display: table;
padding: 0px;
margin: 0px;
position: relative;
-   width: 100%;
+   width: auto;
height: 100%;
overflow-x: hidden;
overflow-y: scroll;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Tamás Zolnai (via logerrit)

 cypress_test/integration_tests/desktop/writer/form_field_spec.js |   73 
--
 1 file changed, 31 insertions(+), 42 deletions(-)

New commits:
commit c04996b659a7ceb6afc4e7f68be56d1126e8a639
Author: Tamás Zolnai 
AuthorDate: Mon Jun 1 11:20:46 2020 +0200
Commit: Andras Timar 
CommitDate: Mon Jun 8 20:45:51 2020 +0200

cypress: fix false failure of form field tests.

The cypress test framework checks if an item is covered
by an other item while we try to interact with it and
fails with an error in this case.
Since the form field button is above the document layer,
cypress correctly identifies that the document layer is
covered (partly) with this button frame. To avoid this
failure we can use force : true option.

Change-Id: I5d9f665e3afe1ae1ff3744a563dd32de52b76bb3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95266
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tamás Zolnai 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95748
Reviewed-by: Andras Timar 

diff --git a/cypress_test/integration_tests/desktop/writer/form_field_spec.js 
b/cypress_test/integration_tests/desktop/writer/form_field_spec.js
index 2bf7df7f3..2b17e3049 100644
--- a/cypress_test/integration_tests/desktop/writer/form_field_spec.js
+++ b/cypress_test/integration_tests/desktop/writer/form_field_spec.js
@@ -57,6 +57,16 @@ describe('Form field button tests.', function() {
});
}
 
+   function moveCursor(direction = 'left') {
+   if (direction == 'left') {
+   cy.get('textarea.clipboard')
+   .type('{leftArrow}', {force : true});
+   } else {
+   cy.get('textarea.clipboard')
+   .type('{rightArrow}', {force : true});
+   }
+   }
+
function doZoom(zoomIn) {
helper.initAliasToEmptyString('prevZoom');
 
@@ -91,26 +101,22 @@ describe('Form field button tests.', function() {
buttonShouldNotExist();
 
// Move the cursor next to the form field
-   cy.get('textarea.clipboard')
-   .type('{rightArrow}');
+   moveCursor('right');
 
buttonShouldExist();
 
// Move the cursor again to the other side of the field
-   cy.get('textarea.clipboard')
-   .type('{rightArrow}');
+   moveCursor('right');
 
buttonShouldExist();
 
// Move the cursor away
-   cy.get('textarea.clipboard')
-   .type('{rightArrow}');
+   moveCursor('right');
 
buttonShouldNotExist();
 
// Move the cursor back next to the field
-   cy.get('textarea.clipboard')
-   .type('{leftArrow}');
+   moveCursor('left');
 
buttonShouldExist();
});
@@ -119,8 +125,7 @@ describe('Form field button tests.', function() {
before('form_field.odt');
 
// Move the cursor next to the form field
-   cy.get('textarea.clipboard')
-   .type('{rightArrow}');
+   moveCursor('right');
 
buttonShouldExist();
 
@@ -162,8 +167,7 @@ describe('Form field button tests.', function() {
before('form_field.odt');
 
// Move the cursor next to the form field
-   cy.get('textarea.clipboard')
-   .type('{rightArrow}');
+   moveCursor('right');
 
// Select a new item
cy.get('.form-field-button')
@@ -177,13 +181,12 @@ describe('Form field button tests.', function() {
 
// Move the cursor away and back
cy.get('textarea.clipboard')
-   .type('{leftArrow}');
+   .type('{home}', {force : true});
 
buttonShouldNotExist();
 
// Move the cursor back next to the field
-   cy.get('textarea.clipboard')
-   .type('{rightArrow}');
+   moveCursor('right');
 
buttonShouldExist();
 
@@ -191,8 +194,7 @@ describe('Form field button tests.', function() {
.should('have.text', 'January');
 
// Do the same from the right side of the field.
-   cy.get('textarea.clipboard')
-   .type('{rightArrow}');
+   moveCursor('right');
 
buttonShouldExist();
 
@@ -206,14 +208,12 @@ describe('Form field button tests.', function() {
cy.contains('.drop-down-field-list-item', 'December')
.click();
 
-   cy.get('textarea.clipboard')
-   .type('{rightArrow}');
+   moveCursor('right');

[Libreoffice-commits] core.git: basctl/source cui/source cui/uiconfig dbaccess/source desktop/source include/vcl sc/source sw/source vcl/source vcl/unx

2020-06-08 Thread Caolán McNamara (via logerrit)

 basctl/source/basicide/moduldl2.cxx   |8 
 basctl/source/basicide/moduldlg.cxx   |1 
 basctl/source/dlged/managelang.cxx|   10 
 cui/source/customize/SvxMenuConfigPage.cxx|   24 -
 cui/source/customize/SvxNotebookbarConfigPage.cxx |   40 --
 cui/source/customize/SvxToolbarConfigPage.cxx |   49 +--
 cui/source/customize/cfg.cxx  |   28 +-
 cui/source/dialogs/hangulhanjadlg.cxx |   10 
 cui/source/dialogs/multipat.cxx   |   23 -
 cui/source/dialogs/srchxtra.cxx   |   10 
 cui/source/inc/cfg.hxx|9 
 cui/source/options/certpath.cxx   |   26 -
 cui/source/options/fontsubs.cxx   |   36 +-
 cui/source/options/optjava.cxx|7 
 cui/source/options/optlingu.cxx   |  123 -
 cui/source/tabpages/autocdlg.cxx  |   78 ++---
 cui/uiconfig/ui/applyautofmtpage.ui   |   25 +
 cui/uiconfig/ui/applylocalizedpage.ui |   23 +
 cui/uiconfig/ui/certdialog.ui |   14 -
 cui/uiconfig/ui/menuassignpage.ui |   14 -
 cui/uiconfig/ui/multipathdialog.ui|9 
 cui/uiconfig/ui/optadvancedpage.ui|   26 +
 cui/uiconfig/ui/optfltrembedpage.ui   |   27 +-
 cui/uiconfig/ui/optfontspage.ui   |8 
 dbaccess/source/ui/control/tabletree.cxx  |   46 +--
 dbaccess/source/ui/dlg/tablespage.cxx |6 
 dbaccess/source/ui/inc/tabletree.hxx  |1 
 dbaccess/source/ui/misc/WNameMatch.cxx|   14 -
 desktop/source/deployment/gui/dp_gui_updatedialog.cxx |   14 -
 include/vcl/weld.hxx  |   40 ++
 sc/source/ui/dbgui/dpgroupdlg.cxx |   12 
 sc/source/ui/dbgui/pvfundlg.cxx   |   14 -
 sc/source/ui/dbgui/tpsubt.cxx |   18 -
 sc/source/ui/miscdlgs/protectiondlg.cxx   |   16 -
 sc/source/ui/miscdlgs/solveroptions.cxx   |   20 -
 sw/source/ui/config/optcomp.cxx   |   24 -
 sw/source/ui/config/optload.cxx   |   30 +-
 sw/source/ui/index/cnttab.cxx |   15 -
 vcl/source/app/salvtables.cxx |  241 ++
 vcl/unx/gtk3/gtk3gtkinst.cxx  |   62 +++-
 40 files changed, 616 insertions(+), 585 deletions(-)

New commits:
commit cd384e2d31f74223948ea70d8aa3c318d3ceeb50
Author: Caolán McNamara 
AuthorDate: Fri Jun 5 16:11:39 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jun 8 20:21:35 2020 +0200

rework treeview initial toggle button col to be like expander col

cause this assumption is baked into the vcl one making it hard
to adapt remaining cases

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

diff --git a/basctl/source/basicide/moduldl2.cxx 
b/basctl/source/basicide/moduldl2.cxx
index 3c9d64a01854..c94cfe753c96 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -648,8 +648,8 @@ void LibPage::InsertLib()
 weld::TreeView& rView = xLibDlg->GetLibBox();
 rView.append();
 const int nRow = rView.n_children() - 1;
-rView.set_toggle(nRow, TRISTATE_TRUE, 0);
-rView.set_text(nRow, aLibName, 1);
+rView.set_toggle(nRow, TRISTATE_TRUE);
+rView.set_text(nRow, aLibName, 0);
 rView.set_cursor(rView.find_text(aLibName));
 }
 }
@@ -682,9 +682,9 @@ void LibPage::InsertLib()
 weld::TreeView& rView = xLibDlg->GetLibBox();
 for (int nLib = 0, nChildren = rView.n_children(); nLib < 
nChildren; ++nLib)
 {
-if (rView.get_toggle(nLib, 0) == TRISTATE_TRUE)
+if (rView.get_toggle(nLib) == TRISTATE_TRUE)
 {
-OUString aLibName(rView.get_text(nLib, 1));
+OUString aLibName(rView.get_text(nLib));
 Reference< script::XLibraryContainer2 > xModLibContainer( 
m_aCurDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY );
 Reference< script::XLibraryContainer2 > xDlgLibContainer( 
m_aCurDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY );
 
diff --git a/basctl/source/basicide/moduldlg.cxx 
b/basctl/source/basicide/moduldlg.cxx
index 3b650078fa4d..7aeae822a7bb 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -897,6 +897,7 @@ LibDialog::LibDialog(weld::Window* pParent)
 {
 m_xLibBox->set_size_request(m_xLibBox->get_approximate_digit_w

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

2020-06-08 Thread Caolán McNamara (via logerrit)

 include/vcl/weld.hxx  |2 ++
 vcl/source/app/salvtables.cxx |5 +
 vcl/unx/gtk3/gtk3gtkinst.cxx  |5 +
 3 files changed, 12 insertions(+)

New commits:
commit c3669c8bd62ecf5eaa6b5e95289825bc11b2688a
Author: Caolán McNamara 
AuthorDate: Mon Jun 8 12:17:45 2020 +0100
Commit: Caolán McNamara 
CommitDate: Mon Jun 8 20:20:43 2020 +0200

add TreeView::set_show_expanders

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

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 0705c546e69f..8655b5282a79 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -1148,6 +1148,8 @@ public:
 OUString const& get_saved_value() const { return m_sSavedValue; }
 bool get_value_changed_from_saved() const { return m_sSavedValue != 
get_selected_text(); }
 
+virtual void set_show_expanders(bool bShow) = 0;
+
 // for custom rendering a cell
 void connect_custom_get_size(const Link& rLink) { 
m_aGetSizeHdl = rLink; }
 void connect_custom_render(const Link& rLink) { 
m_aRenderHdl = rLink; }
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index a783ef39be7d..3ea87a0c0e76 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -4568,6 +4568,11 @@ public:
 m_xTreeView->SetUpdateMode(true);
 }
 
+void set_show_expanders(bool bShow) override
+{
+m_xTreeView->set_property("show-expanders", OUString::boolean(bShow));
+}
+
 virtual ~SalInstanceTreeView() override
 {
 LclHeaderTabListBox* pHeaderBox = 
dynamic_cast(m_xTreeView.get());
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 12214117ffa8..642379718e60 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -11440,6 +11440,11 @@ public:
 return signal_custom_get_size(rOutput, rId);
 }
 
+virtual void set_show_expanders(bool bShow) override
+{
+gtk_tree_view_set_show_expanders(m_pTreeView, bShow);
+}
+
 virtual ~GtkInstanceTreeView() override
 {
 if (m_pChangeEvent)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source include/svx svx/Library_svx.mk svx/source

2020-06-08 Thread Miklos Vajna (via logerrit)

 cui/source/dialogs/SignSignatureLineDialog.cxx |   48 +
 cui/source/dialogs/SignatureLineDialog.cxx |   14 --
 cui/source/dialogs/SignatureLineDialogBase.cxx |   14 --
 cui/source/inc/SignatureLineDialogBase.hxx |1 
 include/svx/signaturelinehelper.hxx|   59 +++
 svx/Library_svx.mk |1 
 svx/source/dialog/signaturelinehelper.cxx  |  124 +
 7 files changed, 195 insertions(+), 66 deletions(-)

New commits:
commit 85b68061a5a904ca82e5db40600af741d30f0bb8
Author: Miklos Vajna 
AuthorDate: Mon Jun 8 17:14:14 2020 +0200
Commit: Miklos Vajna 
CommitDate: Mon Jun 8 20:15:06 2020 +0200

sd signature line: extract part of signature line UI from cui to svx

So the "sign existing pdf" code in sd can reuse that.

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

diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx 
b/cui/source/dialogs/SignSignatureLineDialog.cxx
index 10f80f72983d..80e8f9815053 100644
--- a/cui/source/dialogs/SignSignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignSignatureLineDialog.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -167,33 +168,14 @@ IMPL_LINK_NOARG(SignSignatureLineDialog, 
chooseCertificate, weld::Button&, void)
 if (!pShell->PrepareForSigning(m_xDialog.get()))
 return;
 
-Reference xSigner;
-if (pShell->GetMedium()->GetFilter()->IsAlienFormat())
-{
-xSigner
-= 
DocumentDigitalSignatures::createDefault(comphelper::getProcessComponentContext());
-}
-else
-{
-OUString const aODFVersion(
-
comphelper::OStorageHelper::GetODFVersionFromStorage(pShell->GetStorage()));
-xSigner = DocumentDigitalSignatures::createWithVersion(
-comphelper::getProcessComponentContext(), aODFVersion);
-}
-xSigner->setParentWindow(m_xDialog->GetXWindow());
-OUString aDescription;
-CertificateKind certificateKind = CertificateKind_NONE;
-// When signing ooxml, we only want X.509 certificates
-if (pShell->GetMedium()->GetFilter()->IsAlienFormat())
-certificateKind = CertificateKind_X509;
 Reference xSignCertificate
-= xSigner->selectSigningCertificateWithType(certificateKind, 
aDescription);
+= svx::SignatureLineHelper::getSignatureCertificate(pShell, 
m_xDialog.get());
 
 if (xSignCertificate.is())
 {
 m_xSelectedCertifate = xSignCertificate;
-m_xBtnChooseCertificate->set_label(xmlsec::GetContentPart(
-xSignCertificate->getSubjectName(), 
xSignCertificate->getCertificateKind()));
+m_xBtnChooseCertificate->set_label(
+svx::SignatureLineHelper::getSignerName(xSignCertificate));
 }
 ValidateFields();
 }
@@ -229,15 +211,13 @@ void SignSignatureLineDialog::Apply()
 css::uno::Reference 
SignSignatureLineDialog::getSignedGraphic(bool bValid)
 {
 // Read svg and replace placeholder texts
-OUString aSvgImage(getSignatureImage());
+OUString aSvgImage(svx::SignatureLineHelper::getSignatureImage());
 aSvgImage = aSvgImage.replaceAll("[SIGNER_NAME]", 
getCDataString(m_aSuggestedSignerName));
 aSvgImage = aSvgImage.replaceAll("[SIGNER_TITLE]", 
getCDataString(m_aSuggestedSignerTitle));
 
 OUString aIssuerLine
 = CuiResId(RID_SVXSTR_SIGNATURELINE_SIGNED_BY)
-  .replaceFirst("%1",
-
xmlsec::GetContentPart(m_xSelectedCertifate->getSubjectName(),
-   
m_xSelectedCertifate->getCertificateKind()));
+  .replaceFirst("%1", 
svx::SignatureLineHelper::getSignerName(m_xSelectedCertifate));
 aSvgImage = aSvgImage.replaceAll("[SIGNED_BY]", 
getCDataString(aIssuerLine));
 if (bValid)
 aSvgImage = aSvgImage.replaceAll("[INVALID_SIGNATURE]", "");
@@ -245,10 +225,7 @@ css::uno::Reference 
SignSignatureLineDialog::getSignedGr
 OUString aDate;
 if (m_bShowSignDate && bValid)
 {
-const SvtSysLocale aSysLocale;
-const LocaleDataWrapper& rLocaleData = aSysLocale.GetLocaleData();
-Date aDateTime(Date::SYSTEM);
-aDate = rLocaleData.getDate(aDateTime);
+aDate = svx::SignatureLineHelper::getLocalizedDate();
 }
 aSvgImage = aSvgImage.replaceAll("[DATE]", aDate);
 
@@ -278,16 +255,7 @@ css::uno::Reference 
SignSignatureLineDialog::getSignedGr
 }
 
 // Create graphic
-SvMemoryStream aSvgStream(4096, 4096);
-aSvgStream.WriteOString(OUStringToOString(aSvgImage, 
RTL_TEXTENCODING_UTF8));
-Reference xInputStream(new 
utl::OSeekableInputStreamWrapper(aSvgStream));
-Reference 
xContext(comphelper::getProcessComponentContext());
-Reference xProvider = 
css::graphic::GraphicProvider::create(xContext);
-
-Sequence aMediaProp

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

2020-06-08 Thread Tamás Zolnai (via logerrit)

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

New commits:
commit f64dfc2999ca9faf1756490479b6370ae0e52fef
Author: Tamás Zolnai 
AuthorDate: Mon Jun 8 18:23:32 2020 +0200
Commit: Tamás Zolnai 
CommitDate: Mon Jun 8 19:47:49 2020 +0200

cypress: disable failing tests with cp-6-4 branch.

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

diff --git a/cypress_test/plugins/blacklists.js 
b/cypress_test/plugins/blacklists.js
index ebb392752..20f303b6f 100644
--- a/cypress_test/plugins/blacklists.js
+++ b/cypress_test/plugins/blacklists.js
@@ -41,6 +41,34 @@ var testBlackLists = {
'Push number button.'
]
],
+   ],
+
+   'cp-6-4': [
+   ['desktop/calc/focus_spec.js',
+   []
+   ],
+   ['mobile/calc/apply_font_spec.js',
+   [
+   'Apply font size.'
+   ]
+   ],
+   ['mobile/writer/apply_font_spec.js',
+   [
+   'Apply font size.'
+   ]
+   ],
+   ['mobile/impress/apply_font_spec.js',
+   []
+   ],
+   ['mobile/impress/apply_font_spec.js',
+   []
+   ],
+   ['mobile/impress/apply_paragraph_props_spec.js',
+   []
+   ],
+   ['mobile/writer/table_properties_spec.js',
+   []
+   ],
]
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Canberk TURAN (via logerrit)

 sw/source/core/crsr/swcrsr.cxx |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 402f36efb215338ad545caa65d39fb8a39685ea1
Author: Canberk TURAN 
AuthorDate: Sun Jun 7 16:26:16 2020 +0300
Commit: Xisco Fauli 
CommitDate: Mon Jun 8 19:07:41 2020 +0200

tdf#131990 MACROS: fixes return value of UpDown Method

This patch fixes bRet return value of UpDown method in
sw/source/core/crsr/swcrsr.cxx. Before this patch UpDown method always 
returns true.

Change-Id: I5ebe4bef4e6b9d7ace4941c31e9d5a03c2023997
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95669
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 
(cherry picked from commit 1e5cf1b3ebf39aee01ed2a3bfd5be7ee6f44d18e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95811
Reviewed-by: Canberk TURAN 
Reviewed-by: Xisco Fauli 

diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 6067bfe414d4..9a7c84a44b9f 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -2036,6 +2036,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
 }
 pFrame->GetModelPositionForViewPoint( GetPoint(), aPt, 
&eTmpState );
 }
+bRet = !IsSelOvr( SwCursorSelOverFlags::Toggle | 
SwCursorSelOverFlags::ChangePos );
 }
 else
 {
@@ -2047,12 +2048,17 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
 //if cursor has already been at start or end of file,
 //Update cursor to change nUpDownX.
 if ( aOldPos.nContent.GetIndex() == nOffset )
+{
 GetDoc()->GetEditShell()->UpdateCursor();
-else
+bRet = false;
+}
+else{
 *GetPoint() = aPos; // just give a new position
+bRet = true;
+}
+
 }
 
-bRet = !IsSelOvr( SwCursorSelOverFlags::Toggle | 
SwCursorSelOverFlags::ChangePos );
 DoSetBidiLevelUpDown(); // calculate cursor bidi level
 }
 return bRet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Olivier Hallot (via logerrit)

 source/text/scalc/01/04060106.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6f9cff9a59d66c813d3947cdca65ff32c2d42821
Author: Olivier Hallot 
AuthorDate: Wed Jun 3 10:22:36 2020 -0300
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 19:04:59 2020 +0200

Improve readabilty of SERIESSUM

Change-Id: Ia5f4c2ccd335f9be8606bb192cc88d703d80d00c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95436
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 67026c44ece5d04b41eb1c2f2c3ebf086d558bbd)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95740
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/04060106.xhp 
b/source/text/scalc/01/04060106.xhp
index 7b8658a38..4ddde8974 100644
--- a/source/text/scalc/01/04060106.xhp
+++ b/source/text/scalc/01/04060106.xhp
@@ -750,7 +750,7 @@
 
 SERIESSUM
 Sums the first terms of a power series.
-SERIESSUM(x;n;m;coefficients) = coefficient_1*x^n + 
coefficient_2*x^(n+m) + coefficient_3*x^(n+2m) +...+ 
coefficient_i*x^(n+(i-1)m)
+SERIESSUM(x;n;m;c) = c1xn + 
c2xn+m + c3xn+2m + ... + 
cixn + (i-1)m.
 
 
 SERIESSUM(X; N; M; 
Coefficients)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Olivier Hallot (via logerrit)

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

New commits:
commit 6dd15d39c11384ebd7cd5a2efea666724fcfe0ba
Author: Olivier Hallot 
AuthorDate: Mon Jun 8 14:04:59 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 19:04:59 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 6f9cff9a59d66c813d3947cdca65ff32c2d42821
  - Improve readabilty of SERIESSUM

Change-Id: Ia5f4c2ccd335f9be8606bb192cc88d703d80d00c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95436
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 67026c44ece5d04b41eb1c2f2c3ebf086d558bbd)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95740
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 13eadf6de9cc..6f9cff9a59d6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 13eadf6de9cc483db44c399feb6a657fe8fde2a3
+Subproject commit 6f9cff9a59d66c813d3947cdca65ff32c2d42821
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/04060103.xhp |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 13eadf6de9cc483db44c399feb6a657fe8fde2a3
Author: Steve Fanning 
AuthorDate: Wed Jun 3 10:05:24 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 19:04:04 2020 +0200

Improve help information for ACCRINT() function to better explain the 
behaviour of the Par argument.

Change-Id: Ia1fb54abe828dc9d0310e83f9552099759b96d40
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95329
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit e04a83713f38be33d0c51cc35d0c457919a3f213)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95739
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/04060103.xhp 
b/source/text/scalc/01/04060103.xhp
index 8a8efbffb..549aba1ea 100644
--- a/source/text/scalc/01/04060103.xhp
+++ b/source/text/scalc/01/04060103.xhp
@@ -101,7 +101,8 @@
  
 Rate (required) is the annual nominal rate of 
interest (coupon interest rate)
  
-Par (optional) is the par value of the 
security.
+Par (optional) is the par value of the security. If 
omitted, a default value of 1000 is used.
+ We recommend that you always specify 
the value that you require for ACCRINT’s Par argument, rather than 
allowing Calc to apply an arbitrary default. This will make your formula easier 
to understand and easier to maintain.
  
 Frequency (required) is the number of interest 
payments per year (1, 2 or 4).
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit 259ba438544d44914194114642bab2650c3fd49c
Author: Steve Fanning 
AuthorDate: Mon Jun 8 19:04:04 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 19:04:04 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 13eadf6de9cc483db44c399feb6a657fe8fde2a3
  - Improve help information for ACCRINT() function to better explain the 
behaviour of the Par argument.

Change-Id: Ia1fb54abe828dc9d0310e83f9552099759b96d40
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95329
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit e04a83713f38be33d0c51cc35d0c457919a3f213)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95739
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 4a23b97189fc..13eadf6de9cc 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4a23b97189fc671c10d8ab42c1fc53946247cf8f
+Subproject commit 13eadf6de9cc483db44c399feb6a657fe8fde2a3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Olivier Hallot (via logerrit)

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

New commits:
commit 500cd705ca3eb8f91c2b3c7e9f05f7b9eca7235d
Author: Olivier Hallot 
AuthorDate: Mon Jun 8 14:03:22 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 19:03:22 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to bebcf798e7547283a9dd5fbad44d9bfe3847ddb3
  - Correct argument separation character in CEILING

Change-Id: Iac4caaba8c04232726529a201576a20f29b1a14f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95296
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit a85505fe14d6f677e10e1b1d08ca28ccac0d126c)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95737
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index a7337c992237..bebcf798e754 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a7337c9922374b225595776e7b5ab9f87c9e2856
+Subproject commit bebcf798e7547283a9dd5fbad44d9bfe3847ddb3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Olivier Hallot (via logerrit)

 source/text/scalc/01/func_ceiling.xhp |   30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

New commits:
commit bebcf798e7547283a9dd5fbad44d9bfe3847ddb3
Author: Olivier Hallot 
AuthorDate: Mon Jun 1 11:32:10 2020 -0300
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 19:03:22 2020 +0200

Correct argument separation character in CEILING

Change-Id: Iac4caaba8c04232726529a201576a20f29b1a14f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95296
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit a85505fe14d6f677e10e1b1d08ca28ccac0d126c)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95737
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/func_ceiling.xhp 
b/source/text/scalc/01/func_ceiling.xhp
index 858fb4881..97f831e8e 100644
--- a/source/text/scalc/01/func_ceiling.xhp
+++ b/source/text/scalc/01/func_ceiling.xhp
@@ -28,7 +28,7 @@
 For a positive 
number and a positive significance value, the function rounds up (away from 
zero). For a negative number and a negative significance value, the direction 
of rounding is determined by the value of a mode parameter. The function 
returns an error if the number and significance values have opposite 
signs.
 If the spreadsheet is exported to 
Microsoft Excel, the CEILING function is exported as the equivalent 
CEILING.MATH function that has existed since Excel 2013. If you plan to use the 
spreadsheet with earlier Excel versions, use either CEILING.PRECISE that has 
existed since Excel 2010, or CEILING.XCL that is exported as the CEILING 
function compatible with all Excel versions.
 
-CEILING(Number[; Significance[; Mode]])
+CEILING(Number [; Significance [; Mode]])
 
 Number is the number that is to be rounded, or a 
reference to a cell containing the number.
 
@@ -36,10 +36,10 @@
 Mode (optional) is a number, or a reference to a 
cell containing a number. The function only uses Mode if both 
Number and Significance are negative. Then if 
Mode is given and not equal to zero, numbers are rounded down 
(away from zero); if Mode is equal to zero or not given, negative 
numbers are rounded up (towards zero).
 
 =CEILING(3.45) returns 4.
-=CEILING(3.45, 3) returns 
6.
+=CEILING(3.45; 3) returns 
6.
 =CEILING(-1.234) returns 
-1.
-=CEILING(-45.67, -2, 0) returns 
-44.
-=CEILING(-45.67, -2, 1) returns 
-46.
+=CEILING(-45.67; -2; 0) returns 
-44.
+=CEILING(-45.67; -2; 1) returns 
-46.
 see also FLOOR, EVEN, ODD, MROUND, INT, TRUNC, ROUND, 
ROUNDDOWN, ROUNDUP
 
 
@@ -56,12 +56,12 @@
 This function calculates identical 
results to the ISO.CEILING 
function.
 
 
-CEILING.PRECISE(Number[; Significance])
+CEILING.PRECISE(Number [; Significance])
 
 Significance (optional) is the value, or a 
reference to a cell containing the value, to whose multiple Number 
is to be rounded. It defaults to 1.
 
 =CEILING.PRECISE(3.45) returns 
4.
-=CEILING.PRECISE(-45.67,2) returns 
-44.
+=CEILING.PRECISE(-45.67; 2) returns 
-44.
 see also FLOOR, EVEN, ODD, MROUND, INT, TRUNC, ROUND, 
ROUNDDOWN, ROUNDUP
 
 
@@ -74,18 +74,18 @@
 Rounds a number to the nearest 
multiple of a significance value.
 For a positive 
number the function rounds up (away from zero). For a negative number, the 
direction of rounding is determined by the value of a mode parameter. The sign 
of the significance value is ignored.
 
-  This function exists for 
interoperability with Microsoft Excel 2013 or newer.  
+  This function exists for 
interoperability with Microsoft Excel 2013 or newer.
   
-CEILING.MATH(Number[; Significance[; Mode]])
+CEILING.MATH(Number [; Significance [; Mode]])
 
 Significance (optional) is the value, or a 
reference to a cell containing the value, to whose multiple Number 
is to be rounded. It defaults to 1.
 Mode (optional) is a number, or a reference to a 
cell containing a number. If Mode is given and not equal to zero, 
a negative Number is rounded down (away from zero). If 
Mode is equal to zero or is not given, a negative 
Number is rounded up (towards zero).
 
 =CEILING.MATH(3.45) returns 
4.
-=CEILING.MATH(3.45,-3) returns 
6.
+=CEILING.MATH(3.45; -3) returns 
6.
 =CEILING.MATH(-1.234) returns 
-1.
-=CEILING.MATH(-45.67,-2,0) returns 
-44.
-=CEILING.MATH(-45.67,+2, 1) returns 
-46.
+=CEILING.MATH(-45.67; -2; 0) returns 
-44.
+=CEILING.MATH(-45.67; +2; 1) returns 
-46.
 
 
 
@@ -103,8 +103,8 @@
 Significance is the value, or a reference to a 
cell containing the value, to whose multiple Number is to be 
rounded.
 
 =CEILING.XCL

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/ful_func.xhp |   28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 4a23b97189fc671c10d8ab42c1fc53946247cf8f
Author: Steve Fanning 
AuthorDate: Mon Jun 1 17:17:05 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 19:03:43 2020 +0200

(ful_func.xhp) Update common defintions for lengthy argument lists, to 
contain more white space and give greater consistency across Calc functions.

Change-Id: I053486715c5cb8f0687b6b02c218e470db163b8d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95249
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit e10bfae45bc138b0c2351a7cb6bd3cc591bea388)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95738
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/ful_func.xhp 
b/source/text/scalc/01/ful_func.xhp
index 642a2bf00..d53e5fd81 100644
--- a/source/text/scalc/01/ful_func.xhp
+++ b/source/text/scalc/01/ful_func.xhp
@@ -46,33 +46,33 @@
The result is presented in the string format and has the 
character "i" or "j" as an imaginary unit.

 255 arguments
-String 1[; String 2][; … ;[String 255]]
+String 1 [; String 2 [; …  [; String 
255]]]
 
-String 
1[; String 2][; … ;[String 255]] are strings,  references to cells or to 
cell ranges of strings.
+String 1, 
String 2, … , String 255 are strings, references to cells or to cell 
ranges of strings.
 
-Integer 1[; Integer 2][; … ;[Integer 
255]]
+Integer 1 [; Integer 2 [; … [; Integer 
255]]]
 
-Integer 
1[; Integer 2][; … ;[Integer 255]] are integers, references to cells or 
to cell ranges of integers.
+Integer 
1, Integer 2, … , Integer 255 are integers, references to cells or to 
cell ranges of integers.
 
-Number 1[; Number 2][; … ;[Number 254]]
+Number 1 [; Number 2 [; … [; Number 
254]]]
 
-Number 
1[; Number 2][; … ;[Number 254]] are numbers, references to cells or to 
cell ranges of numbers.
+Number 1, 
Number 2, … , Number 254 are numbers, references to cells or to cell 
ranges of numbers.
 
-Number 1[; Number 2][; … ;[Number 255]]
+Number 1 [; Number 2 [; … [; Number 
255]]]
 
-Number 
1[; Number 2][; … ;[Number 255]] are numbers, references to cells or to 
cell ranges of numbers.
+Number 1, 
Number 2, … , Number 255 are numbers, references to cells or to cell 
ranges of numbers.
 
-Logical 1[; Logical 2][; … ;[Logical 
255]]
+Logical 1 [; Logical 2 [; … [; Logical 
255]]]
 
-Logical 
1[; Logical 2][; … ;[Logical 255]] are boolean values, references to 
cells or to cell ranges of logical values.
+Logical 
1, Logical 2,  … , Logical 255 are boolean values, references to cells 
or to cell ranges of logical values.
 
-Complex 1[; Complex 2][; … ;[Complex 
255]]
+Complex 1 [; Complex 2 [; … [; Complex 
255]]]
 
-Complex 
1[; Complex 2][; … ;[Complex 255]] are complex numbers, references to 
cells or to cell ranges of complex numbers. Complex numbers are entered in the 
form "x+yi" or "x+yj". 
+Complex 
1, Complex 2, … ,Complex 255 are complex numbers, references to cells or 
to cell ranges of complex numbers. Complex numbers are entered in the form 
"x+yi" or "x+yj". 
 
-Reference 1[; Reference 2][; … ;[Reference 
255]]
+Reference 1 [; Reference 2 [; … [; Reference 
255]]]
 
-Reference 
1[; Reference 2][; … ;[Reference 255]] are references to 
cells.
+Reference 
1, Reference 2, … ,Reference 255 are references to cells.
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit 6ae8c8f3b4bc7306a4e90782d72f0c33d02f616b
Author: Steve Fanning 
AuthorDate: Mon Jun 8 19:03:43 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 19:03:43 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 4a23b97189fc671c10d8ab42c1fc53946247cf8f
  - (ful_func.xhp) Update common defintions for lengthy argument lists, to 
contain more white space and give greater consistency across Calc functions.

Change-Id: I053486715c5cb8f0687b6b02c218e470db163b8d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95249
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit e10bfae45bc138b0c2351a7cb6bd3cc591bea388)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95738
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index bebcf798e754..4a23b97189fc 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit bebcf798e7547283a9dd5fbad44d9bfe3847ddb3
+Subproject commit 4a23b97189fc671c10d8ab42c1fc53946247cf8f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit 1c2b704cf441cbe80d4cd468a41a8c9c0bda9870
Author: Steve Fanning 
AuthorDate: Mon Jun 8 19:02:55 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 19:02:55 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to a7337c9922374b225595776e7b5ab9f87c9e2856
  - (04060185.xhp) Include square brackets in syntax sections to indicate 
optional parameters.

Change-Id: I8d099d9babe118c7592b060027dd037e9fbdadaf
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95245
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 79dfc48af63b0834aee096c65f92f1bc96fc1b6c)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95736
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 4a8b7a806112..a7337c992237 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4a8b7a806112d636b17436bd8d74ddcdbfba
+Subproject commit a7337c9922374b225595776e7b5ab9f87c9e2856
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/04060185.xhp |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a7337c9922374b225595776e7b5ab9f87c9e2856
Author: Steve Fanning 
AuthorDate: Mon Jun 1 11:47:38 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 19:02:55 2020 +0200

(04060185.xhp) Include square brackets in syntax sections to indicate 
optional parameters.

Change-Id: I8d099d9babe118c7592b060027dd037e9fbdadaf
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95245
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 79dfc48af63b0834aee096c65f92f1bc96fc1b6c)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95736
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/04060185.xhp 
b/source/text/scalc/01/04060185.xhp
index 1243793dd..65bfaec40 100644
--- a/source/text/scalc/01/04060185.xhp
+++ b/source/text/scalc/01/04060185.xhp
@@ -38,7 +38,7 @@
 RANK
  Returns the rank of a number in a 
sample.
  
- RANK(Value; Data; Type)
+ RANK(Value; Data [; Type])
  
 Value is the value, whose rank is to be 
determined.
  
@@ -62,7 +62,7 @@
 The difference between RANK.AVG and RANK.EQ occurs when 
there are duplicates in the list of values. The RANK.EQ function returns the lower rank, whereas the RANK.AVG function returns the average rank.
 
 
-RANK.AVG(Value; 
Data; Type)
+RANK.AVG(Value; 
Data [; Type])
 Value is the value, whose rank is to be 
determined.
 Data is the array or range of data in the 
sample.
 Type (optional) is the sequence order.
@@ -82,7 +82,7 @@
 The difference between RANK.AVG and RANK.EQ occurs when 
there are duplicates in the list of values. The RANK.EQ function returns the lower rank, whereas the RANK.AVG function returns the average rank.
 
 
-RANK.EQ(Value; 
Data; Type)
+RANK.EQ(Value; Data 
[; Type])
 Value is the value, whose rank is to be 
determined.
 Data is the array or range of data in the 
sample.
 Type (optional) is the sequence order.
@@ -665,7 +665,7 @@
 PROB
  Returns the probability 
that values in a range are between two limits. If there is no End value, this function calculates the probability based 
on the principle that the Data values are equal to the value of Start.
  
- PROB(Data; 
Probability; Start; End)
+ PROB(Data; 
Probability; Start [; End])
  
 Data is the array or range of data in the 
sample.
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit f330a6f52f5d08f296e06b0720fbad5efc7f94b4
Author: Steve Fanning 
AuthorDate: Mon Jun 8 19:02:22 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 19:02:22 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 4a8b7a806112d636b17436bd8d74ddcdbfba
  - (04060184.xhp) Include square brackets in syntax sections to indicate 
optional parameters.

Change-Id: I20270c2acaa2d9f9957691ce3452986d35126a0e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95243
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 427ff3dd99a459af6a3f911ad5b23f94d91b4a62)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95735
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 7256f3ddd4b6..4a8b7a806112 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7256f3ddd4b6a199ab32278ff727b766cf866fc5
+Subproject commit 4a8b7a806112d636b17436bd8d74ddcdbfba
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/04060184.xhp |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 4a8b7a806112d636b17436bd8d74ddcdbfba
Author: Steve Fanning 
AuthorDate: Mon Jun 1 11:39:23 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 19:02:22 2020 +0200

(04060184.xhp) Include square brackets in syntax sections to indicate 
optional parameters.

Change-Id: I20270c2acaa2d9f9957691ce3452986d35126a0e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95243
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 427ff3dd99a459af6a3f911ad5b23f94d91b4a62)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95735
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/04060184.xhp 
b/source/text/scalc/01/04060184.xhp
index c62fafdd3..8134dd9f4 100644
--- a/source/text/scalc/01/04060184.xhp
+++ b/source/text/scalc/01/04060184.xhp
@@ -279,7 +279,7 @@
 NORMDIST
 Returns the density function or the normal cumulative 
distribution.
 
-NORMDIST(Number; 
Mean; StDev; C)
+NORMDIST(Number; 
Mean; StDev [; C])
 Number is the value of the distribution based on 
which the normal distribution is to be calculated.
 Mean is the mean value of the 
distribution.
 StDev is the standard deviation of the 
distribution.
@@ -348,7 +348,7 @@
 POISSON
 Returns the Poisson distribution.
 
-POISSON(Number; 
Mean; C)
+POISSON(Number; 
Mean [; C])
 Number represents the value based on which the 
Poisson distribution is calculated.
 Mean represents the middle value of the Poisson 
distribution.
 C 
(optional) = 0 or False calculates the density function; C = 1 or 
True calculates the distribution. When omitted, the default value True is 
inserted when you save the document, for best compatibility with other programs 
and older versions of %PRODUCTNAME.
@@ -365,7 +365,7 @@
 Returns the Poisson 
distribution.
 
 
-POISSON.DIST(Number; Mean; C)
+POISSON.DIST(Number; Mean [; C])
 Number represents the value based on which the 
Poisson distribution is calculated.
 Mean represents the middle value of the Poisson 
distribution.
 C (optional) = 0 or False calculates the density 
function; C = 1 or True calculates the distribution. When omitted, 
the default value True is inserted when you save the document, for best 
compatibility with other programs and older versions of 
%PRODUCTNAME.
@@ -424,7 +424,7 @@
 PERCENTRANK
 Returns the percentage rank of a value in a 
sample.
 
-PERCENTRANK(Data; 
Value; Significance)
+PERCENTRANK(Data; 
Value [; Significance])
 Data represents the array of data in the 
sample.
 Value represents the value whose percentile rank 
must be determined.
 Significance An optional argument that specifies 
the number of significant digits that the returned percentage value is rounded 
to. If omitted, a value of 3 is used.
@@ -440,7 +440,7 @@
 The difference between PERCENTRANK.INC and PERCENTRANK.EXC is that PERCENTRANK.INC calculates a value in the range 0 to 1 
inclusive, whereas the PERCENTRANK.EXC function 
calculates a value in the range 0 to 1 exclusive.
 
 
-PERCENTRANK.EXC(Data; Value; Significance)
+PERCENTRANK.EXC(Data; Value [; Significance])
 Data represents the array of data in the 
sample.
 Value represents the value whose percentile rank 
must be determined.
 Significance An optional argument that specifies 
the number of significant digits that the returned percentage value is rounded 
to.
@@ -455,7 +455,7 @@
 The difference between PERCENTRANK.INC and PERCENTRANK.EXC is that PERCENTRANK.INC calculates a value in the range 0 to 1 
inclusive, whereas the PERCENTRANK.EXC function 
calculates a value in the range 0 to 1 exclusive.
 
 
-PERCENTRANK.INC(Data; Value; Significance)
+PERCENTRANK.INC(Data; Value [; Significance])
 Data represents the array of data in the 
sample.
 Value represents the value whose percentile rank 
must be determined.
 Significance An optional argument that specifies 
the number of significant digits that the returned percentage value is rounded 
to.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/04060183.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7256f3ddd4b6a199ab32278ff727b766cf866fc5
Author: Steve Fanning 
AuthorDate: Mon Jun 1 11:33:26 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:58:23 2020 +0200

(04060183.xhp) Include square brackets in syntax sections to indicate 
optional parameters.

Change-Id: I53c9d01dfd75cdab6bac7284b2d775d36a1d9311
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95241
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 57145b91d3e06b07d714e65e00d9e19626dbca52)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95734
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/04060183.xhp 
b/source/text/scalc/01/04060183.xhp
index e3cf9d24a..cc5039eef 100644
--- a/source/text/scalc/01/04060183.xhp
+++ b/source/text/scalc/01/04060183.xhp
@@ -223,7 +223,7 @@
 LOGINV
 Returns the inverse of the lognormal 
distribution.
 
-LOGINV(Number; 
Mean; StDev)
+LOGINV(Number [; 
Mean [; StDev]])
 
 Number is the probability value for which the inverse standard 
logarithmic distribution is to be calculated.
 
@@ -263,7 +263,7 @@
 LOGNORMDIST
 Returns the values of a lognormal 
distribution.
 
-LOGNORMDIST(Number; 
Mean; StDev; Cumulative)
+LOGNORMDIST(Number 
[; Mean [; StDev [; Cumulative]]])
 
 Number is the probability value for which the standard 
logarithmic distribution is to be calculated.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit 8857d8086728d14f14ed3a0afb34343ce2b5d2f2
Author: Steve Fanning 
AuthorDate: Mon Jun 8 18:57:56 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:57:56 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to a80ec77e17ca9cbf4c4e12affa4d31a7ed412677
  - (04060182.xhp) Include square brackets in syntax sections to indicate 
optional parameters.

Also updated GEOMEAN() and HARMEAN() to cater for up to 255 arguments 
rather than 30.

Change-Id: I706f1f8426b04b3ec06064d505116151b55f2b00
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95240
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 8a1427c35e2392ecfe8ecaee84ab1c24fa5b87ae)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95733
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 3c0f925c0367..a80ec77e17ca 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3c0f925c0367855db0265e6785c32a1ffc2a0731
+Subproject commit a80ec77e17ca9cbf4c4e12affa4d31a7ed412677
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit e5a96a836523e14890e52d65f07a5297bd6d892e
Author: Steve Fanning 
AuthorDate: Mon Jun 8 18:58:23 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:58:23 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 7256f3ddd4b6a199ab32278ff727b766cf866fc5
  - (04060183.xhp) Include square brackets in syntax sections to indicate 
optional parameters.

Change-Id: I53c9d01dfd75cdab6bac7284b2d775d36a1d9311
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95241
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 57145b91d3e06b07d714e65e00d9e19626dbca52)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95734
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index a80ec77e17ca..7256f3ddd4b6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a80ec77e17ca9cbf4c4e12affa4d31a7ed412677
+Subproject commit 7256f3ddd4b6a199ab32278ff727b766cf866fc5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/04060182.xhp |   22 ++
 1 file changed, 10 insertions(+), 12 deletions(-)

New commits:
commit a80ec77e17ca9cbf4c4e12affa4d31a7ed412677
Author: Steve Fanning 
AuthorDate: Mon Jun 1 11:15:37 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:57:56 2020 +0200

(04060182.xhp) Include square brackets in syntax sections to indicate 
optional parameters.

Also updated GEOMEAN() and HARMEAN() to cater for up to 255 arguments 
rather than 30.

Change-Id: I706f1f8426b04b3ec06064d505116151b55f2b00
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95240
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 8a1427c35e2392ecfe8ecaee84ab1c24fa5b87ae)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95733
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/04060182.xhp 
b/source/text/scalc/01/04060182.xhp
index c02ddbbc0..b6a78433b 100644
--- a/source/text/scalc/01/04060182.xhp
+++ b/source/text/scalc/01/04060182.xhp
@@ -172,7 +172,7 @@
 Calculates the values of the left tail of the F 
distribution.
 
 
-F.DIST(Number; 
DegreesFreedom1; DegreesFreedom2; Cumulative)
+F.DIST(Number; 
DegreesFreedom1; DegreesFreedom2 [; Cumulative])
 Number is the value for which the F distribution 
is to be calculated.
 degreesFreedom1 is the degrees of freedom in the 
numerator in the F distribution.
 degreesFreedom2 is the degrees of freedom in the 
denominator in the F distribution.
@@ -285,7 +285,7 @@
  Returns the values of a Gamma 
distribution.
  The inverse function is GAMMAINV.
  
- GAMMADIST(Number; Alpha; Beta; C)
+ GAMMADIST(Number; Alpha; Beta [; C])
  
 Number is the value for which the Gamma distribution 
is to be calculated.
  
@@ -343,9 +343,8 @@
 GEOMEAN
  Returns the geometric mean of 
a sample.
  
- GEOMEAN(Number1; Number2; ...; Number30)
- 
-Number1, Number2, ..., Number30 are numeric arguments 
or ranges that represent a random sample.
+ GEOMEAN()
+ 
 
  
 =GEOMEAN(23;46;69) = 41.79. The 
geometric mean value of this random sample is therefore 41.79.
@@ -374,7 +373,7 @@
 ZTEST
  Calculates the probability of 
observing a z-statistic greater than the one computed based on a 
sample.
  
- ZTEST(Data; mu; Sigma)
+ ZTEST(Data; mu [; Sigma])
  
 Data is the given sample, drawn from a normally 
distributed population.
  
@@ -391,7 +390,7 @@
 Calculates the probability of observing a z-statistic 
greater than the one computed based on a sample.
 
 
-Z.TEST(Data; mu; 
Sigma)
+Z.TEST(Data; mu [; 
Sigma])
 Data is the given sample, drawn from a normally 
distributed population.
 mu is the known mean of the 
population.
 Sigma (optional) is the known standard deviation 
of the population. If omitted, the standard deviation of the given sample is 
used.
@@ -406,10 +405,9 @@
 HARMEAN
  Returns the harmonic mean of a 
data set.
  
- HARMEAN(Number1; Number2; ...; Number30)
- 
-Number1, Number2, ..., Number30 are up to 30 values 
or ranges, that can be used to calculate the harmonic mean.
-
+ HARMEAN()
+ 
+ 
  
 =HARMEAN(23;46;69) = 37.64. The harmonic 
mean of this random sample is thus 37.64
   
@@ -422,7 +420,7 @@
  Returns the hypergeometric 
distribution.
  
 
- HYPGEOMDIST(X; NSample; Successes; NPopulation[; 
Cumulative])
+ HYPGEOMDIST(X; NSample; Successes; NPopulation [; 
Cumulative])
  
 X is the number of results achieved in the random 
sample.
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/04060119.xhp |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 3c0f925c0367855db0265e6785c32a1ffc2a0731
Author: Steve Fanning 
AuthorDate: Mon Jun 1 00:06:02 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:57:24 2020 +0200

(04060119.xhp) Include square brackets in syntax sections to indicate 
optional parameters.

Note: PMT() and PPMT() functions - syntax now matches ODF 1.2.

Change-Id: I7c291ed84eaf875953e86996cc74c2c9a956e13c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95235
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 4b4e25cad5a6971b1be4f077bbe42fd08366b4fd)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95732
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/04060119.xhp 
b/source/text/scalc/01/04060119.xhp
index 5abb0366f..99f0d6fd5 100644
--- a/source/text/scalc/01/04060119.xhp
+++ b/source/text/scalc/01/04060119.xhp
@@ -41,7 +41,7 @@
 PPMT
 Returns for a given period the payment on the principal for 
an investment that is based on periodic and constant payments and a constant 
interest rate.
 
-PPMT(Rate; Period; 
NPer; PV; FV; Type)
+PPMT(Rate; Period; 
NPer; PV [ ; FV [ ; Type ] ])
 
 Rate is the periodic interest rate.
 
@@ -189,7 +189,7 @@
 PRICE
 Calculates the market value of a fixed interest 
security with a par value of 100 currency units as a function of the forecast 
yield.
 
-PRICE(Settlement; 
Maturity; Rate; Yield; Redemption; Frequency; Basis)
+PRICE(Settlement; 
Maturity; Rate; Yield; Redemption; Frequency [; Basis])
 
 Settlement is the date of purchase of the security.
 
@@ -216,7 +216,7 @@
 PRICEDISC
 Calculates the price per 100 currency units of par 
value of a non-interest- bearing security.
 
-PRICEDISC(Settlement; Maturity; Discount; Redemption; 
Basis)
+PRICEDISC(Settlement; Maturity; Discount; Redemption [; 
Basis])
 
 Settlement is the date of purchase of the security.
 
@@ -238,7 +238,7 @@
 PRICEMAT
 Calculates the price per 100 currency units of par 
value of a security, that pays interest on the maturity 
date.
 
-PRICEMAT(Settlement; Maturity; Issue; Rate; Yield; 
Basis)
+PRICEMAT(Settlement; Maturity; Issue; Rate; Yield [; 
Basis])
 
 Settlement is the date of purchase of the security.
 
@@ -305,7 +305,7 @@
 MDURATION
 Calculates the modified Macauley duration of a 
fixed interest security in years.
 
-MDURATION(Settlement; Maturity; Coupon; Yield; Frequency; 
Basis)
+MDURATION(Settlement; Maturity; Coupon; Yield; Frequency [; 
Basis])
 
 Settlement is the date of purchase of the security.
 
@@ -446,7 +446,7 @@
 YIELD
 Calculates the yield of a security.
 
-YIELD(Settlement; 
Maturity; Rate; Price; Redemption; Frequency; Basis)
+YIELD(Settlement; 
Maturity; Rate; Price; Redemption; Frequency [; Basis])
 
 Settlement is the date of purchase of the security.
 
@@ -472,7 +472,7 @@
 YIELDDISC
 Calculates the annual yield of a 
non-interest-bearing security.
 
-YIELDDISC(Settlement; Maturity; Price; Redemption; 
Basis)
+YIELDDISC(Settlement; Maturity; Price; Redemption [; 
Basis])
 
 Settlement is the date of purchase of the security.
 
@@ -494,7 +494,7 @@
 YIELDMAT
 Calculates the annual yield of a security, the 
interest of which is paid on the date of maturity.
 
-YIELDMAT(Settlement; Maturity; Issue; Rate; Price; 
Basis)
+YIELDMAT(Settlement; Maturity; Issue; Rate; Price [; 
Basis])
 
 Settlement is the date of purchase of the security.
 
@@ -519,7 +519,7 @@
 PMT
 Returns the periodic payment for an annuity with constant 
interest rates.
 
-PMT(Rate; NPer; PV; 
FV; Type)
+PMT(Rate; NPer; PV 
[ ; [ FV ] [ ; Type ] ])
 
 Rate is the periodic interest rate.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit 1fac359a5067e4c657af8c2095c7d5bb1ed554a2
Author: Steve Fanning 
AuthorDate: Mon Jun 8 18:57:24 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:57:24 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 3c0f925c0367855db0265e6785c32a1ffc2a0731
  - (04060119.xhp) Include square brackets in syntax sections to indicate 
optional parameters.

Note: PMT() and PPMT() functions - syntax now matches ODF 1.2.

Change-Id: I7c291ed84eaf875953e86996cc74c2c9a956e13c
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95235
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 4b4e25cad5a6971b1be4f077bbe42fd08366b4fd)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95732
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index d3ba25714ea9..3c0f925c0367 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d3ba25714ea93ce282c319c0898ba66048224afa
+Subproject commit 3c0f925c0367855db0265e6785c32a1ffc2a0731
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit 796384c1a722ef815791607e7a7076a4035e65e2
Author: Steve Fanning 
AuthorDate: Mon Jun 8 18:56:53 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:56:53 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to d3ba25714ea93ce282c319c0898ba66048224afa
  - (04060181.xhp) Include square brackets in syntax sections to indicate 
optional parameters.

Change-Id: Idade23cd4fd95210ecc0bd1684f30f30c9d2ccbc
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95236
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 5dd2cc30687d259990a9882d1c0874993fb60747)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95731
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 71f706236edf..d3ba25714ea9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 71f706236edfd8ade428215f0c850c7197a59008
+Subproject commit d3ba25714ea93ce282c319c0898ba66048224afa
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/04060181.xhp |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit d3ba25714ea93ce282c319c0898ba66048224afa
Author: Steve Fanning 
AuthorDate: Mon Jun 1 00:19:48 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:56:53 2020 +0200

(04060181.xhp) Include square brackets in syntax sections to indicate 
optional parameters.

Change-Id: Idade23cd4fd95210ecc0bd1684f30f30c9d2ccbc
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95236
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 5dd2cc30687d259990a9882d1c0874993fb60747)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95731
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/04060181.xhp 
b/source/text/scalc/01/04060181.xhp
index f51297a15..2dd591ea4 100644
--- a/source/text/scalc/01/04060181.xhp
+++ b/source/text/scalc/01/04060181.xhp
@@ -154,7 +154,7 @@
 Returns the probability of a sample with binomial 
distribution.
 
 
-B(Trials; SP; T1; 
T2)
+B(Trials; SP; T1 [; 
T2])
 Trials is the number of independent 
trials.
 SP is the probability of success on each 
trial.
 T1 defines the lower limit for the number of 
trials.
@@ -198,7 +198,7 @@
 Returns the inverse of the cumulative beta probability 
density function.
 
 
-BETAINV(Number; 
Alpha; Beta; Start; End)
+BETAINV(Number; 
Alpha; Beta [; Start [; End]])
 Number is the value between Start 
and End at which to evaluate the function.
 Alpha is a parameter to the 
distribution.
 Beta is a parameter to the 
distribution.
@@ -222,7 +222,7 @@
 Returns the inverse of the cumulative beta 
probability density function.
 
 
-BETA.INV(Number; 
Alpha; Beta; Start; End)
+BETA.INV(Number; 
Alpha; Beta [; Start [; End]])
 Number is the value between Start 
and End at which to evaluate the function.
 Alpha is a parameter to the 
distribution.
 Beta is a parameter to the 
distribution.
@@ -246,7 +246,7 @@
 Returns the beta function.
 
 
-BETADIST(Number; 
Alpha; Beta; Start; End; Cumulative)
+BETADIST(Number; 
Alpha; Beta [; Start [; End [; Cumulative]]])
 Number is the value between Start 
and End at which to evaluate the function.
 Alpha is a parameter to the 
distribution.
 Beta is a parameter to the 
distribution.
@@ -271,7 +271,7 @@
 Returns the beta function.
 
 
-BETA.DIST(Number; 
Alpha; Beta; Cumulative; Start; End)
+BETA.DIST(Number; 
Alpha; Beta; Cumulative [; Start [; End]])
 Number (required) is the value between 
Start and End at which to evaluate the 
function.
 Alpha (required) is a parameter to the 
distribution.
 Beta (required) is a parameter to the 
distribution.
@@ -705,7 +705,7 @@
 Returns the value of the probability density 
function or the cumulative distribution function for the chi-square 
distribution.
 
 
-CHISQDIST(Number; Degrees Of Freedom; Cumulative)
+CHISQDIST(Number; Degrees Of Freedom [; 
Cumulative])
 Number is the number for which the function is to 
be calculated.
 Degrees Of Freedom is the degrees of freedom for 
the chi-square function.
 Cumulative (optional): 0 or False calculates the 
probability density function. Other values or True or omitted calculates the 
cumulative distribution function.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Olivier Hallot (via logerrit)

 source/text/swriter/01/04090005.xhp |6 +-
 source/text/swriter/01/04090300.xhp |6 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 71f706236edfd8ade428215f0c850c7197a59008
Author: Olivier Hallot 
AuthorDate: Sun May 31 18:53:43 2020 -0300
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:56:16 2020 +0200

Fix broken links between pages

Change-Id: I2bb6f9314bca0e40507644805120f884dc61130f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95253
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 80ea6d732d33f789167774efdb26dfac67b35afc)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95730
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/swriter/01/04090005.xhp 
b/source/text/swriter/01/04090005.xhp
index 96ab4ac6a..97f01c910 100644
--- a/source/text/swriter/01/04090005.xhp
+++ b/source/text/swriter/01/04090005.xhp
@@ -37,8 +37,10 @@
 
 
 
+
 
 Lists the available field 
types. To add a field to your document, click a field type, click a field in 
the Select list, and then click 
Insert.
+
 
 
 
@@ -124,9 +126,11 @@
 
 
 
+
 
-Selecton all tab pages this is 
called "Select", except for "Cross-References", which uses 
"Selection"
+Selecton all tab pages 
this is called "Select", except for "Cross-References", which uses 
"Selection"
 Lists the 
available fields for the field type selected in the Type 
list. To insert a field, click the field, and then click 
Insert.
+
 To quickly insert a 
field from the Select list, hold down CommandCtrl
 and double-click the field.
 
 Click the format that you 
want to apply to the selected field, or click "Additional formats" to define a 
custom format.
diff --git a/source/text/swriter/01/04090300.xhp 
b/source/text/swriter/01/04090300.xhp
index 08fe8e6b1..ddc6c6576 100644
--- a/source/text/swriter/01/04090300.xhp
+++ b/source/text/swriter/01/04090300.xhp
@@ -35,11 +35,9 @@
 
 Type
 Shows the type of the selected field.
-select 
heading
-explain 
select control
+select 
heading
 Provides 
Format header and explanation
-invisible 
heading
-explain 
invisible control
+invisible
 
 apply 
control
 Arrow buttons
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Olivier Hallot (via logerrit)

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

New commits:
commit fad2f2edffca109a8a744e19c49530c6b32aad62
Author: Olivier Hallot 
AuthorDate: Mon Jun 8 13:56:16 2020 -0300
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:56:16 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 71f706236edfd8ade428215f0c850c7197a59008
  - Fix broken links between pages

Change-Id: I2bb6f9314bca0e40507644805120f884dc61130f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95253
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 80ea6d732d33f789167774efdb26dfac67b35afc)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95730
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 5d3020b7cde0..71f706236edf 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5d3020b7cde049bfd0fa61f5d6abe660318ffbbe
+Subproject commit 71f706236edfd8ade428215f0c850c7197a59008
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit 5ec3bfc5de73db1956b596b2aa05e7c2520e2382
Author: Steve Fanning 
AuthorDate: Mon Jun 8 18:55:34 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:55:34 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 5d3020b7cde049bfd0fa61f5d6abe660318ffbbe
  - (04060116.xhp) Include square brackets in syntax sections to indicate 
optional parameters.

Change-Id: Ife2ccaeb06062c1cedaa8cba8511a0a86be1fc1a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95209
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 16b1c5d9c3ead98647e6cc816a9b81e39be48ca5)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95729
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 0c2b19daf2c1..5d3020b7cde0 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0c2b19daf2c1d08c53398f82da914e87aa4373f1
+Subproject commit 5d3020b7cde049bfd0fa61f5d6abe660318ffbbe
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/04060116.xhp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5d3020b7cde049bfd0fa61f5d6abe660318ffbbe
Author: Steve Fanning 
AuthorDate: Sun May 31 11:41:31 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:55:34 2020 +0200

(04060116.xhp) Include square brackets in syntax sections to indicate 
optional parameters.

Change-Id: Ife2ccaeb06062c1cedaa8cba8511a0a86be1fc1a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95209
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 16b1c5d9c3ead98647e6cc816a9b81e39be48ca5)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95729
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/04060116.xhp 
b/source/text/scalc/01/04060116.xhp
index 91ec082cc..9316d9320 100644
--- a/source/text/scalc/01/04060116.xhp
+++ b/source/text/scalc/01/04060116.xhp
@@ -322,7 +322,7 @@
 COMPLEX
  The result is a complex 
number which is returned from a real coefficient and an imaginary 
coefficient.
  
- COMPLEX(RealNum; INum; Suffix)
+ COMPLEX(RealNum; INum [; Suffix])
  
 RealNum is the real coefficient of the complex 
number.
  
@@ -341,7 +341,7 @@
 OCT2BIN
  The result is the binary 
number for the octal number entered.
  
- OCT2BIN(Number; Places)
+ OCT2BIN(Number [; Places])
  
 Number is the octal number. The number can have a 
maximum of 10 places. The most significant bit is the sign bit, the following 
bits return the value. Negative numbers are entered as two's 
complement.
  
@@ -373,7 +373,7 @@
 OCT2HEX
   The result is the 
hexadecimal number for the octal number entered.
  
- OCT2HEX(Number; Places)
+ OCT2HEX(Number [; Places])
  
 Number is the octal number. The number can have a 
maximum of 10 places. The most significant bit is the sign bit, the following 
bits return the value. Negative numbers are entered as two's 
complement.
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/04060118.xhp |   34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 0c2b19daf2c1d08c53398f82da914e87aa4373f1
Author: Steve Fanning 
AuthorDate: Sun May 31 11:19:59 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:55:07 2020 +0200

(04060118.xhp) Include square brackets in syntax sections to indicate 
optional parameters.

ODF 1.2 used to confirm configuration of brackets for FV(), NPER(),and 
RATE().

Change-Id: I7b109974d3e1dbc6670c32628a5425741d882f4e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95208
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit cf09e34b35c8f0803ecfb5151bdbf1a1cf1ccc68)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95728
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/04060118.xhp 
b/source/text/scalc/01/04060118.xhp
index 850d2b1c8..a51d0cf6b 100644
--- a/source/text/scalc/01/04060118.xhp
+++ b/source/text/scalc/01/04060118.xhp
@@ -43,7 +43,7 @@
 Calculates the price per 100 currency units par 
value of a security, if the first interest date falls 
irregularly.
 
 
-ODDFPRICE(Settlement; Maturity; Issue; FirstCoupon; Rate; 
Yield; Redemption; Frequency; Basis)
+ODDFPRICE(Settlement; Maturity; Issue; FirstCoupon; Rate; 
Yield; Redemption; Frequency [; Basis])
 Settlement is the date of purchase of the 
security.
 Maturity is the date on which the security 
matures (expires).
 Issue is the date of issue of the 
security.
@@ -66,7 +66,7 @@
 Calculates the yield of a security if the first 
interest date falls irregularly.
 
 
-ODDFYIELD(Settlement; Maturity; Issue; FirstCoupon; Rate; 
Price; Redemption; Frequency; Basis)
+ODDFYIELD(Settlement; Maturity; Issue; FirstCoupon; Rate; 
Price; Redemption; Frequency [; Basis])
 Settlement is the date of purchase of the 
security.
 Maturity is the date on which the security 
matures (expires).
 Issue is the date of issue of the 
security.
@@ -89,7 +89,7 @@
 Calculates the price per 100 currency units par 
value of a security, if the last interest date falls 
irregularly.
 
 
-ODDLPRICE(Settlement; Maturity; LastInterest; Rate; Yield; 
Redemption; Frequency; Basis)
+ODDLPRICE(Settlement; Maturity; LastInterest; Rate; Yield; 
Redemption; Frequency [; Basis])
 Settlement is the date of purchase of the 
security.
 Maturity is the date on which the security 
matures (expires).
 LastInterest is the last interest date of the 
security.
@@ -116,7 +116,7 @@
 Calculates the yield of a security if the last 
interest date falls irregularly.
 
 
-ODDLYIELD(Settlement; Maturity; LastInterest; Rate; Price; 
Redemption; Frequency; Basis)
+ODDLYIELD(Settlement; Maturity; LastInterest; Rate; Price; 
Redemption; Frequency [; Basis])
 Settlement is the date of purchase of the 
security.
 Maturity is the date on which the security 
matures (expires).
 LastInterest is the last interest date of the 
security.
@@ -145,7 +145,7 @@
 Returns the depreciation of an asset for a specified or 
partial period using a variable declining balance method.
 
 
-VDB(Cost; Salvage; 
Life; S; End; Factor; NoSwitch)
+VDB(Cost; Salvage; 
Life; S; End [; Factor [; NoSwitch]])
 Cost is the initial value of an asset.
 Salvage is the value of an asset at the end of 
the depreciation.
 Life is the depreciation duration of the 
asset.
@@ -174,7 +174,7 @@
 If the payments 
take place at regular intervals, use the IRR 
function.
 
 
-XIRR(Values; Dates; 
Guess)
+XIRR(Values; Dates 
[; Guess])
 Values and Dates refer to a series 
of payments and the series of associated date values. The first pair of dates 
defines the start of the payment plan. All other date values must be later, but 
need not be in any order. The series of values must contain at least one 
negative and one positive value (receipts and deposits).
 Guess (optional) is a guess that can be input for 
the internal rate of return. The default is 10%.
 
@@ -324,7 +324,7 @@
 Returns the constant interest rate per period of an 
annuity.
 
 
-RATE(NPer; Pmt; PV; 
FV; Type; Guess)
+RATE(NPer; Pmt; PV 
[ ; [ FV ] [ ; [ Type ] [ ; Guess ] ] ])
 NPer is the total number of periods, during which 
payments are made (payment period).
 Pmt is the constant payment (annuity) paid during 
each period.
 PV is the cash value in the sequence of 
payments.
@@ -349,7 +349,7 @@
 Calculates the annual interest rate that results 
when a security (or other item) is purchased at an investment value and sold at 
a redemption value. No interest is paid.
 
 
-INTRATE(Settlement; 
Maturity; Investment; Redemption; Basis)
+INTRATE(Settlement; 
Maturity; Investment; Redemption [; Basis])
 Settlement is the date of purchase of the 
security.
 Maturity is the date on which the security is 
sold.
 Investment is the purchase price.
@@ -372,7 +372,7 @@
 Returns the date of the first interest date after 
the settlement date. Format the result as a date.
 
 
-COUPNCD(

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit 46b7af9021197aaa2209c41be8f832a2c93723f9
Author: Steve Fanning 
AuthorDate: Mon Jun 8 18:55:07 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:55:07 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 0c2b19daf2c1d08c53398f82da914e87aa4373f1
  - (04060118.xhp) Include square brackets in syntax sections to indicate 
optional parameters.

ODF 1.2 used to confirm configuration of brackets for FV(), NPER(),and 
RATE().

Change-Id: I7b109974d3e1dbc6670c32628a5425741d882f4e
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95208
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit cf09e34b35c8f0803ecfb5151bdbf1a1cf1ccc68)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95728
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 1db1f9baa638..0c2b19daf2c1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1db1f9baa638c1d615352a810bac549f58cd4c51
+Subproject commit 0c2b19daf2c1d08c53398f82da914e87aa4373f1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit fb6af9b587c204625794d4a7986965b4f8acc91b
Author: Steve Fanning 
AuthorDate: Mon Jun 8 18:54:03 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:54:03 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to d0fa91c4e334faf835820581596e8fda1ca49d0d
  - (func_fourier.xhp) Include square brackets in syntax section to 
indicate optional parameters.

Change-Id: I4f5a108e6e588dd97b4501a8b2d13be628536a6d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95205
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit f35181a3fb8f5db8ac323ec7537d64e693546420)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95725
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 25d7c849c5f6..d0fa91c4e334 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 25d7c849c5f6159cae78b11be63445c548de29eb
+Subproject commit d0fa91c4e334faf835820581596e8fda1ca49d0d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit ce5719179fe1c6ece1c706a3372c3a5862a1b273
Author: Steve Fanning 
AuthorDate: Mon Jun 8 18:54:42 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:54:42 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 1db1f9baa638c1d615352a810bac549f58cd4c51
  - (func_color.xhp) Include square brackets in syntax section to indicate 
optional parameter.

Change-Id: I648260ba137015b29443944c983aac16f497b7d6
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95207
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 6a31cba2f22a5a7cf60c1590b1189423fed285b3)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95727
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index ff832a2656ea..1db1f9baa638 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ff832a2656ea178587b21b19d62207680b131c5b
+Subproject commit 1db1f9baa638c1d615352a810bac549f58cd4c51
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/func_fourier.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d0fa91c4e334faf835820581596e8fda1ca49d0d
Author: Steve Fanning 
AuthorDate: Sun May 31 10:39:03 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:54:03 2020 +0200

(func_fourier.xhp) Include square brackets in syntax section to indicate 
optional parameters.

Change-Id: I4f5a108e6e588dd97b4501a8b2d13be628536a6d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95205
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit f35181a3fb8f5db8ac323ec7537d64e693546420)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95725
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/func_fourier.xhp 
b/source/text/scalc/01/func_fourier.xhp
index 1c6bb7d8a..9aad60e3d 100644
--- a/source/text/scalc/01/func_fourier.xhp
+++ b/source/text/scalc/01/func_fourier.xhp
@@ -27,7 +27,7 @@
 
 
 
-FOURIER(Array, 
GroupedByColumns, Inverse, Polar, MinimumMagnitude)
+FOURIER(Array; 
GroupedByColumns [; Inverse [; Polar [; MinimumMagnitude]]])
 Array 
is a 2 x N or N x 2 range representing an array of complex number to be 
transformed, where N is the length of the array. The array represents the real 
and imaginary parts of the data.
 
 GroupedByColumns is a logical (TRUE or 
FALSE, 1 or 0) argument. When TRUE the array is grouped by columns where the 
first column contains the real part of the complex number and the second 
columns contains the imaginary part of the complex number. When FALSE, the 
first row contains the real part of the complex number and the second row 
contains the imaginary part of the complex number. If there is only 1 column 
(row), the input sequence is treated as purely real.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit a88cfc920e65cc9f2100e95ea07b18c6cc15e5ae
Author: Steve Fanning 
AuthorDate: Mon Jun 8 18:54:25 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:54:25 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to ff832a2656ea178587b21b19d62207680b131c5b
  - (func_findb.xhp) Include square brackets in syntax section to indicate 
optional parameter.

Change-Id: Ib21893f9f1d61a164957a82114f9a1dc0255b9ab
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95206
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit cae5dda033a7b19ecdb37a8abc571f31a5b798d4)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95726
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index d0fa91c4e334..ff832a2656ea 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d0fa91c4e334faf835820581596e8fda1ca49d0d
+Subproject commit ff832a2656ea178587b21b19d62207680b131c5b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/func_findb.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ff832a2656ea178587b21b19d62207680b131c5b
Author: Steve Fanning 
AuthorDate: Sun May 31 10:45:04 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:54:25 2020 +0200

(func_findb.xhp) Include square brackets in syntax section to indicate 
optional parameter.

Change-Id: Ib21893f9f1d61a164957a82114f9a1dc0255b9ab
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95206
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit cae5dda033a7b19ecdb37a8abc571f31a5b798d4)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95726
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/func_findb.xhp 
b/source/text/scalc/01/func_findb.xhp
index 0ab9ead47..091d7ecc3 100644
--- a/source/text/scalc/01/func_findb.xhp
+++ b/source/text/scalc/01/func_findb.xhp
@@ -27,7 +27,7 @@
 
 
 
-FINDB( Find Text ; Text 
; Position )
+FINDB(Find Text ; Text 
[; Position])
 Find 
Text: The text or text expression to be found.
 Text: 
the text in which the search is to be made.
 Position: The position in the text 
where the search starts.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/func_color.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1db1f9baa638c1d615352a810bac549f58cd4c51
Author: Steve Fanning 
AuthorDate: Sun May 31 10:48:00 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:54:42 2020 +0200

(func_color.xhp) Include square brackets in syntax section to indicate 
optional parameter.

Change-Id: I648260ba137015b29443944c983aac16f497b7d6
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95207
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 6a31cba2f22a5a7cf60c1590b1189423fed285b3)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95727
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/func_color.xhp 
b/source/text/scalc/01/func_color.xhp
index fced92ec0..f7c7b1358 100644
--- a/source/text/scalc/01/func_color.xhp
+++ b/source/text/scalc/01/func_color.xhp
@@ -36,7 +36,7 @@
  Return a numeric value calculated by a 
combination of three colors (red, green and blue) and the alpha channel, in the 
RGBA color system. The result depends on the color system used by your 
computer.
  
  
- COLOR(Red; 
Green; Blue; Alpha)
+ COLOR(Red; 
Green; Blue [; Alpha])
  Red, Green and Blue – required arguments. The 
value for the red, green and blue components of the color. The values must be 
between 0 and 255. Zero means no color component and 255 means full color 
component.
  Alpha – optional argument. The value for the 
alpha channel or alpha composite. Alpha is a integer value between 0 and 255. 
The value of zero for alpha means the color is fully transparent, whereas a 
value of 255 in the alpha channel gives a fully opaque color.
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit c46219e6afdb0a448393f69a69cb4e71d6d04a77
Author: Steve Fanning 
AuthorDate: Mon Jun 8 18:52:19 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:52:19 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 25d7c849c5f6159cae78b11be63445c548de29eb
  - (func_networkdays.intl.xhp) Include square brackets in syntax section 
to indicate optional parameters.

Note: Exact configuration of square brackets based on that for 
NETWORKDAYS().

Change-Id: I0f1f7100add3f50d2ba3946087cca292d7a51d65
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95204
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 1637dffb6225234b599ee586c796fd6924aecf8a)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95724
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index c1fbeca7942f..25d7c849c5f6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c1fbeca7942fbc48b7857e7be079de506cfd7deb
+Subproject commit 25d7c849c5f6159cae78b11be63445c548de29eb
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/func_networkdays.intl.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 25d7c849c5f6159cae78b11be63445c548de29eb
Author: Steve Fanning 
AuthorDate: Sun May 31 10:28:34 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:52:19 2020 +0200

(func_networkdays.intl.xhp) Include square brackets in syntax section to 
indicate optional parameters.

Note: Exact configuration of square brackets based on that for 
NETWORKDAYS().

Change-Id: I0f1f7100add3f50d2ba3946087cca292d7a51d65
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95204
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 1637dffb6225234b599ee586c796fd6924aecf8a)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95724
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/func_networkdays.intl.xhp 
b/source/text/scalc/01/func_networkdays.intl.xhp
index 643387924..ed1364ba1 100644
--- a/source/text/scalc/01/func_networkdays.intl.xhp
+++ b/source/text/scalc/01/func_networkdays.intl.xhp
@@ -36,7 +36,7 @@
 
 
 
-NETWORKDAYS.INTL(StartDate; EndDate; Weekend; 
Holidays)
+NETWORKDAYS.INTL(StartDate; EndDate [; [ Weekend ] [; Holidays 
] ])
 StartDate is the date from when the calculation 
is carried out. If the start date is a workday, the day is included in the 
calculation.
 EndDate is the date up until when the calculation 
is carried out. If the end date is a workday, the day is included in the 
calculation.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit d9333fb21473fd749dfbc29cb6a0481de8965d59
Author: Steve Fanning 
AuthorDate: Mon Jun 8 18:52:00 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:52:00 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to c1fbeca7942fbc48b7857e7be079de506cfd7deb
  - (func_networkdays.xhp) Include square brackets in syntax section to 
indicate optional parameters.

Note: Exact configuration of square brackets inferred from ODF 1.2.

Change-Id: Ie607da08555aac5bc3d1a46b53f8d4b5c90d33ff
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95203
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 2d5a11ff0c0ce386c2e6e634b620448d9e0e4824)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95723
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 87cc2e79cff4..c1fbeca7942f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 87cc2e79cff4c4b6e765aede94b8e9ae19c150e4
+Subproject commit c1fbeca7942fbc48b7857e7be079de506cfd7deb
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/func_networkdays.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c1fbeca7942fbc48b7857e7be079de506cfd7deb
Author: Steve Fanning 
AuthorDate: Sun May 31 10:17:59 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:52:00 2020 +0200

(func_networkdays.xhp) Include square brackets in syntax section to 
indicate optional parameters.

Note: Exact configuration of square brackets inferred from ODF 1.2.

Change-Id: Ie607da08555aac5bc3d1a46b53f8d4b5c90d33ff
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95203
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 2d5a11ff0c0ce386c2e6e634b620448d9e0e4824)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95723
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/func_networkdays.xhp 
b/source/text/scalc/01/func_networkdays.xhp
index 19527b6f5..0883963c0 100644
--- a/source/text/scalc/01/func_networkdays.xhp
+++ b/source/text/scalc/01/func_networkdays.xhp
@@ -39,7 +39,7 @@
 
 
 
-NETWORKDAYS(StartDate; EndDate; Holidays; Workdays)
+NETWORKDAYS(StartDate; EndDate [; [ Holidays ] [; Workdays ] 
])
 StartDate is the date from when the calculation 
is carried out. If the start date is a workday, the day is included in the 
calculation.
 EndDate is the date up until when the calculation 
is carried out. If the end date is a workday, the day is included in the 
calculation.
 Holidays is an optional list of holidays. These 
are non-working days. Enter a cell range in which the holidays are listed 
individually.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/func_numbervalue.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 87cc2e79cff4c4b6e765aede94b8e9ae19c150e4
Author: Steve Fanning 
AuthorDate: Sun May 31 10:12:07 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:34:27 2020 +0200

(func_numbervalue.xhp) Include square brackets in syntax section to 
indicate optional parameters.

Change-Id: I7f4018a666d42909bd669eb0c5732c470b0c7255
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95202
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit e02854641f31d183f6405f9ea7ad03ff0c7a4007)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95722
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/func_numbervalue.xhp 
b/source/text/scalc/01/func_numbervalue.xhp
index 7e60ca3ae..026f8a592 100644
--- a/source/text/scalc/01/func_numbervalue.xhp
+++ b/source/text/scalc/01/func_numbervalue.xhp
@@ -39,7 +39,7 @@
 Constraints: LEN(decimal_separator) = 1, decimal_separator 
shall not appear in group_separator
 
 
-NUMBERVALUE("Text";decimal_separator;group_separator)
+NUMBERVALUE("Text" [;decimal_separator 
[;group_separator]])
 Text is a valid number expression and must be 
entered with quotation marks.
 decimal_separator (optional) defines the 
character used as the decimal separator.
 group_separator (optional) defines the 
character(s) used as the group separator.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit 42e394019006c4ce5e0f8f4d6c31c4d77fbdc5be
Author: Steve Fanning 
AuthorDate: Mon Jun 8 18:33:57 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:33:57 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 4004ee9ce06e1a6a4e30ac41622a46b1d0e23b19
  - (func_opt_barrier.xhp) Include square brackets in syntax section to 
indicate optional parameter.

Change-Id: Ide89b5a29ab7846ffa77ccf4a8bc7becfe776cdb
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95201
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 560fefa866227fbdfdae1e99a0761052686e5660)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95721
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index b1e662d40b54..4004ee9ce06e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b1e662d40b54ecd76dfa9c5d8bc8c9c2bc109774
+Subproject commit 4004ee9ce06e1a6a4e30ac41622a46b1d0e23b19
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit 134625283ee72a6941aa125f23a03fd08fc686eb
Author: Steve Fanning 
AuthorDate: Mon Jun 8 18:34:27 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:34:27 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 87cc2e79cff4c4b6e765aede94b8e9ae19c150e4
  - (func_numbervalue.xhp) Include square brackets in syntax section to 
indicate optional parameters.

Change-Id: I7f4018a666d42909bd669eb0c5732c470b0c7255
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95202
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit e02854641f31d183f6405f9ea7ad03ff0c7a4007)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95722
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 4004ee9ce06e..87cc2e79cff4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4004ee9ce06e1a6a4e30ac41622a46b1d0e23b19
+Subproject commit 87cc2e79cff4c4b6e765aede94b8e9ae19c150e4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/func_opt_barrier.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4004ee9ce06e1a6a4e30ac41622a46b1d0e23b19
Author: Steve Fanning 
AuthorDate: Sun May 31 00:58:56 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:33:57 2020 +0200

(func_opt_barrier.xhp) Include square brackets in syntax section to 
indicate optional parameter.

Change-Id: Ide89b5a29ab7846ffa77ccf4a8bc7becfe776cdb
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95201
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 560fefa866227fbdfdae1e99a0761052686e5660)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95721
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/func_opt_barrier.xhp 
b/source/text/scalc/01/func_opt_barrier.xhp
index 5b0a90086..7038d2278 100644
--- a/source/text/scalc/01/func_opt_barrier.xhp
+++ b/source/text/scalc/01/func_opt_barrier.xhp
@@ -27,7 +27,7 @@
 
 
 
-OPT_BARRIER(Spot; 
Volatility; Rate; Foreign Rate; Maturity; Strike; LowerBarrier; UpperBarrier; 
Rebate; PutCall; InOut; BarrierMonitoring; Greek)
+OPT_BARRIER(Spot; 
Volatility; Rate; Foreign Rate; Maturity; Strike; LowerBarrier; UpperBarrier; 
Rebate; PutCall; InOut; BarrierMonitoring [; Greek])
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit bae142557ffdc43a8d0bc72e9e20c0122d5c463a
Author: Steve Fanning 
AuthorDate: Mon Jun 8 18:32:00 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:32:00 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to b1e662d40b54ecd76dfa9c5d8bc8c9c2bc109774
  - (func_opt_prob_inmoney.xhp) Include square brackets in syntax section 
to indicate optional parameters.

Change-Id: I31d3a3f9b5434fe16eb7ed33a56492c1391d4753
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95200
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 9d29678214cb17a3aafbb6c0f31af950b3c9429e)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95720
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 2a100bb6b212..b1e662d40b54 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2a100bb6b2129c91271db4a5aa0e2e18d31d9b73
+Subproject commit b1e662d40b54ecd76dfa9c5d8bc8c9c2bc109774
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/func_opt_prob_inmoney.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b1e662d40b54ecd76dfa9c5d8bc8c9c2bc109774
Author: Steve Fanning 
AuthorDate: Sun May 31 00:53:43 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:32:00 2020 +0200

(func_opt_prob_inmoney.xhp) Include square brackets in syntax section to 
indicate optional parameters.

Change-Id: I31d3a3f9b5434fe16eb7ed33a56492c1391d4753
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95200
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 9d29678214cb17a3aafbb6c0f31af950b3c9429e)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95720
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/func_opt_prob_inmoney.xhp 
b/source/text/scalc/01/func_opt_prob_inmoney.xhp
index 0cbedf6dd..66b939432 100644
--- a/source/text/scalc/01/func_opt_prob_inmoney.xhp
+++ b/source/text/scalc/01/func_opt_prob_inmoney.xhp
@@ -41,7 +41,7 @@
 
 
 
-OPT_PROB_INMONEY(Spot; 
Volatility; Drift; Maturity; LowerBarrier; UpperBarrier; Strike; 
PutCall)
+OPT_PROB_INMONEY(Spot; 
Volatility; Drift; Maturity; LowerBarrier; UpperBarrier [; Strike [; 
PutCall]])
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/func_opt_touch.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2a100bb6b2129c91271db4a5aa0e2e18d31d9b73
Author: Steve Fanning 
AuthorDate: Sun May 31 00:50:22 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:30:57 2020 +0200

(func_opt_touch.xhp) Include square brackets in syntax section to indicate 
optional parameter.

Change-Id: Ib1d07ed5c135176fb95b94d44b0cf7bb78937f28
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95199
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit c3154e19796f918beced9b8a4bc3131c97b2b2a5)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95719
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/func_opt_touch.xhp 
b/source/text/scalc/01/func_opt_touch.xhp
index 0bdd844ee..a71c2a087 100644
--- a/source/text/scalc/01/func_opt_touch.xhp
+++ b/source/text/scalc/01/func_opt_touch.xhp
@@ -30,7 +30,7 @@
 Further information 
about touch / no-touch options may be found on many financial 
websites.
 
 
-OPT_TOUCH(Spot; 
Volatility; Rate; ForeignRate; Maturity; LowerBarrier; UpperBarrier; 
ForeignDomestic; InOut; BarrierMonitoring; Greek)
+OPT_TOUCH(Spot; 
Volatility; Rate; ForeignRate; Maturity; LowerBarrier; UpperBarrier; 
ForeignDomestic; InOut; BarrierMonitoring [; Greek])
 
 Spot is the price / value of the underlying asset and 
should be greater than 0.0.
 Volatility is the annual percentage volatility of 
the underlying asset expressed as a decimal (for example, enter 30% as 0.3). 
The value should be greater than 0.0.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit 8dd6307d20173f613ca98fe60955c12cd28c1a6a
Author: Steve Fanning 
AuthorDate: Mon Jun 8 18:30:57 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:30:57 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 2a100bb6b2129c91271db4a5aa0e2e18d31d9b73
  - (func_opt_touch.xhp) Include square brackets in syntax section to 
indicate optional parameter.

Change-Id: Ib1d07ed5c135176fb95b94d44b0cf7bb78937f28
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95199
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit c3154e19796f918beced9b8a4bc3131c97b2b2a5)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95719
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 5a0d5e63742b..2a100bb6b212 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5a0d5e63742b3ba12d6b1f892e4a080d2cd4ff94
+Subproject commit 2a100bb6b2129c91271db4a5aa0e2e18d31d9b73
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Ilmari Lauhakangas (via logerrit)

 source/text/shared/guide/textmode_change.xhp |  104 +++
 1 file changed, 58 insertions(+), 46 deletions(-)

New commits:
commit 33f5cf993af2d3a08eb2b12abef53d5393a00bfc
Author: Ilmari Lauhakangas 
AuthorDate: Mon Jun 8 14:00:11 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:30:27 2020 +0200

tdf#88066 Update help on switching between insert and overwrite mode

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

diff --git a/source/text/shared/guide/textmode_change.xhp 
b/source/text/shared/guide/textmode_change.xhp
index fee788bd9..a15381b89 100644
--- a/source/text/shared/guide/textmode_change.xhp
+++ b/source/text/shared/guide/textmode_change.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-   
 
-
-
-Switching Between Insert Mode and Overwrite 
Mode
-/text/shared/guide/textmode_change.xhp
-
-
-Sun Microsystems, Inc.
-
-
-
-text; overwriting or 
inserting
-overwrite mode
-insert mode for entering text
-
-Switching Between Insert Mode and Overwrite Mode
-
-With 
the keyboard:
-Press Insert 
to toggle between overwrite mode and insert mode. The current mode is displayed 
on the Status Bar. The 
text cursor must be enabled in the cell or in the input line. 
-
-With 
the mouse:
-On the Status 
Bar, click on the area indicating the current mode in order to switch to the 
other mode:
-
-
-
-INSRT
-
-Insert mode is 
enabled. The text 
cursor is a blinking vertical line. 
-Click on the area to enable the overwrite 
mode.
-
-
-
-
-
-OVER
-
-The overwrite 
mode is enabled. The 
text cursor is a blinking block. 
-Click on the area to enable insert 
mode.
-
-
-
-Keyboard 
commands
-
-
+
+
+Switching Between Insert Mode and 
Overwrite Mode
+/text/shared/guide/textmode_change.xhp
+
+
+Sun Microsystems, 
Inc.
+
+
+
+
+text; overwriting or inserting
+overwrite mode
+insert mode for entering text
+
+
+
+Switching Between 
Insert Mode and Overwrite Mode
+
+
+
+
+
+With the keyboard:
+Press 
Insert to toggle between overwrite mode and insert mode. The 
current mode is displayed on the Status Bar.
+ The 
text cursor must be enabled in the cell or in the input 
line.
+
+
+
+With the mouse:
+On the Status Bar, 
click on the area indicating the current mode in order to switch to the other 
mode:
+
+
+
+Insert
+
+
+
+Insert mode is 
active.
+The area in the status bar is blank, 
when Insert mode is active.
+ The text cursor is a blinking vertical 
line. Click on the area to activate the overwrite mode.
+
+
+
+
+
+
+Overwrite
+
+The overwrite 
mode is active. The text cursor is a blinking block. Click on the area to 
activate insert mode.
+
+
+
+
+Keyboard commands
+
+
+
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2020-06-08 Thread Ilmari Lauhakangas (via logerrit)

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

New commits:
commit e0f058bcd5e185b89e4b7c680a7901bc7eb2a790
Author: Ilmari Lauhakangas 
AuthorDate: Mon Jun 8 18:30:27 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:30:27 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 33f5cf993af2d3a08eb2b12abef53d5393a00bfc
  - tdf#88066 Update help on switching between insert and overwrite mode

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

diff --git a/helpcontent2 b/helpcontent2
index 24901fb947d0..33f5cf993af2 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 24901fb947d0d7adeaefbbddd8d2bad89e49e378
+Subproject commit 33f5cf993af2d3a08eb2b12abef53d5393a00bfc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit c58ab0e62954eff2d42ded186d4212a498952787
Author: Steve Fanning 
AuthorDate: Mon Jun 8 18:27:04 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:27:04 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to ed6e23735a52b339b817230113b2587385312784
  - (04060115.xhp) Update syntax statements to clarify which arguments are 
optional.

Change-Id: I9810870dfef24ab8876c2be0fb6ce6770c60f257
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95196
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 980d7730dbc2275d80fd059f58db56d37a225247)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95717
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 55fb7f4908d0..ed6e23735a52 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 55fb7f4908d0c2f8eeb4d6df54a070cd27fa1a38
+Subproject commit ed6e23735a52b339b817230113b2587385312784
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit 32777006b295166f4de44679cc9af6aa6285b123
Author: Steve Fanning 
AuthorDate: Mon Jun 8 18:27:25 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:27:25 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 5a0d5e63742b3ba12d6b1f892e4a080d2cd4ff94
  - (func_searchb.xhp) Include square brackets in syntax section to 
indicate optional parameter.

Change-Id: I6b3cdf9d6a98b8183b641c94b4cbeceb4add0183
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95198
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit d05d21b99076ad1b3f1fec00058966ecc4ffd179)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95718
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index ed6e23735a52..5a0d5e63742b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ed6e23735a52b339b817230113b2587385312784
+Subproject commit 5a0d5e63742b3ba12d6b1f892e4a080d2cd4ff94
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/func_searchb.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5a0d5e63742b3ba12d6b1f892e4a080d2cd4ff94
Author: Steve Fanning 
AuthorDate: Sun May 31 00:46:34 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:27:25 2020 +0200

(func_searchb.xhp) Include square brackets in syntax section to indicate 
optional parameter.

Change-Id: I6b3cdf9d6a98b8183b641c94b4cbeceb4add0183
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95198
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit d05d21b99076ad1b3f1fec00058966ecc4ffd179)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95718
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/func_searchb.xhp 
b/source/text/scalc/01/func_searchb.xhp
index 201a00769..41262c571 100644
--- a/source/text/scalc/01/func_searchb.xhp
+++ b/source/text/scalc/01/func_searchb.xhp
@@ -27,7 +27,7 @@
 
 
 
-SEARCHB( Find text ; 
Text ; Position)
+SEARCHB(Find Text; Text 
[; Position])
 Find 
Text: The text or text expression to be found.
 Text: 
the text in which the search is to be made.
 Position: The position in the text 
where the search starts.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/04060115.xhp |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit ed6e23735a52b339b817230113b2587385312784
Author: Steve Fanning 
AuthorDate: Sat May 30 20:32:08 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:27:04 2020 +0200

(04060115.xhp) Update syntax statements to clarify which arguments are 
optional.

Change-Id: I9810870dfef24ab8876c2be0fb6ce6770c60f257
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95196
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 980d7730dbc2275d80fd059f58db56d37a225247)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95717
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/04060115.xhp 
b/source/text/scalc/01/04060115.xhp
index ba44e34a2..f45c7a803 100644
--- a/source/text/scalc/01/04060115.xhp
+++ b/source/text/scalc/01/04060115.xhp
@@ -143,7 +143,7 @@
 The result is the hexadecimal number for the binary 
number entered.
 
 
-BIN2HEX(Number; 
Places)
+BIN2HEX(Number [; 
Places])
  
Number is a binary number. The number can have a maximum of 10 
places (bits). The most significant bit is the sign bit. Negative numbers are 
entered as two's complement.
 Places means 
the number of places to be output.
 
@@ -163,7 +163,7 @@
  The result is the octal number for the binary 
number entered.
 
 
-BIN2OCT(Number; 
Places)
+BIN2OCT(Number [; 
Places])
  
Number is a binary number. The number can have a maximum of 10 
places (bits). The most significant bit is the sign bit. Negative numbers are 
entered as two's complement.
  
Places means the number of places to be output.
 
@@ -183,7 +183,7 @@
 The result is TRUE (1) if both numbers, which are 
delivered as an argument, are equal, otherwise it is FALSE 
(0).
 
 
-DELTA(Number1; 
Number2)
+DELTA(Number1 
[; Number2])
 
 
  =DELTA(1;2) returns 0.
@@ -201,7 +201,7 @@
  The result is the binary number for the decimal 
number entered between -512 and 511.
 
 
-DEC2BIN(Number; 
Places)
+DEC2BIN(Number [; 
Places])
  
Number is a decimal number. If Number is negative, the function 
returns a binary number with 10 characters. The most significant bit is the 
sign bit, the other 9 bits return the value.
  
Places means the number of places to be output.
 
@@ -221,7 +221,7 @@
 The result is the hexadecimal number for the decimal 
number entered.
 
 
-DEC2HEX(Number; 
Places)
+DEC2HEX(Number [; 
Places])
  
Number is a decimal number. If Number is negative, the function 
returns a hexadecimal number with 10 characters (40 bits). The most significant 
bit is the sign bit, the other 39 bits return the value.
  
Places means the number of places to be output.
 
@@ -241,7 +241,7 @@
 The result is the octal number for the decimal 
number entered.
 
 
-DEC2OCT(Number; 
Places)
+DEC2OCT(Number [; 
Places])
  
Number is a decimal number. If Number is negative, the function 
returns an octal number with 10 characters (30 bits). The most significant bit 
is the sign bit, the other 29 bits return the value.
  
Places means the number of places to be output.
 
@@ -261,7 +261,7 @@
 Returns values of the Gaussian error 
integral.
 
 
-ERF(LowerLimit; 
UpperLimit)
+ERF(LowerLimit [; 
UpperLimit])
  
LowerLimit is the lower limit of the integral.
  
UpperLimit is optional. It is the upper limit of the integral. If 
this value is missing, the calculation takes place between 0 and the lower 
limit.
 
@@ -336,7 +336,7 @@
 The result is 1 if Number 
is greater than or equal to Step.
 
 
-GESTEP(Number; 
Step)
+GESTEP(Number [; 
Step])
 
 
  =GESTEP(5;1) returns 1.
@@ -354,7 +354,7 @@
 The result is the binary number for the hexadecimal 
number entered.
 
 
-HEX2BIN(Number; 
Places)
+HEX2BIN(Number [; 
Places])
  
Number is a hexadecimal number or a string that represents a 
hexadecimal number. It can have a maximum of 10 places. The most significant 
bit is the sign bit, the following bits return the value. Negative numbers are 
entered as two's complement.
  
Places is the number of places to be output.
 
@@ -393,7 +393,7 @@
 The result is the octal number for the hexadecimal 
number entered.
 
 
-HEX2OCT(Number; 
Places)
+HEX2OCT(Number [; 
Places])
  
Number is a hexadecimal number or a string that represents a 
hexadecimal number. It can have a maximum of 10 places. The most significant 
bit is the sign bit, the following bits return the value. Negative numbers are 
entered as two's complement.
  
Places is the number of places to be output.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit 4dba3915c040242c75eaf36f8862cb159bad1f26
Author: Steve Fanning 
AuthorDate: Mon Jun 8 18:26:40 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:26:40 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 55fb7f4908d0c2f8eeb4d6df54a070cd27fa1a38
  - (04060110.xhp) General updates to function syntax statements in Help 
file, to include square brackets indicating optional parameters.

Also updated example for PROPER() function to reflect more appropriate 
sample string!

Change-Id: I42f485f3e312c2d870059b60b3dcdc7d8921a0d8
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95195
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 4bafa9e1d40f614b8d23637ce7fe49c0460f6553)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95716
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 4b5401b421e6..55fb7f4908d0 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4b5401b421e6a6d42e0fa594db3948aa89586a5a
+Subproject commit 55fb7f4908d0c2f8eeb4d6df54a070cd27fa1a38
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/04060110.xhp |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 55fb7f4908d0c2f8eeb4d6df54a070cd27fa1a38
Author: Steve Fanning 
AuthorDate: Sat May 30 15:41:45 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:26:40 2020 +0200

(04060110.xhp) General updates to function syntax statements in Help file, 
to include square brackets indicating optional parameters.

Also updated example for PROPER() function to reflect more appropriate 
sample string!

Change-Id: I42f485f3e312c2d870059b60b3dcdc7d8921a0d8
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95195
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 4bafa9e1d40f614b8d23637ce7fe49c0460f6553)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95716
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/04060110.xhp 
b/source/text/scalc/01/04060110.xhp
index 5f0bbc9c5..0c8859a61 100644
--- a/source/text/scalc/01/04060110.xhp
+++ b/source/text/scalc/01/04060110.xhp
@@ -107,7 +107,7 @@
 Converts a positive integer to a specified base into a 
text from the numbering system. The digits 0-9 and the 
letters A-Z are used.
 
 
-BASE(Number; Radix; 
[MinimumLength])
+BASE(Number; Radix 
[; MinimumLength])
  
Number is the positive integer to be converted.
  
Radix indicates the base of the number system. It may be any 
positive integer between 2 and 36.
  
MinimumLength (optional) determines the minimum length of the 
character sequence that has been created. If the text is shorter than the 
indicated minimum length, zeros are added to the left of the string.
@@ -233,7 +233,7 @@
 You set the 
currency format in your system settings.
 
 
-DOLLAR(Value; 
Decimals)
+DOLLAR(Value [; 
Decimals])
  
Value is a number, a reference to a cell containing a number, or a 
formula which returns a number.
  
Decimals is the optional number of decimal places.
 
@@ -272,7 +272,7 @@
 Returns the position of a string of text within another 
string.You can also define where to begin the search. The search term 
can be a number or any string of characters. The search is 
case-sensitive.
 
 
-FIND("FindText"; 
"Text"; Position)
+FIND("FindText"; 
"Text" [; Position])
  
FindText refers to the text to be found.
  
Text is the text where the search takes place.
  
Position (optional) is the position in the text from which the 
search starts.
@@ -292,7 +292,7 @@
 Returns a number as text with a specified number of decimal 
places and optional thousands separators.
 
 
-FIXED(Number; 
Decimals; NoThousandsSeparators)
+FIXED(Number; 
Decimals [; NoThousandsSeparators])
  
Number refers to the number to be formatted.
  
Decimals refers to the number of decimal places to be 
displayed.
  
NoThousandsSeparators (optional) determines whether the thousands 
separator is used. If the parameter is a number not equal to 0, the thousands 
separator is suppressed. If the parameter is equal to 0 or if it is missing 
altogether, the thousands separators of your current 
locale setting are displayed.
@@ -330,7 +330,7 @@
 Returns the first character or characters of a 
text.
 
 
-LEFT("Text"; 
Number)
+LEFT("Text" [; 
Number])
  
Text is the text where the initial partial words are to be 
determined.
  
Number (optional) specifies the number of characters for the start 
text. If this parameter is not defined, one character is returned.
 
@@ -349,7 +349,7 @@
 Returns the first characters of a DBCS 
text.
 
 
-LEFTB("Text"; 
Number_bytes)
+LEFTB("Text" [; 
Number_bytes])
 Text is the text where the initial partial words 
are to be determined.
 Number_bytes (optional) specifies the number of 
characters you want LEFTB to extract, based on bytes. If this parameter is not 
defined, one character is returned.
 
@@ -485,7 +485,7 @@
  
Text refers to the text to be converted.
 
 
- =PROPER("open office") returns Open Office.
+ =PROPER("the document foundation") returns The Document 
Foundation.
 
 
 
@@ -545,7 +545,7 @@
 Returns the last character or characters of a 
text.
 
 
-RIGHT("Text"; 
Number)
+RIGHT("Text" [; 
Number])
  
Text is the text of which the right part is to be 
determined.
  
Number (optional) is the number of characters from the right part 
of the text.
 
@@ -564,7 +564,7 @@
 Returns the last character or characters of a text with 
double bytes characters sets (DBCS).
 
 
-RIGHTB("Text"; 
Number_bytes)
+RIGHTB("Text" [; 
Number_bytes])
 Text is the text of which the right part is to be 
determined.
 Number_bytes (optional) specifies the number of 
characters you want RIGHTB to extract, based on bytes.
 
@@ -587,7 +587,7 @@
 Converts a number into a Roman numeral. The value range 
must be between 0 and 3999, the modes can be integers from 0 to 
4.
 
 
-ROMAN(Number; 
Mode)
+ROMAN(Number [; 
Mode])
  
Number is the number that is to be converted into a Roman 
numeral.
  
Mode (optional) indicates the degree of simpl

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit 22178942c94f546e55dfd5227aaeb13962c16695
Author: Steve Fanning 
AuthorDate: Mon Jun 8 18:18:49 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:18:49 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 4b5401b421e6a6d42e0fa594db3948aa89586a5a
  - (04060109.xhp) Changes to syntax statements to readily identify 
optional parameters.

Also implemented modification required to CHOOSE function syntax - the 
Function Wizard allows 250+ arguments, not 30.

Change-Id: Ia623c6c908a9efec219cdf8469c26e24ceca0858
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95121
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 69ce0305af2d911457274e4889334b335640c5da)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95715
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 99974d4e8519..4b5401b421e6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 99974d4e8519f1d08565e1058a1ad9ae17f19ed6
+Subproject commit 4b5401b421e6a6d42e0fa594db3948aa89586a5a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/04060109.xhp |   36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 4b5401b421e6a6d42e0fa594db3948aa89586a5a
Author: Steve Fanning 
AuthorDate: Fri May 29 17:38:14 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:18:49 2020 +0200

(04060109.xhp) Changes to syntax statements to readily identify optional 
parameters.

Also implemented modification required to CHOOSE function syntax - the 
Function Wizard allows 250+ arguments, not 30.

Change-Id: Ia623c6c908a9efec219cdf8469c26e24ceca0858
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95121
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 69ce0305af2d911457274e4889334b335640c5da)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95715
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/04060109.xhp 
b/source/text/scalc/01/04060109.xhp
index 061c1dbb9..98463df3f 100644
--- a/source/text/scalc/01/04060109.xhp
+++ b/source/text/scalc/01/04060109.xhp
@@ -55,7 +55,7 @@
 The INDIRECT function is saved 
without conversion to ODF 1.0/1.1 format. If the second parameter was present, 
an older version of Calc will return an error for that function.
  
  
- ADDRESS(Row; Column; Abs; A1; "Sheet")
+ ADDRESS(Row; Column [; Abs [; A1 [; "Sheet"]]])
  
 Row represents the row number for the cell 
reference
  
@@ -98,7 +98,7 @@
 DDE
  Returns the result of a DDE-based 
link. If the contents of the linked range or section changes, the 
returned value will also change. You must reload the spreadsheet or choose 
Edit - Links to see the updated links. Cross-platform links, for 
example from a %PRODUCTNAME installation 
running on a Windows machine to a document created on a Linux machine, are not 
allowed.
  
- DDE("Server"; "File"; "Range"; Mode)
+ DDE("Server"; "File"; "Range" [; Mode])
  
 Server is the name of a server application. %PRODUCTNAME applications have the server name 
"soffice".
  
@@ -178,7 +178,7 @@
 INDEX
  INDEX returns a sub range, 
specified by row and column number, or an optional range index. Depending on 
context, INDEX returns a reference or content.UFI: will change 
with i4904; see 
http://so-web.germany.sun.com/iBIS/servlet/edit.ControlPanel?tid=i57108changed
 by i83070
  
- INDEX(Reference; Row; Column; Range)
+ INDEX(Reference [; Row [; Column [; Range]]])
  
 Reference is a reference, entered either directly or 
by specifying a range name. If the reference consists of multiple ranges, you 
must enclose the reference or range name in parentheses.
  
@@ -211,7 +211,7 @@
  Returns the 
reference specified by a text string. This function can 
also be used to return the area of a corresponding string.
  
  
- INDIRECT(Ref; A1)
+ INDIRECT(Ref [; A1])
  
 Ref represents a reference to a cell or an area (in 
text form) for which to return the contents.
  
@@ -230,7 +230,7 @@
 COLUMN
  Returns the column number of a 
cell reference. If the reference is a cell the column number of the 
cell is returned; if the parameter is a cell area, the corresponding column 
numbers are returned in a single-row array if the 
formula is entered as an array formula. If the COLUMN function 
with an area reference parameter is not used for an array formula, only the 
column number of the first cell within the area is determined.
  
- COLUMN(Reference)
+ COLUMN([Reference])
  
 Reference is the reference to a cell or cell area 
whose first column number is to be found.
  If no 
reference is entered, the column number of the cell in which the formula is 
entered is found. %PRODUCTNAME Calc 
automatically sets the reference to the current cell.
@@ -275,7 +275,7 @@
  Vertical search with reference 
to adjacent cells to the right. This function checks if a specific 
value is contained in the first column of an array. The function then returns 
the value in the same row of the column named by Index. If the Sorted 
parameter is omitted or set to TRUE or one, it is assumed that the data is 
sorted in ascending order. In this case, if the exact SearchCriterion is not found, the last value that is 
smaller than the criterion will be returned. If Sorted is set to FALSE or zero, an exact match must be 
found, otherwise the error Error: Value Not Available will be the 
result. Thus with a value of zero the data does not need to be sorted in 
ascending order.
  
  
- =VLOOKUP(SearchCriterion; Array; Index; 
SortedRangeLookup)
+ =VLOOKUP(SearchCriterion; Array; Index [; 
SortedRangeLookup])
  
 SearchCriterion is the value sea

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/func_weekday.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 99974d4e8519f1d08565e1058a1ad9ae17f19ed6
Author: Steve Fanning 
AuthorDate: Fri May 29 16:30:39 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:18:19 2020 +0200

(WEEKDAY fn) Minor tidy-up for consistency

Change-Id: Ie5f2031b09afd836c1e92a8f4fe837393442a0c2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95115
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 5f22c5046e8a89d22d186052bc99e605c48c48b1)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95714
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/func_weekday.xhp 
b/source/text/scalc/01/func_weekday.xhp
index 0afcbfbde..f000d5fe7 100644
--- a/source/text/scalc/01/func_weekday.xhp
+++ b/source/text/scalc/01/func_weekday.xhp
@@ -37,7 +37,7 @@
 Returns the day of the week for the given date 
value. The day is returned as an integer between 1 (Sunday) and 7 
(Saturday) if no type or type=1 is specified. For other types, see the table 
below.
 
 
-WEEKDAY(Number[; 
Type])
+WEEKDAY(Number [; 
Type])
  
Number, as a date value, is a decimal for which the weekday is to 
be returned.
  
Type is optional and determines the type of calculation. 

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

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit 34be72248d85cd996e9da1de6b2e124d1e0dbeab
Author: Steve Fanning 
AuthorDate: Mon Jun 8 18:18:19 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:18:19 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 99974d4e8519f1d08565e1058a1ad9ae17f19ed6
  - (WEEKDAY fn) Minor tidy-up for consistency

Change-Id: Ie5f2031b09afd836c1e92a8f4fe837393442a0c2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95115
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 5f22c5046e8a89d22d186052bc99e605c48c48b1)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95714
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index c4a6449f8edf..99974d4e8519 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c4a6449f8edfbdcb6b19c7b4deea31467423e072
+Subproject commit 99974d4e8519f1d08565e1058a1ad9ae17f19ed6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit ce20f5972e1eac97c8768809730479bb297e17e6
Author: Steve Fanning 
AuthorDate: Mon Jun 8 18:14:08 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:14:08 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to c4a6449f8edfbdcb6b19c7b4deea31467423e072
  - (04060107.xhp) Update syntax section for four functions to include 
square brackets, indicating optional parameters.

Change-Id: Ie1b2a487be11c9e6b2ed17eae8e0b067510c8b61
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/94953
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 1a010a1c18a0d992afd907efc201f04f799f9c4a)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95713
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index 77a7dad4708a..c4a6449f8edf 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 77a7dad4708af45da61d34b74a8d6dea1bd4ad8a
+Subproject commit c4a6449f8edfbdcb6b19c7b4deea31467423e072
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

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

New commits:
commit 328ea4d3be666a82fa8951f48cacbfeefd0204d6
Author: Steve Fanning 
AuthorDate: Mon Jun 8 18:13:40 2020 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Jun 8 18:13:40 2020 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-0'
  to 77a7dad4708af45da61d34b74a8d6dea1bd4ad8a
  - (IF func) Minor correction to syntax statement

Change-Id: Ib97051224752f5740e7afa0a6da336bfdf7beeb7
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95119
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 8e5429d50be89dc929cb2e03f339e837481abc9a)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95712
Reviewed-by: Ilmari Lauhakangas 

diff --git a/helpcontent2 b/helpcontent2
index de1399f3c89b..77a7dad4708a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit de1399f3c89be3f91faef69242c3646f3a5fd4ba
+Subproject commit 77a7dad4708af45da61d34b74a8d6dea1bd4ad8a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/04060107.xhp |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c4a6449f8edfbdcb6b19c7b4deea31467423e072
Author: Steve Fanning 
AuthorDate: Wed May 27 17:18:23 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:14:08 2020 +0200

(04060107.xhp) Update syntax section for four functions to include square 
brackets, indicating optional parameters.

Change-Id: Ie1b2a487be11c9e6b2ed17eae8e0b067510c8b61
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/94953
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 1a010a1c18a0d992afd907efc201f04f799f9c4a)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95713
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/04060107.xhp 
b/source/text/scalc/01/04060107.xhp
index ec0f868e2..185868bb5 100644
--- a/source/text/scalc/01/04060107.xhp
+++ b/source/text/scalc/01/04060107.xhp
@@ -693,7 +693,7 @@
 LINEST
   Returns a table of statistics for a straight line that best 
fits a data set.changed based on 
https://wiki.documentfoundation.org/Documentation/How_Tos/Calc:_LINEST_function 
(issue 76142)
   
-  LINEST(data_Y; 
data_X; linearType; stats)
+  LINEST(data_Y [; 
data_X [; linearType [; stats]]])
   data_Y is a single row or column range specifying 
the y coordinates in a set of data points.
   data_X is a corresponding single row or column 
range specifying the x coordinates. If data_X is omitted it 
defaults to 1, 2, 3, ..., n. If there is more than 
one set of variables data_X may be a range with corresponding 
multiple rows or columns.
   LINEST finds a straight line y = a + 
bx that best fits the data, using linear regression (the "least squares" 
method). With more than one set of variables the straight line is of the form 
y = a + b1x1 + b2x2 ... + bnxn.
@@ -965,7 +965,7 @@
 LOGEST
   This function calculates the adjustment of the entered data 
as an exponential regression curve (y=b*m^x).UFI: see 
http://support.microsoft.com/default.aspx?kbid=828528&product=xl2003 for 
bug #i31051#
   
-  LOGEST(DataY; 
DataX; FunctionType; Stats)
+  LOGEST(DataY [; 
DataX [; FunctionType [; Stats]]])
   DataY represents the Y Data array.
   DataX (optional) represents the X Data 
array.
   FunctionType (optional). If Function_Type = 0, 
functions in the form y = m^x will be calculated. Otherwise, y = b*m^x 
functions will be calculated.
@@ -1112,7 +1112,7 @@
 TREND
   Returns values along a linear trend.
   
-  TREND(DataY; 
DataX; NewDataX; LinearType)
+  TREND(DataY [; 
DataX [; NewDataX [; LinearType]]])
   DataY represents the Y Data array.
   DataX (optional) represents the X Data 
array.
   NewDataX (optional) represents the array of the X 
data, which are used for recalculating values.
@@ -1131,7 +1131,7 @@
 GROWTH
   Calculates the points of an exponential trend in an 
array.
   
-  GROWTH(DataY; 
DataX; NewDataX; FunctionType)
+  GROWTH(DataY [; 
DataX [; NewDataX [; FunctionType]]])
   DataY represents the Y Data array.
   DataX (optional) represents the X Data 
array.
   NewDataX (optional) represents the X data array, 
in which the values are recalculated.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-08 Thread Steve Fanning (via logerrit)

 source/text/scalc/01/04060105.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 77a7dad4708af45da61d34b74a8d6dea1bd4ad8a
Author: Steve Fanning 
AuthorDate: Fri May 29 16:49:56 2020 +0200
Commit: Olivier Hallot 
CommitDate: Mon Jun 8 18:13:40 2020 +0200

(IF func) Minor correction to syntax statement

Change-Id: Ib97051224752f5740e7afa0a6da336bfdf7beeb7
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95119
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 8e5429d50be89dc929cb2e03f339e837481abc9a)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/95712
Reviewed-by: Ilmari Lauhakangas 

diff --git a/source/text/scalc/01/04060105.xhp 
b/source/text/scalc/01/04060105.xhp
index c85d57592..8957265b2 100644
--- a/source/text/scalc/01/04060105.xhp
+++ b/source/text/scalc/01/04060105.xhp
@@ -94,7 +94,7 @@
 IF
  Specifies a logical test to be 
performed.
  
- IF(Test[; 
ThenValue][; OtherwiseValue])
+ IF(Test [; 
ThenValue [; OtherwiseValue]])
  
 Test is any value or expression that can be TRUE or 
FALSE.
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

1 2 >

1 - 100 of 172 matches

Mail list logo