4 files changed, 9 insertions, 6 deletions
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index fdf5f8c7db18..7e92020eb88f 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -477,7 +477,6 @@
 #include "sfx2/tabdlg.hxx"
 #include "sfx2/tbxctrl.hxx"
 #include "sfx2/templdlg.hxx"
-#include "sfx2/topfrm.hxx"
 #include "sfx2/tplpitem.hxx"
 #include "sfx2/viewfac.hxx"
 #include "sfx2/viewfrm.hxx"
diff --git a/sd/inc/pres.hxx b/sd/inc/pres.hxx
index 6dd9b08ea442..6efd1cbe89f2 100644
--- a/sd/inc/pres.hxx
+++ b/sd/inc/pres.hxx
@@ -39,7 +39,6 @@ enum PresObjKind
     PRESOBJ_ORGCHART,
     PRESOBJ_TABLE,
     PRESOBJ_IMAGE,
-    PRESOBJ_BACKGROUND,
     PRESOBJ_PAGE,
     PRESOBJ_HANDOUT,
     PRESOBJ_NOTES,
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index dff2344a5395..0dad3ca237cb 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -69,6 +69,11 @@ class DrawDocShell;
 class SdGlobalResourceContainer;
 }
 
+namespace com { namespace sun { namespace star { namespace frame {
+    class XFrame;
+} } } }
+
+
 // ----------------------
 // - SdOptionStreamMode -
 // ----------------------
@@ -165,8 +170,8 @@ private:
     SfxFrame* ExecuteNewDocument( SfxRequest& rReq );
 
     static void ChangeMedium( ::sd::DrawDocShell* pDocShell, SfxViewFrame* pViewFrame, const sal_Int32 eMedium );
-    static SfxFrame* CreateEmptyDocument( DocumentType eDocType, SfxFrame* pTargetFrame = 0  );
-    static SfxFrame* CreateFromTemplate( const String& rTemplatePath, SfxFrame* pTargetFrame = 0 );
+    static SfxFrame* CreateEmptyDocument( DocumentType eDocType, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame );
+    static SfxFrame* CreateFromTemplate( const String& rTemplatePath, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame );
 
     /** The resource container controls the lifetime of some singletons.
     */
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 76d0317fe735..51a1a03d838a 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -157,8 +157,6 @@ protected:
     /** a helper class to manipulate effects inside the main sequence */
     boost::shared_ptr< sd::MainSequence > mpMainSequence;
 
-    void        AdjustBackgroundSize();
-
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage();
 
     SfxItemSet* mpItems;
@@ -194,11 +192,13 @@ public:
 
     sd::ShapeList&  GetPresentationShapeList() { return maPresentationShapeList; }
 
+    void EnsureMasterPageDefaultBackground();
     SdrObject*      CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rectangle& rRect, BOOL bInsert=FALSE);
     SdrObject*      CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert);
     SdrObject*      GetPresObj(PresObjKind eObjKind, int nIndex = 1 );
     PresObjKind     GetPresObjKind(SdrObject* pObj) const;
     String          GetPresObjText(PresObjKind eObjKind) const;
+    SfxStyleSheet* GetStyleSheetForMasterPageBackground() const;
     SfxStyleSheet*  GetStyleSheetForPresObj(PresObjKind eObjKind) const;
     bool            RestoreDefaultText( SdrObject* pObj );