summaryrefslogtreecommitdiff
path: root/jvmaccess
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2013-04-07 12:06:47 +0200
committerLuboš Luňák <l.lunak@suse.cz>2013-04-07 14:23:11 +0200
commit1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
treee32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /jvmaccess
parent5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'jvmaccess')
-rw-r--r--jvmaccess/inc/jvmaccess/classpath.hxx12
-rw-r--r--jvmaccess/source/classpath.cxx12
-rw-r--r--jvmaccess/workbench/javainfo/javainfotest.cxx3
3 files changed, 12 insertions, 15 deletions
diff --git a/jvmaccess/inc/jvmaccess/classpath.hxx b/jvmaccess/inc/jvmaccess/classpath.hxx
index 507af76d3759..ab1a6c53f322 100644
--- a/jvmaccess/inc/jvmaccess/classpath.hxx
+++ b/jvmaccess/inc/jvmaccess/classpath.hxx
@@ -67,7 +67,7 @@ public:
translateToUrls(
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & context,
- ::JNIEnv * environment, ::rtl::OUString const & classPath)
+ ::JNIEnv * environment, OUString const & classPath)
{
return
static_cast< ::jobjectArray >(
@@ -103,8 +103,8 @@ public:
static inline ::jclass loadClass(
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & context,
- ::JNIEnv * environment, ::rtl::OUString const & classPath,
- ::rtl::OUString const & name)
+ ::JNIEnv * environment, OUString const & classPath,
+ OUString const & name)
{
return
static_cast< ::jclass >(
@@ -124,13 +124,13 @@ private:
static void * doTranslateToUrls(
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & context,
- void * environment, ::rtl::OUString const & classPath);
+ void * environment, OUString const & classPath);
static void * doLoadClass(
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & context,
- void * environment, ::rtl::OUString const & classPath,
- ::rtl::OUString const & name);
+ void * environment, OUString const & classPath,
+ OUString const & name);
};
}
diff --git a/jvmaccess/source/classpath.cxx b/jvmaccess/source/classpath.cxx
index 4891cc27876a..d693f2a10a99 100644
--- a/jvmaccess/source/classpath.cxx
+++ b/jvmaccess/source/classpath.cxx
@@ -40,7 +40,7 @@
void * ::jvmaccess::ClassPath::doTranslateToUrls(
css::uno::Reference< css::uno::XComponentContext > const & context,
- void * environment, ::rtl::OUString const & classPath)
+ void * environment, OUString const & classPath)
{
OSL_ASSERT(context.is() && environment != 0);
::JNIEnv * const env = static_cast< ::JNIEnv * >(environment);
@@ -55,7 +55,7 @@ void * ::jvmaccess::ClassPath::doTranslateToUrls(
}
::std::vector< jobject > urls;
for (::sal_Int32 i = 0; i != -1;) {
- ::rtl::OUString url(classPath.getToken(0, ' ', i));
+ OUString url(classPath.getToken(0, ' ', i));
if (!url.isEmpty()) {
css::uno::Reference< css::uri::XVndSunStarExpandUrlReference >
expUrl(
@@ -68,7 +68,7 @@ void * ::jvmaccess::ClassPath::doTranslateToUrls(
url = expUrl->expand( expander );
} catch (const css::lang::IllegalArgumentException & e) {
throw css::uno::RuntimeException(
- (::rtl::OUString(
+ (OUString(
"com.sun.star.lang.IllegalArgumentException: ")
+ e.Message),
css::uno::Reference< css::uno::XInterface >());
@@ -91,7 +91,7 @@ void * ::jvmaccess::ClassPath::doTranslateToUrls(
jobjectArray result = env->NewObjectArray(
static_cast< jsize >(urls.size()), classUrl, 0);
// static_cast is ok, as each element of urls occupied at least one
- // character of the ::rtl::OUString classPath
+ // character of the OUString classPath
if (result == 0) {
return 0;
}
@@ -105,8 +105,8 @@ void * ::jvmaccess::ClassPath::doTranslateToUrls(
void * ::jvmaccess::ClassPath::doLoadClass(
css::uno::Reference< css::uno::XComponentContext > const & context,
- void * environment, ::rtl::OUString const & classPath,
- ::rtl::OUString const & name)
+ void * environment, OUString const & classPath,
+ OUString const & name)
{
OSL_ASSERT(context.is() && environment != 0);
::JNIEnv * const env = static_cast< ::JNIEnv * >(environment);
diff --git a/jvmaccess/workbench/javainfo/javainfotest.cxx b/jvmaccess/workbench/javainfo/javainfotest.cxx
index 26d86dc2cf47..34ccf25cc26f 100644
--- a/jvmaccess/workbench/javainfo/javainfotest.cxx
+++ b/jvmaccess/workbench/javainfo/javainfotest.cxx
@@ -31,9 +31,6 @@ using namespace osl;
using jvmaccess::JavaInfo;
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
#define JAVA_VERSION "1.4.1_01"