filter/source/msfilter/msdffimp.cxx | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
New commits:
commit 5a050e8f0ae5704df6baac4c1b2ca949ddb17ea4
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed May 27 09:29:55 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed May 27 11:49:40 2020 +0200
ofz#22588 Invalid-enum-value
Change-Id: Id632537856086490c3231879a81692e80edad4c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94934
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index dc3ddb76b5c7..8f8e5d015728 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -786,9 +786,8 @@ void SvxMSDffManager::SolveSolver( const
SvxMSDffSolverContainer& rSolver )
}
}
-
-static basegfx::B2DPolyPolygon GetLineArrow( const sal_Int32 nLineWidth, const
MSO_LineEnd eLineEnd,
- const MSO_LineEndWidth eLineWidth, const MSO_LineEndLength eLineLength,
+static basegfx::B2DPolyPolygon GetLineArrow( const sal_Int32 nLineWidth, const
sal_uInt32 eLineEnd,
+ const sal_uInt32 eLineWidth, const sal_uInt32 eLineLength,
sal_Int32& rnArrowWidth, bool& rbArrowCenter,
OUString& rsArrowName, bool bScaleArrow )
{
@@ -1087,9 +1086,9 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet&
rSet, const MSO_SPT eSh
if ( IsProperty( DFF_Prop_lineEndArrowhead ) )
{
- MSO_LineEnd eLineEnd =
static_cast<MSO_LineEnd>(GetPropertyValue( DFF_Prop_lineEndArrowhead, 0 ));
- MSO_LineEndWidth eWidth =
static_cast<MSO_LineEndWidth>(GetPropertyValue( DFF_Prop_lineEndArrowWidth,
mso_lineMediumWidthArrow ));
- MSO_LineEndLength eLength =
static_cast<MSO_LineEndLength>(GetPropertyValue( DFF_Prop_lineEndArrowLength,
mso_lineMediumLenArrow ));
+ auto eLineEnd = GetPropertyValue(DFF_Prop_lineEndArrowhead, 0);
+ auto eWidth = GetPropertyValue(DFF_Prop_lineEndArrowWidth,
mso_lineMediumWidthArrow);
+ auto eLength = GetPropertyValue(DFF_Prop_lineEndArrowLength,
mso_lineMediumLenArrow);
sal_Int32 nArrowWidth;
bool bArrowCenter;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
