diff options
Diffstat (limited to 'sw')
55 files changed, 238 insertions, 238 deletions
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index be12f39e096b..d221bcbdf132 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -100,7 +100,7 @@ static void lcl_PaintReplacement( const SwRect &rRect, const OUString &rText, pFont->SetStyleName( OUString() ); pFont->SetName(OUString("Arial Unicode")); pFont->SetFamily( FAMILY_SWISS ); - pFont->SetTransparent( sal_True ); + pFont->SetTransparent( true ); } Color aCol( COL_RED ); diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index d6a052307e3f..15da21ce2be5 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -1237,7 +1237,7 @@ sal_Bool SwFEShell::GetDrawObjGraphic( sal_uLong nFmt, Graphic& rGrf ) const GetGrfSize( aSz ); VirtualDevice aVirtDev; - aVirtDev.EnableOutput( sal_False ); + aVirtDev.EnableOutput( false ); MapMode aTmp( GetWin()->GetMapMode() ); aTmp.SetOrigin( aPt ); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 2874707c28d7..0082908d8782 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -7047,7 +7047,7 @@ const Font& SwPageFrm::GetEmptyPageFont() pEmptyPgFont->SetStyleName( aEmptyOUStr ); pEmptyPgFont->SetName(OUString("Helvetica")); pEmptyPgFont->SetFamily( FAMILY_SWISS ); - pEmptyPgFont->SetTransparent( sal_True ); + pEmptyPgFont->SetTransparent( true ); pEmptyPgFont->SetColor( COL_GRAY ); } @@ -7303,7 +7303,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap ) OutputDevice *pOld = pSh->GetOut(); VirtualDevice aDev( *pOld ); - aDev.EnableOutput( sal_False ); + aDev.EnableOutput( false ); GDIMetaFile aMet; MapMode aMap( pOld->GetMapMode().GetMapUnit() ); diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx index 192ae5a91135..39a5ff8f40b5 100644 --- a/sw/source/core/view/printdata.cxx +++ b/sw/source/core/view/printdata.cxx @@ -281,7 +281,7 @@ SwPrintUIOptions::SwPrintUIOptions( // print range selection vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt; aPrintRangeOpt.maGroupHint = "PrintRange"; - aPrintRangeOpt.mbInternalOnly = sal_True; + aPrintRangeOpt.mbInternalOnly = true; m_aUIProperties[nIdx++].Value = setSubgroupControlOpt("printrange", OUString(aLocalizedStrings.GetString(26)), OUString(), aPrintRangeOpt); @@ -309,7 +309,7 @@ SwPrintUIOptions::SwPrintUIOptions( aChoices, 0 /* always default to 'All pages' */, aChoicesDisabled); // show an Edit dependent on "Pages" selected - vcl::PrinterOptionsHelper::UIControlOptions aPageRangeOpt( aPrintRangeName, 1, sal_True ); + vcl::PrinterOptionsHelper::UIControlOptions aPageRangeOpt( aPrintRangeName, 1, true ); m_aUIProperties[nIdx++].Value = setEditControlOpt("pagerange", OUString(), ".HelpID:vcl:PrintDialog:PageRange:Edit", "PageRange", @@ -330,7 +330,7 @@ SwPrintUIOptions::SwPrintUIOptions( aHelpIds.realloc( 2 ); aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText"; aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintAnnotationMode:ListBox"; - vcl::PrinterOptionsHelper::UIControlOptions aAnnotOpt( OUString( "PrintProspect" ), 0, sal_False ); + vcl::PrinterOptionsHelper::UIControlOptions aAnnotOpt( OUString( "PrintProspect" ), 0, false ); aAnnotOpt.mbEnabled = bHasPostIts; m_aUIProperties[ nIdx++ ].Value = setChoiceListControlOpt("writercomments", aLocalizedStrings.GetString( 17 ), @@ -389,7 +389,7 @@ SwPrintUIOptions::SwPrintUIOptions( uno::Sequence< OUString > aBRTLChoices( 2 ); aBRTLChoices[0] = aLocalizedStrings.GetString( 24 ); aBRTLChoices[1] = aLocalizedStrings.GetString( 25 ); - vcl::PrinterOptionsHelper::UIControlOptions aBrochureRTLOpt( aBrochurePropertyName, -1, sal_True ); + vcl::PrinterOptionsHelper::UIControlOptions aBrochureRTLOpt( aBrochurePropertyName, -1, true ); uno::Sequence< OUString > aBRTLHelpIds( 1 ); aBRTLHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintProspectRTL:ListBox"; aBrochureRTLOpt.maGroupHint = "LayoutPage"; @@ -444,8 +444,8 @@ bool SwPrintUIOptions::IsPrintEmptyPages( bool bIsPDFExport ) const // take care of different property names for the option. bool bRes = bIsPDFExport ? - !getBoolValue( "IsSkipEmptyPages", sal_True ) : - getBoolValue( "PrintEmptyPages", sal_True ); + !getBoolValue( "IsSkipEmptyPages", true ) : + getBoolValue( "PrintEmptyPages", true ); return bRes; } @@ -463,7 +463,7 @@ bool SwPrintUIOptions::IsPrintGraphics() const // take care of different property names for the option. // for compatibility the old name should win (may still be used for PDF export or via Uno API) - bool bRes = getBoolValue( "PrintPicturesAndObjects", sal_True ); + bool bRes = getBoolValue( "PrintPicturesAndObjects", true ); bRes = getBoolValue( "PrintGraphics", bRes ); return bRes; } @@ -473,7 +473,7 @@ bool SwPrintUIOptions::IsPrintDrawings() const // take care of different property names for the option. // for compatibility the old name should win (may still be used for PDF export or via Uno API) - bool bRes = getBoolValue( "PrintPicturesAndObjects", sal_True ); + bool bRes = getBoolValue( "PrintPicturesAndObjects", true ); bRes = getBoolValue( "PrintDrawings", bRes ); return bRes; } diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 61fbf74d254c..c5062f1a4b13 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -420,7 +420,7 @@ void SwViewShell::ImplStartAction() void SwViewShell::ImplLockPaint() { if ( GetWin() && GetWin()->IsVisible() ) - GetWin()->EnablePaint( sal_False ); //Also cut off the controls. + GetWin()->EnablePaint( false ); //Also cut off the controls. Imp()->LockPaint(); } @@ -439,7 +439,7 @@ void SwViewShell::ImplUnlockPaint( sal_Bool bVirDev ) aSize.Height()+= 20; if( pVout->SetOutputSize( aSize ) ) { - GetWin()->EnablePaint( sal_True ); + GetWin()->EnablePaint( true ); GetWin()->Validate(); Imp()->UnlockPaint(); @@ -465,7 +465,7 @@ void SwViewShell::ImplUnlockPaint( sal_Bool bVirDev ) else { Imp()->UnlockPaint(); - GetWin()->EnablePaint( sal_True ); + GetWin()->EnablePaint( true ); GetWin()->Invalidate( INVALIDATE_CHILDREN ); } delete pVout; @@ -473,7 +473,7 @@ void SwViewShell::ImplUnlockPaint( sal_Bool bVirDev ) else { Imp()->UnlockPaint(); - GetWin()->EnablePaint( sal_True ); + GetWin()->EnablePaint( true ); GetWin()->Invalidate( INVALIDATE_CHILDREN ); } } diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index 1f7f6f3b6a61..e345a6f78a13 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -193,7 +193,7 @@ void SwBreakDlg::CheckEnable() { m_pPageBtn->Enable(false); if(m_pPageBtn->IsChecked()) - m_pLineBtn->Check(sal_True); + m_pLineBtn->Check(true); bEnable = sal_False; } const sal_Bool bPage = m_pPageBtn->IsChecked(); diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index ea5147c9b77f..2e2c83bfb463 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -317,9 +317,9 @@ void SwDropCapsPict::UpdatePaintSettings( void ) maCJKFont.SetSize(Size(0, mnTextH)); maCTLFont.SetSize(Size(0, mnTextH)); - aFont.SetTransparent(sal_True); - maCJKFont.SetTransparent(sal_True); - maCTLFont.SetTransparent(sal_True); + aFont.SetTransparent(true); + maCJKFont.SetTransparent(true); + maCTLFont.SetTransparent(true); aFont.SetColor( SwViewOption::GetFontColor() ); maCJKFont.SetColor( SwViewOption::GetFontColor() ); diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 01b9e2dfc411..50acfdc6a1b8 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -209,7 +209,7 @@ void SwParagraphNumTabPage::Reset( const SfxItemSet& rSet ) m_pNewStartCB->SetState(rStart.GetValue() ? STATE_CHECK : STATE_NOCHECK ); - m_pNewStartCB->EnableTriState(sal_False); + m_pNewStartCB->EnableTriState(false); } else m_pNewStartCB->SetState(bHasNumberStyle ? STATE_NOCHECK : STATE_DONTKNOW); @@ -225,7 +225,7 @@ void SwParagraphNumTabPage::Reset( const SfxItemSet& rSet ) nNewStart = 1; m_pNewStartNF->SetValue(nNewStart); - m_pNewStartNumberCB->EnableTriState(sal_False); + m_pNewStartNumberCB->EnableTriState(false); } else m_pNewStartCB->SetState(STATE_DONTKNOW); @@ -242,8 +242,8 @@ void SwParagraphNumTabPage::Reset( const SfxItemSet& rSet ) m_pRestartParaCountCB->SetState( 0 != nStartValue ? STATE_CHECK : STATE_NOCHECK ); m_pRestartNF->SetValue(nStartValue == 0 ? 1 : nStartValue); LineCountHdl_Impl(m_pCountParaCB); - m_pCountParaCB->EnableTriState(sal_False); - m_pRestartParaCountCB->EnableTriState(sal_False); + m_pCountParaCB->EnableTriState(false); + m_pRestartParaCountCB->EnableTriState(false); } else { diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 994a2c9b3d34..6ab0257bd13a 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -457,7 +457,7 @@ IMPL_LINK_NOARG_INLINE_START(SwAddPrinterTabPage, AutoClickHdl) bAttrModified = sal_True; bool bIsProspect = m_pProspectCB->IsChecked(); if (!bIsProspect) - m_pProspectCB_RTL->Check( sal_False ); + m_pProspectCB_RTL->Check( false ); m_pProspectCB_RTL->Enable( bIsProspect ); m_pNoRB->Enable( !bIsProspect ); m_pOnlyRB->Enable( !bIsProspect ); @@ -1886,10 +1886,10 @@ void SwRedlineOptionsTabPage::Reset( const SfxItemSet& ) InitFontStyle(*pChangedPreviewWN); // initialise colour list box - pInsertColorLB->SetUpdateMode(sal_False); - pDeletedColorLB->SetUpdateMode(sal_False); - pChangedColorLB->SetUpdateMode(sal_False); - pMarkColorLB->SetUpdateMode(sal_False); + pInsertColorLB->SetUpdateMode(false); + pDeletedColorLB->SetUpdateMode(false); + pChangedColorLB->SetUpdateMode(false); + pMarkColorLB->SetUpdateMode(false); pInsertColorLB->InsertEntry(sNone); pDeletedColorLB->InsertEntry(sNone); pChangedColorLB->InsertEntry(sNone); @@ -1911,10 +1911,10 @@ void SwRedlineOptionsTabPage::Reset( const SfxItemSet& ) pChangedColorLB->InsertEntry( aColor, sName ); pMarkColorLB->InsertEntry( aColor, sName ); } - pInsertColorLB->SetUpdateMode( sal_True ); - pDeletedColorLB->SetUpdateMode( sal_True ); - pChangedColorLB->SetUpdateMode( sal_True ); - pMarkColorLB->SetUpdateMode( sal_True ); + pInsertColorLB->SetUpdateMode( true ); + pDeletedColorLB->SetUpdateMode( true ); + pChangedColorLB->SetUpdateMode( true ); + pMarkColorLB->SetUpdateMode( true ); ColorData nColor = rInsertAttr.nColor; diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index fdb7bc8069d4..bd5b36392a18 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -354,13 +354,13 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView, if( pView->GetWrtShell().GetTableFmt() ) { m_pRbAsTable->Enable( false ); - m_pRbAsField->Check( sal_True ); - m_pRbDbFmtFromDb->Check( sal_True ); + m_pRbAsField->Check( true ); + m_pRbDbFmtFromDb->Check( true ); } else { - m_pRbAsTable->Check( sal_True ); - m_pRbDbFmtFromDb->Check( sal_True ); + m_pRbAsTable->Check( true ); + m_pRbDbFmtFromDb->Check( true ); m_pIbDbcolOneFrom->Enable( false ); m_pIbDbcolAllFrom->Enable( false ); } @@ -475,8 +475,8 @@ IMPL_LINK( SwInsertDBColAutoPilot, DBFormatHdl, Button*, pButton ) IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton ) { sal_Bool bChgEnable = sal_True, bEnableTo = sal_True, bEnableFrom = sal_True; - m_pLbTblDbColumn->SetUpdateMode( sal_False ); - m_pLbTableCol->SetUpdateMode( sal_False ); + m_pLbTblDbColumn->SetUpdateMode( false ); + m_pLbTableCol->SetUpdateMode( false ); if( pButton == m_pIbDbcolAllTo ) { @@ -612,8 +612,8 @@ IMPL_LINK( SwInsertDBColAutoPilot, TblToFromHdl, Button*, pButton ) m_pPbTblFormat->Enable( bEnableFrom ); } - m_pLbTblDbColumn->SetUpdateMode( sal_True ); - m_pLbTableCol->SetUpdateMode( sal_True ); + m_pLbTblDbColumn->SetUpdateMode( true ); + m_pLbTableCol->SetUpdateMode( true ); return 0; } @@ -1820,7 +1820,7 @@ void SwInsertDBColAutoPilot::Load() // when the cursor is inside of a table, table must NEVER be selectable if( !m_pRbAsTable->IsEnabled() && m_pRbAsTable->IsChecked() ) - m_pRbAsField->Check( sal_True ); + m_pRbAsField->Check( true ); delete pNewData; break; } diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 18b97076239c..25880d41e879 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -1056,7 +1056,7 @@ IMPL_LINK(SwAssignFieldsControl, ScrollHdl_Impl, ScrollBar*, pScroll) // The first line has to be -(nThumb * m_nYOffset) in the negative long nMove = m_nFirstYPos - (*m_aMatches.begin())->GetPosPixel().Y() - (nThumb * m_nYOffset); - SetUpdateMode(sal_False); + SetUpdateMode(false); long nIndex; ::std::vector<FixedInfo*>::iterator aFIIter; for(nIndex = 0, aFIIter = m_aFieldNames.begin(); aFIIter != m_aFieldNames.end(); ++aFIIter, ++nIndex) @@ -1066,7 +1066,7 @@ IMPL_LINK(SwAssignFieldsControl, ScrollHdl_Impl, ScrollBar*, pScroll) lcl_Move(*aLBIter, nMove); for(nIndex = 0, aFIIter = m_aPreviews.begin(); aFIIter != m_aPreviews.end(); ++aFIIter, ++nIndex) lcl_Move(*aFIIter, nMove); - SetUpdateMode(sal_True); + SetUpdateMode(true); return 0; } @@ -1264,9 +1264,9 @@ AddressMultiLineEdit::AddressMultiLineEdit(Window* pParent, WinBits nBits) : VclMultiLineEdit(pParent, nBits) , m_pParentDialog(NULL) { - GetTextView()->SupportProtectAttribute(sal_True); + GetTextView()->SupportProtectAttribute(true); StartListening(*GetTextEngine()); - EnableFocusSelectionHide(sal_False); + EnableFocusSelectionHide(false); } Size AddressMultiLineEdit::GetOptimalSize() const @@ -1348,7 +1348,7 @@ void AddressMultiLineEdit::SetText( const OUString& rStr ) sal_Int32 nEnd = nStart == -1 ? -1 : sPara.indexOf( '>', nStart ); nIndex = nEnd; if(nStart != -1 && nEnd != -1) - pTextEngine->SetAttrib( aProtectAttr, nPara, nStart, nEnd + 1, sal_False ); + pTextEngine->SetAttrib( aProtectAttr, nPara, nStart, nEnd + 1, false ); else break; } diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 56063f809f1c..ca4c88d4fc7b 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -373,7 +373,7 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton) &m_aSendAllRB, &m_aSendDocumentsPB, 0 }; - SetUpdateMode(sal_True); + SetUpdateMode(true); Control** pControl = aControls; do { @@ -515,7 +515,7 @@ IMPL_LINK(SwMailMergeOutputPage, OutputTypeHdl_Impl, RadioButton*, pButton) } m_aFromRB.GetClickHdl().Call(m_aFromRB.IsChecked() ? &m_aFromRB : 0); - SetUpdateMode(sal_False); + SetUpdateMode(false); return 0; } diff --git a/sw/source/ui/dialog/swabstdlg.cxx b/sw/source/ui/dialog/swabstdlg.cxx index 74fde17d4721..dc459a802fd3 100644 --- a/sw/source/ui/dialog/swabstdlg.cxx +++ b/sw/source/ui/dialog/swabstdlg.cxx @@ -42,7 +42,7 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create() #if HAVE_FEATURE_DESKTOP #ifndef DISABLE_DYNLOADING static ::osl::Module aDialogLibrary; - static const OUString sLibName(::vcl::unohelper::CreateLibraryName("swui", sal_True)); + static const OUString sLibName(::vcl::unohelper::CreateLibraryName("swui", true)); if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName, SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) ) fp = ( SwAbstractDialogFactory* (SAL_CALL*)() ) diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 299abdbcaf9c..b98c01875e45 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -980,7 +980,7 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox ) if(!CheckPasswd(pBox)) return 0; SvTreeListEntry* pEntry = m_pTree->FirstSelected(); - pBox->EnableTriState(sal_False); + pBox->EnableTriState(false); sal_Bool bMulti = 1 < m_pTree->GetSelectionCount(); sal_Bool bFile = pBox->IsChecked(); if(pEntry) @@ -992,7 +992,7 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox ) if( pBox->IsChecked() && bContent && rSh.HasSelection() ) { if( RET_NO == QueryBox( this, SW_RES(QB_CONNECT) ).Execute() ) - pBox->Check( sal_False ); + pBox->Check( false ); } if( bFile ) pSectRepr->SetContent(false); @@ -1571,7 +1571,7 @@ SwInsertSectionTabPage::SwInsertSectionTabPage( m_pCurName->SetModifyHdl ( LINK( this, SwInsertSectionTabPage, NameEditHdl)); m_pDDECB->SetClickHdl ( LINK( this, SwInsertSectionTabPage, DDEHdl )); ChangeProtectHdl(m_pProtectCB); - m_pSubRegionED->EnableAutocomplete( sal_True, sal_True ); + m_pSubRegionED->EnableAutocomplete( true, true ); } SwInsertSectionTabPage::~SwInsertSectionTabPage() @@ -1728,7 +1728,7 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton ) } } else if(!bChange) - m_pPasswdCB->Check(sal_False); + m_pPasswdCB->Check(false); } } else @@ -1750,7 +1750,7 @@ IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox ) { if( m_pWrtSh->HasSelection() && RET_NO == QueryBox( this, SW_RES(QB_CONNECT) ).Execute() ) - pBox->Check( sal_False ); + pBox->Check( false ); } sal_Bool bFile = pBox->IsChecked(); @@ -1764,11 +1764,11 @@ IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox *, pBox ) if( bFile ) { m_pFileNameED->GrabFocus(); - m_pProtectCB->Check( sal_True ); + m_pProtectCB->Check( true ); } else { - m_pDDECB->Check(sal_False); + m_pDDECB->Check(false); DDEHdl(m_pDDECB); } return 0; diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx index 2e47c0699526..ff2e582ef461 100644 --- a/sw/source/ui/dialog/wordcountdialog.cxx +++ b/sw/source/ui/dialog/wordcountdialog.cxx @@ -67,7 +67,7 @@ void SwWordCountFloatDlg::SetValues(const SwDocStat& rCurrent, const SwDocStat& setValue(m_pDocCjkcharsFT, rDoc.nAsianWord); bool bShowCJK = (SvtCJKOptions().IsAnyEnabled() || rDoc.nAsianWord); - bool bToggleCJK = m_pCurrentCjkcharsFT->IsVisible() != static_cast<sal_Bool>(bShowCJK); + bool bToggleCJK = m_pCurrentCjkcharsFT->IsVisible() != bShowCJK; if (bToggleCJK) { showCJK(bShowCJK); diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx index ea591226326c..98dfcc7d5a73 100644 --- a/sw/source/ui/docvw/SidebarWin.cxx +++ b/sw/source/ui/docvw/SidebarWin.cxx @@ -332,7 +332,7 @@ void SwSidebarWin::InitControls() mpOutliner->SetUpdateMode( sal_True ); Rescale(); - mpSidebarTxtControl->EnableRTL( sal_False ); + mpSidebarTxtControl->EnableRTL( false ); mpOutlinerView = new OutlinerView ( mpOutliner, mpSidebarTxtControl ); mpOutlinerView->SetBackgroundColor(COL_TRANSPARENT); mpOutliner->InsertView(mpOutlinerView ); diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx index ea480007a844..024f3f2b6faa 100644 --- a/sw/source/ui/docvw/romenu.cxx +++ b/sw/source/ui/docvw/romenu.cxx @@ -63,7 +63,7 @@ void SwReadOnlyPopup::Check( sal_uInt16 nMID, sal_uInt16 nSID, SfxDispatcher &rD SfxItemState eState = rDis.GetBindings()->QueryState( nSID, _pItem ); if (eState >= SFX_ITEM_AVAILABLE) { - EnableItem( nMID, sal_True ); + EnableItem( nMID, true ); if (_pItem) { CheckItem ( nMID, !_pItem->ISA(SfxVoidItem) && @@ -71,11 +71,11 @@ void SwReadOnlyPopup::Check( sal_uInt16 nMID, sal_uInt16 nSID, SfxDispatcher &rD ((SfxBoolItem*)_pItem)->GetValue()); //remove full screen entry when not in full screen mode if( SID_WIN_FULLSCREEN == nSID && !IsItemChecked(SID_WIN_FULLSCREEN) ) - EnableItem(nMID, sal_False); + EnableItem(nMID, false); } } else - EnableItem( nMID, sal_False ); + EnableItem( nMID, false ); delete _pItem; } @@ -107,8 +107,8 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) : const Graphic *pGrf; if ( 0 == (pGrf = rSh.GetGrfAtPos( rDocPos, sGrfName, bLink )) ) { - EnableItem( MN_READONLY_SAVEGRAPHIC, sal_False ); - EnableItem( MN_READONLY_COPYGRAPHIC, sal_False ); + EnableItem( MN_READONLY_SAVEGRAPHIC, false ); + EnableItem( MN_READONLY_COPYGRAPHIC, false ); } else { @@ -180,7 +180,7 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) : if ( !rSh.GetViewOptions()->IsGraphic() ) CheckItem( MN_READONLY_GRAPHICOFF ); else - EnableItem( MN_READONLY_LOADGRAPHIC, sal_False ); + EnableItem( MN_READONLY_LOADGRAPHIC, false ); sal_Bool bReloadFrame = 0 != rSh.GetView().GetViewFrame()->GetFrame().GetParentFrame(); EnableItem( MN_READONLY_RELOAD_FRAME, @@ -203,7 +203,7 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) : SfxItemState eState = pVFrame->GetBindings().QueryState( SID_COPY, pState ); Check( MN_READONLY_COPY, SID_COPY, rDis ); if(eState < SFX_ITEM_AVAILABLE) - EnableItem( MN_READONLY_COPY, sal_False ); + EnableItem( MN_READONLY_COPY, false ); delete pState; pState = NULL; @@ -213,19 +213,19 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) : (rSh.IsGlobalDoc() && rView.GetDocShell()->IsReadOnlyUI()) ) { - EnableItem( MN_READONLY_EDITDOC, sal_False ); + EnableItem( MN_READONLY_EDITDOC, false ); } delete pState; if ( sURL.isEmpty() ) { - EnableItem( MN_READONLY_OPENURL, sal_False ); - EnableItem( MN_READONLY_OPENURLNEW, sal_False ); - EnableItem( MN_READONLY_COPYLINK, sal_False ); + EnableItem( MN_READONLY_OPENURL, false ); + EnableItem( MN_READONLY_OPENURLNEW, false ); + EnableItem( MN_READONLY_COPYLINK, false ); } Check( SID_WIN_FULLSCREEN, SID_WIN_FULLSCREEN, rDis ); - RemoveDisabledEntries( sal_True, sal_True ); + RemoveDisabledEntries( true, true ); } void SwReadOnlyPopup::Execute( Window* pWin, const Point &rPixPos ) diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index dfa45a108145..7242dcbb97a0 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -501,14 +501,14 @@ void SwSrcEditWindow::CreateTextEngine() pTextEngine = new ExtTextEngine; pTextView = new ExtTextView( pTextEngine, pOutWin ); - pTextView->SetAutoIndentMode(sal_True); + pTextView->SetAutoIndentMode(true); pOutWin->SetTextView(pTextView); - pTextEngine->SetUpdateMode( sal_False ); + pTextEngine->SetUpdateMode( false ); pTextEngine->InsertView( pTextView ); Font aFont; - aFont.SetTransparent( sal_False ); + aFont.SetTransparent( false ); aFont.SetFillColor( rCol ); SetPointFont( aFont ); aFont = GetFont(); @@ -519,10 +519,10 @@ void SwSrcEditWindow::CreateTextEngine() aSyntaxIdleTimer.SetTimeout( SYNTAX_HIGHLIGHT_TIMEOUT ); aSyntaxIdleTimer.SetTimeoutHdl( LINK( this, SwSrcEditWindow, SyntaxTimerHdl ) ); - pTextEngine->EnableUndo( sal_True ); - pTextEngine->SetUpdateMode( sal_True ); + pTextEngine->EnableUndo( true ); + pTextEngine->SetUpdateMode( true ); - pTextView->ShowCursor( sal_True, sal_True ); + pTextView->ShowCursor( true, true ); InitScrollBars(); StartListening( *pTextEngine ); @@ -560,14 +560,14 @@ IMPL_LINK(SwSrcEditWindow, ScrollHdl, ScrollBar*, pScroll) { long nDiff = pTextView->GetStartDocPos().Y() - pScroll->GetThumbPos(); GetTextView()->Scroll( 0, nDiff ); - pTextView->ShowCursor( sal_False, sal_True ); + pTextView->ShowCursor( false, true ); pScroll->SetThumbPos( pTextView->GetStartDocPos().Y() ); } else { long nDiff = pTextView->GetStartDocPos().X() - pScroll->GetThumbPos(); GetTextView()->Scroll( nDiff, 0 ); - pTextView->ShowCursor( sal_False, sal_True ); + pTextView->ShowCursor( false, true ); pScroll->SetThumbPos( pTextView->GetStartDocPos().X() ); } GetSrcView()->GetViewFrame()->GetBindings().Invalidate( SID_TABLE_CELL ); @@ -640,17 +640,17 @@ void SwSrcEditWindow::DoSyntaxHighlight( sal_uInt16 nPara ) if ( nPara < pTextEngine->GetParagraphCount() ) { sal_Bool bTempModified = IsModified(); - pTextEngine->RemoveAttribs( nPara, (sal_Bool)sal_True ); + pTextEngine->RemoveAttribs( nPara, true ); OUString aSource( pTextEngine->GetText( nPara ) ); - pTextEngine->SetUpdateMode( sal_False ); + pTextEngine->SetUpdateMode( false ); ImpDoHighlight( aSource, nPara ); TextView* pTmp = pTextEngine->GetActiveView(); - pTmp->SetAutoScroll(sal_False); + pTmp->SetAutoScroll(false); pTextEngine->SetActiveView(0); - pTextEngine->SetUpdateMode( sal_True ); + pTextEngine->SetUpdateMode( true ); pTextEngine->SetActiveView(pTmp); - pTmp->SetAutoScroll(sal_True); - pTmp->ShowCursor( sal_False/*pTmp->IsAutoScroll()*/ ); + pTmp->SetAutoScroll(true); + pTmp->ShowCursor( false/*pTmp->IsAutoScroll()*/ ); if(!bTempModified) ClearModifyFlag(); @@ -723,7 +723,7 @@ void SwSrcEditWindow::ImpDoHighlight( const OUString& rSource, sal_uInt16 nLineO r.eType = svtools::HTMLUNKNOWN; Color aColor((ColorData)SW_MOD()->GetColorConfig().GetColorValue((svtools::ColorConfigEntry)r.eType).nColor); sal_uInt16 nLine = nLineOff+r.nLine; // - pTextEngine->SetAttrib( TextAttribFontColor( aColor ), nLine, r.nStart, r.nEnd+1, sal_True ); + pTextEngine->SetAttrib( TextAttribFontColor( aColor ), nLine, r.nStart, r.nEnd+1, true ); } } diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 96460837d4e4..92a2475c832b 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -63,7 +63,7 @@ SwLabPreview::SwLabPreview(Window* pParent) SetBackground(Wallpaper(rWinColor)); Font aFont = GetFont(); - aFont.SetTransparent(sal_True); + aFont.SetTransparent(true); aFont.SetWeight (WEIGHT_NORMAL); SetFont(aFont); @@ -116,7 +116,7 @@ void SwLabPreview::Paint(const Rectangle &) SetLineColor(rWinColor); SetFillColor(aGrayColor); Font aPaintFont(GetFont()); - aPaintFont.SetTransparent(sal_False); + aPaintFont.SetTransparent(false); SetFont(aPaintFont); // size of region to be displayed diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 2e99e6d329b9..4481082cf362 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -319,7 +319,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell, aFormatHtmlCB.Check((nMailingMode & TXTFORMAT_HTML) != 0); aFormatRtfCB.Check((nMailingMode & TXTFORMAT_RTF) != 0); - aAllRB.Check(sal_True); + aAllRB.Check(true); // Install handlers Link aLk = LINK(this, SwMailMergeDlg, ButtonHdl); diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index f478d42468ce..82372d200867 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -81,7 +81,7 @@ void SwFldDBPage::Reset(const SfxItemSet&) { Init(); // Allgemeine initialisierung - m_pTypeLB->SetUpdateMode(sal_False); + m_pTypeLB->SetUpdateMode(false); sal_uInt16 nOldPos = m_pTypeLB->GetSelectEntryPos(); m_sOldDBName = m_pDatabaseTLB->GetDBName(m_sOldTableName, m_sOldColumnName); @@ -166,7 +166,7 @@ void SwFldDBPage::Reset(const SfxItemSet&) } TypeHdl(0); - m_pTypeLB->SetUpdateMode(sal_True); + m_pTypeLB->SetUpdateMode(true); m_pTypeLB->SetSelectHdl(LINK(this, SwFldDBPage, TypeHdl)); m_pTypeLB->SetDoubleClickHdl(LINK(this, SwFldDBPage, InsertHdl)); diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index e83684580f38..bc76e4109df0 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -88,7 +88,7 @@ void SwFldDokPage::Reset(const SfxItemSet& ) // initialise TypeListBox const SwFldGroupRgn& rRg = GetFldMgr().GetGroupRange(IsFldDlgHtmlMode(), GetGroup()); - m_pTypeLB->SetUpdateMode(sal_False); + m_pTypeLB->SetUpdateMode(false); m_pTypeLB->Clear(); sal_uInt16 nPos, nTypeId; @@ -146,7 +146,7 @@ void SwFldDokPage::Reset(const SfxItemSet& ) // select old Pos RestorePos(m_pTypeLB); - m_pTypeLB->SetUpdateMode(sal_True); + m_pTypeLB->SetUpdateMode(true); m_pTypeLB->SetDoubleClickHdl(LINK(this, SwFldDokPage, InsertHdl)); m_pTypeLB->SetSelectHdl(LINK(this, SwFldDokPage, TypeHdl)); m_pFormatLB->SetSelectHdl(LINK(this, SwFldDokPage, FormatHdl)); diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 3e0acd623a08..101f58f35740 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -99,7 +99,7 @@ void SwFldFuncPage::Reset(const SfxItemSet& ) SavePos(m_pTypeLB); Init(); // general initialisation - m_pTypeLB->SetUpdateMode(sal_False); + m_pTypeLB->SetUpdateMode(false); m_pTypeLB->Clear(); sal_uInt16 nPos, nTypeId; @@ -169,7 +169,7 @@ void SwFldFuncPage::Reset(const SfxItemSet& ) } TypeHdl(0); - m_pTypeLB->SetUpdateMode(sal_True); + m_pTypeLB->SetUpdateMode(true); if (IsFldEdit()) { @@ -396,7 +396,7 @@ IMPL_LINK_NOARG(SwFldFuncPage, InsertMacroHdl) IMPL_LINK( SwFldFuncPage, ListModifyHdl, Control*, pControl) { - m_pListItemsLB->SetUpdateMode(sal_False); + m_pListItemsLB->SetUpdateMode(false); if(pControl == m_pListAddPB || (pControl == m_pListItemED && m_pListAddPB->IsEnabled())) { @@ -436,7 +436,7 @@ IMPL_LINK( SwFldFuncPage, ListModifyHdl, Control*, pControl) } } bDropDownLBChanged = true; - m_pListItemsLB->SetUpdateMode(sal_True); + m_pListItemsLB->SetUpdateMode(true); ListEnableHdl(0); return 0; } @@ -463,7 +463,7 @@ void SwFldFuncPage::UpdateSubType() sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel()); // fill Selction-Listbox - m_pSelectionLB->SetUpdateMode(sal_False); + m_pSelectionLB->SetUpdateMode(false); m_pSelectionLB->Clear(); std::vector<OUString> aLst; @@ -497,7 +497,7 @@ void SwFldFuncPage::UpdateSubType() EnableInsert(bHasMacro); } - m_pSelectionLB->SetUpdateMode(sal_True); + m_pSelectionLB->SetUpdateMode(true); } /*-------------------------------------------------------------------- diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 7798e2eadea4..ccd742513f85 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -166,7 +166,7 @@ void SwFldRefPage::Reset(const SfxItemSet& ) Init(); // general initialisation // initialise TypeListBox - m_pTypeLB->SetUpdateMode(sal_False); + m_pTypeLB->SetUpdateMode(false); m_pTypeLB->Clear(); // fill Type-Listbox @@ -233,7 +233,7 @@ void SwFldRefPage::Reset(const SfxItemSet& ) if (!IsFldEdit()) RestorePos(m_pTypeLB); - m_pTypeLB->SetUpdateMode(sal_True); + m_pTypeLB->SetUpdateMode(true); nFldDlgFmtSel = 0; @@ -477,7 +477,7 @@ void SwFldRefPage::UpdateSubType() if (IsFldEdit() && sOldSel.isEmpty()) sOldSel = OUString::number( pRefFld->GetSeqNo() + 1 ); - m_pSelectionLB->SetUpdateMode(sal_False); + m_pSelectionLB->SetUpdateMode(false); m_pSelectionLB->Clear(); // #i83479# m_pSelectionToolTipLB->SetUpdateMode(sal_False); @@ -650,7 +650,7 @@ void SwFldRefPage::UpdateSubType() } else { - m_pSelectionLB->SetUpdateMode(sal_True); + m_pSelectionLB->SetUpdateMode(true); // enable or disable bool bEnable = m_pSelectionLB->GetEntryCount() != 0; diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 47d8e95848de..32b3ab1410dd 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -109,7 +109,7 @@ SwFldDlg::~SwFldDlg() { } -sal_Bool SwFldDlg::Close() +bool SwFldDlg::Close() { m_pBindings->GetDispatcher()-> Execute(m_bDataBaseMode ? FN_INSERT_FIELD_DATA_ONLY : FN_INSERT_FIELD, diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index ecd296a3c3d7..7e90bec09d6f 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -93,7 +93,7 @@ void SwFldVarPage::Reset(const SfxItemSet& ) Init(); // general initialisation - m_pTypeLB->SetUpdateMode(sal_False); + m_pTypeLB->SetUpdateMode(false); m_pTypeLB->Clear(); sal_uInt16 nPos, nTypeId; @@ -165,7 +165,7 @@ void SwFldVarPage::Reset(const SfxItemSet& ) } TypeHdl(0); - m_pTypeLB->SetUpdateMode(sal_True); + m_pTypeLB->SetUpdateMode(true); if (IsFldEdit()) { @@ -233,8 +233,8 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) if (m_pValueFT->GetText() != OUString(sOldValueFT)) m_pValueFT->SetText(sOldValueFT); - m_pNumFormatLB->SetUpdateMode(sal_False); - m_pFormatLB->SetUpdateMode(sal_False); + m_pNumFormatLB->SetUpdateMode(false); + m_pFormatLB->SetUpdateMode(false); FillFormatLB(nTypeId); sal_uInt16 nSize = m_pFormatLB->GetEntryCount(); @@ -532,8 +532,8 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) ModifyHdl(); // apply/insert/delete status update - m_pNumFormatLB->SetUpdateMode(sal_True); - m_pFormatLB->SetUpdateMode(sal_True); + m_pNumFormatLB->SetUpdateMode(true); + m_pFormatLB->SetUpdateMode(true); if(m_pSelectionLB->IsCallAddSelection()) { @@ -574,7 +574,7 @@ void SwFldVarPage::UpdateSubType() sOldSel = m_pSelectionLB->GetEntry(GetSelectionSel()); // fill Selection-Listbox - m_pSelectionLB->SetUpdateMode(sal_False); + m_pSelectionLB->SetUpdateMode(false); m_pSelectionLB->Clear(); std::vector<OUString> aList; @@ -663,7 +663,7 @@ void SwFldVarPage::UpdateSubType() m_pSelection->Enable(bEnable); SubTypeHdl(pLB); - m_pSelectionLB->SetUpdateMode(sal_True); + m_pSelectionLB->SetUpdateMode(true); } sal_uInt16 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId) diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 239aaa6f5ed9..b851e939950d 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -540,14 +540,14 @@ SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet) if ( pColorList.is() ) { - m_pLineColorDLB->SetUpdateMode( sal_False ); + m_pLineColorDLB->SetUpdateMode( false ); for (long i = 0; i < pColorList->Count(); ++i ) { XColorEntry* pEntry = pColorList->GetColor(i); m_pLineColorDLB->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); } - m_pLineColorDLB->SetUpdateMode( sal_True ); + m_pLineColorDLB->SetUpdateMode( true ); } m_pLineColorDLB->SelectEntryPos( 0 ); } @@ -614,7 +614,7 @@ void SwColumnPage::Reset(const SfxItemSet &rSet) if( SFX_ITEM_SET == rSet.GetItemState( RES_COLUMNBALANCE, false, &pItem )) m_pBalanceColsCB->Check(!((const SwFmtNoBalancedColumns*)pItem)->GetValue()); else - m_pBalanceColsCB->Check( sal_True ); + m_pBalanceColsCB->Check( true ); } //text direction @@ -1313,7 +1313,7 @@ IMPL_LINK( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS ) { bLockUpdate = true; m_pCLNrEdt->SetValue( 2 ); - m_pAutoWidthBox->Check(sal_False); + m_pAutoWidthBox->Check(false); aDistEd1.SetPrcntValue(0); ColModify(0); // now set the width ratio to 2 : 1 or 1 : 2 respectively diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index fe19d66868f8..10dfa30f8f3b 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -921,7 +921,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) } if ( sDlgType == "PictureDialog" ) - m_pFixedRatioCB->Check( sal_False ); + m_pFixedRatioCB->Check( false ); else { if ( bNew ) @@ -2325,18 +2325,18 @@ void SwFrmPage::Init(const SfxItemSet& rSet, sal_Bool bReset) RangeModifyHdl(&m_aWidthED); // set reference values (for 100%) if (rSize.GetWidthPercent() == 0xff || rSize.GetHeightPercent() == 0xff) - m_pFixedRatioCB->Check(sal_True); + m_pFixedRatioCB->Check(true); if (rSize.GetWidthPercent() && rSize.GetWidthPercent() != 0xff && !m_pRelWidthCB->IsChecked()) { - m_pRelWidthCB->Check(sal_True); + m_pRelWidthCB->Check(true); RelSizeClickHdl(m_pRelWidthCB); m_aWidthED.SetPrcntValue(rSize.GetWidthPercent(), FUNIT_CUSTOM); } if (rSize.GetHeightPercent() && rSize.GetHeightPercent() != 0xff && !m_pRelHeightCB->IsChecked()) { - m_pRelHeightCB->Check(sal_True); + m_pRelHeightCB->Check(true); RelSizeClickHdl(m_pRelHeightCB); m_aHeightED.SetPrcntValue(rSize.GetHeightPercent(), FUNIT_CUSTOM); } @@ -2450,10 +2450,10 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet) switch( eMirror ) { case RES_MIRROR_GRAPH_DONT: break; - case RES_MIRROR_GRAPH_VERT: m_pMirrorHorzBox->Check(sal_True); break; - case RES_MIRROR_GRAPH_HOR: m_pMirrorVertBox->Check(sal_True); break; - case RES_MIRROR_GRAPH_BOTH: m_pMirrorHorzBox->Check(sal_True); - m_pMirrorVertBox->Check(sal_True); + case RES_MIRROR_GRAPH_VERT: m_pMirrorHorzBox->Check(true); break; + case RES_MIRROR_GRAPH_HOR: m_pMirrorVertBox->Check(true); break; + case RES_MIRROR_GRAPH_BOTH: m_pMirrorHorzBox->Check(true); + m_pMirrorVertBox->Check(true); break; default: ; @@ -2469,7 +2469,7 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet) { case 1: // mirror at left / even pages m_pLeftPagesRB->Check(); - m_pMirrorHorzBox->Check(sal_True); + m_pMirrorHorzBox->Check(true); break; case 2: // mirror on all pages m_pAllPagesRB->Check(); @@ -2591,8 +2591,8 @@ IMPL_LINK_NOARG(SwGrfExtPage, BrowseHdl) m_pConnectED->SetText( aNewGrfName ); //reset mirrors because maybe a Bitmap was swapped with //another type of graphic that cannot be mirrored. - m_pMirrorVertBox->Check(sal_False); - m_pMirrorHorzBox->Check(sal_False); + m_pMirrorVertBox->Check(false); + m_pMirrorHorzBox->Check(false); m_pAllPagesRB->Enable(false); m_pLeftPagesRB->Enable(false); m_pRightPagesRB->Enable(false); diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index ab59a3327d8f..2e6bec7f258b 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -518,7 +518,7 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet) if(m_pNoWrapRB->IsChecked() && !m_pNoWrapRB->IsEnabled()) { if(m_pWrapThroughRB->IsEnabled()) - m_pWrapThroughRB->Check(sal_True); + m_pWrapThroughRB->Check(true); else if(m_pWrapLeftRB->IsEnabled()) m_pWrapLeftRB->Check(); else if(m_pWrapRightRB->IsEnabled()) diff --git a/sw/source/ui/inc/fldtdlg.hxx b/sw/source/ui/inc/fldtdlg.hxx index 485eaf66ef56..4835a4afb054 100644 --- a/sw/source/ui/inc/fldtdlg.hxx +++ b/sw/source/ui/inc/fldtdlg.hxx @@ -38,7 +38,7 @@ class SwFldDlg: public SfxTabDialog sal_uInt16 m_nFuncId; sal_uInt16 m_nDbId; - virtual sal_Bool Close(); + virtual bool Close(); virtual SfxItemSet* CreateInputItemSet( sal_uInt16 nId ); virtual void Activate(); virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage); diff --git a/sw/source/ui/inc/srcedtw.hxx b/sw/source/ui/inc/srcedtw.hxx index 2db653685d7d..8f4012009def 100644 --- a/sw/source/ui/inc/srcedtw.hxx +++ b/sw/source/ui/inc/srcedtw.hxx @@ -122,9 +122,9 @@ public: void SetScrollBarRanges(); void InitScrollBars(); sal_uLong Read( SvStream& rInput) - {return pTextEngine->Read(rInput);} + {return pTextEngine->Read(rInput) ? 1 : 0;} sal_uLong Write( SvStream& rOutput) - {return pTextEngine->Write(rOutput);} + {return pTextEngine->Write(rOutput) ? 1 : 0;} ExtTextView* GetTextView() {return pTextView;} @@ -137,7 +137,7 @@ public: virtual void Invalidate( sal_uInt16 nFlags = 0 ); void ClearModifyFlag() - { pTextEngine->SetModified(sal_False); } + { pTextEngine->SetModified(false); } sal_Bool IsModified() const { return pTextEngine->IsModified();} void CreateScrollbars(); diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 6c8128c32851..f1d656e0847f 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -515,11 +515,11 @@ public: int CreateTab(); int KillTab(); - int StatVRuler() const { return ((Window*)m_pVRuler)->IsVisible(); } + bool StatVRuler() const { return ((Window*)m_pVRuler)->IsVisible(); } void ChangeVRulerMetric(FieldUnit eUnit); void GetVRulerMetric(FieldUnit& rToFill) const; - int StatTab() const { return ((Window*)m_pHRuler)->IsVisible(); } + bool StatTab() const { return ((Window*)m_pHRuler)->IsVisible(); } SvxRuler& GetHRuler() { return *m_pHRuler; } SvxRuler& GetVRuler() { return *m_pVRuler; } void InvalidateRulerPos(); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 7a0173b86c23..7906d5382c48 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1370,7 +1370,7 @@ IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, CheckBox*, pBox ) if(!m_pAddStylesCB->IsChecked() && !m_pFromHeadingsCB->IsChecked() && !m_pTOXMarksCB->IsChecked()) { //TODO: InfoBox? - pBox->Check(sal_True); + pBox->Check(true); } m_pAddStylesPB->Enable(m_pAddStylesCB->IsChecked()); } @@ -3080,7 +3080,7 @@ void SwTokenWindow::InsertAtSelection(const OUString& rText, const SwFormToken& Size aEditSize(GetOutputSizePixel()); aEditSize.Width() = pButton->GetTextWidth(rText) + 5; pButton->SetSizePixel(aEditSize); - pButton->Check(sal_True); + pButton->Check(true); pButton->Show(); SetActiveControl(pButton); @@ -3811,7 +3811,7 @@ SwEntryBrowseBox::SwEntryBrowseBox(Window* pParent, VclBuilderContainer* pBuilde sYes = pBuilder->get<Window>("yes")->GetText(); sNo = pBuilder->get<Window>("no")->GetText(); - aCellCheckBox.GetBox().EnableTriState(sal_False); + aCellCheckBox.GetBox().EnableTriState(false); xController = new ::svt::EditCellController(&aCellEdit); xCheckController = new ::svt::CheckBoxCellController(&aCellCheckBox); diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index d29df7439cf4..23e67afed334 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -1309,7 +1309,7 @@ IMPL_LINK(SwAuthorMarkPane, CreateEntryHdl, PushButton*, pButton) } if(bNewEntry && !m_pFromDocContentRB->IsChecked()) { - m_pFromDocContentRB->Check(sal_True); + m_pFromDocContentRB->Check(true); ChangeSourceHdl(m_pFromDocContentRB); } if(bCreate) diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index f3db53ed8fd8..c2591a4966ac 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -213,7 +213,7 @@ void SwSpellPopup::fillLangPopupMenu( if (aEntryTxt == aCurLang) { //make a check mark for the current language - pPopupMenu->CheckItem( nItemId, sal_True ); + pPopupMenu->CheckItem( nItemId, true ); } rLangTable[ nItemId ] = aEntryTxt; ++nItemId; @@ -222,7 +222,7 @@ void SwSpellPopup::fillLangPopupMenu( pPopupMenu->InsertItem( nLangItemIdStart + MN_NONE_OFFSET, OUString(SW_RES( STR_LANGSTATUS_NONE )), MIB_RADIOCHECK ); if ( aLanguageTable.GetString( LANGUAGE_NONE ) == aCurLang ) - pPopupMenu->CheckItem( nLangItemIdStart + MN_NONE_OFFSET, sal_True ); + pPopupMenu->CheckItem( nLangItemIdStart + MN_NONE_OFFSET, true ); pPopupMenu->InsertItem( nLangItemIdStart + MN_RESET_OFFSET, OUString(SW_RES( STR_RESET_TO_DEFAULT_LANGUAGE )), 0 ); pPopupMenu->InsertItem( nLangItemIdStart + MN_MORE_OFFSET, OUString(SW_RES( STR_LANGSTATUS_MORE )), 0 ); @@ -456,7 +456,7 @@ SwSpellPopup::SwSpellPopup( ////////////////////////////////////////////////////////////////////////////////// checkRedline(); - RemoveDisabledEntries( sal_True, sal_True ); + RemoveDisabledEntries( true, true ); } @@ -610,7 +610,7 @@ m_aInfo16( SW_RES(IMG_INFO_16) ) ////////////////////////////////////////////////////////////////////////////////// checkRedline(); - RemoveDisabledEntries( sal_True, sal_True ); + RemoveDisabledEntries( true, true ); } void SwSpellPopup::checkRedline() diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index f60d28d2e8ff..c242903023d1 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -131,8 +131,8 @@ SwInsertBookmarkDlg::SwInsertBookmarkDlg( Window *pParent, SwWrtShell &rS, SfxRe get(m_pDeleteBtn, "delete"); m_pBookmarkBox->SetModifyHdl(LINK(this, SwInsertBookmarkDlg, ModifyHdl)); - m_pBookmarkBox->EnableMultiSelection(sal_True); - m_pBookmarkBox->EnableAutocomplete( sal_True, sal_True ); + m_pBookmarkBox->EnableMultiSelection(true); + m_pBookmarkBox->EnableAutocomplete( true, true ); m_pDeleteBtn->SetClickHdl(LINK(this, SwInsertBookmarkDlg, DeleteHdl)); diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx index 20c8f58da0d8..308512077dab 100644 --- a/sw/source/ui/misc/insfnote.cxx +++ b/sw/source/ui/misc/insfnote.cxx @@ -96,7 +96,7 @@ IMPL_LINK_NOARG_INLINE_END(SwInsFootNoteDlg, NumberCharHdl) IMPL_LINK_NOARG_INLINE_START(SwInsFootNoteDlg, NumberEditHdl) { - m_pNumberCharBtn->Check( sal_True ); + m_pNumberCharBtn->Check( true ); m_pOkBtn->Enable( !m_pNumberCharEdit->GetText().isEmpty() ); return 0; @@ -112,7 +112,7 @@ IMPL_LINK_NOARG_INLINE_END(SwInsFootNoteDlg, NumberAutoBtnHdl) IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberExtCharHdl) { - m_pNumberCharBtn->Check( sal_True ); + m_pNumberCharBtn->Check( true ); SfxItemSet aSet( rSh.GetAttrPool(), RES_CHRATR_FONT, RES_CHRATR_FONT ); rSh.GetCurAttr( aSet ); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 7c7a3b0ea6d3..b66e726d2546 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -378,17 +378,17 @@ void SwNumPositionTabPage::ActivatePage(const SfxItemSet& ) *pActNum = *pSaveNum; nActNumLvl = nTmpNumLvl; sal_uInt16 nMask = 1; - m_pLevelLB->SetUpdateMode(sal_False); + m_pLevelLB->SetUpdateMode(false); m_pLevelLB->SetNoSelection(); m_pLevelLB->SelectEntryPos( MAXLEVEL, nActNumLvl == USHRT_MAX); if(nActNumLvl != USHRT_MAX) for(sal_uInt16 i = 0; i < MAXLEVEL; i++) { if(nActNumLvl & nMask) - m_pLevelLB->SelectEntryPos( i, sal_True); + m_pLevelLB->SelectEntryPos( i, true); nMask <<= 1 ; } - m_pLevelLB->SetUpdateMode(sal_True); + m_pLevelLB->SetUpdateMode(true); InitPosAndSpaceMode(); ShowControlsDependingOnPosAndSpaceMode(); @@ -427,27 +427,27 @@ void SwNumPositionTabPage::Reset( const SfxItemSet& rSet ) if(pOutlineDlg) { pSaveNum = pOutlineDlg->GetNumRule(); - m_pLevelLB->EnableMultiSelection(sal_False); + m_pLevelLB->EnableMultiSelection(false); } else if(SFX_ITEM_SET == rSet.GetItemState(FN_PARAM_ACT_NUMBER, false, &pItem)) pSaveNum = ((SwUINumRuleItem*)pItem)->GetNumRule(); nActNumLvl = SwOutlineTabDialog::GetActNumLevel(); sal_uInt16 nMask = 1; - m_pLevelLB->SetUpdateMode(sal_False); + m_pLevelLB->SetUpdateMode(false); m_pLevelLB->SetNoSelection(); if(nActNumLvl == USHRT_MAX) { - m_pLevelLB->SelectEntryPos( MAXLEVEL, sal_True); + m_pLevelLB->SelectEntryPos( MAXLEVEL, true); } else for(sal_uInt16 i = 0; i < MAXLEVEL; i++) { if(nActNumLvl & nMask) - m_pLevelLB->SelectEntryPos( i, sal_True); + m_pLevelLB->SelectEntryPos( i, true); nMask <<= 1; } - m_pLevelLB->SetUpdateMode(sal_True); + m_pLevelLB->SetUpdateMode(true); if(!pActNum) pActNum = new SwNumRule(*pSaveNum); @@ -593,10 +593,10 @@ IMPL_LINK( SwNumPositionTabPage, LevelHdl, ListBox *, pBox ) (pBox->GetSelectEntryCount() == 1 || nSaveNumLvl != 0xffff)) { nActNumLvl = 0xFFFF; - pBox->SetUpdateMode(sal_False); + pBox->SetUpdateMode(false); for( sal_uInt16 i = 0; i < MAXLEVEL; i++ ) - pBox->SelectEntryPos( i, sal_False ); - pBox->SetUpdateMode(sal_True); + pBox->SelectEntryPos( i, false ); + pBox->SetUpdateMode(true); } else if(pBox->GetSelectEntryCount()) { @@ -607,7 +607,7 @@ IMPL_LINK( SwNumPositionTabPage, LevelHdl, ListBox *, pBox ) nActNumLvl |= nMask; nMask <<= 1; } - pBox->SelectEntryPos( MAXLEVEL, sal_False ); + pBox->SelectEntryPos( MAXLEVEL, false ); } else { diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 4c4a7e0526b9..3f35e7e5b4ad 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -853,7 +853,7 @@ static sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev, Font aFont(*rFmt.GetBulletFont()); aFont.SetSize(rSize); - aFont.SetTransparent(sal_True); + aFont.SetTransparent(true); pVDev->SetFont( aFont ); OUString aText(rFmt.GetBulletChar()); pVDev->DrawText( Point(nXStart, nYStart), aText ); diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 3b353553f9c6..15a0e8e39183 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -167,11 +167,11 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet) if(lHeight) { m_pMaxHeightEdit->SetValue(m_pMaxHeightEdit->Normalize(lHeight),FUNIT_TWIP); - m_pMaxHeightBtn->Check(sal_True); + m_pMaxHeightBtn->Check(true); } else { - m_pMaxHeightPageBtn->Check(sal_True); + m_pMaxHeightPageBtn->Check(true); m_pMaxHeightEdit->Enable(false); } m_pMaxHeightPageBtn->SetClickHdl(LINK(this,SwFootNotePage,HeightPage)); @@ -222,14 +222,14 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet) if ( pColorList.is() ) { - m_pLineColorBox->SetUpdateMode( sal_False ); + m_pLineColorBox->SetUpdateMode( false ); for ( long i = 0; i < pColorList->Count(); ++i ) { XColorEntry* pEntry = pColorList->GetColor(i); m_pLineColorBox->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); } - m_pLineColorBox->SetUpdateMode( sal_True ); + m_pLineColorBox->SetUpdateMode( true ); } // select color in the list or add it as a user color diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index d498e0887182..3b252f977497 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -116,7 +116,7 @@ SwTextGridPage::SwTextGridPage(Window *pParent, const SfxItemSet &rSet) : OUString sName = pEntry->GetName(); m_pColorLB->InsertEntry( aColor, sName ); } - m_pColorLB->SetUpdateMode( sal_True ); + m_pColorLB->SetUpdateMode( true ); //Get the default paper mode SwView *pView = ::GetActiveView(); if( pView ) diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index c2638659f8c4..9feb5670c7ee 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -1033,7 +1033,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl) if (pSubMenu) { for (sal_uInt16 i = MN_SORT_ACTION; i < MN_SORT_ACTION + 5; i++) - pSubMenu->CheckItem(i, sal_False); + pSubMenu->CheckItem(i, false); pSubMenu->CheckItem(nColumn + MN_SORT_ACTION); } diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 2acd12d39715..3eb2e52cb831 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -174,7 +174,7 @@ SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell) else { m_pColumnRB->Enable(false); - m_pRowRB->Check(sal_True); + m_pRowRB->Check(true); m_pColLbl->SetText(aColTxt); } @@ -223,7 +223,7 @@ SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell) if(!m_pDelimTabRB->IsChecked()) { m_pDelimEdt->SetText(OUString(cDeli)); - m_pDelimFreeRB->Check(sal_True); + m_pDelimFreeRB->Check(true); DelimHdl(m_pDelimFreeRB); } else @@ -414,7 +414,7 @@ IMPL_LINK( SwSortDlg, CheckHdl, CheckBox *, pCheck ) else if(!m_pKeyCB1->IsChecked() && !m_pKeyCB2->IsChecked() && !m_pKeyCB3->IsChecked()) - pCheck->Check(sal_True); + pCheck->Check(true); return 0; } diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index 54b34de75fe3..184cf6d5f316 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -108,7 +108,7 @@ void SwTbxInsertCtrl::StateChanged( sal_uInt16 /*nSID*/, ToolBox& rBox = GetToolBox(); Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() ); rBox.SetItemImage(GetId(), aImage); - rBox.SetItemImageMirrorMode( GetId(), sal_False ); + rBox.SetItemImageMirrorMode( GetId(), false ); rBox.SetItemImageAngle( GetId(), pItem->GetRotation() ); rBox.SetItemImageMirrorMode( GetId(), pItem->IsMirrored() ); } @@ -216,13 +216,13 @@ SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow() } ToolBox* pToolBox = &GetToolBox(); sal_uInt16 nId = GetId(); - pToolBox->SetItemDown( nId, sal_True ); + pToolBox->SetItemDown( nId, true ); pPopup->Execute( pToolBox, pToolBox->GetItemRect( nId ), (pToolBox->GetAlign() == WINDOWALIGN_TOP || pToolBox->GetAlign() == WINDOWALIGN_BOTTOM) ? POPUPMENU_EXECUTE_DOWN : POPUPMENU_EXECUTE_RIGHT ); - pToolBox->SetItemDown( nId, sal_False ); + pToolBox->SetItemDown( nId, false ); } GetToolBox().EndSelection(); DelPopup(); @@ -322,13 +322,13 @@ SfxPopupWindow* SwTbxFieldCtrl::CreatePopupWindow() } ToolBox* pToolBox = &GetToolBox(); sal_uInt16 nId = GetId(); - pToolBox->SetItemDown( nId, sal_True ); + pToolBox->SetItemDown( nId, true ); pPopup->Execute( pToolBox, pToolBox->GetItemRect( nId ), (pToolBox->GetAlign() == WINDOWALIGN_TOP || pToolBox->GetAlign() == WINDOWALIGN_BOTTOM) ? POPUPMENU_EXECUTE_DOWN : POPUPMENU_EXECUTE_RIGHT ); - pToolBox->SetItemDown( nId, sal_False ); + pToolBox->SetItemDown( nId, false ); } GetToolBox().EndSelection(); DelPopup(); @@ -504,7 +504,7 @@ SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const Reference< XFrame >& aToolBox.SetPosSizePixel( Point(), aSz ); sal_uInt16 nItemId = SwView::GetMoveType(); aInfoField.SetText(aToolBox.GetItemText(nItemId)); - aToolBox.CheckItem( nItemId, sal_True ); + aToolBox.CheckItem( nItemId, true ); Size aFTSize(aInfoField.GetSizePixel()); Size aSepSize(aSeparator.GetSizePixel()); aSepSize.Width() = aSz.Width(); @@ -640,7 +640,7 @@ SwZoomBox_Impl::SwZoomBox_Impl( bRelease(true), m_xDispatchProvider( rDispatchProvider ) { - EnableAutocomplete( sal_False ); + EnableAutocomplete( false ); sal_uInt16 aZoomValues[] = { 25, 50, 75, 100, 150, 200 }; for(sal_uInt16 i = 0; i < sizeof(aZoomValues)/sizeof(sal_uInt16); i++) diff --git a/sw/source/ui/sidebar/WrapPropertyPanel.cxx b/sw/source/ui/sidebar/WrapPropertyPanel.cxx index 3f303f8dfee8..490a748300ee 100644 --- a/sw/source/ui/sidebar/WrapPropertyPanel.cxx +++ b/sw/source/ui/sidebar/WrapPropertyPanel.cxx @@ -234,12 +234,12 @@ void WrapPropertyPanel::NotifyItemUpdate( mpRBWrapThrough->Enable(false); mpRBIdealWrap->Enable(false); - mpRBNoWrap->Check( sal_False ); - mpRBWrapLeft->Check( sal_False ); - mpRBWrapRight->Check( sal_False ); - mpRBWrapParallel->Check( sal_False ); - mpRBWrapThrough->Check( sal_False ); - mpRBIdealWrap->Check( sal_False ); + mpRBNoWrap->Check( false ); + mpRBWrapLeft->Check( false ); + mpRBWrapRight->Check( false ); + mpRBWrapParallel->Check( false ); + mpRBWrapThrough->Check( false ); + mpRBIdealWrap->Check( false ); } } diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index 96cf83db5867..4fc5ecfcb34c 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -203,7 +203,7 @@ IMPL_LINK( SwConvertTableDlg, BtnHdl, Button*, pButton ) { if( mpKeepColumn->IsEnabled() ) mpKeepColumn->SaveValue(); - mpKeepColumn->Check( sal_True ); + mpKeepColumn->Check( true ); } mpKeepColumn->Enable( mpTabBtn->IsChecked() ); mpOtherEd->Enable( mpOtherBtn->IsChecked() ); diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index c464cd93435c..0ab390563d1e 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -250,7 +250,7 @@ void SwFormatTablePage::RightModify() m_pRelWidthCB->Enable(bEnable); if ( !bEnable ) { - m_pRelWidthCB->Check(sal_False); + m_pRelWidthCB->Check(false); RelWidthClickHdl(m_pRelWidthCB); } bEnable = m_pRelWidthCB->IsChecked(); @@ -462,7 +462,7 @@ void SwFormatTablePage::Reset( const SfxItemSet& ) if(pTblData->GetWidthPercent()) { - m_pRelWidthCB->Check(sal_True); + m_pRelWidthCB->Check(true); RelWidthClickHdl(m_pRelWidthCB); m_aWidthMF.SetPrcntValue(pTblData->GetWidthPercent(), FUNIT_CUSTOM); @@ -1110,13 +1110,13 @@ void SwTableColumnPage::ActivatePage( const SfxItemSet& ) bModifyTbl = sal_False; if(bPercentMode) { - m_pModifyTableCB->Check(sal_False); - m_pProportionalCB->Check(sal_False); + m_pModifyTableCB->Check(false); + m_pProportionalCB->Check(false); } else if( !bModifyTbl ) { - m_pProportionalCB->Check(sal_False); - m_pModifyTableCB->Check(sal_False); + m_pProportionalCB->Check(false); + m_pModifyTableCB->Check(false); } m_pSpaceFT->Enable(!bPercentMode); m_pSpaceED->Enable(!bPercentMode); @@ -1539,15 +1539,15 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet ) m_pPageCollCB->Enable(); m_pPgBrkCB->Check(); - m_pPgBrkCB->Check( sal_True ); - m_pColBrkRB->Check( sal_False ); - m_pPgBrkBeforeRB->Check( sal_True ); - m_pPgBrkAfterRB->Check( sal_False ); + m_pPgBrkCB->Check( true ); + m_pColBrkRB->Check( false ); + m_pPgBrkBeforeRB->Check( true ); + m_pPgBrkAfterRB->Check( false ); } else { m_pPageCollLB->SetNoSelection(); - m_pPageCollCB->Check(sal_False); + m_pPageCollCB->Check(false); } } @@ -1567,28 +1567,28 @@ void SwTextFlowPage::Reset( const SfxItemSet& rSet ) switch ( eBreak ) { case SVX_BREAK_PAGE_BEFORE: - m_pPgBrkRB->Check( sal_True ); - m_pColBrkRB->Check( sal_False ); - m_pPgBrkBeforeRB->Check( sal_True ); - m_pPgBrkAfterRB->Check( sal_False ); + m_pPgBrkRB->Check( true ); + m_pColBrkRB->Check( false ); + m_pPgBrkBeforeRB->Check( true ); + m_pPgBrkAfterRB->Check( false ); break; case SVX_BREAK_PAGE_AFTER: - m_pPgBrkRB->Check( sal_True ); - m_pColBrkRB->Check( sal_False ); - m_pPgBrkBeforeRB->Check( sal_False ); - m_pPgBrkAfterRB->Check( sal_True ); + m_pPgBrkRB->Check( true ); + m_pColBrkRB->Check( false ); + m_pPgBrkBeforeRB->Check( false ); + m_pPgBrkAfterRB->Check( true ); break; case SVX_BREAK_COLUMN_BEFORE: - m_pPgBrkRB->Check( sal_False ); - m_pColBrkRB->Check( sal_True ); - m_pPgBrkBeforeRB->Check( sal_True ); - m_pPgBrkAfterRB->Check( sal_False ); + m_pPgBrkRB->Check( false ); + m_pColBrkRB->Check( true ); + m_pPgBrkBeforeRB->Check( true ); + m_pPgBrkAfterRB->Check( false ); break; case SVX_BREAK_COLUMN_AFTER: - m_pPgBrkRB->Check( sal_False ); - m_pColBrkRB->Check( sal_True ); - m_pPgBrkBeforeRB->Check( sal_False ); - m_pPgBrkAfterRB->Check( sal_True ); + m_pPgBrkRB->Check( false ); + m_pColBrkRB->Check( true ); + m_pPgBrkBeforeRB->Check( false ); + m_pPgBrkAfterRB->Check( true ); break; default:; //prevent warning } @@ -1691,7 +1691,7 @@ IMPL_LINK_NOARG(SwTextFlowPage, PageBreakHdl_Impl) } else { - m_pPageCollCB->Check( sal_False ); + m_pPageCollCB->Check( false ); m_pPageCollCB->Enable(false); m_pPageCollLB->Enable(false); m_pPageNoFT->Enable(false); @@ -1746,7 +1746,7 @@ IMPL_LINK( SwTextFlowPage, PageBreakPosHdl_Impl, RadioButton*, pBtn ) } else if (pBtn == m_pPgBrkAfterRB) { - m_pPageCollCB->Check( sal_False ); + m_pPageCollCB->Check( false ); m_pPageCollCB->Enable(false); m_pPageCollLB->Enable(false); m_pPageNoFT->Enable(false); @@ -1760,7 +1760,7 @@ IMPL_LINK( SwTextFlowPage, PageBreakTypeHdl_Impl, RadioButton*, pBtn ) { if ( pBtn == m_pColBrkRB || m_pPgBrkAfterRB->IsChecked() ) { - m_pPageCollCB->Check(sal_False); + m_pPageCollCB->Check(false); m_pPageCollCB->Enable(false); m_pPageCollLB->Enable(false); m_pPageNoFT->Enable(false); @@ -1779,7 +1779,7 @@ IMPL_LINK( SwTextFlowPage, SplitHdl_Impl, CheckBox*, pBox ) IMPL_LINK( SwTextFlowPage, SplitRowHdl_Impl, TriStateBox*, pBox ) { - pBox->EnableTriState(sal_False); + pBox->EnableTriState(false); return 0; } diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 92ea069d1c3b..680cc726d5a5 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -581,7 +581,7 @@ void AutoFmtPreview::MakeFonts( sal_uInt8 nIndex, Font& rFont, Font& rCJKFont, F SETONALLFONTS( SetShadow, rBoxFmt.GetShadowed().GetValue() ); SETONALLFONTS( SetColor, rBoxFmt.GetColor().GetValue() ); SETONALLFONTS( SetSize, aFontSize ); - SETONALLFONTS( SetTransparent, sal_True ); + SETONALLFONTS( SetTransparent, true ); } sal_uInt8 AutoFmtPreview::GetFormatIndex( size_t nCol, size_t nRow ) const @@ -869,7 +869,7 @@ void AutoFmtPreview::DoPaint( const Rectangle& /*rRect*/ ) Font aFont; aFont = aVD.GetFont(); - aFont.SetTransparent( sal_True ); + aFont.SetTransparent( true ); aVD.SetFont ( aFont ); aVD.SetLineColor (); diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index c520e6570f85..e2dd9dbfa500 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -1245,7 +1245,7 @@ int SwPagePreview::_CreateScrollbar( sal_Bool bHori ) *ppScrollbar = new SwScrollbar( pMDI, bHori ); ScrollDocSzChg(); - (*ppScrollbar)->EnableDrag( sal_True ); + (*ppScrollbar)->EnableDrag( true ); (*ppScrollbar)->SetEndScrollHdl( LINK( this, SwPagePreview, EndScrollHdl )); (*ppScrollbar)->SetScrollHdl( LINK( this, SwPagePreview, ScrollHdl )); @@ -1814,7 +1814,7 @@ uno::Reference< ::com::sun::star::accessibility::XAccessible > SolarMutexGuard aGuard; // this should have happened already!!! OSL_ENSURE( GetViewShell() != NULL, "We need a view shell" ); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc = GetAccessible( sal_False ); + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc = GetAccessible( false ); if (xAcc.is()) { return xAcc; @@ -1824,7 +1824,7 @@ uno::Reference< ::com::sun::star::accessibility::XAccessible > ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAccPreview = mpViewShell->CreateAccessiblePreview(); SetAccessible(xAccPreview); } - return GetAccessible( sal_False ); + return GetAccessible( false ); } // MT: Removed Windows::SwitchView() introduced with IA2 CWS. diff --git a/sw/source/ui/uiview/scroll.cxx b/sw/source/ui/uiview/scroll.cxx index 9ec9a41e9ec9..176ba6f18965 100644 --- a/sw/source/ui/uiview/scroll.cxx +++ b/sw/source/ui/uiview/scroll.cxx @@ -35,7 +35,7 @@ SwScrollbar::SwScrollbar( Window *pWin, sal_Bool bHoriz ) : { // SSA: --- RTL --- no mirroring for horizontal scrollbars if( bHoriz ) - EnableRTL( sal_False ); + EnableRTL( false ); } diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index 1d5ac4c0d4a0..a2b0660e8780 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -594,7 +594,7 @@ sal_uInt16 SwSrcView::StartSearchAndReplace(const SvxSearchItem& rSearchItem, { case SVX_SEARCHCMD_FIND: case SVX_SEARCHCMD_FIND_ALL: - nFound = pTextView->Search( aSearchOpt, bForward ); + nFound = pTextView->Search( aSearchOpt, bForward ) ? 1 : 0; break; case SVX_SEARCHCMD_REPLACE_ALL: bAll = sal_True; @@ -821,9 +821,9 @@ void SwSrcView::Load(SwDocShell* pDocShell) pStream->SetStreamCharSet( eDestEnc ); pStream->Seek(0); TextEngine* pTextEngine = aEditWin.GetTextEngine(); - pTextEngine->EnableUndo(sal_False); + pTextEngine->EnableUndo(false); aEditWin.Read(*pStream); - pTextEngine->EnableUndo(sal_True); + pTextEngine->EnableUndo(true); } else { diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx index 9682f37b85a3..aa10ea327808 100644 --- a/sw/source/ui/uiview/view0.cxx +++ b/sw/source/ui/uiview/view0.cxx @@ -299,7 +299,7 @@ void SwView::StateViewOptions(SfxItemSet &rSet) case FN_VIEW_SMOOTH_SCROLL: aBool.SetValue( pOpt->IsSmoothScroll()); break; case FN_VLINEAL: - aBool.SetValue( 0 != StatVRuler() ); break; + aBool.SetValue( StatVRuler() ); break; case FN_HSCROLLBAR: if( pOpt->getBrowseMode() ) { diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx index c463de2dad22..57c62941973f 100644 --- a/sw/source/ui/uiview/viewmdi.cxx +++ b/sw/source/ui/uiview/viewmdi.cxx @@ -305,7 +305,7 @@ int SwView::_CreateScrollbar( sal_Bool bHori ) (*ppScrollbar)->SetScrollHdl( LINK( this, SwView, ScrollHdl )); (*ppScrollbar)->SetEndScrollHdl( LINK( this, SwView, EndScrollHdl )); - (*ppScrollbar)->EnableDrag( sal_True ); + (*ppScrollbar)->EnableDrag( true ); if(GetWindow()) InvalidateBorder(); diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index f6af0861fc19..cd108feaeb16 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -2946,7 +2946,7 @@ void SAL_CALL SwXTextDocument::render( m_pPrintUIOptions = lcl_GetPrintUIOptions( pDocShell, pView ); m_pPrintUIOptions->processProperties( rxOptions ); const bool bPrintProspect = m_pPrintUIOptions->getBoolValue( "PrintProspect", false ); - const bool bLastPage = m_pPrintUIOptions->getBoolValue( "IsLastPage", sal_False ); + const bool bLastPage = m_pPrintUIOptions->getBoolValue( "IsLastPage", false ); SwDoc *pDoc = GetRenderDoc( pView, rSelection, bIsPDFExport ); OSL_ENSURE( pDoc && pView, "doc or view shell missing!" ); @@ -2994,7 +2994,7 @@ void SAL_CALL SwXTextDocument::render( if(pVwSh && pOut && m_pRenderData->HasSwPrtOptions()) { const OUString aPageRange = m_pPrintUIOptions->getStringValue( "PageRange", OUString() ); - const bool bFirstPage = m_pPrintUIOptions->getBoolValue( "IsFirstPage", sal_False ); + const bool bFirstPage = m_pPrintUIOptions->getBoolValue( "IsFirstPage", false ); bool bIsSkipEmptyPages = !m_pPrintUIOptions->IsPrintEmptyPages( bIsPDFExport ); OSL_ENSURE(( pView->IsA(aSwViewTypeId) && m_pRenderData->IsViewOptionAdjust()) diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index 7ab5f78a3cb2..a7f38a4c0c16 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -380,11 +380,11 @@ IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox ) } pMenu->CheckItem( nRegionMode + 1 ); pMenu->SetSelectHdl(LINK(this, SwNavigationPI, MenuSelectHdl)); - pBox->SetItemDown( nCurrItemId, sal_True ); + pBox->SetItemDown( nCurrItemId, true ); pMenu->Execute( pBox, pBox->GetItemRect(FN_DROP_REGION), POPUPMENU_EXECUTE_DOWN ); - pBox->SetItemDown( nCurrItemId, sal_False ); + pBox->SetItemDown( nCurrItemId, false ); pBox->EndSelection(); delete pMenu; pBox->Invalidate(); @@ -400,11 +400,11 @@ IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox ) } pMenu->CheckItem( aContentTree.GetOutlineLevel() + 100 ); pMenu->SetSelectHdl(LINK(this, SwNavigationPI, MenuSelectHdl)); - pBox->SetItemDown( nCurrItemId, sal_True ); + pBox->SetItemDown( nCurrItemId, true ); pMenu->Execute( pBox, pBox->GetItemRect(FN_OUTLINE_LEVEL), POPUPMENU_EXECUTE_DOWN ); - pBox->SetItemDown( nCurrItemId, sal_False ); + pBox->SetItemDown( nCurrItemId, false ); delete pMenu; pBox->EndSelection(); pBox->Invalidate(); @@ -595,7 +595,7 @@ void SwNavigationPI::_ZoomIn() if(pFirst) aContentTree.Select(pFirst, sal_True); // Enable toolbox pConfig->SetSmall( sal_True ); - aContentToolBox.CheckItem(FN_SHOW_CONTENT_BOX, sal_False); + aContentToolBox.CheckItem(FN_SHOW_CONTENT_BOX, false); } } } @@ -780,7 +780,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, SV_DRAGDROP_ENABLE_TOP ); aContentTree.EnableAsyncDrag(sal_True); aContentTree.ShowTree(); - aContentToolBox.CheckItem(FN_SHOW_CONTENT_BOX, sal_True); + aContentToolBox.CheckItem(FN_SHOW_CONTENT_BOX, true); // TreeListBox for global document aGlobalTree.setPosSizePixel( 0, nListboxYPos, 0, 0, WINDOW_POSSIZE_Y ); @@ -801,7 +801,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, aContentToolBox.SetDropdownClickHdl( LINK(this, SwNavigationPI, ToolBoxDropdownClickHdl) ); aGlobalToolBox.SetClickHdl( LINK(this, SwNavigationPI, ToolBoxClickHdl) ); aGlobalToolBox.SetDropdownClickHdl( LINK(this, SwNavigationPI, ToolBoxDropdownClickHdl) ); - aGlobalToolBox.CheckItem(FN_GLOBAL_SWITCH, sal_True); + aGlobalToolBox.CheckItem(FN_GLOBAL_SWITCH, true); Font aFont(GetFont()); aFont.SetWeight(WEIGHT_NORMAL); @@ -1052,7 +1052,7 @@ IMPL_LINK( SwNavigationPI, MenuSelectHdl, Menu *, pMenu ) void SwNavigationPI::UpdateListBox() { - aDocListBox.SetUpdateMode(sal_False); + aDocListBox.SetUpdateMode(false); aDocListBox.Clear(); SwView *pActView = GetCreateView(); bool bDisable = pActView == 0; @@ -1117,7 +1117,7 @@ void SwNavigationPI::UpdateListBox() aDocListBox.SelectEntryPos(nConstPos); aDocListBox.Enable( !bDisable ); - aDocListBox.SetUpdateMode(sal_True); + aDocListBox.SetUpdateMode(true); } IMPL_LINK(SwNavigationPI, DoneLink, SfxPoolItem *, pItem) @@ -1248,7 +1248,7 @@ sal_Bool SwNavigationPI::ToggleTree() sal_Bool bGlobalDoc = IsGlobalDoc(); if(!IsGlobalMode() && bGlobalDoc) { - SetUpdateMode(sal_False); + SetUpdateMode(false); if(_IsZoomedIn()) _ZoomOut(); aGlobalTree.ShowTree(); @@ -1257,7 +1257,7 @@ sal_Bool SwNavigationPI::ToggleTree() aContentToolBox.Hide(); aDocListBox.Hide(); SetGlobalMode(sal_True); - SetUpdateMode(sal_True); + SetUpdateMode(true); } else { @@ -1337,7 +1337,7 @@ SwNavigationChild::SwNavigationChild( Window* pParent, if( nRootType < CONTENT_TYPE_MAX ) { pNavi->aContentTree.SetRootType(nRootType); - pNavi->aContentToolBox.CheckItem(FN_SHOW_ROOT, sal_True); + pNavi->aContentToolBox.CheckItem(FN_SHOW_ROOT, true); } pNavi->aContentTree.SetOutlineLevel( static_cast< sal_uInt8 >( pNaviConfig->GetOutlineLevel() ) ); pNavi->SetRegionDropMode( static_cast< sal_uInt16 >( pNaviConfig->GetRegionMode() ) ); |