From 3e82897353e576dc6e3fbf55371fda5a0c3415df Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Thu, 12 Jun 2014 14:06:28 +0200
Subject: improve the inlinesimplememberfunctions clang plugin

Change-Id: I6d5a952901648e01904ef5c37f953c517304d31e
---
 framework/source/fwe/classes/addonsoptions.cxx     | 42 +++-------------------
 .../source/uiconfiguration/imagemanagerimpl.cxx    |  8 -----
 .../source/uiconfiguration/imagemanagerimpl.hxx    |  4 +--
 3 files changed, 7 insertions(+), 47 deletions(-)

(limited to 'framework')

diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 5ec0e61ad29b..27891a481501 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -245,15 +245,15 @@ class AddonsOptions_Impl : public ConfigItem
 
         bool                                            HasAddonsMenu        () const;
         sal_Int32                                       GetAddonsToolBarCount() const;
-        const Sequence< Sequence< PropertyValue > >&    GetAddonsMenu        () const;
-        const Sequence< Sequence< PropertyValue > >&    GetAddonsMenuBarPart () const;
+        const Sequence< Sequence< PropertyValue > >&    GetAddonsMenu        () const { return m_aCachedMenuProperties;}
+        const Sequence< Sequence< PropertyValue > >&    GetAddonsMenuBarPart () const { return m_aCachedMenuBarPartProperties;}
         const Sequence< Sequence< PropertyValue > >&    GetAddonsToolBarPart ( sal_uInt32 nIndex ) const;
         const OUString                           GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const;
-        const Sequence< Sequence< PropertyValue > >&    GetAddonsHelpMenu    () const;
+        const Sequence< Sequence< PropertyValue > >&    GetAddonsHelpMenu    () const { return m_aCachedHelpMenuProperties;}
         Image                                           GetImageFromURL( const OUString& aURL, bool bBig, bool bNoScale );
-        const MergeMenuInstructionContainer&            GetMergeMenuInstructions() const;
+        const MergeMenuInstructionContainer&            GetMergeMenuInstructions() const { return m_aCachedMergeMenuInsContainer;}
         bool                                            GetMergeToolbarInstructions( const OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbarInstructions ) const;
-        const MergeStatusbarInstructionContainer&       GetMergeStatusbarInstructions() const;
+        const MergeStatusbarInstructionContainer&       GetMergeStatusbarInstructions() const { return m_aCachedStatusbarMergingInstructions;}
         void                                            ReadConfigurationData();
 
 
@@ -496,20 +496,6 @@ sal_Int32 AddonsOptions_Impl::GetAddonsToolBarCount() const
 
 //  public method
 
-const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenu() const
-{
-    return m_aCachedMenuProperties;
-}
-
-//  public method
-
-const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenuBarPart() const
-{
-    return m_aCachedMenuBarPartProperties;
-}
-
-//  public method
-
 const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsToolBarPart( sal_uInt32 nIndex ) const
 {
     if ( /*nIndex >= 0 &&*/ nIndex < m_aCachedToolBarPartProperties.size() )
@@ -530,20 +516,6 @@ const OUString AddonsOptions_Impl::GetAddonsToolbarResourceName( sal_uInt32 nInd
 
 //  public method
 
-const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsHelpMenu  () const
-{
-    return m_aCachedHelpMenuProperties;
-}
-
-//  public method
-
-const MergeMenuInstructionContainer& AddonsOptions_Impl::GetMergeMenuInstructions() const
-{
-    return m_aCachedMergeMenuInsContainer;
-}
-
-//  public method
-
 bool AddonsOptions_Impl::GetMergeToolbarInstructions(
     const OUString& rToolbarName,
     MergeToolbarInstructionContainer& rToolbarInstructions ) const
@@ -558,10 +530,6 @@ bool AddonsOptions_Impl::GetMergeToolbarInstructions(
         return false;
 }
 
-const MergeStatusbarInstructionContainer& AddonsOptions_Impl::GetMergeStatusbarInstructions() const
-{
-    return m_aCachedStatusbarMergingInstructions;
-}
 
 //  public method
 
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 785303e0037f..2e974e8c70b5 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -274,15 +274,7 @@ ImageList* CmdImageList::impl_getImageList( sal_Int16 nImageType )
     return m_pImageList[nImageType];
 }
 
-std::vector< OUString >& CmdImageList::impl_getImageNameVector()
-{
-    return m_aImageNameVector;
-}
 
-std::vector< OUString >& CmdImageList::impl_getImageCommandNameVector()
-{
-    return m_aImageCommandNameVector;
-}
 
 Image CmdImageList::getImageFromCommandURL( sal_Int16 nImageType, const OUString& rCommandURL )
 {
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index a76ee632adab..362cfe1d7c9f 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -69,8 +69,8 @@ namespace framework
         protected:
             void                            impl_fillCommandToImageNameMap();
             ImageList*                      impl_getImageList( sal_Int16 nImageType );
-            std::vector< OUString >& impl_getImageNameVector();
-            std::vector< OUString >& impl_getImageCommandNameVector();
+            std::vector< OUString >& impl_getImageNameVector() { return m_aImageNameVector;}
+            std::vector< OUString >& impl_getImageCommandNameVector() { return m_aImageCommandNameVector;}
 
         private:
             bool                                                                         m_bVectorInit;
-- 
cgit