From f35a95ff215203fc6bd0f943125283610c95ce3f Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sat, 12 Sep 2020 14:52:41 +0200 Subject: tdf#133502 annotation has wrong position regression from commit 20c5a2abb61c4246c6001b7b6d5bd69cd5882cfd use FastParser in DrawAnnotationContext Change-Id: Ifc4a8d6390d37edfb375f37d513418b77f38d842 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102515 Tested-by: Jenkins Reviewed-by: Noel Grandin (cherry picked from commit 35612c995d53d74e8b9ba44bc6e940cbb4dd0f60) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102568 Reviewed-by: Xisco Fauli --- xmloff/source/draw/ximppage.cxx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'xmloff') diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index e803eda3a8f5..f0d30920f546 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -99,6 +99,7 @@ DrawAnnotationContext::DrawAnnotationContext( SvXMLImport& rImport, const Refere switch( aIter.getToken() ) { case XML_ELEMENT(SVG, XML_X): + case XML_ELEMENT(SVG_COMPAT, XML_X): { sal_Int32 x; GetImport().GetMM100UnitConverter().convertMeasureToCore( @@ -107,6 +108,7 @@ DrawAnnotationContext::DrawAnnotationContext( SvXMLImport& rImport, const Refere break; } case XML_ELEMENT(SVG, XML_Y): + case XML_ELEMENT(SVG_COMPAT, XML_Y): { sal_Int32 y; GetImport().GetMM100UnitConverter().convertMeasureToCore( @@ -115,6 +117,7 @@ DrawAnnotationContext::DrawAnnotationContext( SvXMLImport& rImport, const Refere break; } case XML_ELEMENT(SVG, XML_WIDTH): + case XML_ELEMENT(SVG_COMPAT, XML_WIDTH): { sal_Int32 w; GetImport().GetMM100UnitConverter().convertMeasureToCore( @@ -123,6 +126,7 @@ DrawAnnotationContext::DrawAnnotationContext( SvXMLImport& rImport, const Refere break; } case XML_ELEMENT(SVG, XML_HEIGHT): + case XML_ELEMENT(SVG_COMPAT, XML_HEIGHT): { sal_Int32 h; GetImport().GetMM100UnitConverter().convertMeasureToCore( -- cgit