summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Power <noel.power@novell.com>2012-01-24 11:13:04 +0000
committerNoel Power <noel.power@novell.com>2012-01-24 11:13:04 +0000
commite8681bede97a64d03eaa01556d19f5822f898c26 (patch)
treee4f843e63d7c270d30e1a5a130b4334cbf4c6edc /sc
parent1f0ba007489e77e4145fc840cc3a878772494fd7 (diff)
Revert "fix ( hopefully ) viewing artifacts in input line fdo#44391"
This reverts commit 1f0ba007489e77e4145fc840cc3a878772494fd7.
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/app/inputwin.cxx15
-rw-r--r--sc/source/ui/inc/inputwin.hxx1
2 files changed, 4 insertions, 12 deletions
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 1ae727c201e1..f6404a717c8b 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1125,8 +1125,7 @@ ScMultiTextWnd::ScMultiTextWnd( ScInputBarGroup* pParen, ScTabViewShell* pViewSh
ScTextWnd( pParen, pViewSh ),
mrGroupBar(* pParen ),
mnLines( 1 ),
- mnLastExpandedLines( INPUTWIN_MULTILINES ),
- mbInvalidate( false )
+ mnLastExpandedLines( INPUTWIN_MULTILINES )
{
nTextStartPos = TEXT_MULTI_STARTPOS;
}
@@ -1139,14 +1138,7 @@ void ScMultiTextWnd::Paint( const Rectangle& rRec )
{
EditView* pView = GetEditView();
if ( pView )
- {
- if ( mbInvalidate )
- {
- pView->Invalidate();
- mbInvalidate = false;
- }
- pEditView->Paint( rRec );
- }
+ pView->Paint( rRec );
}
EditView* ScMultiTextWnd::GetEditView()
@@ -1411,7 +1403,8 @@ void ScMultiTextWnd::SetTextString( const String& rNewString )
// inputbar window scrolled to the bottom if we do that here ( because the tableview and topview
// are synced I guess ).
// should fix that I suppose :-/ need to look a bit further into that
- mbInvalidate = true; // ensure next Paint ( that uses editengine ) call will call Invalidate first
+ if ( pEditView )
+ pEditView->Invalidate();
ScTextWnd::SetTextString( rNewString );
SetScrollBarRange();
DoScroll();
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index eec7fede9ad4..7b5bc28eaf94 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -204,7 +204,6 @@ private:
ScInputBarGroup& mrGroupBar;
long mnLines;
long mnLastExpandedLines;
- bool mbInvalidate;
};
class ScInputBarGroup : public ScTextWndBase