diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 15:22:27 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-12-01 15:22:27 +0000 |
| commit | ca9083951a364ec4063be9bd4feb2da5f0fd0888 (patch) | |
| tree | 354cc8e345fbdfe8682d9ebe1c35263066799193 /xmloff/source/forms/attriblistmerge.cxx | |
| parent | 3061b643e207a6137a769b02d11f046abf2a2179 (diff) | |
INTEGRATION: CWS ooo20031110 (1.1.204); FILE MERGED
2003/11/11 11:03:31 waratah 1.1.204.1: #i22301# Correct for scoping rules
Diffstat (limited to 'xmloff/source/forms/attriblistmerge.cxx')
| -rw-r--r-- | xmloff/source/forms/attriblistmerge.cxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/xmloff/source/forms/attriblistmerge.cxx b/xmloff/source/forms/attriblistmerge.cxx index 12b6a3762797..1d7c42bbd615 100644 --- a/xmloff/source/forms/attriblistmerge.cxx +++ b/xmloff/source/forms/attriblistmerge.cxx @@ -2,9 +2,9 @@ * * $RCSfile: attriblistmerge.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: fs $ $Date: 2000-12-12 12:02:06 $ + * last change: $Author: rt $ $Date: 2003-12-01 16:22:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,8 +86,9 @@ namespace xmloff sal_Bool OAttribListMerger::seekToIndex(sal_Int16 _nGlobalIndex, Reference< sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex) { sal_Int16 nLeftOver = _nGlobalIndex; - for ( ConstAttributeListArrayIterator aLookupSublist = m_aLists.begin(); - (aLookupSublist != m_aLists.end()) && (nLeftOver >= (*aLookupSublist)->getLength()); + ConstAttributeListArrayIterator aLookupSublist = m_aLists.begin(); + + for ( ; (aLookupSublist != m_aLists.end()) && (nLeftOver >= (*aLookupSublist)->getLength()); ++aLookupSublist ) nLeftOver -= (*aLookupSublist)->getLength(); @@ -204,6 +205,12 @@ namespace xmloff /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.1.204.1 2003/11/11 11:03:31 waratah + * #i22301# Correct for scoping rules + * + * Revision 1.1 2000/12/12 12:02:06 fs + * initial checkin - helper class for mergin XAttributeList instances + * * * Revision 1.0 12.12.00 10:32:56 fs ************************************************************************/ |