diff options
| -rw-r--r-- | sc/source/ui/app/inputwin.cxx | 15 | ||||
| -rw-r--r-- | sc/source/ui/inc/inputwin.hxx | 1 | ||||
| -rwxr-xr-x | solenv/bin/ooinstall | 2 |
3 files changed, 5 insertions, 13 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 diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall index 3b60909d5c50..794e81b930df 100755 --- a/solenv/bin/ooinstall +++ b/solenv/bin/ooinstall @@ -50,7 +50,7 @@ for $arg (@ARGV) { $path = Cwd::realpath( $ENV{DESTDIR} . $arg ); if (!$do_link) { my $destdir = Cwd::realpath( $ENV{DESTDIR} ); -# $path =~ s|$destdir||; + $path =~ s|$destdir||; } } } |