implement docx import/export of SwPostItField::aInitials

Change-Id: I919f5f0c4f6a1f6b1ea6261d9703da7a6c1046d3

sw/inc/docufld.hxx

@@ -545,6 +545,7 @@ public:
     virtual rtl::OUString   GetPar2() const;
     virtual void            SetPar2(const rtl::OUString& rStr);
     const rtl::OUString&    GetTxt() const { return sTxt; }
+    const rtl::OUString&    GetInitials() const;
 
     const OutlinerParaObject*   GetTextObject() const;
     void SetTextObject( OutlinerParaObject* pText );

sw/source/core/fields/docufld.cxx

@@ -1799,6 +1799,11 @@ rtl::OUString SwPostItField::GetPar2() const
         return sTxt;
 }
 
+const rtl::OUString& SwPostItField::GetInitials() const
+{
+    return sInitials;
+}
+
 const OutlinerParaObject* SwPostItField::GetTextObject() const
 {
     return mpText;

sw/source/filter/ww8/docxattributeoutput.cxx

@@ -3360,7 +3360,8 @@ void DocxAttributeOutput::WritePostitFields()
         const SwPostItField* f = m_postitFields[ i ];
         m_pSerializer->startElementNS( XML_w, XML_comment, FSNS( XML_w, XML_id ), idstr.getStr(),
             FSNS( XML_w, XML_author ), rtl::OUStringToOString( f->GetPar1(), RTL_TEXTENCODING_UTF8 ).getStr(),
-            FSNS( XML_w, XML_date ), msfilter::util::DateTimeToOString(f->GetDateTime()).getStr(), FSEND );
+            FSNS( XML_w, XML_date ), msfilter::util::DateTimeToOString(f->GetDateTime()).getStr(),
+            FSNS( XML_w, XML_initials ), rtl::OUStringToOString( f->GetInitials(), RTL_TEXTENCODING_UTF8 ).getStr(), FSEND );
         // Check for the text object existing, it seems that it can be NULL when saving a newly created
         // comment without giving focus back to the main document. As GetTxt() is empty in that case as well,
         // that is probably a bug in the Writer core.

writerfilter/source/dmapper/DomainMapper.cxx

@@ -1361,6 +1361,9 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
         case NS_ooxml::LN_EG_RangeMarkupElements_commentRangeEnd:
             m_pImpl->AddAnnotationPosition(false);
         break;
+        case NS_ooxml::LN_CT_Comment_initials:
+            m_pImpl->SetCurrentRedlineInitials(sStringValue);
+        break;
         case NS_ooxml::LN_token:
             m_pImpl->SetCurrentRedlineToken( nIntValue );
         break;

writerfilter/source/dmapper/DomainMapper_Impl.cxx

@@ -3538,6 +3538,12 @@ void DomainMapper_Impl::SetCurrentRedlineAuthor( rtl::OUString sAuthor )
         m_xAnnotationField->setPropertyValue("Author", uno::makeAny(sAuthor));
 }
 
+void DomainMapper_Impl::SetCurrentRedlineInitials( rtl::OUString sInitials )
+{
+    if (m_xAnnotationField.is())
+        m_xAnnotationField->setPropertyValue("Initials", uno::makeAny(sInitials));
+}
+
 void DomainMapper_Impl::SetCurrentRedlineDate( rtl::OUString sDate )
 {
     if (!m_xAnnotationField.is())

writerfilter/source/dmapper/DomainMapper_Impl.hxx

@@ -621,6 +621,7 @@ public:
     void SetCurrentRedlineToken( sal_Int32 nToken );
     void RemoveCurrentRedline( );
     void ResetParaRedline( );
+    void SetCurrentRedlineInitials( rtl::OUString sInitials );
 
     void ApplySettingsTable();
     SectionPropertyMap * GetSectionContext();