diff options
| author | Oliver-Rainer Wittmann <od@openoffice.org> | 2010-02-04 15:40:20 +0100 |
|---|---|---|
| committer | Oliver-Rainer Wittmann <od@openoffice.org> | 2010-02-04 15:40:20 +0100 |
| commit | 6deb65760e2787c0b22cf774701f265b7443c379 (patch) | |
| tree | e780f26dae6db61efbf41c8264accf84c0401981 | |
| parent | 604efd1cb3c584d894292d562cff796f89f0241f (diff) | |
sw33bf02: correction needed to general changes between DEV300_m68 and DEV300_m71
| -rw-r--r-- | sw/inc/viewsh.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/doc/doclay.cxx | 8 | ||||
| -rw-r--r-- | sw/source/core/frmedt/fefly1.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 8dceafbcfc64..e8f03899f3ec 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -192,7 +192,7 @@ class SW_DLLPUBLIC ViewShell : public Ring SW_DLLPRIVATE sal_Bool CheckInvalidForPaint( const SwRect & );//Direkt Paint oder lieber //eine Aktion ausloesen. - SW_DLLPRIVATE void PrepareForPrint( const SwPrtOptions &rOptions ); + SW_DLLPRIVATE void PrepareForPrint( const SwPrintData &rOptions ); SW_DLLPRIVATE void ImplApplyViewOptions( const SwViewOption &rOpt ); diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index e826c182d735..75c74a32a1da 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -657,9 +657,9 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos, // --> OD 2010-01-07 #i107811# // Assure that at-page anchored fly frames have a page num or a content anchor set. if ( !pAnchor || - ( FLY_PAGE != pAnchor->GetAnchorId() && + ( FLY_AT_PAGE != pAnchor->GetAnchorId() && !pAnchor->GetCntntAnchor() ) || - ( FLY_PAGE == pAnchor->GetAnchorId() && + ( FLY_AT_PAGE == pAnchor->GetAnchorId() && !pAnchor->GetCntntAnchor() && pAnchor->GetPageNum() == 0 ) ) { @@ -680,8 +680,8 @@ SwFlyFrmFmt* SwDoc::_MakeFlySection( const SwPosition& rAnchPos, } eAnchorId = aAnch.GetAnchorId(); - if ( FLY_PAGE != eAnchorId || - ( FLY_PAGE == eAnchorId && + if ( FLY_AT_PAGE != eAnchorId || + ( FLY_AT_PAGE == eAnchorId && ( !pAnchor || aAnch.GetPageNum() == 0 ) ) ) { diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 5bf9c1e7c17f..ed41bd69cc2c 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -919,7 +919,7 @@ void SwFEShell::InsertDrawObj( SdrObject& rDrawObj, SET_CURR_SHELL( this ); SfxItemSet rFlyAttrSet( GetDoc()->GetAttrPool(), aFrmFmtSetRange ); - rFlyAttrSet.Put( SwFmtAnchor( FLY_AT_CNTNT )); + rFlyAttrSet.Put( SwFmtAnchor( FLY_AT_PARA )); // --> OD 2009-12-29 #i89920# rFlyAttrSet.Put( SwFmtSurround( SURROUND_THROUGHT ) ); rDrawObj.SetLayer( getIDocumentDrawModelAccess()->GetHeavenId() ); diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 13bbb5e82a10..3e480b67352d 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -2829,7 +2829,7 @@ void SwFlyFrmFmt::MakeFrms() } else { - aAnchorAttr.SetType( FLY_AT_CNTNT ); + aAnchorAttr.SetType( FLY_AT_PARA ); SetFmtAttr( aAnchorAttr ); MakeFrms(); return; |