summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-10-20 13:22:23 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-10-21 06:17:24 +0000
commitece0ff48fafce28691321e17420ebc64b3175594 (patch)
treee4745fd6634cdca465efbb576923e794897d3326 /unotools
parent1c4243332213ad72ed63476c99693758d8cbcc40 (diff)
loplugin:expandablemethodds in include/tools..unotools
Change-Id: I5607d4a2a81de1a3ae329acd1e90280a21522f06 Reviewed-on: https://gerrit.libreoffice.org/30097 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'unotools')
-rw-r--r--unotools/source/config/configitem.cxx2
-rw-r--r--unotools/source/config/pathoptions.cxx7
2 files changed, 2 insertions, 7 deletions
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index 348cfc8ba562..f6957e4db24a 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -182,7 +182,7 @@ void ConfigItem::CallNotify( const css::uno::Sequence<OUString>& rPropertyNames
// the call is forwarded to the virtual Notify() method
// it is pure virtual, so all classes deriving from ConfigItem have to decide how they
// want to notify listeners
- if(!IsInValueChange() || m_bEnableInternalNotification)
+ if(m_nInValueChange <= 0 || m_bEnableInternalNotification)
Notify(rPropertyNames);
}
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 944eb366dd72..7b64c91a56d6 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -564,11 +564,6 @@ const OUString& SvtPathOptions::GetUserConfigPath() const
return pImpl->GetUserConfigPath();
}
-const OUString& SvtPathOptions::GetUIConfigPath() const
-{
- return pImpl->GetUIConfigPath();
-}
-
const OUString& SvtPathOptions::GetWorkPath() const
{
return pImpl->GetWorkPath();
@@ -771,7 +766,7 @@ bool SvtPathOptions::SearchFile( OUString& rIniFile, Paths ePath )
case PATH_TEMP: aPath = GetTempPath(); break;
case PATH_TEMPLATE: aPath = GetTemplatePath(); break;
case PATH_WORK: aPath = GetWorkPath(); break;
- case PATH_UICONFIG: aPath = GetUIConfigPath(); break;
+ case PATH_UICONFIG: aPath = pImpl->GetUIConfigPath(); break;
case PATH_FINGERPRINT: aPath = GetFingerprintPath(); break;
case PATH_CLASSIFICATION: aPath = GetClassificationPath(); break;
// coverity[dead_error_begin] - following conditions exist to avoid compiler warning