sc/source/filter/html/htmlpars.cxx | 2 +- sc/source/filter/rtf/rtfparse.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 8bed4206e1b5548e3525021d6d13025a6eb01081 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Sun Sep 9 18:31:57 2012 +0200 fix crash introduced by stl conversion, fdo#54299 Change-Id: Ieb39563b1d26c3037d4200f9ec68f4ce2b2c7b42 diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 105ef75..4034d03 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -391,7 +391,7 @@ bool ScHTMLLayoutParser::SeekOffset( ScHTMLColOffset* pOffset, sal_uInt16 nOffse OSL_ENSURE( pOffset, "ScHTMLLayoutParser::SeekOffset - illegal call" ); ScHTMLColOffset::const_iterator it = pOffset->find( nOffset ); bool bFound = it != pOffset->end(); - sal_uInt16 nPos = it - pOffset->end(); + sal_uInt16 nPos = it - pOffset->begin(); *pCol = static_cast<SCCOL>(nPos); if ( bFound ) return true; diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx index 511d905..56c2f7c 100644 --- a/sc/source/filter/rtf/rtfparse.cxx +++ b/sc/source/filter/rtf/rtfparse.cxx @@ -125,7 +125,7 @@ sal_Bool ScRTFParser::SeekTwips( sal_uInt16 nTwips, SCCOL* pCol ) { ScRTFColTwips::const_iterator it = pColTwips->find( nTwips ); sal_Bool bFound = it != pColTwips->end(); - sal_uInt16 nPos = it - pColTwips->end(); + sal_uInt16 nPos = it - pColTwips->begin(); *pCol = static_cast<SCCOL>(nPos); if ( bFound ) return sal_True; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits