Skip to content

C
core
Kaydet (Commit) ea65a40c authored tarafından Mike Kaganski's avatar Mike Kaganski
Dosyalara gözat
Seçenekler

tdf#120703 PVS: make selection type detection more readable 

V547 Expression 'Oep <= Osp' is always false.

Some of the conditions in the type detection code weren't reachable.
Also moved the code from class member to static function.

Change-Id: Iaf9dbe8ab15a1970b5cd580cf5d868715a234d02
Reviewed-on: https://gerrit.libreoffice.org/63230
Tested-by: Jenkins
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst 577b5fd8
Hide whitespace changes
Inline Side-by-side
Showing with 124 additions and 134 deletions
accessibility/inc/extended/textwindowaccessibility.hxx
Dosyayı görüntüle @ ea65a40c
...@@ -540,7 +540,6 @@ private: ...@@ -540,7 +540,6 @@ private:
void handleSelectionChangeNotification(); void handleSelectionChangeNotification();
::sal_Int32 getSelectionType(::sal_Int32 nNewFirstPara, ::sal_Int32 nNewFirstPos, ::sal_Int32 nNewLastPara, ::sal_Int32 nNewLastPos);
void sendEvent(::sal_Int32 start, ::sal_Int32 end, ::sal_Int16 nEventId); void sendEvent(::sal_Int32 start, ::sal_Int32 end, ::sal_Int16 nEventId);
void disposeParagraphs(); void disposeParagraphs();
......
accessibility/source/extended/textwindowaccessibility.cxx
Dosyayı görüntüle @ ea65a40c
...@@ -1951,109 +1951,102 @@ void Document::handleParagraphNotifications() ...@@ -1951,109 +1951,102 @@ void Document::handleParagraphNotifications()
} }
} }
::sal_Int32 Document::getSelectionType(::sal_Int32 nNewFirstPara, ::sal_Int32 nNewFirstPos, ::sal_Int32 nNewLastPara, ::sal_Int32 nNewLastPos) namespace
{ {
if (m_nSelectionFirstPara == -1)
return -1; enum class SelChangeType
::sal_Int32 Osp = m_nSelectionFirstPara, Osl = m_nSelectionFirstPos, Oep = m_nSelectionLastPara, Oel = m_nSelectionLastPos; {
::sal_Int32 Nsp = nNewFirstPara, Nsl = nNewFirstPos, Nep = nNewLastPara, Nel = nNewLastPos; None, // no change, or invalid
TextPaM Ns(Nsp, Nsl); CaretMove, // neither old nor new have selection, and they are different
TextPaM Ne(Nep, Nel); NoSelToSel, // old has no selection but new has selection
TextPaM Os(Osp, Osl); SelToNoSel, // old has selection but new has no selection
TextPaM Oe(Oep, Oel); // both old and new have selections
NoParaChange, // only end index changed inside end para
if (Os == Oe && Ns == Ne) EndParaNoMoreBehind, // end para was behind start, but now is same or ahead
{ AddedFollowingPara, // selection extended to following paragraph(s)
//only caret moves. ExcludedPreviousPara, // selection shrunk excluding previous paragraph(s)
return 1; ExcludedFollowingPara, // selection shrunk excluding following paragraph(s)
} AddedPreviousPara, // selection extended to previous paragraph(s)
else if (Os == Oe && Ns != Ne) EndParaBecameBehind // end para was ahead of start, but now is behind
};
SelChangeType getSelChangeType(const TextPaM& Os, const TextPaM& Oe,
const TextPaM& Ns, const TextPaM& Ne)
{
if (Os == Oe) // no old selection
{ {
//old has no selection but new has selection if (Ns == Ne) // no new selection: only caret moves
return 2; return Os != Ns ? SelChangeType::CaretMove : SelChangeType::None;
else // old has no selection but new has selection
return SelChangeType::NoSelToSel;
} }
else if (Os != Oe && Ns == Ne) else if (Ns == Ne) // old has selection; no new selection
{ {
//old has selection but new has no selection. return SelChangeType::SelToNoSel;
return 3;
} }
else if (Os != Oe && Ns != Ne && Osp == Nsp && Osl == Nsl) else if (Os == Ns) // both old and new have selections, and their starts are same
{ {
//both old and new have selections. const sal_Int32 Osp = Os.GetPara(), Oep = Oe.GetPara();
if (Oep == Nep ) const sal_Int32 Nsp = Ns.GetPara(), Nep = Ne.GetPara();
if (Oep == Nep) // end of selection stays in the same paragraph
{ {
//Send text_selection_change event on Nep //Send text_selection_change event on Nep
return Oe.GetIndex() != Ne.GetIndex() ? SelChangeType::NoParaChange
return 4; : SelChangeType::None;
} }
else if (Oep < Nep) else if (Oep < Nep) // end of selection moved to a following paragraph
{ {
//all the following examples like 1,2->1,3 means that old start select para is 1, old end select para is 2, //all the following examples like 1,2->1,3 means that old start select para is 1, old end select para is 2,
// then press shift up, the new start select para is 1, new end select para is 3; // then press shift up, the new start select para is 1, new end select para is 3;
//for example, 1, 2 -> 1, 3; 4,1 -> 4, 7; 4,1 -> 4, 2; 4,4->4,5 //for example, 1, 2 -> 1, 3; 4,1 -> 4, 7; 4,1 -> 4, 2; 4,4->4,5
if (Nep >= Nsp) if (Nep >= Nsp) // new end para not behind start
{ {
// 1, 2 -> 1, 3; 4, 1 -> 4, 7; 4,4->4,5; // 1, 2 -> 1, 3; 4, 1 -> 4, 7; 4,4->4,5;
if (Oep < Osp) if (Oep < Osp) // old end was behind start
{ {
// 4,1 -> 4,7; // 4,1 -> 4,7; 4,1 -> 4,4
return 5; return SelChangeType::EndParaNoMoreBehind;
} }
else else // old end para wasn't behind start
{ {
// 1, 2 -> 1, 3; 4,4->4,5; // 1, 2 -> 1, 3; 4,4->4,5;
return 6; return SelChangeType::AddedFollowingPara;
} }
} }
else else // new end para is still behind start
{ {
// 4,1 -> 4,2, // 4,1 -> 4,2,
if (Oep < Osp) return SelChangeType::ExcludedPreviousPara;
{
// 4,1 -> 4,2,
return 7;
}
else
{
// no such condition. Oep > Osp = Nsp > Nep
}
} }
} }
else if (Oep > Nep) else // Oep > Nep => end of selection moved to a previous paragraph
{ {
// 3,2 -> 3,1; 4,7 -> 4,1; 4, 7 -> 4,6; 4,4 -> 4,3 // 3,2 -> 3,1; 4,7 -> 4,1; 4, 7 -> 4,6; 4,4 -> 4,3
if (Nep >= Nsp) if (Nep >= Nsp) // new end para is still not behind of start
{ {
// 4,7 -> 4,6 // 4,7 ->4,6
if (Oep <= Osp) return SelChangeType::ExcludedFollowingPara;
{
//no such condition, Oep<Osp=Nsp <= Nep
}
else
{
// 4,7 ->4,6
return 8;
}
} }
else else // new end para is behind start
{ {
// 3,2 -> 3,1, 4,7 -> 4,1; 4,4->4,3 // 3,2 -> 3,1, 4,7 -> 4,1; 4,4->4,3
if (Oep <= Osp) if (Oep <= Osp) // it was not ahead already
{ {
// 3,2 -> 3,1; 4,4->4,3 // 3,2 -> 3,1; 4,4->4,3
return 9; return SelChangeType::AddedPreviousPara;
} }
else else // it was ahead previously
{ {
// 4,7 -> 4,1 // 4,7 -> 4,1
return 10; return SelChangeType::EndParaBecameBehind;
} }
} }
} }
} }
return -1; return SelChangeType::None;
} }
} // namespace
void Document::sendEvent(::sal_Int32 start, ::sal_Int32 end, ::sal_Int16 nEventId) void Document::sendEvent(::sal_Int32 start, ::sal_Int32 end, ::sal_Int16 nEventId)
{ {
...@@ -2141,97 +2134,95 @@ void Document::handleSelectionChangeNotification() ...@@ -2141,97 +2134,95 @@ void Document::handleSelectionChangeNotification()
} }
m_aFocused = aIt; m_aFocused = aIt;
::sal_Int32 nMin; if (m_nSelectionFirstPara != -1)
::sal_Int32 nMax;
::sal_Int32 ret = getSelectionType(nNewFirstPara, nNewFirstPos, nNewLastPara, nNewLastPos);
switch (ret)
{ {
case -1: sal_Int32 nMin;
{ sal_Int32 nMax;
SelChangeType ret = getSelChangeType(TextPaM(m_nSelectionFirstPara, m_nSelectionFirstPos),
TextPaM(m_nSelectionLastPara, m_nSelectionLastPos),
rSelection.GetStart(), rSelection.GetEnd());
switch (ret)
{
case SelChangeType::None:
//no event //no event
} break;
break; case SelChangeType::CaretMove:
case 1:
{
//only caret moved, already handled in above //only caret moved, already handled in above
} break;
break; case SelChangeType::NoSelToSel:
case 2:
{
//old has no selection but new has selection //old has no selection but new has selection
nMin = std::min(nNewFirstPara, nNewLastPara); nMin = std::min(nNewFirstPara, nNewLastPara);
nMax = std::max(nNewFirstPara, nNewLastPara); nMax = std::max(nNewFirstPara, nNewLastPara);
sendEvent(nMin, nMax, css::accessibility::AccessibleEventId::SELECTION_CHANGED); sendEvent(nMin, nMax, css::accessibility::AccessibleEventId::SELECTION_CHANGED);
sendEvent(nMin, nMax, css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); sendEvent(nMin, nMax,
} css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED);
break; break;
case 3: case SelChangeType::SelToNoSel:
{
//old has selection but new has no selection. //old has selection but new has no selection.
nMin = std::min(m_nSelectionFirstPara, m_nSelectionLastPara); nMin = std::min(m_nSelectionFirstPara, m_nSelectionLastPara);
nMax = std::max(m_nSelectionFirstPara, m_nSelectionLastPara); nMax = std::max(m_nSelectionFirstPara, m_nSelectionLastPara);
sendEvent(nMin, nMax, css::accessibility::AccessibleEventId::SELECTION_CHANGED); sendEvent(nMin, nMax, css::accessibility::AccessibleEventId::SELECTION_CHANGED);
sendEvent(nMin, nMax, css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); sendEvent(nMin, nMax,
} css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED);
break; break;
case 4: case SelChangeType::NoParaChange:
{
//Send text_selection_change event on Nep //Send text_selection_change event on Nep
sendEvent(nNewLastPara, nNewLastPara, css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); sendEvent(nNewLastPara, nNewLastPara,
} css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED);
break; break;
case 5: case SelChangeType::EndParaNoMoreBehind:
{ // 4, 1 -> 4, 7; 4,1 -> 4,4
// 4, 1 -> 4, 7 sendEvent(m_nSelectionLastPara, m_nSelectionFirstPara - 1,
sendEvent(m_nSelectionLastPara, m_nSelectionFirstPara-1, css::accessibility::AccessibleEventId::SELECTION_CHANGED); css::accessibility::AccessibleEventId::SELECTION_CHANGED);
sendEvent(nNewFirstPara+1, nNewLastPara, css::accessibility::AccessibleEventId::SELECTION_CHANGED); sendEvent(nNewFirstPara + 1, nNewLastPara,
css::accessibility::AccessibleEventId::SELECTION_CHANGED);
sendEvent(m_nSelectionLastPara, nNewLastPara, css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED);
} sendEvent(m_nSelectionLastPara, nNewLastPara,
break; css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED);
case 6: break;
{ case SelChangeType::AddedFollowingPara:
// 1, 2 -> 1, 4; 4,4->4,5; // 1, 2 -> 1, 4; 4,4->4,5;
sendEvent(m_nSelectionLastPara+1, nNewLastPara, css::accessibility::AccessibleEventId::SELECTION_CHANGED); sendEvent(m_nSelectionLastPara + 1, nNewLastPara,
css::accessibility::AccessibleEventId::SELECTION_CHANGED);
sendEvent(m_nSelectionLastPara, nNewLastPara, css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); sendEvent(m_nSelectionLastPara, nNewLastPara,
} css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED);
break; break;
case 7: case SelChangeType::ExcludedPreviousPara:
{
// 4,1 -> 4,3, // 4,1 -> 4,3,
sendEvent(m_nSelectionLastPara +1, nNewLastPara , css::accessibility::AccessibleEventId::SELECTION_CHANGED); sendEvent(m_nSelectionLastPara + 1, nNewLastPara,
css::accessibility::AccessibleEventId::SELECTION_CHANGED);
sendEvent(m_nSelectionLastPara, nNewLastPara, css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); sendEvent(m_nSelectionLastPara, nNewLastPara,
} css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED);
break; break;
case 8: case SelChangeType::ExcludedFollowingPara:
{
// 4,7 ->4,5; // 4,7 ->4,5;
sendEvent(nNewLastPara + 1, m_nSelectionLastPara, css::accessibility::AccessibleEventId::SELECTION_CHANGED); sendEvent(nNewLastPara + 1, m_nSelectionLastPara,
css::accessibility::AccessibleEventId::SELECTION_CHANGED);
sendEvent(nNewLastPara, m_nSelectionLastPara, css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); sendEvent(nNewLastPara, m_nSelectionLastPara,
} css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED);
break; break;
case 9: case SelChangeType::AddedPreviousPara:
{
// 3,2 -> 3,1; 4,4->4,3 // 3,2 -> 3,1; 4,4->4,3
sendEvent(nNewLastPara, m_nSelectionLastPara - 1, css::accessibility::AccessibleEventId::SELECTION_CHANGED); sendEvent(nNewLastPara, m_nSelectionLastPara - 1,
css::accessibility::AccessibleEventId::SELECTION_CHANGED);
sendEvent(nNewLastPara, m_nSelectionLastPara, css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); sendEvent(nNewLastPara, m_nSelectionLastPara,
} css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED);
break; break;
case 10: case SelChangeType::EndParaBecameBehind:
{
// 4,7 -> 4,1 // 4,7 -> 4,1
sendEvent(m_nSelectionFirstPara + 1, m_nSelectionLastPara, css::accessibility::AccessibleEventId::SELECTION_CHANGED); sendEvent(m_nSelectionFirstPara + 1, m_nSelectionLastPara,
sendEvent(nNewLastPara, nNewFirstPara - 1, css::accessibility::AccessibleEventId::SELECTION_CHANGED); css::accessibility::AccessibleEventId::SELECTION_CHANGED);
sendEvent(nNewLastPara, nNewFirstPara - 1,
css::accessibility::AccessibleEventId::SELECTION_CHANGED);
sendEvent(nNewLastPara, m_nSelectionLastPara, css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED); sendEvent(nNewLastPara, m_nSelectionLastPara,
} css::accessibility::AccessibleEventId::TEXT_SELECTION_CHANGED);
break; break;
default: }
break;
} }
m_nSelectionFirstPara = nNewFirstPara; m_nSelectionFirstPara = nNewFirstPara;
......
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