RTF filter: handle user-defined document properties of type double

This was the last unhandled type.

Change-Id: Ife9b93ac81ddab9409c6790228eec03e92920e01

sw/qa/extras/rtfexport/data/custom-doc-props.rtf

@@ -18,5 +18,8 @@
 {\propname d}
 \proptype64
 {\staticval 2016. 01. 30.}
+{\propname pi}
+\proptype5
+{\staticval 3.14}
 }
 }

sw/qa/extras/rtfexport/rtfexport.cxx

@@ -1020,6 +1020,9 @@ DECLARE_RTFEXPORT_TEST(testCustomDocProps, "custom-doc-props.rtf")
     CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int16>(2016), aDate.Year);
     CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(1), aDate.Month);
     CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(30), aDate.Day);
+
+    // Test real number.
+    CPPUNIT_ASSERT_EQUAL(3.14, getProperty<double>(xUserDefinedProperties, "pi"));
 }
 
 DECLARE_RTFEXPORT_TEST(testTdf65642, "tdf65642.rtf")

sw/source/filter/ww8/rtfexport.cxx

@@ -538,8 +538,19 @@ void RtfExport::WriteUserProps()
                 }
                 else if (aAny >>= fValue)
                 {
-                    WriteUserPropType(3);
-                    WriteUserPropValue(OUString::number(fValue));
+                    aValue = OUString::number(fValue);
+                    if (aValue.indexOf('.') == -1)
+                    {
+                        // Integer.
+                        WriteUserPropType(3);
+                        WriteUserPropValue(aValue);
+                    }
+                    else
+                    {
+                        // Real number.
+                        WriteUserPropType(5);
+                        WriteUserPropValue(aValue);
+                    }
                 }
                 else if (aAny >>= aDate)
                 {

writerfilter/source/rtftok/rtfdispatchvalue.cxx

@@ -1397,6 +1397,9 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
         case 3:
             m_aStates.top().aPropType = cppu::UnoType<sal_Int32>::get();
             break;
+        case 5:
+            m_aStates.top().aPropType = cppu::UnoType<double>::get();
+            break;
         case 11:
             m_aStates.top().aPropType = cppu::UnoType<bool>::get();
             break;

writerfilter/source/rtftok/rtfdocumentimpl.cxx

@@ -2712,6 +2712,8 @@ RTFError RTFDocumentImpl::popState()
                 aAny = uno::makeAny(aStaticVal.toBoolean());
             else if (m_aStates.top().aPropType == cppu::UnoType<util::DateTime>::get())
                 aAny = uno::makeAny(getDateTimeFromUserProp(aStaticVal));
+            else if (m_aStates.top().aPropType == cppu::UnoType<double>::get())
+                aAny = uno::makeAny(aStaticVal.toDouble());
 
             xPropertyContainer->addProperty(rKey, beans::PropertyAttribute::REMOVABLE, aAny);
         }