configure.in | 6 ++---- oox/inc/oox/vml/vmlformatting.hxx | 5 +++-- oox/source/vml/vmlformatting.cxx | 3 +++ 3 files changed, 8 insertions(+), 6 deletions(-)
New commits: commit 106d638e6cd4dceffc0aa98a7772d69488ae0a39 Author: LuboÅ¡ LuÅák <[email protected]> Date: Fri Jun 8 16:24:18 2012 +0200 fix --help (--with-help is already the default) Change-Id: I3b34b49ec72ebd20d55da38d25c6375e72503a13 diff --git a/configure.in b/configure.in index 4713dd3..fb4f3df 100644 --- a/configure.in +++ b/configure.in @@ -1582,10 +1582,8 @@ AC_ARG_WITH(gxx_include_path, ,) AC_ARG_WITH(help, - AS_HELP_STRING([--with-help], - [Enable the build of help. - - To build without help, use --without-help.])) + AS_HELP_STRING([--without-help], + [Disable the build of help.])) AC_ARG_WITH(java, AS_HELP_STRING([--with-java], commit 2f82bf1949299a3c27423db36f4a1c679e5492ce Author: LuboÅ¡ LuÅák <[email protected]> Date: Thu Jun 7 18:10:20 2012 +0200 handle f suffix (1/65536ths) when reading VML percentages Not all percentage attributes actually use this, but better be safe and no point in checking only the allowed ones use them. Change-Id: I851f9b19ea85201d70d5e6b2e219bbcd88ae3dea diff --git a/oox/inc/oox/vml/vmlformatting.hxx b/oox/inc/oox/vml/vmlformatting.hxx index 25f7a55..428e2bd 100644 --- a/oox/inc/oox/vml/vmlformatting.hxx +++ b/oox/inc/oox/vml/vmlformatting.hxx @@ -66,9 +66,10 @@ public: floating-point value. @param rValue The VML percentage value. This is a floating-point value - with optional following '%' sign. If the '%' sign is missing, the + with optional following '%' or 'f' sign. If the sign is missing, the floating point value will be returned unmodified. If the '%' sign - is present, the value will be divided by 100. + is present, the value will be divided by 100. If the 'f' sign is present, + the value will be divided by 65536. */ static double decodePercent( const ::rtl::OUString& rValue, diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx index 4bc582d..6d20276 100644 --- a/oox/source/vml/vmlformatting.cxx +++ b/oox/source/vml/vmlformatting.cxx @@ -107,6 +107,9 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r if( (nEndPos + 1 == rValue.getLength()) && (rValue[ nEndPos ] == '%') ) return fValue / 100.0; + if( (nEndPos + 1 == rValue.getLength()) && (rValue[ nEndPos ] == 'f') ) + return fValue / 65536.0; + OSL_FAIL( "ConversionHelper::decodePercent - unknown measure unit" ); return fDefValue; }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
