summaryrefslogtreecommitdiff
path: root/registry
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-09-27 20:21:15 +0200
committerStephan Bergmann <sbergman@redhat.com>2011-09-27 20:22:03 +0200
commit6671fa81db0ecea4ada005bb79f55f08fb440ad4 (patch)
tree85ad806ece8d60736b6b01310b04b053dc2f8179 /registry
parentb6d8251eee90b7e24ebb3f8452eff36a507e6d91 (diff)
Removed uses of rtl::O[U]String[Buffer]::operator sal_{char|Unicode} const *().
Diffstat (limited to 'registry')
-rw-r--r--registry/source/regimpl.cxx4
-rw-r--r--registry/tools/checksingleton.cxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 987b679132cc..fd1bb90cf2ec 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -570,7 +570,7 @@ RegError ORegistry::destroyRegistry(const OUString& regName)
systemName = regName;
OString name( OUStringToOString(systemName, osl_getThreadTextEncoding()) );
- if (unlink(name) != 0)
+ if (unlink(name.getStr()) != 0)
{
return REG_DESTROY_REGISTRY_FAILED;
}
@@ -830,7 +830,7 @@ RegError ORegistry::eraseKey(ORegKey* pKey, const OUString& keyName)
if (sFullKeyName.getLength() > 1)
sFullKeyName += keyName;
else
- sFullKeyName += (keyName+1);
+ sFullKeyName += keyName.copy(1);
sFullPath = sFullKeyName.copy(0, keyName.lastIndexOf('/') + 1);
} else
diff --git a/registry/tools/checksingleton.cxx b/registry/tools/checksingleton.cxx
index e1995d6fdfd1..406af9dfeb84 100644
--- a/registry/tools/checksingleton.cxx
+++ b/registry/tools/checksingleton.cxx
@@ -121,7 +121,7 @@ bool Options_Impl::initOptions_Impl(std::vector< std::string > & rArgs)
{
return badOption("invalid", option.c_str());
}
- m_typeRegName = OString((*first).c_str(), (*first).size());
+ m_typeRegName = *first;
break;
}
case 'o':