[Libreoffice-commits] .: 2 commits - sfx2/inc sfx2/source sw/inc sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Oct 29 20:26:10 PDT 2012
sfx2/inc/sfx2/linkmgr.hxx | 6 +-
sfx2/source/appl/linkmgr2.cxx | 8 +--
sw/inc/IDocumentLinksAdministration.hxx | 2
sw/inc/crsrsh.hxx | 8 +--
sw/inc/doc.hxx | 14 ++---
sw/inc/editsh.hxx | 10 ++--
sw/inc/mdiexp.hxx | 2
sw/inc/swcrsr.hxx | 6 +-
sw/source/core/crsr/crstrvl.cxx | 10 ++--
sw/source/core/crsr/swcrsr.cxx | 8 +--
sw/source/core/crsr/trvlreg.cxx | 8 +--
sw/source/core/crsr/trvltbl.cxx | 4 -
sw/source/core/doc/docnew.cxx | 22 +++------
sw/source/core/doc/docnum.cxx | 76 ++++++++++++++++----------------
sw/source/core/docnode/section.cxx | 2
sw/source/core/edit/ednumber.cxx | 22 ++++-----
sw/source/core/inc/UndoNumbering.hxx | 2
sw/source/core/undo/unnum.cxx | 4 -
sw/source/filter/basflt/shellio.cxx | 2
sw/source/filter/html/swhtml.cxx | 2
sw/source/ui/app/docsh.cxx | 2
sw/source/ui/dbui/mmlayoutpage.cxx | 4 -
sw/source/ui/docvw/edtwin.cxx | 4 -
sw/source/ui/docvw/edtwin3.cxx | 4 -
sw/source/ui/inc/view.hxx | 2
sw/source/ui/inc/wrtsh.hxx | 8 +--
sw/source/ui/shells/basesh.cxx | 5 --
sw/source/ui/shells/listsh.cxx | 12 ++---
sw/source/ui/uiview/view2.cxx | 12 ++---
sw/source/ui/uiview/viewprt.cxx | 2
sw/source/ui/uno/unotxdoc.cxx | 2
sw/source/ui/utlui/glbltree.cxx | 2
sw/source/ui/wrtsh/move.cxx | 10 ++--
33 files changed, 140 insertions(+), 147 deletions(-)
New commits:
commit 136ae4bc2fadd558cb044217339f6b7b2e58843e
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Oct 30 11:27:06 2012 +0900
sal_Bool to bool
Change-Id: I87d6e518aebcd0074f673b84b66df27ae9a0a15a
diff --git a/sfx2/inc/sfx2/linkmgr.hxx b/sfx2/inc/sfx2/linkmgr.hxx
index 03b6ca3..39c3bed 100644
--- a/sfx2/inc/sfx2/linkmgr.hxx
+++ b/sfx2/inc/sfx2/linkmgr.hxx
@@ -137,9 +137,9 @@ public:
SvLinkSourceRef CreateObj( SvBaseLink* );
- void UpdateAllLinks( sal_Bool bAskUpdate = sal_True,
- sal_Bool bCallErrHdl = sal_True,
- sal_Bool bUpdateGrfLinks = sal_False,
+ void UpdateAllLinks( bool bAskUpdate = true,
+ bool bCallErrHdl = true,
+ bool bUpdateGrfLinks = false,
Window* pParentWin = 0 );
// Call for list of links (eg for link-dialog)
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 4ad6a59..9564a18 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -304,9 +304,9 @@ bool LinkManager::GetDisplayNames(
}
void LinkManager::UpdateAllLinks(
- sal_Bool bAskUpdate,
- sal_Bool /*bCallErrHdl*/,
- sal_Bool bUpdateGrfLinks,
+ bool bAskUpdate,
+ bool /*bCallErrHdl*/,
+ bool bUpdateGrfLinks,
Window* pParentWin )
{
// First make a copy of the array in order to update links
@@ -350,7 +350,7 @@ void LinkManager::UpdateAllLinks(
int nRet = QueryBox( pParentWin, WB_YES_NO | WB_DEF_YES, SfxResId( STR_QUERY_UPDATE_LINKS ).toString() ).Execute();
if( RET_YES != nRet )
return ; // nothing should be updated
- bAskUpdate = sal_False; // once is enough
+ bAskUpdate = false; // once is enough
}
pLink->Update();
diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx
index 7634212..d3b1c16 100644
--- a/sw/inc/IDocumentLinksAdministration.hxx
+++ b/sw/inc/IDocumentLinksAdministration.hxx
@@ -53,7 +53,7 @@ namespace sfx2 { class SvLinkSource; class LinkManager; }
/** #i42634# Moved common code of SwReader::Read() and
SwDocShell::UpdateLinks() to new SwDoc::UpdateLinks():
*/
- virtual void UpdateLinks(sal_Bool bUI) = 0;
+ virtual void UpdateLinks(bool bUI) = 0;
/** SS fuers Linken von Dokumentteilen / ?? for linking of parts of documents.
*/
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 74bc64a..d404424 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -603,7 +603,7 @@ public:
sal_Bool GoNextCell( sal_Bool bAppendLine = sal_True );
sal_Bool GoPrevCell();
// go to this box (if available and inside of table)
- sal_Bool GotoTable( const String& rName );
+ bool GotoTable( const String& rName );
// select a table row, column or box (based on the current cursor)
sal_Bool SelTblRow() { return _SelTblRowOrCol( true ); }
@@ -615,7 +615,7 @@ public:
sal_Bool GotoNextNum();
sal_Bool GotoPrevNum();
- sal_Bool GotoOutline( const String& rName );
+ bool GotoOutline( const String& rName );
// to the next/previous or the given OutlineNode
void GotoOutline( sal_uInt16 nIdx );
// find the "outline position" in the nodes array of the current chapter
@@ -752,7 +752,7 @@ public:
sal_Bool BasicActionPend() const { return nBasicActionCnt != nStartAction; }
- sal_Bool GotoRegion( const String& rName );
+ bool GotoRegion( const String& rName );
// show the current selection
virtual void MakeSelVisible();
@@ -782,7 +782,7 @@ public:
sal_Bool IsPageAtPos( const Point &rPt ) const;
sal_Bool SelectTxtAttr( sal_uInt16 nWhich, sal_Bool bExpand, const SwTxtAttr* pAttr = 0 );
- sal_Bool GotoINetAttr( const SwTxtINetFmt& rAttr );
+ bool GotoINetAttr( const SwTxtINetFmt& rAttr );
const SwFmtINetFmt* FindINetAttr( const String& rName ) const;
sal_Bool CheckTblBoxCntnt( const SwPosition* pPos = 0 );
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 6dc4bf2..d90646e 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -809,7 +809,7 @@ public:
virtual void SetVisibleLinks(bool bFlag);
virtual sfx2::LinkManager& GetLinkManager();
virtual const sfx2::LinkManager& GetLinkManager() const;
- virtual void UpdateLinks(sal_Bool bUI);
+ virtual void UpdateLinks(bool bUI);
virtual bool GetData(const rtl::OUString& rItem, const String& rMimeType, ::com::sun::star::uno::Any& rValue) const;
virtual bool SetData(const rtl::OUString& rItem, const String& rMimeType, const ::com::sun::star::uno::Any& rValue);
virtual ::sfx2::SvLinkSource* CreateLinkSource(const rtl::OUString& rItem);
@@ -1472,12 +1472,12 @@ public:
void PropagateOutlineRule();
/// Outline - promote / demote.
- sal_Bool OutlineUpDown( const SwPaM& rPam, short nOffset = 1 );
+ bool OutlineUpDown( const SwPaM& rPam, short nOffset = 1 );
/// Ountline - move up / move down.
- sal_Bool MoveOutlinePara( const SwPaM& rPam, short nOffset = 1);
+ bool MoveOutlinePara( const SwPaM& rPam, short nOffset = 1);
- sal_Bool GotoOutline( SwPosition& rPos, const String& rName ) const;
+ bool GotoOutline( SwPosition& rPos, const String& rName ) const;
/** Accept changes of outline styles for OUtlineRule.
re-use unused 3rd parameter
@@ -1492,7 +1492,7 @@ public:
const SwNumRule&,
const bool bCreateNewList,
const String sContinuedListId = String(),
- sal_Bool bSetItem = sal_True,
+ bool bSetItem = true,
const bool bResetIndentAttrs = false );
void SetCounted( const SwPaM&, bool bCounted);
@@ -1578,11 +1578,11 @@ public:
/// Invalidates all numrules
void InvalidateNumRules();
- sal_Bool NumUpDown( const SwPaM&, sal_Bool bDown = sal_True );
+ bool NumUpDown( const SwPaM&, bool bDown = true );
/** Move selected paragraphes (not only numberings)
according to offsets. (if negative: go to doc start). */
- sal_Bool MoveParagraph( const SwPaM&, long nOffset = 1, sal_Bool bIsOutlMv = sal_False );
+ bool MoveParagraph( const SwPaM&, long nOffset = 1, bool bIsOutlMv = false );
sal_Bool NumOrNoNum( const SwNodeIndex& rIdx, sal_Bool bDel = sal_False);
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 1a73025..1c80b09 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -465,9 +465,9 @@ public:
void SetOutlineNumRule(const SwNumRule&);
const SwNumRule* GetOutlineNumRule() const;
- sal_Bool OutlineUpDown( short nOffset = 1 );
+ bool OutlineUpDown( short nOffset = 1 );
- sal_Bool MoveOutlinePara( short nOffset = 1);
+ bool MoveOutlinePara( short nOffset = 1);
sal_Bool IsProtectedOutlinePara() const;
@@ -496,10 +496,10 @@ public:
/// Delete, split enumeration list.
void DelNumRules();
- sal_Bool NumUpDown( sal_Bool bDown = sal_True );
+ bool NumUpDown( bool bDown = true );
- sal_Bool MoveParagraph( long nOffset = 1);
- sal_Bool MoveNumParas( sal_Bool bUpperLower, sal_Bool bUpperLeft );
+ bool MoveParagraph( long nOffset = 1);
+ bool MoveNumParas( bool bUpperLower, bool bUpperLeft );
/// Switch on/off of numbering via Delete/Backspace.
sal_Bool NumOrNoNum( sal_Bool bDelete = sal_False, sal_Bool bChkStart = sal_True);
diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
index 08211a2..a50cef4 100644
--- a/sw/inc/mdiexp.hxx
+++ b/sw/inc/mdiexp.hxx
@@ -72,7 +72,7 @@ void DelAllGrfCacheEntries( SwDoc* pDoc );
// Read ChgMode for tables from configuration.
TblChgMode GetTblChgDefaultMode();
-sal_Bool JumpToSwMark( ViewShell* pVwSh, const rtl::OUString& rMark );
+bool JumpToSwMark( ViewShell* pVwSh, const rtl::OUString& rMark );
#endif
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index 30901f3..7b946d9 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -180,9 +180,9 @@ public:
{ return LeftRight( sal_False, nCnt, nMode, bAllowVisual, bSkipHidden, sal_False ); }
sal_Bool GoNextCell( sal_uInt16 nCnt = 1 ) { return GoPrevNextCell( sal_True, nCnt ); }
sal_Bool GoPrevCell( sal_uInt16 nCnt = 1 ) { return GoPrevNextCell( sal_False, nCnt ); }
- virtual sal_Bool GotoTable( const String& rName );
+ virtual bool GotoTable( const String& rName );
sal_Bool GotoTblBox( const String& rName );
- sal_Bool GotoRegion( const String& rName );
+ bool GotoRegion( const String& rName );
sal_Bool GotoFtnAnchor();
sal_Bool GotoFtnTxt();
sal_Bool GotoNextFtnAnchor();
@@ -283,7 +283,7 @@ public:
virtual sal_Bool LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
sal_Bool bAllowVisual, sal_Bool bSkipHidden, sal_Bool bInsertCrsr );
- virtual sal_Bool GotoTable( const String& rName );
+ virtual bool GotoTable( const String& rName );
void InsertBox( const SwTableBox& rTblBox );
void DeleteBox(size_t nPos);
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index deda8d9..d0e2bcc 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -798,7 +798,7 @@ void SwCrsrShell::GotoOutline( sal_uInt16 nIdx )
}
-sal_Bool SwCrsrShell::GotoOutline( const String& rName )
+bool SwCrsrShell::GotoOutline( const String& rName )
{
SwCursor* pCrsr = getShellCrsr( true );
@@ -806,11 +806,11 @@ sal_Bool SwCrsrShell::GotoOutline( const String& rName )
SwCallLink aLk( *this ); // watch Crsr-Moves
SwCrsrSaveState aSaveState( *pCrsr );
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( pDoc->GotoOutline( *pCrsr->GetPoint(), rName ) && !pCrsr->IsSelOvr() )
{
UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
- bRet = sal_True;
+ bRet = true;
}
return bRet;
}
@@ -1644,9 +1644,9 @@ sal_Bool SwCrsrShell::SelectTxtAttr( sal_uInt16 nWhich, sal_Bool bExpand,
}
-sal_Bool SwCrsrShell::GotoINetAttr( const SwTxtINetFmt& rAttr )
+bool SwCrsrShell::GotoINetAttr( const SwTxtINetFmt& rAttr )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( rAttr.GetpTxtNode() )
{
SwCursor* pCrsr = getShellCrsr( true );
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 68c79cf..aa2c602 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -1963,14 +1963,14 @@ sal_Bool SwCursor::GoPrevNextCell( sal_Bool bNext, sal_uInt16 nCnt )
return !IsInProtectTable( sal_True );
}
-sal_Bool SwTableCursor::GotoTable( const String& )
+bool SwTableCursor::GotoTable( const String& )
{
- return sal_False; // invalid action
+ return false; // invalid action
}
-sal_Bool SwCursor::GotoTable( const String& rName )
+bool SwCursor::GotoTable( const String& rName )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if ( !HasMark() )
{
SwTable* pTmpTbl = SwTable::FindTable( GetDoc()->FindTblFmtByName( rName ) );
diff --git a/sw/source/core/crsr/trvlreg.cxx b/sw/source/core/crsr/trvlreg.cxx
index 4c41be9..c917413 100644
--- a/sw/source/core/crsr/trvlreg.cxx
+++ b/sw/source/core/crsr/trvlreg.cxx
@@ -240,9 +240,9 @@ sal_Bool SwCrsrShell::MoveRegion( SwWhichRegion fnWhichRegion, SwPosRegion fnPos
}
-sal_Bool SwCursor::GotoRegion( const String& rName )
+bool SwCursor::GotoRegion( const String& rName )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
const SwSectionFmts& rFmts = GetDoc()->GetSections();
for( sal_uInt16 n = rFmts.size(); n; )
{
@@ -265,10 +265,10 @@ sal_Bool SwCursor::GotoRegion( const String& rName )
return bRet;
}
-sal_Bool SwCrsrShell::GotoRegion( const String& rName )
+bool SwCrsrShell::GotoRegion( const String& rName )
{
SwCallLink aLk( *this ); // watch Crsr-Moves;call Link if needed
- sal_Bool bRet = !pTblCrsr && pCurCrsr->GotoRegion( rName );
+ bool bRet = !pTblCrsr && pCurCrsr->GotoRegion( rName );
if( bRet )
UpdateCrsr( SwCrsrShell::SCROLLWIN | SwCrsrShell::CHKRANGE |
SwCrsrShell::READONLY );
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index be9a9dc..c93b7a1 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -786,10 +786,10 @@ String SwCrsrShell::GetBoxNms() const
}
-sal_Bool SwCrsrShell::GotoTable( const String& rName )
+bool SwCrsrShell::GotoTable( const String& rName )
{
SwCallLink aLk( *this ); // watch Crsr-Moves
- sal_Bool bRet = !pTblCrsr && pCurCrsr->GotoTable( rName );
+ bool bRet = !pTblCrsr && pCurCrsr->GotoTable( rName );
if( bRet )
{
pCurCrsr->GetPtPos() = Point();
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index f06d168..8135226 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -957,7 +957,7 @@ IGrammarContact* getGrammarContact( const SwTxtNode& rTxtNode )
// #i42634# Moved common code of SwReader::Read() and SwDocShell::UpdateLinks()
// to new SwDoc::UpdateLinks():
-void SwDoc::UpdateLinks( sal_Bool bUI )
+void SwDoc::UpdateLinks( bool bUI )
{
SfxObjectCreateMode eMode;
sal_uInt16 nLinkMode = getLinkUpdateMode( true );
@@ -972,13 +972,13 @@ void SwDoc::UpdateLinks( sal_Bool bUI )
!GetDocShell()->IsPreview() )
{
ViewShell* pVSh = 0;
- sal_Bool bAskUpdate = nLinkMode == MANUAL;
- sal_Bool bUpdate = sal_True;
+ bool bAskUpdate = nLinkMode == MANUAL;
+ bool bUpdate = true;
switch(nUpdateDocMode)
{
- case document::UpdateDocMode::NO_UPDATE: bUpdate = sal_False;break;
- case document::UpdateDocMode::QUIET_UPDATE:bAskUpdate = sal_False; break;
- case document::UpdateDocMode::FULL_UPDATE: bAskUpdate = sal_True; break;
+ case document::UpdateDocMode::NO_UPDATE: bUpdate = false;break;
+ case document::UpdateDocMode::QUIET_UPDATE:bAskUpdate = false; break;
+ case document::UpdateDocMode::FULL_UPDATE: bAskUpdate = true; break;
}
if( bUpdate && (bUI || !bAskUpdate) )
{
@@ -990,10 +990,10 @@ void SwDoc::UpdateLinks( sal_Bool bUI )
ViewShell aVSh( *this, 0, 0 );
SET_CURR_SHELL( &aVSh );
- GetLinkManager().UpdateAllLinks( bAskUpdate , sal_True, sal_False, pDlgParent );
+ GetLinkManager().UpdateAllLinks( bAskUpdate , true, false, pDlgParent );
}
else
- GetLinkManager().UpdateAllLinks( bAskUpdate, sal_True, sal_False, pDlgParent );
+ GetLinkManager().UpdateAllLinks( bAskUpdate, true, false, pDlgParent );
}
}
}
@@ -1196,7 +1196,7 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
}
/*-------------------------------------------------------------------------
- copy document content - code from SwFEShell::Paste( SwDoc* , sal_Bool )
+ copy document content - code from SwFEShell::Paste( SwDoc* )
-----------------------------------------------------------------------*/
void SwDoc::Paste( const SwDoc& rSource )
{
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index b36437e..efbd2c2 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -185,10 +185,10 @@ void SwDoc::PropagateOutlineRule()
}
// Increase/Decrease
-sal_Bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
+bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
{
if( GetNodes().GetOutLineNds().empty() || !nOffset )
- return sal_False;
+ return false;
// calculate the range
const SwOutlineNodes& rOutlNds = GetNodes().GetOutLineNds();
@@ -199,7 +199,7 @@ sal_Bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
if( !rOutlNds.Seek_Entry( pSttNd, &nSttPos ) &&
!nSttPos-- )
// we're not in an "Outline section"
- return sal_False;
+ return false;
if( rOutlNds.Seek_Entry( pEndNd, &nEndPos ) )
++nEndPos;
@@ -371,7 +371,7 @@ sal_Bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
}
if (! bMoveApplicable )
- return sal_False;
+ return false;
if (GetIDocumentUndoRedo().DoesUndo())
{
@@ -424,11 +424,11 @@ sal_Bool SwDoc::OutlineUpDown( const SwPaM& rPam, short nOffset )
ChkCondColls();
SetModified();
- return sal_True;
+ return true;
}
// Move up/down
-sal_Bool SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset )
+bool SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset )
{
// Do not move to special sections in the nodes array
const SwPosition& rStt = *rPam.Start(),
@@ -438,7 +438,7 @@ sal_Bool SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset )
(rStt.nNode.GetIndex() < GetNodes().GetEndOfExtras().GetIndex()) ||
(rEnd.nNode.GetIndex() < GetNodes().GetEndOfExtras().GetIndex()))
{
- return sal_False;
+ return false;
}
sal_uInt16 nAktPos = 0;
@@ -453,11 +453,11 @@ sal_Bool SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset )
if( !GetNodes().GetOutLineNds().Seek_Entry( pSrch, &nAktPos ) )
{
if( !nAktPos )
- return sal_False; // Promoting or demoting before the first outline => no.
+ return false; // Promoting or demoting before the first outline => no.
if( --nAktPos )
aSttRg = *GetNodes().GetOutLineNds()[ nAktPos ];
else if( 0 > nOffset )
- return sal_False; // Promoting at the top of document?!
+ return false; // Promoting at the top of document?!
else
aSttRg = *GetNodes().GetEndOfContent().StartOfSectionNode();
}
@@ -561,7 +561,7 @@ sal_Bool SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset )
if( pNd->IsTableNode() )
pNd = pNd->StartOfSectionNode();
if( pNd->FindTableNode() )
- return sal_False;
+ return false;
OSL_ENSURE( aSttRg.GetIndex() > nNewPos || nNewPos >= aEndRg.GetIndex(),
"Position lies within Move range" );
@@ -573,11 +573,11 @@ sal_Bool SwDoc::MoveOutlinePara( const SwPaM& rPam, short nOffset )
long nOffs = nNewPos - ( 0 < nOffset ? aEndRg.GetIndex() : aSttRg.GetIndex());
SwPaM aPam( aSttRg, aEndRg, 0, -1 );
- return MoveParagraph( aPam, nOffs, sal_True );
+ return MoveParagraph( aPam, nOffs, true );
}
static sal_uInt16 lcl_FindOutlineName( const SwNodes& rNds, const String& rName,
- sal_Bool bExact )
+ bool bExact )
{
sal_uInt16 nSavePos = USHRT_MAX;
const SwOutlineNodes& rOutlNds = rNds.GetOutLineNds();
@@ -704,7 +704,7 @@ static sal_uInt16 lcl_FindOutlineNum( const SwNodes& rNds, String& rName )
// found, we got the right entry. Or else we use the one found by
// searching for the Number.
// If we don't have a Number, we search via the Text only.
-sal_Bool SwDoc::GotoOutline( SwPosition& rPos, const String& rName ) const
+bool SwDoc::GotoOutline( SwPosition& rPos, const String& rName ) const
{
if( rName.Len() )
{
@@ -732,7 +732,7 @@ sal_Bool SwDoc::GotoOutline( SwPosition& rPos, const String& rName ) const
if( !sExpandedText.Equals( sName ) )
{
- sal_uInt16 nTmp = ::lcl_FindOutlineName( GetNodes(), sName, sal_True );
+ sal_uInt16 nTmp = ::lcl_FindOutlineName( GetNodes(), sName, true );
if( USHRT_MAX != nTmp ) // found via the Name
{
nFndPos = nTmp;
@@ -741,32 +741,32 @@ sal_Bool SwDoc::GotoOutline( SwPosition& rPos, const String& rName ) const
}
rPos.nNode = *pNd;
rPos.nContent.Assign( pNd, 0 );
- return sal_True;
+ return true;
}
- nFndPos = ::lcl_FindOutlineName( GetNodes(), rName, sal_False );
+ nFndPos = ::lcl_FindOutlineName( GetNodes(), rName, false );
if( USHRT_MAX != nFndPos )
{
SwTxtNode* pNd = rOutlNds[ nFndPos ]->GetTxtNode();
rPos.nNode = *pNd;
rPos.nContent.Assign( pNd, 0 );
- return sal_True;
+ return true;
}
// #i68289# additional search on hyperlink URL without its outline numbering part
if ( !sName.Equals( rName ) )
{
- nFndPos = ::lcl_FindOutlineName( GetNodes(), sName, sal_False );
+ nFndPos = ::lcl_FindOutlineName( GetNodes(), sName, false );
if( USHRT_MAX != nFndPos )
{
SwTxtNode* pNd = rOutlNds[ nFndPos ]->GetTxtNode();
rPos.nNode = *pNd;
rPos.nContent.Assign( pNd, 0 );
- return sal_True;
+ return true;
}
}
}
- return sal_False;
+ return false;
}
static void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule& rRule )
@@ -838,7 +838,7 @@ void SwDoc::SetNumRule( const SwPaM& rPam,
const SwNumRule& rRule,
const bool bCreateNewList,
const String sContinuedListId,
- sal_Bool bSetItem,
+ bool bSetItem,
const bool bResetIndentAttrs )
{
SwUndoInsNum * pUndo = NULL;
@@ -915,7 +915,7 @@ void SwDoc::SetNumRule( const SwPaM& rPam,
if (pRule && pRule->GetName() == pNew->GetName())
{
- bSetItem = sal_False;
+ bSetItem = false;
if ( !pTxtNd->IsInList() )
{
@@ -933,7 +933,7 @@ void SwDoc::SetNumRule( const SwPaM& rPam,
if ( pCollRule && pCollRule->GetName() == pNew->GetName() )
{
pTxtNd->ResetAttr( RES_PARATR_NUMRULE );
- bSetItem = sal_False;
+ bSetItem = false;
}
}
}
@@ -1626,7 +1626,7 @@ sal_Bool SwDoc::GotoPrevNum( SwPosition& rPos, sal_Bool bOverUpper,
return ::lcl_GotoNextPrevNum( rPos, sal_False, bOverUpper, pUpper, pLower );
}
-sal_Bool SwDoc::NumUpDown( const SwPaM& rPam, sal_Bool bDown )
+bool SwDoc::NumUpDown( const SwPaM& rPam, bool bDown )
{
sal_uLong nStt = rPam.GetPoint()->nNode.GetIndex(),
nEnd = rPam.GetMark()->nNode.GetIndex();
@@ -1656,7 +1656,7 @@ sal_Bool SwDoc::NumUpDown( const SwPaM& rPam, sal_Bool bDown )
}
}
- sal_Bool bRet = sal_True;
+ bool bRet = true;
sal_Int8 nDiff = bDown ? 1 : -1;
if (bOnlyOutline)
@@ -1684,7 +1684,7 @@ sal_Bool SwDoc::NumUpDown( const SwPaM& rPam, sal_Bool bDown )
sal_uInt8 nLevel = static_cast<sal_uInt8>(pTNd->GetActualListLevel());
if( (-1 == nDiff && 0 >= nLevel) ||
(1 == nDiff && MAXLEVEL - 1 <= nLevel))
- bRet = sal_False;
+ bRet = false;
}
}
}
@@ -1725,7 +1725,7 @@ sal_Bool SwDoc::NumUpDown( const SwPaM& rPam, sal_Bool bDown )
return bRet;
}
-sal_Bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, sal_Bool bIsOutlMv )
+bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
{
const SwPosition *pStt = rPam.Start(), *pEnd = rPam.End();
@@ -1750,21 +1750,21 @@ sal_Bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, sal_Bool bIsOutl
{ // First is a start node
pTmp2 = pTmp1->EndOfSectionNode();
if( pTmp2->GetIndex() > nEndIdx )
- return sal_False; // Its end node is behind the moved range
+ return false; // Its end node is behind the moved range
}
pTmp1 = pTmp1->StartOfSectionNode()->EndOfSectionNode();
if( pTmp1->GetIndex() <= nEndIdx )
- return sal_False; // End node inside but start node before moved range => no.
+ return false; // End node inside but start node before moved range => no.
pTmp1 = GetNodes()[ nEndIdx ];
if( pTmp1->IsEndNode() )
{ // The last one is an end node
pTmp1 = pTmp1->StartOfSectionNode();
if( pTmp1->GetIndex() < nStIdx )
- return sal_False; // Its start node is before the moved range.
+ return false; // Its start node is before the moved range.
}
pTmp1 = pTmp1->StartOfSectionNode();
if( pTmp1->GetIndex() >= nStIdx )
- return sal_False; // A start node which ends behind the moved range => no.
+ return false; // A start node which ends behind the moved range => no.
}
sal_uLong nInStIdx, nInEndIdx;
@@ -1779,7 +1779,7 @@ sal_Bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, sal_Bool bIsOutl
{
// Impossible to move to negative index
if( sal_uLong(abs( nOffset )) > nStIdx)
- return sal_False;
+ return false;
nInEndIdx = nStIdx - 1;
nStIdx += nOffset;
@@ -1789,7 +1789,7 @@ sal_Bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, sal_Bool bIsOutl
// Swap [ nStIdx, nInEndIdx ] with [ nInStIdx, nEndIdx ]
if( nEndIdx >= GetNodes().GetEndOfContent().GetIndex() )
- return sal_False;
+ return false;
if( !bIsOutlMv )
{ // And here the restrictions for moving paragraphs other than chapters (outlines)
@@ -1800,7 +1800,7 @@ sal_Bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, sal_Bool bIsOutl
pTmp1 = GetNodes()[ nStIdx ]->StartOfSectionNode();
pTmp2 = GetNodes()[ nInStIdx ]->StartOfSectionNode();
if( pTmp1 != pTmp2 )
- return sal_False; // "start" nodes in different sections
+ return false; // "start" nodes in different sections
pTmp1 = GetNodes()[ nEndIdx ];
bool bIsEndNode = pTmp1->IsEndNode();
if( !pTmp1->IsStartNode() )
@@ -1820,7 +1820,7 @@ sal_Bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, sal_Bool bIsOutl
}
pTmp2 = pTmp2->EndOfSectionNode();
if( pTmp1 != pTmp2 )
- return sal_False; // The "end" notes are in different sections
+ return false; // The "end" notes are in different sections
}
// Test for Redlining - Can the Selection be moved at all, actually?
@@ -1861,7 +1861,7 @@ sal_Bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, sal_Bool bIsOutl
case POS_EQUAL: // Pos1 is equal to Pos2
case POS_OVERLAP_BEFORE: // Pos1 overlaps Pos2 in the beginning
case POS_OVERLAP_BEHIND: // Pos1 overlaps Pos2 at the end
- return sal_False;
+ return false;
}
}
}
@@ -2018,7 +2018,7 @@ sal_Bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, sal_Bool bIsOutl
GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL );
SetModified();
- return sal_True;
+ return true;
}
}
@@ -2076,7 +2076,7 @@ sal_Bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, sal_Bool bIsOutl
}
SetModified();
- return sal_True;
+ return true;
}
sal_Bool SwDoc::NumOrNoNum( const SwNodeIndex& rIdx, sal_Bool bDel )
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 80bec6a..4a16a78 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -1458,7 +1458,7 @@ int sw_FindDocShell( SfxObjectShellRef& xDocSh,
if ( pSrcDoc != pDoc &&
rSection.IsProtectFlag() )
{
- pSrcDoc->GetLinkManager().UpdateAllLinks( sal_False, sal_True, sal_False, 0 );
+ pSrcDoc->GetLinkManager().UpdateAllLinks( false, true, false, 0 );
}
if( pCpyRg )
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index 2597538..6a5892c 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -241,11 +241,11 @@ void SwEditShell::DelNumRules()
// Hoch-/Runterstufen
-sal_Bool SwEditShell::NumUpDown( sal_Bool bDown )
+bool SwEditShell::NumUpDown( bool bDown )
{
StartAllAction();
- sal_Bool bRet = sal_True;
+ bool bRet = true;
SwPaM* pCrsr = GetCrsr();
if( pCrsr->GetNext() == pCrsr ) // keine Mehrfachselektion ?
bRet = GetDoc()->NumUpDown( *pCrsr, bDown );
@@ -354,7 +354,7 @@ void SwEditShell::SetIndent(short nIndent, const SwPosition & rPos)
}
// <- #i23725#
-sal_Bool SwEditShell::MoveParagraph( long nOffset )
+bool SwEditShell::MoveParagraph( long nOffset )
{
StartAllAction();
@@ -366,7 +366,7 @@ sal_Bool SwEditShell::MoveParagraph( long nOffset )
pCrsr->DeleteMark();
}
- sal_Bool bRet = GetDoc()->MoveParagraph( *pCrsr, nOffset );
+ bool bRet = GetDoc()->MoveParagraph( *pCrsr, nOffset );
GetDoc()->SetModified();
EndAllAction();
@@ -397,7 +397,7 @@ void SwEditShell::GetCurrentOutlineLevels( sal_uInt8& rUpper, sal_uInt8& rLower
&rUpper, &rLower );
}
-sal_Bool SwEditShell::MoveNumParas( sal_Bool bUpperLower, sal_Bool bUpperLeft )
+bool SwEditShell::MoveNumParas( bool bUpperLower, bool bUpperLeft )
{
StartAllAction();
@@ -490,11 +490,11 @@ sal_Bool SwEditShell::MoveNumParas( sal_Bool bUpperLower, sal_Bool bUpperLeft )
return bRet;
}
-sal_Bool SwEditShell::OutlineUpDown( short nOffset )
+bool SwEditShell::OutlineUpDown( short nOffset )
{
StartAllAction();
- sal_Bool bRet = sal_True;
+ bool bRet = true;
SwPaM* pCrsr = GetCrsr();
if( pCrsr->GetNext() == pCrsr ) // keine Mehrfachselektion ?
bRet = GetDoc()->OutlineUpDown( *pCrsr, nOffset );
@@ -514,10 +514,10 @@ sal_Bool SwEditShell::OutlineUpDown( short nOffset )
}
-sal_Bool SwEditShell::MoveOutlinePara( short nOffset )
+bool SwEditShell::MoveOutlinePara( short nOffset )
{
StartAllAction();
- sal_Bool bRet = GetDoc()->MoveOutlinePara( *GetCrsr(), nOffset );
+ bool bRet = GetDoc()->MoveOutlinePara( *GetCrsr(), nOffset );
EndAllAction();
return bRet;
}
@@ -680,7 +680,7 @@ void SwEditShell::SetCurNumRule( const SwNumRule& rRule,
aRangeArr.SetPam( n, aPam );
GetDoc()->SetNumRule( aPam, rRule,
bCreateNewList, sContinuedListId,
- sal_True, bResetIndentAttrs );
+ true, bResetIndentAttrs );
GetDoc()->SetCounted( aPam, true );
}
}
@@ -688,7 +688,7 @@ void SwEditShell::SetCurNumRule( const SwNumRule& rRule,
{
GetDoc()->SetNumRule( *pCrsr, rRule,
bCreateNewList, sContinuedListId,
- sal_True, bResetIndentAttrs );
+ true, bResetIndentAttrs );
GetDoc()->SetCounted( *pCrsr, true );
}
GetDoc()->GetIDocumentUndoRedo().EndUndo( UNDO_END, NULL );
diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx
index 58a1169..c3a2ef6 100644
--- a/sw/source/core/inc/UndoNumbering.hxx
+++ b/sw/source/core/inc/UndoNumbering.hxx
@@ -97,7 +97,7 @@ class SwUndoMoveNum : public SwUndo, private SwUndRng
long nOffset;
public:
- SwUndoMoveNum( const SwPaM& rPam, long nOffset, sal_Bool bIsOutlMv = sal_False );
+ SwUndoMoveNum( const SwPaM& rPam, long nOffset, bool bIsOutlMv = false );
virtual void UndoImpl( ::sw::UndoRedoContext & );
virtual void RedoImpl( ::sw::UndoRedoContext & );
diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx
index e1b9da7..32f6236 100644
--- a/sw/source/core/undo/unnum.cxx
+++ b/sw/source/core/undo/unnum.cxx
@@ -226,7 +226,7 @@ void SwUndoDelNum::AddNode( const SwTxtNode& rNd, sal_Bool )
}
}
-SwUndoMoveNum::SwUndoMoveNum( const SwPaM& rPam, long nOff, sal_Bool bIsOutlMv )
+SwUndoMoveNum::SwUndoMoveNum( const SwPaM& rPam, long nOff, bool bIsOutlMv )
: SwUndo( bIsOutlMv ? UNDO_OUTLINE_UD : UNDO_MOVENUM ),
SwUndRng( rPam ),
nNewStt( 0 ), nOffset( nOff )
@@ -271,7 +271,7 @@ void SwUndoMoveNum::RepeatImpl(::sw::RepeatContext & rContext)
}
else
{
- rDoc.MoveParagraph(rContext.GetRepeatPaM(), nOffset, sal_False);
+ rDoc.MoveParagraph(rContext.GetRepeatPaM(), nOffset, false);
}
}
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index 98942c8..77a2cc9 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -379,7 +379,7 @@ sal_uLong SwReader::Read( const Reader& rOptions )
// #i42634# Moved common code of SwReader::Read() and
// SwDocShell::UpdateLinks() to new SwDoc::UpdateLinks():
// ATM still with Update
- pDoc->UpdateLinks( sal_True );
+ pDoc->UpdateLinks( true );
// not insert: set the redline mode read from settings.xml
eOld = static_cast<RedlineMode_t>(
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index a63d7db..4c2d5e3 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -445,7 +445,7 @@ SwHTMLParser::~SwHTMLParser()
if( nLinkMode != NEVER && bAsync &&
SFX_CREATE_MODE_INTERNAL!=pDoc->GetDocShell()->GetCreateMode() )
pDoc->GetLinkManager().UpdateAllLinks( nLinkMode == MANUAL,
- sal_True, sal_False );
+ true, false );
if ( pDoc->GetDocShell()->IsLoading() )
{
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index 459b561..fdf197c 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -1212,7 +1212,7 @@ void SwDocShell::CalcLayoutForOLEObjects()
// read by the binary filter:
void SwDocShell::UpdateLinks()
{
- GetDoc()->UpdateLinks(sal_True);
+ GetDoc()->UpdateLinks(true);
// #i50703# Update footnote numbers
SwTxtFtn::SetUniqueSeqRefNo( *GetDoc() );
SwNodeIndex aTmp( GetDoc()->GetNodes() );
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index 06b60f1..1d02876 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -487,7 +487,7 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
else
while(nMoves)
{
- sal_Bool bMoved = rShell.MoveParagraph( 1 );
+ bool bMoved = rShell.MoveParagraph( 1 );
if(!bMoved)
{
//insert a new paragraph before the greeting line
@@ -758,7 +758,7 @@ IMPL_LINK_NOARG(SwMailMergeLayoutPage, ChangeAddressHdl_Impl)
IMPL_LINK(SwMailMergeLayoutPage, GreetingsHdl_Impl, PushButton*, pButton)
{
bool bDown = pButton == &m_aDownPB;
- sal_Bool bMoved = m_pExampleWrtShell->MoveParagraph( bDown ? 1 : -1 );
+ bool bMoved = m_pExampleWrtShell->MoveParagraph( bDown ? 1 : -1 );
if (bMoved || bDown)
m_pWizard->GetConfigItem().MoveGreeting(bDown ? 1 : -1 );
if(!bMoved && bDown)
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 41f6100..0a2d352 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -2477,11 +2477,11 @@ KEYINPUT_CHECKTABLE_INSDEL:
break;
case KS_NumDown:
- rSh.NumUpDown( sal_True );
+ rSh.NumUpDown( true );
nKS_NUMDOWN_Count = 2;
break;
case KS_NumUp:
- rSh.NumUpDown( sal_False );
+ rSh.NumUpDown( false );
break;
case KS_NumIndentInc:
diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx
index b13cf66..577d3bf 100644
--- a/sw/source/ui/docvw/edtwin3.cxx
+++ b/sw/source/ui/docvw/edtwin3.cxx
@@ -156,12 +156,12 @@ void RepaintPagePreview( ViewShell* pVwSh, const SwRect& rRect )
((SwPagePreView *)pSfxVwSh)->RepaintCoreRect( rRect );
}
-sal_Bool JumpToSwMark( ViewShell* pVwSh, const rtl::OUString& rMark )
+bool JumpToSwMark( ViewShell* pVwSh, const rtl::OUString& rMark )
{
SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell();
if( pSfxVwSh && pSfxVwSh->ISA( SwView ) )
return ((SwView *)pSfxVwSh)->JumpToSwMark( rMark );
- return sal_False;
+ return false;
}
void SwEditWin::DataChanged( const DataChangedEvent& rDCEvt )
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 2a5cc3a..3494ed9 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -606,7 +606,7 @@ public:
sal_Bool IsCrsrAtTop() const { return bTopCrsr; }
sal_Bool IsCrsrAtCenter() const { return bCenterCrsr; }
- sal_Bool JumpToSwMark( const String& rMark );
+ bool JumpToSwMark( const String& rMark );
long InsertDoc( sal_uInt16 nSlotId, const String& rFileName,
const String& rFilterName, sal_Int16 nVersion = 0 );
diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx
index 1ff6b56..756ee84 100644
--- a/sw/source/ui/inc/wrtsh.hxx
+++ b/sw/source/ui/inc/wrtsh.hxx
@@ -469,14 +469,14 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
void addCurrentPosition();
sal_Bool GotoFly( const String& rName, FlyCntType eType = FLYCNTTYPE_ALL,
sal_Bool bSelFrame = sal_True );
- sal_Bool GotoINetAttr( const SwTxtINetFmt& rAttr );
+ bool GotoINetAttr( const SwTxtINetFmt& rAttr );
void GotoOutline( sal_uInt16 nIdx );
- sal_Bool GotoOutline( const String& rName );
- sal_Bool GotoRegion( const String& rName );
+ bool GotoOutline( const String& rName );
+ bool GotoRegion( const String& rName );
sal_Bool GotoRefMark( const String& rRefMark, sal_uInt16 nSubType = 0,
sal_uInt16 nSeqNo = 0 );
sal_Bool GotoNextTOXBase( const String* pName = 0);
- sal_Bool GotoTable( const String& rName );
+ bool GotoTable( const String& rName );
sal_Bool GotoFld( const SwFmtFld& rFld );
const SwRedline* GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect = sal_False);
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index 27cf514..f210183 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -628,7 +628,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
if( !rSh.GetLinkManager().GetLinks().empty() )
{
rSh.StartAllAction();
- rSh.GetLinkManager().UpdateAllLinks( sal_False, sal_True, sal_True );
+ rSh.GetLinkManager().UpdateAllLinks( false, true, true );
rSh.EndAllAction();
}
SfxDispatcher &rDis = *rTempView.GetViewFrame()->GetDispatcher();
@@ -1122,10 +1122,9 @@ void SwBaseShell::Execute(SfxRequest &rReq)
{
if( !rSh.GetLinkManager().GetLinks().empty() )
{
- sal_Bool bUpdateGrf = sal_False, bCallErrHdl = sal_False;
rSh.EnterStdMode();
rSh.StartAllAction();
- rSh.GetLinkManager().UpdateAllLinks( sal_False, bCallErrHdl, bUpdateGrf );
+ rSh.GetLinkManager().UpdateAllLinks( false, false, false );
rSh.EndAllAction();
}
}
diff --git a/sw/source/ui/shells/listsh.cxx b/sw/source/ui/shells/listsh.cxx
index 0c79f02..ca3e736 100644
--- a/sw/source/ui/shells/listsh.cxx
+++ b/sw/source/ui/shells/listsh.cxx
@@ -158,9 +158,7 @@ void SwListShell::Execute(SfxRequest &rReq)
SfxViewFrame * pFrame = GetView().GetViewFrame();
rReq.Done();
- rSh.NumUpDown( ( nSlot == FN_NUM_BULLET_DOWN )
- ? sal_True
- : sal_False );
+ rSh.NumUpDown( nSlot == FN_NUM_BULLET_DOWN );
pFrame->GetBindings().Invalidate( SID_TABLE_CELL ); // StatusZeile updaten!
}
break;
@@ -189,7 +187,7 @@ void SwListShell::Execute(SfxRequest &rReq)
if ( bOutline )
lcl_OutlineUpDownWithSubPoints( rSh, false, false );
else
- rSh.MoveNumParas(sal_False, sal_False);
+ rSh.MoveNumParas(false, false);
rReq.Done();
break;
@@ -197,7 +195,7 @@ void SwListShell::Execute(SfxRequest &rReq)
if ( bOutline )
lcl_OutlineUpDownWithSubPoints( rSh, true, false );
else
- rSh.MoveNumParas(sal_True, sal_False);
+ rSh.MoveNumParas(true, false);
rReq.Done();
break;
@@ -205,7 +203,7 @@ void SwListShell::Execute(SfxRequest &rReq)
if ( bOutline )
lcl_OutlineUpDownWithSubPoints( rSh, true, true );
else
- rSh.MoveNumParas(sal_True, sal_True);
+ rSh.MoveNumParas(true, true);
rReq.Done();
break;
@@ -213,7 +211,7 @@ void SwListShell::Execute(SfxRequest &rReq)
if ( bOutline )
lcl_OutlineUpDownWithSubPoints( rSh, false, true );
else
- rSh.MoveNumParas(sal_False, sal_True);
+ rSh.MoveNumParas(false, true);
rReq.Done();
break;
diff --git a/sw/source/ui/uiview/view2.cxx b/sw/source/ui/uiview/view2.cxx
index c0c4a42..225d63d 100644
--- a/sw/source/ui/uiview/view2.cxx
+++ b/sw/source/ui/uiview/view2.cxx
@@ -1787,9 +1787,9 @@ void SwView::EditLinkDlg()
}
}
-sal_Bool SwView::JumpToSwMark( const String& rMark )
+bool SwView::JumpToSwMark( const String& rMark )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( rMark.Len() )
{
// wir wollen den Bookmark aber am oberen Rand haben
@@ -1863,11 +1863,11 @@ sal_Bool SwView::JumpToSwMark( const String& rMark )
if( pWrtShell->SearchPattern( aSearchOpt, bSearchInNotes, DOCPOS_START, DOCPOS_END ))
{
pWrtShell->EnterStdMode(); // Selektion wieder aufheben
- bRet = sal_True;
+ bRet = true;
}
}
else if( pMarkAccess->getMarksEnd() != (ppMark = pMarkAccess->findMark(sMark)) )
- pWrtShell->GotoMark( ppMark->get(), sal_False, sal_True ), bRet = sal_True;
+ pWrtShell->GotoMark( ppMark->get(), sal_False, sal_True ), bRet = true;
else if( 0 != ( pINet = pWrtShell->FindINetAttr( sMark ) )) {
pWrtShell->addCurrentPosition();
bRet = pWrtShell->GotoINetAttr( *pINet->GetTxtINetFmt() );
@@ -1876,7 +1876,7 @@ sal_Bool SwView::JumpToSwMark( const String& rMark )
// fuer alle Arten von Flys
if( FLYCNTTYPE_ALL != eFlyType && pWrtShell->GotoFly( sName, eFlyType ))
{
- bRet = sal_True;
+ bRet = true;
if( FLYCNTTYPE_FRM == eFlyType )
{
// TextFrames: Cursor in den Frame setzen
@@ -1891,7 +1891,7 @@ sal_Bool SwView::JumpToSwMark( const String& rMark )
}
}
else if( pMarkAccess->getMarksEnd() != (ppMark = pMarkAccess->findMark(sMark)))
- pWrtShell->GotoMark( ppMark->get(), sal_False, sal_True ), bRet = sal_True;
+ pWrtShell->GotoMark( ppMark->get(), sal_False, sal_True ), bRet = true;
else if( 0 != ( pINet = pWrtShell->FindINetAttr( sMark ) ))
bRet = pWrtShell->GotoINetAttr( *pINet->GetTxtINetFmt() );
diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx
index e55acc7..d68ee0a 100644
--- a/sw/source/ui/uiview/viewprt.cxx
+++ b/sw/source/ui/uiview/viewprt.cxx
@@ -237,7 +237,7 @@ void SwView::ExecutePrint(SfxRequest& rReq)
//#i61455# if master documentes are printed silently without loaded links then update the links now
if( bSilent && pSh->IsGlobalDoc() && !pSh->IsGlblDocSaveLinks() )
{
- pSh->GetLinkManager().UpdateAllLinks( sal_False, sal_False, sal_False, 0 );
+ pSh->GetLinkManager().UpdateAllLinks( false, false, false, 0 );
}
SfxRequest aReq( rReq );
SfxBoolItem aBool(SID_SELECTION, bPrintSelection);
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index addb0b0..72b4647 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -2246,7 +2246,7 @@ void SwXTextDocument::updateLinks( ) throw(RuntimeException)
if( !rLnkMan.GetLinks().empty() )
{
UnoActionContext aAction(pDoc);
- rLnkMan.UpdateAllLinks( sal_False, sal_False, sal_True );
+ rLnkMan.UpdateAllLinks( false, false, true );
}
}
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx
index c086b4f..9985c42 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -828,7 +828,7 @@ void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
case CTX_UPDATE_LINK:
case CTX_UPDATE_ALL:
{
- pActiveShell->GetLinkManager().UpdateAllLinks(sal_True);
+ pActiveShell->GetLinkManager().UpdateAllLinks(true);
if(CTX_UPDATE_ALL == nSelectedPopupEntry)
nSlot = FN_UPDATE_TOX;
pCont = 0;
diff --git a/sw/source/ui/wrtsh/move.cxx b/sw/source/ui/wrtsh/move.cxx
index 9ee0f41..c08bb77 100644
--- a/sw/source/ui/wrtsh/move.cxx
+++ b/sw/source/ui/wrtsh/move.cxx
@@ -680,7 +680,7 @@ sal_Bool SwWrtShell::GotoFly( const String& rName, FlyCntType eType, sal_Bool bS
return bRet;
}
-sal_Bool SwWrtShell::GotoINetAttr( const SwTxtINetFmt& rAttr )
+bool SwWrtShell::GotoINetAttr( const SwTxtINetFmt& rAttr )
{
SwPosition aPos = *GetCrsr()->GetPoint();
bool bRet = SwCrsrShell::GotoINetAttr(rAttr);
@@ -692,10 +692,10 @@ sal_Bool SwWrtShell::GotoINetAttr( const SwTxtINetFmt& rAttr )
void SwWrtShell::GotoOutline( sal_uInt16 nIdx )
{
addCurrentPosition();
- return SwCrsrShell::GotoOutline (nIdx);
+ SwCrsrShell::GotoOutline (nIdx);
}
-sal_Bool SwWrtShell::GotoOutline( const String& rName )
+bool SwWrtShell::GotoOutline( const String& rName )
{
SwPosition aPos = *GetCrsr()->GetPoint();
bool bRet = SwCrsrShell::GotoOutline (rName);
@@ -704,7 +704,7 @@ sal_Bool SwWrtShell::GotoOutline( const String& rName )
return bRet;
}
-sal_Bool SwWrtShell::GotoRegion( const String& rName )
+bool SwWrtShell::GotoRegion( const String& rName )
{
SwPosition aPos = *GetCrsr()->GetPoint();
bool bRet = SwCrsrShell::GotoRegion (rName);
@@ -732,7 +732,7 @@ sal_Bool SwWrtShell::GotoNextTOXBase( const String* pName )
return bRet;
}
-sal_Bool SwWrtShell::GotoTable( const String& rName )
+bool SwWrtShell::GotoTable( const String& rName )
{
SwPosition aPos = *GetCrsr()->GetPoint();
bool bRet = SwCrsrShell::GotoTable(rName);
commit b56eb7154428045239493b6fa21b24504b147603
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Mon Oct 29 18:11:36 2012 +0900
bInsWithFmt was always true
Change-Id: I72d764cd88dcd6516edfd11dd39d54f166340de2
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 60430ef..f06d168 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -1248,10 +1248,7 @@ void SwDoc::Paste( const SwDoc& rSource )
{
for ( sal_uInt16 i = 0; i < rSource.GetSpzFrmFmts()->size(); ++i )
{
- sal_Bool bInsWithFmt = sal_True;
const SwFrmFmt& rCpyFmt = *(*rSource.GetSpzFrmFmts())[i];
- if( bInsWithFmt )
- {
SwFmtAnchor aAnchor( rCpyFmt.GetAnchor() );
if (FLY_AT_PAGE == aAnchor.GetAnchorId())
{
@@ -1260,7 +1257,6 @@ void SwDoc::Paste( const SwDoc& rSource )
else
continue;
this->CopyLayoutFmt( rCpyFmt, aAnchor, true, true );
- }
}
}
}
More information about the Libreoffice-commits
mailing list