summaryrefslogtreecommitdiff
path: root/xmlsecurity
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-06-09 10:09:42 +0200
committerNoel Grandin <noel@peralex.com>2014-06-09 10:10:13 +0200
commit184a00b96235f6432294ded63ce4a4a318effdb5 (patch)
treee4ae0e00cb168fa43d280cfb51a50515258b5320 /xmlsecurity
parent534015ad4fd08823b4393dab1ad5d42dedd7bf62 (diff)
loplugin: inlinesimplememberfunctions
Change-Id: I42119f656ca528286fb25d2d36c0af54b7d04a6b
Diffstat (limited to 'xmlsecurity')
-rw-r--r--xmlsecurity/source/framework/buffernode.cxx8
-rw-r--r--xmlsecurity/source/framework/buffernode.hxx4
-rw-r--r--xmlsecurity/source/framework/elementcollector.cxx8
-rw-r--r--xmlsecurity/source/framework/elementcollector.hxx4
-rw-r--r--xmlsecurity/source/framework/elementmark.cxx16
-rw-r--r--xmlsecurity/source/framework/elementmark.hxx8
-rw-r--r--xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx25
-rw-r--r--xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx12
8 files changed, 19 insertions, 66 deletions
diff --git a/xmlsecurity/source/framework/buffernode.cxx b/xmlsecurity/source/framework/buffernode.cxx
index bea9a958f740..f437e9f98e37 100644
--- a/xmlsecurity/source/framework/buffernode.cxx
+++ b/xmlsecurity/source/framework/buffernode.cxx
@@ -113,10 +113,6 @@ void BufferNode::setReceivedAll()
elementCollectorNotify();
}
-bool BufferNode::isAllReceived() const
-{
- return m_bAllReceived;
-}
void BufferNode::addElementCollector(const ElementCollector* pElementCollector)
/****** BufferNode/addElementCollector ***************************************
@@ -182,10 +178,6 @@ void BufferNode::removeElementCollector(const ElementCollector* pElementCollecto
}
}
-ElementMark* BufferNode::getBlocker() const
-{
- return m_pBlocker;
-}
void BufferNode::setBlocker(const ElementMark* pBlocker)
/****** BufferNode/setBlocker ************************************************
diff --git a/xmlsecurity/source/framework/buffernode.hxx b/xmlsecurity/source/framework/buffernode.hxx
index 4ca3dfaddc86..db2b2d95c324 100644
--- a/xmlsecurity/source/framework/buffernode.hxx
+++ b/xmlsecurity/source/framework/buffernode.hxx
@@ -88,10 +88,10 @@ public:
bool isECOfBeforeModifyIncluded(sal_Int32 nIgnoredSecurityId) const;
void setReceivedAll();
- bool isAllReceived() const;
+ bool isAllReceived() const { return m_bAllReceived;}
void addElementCollector(const ElementCollector* pElementCollector);
void removeElementCollector(const ElementCollector* pElementCollector);
- ElementMark* getBlocker() const;
+ ElementMark* getBlocker() const { return m_pBlocker;}
void setBlocker(const ElementMark* pBlocker);
OUString printChildren() const;
bool hasAnything() const;
diff --git a/xmlsecurity/source/framework/elementcollector.cxx b/xmlsecurity/source/framework/elementcollector.cxx
index 137491049665..96c242020e58 100644
--- a/xmlsecurity/source/framework/elementcollector.cxx
+++ b/xmlsecurity/source/framework/elementcollector.cxx
@@ -80,15 +80,7 @@ ElementCollector::ElementCollector(
m_type = cssxc::sax::ElementMarkType_ELEMENTCOLLECTOR;
}
-cssxc::sax::ElementMarkPriority ElementCollector::getPriority() const
-{
- return m_nPriority;
-}
-bool ElementCollector::getModify() const
-{
- return m_bToModify;
-}
void ElementCollector::notifyListener()
/****** ElementCollector/notifyListener ***************************************
diff --git a/xmlsecurity/source/framework/elementcollector.hxx b/xmlsecurity/source/framework/elementcollector.hxx
index ed1411939a19..dfc73b04b462 100644
--- a/xmlsecurity/source/framework/elementcollector.hxx
+++ b/xmlsecurity/source/framework/elementcollector.hxx
@@ -77,8 +77,8 @@ public:
xReferenceResolvedListener);
virtual ~ElementCollector() {};
- com::sun::star::xml::crypto::sax::ElementMarkPriority getPriority() const;
- bool getModify() const;
+ com::sun::star::xml::crypto::sax::ElementMarkPriority getPriority() const { return m_nPriority;}
+ bool getModify() const { return m_bToModify;}
void notifyListener();
void setReferenceResolvedListener(
const com::sun::star::uno::Reference<
diff --git a/xmlsecurity/source/framework/elementmark.cxx b/xmlsecurity/source/framework/elementmark.cxx
index 98947659b71c..24edb826a27b 100644
--- a/xmlsecurity/source/framework/elementmark.cxx
+++ b/xmlsecurity/source/framework/elementmark.cxx
@@ -58,35 +58,19 @@ ElementMark::ElementMark(sal_Int32 nSecurityId, sal_Int32 nBufferId)
{
}
-BufferNode* ElementMark::getBufferNode() const
-{
- return m_pBufferNode;
-}
void ElementMark::setBufferNode(const BufferNode* pBufferNode)
{
m_pBufferNode = (BufferNode*)pBufferNode;
}
-sal_Int32 ElementMark::getSecurityId() const
-{
- return m_nSecurityId;
-}
void ElementMark::setSecurityId(sal_Int32 nSecurityId)
{
m_nSecurityId = nSecurityId;
}
-com::sun::star::xml::crypto::sax::ElementMarkType ElementMark::getType() const
-{
- return m_type;
-}
-sal_Int32 ElementMark::getBufferId() const
-{
- return m_nBufferId;
-}
diff --git a/xmlsecurity/source/framework/elementmark.hxx b/xmlsecurity/source/framework/elementmark.hxx
index f707e39efcd6..8838f2462fdd 100644
--- a/xmlsecurity/source/framework/elementmark.hxx
+++ b/xmlsecurity/source/framework/elementmark.hxx
@@ -62,12 +62,12 @@ public:
ElementMark(sal_Int32 nSecurityId, sal_Int32 nBufferId);
virtual ~ElementMark() {};
- BufferNode* getBufferNode() const;
+ BufferNode* getBufferNode() const { return m_pBufferNode;}
void setBufferNode(const BufferNode* pBufferNode);
- sal_Int32 getSecurityId() const;
+ sal_Int32 getSecurityId() const { return m_nSecurityId;}
void setSecurityId(sal_Int32 nSecurityId);
- com::sun::star::xml::crypto::sax::ElementMarkType getType() const;
- sal_Int32 getBufferId() const;
+ com::sun::star::xml::crypto::sax::ElementMarkType getType() const { return m_type;}
+ sal_Int32 getBufferId() const { return m_nBufferId;}
};
#endif
diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
index fb4a35f85fa9..0a2076459558 100644
--- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx
@@ -110,31 +110,6 @@ cssu::Sequence< OUString > SAL_CALL XMLElementWrapper_XmlSecImpl::getSupportedSe
return XMLElementWrapper_XmlSecImpl_getSupportedServiceNames();
}
-xmlNodePtr XMLElementWrapper_XmlSecImpl::getNativeElement( ) const
-/****** XMLElementWrapper_XmlSecImpl/getNativeElement *************************
- *
- * NAME
- * getNativeElement -- Retrieves the libxml2 node wrapped by this object
- *
- * SYNOPSIS
- * pNode = getNativeElement();
- *
- * FUNCTION
- * see NAME
- *
- * INPUTS
- * empty
- *
- * RESULT
- * pNode - the libxml2 node wrapped by this object
- *
- * AUTHOR
- * Michael Mi
- * Email: michael.mi@sun.com
- ******************************************************************************/
-{
- return m_pElement;
-}
void XMLElementWrapper_XmlSecImpl::setNativeElement(const xmlNodePtr pNode)
/****** XMLElementWrapper_XmlSecImpl/setNativeElement *************************
diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
index b9018a0d6f72..eb029cade1a8 100644
--- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
+++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx
@@ -77,7 +77,17 @@ public:
throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
public:
- xmlNodePtr getNativeElement( ) const;
+ /*
+ * NAME
+ * getNativeElement -- Retrieves the libxml2 node wrapped by this object
+ *
+ * SYNOPSIS
+ * pNode = getNativeElement();
+ *
+ * RESULT
+ * pNode - the libxml2 node wrapped by this object
+ */
+ xmlNodePtr getNativeElement( ) const { return m_pElement;}
void setNativeElement(const xmlNodePtr pNode);
};