[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source
Takeshi Abe
tabe at fixedpoint.jp
Tue Feb 5 06:47:28 PST 2013
sw/inc/crsrsh.hxx | 2 +-
sw/inc/fesh.hxx | 2 +-
sw/source/core/crsr/crstrvl.cxx | 10 +++++-----
sw/source/core/frmedt/feshview.cxx | 4 ++--
sw/source/ui/dbui/dbinsdlg.cxx | 2 +-
sw/source/ui/docvw/edtwin.cxx | 6 +++---
sw/source/ui/inc/dbinsdlg.hxx | 2 +-
sw/source/ui/inc/drawbase.hxx | 8 ++++----
sw/source/ui/inc/view.hxx | 4 ++--
sw/source/ui/inc/wrtsh.hxx | 31 +++++++++++++++----------------
sw/source/ui/ribbar/conform.cxx | 2 +-
sw/source/ui/ribbar/drawbase.cxx | 4 ++--
sw/source/ui/ribbar/dselect.cxx | 2 +-
sw/source/ui/uiview/viewdraw.cxx | 12 ++++++------
sw/source/ui/wrtsh/delete.cxx | 14 +++++++-------
sw/source/ui/wrtsh/move.cxx | 8 ++++----
sw/source/ui/wrtsh/select.cxx | 14 +++++++-------
sw/source/ui/wrtsh/wrtsh1.cxx | 6 +++---
sw/source/ui/wrtsh/wrtsh2.cxx | 14 +++++++-------
sw/source/ui/wrtsh/wrtsh3.cxx | 6 +++---
20 files changed, 76 insertions(+), 77 deletions(-)
New commits:
commit 614358900ebadcd5e58b3a7b439b2f893d818981
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Feb 5 23:43:13 2013 +0900
Drop unused function
Change-Id: Ib7951202399816a8bdb5806751857c6c0cafceff
diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx
index 97dad88..66a7195 100644
--- a/sw/source/ui/inc/wrtsh.hxx
+++ b/sw/source/ui/inc/wrtsh.hxx
@@ -327,7 +327,6 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
sal_Bool InsertOleObject( const svt::EmbeddedObjectRef& xObj, SwFlyFrmFmt **pFlyFrmFmt = 0 );
void LaunchOLEObj( long nVerb = 0 ); // start server
- sal_Bool IsOLEObj() const { return GetCntType() == CNT_OLE;}
virtual void MoveObjectIfActive( svt::EmbeddedObjectRef& xObj, const Point& rOffset );
virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
const SwRect *pFlyPrtRect = 0,
commit e37d24e1c9a3140df47238b1989fc0b5df1443f6
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Feb 5 23:42:42 2013 +0900
sal_Bool to bool
Change-Id: Ie3901ac8dc2cb46f6d06cbc2c80760570a474bf9
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index ababf91..a7f7d7d 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -673,7 +673,7 @@ public:
sal_Bool bOnlyErrors = sal_False );
// jump to the next / previous hyperlink - inside text and also
// on graphics
- sal_Bool SelectNxtPrvHyperlink( sal_Bool bNext = sal_True );
+ bool SelectNxtPrvHyperlink( bool bNext = true );
sal_Bool GotoRefMark( const String& rRefMark, sal_uInt16 nSubType = 0,
sal_uInt16 nSeqNo = 0 );
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index ca42479..3e11b04 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -477,7 +477,7 @@ public:
void MoveCreate ( const Point &rPos );
sal_Bool EndCreate ( sal_uInt16 eSdrCreateCmd );
void BreakCreate();
- sal_Bool IsDrawCreate() const;
+ bool IsDrawCreate() const;
void CreateDefaultShape( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, const Rectangle& rRect, sal_uInt16 nSlotId);
/// Functions for Rubberbox, ti select Draw-Objects
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 7493815..82a66c9 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -2040,7 +2040,7 @@ const SwRedline* SwCrsrShell::GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect
}
-sal_Bool SwCrsrShell::SelectNxtPrvHyperlink( sal_Bool bNext )
+bool SwCrsrShell::SelectNxtPrvHyperlink( bool bNext )
{
SwNodes& rNds = GetDoc()->GetNodes();
const SwNode* pBodyEndNd = &rNds.GetEndOfContent();
@@ -2120,7 +2120,7 @@ sal_Bool SwCrsrShell::SelectNxtPrvHyperlink( sal_Bool bNext )
}
// found any URL ?
- sal_Bool bRet = sal_False;
+ bool bRet = false;
const SwTxtINetFmt* pFndAttr = aCmpPos.GetINetFmt();
const SwFlyFrmFmt* pFndFmt = aCmpPos.GetFlyFmt();
if( pFndAttr || pFndFmt )
@@ -2142,7 +2142,7 @@ sal_Bool SwCrsrShell::SelectNxtPrvHyperlink( sal_Bool bNext )
{
UpdateCrsr( SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|
SwCrsrShell::READONLY );
- bRet = sal_True;
+ bRet = true;
}
}
// found a draw object ?
@@ -2151,7 +2151,7 @@ sal_Bool SwCrsrShell::SelectNxtPrvHyperlink( sal_Bool bNext )
const SdrObject* pSObj = pFndFmt->FindSdrObject();
((SwFEShell*)this)->SelectObj( pSObj->GetCurrentBoundRect().Center() );
MakeSelVisible();
- bRet = sal_True;
+ bRet = true;
}
else // then is it a fly
{
@@ -2160,7 +2160,7 @@ sal_Bool SwCrsrShell::SelectNxtPrvHyperlink( sal_Bool bNext )
{
((SwFEShell*)this)->SelectFlyFrm( *pFly, sal_True );
MakeSelVisible();
- bRet = sal_True;
+ bRet = true;
}
}
}
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 3576033..84a5a53 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1936,9 +1936,9 @@ void SwFEShell::BreakCreate()
|*
*************************************************************************/
-sal_Bool SwFEShell::IsDrawCreate() const
+bool SwFEShell::IsDrawCreate() const
{
- return Imp()->HasDrawView() ? Imp()->GetDrawView()->IsCreateObj() : sal_False;
+ return Imp()->HasDrawView() ? Imp()->GetDrawView()->IsCreateObj() : false;
}
/*************************************************************************
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index bd2134f..dba0173 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -869,7 +869,7 @@ static void lcl_InsTextInArr( const String& rTxt, _DB_Columns& rColArr )
}
}
-sal_Bool SwInsertDBColAutoPilot::SplitTextToColArr( const String& rTxt,
+bool SwInsertDBColAutoPilot::SplitTextToColArr( const String& rTxt,
_DB_Columns& rColArr,
sal_Bool bInsField )
{
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 34d30e3..6ea4fec 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -1867,7 +1867,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
case KEY_BACKSPACE | KEY_SHIFT:
if( !rSh.HasReadonlySel() )
{
- sal_Bool bDone = sal_False;
+ bool bDone = false;
// try to add comment for code snip:
// Remove the paragraph indent, if the cursor is at the
// beginning of a paragraph, there is no selection
@@ -1902,13 +1902,13 @@ KEYINPUT_CHECKTABLE_INSDEL:
{
eKeyState = KS_NumUp;
nKS_NUMDOWN_Count = 2;
- bDone = sal_True;
+ bDone = true;
}
else if (nKS_NUMINDENTINC_Count > 0)
{
eKeyState = KS_NumIndentDec;
nKS_NUMINDENTINC_Count = 2;
- bDone = sal_True;
+ bDone = true;
}
}
diff --git a/sw/source/ui/inc/dbinsdlg.hxx b/sw/source/ui/inc/dbinsdlg.hxx
index 600167d..02488d1 100644
--- a/sw/source/ui/inc/dbinsdlg.hxx
+++ b/sw/source/ui/inc/dbinsdlg.hxx
@@ -151,7 +151,7 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem
DECL_LINK( DblClickHdl, ListBox* );
DECL_LINK( HeaderHdl, Button* );
- sal_Bool SplitTextToColArr( const String& rTxt, _DB_Columns& rColArr, sal_Bool bInsField );
+ bool SplitTextToColArr( const String& rTxt, _DB_Columns& rColArr, sal_Bool bInsField );
using SfxModalDialog::Notify;
virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
virtual void Commit();
diff --git a/sw/source/ui/inc/drawbase.hxx b/sw/source/ui/inc/drawbase.hxx
index 15392f6..431b90da 100644
--- a/sw/source/ui/inc/drawbase.hxx
+++ b/sw/source/ui/inc/drawbase.hxx
@@ -42,8 +42,8 @@ protected:
Point m_aStartPos; // position of BeginCreate
Point m_aMDPos; // position of MouseButtonDown
sal_uInt16 m_nSlotId;
- sal_Bool m_bCreateObj :1;
- sal_Bool m_bInsForm :1;
+ bool m_bCreateObj :1;
+ bool m_bInsForm :1;
Point GetDefaultCenterPos();
public:
@@ -52,8 +52,8 @@ public:
void SetDrawPointer();
void EnterSelectMode(const MouseEvent& rMEvt);
- inline sal_Bool IsInsertForm() const { return m_bInsForm; }
- inline sal_Bool IsCreateObj() const { return m_bCreateObj; }
+ inline bool IsInsertForm() const { return m_bInsForm; }
+ inline bool IsCreateObj() const { return m_bCreateObj; }
// mouse- & key events; return value=sal_True: event was edited
virtual sal_Bool KeyInput(const KeyEvent& rKEvt);
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 473f9c6..573e4d7 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -558,9 +558,9 @@ public:
sal_Bool EnterDrawTextMode(const Point& aDocPos);
void LeaveDrawCreate() { nDrawSfxId = nFormSfxId = USHRT_MAX; sDrawCustom.Erase();}
sal_Bool IsDrawMode() { return (nDrawSfxId != USHRT_MAX || nFormSfxId != USHRT_MAX); }
- sal_Bool IsFormMode() const;
+ bool IsFormMode() const;
sal_Bool IsBezierEditMode();
- sal_Bool AreOnlyFormsSelected() const;
+ bool AreOnlyFormsSelected() const;
sal_Bool HasDrwObj(SdrObject *pSdrObj) const;
sal_Bool HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const;
sal_Bool BeginTextEdit( SdrObject* pObj, SdrPageView* pPV=NULL,
diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx
index 836876b..97dad88 100644
--- a/sw/source/ui/inc/wrtsh.hxx
+++ b/sw/source/ui/inc/wrtsh.hxx
@@ -111,7 +111,7 @@ public:
inline void ResetCursorStack();
SelectionType GetSelectionType() const;
- sal_Bool IsModePushed() const { return 0 != pModeStack; }
+ bool IsModePushed() const { return 0 != pModeStack; }
void PushMode();
void PopMode();
@@ -125,7 +125,7 @@ public:
sal_Bool Pop( sal_Bool bOldCrsr = sal_True );
void EnterStdMode();
- sal_Bool IsStdMode() const { return !bExtMode && !bAddMode && !bBlockMode; }
+ bool IsStdMode() const { return !bExtMode && !bAddMode && !bBlockMode; }
void EnterExtMode();
void LeaveExtMode();
@@ -160,11 +160,11 @@ public:
inline void EndSelTblCells();
// leave per word or per line selection mode. Is usually called in MB-Up.
- sal_Bool IsExtSel() const { return bSelWrd || bSelLn; }
+ bool IsExtSel() const { return bSelWrd || bSelLn; }
// query whether the active fnDrag pointer is set to BeginDrag
// is needed for MouseMove to work around bugs 55592/55931
- inline sal_Bool Is_FnDragEQBeginDrag() const;
+ inline bool Is_FnDragEQBeginDrag() const;
// base requests
sal_Bool IsInWrd() { return IsInWord(); }
@@ -409,7 +409,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
// jump to the next / previous hyperlink - inside text and also
// on graphics
- sal_Bool SelectNextPrevHyperlink( sal_Bool bNext = sal_True );
+ bool SelectNextPrevHyperlink( bool bNext = true );
// determine corresponding SwView
const SwView& GetView() const { return rView; }
@@ -426,11 +426,11 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
// execute the predefined actions.
void ClickToField( const SwField& rFld );
void ClickToINetAttr( const SwFmtINetFmt& rItem, sal_uInt16 nFilter = URLLOAD_NOFILTER );
- sal_Bool ClickToINetGrf( const Point& rDocPt, sal_uInt16 nFilter = URLLOAD_NOFILTER );
- inline sal_Bool IsInClickToEdit() const ;
+ bool ClickToINetGrf( const Point& rDocPt, sal_uInt16 nFilter = URLLOAD_NOFILTER );
+ inline bool IsInClickToEdit() const ;
// if a URL-Button is selected, return its URL; otherwise an empty string
- sal_Bool GetURLFromButton( String& rURL, String& rDescr ) const;
+ bool GetURLFromButton( String& rURL, String& rDescr ) const;
void NavigatorPaste( const NaviContentBookmark& rBkmk,
const sal_uInt16 nAction );
@@ -452,7 +452,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
const SwViewOption *pViewOpt = 0);
virtual ~SwWrtShell();
- sal_Bool TryRemoveIndent(); // #i23725#
+ bool TryRemoveIndent(); // #i23725#
String GetSelDescr() const;
@@ -533,8 +533,8 @@ private:
SwNavigationMgr aNavigationMgr;
Point aDest;
- sal_Bool bDestOnStack;
- sal_Bool HasCrsrStack() const { return 0 != pCrsrStack; }
+ bool bDestOnStack;
+ bool HasCrsrStack() const { return 0 != pCrsrStack; }
SW_DLLPRIVATE sal_Bool PushCrsr(SwTwips lOffset, sal_Bool bSelect);
SW_DLLPRIVATE sal_Bool PopCrsr(sal_Bool bUpdate, sal_Bool bSelect = sal_False);
@@ -562,7 +562,7 @@ private:
sal_Bool bCopy :1;
sal_Bool bSelWrd :1;
sal_Bool bSelLn :1;
- sal_Bool bIsInClickToEdit:1;
+ bool bIsInClickToEdit:1;
sal_Bool bClearMark :1; // don't delete selection for ChartAutoPilot
sal_Bool mbRetainSelection :1; // Do not remove selections
@@ -634,15 +634,15 @@ inline void SwWrtShell::EndSelTblCells()
bClearMark = sal_True;
}
-inline sal_Bool SwWrtShell::IsInClickToEdit() const { return bIsInClickToEdit; }
+inline bool SwWrtShell::IsInClickToEdit() const { return bIsInClickToEdit; }
-inline sal_Bool SwWrtShell::Is_FnDragEQBeginDrag() const
+inline bool SwWrtShell::Is_FnDragEQBeginDrag() const
{
#ifdef __GNUC__
SELECTFUNC fnTmp = &SwWrtShell::BeginDrag;
return fnDrag == fnTmp;
#else
- return sal::static_int_cast< sal_Bool >(fnDrag == &SwWrtShell::BeginDrag);
+ return fnDrag == &SwWrtShell::BeginDrag;
#endif
}
diff --git a/sw/source/ui/ribbar/conform.cxx b/sw/source/ui/ribbar/conform.cxx
index fca2c51..186fe32 100644
--- a/sw/source/ui/ribbar/conform.cxx
+++ b/sw/source/ui/ribbar/conform.cxx
@@ -35,7 +35,7 @@ extern bool bNoInterrupt; // in mainwn.cxx
ConstFormControl::ConstFormControl(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* pSwView) :
SwDrawBase(pWrtShell, pEditWin, pSwView)
{
- m_bInsForm = sal_True;
+ m_bInsForm = true;
}
/**
diff --git a/sw/source/ui/ribbar/drawbase.cxx b/sw/source/ui/ribbar/drawbase.cxx
index a3193e3..da6a616 100644
--- a/sw/source/ui/ribbar/drawbase.cxx
+++ b/sw/source/ui/ribbar/drawbase.cxx
@@ -55,8 +55,8 @@ SwDrawBase::SwDrawBase(SwWrtShell* pSwWrtShell, SwEditWin* pWindow, SwView* pSwV
m_pSh(pSwWrtShell),
m_pWin(pWindow),
m_nSlotId(USHRT_MAX),
- m_bCreateObj(sal_True),
- m_bInsForm(sal_False)
+ m_bCreateObj(true),
+ m_bInsForm(false)
{
if ( !m_pSh->HasDrawView() )
m_pSh->MakeDrawView();
diff --git a/sw/source/ui/ribbar/dselect.cxx b/sw/source/ui/ribbar/dselect.cxx
index cd52505..6308393 100644
--- a/sw/source/ui/ribbar/dselect.cxx
+++ b/sw/source/ui/ribbar/dselect.cxx
@@ -34,7 +34,7 @@
DrawSelection::DrawSelection(SwWrtShell* pWrtShell, SwEditWin* pEditWin, SwView* pSwView) :
SwDrawBase(pWrtShell, pEditWin, pSwView)
{
- m_bCreateObj = sal_False;
+ m_bCreateObj = false;
}
/*************************************************************************
diff --git a/sw/source/ui/uiview/viewdraw.cxx b/sw/source/ui/uiview/viewdraw.cxx
index 7de6967..87b66bc 100644
--- a/sw/source/ui/uiview/viewdraw.cxx
+++ b/sw/source/ui/uiview/viewdraw.cxx
@@ -617,7 +617,7 @@ sal_Bool SwView::IsBezierEditMode()
return (!IsDrawSelMode() && GetWrtShell().GetDrawView()->HasMarkablePoints());
}
-sal_Bool SwView::IsFormMode() const
+bool SwView::IsFormMode() const
{
if (GetDrawFuncPtr() && GetDrawFuncPtr()->IsCreateObj())
{
@@ -639,12 +639,12 @@ void SwView::SetSelDrawSlot()
sDrawCustom.Erase();
}
-sal_Bool SwView::AreOnlyFormsSelected() const
+bool SwView::AreOnlyFormsSelected() const
{
if ( GetWrtShell().IsFrmSelected() )
- return sal_False;
+ return false;
- sal_Bool bForm = sal_True;
+ bool bForm = true;
SdrView* pSdrView = GetWrtShell().GetDrawView();
@@ -660,13 +660,13 @@ sal_Bool SwView::AreOnlyFormsSelected() const
if (!HasOnlyObj(pSdrObj, FmFormInventor))
{
- bForm = sal_False;
+ bForm = false;
break;
}
}
}
else
- bForm = sal_False;
+ bForm = false;
return bForm;
}
diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx
index f714f6a..6f6d3aa 100644
--- a/sw/source/ui/wrtsh/delete.cxx
+++ b/sw/source/ui/wrtsh/delete.cxx
@@ -45,9 +45,9 @@ inline void SwWrtShell::CloseMark( sal_Bool bOkFlag )
}
// #i23725#
-sal_Bool SwWrtShell::TryRemoveIndent()
+bool SwWrtShell::TryRemoveIndent()
{
- sal_Bool bResult = sal_False;
+ bool bResult = false;
SfxItemSet aAttrSet(GetAttrPool(), RES_LR_SPACE, RES_LR_SPACE);
GetCurAttr(aAttrSet);
@@ -58,19 +58,19 @@ sal_Bool SwWrtShell::TryRemoveIndent()
if (aOldFirstLineOfst > 0)
{
aItem.SetTxtFirstLineOfst(0);
- bResult = sal_True;
+ bResult = true;
}
else if (aOldFirstLineOfst < 0)
{
aItem.SetTxtFirstLineOfst(0);
aItem.SetLeft(aItem.GetLeft() + aOldFirstLineOfst);
- bResult = sal_True;
+ bResult = true;
}
else if (aItem.GetLeft() != 0)
{
aItem.SetLeft(0);
- bResult = sal_True;
+ bResult = true;
}
if (bResult)
@@ -184,7 +184,7 @@ long SwWrtShell::DelLeft()
}
// JP 29.06.95: nie eine davor stehende Tabelle loeschen.
- sal_Bool bSwap = sal_False;
+ bool bSwap = false;
const SwTableNode * pWasInTblNd = SwCrsrShell::IsCrsrInTbl();
if( SwCrsrShell::IsSttPara())
@@ -218,7 +218,7 @@ long SwWrtShell::DelLeft()
OpenMark();
SwCrsrShell::Right(1,CRSR_SKIP_CHARS);
SwCrsrShell::SwapPam();
- bSwap = sal_True;
+ bSwap = true;
}
else
{
diff --git a/sw/source/ui/wrtsh/move.cxx b/sw/source/ui/wrtsh/move.cxx
index 06983e3..bcae465 100644
--- a/sw/source/ui/wrtsh/move.cxx
+++ b/sw/source/ui/wrtsh/move.cxx
@@ -464,7 +464,7 @@ sal_Bool SwWrtShell::PushCrsr(SwTwips lOffset, sal_Bool bSelect)
aPt.Y() += lOffset;
aDest = GetCntntPos(aPt,lOffset > 0);
aDest.X() = aPt.X();
- bDestOnStack = sal_True;
+ bDestOnStack = true;
}
//falls wir eine Rahmenselektion hatten, muss diese nach dem
@@ -515,7 +515,7 @@ sal_Bool SwWrtShell::PushCrsr(SwTwips lOffset, sal_Bool bSelect)
}
// Zuruecksetzen des Dest. SPoint Flags
- bDestOnStack = sal_False;
+ bDestOnStack = false;
}
// Position auf den Stack; bDiff besagt, ob ein Unterschied zwischen
@@ -569,7 +569,7 @@ sal_Bool SwWrtShell::PopCrsr(sal_Bool bUpdate, sal_Bool bSelect)
if( 0 == pCrsrStack )
{
ePageMove = MV_NO;
- bDestOnStack = sal_False;
+ bDestOnStack = false;
}
return bValidPos;
}
@@ -591,7 +591,7 @@ void SwWrtShell::_ResetCursorStack()
pCrsrStack = pTmp;
}
ePageMove = MV_NO;
- bDestOnStack = sal_False;
+ bDestOnStack = false;
}
/**************
diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx
index d089a8c..a4a8bee 100644
--- a/sw/source/ui/wrtsh/select.cxx
+++ b/sw/source/ui/wrtsh/select.cxx
@@ -1006,10 +1006,10 @@ int SwWrtShell::IntelligentCut(int nSelection, sal_Bool bCut)
// jump to the next / previous hyperlink - inside text and also
// on graphics
-sal_Bool SwWrtShell::SelectNextPrevHyperlink( sal_Bool bNext )
+bool SwWrtShell::SelectNextPrevHyperlink( bool bNext )
{
StartAction();
- sal_Bool bRet = SwCrsrShell::SelectNxtPrvHyperlink( bNext );
+ bool bRet = SwCrsrShell::SelectNxtPrvHyperlink( bNext );
if( !bRet )
{
// will we have this feature?
@@ -1022,8 +1022,8 @@ sal_Bool SwWrtShell::SelectNextPrevHyperlink( sal_Bool bNext )
}
EndAction();
- sal_Bool bCreateXSelection = sal_False;
- const sal_Bool bFrmSelected = IsFrmSelected() || IsObjSelected();
+ bool bCreateXSelection = false;
+ const bool bFrmSelected = IsFrmSelected() || IsObjSelected();
if( IsSelection() )
{
if ( bFrmSelected )
@@ -1033,18 +1033,18 @@ sal_Bool SwWrtShell::SelectNextPrevHyperlink( sal_Bool bNext )
// bei Cursor setzen
fnKillSel = &SwWrtShell::ResetSelect;
fnSetCrsr = &SwWrtShell::SetCrsrKillSel;
- bCreateXSelection = sal_True;
+ bCreateXSelection = true;
}
else if( bFrmSelected )
{
EnterSelFrmMode();
- bCreateXSelection = sal_True;
+ bCreateXSelection = true;
}
else if( (CNT_GRF | CNT_OLE ) & GetCntType() )
{
SelectObj( GetCharRect().Pos() );
EnterSelFrmMode();
- bCreateXSelection = sal_True;
+ bCreateXSelection = true;
}
if( bCreateXSelection )
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index c089cfc..ab48f15 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -117,7 +117,7 @@ using namespace com::sun::star;
pCrsrStack(0), \
rView(rShell),\
aNavigationMgr(*this), \
- bDestOnStack(sal_False)
+ bDestOnStack(false)
#define BITFLD_INI_LIST \
bClearMark = \
@@ -131,8 +131,8 @@ using namespace com::sun::star;
bNoEdit = \
bSelWrd = \
bSelLn = \
- bIsInClickToEdit = \
- mbRetainSelection = sal_False;
+ mbRetainSelection = sal_False; \
+ bIsInClickToEdit = false;
static SvxAutoCorrect* lcl_IsAutoCorr()
diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx
index 01e4e31..f24c216 100644
--- a/sw/source/ui/wrtsh/wrtsh2.cxx
+++ b/sw/source/ui/wrtsh/wrtsh2.cxx
@@ -236,7 +236,7 @@ sal_Bool SwWrtShell::UpdateTableOf(const SwTOXBase& rTOX, const SfxItemSet* pSet
void SwWrtShell::ClickToField( const SwField& rFld )
{
- bIsInClickToEdit = sal_True;
+ bIsInClickToEdit = true;
switch( rFld.GetTyp()->Which() )
{
case RES_JUMPEDITFLD:
@@ -313,7 +313,7 @@ void SwWrtShell::ClickToField( const SwField& rFld )
break;
}
- bIsInClickToEdit = sal_False;
+ bIsInClickToEdit = false;
}
@@ -323,7 +323,7 @@ void SwWrtShell::ClickToINetAttr( const SwFmtINetFmt& rItem, sal_uInt16 nFilter
if( !rItem.GetValue().Len() )
return ;
- bIsInClickToEdit = sal_True;
+ bIsInClickToEdit = true;
// erstmal das evt. gesetzte ObjectSelect Macro ausfuehren
const SvxMacro* pMac = rItem.GetMacro( SFX_EVENT_MOUSECLICK_OBJECT );
@@ -343,20 +343,20 @@ void SwWrtShell::ClickToINetAttr( const SwFmtINetFmt& rItem, sal_uInt16 nFilter
const_cast<SwTxtINetFmt*>(pTxtAttr)->SetVisitedValid( true );
}
- bIsInClickToEdit = sal_False;
+ bIsInClickToEdit = false;
}
-sal_Bool SwWrtShell::ClickToINetGrf( const Point& rDocPt, sal_uInt16 nFilter )
+bool SwWrtShell::ClickToINetGrf( const Point& rDocPt, sal_uInt16 nFilter )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
String sURL;
String sTargetFrameName;
const SwFrmFmt* pFnd = IsURLGrfAtPos( rDocPt, &sURL, &sTargetFrameName );
if( pFnd && sURL.Len() )
{
- bRet = sal_True;
+ bRet = true;
// erstmal das evt. gesetzte ObjectSelect Macro ausfuehren
const SvxMacro* pMac = &pFnd->GetMacro().GetMacro( SFX_EVENT_MOUSECLICK_OBJECT );
if( pMac )
diff --git a/sw/source/ui/wrtsh/wrtsh3.cxx b/sw/source/ui/wrtsh/wrtsh3.cxx
index 2469589..a8c1454 100644
--- a/sw/source/ui/wrtsh/wrtsh3.cxx
+++ b/sw/source/ui/wrtsh/wrtsh3.cxx
@@ -173,9 +173,9 @@ sal_uInt16 SwWrtShell::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCa
// fall ein util::URL-Button selektiert ist, dessen util::URL returnen, ansonsten
// einen LeerString
-sal_Bool SwWrtShell::GetURLFromButton( String& rURL, String& rDescr ) const
+bool SwWrtShell::GetURLFromButton( String& rURL, String& rDescr ) const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
const SdrView *pDView = GetDrawView();
if( pDView )
{
@@ -220,7 +220,7 @@ sal_Bool SwWrtShell::GetURLFromButton( String& rURL, String& rDescr ) const
{
rURL = String(uTmp);
}
- bRet = sal_True;
+ bRet = true;
}
}
}
More information about the Libreoffice-commits
mailing list