diff options
| author | Michael Brauer <mib@openoffice.org> | 2000-10-12 16:15:50 +0000 |
|---|---|---|
| committer | Michael Brauer <mib@openoffice.org> | 2000-10-12 16:15:50 +0000 |
| commit | d36a09feadeacff355c94ff8bedb9260415b7f31 (patch) | |
| tree | eaec98c185b491bcf5e90d46cb5b9c9106392d83 /sw/source | |
| parent | 344423e3531be91aff2f37125183ad286ea9256c (diff) | |
(Header|Footer)Text(Left)? now don't respect UsedOn property
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/unocore/unostyle.cxx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index c60d1bf2b621..c4b7c01c0091 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unostyle.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-19 00:08:29 $ + * last change: $Author: mib $ $Date: 2000-10-12 17:15:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2306,13 +2306,14 @@ MakeObject: const SwFrmFmt* pFrmFmt = 0; sal_Bool bShare = bHeader && rDesc.IsHeaderShared()|| !bHeader && rDesc.IsFooterShared(); - UseOnPage eUse = rDesc.GetUseOn(); - if((bShare && (PD_ALL == eUse || PD_MIRROR == eUse)) //Share wirkt nur fuer Mirror oder All - || (PD_ALL == eUse || PD_MIRROR == eUse) && (bAll || bRight) || // - bRight && PD_RIGHT == eUse && PD_LEFT != eUse) - pFrmFmt = &rDesc.GetMaster(); - else if(bLeft && PD_RIGHT != eUse) + // TextLeft returns the left content if there is one, + // Text and TextRight return the master content. + // TextRight does the same as Text and is for + // comptability only. + if( bLeft && !bShare ) pFrmFmt = &rDesc.GetLeft(); + else + pFrmFmt = &rDesc.GetMaster(); if(pFrmFmt) { const SfxItemSet& rSet = pFrmFmt->GetAttrSet(); @@ -2560,6 +2561,9 @@ const SwStartNode* SwXPageStyle::GetStartNode(sal_Bool bHeader, sal_Bool bLeft) /*------------------------------------------------------------------------ $Log: not supported by cvs2svn $ + Revision 1.1.1.1 2000/09/19 00:08:29 hr + initial import + Revision 1.96 2000/09/18 16:04:35 willem.vandorp OpenOffice header added. |