cui/source/tabpages/tparea.cxx | 7 ++-----
sc/inc/kahan.hxx | 11 +++++++++++
slideshow/source/engine/shapes/drawshape.cxx | 2 +-
3 files changed, 14 insertions(+), 6 deletions(-)
New commits:
commit edb6b8d715f603af544495df06bb6011d299bbf3
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Thu Sep 7 16:34:53 2023 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Sep 12 09:27:58 2023 +0200
tdf#157138: Can't switch from Use Background to None area fill
Revert partly tdf#151260 fix
Change-Id: I4c052e2cd1cb41dc8bda4b388b46e4416e351434
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156669
(cherry picked from commit b69e14038288387b5f288a06821fb5df66dcf94e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156733
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
(cherry picked from commit 7ccaecd33a30905e3929d43c8164b16bbb101b73)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156741
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index bbdb9733a02f..119d6d154076 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -238,11 +238,8 @@ DeactivateRC SvxAreaTabPage::DeactivatePage( SfxItemSet*
_pSet )
{
XFillStyleItem aStyleItem( drawing::FillStyle_NONE );
_pSet->Put( aStyleItem );
- if (_pSet->HasItem(XATTR_FILLUSESLIDEBACKGROUND))
- {
- XFillUseSlideBackgroundItem aFillBgItem( false );
- _pSet->Put( aFillBgItem );
- }
+ XFillUseSlideBackgroundItem aFillBgItem( false );
+ _pSet->Put( aFillBgItem );
}
break;
}
commit 655a97dd4c16c64340ddb0c3f7cf682f28f45e33
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Tue Sep 5 11:10:45 2023 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Sep 12 09:27:54 2023 +0200
tdf#154138 C/P regression - used setWidth instead of setHeight
Change-Id: I2433b4d32e939cadf499b61dfa9033125eaa3c76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156541
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/slideshow/source/engine/shapes/drawshape.cxx
b/slideshow/source/engine/shapes/drawshape.cxx
index 8993c8edbe77..cdda31da8a66 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -775,7 +775,7 @@ namespace slideshow::internal
aAABorder.setWidth( ::std::max(
rShapeBorder.getWidth(),
aAABorder.getWidth() ) );
- aAABorder.setWidth( ::std::max(
+ aAABorder.setHeight( ::std::max(
rShapeBorder.getHeight(),
aAABorder.getHeight() ) );
}
commit e2397a57ca66a06950a669a3971fbc55b8f5f979
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Fri Sep 1 15:20:28 2023 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Sep 12 09:27:49 2023 +0200
Resolves: tdf#156985 Treat adding two KahanSum differently
When summing mixed formula cells and numeric cells, cell type runs are
summed using KahanSum that when switching cell types are added. Using
add() to explicitly add the rhs m_fError compensation value separately
may had lead to effectively cancelling out the relation of sum and
error, living on with an unrelated error value. Instead, add a "final"
rhs sum+compensation.
Change-Id: I751d3e0eeef9cd80482895c24f05b1ab667c3020
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156253
Tested-by: Jenkins
Reviewed-by: Eike Rathke <er...@redhat.com>
(cherry picked from commit 1f8cc7644293e62ad6430bbeec243d3283e478d7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156432
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sc/inc/kahan.hxx b/sc/inc/kahan.hxx
index 6c84f6eeef2e..ac97ae4394fa 100644
--- a/sc/inc/kahan.hxx
+++ b/sc/inc/kahan.hxx
@@ -71,8 +71,15 @@ public:
*/
inline void add(const KahanSum& fSum)
{
+#ifdef _WIN32
+ // For some odd unknown reason WIN32 fails badly with the
+ // sum+compensation value. Continue keeping the old though slightly off
+ // (see tdf#156985) explicit addition of the compensation value.
add(fSum.m_fSum);
add(fSum.m_fError);
+#else
+ add(fSum.m_fSum + fSum.m_fError);
+#endif
add(fSum.m_fMem);
}
@@ -82,8 +89,12 @@ public:
*/
inline void subtract(const KahanSum& fSum)
{
+#ifdef _WIN32
add(-fSum.m_fSum);
add(-fSum.m_fError);
+#else
+ add(-(fSum.m_fSum + fSum.m_fError));
+#endif
add(-fSum.m_fMem);
}
