diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-07-04 12:25:49 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-07-04 12:25:49 +0000 |
| commit | 37d701fd919a74d23541b39ee5a419556fd5752a (patch) | |
| tree | b0a9e2382e7e4877da4080df2e2b96af2e7cee27 /sw/source/core/view/vdraw.cxx | |
| parent | 648ab155dd7388b6858028892e8eb94d1d32c1a4 (diff) | |
INTEGRATION: CWS aig02 (1.8.38); FILE MERGED
2003/07/02 16:07:53 od 1.8.38.3: #108784# - further adjustments for support of drawing objects in header/footer
2003/06/26 18:09:23 od 1.8.38.2: #108784# - further adjustments for support of drawing objects in header/footer
2003/06/23 15:26:55 od 1.8.38.1: #108784# - further adjustments for supporting drawing objects in header/footer
Diffstat (limited to 'sw/source/core/view/vdraw.cxx')
| -rw-r--r-- | sw/source/core/view/vdraw.cxx | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx index bcf4e7d63e57..cdbe31067703 100644 --- a/sw/source/core/view/vdraw.cxx +++ b/sw/source/core/view/vdraw.cxx @@ -2,9 +2,9 @@ * * $RCSfile: vdraw.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: vg $ $Date: 2003-04-17 14:47:20 $ + * last change: $Author: vg $ $Date: 2003-07-04 13:25:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -232,7 +232,9 @@ void SwViewImp::UnlockPaint() // OD 09.12.2002 #103045# - add 4th parameter for the horizontal text direction // of the page in order to set the default horizontal text direction at the // outliner of the draw view for painting layers <hell> and <heaven>. -void SwViewImp::PaintLayer( const BYTE _nLayerID, const SwRect& _rRect, +// OD 25.06.2003 #108784# - correct type of 1st parameter +void SwViewImp::PaintLayer( const SdrLayerID _nLayerID, + const SwRect& _rRect, const Color* _pPageBackgrdColor, const bool _bIsPageRightToLeft ) const { @@ -310,9 +312,9 @@ IMPL_LINK( SwViewImp, PaintDispatcher, SdrPaintProcRec *, pRec ) if ( !SwFlyFrm::IsPaint( pObj, GetShell() ) ) return 0; - const BYTE nHellId = GetShell()->GetDoc()->GetHellId(); if ( pObj->IsWriterFlyFrame() ) { + const SdrLayerID nHellId = GetShell()->GetDoc()->GetHellId(); if( pObj->GetLayer() == nHellId ) { //Fuer Rahmen in der Hoelle gelten andere Regeln: @@ -515,6 +517,12 @@ void SwViewImp::NotifySizeChg( const Size &rNewSz ) FLY_IN_CNTNT == pCont->GetFmt()->GetAnchor().GetAnchorId() ) continue; + // OD 19.06.2003 #108784# - no move for drawing objects in header/footer + if ( pAnchor->FindFooterOrHeader() ) + { + continue; + } + const Rectangle aBound( pObj->GetBoundRect() ); if ( !aRect.IsInside( aBound ) ) { |