loplugin:staticmethods

Change-Id: I5d02ba0db00e11af3c17eaf77ce19c635a52077f

17 files changed, 52 insertions, 52 deletions

diff --git a/reportdesign/source/filter/xml/xmlControlProperty.hxx b/reportdesign/source/filter/xml/xmlControlProperty.hxx
index 4d4d13db4c7c..5e6bde3430c9 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.hxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.hxx
@@ -39,7 +39,7 @@ namespace rptxml
         bool m_bIsList;
 
         ORptFilter& GetOwnImport();
-        ::com::sun::star::uno::Any convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters);
+        static ::com::sun::star::uno::Any convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters);
         OXMLControlProperty(const OXMLControlProperty&) SAL_DELETED_FUNCTION;
         void operator =(const OXMLControlProperty&) SAL_DELETED_FUNCTION;
     public:
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx
index c0d5272f053f..0d37284c0c47 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -163,9 +163,9 @@ private:
     void                    exportParagraph(const Reference< XReportControlModel >& _xReportElement);
     bool                    exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const OUString& _sFormula);
     void                    exportGroupsExpressionAsFunction(const Reference< XGroups>& _xGroups);
-    OUString         convertFormula(const OUString& _sFormula);
+    static OUString  convertFormula(const OUString& _sFormula);
 
-    OUString         implConvertNumber(sal_Int32 _nValue);
+    static OUString         implConvertNumber(sal_Int32 _nValue);
 
 private:
                                     ORptExport();
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index 3ba9044521af..049ae98da0f1 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -518,7 +518,7 @@ void Condition::updateToolbar(const uno::Reference< report::XReportControlFormat
         for (sal_uInt16 j = 0; j< nItemCount; ++j)
         {
             sal_uInt16 nItemId = m_pActions->GetItemId(j);
-            m_pActions->CheckItem( nItemId, m_rController.isFormatCommandEnabled(mapToolbarItemToSlotId(nItemId),
+            m_pActions->CheckItem( nItemId, OReportController::isFormatCommandEnabled(mapToolbarItemToSlotId(nItemId),
                 _xReportControlFormat ) );
         }
 
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 177b15e57784..efd047adf125 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -116,10 +116,10 @@ public:
     virtual void dispose() SAL_OVERRIDE;
 
     // XEventListener
-    void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception );
+    static void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception );
     // XContainerListener
     void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception);
-    void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception);
+    static void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception);
     void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception);
 
     virtual Size GetOptimalSize() const SAL_OVERRIDE;
@@ -182,13 +182,13 @@ public:
 
 
 void OFieldExpressionControlContainerListener::disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception )
-{ mpParent->disposing(Source); }
+{ OFieldExpressionControl::disposing(Source); }
 
 void OFieldExpressionControlContainerListener::elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception)
 { mpParent->elementInserted(rEvent); }
 
 void OFieldExpressionControlContainerListener::elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception)
-{ mpParent->elementReplaced(rEvent); }
+{ OFieldExpressionControl::elementReplaced(rEvent); }
 
 void OFieldExpressionControlContainerListener::elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception)
 { mpParent->elementRemoved(rEvent); }
diff --git a/reportdesign/source/ui/inc/FixedTextColor.hxx b/reportdesign/source/ui/inc/FixedTextColor.hxx
index a10142d74da8..4f3da57e05ee 100644
--- a/reportdesign/source/ui/inc/FixedTextColor.hxx
+++ b/reportdesign/source/ui/inc/FixedTextColor.hxx
@@ -41,7 +41,7 @@ namespace rptui
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer > getVclWindowPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFixedText >& _xComponent) throw(::com::sun::star::uno::RuntimeException);
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > getXControl(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFixedText >& _xFixedText) throw(::com::sun::star::uno::RuntimeException);
 
-        void setPropertyTextColor(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >& _xVclWindowPeer, sal_Int32 _nFormatKey);
+        static void setPropertyTextColor(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >& _xVclWindowPeer, sal_Int32 _nFormatKey);
 
     public:
         FixedTextColor(const OReportController & _aObserver);
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx
index d71dd3dd215c..f350f3b263d5 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -92,14 +92,14 @@ namespace rptui
 
         ::com::sun::star::uno::Any getConstantValue(bool bToControlValue,sal_uInt16 nResId,const ::com::sun::star::uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName );
         ::com::sun::star::beans::Property getProperty(const OUString & PropertyName);
-        void implCreateListLikeControl(
+        static void implCreateListLikeControl(
                 const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory
                 ,::com::sun::star::inspection::LineDescriptor & out_Descriptor
                 ,sal_uInt16 _nResId
                 ,bool _bReadOnlyControl
                 ,bool _bTrueIfListBoxFalseIfComboBox
             );
-        void implCreateListLikeControl(
+        static void implCreateListLikeControl(
                 const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory
                 ,::com::sun::star::inspection::LineDescriptor & out_Descriptor
                 ,const ::std::vector< OUString>& _aEntries
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index a902da39ccb2..cd1d26f972a3 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -216,8 +216,8 @@ namespace rptui
         @param _nUndoStrId the string id of the string which is shown in undo menu
         @param _nShrinkId  ID of what you would like to shrink.
         */
-        void shrinkSectionBottom(::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > _xSection);
-        void shrinkSectionTop(::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > _xSection);
+        static void shrinkSectionBottom(::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > _xSection);
+        static void shrinkSectionTop(::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > _xSection);
 
     public:
         void shrinkSection(sal_uInt16 _nUndoStrId, ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > _xSection, sal_Int32 _nShrinkId);
@@ -347,8 +347,8 @@ namespace rptui
             @param  _nCommand   the command id
             @param  _xControlFormat the report control format
         */
-        bool                                isFormatCommandEnabled(sal_uInt16 _nCommand
-                                                ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlFormat>& _xControlFormat) const;
+        static bool                         isFormatCommandEnabled(sal_uInt16 _nCommand
+                                                ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlFormat>& _xControlFormat);
 
         virtual bool                        Construct(vcl::Window* pParent) SAL_OVERRIDE;
         // XEventListener
diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx
index f806a42543d0..3b77341b5a69 100644
--- a/reportdesign/source/ui/inc/ReportSection.hxx
+++ b/reportdesign/source/ui/inc/ReportSection.hxx
@@ -151,7 +151,7 @@ namespace rptui
         * \param _sType
         * \param _pObj
         */
-        void createDefault(const OUString& _sType,SdrObject* _pObj);
+        static void createDefault(const OUString& _sType,SdrObject* _pObj);
         void stopScrollTimer();
 
         /** deactivate the current active ole object if any
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index 11d8da6ff981..00e0ac22d837 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -135,7 +135,7 @@ namespace rptui
         */
         TSectionsMap::iterator getIteratorAtPos(sal_uInt16 _nPos);
         void collectRectangles(TRectangleMap& _rMap,bool _bBoundRects);
-        void collectBoundResizeRect(const TRectangleMap& _rSortRectangles,sal_Int32 _nControlModification,bool _bAlignAtSection,bool _bBoundRects,Rectangle& _rBound,Rectangle& _rResize);
+        static void collectBoundResizeRect(const TRectangleMap& _rSortRectangles,sal_Int32 _nControlModification,bool _bAlignAtSection,bool _bBoundRects,Rectangle& _rBound,Rectangle& _rResize);
         void impl_resizeSectionWindow(OSectionWindow& _rSectionWindow,Point& _rStartPoint,bool _bSet);
 
         OViewsWindow(OViewsWindow&) SAL_DELETED_FUNCTION;
diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx
index 238aeb30da2c..0506dfcd3357 100644
--- a/reportdesign/source/ui/inc/metadata.hxx
+++ b/reportdesign/source/ui/inc/metadata.hxx
@@ -48,13 +48,13 @@ namespace rptui
         OPropertyInfoService(){}
         virtual ~OPropertyInfoService(){}
         // IPropertyInfoService
-        sal_Int32                           getPropertyId(const OUString& _rName) const;
-        OUString                            getPropertyTranslation(sal_Int32 _nId) const;
-        OString                             getPropertyHelpId(sal_Int32 _nId) const;
-        sal_uInt32                          getPropertyUIFlags(sal_Int32 _nId) const;
+        static sal_Int32                    getPropertyId(const OUString& _rName);
+        static OUString                     getPropertyTranslation(sal_Int32 _nId);
+        static OString                      getPropertyHelpId(sal_Int32 _nId);
+        static sal_uInt32                   getPropertyUIFlags(sal_Int32 _nId);
         static void                         getExcludeProperties(::std::vector< com::sun::star::beans::Property >& _rExcludeProperties,const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _xFormComponentHandler);
 
-        bool                                isComposable(
+        static bool                         isComposable(
                                                 const OUString& _rPropertyName,
                                                 const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _xFormComponentHandler
                                             );
diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx
index 67a48b248691..945be9a5ef5d 100644
--- a/reportdesign/source/ui/inc/propbrw.hxx
+++ b/reportdesign/source/ui/inc/propbrw.hxx
@@ -75,7 +75,7 @@ protected:
     void implSetNewObject(
         const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> >& _aObjects = ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> >());
 
-    OUString GetHeadlineName(
+    static OUString GetHeadlineName(
         const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> >& _aObjects);
 
     void implDetachController();
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index 06858703be1b..ce18a3e2f780 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -169,7 +169,7 @@ uno::Any SAL_CALL DataProviderHandler::getPropertyValue(const OUString & Propert
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     uno::Any aPropertyValue;
-    const sal_Int32 nId = m_pInfoService->getPropertyId(PropertyName);
+    const sal_Int32 nId = OPropertyInfoService::getPropertyId(PropertyName);
     switch(nId)
     {
         case PROPERTY_ID_CHARTTYPE:
@@ -214,7 +214,7 @@ uno::Any SAL_CALL DataProviderHandler::getPropertyValue(const OUString & Propert
 void SAL_CALL DataProviderHandler::setPropertyValue(const OUString & PropertyName, const uno::Any & Value) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
-    const sal_Int32 nId = m_pInfoService->getPropertyId(PropertyName);
+    const sal_Int32 nId = OPropertyInfoService::getPropertyId(PropertyName);
     switch(nId)
     {
         case PROPERTY_ID_CHARTTYPE:
@@ -260,7 +260,7 @@ beans::PropertyState SAL_CALL DataProviderHandler::getPropertyState(const OUStri
 inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(const OUString & PropertyName,  const uno::Reference< inspection::XPropertyControlFactory > & _xControlFactory) throw (beans::UnknownPropertyException, lang::NullPointerException,uno::RuntimeException, std::exception)
 {
     inspection::LineDescriptor aOut;
-    const sal_Int32 nId = m_pInfoService->getPropertyId(PropertyName);
+    const sal_Int32 nId = OPropertyInfoService::getPropertyId(PropertyName);
     switch(nId)
     {
         case PROPERTY_ID_CHARTTYPE:
@@ -282,12 +282,12 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co
     }
     if ( nId != -1 )
     {
-        aOut.Category = ((m_pInfoService->getPropertyUIFlags(nId ) & PROP_FLAG_DATA_PROPERTY) != 0) ?
+        aOut.Category = ((OPropertyInfoService::getPropertyUIFlags(nId ) & PROP_FLAG_DATA_PROPERTY) != 0) ?
                                     OUString("Data")
                                                         :
                                     OUString("General");
-        aOut.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nId ) );
-        aOut.DisplayName = m_pInfoService->getPropertyTranslation(nId);
+        aOut.HelpURL = HelpIdUrl::getHelpURL( OPropertyInfoService::getPropertyHelpId( nId ) );
+        aOut.DisplayName = OPropertyInfoService::getPropertyTranslation(nId);
     }
     return aOut;
 }
@@ -296,7 +296,7 @@ uno::Any SAL_CALL DataProviderHandler::convertToPropertyValue(const OUString & _
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     uno::Any aPropertyValue( _rControlValue );
-    const sal_Int32 nId = m_pInfoService->getPropertyId(_rPropertyValue);
+    const sal_Int32 nId = OPropertyInfoService::getPropertyId(_rPropertyValue);
     switch(nId)
     {
         case PROPERTY_ID_CHARTTYPE:
@@ -328,7 +328,7 @@ uno::Any SAL_CALL DataProviderHandler::convertToControlValue(const OUString & _r
         return aControlValue;
 
     ::osl::MutexGuard aGuard( m_aMutex );
-    const sal_Int32 nId = m_pInfoService->getPropertyId(_rPropertyName);
+    const sal_Int32 nId = OPropertyInfoService::getPropertyId(_rPropertyName);
     switch(nId)
     {
         case PROPERTY_ID_CHARTTYPE:
@@ -403,7 +403,7 @@ uno::Sequence< OUString > SAL_CALL DataProviderHandler::getActuatingProperties()
 
 sal_Bool SAL_CALL DataProviderHandler::isComposable( const OUString& _rPropertyName ) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
 {
-    return m_pInfoService->isComposable( _rPropertyName, m_xFormComponentHandler );
+    return OPropertyInfoService::isComposable( _rPropertyName, m_xFormComponentHandler );
 }
 
 inspection::InteractiveSelectionResult SAL_CALL DataProviderHandler::onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, uno::Any & out_Data, const uno::Reference< inspection::XObjectInspectorUI > & _rxInspectorUI) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::NullPointerException, std::exception)
@@ -414,7 +414,7 @@ inspection::InteractiveSelectionResult SAL_CALL DataProviderHandler::onInteracti
     inspection::InteractiveSelectionResult eResult = inspection::InteractiveSelectionResult_Cancelled;
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
-    const sal_Int32 nId = m_pInfoService->getPropertyId(PropertyName);
+    const sal_Int32 nId = OPropertyInfoService::getPropertyId(PropertyName);
     switch(nId)
     {
         case PROPERTY_ID_CHARTTYPE:
@@ -467,7 +467,7 @@ void SAL_CALL DataProviderHandler::actuatingPropertyChanged(const OUString & Act
     }
     else
     {
-        const sal_Int32 nId = m_pInfoService->getPropertyId(ActuatingPropertyName);
+        const sal_Int32 nId = OPropertyInfoService::getPropertyId(ActuatingPropertyName);
         switch(nId)
         {
 
diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx
index c8f45dcf82b9..0ea6b88052d0 100644
--- a/reportdesign/source/ui/inspection/DefaultInspection.cxx
+++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx
@@ -234,7 +234,7 @@ namespace rptui
     ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getPropertyOrderIndex( const OUString& _rPropertyName ) throw (RuntimeException, std::exception)
     {
         ::osl::MutexGuard aGuard(m_aMutex);
-        const sal_Int32 nPropertyId( m_pInfoService->getPropertyId( _rPropertyName ) );
+        const sal_Int32 nPropertyId( OPropertyInfoService::getPropertyId( _rPropertyName ) );
         if ( nPropertyId != -1 )
             return nPropertyId;
 
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 7b788b57853f..fd218baf56da 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -364,7 +364,7 @@ uno::Any SAL_CALL GeometryHandler::getPropertyValue(const OUString & PropertyNam
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     uno::Any aPropertyValue;
-    const sal_Int32 nId = m_pInfoService->getPropertyId(PropertyName);
+    const sal_Int32 nId = OPropertyInfoService::getPropertyId(PropertyName);
     switch(nId)
     {
         case PROPERTY_ID_CONDITIONALPRINTEXPRESSION:
@@ -458,7 +458,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const OUString & PropertyName, c
 {
     ::osl::ResettableMutexGuard aGuard( m_aMutex );
     uno::Any aNewValue = Value;
-    const sal_Int32 nId = m_pInfoService->getPropertyId(PropertyName);
+    const sal_Int32 nId = OPropertyInfoService::getPropertyId(PropertyName);
     bool bHandled = false;
     switch(nId)
     {
@@ -716,7 +716,7 @@ void GeometryHandler::implCreateListLikeControl(
 inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const OUString & PropertyName, const uno::Reference< inspection::XPropertyControlFactory > & _xControlFactory) throw (beans::UnknownPropertyException, lang::NullPointerException,uno::RuntimeException, std::exception)
 {
     inspection::LineDescriptor aOut;
-    const sal_Int32 nId = m_pInfoService->getPropertyId(PropertyName);
+    const sal_Int32 nId = OPropertyInfoService::getPropertyId(PropertyName);
     switch(nId)
     {
         case PROPERTY_ID_FORCENEWPAGE:
@@ -847,12 +847,12 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
 
     if ( nId != -1 )
     {
-        aOut.Category = ((m_pInfoService->getPropertyUIFlags(nId ) & PROP_FLAG_DATA_PROPERTY) != 0) ?
+        aOut.Category = ((OPropertyInfoService::getPropertyUIFlags(nId ) & PROP_FLAG_DATA_PROPERTY) != 0) ?
                                     OUString("Data")
                                                         :
                                     OUString("General");
-        aOut.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nId ) );
-        aOut.DisplayName = m_pInfoService->getPropertyTranslation(nId);
+        aOut.HelpURL = HelpIdUrl::getHelpURL( OPropertyInfoService::getPropertyHelpId( nId ) );
+        aOut.DisplayName = OPropertyInfoService::getPropertyTranslation(nId);
     }
 
     if  (  ( nId == PROPERTY_ID_POSITIONX )
@@ -955,7 +955,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & Prope
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     uno::Any aPropertyValue( _rControlValue );
-    const sal_Int32 nId = m_pInfoService->getPropertyId(PropertyName);
+    const sal_Int32 nId = OPropertyInfoService::getPropertyId(PropertyName);
     switch(nId)
     {
         case PROPERTY_ID_FORCENEWPAGE:
@@ -1118,7 +1118,7 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const OUString & Proper
     uno::Any aPropertyValue(_rPropertyValue);
 
     ::osl::MutexGuard aGuard( m_aMutex );
-    const sal_Int32 nId = m_pInfoService->getPropertyId(PropertyName);
+    const sal_Int32 nId = OPropertyInfoService::getPropertyId(PropertyName);
     switch(nId)
     {
         case PROPERTY_ID_AREA:
@@ -1378,7 +1378,7 @@ uno::Sequence< OUString > SAL_CALL GeometryHandler::getActuatingProperties() thr
 
 sal_Bool SAL_CALL GeometryHandler::isComposable(const OUString & _rPropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
 {
-    return m_pInfoService->isComposable( _rPropertyName, m_xFormComponentHandler );
+    return OPropertyInfoService::isComposable( _rPropertyName, m_xFormComponentHandler );
 }
 
 inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, uno::Any & _rData, const uno::Reference< inspection::XObjectInspectorUI > & _rxInspectorUI) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::NullPointerException, std::exception)
@@ -1468,7 +1468,7 @@ void SAL_CALL GeometryHandler::actuatingPropertyChanged(const OUString & Actuati
         throw lang::NullPointerException();
 
     ::osl::MutexGuard aGuard( m_aMutex );
-    const sal_Int32 nId = m_pInfoService->getPropertyId(ActuatingPropertyName);
+    const sal_Int32 nId = OPropertyInfoService::getPropertyId(ActuatingPropertyName);
     switch(nId)
     {
         case PROPERTY_ID_TYPE:
diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
index 5f802c15dda3..c7f278f5cc37 100644
--- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
+++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx
@@ -191,7 +191,7 @@ uno::Sequence< OUString > SAL_CALL ReportComponentHandler::getActuatingPropertie
 
 sal_Bool SAL_CALL ReportComponentHandler::isComposable( const OUString& _rPropertyName ) throw (uno::RuntimeException, beans::UnknownPropertyException, std::exception)
 {
-    return m_pInfoService->isComposable( _rPropertyName, m_xFormComponentHandler );
+    return OPropertyInfoService::isComposable( _rPropertyName, m_xFormComponentHandler );
 }
 
 inspection::InteractiveSelectionResult SAL_CALL ReportComponentHandler::onInteractivePropertySelection(const OUString & PropertyName, sal_Bool Primary, uno::Any & out_Data, const uno::Reference< inspection::XObjectInspectorUI > & InspectorUI) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::NullPointerException, std::exception)
diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx
index ea32550582ba..1cf9fc769074 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -156,28 +156,28 @@ namespace rptui
     }
 
 
-    sal_Int32 OPropertyInfoService::getPropertyId(const OUString& _rName) const
+    sal_Int32 OPropertyInfoService::getPropertyId(const OUString& _rName)
     {
         const OPropertyInfoImpl* pInfo = getPropertyInfo(_rName);
         return pInfo ? pInfo->nId : -1;
     }
 
 
-    OUString OPropertyInfoService::getPropertyTranslation(sal_Int32 _nId) const
+    OUString OPropertyInfoService::getPropertyTranslation(sal_Int32 _nId)
     {
         const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId);
         return (pInfo) ? pInfo->sTranslation : OUString();
     }
 
 
-    OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const
+    OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId)
     {
         const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId);
         return (pInfo) ? pInfo->sHelpId : OString();
     }
 
 
-    sal_uInt32 OPropertyInfoService::getPropertyUIFlags(sal_Int32 _nId) const
+    sal_uInt32 OPropertyInfoService::getPropertyUIFlags(sal_Int32 _nId)
     {
         const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId);
         return (pInfo) ? pInfo->nUIFlags : 0;
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 4398c00949bd..39a3979417ea 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -3181,7 +3181,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co
         OUString sCustomShapeType = getDesignView()->GetInsertObjString();
         if ( sCustomShapeType.isEmpty() )
             sCustomShapeType = "diamond";
-        pSectionWindow->getReportSection().createDefault(sCustomShapeType,pNewControl);
+        OReportSection::createDefault(sCustomShapeType,pNewControl);
         pNewControl->SetLogicRect(Rectangle(3000,500,6000,3500)); // switch height and width
     }
     else if ( _nObjectId == OBJ_OLE2 || OBJ_DLG_SUBREPORT == _nObjectId  )
@@ -4161,7 +4161,7 @@ void OReportController::impl_zoom_nothrow()
     InvalidateFeature(SID_ATTR_ZOOMSLIDER,Reference< XStatusListener >(), true);
 }
 
-bool OReportController::isFormatCommandEnabled(sal_uInt16 _nCommand,const uno::Reference< report::XReportControlFormat>& _xReportControlFormat) const
+bool OReportController::isFormatCommandEnabled(sal_uInt16 _nCommand,const uno::Reference< report::XReportControlFormat>& _xReportControlFormat)
 {
     bool bRet = false;
     if ( _xReportControlFormat.is() && !uno::Reference< report::XFixedLine>(_xReportControlFormat,uno::UNO_QUERY).is() ) // this command is really often called so we nedd a short cut here