aw069 changes after resync to m71#

13 files changed, 146 insertions, 160 deletions

diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index 18f8860ecab9..313df12fddb7 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -31,12 +31,20 @@
 #ifndef _BOOKMRK_HXX
 #define _BOOKMRK_HXX
 
-#include <IMark.hxx>
+#include <cppuhelper/weakref.hxx>
+
 #include <sfx2/Metadatable.hxx>
 
 #include <boost/scoped_ptr.hpp>
 #include <boost/noncopyable.hpp>
 
+#include <IMark.hxx>
+
+
+namespace com { namespace sun { namespace star {
+    namespace text { class XTextContent; }
+} } }
+
 struct SwPosition;  // fwd Decl. wg. UI
 class SwDoc;
 
@@ -90,6 +98,17 @@ namespace sw { namespace mark
             {}
 
             virtual ~MarkBase();
+
+            // SwClient
+            virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew );
+
+            const ::com::sun::star::uno::WeakReference<
+                ::com::sun::star::text::XTextContent> & GetXBookmark() const
+                    { return m_wXBookmark; }
+            void SetXBookmark(::com::sun::star::uno::Reference<
+                        ::com::sun::star::text::XTextContent> const& xBkmk)
+                    { m_wXBookmark = xBkmk; }
+
         protected:
             MarkBase(const SwPaM& rPaM,
                 const ::rtl::OUString& rName);
@@ -97,6 +116,9 @@ namespace sw { namespace mark
             ::boost::scoped_ptr<SwPosition> m_pPos2;
             ::rtl::OUString m_aName;
             static ::rtl::OUString GenerateNewName(const ::rtl::OUString& rPrefix);
+
+            ::com::sun::star::uno::WeakReference<
+                ::com::sun::star::text::XTextContent> m_wXBookmark;
     };
 
     class NavigatorReminder
diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx
index c8bbc7be70c6..0825ccc2dfd7 100644
--- a/sw/source/core/inc/cellfrm.hxx
+++ b/sw/source/core/inc/cellfrm.hxx
@@ -51,7 +51,7 @@ public:
 
     virtual BOOL GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* = 0 ) const;
     virtual void Modify( SfxPoolItem*, SfxPoolItem* );
-    virtual void Paint( const SwRect& ) const;
+    virtual void Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const;
     virtual void CheckDirection( BOOL bVert );
 
     const SwTableBox *GetTabBox() const { return pTabBox; }
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index 4e3c196814c6..069d3a92a8dd 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -109,10 +109,10 @@ protected:
                                 //(CheckClip) nur das Format aufgerufen wird;
                                 //nicht aber die Breite anhand der Attribute
                                 //wieder bestimmt wird.
-    BOOL bInCnt         :1; // FLY_IN_CNTNT, als Zeichen verankert
-    BOOL bAtCnt         :1; // FLY_AT_CNTNT, am Absatz verankert
-    BOOL bLayout        :1; // FLY_PAGE, FLY_AT_FLY, an Seite oder Rahmen
-    BOOL bAutoPosition  :1; // FLY_AUTO_CNTNT, im Text verankerter Rahmen
+    BOOL bInCnt         :1; // FLY_AS_CHAR, anchored as character
+    BOOL bAtCnt         :1; // FLY_AT_PARA, anchored at paragraph
+    BOOL bLayout        :1; // FLY_AT_PAGE, FLY_AT_FLY, at page or at frame
+    BOOL bAutoPosition  :1; // FLY_AT_CHAR, anchored at character
     BOOL bNoShrink      :1; // temporary forbud of shrinking to avoid loops
     BOOL bLockDeleteContent :1;           // If the flag is set, the content of the
                                         // fly frame is not deleted if moved to
@@ -161,7 +161,7 @@ public:
     virtual void Modify( SfxPoolItem*, SfxPoolItem* );
         // erfrage vom Client Informationen
     virtual BOOL GetInfo( SfxPoolItem& ) const;
-    virtual void Paint( const SwRect& ) const;
+    virtual void Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const;
     virtual Size ChgSize( const Size& aNewSize );
     virtual BOOL GetCrsrOfst( SwPosition *, Point&,
                               SwCrsrMoveState* = 0 ) const;
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index c9bbb72693ce..aa56e2db55d9 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -56,6 +56,7 @@ class SvxBrushItem;
 class SwSelectionList;
 struct SwPosition;
 struct SwCrsrMoveState;
+class SwPrtOptions;
 
 // --> OD 2004-07-06 #i28701#
 class SwSortedObjs;
@@ -828,7 +829,7 @@ public:
                                  SwCrsrMoveState* = 0 ) const;
     virtual BOOL    GetCharRect( SwRect &, const SwPosition&,
                                  SwCrsrMoveState* = 0 ) const;
-    virtual void    Paint( const SwRect& ) const;
+    virtual void    Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const;
 
     // der "kurze Dienstweg" zwischen den Frames und der Formatierung.
     // Wer den void* falsch Casted ist selbst schuld!
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index ed172b310a01..8cb536f32cba 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -141,7 +141,7 @@ const SwFrm * MA_FASTCALL FindPage( const SwRect &rRect, const SwFrm *pPage );
 
 // JP 07.05.98: wird von SwCntntNode::GetFrm und von SwFlyFrm::GetFrm
 //              gerufen
-SwFrm* GetFrmOfModify( SwModify&, USHORT nFrmType, const Point* = 0,
+SwFrm* GetFrmOfModify( SwModify const&, USHORT const nFrmType, const Point* = 0,
                         const SwPosition *pPos = 0,
                         const BOOL bCalcFrm = FALSE );
 
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index 76262d18a894..e3ee5edf60c1 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -108,7 +108,7 @@ public:
     SwLayoutFrm( SwFrmFmt* );
     ~SwLayoutFrm();
 
-    virtual void Paint( const SwRect& ) const;
+    virtual void Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const;
     const SwFrm *Lower() const { return pLower; }
           SwFrm *Lower()       { return pLower; }
     const SwCntntFrm *ContainsCntnt() const;
diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx
index 81d63e733f9c..ff739b530758 100644
--- a/sw/source/core/inc/notxtfrm.hxx
+++ b/sw/source/core/inc/notxtfrm.hxx
@@ -59,7 +59,7 @@ public:
     ~SwNoTxtFrm();
 
     virtual void Modify( SfxPoolItem*, SfxPoolItem* );
-    virtual void Paint(const SwRect& ) const;
+    virtual void Paint(const SwRect&, const SwPrtOptions *pPrintData = NULL ) const;
     virtual BOOL GetCharRect( SwRect &, const SwPosition&,
                               SwCrsrMoveState* = 0) const;
     BOOL GetCrsrOfst(SwPosition* pPos, Point& aPoint,
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index be5b8acd22da..fd7f97dcb5b3 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -200,7 +200,7 @@ public:
     virtual BOOL  GetCrsrOfst( SwPosition *, Point&,
                                SwCrsrMoveState* = 0 ) const;
 
-    virtual void  Paint( const SwRect& ) const;
+    virtual void  Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const;
     virtual SwTwips ShrinkFrm( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE );
     virtual SwTwips GrowFrm  ( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE );
 #ifdef DBG_UTIL
diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index b41ba4214aa0..bbd2931d7839 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.hxx
@@ -132,7 +132,7 @@ public:
 
     virtual void Modify( SfxPoolItem*, SfxPoolItem* );
     virtual BOOL GetInfo( SfxPoolItem &rHnt ) const;
-    virtual void Paint( const SwRect& ) const;
+    virtual void Paint( const SwRect&, const SwPrtOptions *pPrintData = NULL ) const;
     virtual void  CheckDirection( BOOL bVert );
 
     virtual void Cut();
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 79cd2a1a574c..dc91b188e439 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -296,7 +296,7 @@ public:
 
     void   PaintExtraData( const SwRect & rRect ) const; //Seitennummer usw.
     SwRect Paint();
-    virtual void Paint( const SwRect & ) const;
+    virtual void Paint( const SwRect &, const SwPrtOptions *pPrintData = NULL ) const;
     virtual void Modify( SfxPoolItem*, SfxPoolItem* );
     virtual sal_Bool GetInfo( SfxPoolItem & ) const;
 
diff --git a/sw/source/core/inc/unoclbck.hxx b/sw/source/core/inc/unoclbck.hxx
deleted file mode 100644
index 30a338f358f6..000000000000
--- a/sw/source/core/inc/unoclbck.hxx
+++ /dev/null
@@ -1,52 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: unoclbck.hxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _UNOCLBCK_HXX
-#define _UNOCLBCK_HXX
-#include <calbck.hxx>
-
-class SwXReferenceMark;
-class SwFmtRefMark;
-class SwFmtFtn;
-class SwXFootnote;
-class SwTOXMark;
-class SwXDocumentIndexMark;
-
-class SwUnoCallBack : public SwModify
-{
-public:
-    SwUnoCallBack(SwModify *pToRegisterIn);
-    virtual ~SwUnoCallBack();
-
-    // returns the API object of a reference mark if available
-    SwXReferenceMark*   GetRefMark(const SwFmtRefMark& rMark);
-    SwXFootnote*        GetFootnote(const SwFmtFtn& rMark);
-    SwXDocumentIndexMark* GetTOXMark(const SwTOXMark& rMark);
-};
-#endif
diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx
index 1dc1985f7dfe..39f81caa902a 100755
--- a/sw/source/core/inc/unometa.hxx
+++ b/sw/source/core/inc/unometa.hxx
@@ -31,63 +31,99 @@
 #ifndef SW_UNOMETA_HXX
 #define SW_UNOMETA_HXX
 
-#include "calbck.hxx"
-
-#include <sfx2/Metadatable.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <deque>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/text/XTextContent.hpp>
 #include <com/sun/star/text/XTextField.hpp>
 
-#include <deque>
+#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase5.hxx>
+
+#include <sfx2/Metadatable.hxx>
+
+#include <unobaseclass.hxx>
 
 
 typedef ::std::deque<
     ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > >
     TextRangeList_t;
 
-class SwXTextRange;
 class SwPaM;
-class SwTxtMeta;
+class SwTxtNode;
+
 namespace sw {
     class Meta;
     class MetaField;
 }
 
-typedef
-::cppu::ImplInheritanceHelper5
-< ::sfx2::MetadatableMixin
-, ::com::sun::star::lang::XUnoTunnel
-, ::com::sun::star::lang::XServiceInfo
-, ::com::sun::star::text::XTextContent
-, ::com::sun::star::text::XText
-, ::com::sun::star::container::XEnumerationAccess
-> SwXMetaBaseClass;
+typedef ::cppu::ImplInheritanceHelper5
+<   ::sfx2::MetadatableMixin
+,   ::com::sun::star::lang::XUnoTunnel
+,   ::com::sun::star::lang::XServiceInfo
+,   ::com::sun::star::container::XEnumerationAccess
+,   ::com::sun::star::text::XTextContent
+,   ::com::sun::star::text::XText
+> SwXMeta_Base;
 
 class SwXMeta
-    : public SwXMetaBaseClass
-    , public SwClient
+    : public SwXMeta_Base
     , private ::boost::noncopyable
 {
-private:
-    struct Impl;
-    ::std::auto_ptr<Impl> m_pImpl;
+
+public:
+
+    class Impl;
 
 protected:
+
+    ::sw::UnoImplPtr<Impl> m_pImpl;
+
+    virtual void SAL_CALL AttachImpl(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange > & xTextRange,
+            const USHORT nWhich)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::uno::RuntimeException);
+
     virtual ~SwXMeta();
 
-public:
-    SwXMeta(SwDoc *const pDoc,
+    /// @param pDoc and pMeta != 0, but not & because of ImplInheritanceHelper
+    SwXMeta(SwDoc *const pDoc, ::sw::Meta *const pMeta,
         ::com::sun::star::uno::Reference< ::com::sun::star::text::XText> const&
             xParentText,
-        TextRangeList_t * const pPortions, SwTxtMeta * const pHint);
+        TextRangeList_t const*const pPortions);
+
+public:
+
     SwXMeta(SwDoc *const pDoc);
 
-    TYPEINFO();
+    static ::com::sun::star::uno::Reference<
+            ::com::sun::star::rdf::XMetadatable >
+        CreateXMeta(
+            ::sw::Meta & rMeta,
+            ::com::sun::star::uno::Reference< ::com::sun::star::text::XText>
+                const& xParentText = 0,
+            ::std::auto_ptr<TextRangeList_t const> pPortions =
+                ::std::auto_ptr<TextRangeList_t const>(0));
+
+    /// init params with position of the attribute content (w/out CH_TXTATR)
+    bool SetContentRange(
+            SwTxtNode *& rpNode, xub_StrLen & rStart, xub_StrLen & rEnd) const;
+    ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
+        GetParentText() const;
+
+    bool CheckForOwnMemberMeta(const SwPaM & rPam, const bool bAbsorb)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+               ::com::sun::star::uno::RuntimeException);
+
+    // MetadatableMixin
+    virtual ::sfx2::Metadatable * GetCoreObject();
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
+        GetModel();
 
     static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
@@ -118,6 +154,18 @@ public:
                 ::com::sun::star::lang::XEventListener > & xListener)
         throw (::com::sun::star::uno::RuntimeException);
 
+    // XElementAccess
+    virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL hasElements()
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XEnumerationAccess
+    virtual ::com::sun::star::uno::Reference<
+            ::com::sun::star::container::XEnumeration >  SAL_CALL
+        createEnumeration()
+        throw (::com::sun::star::uno::RuntimeException);
+
     // XTextContent
     virtual void SAL_CALL attach(
             const ::com::sun::star::uno::Reference<
@@ -180,72 +228,37 @@ public:
         throw (::com::sun::star::container::NoSuchElementException,
             ::com::sun::star::uno::RuntimeException);
 
-    // XElementAccess
-    virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
-        throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasElements()
-        throw (::com::sun::star::uno::RuntimeException);
-
-    // XEnumerationAccess
-    virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::container::XEnumeration >  SAL_CALL
-        createEnumeration()
-        throw (::com::sun::star::uno::RuntimeException);
-
-    // MetadatableMixin
-    virtual ::sfx2::Metadatable * GetCoreObject();
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
-        GetModel();
-
-    // SwClient
-    virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew );
-
-    /// init params with position of the attribute content (w/out CH_TXTATR)
-    bool SetContentRange(
-            SwTxtNode *& rpNode, xub_StrLen & rStart, xub_StrLen & rEnd) const;
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
-        GetParentText() const;
-
-    bool CheckForOwnMemberMeta(const SwXTextRange* const pRange,
-            const SwPaM* const pPam, bool bAbsorb)
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::uno::RuntimeException);
-
-protected:
-    virtual void SAL_CALL AttachImpl(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::text::XTextRange > & xTextRange,
-            const USHORT nWhich)
-        throw ( ::com::sun::star::lang::IllegalArgumentException,
-            ::com::sun::star::uno::RuntimeException );
-
-private:
-    inline const ::sw::Meta * GetMeta() const;
-
 };
 
 
-typedef
-::cppu::ImplInheritanceHelper2
-< SwXMeta
-, ::com::sun::star::beans::XPropertySet
-, ::com::sun::star::text::XTextField
-> SwXMetaFieldBaseClass;
+typedef ::cppu::ImplInheritanceHelper2
+<   SwXMeta
+,   ::com::sun::star::beans::XPropertySet
+,   ::com::sun::star::text::XTextField
+> SwXMetaField_Base;
 
 class SwXMetaField
-    : public SwXMetaFieldBaseClass
+    : public SwXMetaField_Base
 {
+
 private:
+
     virtual ~SwXMetaField();
 
-private:
-    inline const ::sw::MetaField * GetMetaField() const;
+    friend ::com::sun::star::uno::Reference<
+            ::com::sun::star::rdf::XMetadatable >
+        SwXMeta::CreateXMeta(::sw::Meta &,
+            ::com::sun::star::uno::Reference< ::com::sun::star::text::XText>
+                const&,
+            ::std::auto_ptr<TextRangeList_t const> pPortions);
 
-public:
-    SwXMetaField(SwDoc *const pDoc,
+    SwXMetaField(SwDoc *const pDoc, ::sw::Meta *const pMeta,
         ::com::sun::star::uno::Reference< ::com::sun::star::text::XText> const&
             xParentText,
-        TextRangeList_t * const pPortions, SwTxtMeta * const pHint);
+        TextRangeList_t const*const pPortions);
+
+public:
+
     SwXMetaField(SwDoc *const pDoc);
 
     // XServiceInfo
@@ -270,16 +283,6 @@ public:
                 ::com::sun::star::lang::XEventListener > & xListener)
         throw (::com::sun::star::uno::RuntimeException);
 
-    // XTextContent
-    virtual void SAL_CALL attach(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::text::XTextRange > & xTextRange)
-        throw ( ::com::sun::star::lang::IllegalArgumentException,
-            ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::text::XTextRange > SAL_CALL getAnchor()
-        throw (::com::sun::star::uno::RuntimeException);
-
     // XPropertySet
     virtual ::com::sun::star::uno::Reference<
             ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
@@ -327,6 +330,16 @@ public:
             ::com::sun::star::lang::WrappedTargetException,
             ::com::sun::star::uno::RuntimeException);
 
+    // XTextContent
+    virtual void SAL_CALL attach(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange > & xTextRange)
+        throw ( ::com::sun::star::lang::IllegalArgumentException,
+            ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Reference<
+            ::com::sun::star::text::XTextRange > SAL_CALL getAnchor()
+        throw (::com::sun::star::uno::RuntimeException);
+
     // XTextField
     virtual rtl::OUString SAL_CALL getPresentation(sal_Bool bShowCommand)
         throw (::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx
index eba323bd52a2..026b293a827c 100644
--- a/sw/source/core/inc/viewimp.hxx
+++ b/sw/source/core/inc/viewimp.hxx
@@ -57,6 +57,7 @@ struct SdrPaintProcRec;
 class SwAccessibleMap;
 class SdrObject;
 class Fraction;
+class SwPrtOptions;
 // OD 12.12.2002 #103492#
 class SwPagePreviewLayout;
 // OD 15.01.2003 #103492#
@@ -270,10 +271,11 @@ public:
     // direction at the outliner of the draw view for painting layers <hell>
     // and <heaven>.
     // OD 25.06.2003 #108784# - correct type of 1st parameter
-    void   PaintLayer  ( const SdrLayerID _nLayerID,
-                         const SwRect& _rRect,
-                         const Color* _pPageBackgrdColor = 0,
-                         const bool _bIsPageRightToLeft = false ) const;
+    void   PaintLayer( const SdrLayerID _nLayerID,
+                       const SwPrtOptions *pPrintData,
+                       const SwRect& _rRect,
+                       const Color* _pPageBackgrdColor = 0,
+                       const bool _bIsPageRightToLeft = false ) const;
 
     //wird als Link an die DrawEngine uebergeben, entscheidet was wie
     //gepaintet wird oder nicht.