summaryrefslogtreecommitdiff
path: root/stoc
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2017-05-28 19:41:52 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-08-17 11:55:13 +0200
commit9881bea8d41997fb46579eb5f0314300159c96cc (patch)
treef52daa7055d2d28959e2d1ad576d963b7c0d3b2d /stoc
parentec4034c4a4f23574401ba2a74b635d9ed4befbc8 (diff)
remove unnecessary use of OUString::getStr
Change-Id: I3d13e1c0bb6aa4a7aacc463198747c1368ebc9b4 Reviewed-on: https://gerrit.libreoffice.org/38114 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'stoc')
-rw-r--r--stoc/source/implementationregistration/implreg.cxx10
-rw-r--r--stoc/source/javavm/javavm.cxx2
2 files changed, 6 insertions, 6 deletions
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index 4e0e7a5697dd..3a08defbb377 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -166,7 +166,7 @@ void deleteAllLinkReferences(const Reference < XSimpleRegistry >& xReg,
xReg->getRootKey()->deleteLink(aLinkName);
- sEnd = rtl_ustr_lastIndexOfChar( aLinkName.getStr(), '/' );
+ sEnd = aLinkName.lastIndexOf( '/' );
aLinkParent = aLinkName.copy(0, sEnd);
@@ -180,7 +180,7 @@ void deleteAllLinkReferences(const Reference < XSimpleRegistry >& xReg,
xReg->getRootKey()->deleteKey(aLinkParent);
- sEnd = rtl_ustr_lastIndexOfChar( aLinkName.getStr(), '/' );
+ sEnd = aLinkName.lastIndexOf( '/' );
aLinkParent = aLinkName.copy(0, sEnd);
} else
@@ -685,7 +685,7 @@ void deleteAllImplementations( const Reference < XSimpleRegistry >& xReg,
{
hasLocationUrl = true;
- OUString implName(xImplKey->getKeyName().getStr() + 1);
+ OUString implName(xImplKey->getKeyName().copy(1));
sal_Int32 firstDot = implName.indexOf('/');
if (firstDot >= 0)
@@ -1054,7 +1054,7 @@ void prepareRegistry(
Sequence< Reference < XRegistryKey > > serviceKeys = xKey->openKeys();
const Reference < XRegistryKey > * pServiceKeys = serviceKeys.getConstArray();
- OUString implName = OUString(xImplKey->getKeyName().getStr() + 1);
+ OUString implName = xImplKey->getKeyName().copy(1);
sal_Int32 firstDot = implName.indexOf('/');
if (firstDot >= 0)
@@ -1147,7 +1147,7 @@ void findImplementations( const Reference < XRegistryKey > & xSource,
{
isImplKey = true;
- OUString implName = OUString(xSource->getKeyName().getStr() + 1).replace('/', '.').getStr();
+ OUString implName = xSource->getKeyName().copy(1).replace('/', '.');
sal_Int32 firstDot = implName.indexOf('.');
if (firstDot >= 0)
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 4ae249b893c2..5f3c7142f77a 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -756,7 +756,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 > const & rProcessId)
//An unexpected error occurred
throw css::uno::RuntimeException(
"[JavaVirtualMachine]:An unexpected error occurred"
- " while searching for a Java!", nullptr);
+ " while searching for a Java, " + OUString::number(errFind), nullptr);
}
}
case JFW_E_INVALID_SETTINGS: