20 files changed, 340 insertions, 101 deletions
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index 91d67441286e..e33180964909 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -137,13 +137,14 @@ void SwFltStackEntry::SetEndPos(const SwPosition& rEndPos)
 
 sal_Bool SwFltStackEntry::MakeRegion(SwDoc* pDoc, SwPaM& rRegion, sal_Bool bCheck )
 {
-    // wird ueberhaupt ein Bereich umspannt ??
-    // - ist kein Bereich, dann nicht returnen wenn am Anfang vom Absatz
-    // - Felder aussortieren, koennen keinen Bereich haben !!
-    if (
-         nMkNode.GetIndex() == nPtNode.GetIndex() && nMkCntnt == nPtCntnt &&
-         nPtCntnt && RES_TXTATR_FIELD != pAttr->Which()
-       )
+    // does this range actually contain something?
+    // empty range is allowed if at start of empty paragraph
+    // fields are special: never have range, so leave them
+    SwCntntNode *const pCntntNode(
+        SwNodeIndex(nMkNode, +1).GetNode().GetCntntNode());
+    if ((nMkNode.GetIndex() == nPtNode.GetIndex()) && (nMkCntnt == nPtCntnt)
+        && ((0 != nPtCntnt) || (pCntntNode && (0 != pCntntNode->Len())))
+        && (RES_TXTATR_FIELD != pAttr->Which()))
     {
         return sal_False;
     }
diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx
index 665a73f2721f..cba056944a15 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -252,6 +252,9 @@ WidthsPtr WW8TableNodeInfoInner::getWidthsOfRow()
         pWidths = WidthsPtr(new Widths);
         // number of cell written
         sal_uInt32 nBoxes = rTabBoxes.Count();
+        if ( nBoxes > MAXTABLECELLS )
+            nBoxes = MAXTABLECELLS;
+
         for (sal_uInt32 n = 0; n < nBoxes; n++)
         {
             const SwFrmFmt* pBoxFmt = rTabBoxes[ n ]->GetFrmFmt();
@@ -280,6 +283,9 @@ RowSpansPtr WW8TableNodeInfoInner::getRowSpansOfRow()
         const SwTableBoxes & rTabBoxes = pTabLine->GetTabBoxes();
 
         sal_uInt32 nBoxes = rTabBoxes.Count();
+        if (nBoxes > MAXTABLECELLS)
+            nBoxes = MAXTABLECELLS;
+
         for (sal_uInt32 n = 0; n < nBoxes; ++n)
         {
             pResult->push_back(rTabBoxes[n]->getRowSpan());
diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx
index 2ba703ab031f..3979db3bf204 100644
--- a/sw/source/filter/ww8/WW8TableInfo.hxx
+++ b/sw/source/filter/ww8/WW8TableInfo.hxx
@@ -49,6 +49,8 @@ namespace ww8
 {
 using namespace ::std;
 
+const unsigned int MAXTABLECELLS = 63;
+
 class WW8TableNodeInfo;
 typedef boost::shared_ptr<SwRect> SwRectPtr;
 typedef ::std::vector<const SwTableBox *> TableBoxVector;
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 764b5438607f..b89c704093d1 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -439,9 +439,7 @@ void SwWW8AttrIter::OutAttr( xub_StrLen nSwPos, bool bRuby )
                         : nSwPos == *pHt->GetStart() )
             {
                 sal_uInt16 nWhich = pHt->GetAttr().Which();
-                if (nWhich == nFontId)
-                    pFont = &(item_cast<SvxFontItem>(pHt->GetAttr()));
-                else if( nWhich == RES_TXTATR_AUTOFMT )
+                if (nWhich == RES_TXTATR_AUTOFMT)
                 {
                     const SwFmtAutoFmt& rAutoFmt = static_cast<const SwFmtAutoFmt&>(pHt->GetAttr());
                     const boost::shared_ptr<SfxItemSet> pSet = rAutoFmt.GetStyleHandle();
@@ -1797,7 +1795,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
     String aStr( rNode.GetTxt() );
 
     xub_StrLen nAktPos = 0;
-    xub_StrLen nEnd = aStr.Len();
+    xub_StrLen const nEnd = aStr.Len();
     bool bRedlineAtEnd = false;
     int nOpenAttrWithRange = 0;
 
@@ -1941,6 +1939,15 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
         if ( aAttrIter.IsDropCap( nNextAttr ) )
             AttrOutput().FormatDrop( rNode, aAttrIter.GetSwFmtDrop(), nStyle, pTextNodeInfo, pTextNodeInfoInner );
 
+        if (0 != nEnd)
+        {
+            // Output the character attributes
+            // #i51277# do this before writing flys at end of paragraph
+            AttrOutput().StartRunProperties();
+            aAttrIter.OutAttr( nAktPos );
+            AttrOutput().EndRunProperties( pRedlineData );
+        }
+
         // At the end of line, output the attributes until the CR.
         // Exception: footnotes at the end of line
         if ( nNextAttr == nEnd )
@@ -1966,10 +1973,15 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
             }
         }
 
-        // Output the character attributes
-        AttrOutput().StartRunProperties();
-        aAttrIter.OutAttr( nAktPos );   // nAktPos - 1 ??
-        AttrOutput().EndRunProperties( pRedlineData );
+        if (0 == nEnd)
+        {
+            // Output the character attributes
+            // do it after WriteCR for an empty paragraph (otherwise
+            // WW8_WrFkp::Append throws SPRMs away...)
+            AttrOutput().StartRunProperties();
+            aAttrIter.OutAttr( nAktPos );
+            AttrOutput().EndRunProperties( pRedlineData );
+        }
 
         // Exception: footnotes at the end of line
         if ( nNextAttr == nEnd )
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index 38f37ea04648..8a36688d53c5 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -222,8 +222,15 @@ void WW8AttributeOutput::NumberingLevel( sal_uInt8 /*nLevel*/,
     sal_uInt8 nAlign;
     switch ( eAdjust )
     {
-        case SVX_ADJUST_CENTER: nAlign = 1; break;
-        default:                nAlign = 0; break;
+    case SVX_ADJUST_CENTER:
+        nAlign = 1;
+        break;
+    case SVX_ADJUST_RIGHT:
+        nAlign = 2;
+        break;
+    default:
+        nAlign = 0;
+        break;
     }
     *m_rWW8Export.pTableStrm << nAlign;
 
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 81920922c145..5b0df785ac8a 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2141,6 +2141,8 @@ void WW8AttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t
         pTableTextNodeInfoInner->getTableBoxesOfRow();
     // number of cell written
     sal_uInt32 nBoxes = pTableBoxes->size();
+    if (nBoxes > ww8::MAXTABLECELLS)
+        nBoxes = ww8::MAXTABLECELLS;
 
     // sprm header
     m_rWW8Export.InsUInt16( NS_sprm::LN_TDefTable );
@@ -3324,7 +3326,7 @@ sal_uLong SwWW8Writer::Write( SwPaM& rPaM, SfxMedium& rMed,
 
 MSWordExportBase::MSWordExportBase( SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM *pOriginalPam )
     : aMainStg(sMainStream), pISet(0), pUsedNumTbl(0), mpTopNodeOfHdFtPage(0),
-    pBmpPal(0), pKeyMap(0), pOLEExp(0), pOCXExp(0), pOleMap(0),
+    pBmpPal(0), pOLEExp(0), pOCXExp(0), pOleMap(0),
     mpTableInfo(new ww8::WW8TableInfo()), nUniqueList(0),
     mnHdFtIndex(0), pAktPageDesc(0), pPapPlc(0), pChpPlc(0), pChpIter(0),
     pStyles( NULL ),
@@ -3340,8 +3342,6 @@ MSWordExportBase::MSWordExportBase( SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM
 MSWordExportBase::~MSWordExportBase()
 {
     delete pBmpPal;
-    if (pKeyMap)
-        delete[] (NfKeywordTable*)pKeyMap;
     delete pOLEExp;
     delete pOCXExp;
     delete pOleMap;
@@ -3831,4 +3831,35 @@ void MSWordExportBase::OutputEndNode( const SwEndNode &rNode )
 #endif
 }
 
+const NfKeywordTable & MSWordExportBase::GetNfKeywordTable()
+{
+    if (pKeyMap.get() == NULL)
+    {
+        pKeyMap.reset(new NfKeywordTable);
+        NfKeywordTable & rKeywordTable = *pKeyMap;
+        rKeywordTable[NF_KEY_D] = ::rtl::OUString::createFromAscii("d");
+        rKeywordTable[NF_KEY_DD] = ::rtl::OUString::createFromAscii("dd");
+        rKeywordTable[NF_KEY_DDD] = ::rtl::OUString::createFromAscii("ddd");
+        rKeywordTable[NF_KEY_DDDD] = ::rtl::OUString::createFromAscii("dddd");
+        rKeywordTable[NF_KEY_M] = ::rtl::OUString::createFromAscii("M");
+        rKeywordTable[NF_KEY_MM] = ::rtl::OUString::createFromAscii("MM");
+        rKeywordTable[NF_KEY_MMM] = ::rtl::OUString::createFromAscii("MMM");
+        rKeywordTable[NF_KEY_MMMM] = ::rtl::OUString::createFromAscii("MMMM");
+        rKeywordTable[NF_KEY_NN] = ::rtl::OUString::createFromAscii("ddd");
+        rKeywordTable[NF_KEY_NNN] = ::rtl::OUString::createFromAscii("dddd");
+        rKeywordTable[NF_KEY_NNNN] = ::rtl::OUString::createFromAscii("dddd");
+        rKeywordTable[NF_KEY_YY] = ::rtl::OUString::createFromAscii("yy");
+        rKeywordTable[NF_KEY_YYYY] = ::rtl::OUString::createFromAscii("yyyy");
+        rKeywordTable[NF_KEY_H] = ::rtl::OUString::createFromAscii("H");
+        rKeywordTable[NF_KEY_HH] = ::rtl::OUString::createFromAscii("HH");
+        rKeywordTable[NF_KEY_MI] = ::rtl::OUString::createFromAscii("m");
+        rKeywordTable[NF_KEY_MMI] = ::rtl::OUString::createFromAscii("mm");
+        rKeywordTable[NF_KEY_S] = ::rtl::OUString::createFromAscii("s");
+        rKeywordTable[NF_KEY_SS] = ::rtl::OUString::createFromAscii("ss");
+        rKeywordTable[NF_KEY_AMPM] = ::rtl::OUString::createFromAscii("AM/PM");
+    }
+
+    return *pKeyMap;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 2a8b22f4447c..8ca0b1916969 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -470,7 +470,7 @@ public:
     WW8_WrtBookmarks* pBkmks;
     WW8_WrtRedlineAuthor* pRedlAuthors;
     BitmapPalette* pBmpPal;
-    void* pKeyMap;
+    boost::shared_ptr<NfKeywordTable> pKeyMap;
     SvxMSExportOLEObjects* pOLEExp;
     SwMSConvertControls* pOCXExp;
     WW8OleMaps* pOleMap;
@@ -831,6 +831,8 @@ protected:
     bool GetBookmarks( const SwTxtNode& rNd, xub_StrLen nStt, xub_StrLen nEnd,
             IMarkVector& rArr );
 
+    const NfKeywordTable & GetNfKeywordTable();
+
 public:
     MSWordExportBase( SwDoc *pDocument, SwPaM *pCurrentPam, SwPaM *pOriginalPam );
     virtual ~MSWordExportBase();
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 9448cca6b6e8..2e2a33262a2e 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -438,10 +438,19 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
     //section.
     bool bBreakSet = false;
 
+    const SwPageDesc * pPageDesc = rNd.FindPageDesc(sal_False);
+
+    if (pAktPageDesc != pPageDesc)
+    {
+        bBreakSet = true;
+        bNewPageDesc = true;
+        pAktPageDesc = pPageDesc;
+    }
+
     if ( pSet && pSet->Count() )
     {
-        if ( SFX_ITEM_SET == pSet->GetItemState( RES_PAGEDESC, false, &pItem )
-             && ( (SwFmtPageDesc*)pItem )->KnowsPageDesc() )
+        if ( SFX_ITEM_SET == pSet->GetItemState( RES_PAGEDESC, false, &pItem ) &&
+             dynamic_cast<const SwFmtPageDesc*>(pItem)->GetRegisteredIn() != NULL)
         {
             bBreakSet = true;
             bNewPageDesc = true;
@@ -2337,18 +2346,13 @@ bool MSWordExportBase::GetNumberFmt(const SwField& rFld, String& rStr)
     const SvNumberformat* pNumFmt = pNFmtr->GetEntry( nFmtIdx );
     if( pNumFmt )
     {
-        LocaleDataWrapper aLocDat( pNFmtr->GetServiceManager(),
-            MsLangId::convertLanguageToLocale( LANGUAGE_ENGLISH_US ) );
+        sal_uInt16 nLng = rFld.GetLanguage();
+        LocaleDataWrapper aLocDat(pNFmtr->GetServiceManager(),
+                                  MsLangId::convertLanguageToLocale(nLng));
 
-        if( !pKeyMap )
-        {
-            pKeyMap = new NfKeywordTable;
-            NfKeywordTable& rKeyMap = *(NfKeywordTable*)pKeyMap;
-            pNFmtr->FillKeywordTable( rKeyMap, LANGUAGE_ENGLISH_US );
-        }
-
-        String sFmt(pNumFmt->GetMappedFormatstring(*(NfKeywordTable*)pKeyMap,
+        String sFmt(pNumFmt->GetMappedFormatstring(GetNfKeywordTable(),
             aLocDat));
+
         if (sFmt.Len())
         {
             sw::ms::SwapQuotesInField(sFmt);
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 6d014a08a61a..3fca59587e58 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2457,7 +2457,15 @@ sal_Bool WW8FormulaListBox::Import(const uno::Reference <
         aTmp <<= aListSource;
         xPropSet->setPropertyValue(C2U("StringItemList"), aTmp );
 
-        aTmp <<= aListSource[0];
+        if (fDropdownIndex < nLen)
+        {
+            aTmp <<= aListSource[fDropdownIndex];
+        }
+        else
+        {
+            aTmp <<= aListSource[0];
+        }
+
         xPropSet->setPropertyValue(C2U("DefaultText"), aTmp );
 
         rSz = rRdr.MiserableDropDownFormHack(maListEntries[0], xPropSet);
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 8d66b216d2ab..e71cd1dc4c33 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -913,18 +913,19 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPaM, con
         }
     }
 
-    sal_uInt32 nWarn = 0;
-    sal_uInt32 nWarn2 = 0;
     // read storage streams
+
+    // #i103539#: always read meta.xml for generator
+    sal_uInt32 const nWarn = ReadThroughComponent(
+        xStorage, xModelComp, "meta.xml", "Meta.xml", xServiceFactory,
+        (bOASIS ? "com.sun.star.comp.Writer.XMLOasisMetaImporter"
+                : "com.sun.star.comp.Writer.XMLMetaImporter"),
+        aEmptyArgs, rName, sal_False );
+
+    sal_uInt32 nWarn2 = 0;
     if( !(IsOrganizerMode() || IsBlockMode() || aOpt.IsFmtsOnly() ||
           bInsertMode) )
     {
-        nWarn = ReadThroughComponent(
-            xStorage, xModelComp, "meta.xml", "Meta.xml", xServiceFactory,
-            (bOASIS ? "com.sun.star.comp.Writer.XMLOasisMetaImporter"
-                    : "com.sun.star.comp.Writer.XMLMetaImporter"),
-            aEmptyArgs, rName, sal_False );
-
         nWarn2 = ReadThroughComponent(
             xStorage, xModelComp, "settings.xml", NULL, xServiceFactory,
             (bOASIS ? "com.sun.star.comp.Writer.XMLOasisSettingsImporter"
diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx
index fb0f54f21bf3..40d27574a716 100644
--- a/sw/source/filter/xml/xmlbrshi.hxx
+++ b/sw/source/filter/xml/xmlbrshi.hxx
@@ -26,8 +26,12 @@
  *
  ************************************************************************/
 
-#ifndef _XMLBRSHI_HXX
-#define _XMLBRSHI_HXX
+#ifndef SW_XMLBRSHI_HXX
+#define SW_XMLBRSHI_HXX
+
+#include <com/sun/star/io/XOutputStream.hpp>
+
+#include <xmloff/xmlictxt.hxx>
 
 class SvXMLImport;
 class SvXMLUnitConverter;
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index b0904f059e0b..bcd148db33a3 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -410,23 +410,23 @@ SvXMLImportContext *SwXMLImport::CreateContext(
         pContext = CreateMetaContext(rLocalName);
     }
     else if ( XML_NAMESPACE_OFFICE==nPrefix &&
+              IsXMLToken( rLocalName, XML_DOCUMENT_STYLES ) )
+    {
+        pContext = new SwXMLDocStylesContext_Impl( *this, nPrefix, rLocalName,
+                                                   xAttrList );
+    }
+    else if ( XML_NAMESPACE_OFFICE==nPrefix &&
               IsXMLToken( rLocalName, XML_DOCUMENT ) )
     {
         uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(
             mxServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "com.sun.star.xml.dom.SAXDocumentBuilder"))),
                 uno::UNO_QUERY_THROW);
-        uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
-            GetModel(), UNO_QUERY_THROW);
+        uno::Reference<document::XDocumentProperties> const xDocProps(
+            GetDocumentProperties());
         // flat OpenDocument file format
         pContext = new SwXMLOfficeDocContext_Impl( *this, nPrefix, rLocalName,
-                        xAttrList, xDPS->getDocumentProperties(), xDocBuilder);
-    }
-    else if ( XML_NAMESPACE_OFFICE==nPrefix &&
-              IsXMLToken( rLocalName, XML_DOCUMENT_STYLES ) )
-    {
-        pContext = new SwXMLDocStylesContext_Impl( *this, nPrefix, rLocalName,
-                                                   xAttrList );
+                        xAttrList, xDocProps, xDocBuilder);
     }
     // <--
     else
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index ff17d5cc849b..ef9bc9320f57 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -26,14 +26,18 @@
  *
  ************************************************************************/
 
-#ifndef _XMLIMP_HXX
-#define _XMLIMP_HXX
+#ifndef SW_XMLIMP_HXX
+#define SW_XMLIMP_HXX
+
+#include <com/sun/star/document/XDocumentProperties.hpp>
 
 #include <sot/storage.hxx>
+
 #include <xmloff/xmlictxt.hxx>
-#include "xmlitmap.hxx"
 #include <xmloff/xmlimp.hxx>
 
+#include "xmlitmap.hxx"
+
 class SwDoc;
 class SwPaM;
 class SvXMLUnitConverter;
@@ -180,6 +184,7 @@ public:
 
     inline const SvXMLUnitConverter& GetTwipUnitConverter() const;
     inline const SvXMLImportItemMapper& GetTableItemMapper() const;
+    inline       SvXMLImportItemMapper& GetTableItemMapper();
     SvXMLImportContext *CreateTableItemImportContext( sal_uInt16 nPrefix,
                 const ::rtl::OUString& rLocalName,
                 const ::com::sun::star::uno::Reference<
@@ -208,6 +213,11 @@ public:
 
     // initialize XForms
     virtual void initXForms();
+
+    // get the document properties, but only if they actually need importing
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::document::XDocumentProperties>
+            GetDocumentProperties() const;
 };
 
 inline const SvXMLUnitConverter& SwXMLImport::GetTwipUnitConverter() const
@@ -220,6 +230,11 @@ inline const SvXMLImportItemMapper& SwXMLImport::GetTableItemMapper() const
     return *pTableItemMapper;
 }
 
+inline       SvXMLImportItemMapper& SwXMLImport::GetTableItemMapper()
+{
+    return *pTableItemMapper;
+}
+
 inline void SwXMLImport::SetProgressValue( sal_Int32 nValue )
 {
     if ( bShowProgress )
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index 712d56367cf3..5dc21bf5f309 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -78,11 +78,17 @@ SvXMLImportItemMapper::~SvXMLImportItemMapper()
 {
 }
 
+void
+SvXMLImportItemMapper::setMapEntries( SvXMLItemMapEntriesRef rMapEntries )
+{
+    mrMapEntries = rMapEntries;
+}
+
 /** fills the given itemset with the attributes in the given list */
 void SvXMLImportItemMapper::importXML( SfxItemSet& rSet,
                                       uno::Reference< xml::sax::XAttributeList > xAttrList,
                                       const SvXMLUnitConverter& rUnitConverter,
-                                       const SvXMLNamespaceMap& rNamespaceMap ) const
+                                      const SvXMLNamespaceMap& rNamespaceMap )
 {
     sal_Int16 nAttr = xAttrList->getLength();
 
@@ -190,7 +196,7 @@ void SvXMLImportItemMapper::importXML( SfxItemSet& rSet,
         delete pUnknownItem;
     }
 
-    finished( rSet );
+    finished(rSet, rUnitConverter);
 }
 
 /** this method is called for every item that has the
@@ -201,7 +207,7 @@ SvXMLImportItemMapper::handleSpecialItem(  const SvXMLItemMapEntry& /*rEntry*/,
                                             SfxItemSet& /*rSet*/,
                                             const OUString& /*rValue*/,
                                             const SvXMLUnitConverter& /*rUnitConverter*/,
-                                            const SvXMLNamespaceMap& /*rNamespaceMap*/ ) const
+                                            const SvXMLNamespaceMap& /*rNamespaceMap*/ )
 {
     OSL_FAIL( "unsuported special item in xml import" );
     return sal_False;
@@ -213,13 +219,14 @@ sal_Bool SvXMLImportItemMapper::handleNoItem( const SvXMLItemMapEntry& /*rEntry*
                                            SfxItemSet& /*rSet*/,
                                            const OUString& /*rValue*/,
                                            const SvXMLUnitConverter& /*rUnitConverter*/,
-                                           const SvXMLNamespaceMap& /*rNamespaceMap*/ ) const
+                                           const SvXMLNamespaceMap& /*rNamespaceMap*/ )
 {
     OSL_FAIL( "unsuported no item in xml import" );
     return sal_False;
 }
 
-void SvXMLImportItemMapper::finished( SfxItemSet& ) const
+void
+SvXMLImportItemMapper::finished(SfxItemSet &, SvXMLUnitConverter const&) const
 {
     // nothing to do here
 }
diff --git a/sw/source/filter/xml/xmlimpit.hxx b/sw/source/filter/xml/xmlimpit.hxx
index 578084ee972a..792d2bdb2d61 100644
--- a/sw/source/filter/xml/xmlimpit.hxx
+++ b/sw/source/filter/xml/xmlimpit.hxx
@@ -59,7 +59,7 @@ public:
     void importXML( SfxItemSet& rSet,
                     ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > xAttrList,
                     const SvXMLUnitConverter& rUnitConverter,
-                    const SvXMLNamespaceMap& rNamespaceMap ) const;
+                    const SvXMLNamespaceMap& rNamespaceMap );
 
     /** this method is called for every item that has the
         MID_SW_FLAG_SPECIAL_ITEM_IMPORT flag set */
@@ -68,7 +68,7 @@ public:
                                     SfxItemSet& rSet,
                                     const ::rtl::OUString& rValue,
                                     const SvXMLUnitConverter& rUnitConverter,
-                                    const SvXMLNamespaceMap& rNamespaceMap ) const;
+                                    const SvXMLNamespaceMap& rNamespaceMap );
 
     /** this method is called for every item that has the
         MID_SW_FLAG_NO_ITEM_IMPORT flag set */
@@ -76,13 +76,14 @@ public:
                                SfxItemSet& rSet,
                                const ::rtl::OUString& rValue,
                                const SvXMLUnitConverter& rUnitConverter,
-                               const SvXMLNamespaceMap& rNamespaceMap ) const;
+                               const SvXMLNamespaceMap& rNamespaceMap );
 
     /** This method is called when all attributes have benn processed. It
       * may be used to remove items that are incomplete */
-    virtual void finished( SfxItemSet& rSet ) const;
+    virtual void finished(SfxItemSet & rSet,
+                          SvXMLUnitConverter const& rUnitConverter) const;
 
-    inline void setMapEntries( SvXMLItemMapEntriesRef rMapEntries );
+    virtual void setMapEntries( SvXMLItemMapEntriesRef rMapEntries );
     inline SvXMLItemMapEntriesRef getMapEntries() const;
 
 
@@ -95,12 +96,6 @@ public:
         const SvXMLUnitConverter& rUnitConverter );
 };
 
-inline void
-SvXMLImportItemMapper::setMapEntries( SvXMLItemMapEntriesRef rMapEntries )
-{
-    mrMapEntries = rMapEntries;
-}
-
 inline SvXMLItemMapEntriesRef
 SvXMLImportItemMapper::getMapEntries() const
 {
diff --git a/sw/source/filter/xml/xmlitem.cxx b/sw/source/filter/xml/xmlitem.cxx
index d2c41d380cdd..819dfefcf765 100644
--- a/sw/source/filter/xml/xmlitem.cxx
+++ b/sw/source/filter/xml/xmlitem.cxx
@@ -40,15 +40,14 @@ SvXMLItemSetContext::SvXMLItemSetContext( SvXMLImport& rImp, sal_uInt16 nPrfx,
                                           const OUString& rLName,
                                           const uno::Reference< xml::sax::XAttributeList >& xAttrList,
                                           SfxItemSet& rISet,
-                                          const SvXMLImportItemMapper& rIMap,
+                                          SvXMLImportItemMapper& rIMap,
                                           const SvXMLUnitConverter& rUnitConverter ):
     SvXMLImportContext( rImp, nPrfx, rLName ),
     rItemSet( rISet ),
     rIMapper( rIMap ),
     rUnitConv( rUnitConverter )
-
 {
-    rIMapper.importXML( rItemSet, xAttrList, rUnitConv,
+    rIMap.importXML( rItemSet, xAttrList, rUnitConv,
                            GetImport().GetNamespaceMap() );
 }
 
diff --git a/sw/source/filter/xml/xmlitem.hxx b/sw/source/filter/xml/xmlitem.hxx
index a47f73e06bb1..f388206e6b0a 100644
--- a/sw/source/filter/xml/xmlitem.hxx
+++ b/sw/source/filter/xml/xmlitem.hxx
@@ -54,7 +54,7 @@ public:
                          const ::rtl::OUString& rLName,
                          const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList,
                          SfxItemSet&  rItemSet,
-                         const SvXMLImportItemMapper& rIMappper,
+                         SvXMLImportItemMapper& rIMap,
                          const SvXMLUnitConverter& rUnitConv );
 
     virtual ~SvXMLItemSetContext();
diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx
index c875453e97f1..d9a98955c1f1 100644
--- a/sw/source/filter/xml/xmlitemi.cxx
+++ b/sw/source/filter/xml/xmlitemi.cxx
@@ -29,29 +29,34 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
-
-#include <hintids.hxx>
 #include <rtl/ustring.hxx>
+
 #include <rsc/rscsfx.hxx>
-#include "xmlitmap.hxx"
-#include "xmlimpit.hxx"
-#include "xmlitem.hxx"
+
 #include <xmloff/i18nmap.hxx>
 #include <xmloff/xmluconv.hxx>
 #include <xmloff/families.hxx>
-#include <svx/unomid.hxx>
+#include <xmloff/xmlnmspe.hxx>
+#include <xmloff/xmltoken.hxx>
+
 #include <editeng/boxitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/tstpitem.hxx>
 #include <editeng/brshitem.hxx>
 #include <editeng/langitem.hxx>
+#include <editeng/memberids.hrc>
 
-#include "xmlbrshi.hxx"
+#include <svx/unomid.hxx>
+
+#include <hintids.hxx>
 #include <paratr.hxx>
 #include <doc.hxx>
 #include <unomid.h>
+#include "xmlbrshi.hxx"
 #include "xmlimp.hxx"
+#include "xmlitmap.hxx"
+#include "xmlimpit.hxx"
+#include "xmlitem.hxx"
 
 using ::rtl::OUString;
 using namespace ::com::sun::star;
@@ -75,32 +80,93 @@ public:
                                 SfxItemSet& rSet,
                                 const OUString& rValue,
                                 const SvXMLUnitConverter& rUnitConverter,
-                                const SvXMLNamespaceMap& rNamespaceMap ) const;
-    virtual void finished( SfxItemSet& rSet ) const;
+                                const SvXMLNamespaceMap& rNamespaceMap );
+
+    virtual sal_Bool
+    handleNoItem(SvXMLItemMapEntry const& rEntry,
+                 SfxItemSet & rSet,
+                 ::rtl::OUString const& rValue,
+                 SvXMLUnitConverter const& rUnitConverter,
+                 SvXMLNamespaceMap const& rNamespaceMap);
+
+    virtual void finished(SfxItemSet & rSet,
+                          SvXMLUnitConverter const& rUnitConverter) const;
+
+    virtual void setMapEntries( SvXMLItemMapEntriesRef rMapEntries );
+
+private:
+    void Reset();
+
+    ::rtl::OUString m_FoMarginValue;
+    enum { LEFT = 0, RIGHT = 1, TOP = 2, BOTTOM = 3 };
+    bool m_bHaveMargin[4];
 };
 
 SwXMLImportTableItemMapper_Impl::SwXMLImportTableItemMapper_Impl(
                                         SvXMLItemMapEntriesRef rMapEntries ) :
     SvXMLImportItemMapper( rMapEntries, RES_UNKNOWNATR_CONTAINER)
 {
+    Reset();
 }
 
 SwXMLImportTableItemMapper_Impl::~SwXMLImportTableItemMapper_Impl()
 {
 }
 
+void SwXMLImportTableItemMapper_Impl::Reset()
+{
+    m_FoMarginValue = ::rtl::OUString();
+    for (int i = 0; i < 3; ++i)
+    {
+        m_bHaveMargin[i] = false;
+    }
+}
+
+void SwXMLImportTableItemMapper_Impl::setMapEntries(
+        SvXMLItemMapEntriesRef rMapEntries )
+{
+    Reset();
+    SvXMLImportItemMapper::setMapEntries(rMapEntries);
+}
+
 sal_Bool SwXMLImportTableItemMapper_Impl::handleSpecialItem(
                                         const SvXMLItemMapEntry& rEntry,
                                         SfxPoolItem& rItem,
                                         SfxItemSet& rItemSet,
                                         const OUString& rValue,
                                         const SvXMLUnitConverter& rUnitConv,
-                                        const SvXMLNamespaceMap& ) const
+                                        const SvXMLNamespaceMap& )
 {
     sal_Bool bRet = sal_False;
     sal_uInt16 nMemberId = static_cast< sal_Int16 >(rEntry.nMemberId & MID_SW_FLAG_MASK);
     switch( rItem.Which() )
     {
+    case RES_LR_SPACE:
+        switch (nMemberId)
+        {
+            case MID_L_MARGIN:
+                m_bHaveMargin[LEFT] = true;
+                break;
+            case MID_R_MARGIN:
+                m_bHaveMargin[RIGHT] = true;
+                break;
+        }
+        bRet = SvXMLImportItemMapper::PutXMLValue(
+                rItem, rValue, nMemberId, rUnitConv);
+        break;
+    case RES_UL_SPACE:
+        switch (nMemberId)
+        {
+            case MID_UP_MARGIN:
+                m_bHaveMargin[TOP] = true;
+                break;
+            case MID_LO_MARGIN:
+                m_bHaveMargin[BOTTOM] = true;
+                break;
+        }
+        bRet = SvXMLImportItemMapper::PutXMLValue(
+                rItem, rValue, nMemberId, rUnitConv);
+        break;
     case RES_FRM_SIZE:
         switch( nMemberId )
         {
@@ -118,8 +184,72 @@ sal_Bool SwXMLImportTableItemMapper_Impl::handleSpecialItem(
     return bRet;
 }
 
-void SwXMLImportTableItemMapper_Impl::finished( SfxItemSet& /*rSet*/ ) const
+
+sal_Bool SwXMLImportTableItemMapper_Impl::handleNoItem(
+     SvXMLItemMapEntry const& rEntry,
+     SfxItemSet & rSet,
+     ::rtl::OUString const& rValue,
+     SvXMLUnitConverter const& rUnitConverter,
+     SvXMLNamespaceMap const& rNamespaceMap)
+{
+    if ((XML_NAMESPACE_FO == rEntry.nNameSpace) &&
+        (xmloff::token::XML_MARGIN == rEntry.eLocalName))
+    {
+        m_FoMarginValue = rValue;
+        return true;
+    }
+    else
+    {
+        return SvXMLImportItemMapper::handleNoItem(
+                rEntry, rSet, rValue, rUnitConverter, rNamespaceMap);
+    }
+}
+
+void SwXMLImportTableItemMapper_Impl::finished(
+        SfxItemSet & rSet, SvXMLUnitConverter const& rUnitConverter) const
 {
+    if (m_FoMarginValue.getLength())
+    {
+        sal_uInt16 const Ids[4][2] = {
+            { RES_LR_SPACE, MID_L_MARGIN },
+            { RES_LR_SPACE, MID_R_MARGIN },
+            { RES_UL_SPACE, MID_UP_MARGIN },
+            { RES_UL_SPACE, MID_LO_MARGIN },
+        };
+        for (int i = 0; i < 4; ++i)
+        {
+            if (m_bHaveMargin[i])
+            {
+                continue; // already read fo:margin-top etc.
+            }
+            // first get item from itemset
+            SfxPoolItem const* pItem = 0;
+            SfxItemState eState =
+                rSet.GetItemState(Ids[i][0], sal_True, &pItem);
+
+            // if not set, try the pool
+            if ((SFX_ITEM_SET != eState) && (SFX_WHICH_MAX > Ids[i][0]))
+            {
+                pItem = &rSet.GetPool()->GetDefaultItem(Ids[i][0]);
+            }
+
+            // do we have an item?
+            if (eState >= SFX_ITEM_DEFAULT && pItem)
+            {
+                SfxPoolItem *const pNewItem = pItem->Clone();
+                bool const bPut = PutXMLValue(
+                        *pNewItem, m_FoMarginValue, Ids[i][1], rUnitConverter);
+                if (bPut)
+                {
+                    rSet.Put(*pNewItem);
+                }
+            }
+            else
+            {
+                OSL_ENSURE(false, "could not get item");
+            }
+        }
+    }
 }
 
 // ---------------------------------------------------------------------
@@ -135,7 +265,7 @@ public:
                   const OUString& rLName,
                   const Reference< xml::sax::XAttributeList > & xAttrList,
                   SfxItemSet&  rItemSet,
-                  const SvXMLImportItemMapper& rIMapper,
+                  SvXMLImportItemMapper & rIMapper,
                   const SvXMLUnitConverter& rUnitConv );
     virtual ~SwXMLItemSetContext_Impl();
 
@@ -152,7 +282,7 @@ SwXMLItemSetContext_Impl::SwXMLItemSetContext_Impl(
                  const OUString& rLName,
                  const Reference< xml::sax::XAttributeList > & xAttrList,
                  SfxItemSet&  _rItemSet,
-                 const SvXMLImportItemMapper& _rIMapper,
+                 SvXMLImportItemMapper & _rIMapper,
                  const SvXMLUnitConverter& _rUnitConv ) :
     SvXMLItemSetContext( rImport, nPrfx, rLName, xAttrList,
                          _rItemSet, _rIMapper, _rUnitConv )
diff --git a/sw/source/filter/xml/xmlitemm.cxx b/sw/source/filter/xml/xmlitemm.cxx
index 5bc92baa071c..16070cb505f4 100644
--- a/sw/source/filter/xml/xmlitemm.cxx
+++ b/sw/source/filter/xml/xmlitemm.cxx
@@ -47,6 +47,8 @@ using namespace ::xmloff::token;
     { XML_NAMESPACE_##p, XML_##l, w, MID_SW_FLAG_SPECIAL_ITEM_IMPORT|m }
 #define M_E_SE( p, l, w, m ) \
     { XML_NAMESPACE_##p, XML_##l, w, MID_SW_FLAG_SPECIAL_ITEM_EXPORT|m }
+#define M_E_SIE( p, l, w, m ) \
+    { XML_NAMESPACE_##p, XML_##l, w, MID_SW_FLAG_SPECIAL_ITEM_EXPORT|MID_SW_FLAG_SPECIAL_ITEM_IMPORT|m }
 
 #define M_END { 0, XML_TOKEN_INVALID, 0, 0 }
 
@@ -60,11 +62,12 @@ SvXMLItemMapEntry aXMLTableItemMap[] =
     // RES_PAPER_BIN
     // not required
     // TODO: RES_LR_SPACE
-    M_E_SE( FO, MARGIN_LEFT,        RES_LR_SPACE,   MID_L_MARGIN ),
-    M_E_SE( FO, MARGIN_RIGHT,       RES_LR_SPACE,   MID_R_MARGIN ),
+    M_E_SE( FO,     MARGIN,             -1,     MID_SW_FLAG_NO_ITEM_IMPORT),
+    M_E_SIE( FO,    MARGIN_LEFT,        RES_LR_SPACE,   MID_L_MARGIN ),
+    M_E_SIE( FO,    MARGIN_RIGHT,       RES_LR_SPACE,   MID_R_MARGIN ),
     // RES_UL_SPACE
-    MAP_ENTRY( FO,   MARGIN_TOP,         RES_UL_SPACE,   MID_UP_MARGIN ),
-    MAP_ENTRY( FO,   MARGIN_BOTTOM,      RES_UL_SPACE,   MID_LO_MARGIN ),
+    M_E_SI( FO,     MARGIN_TOP,         RES_UL_SPACE,   MID_UP_MARGIN ),
+    M_E_SI( FO,     MARGIN_BOTTOM,      RES_UL_SPACE,   MID_LO_MARGIN ),
     // RES_PAGEDESC
     MAP_ENTRY( STYLE,    PAGE_NUMBER,        RES_PAGEDESC,   MID_PAGEDESC_PAGENUMOFFSET),
     // RES_BREAK
diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx
index 92c743518cb6..1bdcd3592e6b 100644
--- a/sw/source/filter/xml/xmlmeta.cxx
+++ b/sw/source/filter/xml/xmlmeta.cxx
@@ -58,22 +58,34 @@ using namespace ::xmloff::token;
 
 // ---------------------------------------------------------------------
 
+uno::Reference<document::XDocumentProperties>
+SwXMLImport::GetDocumentProperties() const
+{
+    if (IsOrganizerMode() || IsStylesOnlyMode() ||
+        IsBlockMode() || IsInsertMode())
+    {
+        return 0;
+    }
+    uno::Reference<document::XDocumentPropertiesSupplier> const xDPS(
+        GetModel(), UNO_QUERY_THROW);
+    return xDPS->getDocumentProperties();
+}
+
 SvXMLImportContext *SwXMLImport::CreateMetaContext(
                                        const OUString& rLocalName )
 {
     SvXMLImportContext *pContext = 0;
 
-    if( !(IsStylesOnlyMode() || IsInsertMode()) )
+    if (getImportFlags() & IMPORT_META)
     {
-        uno::Reference<xml::sax::XDocumentHandler> xDocBuilder(
+        uno::Reference<xml::sax::XDocumentHandler> const xDocBuilder(
             mxServiceFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
                 "com.sun.star.xml.dom.SAXDocumentBuilder"))),
-                uno::UNO_QUERY_THROW);
-        uno::Reference<document::XDocumentPropertiesSupplier> xDPS(
-            GetModel(), UNO_QUERY_THROW);
+            uno::UNO_QUERY_THROW);
+        uno::Reference<document::XDocumentProperties> const xDocProps(
+                GetDocumentProperties());
         pContext = new SvXMLMetaDocumentContext(*this,
-                        XML_NAMESPACE_OFFICE, rLocalName,
-                        xDPS->getDocumentProperties(), xDocBuilder);
+                    XML_NAMESPACE_OFFICE, rLocalName, xDocProps, xDocBuilder);
     }
 
     if( !pContext )