summaryrefslogtreecommitdiffstats
path: root/svgio/source/svgreader/svgtools.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svgio/source/svgreader/svgtools.cxx')
-rw-r--r--svgio/source/svgreader/svgtools.cxx18
1 files changed, 13 insertions, 5 deletions
diff --git a/svgio/source/svgreader/svgtools.cxx b/svgio/source/svgreader/svgtools.cxx
index 14e5bdaa9553..3bc457344cb4 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -189,6 +189,13 @@ namespace svgio
return fRetval;
}
+ case Unit_none:
+ {
+#ifdef DBG_UTIL
+ myAssert("Design error, this case should have been handled in the caller");
+#endif
+ return mfNumber;
+ }
default:
{
OSL_ENSURE(false, "Do not use with percentage! ");
@@ -219,6 +226,7 @@ namespace svgio
case Unit_in:
case Unit_em:
case Unit_ex:
+ case Unit_none:
{
return solveNonPercentage( rInfoProvider);
}
@@ -473,13 +481,13 @@ namespace svgio
}
else if('t' == aCharB)
{
- // 'pt' == 1.25 px
+ // 'pt' == 4/3 px
aRetval = Unit_pt;
bTwoCharValid = true;
}
else if('c' == aCharB)
{
- // 'pc' == 15 px
+ // 'pc' == 16 px
aRetval = Unit_pc;
bTwoCharValid = true;
}
@@ -489,7 +497,7 @@ namespace svgio
{
if('n' == aCharB)
{
- // 'in' == 90 px
+ // 'in' == 96 px, since CSS 2.1
aRetval = Unit_in;
bTwoCharValid = true;
}
@@ -499,7 +507,7 @@ namespace svgio
{
if('m' == aCharB)
{
- // 'cm' == 35.43307 px
+ // 'cm' == 37.79527559 px
aRetval = Unit_cm;
bTwoCharValid = true;
}
@@ -509,7 +517,7 @@ namespace svgio
{
if('m' == aCharB)
{
- // 'mm' == 3.543307 px
+ // 'mm' == 3.779528 px
aRetval = Unit_mm;
bTwoCharValid = true;
}