xmloff/source/style/chrhghdl.cxx | 2 ++ 1 file changed, 2 insertions(+)
New commits: commit 93d781b42c9596fddedc863ecc0740a7a84c072a Author: Michael Stahl <[email protected]> Date: Fri Sep 14 11:56:16 2012 +0200 fdo#49876: ODF export: do not export font-size="0pt" This is invalid, font size must be positive. Change-Id: I2425d7c596ca9c7c80c0d24c44cdd9ec1ac1dd80 (cherry picked from commit c9699f82edf67a55f4cfdd885fa779b13d816c87) Reviewed-on: https://gerrit.libreoffice.org/617 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Miklos Vajna <[email protected]> diff --git a/xmloff/source/style/chrhghdl.cxx b/xmloff/source/style/chrhghdl.cxx index 8b8f842..0a607ef 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')); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
