Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
6794c2e4
Kaydet (Commit)
6794c2e4
authored
Kas 10, 2015
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
loplugin:nullptr (automatic rewrite)
Change-Id: I89aa17e66c502e81089f42578b45097f44de4ea9
üst
22980bea
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
21 deletions
+21
-21
bootstrap.cxx
javaunohelper/source/bootstrap.cxx
+8
-8
javaunohelper.cxx
javaunohelper/source/javaunohelper.cxx
+8
-8
preload.cxx
javaunohelper/source/preload.cxx
+5
-5
No files found.
javaunohelper/source/bootstrap.cxx
Dosyayı görüntüle @
6794c2e4
...
...
@@ -70,7 +70,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
{
try
{
if
(
0
!=
jpairs
)
if
(
nullptr
!=
jpairs
)
{
jsize
nPos
=
0
,
len
=
jni_env
->
GetArrayLength
(
jpairs
);
while
(
nPos
<
len
)
...
...
@@ -82,7 +82,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
jni_env
->
ExceptionClear
();
throw
RuntimeException
(
"index out of bounds?!"
);
}
if
(
0
!=
jstr
)
if
(
nullptr
!=
jstr
)
{
OUString
name
(
::
javaunohelper
::
jstring_to_oustring
(
jstr
,
jni_env
)
);
// value
...
...
@@ -92,7 +92,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
jni_env
->
ExceptionClear
();
throw
RuntimeException
(
"index out of bounds?!"
);
}
if
(
0
!=
jstr
)
if
(
nullptr
!=
jstr
)
{
OUString
value
(
::
javaunohelper
::
jstring_to_oustring
(
jstr
,
jni_env
)
);
...
...
@@ -106,7 +106,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
// bootstrap uno
Reference
<
XComponentContext
>
xContext
;
if
(
0
==
juno_rc
)
if
(
nullptr
==
juno_rc
)
{
xContext
=
::
cppu
::
defaultBootstrap_InitialComponentContext
();
}
...
...
@@ -126,7 +126,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
OUString
cpp_env_name
=
CPPU_CURRENT_LANGUAGE_BINDING_NAME
;
OUString
java_env_name
=
UNO_LB_JAVA
;
Environment
java_env
,
cpp_env
;
uno_getEnvironment
(
reinterpret_cast
<
uno_Environment
**>
(
&
cpp_env
),
cpp_env_name
.
pData
,
NULL
);
uno_getEnvironment
(
reinterpret_cast
<
uno_Environment
**>
(
&
cpp_env
),
cpp_env_name
.
pData
,
nullptr
);
uno_getEnvironment
(
reinterpret_cast
<
uno_Environment
**>
(
&
java_env
),
java_env_name
.
pData
,
vm_access
.
get
()
);
// map to java
...
...
@@ -148,7 +148,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
catch
(
const
RuntimeException
&
exc
)
{
jclass
c
=
jni_env
->
FindClass
(
"com/sun/star/uno/RuntimeException"
);
if
(
0
!=
c
)
if
(
nullptr
!=
c
)
{
OString
cstr
(
OUStringToOString
(
exc
.
Message
,
RTL_TEXTENCODING_JAVA_UTF8
)
);
...
...
@@ -159,7 +159,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
catch
(
const
Exception
&
exc
)
{
jclass
c
=
jni_env
->
FindClass
(
"com/sun/star/uno/Exception"
);
if
(
0
!=
c
)
if
(
nullptr
!=
c
)
{
OString
cstr
(
OUStringToOString
(
exc
.
Message
,
RTL_TEXTENCODING_JAVA_UTF8
)
);
...
...
@@ -168,7 +168,7 @@ jobject Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
}
}
return
0
;
return
nullptr
;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
javaunohelper/source/javaunohelper.cxx
Dosyayı görüntüle @
6794c2e4
...
...
@@ -55,7 +55,7 @@ jboolean Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
{
bool
bRet
=
false
;
const
jchar
*
pJLibName
=
pJEnv
->
GetStringChars
(
jLibName
,
NULL
);
const
jchar
*
pJLibName
=
pJEnv
->
GetStringChars
(
jLibName
,
nullptr
);
OUString
aLibName
(
pJLibName
);
pJEnv
->
ReleaseStringChars
(
jLibName
,
pJLibName
);
...
...
@@ -77,13 +77,13 @@ jboolean Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
{
Environment
java_env
,
loader_env
;
const
sal_Char
*
pEnvTypeName
=
0
;
const
sal_Char
*
pEnvTypeName
=
nullptr
;
(
*
reinterpret_cast
<
component_getImplementationEnvironmentFunc
>
(
pSym
))(
&
pEnvTypeName
,
reinterpret_cast
<
uno_Environment
**>
(
&
loader_env
)
);
if
(
!
loader_env
.
is
())
{
OUString
aEnvTypeName
(
OUString
::
createFromAscii
(
pEnvTypeName
)
);
uno_getEnvironment
(
reinterpret_cast
<
uno_Environment
**>
(
&
loader_env
),
aEnvTypeName
.
pData
,
0
);
uno_getEnvironment
(
reinterpret_cast
<
uno_Environment
**>
(
&
loader_env
),
aEnvTypeName
.
pData
,
nullptr
);
}
// create vm access
...
...
@@ -138,7 +138,7 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
JNIEnv
*
pJEnv
,
SAL_UNUSED_PARAMETER
jclass
,
jstring
jLibName
,
jstring
jImplName
,
jobject
jSMgr
,
jobject
jRegKey
,
jobject
loader
)
{
const
jchar
*
pJLibName
=
pJEnv
->
GetStringChars
(
jLibName
,
NULL
);
const
jchar
*
pJLibName
=
pJEnv
->
GetStringChars
(
jLibName
,
nullptr
);
OUString
aLibName
(
pJLibName
);
pJEnv
->
ReleaseStringChars
(
jLibName
,
pJLibName
);
...
...
@@ -153,7 +153,7 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
aLibName
+=
SAL_DLLEXTENSION
;
jobject
joSLL_cpp
=
0
;
jobject
joSLL_cpp
=
nullptr
;
#ifndef DISABLE_DYNLOADING
osl
::
Module
lib
(
aLibName
,
SAL_LOADMODULE_LAZY
|
SAL_LOADMODULE_GLOBAL
);
...
...
@@ -167,14 +167,14 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
{
Environment
java_env
,
loader_env
;
const
sal_Char
*
pEnvTypeName
=
0
;
const
sal_Char
*
pEnvTypeName
=
nullptr
;
(
*
reinterpret_cast
<
component_getImplementationEnvironmentFunc
>
(
pSym
))(
&
pEnvTypeName
,
reinterpret_cast
<
uno_Environment
**>
(
&
loader_env
)
);
if
(
!
loader_env
.
is
())
{
OUString
aEnvTypeName
(
OUString
::
createFromAscii
(
pEnvTypeName
)
);
uno_getEnvironment
(
reinterpret_cast
<
uno_Environment
**>
(
&
loader_env
),
aEnvTypeName
.
pData
,
0
);
uno_getEnvironment
(
reinterpret_cast
<
uno_Environment
**>
(
&
loader_env
),
aEnvTypeName
.
pData
,
nullptr
);
}
// create vm access
...
...
@@ -201,7 +201,7 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
java2dest
.
mapInterface
(
jRegKey
,
cppu
::
UnoType
<
registry
::
XRegistryKey
>::
get
());
const
char
*
pImplName
=
pJEnv
->
GetStringUTFChars
(
jImplName
,
NULL
);
const
char
*
pImplName
=
pJEnv
->
GetStringUTFChars
(
jImplName
,
nullptr
);
void
*
pSSF
=
(
*
reinterpret_cast
<
component_getFactoryFunc
>
(
pSym
))(
pImplName
,
pSMgr
,
pKey
);
...
...
javaunohelper/source/preload.cxx
Dosyayı görüntüle @
6794c2e4
...
...
@@ -72,9 +72,9 @@ static bool inited_juhx( JNIEnv * jni_env )
s_bootstrap
=
reinterpret_cast
<
javaunohelper
::
detail
::
Func_bootstrap
*>
(
aModule
.
getFunctionSymbol
(
symbol
));
if
(
0
==
s_writeInfo
||
0
==
s_getFactory
||
0
==
s_bootstrap
)
if
(
nullptr
==
s_writeInfo
||
nullptr
==
s_getFactory
||
nullptr
==
s_bootstrap
)
{
jclass
c
=
jni_env
->
FindClass
(
"java/lang/RuntimeException"
);
jni_env
->
ThrowNew
(
...
...
@@ -107,7 +107,7 @@ Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
if
(
inited_juhx
(
pJEnv
))
return
(
*
s_getFactory
)(
pJEnv
,
jClass
,
jLibName
,
jImplName
,
jSMgr
,
jRegKey
,
loader
);
return
0
;
return
nullptr
;
}
SAL_DLLPUBLIC_EXPORT
jobject
JNICALL
...
...
@@ -117,7 +117,7 @@ Java_com_sun_star_comp_helper_Bootstrap_cppuhelper_1bootstrap(
{
if
(
inited_juhx
(
jni_env
))
return
(
*
s_bootstrap
)(
jni_env
,
jClass
,
juno_rc
,
jpairs
,
loader
);
return
0
;
return
nullptr
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment