summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--officecfg/registry/data/org/openoffice/Office/Calc.xcu35
-rw-r--r--xmloff/source/style/escphdl.cxx6
2 files changed, 39 insertions, 2 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/Calc.xcu b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
index e36f373be9..e37612a049 100644
--- a/officecfg/registry/data/org/openoffice/Office/Calc.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
@@ -171,7 +171,40 @@
<value>SIT</value>
</prop>
<prop oor:name="Factor">
- <value>239.64</value>
+ <value>239.640</value>
+ </prop>
+ </node>
+ <node oor:name="CR14" oor:op="replace">
+ <prop oor:name="FromUnit">
+ <value>EUR</value>
+ </prop>
+ <prop oor:name="ToUnit">
+ <value>MTL</value>
+ </prop>
+ <prop oor:name="Factor">
+ <value>.429300</value>
+ </prop>
+ </node>
+ <node oor:name="CR15" oor:op="replace">
+ <prop oor:name="FromUnit">
+ <value>EUR</value>
+ </prop>
+ <prop oor:name="ToUnit">
+ <value>CYP</value>
+ </prop>
+ <prop oor:name="Factor">
+ <value>.585274</value>
+ </prop>
+ </node>
+ <node oor:name="CR16" oor:op="replace">
+ <prop oor:name="FromUnit">
+ <value>EUR</value>
+ </prop>
+ <prop oor:name="ToUnit">
+ <value>SKK</value>
+ </prop>
+ <prop oor:name="Factor">
+ <value>30.1260</value>
</prop>
</node>
</node>
diff --git a/xmloff/source/style/escphdl.cxx b/xmloff/source/style/escphdl.cxx
index 0692542e8f..5131ad4dd1 100644
--- a/xmloff/source/style/escphdl.cxx
+++ b/xmloff/source/style/escphdl.cxx
@@ -150,7 +150,11 @@ sal_Bool XMLEscapementHeightPropHdl::importXML( const OUString& rStrImpValue, un
}
else
{
- nProp = (sal_Int8) DFLT_ESC_PROP;
+ sal_Int32 nEscapementPosition=0;
+ if( SvXMLUnitConverter::convertPercent( nEscapementPosition, aToken ) && nEscapementPosition==0 )
+ nProp = 100; //if escapement position is zero and no escapement height is given the default height should be 100percent and not something smaller (#i91800#)
+ else
+ nProp = (sal_Int8) DFLT_ESC_PROP;
}
rValue <<= nProp;