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
a9b4c9ca
Kaydet (Commit)
a9b4c9ca
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: I4024816e38c0196ec502a5d39b8bd50cf6b142fb
üst
5d353ff6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
15 deletions
+15
-15
bridgetest.cxx
testtools/source/bridgetest/bridgetest.cxx
+7
-7
constructors.cxx
testtools/source/bridgetest/constructors.cxx
+5
-5
cppobj.cxx
testtools/source/bridgetest/cppobj.cxx
+3
-3
No files found.
testtools/source/bridgetest/bridgetest.cxx
Dosyayı görüntüle @
a9b4c9ca
...
@@ -214,7 +214,7 @@ namespace {
...
@@ -214,7 +214,7 @@ namespace {
template
<
typename
T
>
template
<
typename
T
>
bool
testAny
(
bool
testAny
(
T
const
&
value
,
Reference
<
XBridgeTest
>
const
&
xLBT
,
T
const
&
value
,
Reference
<
XBridgeTest
>
const
&
xLBT
,
char
const
*
typeName
=
0
)
char
const
*
typeName
=
nullptr
)
{
{
Any
any
;
Any
any
;
any
<<=
value
;
any
<<=
value
;
...
@@ -231,7 +231,7 @@ bool testAny(
...
@@ -231,7 +231,7 @@ bool testAny(
RTL_TEXTENCODING_ASCII_US
).
getStr
());
RTL_TEXTENCODING_ASCII_US
).
getStr
());
success
=
false
;
success
=
false
;
}
}
if
(
typeName
!=
0
if
(
typeName
!=
nullptr
&&
!
any2
.
getValueType
().
getTypeName
().
equalsAscii
(
typeName
))
&&
!
any2
.
getValueType
().
getTypeName
().
equalsAscii
(
typeName
))
{
{
fprintf
(
fprintf
(
...
@@ -1046,7 +1046,7 @@ uno_Sequence* cloneSequence(const uno_Sequence* val, const Type& type)
...
@@ -1046,7 +1046,7 @@ uno_Sequence* cloneSequence(const uno_Sequence* val, const Type& type)
sal_Int8
*
buf
=
new
sal_Int8
[
pTdElem
->
nSize
*
val
->
nElements
];
sal_Int8
*
buf
=
new
sal_Int8
[
pTdElem
->
nSize
*
val
->
nElements
];
sal_Int8
*
pBufCur
=
buf
;
sal_Int8
*
pBufCur
=
buf
;
uno_Sequence
*
retSeq
=
NULL
;
uno_Sequence
*
retSeq
=
nullptr
;
switch
(
pTdElem
->
eTypeClass
)
switch
(
pTdElem
->
eTypeClass
)
{
{
case
TypeClass_SEQUENCE
:
case
TypeClass_SEQUENCE
:
...
@@ -1100,14 +1100,14 @@ inline bool makeSurrogate(
...
@@ -1100,14 +1100,14 @@ inline bool makeSurrogate(
// official:
// official:
uno_getEnvironment
(
uno_getEnvironment
(
reinterpret_cast
<
uno_Environment
**
>
(
&
aCppEnv_official
),
reinterpret_cast
<
uno_Environment
**
>
(
&
aCppEnv_official
),
aCppEnvTypeName
.
pData
,
0
);
aCppEnvTypeName
.
pData
,
nullptr
);
// anonymous:
// anonymous:
uno_createEnvironment
(
uno_createEnvironment
(
reinterpret_cast
<
uno_Environment
**
>
(
&
aCppEnv_ano
),
reinterpret_cast
<
uno_Environment
**
>
(
&
aCppEnv_ano
),
aCppEnvTypeName
.
pData
,
0
);
aCppEnvTypeName
.
pData
,
nullptr
);
uno_createEnvironment
(
uno_createEnvironment
(
reinterpret_cast
<
uno_Environment
**
>
(
&
aUnoEnv_ano
),
reinterpret_cast
<
uno_Environment
**
>
(
&
aUnoEnv_ano
),
aUnoEnvTypeName
.
pData
,
0
);
aUnoEnvTypeName
.
pData
,
nullptr
);
UnoInterfaceReference
unoI
;
UnoInterfaceReference
unoI
;
Mapping
cpp2uno
(
aCppEnv_official
.
get
(),
aUnoEnv_ano
.
get
()
);
Mapping
cpp2uno
(
aCppEnv_official
.
get
(),
aUnoEnv_ano
.
get
()
);
...
@@ -1261,7 +1261,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
...
@@ -1261,7 +1261,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const
sal_Char
*
pImplName
,
void
*
pServiceManager
,
const
sal_Char
*
pImplName
,
void
*
pServiceManager
,
SAL_UNUSED_PARAMETER
void
*
)
SAL_UNUSED_PARAMETER
void
*
)
{
{
void
*
pRet
=
0
;
void
*
pRet
=
nullptr
;
if
(
pServiceManager
&&
rtl_str_compare
(
pImplName
,
IMPLNAME
)
==
0
)
if
(
pServiceManager
&&
rtl_str_compare
(
pImplName
,
IMPLNAME
)
==
0
)
{
{
...
...
testtools/source/bridgetest/constructors.cxx
Dosyayı görüntüle @
a9b4c9ca
...
@@ -340,9 +340,9 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments)
...
@@ -340,9 +340,9 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments)
&&
(
arguments
[
28
]
>>=
arg28
)
&&
arg28
.
member
.
getLength
()
==
1
&&
(
arguments
[
28
]
>>=
arg28
)
&&
arg28
.
member
.
getLength
()
==
1
&&
arg28
.
member
[
0
]
==
0.456
&&
arg28
.
member
[
0
]
==
0.456
&&
(
arguments
[
29
]
>>=
arg29
)
&&
arg29
.
member
.
getLength
()
==
1
&&
(
arguments
[
29
]
>>=
arg29
)
&&
arg29
.
member
.
getLength
()
==
1
&&
arg29
.
member
[
0
]
!=
NULL
&&
arg29
.
member
[
0
]
!=
nullptr
&&
(
arguments
[
30
]
>>=
arg30
)
&&
arg30
.
member
.
getLength
()
==
1
&&
(
arguments
[
30
]
>>=
arg30
)
&&
arg30
.
member
.
getLength
()
==
1
&&
arg30
.
member
[
0
]
!=
NULL
&&
arg30
.
member
[
0
]
!=
nullptr
&&
(
arguments
[
31
]
>>=
arg31
)
&&
arg31
.
member
.
getLength
()
==
1
&&
(
arguments
[
31
]
>>=
arg31
)
&&
arg31
.
member
.
getLength
()
==
1
&&
arg31
.
member
[
0
]
==
ttb
::
TestEnum_TWO
&&
arg31
.
member
[
0
]
==
ttb
::
TestEnum_TWO
&&
(
arguments
[
32
]
>>=
arg32
)
&&
arg32
.
member
.
getLength
()
==
1
&&
(
arguments
[
32
]
>>=
arg32
)
&&
arg32
.
member
.
getLength
()
==
1
...
@@ -471,10 +471,10 @@ css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames2() {
...
@@ -471,10 +471,10 @@ css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames2() {
::
cppu
::
ImplementationEntry
entries
[]
=
{
::
cppu
::
ImplementationEntry
entries
[]
=
{
{
&
create
,
&
getImplementationName
,
&
getSupportedServiceNames
,
{
&
create
,
&
getImplementationName
,
&
getSupportedServiceNames
,
&::
cppu
::
createSingleComponentFactory
,
0
,
0
},
&::
cppu
::
createSingleComponentFactory
,
nullptr
,
0
},
{
&
create2
,
&
getImplementationName2
,
&
getSupportedServiceNames2
,
{
&
create2
,
&
getImplementationName2
,
&
getSupportedServiceNames2
,
&::
cppu
::
createSingleComponentFactory
,
0
,
0
},
&::
cppu
::
createSingleComponentFactory
,
nullptr
,
0
},
{
0
,
0
,
0
,
0
,
0
,
0
}
};
{
nullptr
,
nullptr
,
nullptr
,
nullptr
,
nullptr
,
0
}
};
}
}
extern
"C"
SAL_DLLPUBLIC_EXPORT
void
*
SAL_CALL
component_getFactory
(
extern
"C"
SAL_DLLPUBLIC_EXPORT
void
*
SAL_CALL
component_getFactory
(
...
...
testtools/source/bridgetest/cppobj.cxx
Dosyayı görüntüle @
a9b4c9ca
...
@@ -990,7 +990,7 @@ void Test_Impl::testConstructorsService(
...
@@ -990,7 +990,7 @@ void Test_Impl::testConstructorsService(
TestStruct
(
10
),
TestStruct
(
10
),
TestPolyStruct
<
sal_Bool
>
(
true
),
TestPolyStruct
<
sal_Bool
>
(
true
),
TestPolyStruct
<
Any
>
(
makeAny
(
true
)),
TestPolyStruct
<
Any
>
(
makeAny
(
true
)),
Reference
<
XInterface
>
(
0
));
Reference
<
XInterface
>
(
nullptr
));
Sequence
<
Any
>
args
(
40
);
Sequence
<
Any
>
args
(
40
);
args
[
0
]
<<=
true
;
args
[
0
]
<<=
true
;
args
[
1
]
<<=
SAL_MIN_INT8
;
args
[
1
]
<<=
SAL_MIN_INT8
;
...
@@ -1032,7 +1032,7 @@ void Test_Impl::testConstructorsService(
...
@@ -1032,7 +1032,7 @@ void Test_Impl::testConstructorsService(
args
[
36
]
<<=
TestStruct
(
10
);
args
[
36
]
<<=
TestStruct
(
10
);
args
[
37
]
<<=
TestPolyStruct
<
sal_Bool
>
(
true
);
args
[
37
]
<<=
TestPolyStruct
<
sal_Bool
>
(
true
);
args
[
38
]
<<=
TestPolyStruct
<
Any
>
(
makeAny
(
true
));
args
[
38
]
<<=
TestPolyStruct
<
Any
>
(
makeAny
(
true
));
args
[
39
]
<<=
Reference
<
XInterface
>
(
0
);
args
[
39
]
<<=
Reference
<
XInterface
>
(
nullptr
);
Constructors
::
create2
(
context
,
args
);
Constructors
::
create2
(
context
,
args
);
Sequence
<
Type
>
argSeq1
(
1
);
argSeq1
[
0
]
=
cppu
::
UnoType
<
sal_Int32
>::
get
();
Sequence
<
Type
>
argSeq1
(
1
);
argSeq1
[
0
]
=
cppu
::
UnoType
<
sal_Int32
>::
get
();
...
@@ -1183,7 +1183,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
...
@@ -1183,7 +1183,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const
sal_Char
*
pImplName
,
SAL_UNUSED_PARAMETER
void
*
pServiceManager
,
const
sal_Char
*
pImplName
,
SAL_UNUSED_PARAMETER
void
*
pServiceManager
,
SAL_UNUSED_PARAMETER
void
*
)
SAL_UNUSED_PARAMETER
void
*
)
{
{
void
*
pRet
=
0
;
void
*
pRet
=
nullptr
;
if
(
pServiceManager
&&
rtl_str_compare
(
pImplName
,
IMPLNAME
)
==
0
)
if
(
pServiceManager
&&
rtl_str_compare
(
pImplName
,
IMPLNAME
)
==
0
)
{
{
...
...
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