diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-15 11:40:52 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-15 11:40:52 +0000 |
| commit | 65ae0294588619916f504b3d692c7580cf3628b2 (patch) | |
| tree | 62a0680c673d8701af67884e158838f7accae382 /xmloff | |
| parent | 67ebf9f0b4bcdf2f4f9c90e09b206bf373f98439 (diff) | |
INTEGRATION: CWS sw2101_SRC680 (1.121.28.1.2); FILE MERGED
2006/11/06 14:37:49 od 1.121.28.1.2.1: #i71249# method <XMLTextImportHelper::SetOutlineStyles(..)>
- take last added paragraph style for assignment to the list level
of the outline style for document from version OOo 2.0.4 and prior.
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/txtimp.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 3c113bd5ea3e..8da65159dbbd 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: txtimp.cxx,v $ * - * $Revision: 1.123 $ + * $Revision: 1.124 $ * - * last change: $Author: vg $ $Date: 2006-11-01 15:07:30 $ + * last change: $Author: ihi $ $Date: 2006-11-15 12:40:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1339,7 +1339,9 @@ void XMLTextImportHelper::FindOutlineStyleName( ::rtl::OUString& rStyleName, // finally, we'll use the previously used style name for this // format (or the default we've just put into that style) - rStyleName = mpOutlineStylesCandidates[nOutlineLevel][0]; + // --> OD 2006-11-06 #i71249# - take last added one + rStyleName = mpOutlineStylesCandidates[nOutlineLevel].back(); + // <-- } // else: nothing we can do, so we'll leave it empty } @@ -1495,7 +1497,9 @@ void XMLTextImportHelper::SetOutlineStyles( sal_Bool bSetEmptyLevels ) if ( nUPD < 680 || ( nUPD == 680 && nBuild <= 9073 /* BuildId of OOo 2.0.4/SO8 PU4 */ ) ) { - sChoosenStyle = mpOutlineStylesCandidates[i][0]; + // --> OD 2006-11-06 #i71249# - take last added one + sChoosenStyle = mpOutlineStylesCandidates[i].back(); + // <-- } else { |