14 files changed, 11 insertions, 44 deletions
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 56ab1c77f04b..7a3dcc4acec5 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -1972,9 +1972,6 @@ void Access::initBroadcasterAndChanges(
     }
 }
 
-bool Access::isDisposed() const {
-    return disposed_;
-}
 
 Access::ModifiedChild::ModifiedChild():
     directlyModified(false)
diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx
index 625026e869ff..a91312f012a0 100644
--- a/configmgr/source/access.hxx
+++ b/configmgr/source/access.hxx
@@ -472,7 +472,7 @@ protected:
         Modifications::Node const & modifications, Broadcaster * broadcaster,
         std::vector< com::sun::star::util::ElementChange > * changes);
 
-    bool isDisposed() const;
+    bool isDisposed() const { return disposed_;}
 
 private:
     struct ModifiedChild {
diff --git a/configmgr/source/groupnode.cxx b/configmgr/source/groupnode.cxx
index 72e252392fec..a1d5b5864fd2 100644
--- a/configmgr/source/groupnode.cxx
+++ b/configmgr/source/groupnode.cxx
@@ -55,9 +55,6 @@ int GroupNode::getMandatory() const {
     return mandatory_;
 }
 
-bool GroupNode::isExtensible() const {
-    return extensible_;
-}
 
 GroupNode::GroupNode(GroupNode const & other, bool keepTemplateName):
     Node(other), extensible_(other.extensible_), mandatory_(other.mandatory_)
diff --git a/configmgr/source/groupnode.hxx b/configmgr/source/groupnode.hxx
index 8fbac97381af..227084bf57d1 100644
--- a/configmgr/source/groupnode.hxx
+++ b/configmgr/source/groupnode.hxx
@@ -44,7 +44,7 @@ public:
 
     virtual int getMandatory() const SAL_OVERRIDE;
 
-    bool isExtensible() const;
+    bool isExtensible() const { return extensible_;}
 
 private:
     GroupNode(GroupNode const & other, bool keepTemplateName);
diff --git a/configmgr/source/localizedpropertynode.cxx b/configmgr/source/localizedpropertynode.cxx
index 3eda905a71f6..ed861d14ce3f 100644
--- a/configmgr/source/localizedpropertynode.cxx
+++ b/configmgr/source/localizedpropertynode.cxx
@@ -44,13 +44,7 @@ NodeMap & LocalizedPropertyNode::getMembers() {
     return members_;
 }
 
-Type LocalizedPropertyNode::getStaticType() const {
-    return staticType_;
-}
 
-bool LocalizedPropertyNode::isNillable() const {
-    return nillable_;
-}
 
 LocalizedPropertyNode::LocalizedPropertyNode(
     LocalizedPropertyNode const & other):
diff --git a/configmgr/source/localizedpropertynode.hxx b/configmgr/source/localizedpropertynode.hxx
index 538e0c0ab69d..7c6da7b69059 100644
--- a/configmgr/source/localizedpropertynode.hxx
+++ b/configmgr/source/localizedpropertynode.hxx
@@ -39,9 +39,9 @@ public:
 
     virtual NodeMap & getMembers() SAL_OVERRIDE;
 
-    Type getStaticType() const;
+    Type getStaticType() const { return staticType_;}
 
-    bool isNillable() const;
+    bool isNillable() const { return nillable_;}
 
 private:
     LocalizedPropertyNode(LocalizedPropertyNode const & other);
diff --git a/configmgr/source/node.cxx b/configmgr/source/node.cxx
index 4875173e9f79..294ec0ecaa78 100644
--- a/configmgr/source/node.cxx
+++ b/configmgr/source/node.cxx
@@ -57,17 +57,11 @@ void Node::setLayer(int layer) {
     layer_ = layer;
 }
 
-int Node::getLayer() const {
-    return layer_;
-}
 
 void Node::setFinalized(int layer) {
     finalized_ = layer;
 }
 
-int Node::getFinalized() const {
-    return finalized_;
-}
 
 rtl::Reference< Node > Node::getMember(OUString const & name) {
     NodeMap const & members = getMembers();
diff --git a/configmgr/source/node.hxx b/configmgr/source/node.hxx
index 58ad20e4e05f..6537973f7841 100644
--- a/configmgr/source/node.hxx
+++ b/configmgr/source/node.hxx
@@ -47,10 +47,10 @@ public:
     virtual int getMandatory() const;
 
     void setLayer(int layer);
-    int getLayer() const;
+    int getLayer() const { return layer_;}
 
     void setFinalized(int layer);
-    int getFinalized() const;
+    int getFinalized() const { return finalized_;}
 
     rtl::Reference< Node > getMember(OUString const & name);
 
diff --git a/configmgr/source/propertynode.cxx b/configmgr/source/propertynode.cxx
index bec6918dda9d..456091359ebf 100644
--- a/configmgr/source/propertynode.cxx
+++ b/configmgr/source/propertynode.cxx
@@ -46,13 +46,7 @@ rtl::Reference< Node > PropertyNode::clone(bool) const {
     return new PropertyNode(*this);
 }
 
-Type PropertyNode::getStaticType() const {
-    return staticType_;
-}
 
-bool PropertyNode::isNillable() const {
-    return nillable_;
-}
 
 css::uno::Any PropertyNode::getValue(Components & components) {
     if (!externalDescriptor_.isEmpty()) {
@@ -81,9 +75,6 @@ void PropertyNode::setExternal(int layer, OUString const & descriptor) {
     externalDescriptor_ = descriptor;
 }
 
-bool PropertyNode::isExtension() const {
-    return extension_;
-}
 
 PropertyNode::PropertyNode(PropertyNode const & other):
     Node(other), staticType_(other.staticType_), nillable_(other.nillable_),
diff --git a/configmgr/source/propertynode.hxx b/configmgr/source/propertynode.hxx
index 1e21aca5c2d9..60108e7db6ea 100644
--- a/configmgr/source/propertynode.hxx
+++ b/configmgr/source/propertynode.hxx
@@ -41,9 +41,9 @@ public:
 
     virtual rtl::Reference< Node > clone(bool keepTemplateName) const SAL_OVERRIDE;
 
-    Type getStaticType() const;
+    Type getStaticType() const { return staticType_;}
 
-    bool isNillable() const;
+    bool isNillable() const { return nillable_;}
 
     com::sun::star::uno::Any getValue(Components & components);
 
@@ -51,7 +51,7 @@ public:
 
     void setExternal(int layer, OUString const & descriptor);
 
-    bool isExtension() const;
+    bool isExtension() const { return extension_;}
 
 private:
     PropertyNode(PropertyNode const & other);
diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx
index a89d5627cf04..8951dcdcf664 100644
--- a/configmgr/source/rootaccess.cxx
+++ b/configmgr/source/rootaccess.cxx
@@ -110,9 +110,6 @@ OUString RootAccess::getLocale() const {
     return locale_;
 }
 
-bool RootAccess::isUpdate() const {
-    return update_;
-}
 
 void RootAccess::setAlive(bool b) {
     alive_ = b;
diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx
index 4fce20c15161..6583cea1ce3f 100644
--- a/configmgr/source/rootaccess.hxx
+++ b/configmgr/source/rootaccess.hxx
@@ -75,7 +75,7 @@ public:
 
     OUString getLocale() const;
 
-    bool isUpdate() const;
+    bool isUpdate() const { return update_;}
 
     void setAlive(bool b);
 
diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx
index 738b386a4b27..5c140f6f4dff 100644
--- a/configmgr/source/valueparser.cxx
+++ b/configmgr/source/valueparser.cxx
@@ -436,9 +436,6 @@ void ValueParser::start(
     state_ = STATE_TEXT;
 }
 
-int ValueParser::getLayer() const {
-    return layer_;
-}
 
 template< typename T > css::uno::Any ValueParser::convertItems() {
     css::uno::Sequence< T > seq(items_.size());
diff --git a/configmgr/source/valueparser.hxx b/configmgr/source/valueparser.hxx
index a02418ad8bbc..1f0aef061324 100644
--- a/configmgr/source/valueparser.hxx
+++ b/configmgr/source/valueparser.hxx
@@ -63,7 +63,7 @@ public:
         rtl::Reference< Node > const & property,
         OUString const & localizedName = OUString());
 
-    int getLayer() const;
+    int getLayer() const { return layer_;}
 
     Type type_;
     OString separator_;