[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sw/source

[Noel Power]

 sw/source/filter/ww8/ww8atr.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d80516ee8243739aa87b46799970bc3944cf60cb
Author: Noel Power <noel.power at novell.com>
Date:   Tue Apr 19 14:35:52 2011 +0100

    some docx field import/export tweaks
    
    import/export ( USERNAME / USERINITIALS ) - supported now and alligned with binary import
    import/export ( AUTHOR / DocumentProperty.Author ) - AUTHOR is now imported as DocumentInfo.Created, DocProperty.Author is imported as a custom property, DocumentInfo.Created is exported as AUTHOR
    fix docx export of COMMENTS
    fix docx import of CREATEDATE,
    fix docx import of DocProperty.CreateTime
    fix docx import of DocProperty.LastSavedTime
    fix docx import of DocProperty.TotalEditingTime ( format still not right )

diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 9a51005..9448cca 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2629,7 +2629,7 @@ void AttributeOutputBase::TextField( const SwFmtFld& rField )
     case RES_AUTHORFLD:
         {
             ww::eField eFld =
-                (AF_SHORTCUT & nSubType ? ww::eUSERINITIALS : ww::eUSERNAME);
+                (AF_SHORTCUT & pFld->GetFormat() ? ww::eUSERINITIALS : ww::eUSERNAME);
             GetExport().OutputField(pFld, eFld, FieldString(eFld));
         }
         break;