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
f8421bde
Kaydet (Commit)
f8421bde
authored
Haz 02, 2015
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
No need for an intermediate FARPROC here
Change-Id: I601040a142d7a1d946a7141ae48981790eb3f305
üst
6ef9f7e2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
10 deletions
+8
-10
callform.cxx
sc/source/core/tool/callform.cxx
+8
-10
No files found.
sc/source/core/tool/callform.cxx
Dosyayı görüntüle @
f8421bde
...
...
@@ -63,8 +63,6 @@ typedef void (CALLTYPE* Advice) ( sal_uInt16& nNo,
AdvData
&
pfCallback
);
typedef
void
(
CALLTYPE
*
Unadvice
)(
double
&
nHandle
);
typedef
void
(
CALLTYPE
*
FARPROC
)
(
void
);
}
#ifndef DISABLE_DYNLOADING
...
...
@@ -176,13 +174,13 @@ bool InitExternalFunc(const OUString& rModuleName)
osl
::
Module
*
pLib
=
new
osl
::
Module
(
aNP
);
if
(
pLib
->
is
())
{
FARPROC
fpGetCount
=
reinterpret_cast
<
FARPROC
>
(
pLib
->
getFunctionSymbol
(
GETFUNCTIONCOUNT
)
);
FARPROC
fpGetData
=
reinterpret_cast
<
FARPROC
>
(
pLib
->
getFunctionSymbol
(
GETFUNCTIONDATA
)
);
oslGenericFunction
fpGetCount
=
pLib
->
getFunctionSymbol
(
GETFUNCTIONCOUNT
);
oslGenericFunction
fpGetData
=
pLib
->
getFunctionSymbol
(
GETFUNCTIONDATA
);
if
((
fpGetCount
!=
NULL
)
&&
(
fpGetData
!=
NULL
))
{
FARPROC
fpIsAsync
=
reinterpret_cast
<
FARPROC
>
(
pLib
->
getFunctionSymbol
(
ISASYNC
)
);
FARPROC
fpAdvice
=
reinterpret_cast
<
FARPROC
>
(
pLib
->
getFunctionSymbol
(
ADVICE
)
);
FARPROC
fpSetLanguage
=
reinterpret_cast
<
FARPROC
>
(
pLib
->
getFunctionSymbol
(
SETLANGUAGE
)
);
oslGenericFunction
fpIsAsync
=
pLib
->
getFunctionSymbol
(
ISASYNC
);
oslGenericFunction
fpAdvice
=
pLib
->
getFunctionSymbol
(
ADVICE
);
oslGenericFunction
fpSetLanguage
=
pLib
->
getFunctionSymbol
(
SETLANGUAGE
);
if
(
fpSetLanguage
)
{
LanguageType
eLanguage
=
Application
::
GetSettings
().
GetUILanguageTag
().
getLanguageType
();
...
...
@@ -257,7 +255,7 @@ bool FuncData::Call(void** ppParam) const
#else
bool
bRet
=
false
;
osl
::
Module
*
pLib
=
pModuleData
->
GetInstance
();
FARPROC
fProc
=
reinterpret_cast
<
FARPROC
>
(
pLib
->
getFunctionSymbol
(
aFuncName
)
);
oslGenericFunction
fProc
=
pLib
->
getFunctionSymbol
(
aFuncName
);
if
(
fProc
!=
NULL
)
{
switch
(
nParamCount
)
...
...
@@ -355,7 +353,7 @@ bool FuncData::Unadvice( double nHandle )
#else
bool
bRet
=
false
;
osl
::
Module
*
pLib
=
pModuleData
->
GetInstance
();
FARPROC
fProc
=
reinterpret_cast
<
FARPROC
>
(
pLib
->
getFunctionSymbol
(
UNADVICE
)
);
oslGenericFunction
fProc
=
pLib
->
getFunctionSymbol
(
UNADVICE
);
if
(
fProc
!=
NULL
)
{
reinterpret_cast
<
::
Unadvice
>
(
fProc
)(
nHandle
);
...
...
@@ -382,7 +380,7 @@ bool FuncData::getParamDesc( OUString& aName, OUString& aDesc, sal_uInt16 nParam
if
(
nParam
<=
nParamCount
)
{
osl
::
Module
*
pLib
=
pModuleData
->
GetInstance
();
FARPROC
fProc
=
reinterpret_cast
<
FARPROC
>
(
pLib
->
getFunctionSymbol
(
GETPARAMDESC
)
);
oslGenericFunction
fProc
=
pLib
->
getFunctionSymbol
(
GETPARAMDESC
);
if
(
fProc
!=
NULL
)
{
sal_Char
pcName
[
256
];
...
...
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