aw079 #i99386# finer granular changes for MPBGO removal

11 files changed, 212 insertions, 6 deletions

diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 284b4da2be66..8affe9314d3c 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -279,6 +279,31 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
         }
         else
         {
+#ifdef NEWPBG
+            // Only this page, get attributes for background fill
+            const SfxItemSet& rBackgroundAttributes = mpPage->getSdrPageProperties().GetItemSet();
+
+            if(XFILL_NONE != ((const XFillStyleItem&)rBackgroundAttributes.Get(XATTR_FILLSTYLE)).GetValue())
+            {
+                // page attributes are used, take them
+                aMergedAttr.Put(rBackgroundAttributes);
+            }
+            else
+            {
+                if(pStyleSheet
+                    && XFILL_NONE != ((const XFillStyleItem&)pStyleSheet->GetItemSet().Get(XATTR_FILLSTYLE)).GetValue())
+                {
+                    // if the page has no fill style, use the settings from the
+                    // background stylesheet (if used)
+                    mergeItemSetsImpl(aMergedAttr, pStyleSheet->GetItemSet());
+                }
+                else
+                {
+                    // no fill style from page, start with no fill style
+                    aMergedAttr.Put(XFillStyleItem(XFILL_NONE));
+                }
+            }
+#else
             // Only this page, check if there is a background-object on that page
             SdrObject* pObj = mpPage->GetBackgroundObj();
             if( pObj )
@@ -294,6 +319,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
                 else
                     aMergedAttr.Put( XFillStyleItem( XFILL_NONE ) );
             }
+#endif
         }
     }
 
@@ -374,12 +400,23 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
 
                 if( mbPageBckgrdDeleted )
                 {
+#ifdef NEWPBG
+                    mpBackgroundObjUndoAction = new SdBackgroundObjUndoAction(
+                        *mpDoc, *mpPage, mpPage->getSdrPageProperties().GetItemSet());
+
+                    if(!mpPage->IsMasterPage())
+                    {
+                        // on normal pages, switch off fill attribute usage
+                        mpPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE));
+                    }
+#else
                     mpBackgroundObjUndoAction = new SdBackgroundObjUndoAction( *mpDoc, *mpPage, mpPage->GetBackgroundObj() );
                     mpPage->SetBackgroundObj( NULL );
 
                     // #110094#-15
                     // tell the page that it's visualization has changed
                     mpPage->ActionChanged();
+#endif
                 }
             }
 
@@ -406,6 +443,14 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
 
             mpDoc->SetChanged(TRUE);
 
+#ifdef NEWPBG
+            // BackgroundFill of Masterpage: no hard attributes allowed
+            SdrPage& rUsedMasterPage = mpPage->IsMasterPage() ? *mpPage : mpPage->TRG_GetMasterPage();
+            OSL_ENSURE(rUsedMasterPage.IsMasterPage(), "No MasterPage (!)");
+            rUsedMasterPage.getSdrPageProperties().ClearItem();
+            OSL_ENSURE(0 != rUsedMasterPage.getSdrPageProperties().GetStyleSheet(),
+                "MasterPage without StyleSheet detected (!)");
+#else
             SdrObject* pObj = mpPage->IsMasterPage() ?
                 mpPage->GetPresObj( PRESOBJ_BACKGROUND ) :
                 ((SdPage&)(mpPage->TRG_GetMasterPage())).GetPresObj( PRESOBJ_BACKGROUND );
@@ -415,6 +460,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
                 SfxItemSet aSet( mpDoc->GetPool() );
                 pObj->SetMergedItemSet(aSet);
             }
+#endif
         }
 
         aNewAttr.Put(*(pTempSet.get()));
@@ -539,6 +585,13 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs )
         if( !mbMasterPage && !mbPageBckgrdDeleted )
         {
             // Only this page
+#ifdef NEWPBG
+            delete mpBackgroundObjUndoAction;
+            mpBackgroundObjUndoAction = new SdBackgroundObjUndoAction(
+                *mpDoc, *mpPage, mpPage->getSdrPageProperties().GetItemSet());
+            mpPage->getSdrPageProperties().ClearItem();
+            mpPage->getSdrPageProperties().PutItemSet(*pArgs);
+#else
             SdrObject* pObj = mpPage->GetBackgroundObj();
 
             delete mpBackgroundObjUndoAction;
@@ -561,6 +614,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs )
             // #110094#-15
             // tell the page that it's visualization has changed
             mpPage->ActionChanged();
+#endif
         }
     }
 
diff --git a/sd/source/ui/func/undoback.cxx b/sd/source/ui/func/undoback.cxx
index b80e834e1d18..47cd4c8262b2 100644
--- a/sd/source/ui/func/undoback.cxx
+++ b/sd/source/ui/func/undoback.cxx
@@ -36,6 +36,10 @@
 #include "sdresid.hxx"
 #include "strings.hrc"
 
+#ifdef NEWPBG
+#include <svl/itemset.hxx>
+#endif
+
 // ---------------------------
 // - BackgroundObjUndoAction -
 // ---------------------------
@@ -44,10 +48,20 @@ TYPEINIT1( SdBackgroundObjUndoAction, SdUndoAction );
 
 // -----------------------------------------------------------------------------
 
+#ifdef NEWPBG
+SdBackgroundObjUndoAction::SdBackgroundObjUndoAction(
+    SdDrawDocument& rDoc,
+    SdPage& rPage,
+    const SfxItemSet& rItenSet)
+:   SdUndoAction(&rDoc),
+    mrPage(rPage),
+    mpItemSet(new SfxItemSet(rItenSet))
+#else
 SdBackgroundObjUndoAction::SdBackgroundObjUndoAction( SdDrawDocument& rDoc, SdPage& rPage, const SdrObject* pBackgroundObj ) :
     SdUndoAction( &rDoc ),
     mrPage( rPage ),
     mpBackgroundObj( pBackgroundObj ? pBackgroundObj->Clone() : NULL )
+#endif
 {
     String aString( SdResId( STR_UNDO_CHANGE_PAGEFORMAT ) );
     SetComment( aString );
@@ -57,13 +71,24 @@ SdBackgroundObjUndoAction::SdBackgroundObjUndoAction( SdDrawDocument& rDoc, SdPa
 
 SdBackgroundObjUndoAction::~SdBackgroundObjUndoAction()
 {
+#ifdef NEWPBG
+    delete mpItemSet;
+#else
     SdrObject::Free( mpBackgroundObj );
+#endif
 }
 
 // -----------------------------------------------------------------------------
 
 void SdBackgroundObjUndoAction::ImplRestoreBackgroundObj()
 {
+#ifdef NEWPBG
+    SfxItemSet* pNew = new SfxItemSet(mrPage.getSdrPageProperties().GetItemSet());
+    mrPage.getSdrPageProperties().ClearItem();
+    mrPage.getSdrPageProperties().PutItemSet(*mpItemSet);
+    delete mpItemSet;
+    mpItemSet = pNew;
+#else
     SdrObject* pOldObj = mrPage.GetBackgroundObj();
 
     if( pOldObj )
@@ -71,6 +96,7 @@ void SdBackgroundObjUndoAction::ImplRestoreBackgroundObj()
 
     mrPage.SetBackgroundObj( mpBackgroundObj );
     mpBackgroundObj = pOldObj;
+#endif
 
     // #110094#-15
     // tell the page that it's visualization has changed
@@ -95,5 +121,9 @@ void SdBackgroundObjUndoAction::Redo()
 
 SdUndoAction* SdBackgroundObjUndoAction::Clone() const
 {
+#ifdef NEWPBG
+    return new SdBackgroundObjUndoAction(*mpDoc, mrPage, *mpItemSet);
+#else
     return new SdBackgroundObjUndoAction( *mpDoc, mrPage, mpBackgroundObj );
+#endif
 }
diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx
index b6a1182339f4..fa3d3a13b1e2 100644
--- a/sd/source/ui/inc/drawview.hxx
+++ b/sd/source/ui/inc/drawview.hxx
@@ -77,7 +77,9 @@ public:
 
     void    PresPaint(const Region& rRegion);
 
+#ifndef NEWPBG
     virtual SdrObject* GetMaxToBtmObj(SdrObject* pObj) const;
+#endif
 
     virtual void DeleteMarked(); // from SdrView
 protected:
diff --git a/sd/source/ui/inc/undoback.hxx b/sd/source/ui/inc/undoback.hxx
index 68c4334bfa9a..aac9640a4c46 100644
--- a/sd/source/ui/inc/undoback.hxx
+++ b/sd/source/ui/inc/undoback.hxx
@@ -31,11 +31,18 @@
 #ifndef _SD_UNDOBACK_HXX
 #define _SD_UNDOBACK_HXX
 
+#define NEWPBG
+
 #include "sdundo.hxx"
 
 class SdDrawDocument;
 class SdPage;
+
+#ifdef NEWPBG
+class SfxItemSet;
+#else
 class SdrObject;
+#endif
 
 // -----------------------------
 // - SdBackgroundObjUndoAction -
@@ -46,7 +53,11 @@ class SdBackgroundObjUndoAction : public SdUndoAction
 private:
 
     SdPage&                 mrPage;
+#ifdef NEWPBG
+    SfxItemSet*             mpItemSet;
+#else
     SdrObject*              mpBackgroundObj;
+#endif
 
     void                    ImplRestoreBackgroundObj();
 
@@ -54,7 +65,14 @@ public:
 
                             TYPEINFO();
 
+#ifdef NEWPBG
+                            SdBackgroundObjUndoAction(
+                                SdDrawDocument& rDoc,
+                                SdPage& rPage,
+                                const SfxItemSet& rItenSet);
+#else
                             SdBackgroundObjUndoAction( SdDrawDocument& rDoc, SdPage& rPage, const SdrObject* pBackgroundObj );
+#endif
     virtual                 ~SdBackgroundObjUndoAction();
 
     virtual void            Undo();
diff --git a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx
index 19e51186299b..499faea57abf 100644
--- a/sd/source/ui/toolpanel/controls/DocumentHelper.cxx
+++ b/sd/source/ui/toolpanel/controls/DocumentHelper.cxx
@@ -46,7 +46,9 @@
 #include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include "stlpool.hxx"
-
+#ifdef NEWPBG
+#include <svx/xfillit0.hxx>
+#endif
 using namespace ::com::sun::star;
 
 namespace sd { namespace toolpanel { namespace controls {
@@ -448,10 +450,18 @@ void DocumentHelper::AssignMasterPageToPage (
         // 1. Remove the background object (so that that, if it exists, does
         // not override the new master page) and assign the master page to
         // the regular slide.
+#ifdef NEWPBG
+        pDocument->GetDocSh()->GetUndoManager()->AddUndoAction(
+            new SdBackgroundObjUndoAction(
+                *pDocument, *pPage, pPage->getSdrPageProperties().GetItemSet()),
+            TRUE);
+        pPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE));
+#else
         pDocument->GetDocSh()->GetUndoManager()->AddUndoAction(
             new SdBackgroundObjUndoAction(*pDocument, *pPage, pPage->GetBackgroundObj()),
                 TRUE);
         pPage->SetBackgroundObj(NULL);
+#endif
 
         pDocument->SetMasterPage (
             (pPage->GetPageNum()-1)/2,
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 8906059e57cf..8a03c67c97ec 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -455,7 +455,7 @@ void SdXImpressDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
         {
             if( hasEventListeners() )
             {
-
+#ifndef NEWPBG
                 bool bBackgroundShape = false;
 
                 // the background shape itself has no api representation, so filter all notifies for it
@@ -467,6 +467,7 @@ void SdXImpressDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
                 }
 
                 if( !bBackgroundShape )
+#endif
                 {
                     document::EventObject aEvent;
                     if( SvxUnoDrawMSFactory::createEvent( mpDoc, pSdrHint, aEvent ) )
@@ -2705,13 +2706,19 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn
         pMPage->SetLayoutName( aLayoutName );
         mpDoc->InsertMasterPage(pMPage,  (USHORT)nInsertPos);
 
-        { // insert background object
+        {
+#ifdef NEWPBG
+            // ensure default MasterPage fill
+            pMPage->EnsureMasterPageDefaultBackground();
+#else
+            // insert background object
             Point aBackgroundPos ( pMPage->GetLftBorder(), pMPage->GetUppBorder() );
             Size aBackgroundSize ( pMPage->GetSize() );
             aBackgroundSize.Width()  -= pMPage->GetLftBorder() + pMPage->GetRgtBorder() - 1;
             aBackgroundSize.Height() -= pMPage->GetUppBorder() + pMPage->GetLwrBorder() - 1;
             Rectangle aBackgroundRect (aBackgroundPos, aBackgroundSize);
             pMPage->CreatePresObj(PRESOBJ_BACKGROUND, FALSE, aBackgroundRect, sal_True );
+#endif
         }
 
         xDrawPage = uno::Reference< drawing::XDrawPage >::query( pMPage->getUnoPage() );
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 685bb4a48144..37e874eecbf4 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -1392,9 +1392,11 @@ Reference< drawing::XShape >  SdGenericDrawPage::_CreateShape( SdrObject *pObj )
             case PRESOBJ_TABLE:
                 aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("TableShape") );
                 break;
+#ifndef NEWPBG
             case PRESOBJ_BACKGROUND:
                 DBG_ASSERT( sal_False, "Danger! Someone got hold of the horrible background shape!" );
                 break;
+#endif
             case PRESOBJ_PAGE:
                 aShapeType += String( RTL_CONSTASCII_USTRINGPARAM("PageShape") );
                 break;
@@ -2469,16 +2471,22 @@ void SdDrawPage::setBackground( const Any& rValue )
 
     if( !xSet.is() )
     {
+#ifdef NEWPBG
+        // the easy case, no background set. Set XFILL_NONE to represent this
+        GetPage()->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE));
+#else
         // the easy case, clear the background obj
         GetPage()->SetBackgroundObj( NULL );
 
         // #110094#-15
         // tell the page that it's visualization has changed
         GetPage()->ActionChanged();
+#endif
 
         return;
     }
 
+#ifndef NEWPBG
     // prepare background object
     SdrObject* pObj = GetPage()->GetBackgroundObj();
     if( NULL == pObj )
@@ -2502,6 +2510,7 @@ void SdDrawPage::setBackground( const Any& rValue )
     aSize.Height() -= nUpper + nLower - 1;
     Rectangle aRect( aPos, aSize );
     pObj->SetLogicRect( aRect );
+#endif
 
     // is it our own implementation?
     SdUnoPageBackground* pBack = SdUnoPageBackground::getImplementation( xSet );
@@ -2540,11 +2549,22 @@ void SdDrawPage::setBackground( const Any& rValue )
 //-/    pObj->NbcSetAttributes( aSet, sal_False );
     if( aSet.Count() == 0 )
     {
+#ifdef NEWPBG
+        // no background fill, represent by setting XFILL_NONE
+        GetPage()->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE));
+#else
         GetPage()->SetBackgroundObj( NULL );
+#endif
     }
     else
     {
+#ifdef NEWPBG
+        // background fill, set at page (not sure if ClearItem is needed)
+        GetPage()->getSdrPageProperties().ClearItem();
+        GetPage()->getSdrPageProperties().PutItemSet(aSet);
+#else
         pObj->SetMergedItemSet(aSet);
+#endif
     }
 
     // repaint only
@@ -2575,6 +2595,23 @@ Reference< XAnnotationEnumeration > SAL_CALL SdGenericDrawPage::createAnnotation
 
 void SdDrawPage::getBackground( Any& rValue ) throw()
 {
+#ifdef NEWPBG
+    const SfxItemSet& rFillAttributes = GetPage()->getSdrPageProperties().GetItemSet();
+
+       if(XFILL_NONE == ((const XFillStyleItem&)rFillAttributes.Get(XATTR_FILLSTYLE)).GetValue())
+    {
+        // no fill set (switched off by XFILL_NONE), clear rValue to represent this
+        rValue.clear();
+    }
+    else
+    {
+        // there is a fill set, export to rValue
+        Reference< beans::XPropertySet > xSet(new SdUnoPageBackground(
+            GetModel()->GetDoc(),
+            &GetPage()->getSdrPageProperties().GetItemSet()));
+        rValue <<= xSet;
+    }
+#else
     SdrObject* pObj = GetPage()->GetBackgroundObj();
     if( NULL == pObj )
     {
@@ -2585,6 +2622,7 @@ void SdDrawPage::getBackground( Any& rValue ) throw()
         Reference< beans::XPropertySet > xSet( new SdUnoPageBackground( GetModel()->GetDoc(), pObj ) );
         rValue <<= xSet;
     }
+#endif
 }
 
 void SdGenericDrawPage::setNavigationOrder( const Any& rValue )
@@ -2966,7 +3004,11 @@ void SdMasterPage::setBackground( const Any& rValue )
                 }
             }
 
-
+#ifdef NEWPBG
+            // if no background style is available, set at page directly. This
+            // is an error and should NOT happen (and will be asserted from the SdrPage)
+            GetPage()->getSdrPageProperties().PutItemSet(aSet);
+#else
             // if no background style is available, try the background object
             SdrObject* pObj = GetPage()->GetPresObj(PRESOBJ_BACKGROUND);
             if( pObj == NULL )
@@ -2976,6 +3018,7 @@ void SdMasterPage::setBackground( const Any& rValue )
 
             // repaint only
             SvxFmDrawPage::mpPage->ActionChanged();
+#endif
         }
     }
     catch( Exception& )
@@ -3018,6 +3061,21 @@ void SdMasterPage::getBackground( Any& rValue ) throw()
                 }
             }
 
+#ifdef NEWPBG
+            // No style found, use fill attributes from page background. This
+            // should NOT happen and is an error
+            const SfxItemSet& rFallbackItemSet(SvxFmDrawPage::mpPage->getSdrPageProperties().GetItemSet());
+
+            if(XFILL_NONE == ((const XFillStyleItem&)rFallbackItemSet.Get(XATTR_FILLSTYLE)).GetValue())
+            {
+                rValue <<= Reference< beans::XPropertySet >(
+                    new SdUnoPageBackground(GetModel()->GetDoc(), &rFallbackItemSet));
+            }
+            else
+            {
+                rValue.clear();
+            }
+#else
             // no stylesheet? try old fashion background rectangle
             SdrObject* pObj = NULL;
             if( SvxFmDrawPage::mpPage->GetObjCount() >= 1 )
@@ -3033,8 +3091,8 @@ void SdMasterPage::getBackground( Any& rValue ) throw()
                 return;
             }
 
-
             rValue.clear();
+#endif
         }
     }
     catch( Exception& )
diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx
index 5150afb2d10f..305b0438f447 100644
--- a/sd/source/ui/unoidl/unopback.cxx
+++ b/sd/source/ui/unoidl/unopback.cxx
@@ -67,6 +67,7 @@ const SvxItemPropertySet* ImplGetPageBackgroundPropertySet()
 
 UNO3_GETIMPLEMENTATION_IMPL( SdUnoPageBackground );
 
+#ifndef NEWPBG
 SdUnoPageBackground::SdUnoPageBackground( SdDrawDocument* pDoc /* = NULL */, SdrObject* pObj /* = NULL */ ) throw()
 : mpPropSet( ImplGetPageBackgroundPropertySet() ), mpSet( NULL ), mpDoc( pDoc )
 {
@@ -79,9 +80,18 @@ SdUnoPageBackground::SdUnoPageBackground( SdDrawDocument* pDoc /* = NULL */, Sdr
             mpSet->Put(pObj->GetMergedItemSet());
     }
 }
+#endif
 
+#ifdef NEWPBG
+SdUnoPageBackground::SdUnoPageBackground(
+    SdDrawDocument* pDoc /* = NULL */,
+    const SfxItemSet* pSet /* = NULL */) throw()
+#else
 SdUnoPageBackground::SdUnoPageBackground( SdDrawDocument* pDoc, const SfxItemSet* pSet ) throw()
-: mpPropSet( ImplGetPageBackgroundPropertySet() ), mpSet( NULL ), mpDoc( pDoc )
+#endif
+:   mpPropSet(ImplGetPageBackgroundPropertySet()),
+    mpSet(NULL),
+    mpDoc(pDoc)
 {
     if( pDoc )
     {
diff --git a/sd/source/ui/unoidl/unopback.hxx b/sd/source/ui/unoidl/unopback.hxx
index eace69d82c9c..b82993a50ffe 100644
--- a/sd/source/ui/unoidl/unopback.hxx
+++ b/sd/source/ui/unoidl/unopback.hxx
@@ -42,9 +42,13 @@
 
 #include <cppuhelper/implbase4.hxx>
 
+#define NEWPBG
+
 const SvxItemPropertySet* ImplGetPageBackgroundPropertySet();
 
+#ifndef NEWPBG
 class SdrObject;
+#endif
 class SdDrawDocument;
 class SfxItemSet;
 
@@ -62,8 +66,12 @@ protected:
 
     const SfxItemPropertySimpleEntry* getPropertyMapEntry( const ::rtl::OUString& rPropertyName ) const throw();
 public:
+#ifdef NEWPBG
+    SdUnoPageBackground( SdDrawDocument* pDoc = NULL, const SfxItemSet* pSet = NULL) throw();
+#else
     SdUnoPageBackground( SdDrawDocument* pDoc = NULL, SdrObject* pObj = NULL ) throw();
     SdUnoPageBackground( SdDrawDocument* pDoc, const SfxItemSet* pSet ) throw();
+#endif
     ~SdUnoPageBackground() throw();
 
     // internal
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index dfbd76e4a3b6..676437ed14fe 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -305,9 +305,14 @@ BOOL DrawView::SetAttributes(const SfxItemSet& rSet,
                     PresObjKind ePresObjKind = rPage.GetPresObjKind(pObject);
                     String aTemplateName(aLayoutName);
 
+#ifdef NEWPBG
+                    if (ePresObjKind == PRESOBJ_TITLE ||
+                        ePresObjKind == PRESOBJ_NOTES)
+#else
                     if (ePresObjKind == PRESOBJ_TITLE ||
                         ePresObjKind == PRESOBJ_NOTES ||
                         ePresObjKind == PRESOBJ_BACKGROUND)
+#endif
                     {
                         // Presentation object (except outline)
                         SfxStyleSheet* pSheet = rPage.GetStyleSheetForPresObj( ePresObjKind );
@@ -580,6 +585,7 @@ void DrawView::HideSdrPage()
     ::sd::View::HideSdrPage();
 }
 
+#ifndef NEWPBG
 SdrObject* DrawView::GetMaxToBtmObj(SdrObject* pObj) const
 {
     if( pObj )
@@ -590,6 +596,7 @@ SdrObject* DrawView::GetMaxToBtmObj(SdrObject* pObj) const
     }
     return NULL;
 }
+#endif
 
 void DrawView::DeleteMarked()
 {
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index debe811a6a22..4806e33be464 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -265,7 +265,9 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP
                 {
                     eKind = pObjectsSdPage ? pObjectsSdPage->GetPresObjKind(pObject) : PRESOBJ_NONE;
 
+#ifndef NEWPBG
                     if( eKind != PRESOBJ_BACKGROUND )
+#endif
                     {
                         bCreateOutline = true;
                     }