diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-01-05 10:48:18 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-01-05 10:48:18 +0000 |
| commit | 926f008f185c7472aae74f93b5f30203517dfe59 (patch) | |
| tree | 698c154d2e97340c92815eec09ae8c32143ef66a /sw/source/ui/app/docstyle.cxx | |
| parent | c5f76c14fa6b2f2eda70adfbde373d2556efa446 (diff) | |
INTEGRATION: CWS swqcore02 (1.14.132); FILE MERGED
2004/12/14 14:00:55 hbrinkm 1.14.132.2: RESYNC: (1.14-1.15); FILE MERGED
2004/12/01 08:48:57 hbrinkm 1.14.132.1: #i37940# MakeFrmFmt takes care about auto flag
Diffstat (limited to 'sw/source/ui/app/docstyle.cxx')
| -rw-r--r-- | sw/source/ui/app/docstyle.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx index 92f7a865238f..9d162389a2b7 100644 --- a/sw/source/ui/app/docstyle.cxx +++ b/sw/source/ui/app/docstyle.cxx @@ -2,9 +2,9 @@ * * $RCSfile: docstyle.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: rt $ $Date: 2004-11-26 13:32:13 $ + * last change: $Author: obo $ $Date: 2005-01-05 11:48:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -178,7 +178,6 @@ // Ausserdem gibt es jetzt zusaetzlich das Bit bPhysical. Ist dieses Bit // TRUE, werden die Pool-Formatnamen NICHT mit eingetragen. - class SwImplShellAction { SwWrtShell* pSh; @@ -1734,7 +1733,7 @@ BOOL SwDocStyleSheet::FillStyleSheet( FillStyleType eFType ) --------------------------------------------------------------------*/ -void SwDocStyleSheet::Create() +void SwDocStyleSheet::Create() { switch(nFamily) { @@ -1761,8 +1760,8 @@ void SwDocStyleSheet::Create() case SFX_STYLE_FAMILY_FRAME: pFrmFmt = lcl_FindFrmFmt( rDoc, aName ); if( !pFrmFmt ) - pFrmFmt = rDoc.MakeFrmFmt(aName, rDoc.GetDfltFrmFmt()); - pFrmFmt->SetAuto( FALSE ); + pFrmFmt = rDoc.MakeFrmFmt(aName, rDoc.GetDfltFrmFmt(), FALSE); + break; case SFX_STYLE_FAMILY_PAGE : @@ -2674,6 +2673,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First() for( USHORT i = 0; i < nArrLen; i++ ) { SwFrmFmt* pFmt = (*rDoc.GetFrmFmts())[ i ]; + if(pFmt->IsDefault() || pFmt->IsAuto()) { continue; |