diff options
author | Alexandre Fournier <fou@leila.(none)> | 2010-11-06 01:33:05 +0100 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-11-06 18:21:27 -0500 |
commit | a93c9517dc52b1d9c22a0e69f9d92c119983f7fe (patch) | |
tree | 10d0f65563b4c93e9532ad2b2e351f60022a17c4 /starmath/source/cfgitem.cxx | |
parent | c27759cbf40a99632112cf2e2d21d64f2d3ae749 (diff) |
Removes a fair amount of BOOL variables in starmath
I uses the native bool type instead.
Some signatures containing BOOL have been left untouched when belonging to an inheritance hierarchy beyond the scope of starmath
Diffstat (limited to 'starmath/source/cfgitem.cxx')
-rw-r--r-- | starmath/source/cfgitem.cxx | 128 |
1 files changed, 64 insertions, 64 deletions
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index 10148c9d39eb..fabbed54eb8d 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -202,13 +202,13 @@ struct SmCfgOther { SmPrintSize ePrintSize; USHORT nPrintZoomFactor; - BOOL bPrintTitle; - BOOL bPrintFormulaText; - BOOL bPrintFrame; - BOOL bIgnoreSpacesRight; - BOOL bToolboxVisible; - BOOL bAutoRedraw; - BOOL bFormulaCursor; + bool bPrintTitle; + bool bPrintFormulaText; + bool bPrintFrame; + bool bIgnoreSpacesRight; + bool bToolboxVisible; + bool bAutoRedraw; + bool bFormulaCursor; SmCfgOther(); }; @@ -221,7 +221,7 @@ SmCfgOther::SmCfgOther() bPrintTitle = bPrintFormulaText = bPrintFrame = bIgnoreSpacesRight = bToolboxVisible = bAutoRedraw = - bFormulaCursor = TRUE; + bFormulaCursor = true; } ///////////////////////////////////////////////////////////////// @@ -262,7 +262,7 @@ const Font SmFontFormat::GetFont() const } -BOOL SmFontFormat::operator == ( const SmFontFormat &rFntFmt ) const +bool SmFontFormat::operator == ( const SmFontFormat &rFntFmt ) const { return aName == rFntFmt.aName && nCharSet == rFntFmt.nCharSet && @@ -284,7 +284,7 @@ SmFntFmtListEntry::SmFntFmtListEntry( const String &rId, const SmFontFormat &rFn SmFontFormatList::SmFontFormatList() { - bModified = FALSE; + bModified = false; } @@ -294,7 +294,7 @@ void SmFontFormatList::Clear() if (nCnt) { aEntries.Remove( 0, nCnt ); - SetModified( TRUE ); + SetModified( true ); } } @@ -308,7 +308,7 @@ void SmFontFormatList::AddFontFormat( const String &rFntFmtId, { SmFntFmtListEntry aEntry( rFntFmtId, rFntFmt ); aEntries.Insert( aEntry, aEntries.Count() ); - SetModified( TRUE ); + SetModified( true ); } } @@ -329,7 +329,7 @@ void SmFontFormatList::RemoveFontFormat( const String &rFntFmtId ) if (nPos != 0xFFFF) { aEntries.Remove( nPos ); - SetModified( TRUE ); + SetModified( true ); } } @@ -376,7 +376,7 @@ const String SmFontFormatList::GetFontFormatId( const SmFontFormat &rFntFmt ) co } -const String SmFontFormatList::GetFontFormatId( const SmFontFormat &rFntFmt, BOOL bAdd ) +const String SmFontFormatList::GetFontFormatId( const SmFontFormat &rFntFmt, bool bAdd ) { String aRes( GetFontFormatId( rFntFmt) ); if (0 == aRes.Len() && bAdd) @@ -427,7 +427,7 @@ SmMathConfig::SmMathConfig() : pFontFormatList = 0; pSymbolMgr = 0; - bIsOtherModified = bIsFormatModified = FALSE; + bIsOtherModified = bIsFormatModified = false; } @@ -441,19 +441,19 @@ SmMathConfig::~SmMathConfig() } -void SmMathConfig::SetOtherModified( BOOL bVal ) +void SmMathConfig::SetOtherModified( bool bVal ) { bIsOtherModified = bVal; } -void SmMathConfig::SetFormatModified( BOOL bVal ) +void SmMathConfig::SetFormatModified( bool bVal ) { bIsFormatModified = bVal; } -void SmMathConfig::SetFontFormatListModified( BOOL bVal ) +void SmMathConfig::SetFontFormatListModified( bool bVal ) { if (pFontFormatList) pFontFormatList->SetModified( bVal ); @@ -488,27 +488,27 @@ void SmMathConfig::ReadSymbol( SmSym &rSymbol, Font aFont; sal_Unicode cChar = '\0'; String aSet; - BOOL bPredefined = FALSE; + bool bPredefined = false; OUString aTmpStr; INT32 nTmp32 = 0; - BOOL bTmp = FALSE; + bool bTmp = false; - BOOL bOK = TRUE; + bool bOK = true; if (pValue->hasValue() && (*pValue >>= nTmp32)) cChar = (sal_Unicode) nTmp32; else - bOK = FALSE; + bOK = false; ++pValue; if (pValue->hasValue() && (*pValue >>= aTmpStr)) aSet = aTmpStr; else - bOK = FALSE; + bOK = false; ++pValue; if (pValue->hasValue() && (*pValue >>= bTmp)) bPredefined = bTmp; else - bOK = FALSE; + bOK = false; ++pValue; if (pValue->hasValue() && (*pValue >>= aTmpStr)) { @@ -518,7 +518,7 @@ void SmMathConfig::ReadSymbol( SmSym &rSymbol, aFont = pFntFmt->GetFont(); } else - bOK = FALSE; + bOK = false; ++pValue; if (bOK) @@ -636,7 +636,7 @@ void SmMathConfig::SetSymbols( const std::vector< SmSym > &rNewSymbols ) pVal++; // FontFormatId SmFontFormat aFntFmt( rSymbol.GetFace() ); - String aFntFmtId( GetFontFormatList().GetFontFormatId( aFntFmt, TRUE ) ); + String aFntFmtId( GetFontFormatList().GetFontFormatId( aFntFmt, true ) ); OSL_ENSURE( aFntFmtId.Len(), "FontFormatId not found" ); pVal->Name = aNodeNameDelim; pVal->Name += *pName++; @@ -683,7 +683,7 @@ void SmMathConfig::LoadFontFormatList() pFontFormatList->AddFontFormat( pNode[i], aFntFmt ); } } - pFontFormatList->SetModified( FALSE ); + pFontFormatList->SetModified( false ); } @@ -715,36 +715,36 @@ void SmMathConfig::ReadFontFormat( SmFontFormat &rFontFormat, OUString aTmpStr; INT16 nTmp16 = 0; - BOOL bOK = TRUE; + bool bOK = true; if (pValue->hasValue() && (*pValue >>= aTmpStr)) rFontFormat.aName = aTmpStr; else - bOK = FALSE; + bOK = false; ++pValue; if (pValue->hasValue() && (*pValue >>= nTmp16)) rFontFormat.nCharSet = nTmp16; // 6.0 file-format GetSOLoadTextEncoding not needed else - bOK = FALSE; + bOK = false; ++pValue; if (pValue->hasValue() && (*pValue >>= nTmp16)) rFontFormat.nFamily = nTmp16; else - bOK = FALSE; + bOK = false; ++pValue; if (pValue->hasValue() && (*pValue >>= nTmp16)) rFontFormat.nPitch = nTmp16; else - bOK = FALSE; + bOK = false; ++pValue; if (pValue->hasValue() && (*pValue >>= nTmp16)) rFontFormat.nWeight = nTmp16; else - bOK = FALSE; + bOK = false; ++pValue; if (pValue->hasValue() && (*pValue >>= nTmp16)) rFontFormat.nItalic = nTmp16; else - bOK = FALSE; + bOK = false; ++pValue; OSL_ENSURE( bOK, "read FontFormat failed" ); @@ -815,7 +815,7 @@ void SmMathConfig::SaveFontFormatList() OSL_ENSURE( pVal - pValues == nCount * nSymbolProps, "properties missing" ); ReplaceSetProperties( A2OU( FONT_FORMAT_LIST ) , aValues ); - rFntFmtList.SetModified( FALSE ); + rFntFmtList.SetModified( false ); } @@ -830,12 +830,12 @@ void SmMathConfig::StripFontFormatList( const std::vector< SmSym > &rSymbols ) for (i = 0; i < nCount; ++i) { OSL_ENSURE( rSymbols[i].GetName().Len() > 0, "non named symbol" ); - aUsedList.GetFontFormatId( SmFontFormat( rSymbols[i].GetFace() ) , TRUE ); + aUsedList.GetFontFormatId( SmFontFormat( rSymbols[i].GetFace() ) , true ); } const SmFormat & rStdFmt = GetStandardFormat(); for (i = FNT_BEGIN; i <= FNT_END; ++i) { - aUsedList.GetFontFormatId( SmFontFormat( rStdFmt.GetFont( i ) ) , TRUE ); + aUsedList.GetFontFormatId( SmFontFormat( rStdFmt.GetFont( i ) ) , true ); } // remove unused font-formats from list @@ -876,7 +876,7 @@ void SmMathConfig::LoadOther() const Any *pVal = pValues; INT16 nTmp16 = 0; - BOOL bTmp = FALSE; + bool bTmp = false; // Print/Title if (pVal->hasValue() && (*pVal >>= bTmp)) @@ -916,7 +916,7 @@ void SmMathConfig::LoadOther() ++pVal; OSL_ENSURE( pVal - pValues == nProps, "property mismatch" ); - SetOtherModified( FALSE ); + SetOtherModified( false ); } } @@ -955,7 +955,7 @@ void SmMathConfig::SaveOther() OSL_ENSURE( pValue - pValues == nProps, "property mismatch" ); PutProperties( aNames , aValues ); - SetOtherModified( FALSE ); + SetOtherModified( false ); } void SmMathConfig::LoadFormat() @@ -975,7 +975,7 @@ void SmMathConfig::LoadFormat() OUString aTmpStr; INT16 nTmp16 = 0; - BOOL bTmp = FALSE; + bool bTmp = false; // StandardFormat/Textmode if (pVal->hasValue() && (*pVal >>= bTmp)) @@ -1017,7 +1017,7 @@ void SmMathConfig::LoadFormat() for (i = FNT_BEGIN; i < FNT_END; ++i) { Font aFnt; - BOOL bUseDefaultFont = TRUE; + bool bUseDefaultFont = true; if (pVal->hasValue() && (*pVal >>= aTmpStr)) { bUseDefaultFont = 0 == aTmpStr.getLength(); @@ -1041,7 +1041,7 @@ void SmMathConfig::LoadFormat() } OSL_ENSURE( pVal - pValues == nProps, "property mismatch" ); - SetFormatModified( FALSE ); + SetFormatModified( false ); } } @@ -1084,7 +1084,7 @@ void SmMathConfig::SaveFormat() if (!pFormat->IsDefaultFont( i )) { SmFontFormat aFntFmt( pFormat->GetFont( i ) ); - aFntFmtId = GetFontFormatList().GetFontFormatId( aFntFmt, TRUE ); + aFntFmtId = GetFontFormatList().GetFontFormatId( aFntFmt, true ); OSL_ENSURE( aFntFmtId.getLength(), "FontFormatId not found" ); } @@ -1094,7 +1094,7 @@ void SmMathConfig::SaveFormat() OSL_ENSURE( pValue - pValues == nProps, "property mismatch" ); PutProperties( aNames , aValues ); - SetFormatModified( FALSE ); + SetFormatModified( false ); } @@ -1106,20 +1106,20 @@ const SmFormat & SmMathConfig::GetStandardFormat() const } -void SmMathConfig::SetStandardFormat( const SmFormat &rFormat, BOOL bSaveFontFormatList ) +void SmMathConfig::SetStandardFormat( const SmFormat &rFormat, bool bSaveFontFormatList ) { if (!pFormat) LoadFormat(); if (rFormat != *pFormat) { *pFormat = rFormat; - SetFormatModified( TRUE ); + SetFormatModified( true ); SaveFormat(); if (bSaveFontFormatList) { // needed for SmFontTypeDialog's DefaultButtonClickHdl - SetFontFormatListModified( TRUE ); + SetFontFormatListModified( true ); SaveFontFormatList(); } } @@ -1141,7 +1141,7 @@ void SmMathConfig::SetPrintSize( SmPrintSize eSize ) if (eSize != pOther->ePrintSize) { pOther->ePrintSize = eSize; - SetOtherModified( TRUE ); + SetOtherModified( true ); } } @@ -1161,22 +1161,22 @@ void SmMathConfig::SetPrintZoomFactor( USHORT nVal ) if (nVal != pOther->nPrintZoomFactor) { pOther->nPrintZoomFactor = nVal; - SetOtherModified( TRUE ); + SetOtherModified( true ); } } -void SmMathConfig::SetOtherIfNotEqual( BOOL &rbItem, BOOL bNewVal ) +void SmMathConfig::SetOtherIfNotEqual( bool &rbItem, bool bNewVal ) { if (bNewVal != rbItem) { rbItem = bNewVal; - SetOtherModified( TRUE ); + SetOtherModified( true ); } } -BOOL SmMathConfig::IsPrintTitle() const +bool SmMathConfig::IsPrintTitle() const { if (!pOther) ((SmMathConfig *) this)->LoadOther(); @@ -1184,7 +1184,7 @@ BOOL SmMathConfig::IsPrintTitle() const } -void SmMathConfig::SetPrintTitle( BOOL bVal ) +void SmMathConfig::SetPrintTitle( bool bVal ) { if (!pOther) LoadOther(); @@ -1192,7 +1192,7 @@ void SmMathConfig::SetPrintTitle( BOOL bVal ) } -BOOL SmMathConfig::IsPrintFormulaText() const +bool SmMathConfig::IsPrintFormulaText() const { if (!pOther) ((SmMathConfig *) this)->LoadOther(); @@ -1200,7 +1200,7 @@ BOOL SmMathConfig::IsPrintFormulaText() const } -void SmMathConfig::SetPrintFormulaText( BOOL bVal ) +void SmMathConfig::SetPrintFormulaText( bool bVal ) { if (!pOther) LoadOther(); @@ -1208,7 +1208,7 @@ void SmMathConfig::SetPrintFormulaText( BOOL bVal ) } -BOOL SmMathConfig::IsPrintFrame() const +bool SmMathConfig::IsPrintFrame() const { if (!pOther) ((SmMathConfig *) this)->LoadOther(); @@ -1216,7 +1216,7 @@ BOOL SmMathConfig::IsPrintFrame() const } -void SmMathConfig::SetPrintFrame( BOOL bVal ) +void SmMathConfig::SetPrintFrame( bool bVal ) { if (!pOther) LoadOther(); @@ -1224,7 +1224,7 @@ void SmMathConfig::SetPrintFrame( BOOL bVal ) } -BOOL SmMathConfig::IsIgnoreSpacesRight() const +bool SmMathConfig::IsIgnoreSpacesRight() const { if (!pOther) ((SmMathConfig *) this)->LoadOther(); @@ -1232,7 +1232,7 @@ BOOL SmMathConfig::IsIgnoreSpacesRight() const } -void SmMathConfig::SetIgnoreSpacesRight( BOOL bVal ) +void SmMathConfig::SetIgnoreSpacesRight( bool bVal ) { if (!pOther) LoadOther(); @@ -1240,7 +1240,7 @@ void SmMathConfig::SetIgnoreSpacesRight( BOOL bVal ) } -BOOL SmMathConfig::IsAutoRedraw() const +bool SmMathConfig::IsAutoRedraw() const { if (!pOther) ((SmMathConfig *) this)->LoadOther(); @@ -1248,7 +1248,7 @@ BOOL SmMathConfig::IsAutoRedraw() const } -void SmMathConfig::SetAutoRedraw( BOOL bVal ) +void SmMathConfig::SetAutoRedraw( bool bVal ) { if (!pOther) LoadOther(); @@ -1256,7 +1256,7 @@ void SmMathConfig::SetAutoRedraw( BOOL bVal ) } -BOOL SmMathConfig::IsShowFormulaCursor() const +bool SmMathConfig::IsShowFormulaCursor() const { if (!pOther) ((SmMathConfig *) this)->LoadOther(); @@ -1264,7 +1264,7 @@ BOOL SmMathConfig::IsShowFormulaCursor() const } -void SmMathConfig::SetShowFormulaCursor( BOOL bVal ) +void SmMathConfig::SetShowFormulaCursor( bool bVal ) { if (!pOther) LoadOther(); |