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

INTEGRATION: CWS impress20ea (1.78.62); FILE MERGED

Browse source 
2004/10/14 13:15:34 af 1.78.62.2: RESYNC: (1.78-1.80); FILE MERGED
2004/09/20 16:26:03 af 1.78.62.1: #i34011# New master pages are named before they are inserted.
This commit is contained in:
Pascal Junck 2004-10-28 12:32:49 +00:00
parent 1e1d860bfd
commit 0dba7809c9
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sd/source/ui/unoidl/unomodel.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: unomodel.cxx,v $
*
* $Revision: 1.81 $
* $Revision: 1.82 $
*
* last change: $Author: pjunck $ $Date: 2004-10-28 09:49:05 $
* last change: $Author: pjunck $ $Date: 2004-10-28 13:32:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -2700,8 +2700,8 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn
pPage->GetUppBorder(),
pPage->GetRgtBorder(),
pPage->GetLwrBorder() );
pDoc->InsertMasterPage(pMPage, (USHORT)nInsertPos);
pMPage->SetLayoutName( aLayoutName );
pDoc->InsertMasterPage(pMPage, (USHORT)nInsertPos);
{ // insert background object
Point aBackgroundPos ( pMPage->GetLftBorder(), pMPage->GetUppBorder() );
@ -2722,9 +2722,9 @@ uno::Reference< drawing::XDrawPage > SAL_CALL SdMasterPagesAccess::insertNewByIn
pRefNotesPage->GetUppBorder(),
pRefNotesPage->GetRgtBorder(),
pRefNotesPage->GetLwrBorder() );
pMNotesPage->SetLayoutName( aLayoutName );
pDoc->InsertMasterPage(pMNotesPage, (USHORT)nInsertPos + 1);
// pMNotesPage->InsertMasterPage( pMPage->GetPageNum() );
pMNotesPage->SetLayoutName( aLayoutName );
pMNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, sal_True, sal_True);
mpModel->SetModified();
}