[Libreoffice-commits] .: sw/inc sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Oct 18 12:19:50 PDT 2012
sw/inc/crsrsh.hxx | 4 ++--
sw/inc/doc.hxx | 8 ++++----
sw/inc/swtable.hxx | 8 ++++----
sw/source/core/crsr/trvltbl.cxx | 8 ++++----
sw/source/core/doc/doc.cxx | 8 ++++----
sw/source/core/doc/docbasic.cxx | 10 +++++-----
sw/source/core/doc/docbm.cxx | 24 ++++++++++++------------
sw/source/core/doc/docchart.cxx | 8 +++-----
sw/source/core/doc/docedt.cxx | 2 +-
sw/source/core/doc/doclay.cxx | 10 +++++-----
sw/source/core/frmedt/feshview.cxx | 6 +++---
sw/source/core/inc/mvsave.hxx | 2 +-
sw/source/core/table/swtable.cxx | 8 ++++----
sw/source/ui/app/docsh2.cxx | 2 +-
sw/source/ui/docvw/edtwin.cxx | 4 ++--
sw/source/ui/inc/swtablerep.hxx | 5 ++---
sw/source/ui/inc/wrtsh.hxx | 2 +-
sw/source/ui/table/swtablerep.cxx | 2 +-
sw/source/ui/wrtsh/wrtsh2.cxx | 4 ++--
sw/source/ui/wrtsh/wrtsh3.cxx | 2 +-
20 files changed, 62 insertions(+), 65 deletions(-)
New commits:
commit 329d3287272bf4715244a3c03ca008f049e9132f
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Fri Oct 19 03:59:48 2012 +0900
sal_Bool to bool
Change-Id: Id3be1fbf289f04e175bb2fdd71754cad0c9672ce
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index fc421d2..74bc64a 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -594,8 +594,8 @@ public:
inline const SwPaM* GetTblCrs() const;
inline SwPaM* GetTblCrs();
- sal_Bool IsTblComplex() const;
- sal_Bool IsTblComplexForChart();
+ bool IsTblComplex() const;
+ bool IsTblComplexForChart();
// get current table selection as text
String GetBoxNms() const;
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 9649c7e..ff43c12 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1125,12 +1125,12 @@ public:
void SetGlossDoc( bool bGlssDc = true ) { mbGlossDoc = bGlssDc; }
bool IsInsOnlyTextGlossary() const { return mbInsOnlyTxtGlssry; }
- void Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, sal_Bool bImpress );
+ void Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, bool bImpress );
void ChangeAuthorityData(const SwAuthEntry* pNewData);
bool IsInCallModified() const { return mbInCallModified; }
- sal_Bool IsInHeaderFooter( const SwNodeIndex& rIdx ) const;
+ bool IsInHeaderFooter( const SwNodeIndex& rIdx ) const;
short GetTextDirection( const SwPosition& rPos,
const Point* pPt = 0 ) const;
sal_Bool IsInVerticalText( const SwPosition& rPos,
@@ -1812,11 +1812,11 @@ public:
const SwFmtINetFmt* FindINetAttr( const String& rName ) const;
/// Call into intransparent Basic; expect possible Return String.
- sal_Bool ExecMacro( const SvxMacro& rMacro, String* pRet = 0, SbxArray* pArgs = 0 );
+ bool ExecMacro( const SvxMacro& rMacro, String* pRet = 0, SbxArray* pArgs = 0 );
/// Call into intransparent Basic / JavaScript.
sal_uInt16 CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent,
- sal_Bool bChkPtr = sal_False, SbxArray* pArgs = 0,
+ bool bChkPtr = false, SbxArray* pArgs = 0,
const Link* pCallBack = 0 );
/** Adjust left margin via object bar (similar to adjustment of numerations).
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 709fce4..d6192c3 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -299,11 +299,11 @@ public:
const SwTableBox* GetTblBox( sal_uLong nSttIdx ) const
{ return ((SwTable*)this)->GetTblBox( nSttIdx ); }
- // Returns sal_True if table contains nestings.
- sal_Bool IsTblComplex() const;
+ // Returns true if table contains nestings.
+ bool IsTblComplex() const;
- // Returns sal_True if table or selection is balanced.
- sal_Bool IsTblComplexForChart( const String& rSel ) const;
+ // Returns true if table or selection is balanced.
+ bool IsTblComplexForChart( const String& rSel ) const;
// Search all content-bearing boxes of the base line on which this box stands.
// rBoxes as a return value for immediate use.
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index 8260d2f..be9a9dc 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -706,18 +706,18 @@ sal_Bool SwCrsrShell::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
}
-sal_Bool SwCrsrShell::IsTblComplex() const
+bool SwCrsrShell::IsTblComplex() const
{
SwFrm *pFrm = GetCurrFrm( sal_False );
if ( pFrm && pFrm->IsInTab() )
return pFrm->FindTabFrm()->GetTable()->IsTblComplex();
- return sal_False;
+ return false;
}
-sal_Bool SwCrsrShell::IsTblComplexForChart()
+bool SwCrsrShell::IsTblComplexForChart()
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
// Here we may trigger table formatting so we better do that inside an action
StartAction();
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 3216c17..2cf0fe9 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -871,7 +871,7 @@ bool SwDoc::SplitNode( const SwPosition &rPos, bool bChkTableStart )
{
// move all bookmarks, TOXMarks, FlyAtCnt
if( !aBkmkArr.empty() )
- _RestoreCntntIdx( this, aBkmkArr, rPos.nNode.GetIndex()-1, 0, sal_True );
+ _RestoreCntntIdx( this, aBkmkArr, rPos.nNode.GetIndex()-1, 0, true );
if( IsRedlineOn() || (!IsIgnoreRedline() && !pRedlineTbl->empty() ))
{
@@ -2084,7 +2084,7 @@ const SwFmtINetFmt* SwDoc::FindINetAttr( const String& rName ) const
return 0;
}
-void SwDoc::Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, sal_Bool bImpress )
+void SwDoc::Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, bool bImpress )
{
const SwOutlineNodes& rOutNds = GetNodes().GetOutLineNds();
if( pExtDoc && !rOutNds.empty() )
@@ -2418,12 +2418,12 @@ bool SwDoc::ConvertFieldsToText()
// skip fields that are currently not in the document
// e.g. fields in undo or redo array
- sal_Bool bSkip = !pTxtFld ||
+ bool bSkip = !pTxtFld ||
!pTxtFld->GetpTxtNode()->GetNodes().IsDocNodes();
if (!bSkip)
{
- sal_Bool bInHeaderFooter = IsInHeaderFooter(SwNodeIndex(*pTxtFld->GetpTxtNode()));
+ bool bInHeaderFooter = IsInHeaderFooter(SwNodeIndex(*pTxtFld->GetpTxtNode()));
const SwFmtFld& rFmtFld = pTxtFld->GetFld();
const SwField* pField = rFmtFld.GetFld();
diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx
index 8c502cc..b6bc7ae 100644
--- a/sw/source/core/doc/docbasic.cxx
+++ b/sw/source/core/doc/docbasic.cxx
@@ -81,7 +81,7 @@ static Sequence<Any> *lcl_docbasic_convertArgs( SbxArray& rArgs )
return pRet;
}
-sal_Bool SwDoc::ExecMacro( const SvxMacro& rMacro, String* pRet, SbxArray* pArgs )
+bool SwDoc::ExecMacro( const SvxMacro& rMacro, String* pRet, SbxArray* pArgs )
{
ErrCode eErr = 0;
switch( rMacro.GetScriptType() )
@@ -141,7 +141,7 @@ sal_Bool SwDoc::ExecMacro( const SvxMacro& rMacro, String* pRet, SbxArray* pArgs
sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent,
- sal_Bool bCheckPtr, SbxArray* pArgs, const Link* )
+ bool bCheckPtr, SbxArray* pArgs, const Link* )
{
if( !pDocShell ) // we can't do that without a DocShell!
return 0;
@@ -159,7 +159,7 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
if( 0 != (pItem = GetAttrPool().GetItem2( RES_TXTATR_INETFMT, n ) )
&& rCallEvent.PTR.pINetAttr == pItem )
{
- bCheckPtr = sal_False; // misuse as a flag
+ bCheckPtr = false; // misuse as a flag
break;
}
}
@@ -174,7 +174,7 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
if( bCheckPtr )
{
if ( GetSpzFrmFmts()->Contains( pFmt ) )
- bCheckPtr = sal_False; // misuse as a flag
+ bCheckPtr = false; // misuse as a flag
}
if( !bCheckPtr )
pTbl = &pFmt->GetMacro().GetMacroTable();
@@ -194,7 +194,7 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
for( sal_uInt16 nPos = pIMap->GetIMapObjectCount(); nPos; )
if( pIMapObj == pIMap->GetIMapObject( --nPos ))
{
- bCheckPtr = sal_False; // misuse as a flag
+ bCheckPtr = false; // misuse as a flag
break;
}
}
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index dec25f4..9704241 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -982,10 +982,10 @@ namespace
static void lcl_ChkPaM( std::vector<sal_uLong> &rSaveArr, sal_uLong nNode, xub_StrLen nCntnt,
const SwPaM& rPam, _SwSaveTypeCountContent& rSave,
- sal_Bool bChkSelDirection )
+ bool bChkSelDirection )
{
// Respect direction of selection
- bool bBound1IsStart = !bChkSelDirection ? sal_True :
+ bool bBound1IsStart = !bChkSelDirection ? true :
( *rPam.GetPoint() < *rPam.GetMark()
? rPam.GetPoint() == &rPam.GetBound()
: rPam.GetMark() == &rPam.GetBound());
@@ -1182,11 +1182,11 @@ void _DelBookmarks(
pRStt->nContent = *pEndIdx;
else
{
- sal_Bool bStt = sal_True;
+ bool bStt = true;
SwCntntNode* pCNd = pRStt->nNode.GetNode().GetCntntNode();
if( !pCNd && 0 == ( pCNd = pDoc->GetNodes().GoNext( &pRStt->nNode )) )
{
- bStt = sal_False;
+ bStt = false;
pRStt->nNode = rStt;
if( 0 == ( pCNd = pDoc->GetNodes().GoPrevious( &pRStt->nNode )) )
{
@@ -1205,11 +1205,11 @@ void _DelBookmarks(
pREnd->nContent = *pSttIdx;
else
{
- sal_Bool bStt = sal_False;
+ bool bStt = false;
SwCntntNode* pCNd = pREnd->nNode.GetNode().GetCntntNode();
if( !pCNd && 0 == ( pCNd = pDoc->GetNodes().GoPrevious( &pREnd->nNode )) )
{
- bStt = sal_True;
+ bStt = true;
pREnd->nNode = rEnd;
if( 0 == ( pCNd = pDoc->GetNodes().GoNext( &pREnd->nNode )) )
{
@@ -1309,7 +1309,7 @@ void _SaveCntntIdx(SwDoc* pDoc,
SwFrm* pFrm = pNode->getLayoutFrm( pDoc->GetCurrentLayout() );
#if OSL_DEBUG_LEVEL > 1
- static sal_Bool bViaDoc = sal_False;
+ static bool bViaDoc = false;
if( bViaDoc )
pFrm = NULL;
#endif
@@ -1403,14 +1403,14 @@ void _SaveCntntIdx(SwDoc* pDoc,
if( _pStkCrsr )
do {
lcl_ChkPaM( rSaveArr, nNode, nCntnt, *_pStkCrsr,
- aSave, sal_False );
+ aSave, false );
aSave.IncCount();
} while ( (_pStkCrsr != 0 ) &&
((_pStkCrsr=(SwPaM *)_pStkCrsr->GetNext()) != PCURSH->GetStkCrsr()) );
FOREACHPAM_START( PCURSH->_GetCrsr() )
lcl_ChkPaM( rSaveArr, nNode, nCntnt, *PCURCRSR,
- aSave, sal_False );
+ aSave, false );
aSave.IncCount();
FOREACHPAM_END()
@@ -1425,7 +1425,7 @@ void _SaveCntntIdx(SwDoc* pDoc,
it != rTbl.end(); ++it)
{
FOREACHPAM_START( *it )
- lcl_ChkPaM( rSaveArr, nNode, nCntnt, *PCURCRSR, aSave, sal_False );
+ lcl_ChkPaM( rSaveArr, nNode, nCntnt, *PCURCRSR, aSave, false );
aSave.IncCount();
FOREACHPAM_END()
@@ -1434,7 +1434,7 @@ void _SaveCntntIdx(SwDoc* pDoc,
if( pUnoTblCrsr )
{
FOREACHPAM_START( &pUnoTblCrsr->GetSelRing() )
- lcl_ChkPaM( rSaveArr, nNode, nCntnt, *PCURCRSR, aSave, sal_False );
+ lcl_ChkPaM( rSaveArr, nNode, nCntnt, *PCURCRSR, aSave, false );
aSave.IncCount();
FOREACHPAM_END()
}
@@ -1447,7 +1447,7 @@ void _RestoreCntntIdx(SwDoc* pDoc,
std::vector<sal_uLong> &rSaveArr,
sal_uLong nNode,
xub_StrLen nOffset,
- sal_Bool bAuto)
+ bool bAuto)
{
SwCntntNode* pCNd = pDoc->GetNodes()[ nNode ]->GetCntntNode();
const SwRedlineTbl& rRedlTbl = pDoc->GetRedlineTbl();
diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx
index c64270a..6518075 100644
--- a/sw/source/core/doc/docchart.cxx
+++ b/sw/source/core/doc/docchart.cxx
@@ -62,7 +62,7 @@ void SwTable::UpdateCharts() const
GetFrmFmt()->GetDoc()->UpdateCharts( GetFrmFmt()->GetName() );
}
-sal_Bool SwTable::IsTblComplexForChart( const String& rSelection ) const
+bool SwTable::IsTblComplexForChart( const String& rSelection ) const
{
const SwTableBox* pSttBox, *pEndBox;
if( 2 < rSelection.Len() )
@@ -162,11 +162,9 @@ void SwDoc::UpdateCharts( const String &rName ) const
void SwDoc::SetTableName( SwFrmFmt& rTblFmt, const String &rNewName )
{
-// sal_Bool bStop = 1;
-
const String aOldName( rTblFmt.GetName() );
- sal_Bool bNameFound = 0 == rNewName.Len();
+ bool bNameFound = 0 == rNewName.Len();
if( !bNameFound )
{
SwFrmFmt* pFmt;
@@ -175,7 +173,7 @@ void SwDoc::SetTableName( SwFrmFmt& rTblFmt, const String &rNewName )
if( !( pFmt = rTbl[ --i ] )->IsDefault() &&
pFmt->GetName() == rNewName && IsUsed( *pFmt ) )
{
- bNameFound = sal_True;
+ bNameFound = true;
break;
}
}
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 851eeea..7b3f829 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -939,7 +939,7 @@ bool SwDoc::MoveRange( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
pTNd = static_cast<SwTxtNode*>(pTNd->SplitCntntNode( rPos ));
if( !aBkmkArr.empty() )
- _RestoreCntntIdx( this, aBkmkArr, rPos.nNode.GetIndex()-1, 0, sal_True );
+ _RestoreCntntIdx( this, aBkmkArr, rPos.nNode.GetIndex()-1, 0, true );
// correct the PaM!
if( rPos.nNode == rPaM.GetMark()->nNode )
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 3215bb2..b427e18 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -2148,7 +2148,7 @@ void SwDoc::SetAllUniqueFlyNames()
SetLoaded( sal_True );
}
-sal_Bool SwDoc::IsInHeaderFooter( const SwNodeIndex& rIdx ) const
+bool SwDoc::IsInHeaderFooter( const SwNodeIndex& rIdx ) const
{
// If there's a Layout, use it!
// That can also be a Fly in a Fly in the Header.
@@ -2170,9 +2170,9 @@ sal_Bool SwDoc::IsInHeaderFooter( const SwNodeIndex& rIdx ) const
pUp = pUp->GetUpper();
}
if ( pUp )
- return sal_True;
+ return true;
- return sal_False;
+ return false;
}
}
@@ -2192,7 +2192,7 @@ sal_Bool SwDoc::IsInHeaderFooter( const SwNodeIndex& rIdx ) const
if ((FLY_AT_PAGE == rAnchor.GetAnchorId()) ||
!rAnchor.GetCntntAnchor() )
{
- return sal_False;
+ return false;
}
pNd = &rAnchor.GetCntntAnchor()->nNode.GetNode();
@@ -2203,7 +2203,7 @@ sal_Bool SwDoc::IsInHeaderFooter( const SwNodeIndex& rIdx ) const
if( n >= GetSpzFrmFmts()->size() )
{
OSL_ENSURE( mbInReading, "Found a FlySection but not a Format!" );
- return sal_False;
+ return false;
}
}
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index e12430a..04b8ee2 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1634,7 +1634,7 @@ sal_Bool SwFEShell::ImpEndCreate()
// default for controls character bound, otherwise paragraph bound.
SwFmtAnchor aAnch;
const SwFrm *pAnch = 0;
- sal_Bool bCharBound = sal_False;
+ bool bCharBound = false;
if( rSdrObj.ISA( SdrUnoObj ) )
{
SwPosition aPos( GetDoc()->GetNodes() );
@@ -1650,7 +1650,7 @@ sal_Bool SwFEShell::ImpEndCreate()
pAnch->GetCharRect( aTmp, aPos );
// The crsr should not be too far away
- bCharBound = sal_True;
+ bCharBound = true;
Rectangle aRect( aTmp.SVRect() );
aRect.Left() -= MM50*2;
aRect.Top() -= MM50*2;
@@ -1658,7 +1658,7 @@ sal_Bool SwFEShell::ImpEndCreate()
aRect.Bottom()+= MM50*2;
if( !aRect.IsOver( rBound ) && !::GetHtmlMode( GetDoc()->GetDocShell() ))
- bCharBound = sal_False;
+ bCharBound = false;
// anchor in header/footer also not allowed.
if( bCharBound )
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index 9c56566..3afde5a 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -93,7 +93,7 @@ void _SaveCntntIdx( SwDoc* pDoc, sal_uLong nNode, xub_StrLen nCntnt,
std::vector<sal_uLong>& rSaveArr, sal_uInt8 nSaveFly = 0 );
void _RestoreCntntIdx( SwDoc* pDoc, std::vector<sal_uLong>& rSaveArr,
sal_uLong nNode, xub_StrLen nOffset = 0,
- sal_Bool bAuto = sal_False );
+ bool bAuto = false );
void _RestoreCntntIdx( std::vector<sal_uLong>& rSaveArr, const SwNode& rNd,
xub_StrLen nLen, xub_StrLen nCorrLen );
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index f51d9c6..7c23b35 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -1515,19 +1515,19 @@ SwTableBox* SwTable::GetTblBox( sal_uLong nSttIdx )
return pRet;
}
-sal_Bool SwTable::IsTblComplex() const
+bool SwTable::IsTblComplex() const
{
- // Returns sal_True for complex tables, i.e. tables that contain nestings,
+ // Returns true for complex tables, i.e. tables that contain nestings,
// like containing boxes not part of the first line, e.g. results of
// splits/merges which lead to more complex structures.
for (size_t n = 0; n < m_TabSortContentBoxes.size(); ++n)
{
if (m_TabSortContentBoxes[ n ]->GetUpper()->GetUpper())
{
- return sal_True;
+ return true;
}
}
- return sal_False;
+ return false;
}
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index c0ec598..9d8efd2 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -992,7 +992,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
SfxObjectShellLock xDocSh( new SwDocShell( pSmryDoc, SFX_CREATE_MODE_STANDARD));
xDocSh->DoInitNew( 0 );
- sal_Bool bImpress = FN_ABSTRACT_STARIMPRESS == nWhich;
+ bool bImpress = FN_ABSTRACT_STARIMPRESS == nWhich;
pDoc->Summary( pSmryDoc, nLevel, nPara, bImpress );
if( bImpress )
{
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 3fce582..6b921cf 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -4028,7 +4028,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
{
if( aLastCallEvent.HasEvent() )
rSh.CallEvent( SFX_EVENT_MOUSEOUT_OBJECT,
- aLastCallEvent, sal_True );
+ aLastCallEvent, true );
// 0 says that the object doesn't have any table
if( !rSh.CallEvent( SFX_EVENT_MOUSEOVER_OBJECT,
aSaveCallEvent ))
@@ -4039,7 +4039,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
{
// cursor was on an object
rSh.CallEvent( SFX_EVENT_MOUSEOUT_OBJECT,
- aLastCallEvent, sal_True );
+ aLastCallEvent, true );
}
if( bTstShdwCrsr && bInsWin && !bIsDocReadOnly &&
diff --git a/sw/source/ui/inc/swtablerep.hxx b/sw/source/ui/inc/swtablerep.hxx
index f73f50e..996d0b2 100644
--- a/sw/source/ui/inc/swtablerep.hxx
+++ b/sw/source/ui/inc/swtablerep.hxx
@@ -38,13 +38,13 @@ class SW_DLLPUBLIC SwTableRep
sal_uInt16 nColCount;
sal_uInt16 nAllCols;
sal_uInt16 nWidthPercent;
- sal_Bool bComplex : 1;
+ bool bComplex : 1;
sal_Bool bLineSelected : 1;
sal_Bool bWidthChanged : 1;
sal_Bool bColsChanged : 1;
public:
- SwTableRep( const SwTabCols& rTabCol, sal_Bool bComplex );
+ SwTableRep( const SwTabCols& rTabCol, bool bComplex );
~SwTableRep();
sal_Bool FillTabCols( SwTabCols& rTabCol ) const;
@@ -64,7 +64,6 @@ public:
sal_uInt16 GetAlign() const {return nAlign;}
void SetAlign(sal_uInt16 nSet) {nAlign = nSet;}
- sal_Bool IsComplex() const {return bComplex;}
sal_uInt16 GetColCount() const {return nColCount;}
sal_uInt16 GetAllColCount() const {return nAllCols;}
diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx
index 86b4b6e..1ff6b56 100644
--- a/sw/source/ui/inc/wrtsh.hxx
+++ b/sw/source/ui/inc/wrtsh.hxx
@@ -428,7 +428,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
void ExecMacro( const SvxMacro& rMacro, String* pRet = 0, SbxArray* pArgs = 0 );
// call into the dark Basic/JavaScript
sal_uInt16 CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent,
- sal_Bool bCheckPtr = sal_False, SbxArray* pArgs = 0,
+ bool bCheckPtr = false, SbxArray* pArgs = 0,
const Link* pCallBack = 0 );
// a click at the given field. the cursor is on it.
diff --git a/sw/source/ui/table/swtablerep.cxx b/sw/source/ui/table/swtablerep.cxx
index e0733c3..d37f24e 100644
--- a/sw/source/ui/table/swtablerep.cxx
+++ b/sw/source/ui/table/swtablerep.cxx
@@ -64,7 +64,7 @@
#include "swtablerep.hxx"
-SwTableRep::SwTableRep( const SwTabCols& rTabCol, sal_Bool bCplx )
+SwTableRep::SwTableRep( const SwTabCols& rTabCol, bool bCplx )
:
nTblWidth(0),
nSpace(0),
diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx
index 17f2c8c..ba020a2 100644
--- a/sw/source/ui/wrtsh/wrtsh2.cxx
+++ b/sw/source/ui/wrtsh/wrtsh2.cxx
@@ -337,7 +337,7 @@ void SwWrtShell::ClickToINetAttr( const SwFmtINetFmt& rItem, sal_uInt16 nFilter
{
SwCallMouseEvent aCallEvent;
aCallEvent.Set( &rItem );
- GetDoc()->CallEvent( SFX_EVENT_MOUSECLICK_OBJECT, aCallEvent, sal_False );
+ GetDoc()->CallEvent( SFX_EVENT_MOUSECLICK_OBJECT, aCallEvent, false );
}
// damit die Vorlagenumsetzung sofort angezeigt wird
@@ -369,7 +369,7 @@ sal_Bool SwWrtShell::ClickToINetGrf( const Point& rDocPt, sal_uInt16 nFilter )
{
SwCallMouseEvent aCallEvent;
aCallEvent.Set( EVENT_OBJECT_URLITEM, pFnd );
- GetDoc()->CallEvent( SFX_EVENT_MOUSECLICK_OBJECT, aCallEvent, sal_False );
+ GetDoc()->CallEvent( SFX_EVENT_MOUSECLICK_OBJECT, aCallEvent, false );
}
::LoadURL(*this, sURL, nFilter, sTargetFrameName);
diff --git a/sw/source/ui/wrtsh/wrtsh3.cxx b/sw/source/ui/wrtsh/wrtsh3.cxx
index 699e2d3..efa1cba 100644
--- a/sw/source/ui/wrtsh/wrtsh3.cxx
+++ b/sw/source/ui/wrtsh/wrtsh3.cxx
@@ -173,7 +173,7 @@ void SwWrtShell::ExecMacro( const SvxMacro& rMacro, String* pRet, SbxArray* pArg
sal_uInt16 SwWrtShell::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent,
- sal_Bool bChkPtr, SbxArray* pArgs,
+ bool bChkPtr, SbxArray* pArgs,
const Link* pCallBack )
{
return GetDoc()->CallEvent( nEvent, rCallEvent, bChkPtr, pArgs, pCallBack );
More information about the Libreoffice-commits
mailing list