diff options
| author | Mikhail Voytenko <mav@openoffice.org> | 2011-01-03 13:57:25 +0100 |
|---|---|---|
| committer | Mikhail Voytenko <mav@openoffice.org> | 2011-01-03 13:57:25 +0100 |
| commit | 21a943ba3447cd6b83b9495f5af23cd1af2a9e2d (patch) | |
| tree | 70d240348983e4490a1eb59266933f8cd78de39c /sc/source/ui/unoobj/viewuno.cxx | |
| parent | 491837143455a6279f33703d0db01e57abc0e8cc (diff) | |
| parent | e0cef95bab1bd41fce1f08be9d6a2fed71f16944 (diff) | |
fwk162: merge to DEV300_m96
Diffstat (limited to 'sc/source/ui/unoobj/viewuno.cxx')
| -rw-r--r-- | sc/source/ui/unoobj/viewuno.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index fd1e655b8ffb..7646e52c030f 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -572,7 +572,7 @@ void lcl_CallActivate( ScDocShell* pDocSh, SCTAB nTab, sal_Int32 nEvent ) } } -void ScTabViewObj::SheetChanged() +void ScTabViewObj::SheetChanged( bool bSameTabButMoved ) { if ( !GetViewShell() ) return; @@ -600,9 +600,10 @@ void ScTabViewObj::SheetChanged() } } - // handle sheet events + /* Handle sheet events, but do not trigger event handlers, if the old + active sheet gets re-activated after inserting/deleting/moving a sheet. */ SCTAB nNewTab = pViewData->GetTabNo(); - if ( nNewTab != nPreviousTab ) + if ( !bSameTabButMoved && (nNewTab != nPreviousTab) ) { lcl_CallActivate( pDocSh, nPreviousTab, SC_SHEETEVENT_UNFOCUS ); lcl_CallActivate( pDocSh, nNewTab, SC_SHEETEVENT_FOCUS ); |