diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-14 11:56:16 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-09-14 15:04:15 +0200 |
| commit | c9699f82edf67a55f4cfdd885fa779b13d816c87 (patch) | |
| tree | a056a94e0ed03f57d56e3e47ad05b1ce792fa1e5 | |
| parent | a2959aba6affa06dc0c6fb19d0c2b73958e6b221 (diff) | |
fdo#49876: ODF export: do not export font-size="0pt"
This is invalid, font size must be positive.
Change-Id: I2425d7c596ca9c7c80c0d24c44cdd9ec1ac1dd80
| -rw-r--r-- | xmloff/source/style/chrhghdl.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xmloff/source/style/chrhghdl.cxx b/xmloff/source/style/chrhghdl.cxx index 8b8f842ec7f7..0a607efd1bd9 100644 --- a/xmloff/source/style/chrhghdl.cxx +++ b/xmloff/source/style/chrhghdl.cxx @@ -67,6 +67,7 @@ sal_Bool XMLCharHeightHdl::importXML( const OUString& rStrImpValue, uno::Any& rV if (::sax::Converter::convertDouble(fSize, rStrImpValue, eSrcUnit, util::MeasureUnit::POINT)) { + fSize = ::std::max<double>(fSize, 1.0); // fdo#49876: 0pt is invalid rValue <<= (float)fSize; return sal_True; } @@ -82,6 +83,7 @@ sal_Bool XMLCharHeightHdl::exportXML( OUString& rStrExpValue, const uno::Any& rV float fSize = 0; if( rValue >>= fSize ) { + fSize = ::std::max<float>(fSize, 1.0f); // fdo#49876: 0pt is invalid ::sax::Converter::convertDouble(aOut, (double)fSize, true, util::MeasureUnit::POINT, util::MeasureUnit::POINT); aOut.append( sal_Unicode('p')); |