summaryrefslogtreecommitdiff
path: root/svx/source/form/fmvwimp.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-10-26 14:59:38 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-10-27 06:09:29 +0000
commit883172375dbf5c0a79cbda5b615ff26ed27c78be (patch)
tree5d81ab1b28e7509a26148b602fd14f8c5c83642f /svx/source/form/fmvwimp.cxx
parenta7ea18ffe715776cb0e2b39e98569c75605ee332 (diff)
loplugin:expandablemethods in svx
Change-Id: I0d193ddf07cc0ddc89b6ce2df6eb71d44e49b631 Reviewed-on: https://gerrit.libreoffice.org/30295 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/form/fmvwimp.cxx')
-rw-r--r--svx/source/form/fmvwimp.cxx23
1 files changed, 8 insertions, 15 deletions
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 2f5d53934ec9..705b9b1e76ab 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -464,7 +464,14 @@ FmXFormView::~FmXFormView()
void SAL_CALL FmXFormView::disposing(const EventObject& Source) throw( RuntimeException, std::exception )
{
if ( m_xWindow.is() && Source.Source == m_xWindow )
- removeGridWindowListening();
+ {
+ m_xWindow->removeFocusListener(this);
+ if ( m_pView )
+ {
+ m_pView->SetMoveOutside( false, FmFormView::ImplAccess() );
+ }
+ m_xWindow = nullptr;
+ }
}
// XFormControllerListener
@@ -1916,20 +1923,6 @@ void SAL_CALL FmXFormView::focusLost( const FocusEvent& /*e*/ ) throw (RuntimeEx
}
}
-void FmXFormView::removeGridWindowListening()
-{
- if ( m_xWindow.is() )
- {
- m_xWindow->removeFocusListener(this);
- if ( m_pView )
- {
- m_pView->SetMoveOutside( false, FmFormView::ImplAccess() );
- }
- m_xWindow = nullptr;
- }
-}
-
-
DocumentType FmXFormView::impl_getDocumentType() const
{
if ( GetFormShell() && GetFormShell()->GetImpl() )