diff options
73 files changed, 195 insertions, 195 deletions
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx index 0ba3dd92ac37..9d07d2829333 100644 --- a/UnoControls/source/base/basecontrol.cxx +++ b/UnoControls/source/base/basecontrol.cxx @@ -464,7 +464,7 @@ void SAL_CALL BaseControl::setPosSize( sal_Int32 nX , // Ready for multithreading MutexGuard aGuard( m_aMutex ); - sal_Bool bChanged = sal_False ; + bool bChanged = false ; if ( nFlags & PosSize::X ) { diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 19dfa713e955..4d1be954f1f4 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -2066,7 +2066,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) sal_Int32 nStart = 0, nLocalIndex = 0; Sequence< OUString > aChange; - sal_Bool bChanged = sal_False; + bool bChanged = false; for(sal_uInt16 i = 0; i < aModulesCLB.GetEntryCount(); i++) { SvTreeListEntry *pEntry = aModulesCLB.GetEntry(i); @@ -2092,7 +2092,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) } nLocalIndex = nStart = 0; aChange.realloc(aModulesCLB.GetEntryCount()); - bChanged = sal_False; + bChanged = false; } else { diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 392ff4b7f7fb..73348d78f695 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -482,7 +482,7 @@ SfxTabPage* OfaSwAutoFmtOptionsPage::Create( Window* pParent, sal_Bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& ) { - sal_Bool bModified = sal_False; + bool bModified = false; SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect(); SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags(); long nFlags = pAutoCorrect->GetFlags(); @@ -1821,7 +1821,7 @@ sal_Bool OfaQuoteTabPage::FillItemSet( SfxItemSet& ) pAutoCorrect->SetAutoCorrFlag(ChgOrdinalNumber, m_pCheckLB->IsChecked(nPos++)); } - sal_Bool bModified = sal_False; + bool bModified = false; if (m_pSwCheckLB->IsVisible()) { SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags(); @@ -2163,7 +2163,7 @@ sal_Bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet& ) if (m_pAutoCompleteList && nAutoCmpltListCnt != aLBEntries.GetEntryCount()) { - bModified = sal_True; + bModified = true; pOpt->m_pAutoCompleteList = m_pAutoCompleteList; } if( bModified ) diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 6b27019b1e9b..065bee0663a4 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -233,7 +233,7 @@ void SvxGrfCropPage::Reset( const SfxItemSet &rSet ) sal_Bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet) { const SfxItemPool& rPool = *rSet.GetPool(); - sal_Bool bModified = sal_False; + bool bModified = false; if( m_pWidthMF->GetSavedValue() != m_pWidthMF->GetText() || m_pHeightMF->GetSavedValue() != m_pHeightMF->GetText() ) { diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 58130e2d5a61..5e5b40008646 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -141,9 +141,9 @@ static const sal_Unicode aBulletTypes[] = }; // Is one of the masked formats set? -static sal_Bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask) +static bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask) { - sal_Bool bRet = sal_False; + bool bRet = false; sal_uInt16 nMask = 1; for( sal_uInt16 i = 0; i < SVX_MAX_NUM && !bRet; i++ ) { @@ -1381,8 +1381,8 @@ void SvxNumOptionsTabPage::InitControls() bool bSamePrefix = true; bool bSameSuffix = true; bool bAllLevel = true; - sal_Bool bSameCharFmt = true; - sal_Bool bSameVOrient = true; + bool bSameCharFmt = true; + bool bSameVOrient = true; bool bSameSize = true; bool bSameBulColor = true; bool bSameBulRelSize= true; @@ -1694,7 +1694,7 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) { OUString sSelectStyle; sal_Bool bShowOrient = sal_False; - sal_Bool bBmp = sal_False; + bool bBmp = false; OUString aEmptyStr; sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 3fb49101039b..11157ca10499 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -730,11 +730,11 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) { bool bAnchorChanged = false; short nAnchor = GetAnchorType(&bAnchorChanged); - sal_Bool bModified = sal_False; + bool bModified = false; if(bAnchorChanged) { rSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_ANCHOR, nAnchor)); - bModified |= sal_True; + bModified = true; } if ( m_pPositionCB->GetState() != m_pPositionCB->GetSavedValue() ) { @@ -744,7 +744,7 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_POS ), m_pPositionCB->GetState() == STATE_CHECK ? sal_True : sal_False ) ); - bModified |= sal_True; + bModified = true; } if ( m_pSizeCB->GetState() != m_pSizeCB->GetSavedValue() ) @@ -755,7 +755,7 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_TRANSFORM_PROTECT_SIZE ), m_pSizeCB->GetState() == STATE_CHECK ? sal_True : sal_False ) ); - bModified |= sal_True; + bModified = true; } const SfxItemSet& rOldSet = GetItemSet(); @@ -782,7 +782,7 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) rSet.Put( SfxInt32Item( GetWhich( SID_ATTR_TRANSFORM_POS_X ), nHoriByPos ) ); rSet.Put( SfxInt32Item( GetWhich( SID_ATTR_TRANSFORM_POS_Y ), nVertByPos ) ); - bModified |= sal_True; + bModified = true; } } else @@ -811,7 +811,7 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) rSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_HORI_RELATION, nRel)); if(m_pHoriByMF->IsEnabled()) rSet.Put(SfxInt32Item(SID_ATTR_TRANSFORM_HORI_POSITION, nHoriByPos)); - bModified |= sal_True; + bModified = true; } } if(m_pHoriMirrorCB->IsEnabled() && m_pHoriMirrorCB->IsChecked() != m_pHoriMirrorCB->GetSavedValue()) @@ -846,7 +846,7 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) rSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_VERT_RELATION, nRel)); if(m_pVertByMF->IsEnabled()) rSet.Put(SfxInt32Item(SID_ATTR_TRANSFORM_VERT_POSITION, nVertByPos)); - bModified |= sal_True; + bModified = true; } } @@ -876,7 +876,7 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) //this item is required by SdrEditView::SetGeoAttrToMarked() rSet.Put( SfxAllEnumItem( GetWhich( SID_ATTR_TRANSFORM_SIZE_POINT ), RP_LT ) ); - bModified |= sal_True; + bModified = true; } return bModified; diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 087dbe49363a..e67c1220388b 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -2581,7 +2581,7 @@ bool SbaTableQueryBrowser::implSelect( SvTreeListEntry* _pEntry ) : CommandType::QUERY; // check if need to rebuild the rowset - sal_Bool bRebuild = ( xOldConnection != pConData->xConnection ) + bool bRebuild = ( xOldConnection != pConData->xConnection ) || ( nOldType != nCommandType ) || ( aName != aOldName ); @@ -3187,13 +3187,13 @@ void SbaTableQueryBrowser::impl_initialize() // should we display all registered databases in the left hand side tree? // or only *one* special? - sal_Bool bLimitedTreeEntries = sal_False; + bool bLimitedTreeEntries = false; // if we're part of a frame which is a secondary frame of a database document, then only // display the database for this document, not all registered ones bLimitedTreeEntries |= bSubFrameOfEmbeddedDocument; // if the tree view is not to be displayed at all, then only display the data source // which was given as initial selection - bLimitedTreeEntries |= ( m_bEnableBrowser != sal_True ); + bLimitedTreeEntries |= !m_bEnableBrowser; if ( bLimitedTreeEntries ) { diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index a805ddf13795..f3e46ec7a0a4 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -727,7 +727,7 @@ void OfficeIPCThread::execute() continue; } - sal_Bool bDocRequestSent = sal_False; + bool bDocRequestSent = false; OUString aUnknown( aCmdLineArgs->GetUnknown() ); if ( !aUnknown.isEmpty() || aCmdLineArgs->IsHelp() ) @@ -810,7 +810,7 @@ void OfficeIPCThread::execute() // we only do this if no document was specified on the command line, // since this would be inconsistent with the behaviour of // the first process, see OpenClients() (call to OpenDefault()) in app.cxx - if ( aCmdLineArgs->HasModuleParam() && (!bDocRequestSent) ) + if ( aCmdLineArgs->HasModuleParam() && !bDocRequestSent ) { SvtModuleOptions aOpt; SvtModuleOptions::EFactory eFactory = SvtModuleOptions::E_WRITER; @@ -835,7 +835,7 @@ void OfficeIPCThread::execute() pRequest->aModule = aOpt.GetFactoryName( eFactory ); else pRequest->aOpenList.push_back( aOpt.GetFactoryEmptyDocumentURL( eFactory ) ); - bDocRequestSent = sal_True; + bDocRequestSent = true; } } diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 3fc60b42688e..d569723b995f 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -327,7 +327,7 @@ ExtensionManager::getExtensionsWithSameIdentifier( ::std::list<Reference<css::deployment::XPackage> > listExtensions = getExtensionsWithSameId( identifier, fileName, xCmdEnv); - sal_Bool bHasExtension = false; + bool bHasExtension = false; //throw an IllegalArgumentException if there is no extension at all. typedef ::std::list<Reference<css::deployment::XPackage> >::const_iterator CIT; diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index 8c1510d15d11..9f42d6b7b855 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -486,7 +486,7 @@ namespace dbp //--------------------------------------------------------------------- void OLinkFieldsPage::implCheckFinish() { - sal_Bool bInvalidSelection = (COMBOBOX_ENTRY_NOTFOUND == m_aValueListField.GetEntryPos(m_aValueListField.GetText())); + bool bInvalidSelection = (COMBOBOX_ENTRY_NOTFOUND == m_aValueListField.GetEntryPos(m_aValueListField.GetText())); bInvalidSelection |= (COMBOBOX_ENTRY_NOTFOUND == m_aTableField.GetEntryPos(m_aTableField.GetText())); getDialog()->enableButtons(WZB_FINISH, !bInvalidSelection); } diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index 3e0d8d485837..a02b6a9c5c94 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -293,7 +293,7 @@ namespace frm // and an active command OUString sActiveCommand; m_xCursorProperties->getPropertyValue( PROPERTY_ACTIVECOMMAND ) >>= sActiveCommand; - aState.Enabled &= !sActiveCommand.isEmpty(); + aState.Enabled = aState.Enabled && !sActiveCommand.isEmpty(); } break; diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 3f96386c24a5..1627aa801336 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -286,7 +286,7 @@ sal_Bool SvMetaSlot::IsVariable() const sal_Bool SvMetaSlot::IsMethod() const { - sal_Bool b = SvMetaAttribute::IsMethod(); + bool b = SvMetaAttribute::IsMethod(); b |= NULL != GetMethod(); return b; } diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx index 0d8782b4977c..7eebf9b32740 100644 --- a/idl/source/prj/svidl.cxx +++ b/idl/source/prj/svidl.cxx @@ -238,7 +238,7 @@ int main ( int argc, char ** argv) if( nExit == 0 ) { - sal_Bool bErr = sal_False; + bool bErr = false; sal_Bool bDoMove = aCommand.aTargetFile.isEmpty(); OUString aErrFile, aErrFile2; if( !bErr && !aCommand.aListFile.isEmpty() ) diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 504366a98d8e..df78af3a4687 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1182,7 +1182,7 @@ public: ControlPart nPart, const Rectangle& rControlRegion, const Point& aPos, - sal_Bool& rIsInside ) const; + bool& rIsInside ) const; // Request rendering of a particular control and/or part sal_Bool DrawNativeControl( ControlType nType, diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index 0273ddd84e9d..458ebcd9eb1a 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -214,7 +214,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s sal_Int16 nINT16; double fDouble; OUString aString; - sal_Bool bError = false; + bool bError = false; sal_Bool bArrayFormula = false; TokenId nMerk0; const sal_Bool bRangeName = eFT == FT_RangeName; @@ -848,7 +848,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s }//END in current Workbook } break; - default: bError = sal_True; + default: bError = true; } bError |= !aIn.IsValid(); } @@ -903,7 +903,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal sal_Size nIgnore; sal_uInt16 nUINT16; sal_uInt8 nByte; - sal_Bool bError = false; + bool bError = false; const sal_Bool bRangeName = eFT == FT_RangeName; const sal_Bool bSharedFormula = eFT == FT_SharedFormula; const sal_Bool bRNorSF = bRangeName || bSharedFormula; @@ -1286,7 +1286,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal case 0x3D: // Deleted 3-D Area Reference [ 277] nIgnore = 20; break; - default: bError = sal_True; + default: bError = true; } bError |= !aIn.IsValid(); diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx index 9cc81da49fc2..8ec49043fea3 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -144,7 +144,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, sal_uInt16 nUINT16; double fDouble; OUString aString; - sal_Bool bError = false; + bool bError = false; sal_Bool bArrayFormula = false; TokenId nMerk0; const bool bCondFormat = eFT == FT_CondFormat; @@ -881,7 +881,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, } } break; - default: bError = sal_True; + default: bError = true; } bError |= !aIn.IsValid(); } @@ -927,7 +927,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa SCsTAB nTab, const FORMULA_TYPE eFT ) { sal_uInt8 nOp, nLen; - sal_Bool bError = false; + bool bError = false; const bool bCondFormat = eFT == FT_CondFormat; const bool bRangeName = eFT == FT_RangeName || bCondFormat; const bool bSharedFormula = eFT == FT_SharedFormula; @@ -1234,7 +1234,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa aIn.Ignore( 10 ); break; default: - bError = sal_True; + bError = true; } bError |= !aIn.IsValid(); } diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index 9be9bfe530fc..977d638cf482 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -952,7 +952,7 @@ ExcAutoFilterRecs::ExcAutoFilterRecs( const XclExpRoot& rRoot, SCTAB nTab ) : { sal_Bool bConflict = false; sal_Bool bContLoop = sal_True; - sal_Bool bHasOr = false; + bool bHasOr = false; SCCOLROW nFirstField = aParam.GetEntry( 0 ).nField; // create AUTOFILTER records for filtered columns diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index da8f0149afb9..8fc8c71431c1 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -542,7 +542,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, sal_Bool bAllPages, if( (mbShowAllPages || pPage->GetPageKind() == PK_STANDARD) && !(pPage->GetPageKind()==PK_HANDOUT) ) //#94954# never list the normal handout page ( handout-masterpage is used instead ) { - sal_Bool bPageExluded = pPage->IsExcluded(); + bool bPageExluded = pPage->IsExcluded(); bool bPageBelongsToShow = PageBelongsToCurrentShow (pPage); bPageExluded |= !bPageBelongsToShow; diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index d0dcb4658bbd..8706124227b3 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -78,26 +78,26 @@ namespace sfx2 FileDialogHelper::Context meContext; - sal_Bool mbHasPassword : 1; - sal_Bool mbIsPwdEnabled : 1; - sal_Bool m_bHaveFilterOptions : 1; - sal_Bool mbHasVersions : 1; - sal_Bool mbHasAutoExt : 1; - sal_Bool mbAddGraphicFilter : 1; - sal_Bool mbHasPreview : 1; - sal_Bool mbShowPreview : 1; - sal_Bool mbIsSaveDlg : 1; - sal_Bool mbIsSaveACopyDlg : 1; - sal_Bool mbExport : 1; - - sal_Bool mbDeleteMatcher : 1; - sal_Bool mbInsert : 1; - sal_Bool mbSystemPicker : 1; - sal_Bool mbPwdCheckBoxState : 1; - sal_Bool mbSelection : 1; - sal_Bool mbSelectionEnabled : 1; - sal_Bool mbHasSelectionBox : 1; - sal_Bool mbSelectionFltrEnabled : 1; + bool mbHasPassword : 1; + bool mbIsPwdEnabled : 1; + bool m_bHaveFilterOptions : 1; + bool mbHasVersions : 1; + bool mbHasAutoExt : 1; + bool mbAddGraphicFilter : 1; + bool mbHasPreview : 1; + bool mbShowPreview : 1; + bool mbIsSaveDlg : 1; + bool mbIsSaveACopyDlg : 1; + bool mbExport : 1; + + bool mbDeleteMatcher : 1; + bool mbInsert : 1; + bool mbSystemPicker : 1; + bool mbPwdCheckBoxState : 1; + bool mbSelection : 1; + bool mbSelectionEnabled : 1; + bool mbHasSelectionBox : 1; + bool mbSelectionFltrEnabled : 1; private: void addFilters( const OUString& rFactory, diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx index fea32c12cdc5..52834c660a2b 100644 --- a/sfx2/source/doc/zoomitem.cxx +++ b/sfx2/source/doc/zoomitem.cxx @@ -147,7 +147,7 @@ bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMem sal_Int32 nValueTmp( 0 ); sal_Int16 nValueSetTmp( 0 ); sal_Int16 nTypeTmp( 0 ); - sal_Bool bAllConverted( sal_True ); + bool bAllConverted( true ); sal_Int16 nConvertedCount( 0 ); for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ ) { diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index c17af642d95c..bc27dd128b5a 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -633,7 +633,7 @@ const SfxPoolItem* SfxItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich int SfxItemSet::Put( const SfxItemSet& rSet, sal_Bool bInvalidAsDefault ) { DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet); - sal_Bool bRet = sal_False; + bool bRet = false; if( rSet.Count() ) { SfxItemArray ppFnd = rSet._aItems; @@ -658,7 +658,7 @@ int SfxItemSet::Put( const SfxItemSet& rSet, sal_Bool bInvalidAsDefault ) pPtr += 2; } } - return bRet; + return int(bRet); } // ----------------------------------------------------------------------- diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 0b16fef03147..adc485cc7c69 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -381,15 +381,15 @@ void BrowseBox::ToggleSelection( sal_Bool bForce ) void BrowseBox::DrawCursor() { - sal_Bool bReallyHide = sal_False; + bool bReallyHide = false; if ( SMART_CURSOR_HIDE == bHideCursor ) { if ( !GetSelectRowCount() && !GetSelectColumnCount() ) - bReallyHide = sal_True; + bReallyHide = true; } else if ( HARD_CURSOR_HIDE == bHideCursor ) { - bReallyHide = sal_True; + bReallyHide = true; } bReallyHide |= !bSelectionIsVisible || !IsUpdateMode() || bScrolling || nCurRow < 0; diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx index 4c90a1ec81c7..c45df0d2720b 100644 --- a/svtools/source/config/menuoptions.cxx +++ b/svtools/source/config/menuoptions.cxx @@ -297,7 +297,7 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) // We need values from ALL notified configuration keys. DBG_ASSERT( !(seqPropertyNames.getLength()!=seqValues.getLength()), "SvtMenuOptions_Impl::Notify()\nI miss some values of configuration keys!\n" ); - sal_Bool bMenuSettingsChanged = sal_False; + bool bMenuSettingsChanged = false; sal_Bool bMenuIcons = sal_True; sal_Bool bSystemMenuIcons = sal_True; if (m_nMenuIcons == 2) diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 69398e8ff49c..530362782596 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -2640,7 +2640,7 @@ void DbGridControl::PreExecuteRowContextMenu(sal_uInt16 /*nRow*/, PopupMenu& rMe rMenu.EnableItem(SID_FM_RECORD_SAVE, IsModified()); // the undo is more difficult - sal_Bool bCanUndo = IsModified(); + bool bCanUndo = IsModified(); long nState = -1; if (m_aMasterStateProvider.IsSet()) nState = m_aMasterStateProvider.Call((void*)SID_FM_RECORD_UNDO); diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index bbcfcb31c393..b4f480c36bda 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -821,7 +821,7 @@ namespace svxform { // gehen wir durch alle markierten Objekte und suchen wir die raus, mit denen ich was anfangen kann FmNavRequestSelectHint rshRequestSelection; - sal_Bool bIsMixedSelection = sal_False; + bool bIsMixedSelection = false; for (sal_uLong i=0; (i<mlMarked.GetMarkCount()) && !bIsMixedSelection; i++) { diff --git a/svx/source/items/galleryitem.cxx b/svx/source/items/galleryitem.cxx index ace2edd4af85..83bec06e6273 100644 --- a/svx/source/items/galleryitem.cxx +++ b/svx/source/items/galleryitem.cxx @@ -75,7 +75,7 @@ bool SvxGalleryItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /* nMemberId return false; int nConverted(0); - sal_Bool bAllConverted( sal_True ); + bool bAllConverted( true ); sal_Bool bIsSetType( sal_False ); sal_Int8 nType(0); diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index 5d6ec82ecfda..06b393c0a9f9 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -129,7 +129,7 @@ bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt { sal_Int32 nColumns( 0 ); sal_Bool bBookMode = sal_False; - sal_Bool bAllConverted( sal_True ); + bool bAllConverted( true ); sal_Int16 nConvertedCount( 0 ); for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ ) { diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index 23b47f6fd5df..ff646f30a0a6 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -149,7 +149,7 @@ bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt sal_Int32 nCurrentZoom( 0 ); com::sun::star::uno::Sequence < sal_Int32 > aValues; - sal_Bool bAllConverted( sal_True ); + bool bAllConverted( true ); sal_Int16 nConvertedCount( 0 ); sal_Int32 nMinZoom( 0 ), nMaxZoom( 0 ); diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx index fba412d6e787..996bc1ba0b96 100644 --- a/sw/source/core/access/accportions.cxx +++ b/sw/source/core/access/accportions.cxx @@ -708,7 +708,7 @@ void SwAccessiblePortionData::AdjustAndCheck( sal_Int32 nPos, size_t& nPortionNo, sal_Int32& nCorePos, - sal_Bool& bEdit) const + bool& bEdit) const { // find portion and get mode position nPortionNo = FindBreak( aAccessiblePositions, nPos ); @@ -726,7 +726,7 @@ sal_Bool SwAccessiblePortionData::GetEditableRange( sal_Int32 nStart, sal_Int32 nEnd, sal_Int32& nCoreStart, sal_Int32& nCoreEnd ) const { - sal_Bool bIsEditable = sal_True; + bool bIsEditable = true; // get start and end portions size_t nStartPortion, nEndPortion; diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx index fe319690d499..ad09e8f66e5a 100644 --- a/sw/source/core/access/accportions.hxx +++ b/sw/source/core/access/accportions.hxx @@ -89,7 +89,7 @@ class SwAccessiblePortionData : public SwPortionHandler // helper method for GetEditableRange(...): void AdjustAndCheck( sal_Int32 nPos, size_t& nPortionNo, - sal_Int32& nCorePos, sal_Bool& bEdit ) const; + sal_Int32& nCorePos, bool& bEdit ) const; public: SwAccessiblePortionData( const SwTxtNode* pTxtNd, diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx index 7672e74fba69..1972a454c34c 100644 --- a/sw/source/core/edit/edtab.cxx +++ b/sw/source/core/edit/edtab.cxx @@ -122,7 +122,7 @@ sal_Bool SwEditShell::TextToTable( const SwInsertTableOptions& rInsTblOpts, const SwTableAutoFmt* pTAFmt ) { SwWait aWait( *GetDoc()->GetDocShell(), true ); - sal_Bool bRet = sal_False; + bool bRet = false; StartAllAction(); FOREACHPAM_START(GetCrsr()) if( PCURCRSR->HasMark() ) diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index ea7b644b1879..b9222fdf6ed5 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -2309,14 +2309,14 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) : // Further start/end actions only happen if there were paints started // somewhere or if the visibility of the CharRects has changed. - sal_Bool bActions = sal_False; + bool bActions = false; sal_uInt16 nBoolIdx = 0; do { --pSh->mnStartAction; if ( pSh->Imp()->GetRegion() ) - bActions = sal_True; + bActions = true; else { SwRect aTmp( pSh->VisArea() ); diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 500765d3172e..5fd60d154d21 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -1575,7 +1575,7 @@ static sal_Bool lcl_InnerCalcLayout( SwFrm *pFrm, { // LONG_MAX == nBottom means we have to calculate all bool bAll = LONG_MAX == nBottom; - sal_Bool bRet = sal_False; + bool bRet = false; const SwFrm* pOldUp = pFrm->GetUpper(); SWRECTFN( pFrm ) do diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx index af16121ee3c8..8654c939a207 100644 --- a/sw/source/core/text/itrpaint.cxx +++ b/sw/source/core/text/itrpaint.cxx @@ -285,7 +285,7 @@ void SwTxtPainter::DrawTextLine( const SwRect &rPaint, SwSaveClip &rClip, SeekStartAndChg( GetInfo() ); sal_Bool bRest = pCurr->IsRest(); - sal_Bool bFirst = sal_True; + bool bFirst = true; SwArrowPortion *pArrow = NULL; // Reference portion for the paragraph end portion diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx index 1862eb54dc2e..0ca8077fa01b 100644 --- a/sw/source/core/text/pormulti.cxx +++ b/sw/source/core/text/pormulti.cxx @@ -1473,7 +1473,7 @@ void SwTxtPainter::PaintMultiPortion( const SwRect &rPaint, nOfst = nOldY - rMulti.GetAscent(); sal_Bool bRest = pLay->IsRest(); - sal_Bool bFirst = sal_True; + bool bFirst = true; OSL_ENSURE( 0 == GetInfo().GetUnderFnt() || rMulti.IsBidi(), " Only BiDi portions are allowed to use the common underlining font" ); diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx index ba5159390bed..8379f10b9350 100644 --- a/sw/source/core/text/txtfly.cxx +++ b/sw/source/core/text/txtfly.cxx @@ -710,7 +710,7 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, // #i68520# // bEvade: consider pNew, if we are not inside a fly // consider pNew, if pNew is lower of <mpCurrAnchoredObj> - sal_Bool bEvade = !mpCurrAnchoredObj || + bool bEvade = !mpCurrAnchoredObj || Is_Lower_Of( dynamic_cast<const SwFlyFrm*>(mpCurrAnchoredObj), pNew); if ( !bEvade ) @@ -722,7 +722,7 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, // If bTopRule is not set, we ignore the frame types. // We directly check the z-order if ( !bTopRule ) - bEvade = sal_True; + bEvade = true; else { // Within chained Flys we only avoid Lower @@ -748,7 +748,7 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, { if (FLY_AT_PAGE == rCurrA.GetAnchorId()) { - bEvade = sal_True; + bEvade = true; } else return sal_False; @@ -756,7 +756,7 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, else if (FLY_AT_PAGE == rCurrA.GetAnchorId()) return sal_False; // Page anchored ones only avoid page anchored ones else if (FLY_AT_FLY == rNewA.GetAnchorId()) - bEvade = sal_True; // Non-page anchored ones avoid frame anchored ones + bEvade = true; // Non-page anchored ones avoid frame anchored ones else if( FLY_AT_FLY == rCurrA.GetAnchorId() ) return sal_False; // Frame anchored ones do not avoid paragraph anchored ones // #i57062# @@ -778,7 +778,7 @@ sal_Bool SwTxtFly::GetTop( const SwAnchoredObject* _pAnchoredObj, // #i68520# SwRect aTmp( _pAnchoredObj->GetObjRectWithSpaces() ); if ( !aTmp.IsOver( mpCurrAnchoredObj->GetObjRectWithSpaces() ) ) - bEvade = sal_False; + bEvade = false; } } diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 434619df6787..1ab9890f6780 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -596,7 +596,7 @@ void SwHTMLParser::Continue( int nToken ) bSetModEnabled = sal_False; if( pDoc->GetDocShell() && - 0 != (bSetModEnabled = pDoc->GetDocShell()->IsEnableSetModified()) ) + (bSetModEnabled = pDoc->GetDocShell()->IsEnableSetModified()) ) { pDoc->GetDocShell()->EnableSetModified( sal_False ); } diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 6a2304d4701d..4a88b6f284ce 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -73,9 +73,9 @@ class _HTMLAttr SwNodeIndex nSttPara, nEndPara; sal_Int32 nSttCntnt, nEndCntnt; - sal_Bool bInsAtStart : 1; - sal_Bool bLikePara : 1; // Attribut ueber dem gesamten Absatz setzen - sal_Bool bValid : 1; // ist das Attribut gueltig? + bool bInsAtStart : 1; + bool bLikePara : 1; // Attribut ueber dem gesamten Absatz setzen + bool bValid : 1; // ist das Attribut gueltig? SfxPoolItem* pItem; sal_uInt16 nCount; // Anzahl noch zu schliessender Attrs mit einem Wert @@ -214,15 +214,15 @@ class _HTMLAttrContext SwHTMLAppendMode eAppend; - sal_Bool bLRSpaceChanged : 1;// linker/rechtr Rand, Einzug veraendert? - sal_Bool bULSpaceChanged : 1;// oberer/unterer Rand veraendert? - sal_Bool bDfltTxtFmtColl : 1;// nTxtFmtColl ist nur ein default - sal_Bool bSpansSection : 1; // Der Kontext spannt eine SwSection auf - sal_Bool bPopStack : 1; // Oberhalb liegende Stack-Elemente entf. - sal_Bool bFinishPREListingXMP : 1; - sal_Bool bRestartPRE : 1; - sal_Bool bRestartXMP : 1; - sal_Bool bRestartListing : 1; + bool bLRSpaceChanged : 1;// linker/rechtr Rand, Einzug veraendert? + bool bULSpaceChanged : 1;// oberer/unterer Rand veraendert? + bool bDfltTxtFmtColl : 1;// nTxtFmtColl ist nur ein default + bool bSpansSection : 1; // Der Kontext spannt eine SwSection auf + bool bPopStack : 1; // Oberhalb liegende Stack-Elemente entf. + bool bFinishPREListingXMP : 1; + bool bRestartPRE : 1; + bool bRestartXMP : 1; + bool bRestartListing : 1; public: void ClearSaveDocContext(); @@ -431,46 +431,46 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient SvxAdjust eParaAdjust; // Ausrichtung des aktuellen Absatz HTMLScriptLanguage eScriptLang; // die aktuelle Script-Language - sal_Bool bOldIsHTMLMode : 1; // War's mal ein HTML-Dokument? + bool bOldIsHTMLMode : 1; // War's mal ein HTML-Dokument? - sal_Bool bDocInitalized : 1; // Dokument bzw. Shell wurden initialisiert + bool bDocInitalized : 1; // Dokument bzw. Shell wurden initialisiert // Flag um doppeltes init durch Rekursion // zu verhindern. - sal_Bool bViewCreated : 1; // die View wurde schon erzeugt (asynchron) - sal_Bool bSetCrsr : 1; // Crsr wieder auf den Anfang setzen - sal_Bool bSetModEnabled : 1; + bool bViewCreated : 1; // die View wurde schon erzeugt (asynchron) + bool bSetCrsr : 1; // Crsr wieder auf den Anfang setzen + bool bSetModEnabled : 1; - sal_Bool bInFloatingFrame : 1; // Wir sind in einen Floating ::com::sun::star::frame::Frame - sal_Bool bInField : 1; - sal_Bool bKeepUnknown : 1; // unbekannte/nicht unterstuetze Tokens beh. + bool bInFloatingFrame : 1; // Wir sind in einen Floating ::com::sun::star::frame::Frame + bool bInField : 1; + bool bKeepUnknown : 1; // unbekannte/nicht unterstuetze Tokens beh. // 8 - sal_Bool bCallNextToken : 1; // In Tabellen: NextToken in jedem Fall rufen - sal_Bool bIgnoreRawData : 1; // Inhalt eines Scripts/Styles ignorieren. - sal_Bool bLBEntrySelected : 1; // Ist der aktuelle Listbox-Eintrag selekt. - sal_Bool bTAIgnoreNewPara : 1; // naechstes LF in TextArea ignorieren? - sal_Bool bFixMarqueeWidth : 1; // Groesse einer Laufschrift anpassen? - sal_Bool bFixMarqueeHeight : 1; - - sal_Bool bUpperSpace : 1; // obererer Absatz-Abstand wird benoetigt - sal_Bool bNoParSpace : 1; + bool bCallNextToken : 1; // In Tabellen: NextToken in jedem Fall rufen + bool bIgnoreRawData : 1; // Inhalt eines Scripts/Styles ignorieren. + bool bLBEntrySelected : 1; // Ist der aktuelle Listbox-Eintrag selekt. + bool bTAIgnoreNewPara : 1; // naechstes LF in TextArea ignorieren? + bool bFixMarqueeWidth : 1; // Groesse einer Laufschrift anpassen? + bool bFixMarqueeHeight : 1; + + bool bUpperSpace : 1; // obererer Absatz-Abstand wird benoetigt + bool bNoParSpace : 1; // 16 - sal_Bool bAnyStarBasic : 1; // gibt es ueberhaupt ein StarBasic-Modul - sal_Bool bInNoEmbed : 1; // Wir sind in einem NOEMBED-Bereich + bool bAnyStarBasic : 1; // gibt es ueberhaupt ein StarBasic-Modul + bool bInNoEmbed : 1; // Wir sind in einem NOEMBED-Bereich - sal_Bool bInTitle : 1; // Wir sind im Titel + bool bInTitle : 1; // Wir sind im Titel - sal_Bool bChkJumpMark : 1; // springe ggfs. zu einem vorgegebenem Mark - sal_Bool bUpdateDocStat : 1; - sal_Bool bFixSelectWidth : 1; // Breite eines Selects neu setzen? - sal_Bool bFixSelectHeight : 1; // Breite eines Selects neu setzen? - sal_Bool bTextArea : 1; + bool bChkJumpMark : 1; // springe ggfs. zu einem vorgegebenem Mark + bool bUpdateDocStat : 1; + bool bFixSelectWidth : 1; // Breite eines Selects neu setzen? + bool bFixSelectHeight : 1; // Breite eines Selects neu setzen? + bool bTextArea : 1; // 24 - sal_Bool bSelect : 1; - sal_Bool bInFootEndNoteAnchor : 1; - sal_Bool bInFootEndNoteSymbol : 1; - sal_Bool bIgnoreHTMLComments : 1; - sal_Bool bRemoveHidden : 1; // the filter implementation might set the hidden flag + bool bSelect : 1; + bool bInFootEndNoteAnchor : 1; + bool bInFootEndNoteSymbol : 1; + bool bIgnoreHTMLComments : 1; + bool bRemoveHidden : 1; // the filter implementation might set the hidden flag /// the names corresponding to the DOCINFO field subtypes INFO[1-4] OUString m_InfoNames[4]; diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 6d57f12336ec..f0bca134e4f9 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -136,7 +136,7 @@ SwXMLConditionParser_Impl::SwXMLConditionParser_Impl( const OUString& rInp ) : OUString sFunc; bool bHasSub = false; sal_uInt32 nSub = 0; - sal_Bool bOK = SkipWS() && MatchName( sFunc ) && SkipWS() && + bool bOK = SkipWS() && MatchName( sFunc ) && SkipWS() && MatchChar( '(' ) && SkipWS() && MatchChar( ')' ) && SkipWS(); if( bOK && MatchChar( '=' ) ) { diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index fd941ce57822..4077b8898a3f 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -2271,9 +2271,9 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper, // Can be split after current HTML table column? // If yes, can the created region still be split to // rows if the next column is added to it? - sal_Bool bSplit = sal_True; - sal_Bool bHoriSplitMayContinue = sal_False; - sal_Bool bHoriSplitPossible = sal_False; + bool bSplit = true; + bool bHoriSplitMayContinue = false; + bool bHoriSplitPossible = false; if ( bHasSubTables ) { @@ -2283,7 +2283,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper, SwXMLTableCell_Impl *pCell = GetCell(nRow,nCol); // Could the table fragment be splitted horizontally behind // the current line? - sal_Bool bHoriSplit = (*pRows)[(sal_uInt16)nRow].IsSplitable() && + bool bHoriSplit = (*pRows)[(sal_uInt16)nRow].IsSplitable() && nRow+1UL < nBottomRow && 1UL == pCell->GetRowSpan(); (*pRows)[(sal_uInt16)nRow].SetSplitable( bHoriSplit ); diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index d7efd5391f70..3f76347d0999 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -1356,13 +1356,13 @@ sal_Bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet ) eMode = FILL_SPACE; aOpt.SetMode( eMode ); - sal_Bool bRet = sal_False; + bool bRet = false; const SfxPoolItem* pItem = 0; if( SFX_ITEM_SET != rSet.GetItemState( FN_PARAM_SHADOWCURSOR, sal_False, &pItem ) || ((SwShadowCursorItem&)*pItem) != aOpt ) { rSet.Put( aOpt ); - bRet = sal_True; + bRet = true; } if (m_pWrtShell) { @@ -1374,7 +1374,7 @@ sal_Bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet ) if( m_pCrsrInProtCB->IsChecked() != m_pCrsrInProtCB->GetSavedValue()) { rSet.Put(SfxBoolItem(FN_PARAM_CRSR_IN_PROTECTED, m_pCrsrInProtCB->IsChecked())); - bRet |= sal_True; + bRet = true; } const SwDocDisplayItem* pOldAttr = (const SwDocDisplayItem*) diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index f47713474fcd..4dc390a91686 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -391,7 +391,7 @@ IMPL_LINK( SwFldDBPage, NumSelectHdl, NumFormatListBox *, pLB ) void SwFldDBPage::CheckInsert() { - sal_Bool bInsert = sal_True; + bool bInsert = true; sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel()); SvTreeListEntry* pEntry = m_pDatabaseTLB->GetCurEntry(); @@ -406,7 +406,7 @@ void SwFldDBPage::CheckInsert() bInsert &= pEntry != 0; } else - bInsert = sal_False; + bInsert = false; if (nTypeId == TYP_DBNUMSETFLD) { diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 7679f6a4c230..63c489b9f5b3 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -1024,7 +1024,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) --------------------------------------------------------------------*/ sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet) { - sal_Bool bRet = sal_False; + bool bRet = false; SwWrtShell* pSh = bFormat ? ::GetActiveWrtShell() : getFrmDlgParentShell(); OSL_ENSURE( pSh , "shell not found"); @@ -1059,7 +1059,7 @@ sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet) aHoriOrient.SetRelationOrient( eRel ); aHoriOrient.SetPosToggle(m_pMirrorPagesCB->IsChecked()); - sal_Bool bMod = m_pAtHorzPosED->GetText() != m_pAtHorzPosED->GetSavedValue(); + bool bMod = m_pAtHorzPosED->GetText() != m_pAtHorzPosED->GetSavedValue(); bMod |= m_pMirrorPagesCB->GetState() != m_pMirrorPagesCB->GetSavedValue(); if ( eHOri == text::HoriOrientation::NONE && @@ -3019,7 +3019,7 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet ) sal_Bool SwFrmAddPage::FillItemSet(SfxItemSet &rSet) { - sal_Bool bRet = sal_False; + bool bRet = false; if (pNameED->GetText() != pNameED->GetSavedValue()) bRet |= 0 != rSet.Put(SfxStringItem(FN_SET_FRM_NAME, pNameED->GetText())); if (pAltNameED->GetText() != pAltNameED->GetSavedValue()) diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index a48715008a83..c32f02b598f2 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -270,7 +270,7 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet) --------------------------------------------------------------------*/ sal_Bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet) { - sal_Bool bModified = sal_False; + bool bModified = false; const SfxPoolItem* pOldItem; const SwFmtSurround& rOldSur = (const SwFmtSurround&)GetItemSet().Get(RES_SURROUND); @@ -313,7 +313,7 @@ sal_Bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet) aSur != *pOldItem ) { rSet.Put(aSur); - bModified = sal_True; + bModified = true; } if (!bDrawMode) @@ -322,7 +322,7 @@ sal_Bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet) aOp != *pOldItem ) { rSet.Put(aOp); - bModified = sal_True; + bModified = true; } } @@ -339,7 +339,7 @@ sal_Bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet) aUL != *pOldItem ) { rSet.Put( aUL, RES_UL_SPACE ); - bModified = sal_True; + bModified = true; } } @@ -356,7 +356,7 @@ sal_Bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet) aLR != *pOldItem ) { rSet.Put(aLR, RES_LR_SPACE); - bModified = sal_True; + bModified = true; } } @@ -599,7 +599,7 @@ IMPL_LINK( SwWrapTabPage, RangeModifyHdl, MetricField *, pEdit ) IMPL_LINK( SwWrapTabPage, WrapTypeHdl, RadioButton *, pBtn ) { - sal_Bool bWrapThrough = (pBtn == m_pWrapThroughRB); + bool bWrapThrough = (pBtn == m_pWrapThroughRB); m_pWrapTransparentCB->Enable( bWrapThrough && !bHtmlMode ); bWrapThrough |= ( nAnchorId == FLY_AS_CHAR ); m_pWrapOutlineCB->Enable( !bWrapThrough && pBtn != m_pNoWrapRB); diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 22d7f7004eb2..dec1c52727c7 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -368,7 +368,7 @@ IMPL_LINK( SwGlossaryDlg, NameModify, Edit *, pEdit ) //ShortNameEdit if(!bNotFound) { - sal_Bool bEnable = !bNotFound; + bool bEnable = !bNotFound; bEnable &= !bIsDocReadOnly; m_pInsertBtn->Enable(bEnable); } diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 6cde196f6737..8c019a245d06 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -443,12 +443,12 @@ void SwOutlineSettingsTabPage::Update() m_pCollBox->Enable(USHRT_MAX != nActLevel); if(USHRT_MAX == nActLevel) { - sal_Bool bSamePrefix = sal_True; - sal_Bool bSameSuffix = sal_True; - sal_Bool bSameType = sal_True; - sal_Bool bSameComplete = sal_True; - sal_Bool bSameStart = sal_True; - sal_Bool bSameCharFmt = sal_True; + bool bSamePrefix = true; + bool bSameSuffix = true; + bool bSameType = true; + bool bSameComplete = true; + bool bSameStart = true; + bool bSameCharFmt = true; const SwNumFmt* aNumFmtArr[MAXLEVEL]; const SwCharFmt* pFirstFmt = 0; diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index 8a119663082f..a54e192f6139 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -259,7 +259,7 @@ void SwRedlineAcceptDlg::InitAuthors() bOnlyFormatedRedlines = sal_True; bHasReadonlySel = sal_False; - sal_Bool bIsNotFormated = sal_False; + bool bIsNotFormated = false; sal_uInt16 i; // determine authors @@ -924,7 +924,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, GotoHdl) SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr(); aSelectTimer.Stop(); - sal_Bool bIsNotFormated = sal_False; + bool bIsNotFormated = false; bool bSel = false; //#98883# don't select redlines while the dialog is not focussed diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx index c3d31208af54..307789139a97 100644 --- a/sw/source/ui/shells/drawsh.cxx +++ b/sw/source/ui/shells/drawsh.cxx @@ -281,7 +281,7 @@ void SwDrawShell::GetState(SfxItemSet& rSet) SdrView* pSdrView = rSh.GetDrawViewWithValidMarkList(); SfxWhichIter aIter( rSet ); sal_uInt16 nWhich = aIter.FirstWhich(); - sal_Bool bProtected = rSh.IsSelObjProtected(FLYPROTECT_CONTENT); + bool bProtected = rSh.IsSelObjProtected(FLYPROTECT_CONTENT); if (!bProtected) // Check the parent bProtected |= rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0; diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx index ecee1ed97b29..e4f7c781658c 100644 --- a/sw/source/ui/shells/drwbassh.cxx +++ b/sw/source/ui/shells/drwbassh.cxx @@ -645,7 +645,7 @@ void SwDrawBaseShell::GetState(SfxItemSet& rSet) SdrView* pSdrView = rSh.GetDrawViewWithValidMarkList(); SfxWhichIter aIter( rSet ); sal_uInt16 nWhich = aIter.FirstWhich(); - sal_Bool bProtected = rSh.IsSelObjProtected(FLYPROTECT_CONTENT); + bool bProtected = rSh.IsSelObjProtected(FLYPROTECT_CONTENT); if (!bProtected) // Look in the parent bProtected |= rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0; diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index 4152393812ab..1ad2ad926407 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -278,7 +278,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet, bool bBorder = ( SFX_ITEM_SET == rSet.GetItemState( RES_BOX ) || SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BORDER_INNER ) ); pItem = 0; - sal_Bool bBackground = SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, sal_False, &pItem ); + bool bBackground = SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, sal_False, &pItem ); const SfxPoolItem* pRowItem = 0, *pTableItem = 0; bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_ROW, sal_False, &pRowItem ); bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_TABLE, sal_False, &pTableItem ); diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index efc5ae3a32b8..d2bbceef4606 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -475,7 +475,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) case FN_INSERT_FRAME_INTERACT: { sal_uInt16 nCols = 1; - sal_Bool bModifier1 = rReq.GetModifier() == KEY_MOD1; + bool bModifier1 = rReq.GetModifier() == KEY_MOD1; if(pArgs) { if(FN_INSERT_FRAME_INTERACT_NOCOL != nSlot && diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 46901353c322..8e191e5f6429 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -1349,7 +1349,7 @@ SfxTabPage* SwTextFlowPage::Create( Window* pParent, sal_Bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) { - sal_Bool bModified = sal_False; + bool bModified = false; // Repeat Heading if(m_pHeadLineCB->IsChecked() != m_pHeadLineCB->GetSavedValue() || diff --git a/sw/source/ui/uiview/formatclipboard.cxx b/sw/source/ui/uiview/formatclipboard.cxx index 108f9d32763c..f383d23ca07b 100644 --- a/sw/source/ui/uiview/formatclipboard.cxx +++ b/sw/source/ui/uiview/formatclipboard.cxx @@ -141,7 +141,7 @@ void lcl_setTableAttributes( const SfxItemSet& rSet, SwWrtShell &rSh ) const SfxPoolItem* pItem = 0; bool bBorder = ( SFX_ITEM_SET == rSet.GetItemState( RES_BOX ) || SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BORDER_INNER ) ); - sal_Bool bBackground = SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, sal_False, &pItem ); + bool bBackground = SFX_ITEM_SET == rSet.GetItemState( RES_BACKGROUND, sal_False, &pItem ); const SfxPoolItem* pRowItem = 0, *pTableItem = 0; bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_ROW, sal_False, &pRowItem ); bBackground |= SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_BRUSH_TABLE, sal_False, &pTableItem ); diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx index d18ffdad6f88..56660aa03052 100644 --- a/sw/source/ui/wrtsh/select.cxx +++ b/sw/source/ui/wrtsh/select.cxx @@ -147,7 +147,7 @@ long SwWrtShell::SelAll() pEndPos = new SwPosition( *pTmpCrsr->GetMark() ); } Push(); - sal_Bool bIsFullSel = !MoveSection( fnSectionCurr, fnSectionStart); + bool bIsFullSel = !MoveSection( fnSectionCurr, fnSectionStart); SwapPam(); bIsFullSel &= !MoveSection( fnSectionCurr, fnSectionEnd); Pop(sal_False); diff --git a/unotools/source/i18n/readwritemutexguard.cxx b/unotools/source/i18n/readwritemutexguard.cxx index b60a392972d7..0bc602e73127 100644 --- a/unotools/source/i18n/readwritemutexguard.cxx +++ b/unotools/source/i18n/readwritemutexguard.cxx @@ -36,7 +36,7 @@ ReadWriteGuard::ReadWriteGuard( ReadWriteMutex& rMutexP, rMutex.pWriteMutex->acquire(); // wait for any read to complete // TODO: set up a waiting thread instead of a loop - sal_Bool bWait = sal_True; + bool bWait = true; do { rMutex.pMutex->acquire(); diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index 5fcb79729065..a92b2d7cbe77 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -282,7 +282,7 @@ public: CGPoint* makeCGptArray(sal_uLong nPoints, const SalPoint* pPtAry); // native widget rendering methods that require mirroring virtual sal_Bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, - const Point& aPos, sal_Bool& rIsInside ); + const Point& aPos, bool& rIsInside ) SAL_OVERRIDE; virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& aCaption ); diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index ec6f5bc26112..28188260fb3c 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -143,7 +143,7 @@ protected: // native widget rendering methods that require mirroring virtual sal_Bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, - const Point& aPos, sal_Bool& rIsInside ); + const Point& aPos, bool& rIsInside ); virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& aCaption ); @@ -458,7 +458,7 @@ public: ControlPart nPart, const Rectangle& rControlRegion, const Point& aPos, - sal_Bool& rIsInside, + bool& rIsInside, const OutputDevice *pOutDev ); // Request rendering of a particular control and/or part diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index 9ddd99b48c5b..628221bf1f94 100644 --- a/vcl/inc/unx/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -136,7 +136,7 @@ public: // native widget methods virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); virtual sal_Bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, - const Point& aPos, sal_Bool& rIsInside ); + const Point& aPos, bool& rIsInside ) SAL_OVERRIDE; virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 58de36ad0f87..bea5b641db4f 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -247,7 +247,7 @@ protected: // native widget rendering methods that require mirroring virtual sal_Bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, - const Point& aPos, sal_Bool& rIsInside ); + const Point& aPos, bool& rIsInside ) SAL_OVERRIDE; virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& aCaption ); diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx index ec6ca1d9c72f..299e1f9ba97f 100644 --- a/vcl/osx/salnativewidgets.cxx +++ b/vcl/osx/salnativewidgets.cxx @@ -392,7 +392,7 @@ sal_Bool AquaSalGraphics::IsNativeControlSupported( ControlType nType, ControlPa * nType/nPart combination. */ sal_Bool AquaSalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, - const Point& rPos, sal_Bool& rIsInside ) + const Point& rPos, bool& rIsInside ) { if ( nType == CTRL_SCROLLBAR ) { diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index a5a5bebfc1f0..53b2be29f615 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -820,7 +820,7 @@ void ScrollBar::ImplDoMouseAction( const Point& rMousePos, sal_Bool bCallAction sal_uInt16 nOldStateFlags = mnStateFlags; sal_Bool bAction = sal_False; bool bHorizontal = ( GetStyle() & WB_HORZ )? true: false; - sal_Bool bIsInside = sal_False; + bool bIsInside = false; Point aPoint( 0, 0 ); Rectangle aControlRegion( aPoint, GetOutputSizePixel() ); @@ -930,7 +930,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt ) const Point& rMousePos = rMEvt.GetPosPixel(); sal_uInt16 nTrackFlags = 0; bool bHorizontal = ( GetStyle() & WB_HORZ )? true: false; - sal_Bool bIsInside = sal_False; + bool bIsInside = false; bool bDragToMouse = false; Point aPoint( 0, 0 ); @@ -1266,7 +1266,7 @@ void ScrollBar::DataChanged( const DataChangedEvent& rDCEvt ) Rectangle* ScrollBar::ImplFindPartRect( const Point& rPt ) { bool bHorizontal = ( GetStyle() & WB_HORZ )? true: false; - sal_Bool bIsInside = sal_False; + bool bIsInside = false; Point aPoint( 0, 0 ); Rectangle aControlRegion( aPoint, GetOutputSizePixel() ); diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx index 68e65a3a277f..d04477930c6d 100644 --- a/vcl/source/gdi/outdevnative.cxx +++ b/vcl/source/gdi/outdevnative.cxx @@ -166,7 +166,7 @@ sal_Bool OutputDevice::HitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& aPos, - sal_Bool& rIsInside ) const + bool& rIsInside ) const { if( !lcl_enableNativeWidget( *this ) ) return sal_False; diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx index 27193e805b27..a67b9102db38 100644 --- a/vcl/source/gdi/salgdilayout.cxx +++ b/vcl/source/gdi/salgdilayout.cxx @@ -660,7 +660,7 @@ sal_Bool SalGraphics::DrawEPS( long nX, long nY, long nWidth, long nHeight, v } sal_Bool SalGraphics::HitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, - const Point& aPos, sal_Bool& rIsInside, const OutputDevice *pOutDev ) + const Point& aPos, bool& rIsInside, const OutputDevice *pOutDev ) { if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) ) { diff --git a/vcl/source/gdi/salnativewidgets-none.cxx b/vcl/source/gdi/salnativewidgets-none.cxx index 13789539a4c3..bd97f0d67b7b 100644 --- a/vcl/source/gdi/salnativewidgets-none.cxx +++ b/vcl/source/gdi/salnativewidgets-none.cxx @@ -49,7 +49,7 @@ sal_Bool SalGraphics::hitTestNativeControl( ControlType, ControlPart, const Rectangle&, const Point&, - sal_Bool& ) + bool& ) { return( sal_False ); } diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 4c00db56c76e..3652f66db4b4 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -667,7 +667,7 @@ sal_Bool GtkSalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& aPos, - sal_Bool& rIsInside ) + bool& rIsInside ) { if ( ( nType == CTRL_SCROLLBAR ) && ( ( nPart == PART_BUTTON_UP ) || diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index 97473130374a..26c724555c5c 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -1212,7 +1212,7 @@ class KDESalGraphics : public X11SalGraphics virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); virtual sal_Bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& aPos, - sal_Bool& rIsInside ); + bool& rIsInside ) SAL_OVERRIDE; virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, @@ -1272,7 +1272,7 @@ sal_Bool KDESalGraphics::IsNativeControlSupported( ControlType nType, ControlPar */ sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& rPos, - sal_Bool& rIsInside ) + bool& rIsInside ) { if ( nType == CTRL_SCROLLBAR ) { diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx index cf72dcd6aca1..abee781cab1b 100644 --- a/vcl/unx/kde4/KDESalGraphics.cxx +++ b/vcl/unx/kde4/KDESalGraphics.cxx @@ -952,7 +952,7 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart p */ sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& rPos, - sal_Bool& rIsInside ) + bool& rIsInside ) { if ( nType == CTRL_SCROLLBAR ) { diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx index b25afd652564..0fce28980a74 100644 --- a/vcl/unx/kde4/KDESalGraphics.hxx +++ b/vcl/unx/kde4/KDESalGraphics.hxx @@ -52,7 +52,7 @@ class KDESalGraphics : public X11SalGraphics */ virtual sal_Bool hitTestNativeControl( ControlType type, ControlPart part, const Rectangle& rControlRegion, const Point& aPos, - sal_Bool& rIsInside ); + bool& rIsInside ) SAL_OVERRIDE; /** Draw the requested control described by part/nControlState. @param rControlRegion diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index 674f03c60fbb..dc9885f134c5 100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -354,7 +354,7 @@ sal_Bool WinSalGraphics::hitTestNativeControl( ControlType, ControlPart, const Rectangle&, const Point&, - sal_Bool& ) + bool& ) { return FALSE; } diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx index 814243d9ba7b..eb511f22af5a 100644 --- a/xmloff/source/style/XMLBackgroundImageContext.cxx +++ b/xmloff/source/style/XMLBackgroundImageContext.cxx @@ -202,12 +202,12 @@ void XMLBackgroundImageContext::ProcessAttrs( SvXMLTokenEnumerator aTokenEnum( rValue ); OUString aToken; sal_Bool bHori = sal_False, bVert = sal_False; - sal_Bool bOK = sal_True; + bool bOK = true; while( bOK && aTokenEnum.getNextToken( aToken ) ) { if( bHori && bVert ) { - bOK = sal_False; + bOK = false; } else if( -1 != aToken.indexOf( '%' ) ) { @@ -235,7 +235,7 @@ void XMLBackgroundImageContext::ProcessAttrs( else { // wrong percentage - bOK = sal_False; + bOK = false; } } else if( IsXMLToken( aToken, XML_CENTER ) ) @@ -258,7 +258,7 @@ void XMLBackgroundImageContext::ProcessAttrs( else if( !bHori ) eNewPos = (GraphicLocation)nTmp; else - bOK = sal_False; + bOK = false; bHori = sal_True; } else if( SvXMLUnitConverter::convertEnum( nTmp, aToken, @@ -270,12 +270,12 @@ void XMLBackgroundImageContext::ProcessAttrs( else if( !bVert ) eNewPos = (GraphicLocation)nTmp; else - bOK = sal_False; + bOK = false; bVert = sal_True; } else { - bOK = sal_False; + bOK = false; } } diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx index 79e712fa3054..4ffac034a686 100644 --- a/xmloff/source/style/xmlimppr.cxx +++ b/xmloff/source/style/xmlimppr.cxx @@ -140,7 +140,7 @@ void SvXMLImportPropertyMapper::importXML( // for better error reporting: this should be set true if no // warning is needed - sal_Bool bNoWarning = sal_False; + bool bNoWarning = false; bool bAlienImport = false; do diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 6f476c47e593..643354d5da48 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -2883,7 +2883,7 @@ sal_Bool XMLTextFieldExport::ExplodeFieldMasterName( { sal_Int32 nLength = sFieldMasterPrefix.getLength(); sal_Int32 nSeparator = sMasterName.indexOf('.', nLength); - sal_Bool bReturn = sal_True; + bool bReturn = true; #ifdef DBG_UTIL // check for service name @@ -2894,7 +2894,7 @@ sal_Bool XMLTextFieldExport::ExplodeFieldMasterName( if (nSeparator <= nLength) { nSeparator = sMasterName.getLength(); DBG_WARNING("no field var name!"); - bReturn = sal_False; + bReturn = false; } else { diff --git a/xmloff/source/transform/FormPropOASISTContext.cxx b/xmloff/source/transform/FormPropOASISTContext.cxx index a505ed9e21c3..8ab8ef791b71 100644 --- a/xmloff/source/transform/FormPropOASISTContext.cxx +++ b/xmloff/source/transform/FormPropOASISTContext.cxx @@ -54,7 +54,7 @@ XMLTokenEnum XMLFormPropOASISTransformerContext::GetValueType( } // get number - sal_Bool bOverflow = sal_False; + bool bOverflow = false; while( nPos < nLen && '0' <= rValue[nPos] && '9' >= rValue[nPos] ) |