[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - svx/source
Noel Grandin
noel.grandin at collabora.co.uk
Wed Jul 26 06:30:45 UTC 2017
svx/source/unodraw/unoshap2.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c694ce3e0b3a6832ed36b3ca683d18d740310bbd
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Jul 25 15:57:04 2017 +0200
tdf#109242 fix save/load of form button alignment
Regression introduced by commit
dcffc21805828ddff7de1282f3d40ffdf3fac38d
"use actual UNO enums in svx"
Change-Id: Ie3bb025fa0ef52d2e746e4556cf29dbd3c3d55a9
Reviewed-on: https://gerrit.libreoffice.org/40416
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
(cherry picked from commit a4bab9609b04cb644859cf548bb4739a9d5aa590)
Reviewed-on: https://gerrit.libreoffice.org/40432
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 48c0158b8fb9..fa6b6f0eef09 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -687,7 +687,7 @@ namespace
for ( auto const & rEntry : aMapAdjustToAlign )
if ( nValue == rEntry.nFormValue )
{
- _rValue <<= rEntry.nAPIValue;
+ _rValue <<= (sal_uInt16)rEntry.nAPIValue;
return;
}
}
More information about the Libreoffice-commits
mailing list