summaryrefslogtreecommitdiff
path: root/include/sax/tools
diff options
context:
space:
mode:
authorRegina Henschel <rb.henschel@t-online.de>2024-06-01 19:50:47 +0200
committerRegina Henschel <rb.henschel@t-online.de>2024-06-11 10:29:17 +0200
commit567dbcf68711402736f65f4a0a47ef57549fe50f (patch)
tree934b9bd3650598d6a04f69a85c2754ef7c878989 /include/sax/tools
parenta2b6ce5d21b7f5c84ced8485f5af279f1bf8135f (diff)
tdf#161327 Interpret angle units in dr3d:end-angle ..
.. and draw:rotation in <draw:hatch> element. ODF 1.1 has not specified the syntax of datatype 'angle'. Since ODF 1.2 it is specified as double with unit "deg", "grad" or "rad", or without unit. The unit-less value is specified to be in degrees. But OOo, AOO and all LO versions had written the value unit-less in 1/10th of a degree in some cases. To fix it, LibreOffic will be enabled to read units. When then the active versions are able to read units, starting with the then actual version, LibreOffice will write angles with unit 'deg'. This has already be done for gradients, see tdf#89475. This patch starts the first step to make LibreOffice able to read units for dr3d:end-angle (UNO D3DEndAngle) and for draw:rotation (UNO FillHatch.Angle). I have not found further cases of writing 1/10deg. The patch still writes unit-less 1/10th of a degree for export to ODF 1.3 and earlier. When it is time to write unit degree or when LibreOffice supports the next ODF versions, some places need to be adapted. They are marked. The converter convertAngle is renamed to convert10thDegAngle() to indicate, that it is special. The parts, which were specific to gradients are moved to the gradients, so that it is now usable for dr3d:angle and draw:rotation too. I intend to write next a patch that enables LibreOffice to read angle units for cases where LibreOffice already writes unit-less values in degree. That is not so urgent, but to bring LibreOffice nearer to ODF, reading angle units should be implemented nevertheless. The file xmlbahdl.hxx is moved from xmloff/source/style to xmloff/inc to have access to it from xmloff/source/draw. Change-Id: I8ffc2735f8bcfefb86efa80eb05f900c32403f31 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168336 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Regina Henschel <rb.henschel@t-online.de>
Diffstat (limited to 'include/sax/tools')
-rw-r--r--include/sax/tools/converter.hxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/include/sax/tools/converter.hxx b/include/sax/tools/converter.hxx
index d797eace3042..bb97acc595ac 100644
--- a/include/sax/tools/converter.hxx
+++ b/include/sax/tools/converter.hxx
@@ -199,16 +199,16 @@ public:
static bool convertDouble(double& rValue, std::string_view rString);
/** convert number, 10th of degrees with range [0..3600] to SVG angle */
- static void convertAngle(OUStringBuffer& rBuffer, sal_Int16 nAngle,
- SvtSaveOptions::ODFSaneDefaultVersion nVersion);
+ static void convert10thDegAngle(OUStringBuffer& rBuffer, sal_Int16 nAngle,
+ const bool isWrongOOo10thDegAngle);
- /** convert SVG angle to number, 10th of degrees with range [0..3600] */
- static bool convertAngle(sal_Int16& rAngle, std::u16string_view rString,
- bool isWrongOOo10thDegAngle);
+ /** convert SVG angle to number in 10th of degrees */
+ static bool convert10thDegAngle(sal_Int16& rAngle, std::u16string_view rString,
+ bool isWrongOOo10thDegAngle);
- /** convert SVG angle to number, 10th of degrees with range [0..3600] */
- static bool convertAngle(sal_Int16& rAngle, std::string_view rString,
- bool isWrongOOo10thDegAngle);
+ /** convert SVG angle to number in 10th of degrees */
+ static bool convert10thDegAngle(sal_Int16& rAngle, std::string_view rString,
+ bool isWrongOOo10thDegAngle);
/** convert double to XMLSchema-2 "duration" string; negative durations allowed */
static void convertDuration(OUStringBuffer& rBuffer,