loplugin:expandablemethods in UnoControls..vbahelper

Change-Id: Iec2c5e13119d97c9ca87e083c0f7cb00227e5231
Reviewed-on: https://gerrit.libreoffice.org/29997
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

6 files changed, 7 insertions, 21 deletions

diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index c9ccf70d78ac..19ba94a9739c 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -186,7 +186,7 @@ UcbStore::createPropertySetRegistry( const OUString& )
     {
         osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
         if ( !m_pImpl->m_xTheRegistry.is() )
-            m_pImpl->m_xTheRegistry = new PropertySetRegistry( m_xContext, getInitArgs() );
+            m_pImpl->m_xTheRegistry = new PropertySetRegistry( m_xContext, m_pImpl->m_aInitArgs );
     }
 
     return m_pImpl->m_xTheRegistry;
@@ -205,11 +205,6 @@ void SAL_CALL UcbStore::initialize( const Sequence< Any >& aArguments )
 }
 
 
-const Sequence< Any >& UcbStore::getInitArgs() const
-{
-    return m_pImpl->m_aInitArgs;
-}
-
 
 // PropertySetRegistry_Impl.
 
diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx
index 312c5571932e..c0c8de3fb075 100644
--- a/ucb/source/core/ucbstore.hxx
+++ b/ucb/source/core/ucbstore.hxx
@@ -83,9 +83,6 @@ public:
     initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
         throw( css::uno::Exception,
                css::uno::RuntimeException, std::exception ) override;
-
-    const css::uno::Sequence< css::uno::Any >&
-    getInitArgs() const;
 };
 
 
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 8b873b6ef789..b9d530cbb531 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -1333,8 +1333,8 @@ void SortedResultSet::PropertyChanged( const PropertyChangeEvent& rEvt )
 
 void SortedResultSet::CopyData( SortedResultSet *pSource )
 {
-    const SortedEntryList& rSrcS2O = pSource->GetS2OList();
-    const SimpleList&      rSrcO2S = pSource->GetO2SList();
+    const SortedEntryList& rSrcS2O = pSource->maS2O;
+    const SimpleList&      rSrcO2S = pSource->maO2S;
 
     sal_IntPtr i, nCount;
 
@@ -1354,11 +1354,11 @@ void SortedResultSet::CopyData( SortedResultSet *pSource )
     }
 
     mnLastSort = maS2O.Count();
-    mxOther = pSource->GetResultSet();
+    mxOther = pSource->mxOriginal;
 
     if ( !mpSortInfo )
     {
-        mpSortInfo = pSource->GetSortInfo();
+        mpSortInfo = pSource->mpSortInfo;
         mbIsCopy = true;
     }
 }
diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx
index 065405532e19..b0b575a05ea9 100644
--- a/ucb/source/sorter/sortresult.hxx
+++ b/ucb/source/sorter/sortresult.hxx
@@ -164,11 +164,7 @@ public:
                         SortedResultSet( css::uno::Reference< css::sdbc::XResultSet > const & aResult );
                         virtual ~SortedResultSet() override;
 
-    const SortedEntryList&      GetS2OList() const { return maS2O; }
-    const SimpleList&           GetO2SList() const { return maO2S; }
-    const css::uno::Reference < css::sdbc::XResultSet >& GetResultSet() const { return mxOriginal; }
-    SortInfo*                   GetSortInfo() const { return mpSortInfo; }
-    sal_IntPtr                  GetCount() const { return mnCount; }
+    sal_IntPtr          GetCount() const { return mnCount; }
 
     void                CopyData( SortedResultSet* pSource );
     void                Initialize( const css::uno::Sequence < css::ucb::NumberedSortingInfo > &xSortInfo,
diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
index 5007c9ac8e59..4eb418dba25c 100644
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
@@ -119,7 +119,7 @@ Storage::~Storage()
         m_xAggProxy->setDelegator( uno::Reference< uno::XInterface >() );
 
     // Never dispose a document storage. Not owner!
-    if ( !isDocumentStorage() )
+    if ( !m_bIsDocumentStorage )
     {
         if ( m_xWrappedComponent.is() )
         {
diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
index 30c3cff93e79..4b7c370fb42f 100644
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
@@ -81,8 +81,6 @@ public:
         const css::uno::Reference< css::embed::XStorage > & xStorageToWrap );
     virtual ~Storage() override;
 
-    bool isDocumentStorage() const { return m_bIsDocumentStorage; }
-
     // XInterface
     virtual css::uno::Any SAL_CALL queryInterface(
             const css::uno::Type& aType )