Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/writer

Conflicts:
	sw/source/core/inc/frame.hxx
	sw/source/core/layout/wsfrm.cxx

5 files changed, 18 insertions, 3 deletions

diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index d8695c171a..1cdd81714b 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -150,6 +150,8 @@ protected:
     virtual const SwRect GetObjBoundRect() const;
     virtual	void Modify( const SfxPoolItem*, const SfxPoolItem* );
 
+    virtual const IDocumentDrawModelAccess* getIDocumentDrawModelAccess( );
+
 public:
     // #i26791#
     TYPEINFO();
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index d85ac1be10..9135ea766f 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -36,6 +36,7 @@
 #include "swrect.hxx"
 #include "calbck.hxx"	// fuer SwClient
 #include <svl/brdcst.hxx>
+#include "IDocumentDrawModelAccess.hxx"
 
 #if OSL_DEBUG_LEVEL > 1
 #include <libxml/encoding.h>
@@ -502,6 +503,8 @@ protected:
     void PaintShadow( const SwRect&, SwRect&, const SwBorderAttrs& ) const;
     virtual	void  Modify( const SfxPoolItem*, const SfxPoolItem* );
 
+    virtual const IDocumentDrawModelAccess* getIDocumentDrawModelAccess( );
+
 public:
     TYPEINFO();	//Bereits in Basisklasse Client drin.
 
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index a30327f9fb..47cb131b9a 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -326,6 +326,11 @@ SwFlyFrm::~SwFlyFrm()
     FinitDrawObj();
 }
 
+const IDocumentDrawModelAccess* SwFlyFrm::getIDocumentDrawModelAccess()
+{
+    return GetFmt()->getIDocumentDrawModelAccess();
+}
+
 // OD 2004-01-19 #110582#
 void SwFlyFrm::Unchain()
 {
@@ -2293,7 +2298,7 @@ void SwFrm::AppendDrawObj( SwAnchoredObject& _rNewObj )
     // Assure the control objects and group objects containing controls are on the control layer
     if ( ::CheckControlLayer( _rNewObj.DrawObj() ) )
     {
-        const IDocumentDrawModelAccess* pIDDMA = GetUpper()->GetFmt()->getIDocumentDrawModelAccess();
+        const IDocumentDrawModelAccess* pIDDMA = getIDocumentDrawModelAccess();
         const SdrLayerID aCurrentLayer(_rNewObj.DrawObj()->GetLayer());
         const SdrLayerID aControlLayerID(pIDDMA->GetControlsId());
         const SdrLayerID aInvisibleControlLayerID(pIDDMA->GetInvisibleControlsId());
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 58c6a340b3..e3de4b9120 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -117,6 +117,11 @@ SwFrm::SwFrm( SwModify *pMod, SwFrm* pSib ) :
     bCompletePaint = bInfInvalid = sal_True;
 }
 
+const IDocumentDrawModelAccess* SwFrm::getIDocumentDrawModelAccess()
+{
+    return GetUpper()->GetFmt()->getIDocumentDrawModelAccess();
+}
+
 bool SwFrm::KnowsFormat( const SwFmt& rFmt ) const
 { 
     return GetRegisteredIn() == &rFmt; 
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index baf98794e6..38d4d47288 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2449,10 +2449,10 @@ void DocxAttributeOutput::SectionFormProtection( bool bProtected )
 void DocxAttributeOutput::SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo )
 {
     FastAttributeList* pAttr = m_pSerializer->createAttrList();
-    pAttr->add( FSNS( XML_w, XML_countBy ), OString::valueOf( rLnNumInfo.GetCountBy()).getStr());
+    pAttr->add( FSNS( XML_w, XML_countBy ), OString::valueOf(static_cast<sal_Int32>(rLnNumInfo.GetCountBy())).getStr());
     pAttr->add( FSNS( XML_w, XML_restart ), rLnNumInfo.IsRestartEachPage() ? "newPage" : "continuous" );
     if( rLnNumInfo.GetPosFromLeft())
-        pAttr->add( FSNS( XML_w, XML_distance ), OString::valueOf( rLnNumInfo.GetPosFromLeft()).getStr());
+        pAttr->add( FSNS( XML_w, XML_distance ), OString::valueOf(static_cast<sal_Int32>(rLnNumInfo.GetPosFromLeft())).getStr());
     if( nRestartNo )
         pAttr->add( FSNS( XML_w, XML_start ), OString::valueOf( long( nRestartNo )).getStr());
     XFastAttributeListRef xAttrs( pAttr );