strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CWS-TOOLING: integrate CWS os139_DEV300

Browse source
This commit is contained in:
Vladimir Glazunov 2009-12-14 10:26:21 +01:00
commit 244c79ea93
2 changed files with 47 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sw/source/core/doc/docnew.cxx
View file

@ -1418,7 +1418,7 @@ void SwDoc::Paste( const SwDoc& rSource )
SwFmtAnchor aAnchor( rCpyFmt.GetAnchor() );
if( FLY_PAGE == aAnchor.GetAnchorId() )
{
aAnchor.SetPageNum( aAnchor.GetPageNum() + /*nStartPageNumber - */1 );
aAnchor.SetPageNum( aAnchor.GetPageNum() /*+ nStartPageNumber - */);
}
else
continue;

59
sw/source/core/view/vprint.cxx
View file

@ -776,16 +776,32 @@ SwDoc * ViewShell::CreatePrtDoc( SfxPrinter* pPrt, SfxObjectShellRef &rDocShellR
pActCrsr = dynamic_cast<SwShellCrsr*>(pActCrsr->GetPrev());
}
// Die Y-Position der ersten Selektion
const Point aSelPoint = pFESh->IsTableMode() ?
pFESh->GetTableCrsr()->GetSttPos() :
pFirstCrsr->GetSttPos();
Point aSelPoint;
if( pFESh->IsTableMode() )
{
SwShellTableCrsr* pShellTblCrsr = pFESh->GetTableCrsr();
const SwCntntNode* pCntntNode = pShellTblCrsr->GetNode()->GetCntntNode();
const SwCntntFrm *pCntntFrm = pCntntNode ? pCntntNode->GetFrm( 0, pShellTblCrsr->Start() ) : 0;
if( pCntntFrm )
{
SwRect aCharRect;
SwCrsrMoveState aTmpState( MV_NONE );
pCntntFrm->GetCharRect( aCharRect, *pShellTblCrsr->Start(), &aTmpState );
aSelPoint = Point( aCharRect.Left(), aCharRect.Top() );
}
}
else
{
aSelPoint = pFirstCrsr->GetSttPos();
}
const SwPageFrm* pPage = GetLayout()->GetPageAtPos( aSelPoint );
ASSERT( pPage, "no page found!" );
// und ihren Seitendescribtor
const SwPageDesc* pPageDesc = pPrtDoc->FindPageDescByName(
pPage->GetPageDesc()->GetName() );
// get page descriptor - fall back to the first one if pPage could not be found
const SwPageDesc* pPageDesc = pPage ? pPrtDoc->FindPageDescByName(
pPage->GetPageDesc()->GetName() ) : &pPrtDoc->_GetPageDesc( (sal_uInt16)0 );
if( !pFESh->IsTableMode() && pActCrsr->HasMark() )
{ // Am letzten Absatz die Absatzattribute richten:
@ -868,15 +884,32 @@ SwDoc * ViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
// Die Y-Position der ersten Selektion
// Die Y-Position der ersten Selektion
const Point aSelPoint = pFESh->IsTableMode() ?
pFESh->GetTableCrsr()->GetSttPos() :
pFirstCrsr->GetSttPos();
Point aSelPoint;
if( pFESh->IsTableMode() )
{
SwShellTableCrsr* pShellTblCrsr = pFESh->GetTableCrsr();
const SwCntntNode* pCntntNode = pShellTblCrsr->GetNode()->GetCntntNode();
const SwCntntFrm *pCntntFrm = pCntntNode ? pCntntNode->GetFrm( 0, pShellTblCrsr->Start() ) : 0;
if( pCntntFrm )
{
SwRect aCharRect;
SwCrsrMoveState aTmpState( MV_NONE );
pCntntFrm->GetCharRect( aCharRect, *pShellTblCrsr->Start(), &aTmpState );
aSelPoint = Point( aCharRect.Left(), aCharRect.Top() );
}
}
else
{
aSelPoint = pFirstCrsr->GetSttPos();
}
const SwPageFrm* pPage = GetLayout()->GetPageAtPos( aSelPoint );
ASSERT( pPage, "no page found!" );
// und ihren Seitendescribtor
const SwPageDesc* pPageDesc = pPrtDoc->FindPageDescByName(
pPage->GetPageDesc()->GetName() );
// get page descriptor - fall back to the first one if pPage could not be found
const SwPageDesc* pPageDesc = pPage ? pPrtDoc->FindPageDescByName(
pPage->GetPageDesc()->GetName() ) : &pPrtDoc->_GetPageDesc( (sal_uInt16)0 );
if( !pFESh->IsTableMode() && pActCrsr->HasMark() )
{ // Am letzten Absatz die Absatzattribute richten: