loplugin:staticmethods

Change-Id: I1f6c6d13697aa397067478d6b07429120106e6bd

2 files changed, 18 insertions, 28 deletions

diff --git a/include/comphelper/configuration.hxx b/include/comphelper/configuration.hxx
index d4630c74ae64..226462fad992 100644
--- a/include/comphelper/configuration.hxx
+++ b/include/comphelper/configuration.hxx
@@ -97,36 +97,34 @@ public:
 
     com::sun::star::uno::Any getPropertyValue(OUString const & path) const;
 
-    void setPropertyValue(
+    static void setPropertyValue(
         std::shared_ptr< ConfigurationChanges > const & batch,
-        OUString const & path, com::sun::star::uno::Any const & value)
-        const;
+        OUString const & path, com::sun::star::uno::Any const & value);
 
     com::sun::star::uno::Any getLocalizedPropertyValue(
         OUString const & path) const;
 
-    void setLocalizedPropertyValue(
+    static void setLocalizedPropertyValue(
         std::shared_ptr< ConfigurationChanges > const & batch,
-        OUString const & path, com::sun::star::uno::Any const & value)
-        const;
+        OUString const & path, com::sun::star::uno::Any const & value);
 
     com::sun::star::uno::Reference<
         com::sun::star::container::XHierarchicalNameAccess >
     getGroupReadOnly(OUString const & path) const;
 
-    com::sun::star::uno::Reference<
+    static com::sun::star::uno::Reference<
         com::sun::star::container::XHierarchicalNameReplace >
     getGroupReadWrite(
         std::shared_ptr< ConfigurationChanges > const & batch,
-        OUString const & path) const;
+        OUString const & path);
 
     com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >
     getSetReadOnly(OUString const & path) const;
 
-    com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >
+    static com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >
     getSetReadWrite(
         std::shared_ptr< ConfigurationChanges > const & batch,
-        OUString const & path) const;
+        OUString const & path);
 
     std::shared_ptr< ConfigurationChanges > createChanges() const;
 
@@ -223,11 +221,9 @@ template< typename T, typename U > struct ConfigurationProperty
     /// For nillable properties, U is of type boost::optional<U'>.
     static void set(
         U const & value,
-        std::shared_ptr< ConfigurationChanges > const & batch,
-        com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
-            const & context = comphelper::getProcessComponentContext())
+        std::shared_ptr< ConfigurationChanges > const & batch)
     {
-        detail::ConfigurationWrapper::get(context).setPropertyValue(
+        comphelper::detail::ConfigurationWrapper::setPropertyValue(
             batch, T::path(), detail::Convert< U >::toAny(value));
     }
 
@@ -279,11 +275,9 @@ template< typename T, typename U > struct ConfigurationLocalizedProperty
     /// For nillable properties, U is of type boost::optional<U'>.
     static void set(
         U const & value,
-        std::shared_ptr< ConfigurationChanges > const & batch,
-        com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
-            const & context = comphelper::getProcessComponentContext())
+        std::shared_ptr< ConfigurationChanges > const & batch)
     {
-        detail::ConfigurationWrapper::get(context).setLocalizedPropertyValue(
+        comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(
             batch, T::path(), detail::Convert< U >::toAny(value));
     }
 
@@ -315,11 +309,9 @@ template< typename T > struct ConfigurationGroup {
     /// modifications via the given changes batch.
     static com::sun::star::uno::Reference<
         com::sun::star::container::XHierarchicalNameReplace >
-    get(std::shared_ptr< ConfigurationChanges > const & batch,
-        com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
-            const & context = comphelper::getProcessComponentContext())
+    get(std::shared_ptr< ConfigurationChanges > const & batch)
     {
-        return detail::ConfigurationWrapper::get(context).getGroupReadWrite(
+        return comphelper::detail::ConfigurationWrapper::getGroupReadWrite(
             batch, T::path());
     }
 
@@ -351,11 +343,9 @@ template< typename T > struct ConfigurationSet {
     /// modifications via the given changes batch.
     static
     com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >
-    get(std::shared_ptr< ConfigurationChanges > const & batch,
-        com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
-            const & context = comphelper::getProcessComponentContext())
+    get(std::shared_ptr< ConfigurationChanges > const & batch)
     {
-        return detail::ConfigurationWrapper::get(context).getSetReadWrite(
+        return comphelper::detail::ConfigurationWrapper::getSetReadWrite(
             batch, T::path());
     }
 
diff --git a/include/tools/inetmsg.hxx b/include/tools/inetmsg.hxx
index 6bf03d2f5956..95952c042478 100644
--- a/include/tools/inetmsg.hxx
+++ b/include/tools/inetmsg.hxx
@@ -251,8 +251,8 @@ public:
 
     bool HeaderParsed() const { return bHeaderParsed; }
 
-    INetMIMEMessage* CreateMessage (
-        const INetMIMEMessage& rMsg) const;
+    static INetMIMEMessage* CreateMessage (
+        const INetMIMEMessage& rMsg);
 
     // Header fields.