[Libreoffice-commits] .: 2 commits - sw/source

[Miklos Vajna]

 sw/source/filter/ww8/rtfattributeoutput.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 20bc6c3e0d78c70d2556698ef7b80fd8c9a2aa81
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Sun Sep 4 11:57:02 2011 +0200

    RTF export: write postit time as well

diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index f4d3ada..83110b8 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3005,7 +3005,7 @@ void RtfAttributeOutput::PostitField( const SwField* pFld )
 
     m_aRunText.append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_ANNOTATION);
     m_aRunText.append("{" OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_ATNDATE " ");
-    m_aRunText.append((sal_Int32)sw::ms::DateTime2DTTM(rPFld.GetDate()));
+    m_aRunText.append((sal_Int32)sw::ms::DateTime2DTTM(rPFld.GetDateTime()));
     m_aRunText.append('}');
     m_aRunText.append(OUStringToOString(OUString(rPFld.GetTxt()), m_rExport.eCurrentEncoding));
     m_aRunText.append('}');
commit 56aad75c12180a10ca47740e319a947682559a70
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Sun Sep 4 11:07:32 2011 +0200

    RTF export: don't output RTF_IGNORE before RTF_CS outside stylesheet table
    
    That causes old readers not supporting character styles ignoring the
    text having the character style as well. (See the RTF spec v1.9.1 page
    24.)

diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index ab89690..f4d3ada 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2305,7 +2305,7 @@ void RtfAttributeOutput::TextCharFormat( const SwFmtCharFmt& rCharFmt )
     OSL_TRACE("%s", OSL_THIS_FUNC);
 
     sal_uInt16 nStyle = m_rExport.GetId( *rCharFmt.GetCharFmt() );
-    m_aStyles.append(OOO_STRING_SVTOOLS_RTF_IGNORE OOO_STRING_SVTOOLS_RTF_CS);
+    m_aStyles.append(OOO_STRING_SVTOOLS_RTF_CS);
     m_aStyles.append((sal_Int32)nStyle);
     OString* pString = m_rExport.GetStyle(nStyle);
     if (pString)