incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r1354426 - in /incubator/ooo/branches/AOO34: ./ main/ main/sw/source/filter/ww8/rtfattributeoutput.cxx
Date Wed, 27 Jun 2012 11:16:56 GMT
Author: orw
Date: Wed Jun 27 11:16:55 2012
New Revision: 1354426

URL: http://svn.apache.org/viewvc?rev=1354426&view=rev
Log:
#119803# - RTF export for User Fields: implementation for method <RtfAttributeOutput::WriteExpand(..)>

         Found by: ej197us at gmail dot com
         Patch by: yuanlin <yuanlin.ibm at gmail dot com>
         Review by: Oliver <orw at apache dot org>
Merged from trunk

Modified:
    incubator/ooo/branches/AOO34/   (props changed)
    incubator/ooo/branches/AOO34/main/   (props changed)
    incubator/ooo/branches/AOO34/main/sw/source/filter/ww8/rtfattributeoutput.cxx

Propchange: incubator/ooo/branches/AOO34/
------------------------------------------------------------------------------
  Merged /incubator/ooo/trunk:r1354421

Propchange: incubator/ooo/branches/AOO34/main/
------------------------------------------------------------------------------
  Merged /incubator/ooo/trunk/main:r1354421

Modified: incubator/ooo/branches/AOO34/main/sw/source/filter/ww8/rtfattributeoutput.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/sw/source/filter/ww8/rtfattributeoutput.cxx?rev=1354426&r1=1354425&r2=1354426&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/sw/source/filter/ww8/rtfattributeoutput.cxx (original)
+++ incubator/ooo/branches/AOO34/main/sw/source/filter/ww8/rtfattributeoutput.cxx Wed Jun
27 11:16:55 2012
@@ -2933,9 +2933,20 @@ void RtfAttributeOutput::FormatFrameDire
     }
 }
 
-void RtfAttributeOutput::WriteExpand( const SwField* /*pFld*/ )
+void RtfAttributeOutput::WriteExpand( const SwField* pFld )
 {
-    OSL_TRACE("TODO: %s", OSL_THIS_FUNC);
+    String sStr;        // fuer optionale Parameter
+    switch (pFld->GetTyp()->Which())
+    {
+        //#119803# Export user field and DB field for RTF filter
+        case RES_DBFLD:
+            sStr = FieldString(ww::eMERGEFIELD);
+            // kein break !!
+        case RES_USERFLD:
+            sStr += pFld->GetTyp()->GetName();
+            m_rExport.OutputField(pFld, ww::eNONE, sStr);
+            break;
+    }
 }
 
 void RtfAttributeOutput::RefField( const SwField& /*rFld*/, const String& /*rRef*/
)



Mime
View raw message