summaryrefslogtreecommitdiff
path: root/sw/source/ui/misc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-25 14:00:35 +0200
committerNoel Grandin <noel@peralex.com>2014-04-30 08:44:42 +0200
commit6aa35db39311dcd7965c9c9c21fcf4143a1f9b43 (patch)
tree04320eaf8c7481c1b496460624ee20ec11360ac2 /sw/source/ui/misc
parent1417061d1b2c110e7e690523a544b58e7ffd05c0 (diff)
sw: sal_Bool->bool
Change-Id: I324a0ffde2ddcca105451c19e7aadcfad15211d8
Diffstat (limited to 'sw/source/ui/misc')
-rw-r--r--sw/source/ui/misc/bookmark.cxx2
-rw-r--r--sw/source/ui/misc/docfnote.cxx6
-rw-r--r--sw/source/ui/misc/glosbib.cxx14
-rw-r--r--sw/source/ui/misc/glossary.cxx16
-rw-r--r--sw/source/ui/misc/insfnote.cxx34
-rw-r--r--sw/source/ui/misc/num.cxx18
-rw-r--r--sw/source/ui/misc/outline.cxx2
-rw-r--r--sw/source/ui/misc/pgfnote.cxx2
-rw-r--r--sw/source/ui/misc/pggrid.cxx30
-rw-r--r--sw/source/ui/misc/srtdlg.cxx22
-rw-r--r--sw/source/ui/misc/swmodalredlineacceptdlg.cxx8
-rw-r--r--sw/source/ui/misc/titlepage.cxx6
12 files changed, 80 insertions, 80 deletions
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index e612bd2247e4..8405492215f5 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -34,7 +34,7 @@ const OUString BookmarkCombo::aForbiddenChars("/\\@:*?\";,.#");
IMPL_LINK( SwInsertBookmarkDlg, ModifyHdl, BookmarkCombo *, pBox )
{
- sal_Bool bSelEntries = pBox->GetSelectEntryCount() != 0;
+ bool bSelEntries = pBox->GetSelectEntryCount() != 0;
// if a string has been pasted from the clipboard then
// there may be illegal characters in the box
if(!bSelEntries)
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 76ee933e26e2..04d223afa9c2 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -298,10 +298,10 @@ IMPL_LINK_NOARG(SwEndNoteOptionPage, PosPageHdl)
IMPL_LINK_NOARG(SwEndNoteOptionPage, NumCountHdl)
{
- sal_Bool bEnable = sal_True;
+ bool bEnable = true;
if( m_pNumCountBox->GetEntryCount() - 1 != m_pNumCountBox->GetSelectEntryPos() )
{
- bEnable = sal_False;
+ bEnable = false;
m_pOffsetFld->SetValue(1);
}
m_pOffsetLbl->Enable(bEnable);
@@ -380,7 +380,7 @@ bool SwEndNoteOptionPage::FillItemSet( SfxItemSet & )
// page template
pInf->ChgPageDesc( pSh->FindPageDescByName(
- m_pPageTemplBox->GetSelectEntry(), sal_True ) );
+ m_pPageTemplBox->GetSelectEntry(), true ) );
if ( bEndNote )
{
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index c7e16f9cedcf..8a6762f8c675 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -315,14 +315,14 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, RenameHdl)
IMPL_LINK_NOARG(SwGlossaryGroupDlg, ModifyHdl)
{
OUString sEntry(m_pNameED->GetText());
- sal_Bool bEnableNew = sal_True;
- sal_Bool bEnableDel = sal_False;
+ bool bEnableNew = true;
+ bool bEnableDel = false;
sal_uLong nCaseReadonly =
(sal_uLong)m_pPathLB->GetEntryData(m_pPathLB->GetSelectEntryPos());
bool bDirReadonly = 0 != (nCaseReadonly&PATH_READONLY);
if(sEntry.isEmpty() || bDirReadonly)
- bEnableNew = sal_False;
+ bEnableNew = false;
else if(!sEntry.isEmpty())
{
sal_uLong nPos = m_pGroupTLB->GetEntryPos(sEntry, 0);
@@ -346,7 +346,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, ModifyHdl)
}
if( 0xffffffff > nPos)
{
- bEnableNew = sal_False;
+ bEnableNew = false;
m_pGroupTLB->Select(m_pGroupTLB->GetEntry( nPos ));
m_pGroupTLB->MakeVisible(m_pGroupTLB->GetEntry( nPos ));
}
@@ -364,9 +364,9 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, ModifyHdl)
return 0;
}
-sal_Bool SwGlossaryGroupDlg::IsDeleteAllowed(const OUString &rGroup)
+bool SwGlossaryGroupDlg::IsDeleteAllowed(const OUString &rGroup)
{
- sal_Bool bDel = (!pGlosHdl->IsReadOnly(&rGroup));
+ bool bDel = (!pGlosHdl->IsReadOnly(&rGroup));
// OM: if the name is among the new region name, it is deletable
// as well! Because for non existing region names ReadOnly issues
@@ -377,7 +377,7 @@ sal_Bool SwGlossaryGroupDlg::IsDeleteAllowed(const OUString &rGroup)
{
if (*it == rGroup)
{
- bDel = sal_True;
+ bDel = true;
break;
}
}
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index cec5ce2baea6..c45df95a09c4 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -301,7 +301,7 @@ void SwGlossaryDlg::Apply()
}
}
-void SwGlossaryDlg::EnableShortName(sal_Bool bOn)
+void SwGlossaryDlg::EnableShortName(bool bOn)
{
m_pShortNameLbl->Enable(bOn);
m_pShortNameEdit->Enable(bOn);
@@ -435,7 +435,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
m_pShortNameEdit->GrabFocus();
return 1;
}
- if(pGlossaryHdl->NewGlossary(aStr, aShortName, sal_False, bNoAttr ))
+ if(pGlossaryHdl->NewGlossary(aStr, aShortName, false, bNoAttr ))
{
SvTreeListEntry* pEntry = m_pCategoryBox->FirstSelected();
if(m_pCategoryBox->GetParent(pEntry))
@@ -698,7 +698,7 @@ void SwGlossaryDlg::Init()
// fill entries for the groups
{
- pGlossaryHdl->SetCurGroup(sGroupName, sal_False, sal_True);
+ pGlossaryHdl->SetCurGroup(sGroupName, false, true);
const sal_uInt16 nCount = pGlossaryHdl->GetGlossaryCnt();
for(sal_uInt16 i = 0; i < nCount; ++i)
{
@@ -761,7 +761,7 @@ IMPL_LINK_NOARG_INLINE_START(SwGlossaryDlg, EditHdl)
if (m_pEditBtn->GetCurItemIdent() == "edit")
{
SwTextBlocks *pGroup = ::GetGlossaries()->GetGroupDoc ( GetCurrGrpName () );
- sal_Bool bRet = pGlossaryHdl->ConvertToNew ( *pGroup );
+ bool bRet = pGlossaryHdl->ConvertToNew ( *pGroup );
delete pGroup;
if ( bRet )
EndDialog(RET_EDIT);
@@ -781,7 +781,7 @@ IMPL_LINK( SwNewGlosNameDlg, Modify, Edit *, pBox )
if (pBox == m_pNewName)
m_pNewShort->SetText( lcl_GetValidShortCut( aName ) );
- sal_Bool bEnable = !aName.isEmpty() && !m_pNewShort->GetText().isEmpty() &&
+ bool bEnable = !aName.isEmpty() && !m_pNewShort->GetText().isEmpty() &&
(!pDlg->DoesBlockExist(aName, m_pNewShort->GetText())
|| aName == m_pOldName->GetText());
m_pOk->Enable(bEnable);
@@ -969,7 +969,7 @@ TriState SwGlTreeListBox::NotifyCopyingOrMoving(
SvTreeListEntry* pSrcParent = GetParent(pEntry);
SvTreeListEntry* pDestParent =
GetParent(pTarget) ? GetParent(pTarget) : pTarget;
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if(pDestParent != pSrcParent)
{
SwGlossaryDlg* pDlg = (SwGlossaryDlg*)GetParentDialog();
@@ -1033,7 +1033,7 @@ IMPL_LINK( SwGlossaryDlg, PathHdl, Button *, pBtn )
if(sTmp != sGlosPath)
{
aPathOpt.SetAutoTextPath( sTmp );
- ::GetGlossaries()->UpdateGlosPath( sal_True );
+ ::GetGlossaries()->UpdateGlosPath( true );
Init();
}
}
@@ -1072,7 +1072,7 @@ void SwGlossaryDlg::ShowAutoText(const OUString& rGroup, const OUString& rShortN
{
SetResumeData(rGroup, rShortName);
//try to make an Undo()
- pExampleFrame->ClearDocument( sal_True );
+ pExampleFrame->ClearDocument( true );
}
}
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index 308512077dab..de9b9bfc45fa 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -40,7 +40,7 @@
#include <boost/scoped_ptr.hpp>
-static sal_Bool bFootnote = sal_True;
+static bool bFootnote = true;
/*------------------------------------------------------------------------
Description: inserting a footnote with OK
@@ -56,14 +56,14 @@ void SwInsFootNoteDlg::Apply()
if ( bEdit )
{
rSh.StartAction();
- rSh.Left(CRSR_SKIP_CHARS, sal_False, 1, sal_False );
+ rSh.Left(CRSR_SKIP_CHARS, false, 1, false );
rSh.StartUndo( UNDO_START );
SwFmtFtn aNote( m_pEndNoteBtn->IsChecked() );
aNote.SetNumStr( aStr );
if( rSh.SetCurFtn( aNote ) && bExtCharAvailable )
{
- rSh.Right(CRSR_SKIP_CHARS, sal_True, 1, sal_False );
+ rSh.Right(CRSR_SKIP_CHARS, true, 1, false );
SfxItemSet aSet( rSh.GetAttrPool(), RES_CHRATR_FONT, RES_CHRATR_FONT );
rSh.GetCurAttr( aSet );
SvxFontItem &rFont = (SvxFontItem &) aSet.Get( RES_CHRATR_FONT );
@@ -72,8 +72,8 @@ void SwInsFootNoteDlg::Apply()
eCharSet, RES_CHRATR_FONT );
aSet.Put( aFont );
rSh.SetAttrSet( aSet, nsSetAttrMode::SETATTR_DONTEXPAND );
- rSh.ResetSelect(0, sal_False);
- rSh.Left(CRSR_SKIP_CHARS, sal_False, 1, sal_False );
+ rSh.ResetSelect(0, false);
+ rSh.Left(CRSR_SKIP_CHARS, false, 1, false );
}
rSh.EndUndo( UNDO_END );
rSh.EndAction();
@@ -143,7 +143,7 @@ IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberExtCharHdl)
m_pNumberCharEdit->SetFont( aFont );
}
- bExtCharAvailable = sal_True;
+ bExtCharAvailable = true;
m_pOkBtn->Enable(!m_pNumberCharEdit->GetText().isEmpty());
}
}
@@ -156,7 +156,7 @@ IMPL_LINK( SwInsFootNoteDlg, NextPrevHdl, Button *, pBtn )
Apply();
// go to the next foot/endnote here
- rSh.ResetSelect(0, sal_False);
+ rSh.ResetSelect(0, false);
if (pBtn == m_pNextBT)
rSh.GotoNextFtnAnchor();
else
@@ -167,10 +167,10 @@ IMPL_LINK( SwInsFootNoteDlg, NextPrevHdl, Button *, pBtn )
return 0;
}
-SwInsFootNoteDlg::SwInsFootNoteDlg(Window *pParent, SwWrtShell &rShell, sal_Bool bEd) :
+SwInsFootNoteDlg::SwInsFootNoteDlg(Window *pParent, SwWrtShell &rShell, bool bEd) :
SvxStandardDialog(pParent, "InsertFootnoteDialog", "modules/swriter/ui/insertfootnote.ui"),
rSh(rShell),
- bExtCharAvailable(sal_False),
+ bExtCharAvailable(false),
bEdit(bEd)
{
get(m_pNumberFrame, "numberingframe");
@@ -210,7 +210,7 @@ SwInsFootNoteDlg::~SwInsFootNoteDlg()
rSh.SetCareWin(0);
if (bEdit)
- rSh.ResetSelect(0, sal_False);
+ rSh.ResetSelect(0, false);
}
void SwInsFootNoteDlg::Init()
@@ -218,7 +218,7 @@ void SwInsFootNoteDlg::Init()
SwFmtFtn aFtnNote;
OUString sNumStr;
Font aFont;
- bExtCharAvailable = sal_False;
+ bExtCharAvailable = false;
rSh.StartAction();
@@ -228,7 +228,7 @@ void SwInsFootNoteDlg::Init()
{
sNumStr = aFtnNote.GetNumStr();
- rSh.Right(CRSR_SKIP_CHARS, sal_True, 1, sal_False );
+ rSh.Right(CRSR_SKIP_CHARS, true, 1, false );
SfxItemSet aSet( rSh.GetAttrPool(), RES_CHRATR_FONT, RES_CHRATR_FONT );
rSh.GetCurAttr( aSet );
const SvxFontItem &rFont = (SvxFontItem &) aSet.Get( RES_CHRATR_FONT );
@@ -238,8 +238,8 @@ void SwInsFootNoteDlg::Init()
eCharSet = rFont.GetCharSet();
aFont.SetName(m_aFontName);
aFont.SetCharSet(eCharSet);
- bExtCharAvailable = sal_True;
- rSh.Left( CRSR_SKIP_CHARS, sal_False, 1, sal_False );
+ bExtCharAvailable = true;
+ rSh.Left( CRSR_SKIP_CHARS, false, 1, false );
}
bFootnote = !aFtnNote.IsEndNote();
}
@@ -258,12 +258,12 @@ void SwInsFootNoteDlg::Init()
else
m_pEndNoteBtn->Check();
- sal_Bool bNext = rSh.GotoNextFtnAnchor();
+ bool bNext = rSh.GotoNextFtnAnchor();
if (bNext)
rSh.GotoPrevFtnAnchor();
- sal_Bool bPrev = rSh.GotoPrevFtnAnchor();
+ bool bPrev = rSh.GotoPrevFtnAnchor();
if (bPrev)
rSh.GotoNextFtnAnchor();
@@ -271,7 +271,7 @@ void SwInsFootNoteDlg::Init()
m_pPrevBT->Enable(bPrev);
m_pNextBT->Enable(bNext);
- rSh.Right(CRSR_SKIP_CHARS, sal_True, 1, sal_False );
+ rSh.Right(CRSR_SKIP_CHARS, true, 1, false );
rSh.EndAction();
}
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 02cf75d6ee06..9890ee088ecb 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -54,7 +54,7 @@
#include <svl/aeitem.hxx>
#include <svl/slstitm.hxx>
-static sal_Bool bLastRelative = sal_False;
+static bool bLastRelative = false;
//See cui/uiconfig/ui/numberingpositionpage.ui for effectively a duplicate
//dialog to this one, except with a different preview window impl.
@@ -68,8 +68,8 @@ SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent,
, pSaveNum(0)
, pWrtSh(0)
, pOutlineDlg(0)
- , bPreset( sal_False )
- , bInInintControl(sal_False)
+ , bPreset( false )
+ , bInInintControl(false)
, bLabelAlignmentPosAndSpaceModeActive( false )
{
get(m_pLevelLB, "levellb");
@@ -166,7 +166,7 @@ SwNumPositionTabPage::~SwNumPositionTabPage()
void SwNumPositionTabPage::InitControls()
{
- bInInintControl = sal_True;
+ bInInintControl = true;
const bool bRelative = !bLabelAlignmentPosAndSpaceModeActive &&
m_pRelativeCB->IsEnabled() && m_pRelativeCB->IsChecked();
const bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 &&
@@ -355,7 +355,7 @@ void SwNumPositionTabPage::InitControls()
if(bSetDistEmpty)
m_pDistBorderMF->SetText(aEmptyOUStr);
- bInInintControl = sal_False;
+ bInInintControl = false;
}
void SwNumPositionTabPage::ActivatePage(const SfxItemSet& )
@@ -454,7 +454,7 @@ void SwNumPositionTabPage::Reset( const SfxItemSet& rSet )
InitPosAndSpaceMode();
ShowControlsDependingOnPosAndSpaceMode();
InitControls();
- bModified = sal_False;
+ bModified = false;
}
void SwNumPositionTabPage::InitPosAndSpaceMode()
@@ -690,7 +690,7 @@ IMPL_LINK( SwNumPositionTabPage, DistanceHdl, MetricField *, pFld )
IMPL_LINK( SwNumPositionTabPage, RelativeHdl, CheckBox *, pBox )
{
- sal_Bool bOn = pBox->IsChecked();
+ bool bOn = pBox->IsChecked();
bool bSingleSelection = m_pLevelLB->GetSelectEntryCount() == 1 && USHRT_MAX != nActNumLvl;
bool bSetValue = false;
long nValue = 0;
@@ -900,9 +900,9 @@ IMPL_LINK_NOARG(SwNumPositionTabPage, StandardHdl)
}
#ifdef DBG_UTIL
-void SwNumPositionTabPage::SetModified(sal_Bool bRepaint)
+void SwNumPositionTabPage::SetModified(bool bRepaint)
{
- bModified = sal_True;
+ bModified = true;
if(bRepaint)
{
m_pPreviewWIN->SetLevel(nActNumLvl);
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 6a19d904dfc8..6110b650cddd 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -336,7 +336,7 @@ short SwOutlineTabDialog::Ok()
if( !rTxtColl.IsDefault() )
{
const SfxPoolItem & rItem =
- rTxtColl.GetFmtAttr(RES_PARATR_NUMRULE, sal_False);
+ rTxtColl.GetFmtAttr(RES_PARATR_NUMRULE, false);
if ((sal_uInt8)GetLevel(rTxtColl.GetName()) == MAXLEVEL)
{
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index ec6a4f0275d3..60add9d67454 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -125,7 +125,7 @@ SwFootNotePage::SwFootNotePage(Window *pParent, const SfxItemSet &rSet)
get(m_pLineDistEdit, "spacingtocontents");
SetExchangeSupport();
- FieldUnit aMetric = ::GetDfltMetric(sal_False);
+ FieldUnit aMetric = ::GetDfltMetric(false);
SetMetric(*m_pMaxHeightEdit, aMetric);
SetMetric(*m_pDistEdit, aMetric);
SetMetric(*m_pLineDistEdit, aMetric);
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 1060896e61b1..96c7669d5fc0 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -43,12 +43,12 @@
SwTextGridPage::SwTextGridPage(Window *pParent, const SfxItemSet &rSet) :
SfxTabPage(pParent, "TextGridPage", "modules/swriter/ui/textgridpage.ui", rSet),
m_nRubyUserValue(0),
- m_bRubyUserValue(sal_False),
+ m_bRubyUserValue(false),
m_aPageSize(MM50, MM50),
m_bVertical(false),
- m_bSquaredMode(sal_False),
- m_bHRulerChanged( sal_False ),
- m_bVRulerChanged( sal_False )
+ m_bSquaredMode(false),
+ m_bHRulerChanged( false ),
+ m_bVRulerChanged( false )
{
get(m_pNoGridRB,"radioRB_NOGRID");
get(m_pLinesGridRB,"radioRB_LINESGRID");
@@ -160,7 +160,7 @@ SfxTabPage *SwTextGridPage::Create(Window *pParent, const SfxItemSet &rSet)
bool SwTextGridPage::FillItemSet(SfxItemSet &rSet)
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if(m_pNoGridRB->GetSavedValue() != m_pNoGridRB->IsChecked()||
m_pLinesGridRB->GetSavedValue() != m_pLinesGridRB->IsChecked()||
m_pLinesPerPageNF->GetSavedValue().toInt32()
@@ -177,7 +177,7 @@ bool SwTextGridPage::FillItemSet(SfxItemSet &rSet)
m_pColorLB->GetSavedValue() != m_pColorLB->GetSelectEntryPos())
{
PutGridItem(rSet);
- bRet = sal_True;
+ bRet = true;
}
// draw ticks of ruler
@@ -208,7 +208,7 @@ void SwTextGridPage::Reset(const SfxItemSet &rSet)
m_pLinesPerPageNF->SetValue(rGridItem.GetLines());
SetLinesOrCharsRanges( *m_pLinesRangeFT , m_pLinesPerPageNF->GetMax() );
m_nRubyUserValue = rGridItem.GetBaseHeight();
- m_bRubyUserValue = sal_True;
+ m_bRubyUserValue = true;
m_pTextSizeMF->SetValue(m_pTextSizeMF->Normalize(m_nRubyUserValue), FUNIT_TWIP);
m_pRubySizeMF->SetValue(m_pRubySizeMF->Normalize(rGridItem.GetRubyHeight()), FUNIT_TWIP);
m_pCharWidthMF->SetValue(m_pCharWidthMF->Normalize(rGridItem.GetBaseWidth()), FUNIT_TWIP);
@@ -270,9 +270,9 @@ void SwTextGridPage::PutGridItem(SfxItemSet& rSet)
{
if ( aGridItem.GetGridType() == GRID_LINES_CHARS )
{
- m_bHRulerChanged = sal_True;
+ m_bHRulerChanged = true;
}
- m_bVRulerChanged = sal_True;
+ m_bVRulerChanged = true;
pView->GetHRuler().SetCharWidth((long)(m_pCharWidthMF->GetValue(FUNIT_TWIP)/56.7));
pView->GetVRuler().SetLineHeight((long)(m_pTextSizeMF->GetValue(FUNIT_TWIP)/56.7));
}
@@ -372,7 +372,7 @@ IMPL_LINK(SwTextGridPage, CharorLineChangedHdl, SpinField*, pField)
m_pTextSizeMF->SetValue(m_pTextSizeMF->Normalize(nWidth), FUNIT_TWIP);
//prevent rounding errors in the MetricField by saving the used value
m_nRubyUserValue = nWidth;
- m_bRubyUserValue = sal_True;
+ m_bRubyUserValue = true;
}
//set maximum line per page
@@ -395,7 +395,7 @@ IMPL_LINK(SwTextGridPage, CharorLineChangedHdl, SpinField*, pField)
SetLinesOrCharsRanges( *m_pLinesRangeFT , m_pLinesPerPageNF->GetMax() );
m_nRubyUserValue = nHeight;
- m_bRubyUserValue = sal_True;
+ m_bRubyUserValue = true;
}
else if (m_pCharsPerLineNF == pField)
{
@@ -415,7 +415,7 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, SpinField*, pField)
{
if (m_pTextSizeMF == pField)
{
- m_bRubyUserValue = sal_False;
+ m_bRubyUserValue = false;
// fdo#50941: set maximum characters per line
sal_Int32 nTextSize = static_cast< sal_Int32 >(m_pTextSizeMF->Denormalize(m_pTextSizeMF->GetValue(FUNIT_TWIP)));
@@ -442,7 +442,7 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, SpinField*, pField)
{
sal_Int32 nTextSize = static_cast< sal_Int32 >(m_pTextSizeMF->Denormalize(m_pTextSizeMF->GetValue(FUNIT_TWIP)));
m_pLinesPerPageNF->SetValue(m_aPageSize.Height() / nTextSize);
- m_bRubyUserValue = sal_False;
+ m_bRubyUserValue = false;
SetLinesOrCharsRanges( *m_pLinesRangeFT , m_pLinesPerPageNF->GetMax() );
}
else if (m_pCharWidthMF == pField)
@@ -462,7 +462,7 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, SpinField*, pField)
IMPL_LINK(SwTextGridPage, GridTypeHdl, RadioButton*, pButton)
{
- sal_Bool bEnable = m_pNoGridRB != pButton;
+ bool bEnable = m_pNoGridRB != pButton;
m_pLayoutFL->Enable(bEnable);
m_pDisplayFL->Enable(bEnable);
@@ -489,7 +489,7 @@ IMPL_LINK(SwTextGridPage, GridTypeHdl, RadioButton*, pButton)
IMPL_LINK_NOARG(SwTextGridPage, DisplayGridHdl)
{
- sal_Bool bChecked = m_pDisplayCB->IsChecked();
+ bool bChecked = m_pDisplayCB->IsChecked();
m_pPrintCB->Enable(bChecked);
m_pPrintCB->Check(bChecked);
return 0;
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 6c6bf518df81..a4e78417e704 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -40,9 +40,9 @@
#include <tblsel.hxx>
#include <sfx2/request.hxx>
-static sal_Bool bCheck1 = sal_True;
-static sal_Bool bCheck2 = sal_False;
-static sal_Bool bCheck3 = sal_False;
+static bool bCheck1 = true;
+static bool bCheck2 = false;
+static bool bCheck3 = false;
static sal_uInt16 nCol1 = 1;
static sal_uInt16 nCol2 = 1;
@@ -54,11 +54,11 @@ static sal_uInt16 nType3 = 0;
static sal_uInt16 nLang = LANGUAGE_NONE;
-static sal_Bool bAsc1 = sal_True;
-static sal_Bool bAsc2 = sal_True;
-static sal_Bool bAsc3 = sal_True;
-static sal_Bool bCol = sal_False;
-static sal_Bool bCsSens= sal_False;
+static bool bAsc1 = true;
+static bool bAsc2 = true;
+static bool bAsc3 = true;
+static bool bCol = false;
+static bool bCsSens= false;
static sal_Unicode cDeli = '\t';
@@ -346,11 +346,11 @@ void SwSortDlg::Apply()
aOptions.bTable = rSh.IsTableMode();
aOptions.bIgnoreCase = !bCsSens;
- sal_Bool bRet;
+ bool bRet;
{
SwWait aWait( *rSh.GetView().GetDocShell(), true );
rSh.StartAllAction();
- if( 0 != (bRet = rSh.Sort( aOptions )))
+ if( (bRet = rSh.Sort( aOptions )))
rSh.SetModified();
rSh.EndAllAction();
}
@@ -361,7 +361,7 @@ void SwSortDlg::Apply()
IMPL_LINK( SwSortDlg, DelimHdl, RadioButton*, pButton )
{
- sal_Bool bEnable = pButton == m_pDelimFreeRB && m_pDelimFreeRB->IsEnabled();
+ bool bEnable = pButton == m_pDelimFreeRB && m_pDelimFreeRB->IsEnabled();
m_pDelimEdt->Enable( bEnable );
m_pDelimPB->Enable( bEnable );
return 0;
diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
index 81d3c18c6623..67d0f03d07fd 100644
--- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
+++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
@@ -46,7 +46,7 @@ SwModalRedlineAcceptDlg::SwModalRedlineAcceptDlg(Window *pParent)
: SfxModalDialog(pParent,
"AcceptRejectChangesDialog", "svx/ui/acceptrejectchangesdialog.ui")
{
- pImplDlg = new SwRedlineAcceptDlg(this, sal_True);
+ pImplDlg = new SwRedlineAcceptDlg(this, true);
pImplDlg->Initialize(GetExtraData());
pImplDlg->Activate(); // for data's initialisation
@@ -54,7 +54,7 @@ SwModalRedlineAcceptDlg::SwModalRedlineAcceptDlg(Window *pParent)
SwModalRedlineAcceptDlg::~SwModalRedlineAcceptDlg()
{
- AcceptAll(sal_False); // refuse everything remaining
+ AcceptAll(false); // refuse everything remaining
pImplDlg->FillInfo(GetExtraData());
delete pImplDlg;
@@ -64,7 +64,7 @@ void SwModalRedlineAcceptDlg::Activate()
{
}
-void SwModalRedlineAcceptDlg::AcceptAll( sal_Bool bAccept )
+void SwModalRedlineAcceptDlg::AcceptAll( bool bAccept )
{
SvxTPFilter* pFilterTP = pImplDlg->GetChgCtrl()->GetFilterPage();
@@ -78,7 +78,7 @@ void SwModalRedlineAcceptDlg::AcceptAll( sal_Bool bAccept )
pImplDlg->FilterChangedHdl();
}
- pImplDlg->CallAcceptReject( sal_False, bAccept );
+ pImplDlg->CallAcceptReject( false, bAccept );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx
index 70ce11bf5c24..b31cba9504b5 100644
--- a/sw/source/ui/misc/titlepage.cxx
+++ b/sw/source/ui/misc/titlepage.cxx
@@ -104,16 +104,16 @@ namespace
void lcl_PushCursor(SwWrtShell *pSh)
{
- pSh->LockView( sal_True );
+ pSh->LockView( true );
pSh->StartAllAction();
pSh->SwCrsrShell::Push();
}
void lcl_PopCursor(SwWrtShell *pSh)
{
- pSh->SwCrsrShell::Pop( sal_False );
+ pSh->SwCrsrShell::Pop( false );
pSh->EndAllAction();
- pSh->LockView( sal_False );
+ pSh->LockView( false );
}
sal_uInt16 lcl_GetCurrentPage(SwWrtShell *pSh)