Kaydet (Commit) e52792c9 authored tarafından Julien Nabet's avatar Julien Nabet

Fix member variable 'RoadmapImpl::InCompleteHyperLabel' not initialized in CTR

+ replace '<' by '!=' when comparing current it with end iterator

Change-Id: Iea8416a5143aafdea863397c78b58512bb54b427
üst 0787dc99
...@@ -138,6 +138,7 @@ namespace svt ...@@ -138,6 +138,7 @@ namespace svt
,m_iCurItemID( -1 ) ,m_iCurItemID( -1 )
,m_bInteractive( sal_True ) ,m_bInteractive( sal_True )
,m_bComplete( sal_True ) ,m_bComplete( sal_True )
,InCompleteHyperLabel ( NULL )
{ {
} }
...@@ -238,7 +239,7 @@ namespace svt ...@@ -238,7 +239,7 @@ namespace svt
{ {
HL_Vector aItemsCopy = m_pImpl->getHyperLabels(); HL_Vector aItemsCopy = m_pImpl->getHyperLabels();
m_pImpl->getHyperLabels().clear(); m_pImpl->getHyperLabels().clear();
for ( HL_Vector::iterator i = aItemsCopy.begin(); i< aItemsCopy.end(); ++i ) for ( HL_Vector::iterator i = aItemsCopy.begin(); i != aItemsCopy.end(); ++i )
{ {
delete *i; delete *i;
} }
...@@ -309,7 +310,7 @@ namespace svt ...@@ -309,7 +310,7 @@ namespace svt
const HL_Vector& rItems = m_pImpl->getHyperLabels(); const HL_Vector& rItems = m_pImpl->getHyperLabels();
for ( HL_Vector::const_iterator i = rItems.begin(); for ( HL_Vector::const_iterator i = rItems.begin();
i < rItems.end(); i != rItems.end();
++i ++i
) )
{ {
...@@ -348,7 +349,7 @@ namespace svt ...@@ -348,7 +349,7 @@ namespace svt
{ {
RoadmapItem* pItem = NULL; RoadmapItem* pItem = NULL;
for ( HL_Vector::const_iterator i = rItems.begin() + _nIndex; for ( HL_Vector::const_iterator i = rItems.begin() + _nIndex;
i< rItems.end(); i != rItems.end();
++i, ++_nIndex ++i, ++_nIndex
) )
{ {
...@@ -435,7 +436,7 @@ namespace svt ...@@ -435,7 +436,7 @@ namespace svt
const HL_Vector& rItems = m_pImpl->getHyperLabels(); const HL_Vector& rItems = m_pImpl->getHyperLabels();
for ( HL_Vector::const_iterator i = rItems.begin() + _nStartIndex; for ( HL_Vector::const_iterator i = rItems.begin() + _nStartIndex;
i < rItems.end(); i != rItems.end();
++i ++i
) )
{ {
...@@ -458,7 +459,7 @@ namespace svt ...@@ -458,7 +459,7 @@ namespace svt
ItemId nLocID = 0; ItemId nLocID = 0;
const HL_Vector& rItems = m_pImpl->getHyperLabels(); const HL_Vector& rItems = m_pImpl->getHyperLabels();
for ( HL_Vector::const_iterator i = rItems.begin() + _nStartIndex; for ( HL_Vector::const_iterator i = rItems.begin() + _nStartIndex;
i < rItems.end(); i != rItems.end();
++i ++i
) )
{ {
...@@ -530,7 +531,7 @@ namespace svt ...@@ -530,7 +531,7 @@ namespace svt
{ {
const HL_Vector& rItems = m_pImpl->getHyperLabels(); const HL_Vector& rItems = m_pImpl->getHyperLabels();
for ( HL_Vector::const_iterator i = rItems.begin(); for ( HL_Vector::const_iterator i = rItems.begin();
i < rItems.end(); i != rItems.end();
++i ++i
) )
{ {
...@@ -630,7 +631,7 @@ namespace svt ...@@ -630,7 +631,7 @@ namespace svt
{ {
const HL_Vector& rItems = m_pImpl->getHyperLabels(); const HL_Vector& rItems = m_pImpl->getHyperLabels();
for ( HL_Vector::const_iterator i = rItems.begin(); for ( HL_Vector::const_iterator i = rItems.begin();
i < rItems.end(); i != rItems.end();
++i ++i
) )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment