diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2013-01-26 20:14:11 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2013-01-26 20:18:49 +0900 |
commit | 1f531d4f68b41044bdb38f90149b4d81e3024da7 (patch) | |
tree | 7acd0ce9f7a0da57cd32606b94d3dd52c842a139 /sw | |
parent | Nuke unused #define (diff) | |
download | core-1f531d4f68b41044bdb38f90149b4d81e3024da7.tar.gz core-1f531d4f68b41044bdb38f90149b4d81e3024da7.zip |
sal_Bool to bool
Change-Id: Ie452042fafd4d795b9830f9d8416c568a76b3d8f
Diffstat (limited to 'sw')
26 files changed, 87 insertions, 87 deletions
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx index 3c61ac7403e0..9d4bc1d5f79b 100644 --- a/sw/source/ui/app/swmodule.cxx +++ b/sw/source/ui/app/swmodule.cxx @@ -184,8 +184,8 @@ SwModule::SwModule( SfxObjectFactory* pWebFact, pModuleConfig = new SwModuleOptions; // We need them anyways - pToolbarConfig = new SwToolbarConfigItem( sal_False ); - pWebToolbarConfig = new SwToolbarConfigItem( sal_True ); + pToolbarConfig = new SwToolbarConfigItem( false ); + pWebToolbarConfig = new SwToolbarConfigItem( true ); pStdFontConfig = new SwStdFontConfig; diff --git a/sw/source/ui/config/barcfg.cxx b/sw/source/ui/config/barcfg.cxx index 12c251528cbd..95da3e4c6204 100644 --- a/sw/source/ui/config/barcfg.cxx +++ b/sw/source/ui/config/barcfg.cxx @@ -35,7 +35,7 @@ using namespace com::sun::star::uno; #define SEL_TYPE_BEZIER 3 #define SEL_TYPE_GRAPHIC 4 -SwToolbarConfigItem::SwToolbarConfigItem( sal_Bool bWeb ) : +SwToolbarConfigItem::SwToolbarConfigItem( bool bWeb ) : ConfigItem(bWeb ? OUString("Office.WriterWeb/ObjectBar") : OUString("Office.Writer/ObjectBar"), CONFIG_MODE_DELAYED_UPDATE|CONFIG_MODE_RELEASE_TREE) { diff --git a/sw/source/ui/config/caption.cxx b/sw/source/ui/config/caption.cxx index 9fb8b631157f..44f4b693cf01 100644 --- a/sw/source/ui/config/caption.cxx +++ b/sw/source/ui/config/caption.cxx @@ -31,7 +31,7 @@ InsCaptionOpt::InsCaptionOpt(const SwCapObjType eType, const SvGlobalName* pOleI nPos(1), nLevel(0), sSeparator( rtl::OUString(": ") ), - bIgnoreSeqOpts(sal_False), + bIgnoreSeqOpts(false), bCopyAttributes(sal_False) { if (pOleId) diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index d7f2fdaf540a..5f6ab9a6db14 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -68,7 +68,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( Window* pParent, SwDocShell& rDocSh, aCancelPB( this, SW_RES( PB_CANCEL )), aHelpPB( this, SW_RES( PB_HELP )), sSystemCharSet( SW_RES( STR_SYS_CHARSET )), - bSaveLineStatus( sal_True ) + bSaveLineStatus( true ) { FreeResource(); @@ -387,7 +387,7 @@ IMPL_LINK( SwAsciiFilterDlg, CharSetSelHdl, SvxTextEncodingBox*, pBox ) } } - bSaveLineStatus = sal_False; + bSaveLineStatus = false; if( eEnd != (LineEnd)-1 ) // changed? { if( eOldEnd != eEnd ) @@ -400,7 +400,7 @@ IMPL_LINK( SwAsciiFilterDlg, CharSetSelHdl, SvxTextEncodingBox*, pBox ) aCR_RB.Check( aCR_RB.GetSavedValue() ); aLF_RB.Check( aLF_RB.GetSavedValue() ); } - bSaveLineStatus = sal_True; + bSaveLineStatus = true; if( nOldLng != nLng && aFontLB.IsVisible() ) aLanguageLB.SelectLanguage( nLng ); diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 363628fb5ee4..a631230d0db8 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -79,8 +79,8 @@ SwFldFuncPage::SwFldFuncPage(Window* pParent, const SfxItemSet& rCoreSet ) : sOldValueFT = aValueFT.GetText(); sOldNameFT = aNameFT.GetText(); - aCond1ED.ShowBrackets(sal_False); - aCond2ED.ShowBrackets(sal_False); + aCond1ED.ShowBrackets(false); + aCond2ED.ShowBrackets(false); } @@ -245,7 +245,7 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl) aListNameFT.Show(bDropDown); aListNameED.Show(bDropDown); - aNameED.SetDropEnable(sal_False); + aNameED.SetDropEnable(false); if (IsFldEdit()) { @@ -299,7 +299,7 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl) case TYP_HIDDENPARAFLD: aNameFT.SetText(SW_RESSTR(STR_COND)); - aNameED.SetDropEnable(sal_True); + aNameED.SetDropEnable(true); bName = sal_True; aNameED.SetAccessibleName(aNameFT.GetText()); aValueED.SetAccessibleName(aValueFT.GetText()); @@ -308,7 +308,7 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl) case TYP_HIDDENTXTFLD: { aNameFT.SetText(SW_RESSTR(STR_COND)); - aNameED.SetDropEnable(sal_True); + aNameED.SetDropEnable(true); aValueFT.SetText(SW_RESSTR(STR_INSTEXT)); SwWrtShell* pSh = GetActiveWrtShell(); if (!IsFldEdit() && pSh ) @@ -321,7 +321,7 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl) case TYP_CONDTXTFLD: aNameFT.SetText(SW_RESSTR(STR_COND)); - aNameED.SetDropEnable(sal_True); + aNameED.SetDropEnable(true); if (IsFldEdit()) { aCond1ED.SetText(GetCurField()->GetPar2().getToken(0, '|')); @@ -351,7 +351,7 @@ IMPL_LINK_NOARG(SwFldFuncPage, TypeHdl) case TYP_COMBINED_CHARS: { aNameFT.SetText(SW_RESSTR(STR_COMBCHRS_FT)); - aNameED.SetDropEnable(sal_True); + aNameED.SetDropEnable(true); bName = sal_True; const sal_Int32 nLen = aNameED.GetText().getLength(); diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 495e7481c9d9..23a9c5910b67 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -201,7 +201,7 @@ IMPL_LINK_NOARG(SwFldVarPage, TypeHdl) aValueED.SetText(aEmptyStr); } - aValueED.SetDropEnable(sal_False); + aValueED.SetDropEnable(false); UpdateSubType(); // initialise selection-listboxes } @@ -279,7 +279,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) } bValue = bName = bNumFmt = bInvisible = sal_True; - aValueED.SetDropEnable(sal_True); + aValueED.SetDropEnable(true); break; } @@ -330,7 +330,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) // (instead of test2 = test + 1) aValueED.SetText(((SwSetExpField*)GetCurField())->GetFormula()); } - aValueED.SetDropEnable(sal_True); + aValueED.SetDropEnable(true); break; case TYP_FORMELFLD: @@ -338,7 +338,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) bValue = sal_True; bNumFmt = sal_True; aValueFT.SetText(SW_RESSTR(STR_FORMULA)); - aValueED.SetDropEnable(sal_True); + aValueED.SetDropEnable(true); } break; diff --git a/sw/source/ui/frmdlg/colex.cxx b/sw/source/ui/frmdlg/colex.cxx index a5204334ef91..3fa7f2983cdf 100644 --- a/sw/source/ui/frmdlg/colex.cxx +++ b/sw/source/ui/frmdlg/colex.cxx @@ -360,10 +360,10 @@ void SwColumnOnlyExample::Paint( const Rectangle& /*rRect*/ ) long nLength = aLogSize.Height() - 2 * aTL.Y(); Point aUp( aTL ); Point aDown( aTL.X(), nLength ); - sal_Bool bLines = sal_False; + bool bLines = false; if(m_aCols.GetLineAdj() != COLADJ_NONE) { - bLines = sal_True; + bLines = true; sal_uInt16 nPercent = m_aCols.GetLineHeight(); if( nPercent != 100 ) @@ -540,7 +540,7 @@ void SwPageGridExample::DrawPage( const Point& rOrg, m_bVertical ? aCharRect.Move(nRubyHeight, 0) : aCharRect.Move(0, nRubyHeight); //vertical lines - sal_Bool bBothLines = pGridItem->GetGridType() == GRID_LINES_CHARS; + bool bBothLines = pGridItem->GetGridType() == GRID_LINES_CHARS; SetFillColor( Color( COL_TRANSPARENT ) ); sal_Int32 nXMove = m_bVertical ? nLineHeight : 0; sal_Int32 nYMove = m_bVertical ? 0 : nLineHeight; diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 42d013746f73..7c6823e76b77 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -76,10 +76,10 @@ using namespace ::com::sun::star; static const sal_uInt16 nVisCols = 3; -inline sal_Bool IsMarkInSameSection( SwWrtShell& rWrtSh, const SwSection* pSect ) +inline bool IsMarkInSameSection( SwWrtShell& rWrtSh, const SwSection* pSect ) { rWrtSh.SwapPam(); - sal_Bool bRet = pSect == rWrtSh.GetCurrSection(); + bool bRet = pSect == rWrtSh.GetCurrSection(); rWrtSh.SwapPam(); return bRet; } @@ -93,10 +93,10 @@ SwColumnDlg::SwColumnDlg(Window* pParent, SwWrtShell& rSh) , pFrameSet(0) , nOldSelection(0) , nSelectionWidth(0) - , bPageChanged(sal_False) - , bSectionChanged(sal_False) - , bSelSectionChanged(sal_False) - , bFrameChanged(sal_False) + , bPageChanged(false) + , bSectionChanged(false) + , bSelSectionChanged(false) + , bFrameChanged(false) { SwRect aRect; rWrtShell.CalcBoundRect(aRect, FLY_AS_CHAR); @@ -233,19 +233,19 @@ IMPL_LINK(SwColumnDlg, ObjectHdl, ListBox*, pBox) break; case LISTBOX_SECTION : pSet = pSectionSet; - bSectionChanged = sal_True; + bSectionChanged = true; break; case LISTBOX_SECTIONS : pSet = pSectionSet; - bSelSectionChanged = sal_True; + bSelSectionChanged = true; break; case LISTBOX_PAGE : pSet = pPageSet; - bPageChanged = sal_True; + bPageChanged = true; break; case LISTBOX_FRAME: pSet = pFrameSet; - bFrameChanged = sal_True; + bFrameChanged = true; break; } if(pBox) @@ -297,19 +297,19 @@ IMPL_LINK_NOARG(SwColumnDlg, OkHdl) break; case LISTBOX_SECTION : pSet = pSectionSet; - bSectionChanged = sal_True; + bSectionChanged = true; break; case LISTBOX_SECTIONS : pSet = pSectionSet; - bSelSectionChanged = sal_True; + bSelSectionChanged = true; break; case LISTBOX_PAGE : pSet = pPageSet; - bPageChanged = sal_True; + bPageChanged = true; break; case LISTBOX_FRAME: pSet = pFrameSet; - bFrameChanged = sal_True; + bFrameChanged = true; break; } pTabPage->FillItemSet(*pSet); @@ -410,7 +410,7 @@ SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet) , bFormat(sal_False) , bFrm(sal_False) , bHtmlMode(sal_False) - , bLockUpdate(sal_False) + , bLockUpdate(false) { get(m_pCLNrEdt, "colsnf"); get(m_pBalanceColsCB, "balance"); @@ -1285,7 +1285,7 @@ IMPL_LINK( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS ) } else { - bLockUpdate = sal_True; + bLockUpdate = true; m_pCLNrEdt->SetValue( 2 ); m_pAutoWidthBox->Check(sal_False); aDistEd1.SetPrcntValue(0); @@ -1302,7 +1302,7 @@ IMPL_LINK( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS ) aEd1.SetPrcntValue(aEd1.NormalizePercent(long(nSmall)), FUNIT_TWIP); pModifiedField = &aEd1; } - bLockUpdate = sal_False; + bLockUpdate = false; Timeout(); } diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 846ad71ecab8..8117e16f2fb1 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -271,7 +271,7 @@ void SwCaptionDialog::Apply() aOpt.SetSeparator( m_pSepEdit->IsEnabled() ? m_pSepEdit->GetText() : OUString() ); aOpt.SetCaption( m_pTextEdit->GetText() ); aOpt.SetPos( m_pPosBox->GetSelectEntryPos() ); - aOpt.IgnoreSeqOpts() = sal_True; + aOpt.IgnoreSeqOpts() = true; aOpt.CopyAttributes() = bCopyAttributes; aOpt.SetCharacterStyle( sCharacterStyle ); rView.InsertCaption( &aOpt ); @@ -465,7 +465,7 @@ void SwSequenceOptionDialog::Apply() sal_Int8 nLvl = (sal_Int8)( m_pLbLevel->GetSelectEntryPos() - 1); sal_Unicode cDelim = m_pEdDelim->GetText()[0]; - sal_Bool bUpdate = sal_True; + bool bUpdate = true; if( pFldType ) { pFldType->SetDelimiter( rtl::OUString(cDelim) ); @@ -480,7 +480,7 @@ void SwSequenceOptionDialog::Apply() rSh.InsertFldType( aFldType ); } else - bUpdate = sal_False; + bUpdate = false; if( bUpdate ) rSh.UpdateExpFlds(); diff --git a/sw/source/ui/frmdlg/frmmgr.cxx b/sw/source/ui/frmdlg/frmmgr.cxx index 7611c4d65a87..81420d447c4b 100644 --- a/sw/source/ui/frmdlg/frmmgr.cxx +++ b/sw/source/ui/frmdlg/frmmgr.cxx @@ -256,7 +256,7 @@ void SwFlyFrmAttrMgr::SetAbsPos( const Point& rPoint ) --------------------------------------------------------------------*/ void SwFlyFrmAttrMgr::ValidateMetrics( SvxSwFrameValidation& rVal, const SwPosition* pToCharCntntPos, - sal_Bool bOnlyPercentRefValue ) + bool bOnlyPercentRefValue ) { if (!bOnlyPercentRefValue) { diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 1a35cc492ca1..b4148a760c14 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -463,7 +463,7 @@ static void lcl_InsertVectors(ListBox& rBox, // --> OD 2009-08-31 #mongolianlayout# // add input parameter -static SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL(SvxSwFramePosString::StringId eStringId, sal_Bool bVertical, sal_Bool bVerticalL2R, sal_Bool bRTL) +static SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL(SvxSwFramePosString::StringId eStringId, bool bVertical, sal_Bool bVerticalL2R, sal_Bool bRTL) { //special handling of STR_FROMLEFT if ( SwFPos::FROMLEFT == eStringId ) @@ -657,7 +657,7 @@ SwFrmPage::SwFrmPage ( Window *pParent, const SfxItemSet &rSet ) : bNoModifyHdl(sal_True), // --> OD 2009-08-31 #mongolianlayout# - no used // bVerticalChanged(sal_False), - bIsVerticalFrame(sal_False), + bIsVerticalFrame(false), bIsVerticalL2R(sal_False), bIsInRightToLeft(sal_False), bHtmlMode(sal_False), @@ -817,7 +817,7 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) String sHLabel = aHorizontalFT.GetText(); aHorizontalFT.SetText(aVerticalFT.GetText()); aVerticalFT.SetText(sHLabel); - bIsVerticalFrame = sal_True; + bIsVerticalFrame = true; } } @@ -1056,11 +1056,11 @@ sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet) const SwFmtFrmSize& rOldSize = (const SwFmtFrmSize& )rOldSet.Get(RES_FRM_SIZE); SwFmtFrmSize aSz( rOldSize ); - sal_Bool bValueModified = (aWidthED.IsValueModified() || aHeightED.IsValueModified()); - sal_Bool bCheckChanged = (aRelWidthCB.GetSavedValue() != aRelWidthCB.IsChecked() + bool bValueModified = (aWidthED.IsValueModified() || aHeightED.IsValueModified()); + bool bCheckChanged = (aRelWidthCB.GetSavedValue() != aRelWidthCB.IsChecked() || aRelHeightCB.GetSavedValue() != aRelHeightCB.IsChecked()); - sal_Bool bLegalValue = !(!rOldSize.GetWidth () && !rOldSize.GetHeight() && + bool bLegalValue = !(!rOldSize.GetWidth () && !rOldSize.GetHeight() && aWidthED .GetValue() == aWidthED .GetMin() && aHeightED.GetValue() == aHeightED.GetMin()); @@ -1714,7 +1714,7 @@ IMPL_LINK_NOARG(SwFrmPage, RangeModifyHdl) aVal.nHPos = nAtHorzPosVal; aVal.nVPos = nAtVertPosVal; - aMgr.ValidateMetrics(aVal, mpToCharCntntPos, sal_True); // one time, to get reference values for percental values + aMgr.ValidateMetrics(aVal, mpToCharCntntPos, true); // one time, to get reference values for percental values // set reference values for percental values (100%) ... aWidthED.SetRefValue(aVal.aPercentSize.Width()); @@ -1821,7 +1821,7 @@ IMPL_LINK_NOARG(SwFrmPage, AnchorTypeHdl) IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB ) { - sal_Bool bHori = pLB == &aHorizontalDLB; + bool bHori = pLB == &aHorizontalDLB; ListBox *pRelLB = bHori ? &aHoriRelationLB : &aVertRelationLB; FixedText *pRelFT = bHori ? &aHoriRelationFT : &aVertRelationFT; FrmMap *pMap = bHori ? pHMap : pVMap; @@ -1867,7 +1867,7 @@ IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB ) // special treatment for HTML-Mode with horizonal-vertical-dependencies if(bHtmlMode && (FLY_AT_CHAR == GetAnchor())) { - sal_Bool bSet = sal_False; + bool bSet = false; if(bHori) { // right is allowed only above - from the left only above @@ -1879,17 +1879,17 @@ IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB ) aVerticalDLB.SelectEntryPos(1); else aVerticalDLB.SelectEntryPos(0); - bSet = sal_True; + bSet = true; } else if(text::HoriOrientation::LEFT == nAlign && 1 == aVerticalDLB.GetSelectEntryPos()) { aVerticalDLB.SelectEntryPos(0); - bSet = sal_True; + bSet = true; } else if(text::HoriOrientation::NONE == nAlign && 1 == aVerticalDLB.GetSelectEntryPos()) { aVerticalDLB.SelectEntryPos(0); - bSet = sal_True; + bSet = true; } if(bSet) PosHdl(&aVerticalDLB); @@ -1901,7 +1901,7 @@ IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB ) if(1 == aHorizontalDLB.GetSelectEntryPos()) { aHorizontalDLB.SelectEntryPos(0); - bSet = sal_True; + bSet = true; } aHoriRelationLB.SelectEntryPos(1); } @@ -1910,7 +1910,7 @@ IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB ) if(2 == aHorizontalDLB.GetSelectEntryPos()) { aHorizontalDLB.SelectEntryPos(0); - bSet = sal_True; + bSet = true; } aHoriRelationLB.SelectEntryPos(0) ; } @@ -1927,7 +1927,7 @@ IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB ) --------------------------------------------------------------------*/ IMPL_LINK( SwFrmPage, RelHdl, ListBox *, pLB ) { - sal_Bool bHori = pLB == &aHoriRelationLB; + bool bHori = pLB == &aHoriRelationLB; UpdateExample(); @@ -2410,11 +2410,11 @@ sal_Bool SwGrfExtPage::FillItemSet( SfxItemSet &rSet ) { bModified = sal_True; - sal_Bool bHori = sal_False; + bool bHori = false; if (aMirrorHorzBox.IsChecked() && !aLeftPagesRB.IsChecked()) - bHori = sal_True; + bHori = true; MirrorGraph eMirror; eMirror = aMirrorVertBox.IsChecked() && bHori ? @@ -2523,7 +2523,7 @@ BmpWindow::BmpWindow( Window* pPar, sal_uInt16 nId, bHorz(sal_False), bVert(sal_False), bGraphic(sal_False), - bLeftAlign(sal_False) + bLeftAlign(false) { SetBackground(); SetPaintTransparent(sal_True); @@ -3100,7 +3100,7 @@ IMPL_LINK(SwFrmAddPage, ChainModifyHdl, ListBox*, pBox) SwFrmFmt* pFmt = pWrtSh->GetFlyFrmFmt(); if (pFmt) { - sal_Bool bNextBox = &aNextLB == pBox; + bool bNextBox = &aNextLB == pBox; ListBox& rChangeLB = bNextBox ? aPrevLB : aNextLB; for(sal_uInt16 nEntry = rChangeLB.GetEntryCount(); nEntry > 1; nEntry--) rChangeLB.RemoveEntry(nEntry - 1); diff --git a/sw/source/ui/inc/ascfldlg.hxx b/sw/source/ui/inc/ascfldlg.hxx index e047de2be368..71cb7fb30e86 100644 --- a/sw/source/ui/inc/ascfldlg.hxx +++ b/sw/source/ui/inc/ascfldlg.hxx @@ -45,7 +45,7 @@ class SwAsciiFilterDlg : public SfxModalDialog CancelButton aCancelPB; HelpButton aHelpPB; String sSystemCharSet; - sal_Bool bSaveLineStatus; + bool bSaveLineStatus; DECL_LINK( CharSetSelHdl, SvxTextEncodingBox* ); DECL_LINK( LineEndHdl, RadioButton* ); diff --git a/sw/source/ui/inc/barcfg.hxx b/sw/source/ui/inc/barcfg.hxx index 4fbed0f43f35..786f3f4ad5e2 100644 --- a/sw/source/ui/inc/barcfg.hxx +++ b/sw/source/ui/inc/barcfg.hxx @@ -27,7 +27,7 @@ class SwToolbarConfigItem : public utl::ConfigItem com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); public: - SwToolbarConfigItem( sal_Bool bWeb ); + SwToolbarConfigItem( bool bWeb ); ~SwToolbarConfigItem(); virtual void Commit(); diff --git a/sw/source/ui/inc/basesh.hxx b/sw/source/ui/inc/basesh.hxx index e4603391c1ad..2e2577b939f2 100644 --- a/sw/source/ui/inc/basesh.hxx +++ b/sw/source/ui/inc/basesh.hxx @@ -57,7 +57,7 @@ protected: inline SwView& GetView() { return rView; } inline void SetGetStateSet( SfxItemSet* p ) { pGetStateSet = p; } - inline sal_Bool AddGrfUpdateSlot( sal_uInt16 nSlot ){ return aGrfUpdateSlots.insert( nSlot ).second; } + inline bool AddGrfUpdateSlot( sal_uInt16 nSlot ){ return aGrfUpdateSlots.insert( nSlot ).second; } DECL_STATIC_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl* ); diff --git a/sw/source/ui/inc/bmpwin.hxx b/sw/source/ui/inc/bmpwin.hxx index e8e34850d397..251857682bfd 100644 --- a/sw/source/ui/inc/bmpwin.hxx +++ b/sw/source/ui/inc/bmpwin.hxx @@ -36,7 +36,7 @@ private: sal_Bool bHorz : 1; sal_Bool bVert : 1; sal_Bool bGraphic : 1; - sal_Bool bLeftAlign : 1; + bool bLeftAlign : 1; void Paint(const Rectangle& rRect); @@ -45,7 +45,7 @@ public: const Graphic& rGraphic, const BitmapEx& rBmp); BmpWindow(Window* pParent, const ResId rResId) : Window(pParent, rResId), - bHorz(sal_False), bVert(sal_False),bGraphic(sal_False), bLeftAlign(sal_True) {} + bHorz(sal_False), bVert(sal_False),bGraphic(sal_False), bLeftAlign(true) {} ~BmpWindow(); void MirrorVert(sal_Bool bMirror) { bVert = bMirror; Invalidate(); } void MirrorHorz(sal_Bool bMirror) { bHorz = bMirror; Invalidate(); } diff --git a/sw/source/ui/inc/caption.hxx b/sw/source/ui/inc/caption.hxx index b927e4e40848..345235cdf2d4 100644 --- a/sw/source/ui/inc/caption.hxx +++ b/sw/source/ui/inc/caption.hxx @@ -39,7 +39,7 @@ private: String sSeparator; String sCharacterStyle; - sal_Bool bIgnoreSeqOpts; // is not being saved + bool bIgnoreSeqOpts; // is not being saved sal_Bool bCopyAttributes; // -""- public: @@ -81,8 +81,8 @@ public: void SetCharacterStyle(const String& rStyle) { sCharacterStyle = rStyle; } - inline sal_Bool& IgnoreSeqOpts() { return bIgnoreSeqOpts; } - inline sal_Bool IgnoreSeqOpts() const { return bIgnoreSeqOpts; } + inline bool& IgnoreSeqOpts() { return bIgnoreSeqOpts; } + inline bool IgnoreSeqOpts() const { return bIgnoreSeqOpts; } inline sal_Bool& CopyAttributes() { return bCopyAttributes; } inline sal_Bool CopyAttributes() const { return bCopyAttributes; } diff --git a/sw/source/ui/inc/cnttab.hxx b/sw/source/ui/inc/cnttab.hxx index ae91648db673..0da1276ad20e 100644 --- a/sw/source/ui/inc/cnttab.hxx +++ b/sw/source/ui/inc/cnttab.hxx @@ -48,7 +48,7 @@ struct CurTOXType TOXTypes eType; sal_uInt16 nIndex; //for TOX_USER only - sal_Bool operator==(const CurTOXType aCmp) + bool operator==(const CurTOXType aCmp) { return eType == aCmp.eType && nIndex == aCmp.nIndex; } diff --git a/sw/source/ui/inc/colex.hxx b/sw/source/ui/inc/colex.hxx index d9be70b446cf..31f0f7e81e14 100644 --- a/sw/source/ui/inc/colex.hxx +++ b/sw/source/ui/inc/colex.hxx @@ -51,7 +51,7 @@ class SwTextGridItem; class SW_DLLPUBLIC SwPageGridExample : public SwPageExample { SwTextGridItem* pGridItem; - sal_Bool m_bVertical; + bool m_bVertical; protected: virtual void DrawPage( const Point& rPoint, const sal_Bool bSecond, @@ -60,7 +60,7 @@ public: SwPageGridExample(Window* pPar, const ResId& rResId ) : SwPageExample(pPar, rResId ), pGridItem(0), - m_bVertical(sal_False){} + m_bVertical(false){} ~SwPageGridExample(); void UpdateExample( const SfxItemSet& rSet ); }; diff --git a/sw/source/ui/inc/colmgr.hxx b/sw/source/ui/inc/colmgr.hxx index 9cba8c9d73ab..98690bcbe49e 100644 --- a/sw/source/ui/inc/colmgr.hxx +++ b/sw/source/ui/inc/colmgr.hxx @@ -43,7 +43,7 @@ public: inline sal_Bool IsAutoWidth() const; void SetAutoWidth(sal_Bool bOn = sal_True, sal_uInt16 lGutterWidth = 0); - inline sal_Bool HasLine() const; + inline bool HasLine() const; inline void SetNoLine(); void SetLineWidthAndColor(::editeng::SvxBorderStyle eStyle, sal_uLong nWidth, const Color& rCol); @@ -114,7 +114,7 @@ inline void SwColMgr::NoCols() { aFmtCol.GetColumns().clear(); } -inline sal_Bool SwColMgr::HasLine() const +inline bool SwColMgr::HasLine() const { return GetAdjust() != COLADJ_NONE; } diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx index f8df7ab7df4a..2560611bf35e 100644 --- a/sw/source/ui/inc/column.hxx +++ b/sw/source/ui/inc/column.hxx @@ -57,10 +57,10 @@ class SwColumnDlg : public SfxModalDialog long nSelectionWidth; long nPageWidth; - sal_Bool bPageChanged : 1; - sal_Bool bSectionChanged : 1; - sal_Bool bSelSectionChanged : 1; - sal_Bool bFrameChanged : 1; + bool bPageChanged : 1; + bool bSectionChanged : 1; + bool bSelSectionChanged : 1; + bool bFrameChanged : 1; DECL_LINK(ObjectHdl, ListBox*); @@ -138,7 +138,7 @@ class SwColumnPage : public SfxTabPage sal_Bool bFormat; sal_Bool bFrm; sal_Bool bHtmlMode; - sal_Bool bLockUpdate; + bool bLockUpdate; // Handler DECL_LINK( ColModify, NumericField * ); diff --git a/sw/source/ui/inc/condedit.hxx b/sw/source/ui/inc/condedit.hxx index 712ee71b865d..e2bdee7052eb 100644 --- a/sw/source/ui/inc/condedit.hxx +++ b/sw/source/ui/inc/condedit.hxx @@ -25,7 +25,7 @@ class SW_DLLPUBLIC ConditionEdit : public Edit, public DropTargetHelper { - sal_Bool bBrackets, bEnableDrop; + bool bBrackets, bEnableDrop; SW_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); SW_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); @@ -33,9 +33,9 @@ class SW_DLLPUBLIC ConditionEdit : public Edit, public DropTargetHelper public: ConditionEdit( Window* pParent, const ResId& rResId ); - inline void ShowBrackets(sal_Bool bShow) { bBrackets = bShow; } + inline void ShowBrackets(bool bShow) { bBrackets = bShow; } - inline void SetDropEnable( sal_Bool bFlag ) { bEnableDrop = bFlag; } + inline void SetDropEnable( bool bFlag ) { bEnableDrop = bFlag; } }; #endif diff --git a/sw/source/ui/inc/frmmgr.hxx b/sw/source/ui/inc/frmmgr.hxx index b00726c993f2..fb23c0f7695f 100644 --- a/sw/source/ui/inc/frmmgr.hxx +++ b/sw/source/ui/inc/frmmgr.hxx @@ -118,7 +118,7 @@ public: // check and change metrics void ValidateMetrics(SvxSwFrameValidation& rVal, const SwPosition* pToCharCntntPos, - sal_Bool bOnlyPercentRefValue = sal_False); + bool bOnlyPercentRefValue = false); void DelAttr(sal_uInt16 nId); diff --git a/sw/source/ui/inc/frmpage.hxx b/sw/source/ui/inc/frmpage.hxx index 74122705b1c3..e2e0c026b57a 100644 --- a/sw/source/ui/inc/frmpage.hxx +++ b/sw/source/ui/inc/frmpage.hxx @@ -97,7 +97,7 @@ class SwFrmPage: public SfxTabPage sal_Bool bFormat; sal_Bool bNew; sal_Bool bNoModifyHdl; - sal_Bool bIsVerticalFrame; //current frame is in vertical environment - strings are exchanged + bool bIsVerticalFrame; //current frame is in vertical environment - strings are exchanged // --> OD 2009-08-31 #mongolianlayou# sal_Bool bIsVerticalL2R; sal_Bool bIsInRightToLeft; // current frame is in right-to-left environment - strings are exchanged diff --git a/sw/source/ui/inc/pggrid.hxx b/sw/source/ui/inc/pggrid.hxx index 8cbb4983a351..4bb257ccab68 100644 --- a/sw/source/ui/inc/pggrid.hxx +++ b/sw/source/ui/inc/pggrid.hxx @@ -71,7 +71,7 @@ class SwTextGridPage: public SfxTabPage sal_Int32 m_nRubyUserValue; sal_Bool m_bRubyUserValue; Size m_aPageSize; - sal_Bool m_bVertical; + bool m_bVertical; sal_Bool m_bSquaredMode; sal_Bool m_bHRulerChanged; sal_Bool m_bVRulerChanged; diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index ca76be4638f3..c8819df4e673 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -71,7 +71,7 @@ SwTextGridPage::SwTextGridPage(Window *pParent, const SfxItemSet &rSet) : m_nRubyUserValue(0), m_bRubyUserValue(sal_False), m_aPageSize(MM50, MM50), - m_bVertical(sal_False), + m_bVertical(false), m_bSquaredMode(sal_False), m_bHRulerChanged( sal_False ), m_bVRulerChanged( sal_False ) diff --git a/sw/source/ui/utlui/condedit.cxx b/sw/source/ui/utlui/condedit.cxx index 70e1c78dc5a6..562f87d8a691 100644 --- a/sw/source/ui/utlui/condedit.cxx +++ b/sw/source/ui/utlui/condedit.cxx @@ -31,7 +31,7 @@ using namespace ::com::sun::star::uno; ConditionEdit::ConditionEdit( Window* pParent, const ResId& rResId ) : Edit( pParent, rResId ), DropTargetHelper( this ), - bBrackets( sal_True ), bEnableDrop( sal_True ) + bBrackets( true ), bEnableDrop( true ) { } |