[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 209d07ff2de2716be2c3b0cbd61c16774205cb12
Author: Olivier Hallot 
AuthorDate: Wed Apr 14 22:12:21 2021 -0300
Commit: Gerrit Code Review 
CommitDate: Thu Apr 15 03:12:21 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to a1a06717d857022304899fa8607af38b4ce57ac3
  - Fix sort command in Help page (part)

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

diff --git a/helpcontent2 b/helpcontent2
index 400078d391b1..a1a06717d857 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 400078d391b11c921d1069e23e357b12595c0307
+Subproject commit a1a06717d857022304899fa8607af38b4ce57ac3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

 source/text/shared/02/01170101.xhp |  214 ++---
 source/text/shared/02/01170102.xhp |   44 +++
 source/text/shared/02/01170202.xhp |8 -
 source/text/shared/02/01170203.xhp |   65 +--
 source/text/simpress/main0200.xhp  |2 
 source/text/swriter/main0200.xhp   |9 -
 6 files changed, 165 insertions(+), 177 deletions(-)

New commits:
commit a1a06717d857022304899fa8607af38b4ce57ac3
Author: Olivier Hallot 
AuthorDate: Wed Apr 14 20:37:42 2021 -0300
Commit: Olivier Hallot 
CommitDate: Thu Apr 15 03:12:21 2021 +0200

Fix sort command in Help page (part)

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

diff --git a/source/text/shared/02/01170101.xhp 
b/source/text/shared/02/01170101.xhp
index 199e3cda3..6b316f2fa 100644
--- a/source/text/shared/02/01170101.xhp
+++ b/source/text/shared/02/01170101.xhp
@@ -26,27 +26,27 @@
 
 
 
-GeneralUFI: had to remove all 
internal links to this file because all the targets vanished and no time to 
reinsert them all
+GeneralUFI: had to remove all internal 
links to this file because all the targets vanished and no time to reinsert 
them all
   This 
General tab enables you to define the general properties of a form 
control. These properties differ, depending on the control type. Not all of the 
following properties are available for every control.
 
 
   
 
-If you export the 
current form document to HTML format, the default control values are exported, 
not the current control values. Default values are determined - depending on 
the type of control - by the properties' Default value (for 
example, in text fields), Default status (for check boxes and 
option fields), and Default selection (for list boxes).
-
+If you export the current form document to HTML 
format, the default control values are exported, not the current control 
values. Default values are determined - depending on the type of control - by 
the properties' Default value (for example, in text fields), 
Default status (for check boxes and option fields), and 
Default selection (for list boxes).
+
 
 
-Enabled
+Enabled
   If a control field has the property "Enabled" (Yes), the 
form user can use the control field. Otherwise (No), it is 
disabled and greyed out.
 
 
 
-Line 
count
+Line count
   Specifies how many lines should be displayed in the 
dropdown list. This setting is only active if you chose "Yes" in 
the Dropdown option. For combo boxes with the "Dropdown" 
property, you can specify how many lines should be displayed in the dropdown 
list. With control fields which do not have the Dropdown option, 
the line's display will be specified by the size of the control field and the 
font size.
 
 
 
-ActionUFI: renamed from Button type to Action, see 
dba.features: Form navigation functionality for command 
buttons
+ActionUFI: renamed from Button type to Action, 
see dba.features: Form navigation functionality for command 
buttons
   The "Action" property determines the action that 
occurs when you activate a button. You can use navigation actions to 
design your own database navigation buttons.
 The following 
table describes the actions that you can assign to a button:
 
@@ -167,14 +167,14 @@
 
 
 
-Dropdown
+Dropdown
   Specifies whether the combo box should dropdown 
(Yes) or not (No). A control field with the 
dropdown property has an additional arrow button which opens the list of the 
existing form entries per mouse click. Under Line count, you can 
specify how many lines (or rows) should be displayed in the dropdown state. 
Combination fields can have the dropdown property.
   Combo boxes 
that were inserted as columns in a table control are always dropdown as the 
default.
 
 
 
 
-Alignment / Graphics alignment
+Alignment / Graphics alignment
 Specifies the alignment option for text or graphics that 
are used on a control. The alignment options are left-aligned, 
right-aligned, and centered. These options are available for the following 
elements:
 
   
@@ -188,18 +188,18 @@
   
   
 Graphics or 
text that are used in buttons.
-The 
Alignment option for buttons is called Graphics 
alignment.
+The Alignment option for buttons is 
called Graphics alignment.
   
 
 
 
 
-AutoFill
+AutoFill
   Assigns the AutoFill function to a 
combo box. The AutoFill function displays a list of 
previous entries after you start to type an entry.UFI: changed 
AutoComplete to AutoFill (got changed by error in the UI, so we stay with it 
now, according to FS)
 
 
 
-Label 
field
+Label field
   Specifies the source for the label of the control. The text of 
the label field will be used instead of the name of a database field. For 
example, in the Filter Navigator, Search dialog, and 
as a column name in the table view.
   To define 
one character of the label as a mnemonic, so that the user can access this 
co

[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - 3 commits - external/xmlsec include/xmloff sw/qa sw/source xmlsecurity/source

[Michael Stahl (via logerrit)]

Rebased ref, commits from common ancestor:
commit c523da10fbdd54b80439e9594e3e5af78f6e955b
Author: Michael Stahl 
AuthorDate: Wed Apr 7 17:00:43 2021 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Apr 15 02:44:54 2021 +0200

xmlsec: fix signing documents on WNT

Duplicate ds:X509Certificate elements cause:

warn:xmlsecurity.comp:9604:3820:xmlsecurity/source/helper/xmlsignaturehelper.cxx:658:
 X509Data do not form a chain: certificate in cycle:

(regression from 5af5ea893bcb8a8eb472ac11133da10e5a604e66)

Change-Id: I3d319a2f74dbec17b73f1c7bb8f4efe4e335f0ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113746
Tested-by: Mike Kaganski 
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit ae08aa8a095832ae2a88eac14f9680ac8d3a13b6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113752
Reviewed-by: Thorsten Behrens 
(cherry picked from commit 0ab3a264ba8d732cffa42a069c9aa50dab44e99f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113753
Tested-by: Samuel Mehrbrodt 
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 69e2488acea640974fe7946f4cef18fed0ec4c30)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113755
Tested-by: Michael Stahl 

diff --git 
a/external/xmlsec/0001-xmlSecX509DataGetNodeContent-don-t-return-0-for-non-.patch.1
 
b/external/xmlsec/0001-xmlSecX509DataGetNodeContent-don-t-return-0-for-non-.patch.1
new file mode 100644
index ..51607ca6ee73
--- /dev/null
+++ 
b/external/xmlsec/0001-xmlSecX509DataGetNodeContent-don-t-return-0-for-non-.patch.1
@@ -0,0 +1,68 @@
+From a39b110cb2c25680259a38b2f397b350151bc6e7 Mon Sep 17 00:00:00 2001
+From: Michael Stahl 
+Date: Wed, 7 Apr 2021 16:43:48 +0200
+Subject: [PATCH] xmlSecX509DataGetNodeContent(): don't return 0 for non-empty
+ elements
+
+LibreOffice wants to write the content of KeyInfo itself and thus writes
+X509Certificate element with content.
+
+But then xmlSecMSCngKeyDataX509XmlWrite() writes a duplicate
+X509Certificate element, which then makes a new additional consistency
+check in LO unhappy.
+
+The duplicate is written because xmlSecX509DataGetNodeContent() returns
+0 because it only checks for empty nodes; if there are only non-empty
+nodes a fallback to XMLSEC_X509DATA_DEFAULT occurs in all backends.
+
+Change the return value to be non-0 without changing the signature of
+the function, as it is apparently public.
+
+This doesn't happen in LO in the NSS backend due to another accident,
+where the private key flag isn't set when the X509Certificate is read,
+but otherwise the code is the same.
+---
+ src/x509.c | 11 +++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/src/x509.c b/src/x509.c
+index ed8788ae..dac8bd2b 100644
+--- a/src/x509.c
 b/src/x509.c
+@@ -60,22 +60,33 @@ xmlSecX509DataGetNodeContent (xmlNodePtr node, 
xmlSecKeyInfoCtxPtr keyInfoCtx) {
+ if(xmlSecCheckNodeName(cur, xmlSecNodeX509Certificate, xmlSecDSigNs)) 
{
+ if(xmlSecIsEmptyNode(cur) == 1) {
+ content |= XMLSEC_X509DATA_CERTIFICATE_NODE;
++} else {
++/* ensure return value isn't 0 if there are non-empty 
elements */
++content |= (XMLSEC_X509DATA_CERTIFICATE_NODE << 16);
+ }
+ } else if(xmlSecCheckNodeName(cur, xmlSecNodeX509SubjectName, 
xmlSecDSigNs)) {
+ if(xmlSecIsEmptyNode(cur) == 1) {
+ content |= XMLSEC_X509DATA_SUBJECTNAME_NODE;
++} else {
++content |= (XMLSEC_X509DATA_SUBJECTNAME_NODE << 16);
+ }
+ } else if(xmlSecCheckNodeName(cur, xmlSecNodeX509IssuerSerial, 
xmlSecDSigNs)) {
+ if(xmlSecIsEmptyNode(cur) == 1) {
+ content |= XMLSEC_X509DATA_ISSUERSERIAL_NODE;
++} else {
++content |= (XMLSEC_X509DATA_ISSUERSERIAL_NODE << 16);
+ }
+ } else if(xmlSecCheckNodeName(cur, xmlSecNodeX509SKI, xmlSecDSigNs)) {
+ if(xmlSecIsEmptyNode(cur) == 1) {
+ content |= XMLSEC_X509DATA_SKI_NODE;
++} else {
++content |= (XMLSEC_X509DATA_SKI_NODE << 16);
+ }
+ } else if(xmlSecCheckNodeName(cur, xmlSecNodeX509CRL, xmlSecDSigNs)) {
+ if(xmlSecIsEmptyNode(cur) == 1) {
+ content |= XMLSEC_X509DATA_CRL_NODE;
++} else {
++content |= (XMLSEC_X509DATA_CRL_NODE << 16);
+ }
+ } else {
+ /* todo: fail on unknown child node? */
+-- 
+2.30.2
+
diff --git a/external/xmlsec/UnpackedTarball_xmlsec.mk 
b/external/xmlsec/UnpackedTarball_xmlsec.mk
index e4d092bef019..76293fe31e42 100644
--- a/external/xmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/xmlsec/UnpackedTarball_xmlsec.mk
@@ -8,6 +8,7 @@
 #
 
 xmlsec_patches :=
+xmlsec_patches += 
0001-xmlSecX509DataGetNodeContent-don-t-return-0-for-non-.patch.1
 
 $(eval $(call gb_

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

[Jan-Marek Glogowski (via logerrit)]

 canvas/source/tools/page.cxx|2 
 canvas/source/tools/surfacerect.hxx |   74 +++-
 2 files changed, 24 insertions(+), 52 deletions(-)

New commits:
commit f359d4ad33c5a17a8a85d19561f69d21e40ad188
Author: Jan-Marek Glogowski 
AuthorDate: Thu Oct 10 14:48:22 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Apr 15 00:45:47 2021 +0200

tdf#40534 correctly match page with memory slab

LO has a page manager to match system memory backbuffers with
graphics memory on DX accelerated Windows. Internally this uses
an other rectangle implementation, the SurfaceRect, which had
some great comments like:

// a size of [0,0] therefore denotes a one-by-one rectangle.

In commit 230dbe2e43f3ee2cd285f9cdfe0d57e1ca08b8fe ("#144866# Add
one pixel border around textures, a bunch of drivers clobber those
with dirt), the allocation was increased by a pixel border, but
this doesn't work correctly, because now an allocation of the
page size wouldn't fit anymore into a page, because the pages size
is decreased before comparison. In the end the mixup suffered from
hard to handle off-by-one problems.

This patch fixes the bug, but eventually SurfaceRect should be
replaced by an extended basegfx::B2IBox. But since B2IBox uses two
ranges, instead of a point and a size, it would need a lot of
conversations to I2Point and I2Size objects with the current
Page::insert algorithm.

Change-Id: Ia725b4f8ed4fb270f2eb3734e492062bc7f13793
Reviewed-on: https://gerrit.libreoffice.org/80628
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 194e7ce17ae7ca278c12d03bc25684b7437f9785)
Reviewed-on: https://gerrit.libreoffice.org/80671
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/canvas/source/tools/page.cxx b/canvas/source/tools/page.cxx
index 4d83851d806a..78f9cd3aa671 100644
--- a/canvas/source/tools/page.cxx
+++ b/canvas/source/tools/page.cxx
@@ -118,7 +118,7 @@ namespace canvas
 // the rectangle passed as argument has a valid
 // location if and only if there's no intersection
 // with existing areas.
-SurfaceRect 
aBoundary(mpRenderModule->getPageSize()-basegfx::B2IVector(1,1));
+SurfaceRect aBoundary(mpRenderModule->getPageSize());
 if( !r.inside(aBoundary) )
 return false;
 
diff --git a/canvas/source/tools/surfacerect.hxx 
b/canvas/source/tools/surfacerect.hxx
index e0cd0fc023ba..ec73342ea799 100644
--- a/canvas/source/tools/surfacerect.hxx
+++ b/canvas/source/tools/surfacerect.hxx
@@ -25,6 +25,16 @@
 
 namespace canvas
 {
+/**
+ * This implements some equivalent to basegfx::B2IBox, but instead of two
+ * BasicBox ranges, it uses a position and a size. maPos and maSize could
+ * be replaced by:
+ * - B2IPoint(getMinX(), getMinY()) and
+ * - B2ISize(getMaxX()-getMinX(), getMaxY()-getMinY())
+ *
+ * The current allocation algorithm uses size and pos a lot. Not sure how
+ * time-critical any of this code is and if that would be a problem.
+ */
 struct SurfaceRect
 {
 ::basegfx::B2IPoint maPos;
@@ -36,22 +46,12 @@ namespace canvas
 {
 }
 
-// coordinates contained in this rectangle are
-// constrained to the following rules:
-// 1) p.x >= pos.x
-// 2) p.x <= pos.x+size.x
-// 3) p.y >= pos.y
-// 4) p.y <= pos.y+size.y
-// in other words, 'size' means the number of pixels
-// this rectangle encloses plus one. for example with pos[0,0]
-// and size[512,512], p[512,512] would return inside.
-// a size of [0,0] therefore denotes a one-by-one rectangle.
 bool pointInside( sal_Int32 px, sal_Int32 py ) const
 {
 const sal_Int32 x1(maPos.getX());
 const sal_Int32 y1(maPos.getY());
-const sal_Int32 x2(maPos.getX()+maSize.getX());
-const sal_Int32 y2(maPos.getY()+maSize.getY());
+const sal_Int32 x2(x1 + maSize.getX());
+const sal_Int32 y2(y1 + maSize.getY());
 if(px  < x1) return false;
 if(px >= x2) return false;
 if(py  < y1) return false;
@@ -59,58 +59,30 @@ namespace canvas
 return true;
 }
 
-/// returns true if the horizontal line intersects the rect.
-bool hLineIntersect( sal_Int32 lx1, sal_Int32 lx2, sal_Int32 ly ) const
-{
-const sal_Int32 x1(maPos.getX());
-const sal_Int32 y1(maPos.getY());
-const sal_Int32 x2(maPos.getX()+maSize.getX());
-const sal_Int32 y2(maPos.getY()+maSize.getY());
-if(ly < y1) return false;
-if(ly >= y2) return false;
-if((lx1 < x1) && (lx2 < x1)) return false;
-if((lx1 >= x2) && (lx2 >= x2)) return false;
-return tr

[Libreoffice-commits] core.git: helpcontent2

[Steve Fanning (via logerrit)]

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

New commits:
commit 6e6e531b564cdc9d5b25287c215cdc5a1fcbb346
Author: Steve Fanning 
AuthorDate: Thu Apr 15 00:43:57 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Apr 15 00:43:57 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 400078d391b11c921d1069e23e357b12595c0307
  - Fix order of rendering for four Bessel functions in Calc help file 
../01/04060115.xhp.

Also removed a couple of unnecessary spaces at the beginning of 
sentences.

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

diff --git a/helpcontent2 b/helpcontent2
index 26e5265ade24..400078d391b1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 26e5265ade24d7eeeaf7d120e0dbcb4cbc598fed
+Subproject commit 400078d391b11c921d1069e23e357b12595c0307
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Steve Fanning (via logerrit)]

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

New commits:
commit 400078d391b11c921d1069e23e357b12595c0307
Author: Steve Fanning 
AuthorDate: Wed Apr 14 21:45:26 2021 +0200
Commit: Olivier Hallot 
CommitDate: Thu Apr 15 00:43:57 2021 +0200

Fix order of rendering for four Bessel functions in Calc help file 
../01/04060115.xhp.

Also removed a couple of unnecessary spaces at the beginning of sentences.

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

diff --git a/source/text/scalc/01/04060115.xhp 
b/source/text/scalc/01/04060115.xhp
index 52bcff7b6..39203961e 100644
--- a/source/text/scalc/01/04060115.xhp
+++ b/source/text/scalc/01/04060115.xhp
@@ -37,7 +37,7 @@
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 55b48cb9fe1664ce4ffc1f0530f02e41a6174d0e
Author: Olivier Hallot 
AuthorDate: Wed Apr 14 19:36:30 2021 -0300
Commit: Gerrit Code Review 
CommitDate: Thu Apr 15 00:36:30 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 26e5265ade24d7eeeaf7d120e0dbcb4cbc598fed
  - Fix sort order of Calc functions

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

diff --git a/helpcontent2 b/helpcontent2
index 4eb5af3af3d7..26e5265ade24 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4eb5af3af3d74494e4303d6f695638604563411a
+Subproject commit 26e5265ade24d7eeeaf7d120e0dbcb4cbc598fed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

 help3xsl/online_transform.xsl  |   32 
 source/text/scalc/01/04060104.xhp  |   32 
 source/text/scalc/01/04060106.xhp  |3 +--
 source/text/scalc/01/04060107.xhp  |2 +-
 source/text/scalc/01/04060109.xhp  |   16 
 source/text/scalc/01/04060110.xhp  |2 +-
 source/text/scalc/01/04060111.xhp  |   24 
 source/text/scalc/01/04060112.xhp  |   33 +++--
 source/text/scalc/01/04060116.xhp  |2 +-
 source/text/scalc/01/04060118.xhp  |3 ++-
 source/text/scalc/01/04060119.xhp  |2 +-
 source/text/scalc/01/04060120.xhp  |   14 +++---
 source/text/scalc/01/04060181.xhp  |2 +-
 source/text/scalc/01/04060182.xhp  |2 +-
 source/text/scalc/01/04060183.xhp  |2 +-
 source/text/scalc/01/04060184.xhp  |2 +-
 source/text/scalc/01/04060185.xhp  |2 +-
 source/text/scalc/01/func_color.xhp|2 +-
 source/text/scalc/01/func_countifs.xhp |2 +-
 source/text/scalc/01/func_sumifs.xhp   |2 +-
 20 files changed, 89 insertions(+), 92 deletions(-)

New commits:
commit 26e5265ade24d7eeeaf7d120e0dbcb4cbc598fed
Author: Olivier Hallot 
AuthorDate: Wed Apr 14 19:31:31 2021 -0300
Commit: Olivier Hallot 
CommitDate: Thu Apr 15 00:36:30 2021 +0200

Fix sort order of Calc functions

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

diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index d30add9d9..b7502f6f4 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -595,28 +595,28 @@
 
 
 
-
+
 
 
-
+
 
 
-
+
 
 
-
+
 
 
-
+
 
 
-
+
 
 
-
+
 
 
-
+
 
 
 
@@ -629,28 +629,28 @@
 
 
 
-
+
 
 
-
+
 
 
-
+
 
 
-
+
 
 
-
+
 
 
-
+
 
 
-
+
 
 
-
+
 
 
 
diff --git a/source/text/scalc/01/04060104.xhp 
b/source/text/scalc/01/04060104.xhp
index c0c8b2761..27ae5b206 100644
--- a/source/text/scalc/01/04060104.xhp
+++ b/source/text/scalc/01/04060104.xhp
@@ -144,7 +144,7 @@
   
 
 
-
+
 
 
 
@@ -211,7 +211,7 @@
   
 
 
-Other spreadsheet 
applications may accept localized values for the Type parameter, but %PRODUCTNAME Calc will only accept 
the English values.
+Other spreadsheet applications may accept localized 
values for the Type parameter, but %PRODUCTNAME 
Calc will only accept the English values.
 
 
 =INFO("release") returns the product release number of the 
%PRODUCTNAME in use.Do not translate "release"
@@ -359,7 +359,7 @@
 mw inserted "recognizing..." and "formula cells;"
 
 
-ISFORMULA
+ISFORMULA
 Returns TRUE if a cell is a formula 
cell.
 
 
@@ -379,7 +379,7 @@
 
 
 
-ISEVEN
+ISEVEN
 Returns TRUE if the value is an even integer, or FALSE 
if the value is odd.
 
 
@@ -402,7 +402,7 @@
 
 
 
-ISEVEN_ADD
+ISEVEN_ADD
 Tests for even numbers. Returns 1 if the number 
divided by 2 returns a whole number.
 
 
@@ -423,7 +423,7 @@
 mw added "cell contents;"
 
 
-ISNONTEXT
+ISNONTEXT
 Tests if the cell contents are text or numbers, and 
returns FALSE if the contents are text.
 If an error 
occurs, the function returns TRUE.
 
@@ -445,7 +445,7 @@
 mw added "blank..." and "empty cells;"
 
 
-ISBLANK
+ISBLANK
 Returns TRUE if the reference to a cell is 
blank. This function is used to determine if the content of a cell is 
empty. A cell with a formula inside is not empty.
 
 
@@ -466,7 +466,7 @@
 mw added "number formats;" and "logical..."
 
 
-ISLOGICAL
+ISLOGICAL
 Tests for a logical value (TRUE or 
FALSE).
 If an error 
occurs, the function returns FALSE.
 
@@ -487,7 +487,7 @@
 mw added "#N/A ..."
 
 
-ISNA
+ISNA
 Returns TRUE if a cell contains the #N/A (value not 
available) error value.
 If an error 
occurs, the function returns FALSE.
 
@@ -507,7 +507,7 @@
 
 
 
-IFNA
+IFNA
 Returns the value if the cell does not contains the #N/A 
(value not available) error value, or the alternative value if it 
does.
 
 
@@ -527,7 +527,7 @@
 
 
 
-ISTEXT
+ISTEXT
 Returns TRUE if the cell contents refer to 
text.
 If an error 
occurs, the function returns FALSE.
 
@@ -548,7 +548,7 @@
 
 
 
-ISODD
+ISODD
 Returns TRUE if the value is odd, or FALSE if the 
number is even.
 
 
@@ -570,7 +570,7 @@
 
 
 
-ISODD_ADD
+ISODD_ADD
 Returns TR

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - ucb/source

[Andrew Udvare (via logerrit)]

 ucb/source/ucp/webdav/webdavprovider.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 80146da04ce3595aa95f30d7490b83c048b0a000
Author: Andrew Udvare 
AuthorDate: Thu Dec 24 06:04:16 2020 -0500
Commit: Andras Timar 
CommitDate: Thu Apr 15 00:21:33 2021 +0200

ucp: fix call to getComponentContext

Commit 3f9940c2e050830051a31e4b70736132e034a9db mistakenly removed
include/ucbhelper/getcomponentcontext.hxx seeing the getComponentContext 
method
as unused.
According to that file, ucbhelper::getComponentContext was just a duplicate 
of
comphelper::getComponentContext so this commit changes to calling that 
method
instead.

Change-Id: Ibd66b56a72afce437a26417d7944ec1ace34a4eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108262
Reviewed-by: Julien Nabet 
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx 
b/ucb/source/ucp/webdav/webdavprovider.cxx
index 462e4e5a98f7..570b36e6180c 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 #include 
 #include "webdavprovider.hxx"
@@ -106,7 +107,7 @@ static css::uno::Reference< css::uno::XInterface >
 ContentProvider_CreateInstance( const css::uno::Reference< 
css::lang::XMultiServiceFactory> & rSMgr )
 {
 css::lang::XServiceInfo* pX =
-static_cast(new ContentProvider( 
ucbhelper::getComponentContext(rSMgr) ));
+static_cast(new ContentProvider( 
comphelper::getComponentContext(rSMgr) ));
 return css::uno::Reference< css::uno::XInterface >::query( pX );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/serf RepositoryExternal.mk

[Luboš Luňák (via logerrit)]

 RepositoryExternal.mk |   27 +--
 configure.ac  |8 
 download.lst  |4 +-
 external/serf/ExternalProject_serf.mk |   52 --
 external/serf/Module_serf.mk  |2 -
 external/serf/StaticLibrary_serf.mk   |   58 ++
 external/serf/UnpackedTarball_serf.mk |5 --
 external/serf/windows.build.patch.1   |   29 -
 8 files changed, 85 insertions(+), 100 deletions(-)

New commits:
commit af6674ce681b8427d0171a88f212a7034334c9e1
Author: Luboš Luňák 
AuthorDate: Wed Apr 14 20:37:13 2021 +0200
Commit: Andras Timar 
CommitDate: Wed Apr 14 23:59:04 2021 +0200

update serf to 1.3.9

Its build system has switches to scons, so build the library
using gbuild.

Change-Id: I45b784e65e4987c25baf3fa1477816c744663bf0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114107
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e30fe9a1bb57..7b49abb2757d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1107,21 +1107,40 @@ endif
 
 endef
 
+ifneq ($(SYSTEM_SERF),)
+
 define gb_LinkTarget__use_serf
+$(call gb_LinkTarget_add_defs,$(1),\
+   $(filter-out -I% -isystem%,$(subst -isystem 
/,-isystem/,$(SERF_CFLAGS))) \
+)
+
 $(call gb_LinkTarget_set_include,$(1),\
-   $(SERF_CFLAGS) \
+   $(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem 
/,-isystem/,$(SERF_CFLAGS \
$$(INCLUDE) \
 )
+
 $(call gb_LinkTarget_add_libs,$(1),\
$(SERF_LIBS) \
 )
 
-ifeq ($(SYSTEM_SERF),)
-$(call gb_LinkTarget_use_external_project,$(1),serf)
-endif
+endef
+
+else # !SYSTEM_SERF
+
+define gb_LinkTarget__use_serf
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,serf) \
+   $$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_use_static_libraries,$(1),\
+   serf \
+)
 
 endef
 
+endif # SYSTEM_SERF
+
 else ifeq ($(WITH_WEBDAV),neon)
 
 ifneq ($(SYSTEM_NEON),)
diff --git a/configure.ac b/configure.ac
index 3a4d0eb795ce..bf93113fabdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10607,13 +10607,7 @@ serf)
 fi
 
 # Check for system serf
-libo_CHECK_SYSTEM_MODULE([serf],[SERF],[serf-1 >= 
1.1.0],["-I${WORKDIR}/UnpackedTarball/serf"],
- ["-L${WORKDIR}/UnpackedTarball/serf/.libs 
-lserf-1"])
-if test "$COM" = "MSC"; then
-SERF_LIB_DIR="Release"
-test -n "${MSVC_USE_DEBUG_RUNTIME}" && SERF_LIB_DIR="Debug"
-SERF_LIBS="${WORKDIR}/UnpackedTarball/serf/${SERF_LIB_DIR}/serf-1.lib"
-fi
+libo_CHECK_SYSTEM_MODULE([serf],[SERF],[serf-1 >= 1.3.9])
 ;;
 neon)
 AC_MSG_RESULT([neon])
diff --git a/download.lst b/download.lst
index cf97f1ff8d3c..6f38dd67f360 100644
--- a/download.lst
+++ b/download.lst
@@ -233,8 +233,8 @@ export REVENGE_VERSION_MICRO := 4
 export REVENGE_TARBALL := librevenge-0.0.$(REVENGE_VERSION_MICRO).tar.bz2
 export RHINO_SHA256SUM := 
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
 export RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-export SERF_SHA256SUM := 
6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700
-export SERF_TARBALL := serf-1.2.1.tar.bz2
+export SERF_SHA256SUM := 
549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc
+export SERF_TARBALL := serf-1.3.9.tar.bz2
 export SKIA_SHA256SUM := 
abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d
 export SKIA_TARBALL := skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz
 export STAROFFICE_SHA256SUM := 
f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db
diff --git a/external/serf/ExternalProject_serf.mk 
b/external/serf/ExternalProject_serf.mk
deleted file mode 100644
index 043045654956..
--- a/external/serf/ExternalProject_serf.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,serf))
-
-$(eval $(call gb_ExternalProject_use_externals,serf,\
-   apr \
-))
-
-$(eval $(call gb_ExternalProject_register_targets,serf,\
-   build \
-))
-
-$(eval $(call gb_ExternalProject_use_nmake,serf,build))
-
-ifeq ($(COM),MSC)
-$(call gb_ExternalProject_get_state_target,serf,build):
-   $(call gb_Trace_StartRange,serf,EXTERNAL)
-   $(call gb_ExternalProject_run,build,\
-   APR_SRC="..\apr" \
-   APRUTIL_SRC="..\apr_util" \
-   OPENSSL_SRC="..\openssl" \
-   ZLIB_SRC="..\zlib" \
-   nmake -nologo -f serf.mak \
-   $(if 

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

[Hossein (via logerrit)]

 solenv/bin/mkdocs.sh|   19 +++
 solenv/bin/mkdocs_portal.sh |   44 +++-
 2 files changed, 42 insertions(+), 21 deletions(-)

New commits:
commit 80fbc9c49fd23fcf1900fe12ebdc6f43f8db7b7f
Author: Hossein 
AuthorDate: Wed Apr 7 23:47:21 2021 +0430
Commit: Thorsten Behrens 
CommitDate: Wed Apr 14 23:56:09 2021 +0200

Fix problems with LibreOffice document generation (local and portal)

* Fixed problems with LibreOffice local document generation script
  (mkdocs.sh) by interpreting backslash escapes when generating module
  links using "echo -e" and using double quotes around Markdown
  generated text. The result is placed at docs/ folder.
* Fixed problems with LibreOffice portal document generation script
  (mkdocs_portal.sh and mkonedoc.sh) by doing above fixes and also
  adding code from the local document generation script. The result is
  placed at https://docs.libreoffice.org/
* Only the README.md files are processed, and not README* or readme.txt*
* Fixed redmine #3515 "Remove non-necessary subfolders from
  docs.libreoffice.org" by excluding these 10 folders:
  "autom4te.cache dictionaries docs helpcompiler helpcontent2 include
  instdir lo translations workdir"

Change-Id: Id230872b8583a575bfeb6fc77cc9f96d5982908f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113773
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh
index 0f92ff87e532..4b70787787e8 100755
--- a/solenv/bin/mkdocs.sh
+++ b/solenv/bin/mkdocs.sh
@@ -85,8 +85,7 @@ function proc_text {
 }
 
 function proc_text_markdown {
-  sed -re ' s/\[\[([-_a-zA-Z0-9]+)\]\]/\1<\/a>/g' - \
-  | sed -re ' s/\[git:([^]]+)\]/\1<\/a>/g'
+  sed -re ' s/\[git:([^]]+)\]/\1<\/a>/g'
 }
 
 function check_cmd {
@@ -226,10 +225,10 @@ echo "generating index page"
 header "LibreOffice Modules" " " "$BASE_OUTPUT/index.html"
 for module_name in *; do
   if [ -d $module_name ]; then
-cur_file=$(echo $module_name/README* $module_name/readme.txt*)
+cur_file=$(echo $module_name/README.md)
 if [ -f "$cur_file" ]; then
   # write index.html entry
-  text="${module_name}\n"
+  text=$(echo -e "${module_name}\n")
 
   if [ ${cur_file: -3} == ".md" ]; then
 # This is a markdown file.
@@ -239,7 +238,7 @@ for module_name in *; do
   else
 text="${text}$(head -n1 $cur_file | proc_text)"
   fi
-  echo -e $text >> "$BASE_OUTPUT/index.html"
+  echo -e "$text" >> "$BASE_OUTPUT/index.html"
 
   # write detailed module content
   header "$module_name" "LibreOffice » 
${module_name}" "$BASE_OUTPUT/${module_name}.html"
@@ -249,12 +248,12 @@ for module_name in *; do
 text="${text}   Doxygen"
   fi
   text="${text}  "
-  echo -e $text >> "$BASE_OUTPUT/${module_name}.html"
+  echo -e "$text" >> "$BASE_OUTPUT/${module_name}.html"
 
   if [ ${cur_file: -3} == ".md" ]; then
 # This is a markdown file.
 text="$(${markdown} $cur_file | proc_text_markdown)"
-echo $text >> "$BASE_OUTPUT/${module_name}.html"
+echo -e "$text" >> "$BASE_OUTPUT/${module_name}.html"
   else
 proc_text < $cur_file >> "$BASE_OUTPUT/${module_name}.html"
   fi
@@ -265,9 +264,13 @@ for module_name in *; do
   fi
 done
 
-if [ ${#empty_modules[*]} -gt 0 ]; then
+if [ ${#empty_modules[*]} -gt 10 ]; then
   echo -e " READMEs were not available for these 
modules:\n" >> "$BASE_OUTPUT/index.html"
   for module_name in "${empty_modules[@]}"; do
+# Do not process these directories
+if [[ "$module_name" =~ 
^(autom4te.cache|dictionaries|docs|helpcompiler|helpcontent2|include|instdir|lo|translations|workdir)$
 ]]; then
+  continue
+fi
 echo -e "https://cgit.freedesktop.org/libreoffice/core/tree/${module_name}\";>${module_name}\n"
 >> "$BASE_OUTPUT/index.html"
   done
   echo -e "\n" >> "$BASE_OUTPUT/index.html"
diff --git a/solenv/bin/mkdocs_portal.sh b/solenv/bin/mkdocs_portal.sh
index 852e3448179d..284af9e741f5 100755
--- a/solenv/bin/mkdocs_portal.sh
+++ b/solenv/bin/mkdocs_portal.sh
@@ -4,6 +4,7 @@ if [ -n "$debug" ] ; then
 set -x
 fi
 
+markdown="markdown"
 SRCDIR="$1"
 BASE_OUTPUT="$2"
 
@@ -88,6 +89,10 @@ function proc_text
 | awk 'BEGIN { print "" } { print } END { print "" }'
 }
 
+function proc_text_markdown {
+  sed -re ' s/\[git:([^]]+)\]/\1<\/a>/g'
+}
+
 # generate entry page
 
 echo "generating index page"
@@ -95,28 +100,37 @@ header "LibreOffice Modules" " " "$BASE_OUTPUT/index.html"
 
 for module_name in *; do
 if [ -d $module_name ]; then
-cur_file=
-if [ -f $module_name/readme.txt ] ; then
-cur_file="$module_name/readme.txt"
-elif [ -f $module_name/README ] ; then
-cur_file="$module_name/README"
-fi
-if [ -n "$cur_file" ]; then
+cur_file=$(echo $module_name/R

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac download.lst external/serf RepositoryExternal.mk

[Luboš Luňák (via logerrit)]

 RepositoryExternal.mk |   27 +--
 configure.ac  |8 
 download.lst  |4 +-
 external/serf/ExternalProject_serf.mk |   52 --
 external/serf/Module_serf.mk  |2 -
 external/serf/StaticLibrary_serf.mk   |   58 ++
 external/serf/UnpackedTarball_serf.mk |5 --
 external/serf/windows.build.patch.1   |   29 -
 8 files changed, 85 insertions(+), 100 deletions(-)

New commits:
commit 3718e45e17a174eaf6e9ee55d384faa23305b790
Author: Luboš Luňák 
AuthorDate: Wed Apr 14 20:37:13 2021 +0200
Commit: Andras Timar 
CommitDate: Wed Apr 14 23:51:49 2021 +0200

update serf to 1.3.9

Its build system has switches to scons, so build the library
using gbuild.

Change-Id: I45b784e65e4987c25baf3fa1477816c744663bf0

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index ad3febbae41b..01faf862f423 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1107,21 +1107,40 @@ endif
 
 endef
 
+ifneq ($(SYSTEM_SERF),)
+
 define gb_LinkTarget__use_serf
+$(call gb_LinkTarget_add_defs,$(1),\
+   $(filter-out -I% -isystem%,$(subst -isystem 
/,-isystem/,$(SERF_CFLAGS))) \
+)
+
 $(call gb_LinkTarget_set_include,$(1),\
-   $(SERF_CFLAGS) \
+   $(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem 
/,-isystem/,$(SERF_CFLAGS \
$$(INCLUDE) \
 )
+
 $(call gb_LinkTarget_add_libs,$(1),\
$(SERF_LIBS) \
 )
 
-ifeq ($(SYSTEM_SERF),)
-$(call gb_LinkTarget_use_external_project,$(1),serf)
-endif
+endef
+
+else # !SYSTEM_SERF
+
+define gb_LinkTarget__use_serf
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,serf) \
+   $$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_use_static_libraries,$(1),\
+   serf \
+)
 
 endef
 
+endif # SYSTEM_SERF
+
 else ifeq ($(WITH_WEBDAV),neon)
 
 ifneq ($(SYSTEM_NEON),)
diff --git a/configure.ac b/configure.ac
index 2e1454d8edd0..c894b7331623 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10587,13 +10587,7 @@ serf)
 fi
 
 # Check for system serf
-libo_CHECK_SYSTEM_MODULE([serf],[SERF],[serf-1 >= 
1.1.0],["-I${WORKDIR}/UnpackedTarball/serf"],
- ["-L${WORKDIR}/UnpackedTarball/serf/.libs 
-lserf-1"])
-if test "$COM" = "MSC"; then
-SERF_LIB_DIR="Release"
-test -n "${MSVC_USE_DEBUG_RUNTIME}" && SERF_LIB_DIR="Debug"
-SERF_LIBS="${WORKDIR}/UnpackedTarball/serf/${SERF_LIB_DIR}/serf-1.lib"
-fi
+libo_CHECK_SYSTEM_MODULE([serf],[SERF],[serf-1 >= 1.3.9])
 ;;
 neon)
 AC_MSG_RESULT([neon])
diff --git a/download.lst b/download.lst
index 16a74fe081f0..ca6d3f4f6d49 100644
--- a/download.lst
+++ b/download.lst
@@ -261,8 +261,8 @@ export REVENGE_VERSION_MICRO := 4
 export REVENGE_TARBALL := librevenge-0.0.$(REVENGE_VERSION_MICRO).tar.bz2
 export RHINO_SHA256SUM := 
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
 export RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-export SERF_SHA256SUM := 
6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700
-export SERF_TARBALL := serf-1.2.1.tar.bz2
+export SERF_SHA256SUM := 
549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc
+export SERF_TARBALL := serf-1.3.9.tar.bz2
 export SKIA_SHA256SUM := 
f293656a15342a53bb407b932fc907c6894178a162f09728bd383e24d84b1301
 export SKIA_TARBALL := skia-m88-59bafeeaa7de9eb753e3778c414e01dcf013dcd8.tar.xz
 export STAROFFICE_SHA256SUM := 
f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db
diff --git a/external/serf/ExternalProject_serf.mk 
b/external/serf/ExternalProject_serf.mk
deleted file mode 100644
index 043045654956..
--- a/external/serf/ExternalProject_serf.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,serf))
-
-$(eval $(call gb_ExternalProject_use_externals,serf,\
-   apr \
-))
-
-$(eval $(call gb_ExternalProject_register_targets,serf,\
-   build \
-))
-
-$(eval $(call gb_ExternalProject_use_nmake,serf,build))
-
-ifeq ($(COM),MSC)
-$(call gb_ExternalProject_get_state_target,serf,build):
-   $(call gb_Trace_StartRange,serf,EXTERNAL)
-   $(call gb_ExternalProject_run,build,\
-   APR_SRC="..\apr" \
-   APRUTIL_SRC="..\apr_util" \
-   OPENSSL_SRC="..\openssl" \
-   ZLIB_SRC="..\zlib" \
-   nmake -nologo -f serf.mak \
-   $(if $(MSVC_USE_DEBUG_RUNTIME),DEBUG_BUILD=T 
Debug,Release)/serf-1.lib \
-   )
-   $(call gb_Trace_EndRange,serf,

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

[Luboš Luňák (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dad392e43b888fe78a3bc10eca921c4b2d65445d
Author: Luboš Luňák 
AuthorDate: Wed Apr 14 21:43:43 2021 +0200
Commit: Andras Timar 
CommitDate: Wed Apr 14 23:41:52 2021 +0200

disable Skia if --disable -gui

There are link errors because of SkiaZone, and Skia is not even
linked in for non-GUI.

Change-Id: I942dbf79c2012b5dfd4259a7c4ecc680500174b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114111
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/configure.ac b/configure.ac
index 57e1f7c0f180..2e1454d8edd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11695,7 +11695,7 @@ AC_SUBST(POPPLER_LIBS)
 # Skia?
 AC_MSG_CHECKING([whether to build Skia])
 ENABLE_SKIA=
-if test "$enable_skia" != "no" -a "$build_skia" = "yes"; then
+if test "$enable_skia" != "no" -a "$build_skia" = "yes" -a -z "$DISABLE_GUI"; 
then
 if test "$enable_skia" = "debug"; then
 AC_MSG_RESULT([yes (debug)])
 ENABLE_SKIA_DEBUG=TRUE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 85170e2d7a487d4236156fe80ca269e984924e1b
Author: Olivier Hallot 
AuthorDate: Wed Apr 14 18:37:09 2021 -0300
Commit: Gerrit Code Review 
CommitDate: Wed Apr 14 23:37:09 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 4eb5af3af3d74494e4303d6f695638604563411a
  - Add sort attribute in page

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

diff --git a/helpcontent2 b/helpcontent2
index 81014e5cb461..4eb5af3af3d7 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 81014e5cb46166183723ae911f6968e56b403107
+Subproject commit 4eb5af3af3d74494e4303d6f695638604563411a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

 source/text/sbasic/shared/0002.xhp |   17 +++--
 1 file changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 4eb5af3af3d74494e4303d6f695638604563411a
Author: Olivier Hallot 
AuthorDate: Wed Apr 14 18:34:08 2021 -0300
Commit: Olivier Hallot 
CommitDate: Wed Apr 14 23:37:09 2021 +0200

Add sort attribute in page

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

diff --git a/source/text/sbasic/shared/0002.xhp 
b/source/text/sbasic/shared/0002.xhp
index bfdfc2aaf..295664a71 100644
--- a/source/text/sbasic/shared/0002.xhp
+++ b/source/text/sbasic/shared/0002.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-   
 
 
 
@@ -30,30 +27,30 @@
 
 
 
-$[officename] Basic Glossary
+$[officename] Basic Glossary
 This glossary 
explains some technical terms that you may come across when working with 
$[officename] Basic.
-
+
 
-Decimal 
Point
+Decimal Point
 When 
converting numbers, $[officename] Basic uses the locale settings of the system 
for determining the type of decimal and thousand separator.
 The behavior 
has an effect on both the implicit conversion ( 1 + "2.3" = 3.3 ) as well as 
the function IsNumeric.
 
 
-Colors
+Colors
 In 
$[officename] Basic, colors are treated as long integer value. The return value 
of color queries is also always a long integer value. When defining properties, 
colors can be specified using their RGB code that is converted to a long 
integer value using the RGB function.
 
 
-Measurement Units
+Measurement Units
 In 
$[officename] Basic, a method parameter or a property 
expecting unit information can be specified either as integer or long integer 
expression without a unit, or as a character string containing a unit. If no 
unit is passed to the method the default unit defined for the active document 
type will be used. If the parameter is passed as a character string containing 
a measurement unit, the default setting will be ignored. The default 
measurement unit for a document type can be set under %PRODUCTNAME - 
PreferencesTools - 
Options - (Document Type) - 
General.
 
 
 twips; definition
 
-Twips
+Twips
 A twip is a 
screen-independent unit which is used to define the uniform position and size 
of screen elements on all display systems. A twip is 1/1440th of an inch or 
1/20 of a printer's point. There are 1440 twips to an inch or about 567 twips 
to a centimeter.
 
 
-URL 
Notation
+URL Notation
 URLs 
(Uniform Resource Locators) are used to determine the location of 
a resource like a file in a file system, typically inside a network 
environment. A URL consists of a protocol specifier, a host specifier and a 
file and path specifier:
 
 
protocol://host.name/path/to/the/file.html
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Luboš Luňák (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 402f865aff96c192f257bac4dc212ce937bcee84
Author: Luboš Luňák 
AuthorDate: Wed Apr 14 21:43:43 2021 +0200
Commit: Luboš Luňák 
CommitDate: Wed Apr 14 22:26:53 2021 +0200

disable Skia if --disable -gui

There are link errors because of SkiaZone, and Skia is not even
linked in for non-GUI.

Change-Id: I942dbf79c2012b5dfd4259a7c4ecc680500174b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114111
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/configure.ac b/configure.ac
index 46bee5224ce4..3a4d0eb795ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11702,7 +11702,7 @@ AC_SUBST(POPPLER_LIBS)
 # Skia?
 AC_MSG_CHECKING([whether to build Skia])
 ENABLE_SKIA=
-if test "$enable_skia" != "no" -a "$build_skia" = "yes"; then
+if test "$enable_skia" != "no" -a "$build_skia" = "yes" -a -z "$DISABLE_GUI"; 
then
 if test "$enable_skia" = "debug"; then
 AC_MSG_RESULT([yes (debug)])
 ENABLE_SKIA_DEBUG=TRUE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

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

New commits:
commit 846c0c9e861534275c524c2571ab2e7af861892b
Author: Olivier Hallot 
AuthorDate: Wed Apr 14 16:00:20 2021 -0300
Commit: Gerrit Code Review 
CommitDate: Wed Apr 14 21:00:20 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 81014e5cb46166183723ae911f6968e56b403107
  - Fix sort command in Help pages

After the introduction of the headings h1 ... h6  in the Help
pages the sort command broke. It relied only in the 
tag for sorting, usually the first paragraph in the section.

The patch extend the DTD to handle the new descendant="" attribute
to select which tag to sort in the Help page

Default is  for backward compatibility.

Pages with  must be revisited.

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

diff --git a/helpcontent2 b/helpcontent2
index d5c6af3d35be..81014e5cb461 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit d5c6af3d35bef4a734dd38725f069b393d02379d
+Subproject commit 81014e5cb46166183723ae911f6968e56b403107
commit 7ac866934207fa0bf5ba201dff2ff495b4d45250
Author: Olivier Hallot 
AuthorDate: Wed Apr 14 16:00:06 2021 -0300
Commit: Gerrit Code Review 
CommitDate: Wed Apr 14 21:00:06 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to d5c6af3d35bef4a734dd38725f069b393d02379d
  - Fix broken link

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

diff --git a/helpcontent2 b/helpcontent2
index 49d33b45fd6c..d5c6af3d35be 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 49d33b45fd6c0d6b4c514a95bb5aceab37199abf
+Subproject commit d5c6af3d35bef4a734dd38725f069b393d02379d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: 2 commits - help3xsl/online_transform.xsl helpers/xmlhelp.dtd source/text

[Olivier Hallot (via logerrit)]

 help3xsl/online_transform.xsl  |   59 ++---
 helpers/xmlhelp.dtd|1 
 source/text/sbasic/shared/0300.xhp |4 +-
 3 files changed, 58 insertions(+), 6 deletions(-)

New commits:
commit 81014e5cb46166183723ae911f6968e56b403107
Author: Olivier Hallot 
AuthorDate: Wed Apr 14 15:51:02 2021 -0300
Commit: Olivier Hallot 
CommitDate: Wed Apr 14 21:00:20 2021 +0200

Fix sort command in Help pages

After the introduction of the headings h1 ... h6  in the Help
pages the sort command broke. It relied only in the 
tag for sorting, usually the first paragraph in the section.

The patch extend the DTD to handle the new descendant="" attribute
to select which tag to sort in the Help page

Default is  for backward compatibility.

Pages with  must be revisited.

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

diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index c6e2ee1bb..d30add9d9 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -589,20 +589,71 @@
 
 
 
-
+
 
 
 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
 
-
+
 
 
 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/helpers/xmlhelp.dtd b/helpers/xmlhelp.dtd
index 488e7286f..6a4ef9778 100644
--- a/helpers/xmlhelp.dtd
+++ b/helpers/xmlhelp.dtd
@@ -215,6 +215,7 @@ Version Nov 2018
 
 
 
 
commit d5c6af3d35bef4a734dd38725f069b393d02379d
Author: Olivier Hallot 
AuthorDate: Wed Apr 14 15:27:15 2021 -0300
Commit: Olivier Hallot 
CommitDate: Wed Apr 14 21:00:06 2021 +0200

Fix broken link

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

diff --git a/source/text/sbasic/shared/0300.xhp 
b/source/text/sbasic/shared/0300.xhp
index c9eff8c04..a4d518f14 100644
--- a/source/text/sbasic/shared/0300.xhp
+++ b/source/text/sbasic/shared/0300.xhp
@@ -43,9 +43,9 @@
 
 
 
-
+
 
 
 
 
-
\ 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: compilerplugins/clang include/oox include/tools sfx2/inc sfx2/Library_sfx.mk sfx2/source solenv/clang-format sw/inc sw/source

[Noel Grandin (via logerrit)]

 compilerplugins/clang/unusedmethods.results  |  268 ---
 include/oox/export/vmlexport.hxx |2 
 include/tools/fract.hxx  |7 
 sfx2/Library_sfx.mk  |1 
 sfx2/inc/sidebar/DrawHelper.hxx  |   41 
 sfx2/source/sidebar/Deck.cxx |1 
 sfx2/source/sidebar/DrawHelper.cxx   |   50 -
 solenv/clang-format/excludelist  |2 
 sw/inc/fesh.hxx  |1 
 sw/source/core/frmedt/feflyole.cxx   |5 
 sw/source/filter/ww8/docxattributeoutput.cxx |8 
 sw/source/filter/ww8/docxattributeoutput.hxx |1 
 sw/source/uibase/inc/edtwin.hxx  |1 
 13 files changed, 125 insertions(+), 263 deletions(-)

New commits:
commit a41aef4c1648519b934f0aed06d1c75f75fd852a
Author: Noel Grandin 
AuthorDate: Mon Apr 12 16:59:53 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 14 20:52:54 2021 +0200

loplugin:unusedmethods

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

diff --git a/compilerplugins/clang/unusedmethods.results 
b/compilerplugins/clang/unusedmethods.results
index e3686d2235de..86edd49e2943 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -44,6 +44,8 @@ connectivity/inc/sdbcx/VGroup.hxx:61
  connectivity::sdbcx::OGroup::OGroup(_Bool)
 connectivity/inc/sdbcx/VGroup.hxx:62
  connectivity::sdbcx::OGroup::OGroup(const class rtl::OUString &,_Bool)
+connectivity/source/drivers/evoab2/NResultSetMetaData.hxx:49
+class com::sun::star::uno::Reference 
connectivity::evoab::OEvoabResultSetMetaData::operator Reference()
 connectivity/source/drivers/firebird/Driver.hxx:59
 const class com::sun::star::uno::Reference & 
connectivity::firebird::FirebirdDriver::getContext() const
 connectivity/source/drivers/firebird/Util.hxx:65
@@ -86,6 +88,12 @@ cui/source/dialogs/SpellAttrib.hxx:72
 _Bool svx::SpellErrorDescription::operator==(const struct 
svx::SpellErrorDescription &) const
 cui/source/inc/CustomNotebookbarGenerator.hxx:30
  CustomNotebookbarGenerator::CustomNotebookbarGenerator()
+cui/source/inc/fileextcheckdlg.hxx:32
+void FileExtCheckDialog::LinkStubOnOkClick(void *,class weld::Button &)
+cui/source/inc/fileextcheckdlg.hxx:32
+void FileExtCheckDialog::OnOkClick(class weld::Button &)
+cui/source/inc/fileextcheckdlg.hxx:35
+ FileExtCheckDialog::FileExtCheckDialog(class weld::Window *,const class 
rtl::OUString &,const class rtl::OUString &)
 cui/source/inc/SvxNotebookbarConfigPage.hxx:40
 void SvxNotebookbarConfigPage::SetElement()
 dbaccess/source/filter/hsqldb/fbalterparser.hxx:19
@@ -112,8 +120,6 @@ dbaccess/source/ui/inc/sbamultiplex.hxx:384
 class cppu::OInterfaceContainerHelper * 
dbaui::SbaXVetoableChangeMultiplexer::getContainer(const class rtl::OUString &)
 dbaccess/source/ui/inc/unodatbr.hxx:313
 _Bool dbaui::SbaTableQueryBrowser::implCopyObject(class ODataClipboard 
&,const class weld::TreeIter &,int)
-desktop/source/deployment/gui/dp_gui_dialog2.hxx:132
-void dp_gui::ExtMgrDialog::LinkStubHandleUpdateBtn(void *,class 
weld::Button &)
 desktop/source/lib/lokclipboard.hxx:95
  LOKClipboardFactory::LOKClipboardFactory()
 drawinglayer/inc/texture/texture.hxx:39
@@ -210,6 +216,8 @@ embeddedobj/source/msole/olecomponent.hxx:134
 void OleComponent::OnClose_Impl()
 extensions/source/scanner/scanner.hxx:79
 void ScannerManager::SetData(void *)
+framework/inc/uielement/toolbarmanager.hxx:63
+void framework::ToolBarManagerImpl::Init()
 hwpfilter/source/mzstring.h:100
 class MzString & MzString::operator<<(unsigned char)
 hwpfilter/source/mzstring.h:102
@@ -400,13 +408,11 @@ include/basegfx/vector/b3dvector.hxx:75
 class basegfx::B3DVector & basegfx::B3DVector::operator*=(const class 
basegfx::B3DVector &)
 include/basic/sbxvar.hxx:138
 struct SbxValues * SbxValue::data()
-include/codemaker/commoncpp.hxx:47
-class rtl::OString codemaker::cpp::translateUnoToCppType(enum 
codemaker::UnoType::Sort,class std::basic_string_view >)
-include/codemaker/global.hxx:55
+include/codemaker/global.hxx:53
 class FileStream & operator<<(class FileStream &,const class rtl::OString 
*)
-include/codemaker/global.hxx:57
+include/codemaker/global.hxx:55
 class FileStream & operator<<(class FileStream &,const class 
rtl::OStringBuffer *)
-include/codemaker/global.hxx:58
+include/codemaker/global.hxx:56
 class FileStream & operator<<(class FileStream &,const class 
rtl::OStringBuffer &)
 include/comphelper/asyncquithandler.hxx:45
 _Bool AsyncQuitHandler::IsForceQuit() const
@@ -514,7 +520,7 @@ include/comphelper/sequence.hxx:200
 Sequence 
comphelper::containerToSequence(type-parameter-?-? const (&)[N])
 include/comphelper/sequence.hxx:200
 Sequenc

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

[Mike Kaganski (via logerrit)]

 writerfilter/source/ooxml/OOXMLStreamImpl.cxx |   76 +-
 1 file changed, 38 insertions(+), 38 deletions(-)

New commits:
commit 80e081051da2c92c36c9b5aa280a944661bd3ddf
Author: Mike Kaganski 
AuthorDate: Wed Apr 14 17:58:48 2021 +0200
Commit: Mike Kaganski 
CommitDate: Wed Apr 14 20:24:28 2021 +0200

static const char[] -> OUStringLiteral

Change-Id: I77fcd3260fd0f3d4c1a05624a9e9ea1dfad3792f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114004
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx 
b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index 7d48f1c08fce..1d54ffde00d1 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -127,45 +127,45 @@ bool OOXMLStreamImpl::lcl_getTarget(const 
uno::Reference xBase = xFac->parse("file:///" + 
msPath);
 
 static const char sType[] = "Type";
-static const char sDocumentType[] = 
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument";;
-static const char sStylesType[] = 
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles";;
-static const char sNumberingType[] = 
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering";;
-static const char sFonttableType[] = 
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable";;
-static const char sFootnotesType[] = 
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes";;
-static const char sEndnotesType[] = 
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes";;
-static const char sCommentsType[] = 
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments";;
-static const char sThemeType[] = 
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme";;
-static const char sCustomType[] = 
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml";;
-static const char sCustomPropsType[] = 
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXmlProps";;
-static const char sGlossaryType[] = 
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/glossaryDocument";;
-static const char sWebSettings[] = 
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings";;
-static const char sSettingsType[] = 
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings";;
-static const char sChartType[] = 
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart";;
-static const char sEmbeddingsType[] = 
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";;
-static const char sFooterType[] = 
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer";;
-static const char sHeaderType[] = 
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/header";;
-static const char sOleObjectType[] = 
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject";;
+static const OUStringLiteral sDocumentType = 
u"http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument";;
+static const OUStringLiteral sStylesType = 
u"http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles";;
+static const OUStringLiteral sNumberingType = 
u"http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering";;
+static const OUStringLiteral sFonttableType = 
u"http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable";;
+static const OUStringLiteral sFootnotesType = 
u"http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes";;
+static const OUStringLiteral sEndnotesType = 
u"http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes";;
+static const OUStringLiteral sCommentsType = 
u"http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments";;
+static const OUStringLiteral sThemeType = 
u"http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme";;
+static const OUStringLiteral sCustomType = 
u"http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml";;
+static const OUStringLiteral sCustomPropsType = 
u"http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXmlProps";;
+static const OUStringLiteral sGlossaryType = 
u"http://schemas.openxmlformats.org/officeDocument/2006/relationships/glossaryDocument";;
+static const OUStringLiteral sWebSettings = 
u"http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings";;
+static const OUStringLiteral sSettingsType = 
u"http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings";;
+static const OUStringLiteral sChartType = 
u

Minutes from the UX/design meeting 2021-Apr-14

[Heiko Tietze]

Present: Heiko
Comments: Stuart, Gabor, MikeK

Tickets/Topic

 * VIEWING: Can't page down accurately in "Entire Page" view
   + https://bugs.documentfoundation.org/show_bug.cgi?id=81829
   + https://bugs.documentfoundation.org/show_bug.cgi?id=141666
   + WF (Stuart)
   + toggle  pg+up/dn in single page mode?
 + OP: not working; comments tagged as off-topic
   => no objection to adjust pg dn/up to scroll a full page in
  'entire page' zoom level

 * PIVOTTABLE: unintuitive referencing in copying sheets
   + https://bugs.documentfoundation.org/show_bug.cgi?id=135825
   + omit $Sheet1 reference when creating in the same sheet
   => do it

 * SELECTION: Make it more visible, if a shape is not included
   into a selection (because its anchor is not included)
   + https://bugs.documentfoundation.org/show_bug.cgi?id=141210
   + show snap points on selection (like when clicked)
   => do it

 * RFE: Open a Standard filter as widget from Autofilter
   + https://bugs.documentfoundation.org/show_bug.cgi?id=141559
   + not adding the standard filter but removing a filter (Gabor)
 + ideally disabled when no further filter is used to
   have proper feedback
   => do it

 * Calc should display hint "internal calculation is done without rounding"
   + https://bugs.documentfoundation.org/show_bug.cgi?id=141292
   + common behavior, double calculation costs -> WF (MikeK)
   + "hide" option or rather have a separate section for those
 dangerous settings
   + could imagine a statusbar item that gives feedback and allows
 to switch + recalculating
   => keep open; better feedback welcome



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

[Libreoffice-commits] libcdr.git: src/lib

[Libreoffice Gerrit user]

 src/lib/CDRContentCollector.cpp |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit b14f6a1f17652aa842b23c66236610aea5233aa6
Author: Andrey Sobolev 
AuthorDate: Wed Sep 23 00:02:16 2020 +0500
Commit: Fridrich Štrba 
CommitDate: Wed Apr 14 20:06:28 2021 +0200

tdf#98994 Fixes parsing CDR7 files with no bbox surrounding text objects

As of now, libcdr gets the coordinates of a text object from the 
BoundingBox (bbox entry)
corresponding to the object. However, there are certain CDR version 700 
files that do not contain
bounding boxes for text objects. In this case the coordinates of the text 
object can be found from
the transform (trfd entry) for the text object. This commit provides the 
coordinates from trfd if
the bbox coordinates of the object are 0 (the case with no bbox).

Change-Id: I68a7aefbb8a8e2b24466f9dd3fd5e460e28ad9e7

diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index f1a5817..46e2fa6 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -452,6 +452,13 @@ void libcdr::CDRContentCollector::_flushCurrentPath()
 x2 = m_currentBBox.getMinX() + m_currentBBox.getWidth();
   }
 }
+else if (!m_currentTransforms.empty())
+{
+  x1 = m_currentTransforms.getTranslateX();
+  y1 = m_currentTransforms.getTranslateY();
+  x2 = x1;
+  y2 = y1;
+}
 
 CDRTransform tmpTrafo(1.0, 0.0, -m_page.offsetX, 0.0, 1.0, 
-m_page.offsetY);
 tmpTrafo.applyToPoint(x1, y1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski (via logerrit)]

 sw/source/core/inc/layact.hxx|5 ++---
 sw/source/core/layout/layact.cxx |   12 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit d6483eeafcf8183f437afaeaf4c241416faf8e44
Author: Jan-Marek Glogowski 
AuthorDate: Wed Apr 14 14:51:11 2021 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Wed Apr 14 19:42:28 2021 +0200

IsInput is equal to IsInterrupt, so drop it

Nobody is really interested in the reason for the interrupt.

And since we already checked IsInterrupt() to get in this
branch, mbFormatContentOnInterrupt is always true. Also because
we want to finish layouting the current page, especially on Idle,
according to commit aa355eeec8c5526c68b17d15192aef94062607d7
("#i42586# ... - finish format of current page on interrupt."),
so must ignore many (all?) IsInterrupt() checks.

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

diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index f46c090dbb20..2457dfa55a23 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -84,7 +84,7 @@ class SwLayAction
 bool m_bCalcLayout;// Complete reformatting?
 bool m_bAgain; // For the automatically repeated Action if Pages 
are deleted
 bool m_bNextCycle; // Reset on the first invalid Page
-bool m_bInput; // For terminating processing on input
+bool m_bInterrupt; // For terminating processing on interrupt
 bool m_bIdle;  // True if the LayAction was triggered by the Idler
 bool m_bReschedule;// Call Reschedule depending on Progress?
 bool m_bCheckPages;// Run CheckPageDescs() or delay it
@@ -137,12 +137,11 @@ public:
 
 bool IsWaitAllowed()const   { return m_bWaitAllowed; }
 bool IsNextCycle()  const   { return m_bNextCycle; }
-bool IsInput()  const   { return m_bInput; }
 bool IsPaint()  const   { return m_bPaint; }
 bool IsIdle()   const   { return m_bIdle;  }
 bool IsReschedule() const   { return m_bReschedule;  }
 bool IsPaintExtraData() const   { return m_bPaintExtraData;}
-bool IsInterrupt()  const   { return IsInput(); }
+bool IsInterrupt()  const   { return m_bInterrupt; }
 
 VclInputFlags GetInputType()const { return m_nInputType; }
 
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index c75dd034978c..e3063d59ff21 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -91,8 +91,8 @@ void SwLayAction::CheckWaitCursor()
 // Time over already?
 inline void SwLayAction::CheckIdleEnd()
 {
-if ( !IsInput() )
-m_bInput = bool(GetInputType()) && Application::AnyInput( 
GetInputType() );
+if (!IsInterrupt())
+m_bInterrupt = bool(GetInputType()) && 
Application::AnyInput(GetInputType());
 }
 
 void SwLayAction::SetStatBar( bool bNew )
@@ -267,7 +267,7 @@ SwLayAction::SwLayAction( SwRootFrame *pRt, SwViewShellImp 
*pI ) :
 {
 m_bPaintExtraData = ::IsExtraData( m_pImp->GetShell()->GetDoc() );
 m_bPaint = m_bComplete = m_bWaitAllowed = m_bCheckPages = true;
-m_bInput = m_bAgain = m_bNextCycle = m_bCalcLayout = m_bIdle = 
m_bReschedule =
+m_bInterrupt = m_bAgain = m_bNextCycle = m_bCalcLayout = m_bIdle = 
m_bReschedule =
 m_bUpdateExpFields = m_bBrowseActionStop = m_bActionInProgress = false;
 // init new flag .
 mbFormatContentOnInterrupt = false;
@@ -289,7 +289,7 @@ void SwLayAction::Reset()
 m_nInputType = VclInputFlags::NONE;
 m_nEndPage = m_nPreInvaPage = m_nCheckPageNum = USHRT_MAX;
 m_bPaint = m_bComplete = m_bWaitAllowed = m_bCheckPages = true;
-m_bInput = m_bAgain = m_bNextCycle = m_bCalcLayout = m_bIdle = 
m_bReschedule =
+m_bInterrupt = m_bAgain = m_bNextCycle = m_bCalcLayout = m_bIdle = 
m_bReschedule =
 m_bUpdateExpFields = m_bBrowseActionStop = false;
 m_pCurPage = nullptr;
 }
@@ -573,7 +573,7 @@ void SwLayAction::InternalAction(OutputDevice* 
pRenderContext)
 pPage->InvalidateFlyLayout();
 pPage->InvalidateFlyContent();
 if ( IsBrowseActionStop() )
-m_bInput = true;
+m_bInterrupt = true;
 }
 }
 if( bNoLoop )
@@ -687,7 +687,7 @@ void SwLayAction::InternalAction(OutputDevice* 
pRenderContext)
 pPg = pPg ? static_cast(pPg->GetPrev()) : pPage;
 
 // set flag for interrupt content formatting
-mbFormatContentOnInterrupt = IsInput();
+mbFormatContentOnInterrupt = true;
 tools::Long nBottom = rVis.Bottom();
 // #i42586

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

[Aditya Pratap Singh (via logerrit)]

 svtools/source/filter/exportdialog.cxx |   23 +
 svtools/source/filter/exportdialog.hxx |4 
 svtools/uiconfig/ui/graphicexport.ui   |  523 +
 3 files changed, 304 insertions(+), 246 deletions(-)

New commits:
commit b524e0f2636d7983dd5aba32b2fd3e61e08aac56
Author: Aditya Pratap Singh 
AuthorDate: Wed Mar 31 21:02:27 2021 +0530
Commit: Heiko Tietze 
CommitDate: Wed Apr 14 19:22:29 2021 +0200

tdf#115464 Added "prevent input" in export dialog

Change-Id: Ib3e863e4318a3877a36b8ae47dc9b09f3c4b8918
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113422
Tested-by: Jenkins
Reviewed-by: Aditya, Pratap Singh 
Reviewed-by: Heiko Tietze 

diff --git a/svtools/source/filter/exportdialog.cxx 
b/svtools/source/filter/exportdialog.cxx
index 86fd9fdfeff3..f611e291ec5b 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -600,6 +600,8 @@ ExportDialog::ExportDialog(FltCallDialogParameter& rPara,
 , mxRbBinary(m_xBuilder->weld_radio_button("binarycb"))
 , mxRbText(m_xBuilder->weld_radio_button("textcb"))
 , mxEPSGrid(m_xBuilder->weld_widget("epsgrid"))
+, mxModifyDimension(m_xBuilder->weld_radio_button("modifydimensionscb"))
+, mxModifyResolution(m_xBuilder->weld_radio_button("modifyresolutioncb"))
 , mxCbEPSPreviewTIFF(m_xBuilder->weld_check_button("tiffpreviewcb"))
 , mxCbEPSPreviewEPSI(m_xBuilder->weld_check_button("epsipreviewcb"))
 , mxRbEPSLevel1(m_xBuilder->weld_radio_button("level1rb"))
@@ -683,6 +685,9 @@ ExportDialog::ExportDialog(FltCallDialogParameter& rPara,
 
 mxCbSaveTransparency->connect_toggled( LINK( this, ExportDialog, UpdateHdl 
) );
 
+mxModifyDimension->connect_toggled( LINK( this, ExportDialog, UpdateLock ) 
);
+mxModifyResolution->connect_toggled( LINK( this, ExportDialog, UpdateLock 
) );
+
 mxCbEPSPreviewTIFF->connect_toggled( LINK( this, ExportDialog, UpdateHdl ) 
);
 mxCbEPSPreviewEPSI->connect_toggled( LINK( this, ExportDialog, UpdateHdl ) 
);
 
@@ -992,6 +997,24 @@ IMPL_LINK_NOARG(ExportDialog, UpdateHdl, 
weld::ToggleButton&, void)
 updateControls();
 }
 
+IMPL_LINK_NOARG(ExportDialog, UpdateLock, weld::ToggleButton&, void)
+{
+if (mxModifyResolution->get_active())
+{
+mxMfSizeY->set_sensitive(false);
+mxMfSizeX->set_sensitive(false);
+mxNfResolution->set_sensitive(true);
+}
+else
+{
+mxMfSizeY->set_sensitive(true);
+mxMfSizeX->set_sensitive(true);
+mxNfResolution->set_sensitive(false);
+}
+updateControls();
+}
+
+
 IMPL_LINK_NOARG(ExportDialog, UpdateHdlMtfSizeX, weld::SpinButton&, void)
 {
 double fRatio = static_cast< double >( maOriginalSize.Height ) / 
maOriginalSize.Width;
diff --git a/svtools/source/filter/exportdialog.hxx 
b/svtools/source/filter/exportdialog.hxx
index 137279ee6464..787329d16703 100644
--- a/svtools/source/filter/exportdialog.hxx
+++ b/svtools/source/filter/exportdialog.hxx
@@ -127,6 +127,8 @@ private:
 std::unique_ptr mxRbText;
 
 std::unique_ptr mxEPSGrid;
+std::unique_ptr mxModifyDimension;
+std::unique_ptr mxModifyResolution;
 std::unique_ptr mxCbEPSPreviewTIFF;
 std::unique_ptr mxCbEPSPreviewEPSI;
 std::unique_ptr mxRbEPSLevel1;
@@ -136,12 +138,14 @@ private:
 std::unique_ptr mxRbEPSCompressionLZW;
 std::unique_ptr mxRbEPSCompressionNone;
 
+
 std::unique_ptr mxInfo;
 std::unique_ptr mxFtEstimatedSize;
 
 std::unique_ptr mxBtnOK;
 
 DECL_LINK(UpdateHdl, weld::ToggleButton&, void);
+DECL_LINK(UpdateLock, weld::ToggleButton&, void);
 DECL_LINK(SelectListBoxHdl, weld::ComboBox&, void);
 DECL_LINK(SelectHdl, weld::SpinButton&, void);
 DECL_LINK(UpdateHdlMtfSizeX, weld::SpinButton&, void);
diff --git a/svtools/uiconfig/ui/graphicexport.ui 
b/svtools/uiconfig/ui/graphicexport.ui
index 2ecdf48f9ddd..db4f9fc1db78 100644
--- a/svtools/uiconfig/ui/graphicexport.ui
+++ b/svtools/uiconfig/ui/graphicexport.ui
@@ -1,60 +1,60 @@
 
-
+
 
   
   
 1
 100
 75
-1
-10
+1
+10
   
   
 1
 9
 9
-1
-10
+1
+10
   
   
 9.99
-1
-10
+1
+10
   
   
 9.99
-1
-10
+1
+10
   
   
 9
-1
-10
+1
+10
   
   
-False
-6
+False
+6
 %1 Options
 False
 True
-0
-0
-dialog
+0
+0
+dialog
 
   
-False
+False
 vertical
 12
 
   
-False
-end
+False
+end
 
   
 _Help
 True
-True
-True
+True
+True
 True
   
   
@@ -67,10 +67,10 @@
   
 _OK
 True
-True
-True
-True
-

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

[Miklos Vajna (via logerrit)]

 sw/source/core/inc/txmsrt.hxx |2 +-
 sw/source/core/tox/txmsrt.cxx |   22 --
 2 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit 21f7dc039027d8617a7032fea984f5d6e0c29de3
Author: Miklos Vajna 
AuthorDate: Wed Apr 14 18:31:32 2021 +0200
Commit: Miklos Vajna 
CommitDate: Wed Apr 14 19:17:39 2021 +0200

sw bibliography, refer to a page: also de-duplicate relative URLs

Relative URLs have to be converted to absolute ones, otherwise
INetURLObject can't clear the mark (fragment) part of it. Then convert
back, so the document remains portable.

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

diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx
index 873e683c451e..ac89aab96c1b 100644
--- a/sw/source/core/inc/txmsrt.hxx
+++ b/sw/source/core/inc/txmsrt.hxx
@@ -299,7 +299,7 @@ public:
 OUString GetText(sal_uInt16 nAuthField, const SwRootFrame* pLayout) const;
 
 /// Gets the URL of the underlying SwAuthEntry, ignoring its page number.
-static OUString GetSourceURL(const OUString& rText);
+OUString GetSourceURL(const OUString& rText) const;
 };
 
 #endif // INCLUDED_SW_SOURCE_CORE_INC_TXMSRT_HXX
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index 881ea6e3c686..dade7ad0c5b2 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -42,6 +42,7 @@
 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -842,15 +843,32 @@ OUString SwTOXAuthority::GetText(sal_uInt16 nAuthField, 
const SwRootFrame* pLayo
 return sText;
 }
 
-OUString SwTOXAuthority::GetSourceURL(const OUString& rText)
+OUString SwTOXAuthority::GetSourceURL(const OUString& rText) const
 {
 OUString aText = rText;
-INetURLObject aObject(aText);
+
+SwDoc* pDoc = 
static_cast(m_rField.GetField()->GetTyp())->GetDoc();
+SwDocShell* pDocShell = pDoc->GetDocShell();
+OUString aBasePath = pDocShell->getDocumentBaseURL();
+OUString aAbs
+= INetURLObject::GetAbsURL(aBasePath, aText, 
INetURLObject::EncodeMechanism::WasEncoded,
+   
INetURLObject::DecodeMechanism::WithCharset);
+bool bRelative = aAbs != aText;
+
+INetURLObject aObject(aAbs);
 if (aObject.GetMark().startsWith("page="))
 {
 aObject.SetMark(OUString());
 aText = aObject.GetMainURL(INetURLObject::DecodeMechanism::NONE);
 }
+
+if (bRelative)
+{
+aText
+= INetURLObject::GetRelURL(aBasePath, aText, 
INetURLObject::EncodeMechanism::WasEncoded,
+   
INetURLObject::DecodeMechanism::WithCharset);
+}
+
 return aText;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 filter/source/pdf/pdfexport.cxx  |2 +-
 sc/qa/unit/subsequent_export-test.cxx|2 +-
 sc/qa/unit/tiledrendering/tiledrendering.cxx |2 +-
 sc/qa/unit/uicalc/uicalc.cxx |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0da9ed723c713fd327dcc4225ffdddae9ad10939
Author: Andrea Gelmini 
AuthorDate: Wed Apr 14 14:49:44 2021 +0200
Commit: Julien Nabet 
CommitDate: Wed Apr 14 18:58:39 2021 +0200

Fix typos

Change-Id: I93008d534b9b677ed131e4302e5df4391db4cafd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114090
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 87cd58578db7..f0b1c74cbc62 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -1080,7 +1080,7 @@ void PDFExport::ImplExportPage( vcl::PDFWriter& rWriter, 
vcl::PDFExtOutDevData&
   false, true, 
mbReduceImageResolution );
 // tdf#134736 if the metafile was replaced then rPDFExtOutDevData's 
PageSyncData mActions
 // all still point to MetaAction indexes in the original metafile that 
are now invalid.
-// Throw them all way in the absence of a way to reposition them to 
new positions of
+// Throw them all away in the absence of a way to reposition them to 
new positions of
 // their replacements.
 if (aCtx.m_bTransparenciesWereRemoved)
 rPDFExtOutDevData.ResetSyncData();
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index c7af15f9003e..1c17b2f527c1 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -4441,7 +4441,7 @@ void ScExportTest::testTdf107586()
 xmlDocUniquePtr pSheet = XPathHelper::parseExport2(*this, *xDocSh, 
m_xSFactory, "xl/worksheets/sheet1.xml", FORMAT_XLSX);
 CPPUNIT_ASSERT(pSheet);
 
-// Without the fix in place, this test would haved failed with
+// Without the fix in place, this test would have failed with
 // XPath '/x:worksheet/x:sheetPr/x:tabColor' number of nodes is incorrect
 assertXPath(pSheet, "/x:worksheet/x:sheetPr/x:tabColor", "rgb", 
"FF9BBB59");
 
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx 
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 5e3f1494059d..a87026735f5c 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1646,7 +1646,7 @@ void ScTiledRenderingTest::testFunctionDlg()
 SfxViewShell* pView2 = SfxViewShell::Current();
 CPPUNIT_ASSERT(pView1 != pView2);
 
-// check loking
+// check locking
 CPPUNIT_ASSERT_EQUAL(true, 
pView1->GetViewFrame()->GetDispatcher()->IsLocked());
 CPPUNIT_ASSERT_EQUAL(false, 
pView2->GetViewFrame()->GetDispatcher()->IsLocked());
 
diff --git a/sc/qa/unit/uicalc/uicalc.cxx b/sc/qa/unit/uicalc/uicalc.cxx
index 48cde55df479..90a412d4588e 100644
--- a/sc/qa/unit/uicalc/uicalc.cxx
+++ b/sc/qa/unit/uicalc/uicalc.cxx
@@ -1126,7 +1126,7 @@ CPPUNIT_TEST_FIXTURE(ScUiCalcTest, testTdf112884)
 
 dispatchCommand(mxComponent, ".uno:RecalcPivotTable", {});
 
-// Without the fix in place, this test would haved failed with
+// Without the fix in place, this test would have failed with
 // - Expected: #DIV/0!
 // - Actual  : 0.5
 CPPUNIT_ASSERT_EQUAL(OUString("#DIV/0!"), pDoc->GetString(ScAddress(6, 2, 
0)));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Luboš Luňák (via logerrit)]

 vcl/skia/gdiimpl.cxx |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

New commits:
commit aa03f1a564abf967a60a284f5656fb2f2efb977f
Author: Luboš Luňák 
AuthorDate: Wed Apr 14 14:58:32 2021 +0200
Commit: Luboš Luňák 
CommitDate: Wed Apr 14 18:54:54 2021 +0200

SkBlendMode::kDifference causes AMD/Linux driver instability

Change-Id: I70de779c20185ac6efe8da7ad197c5e4c68a8d23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114091
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index e2d4ff9a3800..145bbf19cc4c 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -1434,7 +1434,14 @@ void SkiaSalGraphicsImpl::invert(basegfx::B2DPolygon 
const& rPoly, SalInvert eFl
 // with SkBlendMode::kDifference(?) and surfaces wider than 1024 pixels, 
resulting
 // in drawing errors. Work that around by fetching the relevant part of 
the surface
 // and drawing using CPU.
-bool intelHack = (isGPU() && getVendor() == DriverBlocklist::VendorIntel 
&& !mXorMode);
+bool rasterHack = (isGPU() && getVendor() == DriverBlocklist::VendorIntel 
&& !mXorMode);
+#if defined LINUX
+// BackendTest::testDrawInvertTrackFrameWithRectangle() also has a problem
+// with SkBlendMode::kDifference on AMD/Linux, leading to crashes or even
+// driver instability. Also work around by drawing using CPU.
+if (isGPU() && getVendor() == DriverBlocklist::VendorAMD && !mXorMode)
+rasterHack = true;
+#endif
 SkPath aPath;
 addPolygonToPath(rPoly, aPath);
 aPath.setFillType(SkPathFillType::kEvenOdd);
@@ -1454,7 +1461,7 @@ void SkiaSalGraphicsImpl::invert(basegfx::B2DPolygon 
const& rPoly, SalInvert eFl
 aPaint.setPathEffect(SkDashPathEffect::Make(intervals, 
SK_ARRAY_COUNT(intervals), 0));
 aPaint.setColor(SkColorSetARGB(255, 255, 255, 255));
 aPaint.setBlendMode(SkBlendMode::kDifference);
-if (!intelHack)
+if (!rasterHack)
 getDrawCanvas()->drawPath(aPath, aPaint);
 else
 {
@@ -1505,7 +1512,7 @@ void SkiaSalGraphicsImpl::invert(basegfx::B2DPolygon 
const& rPoly, SalInvert eFl
 aPaint.setShader(
 aBitmap.makeShader(SkTileMode::kRepeat, SkTileMode::kRepeat, 
SkSamplingOptions()));
 }
-if (!intelHack)
+if (!rasterHack)
 getDrawCanvas()->drawPath(aPath, aPaint);
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/update_pch download.lst external/skia vcl/skia

[Luboš Luňák (via logerrit)]

 bin/update_pch|3 -
 download.lst  |4 -
 external/skia/Library_skia.mk |   54 
 external/skia/UnpackedTarball_skia.mk |4 +
 external/skia/c++20.patch.0   |   17 ++
 external/skia/constexpr-debug-std-max.patch.1 |   14 ++---
 external/skia/fix-gcc-x86.patch.1 |   16 ++
 external/skia/fix-pch.patch.1 |   25 ++---
 external/skia/inc/pch/precompiled_skia.hxx|   67 +-
 vcl/skia/gdiimpl.cxx  |   13 +
 10 files changed, 145 insertions(+), 72 deletions(-)

New commits:
commit 302fb4c1ec4a24112f9a2028be4d424891f10b4c
Author: Luboš Luňák 
AuthorDate: Wed Apr 14 14:29:20 2021 +0200
Commit: Luboš Luňák 
CommitDate: Wed Apr 14 18:54:32 2021 +0200

Revert "update Skia to chrome/m91" (tdf#141680)

The m91 snapshot seems to cause a number of Vulkan problems.
My commit already worked around one, but there are apparently
others, such as very slow startup, or a failed Skia assertion
triggered by VCL Skia's copyArea().

This reverts commit 09d850e46903a528d4b08d3fdf03c3964d79fbc5.

Change-Id: I4f1832ba76db15cab8eccbe115d21c989da3c841
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114089
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/bin/update_pch b/bin/update_pch
index a20c85f88f36..e47a97994bb2 100755
--- a/bin/update_pch
+++ b/bin/update_pch
@@ -474,8 +474,7 @@ def filter_ignore(line, module):
 'src/sksl/SkSLCPP.h',
 'src/gpu/vk/GrVkAMDMemoryAllocator.h',
 'src/gpu/GrUtil.h',
-'src/sksl/dsl/', # conflict between SkSL::Expression and 
SkSL::dsl::Expression
-'include/sksl/',
+'src/sksl/dsl/',
 ]
 
 for i in ignore_list:
diff --git a/download.lst b/download.lst
index 3355422c9987..cf97f1ff8d3c 100644
--- a/download.lst
+++ b/download.lst
@@ -235,8 +235,8 @@ export RHINO_SHA256SUM := 
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131
 export RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 export SERF_SHA256SUM := 
6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700
 export SERF_TARBALL := serf-1.2.1.tar.bz2
-export SKIA_SHA256SUM := 
cf90e16d8a093d6cb5756d515c98397c98ca2bb00b7c28cf0e884aa4e9ed7a82
-export SKIA_TARBALL := skia-m91-b99622c05aa071606921ab35a4b59fba5305669d.tar.xz
+export SKIA_SHA256SUM := 
abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d
+export SKIA_TARBALL := skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz
 export STAROFFICE_SHA256SUM := 
f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db
 export STAROFFICE_VERSION_MICRO := 7
 export STAROFFICE_TARBALL := 
libstaroffice-0.0.$(STAROFFICE_VERSION_MICRO).tar.xz
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index f57e6378de2d..a1f1f1c30ef6 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -339,6 +339,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/effects/imagefilters/SkComposeImageFilter \
 UnpackedTarball/skia/src/effects/imagefilters/SkDisplacementMapImageFilter 
\
 UnpackedTarball/skia/src/effects/imagefilters/SkDropShadowImageFilter \
+UnpackedTarball/skia/src/effects/imagefilters/SkImageFilters \
 UnpackedTarball/skia/src/effects/imagefilters/SkImageImageFilter \
 UnpackedTarball/skia/src/effects/imagefilters/SkLightingImageFilter \
 UnpackedTarball/skia/src/effects/imagefilters/SkMagnifierImageFilter \
@@ -361,6 +362,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/effects/SkLumaColorFilter \
 UnpackedTarball/skia/src/effects/SkOpPathEffect \
 UnpackedTarball/skia/src/effects/SkOverdrawColorFilter \
+UnpackedTarball/skia/src/effects/SkPackBits \
 UnpackedTarball/skia/src/effects/SkShaderMaskFilter \
 UnpackedTarball/skia/src/effects/SkTableColorFilter \
 UnpackedTarball/skia/src/effects/SkTableMaskFilter \
@@ -429,7 +431,6 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/shaders/SkPictureShader \
 UnpackedTarball/skia/src/shaders/SkShader \
 UnpackedTarball/skia/src/sksl/dsl/DSLBlock \
-UnpackedTarball/skia/src/sksl/dsl/DSLCase \
 UnpackedTarball/skia/src/sksl/dsl/DSLCore \
 UnpackedTarball/skia/src/sksl/dsl/DSLExpression \
 UnpackedTarball/skia/src/sksl/dsl/DSLFunction \
@@ -438,42 +439,25 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,skia,\
 UnpackedTarball/skia/src/sksl/dsl/DSLVar \
 UnpackedTarball/skia/src/sksl/dsl/priv/DSLFPs \
 UnpackedTarball/skia/src/sksl/dsl/priv/DSLWriter \
-UnpackedTarball/skia/src/sksl/ir/SkSLBinaryExpression \
-UnpackedTarball/skia/src/sksl/ir/SkSLBl

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

[Michael Stahl (via logerrit)]

 sw/qa/core/layout/layout.cxx   |   24 ++--
 sw/qa/core/objectpositioning/objectpositioning.cxx |   42 -
 sw/qa/extras/layout/layout2.cxx|   37 +++---
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx   |8 ++--
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx |6 +--
 sw/qa/extras/ooxmlexport/ooxmlexport15.cxx |4 +-
 sw/qa/extras/ooxmlexport/ooxmlexport3.cxx  |   10 ++---
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx  |6 +--
 sw/qa/extras/ooxmlexport/ooxmlexport6.cxx  |6 +--
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |2 -
 sw/qa/extras/ooxmlimport/ooxmlimport2.cxx  |4 +-
 sw/qa/extras/uiwriter/uiwriter2.cxx|2 -
 sw/source/core/text/xmldump.cxx|   21 ++
 13 files changed, 104 insertions(+), 68 deletions(-)

New commits:
commit 3d64587c53eea47674d51e84622a167db1635909
Author: Michael Stahl 
AuthorDate: Tue Apr 13 20:04:27 2021 +0200
Commit: Michael Stahl 
CommitDate: Wed Apr 14 18:54:14 2021 +0200

sw: layout dump: sorted_objs of SwPageFrame

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

diff --git a/sw/qa/core/layout/layout.cxx b/sw/qa/core/layout/layout.cxx
index 794752206035..f1880bffab67 100644
--- a/sw/qa/core/layout/layout.cxx
+++ b/sw/qa/core/layout/layout.cxx
@@ -163,12 +163,12 @@ CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, 
testAnchorPositionBasedOnParagraph)
 load(DATA_DIRECTORY, "tdf134783_testAnchorPositionBasedOnParagraph.fodt");
 xmlDocUniquePtr pXmlDoc = parseLayoutDump();
 CPPUNIT_ASSERT(pXmlDoc);
-assertXPath(pXmlDoc, "(//SwAnchoredDrawObject)[1]/bounds", "top", "1671");
-assertXPath(pXmlDoc, "(//SwAnchoredDrawObject)[1]/bounds", "bottom", 
"1732");
-assertXPath(pXmlDoc, "(//SwAnchoredDrawObject)[2]/bounds", "top", "1947");
-assertXPath(pXmlDoc, "(//SwAnchoredDrawObject)[2]/bounds", "bottom", 
"2008");
-assertXPath(pXmlDoc, "(//SwAnchoredDrawObject)[3]/bounds", "top", "3783");
-assertXPath(pXmlDoc, "(//SwAnchoredDrawObject)[3]/bounds", "bottom", 
"3844");
+assertXPath(pXmlDoc, "(//anchored/SwAnchoredDrawObject)[1]/bounds", "top", 
"1671");
+assertXPath(pXmlDoc, "(//anchored/SwAnchoredDrawObject)[1]/bounds", 
"bottom", "1732");
+assertXPath(pXmlDoc, "(//anchored/SwAnchoredDrawObject)[2]/bounds", "top", 
"1947");
+assertXPath(pXmlDoc, "(//anchored/SwAnchoredDrawObject)[2]/bounds", 
"bottom", "2008");
+assertXPath(pXmlDoc, "(//anchored/SwAnchoredDrawObject)[3]/bounds", "top", 
"3783");
+assertXPath(pXmlDoc, "(//anchored/SwAnchoredDrawObject)[3]/bounds", 
"bottom", "3844");
 }
 
 CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, testTextBoxStaysInsideShape)
@@ -181,8 +181,8 @@ CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, 
testTextBoxStaysInsideShape)
 // Without the fix in place, this test would have failed with
 // - Expected: 1932
 // - Actual  : 7476
-assertXPath(pXmlDoc, "//fly/infos/bounds", "top", "1932");
-assertXPath(pXmlDoc, "//fly/infos/bounds", "bottom", "7184");
+assertXPath(pXmlDoc, "//anchored/fly/infos/bounds", "top", "1932");
+assertXPath(pXmlDoc, "//anchored/fly/infos/bounds", "bottom", "7184");
 }
 
 CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, testTextBoxNotModifiedOnOpen)
@@ -210,10 +210,10 @@ CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, 
testTextBoxAutoGrowVertical)
 discardDumpedLayout();
 xmlDocUniquePtr pLayout = parseLayoutDump();
 CPPUNIT_ASSERT(pLayout);
-sal_Int32 nFlyLeft = getXPath(pLayout, "//fly/infos/bounds", 
"left").toInt32();
-sal_Int32 nFlyTop = getXPath(pLayout, "//fly/infos/bounds", 
"top").toInt32();
-sal_Int32 nFlyRight = getXPath(pLayout, "//fly/infos/bounds", 
"right").toInt32();
-sal_Int32 nFlyBottom = getXPath(pLayout, "//fly/infos/bounds", 
"bottom").toInt32();
+sal_Int32 nFlyLeft = getXPath(pLayout, "//anchored/fly/infos/bounds", 
"left").toInt32();
+sal_Int32 nFlyTop = getXPath(pLayout, "//anchored/fly/infos/bounds", 
"top").toInt32();
+sal_Int32 nFlyRight = getXPath(pLayout, "//anchored/fly/infos/bounds", 
"right").toInt32();
+sal_Int32 nFlyBottom = getXPath(pLayout, "//anchored/fly/infos/bounds", 
"bottom").toInt32();
 tools::Rectangle aFlyRect(nFlyLeft, nFlyTop, nFlyRight, nFlyBottom);
 // Without the accompanying fix in place, this test would have failed, as 
aFlyRect was too wide,
 // so it was not inside aShapeRect anymore.
diff --git a/sw/qa/core/objectpositioning/objectpositioning.cxx 
b/sw/qa/core/objectpositioning/objectpositioning.cxx
index 9817b9b05233..7c91bc797512 100644
--- a/sw/qa/core/objectpositioning/objectpositioning.cxx
+++ b/sw/qa/core/objectpositioning/objectpositioning.cxx
@@ -65,7 +65,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreObjectpositioningTest, 
testVertPosFromBottom)
 xmlD

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

[Mike Kaganski (via logerrit)]

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

New commits:
commit b9b3c4abb5172503723e6189f994dddf71c62933
Author: Mike Kaganski 
AuthorDate: Wed Apr 14 17:32:41 2021 +0200
Commit: Mike Kaganski 
CommitDate: Wed Apr 14 18:45:26 2021 +0200

Use mpStream consistently

I had to check above that pStream indeed points to same object
as mpStream, which is dereferenced in all other cases.

Change-Id: Ib31fad9c163ae828afbcf657b0922bae1b1ed16a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114002
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx 
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 9ab9bb937bce..8d959dc0119f 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -101,7 +101,7 @@ void OOXMLDocumentImpl::resolveFastSubStream(Stream & 
rStreamHandler,
 xParser->setFastDocumentHandler(pDocHandler);
 xParser->setTokenHandler(xTokenHandler);
 
-uno::Reference xInputStream = 
pStream->getDocumentStream();
+uno::Reference xInputStream = 
mpStream->getDocumentStream();
 
 if (xInputStream.is())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Alain Romedenne (via logerrit)]

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

New commits:
commit 04a29aa1a02406a8c5ab337f98e4869ba72c8ff9
Author: Alain Romedenne 
AuthorDate: Wed Apr 14 18:44:22 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Apr 14 18:44:22 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 49d33b45fd6c0d6b4c514a95bb5aceab37199abf
  - Typo in sf_forms

Change-Id: I8a70e9b81713a049f1e3ea96fd1dd8faefb0c615
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/114003
Tested-by: Jenkins
Reviewed-by: Rafael Lima 

diff --git a/helpcontent2 b/helpcontent2
index 5ba538ce7121..49d33b45fd6c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5ba538ce7121b2733824ff71f0e553d004429247
+Subproject commit 49d33b45fd6c0d6b4c514a95bb5aceab37199abf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Alain Romedenne (via logerrit)]

 source/text/sbasic/shared/03/sf_form.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 49d33b45fd6c0d6b4c514a95bb5aceab37199abf
Author: Alain Romedenne 
AuthorDate: Wed Apr 14 17:33:09 2021 +0200
Commit: Rafael Lima 
CommitDate: Wed Apr 14 18:44:22 2021 +0200

Typo in sf_forms

Change-Id: I8a70e9b81713a049f1e3ea96fd1dd8faefb0c615
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/114003
Tested-by: Jenkins
Reviewed-by: Rafael Lima 

diff --git a/source/text/sbasic/shared/03/sf_form.xhp 
b/source/text/sbasic/shared/03/sf_form.xhp
index 2ca860c7a..955f0bc80 100644
--- a/source/text/sbasic/shared/03/sf_form.xhp
+++ b/source/text/sbasic/shared/03/sf_form.xhp
@@ -568,7 +568,7 @@
  'Activates the 
form
  myForm.Activate()

-   To use the method 
Activate with other %PRODUCTNAME documents, read Service inovcation above.
+   To use the method 
Activate with other %PRODUCTNAME documents, read Service invocation above.
   ThisComponent is valid 
for Calc and Writer documents. For Base documents use 
ThisDataBaseDocument.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 tools/source/generic/poly.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2f752afbb075c4caa67697d9e8b249ae29824bbe
Author: Caolán McNamara 
AuthorDate: Wed Apr 14 15:31:04 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 14 18:33:16 2021 +0200

ofz#33235 Integer-overflow

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

diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 9d06055150b4..e482528b9ab1 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -57,7 +57,7 @@
 static double ImplGetParameter( const Point& rCenter, const Point& rPt, double 
fWR, double fHR )
 {
 const tools::Long nDX = rPt.X() - rCenter.X();
-double fAngle = atan2( -rPt.Y() + rCenter.Y(), ( ( nDX == 0 ) ? 
0.1 : nDX ) );
+double fAngle = atan2( o3tl::saturating_toggle_sign(rPt.Y()) + 
rCenter.Y(), ( ( nDX == 0 ) ? 0.1 : nDX ) );
 
 return atan2(fWR*sin(fAngle), fHR*cos(fAngle));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 svx/source/customshapes/EnhancedCustomShapeEngine.cxx |   57 ++
 1 file changed, 22 insertions(+), 35 deletions(-)

New commits:
commit d20f118dbcef41f6e3613d3ad947af48be4fd34e
Author: Noel Grandin 
AuthorDate: Wed Apr 14 15:16:54 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 14 18:32:46 2021 +0200

static_cast after dynamic_cast

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

diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx 
b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 8e12ad83672d..28684e59e5c7 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -263,25 +263,21 @@ void SetTemporary( uno::Reference< drawing::XShape > 
const & xShape )
 
 Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render()
 {
-const bool bIsSdrObjCustomShape(nullptr != dynamic_cast< 
SdrObjCustomShape* >(GetSdrObjectFromXShape(mxShape)));
+SdrObjCustomShape* pSdrObjCustomShape = dynamic_cast< SdrObjCustomShape* 
>(GetSdrObjectFromXShape(mxShape));
 
-if(!bIsSdrObjCustomShape)
+if(!pSdrObjCustomShape)
 {
 return Reference< drawing::XShape >();
 }
 
-SdrObjCustomShape& rSdrObjCustomShape(
-static_cast< SdrObjCustomShape& >(
-*GetSdrObjectFromXShape(mxShape)));
-
 // retrieving the TextPath property to check if feature is enabled
-const SdrCustomShapeGeometryItem& 
rGeometryItem(rSdrObjCustomShape.GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ));
+const SdrCustomShapeGeometryItem& 
rGeometryItem(pSdrObjCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY 
));
 bool bTextPathOn = false;
 const uno::Any* pAny = rGeometryItem.GetPropertyValueByName( "TextPath", 
"TextPath" );
 if ( pAny )
 *pAny >>= bTextPathOn;
 
-EnhancedCustomShape2d aCustomShape2d(rSdrObjCustomShape);
+EnhancedCustomShape2d aCustomShape2d(*pSdrObjCustomShape);
 Degree100 nRotateAngle = aCustomShape2d.GetRotateAngle();
 
 bool bFlipV = aCustomShape2d.IsFlipVert();
@@ -296,14 +292,14 @@ Reference< drawing::XShape > SAL_CALL 
EnhancedCustomShapeEngine::render()
 std::unique_ptr xRenderedFontWork(
 EnhancedCustomShapeFontWork::CreateFontWork(
 xRenderedShape.get(),
-rSdrObjCustomShape));
+*pSdrObjCustomShape));
 
 if (xRenderedFontWork)
 {
 xRenderedShape = std::move(xRenderedFontWork);
 }
 }
-std::unique_ptr 
xRenderedShape3d(EnhancedCustomShape3d::Create3DObject(xRenderedShape.get(), 
rSdrObjCustomShape));
+std::unique_ptr 
xRenderedShape3d(EnhancedCustomShape3d::Create3DObject(xRenderedShape.get(), 
*pSdrObjCustomShape));
 if (xRenderedShape3d)
 {
 bFlipV = bFlipH = false;
@@ -311,8 +307,8 @@ Reference< drawing::XShape > SAL_CALL 
EnhancedCustomShapeEngine::render()
 xRenderedShape = std::move(xRenderedShape3d);
 }
 
-tools::Rectangle aRect(rSdrObjCustomShape.GetSnapRect());
-const GeoStat& rGeoStat(rSdrObjCustomShape.GetGeoStat());
+tools::Rectangle aRect(pSdrObjCustomShape->GetSnapRect());
+const GeoStat& rGeoStat(pSdrObjCustomShape->GetGeoStat());
 
 if ( rGeoStat.nShearAngle )
 {
@@ -324,10 +320,10 @@ Reference< drawing::XShape > SAL_CALL 
EnhancedCustomShapeEngine::render()
 nTan = -nTan;
 }
 
-xRenderedShape->Shear(rSdrObjCustomShape.GetSnapRect().Center(), 
nShearAngle, nTan, false);
+xRenderedShape->Shear(pSdrObjCustomShape->GetSnapRect().Center(), 
nShearAngle, nTan, false);
 }
 if(nRotateAngle )
-
xRenderedShape->NbcRotate(rSdrObjCustomShape.GetSnapRect().Center(), 
nRotateAngle);
+
xRenderedShape->NbcRotate(pSdrObjCustomShape->GetSnapRect().Center(), 
nRotateAngle);
 if ( bFlipV )
 {
 Point aLeft( aRect.Left(), ( aRect.Top() + aRect.Bottom() ) >> 1 );
@@ -341,14 +337,14 @@ Reference< drawing::XShape > SAL_CALL 
EnhancedCustomShapeEngine::render()
 xRenderedShape->NbcMirror( aTop, aBottom );
 }
 
-xRenderedShape->NbcSetStyleSheet(rSdrObjCustomShape.GetStyleSheet(), 
true);
+xRenderedShape->NbcSetStyleSheet(pSdrObjCustomShape->GetStyleSheet(), 
true);
 xRenderedShape->RecalcSnapRect();
 }
 
 if ( mbForceGroupWithText )
 {
 xRenderedShape = ImplForceGroupWithText(
-rSdrObjCustomShape,
+*pSdrObjCustomShape,
 std::move(xRenderedShape));
 }
 
@@ -370,16 +366,13 @@ Reference< drawing::XShape > SAL_CALL 
EnhancedCustomShapeEngine::render()
 awt::Rectangle SAL_CALL EnhancedCustomShapeEngine::getTe

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

[Noel Grandin (via logerrit)]

 oox/inc/drawingml/textliststyle.hxx |2 +-
 oox/inc/drawingml/textparagraph.hxx |2 +-
 oox/inc/drawingml/textparagraphproperties.hxx   |4 
 oox/source/drawingml/shape.cxx  |4 ++--
 oox/source/drawingml/textbody.cxx   |2 +-
 oox/source/drawingml/textliststyle.cxx  |   17 ++---
 oox/source/drawingml/textliststylecontext.cxx   |   24 
 oox/source/drawingml/textparagraph.cxx  |   12 ++--
 oox/source/ppt/presentationfragmenthandler.cxx  |4 ++--
 oox/source/ppt/slidemastertextstylescontext.cxx |2 +-
 oox/source/ppt/slidepersist.cxx |2 +-
 11 files changed, 33 insertions(+), 42 deletions(-)

New commits:
commit 94afb3663b1618b66daa7cc7199cbd5c9f387e0f
Author: Noel Grandin 
AuthorDate: Wed Apr 14 13:11:22 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 14 18:32:26 2021 +0200

reduce allocation in TextListStyle some more

These child objects do not need to use shared_ptr, since no-one
else holds a pointer to them, and we always allocate them, so
just allocate them inline the parent object.

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

diff --git a/oox/inc/drawingml/textliststyle.hxx 
b/oox/inc/drawingml/textliststyle.hxx
index ac84cc9d903d..cd770457575f 100644
--- a/oox/inc/drawingml/textliststyle.hxx
+++ b/oox/inc/drawingml/textliststyle.hxx
@@ -27,7 +27,7 @@
 namespace oox::drawingml
 {
 constexpr int NUM_TEXT_LIST_STYLE_ENTRIES = 9;
-typedef std::array, 
NUM_TEXT_LIST_STYLE_ENTRIES>
+typedef std::array
 TextParagraphPropertiesArray;
 
 class TextListStyle
diff --git a/oox/inc/drawingml/textparagraph.hxx 
b/oox/inc/drawingml/textparagraph.hxx
index 5139c51b9b26..df39f8841c76 100644
--- a/oox/inc/drawingml/textparagraph.hxx
+++ b/oox/inc/drawingml/textparagraph.hxx
@@ -61,7 +61,7 @@ public:
 const TextCharacterProperties& rTextStyleProperties,
 const TextListStyle& rTextListStyle) const;
 
-TextParagraphPropertiesPtr  getParagraphStyle(
+TextParagraphProperties*  getParagraphStyle(
 const TextListStyle& rTextListStyle) const;
 
 voidinsertAt(
diff --git a/oox/inc/drawingml/textparagraphproperties.hxx 
b/oox/inc/drawingml/textparagraphproperties.hxx
index 7dd41610024b..dd508179c13d 100644
--- a/oox/inc/drawingml/textparagraphproperties.hxx
+++ b/oox/inc/drawingml/textparagraphproperties.hxx
@@ -33,10 +33,6 @@ namespace com::sun::star {
 
 namespace oox::drawingml {
 
-class TextParagraphProperties;
-
-typedef std::shared_ptr< TextParagraphProperties > TextParagraphPropertiesPtr;
-
 class BulletList
 {
 public:
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 819d117d4fa9..729fb3c3712f 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1050,8 +1050,8 @@ Reference< XShape > const & Shape::createAndInsert(
 mpTextBody->getTextProperties().pushRotationAdjustments();
 aShapeProps.assignUsed( 
mpTextBody->getTextProperties().maPropertyMap );
 // Push char properties as well - specifically useful when this is 
a placeholder
-if( mpMasterTextListStyle &&  
mpMasterTextListStyle->getListStyle()[0]->getTextCharacterProperties().moHeight.has()
 )
-aShapeProps.setProperty(PROP_CharHeight, GetFontHeight( 
mpMasterTextListStyle->getListStyle()[0]->getTextCharacterProperties().moHeight.get()
 ));
+if( mpMasterTextListStyle &&  
mpMasterTextListStyle->getListStyle()[0].getTextCharacterProperties().moHeight.has()
 )
+aShapeProps.setProperty(PROP_CharHeight, GetFontHeight( 
mpMasterTextListStyle->getListStyle()[0].getTextCharacterProperties().moHeight.get()
 ));
 }
 
 // applying properties
diff --git a/oox/source/drawingml/textbody.cxx 
b/oox/source/drawingml/textbody.cxx
index 4c5495e6c040..c6abacf7d485 100644
--- a/oox/source/drawingml/textbody.cxx
+++ b/oox/source/drawingml/textbody.cxx
@@ -119,7 +119,7 @@ void TextBody::ApplyStyleEmpty(
 aTextCharacterProps.pushToPropSet(aPropSet, rFilterBase);
 
 // Apply paragraph properties
-TextParagraphPropertiesPtr pTextParagraphStyle = 
maParagraphs[0]->getParagraphStyle(aCombinedTextStyle);
+TextParagraphProperties* pTextParagraphStyle = 
maParagraphs[0]->getParagraphStyle(aCombinedTextStyle);
 if (pTextParagraphStyle)
 {
 Reference< XPropertySet > xProps(xText, UNO_QUERY);
diff --git a/oox/source/drawingml/textliststyle.cxx 
b/oox/source/drawingml/textliststyle.cxx
index da170cae03eb..0b757159e5bc 100644
--- a/oox/source/drawingml/textliststyle.cxx
+++ b/oox/source/drawingml/textliststyle.cxx
@@ -24,11 +24,6 @@ namespace oox::drawingml {
 
 TextListStyle::TextListStyle()
 {
-for ( 

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

[Noel Grandin (via logerrit)]

 svx/source/svdraw/svdoashp.cxx |   33 +
 1 file changed, 17 insertions(+), 16 deletions(-)

New commits:
commit 67067c3fd017bd0d5cb91218c4ee4befd0f824ba
Author: Noel Grandin 
AuthorDate: Wed Apr 14 15:04:43 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 14 17:05:50 2021 +0200

avoid creating an SfxItemSet here

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

diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 855d6e0e12ec..409915bc1c8a 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -1376,12 +1376,21 @@ void SdrObjCustomShape::AdaptTextMinSize()
 if (getSdrModelFromSdrObject().IsCreatingDataObj() || 
getSdrModelFromSdrObject().IsPasteResize())
 return;
 
+// check if we need to change anything before creating an SfxItemSet, 
because that is expensive
 const bool 
bResizeShapeToFitText(GetObjectItem(SDRATTR_TEXT_AUTOGROWHEIGHT).GetValue());
+tools::Rectangle aTextBound(maRect);
+bool bChanged(false);
+if(bResizeShapeToFitText)
+bChanged = true;
+else if(GetTextBounds(aTextBound))
+bChanged = true;
+if (!bChanged)
+   return;
+
 SfxItemSet aSet(
 *GetObjectItemSet().GetPool(),
 svl::Items{}); // 
contains SDRATTR_TEXT_MAXFRAMEWIDTH
-bool bChanged(false);
 
 if(bResizeShapeToFitText)
 {
@@ -1389,28 +1398,20 @@ void SdrObjCustomShape::AdaptTextMinSize()
 // to allow resizing being completely dependent on text size only
 aSet.Put(makeSdrTextMinFrameWidthItem(0));
 aSet.Put(makeSdrTextMinFrameHeightItem(0));
-bChanged = true;
 }
 else
 {
 // recreate from CustomShape-specific TextBounds
-tools::Rectangle aTextBound(maRect);
+const tools::Long nHDist(GetTextLeftDistance() + 
GetTextRightDistance());
+const tools::Long nVDist(GetTextUpperDistance() + 
GetTextLowerDistance());
+const tools::Long nTWdt(std::max(tools::Long(0), 
static_cast(aTextBound.GetWidth() - 1 - nHDist)));
+const tools::Long nTHgt(std::max(tools::Long(0), 
static_cast(aTextBound.GetHeight() - 1 - nVDist)));
 
-if(GetTextBounds(aTextBound))
-{
-const tools::Long nHDist(GetTextLeftDistance() + 
GetTextRightDistance());
-const tools::Long nVDist(GetTextUpperDistance() + 
GetTextLowerDistance());
-const tools::Long nTWdt(std::max(tools::Long(0), 
static_cast(aTextBound.GetWidth() - 1 - nHDist)));
-const tools::Long nTHgt(std::max(tools::Long(0), 
static_cast(aTextBound.GetHeight() - 1 - nVDist)));
-
-aSet.Put(makeSdrTextMinFrameWidthItem(nTWdt));
-aSet.Put(makeSdrTextMinFrameHeightItem(nTHgt));
-bChanged = true;
-}
+aSet.Put(makeSdrTextMinFrameWidthItem(nTWdt));
+aSet.Put(makeSdrTextMinFrameHeightItem(nTHgt));
 }
 
-if(bChanged)
-SetObjectItemSet(aSet);
+SetObjectItemSet(aSet);
 }
 
 void SdrObjCustomShape::NbcSetSnapRect( const tools::Rectangle& rRect )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 oox/inc/drawingml/textbody.hxx |1 
 oox/inc/drawingml/textliststyle.hxx|   19 +++-
 oox/inc/drawingml/textparagraph.hxx|1 
 oox/source/drawingml/textliststyle.cxx |   37 +++--
 oox/source/drawingml/textparagraph.cxx |2 -
 oox/source/ppt/presentationfragmenthandler.cxx |2 -
 6 files changed, 26 insertions(+), 36 deletions(-)

New commits:
commit 306f6934ac6f0b012eaecd05bb4abb7c9d341993
Author: Noel Grandin 
AuthorDate: Wed Apr 14 12:51:59 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 14 17:04:52 2021 +0200

reduce allocation in TextListStyle

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

diff --git a/oox/inc/drawingml/textbody.hxx b/oox/inc/drawingml/textbody.hxx
index 5e6d156e7ce4..093642f30d97 100644
--- a/oox/inc/drawingml/textbody.hxx
+++ b/oox/inc/drawingml/textbody.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace com::sun::star::text {
 class XText;
diff --git a/oox/inc/drawingml/textliststyle.hxx 
b/oox/inc/drawingml/textliststyle.hxx
index 52cb29330877..ac84cc9d903d 100644
--- a/oox/inc/drawingml/textliststyle.hxx
+++ b/oox/inc/drawingml/textliststyle.hxx
@@ -21,11 +21,14 @@
 #define INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLE_HXX
 
 #include 
-#include 
+#include 
+#include 
 
 namespace oox::drawingml
 {
-typedef RefVector TextParagraphPropertiesVector;
+constexpr int NUM_TEXT_LIST_STYLE_ENTRIES = 9;
+typedef std::array, 
NUM_TEXT_LIST_STYLE_ENTRIES>
+TextParagraphPropertiesArray;
 
 class TextListStyle
 {
@@ -38,22 +41,22 @@ public:
 
 void apply(const TextListStyle& rTextListStyle);
 
-const TextParagraphPropertiesVector& getListStyle() const { return 
maListStyle; };
-TextParagraphPropertiesVector& getListStyle() { return maListStyle; };
+const TextParagraphPropertiesArray& getListStyle() const { return 
maListStyle; };
+TextParagraphPropertiesArray& getListStyle() { return maListStyle; };
 
-const TextParagraphPropertiesVector& getAggregationListStyle() const
+const TextParagraphPropertiesArray& getAggregationListStyle() const
 {
 return maAggregationListStyle;
 };
-TextParagraphPropertiesVector& getAggregationListStyle() { return 
maAggregationListStyle; };
+TextParagraphPropertiesArray& getAggregationListStyle() { return 
maAggregationListStyle; };
 
 #ifdef DBG_UTIL
 void dump() const;
 #endif
 
 private:
-TextParagraphPropertiesVector maListStyle;
-TextParagraphPropertiesVector maAggregationListStyle;
+TextParagraphPropertiesArray maListStyle;
+TextParagraphPropertiesArray maAggregationListStyle;
 };
 }
 
diff --git a/oox/inc/drawingml/textparagraph.hxx 
b/oox/inc/drawingml/textparagraph.hxx
index 22465355142c..5139c51b9b26 100644
--- a/oox/inc/drawingml/textparagraph.hxx
+++ b/oox/inc/drawingml/textparagraph.hxx
@@ -25,6 +25,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/oox/source/drawingml/textliststyle.cxx 
b/oox/source/drawingml/textliststyle.cxx
index d900e3cef338..da170cae03eb 100644
--- a/oox/source/drawingml/textliststyle.cxx
+++ b/oox/source/drawingml/textliststyle.cxx
@@ -24,10 +24,10 @@ namespace oox::drawingml {
 
 TextListStyle::TextListStyle()
 {
-for ( int i = 0; i < 9; i++ )
+for ( int i = 0; i < NUM_TEXT_LIST_STYLE_ENTRIES; i++ )
 {
-maListStyle.push_back( std::make_shared( ) );
-maAggregationListStyle.push_back( 
std::make_shared( ) );
+maListStyle[i] = std::make_shared( );
+maAggregationListStyle[i] = std::make_shared( 
);
 }
 }
 
@@ -37,12 +37,10 @@ TextListStyle::~TextListStyle()
 
 TextListStyle::TextListStyle(const TextListStyle& rStyle)
 {
-assert(rStyle.maListStyle.size() == 9);
-assert(rStyle.maAggregationListStyle.size() == 9);
-for ( size_t i = 0; i < 9; i++ )
+for ( size_t i = 0; i < NUM_TEXT_LIST_STYLE_ENTRIES; i++ )
 {
-maListStyle.push_back( std::make_shared( 
*rStyle.maListStyle[i] ) );
-maAggregationListStyle.push_back( 
std::make_shared( *rStyle.maAggregationListStyle[i] ) 
);
+maListStyle[i] = std::make_shared( 
*rStyle.maListStyle[i] );
+maAggregationListStyle[i] = std::make_shared( 
*rStyle.maAggregationListStyle[i] );
 }
 }
 
@@ -50,11 +48,7 @@ TextListStyle& TextListStyle::operator=(const TextListStyle& 
rStyle)
 {
 if(this != &rStyle)
 {
-assert(rStyle.maListStyle.size() == 9);
-assert(rStyle.maAggregationListStyle.size() == 9);
-assert(maListStyle.size() == 9);
-assert(maAggregationListStyle.size() == 9);
-for ( size_t i = 0; i < 9; i++ )
+for ( size_t i = 0; i < NUM_TEXT_LIST_STYLE_ENTRIES; i++ )
 {
 *maListStyle[i] = *rStyle.maListStyle[i];
 *maAggregationListStyle[i] 

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

[Miklos Vajna (via logerrit)]

 sw/source/ui/index/swuiidxmrk.cxx |   19 +--
 1 file changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 869acd8315af695ff79594fc6a498abb8371103a
Author: Miklos Vajna 
AuthorDate: Wed Apr 14 15:07:33 2021 +0200
Commit: Miklos Vajna 
CommitDate: Wed Apr 14 16:17:50 2021 +0200

sw define bibliography entry dialog: set browse button visibility based on 
type

Show the browse button exactly when the biblio entry type is a local
file. This needs to always weld the browse button, just not showing it
initially in the non-local-file-type case.

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

diff --git a/sw/source/ui/index/swuiidxmrk.cxx 
b/sw/source/ui/index/swuiidxmrk.cxx
index 464614f7eeb3..a8c8df620753 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -1629,6 +1629,11 @@ 
SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(weld::Window* pParent,
 pEdits[nIndex]->set_text(pFields[aCurInfo.nToxField]);
 pEdits[nIndex]->show();
 pEdits[nIndex]->set_help_id(aCurInfo.pHelpId);
+if (aCurInfo.nToxField == AUTH_FIELD_URL)
+{
+m_xBrowseButton = m_aBuilders.back()->weld_button("browse");
+m_xBrowseButton->connect_clicked(LINK(this, 
SwCreateAuthEntryDlg_Impl, BrowseHdl));
+}
 if(AUTH_FIELD_IDENTIFIER == aCurInfo.nToxField)
 {
 pEdits[nIndex]->connect_changed(LINK(this, 
SwCreateAuthEntryDlg_Impl, ShortNameHdl));
@@ -1642,8 +1647,6 @@ 
SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(weld::Window* pParent,
 else if (aCurInfo.nToxField == AUTH_FIELD_URL
  && IsFileUrl(rWrtSh, pFields[aCurInfo.nToxField]))
 {
-m_xBrowseButton = m_aBuilders.back()->weld_button("browse");
-m_xBrowseButton->connect_clicked(LINK(this, 
SwCreateAuthEntryDlg_Impl, BrowseHdl));
 m_xBrowseButton->show();
 }
 
@@ -1729,6 +1732,18 @@ IMPL_LINK(SwCreateAuthEntryDlg_Impl, ShortNameHdl, 
weld::Entry&, rEdit, void)
 IMPL_LINK(SwCreateAuthEntryDlg_Impl, EnableHdl, weld::ComboBox&, rBox, void)
 {
 m_xOKBT->set_sensitive(m_bNameAllowed && rBox.get_active() != -1);
+
+int nType = m_xTypeListBox->get_active();
+if (nType == AUTH_TYPE_END && !m_xBrowseButton->is_visible())
+{
+// File URL -> show the browse button.
+m_xBrowseButton->show();
+}
+else if (nType != AUTH_TYPE_END && m_xBrowseButton->is_visible())
+{
+// Not a file URL -> hide the browse button.
+m_xBrowseButton->hide();
+}
 };
 
 IMPL_LINK_NOARG(SwCreateAuthEntryDlg_Impl, BrowseHdl, weld::Button&, void)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - comphelper/source desktop/source include/comphelper toolkit/source

[Tor Lillqvist (via logerrit)]

 comphelper/source/misc/profilezone.cxx |   27 +++
 desktop/source/lib/init.cxx|2 +-
 include/comphelper/profilezone.hxx |3 ++-
 toolkit/source/awt/vclxtoolkit.cxx |4 ++--
 4 files changed, 20 insertions(+), 16 deletions(-)

New commits:
commit dd57e1e9de21f05ff2c9c477c1a17ac25cd5bdfe
Author: Tor Lillqvist 
AuthorDate: Wed Apr 14 12:47:14 2021 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Apr 14 15:48:05 2021 +0200

Clarify the ProfileRecording API

Instead of a startRecording(bool) function that is used to also stop
recording, have separate startRecording() and stopRecording()
functions that do what they say.

Change-Id: Ifa9ea0e530d5d38baa52f685fc1dc0029d30d023
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114081
Tested-by: Tor Lillqvist 
Reviewed-by: Tor Lillqvist 

diff --git a/comphelper/source/misc/profilezone.cxx 
b/comphelper/source/misc/profilezone.cxx
index ff76a4f35e8d..4d6d94744c88 100644
--- a/comphelper/source/misc/profilezone.cxx
+++ b/comphelper/source/misc/profilezone.cxx
@@ -30,17 +30,19 @@ static int g_aNesting;   // level of overlapped 
zones
 static long long g_aStartTime;// start time of recording
 static ::osl::Mutex g_aMutex;
 
-void startRecording(bool bStartRecording)
+void startRecording()
 {
-if (bStartRecording)
-{
-TimeValue systemTime;
-osl_getSystemTime( &systemTime );
-::osl::MutexGuard aGuard( g_aMutex );
-g_aStartTime = static_cast(systemTime.Seconds) * 100 + 
systemTime.Nanosec/1000;
-g_aNesting = 0;
-}
-ProfileZone::g_bRecording = bStartRecording;
+TimeValue systemTime;
+osl_getSystemTime( &systemTime );
+::osl::MutexGuard aGuard( g_aMutex );
+g_aStartTime = static_cast(systemTime.Seconds) * 100 + 
systemTime.Nanosec/1000;
+g_aNesting = 0;
+ProfileZone::g_bRecording = true;
+}
+
+void stopRecording()
+{
+ProfileZone::g_bRecording = false;
 }
 
 long long addRecording(const char * aProfileId, long long aCreateTime)
@@ -86,13 +88,14 @@ css::uno::Sequence getRecordingAndClear()
 {
 ::osl::MutexGuard aGuard( g_aMutex );
 bRecording = ProfileZone::g_bRecording;
-startRecording(false);
+stopRecording();
 aRecording.swap(g_aRecording);
 long long aSumTime = g_aSumTime;
 aRecording.insert(aRecording.begin(), 
OUString::number(aSumTime/100.0));
 }
 // reset start time and nesting level
-startRecording(bRecording);
+if (bRecording)
+startRecording();
 return ::comphelper::containerToSequence(aRecording);
 }
 
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8d641cd1383f..c175b2fa02ad 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -6179,7 +6179,7 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath, const char
 // Turn profile zones on early
 if (bProfileZones && eStage == SECOND_INIT)
 {
-comphelper::ProfileRecording::startRecording(true);
+comphelper::ProfileRecording::startRecording();
 new ProfileZoneDumper();
 }
 
diff --git a/include/comphelper/profilezone.hxx 
b/include/comphelper/profilezone.hxx
index 8cbc078f6621..b54d69523fd6 100644
--- a/include/comphelper/profilezone.hxx
+++ b/include/comphelper/profilezone.hxx
@@ -26,7 +26,8 @@ namespace comphelper
 namespace ProfileRecording
 {
 
-COMPHELPER_DLLPUBLIC void startRecording(bool bRecording);
+COMPHELPER_DLLPUBLIC void startRecording();
+COMPHELPER_DLLPUBLIC void stopRecording();
 
 COMPHELPER_DLLPUBLIC long long addRecording(const char * aProfileId, long long 
aCreateTime);
 
diff --git a/toolkit/source/awt/vclxtoolkit.cxx 
b/toolkit/source/awt/vclxtoolkit.cxx
index 2121e14c3e15..95e731beb2df 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -2535,12 +2535,12 @@ void SAL_CALL VCLXToolkit::pause(sal_Int32 
nMilliseconds)
 
 void SAL_CALL VCLXToolkit::startRecording()
 {
-::comphelper::ProfileRecording::startRecording(true);
+::comphelper::ProfileRecording::startRecording();
 }
 
 void SAL_CALL VCLXToolkit::stopRecording()
 {
-::comphelper::ProfileRecording::startRecording( false );
+::comphelper::ProfileRecording::stopRecording();
 }
 
 css::uno::Sequence< OUString > VCLXToolkit::getRecordingAndClear()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/inc/unx/fontmanager.hxx|1 
 vcl/unx/generic/fontmanager/fontconfig.cxx |  116 +++--
 vcl/unx/generic/gdi/freetypetextrender.cxx |1 
 3 files changed, 113 insertions(+), 5 deletions(-)

New commits:
commit a199e4ea389c934d169a178433f4b94033e60f93
Author: Caolán McNamara 
AuthorDate: Wed Apr 14 12:25:36 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 14 14:37:08 2021 +0200

add pitch to the pattern

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

diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx 
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 748fbf2d7b9a..689c4816e174 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -63,6 +63,7 @@ struct FontOptionsKey
 FontItalic m_eItalic;
 FontWeight m_eWeight;
 FontWidth m_eWidth;
+FontPitch m_ePitch;
 
 bool operator==(const FontOptionsKey& rOther) const
 {
@@ -70,7 +71,8 @@ struct FontOptionsKey
m_nFontSize == rOther.m_nFontSize &&
m_eItalic == rOther.m_eItalic &&
m_eWeight == rOther.m_eWeight &&
-   m_eWidth == rOther.m_eWidth;
+   m_eWidth == rOther.m_eWidth &&
+   m_ePitch == rOther.m_ePitch;
 }
 };
 
@@ -88,6 +90,7 @@ template <> struct hash
 boost::hash_combine(seed, k.m_eItalic);
 boost::hash_combine(seed, k.m_eWeight);
 boost::hash_combine(seed, k.m_eWidth);
+boost::hash_combine(seed, k.m_ePitch);
 return seed;
 }
 };
@@ -1188,7 +1191,8 @@ void FontConfigFontOptions::SyncPattern(const OString& 
rFileName, sal_uInt32 nIn
 
 std::unique_ptr PrintFontManager::getFontOptions(const 
FontAttributes& rInfo, int nSize)
 {
-FontOptionsKey aKey{ rInfo.GetFamilyName(), nSize, rInfo.GetItalic(), 
rInfo.GetWeight(), rInfo.GetWidthType() };
+FontOptionsKey aKey{ rInfo.GetFamilyName(), nSize, rInfo.GetItalic(),
+ rInfo.GetWeight(), rInfo.GetWidthType(), 
rInfo.GetPitch() };
 
 FontCfgWrapper& rWrapper = FontCfgWrapper::get();
 
@@ -1207,8 +1211,7 @@ std::unique_ptr 
PrintFontManager::getFontOptions(const Fo
 if( !sFamily.isEmpty() )
 FcPatternAddString(pPattern, FC_FAMILY, reinterpret_cast(sFamily.getStr()));
 
-// TODO: ePitch argument of always PITCH_DONTKNOW is suspicious
-addtopattern(pPattern, aKey.m_eItalic, aKey.m_eWeight, aKey.m_eWidth, 
PITCH_DONTKNOW);
+addtopattern(pPattern, aKey.m_eItalic, aKey.m_eWeight, aKey.m_eWidth, 
aKey.m_ePitch);
 FcPatternAddDouble(pPattern, FC_PIXEL_SIZE, nSize);
 
 FcConfigSubstitute(pConfig, pPattern, FcMatchPattern);
commit 3a933fddfdbbe158caac47b9957fb3c8d92506fb
Author: Caolán McNamara 
AuthorDate: Wed Apr 14 10:28:36 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 14 14:36:51 2021 +0200

tdf#140639 cache FcPattern for font options

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

diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index 0f5a85d61153..9ae95d0493af 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -313,6 +313,7 @@ public:
 void matchFont( FastPrintFontInfo& rInfo, const css::lang::Locale& rLocale 
);
 
 static std::unique_ptr getFontOptions(const 
FontAttributes& rFontAttributes, int nSize);
+static void clearFontOptionsCache();
 
 void Substitute(FontSelectPattern &rPattern, OUString& rMissingCodes);
 
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx 
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 1ebe39ca4b98..748fbf2d7b9a 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -46,6 +47,7 @@ using namespace psp;
 
 #include 
 
+#include 
 #include 
 #include 
 
@@ -53,7 +55,92 @@ using namespace osl;
 
 namespace
 {
-typedef std::pair lang_and_element;
+
+struct FontOptionsKey
+{
+OUString m_sFamilyName;
+int m_nFontSize;
+FontItalic m_eItalic;
+FontWeight m_eWeight;
+FontWidth m_eWidth;
+
+bool operator==(const FontOptionsKey& rOther) const
+{
+return m_sFamilyName == rOther.m_sFamilyName &&
+   m_nFontSize == rOther.m_nFontSize &&
+   m_eItalic == rOther.m_eItalic &&
+   m_eWeight == rOther.m_eWeight &&
+   m_eWidth == rOther.m_eWidth;
+}
+};
+
+}
+
+namespace std
+{
+
+template <> struct hash
+{
+std::size_t operator()(const FontOptionsKey& k) const noexcept
+{
+std::size_t seed = k.m_sFamilyName.hashCode();
+boost::hash_combine(seed, k.m_nFontSize

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

[Jan-Marek Glogowski (via logerrit)]

 vcl/inc/qt5/Qt5Instance.hxx|2 ++
 vcl/qt5/Qt5Instance.cxx|   16 
 vcl/unx/kf5/KF5SalInstance.cxx |2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

New commits:
commit dbdc0475097210ec88f1e867b4464fdcd17a5d37
Author: Jan-Marek Glogowski 
AuthorDate: Sun Apr 11 14:05:59 2021 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Wed Apr 14 14:35:38 2021 +0200

Qt add additional info to ToolkitName

Adds the used font backend and the QPA platform name, so we don't
need to ask / verify all time (and less chance of wrong info).

Examples:
- qt5 (qfont+xcb) => QFont text rendering + X11 backend
- kf5 (cairo+wayland) => Cairo text rendering + Wayland backend

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

diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx
index 5dc2db898d29..111e86f0878a 100644
--- a/vcl/inc/qt5/Qt5Instance.hxx
+++ b/vcl/inc/qt5/Qt5Instance.hxx
@@ -84,6 +84,8 @@ protected:
 createPicker(css::uno::Reference const& 
context,
  QFileDialog::FileMode);
 bool useCairo() const { return m_bUseCairo; }
+// encodes cairo usage and Qt platform name into the ToolkitName
+OUString constructToolkitID(std::u16string_view sTKname);
 
 public:
 explicit Qt5Instance(std::unique_ptr& pQApp, bool bUseCairo 
= false);
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index 5afbd8722418..3ea129b8aeea 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -196,6 +196,17 @@ void Qt5Instance::RunInMainThread(std::function 
func)
 }
 }
 
+OUString Qt5Instance::constructToolkitID(std::u16string_view sTKname)
+{
+OUString sID(sTKname + OUStringLiteral(u" ("));
+if (m_bUseCairo)
+sID += OUStringLiteral(u"cairo+");
+else
+sID += OUStringLiteral(u"qfont+");
+sID += toOUString(QGuiApplication::platformName()) + OUStringLiteral(u")");
+return sID;
+}
+
 Qt5Instance::Qt5Instance(std::unique_ptr& pQApp, bool bUseCairo)
 : SalGenericInstance(std::make_unique())
 , m_bUseCairo(bUseCairo)
@@ -206,10 +217,7 @@ Qt5Instance::Qt5Instance(std::unique_ptr& 
pQApp, bool bUseCairo)
 , m_bUpdateFonts(false)
 {
 ImplSVData* pSVData = ImplGetSVData();
-if (bUseCairo)
-pSVData->maAppData.mxToolkitName = OUString("qt5+cairo");
-else
-pSVData->maAppData.mxToolkitName = OUString("qt5");
+pSVData->maAppData.mxToolkitName = constructToolkitID(u"qt5");
 
 // this one needs to be blocking, so that the handling in main thread
 // is processed before the thread emitting the signal continues
diff --git a/vcl/unx/kf5/KF5SalInstance.cxx b/vcl/unx/kf5/KF5SalInstance.cxx
index 1335d4123a2e..608b5dccc4dc 100644
--- a/vcl/unx/kf5/KF5SalInstance.cxx
+++ b/vcl/unx/kf5/KF5SalInstance.cxx
@@ -37,7 +37,7 @@ KF5SalInstance::KF5SalInstance(std::unique_ptr& 
pQApp, bool bUseCa
 : Qt5Instance(pQApp, bUseCairo)
 {
 ImplSVData* pSVData = ImplGetSVData();
-pSVData->maAppData.mxToolkitName = OUString("kf5");
+pSVData->maAppData.mxToolkitName = constructToolkitID(u"kf5");
 }
 
 SalFrame* KF5SalInstance::CreateChildFrame(SystemParentData* /*pParent*/, 
SalFrameStyleFlags nStyle)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit ec1e3977cad824da6017fe150d55c262cd68dccd
Author: Olivier Hallot 
AuthorDate: Wed Apr 14 09:24:08 2021 -0300
Commit: Gerrit Code Review 
CommitDate: Wed Apr 14 14:24:08 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 5ba538ce7121b2733824ff71f0e553d004429247
  - Refactor somedatabase Help files

put in th right folder

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

diff --git a/helpcontent2 b/helpcontent2
index f1c3329df60d..5ba538ce7121 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f1c3329df60dd8e0d5fb495a1e2f12790eb7a829
+Subproject commit 5ba538ce7121b2733824ff71f0e553d004429247
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

 AllLangHelp_sdatabase.mk   |3 +++
 AllLangHelp_shared.mk  |3 ---
 source/text/sdatabase/0504.xhp |   13 -
 source/text/sdatabase/05040100.xhp |   27 ---
 source/text/sdatabase/05040200.xhp |   11 +++
 5 files changed, 22 insertions(+), 35 deletions(-)

New commits:
commit 5ba538ce7121b2733824ff71f0e553d004429247
Author: Olivier Hallot 
AuthorDate: Wed Apr 14 08:59:19 2021 -0300
Commit: Olivier Hallot 
CommitDate: Wed Apr 14 14:24:08 2021 +0200

Refactor somedatabase Help files

put in th right folder

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

diff --git a/AllLangHelp_sdatabase.mk b/AllLangHelp_sdatabase.mk
index b9cd52e67..a1899d7fd 100644
--- a/AllLangHelp_sdatabase.mk
+++ b/AllLangHelp_sdatabase.mk
@@ -35,6 +35,9 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sdatabase,\
 helpcontent2/source/text/sdatabase/05030200 \
 helpcontent2/source/text/sdatabase/05030300 \
 helpcontent2/source/text/sdatabase/05030400 \
+helpcontent2/source/text/sdatabase/0504 \
+helpcontent2/source/text/sdatabase/05040100 \
+helpcontent2/source/text/sdatabase/05040200 \
 helpcontent2/source/text/sdatabase/toolbars \
 ))
 
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 97c1a0a16..5ffdc9d92 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -861,9 +861,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 ))
 
 $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
-helpcontent2/source/text/shared/explorer/database/0504 \
-helpcontent2/source/text/shared/explorer/database/05040100 \
-helpcontent2/source/text/shared/explorer/database/05040200 \
 helpcontent2/source/text/shared/explorer/database/1102 \
 helpcontent2/source/text/shared/explorer/database/1102 \
 helpcontent2/source/text/shared/explorer/database/1103 \
diff --git a/source/text/shared/explorer/database/0504.xhp 
b/source/text/sdatabase/0504.xhp
similarity index 75%
rename from source/text/shared/explorer/database/0504.xhp
rename to source/text/sdatabase/0504.xhp
index 980095ca9..c3f068e0b 100644
--- a/source/text/shared/explorer/database/0504.xhp
+++ b/source/text/sdatabase/0504.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-
-
-   
 
 
 
 General
-/text/shared/explorer/database/0504.xhp
+/text/sdatabase/0504.xhp
 
 
 Sun Microsystems, Inc.
 
 
 
-General
-
-
+General
+
+
 
 
diff --git a/source/text/shared/explorer/database/05040100.xhp 
b/source/text/sdatabase/05040100.xhp
similarity index 73%
rename from source/text/shared/explorer/database/05040100.xhp
rename to source/text/sdatabase/05040100.xhp
index 9c45e34f1..538820245 100644
--- a/source/text/shared/explorer/database/05040100.xhp
+++ b/source/text/sdatabase/05040100.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-   
 
 
 
 General
-/text/shared/explorer/database/05040100.xhp
+/text/sdatabase/05040100.xhp
 
 
 Sun Microsystems, Inc.
@@ -31,32 +28,32 @@
 
 
 
-General
+General
 When you 
create a database table as an administrator, you can use this tab to determine 
user access, and to edit the data or the table structure.
 
 access rights for database tables 
(Base)
 tables in databases; access rights to (Base)
 mw added "(Base)" to all entries
 If you are not 
the administrator, you can use the General tab to view your access 
rights for the selected table.
-Table 
name
+Table name
 Displays the 
name of the selected database table.
-Type
+Type
 Displays the 
type of database.
-Location
+Location
 Displays the 
complete path of the database table.
-Read 
data
+Read data
 Allows a user to read the data.
-Insert 
data
+Insert data
 Allows a user to insert new data.
-Change 
data
+Change data
 Allows a user to change data.
-Delete 
data
+Delete data
 Allows a user to delete data.
-Change 
table structure
+Change table structure
 Allows a user to change the table structure.
-Definition
+Definition
 Allows the user to delete the table structure.
-Modify 
references
+Modify references
 Allows the user to modify the defined references, for example, to enter 
new relations for the table or to delete existing relations.
 
 
diff --git a/source/text/shared/explorer/database/05040200.xhp 
b/source/text/sdatabase/05040200.xhp
similarity index 79%
rename from source/text/shared/explorer/database/05040200.xhp
rename to source/text/sdatabase/05040200.xhp
index 37db839f3..dfb61ef7b 100644
--- a/source/text/shared/explorer/database/05040200.xhp
+++ b/source/text/sdatabase/05040200.xhp
@@ -1,6 +1,4 @@
 
-
-
 
-
-
-   
 
 
 
 Description
-/text/shared/explorer/database/05040200.xhp
+/text/sdatabase/05040200.xhp
 
 
 Sun Microsystems, Inc.
@@ -33,9 +28,9 @@
 
 
 
-Description
+Description
 
-Table 
description
+Table description
 Displays the description for the selected table.
 
 
___

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 4 commits - desktop/source filter/source include/vcl sc/inc sc/qa sc/source sd/qa sd/source sw/inc sw/source

[Szymon Kłos (via logerrit)]

 desktop/source/lib/init.cxx  |   13 +++--
 filter/source/svg/svgexport.cxx  |2 
 include/vcl/ITiledRenderable.hxx |4 +
 sc/inc/docuno.hxx|2 
 sc/qa/unit/tiledrendering/tiledrendering.cxx |4 -
 sc/source/ui/app/inputhdl.cxx|5 +
 sc/source/ui/unoobj/docuno.cxx   |7 ++
 sc/source/ui/view/cliputil.cxx   |   16 +-
 sd/qa/unit/tiledrendering/tiledrendering.cxx |   68 +++
 sd/source/ui/inc/DrawViewShell.hxx   |2 
 sd/source/ui/inc/unomodel.hxx|2 
 sd/source/ui/unoidl/unomodel.cxx |4 -
 sd/source/ui/view/drviews1.cxx   |   23 ++---
 sd/source/ui/view/drviews3.cxx   |   14 -
 sw/inc/unotxdoc.hxx  |2 
 sw/source/uibase/uno/unotxdoc.cxx|2 
 16 files changed, 142 insertions(+), 28 deletions(-)

New commits:
commit ce7bf351972bbfd64ca99e8d2fb4c5f77591c9e0
Author: Szymon Kłos 
AuthorDate: Thu Mar 25 17:21:35 2021 +0100
Commit: Andras Timar 
CommitDate: Wed Apr 14 13:42:29 2021 +0200

impress: don't exit textbox editing when new slide was added

When new slide is added by other user before currently visible slide
then SwitchPage is called and textbox editing is ended.

Avoid any focus change when setPart is called just for rendering
or SwitchPage is used on previously avtive slide (only slide numer changed).

Change-Id: I7fef42b863e0079acc84dadfc3f891548652b48f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113144
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113806
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 15250bc35085..bc21a07e5ac5 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2972,7 +2972,7 @@ static int doc_getPart (LibreOfficeKitDocument* pThis)
 return pDoc->getPart();
 }
 
-static void doc_setPart(LibreOfficeKitDocument* pThis, int nPart)
+static void doc_setPartImpl(LibreOfficeKitDocument* pThis, int nPart, bool 
bAllowChangeFocus = true)
 {
 comphelper::ProfileZone aZone("doc_setPart");
 
@@ -2986,7 +2986,12 @@ static void doc_setPart(LibreOfficeKitDocument* pThis, 
int nPart)
 return;
 }
 
-pDoc->setPart( nPart );
+pDoc->setPart( nPart, bAllowChangeFocus );
+}
+
+static void doc_setPart(LibreOfficeKitDocument* pThis, int nPart)
+{
+doc_setPartImpl(pThis, nPart, true);
 }
 
 static char* doc_getPartInfo(LibreOfficeKitDocument* pThis, int nPart)
@@ -3300,7 +3305,7 @@ static void doc_paintPartTile(LibreOfficeKitDocument* 
pThis,
 nOrigPart = doc_getPart(pThis);
 if (nPart != nOrigPart)
 {
-doc_setPart(pThis, nPart);
+doc_setPartImpl(pThis, nPart, false);
 }
 }
 
@@ -3308,7 +3313,7 @@ static void doc_paintPartTile(LibreOfficeKitDocument* 
pThis,
 
 if (!isText && nPart != nOrigPart)
 {
-doc_setPart(pThis, nOrigPart);
+doc_setPartImpl(pThis, nOrigPart, false);
 }
 if (!isText && nViewId != nOrigViewId)
 {
diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index 42689ed98c2a..cf609fa0d0a5 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -72,8 +72,10 @@ public:
 /**
  * Set the document "part", i.e. slide for a slideshow, and
  * tab for a spreadsheet.
+ * bool bAllowChangeFocus - used to not disturb other users while editing 
when
+ *  setPart is used for tile rendering only
  */
-virtual void setPart( int ) {}
+virtual void setPart( int /*nPart*/, bool /*bAllowChangeFocus*/ = true ) {}
 
 /**
  * Get the number of parts -- see setPart for further details.
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index 44fdc3463aed..b58990a37fd7 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -312,7 +312,7 @@ public:
 virtual Size getDocumentSize() override;
 
 /// @see vcl::ITiledRenderable::setPart().
-virtual void setPart(int nPart) override;
+virtual void setPart(int nPart, bool bAllowChangeFocus = true) override;
 
 /// @see vcl::ITiledRenderable::getPart().
 virtual int getPart() override;
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index eca643fc5a1c..5906c85ef498 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -570,7 +570,7 @@ void ScModelObj::paintTile( VirtualDevice& rDevice,
  nTilePosX, nTilePosY, nTileWidth, 
nTileHeight);
 }
 
-void ScModelObj::setPart( int nPart )
+void ScModelObj::setPart( int nPart, bool /*bAllowChangeFoc

[Libreoffice-commits] core.git: helpcontent2

[Alain Romedenne (via logerrit)]

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

New commits:
commit e2ae3ce304b1780ebe9f452a75e83612c8309c26
Author: Alain Romedenne 
AuthorDate: Wed Apr 14 13:28:49 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Apr 14 13:28:49 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to f1c3329df60dd8e0d5fb495a1e2f12790eb7a829
  - tdf#141474 InputBox Basic method signature

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

diff --git a/helpcontent2 b/helpcontent2
index 2280caa5f5cf..f1c3329df60d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2280caa5f5cf639b5c9f71797dfab0749fa29639
+Subproject commit f1c3329df60dd8e0d5fb495a1e2f12790eb7a829
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Alain Romedenne (via logerrit)]

 source/text/sbasic/shared/03010201.xhp |   27 +--
 1 file changed, 13 insertions(+), 14 deletions(-)

New commits:
commit f1c3329df60dd8e0d5fb495a1e2f12790eb7a829
Author: Alain Romedenne 
AuthorDate: Tue Apr 6 17:25:17 2021 +0200
Commit: Olivier Hallot 
CommitDate: Wed Apr 14 13:28:49 2021 +0200

tdf#141474 InputBox Basic method signature

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

diff --git a/source/text/sbasic/shared/03010201.xhp 
b/source/text/sbasic/shared/03010201.xhp
index 353d6a442..5e7ee3543 100644
--- a/source/text/sbasic/shared/03010201.xhp
+++ b/source/text/sbasic/shared/03010201.xhp
@@ -33,29 +33,28 @@
   InputBox function
 
 
-
-InputBox 
Function
+InputBox 
Function
 Displays a 
prompt in a dialog at which the user can input text. The input is assigned to a 
variable.
 
 The 
InputBox statement is a convenient method of entering text through 
a dialog. Confirm the input by clicking OK or pressing Return. The input is 
returned as the function return value. If you close the dialog with Cancel, 
InputBox returns a zero-length string ("").
 
-Syntax:
+
 
-InputBox (Msg As 
String[, Title As String[, Default As String[, x_pos As Integer, y_pos As 
Integer) 
+InputBox (Prompt 
As String[, Title As String[, Default As String[, xPosTwips As Integer, 
yPosTwips As Integer]]]) As String
 
 
-Return 
value:
-String
-
-Parameter:
- 
Msg: String expression displayed as the message in the dialog 
box.
+
+ 
Prompt: String expression displayed as the message in the dialog 
box.
  
Title: String expression displayed in the title bar of the dialog 
box.
  
Default: String expression displayed in the text box as default if 
no other input is given.
- 
x_pos: Integer expression that specifies the horizontal position 
of the dialog. The position is an absolute coordinate and does not refer to the 
window of the office application.
- 
y_pos: Integer expression that specifies the vertical position of 
the dialog. The position is an absolute coordinate and does not refer to the 
window of the office application.
-If 
x_pos and y_pos are omitted, the dialog is centered 
on the screen. The position is specified in twips.
+ 
xPosTwips: Integer expression that specifies the horizontal 
position of the dialog. The position is an absolute coordinate and does not 
refer to the window of the office application.
+ 
yPosTwips: Integer expression that specifies the vertical position 
of the dialog. The position is an absolute coordinate and does not refer to the 
window of the office application.
+If 
xPosTwips and yPosTwips are omitted, the dialog is 
centered on the screen. The position is specified in twips.
 
-Example:
+
+String
+
+
 
 Sub ExampleInputBox
 Dim sText As String
@@ -63,6 +62,6 @@
 MsgBox ( 
sText , 64, "Confirmation of phrase")
 End Sub
 
-
 
+
 
\ 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

[Rafael Lima (via logerrit)]

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

New commits:
commit 937f3d89e95fa431c3b860a4f2810c5628e8f0e1
Author: Rafael Lima 
AuthorDate: Wed Apr 14 13:23:34 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Apr 14 13:23:34 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 2280caa5f5cf639b5c9f71797dfab0749fa29639
  - Create SFDocuments.Form help page

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

diff --git a/helpcontent2 b/helpcontent2
index a26e51cc4e5a..2280caa5f5cf 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a26e51cc4e5af7eae340fcf20e31e991239def2d
+Subproject commit 2280caa5f5cf639b5c9f71797dfab0749fa29639
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Rafael Lima (via logerrit)]

 AllLangHelp_sbasic.mk|1 
 source/text/sbasic/shared/03/lib_ScriptForge.xhp |7 
 source/text/sbasic/shared/03/sf_form.xhp |  787 +++
 3 files changed, 794 insertions(+), 1 deletion(-)

New commits:
commit 2280caa5f5cf639b5c9f71797dfab0749fa29639
Author: Rafael Lima 
AuthorDate: Mon Apr 12 14:40:35 2021 +0200
Commit: Olivier Hallot 
CommitDate: Wed Apr 14 13:23:34 2021 +0200

Create SFDocuments.Form help page

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

diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk
index c1bae31bb..08b2006f0 100644
--- a/AllLangHelp_sbasic.mk
+++ b/AllLangHelp_sbasic.mk
@@ -87,6 +87,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\
 helpcontent2/source/text/sbasic/shared/03/sf_document \
 helpcontent2/source/text/sbasic/shared/03/sf_exception \
 helpcontent2/source/text/sbasic/shared/03/sf_filesystem \
+helpcontent2/source/text/sbasic/shared/03/sf_form \
 helpcontent2/source/text/sbasic/shared/03/sf_l10n \
 helpcontent2/source/text/sbasic/shared/03/sf_platform \
 helpcontent2/source/text/sbasic/shared/03/sf_session \
diff --git a/source/text/sbasic/shared/03/lib_ScriptForge.xhp 
b/source/text/sbasic/shared/03/lib_ScriptForge.xhp
index 70506e1be..4c5b846c7 100644
--- a/source/text/sbasic/shared/03/lib_ScriptForge.xhp
+++ b/source/text/sbasic/shared/03/lib_ScriptForge.xhp
@@ -75,7 +75,9 @@
  


- 
+ 
+   Form
+ 

 
 
@@ -140,6 +142,9 @@
 
   
 
+
+  
+
 
   
 
diff --git a/source/text/sbasic/shared/03/sf_form.xhp 
b/source/text/sbasic/shared/03/sf_form.xhp
new file mode 100644
index 0..2ca860c7a
--- /dev/null
+++ b/source/text/sbasic/shared/03/sf_form.xhp
@@ -0,0 +1,787 @@
+
+
+
+
+  
+SFDocuments.Form service
+/text/sbasic/shared/03/sf_form.xhp
+  
+  
+
+
+   
+  Form service
+   
+
+
+  SFDocuments.Form 
service
+  The 
Form service provides methods and properties to manage forms 
in %PRODUCTNAME documents. This service supports forms in Base, Calc and Writer 
documents and allows to:
+  
+
+Open and 
activate forms.
+
+
+Navigate through 
records shown by the form.
+
+
+Get access to 
the controls inside the form.
+
+
+Get access to 
subforms of a parent form.
+
+  
+
+  The 
SFDocuments.Form service is available 
from %PRODUCTNAME 7.2 onwards.
+  Forms are usually used in %PRODUCTNAME documents to create 
user interfaces connected to relational databases. Hence, the 
Form service provides quick access to the linked database 
through the SFDatabases.Database
 service.
+  The 
SFDocuments.Form service is closely 
related to the SFDocuments.FormControl
 service.
+
+  Definitions
+  FormDocument
+  Forms are usually 
created in Base documents, but they can be added to Writer and Calc documents 
as well. The way a FormDocument is handled depends on the 
%PRODUCTNAME component where it is stored.
+  In Base, each form 
you create using the Insert - Form  functionality or 
through the Form 
Wizard is actually a FormDocument that can be handled 
with the Form service. Base documents can contain an 
unlimited number of form documents.
+  Below is an example 
showing the hierarchy of all the elements involved in accessing forms and 
subforms in a Base document. Suppose you have a Base file named 
Employees.odb and inside it you created a form document to 
add new employees to the database. The form document contains a main form named 
EmployeeData that gives access to a table. There is also a 
subform WorksAtPlant that allows you to associate the new 
employee to one of the plants of the company.
+  
+Employees.odb (Base 
document)
+ 
|
+ |-- 
AddEmployee (FormDocument)
+ 
 |
+  |-- 
EmployeeData (Main Form)
+ 
  |
+ 
  |-- WorksAtPlant (SubForm)
+  
+  A FormDocument can be 
seen as a set of forms that provide access to datasets such as database tables 
and queries from within %PRODUCTNAME documents. The names of forms and subforms 
inside a FormDocument can be accessed using the Form 
Navigator.
+  In Calc documents, 
each sheet can contain a single FormDocument. A Writer 
document contains only one FormDocument, which is the 
document itself.
+
+  Forms and Subforms
+  A 
form document is composed of one or more forms which, in turn, may also contain 
any number of subforms. A Form is an abstract set of controls that are linked 
to a specified data source, which can be a database table, a query or a SQL 
SELECT statement.
+  In Calc and Writer 
documents, each form can be linked to datasets located in different databases. 
On the other hand, in Base documents the database contained in the document 

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sc/qa sc/source

[Marco Cecchetti (via logerrit)]

 sc/qa/unit/tiledrendering/tiledrendering.cxx |   39 +++
 sc/source/ui/view/tabvwshc.cxx   |9 +++---
 2 files changed, 44 insertions(+), 4 deletions(-)

New commits:
commit 2972cd2477a9b51d7aabbb48cd33a85ca9b253e6
Author: Marco Cecchetti 
AuthorDate: Wed Jul 15 13:01:33 2020 +0200
Commit: Andras Timar 
CommitDate: Wed Apr 14 12:46:51 2021 +0200

lok: sc: Desktop: Function wizard isn't properly async

Open another view of the same spreadsheet when the function dialog is
open. Note how the document in the new view can't be edited.

This patch avoids to have a view locked after creation when in an
other view the formula dialog is open.

See also commit 009d275.

Change-Id: Ie51f414c4ad83ef20526d10be3251e174158096c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98823
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114060
Tested-by: Jenkins
Reviewed-by: Marco Cecchetti 

diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx 
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index bac7ff5d2317..20693b9f4431 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -111,6 +111,7 @@ public:
 void testSheetGeometryDataInvariance();
 void testSheetGeometryDataCorrectness();
 void testDeleteCellMultilineContent();
+void testFunctionDlg();
 void testSpellOnlineParameter();
 void testSpellOnlineRenderParameter();
 void testPasteIntoWrapTextCell();
@@ -159,6 +160,7 @@ public:
 CPPUNIT_TEST(testSheetGeometryDataInvariance);
 CPPUNIT_TEST(testSheetGeometryDataCorrectness);
 CPPUNIT_TEST(testDeleteCellMultilineContent);
+CPPUNIT_TEST(testFunctionDlg);
 CPPUNIT_TEST(testSpellOnlineParameter);
 CPPUNIT_TEST(testSpellOnlineRenderParameter);
 CPPUNIT_TEST(testPasteIntoWrapTextCell);
@@ -1625,6 +1627,43 @@ void ScTiledRenderingTest::testFilterDlg()
 SfxViewShell::Current()->registerLibreOfficeKitViewCallback(nullptr, 
nullptr);
 }
 
+void ScTiledRenderingTest::testFunctionDlg()
+{
+comphelper::LibreOfficeKit::setActive();
+
+createDoc("empty.ods");
+
+// view #1
+SfxViewShell* pView1 = SfxViewShell::Current();
+int nView1 = SfxLokHelper::getView();
+{
+pView1->GetViewFrame()->GetDispatcher()->Execute(SID_OPENDLG_FUNCTION,
+SfxCallMode::SLOT|SfxCallMode::RECORD);
+}
+Scheduler::ProcessEventsToIdle();
+SfxChildWindow* pRefWindow = 
pView1->GetViewFrame()->GetChildWindow(SID_OPENDLG_FUNCTION);
+CPPUNIT_ASSERT(pRefWindow);
+
+// view #2
+int nView2 = SfxLokHelper::createView();
+SfxViewShell* pView2 = SfxViewShell::Current();
+CPPUNIT_ASSERT(pView1 != pView2);
+
+// check loking
+CPPUNIT_ASSERT_EQUAL(true, 
pView1->GetViewFrame()->GetDispatcher()->IsLocked());
+CPPUNIT_ASSERT_EQUAL(false, 
pView2->GetViewFrame()->GetDispatcher()->IsLocked());
+
+SfxLokHelper::setView(nView1);
+pRefWindow->GetController()->response(RET_CANCEL);
+
+CPPUNIT_ASSERT_EQUAL(false, 
pView1->GetViewFrame()->GetDispatcher()->IsLocked());
+CPPUNIT_ASSERT_EQUAL(false, 
pView2->GetViewFrame()->GetDispatcher()->IsLocked());
+
+SfxViewShell::Current()->registerLibreOfficeKitViewCallback(nullptr, 
nullptr);
+SfxLokHelper::setView(nView2);
+SfxViewShell::Current()->registerLibreOfficeKitViewCallback(nullptr, 
nullptr);
+}
+
 void ScTiledRenderingTest::testSpellOnlineParameter()
 {
 ScModelObj* pModelObj = createDoc("empty.ods");
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 208623b1c4cb..2249f25decb2 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -121,12 +121,13 @@ std::shared_ptr 
ScTabViewShell::CreateRefDialogCont
 
 if ( nCurRefDlgId != nSlotId )
 {
-//  the dialog has been opened in a different view
-//  -> lock the dispatcher for this view (modal mode)
+if (!(comphelper::LibreOfficeKit::isActive() && nSlotId == 
SID_OPENDLG_FUNCTION))
+{
+//  the dialog has been opened in a different view
+//  -> lock the dispatcher for this view (modal mode)
 
-if (!comphelper::LibreOfficeKit::isActive())
 GetViewData().GetDispatcher().Lock( true );// lock is reset 
when closing dialog
-
+}
 return nullptr;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/inc/unx/fontmanager.hxx|4 +++-
 vcl/unx/generic/fontmanager/fontconfig.cxx |6 +++---
 vcl/unx/generic/glyphs/freetype_glyphcache.cxx |   11 ++-
 3 files changed, 8 insertions(+), 13 deletions(-)

New commits:
commit e6aa51affc269753644222103d55f7655e84bfa2
Author: Caolán McNamara 
AuthorDate: Wed Apr 14 10:02:08 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 14 12:39:28 2021 +0200

use original FontAttributes instead of an intermediate FastPrintFontInfo

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

diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index 0ef3aa3655e6..0f5a85d61153 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -40,6 +40,7 @@
  *  friends are PostScript afm style, that is they are 1/1000 font height
  */
 
+class FontAttributes;
 class FontSubsetInfo;
 class FontConfigFontOptions;
 class FontSelectPattern;
@@ -310,7 +311,8 @@ public:
 in different fonts in e.g. english and japanese
  */
 void matchFont( FastPrintFontInfo& rInfo, const css::lang::Locale& rLocale 
);
-static std::unique_ptr getFontOptions( const 
FastPrintFontInfo&, int nSize);
+
+static std::unique_ptr getFontOptions(const 
FontAttributes& rFontAttributes, int nSize);
 
 void Substitute(FontSelectPattern &rPattern, OUString& rMissingCodes);
 
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx 
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 17ca8f46ccae..1ebe39ca4b98 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -1097,7 +1097,7 @@ void FontConfigFontOptions::SyncPattern(const OString& 
rFileName, sal_uInt32 nIn
 FcPatternAddBool(mpPattern, FC_EMBOLDEN, bEmbolden ? FcTrue : FcFalse);
 }
 
-std::unique_ptr PrintFontManager::getFontOptions(const 
FastPrintFontInfo& rInfo, int nSize)
+std::unique_ptr PrintFontManager::getFontOptions(const 
FontAttributes& rInfo, int nSize)
 {
 FontCfgWrapper& rWrapper = FontCfgWrapper::get();
 
@@ -1105,7 +1105,7 @@ std::unique_ptr 
PrintFontManager::getFontOptions(const Fa
 FcConfig* pConfig = FcConfigGetCurrent();
 FcPattern* pPattern = FcPatternCreate();
 
-OString sFamily = OUStringToOString( rInfo.m_aFamilyName, 
RTL_TEXTENCODING_UTF8 );
+OString sFamily = OUStringToOString( rInfo.GetFamilyName(), 
RTL_TEXTENCODING_UTF8 );
 
 std::unordered_map< OString, OString >::const_iterator aI = 
rWrapper.m_aLocalizedToCanonical.find(sFamily);
 if (aI != rWrapper.m_aLocalizedToCanonical.end())
@@ -1114,7 +1114,7 @@ std::unique_ptr 
PrintFontManager::getFontOptions(const Fa
 FcPatternAddString(pPattern, FC_FAMILY, reinterpret_cast(sFamily.getStr()));
 
 // TODO: ePitch argument of always PITCH_DONTKNOW is suspicious
-addtopattern(pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth, 
PITCH_DONTKNOW);
+addtopattern(pPattern, rInfo.GetItalic(), rInfo.GetWeight(), 
rInfo.GetWidthType(), PITCH_DONTKNOW);
 FcPatternAddDouble(pPattern, FC_PIXEL_SIZE, nSize);
 
 FcConfigSubstitute(pConfig, pPattern, FcMatchPattern);
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx 
b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index 5831979e6109..0881913c040c 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -473,16 +473,9 @@ FreetypeFont::FreetypeFont(FreetypeFontInstance& 
rFontInstance, const std::share
 
 namespace
 {
-std::unique_ptr GetFCFontOptions( const 
FontAttributes& rFontAttributes, int nSize)
+std::unique_ptr GetFCFontOptions(const 
FontAttributes& rFontAttributes, int nSize)
 {
-psp::FastPrintFontInfo aInfo;
-
-aInfo.m_aFamilyName = rFontAttributes.GetFamilyName();
-aInfo.m_eItalic = rFontAttributes.GetItalic();
-aInfo.m_eWeight = rFontAttributes.GetWeight();
-aInfo.m_eWidth = rFontAttributes.GetWidthType();
-
-return psp::PrintFontManager::getFontOptions(aInfo, nSize);
+return psp::PrintFontManager::getFontOptions(rFontAttributes, nSize);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/unx/generic/fontmanager/fontconfig.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0bbd74f93a6f37bf880981862437f892f43452d0
Author: Caolán McNamara 
AuthorDate: Wed Apr 14 09:57:33 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 14 12:39:01 2021 +0200

getFontOptions is always called with pitch of PITCH_DONTKNOW

getFontOptions is called from only one location and there
the pitch value is left at its default PITCH_DONTKNOW
which is suspicious but that's the way it currently is

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

diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx 
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 855868a022e4..17ca8f46ccae 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -1113,7 +1113,8 @@ std::unique_ptr 
PrintFontManager::getFontOptions(const Fa
 if( !sFamily.isEmpty() )
 FcPatternAddString(pPattern, FC_FAMILY, reinterpret_cast(sFamily.getStr()));
 
-addtopattern(pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth, 
rInfo.m_ePitch);
+// TODO: ePitch argument of always PITCH_DONTKNOW is suspicious
+addtopattern(pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth, 
PITCH_DONTKNOW);
 FcPatternAddDouble(pPattern, FC_PIXEL_SIZE, nSize);
 
 FcConfigSubstitute(pConfig, pPattern, FcMatchPattern);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 6 commits - sc/inc sc/qa sc/source

[Tor Lillqvist (via logerrit)]

 sc/inc/document.hxx   |4 
 sc/inc/table.hxx  |6 -
 sc/qa/unit/subsequent_export-test.cxx |   12 +-
 sc/qa/unit/ucalc_sharedformula.cxx|2 
 sc/source/core/data/dociter.cxx   |4 
 sc/source/core/data/documen3.cxx  |2 
 sc/source/core/data/document.cxx  |6 -
 sc/source/core/data/table1.cxx|   23 ++--
 sc/source/core/data/table2.cxx|   25 +++-
 sc/source/core/data/table5.cxx|2 
 sc/source/filter/rtf/eeimpars.cxx |2 
 sc/source/filter/xcl97/xcl97rec.cxx   |2 
 sc/source/filter/xml/xmlexprt.cxx |2 
 sc/source/ui/docshell/docfunc.cxx |  181 +++---
 sc/source/ui/docshell/docsh5.cxx  |2 
 sc/source/ui/inc/docfunc.hxx  |8 +
 sc/source/ui/inc/viewfunc.hxx |2 
 sc/source/ui/undo/undobase.cxx|2 
 sc/source/ui/undo/undoblk.cxx |6 -
 sc/source/ui/undo/undoblk3.cxx|6 -
 sc/source/ui/vba/vbaworksheet.cxx |   12 +-
 sc/source/ui/view/gridwin.cxx |2 
 sc/source/ui/view/select.cxx  |2 
 sc/source/ui/view/tabview2.cxx|   10 -
 sc/source/ui/view/tabview3.cxx|2 
 sc/source/ui/view/tabvwsh3.cxx|4 
 sc/source/ui/view/viewfun2.cxx|6 -
 sc/source/ui/view/viewfun3.cxx|2 
 sc/source/ui/view/viewfun4.cxx|2 
 sc/source/ui/view/viewfunc.cxx|   21 ++-
 30 files changed, 182 insertions(+), 180 deletions(-)

New commits:
commit 964f6eda20c4ce6415bd66fd228526b44e5b3159
Author: Tor Lillqvist 
AuthorDate: Wed Feb 10 11:58:52 2021 +0200
Commit: Andras Timar 
CommitDate: Wed Apr 14 12:21:09 2021 +0200

Don't shrink row height when deleting cell contents interactively either

Follow-up to e763e13873adfe3c6abfa4c2dfd3ac3847e2d494. Such shrinking
of row height, typically by a few silly pixels, just causes
unnecessary invalidation thrash in a collaborative editing context.

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

diff --git a/sc/qa/unit/ucalc_sharedformula.cxx 
b/sc/qa/unit/ucalc_sharedformula.cxx
index c965a71196a7..a24546516df5 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -2411,7 +2411,7 @@ void Test::testSharedFormulaDeleteTopCell()
 // Delete cell A1.
 ScMarkData aMark(m_pDoc->GetSheetLimits());
 aMark.SelectOneTable(0);
-getDocShell().GetDocFunc().DeleteCell( ScAddress(0,0,0), aMark, 
InsertDeleteFlags::CONTENTS, false);
+getDocShell().GetDocFunc().DeleteCell( ScAddress(0,0,0), aMark, 
InsertDeleteFlags::CONTENTS, false, /*bApi=*/ true);
 // Check it's gone.
 CPPUNIT_ASSERT(!m_pDoc->GetFormulaCell( ScAddress(0,0,0)));
 
diff --git a/sc/source/ui/docshell/docfunc.cxx 
b/sc/source/ui/docshell/docfunc.cxx
index 2949e92390f1..951048e43869 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -660,7 +660,7 @@ bool ScDocFunc::DeleteContents(
 }
 
 bool ScDocFunc::DeleteCell(
-const ScAddress& rPos, const ScMarkData& rMark, InsertDeleteFlags nFlags, 
bool bRecord )
+const ScAddress& rPos, const ScMarkData& rMark, InsertDeleteFlags nFlags, 
bool bRecord, bool bApi )
 {
 ScDocShellModificator aModificator(rDocShell);
 
@@ -716,7 +716,7 @@ bool ScDocFunc::DeleteCell(
 nFlags, pDataSpans, false, bDrawUndo);
 }
 
-if (!AdjustRowHeight(rPos, true, true))
+if (!AdjustRowHeight(rPos, true, bApi))
 rDocShell.PostPaint(
 rPos.Col(), rPos.Row(), rPos.Tab(), rPos.Col(), rPos.Row(), 
rPos.Tab(),
 PaintPartFlags::Grid, nExtFlags);
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index f8319295b2f0..d52d0225b167 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -92,7 +92,7 @@ public:
 const ScMarkData& rMark, InsertDeleteFlags nFlags, bool bRecord, bool 
bApi );
 
 bool DeleteCell(
-const ScAddress& rPos, const ScMarkData& rMark, InsertDeleteFlags 
nFlags, bool bRecord );
+const ScAddress& rPos, const ScMarkData& rMark, InsertDeleteFlags 
nFlags, bool bRecord, bool bApi );
 
 boolTransliterateText( const ScMarkData& rMark, 
TransliterationFlags nType,
bool bApi );
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index ac08fb699380..f59f5e37820c 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -1982,10 +1982,14 @@ void ScViewFunc::DeleteContents( I

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

[Justin Luth (via logerrit)]

 sw/qa/extras/rtfexport/data/tdf100961_fixedDateTime.rtf |   38 
 sw/qa/extras/rtfexport/rtfexport3.cxx   |   12 +
 writerfilter/inc/dmapper/resourcemodel.hxx  |1 
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx   |1 
 writerfilter/source/rtftok/rtfdispatchdestination.cxx   |1 
 writerfilter/source/rtftok/rtfdispatchflag.cxx  |6 ++
 writerfilter/source/rtftok/rtfdocumentimpl.cxx  |4 +
 writerfilter/source/rtftok/rtfdocumentimpl.hxx  |3 +
 8 files changed, 65 insertions(+), 1 deletion(-)

New commits:
commit 4ed7a2c8af03bc0f45df1f03fd160ccbf045ed4f
Author: Justin Luth 
AuthorDate: Tue Apr 13 17:57:58 2021 +0200
Commit: Justin Luth 
CommitDate: Wed Apr 14 12:23:25 2021 +0200

tdf#100961 rtf import: fldlock is FIXEDFLD

This depends on another fix in this bug report for
exporting.

I'm not sure why I even bother trying to work
on RTF stuff. I'm not really into black magic.

Change-Id: If596cae011a261a80ca13962932bf25561c0f63f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114062
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/sw/qa/extras/rtfexport/data/tdf100961_fixedDateTime.rtf 
b/sw/qa/extras/rtfexport/data/tdf100961_fixedDateTime.rtf
new file mode 100644
index ..95f28e34ddbb
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf100961_fixedDateTime.rtf
@@ -0,0 +1,38 @@
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff1\deff0\stshfdbch42\stshfloch41\stshfhich41\stshfbi1\deflang2057\deflangfe2057{\fonttbl{\f1\fswiss\fcharset0\fprq2{\*\panose
 020b0604020202020204}Arial;}{\f36\fswiss\fcharset0\fprq2{\*\panose 
020b0604020202020204}Liberation Sans{\*\falt Arial};}
+{\f41\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Liberation 
Serif{\*\falt Times New Roman};}{\f42\fmodern\fcharset134\fprq1{\*\panose 
02010609030101010101}NSimSun;}{\f43\fswiss\fcharset134\fprq2{\*\panose 
020b0503020204020204}Microsoft YaHei;}
+{\f72\fmodern\fcharset134\fprq1{\*\panose 
}@NSimSun;}{\f73\fswiss\fcharset134\fprq2{\*\panose 
}@Microsoft YaHei;}{\f84\fswiss\fcharset238\fprq2 Arial 
CE;}{\f85\fswiss\fcharset204\fprq2 Arial Cyr;}
+{\f87\fswiss\fcharset161\fprq2 Arial Greek;}{\f88\fswiss\fcharset162\fprq2 
Arial Tur;}{\f89\fbidi \fswiss\fcharset177\fprq2 Arial (Hebrew);}{\f90\fbidi 
\fswiss\fcharset178\fprq2 Arial (Arabic);}{\f91\fswiss\fcharset186\fprq2 Arial 
Baltic;}
+{\f92\fswiss\fcharset163\fprq2 Arial 
(Vietnamese);}{\f434\fswiss\fcharset238\fprq2 Liberation Sans CE{\*\falt 
Arial};}{\f435\fswiss\fcharset204\fprq2 Liberation Sans Cyr{\*\falt Arial};}
+{\f437\fswiss\fcharset161\fprq2 Liberation Sans Greek{\*\falt 
Arial};}{\f438\fswiss\fcharset162\fprq2 Liberation Sans Tur{\*\falt 
Arial};}{\f439\fbidi \fswiss\fcharset177\fprq2 Liberation Sans (Hebrew){\*\falt 
Arial};}
+{\f441\fswiss\fcharset186\fprq2 Liberation Sans Baltic{\*\falt 
Arial};}{\f442\fswiss\fcharset163\fprq2 Liberation Sans (Vietnamese){\*\falt 
Arial};}{\f484\froman\fcharset238\fprq2 Liberation Serif CE{\*\falt Times New 
Roman};}
+{\f485\froman\fcharset204\fprq2 Liberation Serif Cyr{\*\falt Times New 
Roman};}{\f487\froman\fcharset161\fprq2 Liberation Serif Greek{\*\falt Times 
New Roman};}{\f488\froman\fcharset162\fprq2 Liberation Serif Tur{\*\falt Times 
New Roman};}
+{\f489\fbidi \froman\fcharset177\fprq2 Liberation Serif (Hebrew){\*\falt Times 
New Roman};}{\f491\froman\fcharset186\fprq2 Liberation Serif Baltic{\*\falt 
Times New Roman};}
+{\f492\froman\fcharset163\fprq2 Liberation Serif (Vietnamese){\*\falt Times 
New Roman};}{\f74\froman\fcharset238\fprq2 Times New Roman 
CE;}{\f75\froman\fcharset204\fprq2 Times New Roman 
Cyr;}{\f77\froman\fcharset161\fprq2 Times New Roman Greek;}
+{\f78\froman\fcharset162\fprq2 Times New Roman Tur;}{\f79\fbidi 
\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f80\fbidi 
\froman\fcharset178\fprq2 Times New Roman 
(Arabic);}{\f81\froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\f82\froman\fcharset163\fprq2 Times New Roman 
(Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;
+\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{
+\ql 
\li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0
 \rtlch\fcs1 \af1\afs24\alang1081 \ltrch\fcs0 
\fs24\lang1049\langfe2052\kerning2\loch\f41\hich\af41\dbch\af42\cgrid\langnp1049\langfenp2052
 \snext0 Normal;}{\*\cs10 
+\additive \ssemihidden Default Paragraph Font;}{\*
+\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\t

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

[Miklos Vajna (via logerrit)]

 sw/source/ui/index/swuiidxmrk.cxx |   20 +---
 1 file changed, 17 insertions(+), 3 deletions(-)

New commits:
commit 7526e77820956238a1a903d73ff15a49c082d6de
Author: Miklos Vajna 
AuthorDate: Wed Apr 14 11:06:00 2021 +0200
Commit: Miklos Vajna 
CommitDate: Wed Apr 14 12:08:49 2021 +0200

sw define bibliography entry dialog: recognize relative file URLs

So that in case a file:// document has relative URLs, we show the type
as local file (with a file picker), not as "www document".

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

diff --git a/sw/source/ui/index/swuiidxmrk.cxx 
b/sw/source/ui/index/swuiidxmrk.cxx
index 9d5a41f05075..464614f7eeb3 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -72,6 +72,20 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::util;
 using namespace ::comphelper;
 
+namespace
+{
+/// Similar to comphelper::isFileUrl(), but handles relative URLs as well.
+bool IsFileUrl(SwWrtShell& rWrtSh, const OUString& rUrl)
+{
+SwDocShell* pDocShell = rWrtSh.GetDoc()->GetDocShell();
+OUString aBaseUrl = pDocShell->getDocumentBaseURL();
+OUString aAbs = INetURLObject::GetAbsURL(aBaseUrl, rUrl,
+INetURLObject::EncodeMechanism::WasEncoded,
+INetURLObject::DecodeMechanism::WithCharset);
+return comphelper::isFileUrl(aAbs);
+}
+}
+
 // dialog to insert a directory selection
 SwIndexMarkPane::SwIndexMarkPane(const std::shared_ptr& rDialog, 
weld::Builder& rBuilder, bool bNewDlg,
 SwWrtShell* pWrtShell)
@@ -1557,7 +1571,7 @@ 
SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(weld::Window* pParent,
 if(!pFields[aCurInfo.nToxField].isEmpty())
 {
 int nPos = pFields[aCurInfo.nToxField].toInt32();
-if (nPos == AUTH_TYPE_WWW && 
comphelper::isFileUrl(pFields[AUTH_FIELD_URL]))
+if (nPos == AUTH_TYPE_WWW && IsFileUrl(rWrtSh, 
pFields[AUTH_FIELD_URL]))
 {
 // Map file URL to local file.
 nPos = AUTH_TYPE_END;
@@ -1626,7 +1640,7 @@ 
SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(weld::Window* pParent,
 }
 }
 else if (aCurInfo.nToxField == AUTH_FIELD_URL
- && comphelper::isFileUrl(pFields[aCurInfo.nToxField]))
+ && IsFileUrl(rWrtSh, pFields[aCurInfo.nToxField]))
 {
 m_xBrowseButton = m_aBuilders.back()->weld_button("browse");
 m_xBrowseButton->connect_clicked(LINK(this, 
SwCreateAuthEntryDlg_Impl, BrowseHdl));
@@ -1725,7 +1739,7 @@ IMPL_LINK_NOARG(SwCreateAuthEntryDlg_Impl, BrowseHdl, 
weld::Button&, void)
 bool bSaveRelFSys = 
officecfg::Office::Common::Save::URL::FileSystem::get();
 if (!aPath.isEmpty())
 {
-if (bSaveRelFSys && !comphelper::isFileUrl(aPath))
+if (bSaveRelFSys && !IsFileUrl(rWrtSh, aPath))
 {
 SwDocShell* pDocShell = rWrtSh.GetDoc()->GetDocShell();
 OUString aBasePath = pDocShell->getDocumentBaseURL();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marco Cecchetti (via logerrit)]

 sc/qa/unit/tiledrendering/tiledrendering.cxx |   39 +++
 sc/source/ui/view/tabvwshc.cxx   |9 +++---
 2 files changed, 44 insertions(+), 4 deletions(-)

New commits:
commit 9dda49734b65875d7b916a1867d86f8c161b32e8
Author: Marco Cecchetti 
AuthorDate: Wed Jul 15 13:01:33 2020 +0200
Commit: Marco Cecchetti 
CommitDate: Wed Apr 14 11:44:27 2021 +0200

lok: sc: Desktop: Function wizard isn't properly async

Open another view of the same spreadsheet when the function dialog is
open. Note how the document in the new view can't be edited.

This patch avoids to have a view locked after creation when in an
other view the formula dialog is open.

See also commit 009d275.

Change-Id: Ie51f414c4ad83ef20526d10be3251e174158096c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98823
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114060
Tested-by: Jenkins
Reviewed-by: Marco Cecchetti 

diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx 
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 9a9a5119c4a0..5e3f1494059d 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -108,6 +108,7 @@ public:
 void testSheetGeometryDataInvariance();
 void testSheetGeometryDataCorrectness();
 void testDeleteCellMultilineContent();
+void testFunctionDlg();
 void testSpellOnlineParameter();
 void testSpellOnlineRenderParameter();
 void testPasteIntoWrapTextCell();
@@ -156,6 +157,7 @@ public:
 CPPUNIT_TEST(testSheetGeometryDataInvariance);
 CPPUNIT_TEST(testSheetGeometryDataCorrectness);
 CPPUNIT_TEST(testDeleteCellMultilineContent);
+CPPUNIT_TEST(testFunctionDlg);
 CPPUNIT_TEST(testSpellOnlineParameter);
 CPPUNIT_TEST(testSpellOnlineRenderParameter);
 CPPUNIT_TEST(testPasteIntoWrapTextCell);
@@ -1622,6 +1624,43 @@ void ScTiledRenderingTest::testFilterDlg()
 SfxViewShell::Current()->registerLibreOfficeKitViewCallback(nullptr, 
nullptr);
 }
 
+void ScTiledRenderingTest::testFunctionDlg()
+{
+comphelper::LibreOfficeKit::setActive();
+
+createDoc("empty.ods");
+
+// view #1
+SfxViewShell* pView1 = SfxViewShell::Current();
+int nView1 = SfxLokHelper::getView();
+{
+pView1->GetViewFrame()->GetDispatcher()->Execute(SID_OPENDLG_FUNCTION,
+SfxCallMode::SLOT|SfxCallMode::RECORD);
+}
+Scheduler::ProcessEventsToIdle();
+SfxChildWindow* pRefWindow = 
pView1->GetViewFrame()->GetChildWindow(SID_OPENDLG_FUNCTION);
+CPPUNIT_ASSERT(pRefWindow);
+
+// view #2
+int nView2 = SfxLokHelper::createView();
+SfxViewShell* pView2 = SfxViewShell::Current();
+CPPUNIT_ASSERT(pView1 != pView2);
+
+// check loking
+CPPUNIT_ASSERT_EQUAL(true, 
pView1->GetViewFrame()->GetDispatcher()->IsLocked());
+CPPUNIT_ASSERT_EQUAL(false, 
pView2->GetViewFrame()->GetDispatcher()->IsLocked());
+
+SfxLokHelper::setView(nView1);
+pRefWindow->GetController()->response(RET_CANCEL);
+
+CPPUNIT_ASSERT_EQUAL(false, 
pView1->GetViewFrame()->GetDispatcher()->IsLocked());
+CPPUNIT_ASSERT_EQUAL(false, 
pView2->GetViewFrame()->GetDispatcher()->IsLocked());
+
+SfxViewShell::Current()->registerLibreOfficeKitViewCallback(nullptr, 
nullptr);
+SfxLokHelper::setView(nView2);
+SfxViewShell::Current()->registerLibreOfficeKitViewCallback(nullptr, 
nullptr);
+}
+
 void ScTiledRenderingTest::testSpellOnlineParameter()
 {
 ScModelObj* pModelObj = createDoc("empty.ods");
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 208623b1c4cb..2249f25decb2 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -121,12 +121,13 @@ std::shared_ptr 
ScTabViewShell::CreateRefDialogCont
 
 if ( nCurRefDlgId != nSlotId )
 {
-//  the dialog has been opened in a different view
-//  -> lock the dispatcher for this view (modal mode)
+if (!(comphelper::LibreOfficeKit::isActive() && nSlotId == 
SID_OPENDLG_FUNCTION))
+{
+//  the dialog has been opened in a different view
+//  -> lock the dispatcher for this view (modal mode)
 
-if (!comphelper::LibreOfficeKit::isActive())
 GetViewData().GetDispatcher().Lock( true );// lock is reset 
when closing dialog
-
+}
 return nullptr;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ahmet Hakan Çelik (via logerrit)]

 xmlsecurity/source/framework/saxeventkeeperimpl.cxx|3 +--
 xmlsecurity/source/framework/signaturecreatorimpl.cxx  |3 +--
 xmlsecurity/source/framework/signatureverifierimpl.cxx |3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 348595440143b210f55bfa541ab3f853d468f19f
Author: Ahmet Hakan Çelik 
AuthorDate: Sun Mar 7 19:06:33 2021 +0300
Commit: Michael Stahl 
CommitDate: Wed Apr 14 11:07:06 2021 +0200

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

Change-Id: Ie7507e6beb470708bb4e52a7b926433043b80d85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112133
Tested-by: Jenkins
Reviewed-by: John Turpish 
Reviewed-by: Michael Stahl 

diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx 
b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
index b0c03880348f..5e2f697d64ac 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
@@ -1131,8 +1131,7 @@ OUString SAXEventKeeperImpl_getImplementationName ()
 
 css::uno::Sequence< OUString > SAXEventKeeperImpl_getSupportedServiceNames(  )
 {
-css::uno::Sequence aRet { 
"com.sun.star.xml.crypto.sax.SAXEventKeeper" };
-return aRet;
+return { "com.sun.star.xml.crypto.sax.SAXEventKeeper" };
 }
 
 /* XServiceInfo */
diff --git a/xmlsecurity/source/framework/signaturecreatorimpl.cxx 
b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
index 826f800409f6..ca90abe9a004 100644
--- a/xmlsecurity/source/framework/signaturecreatorimpl.cxx
+++ b/xmlsecurity/source/framework/signaturecreatorimpl.cxx
@@ -153,8 +153,7 @@ OUString SignatureCreatorImpl_getImplementationName ()
 
 css::uno::Sequence< OUString > SignatureCreatorImpl_getSupportedServiceNames(  
)
 {
-css::uno::Sequence aRet { 
"com.sun.star.xml.crypto.sax.SignatureCreator" };
-return aRet;
+return { "com.sun.star.xml.crypto.sax.SignatureCreator" };
 }
 
 /* XServiceInfo */
diff --git a/xmlsecurity/source/framework/signatureverifierimpl.cxx 
b/xmlsecurity/source/framework/signatureverifierimpl.cxx
index 4e9dc08af972..489e8348604c 100644
--- a/xmlsecurity/source/framework/signatureverifierimpl.cxx
+++ b/xmlsecurity/source/framework/signatureverifierimpl.cxx
@@ -109,8 +109,7 @@ OUString SignatureVerifierImpl_getImplementationName ()
 
 css::uno::Sequence< OUString > SignatureVerifierImpl_getSupportedServiceNames( 
 )
 {
-css::uno::Sequence aRet { 
"com.sun.star.xml.crypto.sax.SignatureVerifier" };
-return aRet;
+return { "com.sun.star.xml.crypto.sax.SignatureVerifier" };
 }
 
 /* XServiceInfo */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 desktop/source/lib/init.cxx |   14 +++
 include/vcl/layout.hxx  |7 -
 include/vcl/uitest/uiobject.hxx |   12 +
 vcl/source/uitest/uiobject.cxx  |   50 
 vcl/source/window/layout.cxx|8 ++
 5 files changed, 85 insertions(+), 6 deletions(-)

New commits:
commit 5f18922496ec60255097048d9b00b70fc6ccbba5
Author: Szymon Kłos 
AuthorDate: Fri Apr 2 20:13:32 2021 +0200
Commit: Jan Holesovsky 
CommitDate: Wed Apr 14 11:06:08 2021 +0200

jsdialog: uitest: handle click for drawing area

Change-Id: I5ea78697b87f4b2a468f8507470b62031bee4aa0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113524
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index dca49bd79014..8d641cd1383f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3818,6 +3818,20 @@ static void lcl_sendDialogEvent(unsigned long long int 
nWindowId, const char* pA
 aMap["VALUE"] = aMap["data"];
 pUIWindow->execute(sValue, aMap);
 }
+else if (sAction == "click" && sControlType == 
"drawingarea")
+{
+int separatorPos = aMap["data"].indexOf(';');
+if (separatorPos > 0)
+{
+// x;y
+aMap["POSX"] = aMap["data"].copy(0, separatorPos);
+aMap["POSY"] = aMap["data"].copy(separatorPos + 1);
+
+pUIWindow->execute(sClickAction, aMap);
+}
+else
+bIsClickAction = true;
+}
 else
 bIsClickAction = true;
 
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 63d789d28a7e..b2f340942a20 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -723,12 +723,7 @@ private:
 Help::ShowQuickHelp(this, aHelpArea, sHelpTip, eHelpWinStyle);
 }
 }
-virtual FactoryFunction GetUITestFactory() const override
-{
-if (m_pFactoryFunction)
-return m_pFactoryFunction;
-return Control::GetUITestFactory();
-}
+virtual FactoryFunction GetUITestFactory() const override;
 
 public:
 VclDrawingArea(vcl::Window *pParent, WinBits nStyle)
diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx
index 60d84dedbe24..b5713587ccf3 100644
--- a/include/vcl/uitest/uiobject.hxx
+++ b/include/vcl/uitest/uiobject.hxx
@@ -29,6 +29,7 @@
 class Edit;
 class SpinButton;
 class SpinField;
+class VclDrawingArea;
 class MetricField;
 
 typedef std::map StringMap;
@@ -495,6 +496,17 @@ private:
 SvTreeListEntry* const mpEntry;
 };
 
+class UITEST_DLLPUBLIC DrawingAreaUIObject : public WindowUIObject
+{
+private:
+VclPtr mxDrawingArea;
+public:
+DrawingAreaUIObject(const VclPtr& rDrawingArea);
+virtual ~DrawingAreaUIObject() override;
+virtual void execute(const OUString& rAction, const StringMap& 
rParameters) override;
+static std::unique_ptr create(vcl::Window* pWindow);
+};
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 2c6010dc205d..c10cc5f21d9d 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -11,6 +11,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1485,6 +1486,55 @@ std::unique_ptr 
TabControlUIObject::create(vcl::Window* pWindow)
 return std::unique_ptr(new TabControlUIObject(pTabControl));
 }
 
+DrawingAreaUIObject::DrawingAreaUIObject(const VclPtr& 
rDrawingArea)
+: WindowUIObject(rDrawingArea)
+, mxDrawingArea(rDrawingArea.get())
+{
+assert(mxDrawingArea);
+}
+
+DrawingAreaUIObject::~DrawingAreaUIObject()
+{
+}
+
+void DrawingAreaUIObject::execute(const OUString& rAction, const StringMap& 
rParameters)
+{
+if (rAction == "CLICK")
+{
+// POSX and POSY are percentage of width/height dimensions
+if (rParameters.find("POSX") != rParameters.end() &&
+rParameters.find("POSY") != rParameters.end())
+{
+auto aPosX = rParameters.find("POSX");
+auto aPosY = rParameters.find("POSY");
+
+OString sPosX2 = OUStringToOString(aPosX->second, 
RTL_TEXTENCODING_ASCII_US);
+OString sPoxY2 = OUStringToOString(aPosY->second, 
RTL_TEXTENCODING_ASCII_US);
+
+if (!sPosX2.isEmpty() && !sPoxY2.isEmpty())
+{
+double fPosX = std::atof(sPosX2.getStr());
+double fPosY = std::atof(sPoxY2.getStr());
+
+fPosX = fPosX * mxDrawingArea->GetOutputWidthPixel();
+fPosY = fPosY * mxDrawingArea->Get

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

[Szymon Kłos (via logerrit)]

 chart2/qa/extras/chart2import.cxx|   35 +++
 chart2/qa/extras/data/xlsx/tdf140489.xlsx|binary
 oox/source/drawingml/chart/plotareaconverter.cxx |8 +++--
 3 files changed, 41 insertions(+), 2 deletions(-)

New commits:
commit d8d1b869e8554c0aa1e13114b9fe1fdc236c47d8
Author: Szymon Kłos 
AuthorDate: Thu Apr 8 15:08:38 2021 +0200
Commit: Jan Holesovsky 
CommitDate: Wed Apr 14 11:04:22 2021 +0200

tdf#140489 fix chart display in xlsx

Commit 1147383:
tdf#114181 XLSX combined chart: fix swapped primary and secondary axes etc.

introduced regression by applying axis swaping not only
for combined charts.

Change-Id: I764399579ff922ddd495540fdd2a39675f2a8da5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113804
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index 383196d774d4..82e534f4dfcb 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -115,6 +115,7 @@ public:
 void testAxisTitleRotationXLSX();
 void testAxisTitlePositionDOCX();
 void testCombinedChartAttachedAxisXLSX();
+void testTdf140489MultiSeriesChartAxisXLSX();
 
 void testTdf90510(); // Pie chart label placement settings(XLS)
 void testTdf109858(); // Pie chart label placement settings(XLSX)
@@ -219,6 +220,7 @@ public:
 CPPUNIT_TEST(testAxisTitleRotationXLSX);
 CPPUNIT_TEST(testAxisTitlePositionDOCX);
 CPPUNIT_TEST(testCombinedChartAttachedAxisXLSX);
+CPPUNIT_TEST(testTdf140489MultiSeriesChartAxisXLSX);
 CPPUNIT_TEST(testTdf90510);
 CPPUNIT_TEST(testTdf109858);
 CPPUNIT_TEST(testTdf130105);
@@ -1635,6 +1637,39 @@ void 
Chart2ImportTest::testCombinedChartAttachedAxisXLSX()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nAxisIndex);
 }
 
+void Chart2ImportTest::testTdf140489MultiSeriesChartAxisXLSX()
+{
+load("/chart2/qa/extras/data/xlsx/", "tdf140489.xlsx");
+Reference< chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, 
mxComponent);
+// First series
+Reference xSeries = getDataSeriesFromDoc(xChartDoc, 
0);
+CPPUNIT_ASSERT(xSeries.is());
+
+Reference xPropSet(xSeries, uno::UNO_QUERY_THROW);
+sal_Int32 nAxisIndex = -1;
+uno::Any aAny = xPropSet->getPropertyValue("AttachedAxisIndex");
+CPPUNIT_ASSERT(aAny >>= nAxisIndex);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nAxisIndex);
+
+// Second series
+xSeries = getDataSeriesFromDoc(xChartDoc, 0, 1);
+CPPUNIT_ASSERT(xSeries.is());
+
+xPropSet.set(xSeries, uno::UNO_QUERY_THROW);
+aAny = xPropSet->getPropertyValue("AttachedAxisIndex");
+CPPUNIT_ASSERT(aAny >>= nAxisIndex);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nAxisIndex);
+
+// Third series
+xSeries = getDataSeriesFromDoc(xChartDoc, 0, 2);
+CPPUNIT_ASSERT(xSeries.is());
+
+xPropSet.set(xSeries, uno::UNO_QUERY_THROW);
+aAny = xPropSet->getPropertyValue("AttachedAxisIndex");
+CPPUNIT_ASSERT(aAny >>= nAxisIndex);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), nAxisIndex);
+}
+
 void Chart2ImportTest::testInternalDataProvider() {
 uno::Reference< chart2::XChartDocument > 
xChartDoc(getChartDocFromImpress("/chart2/qa/extras/data/odp/", "chart.odp"), 
uno::UNO_QUERY_THROW);
 const uno::Reference< chart2::data::XDataProvider >& rxDataProvider = 
xChartDoc->getDataProvider();
diff --git a/chart2/qa/extras/data/xlsx/tdf140489.xlsx 
b/chart2/qa/extras/data/xlsx/tdf140489.xlsx
new file mode 100644
index ..bd24f40be7b5
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/tdf140489.xlsx differ
diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx 
b/oox/source/drawingml/chart/plotareaconverter.cxx
index b3c76915a5de..32bbfb545ef2 100644
--- a/oox/source/drawingml/chart/plotareaconverter.cxx
+++ b/oox/source/drawingml/chart/plotareaconverter.cxx
@@ -414,9 +414,13 @@ void PlotAreaConverter::convertFromModel( View3DModel& 
rView3DModel )
 // varying point colors only for single series in single chart type
 bool bSupportsVaryColorsByPoint = mrModel.maTypeGroups.size() == 1;
 
+bool bIsCombinedChart = mrModel.maTypeGroups.size() == 2 &&
+mrModel.maTypeGroups[0]->mnTypeId != mrModel.maTypeGroups[1]->mnTypeId;
+
 // convert all axes sets, and check which axis is attached to the first 
maTypeGroups
-sal_Int32 nStartAxesSetIdx = (rValAxisIds.size() > 1 && aAxesSets.size() > 
0 && aAxesSets[0]->maAxes.count( API_Y_AXIS )
-&& aAxesSets[0]->maAxes[ API_Y_AXIS ]->mnAxisId != rValAxisIds[0] 
) ? 1 : 0;
+sal_Int32 nStartAxesSetIdx = bIsCombinedChart ? ((rValAxisIds.size() > 1 
&& aAxesSets.size() > 0 && aAxesSets[0]->maAxes.count( API_Y_AXIS )
+&& aAxesSets[0]->maAxes[ API_Y_AXIS ]->mnAxisId != rValAxisIds[0] 
) ? 1 : 0)
+: 0;
 sal_Int32 nAxesSetIdx = nStartAxesSetIdx;
 
 for (auto const& axesSet : aAxesSets

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

[Jan-Marek Glogowski (via logerrit)]

 vcl/qt5/Qt5Frame.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 93b50c83b370a6621438ae532f897100b2bf0666
Author: Jan-Marek Glogowski 
AuthorDate: Sun Apr 11 17:21:57 2021 +0200
Commit: Michael Stahl 
CommitDate: Wed Apr 14 11:01:09 2021 +0200

tdf#141623 Qt5+cairo init surface with widget size

The QFont based rendering path directly uses the widgets size to
initialize the QImage buffer image, so do the same for the Cairo
surface, instead of the arbitrarily size of 640x480.

Change-Id: I91326dab67cbbb5e75b78b02c34eaca61ad26482
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113955
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 91c883e75436210ca8af95df1ca597caeeda8703)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113869
Reviewed-by: Michael Weghorn 
(cherry picked from commit 3f204ca2fed7614e1e12180af5ce5bfd88249eb7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113870
Reviewed-by: Michael Stahl 

diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 936216b9de68..6cb4189343a7 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -290,11 +290,11 @@ void Qt5Frame::Damage(sal_Int32 nExtentsX, sal_Int32 
nExtentsY, sal_Int32 nExten
 
 void Qt5Frame::InitQt5SvpGraphics(Qt5SvpGraphics* pQt5SvpGraphics)
 {
-int width = 640;
-int height = 480;
+QSize aSize = m_pQWidget->size() * devicePixelRatioF();
 m_pSvpGraphics = pQt5SvpGraphics;
-m_pSurface.reset(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, 
height));
-m_pSvpGraphics->setSurface(m_pSurface.get(), basegfx::B2IVector(width, 
height));
+m_pSurface.reset(
+cairo_image_surface_create(CAIRO_FORMAT_ARGB32, aSize.width(), 
aSize.height()));
+m_pSvpGraphics->setSurface(m_pSurface.get(), 
basegfx::B2IVector(aSize.width(), aSize.height()));
 cairo_surface_set_user_data(m_pSurface.get(), 
Qt5SvpGraphics::getDamageKey(), &m_aDamageHandler,
 nullptr);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 oox/source/drawingml/chart/typegroupconverter.cxx |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 5389028154847f05a5138d85645f7d0639e10b16
Author: Szymon Kłos 
AuthorDate: Wed Apr 7 11:00:25 2021 +0200
Commit: Jan Holesovsky 
CommitDate: Wed Apr 14 10:59:43 2021 +0200

Don't overwrite existing categories for series

When chart serie has defined categories which are not
references we can fail on creating XLabeledDataSequence
and in the end overwrite them.

Change-Id: Ie8dc76e420fc4a2508df66a6dca80b8023ee895b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113721
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx 
b/oox/source/drawingml/chart/typegroupconverter.cxx
index ea02d5ca548b..99bbaebe3101 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -291,11 +291,14 @@ Reference< XLabeledDataSequence > 
TypeGroupConverter::createCategorySequence()
 if( nMaxValues < 0 )
 nMaxValues = 2;
 SeriesModel &aModel = *mrModel.maSeries.get(0);
-DataSourceModel &aSrc = aModel.maSources.create( 
SeriesModel::CATEGORIES );
-DataSequenceModel &aSeq = aSrc.mxDataSeq.create();
-aSeq.mnPointCount = nMaxValues;
-for( sal_Int32 i = 0; i < nMaxValues; i++ )
-aSeq.maData[ i ] <<= OUString::number( i + 1 );
+if (!aModel.maSources.has(SeriesModel::CATEGORIES))
+{
+DataSourceModel &aSrc = aModel.maSources.create( 
SeriesModel::CATEGORIES );
+DataSequenceModel &aSeq = aSrc.mxDataSeq.create();
+aSeq.mnPointCount = nMaxValues;
+for( sal_Int32 i = 0; i < nMaxValues; i++ )
+aSeq.maData[ i ] <<= OUString::number( i + 1 );
+}
 SeriesConverter aSeriesConv( *this,  aModel );
 xLabeledSeq = aSeriesConv.createCategorySequence( "categories" );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source include/vcl sc/uiconfig sc/UIConfig_scalc.mk sd/uiconfig sd/UIConfig_sdraw.mk sd/UIConfig_simpress.mk sfx2/source sw/u

[Szymon Kłos (via logerrit)]

 desktop/source/lib/init.cxx|2 
 include/vcl/WeldedTabbedNotebookbar.hxx|4 -
 sc/UIConfig_scalc.mk   |1 
 sc/uiconfig/scalc/ui/notebookbar_online.ui |   93 
 sd/UIConfig_sdraw.mk   |1 
 sd/UIConfig_simpress.mk|1 
 sd/uiconfig/sdraw/ui/notebookbar_online.ui |   69 ++
 sd/uiconfig/simpress/ui/notebookbar_online.ui  |   69 ++
 sfx2/source/notebookbar/SfxNotebookBar.cxx |   11 ++
 sw/UIConfig_swriter.mk |1 
 sw/uiconfig/swriter/ui/notebookbar_online.ui   |   95 +
 vcl/source/control/WeldedTabbedNotebookbar.cxx |2 
 vcl/source/control/notebookbar.cxx |6 -
 13 files changed, 343 insertions(+), 12 deletions(-)

New commits:
commit f3f4ca409ec619e205ce9af5a4938d6bafac0ca5
Author: Szymon Kłos 
AuthorDate: Tue Apr 6 07:08:30 2021 +0200
Commit: Jan Holesovsky 
CommitDate: Wed Apr 14 10:57:24 2021 +0200

notebookbar: minify for online

Notebookbar load takes some time. We don't use most of
the items in online so minify .ui file to contain
only needed widgets.

Change-Id: I4796caae14bb63e3e04d318093209adfb87a77df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113623
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 5ac2212f211b..dca49bd79014 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -6106,7 +6106,7 @@ static void activateNotebookbar(const OUString& rApp)
 
 if (aAppNode.isValid())
 {
-aAppNode.setNodeValue("Active", makeAny(OUString("notebookbar.ui")));
+aAppNode.setNodeValue("Active", 
makeAny(OUString("notebookbar_online.ui")));
 aAppNode.commit();
 }
 }
diff --git a/include/vcl/WeldedTabbedNotebookbar.hxx 
b/include/vcl/WeldedTabbedNotebookbar.hxx
index 82996868cd2b..1a4f9eede4ec 100644
--- a/include/vcl/WeldedTabbedNotebookbar.hxx
+++ b/include/vcl/WeldedTabbedNotebookbar.hxx
@@ -15,14 +15,14 @@
 #include 
 #include 
 
-/** Tabbed implementation of NotebookBar for Writer
+/**
+ * Welded wrapper for NotebookBar used for online
 */
 class VCL_DLLPUBLIC WeldedTabbedNotebookbar
 {
 std::unique_ptr m_xBuilder;
 
 std::unique_ptr m_xContainer;
-std::unique_ptr m_xNotebook;
 
 public:
 WeldedTabbedNotebookbar(VclPtr& pContainerWindow, const 
OUString& rUIFilePath,
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 7a568e1f48a8..338d4dd2ff4d 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -159,6 +159,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/notebookbar_groups \
sc/uiconfig/scalc/ui/notebookbar_groupedbar_full \
sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact \
+   sc/uiconfig/scalc/ui/notebookbar_online \
sc/uiconfig/scalc/ui/numberbox \
sc/uiconfig/scalc/ui/managenamesdialog \
sc/uiconfig/scalc/ui/mergecellsdialog \
diff --git a/sc/uiconfig/scalc/ui/notebookbar_online.ui 
b/sc/uiconfig/scalc/ui/notebookbar_online.ui
new file mode 100644
index ..85260fe7213d
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/notebookbar_online.ui
@@ -0,0 +1,93 @@
+
+
+
+  
+  
+  
+  
+True
+False
+
+  
+True
+False
+vertical
+
+  
+True
+True
+True
+
+  
+True
+False
+True
+.uno:CharFontName
+  
+  
+True
+True
+  
+
+  
+  
+True
+True
+0
+  
+
+
+  
+True
+True
+5
+
+  
+True
+False
+.uno:FontHeight
+  
+  
+True
+True
+  
+
+  
+  
+False
+True
+1
+  
+
+
+  
+True
+True
+icons
+False
+
+  
+True
+False
+.uno:NumberFormatType
+  
+  
+True
+True
+  
+
+  
+  
+False
+True
+0
+  
+
+  
+  
+0
+0
+  
+
+  
+
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index 247767eb6f26..3e3a181f94f5 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -117,6 +117,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
  

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 14 commits - chart2/qa icon-themes/colibre icon-themes/colibre_svg icon-themes/sukapura icon-themes/sukapura_svg oox/source sc/qa sc

[Tor Lillqvist (via logerrit)]

 chart2/qa/extras/chart2import.cxx   |   35 +++
 chart2/qa/extras/data/xlsx/tdf140489.xlsx   |binary
 icon-themes/colibre/cmd/32/ar/defaultbullet.png |binary
 icon-themes/colibre/cmd/32/ar/outlinebullet.png |binary
 icon-themes/colibre/cmd/32/ar/removebullets.png |binary
 icon-themes/colibre/cmd/32/ar/setoutline.png|binary
 icon-themes/colibre/cmd/32/defaultbullet.png|binary
 icon-themes/colibre/cmd/32/outlinebullet.png|binary
 icon-themes/colibre/cmd/32/removebullets.png|binary
 icon-themes/colibre/cmd/32/setoutline.png   |binary
 icon-themes/colibre/cmd/ar/lc_removebullets.png |binary
 icon-themes/colibre/cmd/ar/sc_bulletsandnumberingdialog.png |binary
 icon-themes/colibre/cmd/ar/sc_chapternumberingdialog.png|binary
 icon-themes/colibre/cmd/ar/sc_defaultnumbering.png  |binary
 icon-themes/colibre/cmd/ar/sc_linenumberingdialog.png   |binary
 icon-themes/colibre/cmd/ar/sc_removebullets.png |binary
 icon-themes/colibre/cmd/ar/sc_setoutline.png|binary
 icon-themes/colibre/cmd/lc_removebullets.png|binary
 icon-themes/colibre/cmd/sc_bulletsandnumberingdialog.png|binary
 icon-themes/colibre/cmd/sc_chapternumberingdialog.png   |binary
 icon-themes/colibre/cmd/sc_defaultnumbering.png |binary
 icon-themes/colibre/cmd/sc_linenumberingdialog.png  |binary
 icon-themes/colibre/cmd/sc_removebullets.png|binary
 icon-themes/colibre/cmd/sc_setoutline.png   |binary
 icon-themes/colibre/svx/res/marker-anchor.png   |binary
 icon-themes/colibre/svx/res/markers.png |binary
 icon-themes/colibre_svg/cmd/32/ar/defaultbullet.svg |2 
 icon-themes/colibre_svg/cmd/32/ar/outlinebullet.svg |2 
 icon-themes/colibre_svg/cmd/32/ar/removebullets.svg |2 
 icon-themes/colibre_svg/cmd/32/ar/setoutline.svg|2 
 icon-themes/colibre_svg/cmd/32/defaultbullet.svg|2 
 icon-themes/colibre_svg/cmd/32/outlinebullet.svg|2 
 icon-themes/colibre_svg/cmd/32/removebullets.svg|2 
 icon-themes/colibre_svg/cmd/32/setoutline.svg   |2 
 icon-themes/colibre_svg/cmd/ar/lc_removebullets.svg |2 
 icon-themes/colibre_svg/cmd/ar/sc_bulletsandnumberingdialog.svg |2 
 icon-themes/colibre_svg/cmd/ar/sc_chapternumberingdialog.svg|2 
 icon-themes/colibre_svg/cmd/ar/sc_defaultnumbering.svg  |2 
 icon-themes/colibre_svg/cmd/ar/sc_linenumberingdialog.svg   |2 
 icon-themes/colibre_svg/cmd/ar/sc_removebullets.svg |2 
 icon-themes/colibre_svg/cmd/ar/sc_setoutline.svg|2 
 icon-themes/colibre_svg/cmd/lc_removebullets.svg|2 
 icon-themes/colibre_svg/cmd/sc_bulletsandnumberingdialog.svg|2 
 icon-themes/colibre_svg/cmd/sc_chapternumberingdialog.svg   |2 
 icon-themes/colibre_svg/cmd/sc_defaultnumbering.svg |2 
 icon-themes/colibre_svg/cmd/sc_linenumberingdialog.svg  |2 
 icon-themes/colibre_svg/cmd/sc_removebullets.svg|2 
 icon-themes/colibre_svg/cmd/sc_setoutline.svg   |2 
 icon-themes/colibre_svg/svx/res/marker-anchor.svg   |2 
 icon-themes/colibre_svg/svx/res/markers.svg |2 
 icon-themes/sukapura/svx/res/markers.png|binary
 icon-themes/sukapura_svg/svx/res/markers.svg|2 
 oox/source/drawingml/chart/plotareaconverter.cxx|8 +
 sc/qa/extras/macros-test.cxx|   48 
++
 sc/qa/extras/testdocuments/tdf138646.ods|binary
 sc/source/core/tool/rangeutl.cxx|4 
 sc/source/ui/app/inputwin.cxx   |4 
 sd/xml/effects.xml  |   16 +--
 sfx2/source/control/unoctitm.cxx|6 +
 sw/inc/dcontact.hxx |4 
 sw/source/core/draw/dcontact.cxx|   42 +++-
 sw/source/core/layout/frmtool.cxx   |2 
 vcl/qt5/Qt5Clipboard.cxx|9 +
 vcl/qt5/Qt5Frame.cxx|8 -
 vcl/source/bitmap/BitmapSepiaFilter.cxx |2 
 vcl/source/bitmap/BitmapSmoothenFilter.cxx  |2 
 vcl/source/bitmap/BitmapSolarizeFilter.cxx  |2 
 vcl/source/gdi/print2.cxx   |   12 ++

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

[Michael Weghorn (via logerrit)]

 android/source/src/java/org/libreoffice/FontController.java  |2 +-
 android/source/src/java/org/libreoffice/InvalidationHandler.java |4 
++--
 android/source/src/java/org/libreoffice/LOKitShell.java  |4 
+++-
 android/source/src/java/org/libreoffice/LOKitTileProvider.java   |4 

 android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java |9 
-
 5 files changed, 6 insertions(+), 17 deletions(-)

New commits:
commit 4db8535fba00c476555e09e32e521993ab77dc4d
Author: Michael Weghorn 
AuthorDate: Tue Apr 13 07:55:54 2021 +0200
Commit: Michael Weghorn 
CommitDate: Wed Apr 14 10:25:46 2021 +0200

android: Don't store whether spreadsheet in LibreOfficeMainActivity

LOKitTileProvider has that information, so query it instead
and don't duplicate information in LibreOfficeMainActivity.

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

diff --git a/android/source/src/java/org/libreoffice/FontController.java 
b/android/source/src/java/org/libreoffice/FontController.java
index a00e13e1485c..8729b51e01ac 100644
--- a/android/source/src/java/org/libreoffice/FontController.java
+++ b/android/source/src/java/org/libreoffice/FontController.java
@@ -158,7 +158,7 @@ public class FontController implements 
AdapterView.OnItemSelectedListener {
 JSONObject valueJson = new JSONObject();
 valueJson.put("type", "long");
 valueJson.put("value", 0x00FF & color);
-if(mActivity.isSpreadsheet()){
+if(mActivity.getTileProvider().isSpreadsheet()){
 json.put("BackgroundColor", valueJson);
 LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, 
".uno:BackgroundColor", json.toString()));
 }else if(mActivity.getTileProvider().isPresentation()){
diff --git a/android/source/src/java/org/libreoffice/InvalidationHandler.java 
b/android/source/src/java/org/libreoffice/InvalidationHandler.java
index 588fec9f5372..b74d92d15460 100644
--- a/android/source/src/java/org/libreoffice/InvalidationHandler.java
+++ b/android/source/src/java/org/libreoffice/InvalidationHandler.java
@@ -505,7 +505,7 @@ public class InvalidationHandler implements 
Document.MessageCallback, Office.Mes
 changeStateTo(OverlayState.TRANSITION);
 }
 mDocumentOverlay.changeSelections(Collections.emptyList());
-if (mContext.isSpreadsheet()) {
+if (mContext.getTileProvider().isSpreadsheet()) {
 mDocumentOverlay.showHeaderSelection(null);
 }
 mContext.getToolbarController().showHideClipboardCutAndCopy(false);
@@ -516,7 +516,7 @@ public class InvalidationHandler implements 
Document.MessageCallback, Office.Mes
 }
 changeStateTo(OverlayState.SELECTION);
 mDocumentOverlay.changeSelections(rectangles);
-if (mContext.isSpreadsheet()) {
+if (mContext.getTileProvider().isSpreadsheet()) {
 mDocumentOverlay.showHeaderSelection(rectangles.get(0));
 }
 String selectedText = 
mContext.getTileProvider().getTextSelection("");
diff --git a/android/source/src/java/org/libreoffice/LOKitShell.java 
b/android/source/src/java/org/libreoffice/LOKitShell.java
index 43dd30a69847..5fb7159f1032 100644
--- a/android/source/src/java/org/libreoffice/LOKitShell.java
+++ b/android/source/src/java/org/libreoffice/LOKitShell.java
@@ -27,7 +27,9 @@ public class LOKitShell {
 private static final String LOGTAG = LOKitShell.class.getSimpleName();
 
 public static float getDpi(Context context) {
-if (((LibreOfficeMainActivity)context).isSpreadsheet()) return 96f;
+LOKitTileProvider tileProvider = 
((LibreOfficeMainActivity)context).getTileProvider();
+if (tileProvider != null && tileProvider.isSpreadsheet())
+return 96f;
 DisplayMetrics metrics = context.getResources().getDisplayMetrics();
 return metrics.density * 160;
 }
diff --git a/android/source/src/java/org/libreoffice/LOKitTileProvider.java 
b/android/source/src/java/org/libreoffice/LOKitTileProvider.java
index e9fc2d52a154..2fb3551eada2 100644
--- a/android/source/src/java/org/libreoffice/LOKitTileProvider.java
+++ b/android/source/src/java/org/libreoffice/LOKitTileProvider.java
@@ -102,10 +102,6 @@ class LOKitTileProvider implements TileProvider {
 
 Log.i(LOGTAG, "> mDocument = " + mDocument);
 
-if(isSpreadsheet()) {
-mContext.setIsSpreadsheet(true); // Calc is treated differently 
e.g. DPI = 96f
-}
-
 mDPI = LOKitShell.getDpi(mContext);
 mTileWidth = pixelToTwip(TILE_SIZE, mDPI);
 mTileHeight = pixelToTwip(TILE_SIZE, mDPI);
diff --git 
a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java

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

[Caolán McNamara (via logerrit)]

 vcl/unx/generic/fontmanager/fontconfig.cxx |   10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)

New commits:
commit b7a38c1dfeab7c5eebb7fd5bc571e68b343bffb7
Author: Caolán McNamara 
AuthorDate: Tue Apr 13 20:45:24 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 14 09:46:21 2021 +0200

hintstyle is unused

left behind after...

commit 561a02ec72cf963d7cd59cfb9a183c1032f0861b
Date:   Thu Jun 15 15:28:46 2017 +0200

loplugin:unusedfields in vcl part3

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

diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx 
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 48428aa4be36..855868a022e4 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -1116,22 +1116,14 @@ std::unique_ptr 
PrintFontManager::getFontOptions(const Fa
 addtopattern(pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth, 
rInfo.m_ePitch);
 FcPatternAddDouble(pPattern, FC_PIXEL_SIZE, nSize);
 
-int hintstyle = FC_HINT_FULL;
-
 FcConfigSubstitute(pConfig, pPattern, FcMatchPattern);
 FontConfigFontOptions::cairo_font_options_substitute(pPattern);
 FcDefaultSubstitute(pPattern);
 
 FcResult eResult = FcResultNoMatch;
 FcFontSet* pFontSet = rWrapper.getFontSet();
-FcPattern* pResult = FcFontSetMatch( pConfig, &pFontSet, 1, pPattern, 
&eResult );
-if( pResult )
-{
-(void) FcPatternGetInteger(pResult,
-FC_HINT_STYLE, 0, &hintstyle);
-
+if (FcPattern* pResult = FcFontSetMatch(pConfig, &pFontSet, 1, pPattern, 
&eResult))
 pOptions.reset(new FontConfigFontOptions(pResult));
-}
 
 // cleanup
 FcPatternDestroy( pPattern );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Alain Romedenne (via logerrit)]

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

New commits:
commit 2465a0f3b83fcbcdfa9cdda459ffc62bef08e4ee
Author: Alain Romedenne 
AuthorDate: Wed Apr 14 09:34:31 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Apr 14 09:34:31 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to a26e51cc4e5af7eae340fcf20e31e991239def2d
  - tdf#141474 MsgBox function signature

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

diff --git a/helpcontent2 b/helpcontent2
index 7f3528e4c87f..a26e51cc4e5a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7f3528e4c87fb7bea49c715733abb041d4e0bd52
+Subproject commit a26e51cc4e5af7eae340fcf20e31e991239def2d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Alain Romedenne (via logerrit)]

 source/text/sbasic/shared/03010101.xhp |   21 +--
 source/text/sbasic/shared/03010102.xhp |  176 +
 2 files changed, 16 insertions(+), 181 deletions(-)

New commits:
commit a26e51cc4e5af7eae340fcf20e31e991239def2d
Author: Alain Romedenne 
AuthorDate: Tue Apr 13 11:59:28 2021 +0200
Commit: Alain Romedenne 
CommitDate: Wed Apr 14 09:34:31 2021 +0200

tdf#141474 MsgBox function signature

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

diff --git a/source/text/sbasic/shared/03010101.xhp 
b/source/text/sbasic/shared/03010101.xhp
index 095976844..c87987c70 100644
--- a/source/text/sbasic/shared/03010101.xhp
+++ b/source/text/sbasic/shared/03010101.xhp
@@ -26,27 +26,25 @@
 
 
 
-
-
 
 
   MsgBox statement
 
 
-
-MsgBox Statement
+MsgBox Statement
 Displays a 
dialog box containing a message.
 
 
-Syntax:
+
 
-MsgBox Text As 
String [,Type As Integer [,Dialogtitle As String]] (As Statement) or MsgBox 
(Text As String [,Type As Integer [,Dialogtitle As String]]) (As 
Function)
+MsgBox Prompt As 
String [,Buttons = MB_OK [,Title As String]]
 
 
-Parameter:
- 
Text: String expression displayed as a message in the dialog box. 
Line breaks can be inserted with Chr$(13).
- 
DialogTitle: String expression displayed in the title bar of the 
dialog. If omitted, the title bar displays the name of the respective 
application.
- 
Type: Any integer expression that specifies the dialog type, as 
well as the number and type of buttons to display, and the icon type. 
Type represents a combination of bit patterns, that is, a 
combination of elements can be defined by adding their respective 
values:
+
+
+ 
Prompt: String expression displayed as a message in the dialog 
box. Line breaks can be inserted with Chr$(13).
+ 
Title: String expression displayed in the title bar of the dialog. 
If omitted, the title bar displays the name of the respective 
application.
+ 
Buttons: Any integer expression that specifies the dialog type, as 
well as the number and type of buttons to display, and the icon type. 
Buttons represents a combination of bit patterns, that is, a 
combination of elements can be defined by adding their respective 
values:
 
 
   
@@ -204,11 +202,12 @@
 
   
 
+
 
 
 
 
-Example:
+
 
 Sub ExampleMsgBox
  Const sText1 = 
"An unexpected error occurred."
diff --git a/source/text/sbasic/shared/03010102.xhp 
b/source/text/sbasic/shared/03010102.xhp
index 68eeba306..54ea9ad0f 100644
--- a/source/text/sbasic/shared/03010102.xhp
+++ b/source/text/sbasic/shared/03010102.xhp
@@ -34,183 +34,19 @@
 
 
 
-MsgBox 
Function
+MsgBox Function
 Displays a 
dialog box containing a message and returns a value.
 
 
-Syntax:
+
 
-MsgBox (Text As 
String [,Type As Integer [,Dialogtitle As String]])
+MsgBox (Prompt 
As String [,Buttons = MB_OK [,Title As String]]) As Integer
 
 
-Return 
value:
-Integer
-
-Parameter:
- 
Text: String expression displayed as a message in the dialog box. 
Line breaks can be inserted with Chr$(13).
- 
DialogTitle: String expression displayed in the title bar of the 
dialog. If omitted, the name of the respective application is 
displayed.
- 
Type: Any integer expression that specifies the dialog type and 
defines the number and type of buttons or icons displayed. Type 
represents a combination of bit patterns (dialog elements defined by adding the 
respective values):
- 
Values 
-
-
-  
-
-  Named constant
-
-
-  Integer value
-
-
-  Definition
-
-  
-  
-
-  MB_OK
-
-
-  0
-
-
-  Display 
OK button only.
-
-  
-  
-
-  MB_OKCANCEL
-
-
-  1
-
-
-  Display 
OK and Cancel buttons.
-
-  
-  
-
-  MB_ABORTRETRYCANCEL
-
-
-  2
-
-
-  Display 
Abort, Retry, and Ignore buttons.
-
-  
-  
-
-  MB_YESNOCANCEL
-
-
-  3
-
-
-  Display 
Yes, No, and Cancel buttons.
-
-  
-  
-
-  MB_YESNO
-
-
-  4
-
-
-  Display 
Yes and No buttons.
-
-  
-  
-
-  MB_RETRYCANCEL
-
-
-  5
-
-
-  Display 
Retry and Cancel buttons.
-
-  
-  
-
-  MB_ICONSTOP
-
-
-  16
-
-
-  Add the 
Stop icon to the dialog.
-
-  
-  
-
-  MB_ICONQUESTION
-
-
-  32
-
-
-  Add the 
Question icon to the dialog.
-
-  
-  
-
-  MB_ICONEXCLAMATION
-
-
-  48
-
-
-  Add the 
Exclamation Point icon to the dialog.
-
-  
-  
-
-  MB_ICONINFORMATION
-
-
-  64
-
-
-  Add the 
Information icon to the dialog.
-
-  
-  
-
-   
-
-
-  128
-
-
-  First 
button in the dialog as default button.
-
-  
-  
-
-  MB_DEFBUTTON2
-
-
-  256
-
-
-  Seco

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

[Tor Lillqvist (via logerrit)]

 sc/source/ui/app/inputwin.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 4f92acefe024a323c0a31ee991eff45eaf24029f
Author: Tor Lillqvist 
AuthorDate: Tue Apr 13 17:14:57 2021 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Apr 14 09:15:26 2021 +0200

Early return from ScInputWindow::setPosSizePixel() if no-op

This seems to fix https://github.com/CollaboraOnline/online/issues/1988

Change-Id: I5fd826647ce85b7ad2d93085fb0c2fa9db69e745
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114056
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114070
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 2da8fd62746f..67c12839a4ac 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -478,6 +478,10 @@ void ScInputWindow::SetSizePixel( const Size& rNewSize )
 
 void ScInputWindow::setPosSizePixel(tools::Long nX, tools::Long nY, 
tools::Long nWidth, tools::Long nHeight, PosSizeFlags nFlags)
 {
+if ((!(nFlags & PosSizeFlags::Size) ||  GetSizePixel() == Size(nWidth, 
nHeight)) &&
+(!(nFlags & PosSizeFlags::Pos) || GetPosPixel() == Point(nX, nY)))
+return;
+
 ToolBox::setPosSizePixel(nX, nY, nWidth, nHeight, nFlags);
 if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits