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

[Tomaž Vajngerl (via logerrit)]

 slideshow/source/engine/shapes/drawshape.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f73da4f9c2ecbd3d79923db9bdbd15501d12696f
Author:     Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Tue Sep 5 11:10:45 2023 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Sep 6 14:41:03 2023 +0200

    tdf#154138 C/P regression - used setWidth instead of setHeight
    
    Change-Id: I2433b4d32e939cadf499b61dfa9033125eaa3c76
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156540
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    (cherry picked from commit 1c08f20af9034e4995932fa7f3d71dcdd9989355)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156542
    Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
    Reviewed-by: Hossein <hoss...@libreoffice.org>
    Tested-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() ) );
                         }