diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-11-12 22:28:54 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-11-13 11:03:10 +0100 |
| commit | 5a616ca96c41b1e3d6dc2bca370f0797dfef7511 (patch) | |
| tree | ca6f991e81b0a70d9c9cccf2e05c97bd918fb066 /sc/source/ui/pagedlg | |
| parent | 5140fe150b2962f2973bd07e770df46fee7ab25d (diff) | |
sc: loplugin:badstatics: _one_ global pActiveEdWnd is enough
Change-Id: Idb0eacc8c14b2c56e8255c47c8330e5e6572d5de
Diffstat (limited to 'sc/source/ui/pagedlg')
| -rw-r--r-- | sc/source/ui/pagedlg/scuitphfedit.cxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/pagedlg/tphfedit.cxx | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 2b2192f71af8..9f6f843f66ce 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -51,8 +51,6 @@ // STATIC DATA ----------------------------------------------------------- -static VclPtr<ScEditWindow> pActiveEdWnd = nullptr; - // class ScHFEditPage ScHFEditPage::ScHFEditPage( vcl::Window* pParent, @@ -793,7 +791,7 @@ IMPL_LINK_TYPED( ScHFEditPage, ListHdl_Impl, ListBox&, rList, void ) IMPL_LINK_TYPED( ScHFEditPage, ClickHdl, Button*, pBtn, void ) { - pActiveEdWnd = ::GetScEditWindow(); + VclPtr<ScEditWindow> pActiveEdWnd = ::GetScEditWindow(); if ( !pActiveEdWnd ) return; @@ -824,7 +822,7 @@ IMPL_LINK_TYPED( ScHFEditPage, ClickHdl, Button*, pBtn, void ) IMPL_STATIC_LINK_TYPED( ScHFEditPage, MenuHdl, ScExtIButton&, rBtn, void ) { - pActiveEdWnd = ::GetScEditWindow(); + VclPtr<ScEditWindow> pActiveEdWnd = ::GetScEditWindow(); if ( !pActiveEdWnd ) return; diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index b5f8bf87e401..eab598cc2231 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -48,11 +48,11 @@ #include <memory> // STATIC DATA ----------------------------------------------------------- -static VclPtr<ScEditWindow> pActiveEdWnd = nullptr; +static VclPtr<ScEditWindow> g_pActiveEdWnd = nullptr; ScEditWindow* GetScEditWindow () { - return pActiveEdWnd; + return g_pActiveEdWnd; } static void lcl_GetFieldData( ScHeaderFieldData& rData ) @@ -283,7 +283,7 @@ void ScEditWindow::Command( const CommandEvent& rCEvt ) void ScEditWindow::GetFocus() { pEdView->ShowCursor(); - pActiveEdWnd = this; + g_pActiveEdWnd = this; css::uno::Reference< css::accessibility::XAccessible > xTemp = xAcc; if (xTemp.is() && pAcc) |