Finished rebasing to master.

I forgot some lines while rebasing and had to fix this here.

Change-Id: I6a29497aa779d2b104db685161d89ae7c27805b3

sw/source/core/unocore/unoframe.cxx

@@ -1681,13 +1681,8 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
             if( nZOrder >= 0 && std::find(aTextBoxes.begin(), aTextBoxes.end(), pFmt) == aTextBoxes.end())
             {
                 SdrObject* pObject =
-<<<<<<< HEAD
                     GetOrCreateSdrObject( (SwFlyFrmFmt&)*pFmt );
-                SdrModel *pDrawModel = pDoc->GetDrawModel();
-=======
-                    GetOrCreateSdrObject( (SwFlyFrmFmt*)pFmt );
                 SdrModel *pDrawModel = pDoc->getIDocumentDrawModelAccess().GetDrawModel();
->>>>>>> Split out IDocumentDrawModelAccess from SwDoc.
                 pDrawModel->GetPage(0)->
                             SetObjectOrdNum(pObject->GetOrdNum(), nZOrder);
             }
@@ -3034,13 +3029,8 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
                     pDoc->SetFlyName((SwFlyFrmFmt&)*pFrmFmt, m_sName);
             }
         }
-<<<<<<< HEAD
-        if( pFmt && pDoc->GetDrawModel() )
-            GetOrCreateSdrObject(*pFmt);
-=======
         if( pFmt && pDoc->getIDocumentDrawModelAccess().GetDrawModel() )
-            GetOrCreateSdrObject( pFmt );
->>>>>>> Split out IDocumentDrawModelAccess from SwDoc.
+            GetOrCreateSdrObject(*pFmt);
         const ::uno::Any* pOrder;
         if( pProps->GetProperty(FN_UNO_Z_ORDER, 0, pOrder) )
             setPropertyValue(UNO_NAME_Z_ORDER, *pOrder);

sw/source/filter/xml/xmltexti.cxx

@@ -596,13 +596,8 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink(
 
             SwXFrame *pXFrame = SwXFrames::GetObject( *pFrmFmt, FLYCNTTYPE_OLE );
             xPropSet = pXFrame;
-<<<<<<< HEAD
-            if( pDoc->GetDrawModel() )
-                SwXFrame::GetOrCreateSdrObject(*
-=======
             if( pDoc->getIDocumentDrawModelAccess().GetDrawModel() )
-                SwXFrame::GetOrCreateSdrObject(
->>>>>>> Split out IDocumentDrawModelAccess from SwDoc.
+                SwXFrame::GetOrCreateSdrObject(*
                         static_cast<SwFlyFrmFmt*>( pXFrame->GetFrmFmt() ) ); // req for z-order
         }
     }
@@ -658,13 +653,8 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertApplet(
                                        NULL);
     SwXFrame *pXFrame = SwXFrames::GetObject( *pFrmFmt, FLYCNTTYPE_OLE );
     xPropSet = pXFrame;
-<<<<<<< HEAD
-    if( pDoc->GetDrawModel() )
-        SwXFrame::GetOrCreateSdrObject(*
-=======
     if( pDoc->getIDocumentDrawModelAccess().GetDrawModel() )
-        SwXFrame::GetOrCreateSdrObject(
->>>>>>> Split out IDocumentDrawModelAccess from SwDoc.
+        SwXFrame::GetOrCreateSdrObject(*
                 static_cast<SwFlyFrmFmt*>( pXFrame->GetFrmFmt() ) ); // req for z-order
 
     return xPropSet;
@@ -736,13 +726,8 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin(
                                             NULL);
             SwXFrame *pXFrame = SwXFrames::GetObject( *pFrmFmt, FLYCNTTYPE_OLE );
             xPropSet = pXFrame;
-<<<<<<< HEAD
-            if( pDoc->GetDrawModel() )
-                SwXFrame::GetOrCreateSdrObject(*
-=======
             if( pDoc->getIDocumentDrawModelAccess().GetDrawModel() )
-                SwXFrame::GetOrCreateSdrObject(
->>>>>>> Split out IDocumentDrawModelAccess from SwDoc.
+                SwXFrame::GetOrCreateSdrObject(*
                         static_cast<SwFlyFrmFmt*>( pXFrame->GetFrmFmt() ) ); // req for z-order
         }
     }
@@ -892,13 +877,8 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
                                             NULL);
             SwXFrame *pXFrame = SwXFrames::GetObject( *pFrmFmt, FLYCNTTYPE_OLE );
             xPropSet = pXFrame;
-<<<<<<< HEAD
-            if( pDoc->GetDrawModel() )
-                SwXFrame::GetOrCreateSdrObject(*
-=======
             if( pDoc->getIDocumentDrawModelAccess().GetDrawModel() )
-                SwXFrame::GetOrCreateSdrObject(
->>>>>>> Split out IDocumentDrawModelAccess from SwDoc.
+                SwXFrame::GetOrCreateSdrObject(*
                         static_cast<SwFlyFrmFmt*>( pXFrame->GetFrmFmt() ) ); // req for z-order
         }
     }

sw/source/uibase/uno/SwXDocumentSettings.cxx

@@ -801,7 +801,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf
         case HANDLE_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING:
         {
             bool bTmp = *(sal_Bool*)rValue.getValue();
-            mpDoc->set(IDocumentSettingAccess::APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING, bTmp);
+            mpDoc->getIDocumentSettingAccess().set(IDocumentSettingAccess::APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING, bTmp);
         }
         break;
         default:
@@ -1229,7 +1229,7 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf
         break;
         case HANDLE_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING:
         {
-            sal_Bool bTmp = mpDoc->get( IDocumentSettingAccess::APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING );
+            sal_Bool bTmp = mpDoc->getIDocumentSettingAccess().get( IDocumentSettingAccess::APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING );
             rValue.setValue( &bTmp, ::getBooleanCppuType() );
         }
         break;