Kaydet (Commit) 43b98980 authored tarafından Takeshi Abe's avatar Takeshi Abe

sal_Bool to bool

Change-Id: I4ab448a461a9fe37ba18838357d371f71b0a496c
üst 92d18638
......@@ -111,7 +111,7 @@ struct GroupIDToCommandGroup
// Please update when a new command group is added
const sal_Int16 MAX_COMMANDGROUP = frame::CommandGroup::CONTROLS;
static sal_Bool bGroupIDMapInitialized = sal_False;
static bool bGroupIDMapInitialized = false;
static GroupIDToCommandGroup GroupIDCommandGroupMap[] =
{
{ GID_INTERN , frame::CommandGroup::INTERNAL },
......@@ -160,7 +160,7 @@ sal_Int16 MapGroupIDToCommandGroup( sal_Int16 nGroupID )
GroupIDCommandGroupMap[i].nCommandGroup ));
++i;
}
bGroupIDMapInitialized = sal_True;
bGroupIDMapInitialized = true;
}
GroupHashMap::const_iterator pIter = mHashMap.find( nGroupID );
......@@ -281,7 +281,7 @@ void SAL_CALL SfxStatusIndicator::setValue( sal_Int32 nValue ) throw(RuntimeExce
if ( xProgress.is() )
xProgress->setValue( nValue );
sal_Bool bReschedule = (( Get10ThSec() - _nStartTime ) > TIMEOUT_START_RESCHEDULE );
bool bReschedule = (( Get10ThSec() - _nStartTime ) > TIMEOUT_START_RESCHEDULE );
if ( bReschedule )
reschedule();
}
......@@ -400,7 +400,7 @@ struct IMPL_SfxBaseController_DataContainer
Reference< XStatusIndicator > m_xIndicator ;
SfxViewShell* m_pViewShell ;
SfxBaseController* m_pController ;
sal_Bool m_bDisposing ;
bool m_bDisposing ;
sal_Bool m_bSuspendState ;
Reference< XTitle > m_xTitleHelper ;
Sequence< PropertyValue > m_aCreationArgs ;
......@@ -415,7 +415,7 @@ struct IMPL_SfxBaseController_DataContainer
, m_aInterceptorContainer ( aMutex )
, m_pViewShell ( pViewShell )
, m_pController ( pController )
, m_bDisposing ( sal_False )
, m_bDisposing ( false )
, m_bSuspendState ( sal_False )
{
}
......@@ -631,7 +631,7 @@ sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( Runtime
// More Views on the same document?
SfxObjectShell* pDocShell = m_pData->m_pViewShell->GetObjectShell() ;
sal_Bool bOther = sal_False ;
bool bOther = false ;
for ( const SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell ); !bOther && pFrame; pFrame = SfxViewFrame::GetNext( *pFrame, pDocShell ) )
bOther = (pFrame != pActFrame);
......@@ -974,7 +974,7 @@ void SAL_CALL SfxBaseController::dispose() throw( RuntimeException )
{
SolarMutexGuard aGuard;
Reference< XController > xTmp( this );
m_pData->m_bDisposing = sal_True ;
m_pData->m_bDisposing = true ;
lang::EventObject aEventObject;
aEventObject.Source = *this ;
......
......@@ -106,7 +106,7 @@ sal_uLong SmXMLImportWrapper::Import(SfxMedium &rMedium)
// try to get an XStatusIndicator from the Medium
uno::Reference<task::XStatusIndicator> xStatusIndicator;
sal_Bool bEmbedded = sal_False;
bool bEmbedded = false;
uno::Reference <lang::XUnoTunnel> xTunnel;
xTunnel = uno::Reference <lang::XUnoTunnel> (xModel,uno::UNO_QUERY);
SmModel *pModel = reinterpret_cast<SmModel *>
......@@ -129,7 +129,7 @@ sal_uLong SmXMLImportWrapper::Import(SfxMedium &rMedium)
}
if ( SFX_CREATE_MODE_EMBEDDED == pDocShell->GetCreateMode() )
bEmbedded = sal_True;
bEmbedded = true;
}
comphelper::PropertyMapEntry aInfoMap[] =
......@@ -191,7 +191,7 @@ sal_uLong SmXMLImportWrapper::Import(SfxMedium &rMedium)
}
}
sal_Bool bOASIS = ( SotStorage::GetVersion( rMedium.GetStorage() ) > SOFFICE_FILEFORMAT_60 );
bool bOASIS = ( SotStorage::GetVersion( rMedium.GetStorage() ) > SOFFICE_FILEFORMAT_60 );
if (xStatusIndicator.is())
xStatusIndicator->setValue(nSteps++);
......@@ -305,7 +305,7 @@ sal_uLong SmXMLImportWrapper::ReadThroughComponent(
// sax parser sends wrapped exceptions,
// try to find the original one
xml::sax::SAXException aSaxEx = *(xml::sax::SAXException*)(&r);
sal_Bool bTryChild = sal_True;
bool bTryChild = true;
while( bTryChild )
{
......@@ -313,7 +313,7 @@ sal_uLong SmXMLImportWrapper::ReadThroughComponent(
if ( aSaxEx.WrappedException >>= aTmp )
aSaxEx = aTmp;
else
bTryChild = sal_False;
bTryChild = false;
}
packages::zip::ZipIOException aBrokenPackage;
......@@ -635,7 +635,7 @@ struct SmXMLContext_Helper
sal_Int8 nIsBold;
sal_Int8 nIsItalic;
double nFontSize;
sal_Bool bFontNodeNeeded;
bool bFontNodeNeeded;
OUString sFontFamily;
OUString sColor;
......@@ -702,9 +702,9 @@ void SmXMLContext_Helper::RetrieveAttrs(const uno::Reference<
if ((nOldIsBold!=nIsBold) || (nOldIsItalic!=nIsItalic) ||
(nOldFontSize!=nFontSize) || (sOldFontFamily!=sFontFamily)
|| !sColor.isEmpty())
bFontNodeNeeded=sal_True;
bFontNodeNeeded=true;
else
bFontNodeNeeded=sal_False;
bFontNodeNeeded=false;
}
void SmXMLContext_Helper::ApplyAttrs()
......@@ -1152,12 +1152,12 @@ void SmXMLNumberContext_Impl::EndElement()
class SmXMLAnnotationContext_Impl : public SmXMLImportContext
{
sal_Bool bIsStarMath;
bool bIsStarMath;
public:
SmXMLAnnotationContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,
const OUString& rLName)
: SmXMLImportContext(rImport,nPrefix,rLName), bIsStarMath(sal_False) {}
: SmXMLImportContext(rImport,nPrefix,rLName), bIsStarMath(false) {}
virtual void Characters(const OUString &rChars);
......@@ -1320,9 +1320,9 @@ void SmXMLIdentifierContext_Impl::EndElement()
if ((-1!=aStyleHelper.nIsBold) || (0.0!=aStyleHelper.nFontSize) ||
(!aStyleHelper.sFontFamily.isEmpty()) ||
!aStyleHelper.sColor.isEmpty())
aStyleHelper.bFontNodeNeeded=sal_True;
aStyleHelper.bFontNodeNeeded=true;
else
aStyleHelper.bFontNodeNeeded=sal_False;
aStyleHelper.bFontNodeNeeded=false;
if (aStyleHelper.bFontNodeNeeded)
aStyleHelper.ApplyAttrs();
GetSmImport().GetNodeStack().push(pNode);
......@@ -1337,7 +1337,7 @@ void SmXMLIdentifierContext_Impl::TCharacters(const OUString &rChars)
class SmXMLOperatorContext_Impl : public SmXMLImportContext
{
sal_Bool bIsStretchy;
bool bIsStretchy;
protected:
SmToken aToken;
......@@ -1345,7 +1345,7 @@ protected:
public:
SmXMLOperatorContext_Impl(SmXMLImport &rImport,sal_uInt16 nPrefix,
const OUString& rLName)
: SmXMLImportContext(rImport,nPrefix,rLName), bIsStretchy(sal_False)
: SmXMLImportContext(rImport,nPrefix,rLName), bIsStretchy(false)
{
aToken.eType = TSPECIAL;
aToken.nLevel = 5;
......
......@@ -876,7 +876,7 @@ InvocationInfo SAL_CALL Invocation_Impl::getInfoForName( const OUString& aName,
return _xDirect2->getInfoForName( aName, bExact );
}
sal_Bool bFound = sal_False;
bool bFound = false;
OUString aExactName = aName;
InvocationInfo aRetInfo;
......@@ -889,7 +889,7 @@ InvocationInfo SAL_CALL Invocation_Impl::getInfoForName( const OUString& aName,
Reference<XIdlMethod> xMethod = _xIntrospectionAccess->getMethod
( aExactName, MethodConcept::ALL ^ MethodConcept::DANGEROUS );
fillInfoForMethod( aRetInfo, xMethod );
bFound = sal_True;
bFound = true;
}
else
{
......@@ -899,13 +899,13 @@ InvocationInfo SAL_CALL Invocation_Impl::getInfoForName( const OUString& aName,
Property aProp = _xIntrospectionAccess->getProperty
( aExactName, PropertyConcept::ALL ^ PropertyConcept::DANGEROUS );
fillInfoForProperty( aRetInfo, aProp );
bFound = sal_True;
bFound = true;
}
// NameAccess
else if( _xNameAccess.is() && _xNameAccess->hasByName( aExactName ) )
{
fillInfoForNameAccess( aRetInfo, aExactName );
bFound = sal_True;
bFound = true;
}
}
}
......
......@@ -229,7 +229,7 @@ static inline void constructRuntimeException(
}
//------------------------------------------------------------------------------
static inline sal_Bool type_equals(
static inline bool type_equals(
typelib_TypeDescriptionReference * pType1,
typelib_TypeDescriptionReference * pType2 )
SAL_THROW(())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment