Re: Slow fetching of https://gerrit.libreoffice.org/core?

[Stephan Bergmann]

On 19/04/2021 11:17, Stephan Bergmann wrote:
More often than not, trying to do a LibreOffice Flatpak build on Flathub 
fails because the step that fetches the 
 git repo times out.  See e.g. 
 and 
, with the 
relevant log output being


]2;flatpak-builder: Downloading gvfs]2;flatpak-builder: 
Downloading krb5]2;flatpak-builder: Downloading libreofficeFetching 
full git repo https://gerrit.libreoffice.org/core?
command timed out: 3600 seconds without output running 
[b'flatpak-builder', b'--download-only', b'--no-shallow-clone', 
b'--allow-missing-runtimes', b'--state-dir=/srv/buildbot/sources', 
b'/srv/buildbot/sources/.builddir', 
b'org.libreoffice.LibreOffice.json'], attempting to kill


I'm not sure whether the best place to do something about this would be 
the serving libreoffice.org side, or the receiving flathub.org side, or 
even my choice of  git repo URL at 
 
"solenv/flatpak-manifest.in: Merge 'Switch git repo URL from git: to 
https:'"?


So this has apparently been discussed at 
 
"[libreoffice-website] Minutes from the Tue Apr 20 infra call".


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

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

[Dennis Francis (via logerrit)]

 sc/source/ui/view/viewdata.cxx |   23 +++
 1 file changed, 19 insertions(+), 4 deletions(-)

New commits:
commit 88f5b8b924ef38e7ff20316e7ddc3cfe66b378d0
Author: Dennis Francis 
AuthorDate: Wed Apr 14 13:26:26 2021 +0530
Commit: Dennis Francis 
CommitDate: Thu Apr 22 08:05:39 2021 +0200

lok: fix incomplete/wrong tiles after zoom change and sheet switch

Fix:
Reset position cache for all sheets on zoom change.

Change-Id: I58264d4674d2cb736c702096ffd52faffb603ec6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114227
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 
(cherry picked from commit fe52c79323f9ac4b5ea61e7d7e5f038552e9a247)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114362
Reviewed-by: Dennis Francis 

diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 0ad17c2ace93..91f5fc6062af 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -3143,10 +3143,25 @@ void ScViewData::CalcPPT()
 }
 }
 
-if (nPPTX != nOldPPTX)
-GetLOKWidthHelper().invalidateByPosition(0L);
-if (nPPTY != nOldPPTY)
-GetLOKHeightHelper().invalidateByPosition(0L);
+if (comphelper::LibreOfficeKit::isActive())
+{
+SCTAB nTabCount = maTabData.size();
+bool bResetWidths = (nPPTX != nOldPPTX);
+bool bResetHeights = (nPPTY != nOldPPTY);
+for (SCTAB nTabIdx = 0; nTabIdx < nTabCount; ++nTabIdx)
+{
+if (!maTabData[nTabIdx])
+continue;
+
+if (bResetWidths)
+if (auto* pWHelper = GetLOKWidthHelper(nTabIdx))
+pWHelper->invalidateByPosition(0L);
+
+if (bResetHeights)
+if (auto* pHHelper = GetLOKHeightHelper(nTabIdx))
+pHHelper->invalidateByPosition(0L);
+}
+}
 }
 
 #define SC_OLD_TABSEP   '/'
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski (via logerrit)]

 svx/source/svdraw/svdundo.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bfe800f773b0fe945452dc59205c156d0fc69462
Author: Mike Kaganski 
AuthorDate: Wed Apr 21 22:41:33 2021 +0200
Commit: Mike Kaganski 
CommitDate: Thu Apr 22 06:12:45 2021 +0200

tdf#141816: fix a thinko

This must check if they are different, not the other way around

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

diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 1805c06236e3..2e81d8acd91f 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -995,7 +995,7 @@ SdrUndoObjSetText::~SdrUndoObjSetText()
 bool SdrUndoObjSetText::IsDifferent() const
 {
 if (!pOldText || !pNewText)
-return !pOldText && !pNewText;
+return pOldText || pNewText;
 return !(*pOldText == *pNewText);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Rahul Balaji - license statement

[Rahul Balaji]

I, Rahul Balaji hereby declare that all of my past and future contributions
to libreoffice may be licensed under the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 24 commits - canvas/source download.lst editeng/source icon-themes/colibre icon-themes/colibre_svg include/editeng include/oox inclu

[Michael Stahl (via logerrit)]

 canvas/source/cairo/cairo_spritehelper.cxx   |   32 ++
 download.lst |4 
 editeng/source/editeng/editview.cxx  |5 
 icon-themes/colibre/cmd/32/actionmode.png|binary
 icon-themes/colibre/cmd/sc_sendmail.png  |binary
 icon-themes/colibre/cmd/sc_tabdialog.png |binary
 icon-themes/colibre_svg/cmd/32/actionmode.svg|2 
 icon-themes/colibre_svg/cmd/sc_sendmail.svg  |3 
 icon-themes/colibre_svg/cmd/sc_tabdialog.svg |2 
 include/editeng/editview.hxx |1 
 include/oox/export/drawingml.hxx |2 
 include/svx/sdrundomanager.hxx   |2 
 officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu |2 
 oox/CppunitTest_oox_export.mk|   46 +++
 oox/Module_oox.mk|1 
 oox/qa/unit/data/dml-groupshape-polygon.docx |binary
 oox/qa/unit/export.cxx   |  157 +++
 oox/source/export/drawingml.cxx  |   29 +-
 oox/source/export/shapes.cxx |8 
 sc/source/ui/view/gridwin.cxx|9 
 sd/source/ui/view/drviews4.cxx   |7 
 sd/xml/effects.xml   |   24 -
 sfx2/uiconfig/ui/linkeditdialog.ui   |   35 +-
 shell/source/unix/exec/shellexec.cxx |1 
 solenv/gbuild/extensions/pre_MergedLibsList.mk   |4 
 svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx  |6 
 svx/source/dialog/weldeditview.cxx   |   72 +
 svx/source/form/fmview.cxx   |   35 +-
 svx/source/sdr/contact/viewcontactofsdrole2obj.cxx   |   76 +
 svx/source/sdr/properties/defaultproperties.cxx  |5 
 svx/source/svdraw/sdrundomanager.cxx |3 
 svx/source/svdraw/svdedxv.cxx|3 
 svx/source/unodraw/unoshape.cxx  |   10 
 svx/uiconfig/ui/fillctrlbox.ui   |3 
 sw/qa/extras/ooxmlexport/ooxmlexport6.cxx|4 
 sw/source/core/frmedt/feshview.cxx   |8 
 sw/source/ui/dbui/addresslistdialog.cxx  |6 
 vcl/skia/win/gdiimpl.cxx |6 
 vcl/unx/generic/gdi/salgdi.cxx   |9 
 vcl/unx/gtk3/gtk3gtkinst.cxx |2 
 40 files changed, 431 insertions(+), 193 deletions(-)

New commits:
commit 2d61d0639d7b97046ed4f4ef98cc34281e63fcf4
Author: Michael Stahl 
AuthorDate: Fri Apr 16 16:21:26 2021 +0200
Commit: Andras Timar 
CommitDate: Wed Apr 21 21:08:16 2021 +0200

svx: fix crash in DefaultProperties::dumpAsXml()

mpItemSet can be null

Change-Id: I4192f84639116c550bba5303a5fc70528cb3e8c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114263
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 832b23d9376019619929764606276aacde1e329a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114268
Reviewed-by: Caolán McNamara 

diff --git a/svx/source/sdr/properties/defaultproperties.cxx 
b/svx/source/sdr/properties/defaultproperties.cxx
index e9a9934a9973..9244356af297 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -246,7 +246,10 @@ namespace sdr::properties
 {
 xmlTextWriterStartElement(pWriter, BAD_CAST("DefaultProperties"));
 BaseProperties::dumpAsXml(pWriter);
-mpItemSet->dumpAsXml(pWriter);
+if (mpItemSet)
+{
+mpItemSet->dumpAsXml(pWriter);
+}
 xmlTextWriterEndElement(pWriter);
 }
 } // end of namespace
commit 128ee71195b4376daf5c191dd74b7d5479dc689f
Author: Samuel Mehrbrodt 
AuthorDate: Wed Apr 21 14:15:07 2021 +0200
Commit: Andras Timar 
CommitDate: Wed Apr 21 21:08:16 2021 +0200

Related tdf#139804 Allow activating btn on first click

Change-Id: I3bcdf8bdd6f25fd30106214f40e72bf1506f6bbf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114398
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 8d633320df3fb58e6e9ac12dcf9983ad5d5db75e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114416
Reviewed-by: Caolán McNamara 

diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 79651f7ab732..8de9b531950f 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -516,6 +51

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - icon-themes/galaxy

[Pedro Pinto Silva (via logerrit)]

 icon-themes/galaxy/brand_cp_snapshot/about.svg   | 1463 +++
 icon-themes/galaxy/brand_cp_snapshot/logo-sc.svg |  181 ++
 icon-themes/galaxy/brand_cp_snapshot/logo.svg|  182 ++
 3 files changed, 1826 insertions(+)

New commits:
commit e4adc0bea89db8a8dd5d5e7e4c75704b0be5519d
Author: Pedro Pinto Silva 
AuthorDate: Wed Apr 21 21:00:28 2021 +0200
Commit: Andras Timar 
CommitDate: Wed Apr 21 21:00:28 2021 +0200

[cp] Collabora Office snapshot logo and 'About' image

Change-Id: I8598a0432f294503f14afebf29270f24ec89f6eb

diff --git a/icon-themes/galaxy/brand_cp_snapshot/about.svg 
b/icon-themes/galaxy/brand_cp_snapshot/about.svg
new file mode 100644
index ..1cb919f180aa
--- /dev/null
+++ b/icon-themes/galaxy/brand_cp_snapshot/about.svg
@@ -0,0 +1,1463 @@
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   height="1340.7048"
+   viewBox="0 0 372.72406 354.72815"
+   width="1408.7208"
+   version="1.1"
+   id="svg1334"
+   sodipodi:docname="about.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+  
+  
+
+  
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"; />
+
+  
+
+  
+  
+
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+
+  
+  
+  
+  
+
+  
+
+
+  
+
+  
+  
+  
+  
+
+  
+
+
+
+  
+  
+
+
+
+  
+  
+
+
+
+  
+
+  
+  
+  
+  
+
+  
+
+
+
+
+
+
+  
+  
+
+
+  
+  
+
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+  
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+
+  
+  
+
+
+  
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+
+  
+  
+  
+  
+  
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+!function(){const 
t="http://www.w3.org/2000/svg",e="http://www.w3.org/1999/xlink",s="http://www.w3.org/1999/xhtml",r=2;if(document.createElementNS(t,"meshgradient").x)return;const
 n=(t,e,s,r)=>{let n=new x(.5*(e.x+s.x),.5*(e.y+s.y)),o=new 
x(.5*(t.x+e.x),.5*(t.y+e.y)),i=new x(.5*(s.x+r.x),.5*(s.y+r.y)),a=new 
x(.5*(n.x+o.x),.5*(n.y+o.y)),h=new x(.5*(n.x+i.x),.5*(n.y+i.y)),l=new 
x(.5*(a.x+h.x),.5*(a.y+h.y));return[[t,o,a,l],[l,h,i,r]]},o=t=>{let 
e=t[0].distSquared(t[1]),s=t[2].distSquared(t[3]),r=.25*t[0].distSquared(t[2]),n=.25*t[1].distSquared(t[3]),o=e>s?e:s,i=r>n?r:n;return
 
18*(o>i?o:i)},i=(t,e)=>Math.sqrt(t.distSquared(e)),a=(t,e)=>t.scale(2/3).add(e.scale(1/3)),h=t=>{let
 e,s,r,n,o,i,a,h=new g;return t.match(/(\w+\(\s*[^)]+\))+/g).forEach(t=>{let 
l=t.match(/[\w.-]+/g),d=l.shift();switch(d){case"translate":2===l.length?e=new
 g(1,0,0,1,l[0],l[1]):(console.error("mesh.js: translate does not have 2 
argum
 ents!"),e=new 
g(1,0,0,1,0,0)),h=h.append(e);break;case"scale":1===l.length?s=new 
g(l[0],0,0,l[0],0,0):2===l.length?s=new 
g(l[0],0,0,l[1],0,0):(console.error("mesh.js: scale does not have 1 or 2 
arguments!"),s=new 
g(1,0,0,1,0,0)),h=h.append(s);break;case"rotate":if(3===l.length&&(e=new
 g(1,0,0,1,l[1],l[2]),h=h.append(e)),l[0]){r=l[0]*Math.PI/180;let 
t=Math.cos(r),e=Math.sin(r);Math.abs(t)<1e-16&a

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - icon-themes/galaxy

[Pedro Pinto Silva (via logerrit)]

 icon-themes/galaxy/brand_cp/about.svg   | 1463 
 icon-themes/galaxy/brand_cp/logo-sc.svg |  181 +++
 icon-themes/galaxy/brand_cp/logo.svg|  182 +++
 3 files changed, 1826 insertions(+)

New commits:
commit b1fe84365b700fdc9d42d844a49b7515e8d71fd7
Author: Pedro Pinto Silva 
AuthorDate: Wed Apr 21 20:57:01 2021 +0200
Commit: Andras Timar 
CommitDate: Wed Apr 21 20:57:01 2021 +0200

[cp] Collabora Office logo and 'About' image

Change-Id: I103343eb6da09bf5e58c2a2914887998deb37056

diff --git a/icon-themes/galaxy/brand_cp/about.svg 
b/icon-themes/galaxy/brand_cp/about.svg
new file mode 100644
index ..1cb919f180aa
--- /dev/null
+++ b/icon-themes/galaxy/brand_cp/about.svg
@@ -0,0 +1,1463 @@
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   height="1340.7048"
+   viewBox="0 0 372.72406 354.72815"
+   width="1408.7208"
+   version="1.1"
+   id="svg1334"
+   sodipodi:docname="about.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+  
+  
+
+  
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"; />
+
+  
+
+  
+  
+
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+
+  
+  
+  
+  
+
+  
+
+
+  
+
+  
+  
+  
+  
+
+  
+
+
+
+  
+  
+
+
+
+  
+  
+
+
+
+  
+
+  
+  
+  
+  
+
+  
+
+
+
+
+
+
+  
+  
+
+
+  
+  
+
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+  
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+
+  
+  
+
+
+  
+  
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+  
+
+  
+  
+  
+  
+  
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+!function(){const 
t="http://www.w3.org/2000/svg",e="http://www.w3.org/1999/xlink",s="http://www.w3.org/1999/xhtml",r=2;if(document.createElementNS(t,"meshgradient").x)return;const
 n=(t,e,s,r)=>{let n=new x(.5*(e.x+s.x),.5*(e.y+s.y)),o=new 
x(.5*(t.x+e.x),.5*(t.y+e.y)),i=new x(.5*(s.x+r.x),.5*(s.y+r.y)),a=new 
x(.5*(n.x+o.x),.5*(n.y+o.y)),h=new x(.5*(n.x+i.x),.5*(n.y+i.y)),l=new 
x(.5*(a.x+h.x),.5*(a.y+h.y));return[[t,o,a,l],[l,h,i,r]]},o=t=>{let 
e=t[0].distSquared(t[1]),s=t[2].distSquared(t[3]),r=.25*t[0].distSquared(t[2]),n=.25*t[1].distSquared(t[3]),o=e>s?e:s,i=r>n?r:n;return
 
18*(o>i?o:i)},i=(t,e)=>Math.sqrt(t.distSquared(e)),a=(t,e)=>t.scale(2/3).add(e.scale(1/3)),h=t=>{let
 e,s,r,n,o,i,a,h=new g;return t.match(/(\w+\(\s*[^)]+\))+/g).forEach(t=>{let 
l=t.match(/[\w.-]+/g),d=l.shift();switch(d){case"translate":2===l.length?e=new
 g(1,0,0,1,l[0],l[1]):(console.error("mesh.js: translate does not have 2 
argum
 ents!"),e=new 
g(1,0,0,1,0,0)),h=h.append(e);break;case"scale":1===l.length?s=new 
g(l[0],0,0,l[0],0,0):2===l.length?s=new 
g(l[0],0,0,l[1],0,0):(console.error("mesh.js: scale does not have 1 or 2 
arguments!"),s=new 
g(1,0,0,1,0,0)),h=h.append(s);break;case"rotate":if(3===l.length&&(e=new
 g(1,0,0,1,l[1],l[2]),h=h.append(e)),l[0]){r=l[0]*Math.PI/180;let 
t=Math.cos(r),e=Math.sin(r);Math.abs(t)<1e-16&&(t=0),Math.abs(e)<1e-16&&(e=0),a=

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

[Michael Stahl (via logerrit)]

 svx/source/sdr/properties/defaultproperties.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit ecfa3da07e5b68a4bc24f25d3760e72efc42fe92
Author: Michael Stahl 
AuthorDate: Fri Apr 16 16:21:26 2021 +0200
Commit: Caolán McNamara 
CommitDate: Wed Apr 21 20:53:37 2021 +0200

svx: fix crash in DefaultProperties::dumpAsXml()

mpItemSet can be null

Change-Id: I4192f84639116c550bba5303a5fc70528cb3e8c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114263
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 832b23d9376019619929764606276aacde1e329a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114268
Reviewed-by: Caolán McNamara 

diff --git a/svx/source/sdr/properties/defaultproperties.cxx 
b/svx/source/sdr/properties/defaultproperties.cxx
index e9a9934a9973..9244356af297 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -246,7 +246,10 @@ namespace sdr::properties
 {
 xmlTextWriterStartElement(pWriter, BAD_CAST("DefaultProperties"));
 BaseProperties::dumpAsXml(pWriter);
-mpItemSet->dumpAsXml(pWriter);
+if (mpItemSet)
+{
+mpItemSet->dumpAsXml(pWriter);
+}
 xmlTextWriterEndElement(pWriter);
 }
 } // end of namespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt (via logerrit)]

 svx/source/form/fmview.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 966061fa7c02c9dd8d089db2d56ee95667009d26
Author: Samuel Mehrbrodt 
AuthorDate: Wed Apr 21 14:15:07 2021 +0200
Commit: Caolán McNamara 
CommitDate: Wed Apr 21 20:52:29 2021 +0200

Related tdf#139804 Allow activating btn on first click

Change-Id: I3bcdf8bdd6f25fd30106214f40e72bf1506f6bbf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114398
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 8d633320df3fb58e6e9ac12dcf9983ad5d5db75e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114416
Reviewed-by: Caolán McNamara 

diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 79651f7ab732..8de9b531950f 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -516,6 +516,7 @@ bool FmFormView::KeyInput(const KeyEvent& rKEvt, 
vcl::Window* pWin)
 if (rI18nHelper.MatchMnemonic(pWindow->GetText(), 
rKEvt.GetCharCode()))
 {
 pWindow->GrabFocus();
+pWindow->KeyInput(rKEvt);
 bDone = true;
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 canvas/source/cairo/cairo_spritehelper.cxx |   32 +
 1 file changed, 32 insertions(+)

New commits:
commit 064f3641240b380a12a88e2bd1ef8f88add2ed23
Author: Luboš Luňák 
AuthorDate: Tue Apr 20 17:20:31 2021 +0200
Commit: Caolán McNamara 
CommitDate: Wed Apr 21 20:51:15 2021 +0200

prevent cairo from breaking because of a large matrix (tdf#125949)

Some presentation animations temporarily cause extensive zoom matrix
and Cairo doesn't take that well.

Change-Id: I1eb6d63fc2dcde6553bc8cc7ab967532d085a579
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114344
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit 3a4bfe3e45be2d5b591ab5cae3694c9492ca9e1b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114419
Reviewed-by: Caolán McNamara 

diff --git a/canvas/source/cairo/cairo_spritehelper.cxx 
b/canvas/source/cairo/cairo_spritehelper.cxx
index 1fe9eb9152e0..b0eb7e9b7e44 100644
--- a/canvas/source/cairo/cairo_spritehelper.cxx
+++ b/canvas/source/cairo/cairo_spritehelper.cxx
@@ -28,6 +28,7 @@
 #include 
 
 #include 
+#include 
 
 #include "cairo_spritehelper.hxx"
 
@@ -140,6 +141,37 @@ namespace cairocanvas
 cairo_clip( pCairo.get() );
 cairo_set_matrix( pCairo.get(), &aOrigMatrix );
 
+cairo_matrix_t aInverseMatrix = aOrigMatrix;
+bool matrixProblem = false;
+// tdf#125949: Cairo internally uses the pixman library, and 
_cairo_matrix_to_pixman_matrix()
+// checks all matrix components to fix PIXMAN_MAX_INT, which is about 
32k. Which means that
+// if our transformation is large, such as an initial step of some 
zooming animations,
+// the conversion will fail. To make things worse, once something in 
cairo fails, it's treated
+// as a fatal error, the error status of that cairo_t gets set, and 
there's no way to reset it
+// besides recreating the whole cairo_t
+// 
(https://lists.cairographics.org/archives/cairo/2006-September/007892.html).
+// So copy&paste PIXMAN_MAX_INT here, and if our matrix could fail, 
bail out.
+#define PIXMAN_MAX_INT ((pixman_fixed_1 >> 1) - pixman_fixed_e) /* need to 
ensure deltas also fit */
+if(cairo_matrix_invert(&aInverseMatrix) == CAIRO_STATUS_SUCCESS)
+{
+if(abs(aOrigMatrix.xx) > PIXMAN_MAX_INT || abs(aOrigMatrix.xx) > 
PIXMAN_MAX_INT
+|| abs(aOrigMatrix.xy) > PIXMAN_MAX_INT || abs(aOrigMatrix.yx) 
> PIXMAN_MAX_INT
+|| abs(aOrigMatrix.x0) > PIXMAN_MAX_INT || abs(aOrigMatrix.y0) 
> PIXMAN_MAX_INT
+|| abs(aInverseMatrix.xx) > PIXMAN_MAX_INT || 
abs(aInverseMatrix.xx) > PIXMAN_MAX_INT
+|| abs(aInverseMatrix.xy) > PIXMAN_MAX_INT || 
abs(aInverseMatrix.yx) > PIXMAN_MAX_INT
+|| abs(aInverseMatrix.x0) > PIXMAN_MAX_INT || 
abs(aInverseMatrix.y0) > PIXMAN_MAX_INT)
+matrixProblem = true;
+#undef PIXMAN_MAX_INT
+}
+else
+matrixProblem = true;
+if(matrixProblem)
+{
+SAL_WARN( "canvas.cairo", "matrix would overflow PIXMAN_MAX_INT, 
avoiding drawing" );
+cairo_restore( pCairo.get() );
+return;
+}
+
 if( isContentFullyOpaque() )
 cairo_set_operator( pCairo.get(), CAIRO_OPERATOR_SOURCE );
 cairo_set_source_surface( pCairo.get(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sd/source/ui/animations/CustomAnimationList.hxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 66cd3c57f4f7b0b7b6dc38196b932a0a66f846fd
Author: Caolán McNamara 
AuthorDate: Thu Mar 4 15:17:28 2021 +
Commit: Caolán McNamara 
CommitDate: Wed Apr 21 20:47:03 2021 +0200

tdf#139305 make both 'empty' widget and its treeview replacement the same 
size

so on flipping one visible vs the other the panel scrollbar position
is equally valid for each mode

Change-Id: Iae422c30eb8b752c407070b66852fe23fdc38912
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111925
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 0d20074eb112186e0e2fa4241b5a335eb68c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114438
Tested-by: Xisco Fauli 
Reviewed-by: Caolán McNamara 

diff --git a/sd/source/ui/animations/CustomAnimationList.hxx 
b/sd/source/ui/animations/CustomAnimationList.hxx
index f704e1b92b4f..eae9e2aead2d 100644
--- a/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/sd/source/ui/animations/CustomAnimationList.hxx
@@ -110,7 +110,11 @@ public:
 void set_sensitive(bool bSensitive) { 
mxTreeView->set_sensitive(bSensitive); }
 int get_height_rows(int nRows) { return 
mxTreeView->get_height_rows(nRows); }
 int get_approximate_digit_width() const { return 
mxTreeView->get_approximate_digit_width(); }
-void set_size_request(int nWidth, int nHeight) { 
mxTreeView->set_size_request(nWidth, nHeight); }
+void set_size_request(int nWidth, int nHeight)
+{
+mxTreeView->set_size_request(nWidth, nHeight);
+mxEmptyLabel->set_size_request(nWidth, nHeight);
+}
 void unselect_all() { mxTreeView->unselect_all(); }
 weld::TreeView& get_widget() { return *mxTreeView; }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 svx/source/dialog/fntctrl.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 41145efffe9d5af358a52b9e114bb01b98b3d7c2
Author: Caolán McNamara 
AuthorDate: Wed Apr 21 15:53:13 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 21 20:45:33 2021 +0200

tdf#141419 restore use any explicitly set background color in previews

regression since...

commit 6f3899b27156591e65f62649a92c727eb6f5dd03
Date:   Thu Oct 29 15:03:44 2020 +0100

Resolves tdf#137059 - Use application colors for font preview

but continue to use the doc-color setting when there isn't an explicit
bg setting in the input propertyset

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

diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 12afafcb0939..d2a99a367131 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -1008,6 +1008,16 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet 
&rSet, bool bPreviewBack
 rCJKFont.SetTransparent( bTransparent );
 rCTLFont.SetTransparent( bTransparent );
 
+if( !bPreviewBackgroundToCharacter )
+{
+if( GetWhich( rSet, SID_ATTR_BRUSH, nWhich ) )
+{
+const SvxBrushItem& rBrush = static_cast( 
rSet.Get( nWhich ) );
+if( GPOS_NONE == rBrush.GetGraphicPos() )
+pImpl->mxBackColor = rBrush.GetColor();
+}
+}
+
 // Font
 SetPrevFont( rSet, SID_ATTR_CHAR_FONT, rFont );
 SetPrevFont( rSet, SID_ATTR_CHAR_CJK_FONT, rCJKFont );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 starmath/source/ElementsDockingWindow.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 30b36f290aa0b59fd7d2bd41c8bdfca304d859af
Author: Caolán McNamara 
AuthorDate: Wed Apr 21 17:09:59 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 21 20:45:01 2021 +0200

Related: tdf#140659 on control get/lose focus call update custom a11y

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

diff --git a/starmath/source/ElementsDockingWindow.cxx 
b/starmath/source/ElementsDockingWindow.cxx
index aef1d2598d60..29d4aef5a646 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -651,10 +651,14 @@ void SmElementsControl::GetFocus()
 {
 CustomWidgetController::GetFocus();
 Invalidate();
+if (m_xAccessible.is() && m_nCurrentElement != SAL_MAX_UINT16)
+m_xAccessible->AcquireFocus();
 }
 
 void SmElementsControl::LoseFocus()
 {
+if (m_xAccessible.is() && m_nCurrentElement != SAL_MAX_UINT16)
+m_xAccessible->ReleaseFocus(m_nCurrentElement);
 CustomWidgetController::LoseFocus();
 Invalidate();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 starmath/source/ElementsDockingWindow.cxx |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 12ea51ba8bfbc1d22feb2e4d498360eec015859e
Author: Caolán McNamara 
AuthorDate: Wed Apr 21 16:57:32 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 21 20:43:46 2021 +0200

Related: tdf#140659 off by one indexes because scrollbar is now outside

and not inside the control so it doesn't need to be accounted for
as a child

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

diff --git a/starmath/source/ElementsDockingWindow.cxx 
b/starmath/source/ElementsDockingWindow.cxx
index 5c43b4f7f8bb..aef1d2598d60 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -285,7 +285,7 @@ 
SmElementsControl::SmElementsControl(std::unique_ptr xScro
 : mpDocShell(new SmDocShell(SfxModelFlags::EMBEDDED_OBJECT))
 , m_nCurrentElement(SAL_MAX_UINT16)
 , m_nCurrentRolloverElement(SAL_MAX_UINT16)
-, m_nCurrentOffset(1) // Default offset of 1 due to the ScrollBar child
+, m_nCurrentOffset(0)
 , m_nSmSyntaxVersion(SM_MOD()->GetConfig()->GetDefaultSmSyntaxVersion())
 , mbVerticalMode(true)
 , mxScroll(std::move(xScrolledWindow))
@@ -1014,7 +1014,7 @@ void SmElementsControl::addElements(const SmElementDescr 
aElementsArray[], sal_u
 void SmElementsControl::build()
 {
 // The order is important!
-// 1. Ensure there are no items left, including the default scrollbar!
+// 1. Ensure there are no items left
 // 2. Release all the current accessible items.
 //This will check for new items after releasing them!
 // 3. Set the cursor element
@@ -1029,9 +1029,7 @@ void SmElementsControl::build()
 
 setCurrentElement(SAL_MAX_UINT16);
 
-// The first element is the scrollbar. We can't change its indexInParent
-// value, as this is set by being a child of the SmElementsControl.
-m_nCurrentOffset = 1;
+m_nCurrentOffset = 0;
 
 switch(m_nSmSyntaxVersion)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 vcl/source/window/builder.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d7673fe5128a8b9b4ae49782e817d4c8b56706e4
Author: Caolán McNamara 
AuthorDate: Wed Apr 21 14:15:48 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 21 20:39:53 2021 +0200

don't warn about 'shrink' packing property

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

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 77f882fc8656..32267d8c95b2 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -3868,7 +3868,7 @@ void VclBuilder::applyPackingProperty(vcl::Window 
*pCurrent,
 }
 else
 {
-SAL_WARN("vcl.builder", "unknown packing: " << sKey);
+SAL_WARN_IF(sKey != "shrink", "vcl.builder", "unknown packing: 
" << sKey);
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 svx/uiconfig/ui/fillctrlbox.ui |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 8cc1c2b1eaf14eff79fe0940e5c91c7630fe5bff
Author: Caolán McNamara 
AuthorDate: Wed Apr 21 14:01:47 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 21 20:39:34 2021 +0200

Resolves: tdf#141765 set 'color' GtkToolbar to small-button size

so its height is as small as possible so it won't force the surrounding
toolbar's height to stretch to fit it in

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

diff --git a/svx/uiconfig/ui/fillctrlbox.ui b/svx/uiconfig/ui/fillctrlbox.ui
index 996f9bb9ba5a..0eece4490fe6 100644
--- a/svx/uiconfig/ui/fillctrlbox.ui
+++ b/svx/uiconfig/ui/fillctrlbox.ui
@@ -63,6 +63,9 @@
 False
   
 
+
+  
+
   
   
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - svx/uiconfig

[Caolán McNamara (via logerrit)]

 svx/uiconfig/ui/fillctrlbox.ui |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 1401037556607ef0b7977f48dc203c328e757528
Author: Caolán McNamara 
AuthorDate: Wed Apr 21 14:01:47 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 21 20:39:19 2021 +0200

Resolves: tdf#141765 set 'color' GtkToolbar to small-button size

so its height is as small as possible so it won't force the surrounding
toolbar's height to stretch to fit it in

Change-Id: Ibfbcfb551cdd82df05faf382d8cb8fcaa142ec14
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114415
Tested-by: Jenkins
Reviewed-by: Aron Budea 
Reviewed-by: Caolán McNamara 

diff --git a/svx/uiconfig/ui/fillctrlbox.ui b/svx/uiconfig/ui/fillctrlbox.ui
index e13508f77e1f..5ca5b329e354 100644
--- a/svx/uiconfig/ui/fillctrlbox.ui
+++ b/svx/uiconfig/ui/fillctrlbox.ui
@@ -63,6 +63,9 @@
 False
   
 
+
+  
+
   
   
 False
___
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' - 2 commits - icon-themes/galaxy instsetoo_native/CustomTarget_setup.mk sc/source

[Pedro Pinto Silva (via logerrit)]

 icon-themes/galaxy/brand_cp/intro-highres.png  |binary
 icon-themes/galaxy/brand_cp/intro.png  |binary
 icon-themes/galaxy/brand_cp_snapshot/intro-highres.png |binary
 icon-themes/galaxy/brand_cp_snapshot/intro.png |binary
 instsetoo_native/CustomTarget_setup.mk |   10 +-
 sc/source/ui/app/inputwin.cxx  |   12 
 sc/source/ui/inc/inputwin.hxx  |1 +
 7 files changed, 14 insertions(+), 9 deletions(-)

New commits:
commit 779808a7c3fb4cc47aeb21ba5919f57caffee35b
Author: Pedro Pinto Silva 
AuthorDate: Wed Apr 21 17:17:48 2021 +0200
Commit: Andras Timar 
CommitDate: Wed Apr 21 19:08:11 2021 +0200

[cp] Update splash screen

Change-Id: I661a9009dff0ad44b4c9bad3700c029f02631131

diff --git a/icon-themes/galaxy/brand_cp/intro-highres.png 
b/icon-themes/galaxy/brand_cp/intro-highres.png
index 7891caaa8047..17724c32f2fa 100644
Binary files a/icon-themes/galaxy/brand_cp/intro-highres.png and 
b/icon-themes/galaxy/brand_cp/intro-highres.png differ
diff --git a/icon-themes/galaxy/brand_cp/intro.png 
b/icon-themes/galaxy/brand_cp/intro.png
index 7449b643cd95..4f0937b451e2 100644
Binary files a/icon-themes/galaxy/brand_cp/intro.png and 
b/icon-themes/galaxy/brand_cp/intro.png differ
diff --git a/icon-themes/galaxy/brand_cp_snapshot/intro-highres.png 
b/icon-themes/galaxy/brand_cp_snapshot/intro-highres.png
index 87cf05397686..59a87dac1f96 100644
Binary files a/icon-themes/galaxy/brand_cp_snapshot/intro-highres.png and 
b/icon-themes/galaxy/brand_cp_snapshot/intro-highres.png differ
diff --git a/icon-themes/galaxy/brand_cp_snapshot/intro.png 
b/icon-themes/galaxy/brand_cp_snapshot/intro.png
index fdfbda157a5f..2485dee83cfb 100644
Binary files a/icon-themes/galaxy/brand_cp_snapshot/intro.png and 
b/icon-themes/galaxy/brand_cp_snapshot/intro.png differ
diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index e8c928d96fff..15802c36a754 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -135,11 +135,11 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'HideEula=1' \
&& echo 'Logo=1' \
&& echo 'NativeProgress=false' \
-   && echo 'ProgressBarColor=0,0,0' \
-   && echo 'ProgressFrameColor=102,102,102' \
-   && echo 'ProgressPosition=26,235' \
-   && echo 'ProgressSize=460,6' \
-   && echo 'ProgressPositionHigh=46,212' \
+   && echo 'ProgressBarColor=80,73,153' \
+   && echo 'ProgressFrameColor=255,255,255' \
+   && echo 'ProgressPosition=268,106' \
+   && echo 'ProgressSize=212,4' \
+   && echo 'ProgressPositionHigh=268,137' \
&& echo 'ProgressSizeHigh=617,12' \
&& echo 'ProgressTextBaseline=230' \
&& echo 'ProgressTextColor=255,255,255' \
commit 9749c327c54762c14062941874b773b40cf76448
Author: Szymon Kłos 
AuthorDate: Tue Apr 20 09:08:33 2021 +0200
Commit: Andras Timar 
CommitDate: Wed Apr 21 19:08:11 2021 +0200

Fix early return in ScInputWindow::setPosSizePixel

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

was too agressive optimization causing input bar not
showing in the online and blocking the fix:

online: update calc inputbar position on change
09afa34955d76419ebe8f4d15780d801f95256ca

Sending message was originally introduced to update
information about position in the online when notebookbar
become visible (what causes input bar position change).
Send it only when vertical position changed.

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

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index cfd01f1d962f..6c6fd824e8e6 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -159,7 +159,8 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, const 
SfxBindings* pBind ) :
 mpViewShell ( nullptr ),
 mnMaxY  (0),
 bIsOkCancelMode ( false ),
-bInResize   ( false )
+bInResize   ( false ),
+nOldOutOffYPixel( GetOutOffYPixel() )
 {
 // #i73615# don't rely on SfxViewShell::Current while constructing the 
input line
 // (also for GetInputHdl below)
@@ -476,11 +477,12 @@ 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, 
nHeigh

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

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

 vcl/skia/skia_denylist_vulkan.xml |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit eb10c4dd78703f1af501db14a0c72ef5d1b74be4
Author: Luboš Luňák 
AuthorDate: Wed Apr 21 18:50:16 2021 +0200
Commit: Luboš Luňák 
CommitDate: Wed Apr 21 18:51:02 2021 +0200

blacklist intel 0.402.743 vulkan driver (tdf#138729)

Change-Id: Id827dc4daba8abeb5829528283a26a661fe7e6a1

diff --git a/vcl/skia/skia_denylist_vulkan.xml 
b/vcl/skia/skia_denylist_vulkan.xml
index 507bc04d2d94..9ae2fce70c6f 100644
--- a/vcl/skia/skia_denylist_vulkan.xml
+++ b/vcl/skia/skia_denylist_vulkan.xml
@@ -24,6 +24,9 @@
 
 
 
+ 

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

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

[Miklos Vajna (via logerrit)]

 sw/source/ui/index/swuiidxmrk.cxx|   76 +---
 sw/uiconfig/swriter/ui/bibliofragment.ui |   83 ++-
 2 files changed, 140 insertions(+), 19 deletions(-)

New commits:
commit e920406994dd2b880d4b752e3ea4e09e4a8f97cc
Author: Miklos Vajna 
AuthorDate: Wed Apr 21 16:54:00 2021 +0200
Commit: Miklos Vajna 
CommitDate: Wed Apr 21 18:45:39 2021 +0200

sw bibliography, refer to a page: add dedicate widget to show the page 
number

This way the user doesn't have to interpret the URL manually, we can
show the fragment-less URL and the page number separately.

So far only the doc model -> UI is done, not yet the other way around.

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

diff --git a/sw/source/ui/index/swuiidxmrk.cxx 
b/sw/source/ui/index/swuiidxmrk.cxx
index c16eacf36fab..483fe01cf3aa 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -70,6 +71,36 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::util;
 using namespace ::comphelper;
 
+namespace
+{
+bool SplitUrlAndPage(const OUString& rText, OUString& rUrl, int& nPageNumber)
+{
+uno::Reference xUriReferenceFactory
+= 
uri::UriReferenceFactory::create(comphelper::getProcessComponentContext());
+uno::Reference xUriRef;
+try
+{
+xUriRef = xUriReferenceFactory->parse(rText);
+}
+catch (const uno::Exception& rException)
+{
+SAL_WARN("sw.ui", "SplitUrlAndPage: failed to parse url: " << 
rException.Message);
+return false;
+}
+
+OUString aPagePrefix("page=");
+if (!xUriRef->getFragment().startsWith(aPagePrefix))
+{
+return false;
+}
+
+nPageNumber = 
xUriRef->getFragment().copy(aPagePrefix.getLength()).toInt32();
+xUriRef->clearFragment();
+rUrl = xUriRef->getUriReference();
+return true;
+}
+}
+
 // dialog to insert a directory selection
 SwIndexMarkPane::SwIndexMarkPane(const std::shared_ptr& rDialog, 
weld::Builder& rBuilder, bool bNewDlg,
 SwWrtShell* pWrtShell)
@@ -1028,6 +1059,8 @@ class SwCreateAuthEntryDlg_Impl : public 
weld::GenericDialogController
 std::unique_ptr m_xTypeListBox;
 std::unique_ptr m_xIdentifierBox;
 std::unique_ptr m_xBrowseButton;
+std::unique_ptr m_xPageCB;
+std::unique_ptr m_xPageSB;
 
 DECL_LINK(IdentifierHdl, weld::ComboBox&, void);
 DECL_LINK(ShortNameHdl, weld::Entry&, void);
@@ -1600,7 +1633,7 @@ 
SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(weld::Window* pParent,
 }
 else
 {
-m_pBoxes[nIndex] = m_aBuilders.back()->weld_box("hbox");
+m_pBoxes[nIndex] = m_aBuilders.back()->weld_box("vbox");
 pEdits[nIndex] = m_aBuilders.back()->weld_entry("entry");
 if (bLeft)
 m_aOrigContainers.back()->move(m_pBoxes[nIndex].get(), 
m_xLeft.get());
@@ -1610,14 +1643,39 @@ 
SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(weld::Window* pParent,
 m_pBoxes[nIndex]->set_grid_left_attach(1);
 m_pBoxes[nIndex]->set_grid_top_attach(bLeft ? nLeftRow : 
nRightRow);
 m_pBoxes[nIndex]->set_hexpand(true);
-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));
+m_xPageCB = m_aBuilders.back()->weld_check_button("pagecb");
+m_xPageSB = m_aBuilders.back()->weld_spin_button("pagesb");
 }
+
+// Now that both pEdits[nIndex] and m_xPageSB is initialized, set 
their values.
+OUString aText = pFields[aCurInfo.nToxField];
+if (aCurInfo.nToxField != AUTH_FIELD_URL)
+{
+pEdits[nIndex]->set_text(aText);
+}
+else
+{
+OUString aUrl;
+int nPageNumber;
+if (SplitUrlAndPage(aText, aUrl, nPageNumber))
+{
+pEdits[nIndex]->set_text(aUrl);
+m_xPageCB->set_active(true);
+m_xPageSB->set_sensitive(true);
+m_xPageSB->set_value(nPageNumber);
+}
+else
+{
+pEdits[nIndex]->set_text(aText);
+}
+}
+pEdits[nIndex]->show();
+pEdits[nIndex]->set_help_id(aCurInfo.pHelpId);
+
 if(AUTH_FIELD_ID

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

[Mike Kaganski (via logerrit)]

 comphelper/source/misc/string.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 38ddeebce90f94b9211091f46dcd09ce679cb475
Author: Mike Kaganski 
AuthorDate: Wed Apr 21 14:39:44 2021 +0200
Commit: Mike Kaganski 
CommitDate: Wed Apr 21 18:32:17 2021 +0200

Fix templates to use correct typedefs

... even if they happen to be the same underlying type

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

diff --git a/comphelper/source/misc/string.cxx 
b/comphelper/source/misc/string.cxx
index 1867728381b6..e1217dc5560f 100644
--- a/comphelper/source/misc/string.cxx
+++ b/comphelper/source/misc/string.cxx
@@ -50,7 +50,7 @@ namespace
 if (rIn.empty())
 return rIn;
 
-std::string_view::size_type i = 0;
+typename T::size_type i = 0;
 
 while (i < rIn.size())
 {
@@ -81,7 +81,7 @@ namespace
 if (rIn.empty())
 return rIn;
 
-std::u16string_view::size_type i = rIn.size();
+typename T::size_type i = rIn.size();
 
 while (i > 0)
 {
@@ -126,7 +126,7 @@ namespace
 return 0;
 
 sal_Int32 nTokCount = 1;
-for (std::u16string_view::size_type i = 0; i < rIn.size(); ++i)
+for (typename T::size_type i = 0; i < rIn.size(); ++i)
 {
 if (rIn[i] == cTok)
 ++nTokCount;
@@ -393,7 +393,7 @@ namespace
 if (rIn.empty())
 return T();
 
-std::u16string_view::size_type i = rIn.size();
+typename I::size_type i = rIn.size();
 O sBuf(static_cast(i));
 while (i)
 sBuf.append(rIn[--i]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: slideshow/Library_slideshow.mk slideshow/source

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

 slideshow/Library_slideshow.mk |4 -
 slideshow/source/engine/effectrewinder.cxx |   61 -
 slideshow/source/engine/effectrewinder.hxx |3 -
 3 files changed, 1 insertion(+), 67 deletions(-)

New commits:
commit 093f90fa9bf71174c08c271fc9ac1469af504441
Author: Luboš Luňák 
AuthorDate: Tue Apr 20 12:47:40 2021 +0200
Commit: Luboš Luňák 
CommitDate: Wed Apr 21 18:30:15 2021 +0200

Revert "tdf#125949 Allow the slide to continue with ..." (tdf#133447)

These animations were causing problems because of Cairo not handling
well large matrix values. With the real problem fixed this can now
be reverted. I assume the commit claiming to occur with OpenGL was
a mistake, I cannot reproduce any problem, or possibly the problem
went away when the OpenGL VCL backend was removed.

This reverts commit 8eb2d2972583b909a249f5b0f22a9b1fbf533d24.
This reverts commit 3e88fc6b0eef06e1e12fcfe765e3092c6c06ce5c.

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

diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 3ff098c01639..de589f210602 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -32,10 +32,6 @@ $(eval $(call gb_Library_use_externals,slideshow,\
  ))
 endif
 
-$(eval $(call gb_Library_use_custom_headers,slideshow,\
-   officecfg/registry \
-))
-
 $(eval $(call gb_Library_use_sdk_api,slideshow))
 
 $(eval $(call gb_Library_use_libraries,slideshow,\
diff --git a/slideshow/source/engine/effectrewinder.cxx 
b/slideshow/source/engine/effectrewinder.cxx
index 7d329c9ae411..48a83d591437 100644
--- a/slideshow/source/engine/effectrewinder.cxx
+++ b/slideshow/source/engine/effectrewinder.cxx
@@ -27,11 +27,8 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
-#include 
-
 using ::com::sun::star::uno::Reference;
 using namespace ::com::sun::star;
 
@@ -311,66 +308,9 @@ bool EffectRewinder::resetEffectCount()
 return false;
 }
 
-bool EffectRewinder::hasBlockedAnimation( const 
css::uno::Reference& xNode)
-{
-bool isShapeTarget = false;;
-OUString preset_id;
-OUString preset_sub_type;
-OUString preset_property;
-
-if (xNode->getUserData().getLength())
-{
-for(int i = 0; i < xNode->getUserData().getLength(); i++)
-{
-if(xNode->getUserData()[i].Name == "preset-id")
-xNode->getUserData()[i].Value >>= preset_id;
-if(xNode->getUserData()[i].Name == "preset-sub-type")
-xNode->getUserData()[i].Value >>= preset_sub_type;
-if(xNode->getUserData()[i].Name == "preset-property")
-xNode->getUserData()[i].Value >>= preset_property;
-}
-}
-
-uno::Reference xEnumerationAccess (xNode, 
uno::UNO_QUERY);
-if (xEnumerationAccess.is())
-{
-uno::Reference xEnumeration (
-xEnumerationAccess->createEnumeration());
-if (xEnumeration.is())
-while (xEnumeration->hasMoreElements())
-{
-uno::Reference xNext 
(xEnumeration->nextElement(), uno::UNO_QUERY);
-uno::Reference xAnimate( xNext, 
uno::UNO_QUERY );
-
-if(xAnimate.is())
-{
-uno::Reference< drawing::XShape > xShape( 
xAnimate->getTarget(), uno::UNO_QUERY );
-
-if (xShape.is() || xAnimate->getTarget().getValueType() == 
cppu::UnoType::get())
-isShapeTarget=true;
-}
-}
-}
-
-if(isShapeTarget &&
-   ((preset_id == "ooo-entrance-zoom" && preset_sub_type == "in") || // 
Entrance Zoom In
-(preset_id == "ooo-entrance-swivel" ) || // 
Entrance Swivel
-(preset_id == "ooo-entrance-spiral-in")   || // 
Entrance Spiral-In
-(preset_id == "ooo-entrance-stretchy"))) // 
Entrance Stretchy
-return true;
-
-return false;
-}
 
 bool EffectRewinder::notifyAnimationStart (const AnimationNodeSharedPtr& 
rpNode)
 {
-Reference xNode (rpNode->getXAnimationNode());
-
-if( xNode.is() &&
-!officecfg::Office::Canvas::ForceSafeServiceImpl::get() &&
-hasBlockedAnimation(xNode) )
-skipSingleMainSequenceEffects();
-
 // This notification is only relevant for us when the rpNode belongs to
 // the main sequence.
 BaseNodeSharedPtr pBaseNode 
(::std::dynamic_pointer_cast(rpNode));
@@ -385,6 +325,7 @@ bool EffectRewinder::notifyAnimationStart (const 
AnimationNodeSharedPtr& rpNode)
 // triggered.
 bool bIsUserTriggered (false);
 
+Reference xNode (rpNode->getXAnimationNode());
 if (xNode.is())
 {
 animations::Event aEvent;
diff --git a/slideshow/source/engine/effectrewinder.hxx 
b/slideshow/source/engine/eff

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

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

 canvas/source/cairo/cairo_spritehelper.cxx |   32 +
 1 file changed, 32 insertions(+)

New commits:
commit 3a4bfe3e45be2d5b591ab5cae3694c9492ca9e1b
Author: Luboš Luňák 
AuthorDate: Tue Apr 20 17:20:31 2021 +0200
Commit: Luboš Luňák 
CommitDate: Wed Apr 21 18:29:49 2021 +0200

prevent cairo from breaking because of a large matrix (tdf#125949)

Some presentation animations temporarily cause extensive zoom matrix
and Cairo doesn't take that well.

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

diff --git a/canvas/source/cairo/cairo_spritehelper.cxx 
b/canvas/source/cairo/cairo_spritehelper.cxx
index 929ecdf3b384..264c720e995e 100644
--- a/canvas/source/cairo/cairo_spritehelper.cxx
+++ b/canvas/source/cairo/cairo_spritehelper.cxx
@@ -28,6 +28,7 @@
 #include 
 
 #include 
+#include 
 
 #include "cairo_spritehelper.hxx"
 
@@ -139,6 +140,37 @@ namespace cairocanvas
 cairo_clip( pCairo.get() );
 cairo_set_matrix( pCairo.get(), &aOrigMatrix );
 
+cairo_matrix_t aInverseMatrix = aOrigMatrix;
+bool matrixProblem = false;
+// tdf#125949: Cairo internally uses the pixman library, and 
_cairo_matrix_to_pixman_matrix()
+// checks all matrix components to fix PIXMAN_MAX_INT, which is about 
32k. Which means that
+// if our transformation is large, such as an initial step of some 
zooming animations,
+// the conversion will fail. To make things worse, once something in 
cairo fails, it's treated
+// as a fatal error, the error status of that cairo_t gets set, and 
there's no way to reset it
+// besides recreating the whole cairo_t
+// 
(https://lists.cairographics.org/archives/cairo/2006-September/007892.html).
+// So copy&paste PIXMAN_MAX_INT here, and if our matrix could fail, 
bail out.
+#define PIXMAN_MAX_INT ((pixman_fixed_1 >> 1) - pixman_fixed_e) /* need to 
ensure deltas also fit */
+if(cairo_matrix_invert(&aInverseMatrix) == CAIRO_STATUS_SUCCESS)
+{
+if(abs(aOrigMatrix.xx) > PIXMAN_MAX_INT || abs(aOrigMatrix.xx) > 
PIXMAN_MAX_INT
+|| abs(aOrigMatrix.xy) > PIXMAN_MAX_INT || abs(aOrigMatrix.yx) 
> PIXMAN_MAX_INT
+|| abs(aOrigMatrix.x0) > PIXMAN_MAX_INT || abs(aOrigMatrix.y0) 
> PIXMAN_MAX_INT
+|| abs(aInverseMatrix.xx) > PIXMAN_MAX_INT || 
abs(aInverseMatrix.xx) > PIXMAN_MAX_INT
+|| abs(aInverseMatrix.xy) > PIXMAN_MAX_INT || 
abs(aInverseMatrix.yx) > PIXMAN_MAX_INT
+|| abs(aInverseMatrix.x0) > PIXMAN_MAX_INT || 
abs(aInverseMatrix.y0) > PIXMAN_MAX_INT)
+matrixProblem = true;
+#undef PIXMAN_MAX_INT
+}
+else
+matrixProblem = true;
+if(matrixProblem)
+{
+SAL_WARN( "canvas.cairo", "matrix would overflow PIXMAN_MAX_INT, 
avoiding drawing" );
+cairo_restore( pCairo.get() );
+return;
+}
+
 if( isContentFullyOpaque() )
 cairo_set_operator( pCairo.get(), CAIRO_OPERATOR_SOURCE );
 cairo_set_source_surface( pCairo.get(),
___
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

[Andreas Heinisch (via logerrit)]

 sc/qa/unit/data/functions/statistical/fods/rsq.fods |   55 
 sc/source/core/tool/interpr3.cxx|4 +
 2 files changed, 48 insertions(+), 11 deletions(-)

New commits:
commit fc9919bcfcf32f2ecefa4fce18a49545b93d3499
Author: Andreas Heinisch 
AuthorDate: Mon Apr 19 18:26:48 2021 +0200
Commit: Eike Rathke 
CommitDate: Wed Apr 21 18:03:41 2021 +0200

tdf#94962 - Limit calculation of pearson coefficient

The RSQ/PEARSON functions return values greater than one, if the divisors 
are below the numerical limits.

Change-Id: Ice224315072afafc6206c367f219771adebe23ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114301
Tested-by: Eike Rathke 
Reviewed-by: Eike Rathke 

diff --git a/sc/qa/unit/data/functions/statistical/fods/rsq.fods 
b/sc/qa/unit/data/functions/statistical/fods/rsq.fods
index 0028bda9d834..b37fbd7b6f94 100644
--- a/sc/qa/unit/data/functions/statistical/fods/rsq.fods
+++ b/sc/qa/unit/data/functions/statistical/fods/rsq.fods
@@ -4129,9 +4129,21 @@
  
 
 
- 
- 
- 
+ 
+  #DIV/0!
+ 
+ 
+  #DIV/0!
+ 
+ 
+  WAHR
+ 
+ 
+  =RSQ(L12:L15;M12:M15)
+ 
+ 
+  tdf#94962
+ 
  
   9
  
@@ -4228,8 +4240,13 @@
   89989
  
  
- 
- 
+ 
+  7.149E-166
+ 
+ 
+  4.998E-163
+ 
+ 
  
  
  
@@ -4249,7 +4266,13 @@
   89988
  
  
- 
+ 
+  3.963E-165
+ 
+ 
+  6.232E-163
+ 
+ 
  
  
  
@@ -4267,8 +4290,14 @@
  
   89987
  
- 
- 
+ 
+ 
+  6.609E-165
+ 
+ 
+  7.724E-163
+ 
+ 
  
  
  
@@ -4286,8 +4315,14 @@
  
   89986
  
- 
- 
+ 
+ 
+  3.056E-165
+ 
+ 
+  4.955E-163
+ 
+ 
  
  
  
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index ebf77f67a353..7adee328c37a 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -4603,7 +4603,9 @@ void ScInterpreter::CalculatePearsonCovar( bool 
_bPearson, bool _bStexy, bool _b
 }
 if ( _bPearson )
 {
-if (fSumSqrDeltaX == 0.0 || ( !_bStexy && fSumSqrDeltaY == 0.0) )
+// tdf#94962 - Values below the numerical limit lead to unexpected 
results
+if (fSumSqrDeltaX < ::std::numeric_limits::min()
+|| (!_bStexy && fSumSqrDeltaY < 
::std::numeric_limits::min()))
 PushError( FormulaError::DivisionByZero);
 else if ( _bStexy )
 PushDouble( sqrt( (fSumSqrDeltaY - fSumDeltaXDeltaY *
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/clang-format starmath/inc starmath/Library_sm.mk starmath/source starmath/uiconfig starmath/UIConfig_smath.mk starmath/visual-editor-todo

[Caolán McNamara (via logerrit)]

 solenv/clang-format/excludelist  |2 
 starmath/Library_sm.mk   |1 
 starmath/UIConfig_smath.mk   |1 
 starmath/inc/scrwin.hxx  |   68 
 starmath/inc/view.hxx|  111 ---
 starmath/source/accessibility.cxx|  203 ++---
 starmath/source/accessibility.hxx|4 
 starmath/source/cursor.cxx   |2 
 starmath/source/document.cxx |   10 
 starmath/source/edit.cxx |4 
 starmath/source/scrwin.cxx   |  345 --
 starmath/source/view.cxx |  483 ---
 starmath/uiconfig/smath/ui/mathwindow.ui |   38 ++
 starmath/visual-editor-todo  |2 
 14 files changed, 549 insertions(+), 725 deletions(-)

New commits:
commit ea21b870f8549d0110ef65187af50694a06458ca
Author: Caolán McNamara 
AuthorDate: Mon Apr 19 15:22:22 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 21 18:02:15 2021 +0200

weld SmGraphicWindow

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

diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index ae149d09096b..99d83dcc8730 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -10977,7 +10977,6 @@ starmath/inc/helpids.h
 starmath/inc/node.hxx
 starmath/inc/parse.hxx
 starmath/inc/rect.hxx
-starmath/inc/scrwin.hxx
 starmath/inc/smmod.hxx
 starmath/inc/symbol.hxx
 starmath/inc/unomodel.hxx
@@ -11009,7 +11008,6 @@ starmath/source/ooxmlimport.cxx
 starmath/source/ooxmlimport.hxx
 starmath/source/parse.cxx
 starmath/source/rect.cxx
-starmath/source/scrwin.cxx
 starmath/source/smdetect.cxx
 starmath/source/smdetect.hxx
 starmath/source/smdll.cxx
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 2e3cc035ec5f..0c27c07bc2a4 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -84,7 +84,6 @@ $(eval $(call gb_Library_add_exception_objects,sm,\
 starmath/source/parse \
 starmath/source/parse5 \
 starmath/source/rect \
-starmath/source/scrwin \
 starmath/source/smdll \
 starmath/source/smmod \
 starmath/source/symbol \
diff --git a/starmath/UIConfig_smath.mk b/starmath/UIConfig_smath.mk
index c24374206350..2a39af9e4a6d 100644
--- a/starmath/UIConfig_smath.mk
+++ b/starmath/UIConfig_smath.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/smath,\
starmath/uiconfig/smath/ui/fontdialog \
starmath/uiconfig/smath/ui/fontsizedialog \
starmath/uiconfig/smath/ui/fonttypedialog \
+   starmath/uiconfig/smath/ui/mathwindow \
starmath/uiconfig/smath/ui/printeroptions \
starmath/uiconfig/smath/ui/savedefaultsdialog \
starmath/uiconfig/smath/ui/smathsettings \
diff --git a/starmath/inc/scrwin.hxx b/starmath/inc/scrwin.hxx
deleted file mode 100644
index 348779e312b9..
--- a/starmath/inc/scrwin.hxx
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#pragma once
-
-#include 
-#include 
-
-class DataChangedEvent;
-class ScrollBar;
-class ScrollBarBox;
-
-class ScrollableWindow : public vcl::Window
-{
-private:
-Point   aPixOffset; // offset to virtual window (pixel)
-SizeaTotPixSz;  // total size of virtual window (pixel)
-tools::LongnLinePixH;  // size of a line/column (pixel)
-tools::LongnColumnPixW;
-
-VclPtraVScroll;  // the scrollbars
-VclPtraHScroll;
-VclPtr aCornerWin;// window in the bottom right corner
-boolbScrolling:1;   // user controlled scrolling
-
-DECL_LINK( ScrollHdl, ScrollBar *, void );
-DECL_LINK( EndScrollHdl, ScrollBar *, void );
-
-public:
-ScrollableWindow( vcl::Window* pParent );
-virtual ~ScrollableWindow() override;
-virtual voiddispose() ov

[Libreoffice-commits] core.git: include/rtl

[Noel Grandin (via logerrit)]

 include/rtl/strbuf.hxx  |4 
 include/rtl/ustrbuf.hxx |5 +
 2 files changed, 9 insertions(+)

New commits:
commit 967da14b48035f5acdd8a604a5c33cc6fe37035a
Author: Noel Grandin 
AuthorDate: Wed Apr 21 11:56:40 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 21 17:58:54 2021 +0200

string_view conversion operator for O[U]StringBuffer

which will be useful in an upcoming change of mine, so I don't need to
construct a temporary from a buffer

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

diff --git a/include/rtl/strbuf.hxx b/include/rtl/strbuf.hxx
index 5bdf072a..a238f305fa07 100644
--- a/include/rtl/strbuf.hxx
+++ b/include/rtl/strbuf.hxx
@@ -248,6 +248,10 @@ public:
 {}
 #endif
 
+#if defined LIBO_INTERNAL_ONLY
+operator std::string_view() const { return {getStr(), 
sal_uInt32(getLength())}; }
+#endif
+
 /** Assign to this a copy of value.
  */
 OStringBuffer& operator = ( const OStringBuffer& value )
diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx
index 170b76908dff..65762d53960d 100644
--- a/include/rtl/ustrbuf.hxx
+++ b/include/rtl/ustrbuf.hxx
@@ -253,6 +253,11 @@ public:
 rtl_uStringbuffer_newFromStr_WithLength( &pData, n.buf, n.length );
 }
 #endif
+
+#if defined LIBO_INTERNAL_ONLY
+operator std::u16string_view() const { return {getStr(), 
sal_uInt32(getLength())}; }
+#endif
+
 /** Assign to this a copy of value.
  */
 OUStringBuffer& operator = ( const OUStringBuffer& value )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Johnny_M (via logerrit)]

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

New commits:
commit f40bd2c5cca0d6f95e48f60179669a21ac9aa8ca
Author: Johnny_M 
AuthorDate: Wed Apr 21 17:07:25 2021 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Apr 21 17:07:25 2021 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to a81010b7f3ff48667d22fc654dcd7eeae2eda70f
  - tdf#132643 Translate German section IDs

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

diff --git a/helpcontent2 b/helpcontent2
index 1f54b9ee1257..a81010b7f3ff 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1f54b9ee1257f929c6c250373d7a0986f310c2f3
+Subproject commit a81010b7f3ff48667d22fc654dcd7eeae2eda70f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M (via logerrit)]

 source/text/shared/00/0406.xhp  |2 +-
 source/text/shared/01/01020101.xhp  |2 +-
 source/text/swriter/01/04120200.xhp |2 +-
 source/text/swriter/01/04120210.xhp |2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a81010b7f3ff48667d22fc654dcd7eeae2eda70f
Author: Johnny_M 
AuthorDate: Sat Apr 17 11:40:28 2021 +0200
Commit: Olivier Hallot 
CommitDate: Wed Apr 21 17:07:25 2021 +0200

tdf#132643 Translate German section IDs

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

diff --git a/source/text/shared/00/0406.xhp 
b/source/text/shared/00/0406.xhp
index 08d21d0ee..ce3461fcf 100644
--- a/source/text/shared/00/0406.xhp
+++ b/source/text/shared/00/0406.xhp
@@ -106,7 +106,7 @@
 Choose %PRODUCTNAME - 
PreferencesTools - 
Options - %PRODUCTNAME Calc - 
View.
 Choose %PRODUCTNAME - 
PreferencesTools - 
Options - %PRODUCTNAME 
Impress/%PRODUCTNAME Draw - View.
 Choose %PRODUCTNAME - 
PreferencesTools - 
Options - %PRODUCTNAME Draw - 
General.
-
+
 Path 
selection button in various wizards.
 Click 
Edit button for a few entries under %PRODUCTNAME - 
PreferencesTools - 
Options - $[officename] - 
Paths.
 
diff --git a/source/text/shared/01/01020101.xhp 
b/source/text/shared/01/01020101.xhp
index 7b23659af..627d84353 100644
--- a/source/text/shared/01/01020101.xhp
+++ b/source/text/shared/01/01020101.xhp
@@ -31,7 +31,7 @@
 Select 
Path
   Sets file 
paths.
 
-  
+  
 
 
 Select
diff --git a/source/text/swriter/01/04120200.xhp 
b/source/text/swriter/01/04120200.xhp
index f36ef036d..a2e50e2f1 100644
--- a/source/text/swriter/01/04120200.xhp
+++ b/source/text/swriter/01/04120200.xhp
@@ -37,7 +37,7 @@
 
   You can also 
preview the index or table in this dialog.
   Depending on 
the type of index or table that you select, the following tabs are 
present.
-  
+  
   
   
   
diff --git a/source/text/swriter/01/04120210.xhp 
b/source/text/swriter/01/04120210.xhp
index 191d5d4a0..ebd512dab 100644
--- a/source/text/swriter/01/04120210.xhp
+++ b/source/text/swriter/01/04120210.xhp
@@ -32,7 +32,7 @@
 
   
   
-  
+  
   Type
   Use this tab 
to specify and define the type of  index that you want to insert. You can also create custom 
indexes.
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/calc_tests8/tdf114710.py|4 ++--
 sc/qa/uitest/calc_tests8/tdf118308.py|7 +--
 sc/qa/uitest/chart/copyPaste.py  |4 ++--
 sc/qa/uitest/chart/tdf107097.py  |4 ++--
 sc/qa/uitest/chart/tdf120348.py  |4 ++--
 sc/qa/uitest/chart/tdf136011.py  |4 ++--
 sc/qa/uitest/chart/tdf62057.py   |4 ++--
 sc/qa/uitest/chart/tdf98690.py   |4 ++--
 sc/qa/uitest/conditional_format/tdf117899.py |4 ++--
 uitest/uitest/test.py|   14 +++---
 10 files changed, 24 insertions(+), 29 deletions(-)

New commits:
commit 5fb6081475f315ac825f8519fb9c99d751cabd47
Author: Xisco Fauli 
AuthorDate: Wed Apr 21 11:26:19 2021 +0200
Commit: Xisco Fauli 
CommitDate: Wed Apr 21 17:05:46 2021 +0200

uitest: just use .uno:CloseDoc and simplify code

Change-Id: Ic5fec6f1dd76aab6b11e822d127f0eb4c705ffae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114388
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_tests8/tdf114710.py 
b/sc/qa/uitest/calc_tests8/tdf114710.py
index ca82fa938ad1..94f3849f58ac 100644
--- a/sc/qa/uitest/calc_tests8/tdf114710.py
+++ b/sc/qa/uitest/calc_tests8/tdf114710.py
@@ -19,9 +19,9 @@ class tdf114710(UITestCase):
 gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:O7"}))
 self.xUITest.executeCommand(".uno:Copy")
 
-self.ui_test.close_doc()
+self.xUITest.executeCommand(".uno:CloseDoc")
 
-self.ui_test.load_empty_file("writer")
+self.ui_test.create_doc_in_start_center("writer")
 
 self.xUITest.getTopFocusWindow()
 
diff --git a/sc/qa/uitest/calc_tests8/tdf118308.py 
b/sc/qa/uitest/calc_tests8/tdf118308.py
index 313a2dc35ec8..2c38cd11394d 100644
--- a/sc/qa/uitest/calc_tests8/tdf118308.py
+++ b/sc/qa/uitest/calc_tests8/tdf118308.py
@@ -22,9 +22,12 @@ class tdf118308(UITestCase):
 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
 self.xUITest.executeCommand(".uno:Copy")
 
-self.ui_test.close_doc()
+self.ui_test.execute_dialog_through_command(".uno:CloseDoc")
+xDialog = self.xUITest.getTopFocusWindow()
+xDiscardBtn = xDialog.getChild("discard")
+self.ui_test.close_dialog_through_button(xDiscardBtn)
 
-calc_doc = self.ui_test.load_empty_file("calc")
+calc_doc = self.ui_test.create_doc_in_start_center("calc")
 
 xCalcDoc = self.xUITest.getTopFocusWindow()
 gridwin = xCalcDoc.getChild("grid_window")
diff --git a/sc/qa/uitest/chart/copyPaste.py b/sc/qa/uitest/chart/copyPaste.py
index 9b4ba830cdf1..3d37595f2dda 100644
--- a/sc/qa/uitest/chart/copyPaste.py
+++ b/sc/qa/uitest/chart/copyPaste.py
@@ -33,9 +33,9 @@ class CopyPaste(UITestCase):
 
 self.xUITest.executeCommand(".uno:Copy")
 
-self.ui_test.close_doc()
+self.xUITest.executeCommand(".uno:CloseDoc")
 
-self.ui_test.load_empty_file("calc")
+self.ui_test.create_doc_in_start_center("calc")
 document = self.ui_test.get_component()
 
 # Rename the sheet to match the same name as the first document
diff --git a/sc/qa/uitest/chart/tdf107097.py b/sc/qa/uitest/chart/tdf107097.py
index bbf697c5cd88..50ecccaff309 100644
--- a/sc/qa/uitest/chart/tdf107097.py
+++ b/sc/qa/uitest/chart/tdf107097.py
@@ -31,9 +31,9 @@ class tdf107097(UITestCase):
 
 self.xUITest.executeCommand(".uno:Copy")
 
-self.ui_test.close_doc()
+self.xUITest.executeCommand(".uno:CloseDoc")
 
-self.ui_test.load_empty_file("calc")
+self.ui_test.create_doc_in_start_center("calc")
 xCalcDoc = self.xUITest.getTopFocusWindow()
 gridwin = xCalcDoc.getChild("grid_window")
 document = self.ui_test.get_component()
diff --git a/sc/qa/uitest/chart/tdf120348.py b/sc/qa/uitest/chart/tdf120348.py
index 5eb83a0f66d1..b8ccb6c9b2c0 100644
--- a/sc/qa/uitest/chart/tdf120348.py
+++ b/sc/qa/uitest/chart/tdf120348.py
@@ -30,9 +30,9 @@ class tdf120348(UITestCase):
 
 self.xUITest.executeCommand(".uno:Copy")
 
-self.ui_test.close_doc()
+self.xUITest.executeCommand(".uno:CloseDoc")
 
-self.ui_test.load_empty_file("calc")
+self.ui_test.create_doc_in_start_center("calc")
 xCalcDoc = self.xUITest.getTopFocusWindow()
 gridwin = xCalcDoc.getChild("grid_window")
 document = self.ui_test.get_component()
diff --git a/sc/qa/uitest/chart/tdf136011.py b/sc/qa/uitest/chart/tdf136011.py
index 5a8074f3975d..e4bcbd5f975e 100644
--- a/sc/qa/uitest/chart/tdf136011.py
+++ b/sc/qa/uitest/chart/tdf136011.py
@@ -36,9 +36,9 @@ class tdf136011(UITestCase):
 
 self.xUITest.executeCommand(".uno:Copy")
 
-self.ui_test.close_doc()
+self.xUITest.executeCommand(".uno:CloseDoc")
 
-self.ui_test.load_empty_file("calc")
+self.ui_test.create_doc_in_start_center("calc")
 xCalcDoc = self.xUITest.getTopFocusWindow()
 gridwin = xCalcDoc

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

[Andreas Heinisch (via logerrit)]

 sc/qa/unit/data/functions/financial/fods/irr.fods |   45 ++---
 sc/source/core/tool/interpr2.cxx  |   73 +-
 2 files changed, 77 insertions(+), 41 deletions(-)

New commits:
commit a8216c210dbe83a7fe0c8b1a767c2ddf8b611e96
Author: Andreas Heinisch 
AuthorDate: Mon Apr 12 10:51:57 2021 +0200
Commit: Eike Rathke 
CommitDate: Wed Apr 21 16:59:13 2021 +0200

tdf#58585 - IRR function: support array argument for values

Text and empty cells in the value range are ignored.

Change-Id: I0790a83c79d3861afa855bf89a1c4eb39eb6d638
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113971
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/sc/qa/unit/data/functions/financial/fods/irr.fods 
b/sc/qa/unit/data/functions/financial/fods/irr.fods
index ced44ffd0c49..4ecc9cb32581 100644
--- a/sc/qa/unit/data/functions/financial/fods/irr.fods
+++ b/sc/qa/unit/data/functions/financial/fods/irr.fods
@@ -1913,20 +1913,29 @@
  
  
 
-
- 
- 
- 
- 
- 
+
+ 
+  23,38%
+ 
+ 
+  0.233751928528259
+ 
+ 
+  TRUE
+ 
+ 
+  =IRR({-1|5000|5000|5000})
+ 
+ 
+  Tdf#58585 enhancement
+ 
+ 
  
-  20
+  10
  
  
- 
- 
- 
- 
+ 
+ 
 
 
  
@@ -2014,20 +2023,6 @@
  
  
 
-
- 
-  Err:504
- 
- 
- 
- 
-  =IRR( {-1;5000;5000;5000})
- 
- 
-  Tdf#58585 enhancement
- 
- 
-
 
  
  
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index a14c84b69f92..7e0d3733538d 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -1410,17 +1410,43 @@ void ScInterpreter::ScIRR()
 fEstimated = GetDouble();
 else
 fEstimated = 0.1;
-sal_uInt16 sPos = sp;  // memorize the position of the 
stack
 double fEps = 1.0;
 double x, fValue;
 if (fEstimated == -1.0)
 x = 0.1;   // default result for division by 
zero
 else
 x = fEstimated;// startvalue
+
+ScRange aRange;
+ScMatrixRef pMat;
+SCSIZE nC = 0;
+SCSIZE nR = 0;
+bool bIsMatrix = false;
 switch (GetStackType())
 {
-case svDoubleRef :
+case svDoubleRef:
+PopDoubleRef(aRange);
 break;
+case svMatrix:
+case svExternalSingleRef:
+case svExternalDoubleRef:
+pMat = GetMatrix();
+if (pMat)
+{
+pMat->GetDimensions(nC, nR);
+if (nC == 0 || nR == 0)
+{
+PushIllegalParameter();
+return;
+}
+bIsMatrix = true;
+}
+else
+{
+PushIllegalParameter();
+return;
+}
+break;
 default:
 {
 PushIllegalParameter();
@@ -1429,28 +1455,43 @@ void ScInterpreter::ScIRR()
 }
 const sal_uInt16 nIterationsMax = 20;
 sal_uInt16 nItCount = 0;
-ScRange aRange;
-while (fEps > SCdEpsilon && nItCount < nIterationsMax)
+FormulaError nIterError = FormulaError::NONE;
+while (fEps > SCdEpsilon && nItCount < nIterationsMax && nGlobalError == 
FormulaError::NONE)
 {   // Newtons method:
-sp = sPos;  // reset stack
 double fNom = 0.0;
 double fDenom = 0.0;
-FormulaError nErr = FormulaError::NONE;
-PopDoubleRef( aRange );
-ScValueIterator aValIter(mrDoc, aRange, mnSubTotalFlags);
-if (aValIter.GetFirst(fValue, nErr))
-{
-double fCount = 0.0;
-fNom+=   fValue / pow(1.0+x,fCount);
-fDenom  += -fCount * fValue / pow(1.0+x,fCount+1.0);
-fCount++;
-while ((nErr == FormulaError::NONE) && aValIter.GetNext(fValue, 
nErr))
+double fCount = 0.0;
+if (bIsMatrix)
+{
+for (SCSIZE j = 0; j < nC && nGlobalError == FormulaError::NONE; 
j++)
+{
+for (SCSIZE k = 0; k < nR; k++)
+{
+if (!pMat->IsValue(j, k))
+continue;
+fValue = pMat->GetDouble(j, k);
+if (nGlobalError != FormulaError::NONE)
+break;
+
+fNom   +=   fValue / pow(1.0+x,fCount);
+fDenom += -fCount * fValue / pow(1.0+x,fCount+1.0);
+fCount++;
+}
+}
+}
+else
+{
+ScValueIterator aValIter(mrDoc, aRange, mnSubTotalFlags);
+bool bLoop = aValIter.GetFirst(fValue, nIterError);
+while (bLoop && nIterError ==

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

[Xisco Fauli (via logerrit)]

 sc/qa/uitest/calc_tests9/tdf141244.py |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 2056cdca53b694d8c27ef85e4a3679df4608f22c
Author: Xisco Fauli 
AuthorDate: Wed Apr 21 12:06:01 2021 +0200
Commit: Xisco Fauli 
CommitDate: Wed Apr 21 16:45:22 2021 +0200

uitest: just use enter_text_to_cell here

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

diff --git a/sc/qa/uitest/calc_tests9/tdf141244.py 
b/sc/qa/uitest/calc_tests9/tdf141244.py
index d65a35cf2525..2c605108c011 100644
--- a/sc/qa/uitest/calc_tests9/tdf141244.py
+++ b/sc/qa/uitest/calc_tests9/tdf141244.py
@@ -7,7 +7,7 @@
 from uitest.framework import UITestCase
 from uitest.uihelper.common import get_state_as_dict
 from libreoffice.uno.propertyvalue import mkPropertyValues
-from uitest.uihelper.common import type_text
+from uitest.uihelper.calc import enter_text_to_cell
 
 class tdf141244(UITestCase):
 
@@ -18,9 +18,7 @@ class tdf141244(UITestCase):
 calcDoc = self.xUITest.getTopFocusWindow()
 gridwin = calcDoc.getChild("grid_window")
 
-gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
-type_text(gridwin, '=DDE("soffice";"data1.ods";"sheet1.A1")')
-gridwin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"}))
+enter_text_to_cell(gridwin, "A1", 
'=DDE("soffice";"data1.ods";"sheet1.A1")')
 
 self.ui_test.execute_dialog_through_command(".uno:EditLinks")
 xDialog = self.xUITest.getTopFocusWindow()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: CppCheck Report on vm140 Not Running

[Luke Benes]

I spoke to the author of the cppcheck script, Maarten Hoes, about this issue. 
We would like to know why no one has responded to our emails about the cppcheck 
service being down. Are devs not interested in cppcheck's results, is it the 
high false positives, or is it that no one knows how to help get it back online?

Maarten has lost his ssh-key to vm140 and needs support from the tdf 
infrastructure team to get back in. IF there is sufficient developer 
interest,he has generously offered to setup a new vm for the script. I too 
would be willing, if I could get a tdf infra team commitment to provide minimal 
support. (Hours of volunteered time were wasted on a ESC approved 32-bit linux 
tinderbox, because I could not get my quested answered on registering a lode 
tinderbox after I got the manual builds working)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

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

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

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


** CID 1476301:  Null pointer dereferences  (NULL_RETURNS)
/starmath/source/edit.cxx: 788 in SmEditTextWindow::UpdateStatus(bool)()



*** CID 1476301:  Null pointer dereferences  (NULL_RETURNS)
/starmath/source/edit.cxx: 788 in SmEditTextWindow::UpdateStatus(bool)()
782 void SmEditTextWindow::UpdateStatus(bool bSetDocModified)
783 {
784 SmModule *pMod = SM_MOD();
785 if (pMod && pMod->GetConfig()->IsAutoRedraw())
786 Flush();
787 if ( bSetDocModified )
>>> CID 1476301:  Null pointer dereferences  (NULL_RETURNS)
>>> Dereferencing a pointer that might be "nullptr" 
>>> "this->mrEditWindow->GetDoc()" when calling "SetModified". (The dereference 
>>> happens because this is a virtual function call.)
788 mrEditWindow.GetDoc()->SetModified();
789 }
790 
791 void SmEditWindow::Cut()
792 {
793 if (mxTextControl)

** CID 1476300:  Null pointer dereferences  (FORWARD_NULL)



*** CID 1476300:  Null pointer dereferences  (FORWARD_NULL)
/svx/source/svdraw/svdmrkv.cxx: 811 in 
SdrMarkView::SetMarkHandlesForLOKit(const tools::Rectangle &, const 
SfxViewShell *)()
805 {
806 auto& rTableObject = 
dynamic_cast(*mpMarkedObj);
807 bTableSelection = 
rTableObject.createTableEdgesJson(aTableJsonTree);
808 }
809 if (mpMarkedObj && mpMarkedObj->GetObjIdentifier() == OBJ_EDGE)
810 {
>>> CID 1476300:  Null pointer dereferences  (FORWARD_NULL)
>>> "dumpGluePointsToJSON" dereferences null "this->mpMarkedPV".
811 bConnectorSelection = dumpGluePointsToJSON(aGluePointsTree);
812 }
813 if (GetMarkedObjectCount())
814 {
815 SdrMark* pM = GetSdrMarkByIndex(0);
816 SdrObject* pO = pM->GetMarkedSdrObj();



To view the defects in Coverity Scan visit, 
https://u15810271.ct.sendgrid.net/ls/click?upn=HRESupC-2F2Czv4BOaCWWCy7my0P0qcxCbhZ31OYv50ypSs1kiFPuCn2xFdlMIFBirii0zZ9j2-2F9F2XPBcBm2BNgi9duPy3v-2FzgFDd2LJ-2BDKI-3D16Ot_OTq2XUZbbipYjyLSo6GRo-2FpVxQ9OzkDINu9UTS-2FQhSdO0F0jQniitrGlNxDIzPJibfe-2BvtHAh-2B0LdXsIiymWiwf7NZfOvl4Jf4NBG1zXR0MCAtIcjxoQwls228ENf40eDr8jb7flAePvfBMk95IqPnfUm7a8xORdjsUBt7zSuPWFygD-2FeYoX9cayGfl174obYpxMOxW-2Ffw1o2bneJYv04gF0VXTtWk-2Baw6-2Bk0p1-2FIC0-3D

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

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

[Caolán McNamara (via logerrit)]

 starmath/source/edit.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 3902cfcd14cc66ee52b6d5bca7621bf30d6f4095
Author: Caolán McNamara 
AuthorDate: Wed Apr 21 11:23:04 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 21 15:52:07 2021 +0200

cid#1476301 Dereference null return value

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

diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index a02ad7436500..4c3549ec8d62 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -784,8 +784,9 @@ void SmEditTextWindow::UpdateStatus(bool bSetDocModified)
 SmModule *pMod = SM_MOD();
 if (pMod && pMod->GetConfig()->IsAutoRedraw())
 Flush();
-if ( bSetDocModified )
-mrEditWindow.GetDoc()->SetModified();
+SmDocShell* pDoc = bSetDocModified ? mrEditWindow.GetDoc() : nullptr;
+if (pDoc)
+pDoc->SetModified();
 }
 
 void SmEditWindow::Cut()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sd/qa/uitest/impress_tests/tdf141708.py |   32 
 1 file changed, 32 insertions(+)

New commits:
commit c076f7602962cdaaff0acd78256bda75838c4a9e
Author: Xisco Fauli 
AuthorDate: Wed Apr 21 11:07:09 2021 +0200
Commit: Xisco Fauli 
CommitDate: Wed Apr 21 15:47:52 2021 +0200

tdf#141708: sd: Add UItest

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

diff --git a/sd/qa/uitest/impress_tests/tdf141708.py 
b/sd/qa/uitest/impress_tests/tdf141708.py
new file mode 100644
index ..613cc8938b4d
--- /dev/null
+++ b/sd/qa/uitest/impress_tests/tdf141708.py
@@ -0,0 +1,32 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+#
+from uitest.framework import UITestCase
+
+class tdf141708(UITestCase):
+
+def test_tdf141708(self):
+
+self.ui_test.create_doc_in_start_center("impress")
+
+xTemplateDlg = self.xUITest.getTopFocusWindow()
+xCancelBtn = xTemplateDlg.getChild("close")
+self.ui_test.close_dialog_through_button(xCancelBtn)
+
+self.xUITest.executeCommand(".uno:Navigator")
+
+self.xUITest.executeCommand(".uno:CloseDoc")
+
+self.ui_test.create_doc_in_start_center("impress")
+
+xTemplateDlg = self.xUITest.getTopFocusWindow()
+xCancelBtn = xTemplateDlg.getChild("close")
+self.ui_test.close_dialog_through_button(xCancelBtn)
+
+# Without the fix in place, this test would have crashed here
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt (via logerrit)]

 svx/source/form/fmview.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8d633320df3fb58e6e9ac12dcf9983ad5d5db75e
Author: Samuel Mehrbrodt 
AuthorDate: Wed Apr 21 14:15:07 2021 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Wed Apr 21 15:46:57 2021 +0200

Related tdf#139804 Allow activating btn on first click

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

diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 5d195ef74245..a77ab010c070 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -517,6 +517,7 @@ bool FmFormView::KeyInput(const KeyEvent& rKEvt, 
vcl::Window* pWin)
 if (rI18nHelper.MatchMnemonic(pWindow->GetText(), 
rKEvt.GetCharCode()))
 {
 pWindow->GrabFocus();
+pWindow->KeyInput(rKEvt);
 bDone = true;
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 svx/source/sidebar/fontwork/FontworkPropertyPanel.cxx |   10 ++
 svx/source/sidebar/fontwork/FontworkPropertyPanel.hxx |2 ++
 2 files changed, 12 insertions(+)

New commits:
commit 649c0de61d1d16135ea573a343e8bc249986315b
Author: Szymon Kłos 
AuthorDate: Wed Apr 21 14:19:27 2021 +0200
Commit: Szymon Kłos 
CommitDate: Wed Apr 21 15:46:00 2021 +0200

Destroy properly FontworkPropertyPanel

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

diff --git a/svx/source/sidebar/fontwork/FontworkPropertyPanel.cxx 
b/svx/source/sidebar/fontwork/FontworkPropertyPanel.cxx
index 7d1b853d2ea8..286f65109698 100644
--- a/svx/source/sidebar/fontwork/FontworkPropertyPanel.cxx
+++ b/svx/source/sidebar/fontwork/FontworkPropertyPanel.cxx
@@ -49,6 +49,16 @@ FontworkPropertyPanel::FontworkPropertyPanel(vcl::Window* 
pParent,
 m_pToolbar->set_item_visible(".uno:ExtrusionToggle", false);
 }
 
+FontworkPropertyPanel::~FontworkPropertyPanel() { disposeOnce(); }
+
+void FontworkPropertyPanel::dispose()
+{
+m_xToolbar.reset(nullptr);
+m_pToolbar.reset(nullptr);
+
+PanelLayout::dispose();
+}
+
 VclPtr
 FontworkPropertyPanel::Create(vcl::Window* pParent,
   const css::uno::Reference& 
rxFrame)
diff --git a/svx/source/sidebar/fontwork/FontworkPropertyPanel.hxx 
b/svx/source/sidebar/fontwork/FontworkPropertyPanel.hxx
index 92447863b316..7c8c3a2a84bb 100644
--- a/svx/source/sidebar/fontwork/FontworkPropertyPanel.hxx
+++ b/svx/source/sidebar/fontwork/FontworkPropertyPanel.hxx
@@ -36,6 +36,8 @@ public:
 // constructor/destructor
 FontworkPropertyPanel(vcl::Window* pParent,
   const css::uno::Reference& 
rxFrame);
+~FontworkPropertyPanel();
+void dispose() override;
 
 private:
 std::unique_ptr m_pToolbar;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sd/source

[Samuel Mehrbrodt (via logerrit)]

 sd/source/ui/view/drviews4.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 29de1e98d30db95b4045537b6c867c7ea0090c4e
Author: Samuel Mehrbrodt 
AuthorDate: Wed Apr 21 10:57:16 2021 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Apr 21 14:46:15 2021 +0200

tdf#141703 Restore tab function in sd tables

Regression from 67ad205404211a2ae17c430a17ede6e9d04d0b7e

Change-Id: Iadbdaf1b59d2481264e45b85aed248c84404c26b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114383
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 75f5fdbbe48a847874397d9d126f832dbdfada5a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114368
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index e1c7831e11a7..baccb46cac5a 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -147,9 +147,9 @@ void DrawViewShell::DeleteActualLayer()
 
 bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin)
 {
-bool bRet = GetView()->KeyInput(rKEvt, pWin);
+bool bRet = false;
 
-if (!bRet && (!IsInputLocked() || (rKEvt.GetKeyCode().GetCode() == 
KEY_ESCAPE)))
+if (!IsInputLocked() || (rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE))
 {
 if(KEY_RETURN == rKEvt.GetKeyCode().GetCode()
 && rKEvt.GetKeyCode().IsMod1()
@@ -226,6 +226,9 @@ bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, 
::sd::Window* pWin)
 }
 }
 
+if (!bRet)
+bRet = GetView()->KeyInput(rKEvt, pWin);
+
 return bRet;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Attila Bakos (NISZ) (via logerrit)]

 sw/source/core/doc/textboxhelper.cxx |   54 +++
 1 file changed, 54 insertions(+)

New commits:
commit 09df81f33b1ed286aa8c544a32a530d1fcf53adf
Author: Attila Bakos (NISZ) 
AuthorDate: Wed Oct 21 15:50:25 2020 +0200
Commit: Gabor Kelemen 
CommitDate: Wed Apr 21 14:32:30 2021 +0200

tdf#137798 sw: apply textbox Text alignment

set in "Text" dialog window using "Text Anchor"
in Format -> Text Box and Shape -> Text
attributes... on the selected text box.

Follow up of commit 726c911b90b9a3170fa6b3a34bb952a8d2dbe148
(tdf#137025 sw: apply textbox padding set in Text).

Change-Id: I8c575ceb1d0b0772c1f7d99dc746531b0cd7ceb4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104632
Tested-by: Jenkins
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit 0b5801fc2c768d1774957c2c122c9061d3a74756)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114371
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git a/sw/source/core/doc/textboxhelper.cxx 
b/sw/source/core/doc/textboxhelper.cxx
index 43e77acd9fea..2fc1c1474ff6 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -47,6 +47,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 using namespace com::sun::star;
 
@@ -164,6 +166,8 @@ void SwTextBoxHelper::create(SwFrameFormat* pShape, bool 
bCopyText)
 if (xShapePropertySet->getPropertyValue(UNO_NAME_TEXT_WRITINGMODE) >>= 
eMode)
 syncProperty(pShape, RES_FRAMEDIR, 0, uno::makeAny(sal_Int16(eMode)));
 
+// TODO: Text dialog attr setting to frame
+
 const SwFormatAnchor& rAnch = pShape->GetAnchor();
 if ((rAnch.GetAnchorId() == RndStdIds::FLY_AT_PAGE && rAnch.GetPageNum() 
!= 0)
 || ((rAnch.GetAnchorId() == RndStdIds::FLY_AT_PARA
@@ -429,6 +433,45 @@ tools::Rectangle 
SwTextBoxHelper::getTextRectangle(SwFrameFormat* pShape, bool b
 void SwTextBoxHelper::syncProperty(SwFrameFormat* pShape, const OUString& 
rPropertyName,
const css::uno::Any& rValue)
 {
+// Textframes does not have valid horizontal adjust property, so map it to 
paragraph adjust property
+if (rPropertyName == UNO_NAME_TEXT_HORZADJUST)
+{
+SwFrameFormat* pFormat = getOtherTextBoxFormat(pShape, RES_DRAWFRMFMT);
+if (!pFormat)
+return;
+
+auto xTextFrame = SwXTextFrame::CreateXTextFrame(*pFormat->GetDoc(), 
pFormat);
+uno::Reference xCursor = 
xTextFrame->getText()->createTextCursor();
+
+// Select all paragraps in the textframe
+xCursor->gotoStart(false);
+xCursor->gotoEnd(true);
+uno::Reference xFrameParaProps(xCursor, 
uno::UNO_QUERY);
+
+// And simply map the property
+switch (rValue.get())
+{
+case drawing::TextHorizontalAdjust::TextHorizontalAdjust_CENTER:
+xFrameParaProps->setPropertyValue(
+UNO_NAME_PARA_ADJUST,
+
uno::makeAny(style::ParagraphAdjust::ParagraphAdjust_CENTER)); //3
+break;
+case drawing::TextHorizontalAdjust::TextHorizontalAdjust_LEFT:
+xFrameParaProps->setPropertyValue(
+UNO_NAME_PARA_ADJUST,
+
uno::makeAny(style::ParagraphAdjust::ParagraphAdjust_LEFT)); //0
+break;
+case drawing::TextHorizontalAdjust::TextHorizontalAdjust_RIGHT:
+xFrameParaProps->setPropertyValue(
+UNO_NAME_PARA_ADJUST,
+
uno::makeAny(style::ParagraphAdjust::ParagraphAdjust_RIGHT)); //1
+break;
+default:
+break;
+}
+return;
+}
+
 if (rPropertyName == "CustomShapeGeometry")
 {
 // CustomShapeGeometry changes the textbox position offset and size, 
so adjust both.
@@ -870,6 +913,7 @@ void SwTextBoxHelper::updateTextBoxMargin(SdrObject* pObj)
 if (!pParentFormat)
 return;
 
+// Sync the padding
 syncProperty(pParentFormat, UNO_NAME_TEXT_LEFTDIST,
  xPropertySet->getPropertyValue(UNO_NAME_TEXT_LEFTDIST));
 syncProperty(pParentFormat, UNO_NAME_TEXT_RIGHTDIST,
@@ -878,6 +922,16 @@ void SwTextBoxHelper::updateTextBoxMargin(SdrObject* pObj)
  xPropertySet->getPropertyValue(UNO_NAME_TEXT_UPPERDIST));
 syncProperty(pParentFormat, UNO_NAME_TEXT_LOWERDIST,
  xPropertySet->getPropertyValue(UNO_NAME_TEXT_LOWERDIST));
+
+// Sync the text aligning
+syncProperty(pParentFormat, UNO_NAME_TEXT_VERTADJUST,
+ xPropertySet->getPropertyValue(UNO_NAME_TEXT_VERTADJUST));
+syncProperty(pParentFormat, UNO_NAME_TEXT_HORZADJUST,
+ xPropertySet->getPropertyValue(UNO_NAME_TEXT_HORZADJUST));
+
+//FIXME: Sync autogrow: needs repositioning after sync
+//syncProperty(pParentFormat, RES

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

[Tor Lillqvist (via logerrit)]

 external/python3/ExternalProject_python3.mk |   28 +---
 1 file changed, 13 insertions(+), 15 deletions(-)

New commits:
commit 013bd441455ba88d612510c9c72dd2c0edca6ffd
Author: Tor Lillqvist 
AuthorDate: Tue Apr 20 20:55:11 2021 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Apr 21 14:30:29 2021 +0200

Python .so files names have changed on macOS at least for some reason

There is no longer any "m" in the name suffix. Adapt the names of the
ones we want to remove for macOS.

The idlelib and tkinter dylibs are no longer there at all.

Don't use the -f flag to the rm commands. Thus we will notice the next
time something we want to remove isn't actually there or has been
renamed. But sadly for some unknown reason we do need to use a *
wildcard in the .so names.

Fixes a problem caught by App Store review where the Python curses
module had not been removed as it should have been. (It uses
non-public APIs and can thus not be included.)

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

diff --git a/external/python3/ExternalProject_python3.mk 
b/external/python3/ExternalProject_python3.mk
index 5bb20c67c867..2e48294ab603 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -187,22 +187,20 @@ $(call 
gb_ExternalProject_get_state_target,python3,executables) : $(call gb_Exte
 
 $(call gb_ExternalProject_get_state_target,python3,removeunnecessarystuff) : 
$(call gb_ExternalProject_get_state_target,python3,build)
$(call gb_Output_announce,python3 - remove the stuff we don't need to 
ship,build,CUS,5)
-   rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/dbm
-   rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/sqlite3
-   rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/curses
-   rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/idlelib
-   rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/tkinter
-   rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/turtledemo
-   rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/test
-   rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/venv
+   rm -r 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/dbm
+   rm -r 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/sqlite3
+   rm -r 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/curses
+   rm -r 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/idlelib
+   rm -r 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/tkinter
+   rm -r 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/turtledemo
+   rm -r 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/test
+   rm -r 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/venv
# Then the binary libraries
-   rm -f 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload/_dbm.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so
-   rm -f 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload/_sqlite3.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so
-   rm -f 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(

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

[Noel Grandin (via logerrit)]

 starmath/source/dialog.cxx|3 +--
 vcl/source/control/fmtfield.cxx   |6 ++
 vcl/source/treelist/imap2.cxx |6 ++
 vcl/unx/generic/printer/ppdparser.cxx |9 +++--
 4 files changed, 8 insertions(+), 16 deletions(-)

New commits:
commit 69e385ec0240d0c44caa5a4ea0195e06007cd588
Author: Noel Grandin 
AuthorDate: Wed Apr 21 12:28:54 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 21 14:11:57 2021 +0200

simplify stripStart/End pairs into a single strip call

Change-Id: I32b1b7d944a4ec49d7daa5b8fa9371b059380062
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114393
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index fc722e252bce..523f2fa89d7f 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -1813,8 +1813,7 @@ bool SmSymDefineDialog::SelectSymbolSet(weld::ComboBox& 
rComboBox,
 assert((&rComboBox == m_xOldSymbolSets.get() || &rComboBox == 
m_xSymbolSets.get()) && "Sm : wrong ComboBox");
 
 // trim SymbolName (no leading and trailing blanks)
-OUString aNormName = comphelper::string::stripStart(rSymbolSetName, ' ');
-aNormName = comphelper::string::stripEnd(aNormName, ' ');
+OUString aNormName = comphelper::string::strip(rSymbolSetName, ' ');
 // and remove possible deviations within the input
 rComboBox.set_entry_text(aNormName);
 
diff --git a/vcl/source/control/fmtfield.cxx b/vcl/source/control/fmtfield.cxx
index 2910c7e02604..cb55d2ce158a 100644
--- a/vcl/source/control/fmtfield.cxx
+++ b/vcl/source/control/fmtfield.cxx
@@ -1114,8 +1114,7 @@ void DoubleCurrencyField::UpdateCurrencyFormat()
 if (getPrependCurrSym())
 {
 OUString sSymbol = getCurrencySymbol();
-sSymbol = comphelper::string::stripStart(sSymbol, ' ');
-sSymbol = comphelper::string::stripEnd(sSymbol, ' ');
+sSymbol = comphelper::string::strip(sSymbol, ' ');
 
 OUStringBuffer sTemp("[$");
 sTemp.append(sSymbol);
@@ -1136,8 +1135,7 @@ void DoubleCurrencyField::UpdateCurrencyFormat()
 else
 {
 OUString sTemp = getCurrencySymbol();
-sTemp = comphelper::string::stripStart(sTemp, ' ');
-sTemp = comphelper::string::stripEnd(sTemp, ' ');
+sTemp = comphelper::string::strip(sTemp, ' ');
 
 sNewFormat.append(" [$");
 sNewFormat.append(sTemp);
diff --git a/vcl/source/treelist/imap2.cxx b/vcl/source/treelist/imap2.cxx
index 4c55f67cde31..889b2c061d92 100644
--- a/vcl/source/treelist/imap2.cxx
+++ b/vcl/source/treelist/imap2.cxx
@@ -358,10 +358,8 @@ OUString ImageMap::ImpReadCERNURL( const char** ppStr )
 {
 OUString aStr(OUString::createFromAscii(*ppStr));
 
-aStr = comphelper::string::stripStart(aStr, ' ');
-aStr = comphelper::string::stripStart(aStr, '\t');
-aStr = comphelper::string::stripEnd(aStr, ' ');
-aStr = comphelper::string::stripEnd(aStr, '\t');
+aStr = comphelper::string::strip(aStr, ' ');
+aStr = comphelper::string::strip(aStr, '\t');
 
 return INetURLObject::GetAbsURL( "", aStr );
 }
diff --git a/vcl/unx/generic/printer/ppdparser.cxx 
b/vcl/unx/generic/printer/ppdparser.cxx
index 7b29c876a8c3..75abab8bc728 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -720,14 +720,11 @@ PPDParser::PPDParser( const OUString& rFile ) :
 if (aCurLine.matchIgnoreAsciiCase("*include:"))
 {
 aCurLine = aCurLine.copy(9);
-aCurLine = comphelper::string::stripStart(aCurLine, ' ');
-aCurLine = comphelper::string::stripEnd(aCurLine, ' ');
-aCurLine = comphelper::string::stripStart(aCurLine, '\t');
-aCurLine = comphelper::string::stripEnd(aCurLine, '\t');
+aCurLine = comphelper::string::strip(aCurLine, ' ');
+aCurLine = comphelper::string::strip(aCurLine, '\t');
 aCurLine = comphelper::string::stripEnd(aCurLine, '\r');
 aCurLine = comphelper::string::stripEnd(aCurLine, '\n');
-aCurLine = comphelper::string::stripStart(aCurLine, '"');
-aCurLine = comphelper::string::stripEnd(aCurLine, '"');
+aCurLine = comphelper::string::strip(aCurLine, '"');
 aStream.Close();
 aStream.Open(getPPDFile(OStringToOUString(aCurLine, 
m_aFileEncoding)));
 continue;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Attila Bakos (NISZ) (via logerrit)]

 sw/qa/extras/uiwriter/data3/txbx_crash.odt |binary
 sw/qa/extras/uiwriter/uiwriter3.cxx|   31 +
 sw/source/core/doc/textboxhelper.cxx   |7 +-
 3 files changed, 37 insertions(+), 1 deletion(-)

New commits:
commit f9a26bd2f5fae14ed99d8240a090b9a5aae1fcc2
Author: Attila Bakos (NISZ) 
AuthorDate: Thu Oct 15 16:45:15 2020 +0200
Commit: Gabor Kelemen 
CommitDate: Wed Apr 21 14:11:37 2021 +0200

tdf#137802 sw: fix crash on deleting last paragraph

if the last paragraph of document had a text box
anchored to.

Change-Id: Ibe29a0f37d06223c31f3add0c194e4414f65d5ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104379
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit 056933bc55608d0ca061539ae124d7b9386cdb62)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114354
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git a/sw/qa/extras/uiwriter/data3/txbx_crash.odt 
b/sw/qa/extras/uiwriter/data3/txbx_crash.odt
new file mode 100755
index ..0a029da88289
Binary files /dev/null and b/sw/qa/extras/uiwriter/data3/txbx_crash.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 245c57ebb788..60e2d5067166 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -772,6 +772,37 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf107893)
 CPPUNIT_ASSERT_MESSAGE("Textbox cannot be readd after Undo!", pTxBxFrm);
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, TestTextBoxCrashAfterLineDel)
+{
+// Open the desired file
+load(DATA_DIRECTORY, "txbx_crash.odt");
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+// Get the Writer shell
+SwWrtShell* pWrtSh = pTextDoc->GetDocShell()->GetWrtShell();
+CPPUNIT_ASSERT(pWrtSh);
+
+// Get the format of the shape
+const SwFrameFormats& rFrmFormats = 
*pWrtSh->GetDoc()->GetSpzFrameFormats();
+CPPUNIT_ASSERT(rFrmFormats.size() >= size_t(o3tl::make_unsigned(1)));
+SwFrameFormat* pShape = rFrmFormats.front();
+CPPUNIT_ASSERT(pShape);
+
+// Add a textbox
+SwTextBoxHelper::create(pShape);
+SwFrameFormat* pTxBxFrm = 
SwTextBoxHelper::getOtherTextBoxFormat(getShape(1));
+CPPUNIT_ASSERT(pTxBxFrm);
+
+// remove the last paragraph
+auto xCursor = getParagraph(1)->getText()->createTextCursor();
+xCursor->gotoEnd(false);
+xCursor->goLeft(3, true);
+
+// This caused crash before, now it should pass with the patch.
+xCursor->setString(OUString());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf96067)
 {
 mxComponent = loadFromDesktop("private:factory/swriter", 
"com.sun.star.text.TextDocument");
diff --git a/sw/source/core/doc/textboxhelper.cxx 
b/sw/source/core/doc/textboxhelper.cxx
index 98debf9b59d4..43e77acd9fea 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -89,7 +89,12 @@ void SwTextBoxHelper::create(SwFrameFormat* pShape, bool 
bCopyText)
 }
 catch (uno::Exception&)
 {
-xTextContentAppend->appendTextContent(xTextFrame, 
uno::Sequence());
+// Before the textframe was appended now it is inserted to the begin 
of the doc in order
+// to prevent crash when someone removes the para where the textframe 
anchored:
+uno::Reference xCursor = 
xTextDocument->getText()->createTextCursor();
+xCursor->gotoStart(false);
+xTextContentAppend->insertTextContentWithProperties(
+xTextFrame, uno::Sequence(), 
xCursor->getStart());
 }
 // Link FLY and DRAW formats, so it becomes a text box (needed for 
syncProperty calls).
 uno::Reference xRealTextFrame(xTextFrame, 
uno::UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 svx/source/svdraw/svdmrkv.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d757051f1c0c6a1b3239dcf0d1c6c7e20392d20b
Author: Caolán McNamara 
AuthorDate: Wed Apr 21 11:19:45 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 21 14:08:20 2021 +0200

cid#1476300 Dereference after null check

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

diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index b5adf79a6b3b..963ee43d65af 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -688,10 +688,10 @@ OUString lcl_getDragParameterString( const OUString& rCID 
)
 bool SdrMarkView::dumpGluePointsToJSON(boost::property_tree::ptree& rTree)
 {
 bool result = false;
-if (OutputDevice* rOutDev = mpMarkedPV->GetView().GetFirstOutputDevice())
+if (OutputDevice* pOutDev = mpMarkedPV ? 
mpMarkedPV->GetView().GetFirstOutputDevice() : nullptr)
 {
 bool bConvertUnit = false;
-if (rOutDev->GetMapMode().GetMapUnit() == MapUnit::Map100thMM)
+if (pOutDev->GetMapMode().GetMapUnit() == MapUnit::Map100thMM)
 bConvertUnit = true;
 const SdrObjList* pOL = mpMarkedPV->GetObjList();
 if (!pOL)
___
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' - comphelper/qa

[Tor Lillqvist (via logerrit)]

 comphelper/qa/unit/threadpooltest.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 0152674e929994cf3cfef849310cb6e9b8f529a6
Author: Tor Lillqvist 
AuthorDate: Wed Apr 21 14:05:04 2021 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Apr 21 13:38:58 2021 +0200

Avoid unused private field warning in a NDEBUG compilation

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

diff --git a/comphelper/qa/unit/threadpooltest.cxx 
b/comphelper/qa/unit/threadpooltest.cxx
index 695aca5b421a..435664e4aa77 100644
--- a/comphelper/qa/unit/threadpooltest.cxx
+++ b/comphelper/qa/unit/threadpooltest.cxx
@@ -121,6 +121,8 @@ public:
 }
 virtual void doWork()
 {
+(void) mThreadId;
+(void) mCheckEqual;
 assert(mCheckEqual ? osl::Thread::getCurrentIdentifier() == mThreadId
: osl::Thread::getCurrentIdentifier() != mThreadId);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 svx/source/form/fmview.cxx |   34 ++
 1 file changed, 18 insertions(+), 16 deletions(-)

New commits:
commit 1b06eb6c96ecfe0c39f50889797ddbf6b839a9e6
Author: Caolán McNamara 
AuthorDate: Fri Mar 19 15:32:53 2021 +
Commit: Samuel Mehrbrodt 
CommitDate: Wed Apr 21 13:24:11 2021 +0200

cid#1474166 Deference null return value

Change-Id: I725eff105f963b139ae8646cd1cb193ce737d313
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112760
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 
(cherry picked from commit 229558c0bf257e4e559cc1b84bd2918b04c68305)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114365
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 3a4b443f4541..79651f7ab732 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -499,24 +499,26 @@ bool FmFormView::KeyInput(const KeyEvent& rKEvt, 
vcl::Window* pWin)
 // tdf#139804 Allow selecting form controls with Alt-
 if (rKeyCode.IsMod2() && rKeyCode.GetCode())
 {
-FmFormPage* pCurPage = GetCurPage();
-for (size_t a = 0; a < pCurPage->GetObjCount(); ++a)
+if (FmFormPage* pCurPage = GetCurPage())
 {
-SdrObject* pObj = pCurPage->GetObj(a);
-FmFormObj* pFormObject = FmFormObj::GetFormObject(pObj);
-if (!pFormObject)
-continue;
-
-Reference xControl = 
pFormObject->GetUnoControl(*this, *pWin);
-if (!xControl.is())
-continue;
-const vcl::I18nHelper& rI18nHelper = 
Application::GetSettings().GetUILocaleI18nHelper();
-VclPtr pWindow = 
VCLUnoHelper::GetWindow(xControl->getPeer());
-if (rI18nHelper.MatchMnemonic(pWindow->GetText(), 
rKEvt.GetCharCode()))
+for (size_t a = 0; a < pCurPage->GetObjCount(); ++a)
 {
-pWindow->GrabFocus();
-bDone = true;
-break;
+SdrObject* pObj = pCurPage->GetObj(a);
+FmFormObj* pFormObject = FmFormObj::GetFormObject(pObj);
+if (!pFormObject)
+continue;
+
+Reference xControl = 
pFormObject->GetUnoControl(*this, *pWin);
+if (!xControl.is())
+continue;
+const vcl::I18nHelper& rI18nHelper = 
Application::GetSettings().GetUILocaleI18nHelper();
+VclPtr pWindow = 
VCLUnoHelper::GetWindow(xControl->getPeer());
+if (rI18nHelper.MatchMnemonic(pWindow->GetText(), 
rKEvt.GetCharCode()))
+{
+pWindow->GrabFocus();
+bDone = true;
+break;
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt (via logerrit)]

 sd/source/ui/view/drviews4.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 75f5fdbbe48a847874397d9d126f832dbdfada5a
Author: Samuel Mehrbrodt 
AuthorDate: Wed Apr 21 10:57:16 2021 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Wed Apr 21 13:23:58 2021 +0200

tdf#141703 Restore tab function in sd tables

Regression from 67ad205404211a2ae17c430a17ede6e9d04d0b7e

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

diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index ec3ec5d11d31..01d9d88ac24a 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -177,9 +177,9 @@ void DrawViewShell::DeleteActualLayer()
 
 bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, ::sd::Window* pWin)
 {
-bool bRet = GetView()->KeyInput(rKEvt, pWin);
+bool bRet = false;
 
-if (!bRet && (!IsInputLocked() || (rKEvt.GetKeyCode().GetCode() == 
KEY_ESCAPE)))
+if (!IsInputLocked() || (rKEvt.GetKeyCode().GetCode() == KEY_ESCAPE))
 {
 if(KEY_RETURN == rKEvt.GetKeyCode().GetCode()
 && rKEvt.GetKeyCode().IsMod1()
@@ -256,6 +256,9 @@ bool DrawViewShell::KeyInput (const KeyEvent& rKEvt, 
::sd::Window* pWin)
 }
 }
 
+if (!bRet)
+bRet = GetView()->KeyInput(rKEvt, pWin);
+
 return bRet;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt (via logerrit)]

 sc/source/core/data/table3.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d7ea2afea6ee70b675ed648857b7a3f2044827b9
Author: Samuel Mehrbrodt 
AuthorDate: Wed Apr 21 11:04:01 2021 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Wed Apr 21 13:23:42 2021 +0200

Fix indentation

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

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index e1df9cae6332..93cd3f9dd5b2 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -2418,7 +2418,7 @@ public:
 return std::pair(bOk, bTestEqual);
 }
 
-   std::pair compareByString(
+std::pair compareByString(
 const ScRefCellValue& rCell, SCROW nRow, const ScQueryEntry& rEntry, 
const ScQueryEntry::Item& rItem,
 const ScInterpreterContext* pContext)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: codemaker/source comphelper/source compilerplugins/clang extensions/source filter/source idlc/inc include/tools jvmfwk/source pyuno/source reportdesign/source sal/osl s

[Noel Grandin (via logerrit)]

 codemaker/source/cppumaker/cppuoptions.cxx   |   20 -
 codemaker/source/javamaker/javaoptions.cxx   |   12 ++---
 comphelper/source/misc/storagehelper.cxx |2 
 compilerplugins/clang/stringadd.cxx  |   15 +--
 compilerplugins/clang/test/stringadd.cxx |9 ++--
 extensions/source/update/check/updatecheckconfig.cxx |2 
 filter/source/msfilter/rtfutil.cxx   |2 
 idlc/inc/astsequence.hxx |2 
 include/tools/diagnose_ex.h  |8 +--
 jvmfwk/source/fwkbase.cxx|2 
 pyuno/source/module/pyuno_module.cxx |8 +--
 pyuno/source/module/pyuno_type.cxx   |2 
 reportdesign/source/core/misc/reportformula.cxx  |2 
 sal/osl/unx/file_misc.cxx|2 
 sal/osl/unx/pipe.cxx |4 -
 sal/qa/osl/file/osl_File.cxx |2 
 sc/qa/unit/subsequent_export-test.cxx|6 +-
 sc/qa/unit/ucalc_formula.cxx |6 +-
 sc/source/core/data/segmenttree.cxx  |4 -
 sc/source/filter/qpro/qproform.cxx   |2 
 sc/source/ui/vba/vbaeventshelper.cxx |8 +--
 sd/qa/unit/export-tests.cxx  |8 +--
 sdext/source/pdfimport/test/pdfunzip.cxx |4 -
 sfx2/source/control/msg.cxx  |2 
 sfx2/source/statbar/stbitem.cxx  |2 
 sfx2/source/view/lokhelper.cxx   |4 -
 shell/source/unix/exec/shellexec.cxx |2 
 svl/qa/unit/svl.cxx  |6 +-
 sw/qa/extras/globalfilter/globalfilter.cxx   |   39 +--
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx   |2 
 sw/qa/extras/uiwriter/uiwriter.cxx   |2 
 sw/qa/extras/uiwriter/uiwriter2.cxx  |4 -
 sw/qa/extras/ww8export/ww8export2.cxx|2 
 sw/qa/unit/swmodeltestbase.cxx   |4 -
 sw/source/core/crsr/bookmrk.cxx  |2 
 sw/source/core/fields/reffld.cxx |2 
 sw/source/filter/html/css1atr.cxx|2 
 sw/source/filter/html/htmlatr.cxx|4 -
 sw/source/filter/html/htmlforw.cxx   |8 +--
 sw/source/filter/html/htmlnumwriter.cxx  |2 
 sw/source/filter/html/wrthtml.cxx|5 --
 sw/source/uibase/wrtsh/wrtsh1.cxx|2 
 test/source/xmltesttools.cxx |   26 ++--
 unotest/source/cpp/macros_test.cxx   |2 
 vbahelper/source/vbahelper/vbacommandbarhelper.cxx   |2 
 vcl/qa/cppunit/complextext.cxx   |2 
 vcl/qt5/Qt5Instance.cxx  |4 -
 vcl/skia/salbmp.cxx  |8 +--
 vcl/unx/generic/fontmanager/fontconfig.cxx   |2 
 vcl/unx/generic/fontmanager/helper.cxx   |2 
 vcl/unx/generic/printer/printerinfomanager.cxx   |2 
 xmloff/source/text/txtfldi.cxx   |2 
 xmloff/source/text/txtvfldi.cxx  |4 -
 53 files changed, 146 insertions(+), 138 deletions(-)

New commits:
commit 7049328fb2d656d8454d4f704ad75d057e766c0b
Author: Noel Grandin 
AuthorDate: Tue Apr 20 21:07:42 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Apr 21 13:15:32 2021 +0200

loplugin:stringadd replace OUStringLiteral temporaries with OUString::Concat

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

diff --git a/codemaker/source/cppumaker/cppuoptions.cxx 
b/codemaker/source/cppumaker/cppuoptions.cxx
index 90f16fdd3332..43376278b285 100644
--- a/codemaker/source/cppumaker/cppuoptions.cxx
+++ b/codemaker/source/cppumaker/cppuoptions.cxx
@@ -76,7 +76,7 @@ bool CppuOptions::initOptions(int ac, char* av[], bool 
bCmdFile)
 OString tmp("'-O', please check");
 if (i <= ac - 1)
 {
-tmp += OStringLiteral(" your input '") + 
av[i+1] + "'";
+tmp += OString::Concat(" your input '") + 
av[i+1] + "'";
 }
 
 throw IllegalArgument(tmp);
@@ -92,7 +92,7 @@ bool CppuOptions::initOptions(int ac, char* av[], bool 
bCmdFile)
 case 'n':
 if (av[i][2] != 'D' || av[i][3] != '\0')
 {
-OString tmp = OStringLiteral("'-nD', please check your 
input '") + av[i] + "'";
+OString tmp = OString::Concat("'-nD', ple

Re: About tdf#138715 and future of Thunderbird address book support

[Alexander Thurgood]

Le 10/12/2020 à 10:38, Tor Lillqvist a écrit :
> My recommendation would be to just drop the Thunderbird address book
> driver without any replacement.
> 


I would be interested to know what replacement would be suggested instead ?


Currently, if I take macOS as my example, LO enters a crash/recovery
loop anytime any function execution in a macab connected ODB is
attempted (bug 126961).

ODBC connections are also broken (bug 138990).

Sure, macOS has built-in OS-provided sqlite3, but currently no way to
use it from within LO.

Currently, there is no way to create any sort of ODB file connecting to
one of the main addressbook formats (either native OS, or multi-OS) for
the macOS system.


Just my ha'penneth.

Alex


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

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

[Tor Lillqvist (via logerrit)]

 sfx2/source/doc/docfile.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a73011dfce4790d7648836b31ec7ec60b63fc7eb
Author: Tor Lillqvist 
AuthorDate: Tue Apr 20 10:07:19 2021 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Apr 21 13:02:34 2021 +0200

Avoid unused parameter warning in the HAVE_FEATURE_MACOSX_SANDBOX case

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

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 631c06bd0713..c4751dc52be9 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -3628,6 +3628,7 @@ OUString GetLogicBase(const INetURLObject& rURL, 
std::unique_ptr
 // In a sandboxed environment we don't want to attempt to create temporary 
files in the same
 // directory where the user has selected an output file to be stored. The 
sandboxed process has
 // permission only to create the specifically named output file in that 
directory.
+(void) rURL;
 (void) pImpl;
 #else
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 starmath/uiconfig/smath/ui/editwindow.ui |5 -
 1 file changed, 5 deletions(-)

New commits:
commit a003e4ff69263c7feb8e97e3291e5579fbd181ac
Author: Caolán McNamara 
AuthorDate: Wed Apr 21 10:00:32 2021 +0100
Commit: Caolán McNamara 
CommitDate: Wed Apr 21 12:36:38 2021 +0200

c-n-p of a different widgets accessibility description

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

diff --git a/starmath/uiconfig/smath/ui/editwindow.ui 
b/starmath/uiconfig/smath/ui/editwindow.ui
index ca7794fa3257..0907ff20cb2c 100644
--- a/starmath/uiconfig/smath/ui/editwindow.ui
+++ b/starmath/uiconfig/smath/ui/editwindow.ui
@@ -25,11 +25,6 @@
 True
 True
 GDK_BUTTON_MOTION_MASK | 
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | 
GDK_KEY_RELEASE_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK
-
-  
-Enter the text to 
be displayed at the left side of the header or footer.
-  
-
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sw/CppunitTest_sw_uibase_fldui.mk |   74 
 sw/Module_sw.mk   |1 
 sw/qa/uibase/fldui/fldui.cxx  |   98 ++
 sw/source/uibase/fldui/fldmgr.cxx |   33 
 4 files changed, 206 insertions(+)

New commits:
commit adea8835d417379447cb8de6f30e959808b8db91
Author: Miklos Vajna 
AuthorDate: Wed Apr 21 10:51:05 2021 +0200
Commit: Miklos Vajna 
CommitDate: Wed Apr 21 12:00:47 2021 +0200

sw bibliography, refer to a page: edit the page number of individual entries

Usually it's handy that editing a bibliography entry field updates all
other fields referring to the same source. But avoid doing this in case
only the page number changes, that's typically specific to that field.

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

diff --git a/sw/CppunitTest_sw_uibase_fldui.mk 
b/sw/CppunitTest_sw_uibase_fldui.mk
new file mode 100644
index ..613161a21be4
--- /dev/null
+++ b/sw/CppunitTest_sw_uibase_fldui.mk
@@ -0,0 +1,74 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_uibase_fldui))
+
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_uibase_fldui))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_uibase_fldui, \
+sw/qa/uibase/fldui/fldui \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_uibase_fldui, \
+comphelper \
+cppu \
+cppuhelper \
+sal \
+sfx \
+svxcore \
+sw \
+swqahelper \
+test \
+unotest \
+utl \
+vcl \
+svt \
+tl \
+svl \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_uibase_fldui,\
+boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_uibase_fldui,\
+-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/core/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
+-I$(SRCDIR)/sw/qa/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_uibase_fldui,\
+udkapi \
+offapi \
+oovbaapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_uibase_fldui))
+$(eval $(call gb_CppunitTest_use_vcl,sw_uibase_fldui))
+
+$(eval $(call gb_CppunitTest_use_rdb,sw_uibase_fldui,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,sw_uibase_fldui,\
+officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,sw_uibase_fldui))
+
+$(eval $(call gb_CppunitTest_use_uiconfigs,sw_uibase_fldui, \
+modules/swriter \
+))
+
+$(eval $(call gb_CppunitTest_use_more_fonts,sw_uibase_fldui))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 07a79c3ad951..793ed739daa4 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -131,6 +131,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 CppunitTest_sw_core_undo \
 CppunitTest_sw_uibase_uiview \
 CppunitTest_sw_core_draw \
+CppunitTest_sw_uibase_fldui \
 ))
 
 ifneq ($(DISABLE_GUI),TRUE)
diff --git a/sw/qa/uibase/fldui/fldui.cxx b/sw/qa/uibase/fldui/fldui.cxx
new file mode 100644
index ..b3785f5ee072
--- /dev/null
+++ b/sw/qa/uibase/fldui/fldui.cxx
@@ -0,0 +1,98 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include 
+
+#include 
+#include 
+
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+
+using namespace com::sun::star;
+
+namespace
+{
+/// Covers sw/source/uibase/fldui/ fixes.
+class Test : public SwModelTestBase
+{
+};
+
+CPPUNIT_TEST_FIXTURE(Test, testBiblioPageNumberUpdate)
+{
+// Given a document with 2 biblio fields, same properties, but different 
page number in the URL:
+SwDoc* pDoc = createSwDoc();
+uno::Reference xFactory(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xField(
+xFactory->createInstance("com.sun.star.text.TextField.Bibliography"), 
uno::UNO_QUERY);
+uno::Sequence aFields = {
+comphelper::makePropertyValue("BibiliographicType", 
text::BibliographyDataType::WWW),
+comphelper::makePropertyValue("Identifier", OUString("AT")),
+comphelper::makePropertyValue("Author", OUString("Author")),
+comphelper::makePropertyValue("Title

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - include/oox oox/CppunitTest_oox_export.mk oox/Module_oox.mk oox/qa oox/source sw/qa

[Miklos Vajna (via logerrit)]

 include/oox/export/drawingml.hxx |2 
 oox/CppunitTest_oox_export.mk|   46 +++
 oox/Module_oox.mk|1 
 oox/qa/unit/data/dml-groupshape-polygon.docx |binary
 oox/qa/unit/export.cxx   |  157 +++
 oox/source/export/drawingml.cxx  |   29 +++-
 oox/source/export/shapes.cxx |8 -
 sw/qa/extras/ooxmlexport/ooxmlexport6.cxx|4 
 8 files changed, 235 insertions(+), 12 deletions(-)

New commits:
commit 7b3ea547bddd08e483c49ed5b3ff822f782a0aae
Author: Miklos Vajna 
AuthorDate: Mon Apr 19 20:27:32 2021 +0200
Commit: Michael Stahl 
CommitDate: Wed Apr 21 11:58:37 2021 +0200

tdf#122962 DOCX drawingML export: fix polygon shape in group shape

Regression from commit cfb5b20cdc230320ff9f864d1cfd81aaea221da0
(DocxAttributeOutput::OutputFlyFrame_Impl: enable DML export by default,
2013-12-18), there were two problems here.

First,  and  was not written for docx group shapes.
This can be done for toplevel shapes just by writing what would be the
shape position and size (but for docx, we don't write the size).

Second, (poly)polygon shapes used the bounding rectangle of their points
as size, which doesn't necessarily match the shape size. Given that the
group shape is meant to simply contain its children in LibreOffice (and
not have an own size), switch to using the UNO API for polygon shapes as
well, that way the two sizes will always match.

Change-Id: I4406ddefe5f6105aa2fc74d805359add452936bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114305
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit 4cb71fefc61d9015a0142f3a4fdafc5250913f2c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114279
Reviewed-by: Michael Stahl 

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 0a42eb84f001..00049fd94103 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -250,7 +250,7 @@ public:
 
 void WriteShapeTransformation(const css::uno::Reference< 
css::drawing::XShape >& rXShape,
   sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = 
false, bool bSuppressRotation = false, bool bSuppressFlipping = false, bool 
bFlippedBeforeRotation = false);
-void WriteTransformation(const tools::Rectangle& rRectangle,
+void WriteTransformation(const css::uno::Reference< css::drawing::XShape 
>& xShape, const tools::Rectangle& rRectangle,
   sal_Int32 nXmlNamespace, bool bFlipH = false, bool bFlipV = 
false, sal_Int32 nRotation = 0, bool bIsGroupShape = false);
 
 void WriteText( const css::uno::Reference< css::uno::XInterface >& 
rXIface, bool bBodyPr, bool bText = true, sal_Int32 nXmlNamespace = 0);
diff --git a/oox/CppunitTest_oox_export.mk b/oox/CppunitTest_oox_export.mk
new file mode 100644
index ..011ce3d2a5de
--- /dev/null
+++ b/oox/CppunitTest_oox_export.mk
@@ -0,0 +1,46 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,oox_export))
+
+$(eval $(call gb_CppunitTest_use_externals,oox_export,\
+   boost_headers \
+   libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,oox_export, \
+oox/qa/unit/export \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,oox_export, \
+comphelper \
+cppu \
+oox \
+sal \
+test \
+unotest \
+utl \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,oox_export))
+
+$(eval $(call gb_CppunitTest_use_ure,oox_export))
+$(eval $(call gb_CppunitTest_use_vcl,oox_export))
+
+$(eval $(call gb_CppunitTest_use_rdb,oox_export,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,oox_export,\
+   officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,oox_export))
+
+# vim: set noet sw=4 ts=4:
diff --git a/oox/Module_oox.mk b/oox/Module_oox.mk
index ed85ee68da2d..75ef85051f85 100644
--- a/oox/Module_oox.mk
+++ b/oox/Module_oox.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Module_add_check_targets,oox,\
CppunitTest_oox_drawingml \
CppunitTest_oox_vml \
CppunitTest_oox_shape \
+   CppunitTest_oox_export \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/oox/qa/unit/data/dml-groupshape-polygon.docx 
b/oox/qa/unit/data/dml-groupshape-polygon.docx
new file mode 100644
index ..6d20b0342f68
Binary files /dev/null and b/oox/qa/unit/data/dml-groupshape

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkinst.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 054d0f8f5e6791d03081be7be19abeaad8aab918
Author: Caolán McNamara 
AuthorDate: Tue Apr 20 14:01:17 2021 +0100
Commit: Michael Stahl 
CommitDate: Wed Apr 21 11:41:52 2021 +0200

setting vertical when horizontal wanted

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 773b20ac5b07..3d1936b7dd8e 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -5879,7 +5879,7 @@ public:
 {
 GtkPolicyType eGtkVPolicy;
 gtk_scrolled_window_get_policy(m_pScrolledWindow, nullptr, 
&eGtkVPolicy);
-gtk_scrolled_window_set_policy(m_pScrolledWindow, eGtkVPolicy, 
VclToGtk(eHPolicy));
+gtk_scrolled_window_set_policy(m_pScrolledWindow, VclToGtk(eHPolicy), 
eGtkVPolicy);
 }
 
 virtual VclPolicyType get_hpolicy() const override
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mark Hung (via logerrit)]

 include/svx/sdrundomanager.hxx   |2 ++
 svx/source/svdraw/sdrundomanager.cxx |3 +++
 svx/source/svdraw/svdedxv.cxx|3 ++-
 3 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 016a83306f6744892038b1bd9e6a6817e6a8c087
Author: Mark Hung 
AuthorDate: Wed Apr 14 22:30:06 2021 +0800
Commit: Michael Stahl 
CommitDate: Wed Apr 21 11:41:03 2021 +0200

tdf#131634 Don't redo actions created before text edit begins.

In SdrObjEditView::SdrEndTextEdit(), pSdrUndoManager->Redo() was
invoked until all the redo actions created after text edit began
were converted to undo actions.

Without checking, all the redo actions include the ones created
before text edit began were moved to undo stack, and caused the
SdrTextObj to be destroyed in SdrUndoManager::SetEndTextEditHdl
when removing the undo actions and a use after release problem.

The patch add GetRedoActionCountBeforeTextEdit() so the program
won't invoke pSdrUndoManager->Redo() on actions created before
text edit begin.

Change-Id: Ic010bc6e71ee78ef2cb20a5259dc9d6d6579ccaa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114102
Tested-by: Jenkins
Reviewed-by: Mark Hung 
(cherry picked from commit 7a641c71f8191e83bb6c408d3ff51a58d7dd4af9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114360
Reviewed-by: Caolán McNamara 
Reviewed-by: Michael Stahl 

diff --git a/include/svx/sdrundomanager.hxx b/include/svx/sdrundomanager.hxx
index 12fa1c7b3852..9ff23e441c54 100644
--- a/include/svx/sdrundomanager.hxx
+++ b/include/svx/sdrundomanager.hxx
@@ -33,6 +33,7 @@ private:
 
 Link maEndTextEditHdl;
 SfxUndoAction* mpLastUndoActionBeforeTextEdit;
+size_t mnRedoActionCountBeforeTextEdit;
 bool mbEndTextEditTriggeredFromUndo;
 
 SfxObjectShell* m_pDocSh;
@@ -64,6 +65,7 @@ public:
 // by a last undo during text edit
 bool isEndTextEditTriggeredFromUndo() const { return 
mbEndTextEditTriggeredFromUndo; }
 void SetDocShell(SfxObjectShell* pDocShell);
+size_t GetRedoActionCountBeforeTextEdit() const { return 
mnRedoActionCountBeforeTextEdit; }
 };
 
 #endif // INCLUDED_SVX_SDRUNDOMANAGER_HXX
diff --git a/svx/source/svdraw/sdrundomanager.cxx 
b/svx/source/svdraw/sdrundomanager.cxx
index 1e64a1a89482..8b1f19fbecfa 100644
--- a/svx/source/svdraw/sdrundomanager.cxx
+++ b/svx/source/svdraw/sdrundomanager.cxx
@@ -25,6 +25,7 @@ SdrUndoManager::SdrUndoManager()
 : EditUndoManager(20 /*nMaxUndoActionCount*/)
 , maEndTextEditHdl()
 , mpLastUndoActionBeforeTextEdit(nullptr)
+, mnRedoActionCountBeforeTextEdit(0)
 , mbEndTextEditTriggeredFromUndo(false)
 , m_pDocSh(nullptr)
 {
@@ -107,6 +108,7 @@ void SdrUndoManager::SetEndTextEditHdl(const 
Link& rLink)
 {
 // text edit start, remember last non-textedit action for later cleanup
 mpLastUndoActionBeforeTextEdit = GetUndoActionCount() ? 
GetUndoAction() : nullptr;
+mnRedoActionCountBeforeTextEdit = GetRedoActionCount();
 }
 else
 {
@@ -123,6 +125,7 @@ void SdrUndoManager::SetEndTextEditHdl(const 
Link& rLink)
 
 // forget marker again
 mpLastUndoActionBeforeTextEdit = nullptr;
+mnRedoActionCountBeforeTextEdit = 0;
 }
 }
 
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 8220b4c59b03..736d31b7aac5 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1438,7 +1438,8 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool 
bDontDeleteReally)
 // to create a complete text change undo action for the 
redo buffer. Also mark this
 // state when at least one redo was executed; the created 
extra TextChange needs to
 // be undone in addition to the first real undo outside 
the text edit changes
-while (pSdrUndoManager->GetRedoActionCount())
+while (pSdrUndoManager->GetRedoActionCount()
+   > 
pSdrUndoManager->GetRedoActionCountBeforeTextEdit())
 {
 bNeedToUndoSavedRedoTextEdit = true;
 pSdrUndoManager->Redo();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: About building on Apple Silicon M1

[Alexander Thurgood]

Le 16/04/2021 à 08:42, Stephan Bergmann a écrit :

> Apart from that, things just work (thanks to Tor, mostly).
> 

How about Firebird support ? Does that build / is it functional yet ?


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

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - external/python3

[Tor Lillqvist (via logerrit)]

 external/python3/ExternalProject_python3.mk |   28 +---
 1 file changed, 13 insertions(+), 15 deletions(-)

New commits:
commit d98f0bee1376b8002bbf5e3a96ab6e16ced1d880
Author: Tor Lillqvist 
AuthorDate: Tue Apr 20 20:55:11 2021 +0300
Commit: Tor Lillqvist 
CommitDate: Wed Apr 21 11:22:02 2021 +0200

Python .so files names have changed on macOS at least for some reason

There is no longer any "m" in the name suffix. Adapt the names of the
ones we want to remove for macOS.

The idlelib and tkinter dylibs are no longer there at all.

Don't use the -f flag to the rm commands. Thus we will notice the next
time something we want to remove isn't actually there or has been
renamed. But sadly for some unknown reason we do need to use a *
wildcard in the .so names.

Fixes a problem caught by App Store review where the Python curses
module had not been removed as it should have been. (It uses
non-public APIs and can thus not be included.)

Change-Id: I51b9728cc9ca0a962908d3994e3a0ff8e4fa7f60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114372
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114376
Reviewed-by: Christian Lohmaier 

diff --git a/external/python3/ExternalProject_python3.mk 
b/external/python3/ExternalProject_python3.mk
index 5bb20c67c867..2e48294ab603 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -187,22 +187,20 @@ $(call 
gb_ExternalProject_get_state_target,python3,executables) : $(call gb_Exte
 
 $(call gb_ExternalProject_get_state_target,python3,removeunnecessarystuff) : 
$(call gb_ExternalProject_get_state_target,python3,build)
$(call gb_Output_announce,python3 - remove the stuff we don't need to 
ship,build,CUS,5)
-   rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/dbm
-   rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/sqlite3
-   rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/curses
-   rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/idlelib
-   rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/tkinter
-   rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/turtledemo
-   rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/test
-   rm -rf 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/venv
+   rm -r 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/dbm
+   rm -r 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/sqlite3
+   rm -r 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/curses
+   rm -r 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/idlelib
+   rm -r 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/tkinter
+   rm -r 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/turtledemo
+   rm -r 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/test
+   rm -r 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/venv
# Then the binary libraries
-   rm -f 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload/_dbm.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so
-   rm -f 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib-dynload/_sqlite3.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so
-   rm -f 
$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MA

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

[Xisco Fauli (via logerrit)]

 svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx|6 -
 svx/source/sdr/contact/viewcontactofsdrole2obj.cxx |   76 ++---
 svx/source/unodraw/unoshape.cxx|   10 --
 3 files changed, 25 insertions(+), 67 deletions(-)

New commits:
commit 99679f4dbfae6eb51a9a76b1cebd87e3d38b0c9c
Author: Xisco Fauli 
AuthorDate: Mon Apr 19 21:37:53 2021 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Wed Apr 21 11:06:04 2021 +0200

tdf#86321: Revert "Resolves: #i123539# some optimizations for 3D chart..."

This reverts commit db1d2af02861b49e4f53d726d59cd71c20cee9b1

The commit was already partically reverted in
bca8d8985666d3fd22b91eb280f9baaeb933c2d0 < Resolves: tdf#90583
3D pie-chart missing guide handles >.
This partial revert broke the optimization introduced in
db1d2af02861b49e4f53d726d59cd71c20cee9b1  for 3D charts like
https://bz.apache.org/ooo/attachment.cgi?id=81810

Later, 3D charts were optimized again in
55a7e836a2db662a53adc4f8b98d08b06790c758 < chart2: When
creating objects prevent setting object rects dirty > so
the remaining code originally introduced can go.

Import time of https://bz.apache.org/ooo/attachment.cgi?id=81810
is the same with and without this patch

Change-Id: I25338d0dfb4b41651dfe05e7bfbd74c86091dacb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114313
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit eec03e848cb6874ce6d64dc0b8f45dbaf52e6c2b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114277
Reviewed-by: Adolfo Jayme Barrientos 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114325

diff --git a/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx 
b/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx
index 7a79e3ee4f12..cd12229f2b40 100644
--- a/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx
+++ b/svx/inc/sdr/contact/viewcontactofsdrole2obj.hxx
@@ -31,9 +31,6 @@ namespace sdr::contact {
 class ViewContactOfSdrOle2Obj final : public ViewContactOfSdrRectObj
 {
 private:
-// #i123539# allow local buffering of chart data (if chart)
-drawinglayer::primitive2d::Primitive2DReference mxChartContent;
-
 // Create an Object-Specific ViewObjectContact, set ViewContact and
 // ObjectContact. Always needs to return something.
 virtual ViewObjectContact& 
CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) override;
@@ -58,9 +55,6 @@ public:
 // from the VOC which knows that
 drawinglayer::primitive2d::Primitive2DContainer 
createPrimitive2DSequenceWithParameters() const;
 
-// #i123539# get rid of buffered chart content (if there) on change
-virtual void ActionChanged() override;
-
 virtual basegfx::B2DRange getRange( const 
drawinglayer::geometry::ViewInformation2D& rViewInfo2D ) const override;
 
 private:
diff --git a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx 
b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
index 57077e7b30eb..6c9662a957f9 100644
--- a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
@@ -45,8 +45,7 @@ ViewObjectContact& 
ViewContactOfSdrOle2Obj::CreateObjectSpecificViewObjectContac
 }
 
 ViewContactOfSdrOle2Obj::ViewContactOfSdrOle2Obj(SdrOle2Obj& rOle2Obj)
-:   ViewContactOfSdrRectObj(rOle2Obj),
-mxChartContent()
+:   ViewContactOfSdrRectObj(rOle2Obj)
 {
 }
 
@@ -90,45 +89,30 @@ drawinglayer::primitive2d::Primitive2DContainer 
ViewContactOfSdrOle2Obj::createP
 
 if(GetOle2Obj().IsChart())
 {
-// #i123539# allow buffering and reuse of local chart data to not need 
to rebuild it
-// on every ViewObjectContact::getPrimitive2DSequence call. : Not 
needed for
-// aw080, there this mechanism already works differently
-if(mxChartContent.is())
+// try to get chart primitives and chart range directly from 
xChartModel
+basegfx::B2DRange aChartContentRange;
+const drawinglayer::primitive2d::Primitive2DContainer aChartSequence(
+ChartHelper::tryToGetChartContentAsPrimitive2DSequence(
+GetOle2Obj().getXModel(),
+aChartContentRange));
+const double fWidth(aChartContentRange.getWidth());
+const double fHeight(aChartContentRange.getHeight());
+
+if(!aChartSequence.empty()
+&& basegfx::fTools::more(fWidth, 0.0)
+&& basegfx::fTools::more(fHeight, 0.0))
 {
-xContent = mxChartContent;
-}
-else
-{
-// try to get chart primitives and chart range directly from 
xChartModel
-basegfx::B2DRange aChartContentRange;
-const drawinglayer::primitive2d::Primitive2DContainer 
aChartSequence(
-ChartHelper::tryToGetChartContentAsPrimitive2DSequence(
-GetOle2Obj().getXModel(),
-   

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

[Dennis Francis (via logerrit)]

 sc/source/ui/view/viewdata.cxx |   23 +++
 1 file changed, 19 insertions(+), 4 deletions(-)

New commits:
commit b82f39f29a9ceeacb06ae9d1571665327d3e3019
Author: Dennis Francis 
AuthorDate: Wed Apr 14 13:26:26 2021 +0530
Commit: Michael Meeks 
CommitDate: Wed Apr 21 10:28:45 2021 +0200

lok: fix incomplete/wrong tiles after zoom change and sheet switch

Fix:
Reset position cache for all sheets on zoom change.

Change-Id: I58264d4674d2cb736c702096ffd52faffb603ec6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114227
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 
(cherry picked from commit fe52c79323f9ac4b5ea61e7d7e5f038552e9a247)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114363
Tested-by: Jenkins

diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 980e887c16e2..015083828bb1 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -3144,10 +3144,25 @@ void ScViewData::CalcPPT()
 }
 }
 
-if (nPPTX != nOldPPTX)
-GetLOKWidthHelper().invalidateByPosition(0L);
-if (nPPTY != nOldPPTY)
-GetLOKHeightHelper().invalidateByPosition(0L);
+if (comphelper::LibreOfficeKit::isActive())
+{
+SCTAB nTabCount = maTabData.size();
+bool bResetWidths = (nPPTX != nOldPPTX);
+bool bResetHeights = (nPPTY != nOldPPTY);
+for (SCTAB nTabIdx = 0; nTabIdx < nTabCount; ++nTabIdx)
+{
+if (!maTabData[nTabIdx])
+continue;
+
+if (bResetWidths)
+if (auto* pWHelper = GetLOKWidthHelper(nTabIdx))
+pWHelper->invalidateByPosition(0L);
+
+if (bResetHeights)
+if (auto* pHHelper = GetLOKHeightHelper(nTabIdx))
+pHHelper->invalidateByPosition(0L);
+}
+}
 }
 
 #define SC_OLD_TABSEP   '/'
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: starmath/inc starmath/Library_sm.mk starmath/source

[dante (via logerrit)]

 starmath/Library_sm.mk   |3 
 starmath/inc/mathml/attribute.hxx|  190 ++
 starmath/inc/mathml/def.hxx  |  333 +
 starmath/inc/mathml/element.hxx  |  236 ++
 starmath/source/mathml/attribute.cxx |  450 +++
 starmath/source/mathml/def.cxx   |  132 ++
 starmath/source/mathml/element.cxx   |  134 ++
 7 files changed, 1478 insertions(+)

New commits:
commit 565bbd2e46e57117eb401344689858c3d749dc5c
Author: dante 
AuthorDate: Tue Mar 16 20:21:51 2021 +0100
Commit: Noel Grandin 
CommitDate: Wed Apr 21 10:25:26 2021 +0200

Add mathml structures

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

diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 89f9f34c59bf..2e3cc035ec5f 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -103,6 +103,9 @@ $(eval $(call gb_Library_add_exception_objects,sm,\
 starmath/source/mathml/mathmlexport \
 starmath/source/mathml/mathmlimport \
 starmath/source/mathml/mathmlMo \
+starmath/source/mathml/attribute \
+starmath/source/mathml/element \
+starmath/source/mathml/def \
 starmath/source/mathml/starmathdatabase \
 ))
 
diff --git a/starmath/inc/mathml/attribute.hxx 
b/starmath/inc/mathml/attribute.hxx
new file mode 100644
index ..c30053c9d037
--- /dev/null
+++ b/starmath/inc/mathml/attribute.hxx
@@ -0,0 +1,190 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include "def.hxx"
+
+/* All possible data needed to do the job outside mathml limits */
+// Ml prefix means it is part of mathml standar
+// NMl means it is not part of mathml standar but needed info to work
+
+/* Union for storing the mathml attribute value */
+/*/
+
+union SmMlAttributeValue {
+SmMlAttributeValue(){};
+
+struct SmMlAccent m_aAccent;
+struct SmMlDir m_aDir;
+struct SmMlDisplaystyle m_aDisplaystyle;
+struct SmMlFence m_aFence;
+struct SmMlHref m_aHref;
+struct SmMlLspace m_aLspace;
+struct SmMlMathbackground m_aMathbackground;
+struct SmMlMathcolor m_aMathcolor;
+struct SmMlMathsize m_aMathsize;
+struct SmMlMathvariant m_aMathvariant;
+struct SmMlMaxsize m_aMaxsize;
+struct SmMlMinsize m_aMinsize;
+struct SmMlMovablelimits m_aMovablelimits;
+struct SmMlRspace m_aRspace;
+struct SmMlSeparator m_aSeparator;
+struct SmMlStretchy m_aStretchy;
+struct SmMlSymmetric m_aSymmetric;
+};
+
+/* Class managing the attribute value */
+/*/
+
+class SmMlAttribute
+{
+private:
+SmMlAttributeValueType m_aSmMlAttributeValueType;
+SmMlAttributeValue m_aAttributeValue;
+
+private:
+void clearPreviousAttributeValue();
+void setDefaultAttributeValue();
+void setAttributeValue(const SmMlAttribute* aMlAttribute);
+
+public:
+SmMlAttribute() { m_aSmMlAttributeValueType = 
SmMlAttributeValueType::NMlEmpty; };
+
+virtual ~SmMlAttribute() { clearPreviousAttributeValue(); };
+
+SmMlAttribute(SmMlAttributeValueType)
+{
+m_aSmMlAttributeValueType = SmMlAttributeValueType::NMlEmpty;
+setDefaultAttributeValue();
+};
+
+SmMlAttribute(const SmMlAttribute& aMlAttribute)
+{
+m_aSmMlAttributeValueType = SmMlAttributeValueType::NMlEmpty;
+setAttributeValue(&aMlAttribute);
+}
+
+SmMlAttribute(const SmMlAttribute* aMlAttribute)
+{
+m_aSmMlAttributeValueType = SmMlAttributeValueType::NMlEmpty;
+setAttributeValue(aMlAttribute);
+}
+
+public:
+/**
+  * Returns the type of attribute we are dealing with.
+  * Attribute Value Type
+  */
+SmMlAttributeValueType getMlAttributeValueType() const { return 
m_aSmMlAttributeValueType; };

[Libreoffice-commits] core.git: Changes to 'private/tml/lov-7.1.2'

[Tor Lillqvist (via logerrit)]

New branch 'private/tml/lov-7.1.2' available with the following commits:
commit a393d9064b7eb849da7f488ab43f56a404be32ae
Author: Tor Lillqvist 
Date:   Tue Apr 20 20:55:11 2021 +0300

Python .so files names have changed on macOS at least for some reason

There is no longer any "m" in the name suffix. Adapt the names of the
ones we want to remove for macOS.

The idlelib and tkinter dylibs are no longer there at all.

Don't use the -f flag to the rm commands. Thus we will notice the next
time something we want to remove isn't actually there or has been
renamed. But sadly for some unknown reason we do need to use a *
wildcard in the .so names.

Fixes a problem caught by App Store review where the Python curses
module had not been removed as it should have been. (It uses
non-public APIs and can thus not be included.)

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

commit c55e29f944d25693c5818917a21909d1d816a570
Author: Tor Lillqvist 
Date:   Tue Apr 20 10:07:19 2021 +0300

Avoid unused parameter warning in the HAVE_FEATURE_MACOSX_SANDBOX case

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

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