summaryrefslogtreecommitdiff
path: root/forms
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 /forms
parent534015ad4fd08823b4393dab1ad5d42dedd7bf62 (diff)
loplugin: inlinesimplememberfunctions
Change-Id: I42119f656ca528286fb25d2d36c0af54b7d04a6b
Diffstat (limited to 'forms')
-rw-r--r--forms/source/richtext/richtextviewport.cxx4
-rw-r--r--forms/source/richtext/richtextviewport.hxx2
-rw-r--r--forms/source/xforms/computedexpression.cxx6
-rw-r--r--forms/source/xforms/computedexpression.hxx2
-rw-r--r--forms/source/xforms/mip.cxx9
-rw-r--r--forms/source/xforms/mip.hxx18
-rw-r--r--forms/source/xforms/model.cxx8
-rw-r--r--forms/source/xforms/model.hxx4
-rw-r--r--forms/source/xforms/submission.cxx12
-rw-r--r--forms/source/xforms/submission.hxx6
10 files changed, 16 insertions, 55 deletions
diff --git a/forms/source/richtext/richtextviewport.cxx b/forms/source/richtext/richtextviewport.cxx
index 18a7d66e3c37..b18995f6af9d 100644
--- a/forms/source/richtext/richtextviewport.cxx
+++ b/forms/source/richtext/richtextviewport.cxx
@@ -103,10 +103,6 @@ namespace frm
}
- bool RichTextViewPort::GetHideInactiveSelection() const
- {
- return m_bHideInactiveSelection;
- }
} // namespace frm
diff --git a/forms/source/richtext/richtextviewport.hxx b/forms/source/richtext/richtextviewport.hxx
index b33a5e798113..fdd4bb005999 100644
--- a/forms/source/richtext/richtextviewport.hxx
+++ b/forms/source/richtext/richtextviewport.hxx
@@ -41,7 +41,7 @@ namespace frm
inline void setAttributeInvalidationHandler( const Link& _rHandler ) { m_aInvalidationHandler = _rHandler; }
void SetHideInactiveSelection( bool _bHide );
- bool GetHideInactiveSelection() const;
+ bool GetHideInactiveSelection() const { return m_bHideInactiveSelection; }
protected:
virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
diff --git a/forms/source/xforms/computedexpression.cxx b/forms/source/xforms/computedexpression.cxx
index 809f80fac1d1..b00077d47a5a 100644
--- a/forms/source/xforms/computedexpression.cxx
+++ b/forms/source/xforms/computedexpression.cxx
@@ -106,12 +106,6 @@ bool ComputedExpression::_checkExpression( const sal_Char* pExpression ) const
&& ( nStart == 0 && nEnd == nLength );
}
-/// do we have an actual expression?
-bool ComputedExpression::isEmptyExpression() const
-{
- return mbIsEmpty;
-}
-
bool ComputedExpression::isSimpleExpression() const
{
// actual work is done by setExpression
diff --git a/forms/source/xforms/computedexpression.hxx b/forms/source/xforms/computedexpression.hxx
index e6f8ba200cfd..a2c43053f0b9 100644
--- a/forms/source/xforms/computedexpression.hxx
+++ b/forms/source/xforms/computedexpression.hxx
@@ -94,7 +94,7 @@ public:
void setNamespaces( const com::sun::star::uno::Reference<com::sun::star::container::XNameContainer>& );
/// do we have an actual expression?
- bool isEmptyExpression() const;
+ bool isEmptyExpression() const { return mbIsEmpty;}
/// heuristically determine whether this expression is 'simple',
/// i.e. whether its value will change depending on the values
diff --git a/forms/source/xforms/mip.cxx b/forms/source/xforms/mip.cxx
index e8ccd35a282d..493881b9170b 100644
--- a/forms/source/xforms/mip.cxx
+++ b/forms/source/xforms/mip.cxx
@@ -77,23 +77,16 @@ void MIP::join( const MIP& rMip )
inherit( rMip );
}
-bool MIP::hasReadonly() const { return mbHasReadonly; }
bool MIP::isReadonly() const { return mbHasReadonly ? mbReadonly : mbHasCalculate; }
void MIP::setReadonly( bool b ) { mbHasReadonly = true; mbReadonly = b; }
void MIP::resetReadonly() { mbHasReadonly = false; mbReadonly = false; }
-bool MIP::hasRequired() const { return mbHasRequired; }
-bool MIP::isRequired() const { return mbRequired; }
void MIP::setRequired( bool b ) { mbHasRequired = true; mbRequired = b; }
void MIP::resetRequired() { mbHasRequired = false; mbRequired = false; }
-bool MIP::hasRelevant() const { return mbHasRelevant; }
-bool MIP::isRelevant() const { return mbRelevant; }
void MIP::setRelevant( bool b ) { mbHasRelevant = true; mbRelevant = b; }
void MIP::resetRelevant() { mbHasRelevant = false; mbRelevant = true; }
-bool MIP::hasConstraint() const { return mbHasConstraint; }
-bool MIP::isConstraint() const { return mbConstraint; }
void MIP::setConstraint( bool b ) { mbHasConstraint = true; mbConstraint = b; msConstraintExplanation = OUString(); }
void MIP::resetConstraint() { mbHasConstraint = false; mbConstraint = true; msConstraintExplanation = OUString(); }
@@ -101,11 +94,9 @@ void MIP::setConstraintExplanation( const OUString& s ) { msConstraintExplanatio
OUString MIP::getConstraintExplanation() const { return msConstraintExplanation; }
-bool MIP::hasCalculate() const { return mbHasCalculate; }
void MIP::setHasCalculate( bool b ) { mbHasCalculate = b; }
void MIP::resetCalculate() { mbHasCalculate = false; }
-bool MIP::hasTypeName() const { return mbHasTypeName; }
OUString MIP::getTypeName() const { return msTypeName; }
void MIP::setTypeName( const OUString& s ) { msTypeName = s; mbHasTypeName = true; }
void MIP::resetTypeName() { msTypeName = OUString(); mbHasTypeName = false; }
diff --git a/forms/source/xforms/mip.hxx b/forms/source/xforms/mip.hxx
index d9974dab5327..361f1229a40f 100644
--- a/forms/source/xforms/mip.hxx
+++ b/forms/source/xforms/mip.hxx
@@ -63,32 +63,32 @@ public:
// - type (static; default: xsd:string)
// (currently default implemented as empty string)
- bool hasTypeName() const;
+ bool hasTypeName() const { return mbHasTypeName; }
OUString getTypeName() const;
void setTypeName( const OUString& );
void resetTypeName();
// - readonly (computed XPath; default: false; true if calculate exists)
- bool hasReadonly() const;
+ bool hasReadonly() const { return mbHasReadonly; }
bool isReadonly() const;
void setReadonly( bool );
void resetReadonly();
// - required (computed XPath; default: false)
- bool hasRequired() const;
- bool isRequired() const;
+ bool hasRequired() const { return mbHasRequired; }
+ bool isRequired() const { return mbRequired; }
void setRequired( bool );
void resetRequired();
// - relevant (computed XPath; default: true)
- bool hasRelevant() const;
- bool isRelevant() const;
+ bool hasRelevant() const { return mbHasRelevant; }
+ bool isRelevant() const { return mbRelevant; }
void setRelevant( bool );
void resetRelevant();
// - constraing (computed XPath; default: true)
- bool hasConstraint() const;
- bool isConstraint() const;
+ bool hasConstraint() const { return mbHasConstraint; }
+ bool isConstraint() const { return mbConstraint; }
void setConstraint( bool );
void resetConstraint();
@@ -100,7 +100,7 @@ public:
// (for calculate, we only store whether a calculate MIP is present;
// the actual calculate value is handled my changing the instance
// directly)
- bool hasCalculate() const;
+ bool hasCalculate() const { return mbHasCalculate; }
void setHasCalculate( bool );
void resetCalculate();
diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index a17158ec176f..d4aafddddbbc 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -207,10 +207,6 @@ void Model::setNamespaces( const XNameContainer_t& rNamespaces )
mxNamespaces = rNamespaces;
}
-bool Model::getExternalData() const
-{
- return mbExternalData;
-}
void Model::setExternalData( bool _bData )
{
@@ -426,10 +422,6 @@ void Model::loadInstances()
}
}
-bool Model::isInitialized() const
-{
- return mbInitialized;
-}
bool Model::isValid() const
{
diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx
index 56ce37141bac..5559d6a80c76 100644
--- a/forms/source/xforms/model.hxx
+++ b/forms/source/xforms/model.hxx
@@ -156,7 +156,7 @@ public:
void setNamespaces( const XNameContainer_t& );
// get/set the ExternalData property
- bool getExternalData() const;
+ bool getExternalData() const { return mbExternalData;}
void setExternalData( bool _bData );
@@ -194,7 +194,7 @@ public:
void loadInstances();
/// has model been initialized?
- bool isInitialized() const;
+ bool isInitialized() const { return mbInitialized;}
/// is model currently valid (for submission)?
bool isValid() const;
diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx
index 4d21f979583b..a3eb261f6943 100644
--- a/forms/source/xforms/submission.cxx
+++ b/forms/source/xforms/submission.cxx
@@ -175,10 +175,6 @@ void Submission::setVersion( const OUString& sVersion )
msVersion = sVersion;
}
-bool Submission::getIndent() const
-{
- return mbIndent;
-}
void Submission::setIndent( bool bIndent )
{
@@ -205,20 +201,12 @@ void Submission::setEncoding( const OUString& sEncoding )
msEncoding = sEncoding;
}
-bool Submission::getOmitXmlDeclaration() const
-{
- return mbOmitXmlDeclaration;
-}
void Submission::setOmitXmlDeclaration( bool bOmitXmlDeclaration )
{
mbOmitXmlDeclaration = bOmitXmlDeclaration;
}
-bool Submission::getStandalone() const
-{
- return mbStandalone;
-}
void Submission::setStandalone( bool bStandalone )
{
diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx
index 07ea512c6c93..a431f54c856d 100644
--- a/forms/source/xforms/submission.hxx
+++ b/forms/source/xforms/submission.hxx
@@ -126,7 +126,7 @@ public:
OUString getVersion() const;
void setVersion( const OUString& );
- bool getIndent() const;
+ bool getIndent() const { return mbIndent;}
void setIndent( bool );
OUString getMediaType() const;
@@ -135,10 +135,10 @@ public:
OUString getEncoding() const;
void setEncoding( const OUString& );
- bool getOmitXmlDeclaration() const;
+ bool getOmitXmlDeclaration() const { return mbOmitXmlDeclaration;}
void setOmitXmlDeclaration( bool );
- bool getStandalone() const;
+ bool getStandalone() const { return mbStandalone;}
void setStandalone( bool );
OUString getCDataSectionElement() const;