diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-22 11:06:06 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-22 11:06:06 +0000 |
| commit | 9b2a0579eca8e680e1aade115c9241967133a2a4 (patch) | |
| tree | ed0f02813c311439cfcebeb08e46ad0887713b95 /sw/source/filter/xml/swxml.cxx | |
| parent | cbd7be39c69b90878feeaa6bedd4a257e9200720 (diff) | |
INTEGRATION: CWS swqbf92 (1.75.42); FILE MERGED
2007/01/12 14:13:14 od 1.75.42.1: #i73361# method <lcl_AdjustOutlineStylesForOOo(..)>
- Do not change existing assignment of default outline style
to a certain outline list level.
Diffstat (limited to 'sw/source/filter/xml/swxml.cxx')
| -rw-r--r-- | sw/source/filter/xml/swxml.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx index 39c2c1f83443..418962ee6241 100644 --- a/sw/source/filter/xml/swxml.cxx +++ b/sw/source/filter/xml/swxml.cxx @@ -4,9 +4,9 @@ * * $RCSfile: swxml.cxx,v $ * - * $Revision: 1.75 $ + * $Revision: 1.76 $ * - * last change: $Author: rt $ $Date: 2006-12-01 15:57:33 $ + * last change: $Author: obo $ $Date: 2007-01-22 12:06:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -528,7 +528,14 @@ void lcl_AdjustOutlineStylesForOOo( SwDoc& _rDoc ) const SwNumRule* pOutlineRule = _rDoc.GetOutlineNumRule(); for ( BYTE i = 0; i < MAXLEVEL; ++i ) { - if ( aCreatedDefaultOutlineStyles[ i ] != 0 && !aOutlineLevelAssigned[ i ] ) + // --> OD 2007-01-11 #i73361# + // Do not change assignment of already created default outline style + // to a certain outline level. +// if ( aCreatedDefaultOutlineStyles[ i ] != 0 && !aOutlineLevelAssigned[ i ] ) + if ( !aOutlineLevelAssigned[ i ] && + aCreatedDefaultOutlineStyles[ i ] != 0 && + aCreatedDefaultOutlineStyles[ i ]->GetOutlineLevel() == NO_NUMBERING ) + // <-- { // apply outline level at created default outline style aCreatedDefaultOutlineStyles[ i ]->SetOutlineLevel( i ); |