diff options
Diffstat (limited to 'registry')
-rw-r--r-- | registry/source/regimpl.cxx | 4 | ||||
-rw-r--r-- | registry/tools/checksingleton.cxx | 2 |
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': |