summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-10-25 11:47:17 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-10-25 11:16:02 +0000
commitc5498c310f6765ec9857e34169fd4a8d48953eb7 (patch)
treecd89d0c906677e80b6953c5a4fd7746ee59eff52 /unotools
parent97f0fbe5830a5d2119fe9f5e8142fe45b255c2ac (diff)
loplugin:expandablemethods in UnoControls..vbahelper
Change-Id: I7e607df2a1f6d4eb207ee0d3eb30f41fac44a0c6 Reviewed-on: https://gerrit.libreoffice.org/30262 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'unotools')
-rw-r--r--unotools/source/config/confignode.cxx7
-rw-r--r--unotools/source/config/configvaluecontainer.cxx10
2 files changed, 3 insertions, 14 deletions
diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx
index 89c38fa74790..4d0eec963c11 100644
--- a/unotools/source/config/confignode.cxx
+++ b/unotools/source/config/confignode.cxx
@@ -74,7 +74,7 @@ namespace utl
startComponentListening(xConfigNodeComp);
if (isValid())
- setEscape(isSetNode());
+ m_bEscapeNames = isSetNode() && Reference< XStringEscape >::query(m_xDirectAccess).is();
}
OConfigurationNode::OConfigurationNode(const OConfigurationNode& _rSource)
@@ -303,11 +303,6 @@ namespace utl
return OConfigurationNode();
}
- void OConfigurationNode::setEscape(bool _bEnable)
- {
- m_bEscapeNames = _bEnable && Reference< XStringEscape >::query(m_xDirectAccess).is();
- }
-
bool OConfigurationNode::isSetNode() const
{
bool bIsSet = false;
diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx
index 873dcfef85d7..312751089213 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.cxx
@@ -271,20 +271,14 @@ namespace utl
);
}
- void OConfigurationValueContainer::write()
+ void OConfigurationValueContainer::commit()
{
- // collect the current values in the exchange locations
+ // write the current values in the exchange locations
std::for_each(
m_pImpl->aAccessors.begin(),
m_pImpl->aAccessors.end(),
UpdateToConfig( m_pImpl->aConfigRoot, m_pImpl->rMutex )
);
- }
-
- void OConfigurationValueContainer::commit()
- {
- // write the current values in the exchange locations
- write();
// commit the changes done
m_pImpl->aConfigRoot.commit( );