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
d57010fa
Kaydet (Commit)
d57010fa
authored
Eki 07, 2013
tarafından
Takeshi Abe
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sal_Bool to bool
Change-Id: Ie8e35c4342db6e2dc35fca33cee7b4d71cfcb732
üst
aa527537
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
30 deletions
+30
-30
sbunoobj.cxx
basic/source/classes/sbunoobj.cxx
+15
-15
sbxobj.cxx
basic/source/sbx/sbxobj.cxx
+6
-6
sbxvalue.cxx
basic/source/sbx/sbxvalue.cxx
+3
-3
scriptcont.cxx
basic/source/uno/scriptcont.cxx
+6
-6
No files found.
basic/source/classes/sbunoobj.cxx
Dosyayı görüntüle @
d57010fa
...
@@ -2242,7 +2242,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
...
@@ -2242,7 +2242,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
// number of Parameter -1 because of Param0 == this
// number of Parameter -1 because of Param0 == this
sal_uInt32
nParamCount
=
pParams
?
((
sal_uInt32
)
pParams
->
Count
()
-
1
)
:
0
;
sal_uInt32
nParamCount
=
pParams
?
((
sal_uInt32
)
pParams
->
Count
()
-
1
)
:
0
;
Sequence
<
Any
>
args
;
Sequence
<
Any
>
args
;
sal_Bool
bOutParams
=
sal_F
alse
;
bool
bOutParams
=
f
alse
;
sal_uInt32
i
;
sal_uInt32
i
;
if
(
!
bInvocation
&&
mxUnoAccess
.
is
()
)
if
(
!
bInvocation
&&
mxUnoAccess
.
is
()
)
...
@@ -2300,7 +2300,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
...
@@ -2300,7 +2300,7 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
{
{
ParamMode
aParamMode
=
rInfo
.
aMode
;
ParamMode
aParamMode
=
rInfo
.
aMode
;
if
(
aParamMode
!=
ParamMode_IN
)
if
(
aParamMode
!=
ParamMode_IN
)
bOutParams
=
sal_T
rue
;
bOutParams
=
t
rue
;
}
}
}
}
}
}
...
@@ -2417,21 +2417,21 @@ SbUnoObject::SbUnoObject( const OUString& aName_, const Any& aUnoObj_ )
...
@@ -2417,21 +2417,21 @@ SbUnoObject::SbUnoObject( const OUString& aName_, const Any& aUnoObj_ )
//*** Define the name ***
//*** Define the name ***
sal_Bool
bFatalError
=
sal_T
rue
;
bool
bFatalError
=
t
rue
;
// Is it an interface or a struct?
// Is it an interface or a struct?
sal_Bool
bSetClassName
=
sal_F
alse
;
bool
bSetClassName
=
f
alse
;
OUString
aClassName_
;
OUString
aClassName_
;
if
(
eType
==
TypeClass_STRUCT
||
eType
==
TypeClass_EXCEPTION
)
if
(
eType
==
TypeClass_STRUCT
||
eType
==
TypeClass_EXCEPTION
)
{
{
// Struct is Ok
// Struct is Ok
bFatalError
=
sal_F
alse
;
bFatalError
=
f
alse
;
// insert the real name of the class
// insert the real name of the class
if
(
aName_
.
isEmpty
()
)
if
(
aName_
.
isEmpty
()
)
{
{
aClassName_
=
aUnoObj_
.
getValueType
().
getTypeName
();
aClassName_
=
aUnoObj_
.
getValueType
().
getTypeName
();
bSetClassName
=
sal_T
rue
;
bSetClassName
=
t
rue
;
}
}
typelib_TypeDescription
*
pDeclTD
=
0
;
typelib_TypeDescription
*
pDeclTD
=
0
;
typelib_typedescription_getByName
(
&
pDeclTD
,
maTmpUnoObj
.
getValueTypeName
().
pData
);
typelib_typedescription_getByName
(
&
pDeclTD
,
maTmpUnoObj
.
getValueTypeName
().
pData
);
...
@@ -2441,7 +2441,7 @@ SbUnoObject::SbUnoObject( const OUString& aName_, const Any& aUnoObj_ )
...
@@ -2441,7 +2441,7 @@ SbUnoObject::SbUnoObject( const OUString& aName_, const Any& aUnoObj_ )
else
if
(
eType
==
TypeClass_INTERFACE
)
else
if
(
eType
==
TypeClass_INTERFACE
)
{
{
// Interface works always through the type in the Any
// Interface works always through the type in the Any
bFatalError
=
sal_F
alse
;
bFatalError
=
f
alse
;
}
}
if
(
bSetClassName
)
if
(
bSetClassName
)
SetClassName
(
aClassName_
);
SetClassName
(
aClassName_
);
...
@@ -3652,7 +3652,7 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
...
@@ -3652,7 +3652,7 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
// Parameter count -1 because of Param0 == this
// Parameter count -1 because of Param0 == this
sal_uInt32
nParamCount
=
pParams
?
((
sal_uInt32
)
pParams
->
Count
()
-
1
)
:
0
;
sal_uInt32
nParamCount
=
pParams
?
((
sal_uInt32
)
pParams
->
Count
()
-
1
)
:
0
;
Sequence
<
Any
>
args
;
Sequence
<
Any
>
args
;
sal_Bool
bOutParams
=
sal_F
alse
;
bool
bOutParams
=
f
alse
;
Reference
<
XServiceConstructorDescription
>
xCtor
=
pUnoCtor
->
getServiceCtorDesc
();
Reference
<
XServiceConstructorDescription
>
xCtor
=
pUnoCtor
->
getServiceCtorDesc
();
Sequence
<
Reference
<
XParameter
>
>
aParameterSeq
=
xCtor
->
getParameters
();
Sequence
<
Reference
<
XParameter
>
>
aParameterSeq
=
xCtor
->
getParameters
();
...
@@ -3739,7 +3739,7 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
...
@@ -3739,7 +3739,7 @@ void SbUnoService::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
if
(
!
bOutParams
)
if
(
!
bOutParams
)
{
{
if
(
xParam
->
isOut
()
)
if
(
xParam
->
isOut
()
)
bOutParams
=
sal_T
rue
;
bOutParams
=
t
rue
;
}
}
}
}
else
else
...
@@ -4101,7 +4101,7 @@ Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName,
...
@@ -4101,7 +4101,7 @@ Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName,
// Check if to firing or approveFiring has to be called
// Check if to firing or approveFiring has to be called
Reference
<
XIdlMethod
>
xMethod
=
m_xListenerType
->
getMethod
(
FunctionName
);
Reference
<
XIdlMethod
>
xMethod
=
m_xListenerType
->
getMethod
(
FunctionName
);
sal_Bool
bApproveFiring
=
sal_F
alse
;
bool
bApproveFiring
=
f
alse
;
if
(
!
xMethod
.
is
()
)
if
(
!
xMethod
.
is
()
)
return
aRet
;
return
aRet
;
Reference
<
XIdlClass
>
xReturnType
=
xMethod
->
getReturnType
();
Reference
<
XIdlClass
>
xReturnType
=
xMethod
->
getReturnType
();
...
@@ -4109,7 +4109,7 @@ Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName,
...
@@ -4109,7 +4109,7 @@ Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName,
if
(
(
xReturnType
.
is
()
&&
xReturnType
->
getTypeClass
()
!=
TypeClass_VOID
)
||
if
(
(
xReturnType
.
is
()
&&
xReturnType
->
getTypeClass
()
!=
TypeClass_VOID
)
||
aExceptionSeq
.
getLength
()
>
0
)
aExceptionSeq
.
getLength
()
>
0
)
{
{
bApproveFiring
=
sal_T
rue
;
bApproveFiring
=
t
rue
;
}
}
else
else
{
{
...
@@ -4122,7 +4122,7 @@ Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName,
...
@@ -4122,7 +4122,7 @@ Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName,
{
{
if
(
pInfos
[
i
].
aMode
!=
ParamMode_IN
)
if
(
pInfos
[
i
].
aMode
!=
ParamMode_IN
)
{
{
bApproveFiring
=
sal_T
rue
;
bApproveFiring
=
t
rue
;
break
;
break
;
}
}
}
}
...
@@ -4496,7 +4496,7 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const OUString& rFunction,
...
@@ -4496,7 +4496,7 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const OUString& rFunction,
OUString
aFunctionName
=
m_aPrefix
;
OUString
aFunctionName
=
m_aPrefix
;
aFunctionName
+=
rFunction
;
aFunctionName
+=
rFunction
;
sal_Bool
bSetRescheduleBack
=
sal_F
alse
;
bool
bSetRescheduleBack
=
f
alse
;
sal_Bool
bOldReschedule
=
sal_True
;
sal_Bool
bOldReschedule
=
sal_True
;
SbiInstance
*
pInst
=
GetSbData
()
->
pInst
;
SbiInstance
*
pInst
=
GetSbData
()
->
pInst
;
if
(
pInst
&&
pInst
->
IsCompatibility
()
)
if
(
pInst
&&
pInst
->
IsCompatibility
()
)
...
@@ -4505,7 +4505,7 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const OUString& rFunction,
...
@@ -4505,7 +4505,7 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const OUString& rFunction,
if
(
bOldReschedule
)
if
(
bOldReschedule
)
{
{
pInst
->
EnableReschedule
(
sal_False
);
pInst
->
EnableReschedule
(
sal_False
);
bSetRescheduleBack
=
sal_T
rue
;
bSetRescheduleBack
=
t
rue
;
}
}
}
}
...
@@ -5002,7 +5002,7 @@ OUString SbUnoStructRefObject::Impl_DumpProperties()
...
@@ -5002,7 +5002,7 @@ OUString SbUnoStructRefObject::Impl_DumpProperties()
// Is it in Uno a sequence?
// Is it in Uno a sequence?
SbxDataType
eType
=
pVar
->
GetFullType
();
SbxDataType
eType
=
pVar
->
GetFullType
();
sal_Bool
bMaybeVoid
=
sal_F
alse
;
bool
bMaybeVoid
=
f
alse
;
OUString
aName
(
pVar
->
GetName
()
);
OUString
aName
(
pVar
->
GetName
()
);
StructFieldInfo
::
iterator
it
=
maFields
.
find
(
aName
);
StructFieldInfo
::
iterator
it
=
maFields
.
find
(
aName
);
...
...
basic/source/sbx/sbxobj.cxx
Dosyayı görüntüle @
d57010fa
...
@@ -592,12 +592,12 @@ void SbxObject::Remove( SbxVariable* pVar )
...
@@ -592,12 +592,12 @@ void SbxObject::Remove( SbxVariable* pVar )
}
}
}
}
static
sal_B
ool
LoadArray
(
SvStream
&
rStrm
,
SbxObject
*
pThis
,
SbxArray
*
pArray
)
static
b
ool
LoadArray
(
SvStream
&
rStrm
,
SbxObject
*
pThis
,
SbxArray
*
pArray
)
{
{
SbxArrayRef
p
=
(
SbxArray
*
)
SbxBase
::
Load
(
rStrm
);
SbxArrayRef
p
=
(
SbxArray
*
)
SbxBase
::
Load
(
rStrm
);
if
(
!
p
.
Is
()
)
if
(
!
p
.
Is
()
)
{
{
return
sal_F
alse
;
return
f
alse
;
}
}
for
(
sal_uInt16
i
=
0
;
i
<
p
->
Count
();
i
++
)
for
(
sal_uInt16
i
=
0
;
i
<
p
->
Count
();
i
++
)
{
{
...
@@ -610,7 +610,7 @@ static sal_Bool LoadArray( SvStream& rStrm, SbxObject* pThis, SbxArray* pArray )
...
@@ -610,7 +610,7 @@ static sal_Bool LoadArray( SvStream& rStrm, SbxObject* pThis, SbxArray* pArray )
}
}
}
}
pArray
->
Merge
(
p
);
pArray
->
Merge
(
p
);
return
sal_T
rue
;
return
t
rue
;
}
}
// The load of an object is additive!
// The load of an object is additive!
...
@@ -758,7 +758,7 @@ OUString SbxObject::GenerateSource( const OUString &rLinePrefix,
...
@@ -758,7 +758,7 @@ OUString SbxObject::GenerateSource( const OUString &rLinePrefix,
return
aSource
;
return
aSource
;
}
}
static
sal_B
ool
CollectAttrs
(
const
SbxBase
*
p
,
OUString
&
rRes
)
static
b
ool
CollectAttrs
(
const
SbxBase
*
p
,
OUString
&
rRes
)
{
{
OUString
aAttrs
;
OUString
aAttrs
;
if
(
p
->
IsHidden
()
)
if
(
p
->
IsHidden
()
)
...
@@ -794,12 +794,12 @@ static sal_Bool CollectAttrs( const SbxBase* p, OUString& rRes )
...
@@ -794,12 +794,12 @@ static sal_Bool CollectAttrs( const SbxBase* p, OUString& rRes )
rRes
=
" ("
;
rRes
=
" ("
;
rRes
+=
aAttrs
;
rRes
+=
aAttrs
;
rRes
+=
")"
;
rRes
+=
")"
;
return
sal_T
rue
;
return
t
rue
;
}
}
else
else
{
{
rRes
=
""
;
rRes
=
""
;
return
sal_F
alse
;
return
f
alse
;
}
}
}
}
...
...
basic/source/sbx/sbxvalue.cxx
Dosyayı görüntüle @
d57010fa
...
@@ -191,7 +191,7 @@ void SbxValue::Clear()
...
@@ -191,7 +191,7 @@ void SbxValue::Clear()
{
{
SAL_WARN
(
"basic.sbx"
,
"Not at Parent-Prop - otherwise CyclicRef"
);
SAL_WARN
(
"basic.sbx"
,
"Not at Parent-Prop - otherwise CyclicRef"
);
SbxVariable
*
pThisVar
=
PTR_CAST
(
SbxVariable
,
this
);
SbxVariable
*
pThisVar
=
PTR_CAST
(
SbxVariable
,
this
);
sal_B
ool
bParentProp
=
pThisVar
&&
5345
==
b
ool
bParentProp
=
pThisVar
&&
5345
==
(
(
sal_Int16
)
(
pThisVar
->
GetUserData
()
&
0xFFFF
)
);
(
(
sal_Int16
)
(
pThisVar
->
GetUserData
()
&
0xFFFF
)
);
if
(
!
bParentProp
)
if
(
!
bParentProp
)
aData
.
pObj
->
ReleaseRef
();
aData
.
pObj
->
ReleaseRef
();
...
@@ -540,7 +540,7 @@ sal_Bool SbxValue::Put( const SbxValues& rVal )
...
@@ -540,7 +540,7 @@ sal_Bool SbxValue::Put( const SbxValues& rVal )
}
}
SAL_WARN
(
"basic.sbx"
,
"Not at Parent-Prop - otherwise CyclicRef"
);
SAL_WARN
(
"basic.sbx"
,
"Not at Parent-Prop - otherwise CyclicRef"
);
SbxVariable
*
pThisVar
=
PTR_CAST
(
SbxVariable
,
this
);
SbxVariable
*
pThisVar
=
PTR_CAST
(
SbxVariable
,
this
);
sal_B
ool
bParentProp
=
pThisVar
&&
5345
==
b
ool
bParentProp
=
pThisVar
&&
5345
==
(
(
sal_Int16
)
(
pThisVar
->
GetUserData
()
&
0xFFFF
)
);
(
(
sal_Int16
)
(
pThisVar
->
GetUserData
()
&
0xFFFF
)
);
if
(
!
bParentProp
)
if
(
!
bParentProp
)
p
->
aData
.
pObj
->
AddRef
();
p
->
aData
.
pObj
->
AddRef
();
...
@@ -809,7 +809,7 @@ sal_Bool SbxValue::SetType( SbxDataType t )
...
@@ -809,7 +809,7 @@ sal_Bool SbxValue::SetType( SbxDataType t )
:
0
;
:
0
;
DBG_ASSERT
(
nSlotId
!=
5345
||
pThisVar
->
GetName
().
equalsAscii
(
"Parent"
),
DBG_ASSERT
(
nSlotId
!=
5345
||
pThisVar
->
GetName
().
equalsAscii
(
"Parent"
),
"SID_PARENTOBJECT is not named 'Parent'"
);
"SID_PARENTOBJECT is not named 'Parent'"
);
sal_B
ool
bParentProp
=
5345
==
nSlotId
;
b
ool
bParentProp
=
5345
==
nSlotId
;
if
(
!
bParentProp
)
if
(
!
bParentProp
)
aData
.
pObj
->
ReleaseRef
();
aData
.
pObj
->
ReleaseRef
();
}
}
...
...
basic/source/uno/scriptcont.cxx
Dosyayı görüntüle @
d57010fa
...
@@ -466,8 +466,8 @@ void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString&
...
@@ -466,8 +466,8 @@ void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString&
// Library must be loaded
// Library must be loaded
loadLibrary
(
Name
);
loadLibrary
(
Name
);
sal_Bool
bKillCryptedFiles
=
sal_F
alse
;
bool
bKillCryptedFiles
=
f
alse
;
sal_Bool
bKillUncryptedFiles
=
sal_F
alse
;
bool
bKillUncryptedFiles
=
f
alse
;
// Remove or change password?
// Remove or change password?
if
(
bOldPassword
)
if
(
bOldPassword
)
...
@@ -503,7 +503,7 @@ void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString&
...
@@ -503,7 +503,7 @@ void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString&
// Store application basic uncrypted
// Store application basic uncrypted
uno
::
Reference
<
embed
::
XStorage
>
xStorage
;
uno
::
Reference
<
embed
::
XStorage
>
xStorage
;
storeLibraries_Impl
(
xStorage
,
false
);
storeLibraries_Impl
(
xStorage
,
false
);
bKillCryptedFiles
=
sal_T
rue
;
bKillCryptedFiles
=
t
rue
;
}
}
}
}
}
}
...
@@ -523,7 +523,7 @@ void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString&
...
@@ -523,7 +523,7 @@ void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString&
// Store applictaion basic crypted
// Store applictaion basic crypted
uno
::
Reference
<
embed
::
XStorage
>
xStorage
;
uno
::
Reference
<
embed
::
XStorage
>
xStorage
;
storeLibraries_Impl
(
xStorage
,
false
);
storeLibraries_Impl
(
xStorage
,
false
);
bKillUncryptedFiles
=
sal_T
rue
;
bKillUncryptedFiles
=
t
rue
;
}
}
}
}
...
@@ -913,10 +913,10 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
...
@@ -913,10 +913,10 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
pScriptLib
->
mbLoadedBinary
=
true
;
pScriptLib
->
mbLoadedBinary
=
true
;
}
}
sal_Bool
bLoadSource
=
sal_F
alse
;
bool
bLoadSource
=
f
alse
;
if
(
!
pScriptLib
->
mbLoadedSource
&&
pLib
->
mbPasswordVerified
&&
!
bVerifyPasswordOnly
)
if
(
!
pScriptLib
->
mbLoadedSource
&&
pLib
->
mbPasswordVerified
&&
!
bVerifyPasswordOnly
)
{
{
bLoadSource
=
sal_T
rue
;
bLoadSource
=
t
rue
;
pScriptLib
->
mbLoadedSource
=
true
;
pScriptLib
->
mbLoadedSource
=
true
;
}
}
...
...
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