From c2b48a763df113e63e6a27ee05b9a6834e4e49a4 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Wed, 19 Oct 2016 15:06:27 +0200
Subject: loplugin:expandablemethodds in svx

Change-Id: I45447b6f5cf7e17d6e81e8c931b07b26d41b9a8c
Reviewed-on: https://gerrit.libreoffice.org/30057
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 svx/source/form/fmexpl.cxx  | 7 +------
 svx/source/form/fmitems.cxx | 2 +-
 svx/source/form/fmshimp.cxx | 4 ++--
 3 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'svx/source/form')

diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 755403338a2f..cbc6f2b347e7 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -185,7 +185,7 @@ FmEntryData::FmEntryData( FmEntryData* pParentData, const Reference< XInterface
 
 FmEntryData::~FmEntryData()
 {
-    Clear();
+    GetChildList()->clear();
     delete pChildList;
 }
 
@@ -221,11 +221,6 @@ FmEntryData::FmEntryData( const FmEntryData& rEntryData )
 }
 
 
-void FmEntryData::Clear()
-{
-    GetChildList()->clear();
-}
-
 
 bool FmEntryData::IsEqualWithoutChildren( FmEntryData* pEntryData )
 {
diff --git a/svx/source/form/fmitems.cxx b/svx/source/form/fmitems.cxx
index aed2077ddac6..7e50a3d1a858 100644
--- a/svx/source/form/fmitems.cxx
+++ b/svx/source/form/fmitems.cxx
@@ -29,7 +29,7 @@
 bool FmInterfaceItem::operator==( const SfxPoolItem& rAttr ) const
 {
     DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
-    return( xInterface == static_cast<const FmInterfaceItem&>(rAttr).GetInterface() );
+    return xInterface == static_cast<const FmInterfaceItem&>(rAttr).xInterface;
 }
 
 
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 1ad1630136b8..c1e0b16c0996 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -3650,10 +3650,10 @@ void FmXFormShell::viewActivated( FmFormView& _rCurrentView, bool _bSyncAction /
 
     UpdateForms( true );
 
-    if ( !hasEverBeenActivated() )
+    if ( m_bFirstActivation )
     {
         m_nActivationEvent = Application::PostUserEvent( LINK( this, FmXFormShell, OnFirstTimeActivation ) );
-        setHasBeenActivated();
+        m_bFirstActivation = false;
     }
 
     // find a default "current form", if there is none, yet
-- 
cgit