improve the inlinesimplememberfunctions clang plugin

Change-Id: I6d5a952901648e01904ef5c37f953c517304d31e

56 files changed, 45 insertions, 220 deletions

diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index ecabba2bcb4d..9b3eba310df6 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -595,7 +595,7 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >
         getNumberFormatsSupplier();
 
-    com::sun::star::uno::Reference< com::sun::star::uno::XInterface > getChartView();
+    com::sun::star::uno::Reference< com::sun::star::uno::XInterface > getChartView() { return xChartView;}
 
     bool isTimeBased() const { return mbTimeBased;}
     void setTimeBased(bool bTimeBased);
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index db5e60331b08..0c92a26c4625 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -442,10 +442,6 @@ void AccessibleBase::KillAllChildren()
     m_bChildrenInitialized = false;
 }
 
-AccessibleElementInfo AccessibleBase::GetInfo() const
-{
-    return m_aAccInfo;
-}
 
 void AccessibleBase::SetInfo( const AccessibleElementInfo & rNewInfo )
 {
@@ -458,10 +454,6 @@ void AccessibleBase::SetInfo( const AccessibleElementInfo & rNewInfo )
                        true /* global notification */ );
 }
 
-AccessibleUniqueId AccessibleBase::GetId() const
-{
-    return m_aAccInfo.m_aOID;
-}
 
 // ________ (XComponent::dispose) ________
 void SAL_CALL AccessibleBase::disposing()
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index cac76fe74958..2fbe179450f4 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -1035,15 +1035,7 @@ void ChartDocumentWrapper::setBaseDiagram( const OUString& rBaseDiagram )
         this->setDiagram( xDiagram );
 }
 
-OUString ChartDocumentWrapper::getBaseDiagram() const
-{
-    return m_aBaseDiagram;
-}
 
-Reference< util::XRefreshable > ChartDocumentWrapper::getAddIn() const
-{
-    return m_xAddIn;
-}
 
 void ChartDocumentWrapper::setAddIn( const Reference< util::XRefreshable >& xAddIn )
 {
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index 46384871b1e9..0a4cf662fb2e 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -543,10 +543,6 @@ bool DataSeriesPointWrapper::isSupportingAreaProperties()
     return ChartTypeHelper::isSupportingAreaProperties( xChartType, nDimensionCount );
 }
 
-bool DataSeriesPointWrapper::isLinesForbidden()
-{
-    return !m_bLinesAllowed;
-}
 
 Reference< chart2::XDataSeries > DataSeriesPointWrapper::getDataSeries()
 {
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
index f0cff4cc2d06..c0d128d47a2d 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
@@ -71,7 +71,7 @@ public:
     virtual ~DataSeriesPointWrapper();
 
     bool isSupportingAreaProperties();
-    bool isLinesForbidden();
+    bool isLinesForbidden() { return !m_bLinesAllowed;}
 
     /// XServiceInfo declarations
     APPHELPER_XSERVICEINFO_DECL()
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 724c078ae30a..aafc9d3f1fea 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -764,10 +764,6 @@ sal_Int32 DataBrowserModel::getCategoryColumnCount()
     return nLastTextColumnIndex+1;
 }
 
-const DataBrowserModel::tDataHeaderVector& DataBrowserModel::getDataHeaders() const
-{
-    return m_aHeaders;
-}
 
 void DataBrowserModel::updateFromModel()
 {
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx
index 60a8b26b8f43..57bd55f14848 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.hxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx
@@ -130,7 +130,7 @@ public:
 
     typedef ::std::vector< tDataHeader > tDataHeaderVector;
 
-    const tDataHeaderVector& getDataHeaders() const;
+    const tDataHeaderVector& getDataHeaders() const { return m_aHeaders;}
 
     tDataHeader getHeaderForSeries(
         const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 859a4bf541da..834bf7687633 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -110,10 +110,6 @@ ObjectPropertiesDialogParameter::ObjectPropertiesDialogParameter( const OUString
 ObjectPropertiesDialogParameter::~ObjectPropertiesDialogParameter()
 {
 }
-OUString ObjectPropertiesDialogParameter::getLocalizedName() const
-{
-    return m_aLocalizedName;
-}
 
 void ObjectPropertiesDialogParameter::init( const uno::Reference< frame::XModel >& xChartModel )
 {
@@ -309,14 +305,6 @@ void ObjectPropertiesDialogParameter::init( const uno::Reference< frame::XModel
     }
 }
 
-const uno::Sequence< OUString >& ObjectPropertiesDialogParameter::GetCategories() const
-{
-    return m_aCategories;
-}
-uno::Reference< chart2::XChartDocument > ObjectPropertiesDialogParameter::getDocument() const
-{
-    return m_xChartDocument;
-}
 
 const sal_uInt16 nNoArrowNoShadowDlg    = 1101;
 
diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx
index dbb171068e93..5487a3bdfa29 100644
--- a/chart2/source/controller/inc/AccessibleBase.hxx
+++ b/chart2/source/controller/inc/AccessibleBase.hxx
@@ -217,9 +217,9 @@ protected:
     virtual sal_Int32 ImplGetAccessibleChildCount() const
         throw (::com::sun::star::uno::RuntimeException);
 
-    AccessibleElementInfo GetInfo() const;
+    AccessibleElementInfo GetInfo() const { return m_aAccInfo;}
     void SetInfo( const AccessibleElementInfo & rNewInfo );
-    AccessibleUniqueId GetId() const;
+    AccessibleUniqueId GetId() const { return m_aAccInfo.m_aOID;}
 
     // ________ XComponent ________
     virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
index 7ae26ebe2271..b4e2d57e825e 100644
--- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
@@ -62,7 +62,7 @@ protected:
         throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE;
 
     ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >  GetRefSizePropertySet() const;
+        ::com::sun::star::beans::XPropertySet >  GetRefSizePropertySet() const { return m_xRefSizePropSet;}
 
 private:
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
index 21de1e66bdd6..a14cf15b052c 100644
--- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx
+++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
@@ -69,13 +69,13 @@ public:
     APPHELPER_SERVICE_FACTORY_HELPER(ChartDocumentWrapper)
 
     void setAddIn( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable >& xAddIn );
-    ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > getAddIn() const;
+    ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > getAddIn() const { return m_xAddIn;}
 
     void setUpdateAddIn( bool bUpdateAddIn );
     bool getUpdateAddIn() const { return m_bUpdateAddIn;}
 
     void setBaseDiagram( const OUString& rBaseDiagram );
-    OUString getBaseDiagram() const;
+    OUString getBaseDiagram() const { return m_aBaseDiagram;}
 
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > getAdditionalShapes() const;
 
diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx
index ea8850d766ff..dcf34104439f 100644
--- a/chart2/source/controller/inc/ItemConverter.hxx
+++ b/chart2/source/controller/inc/ItemConverter.hxx
@@ -164,13 +164,13 @@ protected:
         throw( ::com::sun::star::uno::Exception );
 
     /// Returns the pool
-    SfxItemPool & GetItemPool() const;
+    SfxItemPool & GetItemPool() const { return m_rItemPool;}
 
     /** Returns the XPropertySet that was given in the CTOR and is used to apply
         items in ApplyItemSet().
      */
     ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >  GetPropertySet() const;
+        ::com::sun::star::beans::XPropertySet >  GetPropertySet() const { return m_xPropertySet;}
 
     // ____ ::utl::OEventListenerAdapter ____
     virtual void _disposing( const ::com::sun::star::lang::EventObject& rSource ) SAL_OVERRIDE;
diff --git a/chart2/source/controller/inc/ObjectHierarchy.hxx b/chart2/source/controller/inc/ObjectHierarchy.hxx
index 843af97d19d2..f0c02c17f91b 100644
--- a/chart2/source/controller/inc/ObjectHierarchy.hxx
+++ b/chart2/source/controller/inc/ObjectHierarchy.hxx
@@ -86,7 +86,7 @@ public:
                                   ExplicitValueProvider * pExplicitValueProvider = 0 );
 
     bool handleKeyEvent( const ::com::sun::star::awt::KeyEvent & rEvent );
-    ObjectHierarchy::tOID getCurrentSelection() const;
+    ObjectHierarchy::tOID getCurrentSelection() const { return m_aCurrentOID;}
 
 private:
     void setCurrentSelection( const ObjectHierarchy::tOID& rOID );
diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
index 13f14e0f402f..33013c3004f0 100644
--- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx
+++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
@@ -35,7 +35,7 @@ public:
 
     void            init( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
     ObjectType      getObjectType() const { return m_eObjectType;}
-    OUString   getLocalizedName() const;
+    OUString   getLocalizedName() const { return m_aLocalizedName;}
 
     bool HasGeometryProperties() const { return m_bHasGeometryProperties;}
     bool HasStatisticProperties() const { return m_bHasStatisticProperties;}
@@ -53,10 +53,10 @@ public:
     bool IsSupportingAxisPositioning() const { return m_bSupportingAxisPositioning;}
     bool ShowAxisOrigin() const { return m_bShowAxisOrigin;}
     bool IsCrossingAxisIsCategoryAxis() const { return m_bIsCrossingAxisIsCategoryAxis;}
-    const ::com::sun::star::uno::Sequence< OUString >& GetCategories() const;
+    const ::com::sun::star::uno::Sequence< OUString >& GetCategories() const { return m_aCategories;}
 
     ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >
-        getDocument() const;
+        getDocument() const { return m_xChartDocument;}
 
     bool IsComplexCategoriesAxis() const { return m_bComplexCategoriesAxis;}
 
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index 6d598d38d89b..79410d8576f1 100644
--- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
@@ -556,11 +556,6 @@ bool CharacterPropertyItemConverter::ApplySpecialItem(
     return bChanged;
 }
 
-uno::Reference< beans::XPropertySet >
-    CharacterPropertyItemConverter::GetRefSizePropertySet() const
-{
-    return m_xRefSizePropSet;
-}
 
 } //  namespace wrapper
 } //  namespace chart
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index 74bf8a26ac26..e8a31d56d2b3 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -64,20 +64,12 @@ void ItemConverter::resetPropertySet(
     }
 }
 
-SfxItemPool & ItemConverter::GetItemPool() const
-{
-    return m_rItemPool;
-}
 
 SfxItemSet ItemConverter::CreateEmptyItemSet() const
 {
     return SfxItemSet( GetItemPool(), GetWhichPairs() );
 }
 
-uno::Reference< beans::XPropertySet > ItemConverter::GetPropertySet() const
-{
-    return m_xPropertySet;
-}
 
 void ItemConverter::_disposing( const lang::EventObject& rSource )
 {
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx
index 0a8d00fc1322..26caf6e3636b 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -745,10 +745,6 @@ void ObjectKeyNavigation::setCurrentSelection( const ObjectHierarchy::tOID& rOID
     m_aCurrentOID = rOID;
 }
 
-ObjectHierarchy::tOID ObjectKeyNavigation::getCurrentSelection() const
-{
-    return m_aCurrentOID;
-}
 
 bool ObjectKeyNavigation::first()
 {
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index 9d0107168e02..8630526c9bd0 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -77,10 +77,6 @@ uno::Reference< drawing::XShape > Selection::getSelectedAdditionalShape()
     return m_aSelectedOID.getAdditionalShape();
 }
 
-ObjectIdentifier Selection::getSelectedOID() const
-{
-    return m_aSelectedOID;
-}
 
 bool Selection::setSelection( const OUString& rCID )
 {
diff --git a/chart2/source/controller/main/SelectionHelper.hxx b/chart2/source/controller/main/SelectionHelper.hxx
index 9a5f56534e3f..48d3ea355737 100644
--- a/chart2/source/controller/main/SelectionHelper.hxx
+++ b/chart2/source/controller/main/SelectionHelper.hxx
@@ -39,7 +39,7 @@ public: //methods
     OUString getSelectedCID();
     ::com::sun::star::uno::Reference<
                     ::com::sun::star::drawing::XShape > getSelectedAdditionalShape();
-    ObjectIdentifier getSelectedOID() const;
+    ObjectIdentifier getSelectedOID() const { return m_aSelectedOID;}
 
     bool isResizeableObjectSelected();
     bool isRotateableObjectSelected( const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/inc/InternalData.hxx b/chart2/source/inc/InternalData.hxx
index 77ed6cabd501..082f6ee3b6b6 100644
--- a/chart2/source/inc/InternalData.hxx
+++ b/chart2/source/inc/InternalData.hxx
@@ -72,9 +72,9 @@ public:
     typedef ::std::vector< ::std::vector< ::com::sun::star::uno::Any > > tVecVecAny; //inner index is hierarchical level
 
     void setComplexRowLabels( const tVecVecAny& rNewRowLabels );
-    tVecVecAny getComplexRowLabels() const;
+    tVecVecAny getComplexRowLabels() const { return m_aRowLabels;}
     void setComplexColumnLabels( const tVecVecAny& rNewColumnLabels );
-    tVecVecAny getComplexColumnLabels() const;
+    tVecVecAny getComplexColumnLabels() const { return m_aColumnLabels;}
 
 #if OSL_DEBUG_LEVEL > 1
     void traceData() const;
diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx
index 6b056122bc46..dead054ca0a2 100644
--- a/chart2/source/inc/MediaDescriptorHelper.hxx
+++ b/chart2/source/inc/MediaDescriptorHelper.hxx
@@ -52,7 +52,7 @@ public:
                             ::com::sun::star::beans::PropertyValue > & rMediaDescriptor );
 
     ::com::sun::star::uno::Sequence<
-                ::com::sun::star::beans::PropertyValue > getReducedForModel();
+                ::com::sun::star::beans::PropertyValue > getReducedForModel() { return m_aModelProperties;}
 
 public:
     //all properties given in the constructor are stored in the following three sequences
diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx
index d30a00df8a2b..937da78571df 100644
--- a/chart2/source/inc/ObjectIdentifier.hxx
+++ b/chart2/source/inc/ObjectIdentifier.hxx
@@ -265,8 +265,8 @@ public:
     bool isValid() const;
     bool isAutoGeneratedObject() const;
     bool isAdditionalShape() const;
-    OUString getObjectCID() const;
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getAdditionalShape() const;
+    OUString getObjectCID() const { return m_aObjectCID;}
+    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getAdditionalShape() const { return m_xAdditionalShape;}
     ::com::sun::star::uno::Any getAny() const;
 
 private:
diff --git a/chart2/source/inc/ReferenceSizeProvider.hxx b/chart2/source/inc/ReferenceSizeProvider.hxx
index d1275c718a2f..9c15afd3ad69 100644
--- a/chart2/source/inc/ReferenceSizeProvider.hxx
+++ b/chart2/source/inc/ReferenceSizeProvider.hxx
@@ -51,7 +51,7 @@ public:
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XChartDocument > & xChartDoc );
 
-    ::com::sun::star::awt::Size getPageSize() const;
+    ::com::sun::star::awt::Size getPageSize() const { return m_aPageSize;}
 
     /** Retrieves the state auto-resize from all objects that support this
         feature.  If all objects return the same state, AUTO_RESIZE_YES or
diff --git a/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx
index 2baa2f2b9e22..d5f0bea15eef 100644
--- a/chart2/source/inc/WrappedProperty.hxx
+++ b/chart2/source/inc/WrappedProperty.hxx
@@ -37,7 +37,7 @@ public:
     WrappedProperty( const OUString& rOuterName, const OUString& rInnerName );
     virtual ~WrappedProperty();
 
-    const OUString& getOuterName() const;
+    const OUString& getOuterName() const { return m_aOuterName;}
     virtual OUString getInnerName() const;
 
     virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 833ea95df316..02c123477eb9 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -1408,10 +1408,6 @@ void ChartModel::setTimeBasedRange(sal_Int32 nStart, sal_Int32 nEnd)
     mbTimeBased = true;
 }
 
-uno::Reference< uno::XInterface > ChartModel::getChartView()
-{
-    return xChartView;
-}
 
 void ChartModel::setWindow( const sal_uInt64 nWindowPtr )
     throw (uno::RuntimeException, std::exception)
diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx
index 9fb275f7a61e..db542d0e8edc 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -66,10 +66,6 @@ ChartType::~ChartType()
     m_aDataSeries.clear();
 }
 
-Reference< uno::XComponentContext > ChartType::GetComponentContext() const
-{
-    return m_xContext;
-}
 
 // ____ XChartType ____
 Reference< chart2::XCoordinateSystem > SAL_CALL
diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx
index 82eb80332504..18dfaea03ba4 100644
--- a/chart2/source/model/template/ChartType.hxx
+++ b/chart2/source/model/template/ChartType.hxx
@@ -63,7 +63,7 @@ protected:
     explicit ChartType( const ChartType & rOther );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
-        GetComponentContext() const;
+        GetComponentContext() const { return m_xContext;}
 
     // ____ XChartType ____
     // still abstract ! implement !
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index 8be651a75f7f..de109e85a98a 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -898,10 +898,6 @@ void ChartTypeTemplate::copyPropertiesFromOldToNewCoordianteSystem(
         comphelper::copyProperties( xSource, xDestination );
 }
 
-Reference< uno::XComponentContext > ChartTypeTemplate::GetComponentContext() const
-{
-    return m_xContext;
-}
 
 } //  namespace chart
 
diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx
index 39f3e0c5e742..b0dc88c4af09 100644
--- a/chart2/source/model/template/ChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ChartTypeTemplate.hxx
@@ -246,7 +246,7 @@ protected:
                 ::com::sun::star::chart2::XCoordinateSystem > > & rCoordSys );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
-        GetComponentContext() const;
+        GetComponentContext() const { return m_xContext;}
 
     static void copyPropertiesFromOldToNewCoordianteSystem(
                     const ::com::sun::star::uno::Sequence<
diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx
index ce454089b868..67e50fb38db9 100644
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -57,10 +57,6 @@ DataInterpreter::DataInterpreter(
 DataInterpreter::~DataInterpreter()
 {}
 
-Reference< uno::XComponentContext > DataInterpreter::GetComponentContext() const
-{
-    return m_xContext;
-}
 
 // ____ XDataInterpreter ____
 InterpretedData SAL_CALL DataInterpreter::interpretDataSource(
diff --git a/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx
index 9f49db3d29dd..af589f13bf63 100644
--- a/chart2/source/model/template/DataInterpreter.hxx
+++ b/chart2/source/model/template/DataInterpreter.hxx
@@ -38,7 +38,7 @@ public:
     virtual ~DataInterpreter();
 
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
-        GetComponentContext() const;
+        GetComponentContext() const { return m_xContext;}
 
     /// XServiceInfo declarations
     APPHELPER_XSERVICEINFO_DECL()
diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx
index 33b850ea90e4..de003b70e04e 100644
--- a/chart2/source/tools/ImplOPropertySet.cxx
+++ b/chart2/source/tools/ImplOPropertySet.cxx
@@ -181,10 +181,6 @@ bool ImplOPropertySet::SetStyle( const Reference< style::XStyle > & xStyle )
     return true;
 }
 
-Reference< style::XStyle > ImplOPropertySet::GetStyle() const
-{
-    return m_xStyle;
-}
 
 void ImplOPropertySet::cloneInterfaceProperties()
 {
diff --git a/chart2/source/tools/ImplOPropertySet.hxx b/chart2/source/tools/ImplOPropertySet.hxx
index 28e84cc818c9..ca7e5f0266f9 100644
--- a/chart2/source/tools/ImplOPropertySet.hxx
+++ b/chart2/source/tools/ImplOPropertySet.hxx
@@ -67,7 +67,7 @@ public:
 
     bool SetStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > & xStyle );
     ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle >
-        GetStyle() const;
+        GetStyle() const { return m_xStyle;}
 
     typedef
         ::std::map< sal_Int32, ::com::sun::star::uno::Any >
diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
index 71a2fd8ab466..f79bd627d4de 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -496,10 +496,6 @@ void InternalData::setComplexRowLabels( const vector< vector< uno::Any > >& rNew
         enlargeData( 0, nNewRowCount );
 }
 
-vector< vector< uno::Any > > InternalData::getComplexRowLabels() const
-{
-    return m_aRowLabels;
-}
 
 void InternalData::setComplexColumnLabels( const vector< vector< uno::Any > >& rNewColumnLabels )
 {
@@ -511,10 +507,6 @@ void InternalData::setComplexColumnLabels( const vector< vector< uno::Any > >& r
         enlargeData( nNewColumnCount, 0 );
 }
 
-vector< vector< uno::Any > > InternalData::getComplexColumnLabels() const
-{
-    return m_aColumnLabels;
-}
 
 #if OSL_DEBUG_LEVEL > 1
 void InternalData::traceData() const
diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx b/chart2/source/tools/MediaDescriptorHelper.cxx
index 9279b9d9fe7b..610426548e1e 100644
--- a/chart2/source/tools/MediaDescriptorHelper.cxx
+++ b/chart2/source/tools/MediaDescriptorHelper.cxx
@@ -196,11 +196,6 @@ void MediaDescriptorHelper::impl_init()
     ISSET_Stream = false;
 }
 
-    uno::Sequence< beans::PropertyValue > MediaDescriptorHelper
-::getReducedForModel()
-{
-    return m_aModelProperties;
-}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index 9edbdf041abd..0ab0874fdb85 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -1542,15 +1542,7 @@ bool ObjectIdentifier::isAdditionalShape() const
     return m_xAdditionalShape.is();
 }
 
-OUString ObjectIdentifier::getObjectCID() const
-{
-    return m_aObjectCID;
-}
 
-Reference< drawing::XShape > ObjectIdentifier::getAdditionalShape() const
-{
-    return m_xAdditionalShape;
-}
 
 Any ObjectIdentifier::getAny() const
 {
diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx
index 1f5c84f30025..0a0145b9604b 100644
--- a/chart2/source/tools/ReferenceSizeProvider.cxx
+++ b/chart2/source/tools/ReferenceSizeProvider.cxx
@@ -48,10 +48,6 @@ ReferenceSizeProvider::ReferenceSizeProvider(
         m_bUseAutoScale( getAutoResizeState( xChartDoc ) == AUTO_RESIZE_YES )
 {}
 
-awt::Size ReferenceSizeProvider::getPageSize() const
-{
-    return m_aPageSize;
-}
 
 
 void ReferenceSizeProvider::impl_setValuesAtTitled(
diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx
index 4a8f94b7912b..4666dbb2cf96 100644
--- a/chart2/source/tools/WrappedProperty.cxx
+++ b/chart2/source/tools/WrappedProperty.cxx
@@ -37,10 +37,6 @@ WrappedProperty::~WrappedProperty()
 {
 }
 
-const OUString& WrappedProperty::getOuterName() const
-{
-    return m_aOuterName;
-}
 
 OUString WrappedProperty::getInnerName() const
 {
diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx
index 1dbab1c820e3..ff6b7d509eb6 100644
--- a/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -228,15 +228,7 @@ void ScaleAutomatism::calculateExplicitScaleAndIncrement(
     }
 }
 
-ScaleData ScaleAutomatism::getScale() const
-{
-    return m_aSourceScale;
-}
 
-Date ScaleAutomatism::getNullDate() const
-{
-    return m_aNullDate;
-}
 
 void ScaleAutomatism::calculateExplicitIncrementAndScaleForCategory(
         ExplicitScaleData& rExplicitScale,
diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx
index a7c6e8dc0877..457a211ee9d1 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -49,10 +49,6 @@ VAxisBase::~VAxisBase()
 {
 }
 
-sal_Int32 VAxisBase::getDimensionCount()
-{
-    return m_nDimension;
-}
 
 void VAxisBase::initAxisLabelProperties( const ::com::sun::star::awt::Size& rFontReferenceSize
                   , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels )
diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx
index 7494430a206e..3c39c033e1a6 100644
--- a/chart2/source/view/axes/VAxisBase.hxx
+++ b/chart2/source/view/axes/VAxisBase.hxx
@@ -39,7 +39,7 @@ public:
                     ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier );
     virtual ~VAxisBase();
 
-    sal_Int32 getDimensionCount();
+    sal_Int32 getDimensionCount() { return m_nDimension;}
 
     virtual void createMaximumLabels()=0;
     virtual void createLabels()=0;
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index 8cf540b057b9..e6fb154b1473 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -87,13 +87,6 @@ double lcl_getTickOffset(sal_Int32 nLength,sal_Int32 nTickmarkStyle)
     return fPercent*nLength;
 }
 
-VLineProperties AxisProperties::makeLinePropertiesForDepth( sal_Int32 /* nDepth */ ) const
-{
-    //@todo get this from somewhere; maybe for each subincrement
-    //so far the model does not offer different settings for each tick depth
-    return m_aLineProperties;
-}
-
 TickmarkProperties AxisProperties::makeTickmarkProperties(
                         sal_Int32 nDepth ) const
 {
diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx
index 7da3d8a47118..bf4a50824887 100644
--- a/chart2/source/view/axes/VAxisProperties.hxx
+++ b/chart2/source/view/axes/VAxisProperties.hxx
@@ -147,7 +147,9 @@ private:
 
 protected:
     virtual TickmarkProperties  makeTickmarkProperties( sal_Int32 nDepth ) const;
-    VLineProperties      makeLinePropertiesForDepth( sal_Int32 nDepth ) const;
+    //@todo get this from somewhere; maybe for each subincrement
+    //so far the model does not offer different settings for each tick depth
+    VLineProperties      makeLinePropertiesForDepth( sal_Int32 /*nDepth*/ ) const { return m_aLineProperties; }
 };
 
 } //namespace chart
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index 205fd77edd49..7415b3e82465 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -147,10 +147,6 @@ void VCoordinateSystem::setTransformationSceneToScreen(
     }
 }
 
-drawing::HomogenMatrix VCoordinateSystem::getTransformationSceneToScreen()
-{
-    return m_aMatrixSceneToScreen;
-}
 
 //better performance for big data
 uno::Sequence< sal_Int32 > VCoordinateSystem::getCoordinateSystemResolution(
@@ -205,10 +201,6 @@ uno::Sequence< sal_Int32 > VCoordinateSystem::getCoordinateSystemResolution(
     return aResolution;
 }
 
-Reference< XCoordinateSystem > VCoordinateSystem::getModel() const
-{
-    return m_xCooSysModel;
-}
 
 Reference< XAxis > VCoordinateSystem::getAxisByDimension( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const
 {
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx
index d04d3b06215b..329827167821 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -675,10 +675,6 @@ void VDiagram::createShapes_3d()
     adjustPosAndSize_3d( m_aAvailablePosIncludingAxes, m_aAvailableSizeIncludingAxes );
 }
 
-uno::Reference< drawing::XShapes > VDiagram::getCoordinateRegion()
-{
-    return uno::Reference<drawing::XShapes>( m_xCoordinateRegionShape, uno::UNO_QUERY );
-}
 
 ::basegfx::B2IRectangle VDiagram::getCurrentRectangle()
 {
diff --git a/chart2/source/view/inc/3DChartObjects.hxx b/chart2/source/view/inc/3DChartObjects.hxx
index cc3d8144923d..54b04fdcbb0f 100644
--- a/chart2/source/view/inc/3DChartObjects.hxx
+++ b/chart2/source/view/inc/3DChartObjects.hxx
@@ -94,7 +94,7 @@ public:
     Text(OpenGL3DRenderer* pRenderer, TextCache& rTextCache, const OUString& rStr, sal_uInt32 nId);
     virtual void render() SAL_OVERRIDE;
 
-    Size getSize() const;
+    Size getSize() const { return maText.maSize;}
 
     void setPosition(const glm::vec3& rTopLeft, const glm::vec3& rTopRight, const glm::vec3& rBottomRight);
 
diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx
index f2f81dee7428..e355b2749144 100644
--- a/chart2/source/view/inc/PlottingPositionHelper.hxx
+++ b/chart2/source/view/inc/PlottingPositionHelper.hxx
@@ -50,7 +50,7 @@ public:
     virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix);
 
     virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis );
-    const ::std::vector< ExplicitScaleData >& getScales() const;
+    const ::std::vector< ExplicitScaleData >& getScales() const { return m_aScales;}
 
     //better performance for big data
     inline void   setCoordinateSystemResolution( const ::com::sun::star::uno::Sequence< sal_Int32 >& rCoordinateSystemResolution );
@@ -155,7 +155,7 @@ public:
     virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix) SAL_OVERRIDE;
     virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) SAL_OVERRIDE;
 
-    ::basegfx::B3DHomMatrix getUnitCartesianToScene() const;
+    ::basegfx::B3DHomMatrix getUnitCartesianToScene() const { return m_aUnitCartesianToScene;}
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >
                   getTransformationScaledLogicToScene() const SAL_OVERRIDE;
diff --git a/chart2/source/view/inc/ScaleAutomatism.hxx b/chart2/source/view/inc/ScaleAutomatism.hxx
index 384577779beb..3518eb2bae64 100644
--- a/chart2/source/view/inc/ScaleAutomatism.hxx
+++ b/chart2/source/view/inc/ScaleAutomatism.hxx
@@ -73,8 +73,8 @@ public:
                             ExplicitScaleData& rExplicitScale,
                             ExplicitIncrementData& rExplicitIncrement ) const;
 
-    ::com::sun::star::chart2::ScaleData getScale() const;
-    Date getNullDate() const;
+    ::com::sun::star::chart2::ScaleData getScale() const { return m_aSourceScale;}
+    Date getNullDate() const { return m_aNullDate;}
 
 private:
     /** Fills the passed scale data and increment data for category scaling. */
diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx
index fa2ed6a857ee..18c8c50b6aa2 100644
--- a/chart2/source/view/inc/VCoordinateSystem.hxx
+++ b/chart2/source/view/inc/VCoordinateSystem.hxx
@@ -66,7 +66,7 @@ public:
     void setParticle( const OUString& rCooSysParticle );
 
     virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix );
-    ::com::sun::star::drawing::HomogenMatrix getTransformationSceneToScreen();
+    ::com::sun::star::drawing::HomogenMatrix getTransformationSceneToScreen() { return m_aMatrixSceneToScreen;}
 
     //better performance for big data
     virtual ::com::sun::star::uno::Sequence< sal_Int32 > getCoordinateSystemResolution( const ::com::sun::star::awt::Size& rPageSize
@@ -97,7 +97,7 @@ public:
 
     ::com::sun::star::uno::Reference<
         ::com::sun::star::chart2::XCoordinateSystem >
-        getModel() const;
+        getModel() const { return m_xCooSysModel;}
 
     virtual void createVAxisList(
             const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xNumberFormatsSupplier
diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx
index 9aeaa9c70fd9..c62b45dcc4e2 100644
--- a/chart2/source/view/inc/VDataSeries.hxx
+++ b/chart2/source/view/inc/VDataSeries.hxx
@@ -67,7 +67,7 @@ public:
     ~VDataSeries();
 
     ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >
-        getModel() const;
+        getModel() const { return m_xDataSeries;}
 
     void setCategoryXAxis();
     void setXValues( const ::com::sun::star::uno::Reference<
@@ -116,7 +116,7 @@ public:
                         getPropertiesOfPoint( sal_Int32 index ) const;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
-                        getPropertiesOfSeries() const;
+                        getPropertiesOfSeries() const { return css::uno::Reference<css::beans::XPropertySet>(m_xDataSeries, css::uno::UNO_QUERY );}
 
     ::com::sun::star::chart2::Symbol*
                         getSymbolProperties( sal_Int32 index ) const;
@@ -155,12 +155,12 @@ public:
     //this is here for deep stacking:
     double m_fLogicZPos;//from 0 to series count -1
 
-    OUString       getCID() const;
-    OUString       getSeriesParticle() const;
-    OUString       getPointCID_Stub() const;
+    OUString       getCID() const { return m_aCID;}
+    OUString       getSeriesParticle() const { return m_aSeriesParticle;}
+    OUString       getPointCID_Stub() const { return m_aPointCID_Stub;}
     OUString       getErrorBarsCID( bool bYError ) const;
     OUString       getLabelsCID() const;
-    OUString       getLabelCID_Stub() const;
+    OUString       getLabelCID_Stub() const { return m_aLabelCID_Stub;}
     OUString       getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const;
 
     ::com::sun::star::chart2::DataPointLabel*
diff --git a/chart2/source/view/inc/VDiagram.hxx b/chart2/source/view/inc/VDiagram.hxx
index 8baa33754922..ecf6cf23836b 100644
--- a/chart2/source/view/inc/VDiagram.hxx
+++ b/chart2/source/view/inc/VDiagram.hxx
@@ -52,7 +52,7 @@ public: //methods
                         , const ::com::sun::star::awt::Size& rSize );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >
-            getCoordinateRegion();
+            getCoordinateRegion() { return css::uno::Reference<css::drawing::XShapes>( m_xCoordinateRegionShape, css::uno::UNO_QUERY );}
 
     ::basegfx::B2IRectangle    getCurrentRectangle();
 
diff --git a/chart2/source/view/main/3DChartObjects.cxx b/chart2/source/view/main/3DChartObjects.cxx
index 1cf0b4920994..1b962c69168c 100644
--- a/chart2/source/view/main/3DChartObjects.cxx
+++ b/chart2/source/view/main/3DChartObjects.cxx
@@ -111,10 +111,6 @@ void Text::render()
                                   mnUniqueId);
 }
 
-Size Text::getSize() const
-{
-    return maText.maSize;
-}
 
 void Text::setPosition(const glm::vec3& rTopLeft, const glm::vec3& rTopRight, const glm::vec3& rBottomRight)
 {
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index 12d93678db3a..1880d7ffac00 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -1191,10 +1191,6 @@ void DummyChart::clear()
     maShapes.clear();
 }
 
-TextCache& DummyChart::getTextCache()
-{
-    return maTextCache;
-}
 
 }
 
diff --git a/chart2/source/view/main/DummyXShape.hxx b/chart2/source/view/main/DummyXShape.hxx
index ddee02d815f9..be1b86b57dd4 100644
--- a/chart2/source/view/main/DummyXShape.hxx
+++ b/chart2/source/view/main/DummyXShape.hxx
@@ -397,7 +397,7 @@ public:
     virtual void render() SAL_OVERRIDE;
 
     void clear();
-    TextCache& getTextCache();
+    TextCache& getTextCache() { return maTextCache;}
 
 private:
 
diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx
index cfc496a39b0f..9c6a8ed3290e 100644
--- a/chart2/source/view/main/PlottingPositionHelper.cxx
+++ b/chart2/source/view/main/PlottingPositionHelper.cxx
@@ -104,10 +104,6 @@ void PlottingPositionHelper::setScales( const std::vector< ExplicitScaleData >&
     m_bSwapXAndY = bSwapXAndYAxis;
     m_xTransformationLogicToScene = NULL;
 }
-const std::vector< ExplicitScaleData >& PlottingPositionHelper::getScales() const
-{
-    return m_aScales;
-}
 
 uno::Reference< XTransformation > PlottingPositionHelper::getTransformationScaledLogicToScene() const
 {
@@ -423,10 +419,6 @@ void PolarPlottingPositionHelper::setScales( const std::vector< ExplicitScaleDat
     return aRet;
 }
 
-::basegfx::B3DHomMatrix PolarPlottingPositionHelper::getUnitCartesianToScene() const
-{
-    return m_aUnitCartesianToScene;
-}
 
 uno::Reference< XTransformation > PolarPlottingPositionHelper::getTransformationScaledLogicToScene() const
 {
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index 7354bd88b9ef..6fc067688649 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -312,10 +312,6 @@ void VDataSeries::doSortByXValues()
     }
 }
 
-uno::Reference< XDataSeries > VDataSeries::getModel() const
-{
-    return m_xDataSeries;
-}
 
 void VDataSeries::releaseShapes()
 {
@@ -370,18 +366,6 @@ void VDataSeries::setParticle( const OUString& rSeriesParticle )
     m_aLabelCID_Stub = ObjectIdentifier::createClassifiedIdentifierWithParent(
                         OBJECTTYPE_DATA_LABEL, OUString(), getLabelsCID() );
 }
-OUString VDataSeries::getSeriesParticle() const
-{
-    return m_aSeriesParticle;
-}
-OUString VDataSeries::getCID() const
-{
-    return m_aCID;
-}
-OUString VDataSeries::getPointCID_Stub() const
-{
-    return m_aPointCID_Stub;
-}
 OUString VDataSeries::getErrorBarsCID(bool bYError) const
 {
     OUString aChildParticle( ObjectIdentifier::getStringForType(
@@ -399,10 +383,6 @@ OUString VDataSeries::getLabelsCID() const
     return ObjectIdentifier::createClassifiedIdentifierForParticles(
             m_aSeriesParticle, aChildParticle );
 }
-OUString VDataSeries::getLabelCID_Stub() const
-{
-    return m_aLabelCID_Stub;
-}
 OUString VDataSeries::getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const
 {
     OUString aRet;
@@ -910,10 +890,6 @@ uno::Reference< beans::XPropertySet > VDataSeries::getPropertiesOfPoint( sal_Int
     return this->getPropertiesOfSeries();
 }
 
-uno::Reference< beans::XPropertySet > VDataSeries::getPropertiesOfSeries() const
-{
-    return  uno::Reference<beans::XPropertySet>(m_xDataSeries, uno::UNO_QUERY );
-}
 
 DataPointLabel* getDataPointLabelFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp )
 {