solenv/bin/ooinstall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit f00b387faeca2902909ce181f2f772a51ec4527f Author: Noel Power <[email protected]> Date: Tue Jan 24 11:14:38 2012 +0000 fix ( hopefully ) viewing artifacts in input line fdo#44391 diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index f6404a7..1ae727c 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1125,7 +1125,8 @@ ScMultiTextWnd::ScMultiTextWnd( ScInputBarGroup* pParen, ScTabViewShell* pViewSh ScTextWnd( pParen, pViewSh ), mrGroupBar(* pParen ), mnLines( 1 ), - mnLastExpandedLines( INPUTWIN_MULTILINES ) + mnLastExpandedLines( INPUTWIN_MULTILINES ), + mbInvalidate( false ) { nTextStartPos = TEXT_MULTI_STARTPOS; } @@ -1138,7 +1139,14 @@ void ScMultiTextWnd::Paint( const Rectangle& rRec ) { EditView* pView = GetEditView(); if ( pView ) - pView->Paint( rRec ); + { + if ( mbInvalidate ) + { + pView->Invalidate(); + mbInvalidate = false; + } + pEditView->Paint( rRec ); + } } EditView* ScMultiTextWnd::GetEditView() @@ -1403,8 +1411,7 @@ 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 - if ( pEditView ) - pEditView->Invalidate(); + mbInvalidate = true; // ensure next Paint ( that uses editengine ) call will call Invalidate first ScTextWnd::SetTextString( rNewString ); SetScrollBarRange(); DoScroll(); diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 7b5bc28..eec7fed 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -204,6 +204,7 @@ private: ScInputBarGroup& mrGroupBar; long mnLines; long mnLastExpandedLines; + bool mbInvalidate; }; class ScInputBarGroup : public ScTextWndBase commit e8681bede97a64d03eaa01556d19f5822f898c26 Author: Noel Power <[email protected]> Date: Tue Jan 24 11:13:04 2012 +0000 Revert "fix ( hopefully ) viewing artifacts in input line fdo#44391" This reverts commit 1f0ba007489e77e4145fc840cc3a878772494fd7. diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 1ae727c..f6404a7 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 eec7fed..7b5bc28 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 3b60909..794e81b 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||; } } } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
