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
714f4db8
Kaydet (Commit)
714f4db8
authored
Nis 01, 2015
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Replace remaining getCppuType et al with cppu::UnoType
Change-Id: Id848d14133fee5104e79ba0683cbaf942598faa7
üst
cf93af5e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
12 deletions
+12
-12
pyuno_adapter.cxx
pyuno/source/module/pyuno_adapter.cxx
+3
-3
pyuno_callable.cxx
pyuno/source/module/pyuno_callable.cxx
+3
-3
pyuno_runtime.cxx
pyuno/source/module/pyuno_runtime.cxx
+6
-6
No files found.
pyuno/source/module/pyuno_adapter.cxx
Dosyayı görüntüle @
714f4db8
...
...
@@ -314,7 +314,7 @@ Any Adapter::invoke( const OUString &aFunctionName,
{
logException
(
cargo
,
"except uno->py[0x"
,
mWrappedObject
.
get
(),
aFunctionName
,
&
e
,
getCppuType
(
&
e
)
);
mWrappedObject
.
get
(),
aFunctionName
,
&
e
,
cppu
::
UnoType
<
decltype
(
e
)
>::
get
(
)
);
}
throw
;
}
...
...
@@ -324,7 +324,7 @@ Any Adapter::invoke( const OUString &aFunctionName,
{
logException
(
cargo
,
"except uno->py[0x"
,
mWrappedObject
.
get
(),
aFunctionName
,
&
e
,
getCppuType
(
&
e
)
);
mWrappedObject
.
get
(),
aFunctionName
,
&
e
,
cppu
::
UnoType
<
decltype
(
e
)
>::
get
(
)
);
}
throw
;
}
...
...
@@ -334,7 +334,7 @@ Any Adapter::invoke( const OUString &aFunctionName,
{
logException
(
cargo
,
"except uno->py[0x"
,
mWrappedObject
.
get
(),
aFunctionName
,
&
e
,
getCppuType
(
&
e
)
);
mWrappedObject
.
get
(),
aFunctionName
,
&
e
,
cppu
::
UnoType
<
decltype
(
e
)
>::
get
(
)
);
}
throw
;
}
...
...
pyuno/source/module/pyuno_callable.cxx
Dosyayı görüntüle @
714f4db8
...
...
@@ -154,7 +154,7 @@ PyObject* PyUNO_callable_call(
if
(
isLog
(
cargo
,
LogLevel
::
CALL
)
)
{
logException
(
cargo
,
"error py->uno[0x"
,
me
->
members
->
xInvocation
.
get
()
,
me
->
members
->
methodName
,
&
e
,
getCppuType
(
&
e
).
getTypeLibType
());
me
->
members
->
methodName
,
&
e
,
cppu
::
UnoType
<
decltype
(
e
)
>::
get
(
).
getTypeLibType
());
}
raisePyExceptionWithAny
(
com
::
sun
::
star
::
uno
::
makeAny
(
e
)
);
}
...
...
@@ -163,7 +163,7 @@ PyObject* PyUNO_callable_call(
if
(
isLog
(
cargo
,
LogLevel
::
CALL
)
)
{
logException
(
cargo
,
"error py->uno[0x"
,
me
->
members
->
xInvocation
.
get
()
,
me
->
members
->
methodName
,
&
e
,
getCppuType
(
&
e
).
getTypeLibType
());
me
->
members
->
methodName
,
&
e
,
cppu
::
UnoType
<
decltype
(
e
)
>::
get
(
).
getTypeLibType
());
}
raisePyExceptionWithAny
(
com
::
sun
::
star
::
uno
::
makeAny
(
e
)
);
}
...
...
@@ -172,7 +172,7 @@ PyObject* PyUNO_callable_call(
if
(
cargo
&&
isLog
(
cargo
,
LogLevel
::
CALL
)
)
{
logException
(
cargo
,
"error py->uno[0x"
,
me
->
members
->
xInvocation
.
get
()
,
me
->
members
->
methodName
,
&
e
,
getCppuType
(
&
e
).
getTypeLibType
());
me
->
members
->
methodName
,
&
e
,
cppu
::
UnoType
<
decltype
(
e
)
>::
get
(
).
getTypeLibType
());
}
raisePyExceptionWithAny
(
com
::
sun
::
star
::
uno
::
makeAny
(
e
)
);
}
...
...
pyuno/source/module/pyuno_runtime.cxx
Dosyayı görüntüle @
714f4db8
...
...
@@ -524,7 +524,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const
{
Reference
<
XTypeConverter
>
tc
=
getImpl
()
->
cargo
->
xTypeConverter
;
Reference
<
XSingleServiceFactory
>
ssf
=
getImpl
()
->
cargo
->
xInvocation
;
tc
->
convertTo
(
a
,
::
getCppuType
(
&
s
))
>>=
s
;
tc
->
convertTo
(
a
,
cppu
::
UnoType
<
decltype
(
s
)
>::
get
(
))
>>=
s
;
PyRef
tuple
(
PyTuple_New
(
s
.
getLength
()),
SAL_NO_ACQUIRE
,
NOT_NULL
);
int
i
=
0
;
try
...
...
@@ -642,12 +642,12 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
if
(
o
==
Py_True
)
{
sal_Bool
b
=
sal_True
;
a
=
Any
(
&
b
,
getBooleanCppuType
()
);
a
=
Any
(
&
b
,
cppu
::
UnoType
<
bool
>::
get
()
);
}
else
if
(
o
==
Py_False
)
{
sal_Bool
b
=
sal_False
;
a
=
Any
(
&
b
,
getBooleanCppuType
()
);
a
=
Any
(
&
b
,
cppu
::
UnoType
<
bool
>::
get
()
);
}
else
{
...
...
@@ -676,12 +676,12 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
if
(
o
==
Py_True
)
{
sal_Bool
b
=
sal_True
;
a
=
Any
(
&
b
,
getBooleanCppuType
());
a
=
Any
(
&
b
,
cppu
::
UnoType
<
bool
>::
get
());
}
else
if
(
o
==
Py_False
)
{
sal_Bool
b
=
sal_False
;
a
=
Any
(
&
b
,
getBooleanCppuType
());
a
=
Any
(
&
b
,
cppu
::
UnoType
<
bool
>::
get
());
}
else
{
...
...
@@ -794,7 +794,7 @@ Any Runtime::pyObject2Any ( const PyRef & source, enum ConversionMode mode ) con
else
if
(
PyObject_IsInstance
(
o
,
getCharClass
(
runtime
).
get
()
)
)
{
sal_Unicode
c
=
PyChar2Unicode
(
o
);
a
.
setValue
(
&
c
,
getCharCppuType
(
));
a
.
setValue
(
&
c
,
cppu
::
UnoType
<
cppu
::
UnoCharType
>::
get
(
));
}
else
if
(
PyObject_IsInstance
(
o
,
getAnyClass
(
runtime
).
get
()
)
)
{
...
...
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