diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-22 11:26:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-22 11:54:12 +0100 |
| commit | 1ae61b0ac4187b2938647f3ca0289a070a5dc7d2 (patch) | |
| tree | 9461c0532919f4fe61f3e0e3fa8556e954244fbd /svtools/source/edit | |
| parent | 04bb9549e0a0ee567f3bd48a7707286c5abd631a (diff) | |
loplugin:flatten in svtools
almost completely automatically rewritten, only had to tweak
the indentation on a couple of lines.
Change-Id: Ieec92e5b602d180d7ec556e3421ce3c835c1f646
Reviewed-on: https://gerrit.libreoffice.org/45072
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools/source/edit')
| -rw-r--r-- | svtools/source/edit/editsyntaxhighlighter.cxx | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx index b8bc4d118a83..6c081b4f11db 100644 --- a/svtools/source/edit/editsyntaxhighlighter.cxx +++ b/svtools/source/edit/editsyntaxhighlighter.cxx @@ -72,39 +72,39 @@ void MultiLineEditSyntaxHighlight::DoBracketHilight(sal_uInt16 nKey) } } - if (nChar != -1) + if (nChar == -1) + return; + + sal_uInt32 nPara = nStartPara; + do { - sal_uInt32 nPara = nStartPara; - do - { - if (nPara == nStartPara && nStartPos == 0) - continue; + if (nPara == nStartPara && nStartPos == 0) + continue; - OUString aLine( GetTextEngine()->GetText( nPara ) ); + OUString aLine( GetTextEngine()->GetText( nPara ) ); - if (aLine.isEmpty()) - continue; + if (aLine.isEmpty()) + continue; - for (sal_Int32 i = (nPara==nStartPara) ? nStartPos-1 : aLine.getLength()-1; i>0; --i) + for (sal_Int32 i = (nPara==nStartPara) ? nStartPos-1 : aLine.getLength()-1; i>0; --i) + { + if (aLine[i] == nChar) { - if (aLine[i] == nChar) + if (!nCount) { - if (!nCount) - { - GetTextEngine()->SetAttrib( TextAttribFontWeight( WEIGHT_ULTRABOLD ), nPara, i, i+1 ); - GetTextEngine()->SetAttrib( TextAttribFontColor( Color(0,0,0) ), nPara, i, i+1 ); - GetTextEngine()->SetAttrib( TextAttribFontWeight( WEIGHT_ULTRABOLD ), nStartPara, nStartPos, nStartPos ); - GetTextEngine()->SetAttrib( TextAttribFontColor( Color(0,0,0) ), nStartPara, nStartPos, nStartPos ); - return; - } - else - --nCount; + GetTextEngine()->SetAttrib( TextAttribFontWeight( WEIGHT_ULTRABOLD ), nPara, i, i+1 ); + GetTextEngine()->SetAttrib( TextAttribFontColor( Color(0,0,0) ), nPara, i, i+1 ); + GetTextEngine()->SetAttrib( TextAttribFontWeight( WEIGHT_ULTRABOLD ), nStartPara, nStartPos, nStartPos ); + GetTextEngine()->SetAttrib( TextAttribFontColor( Color(0,0,0) ), nStartPara, nStartPos, nStartPos ); + return; } - if (aLine[i] == nKey) - ++nCount; + else + --nCount; } - } while (nPara--); - } + if (aLine[i] == nKey) + ++nCount; + } + } while (nPara--); } bool MultiLineEditSyntaxHighlight::PreNotify( NotifyEvent& rNEvt ) |