diff options
| -rw-r--r-- | sc/source/ui/app/client.cxx | 10 | ||||
| -rw-r--r-- | sc/source/ui/app/scdll.cxx | 3 | ||||
| -rw-r--r-- | sc/source/ui/drawfunc/fusel.cxx | 11 | ||||
| -rw-r--r-- | sc/source/ui/inc/client.hxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/view/drawview.cxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwshb.cxx | 9 |
6 files changed, 11 insertions, 29 deletions
diff --git a/sc/source/ui/app/client.cxx b/sc/source/ui/app/client.cxx index 821865d1c7ef..9dac737372ae 100644 --- a/sc/source/ui/app/client.cxx +++ b/sc/source/ui/app/client.cxx @@ -254,13 +254,3 @@ void __EXPORT ScClient::MakeVisible() } } -void ScClient::DeactivateObj() -{ - DeactivateObject(); - - ScTabViewShell* pViewSh = dynamic_cast< ScTabViewShell* >( GetViewShell() ); - if ( pViewSh ) - { - pViewSh->UpdateInputHandler(); - } -} diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index f87241f2fa40..9a1858fe5170 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -287,7 +287,8 @@ void ScDLL::Init() // Child-Windows - ScInputWindowWrapper ::RegisterChildWindow( sal_True, pMod, SFX_CHILDWIN_TASK|SFX_CHILDWIN_FORCEDOCK|SFX_CHILDWIN_NEVERHIDEACTIVEOLE ); + // Hack: Eingabezeile mit 42 registrieren, damit sie im PlugIn immer sichtbar ist + ScInputWindowWrapper ::RegisterChildWindow(42, pMod, SFX_CHILDWIN_TASK|SFX_CHILDWIN_FORCEDOCK); ScNavigatorDialogWrapper ::RegisterChildWindowContext( sal::static_int_cast<sal_uInt16>(ScTabViewShell::GetInterfaceId()), pMod); ScSolverDlgWrapper ::RegisterChildWindow(sal_False, pMod); diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index 76f7338f0067..368a27b4bd5d 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -497,16 +497,15 @@ sal_Bool __EXPORT FuSelection::MouseButtonUp(const MouseEvent& rMEvt) /************************************************************************** * Ggf. OLE-Objekt beruecksichtigen **************************************************************************/ + SfxInPlaceClient* pIPClient = pViewShell->GetIPClient(); - ScClient* pClient = static_cast< ScClient* >( pViewShell->GetIPClient() ); - if ( pClient ) + if (pIPClient) { ScModule* pScMod = SC_MOD(); bool bUnoRefDialog = pScMod->IsRefDialogOpen() && pScMod->GetCurRefDlgId() == WID_SIMPLE_REF; - if ( pClient->IsObjectInPlaceActive() && !bUnoRefDialog ) - { - pClient->DeactivateObj(); - } + + if ( pIPClient->IsObjectInPlaceActive() && !bUnoRefDialog ) + pIPClient->DeactivateObject(); } sal_uInt16 nClicks = rMEvt.GetClicks(); diff --git a/sc/source/ui/inc/client.hxx b/sc/source/ui/inc/client.hxx index c8373e6b0bcd..1b13ee224d77 100644 --- a/sc/source/ui/inc/client.hxx +++ b/sc/source/ui/inc/client.hxx @@ -56,7 +56,6 @@ public: SdrGrafObj* GetGrafEdit() const { return pGrafEdit; } void SetGrafEdit(SdrGrafObj* pNew) { pGrafEdit = pNew; } SdrOle2Obj* GetDrawObj(); - void DeactivateObj(); }; diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index ae777c8f79a7..6b8ecad11e09 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -415,9 +415,9 @@ void ScDrawView::MarkListHasChanged() if ( pClient && pClient->IsObjectInPlaceActive() && !bUnoRefDialog ) { // #41730# beim ViewShell::Activate aus dem Reset2Open nicht die Handles anzeigen - //HMHbDisableHdl = sal_True; - pClient->DeactivateObj(); - //HMHbDisableHdl = sal_False; + //HMHbDisableHdl = TRUE; + pClient->DeactivateObject(); + //HMHbDisableHdl = FALSE; // Image-Ole wieder durch Grafik ersetzen passiert jetzt in ScClient::UIActivate } diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index 587ea58f2d33..2001ba165531 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -78,7 +78,6 @@ #include "chartarr.hxx" #include "drawview.hxx" #include "ChartRangeSelectionListener.hxx" -#include "inputhdl.hxx" using namespace com::sun::star; @@ -182,12 +181,6 @@ sal_Bool ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb ) bErrorShown = sal_True; // SfxViewShell::DoVerb zeigt seine Fehlermeldungen selber an - ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl( this ); - if ( pInputHdl ) - { - pInputHdl->NotifyChange( NULL ); - } - // attach listener to selection changes in chart that affect cell // ranges, so those can be highlighted // note: do that after DoVerb, so that the chart controller exists @@ -272,7 +265,7 @@ void ScTabViewShell::DeactivateOle() ScClient* pClient = (ScClient*) GetIPClient(); if ( pClient && pClient->IsObjectInPlaceActive() && !bUnoRefDialog ) - pClient->DeactivateObj(); + pClient->DeactivateObject(); } void ScTabViewShell::ExecDrawIns(SfxRequest& rReq) |