summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-08-12 13:43:27 +0100
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2015-08-12 14:14:16 +0000
commita062344931002d88de529d834707444864acfeee (patch)
tree189f695ec3f7eeffda151f70cfb1af3bda1359ec
parentb137ea11db280dec3e38a306f9daf7209eacf18e (diff)
Resolves: tdf#93113 crash on revisiting insert special character
this effectively reverts commit c43ee00e5d2edfebfa148b310813335aab27db34 Author: Herbert Duerr <hdu@openoffice.org> Date: Wed Aug 15 13:20:51 2001 +0000 #91025# reduce flicker in charmap dialog in favour of the new double buffering Paint is calling RecalculateFont which calls SelectIndex which calls Update which calls Paint, boom Change-Id: I69e9f53b7db09837ff08a2ce9fc6f81a52b5c794 (cherry picked from commit 79395c934771818686e488a7c2e382a00456c8a1) Reviewed-on: https://gerrit.libreoffice.org/17674 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--svx/source/dialog/charmap.cxx6
1 files changed, 1 insertions, 5 deletions
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index df7d68e7b3b0..6a52644bad22 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -602,7 +602,6 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, bool bFocus )
aVscrollSB->SetThumbPos( nNewPos );
nSelectedIndex = bFocus ? nMapIndex+1 : -1;
Invalidate();
- Update();
}
else if( nNewIndex < FirstInView() )
{
@@ -612,8 +611,6 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, bool bFocus )
aVscrollSB->SetThumbPos( nOldPos - nDelta );
nSelectedIndex = nNewIndex;
Invalidate();
- if( nDelta )
- Update();
}
else if( nNewIndex > LastInView() )
{
@@ -626,10 +623,9 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, bool bFocus )
nSelectedIndex = nNewIndex;
Invalidate();
}
- if( nOldPos != aVscrollSB->GetThumbPos() )
+ else if (nOldPos != aVscrollSB->GetThumbPos())
{
Invalidate();
- Update();
}
}
else