diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-01-29 07:42:54 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-01-29 07:42:54 +0000 |
| commit | e055e80a3eec46b7a9041002baa818c8dbd047a8 (patch) | |
| tree | f01016a8190d8f312be10a880606b7d8e35e1f82 /sw/source/ui/app/docstyle.cxx | |
| parent | 6c765779a9b4b3b049b4fcb63104635bbb88c561 (diff) | |
INTEGRATION: CWS sw8u10bf04 (1.28.120); FILE MERGED
2007/12/18 10:34:05 ama 1.28.120.1: Fix #i84536#: Set same follow page style disturbs sensitive undo
Diffstat (limited to 'sw/source/ui/app/docstyle.cxx')
| -rw-r--r-- | sw/source/ui/app/docstyle.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx index fc8e8a2d0e90..3e32dbc1a036 100644 --- a/sw/source/ui/app/docstyle.cxx +++ b/sw/source/ui/app/docstyle.cxx @@ -4,9 +4,9 @@ * * $RCSfile: docstyle.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: hr $ $Date: 2007-09-27 10:17:24 $ + * last change: $Author: vg $ $Date: 2008-01-29 08:42:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1044,7 +1044,8 @@ BOOL SwDocStyleSheet::SetFollow( const String& rStr) ? lcl_FindPageDesc(rDoc, rStr) : 0; USHORT nId; - if( rDoc.FindPageDescByName( pDesc->GetName(), &nId )) + if( pFollowDesc != pDesc->GetFollow() && + rDoc.FindPageDescByName( pDesc->GetName(), &nId ) ) { SwPageDesc aDesc( *pDesc ); aDesc.SetFollow( pFollowDesc ); |