[Libreoffice-commits] core.git: 15 commits - basctl/source include/sfx2 include/svtools sc/source sd/source sfx2/source starmath/inc starmath/source svtools/source sw/inc sw/source
Matteo Casalin
matteo.casalin at yahoo.com
Sun Mar 16 01:56:33 PDT 2014
basctl/source/basicide/basdoc.cxx | 2
basctl/source/basicide/basdoc.hxx | 2
include/sfx2/objsh.hxx | 4
include/svtools/grfmgr.hxx | 6
sc/source/ui/docshell/docsh.cxx | 2
sc/source/ui/inc/docsh.hxx | 2
sd/source/ui/app/sdxfer.cxx | 2
sd/source/ui/docshell/docshel4.cxx | 26 +-
sd/source/ui/inc/DrawDocShell.hxx | 2
sfx2/source/doc/objstor.cxx | 11 -
sfx2/source/doc/sfxbasemodel.cxx | 2
starmath/inc/document.hxx | 2
starmath/source/document.cxx | 2
svtools/source/graphic/grfmgr.cxx | 16 -
sw/inc/crsrsh.hxx | 6
sw/inc/docsh.hxx | 2
sw/inc/globdoc.hxx | 2
sw/inc/ndgrf.hxx | 65 +++----
sw/inc/ndnotxt.hxx | 4
sw/inc/ndole.hxx | 4
sw/inc/node.hxx | 2
sw/inc/pam.hxx | 4
sw/inc/swbaslnk.hxx | 24 +-
sw/inc/swcrsr.hxx | 6
sw/inc/viscrs.hxx | 12 -
sw/inc/wdocsh.hxx | 2
sw/source/core/crsr/callnk.cxx | 4
sw/source/core/crsr/callnk.hxx | 2
sw/source/core/crsr/crsrsh.cxx | 38 ++--
sw/source/core/crsr/crstrvl.cxx | 16 -
sw/source/core/crsr/pam.cxx | 2
sw/source/core/crsr/swcrsr.cxx | 20 +-
sw/source/core/crsr/viscrs.cxx | 18 +-
sw/source/core/doc/doc.cxx | 2
sw/source/core/doc/docedt.cxx | 2
sw/source/core/doc/docfld.cxx | 4
sw/source/core/doc/docfly.cxx | 4
sw/source/core/doc/doctxm.cxx | 4
sw/source/core/doc/notxtfrm.cxx | 6
sw/source/core/docnode/ndnotxt.cxx | 10 -
sw/source/core/docnode/ndtbl.cxx | 4
sw/source/core/docnode/node.cxx | 10 -
sw/source/core/docnode/retrieveinputstreamconsumer.cxx | 2
sw/source/core/docnode/section.cxx | 4
sw/source/core/docnode/swbaslnk.cxx | 67 +++----
sw/source/core/edit/eddel.cxx | 2
sw/source/core/edit/editsh.cxx | 2
sw/source/core/edit/edlingu.cxx | 4
sw/source/core/fields/cellfml.cxx | 2
sw/source/core/fields/ddefld.cxx | 10 -
sw/source/core/fields/docufld.cxx | 8
sw/source/core/fields/reffld.cxx | 6
sw/source/core/frmedt/fecopy.cxx | 4
sw/source/core/frmedt/fedesc.cxx | 4
sw/source/core/frmedt/fefly1.cxx | 14 -
sw/source/core/frmedt/feshview.cxx | 2
sw/source/core/frmedt/fetab.cxx | 8
sw/source/core/graphic/ndgrf.cxx | 149 ++++++++---------
sw/source/core/inc/cntfrm.hxx | 2
sw/source/core/inc/flowfrm.hxx | 4
sw/source/core/inc/retrieveinputstreamconsumer.hxx | 2
sw/source/core/inc/sectfrm.hxx | 2
sw/source/core/inc/tabfrm.hxx | 2
sw/source/core/layout/calcmove.cxx | 60 ++----
sw/source/core/layout/flowfrm.cxx | 10 -
sw/source/core/layout/flycnt.cxx | 2
sw/source/core/layout/flylay.cxx | 2
sw/source/core/layout/ftnfrm.cxx | 2
sw/source/core/layout/sectfrm.cxx | 4
sw/source/core/layout/tabfrm.cxx | 25 +-
sw/source/core/layout/trvlfrm.cxx | 4
sw/source/core/ole/ndole.cxx | 61 +++---
sw/source/core/tox/txmsrt.cxx | 2
sw/source/core/uibase/app/docsh.cxx | 2
sw/source/core/uibase/app/docsh2.cxx | 2
sw/source/core/uibase/dochdl/swdtflvr.cxx | 2
sw/source/core/uibase/docvw/edtwin.cxx | 4
sw/source/core/uibase/globdoc/globdoc.cxx | 4
sw/source/core/uibase/inc/wrtsh.hxx | 6
sw/source/core/uibase/shells/txtcrsr.cxx | 10 -
sw/source/core/uibase/table/tablemgr.cxx | 4
sw/source/core/uibase/uno/unotxvw.cxx | 4
sw/source/core/uibase/utlui/glbltree.cxx | 2
sw/source/core/uibase/web/wdocsh.cxx | 4
sw/source/core/uibase/wrtsh/move.cxx | 24 +-
sw/source/core/undo/rolbck.cxx | 2
sw/source/core/undo/unins.cxx | 6
sw/source/core/unocore/unoframe.cxx | 2
sw/source/core/unocore/unotbl.cxx | 4
sw/source/filter/html/htmlgrin.cxx | 16 -
90 files changed, 461 insertions(+), 469 deletions(-)
New commits:
commit 55a5e890ef531961a811508a316c83bd6a679781
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sun Mar 16 00:38:46 2014 +0100
sal_Bool to bool + make a local function static
Change-Id: I8285f69e175dd10f6128a1d9b39bdc646c51df43
diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx
index f145b5b..85566d5 100644
--- a/sw/inc/swbaslnk.hxx
+++ b/sw/inc/swbaslnk.hxx
@@ -32,8 +32,8 @@ class SwBaseLink : public ::sfx2::SvBaseLink
SwCntntNode* pCntntNode;
bool bSwapIn : 1;
- sal_Bool bNoDataFlag : 1;
- sal_Bool bIgnoreDataChanged : 1;
+ bool bNoDataFlag : 1;
+ bool bIgnoreDataChanged : 1;
ReReadThread* m_pReReadThread;
protected:
@@ -42,7 +42,7 @@ protected:
SwBaseLink( const OUString& rNm, sal_uInt16 nObjectType, ::sfx2::SvLinkSource* pObj,
SwCntntNode* pNode = 0 )
: ::sfx2::SvBaseLink( rNm, nObjectType, pObj ), pCntntNode( pNode ),
- bSwapIn( false ), bNoDataFlag( sal_False ), bIgnoreDataChanged( sal_False ),
+ bSwapIn( false ), bNoDataFlag( false ), bIgnoreDataChanged( false ),
m_pReReadThread(0)
{}
@@ -51,7 +51,7 @@ public:
SwBaseLink( sal_uInt16 nMode, sal_uInt16 nFormat, SwCntntNode* pNode = 0 )
: ::sfx2::SvBaseLink( nMode, nFormat ), pCntntNode( pNode ),
- bSwapIn( false ), bNoDataFlag( sal_False ), bIgnoreDataChanged( sal_False ),
+ bSwapIn( false ), bNoDataFlag( false ), bIgnoreDataChanged( false ),
m_pReReadThread(0)
{}
virtual ~SwBaseLink();
@@ -68,18 +68,18 @@ public:
// For graphics only.
bool SwapIn( bool bWaitForData = false, bool bNativFormat = false );
- sal_Bool Connect() { return 0 != SvBaseLink::GetRealObject(); }
+ bool Connect() { return 0 != SvBaseLink::GetRealObject(); }
// Only for graphics-links (for switching between DDE / Grf-link).
void SetObjType( sal_uInt16 nType ) { SvBaseLink::SetObjType( nType ); }
- sal_Bool IsRecursion( const SwBaseLink* pChkLnk ) const;
- virtual sal_Bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, sal_Int32 nStt = 0,
+ bool IsRecursion( const SwBaseLink* pChkLnk ) const;
+ virtual bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, sal_Int32 nStt = 0,
sal_Int32 nEnd = -1 ) const;
- void SetNoDataFlag() { bNoDataFlag = sal_True; }
- sal_Bool ChkNoDataFlag() { sal_Bool bRet = bNoDataFlag; bNoDataFlag = sal_False; return bRet; }
- sal_Bool IsNoDataFlag() const { return bNoDataFlag; }
+ void SetNoDataFlag() { bNoDataFlag = true; }
+ bool ChkNoDataFlag() { const bool bRet = bNoDataFlag; bNoDataFlag = false; return bRet; }
+ bool IsNoDataFlag() const { return bNoDataFlag; }
};
#endif
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index b723bf3..0b85906 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -76,7 +76,7 @@ public:
const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue );
virtual const SwNode* GetAnchor() const;
- virtual sal_Bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, sal_Int32 nStt = 0,
+ virtual bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, sal_Int32 nStt = 0,
sal_Int32 nEnd = -1 ) const;
inline SwSectionNode* GetSectNode()
@@ -1586,7 +1586,7 @@ const SwNode* SwIntrnlSectRefLink::GetAnchor() const
return rSectFmt.GetSectionNode( false );
}
-sal_Bool SwIntrnlSectRefLink::IsInRange( sal_uLong nSttNd, sal_uLong nEndNd,
+bool SwIntrnlSectRefLink::IsInRange( sal_uLong nSttNd, sal_uLong nEndNd,
sal_Int32 , sal_Int32 ) const
{
SwStartNode* pSttNd = rSectFmt.GetSectionNode( false );
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 9825b7f..84c8ab0 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -51,7 +51,7 @@
using namespace com::sun::star;
-sal_Bool SetGrfFlySize( const Size& rGrfSz, const Size& rFrmSz, SwGrfNode* pGrfNd );
+static bool SetGrfFlySize( const Size& rGrfSz, const Size& rFrmSz, SwGrfNode* pGrfNd );
TYPEINIT1( SwBaseLink, ::sfx2::SvBaseLink );
@@ -92,7 +92,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
SwDoc* pDoc = pCntntNode->GetDoc();
if( pDoc->IsInDtor() || ChkNoDataFlag() || bIgnoreDataChanged )
{
- bIgnoreDataChanged = sal_False;
+ bIgnoreDataChanged = false;
return SUCCESS;
}
@@ -126,7 +126,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
bool bUpdate = false;
bool bGraphicArrived = false;
- sal_Bool bGraphicPieceArrived = sal_False;
+ bool bGraphicPieceArrived = false;
bool bDontNotify = false;
Size aGrfSz, aFrmFmtSz;
@@ -168,7 +168,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
// we need to go through bGraphicArrived down there.
// Or else the graphic is painted at its definitive size
bGraphicArrived = true;
- bGraphicPieceArrived = sal_False;
+ bGraphicPieceArrived = false;
}
pSwGrfNode->SetGraphic(aGrf, rGrfObj.GetLink());
@@ -210,11 +210,11 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
if( bUpdate && !bDontNotify && (!bSwapIn || bGraphicArrived) &&
!bInNotifyLinks)
{
- sal_Bool bLockView = sal_False;
+ bool bLockView = false;
if( pSh )
{
bLockView = pSh->IsViewLocked();
- pSh->LockView( sal_True );
+ pSh->LockView( true );
}
if( pESh )
@@ -244,9 +244,9 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
( !bSwapIn ||
GRAPHIC_DEFAULT == pGrfNd->GetGrfObj().GetType()))
{
- pBLink->bIgnoreDataChanged = sal_False;
+ pBLink->bIgnoreDataChanged = false;
pBLink->DataChanged( rMimeType, rValue );
- pBLink->bIgnoreDataChanged = sal_True;
+ pBLink->bIgnoreDataChanged = true;
pGrfNd->SetGraphicArrived( ((SwGrfNode*)pCntntNode)->
IsGraphicArrived() );
@@ -271,7 +271,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
if( pESh )
{
- const sal_Bool bEndActionByVirDev = pESh->IsEndActionByVirDev();
+ const bool bEndActionByVirDev = pESh->IsEndActionByVirDev();
pESh->SetEndActionByVirDev( sal_True );
pESh->EndAllAction();
pESh->SetEndActionByVirDev( bEndActionByVirDev );
@@ -280,15 +280,15 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
pSh->EndAction();
if( pSh && !bLockView )
- pSh->LockView( sal_False );
+ pSh->LockView( false );
}
return SUCCESS;
}
-sal_Bool SetGrfFlySize( const Size& rGrfSz, const Size& rFrmSz, SwGrfNode* pGrfNd )
+static bool SetGrfFlySize( const Size& rGrfSz, const Size& rFrmSz, SwGrfNode* pGrfNd )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
SwViewShell *pSh;
CurrShell *pCurr = 0;
if ( pGrfNd->GetDoc()->GetEditShell( &pSh ) )
@@ -326,7 +326,7 @@ sal_Bool SetGrfFlySize( const Size& rGrfSz, const Size& rFrmSz, SwGrfNode* pGrfN
SwFmtFrmSize aAttr( rOldAttr );
aAttr.SetSize( aCalcSz );
pFmt->SetFmtAttr( aAttr );
- bRet = sal_True;
+ bRet = true;
}
if( !aSz.Width() )
@@ -341,7 +341,7 @@ sal_Bool SetGrfFlySize( const Size& rGrfSz, const Size& rFrmSz, SwGrfNode* pGrfN
0 != (pANd = & pAPos->nNode.GetNode()) &&
0 != (pTblNd = pANd->FindTableNode()) )
{
- const sal_Bool bLastGrf = !pTblNd->GetTable().DecGrfsThatResize();
+ const bool bLastGrf = !pTblNd->GetTable().DecGrfsThatResize();
SwHTMLTableLayout *pLayout =
pTblNd->GetTable().GetHTMLTableLayout();
if( pLayout )
@@ -409,7 +409,7 @@ bool SwBaseLink::SwapIn( bool bWaitForData, bool bNativFormat )
{
// The Flag needs to be reset on a SwapIn, because
// we want to reapply the data.
- bIgnoreDataChanged = sal_False;
+ bIgnoreDataChanged = false;
DataChanged( aMimeType, aValue );
}
}
@@ -463,7 +463,7 @@ const SwNode* SwBaseLink::GetAnchor() const
return 0;
}
-sal_Bool SwBaseLink::IsRecursion( const SwBaseLink* pChkLnk ) const
+bool SwBaseLink::IsRecursion( const SwBaseLink* pChkLnk ) const
{
SwServerObjectRef aRef( (SwServerObject*)GetObj() );
if( aRef.Is() )
@@ -472,14 +472,14 @@ sal_Bool SwBaseLink::IsRecursion( const SwBaseLink* pChkLnk ) const
// if we are contained in them. Else we have a recursion.
return aRef->IsLinkInServer( pChkLnk );
}
- return sal_False;
+ return false;
}
-sal_Bool SwBaseLink::IsInRange( sal_uLong, sal_uLong, sal_Int32, sal_Int32 ) const
+bool SwBaseLink::IsInRange( sal_uLong, sal_uLong, sal_Int32, sal_Int32 ) const
{
// Not Graphic or OLE Links
// Fields or Sections have their own derivation!
- return sal_False;
+ return false;
}
SwBaseLink::~SwBaseLink()
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index f5cbf4c..e79729c 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -49,7 +49,7 @@ public:
const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue );
virtual const SwNode* GetAnchor() const;
- virtual sal_Bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, sal_Int32 nStt = 0,
+ virtual bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, sal_Int32 nStt = 0,
sal_Int32 nEnd = -1 ) const;
};
@@ -188,7 +188,7 @@ const SwNode* SwIntrnlRefLink::GetAnchor() const
return pNd;
}
-sal_Bool SwIntrnlRefLink::IsInRange( sal_uLong nSttNd, sal_uLong nEndNd,
+bool SwIntrnlRefLink::IsInRange( sal_uLong nSttNd, sal_uLong nEndNd,
sal_Int32 nStt, sal_Int32 nEnd ) const
{
// here, any anchor of the normal NodesArray should be sufficient
@@ -207,7 +207,7 @@ sal_Bool SwIntrnlRefLink::IsInRange( sal_uLong nSttNd, sal_uLong nEndNd,
if( pTblNd->GetNodes().IsDocNodes() &&
nSttNd < pTblNd->EndOfSectionIndex() &&
nEndNd > pTblNd->GetIndex() )
- return sal_True;
+ return true;
}
else if( ((SwFmtFld*)pLast)->GetTxtFld() )
{
@@ -219,12 +219,12 @@ sal_Bool SwIntrnlRefLink::IsInRange( sal_uLong nSttNd, sal_uLong nEndNd,
if( nSttNd <= nNdPos && nNdPos <= nEndNd &&
( nNdPos != nSttNd || *pTFld->GetStart() >= nStt ) &&
( nNdPos != nEndNd || *pTFld->GetStart() < nEnd ))
- return sal_True;
+ return true;
}
}
} while( 0 != ( pLast = ++aIter ));
- return sal_False;
+ return false;
}
SwDDEFieldType::SwDDEFieldType(const OUString& rName,
commit 78a4b4247b90a75e7a5a8b42aef8d39187cc0182
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sat Mar 15 22:20:17 2014 +0100
SwapIn/SwapOut can return bool + sal_Bool to bool
Change-Id: Ia5477d6bb83af38435b9ac44359fe2f46b00807c
diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx
index 88ba220..7ba4142 100644
--- a/include/svtools/grfmgr.hxx
+++ b/include/svtools/grfmgr.hxx
@@ -403,9 +403,9 @@ public:
Link GetAnimationNotifyHdl() const { return maGraphic.GetAnimationNotifyHdl(); }
- sal_Bool SwapOut();
- sal_Bool SwapOut( SvStream* pOStm );
- sal_Bool SwapIn();
+ bool SwapOut();
+ bool SwapOut( SvStream* pOStm );
+ bool SwapIn();
sal_Bool IsInSwapIn() const { return mbIsInSwapIn; }
sal_Bool IsInSwapOut() const { return mbIsInSwapOut; }
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index a1d619a..d3b66d2 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -1055,9 +1055,9 @@ Graphic GraphicObject::GetTransformedGraphic( const GraphicAttr* pAttr ) const /
return aGraphic;
}
-sal_Bool GraphicObject::SwapOut()
+bool GraphicObject::SwapOut()
{
- sal_Bool bRet = ( !mbAutoSwapped ? maGraphic.SwapOut() : sal_False );
+ const bool bRet = !mbAutoSwapped && maGraphic.SwapOut();
if( bRet && mpMgr )
mpMgr->ImplGraphicObjectWasSwappedOut( *this );
@@ -1065,9 +1065,9 @@ sal_Bool GraphicObject::SwapOut()
return bRet;
}
-sal_Bool GraphicObject::SwapOut( SvStream* pOStm )
+bool GraphicObject::SwapOut( SvStream* pOStm )
{
- sal_Bool bRet = ( !mbAutoSwapped ? maGraphic.SwapOut( pOStm ) : sal_False );
+ const bool bRet = !mbAutoSwapped && maGraphic.SwapOut( pOStm );
if( bRet && mpMgr )
mpMgr->ImplGraphicObjectWasSwappedOut( *this );
@@ -1075,17 +1075,17 @@ sal_Bool GraphicObject::SwapOut( SvStream* pOStm )
return bRet;
}
-sal_Bool GraphicObject::SwapIn()
+bool GraphicObject::SwapIn()
{
- sal_Bool bRet;
+ bool bRet = false;
if( mbAutoSwapped )
{
ImplAutoSwapIn();
- bRet = sal_True;
+ bRet = true;
}
else if( mpMgr && mpMgr->ImplFillSwappedGraphicObject( *this, maGraphic ) )
- bRet = sal_True;
+ bRet = true;
else
{
bRet = maGraphic.SwapIn();
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 63a7e01..850b230 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -171,9 +171,9 @@ public:
const GraphicObject* pGrfObj = 0,
bool bModify = true );
/// Loading of graphic immediately before displaying.
- short SwapIn( bool bWaitForData = false );
+ bool SwapIn( bool bWaitForData = false );
/// Remove graphic in order to free memory.
- short SwapOut();
+ bool SwapOut();
/// Access to storage stream-name.
void SetStreamName( const OUString& r ) { maGrfObj.SetUserData( r ); }
/// Is this node selected by any shell?
diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx
index 7060837..f145b5b 100644
--- a/sw/inc/swbaslnk.hxx
+++ b/sw/inc/swbaslnk.hxx
@@ -31,7 +31,7 @@ class SwBaseLink : public ::sfx2::SvBaseLink
friend long GrfNodeChanged( void* pLink, void* pCaller );
SwCntntNode* pCntntNode;
- sal_Bool bSwapIn : 1;
+ bool bSwapIn : 1;
sal_Bool bNoDataFlag : 1;
sal_Bool bIgnoreDataChanged : 1;
ReReadThread* m_pReReadThread;
@@ -42,7 +42,7 @@ protected:
SwBaseLink( const OUString& rNm, sal_uInt16 nObjectType, ::sfx2::SvLinkSource* pObj,
SwCntntNode* pNode = 0 )
: ::sfx2::SvBaseLink( rNm, nObjectType, pObj ), pCntntNode( pNode ),
- bSwapIn( sal_False ), bNoDataFlag( sal_False ), bIgnoreDataChanged( sal_False ),
+ bSwapIn( false ), bNoDataFlag( sal_False ), bIgnoreDataChanged( sal_False ),
m_pReReadThread(0)
{}
@@ -51,7 +51,7 @@ public:
SwBaseLink( sal_uInt16 nMode, sal_uInt16 nFormat, SwCntntNode* pNode = 0 )
: ::sfx2::SvBaseLink( nMode, nFormat ), pCntntNode( pNode ),
- bSwapIn( sal_False ), bNoDataFlag( sal_False ), bIgnoreDataChanged( sal_False ),
+ bSwapIn( false ), bNoDataFlag( sal_False ), bIgnoreDataChanged( sal_False ),
m_pReReadThread(0)
{}
virtual ~SwBaseLink();
@@ -66,7 +66,7 @@ public:
SwCntntNode *GetCntntNode() { return pCntntNode; }
// For graphics only.
- sal_Bool SwapIn( sal_Bool bWaitForData = sal_False, sal_Bool bNativFormat = sal_False );
+ bool SwapIn( bool bWaitForData = false, bool bNativFormat = false );
sal_Bool Connect() { return 0 != SvBaseLink::GetRealObject(); }
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index fd58427..df0c4e7 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -855,7 +855,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
if( bContinue )
{
const sal_Bool bSwapped = rGrfObj.IsSwappedOut();
- const bool bSwappedIn = 0 != pGrfNd->SwapIn( bPrn );
+ const bool bSwappedIn = pGrfNd->SwapIn( bPrn );
if( bSwappedIn && rGrfObj.GetGraphic().IsSupportedGraphic())
{
const bool bAnimate = rGrfObj.IsAnimated() &&
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 2dd2075..9825b7f 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -369,11 +369,9 @@ sal_Bool SetGrfFlySize( const Size& rGrfSz, const Size& rFrmSz, SwGrfNode* pGrfN
return bRet;
}
-sal_Bool SwBaseLink::SwapIn( sal_Bool bWaitForData, sal_Bool bNativFormat )
+bool SwBaseLink::SwapIn( bool bWaitForData, bool bNativFormat )
{
- bSwapIn = sal_True;
-
- sal_Bool bRes;
+ bSwapIn = true;
if( !GetObj() && ( bNativFormat || ( !IsSynchron() && bWaitForData ) ))
{
@@ -392,6 +390,8 @@ sal_Bool SwBaseLink::SwapIn( sal_Bool bWaitForData, sal_Bool bNativFormat )
}
#endif
+ bool bRes = false;
+
if( GetObj() )
{
OUString aMimeType( SotExchange::GetFormatMimeType( GetContentType() ));
@@ -401,14 +401,17 @@ sal_Bool SwBaseLink::SwapIn( sal_Bool bWaitForData, sal_Bool bNativFormat )
if( bWaitForData && !GetObj() )
{
OSL_ENSURE( !this, "The SvxFileObject was deleted in a GetData!" );
- bRes = sal_False;
}
- else if( 0 != ( bRes = aValue.hasValue() ) )
+ else
{
- // The Flag needs to be reset on a SwapIn, because
- // we want to reapply the data.
- bIgnoreDataChanged = sal_False;
- DataChanged( aMimeType, aValue );
+ bRes = aValue.hasValue();
+ if ( bRes )
+ {
+ // The Flag needs to be reset on a SwapIn, because
+ // we want to reapply the data.
+ bIgnoreDataChanged = sal_False;
+ DataChanged( aMimeType, aValue );
+ }
}
}
else if( !IsSynchron() && bWaitForData )
@@ -420,7 +423,7 @@ sal_Bool SwBaseLink::SwapIn( sal_Bool bWaitForData, sal_Bool bNativFormat )
else
bRes = Update();
- bSwapIn = sal_False;
+ bSwapIn = false;
return bRes;
}
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 59e6d3c..aca1675 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -517,16 +517,15 @@ StreamAndStorageNames lcl_GetStreamStorageNames( const OUString sUserData )
}
/**
- * @return -1 if ReRead successful,
- * 1 if reading successful,
- * 0 if not loaded
+ * @return true if ReRead or reading successful,
+ * false if not loaded
*/
-short SwGrfNode::SwapIn( bool bWaitForData )
+bool SwGrfNode::SwapIn( bool bWaitForData )
{
if( bInSwapIn ) // not recursively!
- return short(!maGrfObj.IsSwappedOut());
+ return !maGrfObj.IsSwappedOut();
- short nRet = 0;
+ bool bRet = false;
bInSwapIn = true;
SwBaseLink* pLink = (SwBaseLink*)(::sfx2::SvBaseLink*) refLink;
@@ -537,7 +536,9 @@ short SwGrfNode::SwapIn( bool bWaitForData )
{
// link was not loaded yet
if( pLink->SwapIn( bWaitForData ) )
- nRet = -1;
+ {
+ bRet = true;
+ }
else if( GRAPHIC_DEFAULT == maGrfObj.GetType() )
{
// no default bitmap anymore, thus re-paint
@@ -550,18 +551,21 @@ short SwGrfNode::SwapIn( bool bWaitForData )
ModifyNotification( &aMsgHint, &aMsgHint );
}
}
- else if( maGrfObj.IsSwappedOut() ) {
+ else if( maGrfObj.IsSwappedOut() )
+ {
// link to download
- nRet = pLink->SwapIn( bWaitForData ) ? 1 : 0;
+ bRet = pLink->SwapIn( bWaitForData );
}
else
- nRet = 1;
+ bRet = true;
}
else if( maGrfObj.IsSwappedOut() )
{
// graphic is in storage or in a temp file
if( !HasStreamName() )
- nRet = (short)maGrfObj.SwapIn();
+ {
+ bRet = maGrfObj.SwapIn();
+ }
else
{
try
@@ -571,8 +575,7 @@ short SwGrfNode::SwapIn( bool bWaitForData )
SvStream* pStrm = _GetStreamForEmbedGrf( refPics, aNames.sStream );
if ( pStrm )
{
- if ( ImportGraphic( *pStrm ) )
- nRet = 1;
+ bRet = ImportGraphic( *pStrm );
delete pStrm;
}
}
@@ -583,26 +586,26 @@ short SwGrfNode::SwapIn( bool bWaitForData )
}
}
- if( 1 == nRet )
+ if( bRet )
{
SwMsgPoolItem aMsg( RES_GRAPHIC_SWAPIN );
ModifyNotification( &aMsg, &aMsg );
}
}
else
- nRet = 1;
- OSL_ENSURE( nRet, "Cannot swap in graphic" );
+ bRet = true;
+ OSL_ENSURE( bRet, "Cannot swap in graphic" );
- if( nRet )
+ if( bRet )
{
if( !nGrfSize.Width() && !nGrfSize.Height() )
SetTwipSize( ::GetGraphicSizeTwip( maGrfObj.GetGraphic(), 0 ) );
}
bInSwapIn = false;
- return nRet;
+ return bRet;
}
-short SwGrfNode::SwapOut()
+bool SwGrfNode::SwapOut()
{
if( maGrfObj.GetType() != GRAPHIC_DEFAULT &&
maGrfObj.GetType() != GRAPHIC_NONE &&
@@ -615,12 +618,12 @@ short SwGrfNode::SwapOut()
// if there is no stream name in the storage yet
if( !HasStreamName() )
if( !maGrfObj.SwapOut() )
- return 0;
+ return false;
}
// written graphics and links are removed here
- return (short) maGrfObj.SwapOut( NULL );
+ return maGrfObj.SwapOut( NULL );
}
- return 1;
+ return true;
}
bool SwGrfNode::GetFileFilterNms( OUString* pFileNm, OUString* pFilterNm ) const
commit cb375b90031aa91274a82fea37f0aa341246e86c
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sat Mar 15 19:29:18 2014 +0100
Fix indentation/formatting and 2 typos in a comment
Change-Id: I863f82fb9ddf136778ab5934312859dcac2370f9
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 822bbb9..c707084 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -328,29 +328,36 @@ bool SwOLENode::SavePersistentData()
if ( xChild.is() )
xChild->setParent( 0 );
- // pCnt->RemoveEmbeddedObject( aOLEObj.aName, sal_False );
- /* #i119941: When cut or move the chart, SwUndoFlyBase::DelFly will call SaveSection to store the comtent to strorage.
- In this step, chart filter functions will be called. And chart filter will call chart core functions to create the chart again.
- Then chart core function will call the class ExplicitCategoryProvider to create data source.
- In this step, when SW data source provider create the data source, it will create a new SwFlyFrm.
- But later in SwUndoFlyBase::DelFly, it will clear anchor related attributes of SwFlyFrm. Then finally null pointer occur.
- Resolution:
- In pCnt->RemoveEmbeddedObject in SaveSection process of table chart, only remove the object from the object container,
- without removing it's storage and graphic stream. The chart already removed from formatter.> */
- bool bChartWithInternalProvider = false;
- uno::Reference < embed::XEmbeddedObject > xIP = GetOLEObj().GetOleRef();
- if ( svt::EmbeddedObjectRef::TryRunningState( xIP ) )
- {
- uno::Reference< chart2::XChartDocument > xChart( xIP->getComponent(), UNO_QUERY );
- if ( xChart.is() && xChart->hasInternalDataProvider() )
- bChartWithInternalProvider = true;
- }
-
- const bool bKeepObjectToTempStorage = !IsChart() ||
- sChartTblName.isEmpty() ||
- bChartWithInternalProvider;
- pCnt->RemoveEmbeddedObject( aOLEObj.aName, false, bKeepObjectToTempStorage );
- // modify end
+ // pCnt->RemoveEmbeddedObject( aOLEObj.aName, sal_False );
+ /*
+ #i119941
+ When cut or move the chart, SwUndoFlyBase::DelFly will call SaveSection
+ to store the content to storage. In this step, chart filter functions
+ will be called. And chart filter will call chart core functions to create
+ the chart again. Then chart core function will call the class
+ ExplicitCategoryProvider to create data source. In this step, when SW data
+ source provider create the data source, it will create a new SwFlyFrm.
+ But later in SwUndoFlyBase::DelFly, it will clear anchor related attributes
+ of SwFlyFrm. Then finally null pointer occur.
+ Resolution:
+ In pCnt->RemoveEmbeddedObject in SaveSection process of table chart,
+ only remove the object from the object container, without removing it's
+ storage and graphic stream. The chart already removed from formatter.
+ */
+ bool bChartWithInternalProvider = false;
+ uno::Reference < embed::XEmbeddedObject > xIP = GetOLEObj().GetOleRef();
+ if ( svt::EmbeddedObjectRef::TryRunningState( xIP ) )
+ {
+ uno::Reference< chart2::XChartDocument > xChart( xIP->getComponent(), UNO_QUERY );
+ if ( xChart.is() && xChart->hasInternalDataProvider() )
+ bChartWithInternalProvider = true;
+ }
+
+ const bool bKeepObjectToTempStorage = !IsChart() ||
+ sChartTblName.isEmpty() ||
+ bChartWithInternalProvider;
+ pCnt->RemoveEmbeddedObject( aOLEObj.aName, false, bKeepObjectToTempStorage );
+ // modify end
// TODO/LATER: aOLEObj.aName has no meaning here, since the undo container contains the object
// by different name, in future it might makes sence that the name is transported here.
commit c57535fe2aaec8b41c1026a7de495670c251d7e1
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Sat Mar 15 19:22:14 2014 +0100
sal_Bool to bool
Change-Id: I01986d22cfc6544cbad39c3276d272d0520e3f53
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 97e6006..63a7e01 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -180,8 +180,8 @@ public:
bool IsSelected() const;
/// Communicate to graphic that node is in Undo-range.
- virtual sal_Bool SavePersistentData();
- virtual sal_Bool RestorePersistentData();
+ virtual bool SavePersistentData();
+ virtual bool RestorePersistentData();
/// Query link-data.
bool IsGrfLink() const { return refLink.Is(); }
diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx
index c3cd9ee..937c4d4 100644
--- a/sw/inc/ndnotxt.hxx
+++ b/sw/inc/ndnotxt.hxx
@@ -57,8 +57,8 @@ public:
virtual Size GetTwipSize() const = 0;
- virtual sal_Bool SavePersistentData();
- virtual sal_Bool RestorePersistentData();
+ virtual bool SavePersistentData();
+ virtual bool RestorePersistentData();
OUString GetTitle() const;
void SetTitle( const OUString& rTitle, bool bBroadcast = false );
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index 0dbb0d1..9b3f6c7 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.hxx
@@ -111,8 +111,8 @@ public:
void GetNewReplacement();
- virtual sal_Bool SavePersistentData();
- virtual sal_Bool RestorePersistentData();
+ virtual bool SavePersistentData();
+ virtual bool RestorePersistentData();
sal_Bool IsInGlobalDocSection() const;
sal_Bool IsOLEObjectDeleted() const;
diff --git a/sw/source/core/docnode/ndnotxt.cxx b/sw/source/core/docnode/ndnotxt.cxx
index f5de845..ef9b2af 100644
--- a/sw/source/core/docnode/ndnotxt.cxx
+++ b/sw/source/core/docnode/ndnotxt.cxx
@@ -75,14 +75,14 @@ void SwNoTxtNode::NewAttrSet( SwAttrPool& rPool )
/// Dummies for loading/saving of persistent data
/// when working with graphics and OLE objects
-sal_Bool SwNoTxtNode::RestorePersistentData()
+bool SwNoTxtNode::RestorePersistentData()
{
- return sal_True;
+ return true;
}
-sal_Bool SwNoTxtNode::SavePersistentData()
+bool SwNoTxtNode::SavePersistentData()
{
- return sal_True;
+ return true;
}
void SwNoTxtNode::SetContour( const PolyPolygon *pPoly, sal_Bool bAutomatic )
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index f1d5c4b..59e6d3c 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -655,18 +655,18 @@ bool SwGrfNode::GetFileFilterNms( OUString* pFileNm, OUString* pFilterNm ) const
*
* If it is already in storage, it needs to be loaded.
*/
-sal_Bool SwGrfNode::SavePersistentData()
+bool SwGrfNode::SavePersistentData()
{
if( refLink.Is() )
{
OSL_ENSURE( !bInSwapIn, "SavePersistentData: I am still in SwapIn" );
GetDoc()->GetLinkManager().Remove( refLink );
- return sal_True;
+ return true;
}
// swap in first if already in storage
if( HasStreamName() && !SwapIn() )
- return sal_False;
+ return false;
// #i44367#
// Do not delete graphic file in storage, because the graphic file could
@@ -680,10 +680,10 @@ sal_Bool SwGrfNode::SavePersistentData()
// Important note: see also fix for #i40014#
// swap out into temp file
- return (sal_Bool) SwapOut();
+ return SwapOut();
}
-sal_Bool SwGrfNode::RestorePersistentData()
+bool SwGrfNode::RestorePersistentData()
{
if( refLink.Is() )
{
@@ -693,7 +693,7 @@ sal_Bool SwGrfNode::RestorePersistentData()
if( getIDocumentLayoutAccess()->GetCurrentLayout() )
refLink->Update();
}
- return sal_True;
+ return true;
}
void SwGrfNode::InsertLink( const OUString& rGrfName, const OUString& rFltName )
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index cf7d48a..822bbb9 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -266,7 +266,7 @@ SwCntntNode *SwOLENode::SplitCntntNode( const SwPosition & )
// Laden eines in den Undo-Bereich verschobenen OLE-Objekts
-sal_Bool SwOLENode::RestorePersistentData()
+bool SwOLENode::RestorePersistentData()
{
OSL_ENSURE( aOLEObj.GetOleRef().is(), "No object to restore!" );
if ( aOLEObj.xOLERef.is() )
@@ -302,11 +302,11 @@ sal_Bool SwOLENode::RestorePersistentData()
}
}
- return sal_True;
+ return true;
}
// OLE object is transported into UNDO area
-sal_Bool SwOLENode::SavePersistentData()
+bool SwOLENode::SavePersistentData()
{
if( aOLEObj.xOLERef.is() )
{
@@ -337,18 +337,18 @@ sal_Bool SwOLENode::SavePersistentData()
Resolution:
In pCnt->RemoveEmbeddedObject in SaveSection process of table chart, only remove the object from the object container,
without removing it's storage and graphic stream. The chart already removed from formatter.> */
- sal_Bool bChartWithInternalProvider = sal_False;
- sal_Bool bKeepObjectToTempStorage = sal_True;
+ bool bChartWithInternalProvider = false;
uno::Reference < embed::XEmbeddedObject > xIP = GetOLEObj().GetOleRef();
if ( svt::EmbeddedObjectRef::TryRunningState( xIP ) )
{
uno::Reference< chart2::XChartDocument > xChart( xIP->getComponent(), UNO_QUERY );
if ( xChart.is() && xChart->hasInternalDataProvider() )
- bChartWithInternalProvider = sal_True;
+ bChartWithInternalProvider = true;
}
- if ( IsChart() && !sChartTblName.isEmpty() && !bChartWithInternalProvider )
- bKeepObjectToTempStorage = sal_False;
+ const bool bKeepObjectToTempStorage = !IsChart() ||
+ sChartTblName.isEmpty() ||
+ bChartWithInternalProvider;
pCnt->RemoveEmbeddedObject( aOLEObj.aName, false, bKeepObjectToTempStorage );
// modify end
@@ -368,7 +368,7 @@ sal_Bool SwOLENode::SavePersistentData()
DisconnectFileLink_Impl();
- return sal_True;
+ return true;
}
SwOLENode * SwNodes::MakeOLENode( const SwNodeIndex & rWhere,
commit 2b4c01c268fcda1b7d7fdf2e6c45d7ce18133b81
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Fri Mar 14 22:44:58 2014 +0100
Remove redundant inline
Change-Id: I1846523359104a00c4fb84dc0d4df4251e4c43b6
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 92f7a5e..97e6006 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -142,24 +142,24 @@ public:
bool IsTransparent() const;
- inline bool IsAnimated() const { return maGrfObj.IsAnimated(); }
+ bool IsAnimated() const { return maGrfObj.IsAnimated(); }
- inline bool IsChgTwipSize() const { return bChgTwipSize; }
- inline bool IsChgTwipSizeFromPixel() const { return bChgTwipSizeFromPixel; }
- inline void SetChgTwipSize( bool b, bool bFromPx=false )
+ bool IsChgTwipSize() const { return bChgTwipSize; }
+ bool IsChgTwipSizeFromPixel() const { return bChgTwipSizeFromPixel; }
+ void SetChgTwipSize( bool b, bool bFromPx=false )
{
bChgTwipSize = b;
bChgTwipSizeFromPixel = bFromPx;
}
- inline bool IsGraphicArrived() const { return bGraphicArrived; }
- inline void SetGraphicArrived( bool b ) { bGraphicArrived = b; }
+ bool IsGraphicArrived() const { return bGraphicArrived; }
+ void SetGraphicArrived( bool b ) { bGraphicArrived = b; }
- inline bool IsFrameInPaint() const { return bFrameInPaint; }
- inline void SetFrameInPaint( bool b ) { bFrameInPaint = b; }
+ bool IsFrameInPaint() const { return bFrameInPaint; }
+ void SetFrameInPaint( bool b ) { bFrameInPaint = b; }
- inline bool IsScaleImageMap() const { return bScaleImageMap; }
- inline void SetScaleImageMap( bool b ) { bScaleImageMap = b; }
+ bool IsScaleImageMap() const { return bScaleImageMap; }
+ void SetScaleImageMap( bool b ) { bScaleImageMap = b; }
/// in ndcopy.cxx
virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const;
@@ -185,8 +185,8 @@ public:
/// Query link-data.
bool IsGrfLink() const { return refLink.Is(); }
- inline bool IsLinkedFile() const;
- inline bool IsLinkedDDE() const;
+ bool IsLinkedFile() const;
+ bool IsLinkedDDE() const;
::sfx2::SvBaseLinkRef GetLink() const { return refLink; }
bool GetFileFilterNms( OUString* pFileNm, OUString* pFilterNm ) const;
void ReleaseLink();
commit df8d9fc9a95220fb8ce86734c64e56afa1cbfcfa
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Fri Mar 14 22:37:51 2014 +0100
sal_Bool to bool
Change-Id: I5c134bce37e1be05618b14e7dbb22911cd6656c1
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index c83b797..92f7a5e 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -42,18 +42,18 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
::sfx2::SvBaseLinkRef refLink; ///< If graphics only as link then pointer is set.
Size nGrfSize;
OUString aLowResGrf; ///< HTML: LowRes graphics (substitute until regular HighRes graphics is loaded).
- sal_Bool bInSwapIn :1;
+ bool bInSwapIn :1;
- sal_Bool bGraphicArrived :1;
- sal_Bool bChgTwipSize :1;
- sal_Bool bChgTwipSizeFromPixel :1;
- sal_Bool bFrameInPaint :1; ///< To avoid Start-/EndActions in Paint via SwapIn.
- sal_Bool bScaleImageMap :1; ///< Scale image map in SetTwipSize.
+ bool bGraphicArrived :1;
+ bool bChgTwipSize :1;
+ bool bChgTwipSizeFromPixel :1;
+ bool bFrameInPaint :1; ///< To avoid Start-/EndActions in Paint via SwapIn.
+ bool bScaleImageMap :1; ///< Scale image map in SetTwipSize.
boost::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer;
bool mbLinkedInputStreamReady;
com::sun::star::uno::Reference<com::sun::star::io::XInputStream> mxInputStream;
- sal_Bool mbIsStreamReadOnly;
+ bool mbIsStreamReadOnly;
SwGrfNode( const SwNodeIndex& rWhere,
const OUString& rGrfName, const OUString& rFltName,
@@ -71,8 +71,8 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
SwAttrSet* pAutoAttr = 0 );
void InsertLink( const OUString& rGrfName, const OUString& rFltName );
- sal_Bool ImportGraphic( SvStream& rStrm );
- sal_Bool HasStreamName() const { return maGrfObj.HasUserData(); }
+ bool ImportGraphic( SvStream& rStrm );
+ bool HasStreamName() const { return maGrfObj.HasUserData(); }
/** adjust return type and rename method to
indicate that its an private one. */
@@ -140,40 +140,44 @@ public:
virtual Size GetTwipSize() const;
void SetTwipSize( const Size& rSz );
- sal_Bool IsTransparent() const;
+ bool IsTransparent() const;
- inline sal_Bool IsAnimated() const { return maGrfObj.IsAnimated(); }
+ inline bool IsAnimated() const { return maGrfObj.IsAnimated(); }
- inline sal_Bool IsChgTwipSize() const { return bChgTwipSize; }
- inline sal_Bool IsChgTwipSizeFromPixel() const { return bChgTwipSizeFromPixel; }
- inline void SetChgTwipSize( sal_Bool b, sal_Bool bFromPx=sal_False ) { bChgTwipSize = b; bChgTwipSizeFromPixel = bFromPx; }
+ inline bool IsChgTwipSize() const { return bChgTwipSize; }
+ inline bool IsChgTwipSizeFromPixel() const { return bChgTwipSizeFromPixel; }
+ inline void SetChgTwipSize( bool b, bool bFromPx=false )
+ {
+ bChgTwipSize = b;
+ bChgTwipSizeFromPixel = bFromPx;
+ }
- inline sal_Bool IsGraphicArrived() const { return bGraphicArrived; }
- inline void SetGraphicArrived( sal_Bool b ) { bGraphicArrived = b; }
+ inline bool IsGraphicArrived() const { return bGraphicArrived; }
+ inline void SetGraphicArrived( bool b ) { bGraphicArrived = b; }
- inline sal_Bool IsFrameInPaint() const { return bFrameInPaint; }
- inline void SetFrameInPaint( sal_Bool b ) { bFrameInPaint = b; }
+ inline bool IsFrameInPaint() const { return bFrameInPaint; }
+ inline void SetFrameInPaint( bool b ) { bFrameInPaint = b; }
- inline sal_Bool IsScaleImageMap() const { return bScaleImageMap; }
- inline void SetScaleImageMap( sal_Bool b ) { bScaleImageMap = b; }
+ inline bool IsScaleImageMap() const { return bScaleImageMap; }
+ inline void SetScaleImageMap( bool b ) { bScaleImageMap = b; }
/// in ndcopy.cxx
virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const;
/** Re-read in case graphic was not OK. The current one
gets replaced by the new one. */
- sal_Bool ReRead( const OUString& rGrfName, const OUString& rFltName,
+ bool ReRead( const OUString& rGrfName, const OUString& rFltName,
const Graphic* pGraphic = 0,
const GraphicObject* pGrfObj = 0,
- sal_Bool bModify = sal_True );
+ bool bModify = true );
/// Loading of graphic immediately before displaying.
- short SwapIn( sal_Bool bWaitForData = sal_False );
+ short SwapIn( bool bWaitForData = false );
/// Remove graphic in order to free memory.
short SwapOut();
/// Access to storage stream-name.
void SetStreamName( const OUString& r ) { maGrfObj.SetUserData( r ); }
/// Is this node selected by any shell?
- sal_Bool IsSelected() const;
+ bool IsSelected() const;
/// Communicate to graphic that node is in Undo-range.
virtual sal_Bool SavePersistentData();
@@ -199,7 +203,7 @@ public:
void TriggerAsyncRetrieveInputStream();
void ApplyInputStream(
com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream,
- const sal_Bool bIsStreamReadOnly );
+ const bool bIsStreamReadOnly );
void UpdateLinkWithInputStream();
bool IsAsyncRetrieveInputStreamPossible() const;
};
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index b31918f..ed1e6ac 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1965,7 +1965,7 @@ void SwDoc::ReRead( SwPaM& rPam, const OUString& rGrfName,
GetMirrorGrf().GetValue() )
pGrfNd->SetAttr( SwMirrorGrf() );
- pGrfNd->ReRead( rGrfName, rFltName, pGraphic, pGrafObj, sal_True );
+ pGrfNd->ReRead( rGrfName, rFltName, pGraphic, pGrafObj, true );
SetModified();
}
}
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 56e47df..fd58427 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -232,7 +232,7 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
SwNoTxtNode& rNoTNd = *(SwNoTxtNode*)GetNode();
SwGrfNode* pGrfNd = rNoTNd.GetGrfNode();
if( pGrfNd )
- pGrfNd->SetFrameInPaint( sal_True );
+ pGrfNd->SetFrameInPaint( true );
// #i13147# - add 2nd parameter with value <sal_True> to
// method call <FindFlyFrm().GetContour(..)> to indicate that it is called
@@ -287,7 +287,7 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
// If it's not visible, simply delete the given Area
lcl_ClearArea( *this, *pSh->GetOut(), aPaintArea, SwRect() );
if( pGrfNd )
- pGrfNd->SetFrameInPaint( sal_False );
+ pGrfNd->SetFrameInPaint( false );
pOut->Pop();
SfxProgress::LeaveLock();
diff --git a/sw/source/core/docnode/ndnotxt.cxx b/sw/source/core/docnode/ndnotxt.cxx
index b1b41a0..f5de845 100644
--- a/sw/source/core/docnode/ndnotxt.cxx
+++ b/sw/source/core/docnode/ndnotxt.cxx
@@ -251,7 +251,7 @@ Graphic SwNoTxtNode::GetGraphic() const
Graphic aRet;
if ( GetGrfNode() )
{
- ((SwGrfNode*)this)->SwapIn( sal_True );
+ ((SwGrfNode*)this)->SwapIn( true );
aRet = ((SwGrfNode*)this)->GetGrf();
}
else
diff --git a/sw/source/core/docnode/retrieveinputstreamconsumer.cxx b/sw/source/core/docnode/retrieveinputstreamconsumer.cxx
index f621fd8..6bfa562 100644
--- a/sw/source/core/docnode/retrieveinputstreamconsumer.cxx
+++ b/sw/source/core/docnode/retrieveinputstreamconsumer.cxx
@@ -55,7 +55,7 @@ void SwAsyncRetrieveInputStreamThreadConsumer::CreateThread( const OUString& rUR
void SwAsyncRetrieveInputStreamThreadConsumer::ApplyInputStream(
com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream,
- const sal_Bool bIsStreamReadOnly )
+ const bool bIsStreamReadOnly )
{
mrGrfNode.ApplyInputStream( xInputStream, bIsStreamReadOnly );
}
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 46341cb..2dd2075 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -125,9 +125,9 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
}
bool bUpdate = false;
- sal_Bool bGraphicArrived = sal_False;
+ bool bGraphicArrived = false;
sal_Bool bGraphicPieceArrived = sal_False;
- sal_Bool bDontNotify = sal_False;
+ bool bDontNotify = false;
Size aGrfSz, aFrmFmtSz;
if( pCntntNode->IsGrfNode() )
@@ -167,7 +167,7 @@ static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
// If only a part arrives, but the size is not set
// we need to go through bGraphicArrived down there.
// Or else the graphic is painted at its definitive size
- bGraphicArrived = sal_True;
+ bGraphicArrived = true;
bGraphicPieceArrived = sal_False;
}
diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx
index f1a343c..53bed9a 100644
--- a/sw/source/core/frmedt/fefly1.cxx
+++ b/sw/source/core/frmedt/fefly1.cxx
@@ -1662,7 +1662,7 @@ const Graphic *SwFEShell::GetGrfAtPos( const Point &rPt,
pNd->GetFileFilterNms( &rName, 0 );
if ( rName.isEmpty() )
rName = pFly->GetFmt()->GetName();
- pNd->SwapIn( sal_True );
+ pNd->SwapIn( true );
return &pNd->GetGrf();
}
}
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index a4bcbae..f1d5c4b 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -67,20 +67,20 @@ SwGrfNode::SwGrfNode(
mpReplacementGraphic(0),
// #i73788#
mbLinkedInputStreamReady( false ),
- mbIsStreamReadOnly( sal_False )
+ mbIsStreamReadOnly( false )
{
maGrfObj.SetSwapStreamHdl( LINK(this, SwGrfNode, SwapGraphic) );
bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel =
- bFrameInPaint = bScaleImageMap = sal_False;
+ bFrameInPaint = bScaleImageMap = false;
- bGraphicArrived = sal_True;
+ bGraphicArrived = true;
// fdo#50763 inline image has already been read into memory
if (rGrfName.startsWith("data:")) {
maGrfObj.SetGraphic( *pGraphic, rGrfName );
}
else {
- ReRead(rGrfName,rFltName, pGraphic, 0, sal_False);
+ ReRead(rGrfName,rFltName, pGraphic, 0, false);
}
}
@@ -92,14 +92,14 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
mpReplacementGraphic(0),
// #i73788#
mbLinkedInputStreamReady( false ),
- mbIsStreamReadOnly( sal_False )
+ mbIsStreamReadOnly( false )
{
maGrfObj.SetSwapStreamHdl( LINK(this, SwGrfNode, SwapGraphic) );
if( rGrfObj.HasUserData() && rGrfObj.IsSwappedOut() )
maGrfObj.SetSwapState();
bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel =
- bFrameInPaint = bScaleImageMap = sal_False;
- bGraphicArrived = sal_True;
+ bFrameInPaint = bScaleImageMap = false;
+ bGraphicArrived = true;
}
/** Create new SW/G reader.
@@ -117,7 +117,7 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
mpReplacementGraphic(0),
// #i73788#
mbLinkedInputStreamReady( false ),
- mbIsStreamReadOnly( sal_False )
+ mbIsStreamReadOnly( false )
{
maGrfObj.SetSwapStreamHdl( LINK(this, SwGrfNode, SwapGraphic) );
@@ -125,8 +125,8 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
maGrfObj.SetGraphic( aGrf, rGrfName );
bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel =
- bFrameInPaint = bScaleImageMap = sal_False;
- bGraphicArrived = sal_True;
+ bFrameInPaint = bScaleImageMap = false;
+ bGraphicArrived = true;
InsertLink( rGrfName, rFltName );
if( IsLinkedFile() )
@@ -141,12 +141,13 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
}
}
-sal_Bool SwGrfNode::ReRead(
+bool SwGrfNode::ReRead(
const OUString& rGrfName, const OUString& rFltName,
const Graphic* pGraphic, const GraphicObject* pGrfObj,
- sal_Bool bNewGrf )
+ bool bNewGrf )
{
- sal_Bool bReadGrf = sal_False, bSetTwipSize = sal_True;
+ bool bReadGrf = false;
+ bool bSetTwipSize = true;
delete mpReplacementGraphic;
mpReplacementGraphic = 0;
@@ -192,7 +193,7 @@ sal_Bool SwGrfNode::ReRead(
{
maGrfObj.SetGraphic( *pGraphic, rGrfName );
onGraphicChanged();
- bReadGrf = sal_True;
+ bReadGrf = true;
}
else if( pGrfObj )
{
@@ -201,7 +202,7 @@ sal_Bool SwGrfNode::ReRead(
maGrfObj.SetSwapState();
maGrfObj.SetLink( rGrfName );
onGraphicChanged();
- bReadGrf = sal_True;
+ bReadGrf = true;
}
else
{
@@ -225,7 +226,7 @@ sal_Bool SwGrfNode::ReRead(
}
}
onGraphicChanged();
- bSetTwipSize = sal_False;
+ bSetTwipSize = false;
}
}
else if( pGraphic && rGrfName.isEmpty() )
@@ -236,7 +237,7 @@ sal_Bool SwGrfNode::ReRead(
maGrfObj.SetGraphic( *pGraphic );
onGraphicChanged();
- bReadGrf = sal_True;
+ bReadGrf = true;
}
else if( pGrfObj && rGrfName.isEmpty() )
{
@@ -248,11 +249,11 @@ sal_Bool SwGrfNode::ReRead(
onGraphicChanged();
if( pGrfObj->HasUserData() && pGrfObj->IsSwappedOut() )
maGrfObj.SetSwapState();
- bReadGrf = sal_True;
+ bReadGrf = true;
}
// Was the graphic already loaded?
else if( !bNewGrf && GRAPHIC_NONE != maGrfObj.GetType() )
- return sal_True;
+ return true;
else
{
if( HasStreamName() )
@@ -267,7 +268,7 @@ sal_Bool SwGrfNode::ReRead(
{
maGrfObj.SetGraphic( *pGraphic, rGrfName );
onGraphicChanged();
- bReadGrf = sal_True;
+ bReadGrf = true;
// create connection without update, as we have the graphic
((SwBaseLink*)&refLink)->Connect();
}
@@ -276,7 +277,7 @@ sal_Bool SwGrfNode::ReRead(
maGrfObj = *pGrfObj;
maGrfObj.SetLink( rGrfName );
onGraphicChanged();
- bReadGrf = sal_True;
+ bReadGrf = true;
// create connection without update, as we have the graphic
((SwBaseLink*)&refLink)->Connect();
}
@@ -455,7 +456,7 @@ Size SwGrfNode::GetTwipSize() const
return nGrfSize;
}
-sal_Bool SwGrfNode::ImportGraphic( SvStream& rStrm )
+bool SwGrfNode::ImportGraphic( SvStream& rStrm )
{
Graphic aGraphic;
const OUString aURL(maGrfObj.GetUserData());
@@ -468,10 +469,10 @@ sal_Bool SwGrfNode::ImportGraphic( SvStream& rStrm )
maGrfObj.SetGraphic( aGraphic );
maGrfObj.SetUserData( aURL );
onGraphicChanged();
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
namespace
@@ -520,13 +521,13 @@ StreamAndStorageNames lcl_GetStreamStorageNames( const OUString sUserData )
* 1 if reading successful,
* 0 if not loaded
*/
-short SwGrfNode::SwapIn( sal_Bool bWaitForData )
+short SwGrfNode::SwapIn( bool bWaitForData )
{
if( bInSwapIn ) // not recursively!
return short(!maGrfObj.IsSwappedOut());
short nRet = 0;
- bInSwapIn = sal_True;
+ bInSwapIn = true;
SwBaseLink* pLink = (SwBaseLink*)(::sfx2::SvBaseLink*) refLink;
if( pLink )
@@ -597,7 +598,7 @@ short SwGrfNode::SwapIn( sal_Bool bWaitForData )
if( !nGrfSize.Width() && !nGrfSize.Height() )
SetTwipSize( ::GetGraphicSizeTwip( maGrfObj.GetGraphic(), 0 ) );
}
- bInSwapIn = sal_False;
+ bInSwapIn = false;
return nRet;
}
@@ -715,7 +716,7 @@ void SwGrfNode::InsertLink( const OUString& rGrfName, const OUString& rFltName )
}
else
{
- sal_Bool bSync = rFltName == "SYNCHRON";
+ const bool bSync = rFltName == "SYNCHRON";
refLink->SetSynchron( bSync );
refLink->SetContentType( SOT_FORMATSTR_ID_SVXB );
@@ -737,10 +738,10 @@ void SwGrfNode::ReleaseLink()
const bool bHasOriginalData(aLocalGraphic.IsLink());
{
- bInSwapIn = sal_True;
+ bInSwapIn = true;
SwBaseLink* pLink = (SwBaseLink*)(::sfx2::SvBaseLink*) refLink;
- pLink->SwapIn( sal_True, sal_True );
- bInSwapIn = sal_False;
+ pLink->SwapIn( true, true );
+ bInSwapIn = false;
}
getIDocumentLinksAdministration()->GetLinkManager().Remove( refLink );
@@ -790,7 +791,7 @@ void SwGrfNode::SetTwipSize( const Size& rSz )
ScaleImageMap();
// do not re-scale Image-Map
- SetScaleImageMap( sal_False );
+ SetScaleImageMap( false );
}
}
@@ -1029,9 +1030,9 @@ IMPL_LINK( SwGrfNode, SwapGraphic, GraphicObject*, pGrfObj )
// then make it by your self
if( !bInSwapIn )
{
- bool bIsModifyLocked = IsModifyLocked();
+ const bool bIsModifyLocked = IsModifyLocked();
LockModify();
- SwapIn( sal_False );
+ SwapIn( false );
if( !bIsModifyLocked )
UnlockModify();
}
@@ -1156,18 +1157,15 @@ GraphicAttr& SwGrfNode::GetGraphicAttr( GraphicAttr& rGA,
return rGA;
}
-sal_Bool SwGrfNode::IsTransparent() const
+bool SwGrfNode::IsTransparent() const
{
- sal_Bool bRet = maGrfObj.IsTransparent();
- if( !bRet ) // ask the attribut
- bRet = 0 != GetSwAttrSet().GetTransparencyGrf().GetValue();
-
- return bRet;
+ return maGrfObj.IsTransparent() ||
+ GetSwAttrSet().GetTransparencyGrf().GetValue() != 0;
}
-sal_Bool SwGrfNode::IsSelected() const
+bool SwGrfNode::IsSelected() const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
const SwEditShell* pESh = GetDoc()->GetEditShell();
if( pESh )
{
@@ -1177,7 +1175,7 @@ sal_Bool SwGrfNode::IsSelected() const
if( pV->ISA( SwEditShell ) && pN == &((SwCrsrShell*)pV)
->GetCrsr()->GetPoint()->nNode.GetNode() )
{
- bRet = sal_True;
+ bRet = true;
break;
}
}
@@ -1223,7 +1221,7 @@ bool SwGrfNode::IsLinkedInputStreamReady() const
void SwGrfNode::ApplyInputStream(
com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream,
- const sal_Bool bIsStreamReadOnly )
+ const bool bIsStreamReadOnly )
{
if ( IsLinkedFile() )
{
diff --git a/sw/source/core/inc/retrieveinputstreamconsumer.hxx b/sw/source/core/inc/retrieveinputstreamconsumer.hxx
index 64f660c..fc9f2cc 100644
--- a/sw/source/core/inc/retrieveinputstreamconsumer.hxx
+++ b/sw/source/core/inc/retrieveinputstreamconsumer.hxx
@@ -46,7 +46,7 @@ class SwAsyncRetrieveInputStreamThreadConsumer
*/
void ApplyInputStream(
com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xInputStream,
- const sal_Bool bIsStreamReadOnly );
+ const bool bIsStreamReadOnly );
private:
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 31db7c8..6a1de08 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -815,13 +815,13 @@ void SwUndoReRead::SetAndSave(::sw::UndoRedoContext & rContext)
if( pOldNm )
{
- pGrfNd->ReRead( *pOldNm, pFltr ? *pFltr : OUString(), 0, 0, sal_True );
+ pGrfNd->ReRead( *pOldNm, pFltr ? *pFltr : OUString(), 0, 0, true );
delete pOldNm;
delete pOldFltr;
}
else
{
- pGrfNd->ReRead( OUString(), OUString(), pOldGrf, 0, sal_True );
+ pGrfNd->ReRead( OUString(), OUString(), pOldGrf, 0, true );
delete pOldGrf;
}
@@ -852,7 +852,7 @@ void SwUndoReRead::SaveGraphicData( const SwGrfNode& rGrfNd )
}
else
{
- ((SwGrfNode&)rGrfNd).SwapIn( sal_True );
+ ((SwGrfNode&)rGrfNd).SwapIn( true );
pGrf = new Graphic( rGrfNd.GetGrf() );
pNm = pFltr = 0;
}
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index a6f6561..22229ea 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1675,7 +1675,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
if ( aActSize.Width() == 0 && aActSize.Height() == 0 &&
pGrfNode->IsLinkedFile() )
{
- pGrfNode->SwapIn( sal_True );
+ pGrfNode->SwapIn( true );
aActSize = pGrfNode->GetTwipSize();
}
}
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 43934af..7da9981 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -562,9 +562,9 @@ IMAGE_SETEVENT:
Size aGrfSz( 0, 0 );
sal_Bool bSetTwipSize = sal_True; // Twip-Size am Node setzen?
- sal_Bool bChangeFrmSize = sal_False; // Frame-Format nachtraeglich anpassen?
+ bool bChangeFrmSize = false; // Frame-Format nachtraeglich anpassen?
sal_Bool bRequestGrfNow = sal_False;
- sal_Bool bSetScaleImageMap = sal_False;
+ bool bSetScaleImageMap = false;
sal_uInt8 nPrcWidth = 0, nPrcHeight = 0;
if( !nWidth || !nHeight )
@@ -580,7 +580,7 @@ IMAGE_SETEVENT:
}
// Die Groesse des Rahmens wird nachtraeglich gesetzt
- bChangeFrmSize = sal_True;
+ bChangeFrmSize = true;
aGrfSz = aTwipSz;
if( !nWidth && !nHeight )
{
@@ -657,7 +657,7 @@ IMAGE_SETEVENT:
// die Grafik muss beim SetTwipSize skaliert werden, wenn
// wir keine Groesse am Node gesetzt haben oder die Groesse
// nicht der Grafikgroesse entsprach.
- bSetScaleImageMap = sal_True;
+ bSetScaleImageMap = true;
}
}
@@ -733,13 +733,13 @@ IMAGE_SETEVENT:
if( !sAltNm.isEmpty() )
pGrfNd->SetTitle( sAltNm );
- if( bSetTwipSize )
- pGrfNd->SetTwipSize( aGrfSz );
+ if( bSetTwipSize )
+ pGrfNd->SetTwipSize( aGrfSz );
- pGrfNd->SetChgTwipSize( bChangeFrmSize, bChangeFrmSize );
+ pGrfNd->SetChgTwipSize( bChangeFrmSize, bChangeFrmSize );
if( bSetScaleImageMap )
- pGrfNd->SetScaleImageMap( sal_True );
+ pGrfNd->SetScaleImageMap( true );
}
if( aAttrTab.pINetFmt )
commit 2f2255cf1ea9e9b32d9d01308deaccec5e5b34b7
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Fri Mar 14 00:35:29 2014 +0100
bLoadLowResGrf is never read
Change-Id: I1dd1b1ccf0981f118ac66d867f75528d15017ffe
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 1485d48..c83b797 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -47,7 +47,6 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
sal_Bool bGraphicArrived :1;
sal_Bool bChgTwipSize :1;
sal_Bool bChgTwipSizeFromPixel :1;
- sal_Bool bLoadLowResGrf :1;
sal_Bool bFrameInPaint :1; ///< To avoid Start-/EndActions in Paint via SwapIn.
sal_Bool bScaleImageMap :1; ///< Scale image map in SetTwipSize.
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index c7da2f1..a4bcbae 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -70,7 +70,7 @@ SwGrfNode::SwGrfNode(
mbIsStreamReadOnly( sal_False )
{
maGrfObj.SetSwapStreamHdl( LINK(this, SwGrfNode, SwapGraphic) );
- bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf =
+ bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel =
bFrameInPaint = bScaleImageMap = sal_False;
bGraphicArrived = sal_True;
@@ -97,7 +97,7 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
maGrfObj.SetSwapStreamHdl( LINK(this, SwGrfNode, SwapGraphic) );
if( rGrfObj.HasUserData() && rGrfObj.IsSwappedOut() )
maGrfObj.SetSwapState();
- bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel= bLoadLowResGrf =
+ bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel =
bFrameInPaint = bScaleImageMap = sal_False;
bGraphicArrived = sal_True;
}
@@ -124,7 +124,7 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
Graphic aGrf; aGrf.SetDefaultType();
maGrfObj.SetGraphic( aGrf, rGrfName );
- bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel = bLoadLowResGrf =
+ bInSwapIn = bChgTwipSize = bChgTwipSizeFromPixel =
bFrameInPaint = bScaleImageMap = sal_False;
bGraphicArrived = sal_True;
commit e6405ba66233ee0a138e6c623e6a36158026c58b
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Thu Mar 13 23:19:52 2014 +0100
sal_Bool to bool
Change-Id: Iadb3c137813039b64a909e2be5693656ae35db45
diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx
index e9ddcd6..be61756 100644
--- a/sw/source/core/inc/cntfrm.hxx
+++ b/sw/source/core/inc/cntfrm.hxx
@@ -50,7 +50,7 @@ class SwCntntFrm: public SwFrm, public SwFlowFrm
void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &,
SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 );
- virtual sal_Bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool& );
+ virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool& );
const SwCntntFrm* ImplGetNextCntntFrm( bool bFwd ) const;
diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx
index 398d5bd..09a6afb 100644
--- a/sw/source/core/inc/flowfrm.hxx
+++ b/sw/source/core/inc/flowfrm.hxx
@@ -138,8 +138,8 @@ protected:
sal_Bool CheckMoveFwd( bool& rbMakePage, sal_Bool bKeep, sal_Bool bMovedBwd );
sal_Bool MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool bMoveAlways = sal_False );
- sal_Bool MoveBwd( sal_Bool &rbReformat );
- virtual sal_Bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool bHead, sal_Bool &rReformat )=0;
+ bool MoveBwd( bool &rbReformat );
+ virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat )=0;
public:
SwFlowFrm( SwFrm &rFrm );
diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx
index b15b753..930d1bc 100644
--- a/sw/source/core/inc/sectfrm.hxx
+++ b/sw/source/core/inc/sectfrm.hxx
@@ -55,7 +55,7 @@ class SwSectionFrm: public SwLayoutFrm, public SwFlowFrm
bool IsEndnoteAtMyEnd() const;
protected:
virtual void MakeAll();
- virtual sal_Bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool bHead, sal_Bool &rReformat );
+ virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat );
virtual void Format( const SwBorderAttrs *pAttrs = 0 );
virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
virtual void SwClientNotify( const SwModify&, const SfxHint& );
diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index 44ff0f3..02a454c 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.hxx
@@ -98,7 +98,7 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm
SwAttrSetChg *pa = 0,
SwAttrSetChg *pb = 0 );
- virtual sal_Bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool bHead, sal_Bool &rReformat );
+ virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat );
protected:
virtual void MakeAll();
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index bbd6bfc..ce04d82 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -46,7 +46,7 @@
// Move methods
/// Return value tells whether the Frm should be moved.
-sal_Bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool & )
+bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool & )
{
if ( (SwFlowFrm::IsMoveBwdJump() || !IsPrevObjMove()))
{
@@ -73,7 +73,7 @@ sal_Bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool
SwPageFrm *pOldPage = FindPageFrm();
if ( SwFlowFrm::IsMoveBwdJump() )
- return sal_True;
+ return true;
if( IsInFtn() && IsInSct() )
{
@@ -193,7 +193,7 @@ sal_Bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool
return nSpace != 0;
}
}
- return sal_False;
+ return false;
}
// Calc methods
@@ -1345,7 +1345,7 @@ void SwCntntFrm::MakeAll()
// backwards (if this is movable at all).
// To prevent oscillations/loops, check that this has not just
// flowed forwards.
- sal_Bool bDummy;
+ bool bDummy;
if ( !lcl_Prev( this ) &&
!bMovedFwd &&
( bMoveable || ( bFly && !bTab ) ) &&
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index e0c8e93..5b51242 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1964,13 +1964,13 @@ sal_Bool SwFlowFrm::MoveFwd( sal_Bool bMakePage, sal_Bool bPageBreak, sal_Bool b
* @note This should be called by derived classes.
* @note The actual moving must be implemented in the subclasses.
*/
-sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
+bool SwFlowFrm::MoveBwd( bool &rbReformat )
{
SwFlowFrm::SetMoveBwdJump( sal_False );
SwFtnFrm* pFtn = m_rThis.FindFtnFrm();
if ( pFtn && pFtn->IsBackMoveLocked() )
- return sal_False;
+ return false;
// #115759# - text frames, which are directly inside
// tables aren't allowed to move backward.
@@ -1981,9 +1981,9 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
{
if ( pUpperFrm->IsTabFrm() )
{
- return sal_False;
+ return false;
}
- else if ( pUpperFrm->IsColumnFrm() && pUpperFrm->IsInSct() )
+ if ( pUpperFrm->IsColumnFrm() && pUpperFrm->IsInSct() )
{
break;
}
@@ -2290,7 +2290,7 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat )
pNewUpper = 0;
}
}
- if ( pNewUpper && !ShouldBwdMoved( pNewUpper, sal_True, rbReformat ) )
+ if ( pNewUpper && !ShouldBwdMoved( pNewUpper, true, rbReformat ) )
{
if( !pNewUpper->Lower() )
{
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index f6a9055..79889a7 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -751,10 +751,10 @@ void SwSectionFrm::MakeAll()
DelEmpty( sal_False );
}
-sal_Bool SwSectionFrm::ShouldBwdMoved( SwLayoutFrm *, sal_Bool , sal_Bool & )
+bool SwSectionFrm::ShouldBwdMoved( SwLayoutFrm *, bool , bool & )
{
OSL_FAIL( "Hups, wo ist meine Tarnkappe?" );
- return sal_False;
+ return false;
}
const SwSectionFmt* SwSectionFrm::_GetEndSectFmt() const
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 82eeb6e..a326d4c 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -1947,13 +1947,13 @@ void SwTabFrm::MakeAll()
if( pFrm && n1StLineHeight >(pFrm->Frm().*fnRect->fnGetHeight )() )
{
SwTabFrm *pMaster = (SwTabFrm*)FindMaster();
- sal_Bool bDummy;
- if ( ShouldBwdMoved( pMaster->GetUpper(), sal_False, bDummy ) )
+ bool bDummy;
+ if ( ShouldBwdMoved( pMaster->GetUpper(), false, bDummy ) )
pMaster->InvalidatePos();
}
}
SwFtnBossFrm *pOldBoss = bFtnsInDoc ? FindFtnBossFrm( sal_True ) : 0;
- sal_Bool bReformat;
+ bool bReformat;
if ( MoveBwd( bReformat ) )
{
SWREFRESHFN( this )
@@ -2038,8 +2038,8 @@ void SwTabFrm::MakeAll()
// at least one further row of an existing follow.
if ( !bSplit && GetFollow() )
{
- sal_Bool bDummy;
- if ( GetFollow()->ShouldBwdMoved( GetUpper(), sal_False, bDummy ) )
+ bool bDummy;
+ if ( GetFollow()->ShouldBwdMoved( GetUpper(), false, bDummy ) )
{
SwFrm *pTmp = GetUpper();
SwTwips nDeadLine = (pTmp->*fnRect->fnGetPrtBottom)();
@@ -3251,9 +3251,9 @@ SwCntntFrm *SwTabFrm::FindLastCntnt()
}
/// Return value defines if the frm needs to be relocated
-sal_Bool SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool &rReformat )
+bool SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool, bool &rReformat )
{
- rReformat = sal_False;
+ rReformat = false;
if ( (SwFlowFrm::IsMoveBwdJump() || !IsPrevObjMove()) )
{
//Floating back Frm's is quite time consuming unfortunately.
@@ -3320,8 +3320,11 @@ sal_Bool SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool &r
bMoveAnyway = true;
if ( bMoveAnyway )
- return rReformat = sal_True;
- else if ( !bLockBackMove && nSpace > 0 )
+ {
+ rReformat = true;
+ return true;
+ }
+ if ( !bLockBackMove && nSpace > 0 )
{
// #i26945# - check, if follow flow line
// contains frame, which are moved forward due to its object
@@ -3332,7 +3335,7 @@ sal_Bool SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool &r
*(pFirstRow->GetFmt()->GetDoc()),
*(pFirstRow) ) )
{
- return sal_False;
+ return false;
}
SwTwips nTmpHeight = CalcHeightOfFirstContentLine();
@@ -3344,7 +3347,7 @@ sal_Bool SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool &r
return nTmpHeight <= nSpace;
}
}
- return sal_False;
+ return false;
}
void SwTabFrm::Cut()
commit 35bbf925b353e20e88c23e5c8f1934397a0b1a6a
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Wed Mar 12 23:13:04 2014 +0100
Simplify evaluation of returned booleans
Change-Id: I429d410cf735d4c1dd37ae71513b2e0d6332c50a
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index da97bcf..bbd6bfc 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -182,23 +182,15 @@ sal_Bool SwCntntFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool
}
// It's impossible for _WouldFit to return a usable result if
// we have a fresh multi-column section - so we really have to
- // float back
- else if( pNewUpper->IsInSct() && pNewUpper->IsColBodyFrm() &&
- !(pNewUpper->Prt().*fnRectX->fnGetWidth)() &&
- ( pNewUpper->GetUpper()->GetPrev() ||
- pNewUpper->GetUpper()->GetNext() ) )
- return sal_True;
- else
- return sal_False; // No space. No sense in floating back
- }
- else
- {
- // OD 2004-05-26 #i25904# - check for space left in new upper
- if ( nSpace )
- return sal_True;
- else
- return sal_False;
+ // float back unless there is no space.
+ return pNewUpper->IsInSct() && pNewUpper->IsColBodyFrm() &&
+ !(pNewUpper->Prt().*fnRectX->fnGetWidth)() &&
+ ( pNewUpper->GetUpper()->GetPrev() ||
+ pNewUpper->GetUpper()->GetNext() );
}
+
+ // OD 2004-05-26 #i25904# - check for space left in new upper
+ return nSpace != 0;
}
}
return sal_False;
@@ -879,28 +871,20 @@ bool SwTxtNode::IsCollapse() const
SwSortedObjs* pObjs = this->getLayoutFrm( GetDoc()->GetCurrentLayout() )->GetDrawObjs( );
sal_uInt32 nObjs = ( pObjs != NULL ) ? pObjs->Count( ) : 0;
- if ( pNdBefore!=NULL && pNdAfter!=NULL && nObjs == 0 && bInTable ) {
- return true;
- } else {
- return false;
- }
- } else
- return false;
+ return pNdBefore!=NULL && pNdAfter!=NULL && nObjs == 0 && bInTable;
+ }
+
+ return false;
}
bool SwFrm::IsCollapse() const
{
- if (IsTxtFrm()) {
- const SwTxtFrm *pTxtFrm=(SwTxtFrm*)this;
- const SwTxtNode *pTxtNode=pTxtFrm->GetTxtNode();
- if (pTxtNode && pTxtNode->IsCollapse()) {
- return true;
- } else {
- return false;
- }
- } else {
+ if (!IsTxtFrm())
return false;
- }
+
+ const SwTxtFrm *pTxtFrm=(SwTxtFrm*)this;
+ const SwTxtNode *pTxtNode=pTxtFrm->GetTxtNode();
+ return pTxtNode && pTxtNode->IsCollapse();
}
sal_Bool SwCntntFrm::MakePrtArea( const SwBorderAttrs &rAttrs )
@@ -1762,7 +1746,7 @@ static bool lcl_IsNextFtnBoss( const SwFrm *pFrm, const SwFrm* pNxt )
while( pNxt && pNxt->IsColumnFrm() && !pNxt->GetPrev() )
pNxt = pNxt->GetUpper()->FindFtnBossFrm();
// So.. now pFrm and pNxt are either two adjacent pages or columns.
- return ( pFrm && pNxt && pFrm->GetNext() == pNxt );
+ return pFrm && pNxt && pFrm->GetNext() == pNxt;
}
sal_Bool SwCntntFrm::_WouldFit( SwTwips nSpace,
commit 2e26e6fd91b21a87ef5932ace1b423ce12de02e5
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date: Wed Mar 12 22:51:01 2014 +0100
sal_Bool to bool
Change-Id: I3548bdc15cf779495a966b4b36bb6d209fd3ee8f
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index a5ffbe4..d1aa67a 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -402,7 +402,7 @@ public:
SwCntntFrm *getLayoutFrm( const SwRootFrm*,
const Point* pDocPos = 0,
const SwPosition *pPos = 0,
- const sal_Bool bCalcFrm = sal_True ) const;
+ const bool bCalcFrm = true ) const;
/** @return the real size of the frame or an empty rectangle if
no layout exists. Needed for export filters. */
SwRect FindLayoutRect( const sal_Bool bPrtArea = sal_False,
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index 65eb900..e089425 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -212,7 +212,7 @@ SwCallLink::~SwCallLink()
const SwFrm* pFrm;
const SwFlyFrm *pFlyFrm;
- if( !rShell.ActionPend() && 0 != ( pFrm = pCNd->getLayoutFrm(rShell.GetLayout(),0,0,sal_False) ) &&
+ if( !rShell.ActionPend() && 0 != ( pFrm = pCNd->getLayoutFrm(rShell.GetLayout(), 0, 0, false) ) &&
0 != ( pFlyFrm = pFrm->FindFlyFrm() ) && !rShell.IsTableMode() )
{
const SwNodeIndex* pIndex = pFlyFrm->GetFmt()->GetCntnt().GetCntntIdx();
@@ -229,7 +229,7 @@ SwCallLink::~SwCallLink()
}
}
-long SwCallLink::getLayoutFrm( const SwRootFrm* pRoot, SwTxtNode& rNd, sal_Int32 nCntPos, sal_Bool bCalcFrm )
+long SwCallLink::getLayoutFrm( const SwRootFrm* pRoot, SwTxtNode& rNd, sal_Int32 nCntPos, bool bCalcFrm )
{
SwTxtFrm* pFrm = (SwTxtFrm*)rNd.getLayoutFrm(pRoot,0,0,bCalcFrm), *pNext = pFrm;
if ( pFrm && !pFrm->IsHiddenNow() )
diff --git a/sw/source/core/crsr/callnk.hxx b/sw/source/core/crsr/callnk.hxx
index 83a0270..384201e 100644
--- a/sw/source/core/crsr/callnk.hxx
+++ b/sw/source/core/crsr/callnk.hxx
@@ -42,7 +42,7 @@ public:
bool bAktSelection );
~SwCallLink();
- static long getLayoutFrm( const SwRootFrm*, SwTxtNode& rNd, sal_Int32 nCntPos, sal_Bool bCalcFrm );
+ static long getLayoutFrm( const SwRootFrm*, SwTxtNode& rNd, sal_Int32 nCntPos, bool bCalcFrm );
};
#endif // INCLUDED_SW_SOURCE_CORE_CRSR_CALLNK_HXX
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 02f4d7c..278e1b2 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -221,7 +221,7 @@ void SwCrsrShell::StartAction()
m_nAktNdTyp = rNd.GetNodeType();
m_bAktSelection = *m_pCurCrsr->GetPoint() != *m_pCurCrsr->GetMark();
if( rNd.IsTxtNode() )
- m_nLeftFrmPos = SwCallLink::getLayoutFrm( GetLayout(), (SwTxtNode&)rNd, m_nAktCntnt, sal_True );
+ m_nLeftFrmPos = SwCallLink::getLayoutFrm( GetLayout(), (SwTxtNode&)rNd, m_nAktCntnt, true );
else
m_nLeftFrmPos = 0;
}
@@ -641,7 +641,7 @@ sal_Bool SwCrsrShell::MovePage( SwWhichPage fnWhichPage, SwPosPage fnPosPage )
SwCrsrSaveState aSaveState( *m_pCurCrsr );
Point& rPt = m_pCurCrsr->GetPtPos();
SwCntntFrm * pFrm = m_pCurCrsr->GetCntntNode()->
- getLayoutFrm( GetLayout(), &rPt, m_pCurCrsr->GetPoint(), sal_False );
+ getLayoutFrm( GetLayout(), &rPt, m_pCurCrsr->GetPoint(), false );
if( pFrm && sal_True == ( bRet = GetFrmInPage( pFrm, fnWhichPage,
fnPosPage, m_pCurCrsr ) ) &&
!m_pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
@@ -657,7 +657,7 @@ bool SwCrsrShell::isInHiddenTxtFrm(SwShellCrsr* pShellCrsr)
{
SwCntntNode *pCNode = pShellCrsr->GetCntntNode();
SwCntntFrm *pFrm = pCNode ?
- pCNode->getLayoutFrm( GetLayout(), &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), sal_False ) : 0;
+ pCNode->getLayoutFrm( GetLayout(), &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), false ) : 0;
return !pFrm || (pFrm->IsTxtFrm() && ((SwTxtFrm*)pFrm)->IsHiddenNow());
}
@@ -704,7 +704,7 @@ static SwFrm* lcl_IsInHeaderFooter( const SwNodeIndex& rIdx, Point& rPt )
SwCntntNode* pCNd = rIdx.GetNode().GetCntntNode();
if( pCNd )
{
- SwCntntFrm *pCntFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &rPt, 0, sal_False );
+ SwCntntFrm *pCntFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &rPt, 0, false );
pFrm = pCntFrm ? pCntFrm->GetUpper() : NULL;
while( pFrm && !pFrm->IsHeaderFrm() && !pFrm->IsFooterFrm() )
pFrm = pFrm->IsFlyFrm() ? ((SwFlyFrm*)pFrm)->AnchorFrm()
@@ -789,9 +789,9 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, sal_Bool bOnlyText, bool bBlock )
{
// in the same frame?
SwFrm* pOld = ((SwCntntNode&)aPos.nNode.GetNode()).getLayoutFrm(
- GetLayout(), &m_aCharRect.Pos(), 0, sal_False );
+ GetLayout(), &m_aCharRect.Pos(), 0, false );
SwFrm* pNew = ((SwCntntNode&)aPos.nNode.GetNode()).getLayoutFrm(
- GetLayout(), &aPt, 0, sal_False );
+ GetLayout(), &aPt, 0, false );
if( pNew == pOld )
return bRet;
}
@@ -1425,7 +1425,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
}
SwCntntFrm *pTblFrm = pPos->nNode.GetNode().GetCntntNode()->
- getLayoutFrm( GetLayout(), &aTmpPt, pPos, sal_False );
+ getLayoutFrm( GetLayout(), &aTmpPt, pPos, false );
OSL_ENSURE( pTblFrm, "Tabelle Crsr nicht im Content ??" );
@@ -1442,7 +1442,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
if ( !bInRepeatedHeadline )
{
SwCntntFrm* pMarkTblFrm = pITmpCrsr->GetCntntNode( false )->
- getLayoutFrm( GetLayout(), &aTmpMk, pITmpCrsr->GetMark(), sal_False );
+ getLayoutFrm( GetLayout(), &aTmpMk, pITmpCrsr->GetMark(), false );
OSL_ENSURE( pMarkTblFrm, "Tabelle Crsr nicht im Content ??" );
if ( pMarkTblFrm )
@@ -1658,7 +1658,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
do {
bAgainst = false;
pFrm = pShellCrsr->GetCntntNode()->getLayoutFrm( GetLayout(),
- &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), sal_False );
+ &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), false );
// if the Frm doesn't exist anymore, the complete Layout has to be
// created, because there used to be a Frm here!
if ( !pFrm )
@@ -1667,7 +1667,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd )
{
CalcLayout();
pFrm = pShellCrsr->GetCntntNode()->getLayoutFrm( GetLayout(),
- &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), sal_False );
+ &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), false );
} while( !pFrm );
}
else if ( Imp()->IsIdleAction() )
@@ -1852,7 +1852,7 @@ void SwCrsrShell::RefreshBlockCursor()
OSL_ENSURE( m_pBlockCrsr, "Don't call me without a block cursor" );
SwShellCrsr &rBlock = m_pBlockCrsr->getShellCrsr();
Point aPt = rBlock.GetPtPos();
- SwCntntFrm* pFrm = rBlock.GetCntntNode()->getLayoutFrm( GetLayout(), &aPt, rBlock.GetPoint(), sal_False );
+ SwCntntFrm* pFrm = rBlock.GetCntntNode()->getLayoutFrm( GetLayout(), &aPt, rBlock.GetPoint(), false );
Point aMk;
if( m_pBlockCrsr->getEndPoint() && m_pBlockCrsr->getStartPoint() )
{
@@ -2169,7 +2169,7 @@ SwCntntFrm *SwCrsrShell::GetCurrFrm( const sal_Bool bCalcFrm ) const
((SwCrsrShell*)this)->SizeChgNotify();
}
else
- pRet = pNd->getLayoutFrm( GetLayout(), &m_pCurCrsr->GetPtPos(), m_pCurCrsr->GetPoint(), sal_False);
+ pRet = pNd->getLayoutFrm( GetLayout(), &m_pCurCrsr->GetPtPos(), m_pCurCrsr->GetPoint(), false);
}
return pRet;
}
@@ -2770,7 +2770,7 @@ sal_Bool SwCrsrShell::FindValidCntntNode( sal_Bool bOnlyText )
SwCntntNode* pCNd = rNdIdx.GetNode().GetCntntNode();
const SwCntntFrm * pFrm;
- if( pCNd && 0 != (pFrm = pCNd->getLayoutFrm( GetLayout(),0,m_pCurCrsr->GetPoint(),sal_False)) &&
+ if( pCNd && 0 != (pFrm = pCNd->getLayoutFrm( GetLayout(), 0, m_pCurCrsr->GetPoint(), false)) &&
!IsReadOnlyAvailable() && pFrm->IsProtected() &&
nNdIdx < rNds.GetEndOfExtras().GetIndex() )
{
@@ -2885,7 +2885,7 @@ sal_Bool SwCrsrShell::FindValidCntntNode( sal_Bool bOnlyText )
if( bOk && rNdIdx.GetIndex() < rNds.GetEndOfExtras().GetIndex() )
{
// also check for Fly - might be protected as well
- if( 0 == (pFrm = pCNd->getLayoutFrm( GetLayout(),0,0,sal_False)) ||
+ if( 0 == (pFrm = pCNd->getLayoutFrm( GetLayout(), 0, 0, false)) ||
( !IsReadOnlyAvailable() && pFrm->IsProtected() ) ||
( bOnlyText && pCNd->IsNoTxtNode() ) )
{
@@ -2914,7 +2914,7 @@ sal_Bool SwCrsrShell::FindValidCntntNode( sal_Bool bOnlyText )
{
pCNd = rNdIdx.GetNode().GetCntntNode();
// if cursor in hidden frame, always move it
- if( !pCNd || !pCNd->getLayoutFrm( GetLayout(),0,0,sal_False) )
+ if( !pCNd || !pCNd->getLayoutFrm( GetLayout(), 0, 0, false) )
{
SwCrsrMoveState aTmpState( MV_NONE );
aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
@@ -3452,7 +3452,7 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
SwCrsrMoveState aState;
aState.bRealWidth = sal_True;
SwCntntNode* pCntntNode = pCrsr->GetCntntNode();
- SwCntntFrm *pCntntFrame = pCntntNode->getLayoutFrm( GetLayout(), &rPt, pCrsr->GetPoint(), sal_False);
+ SwCntntFrm *pCntntFrame = pCntntNode->getLayoutFrm( GetLayout(), &rPt, pCrsr->GetPoint(), false);
pCntntFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState );
rContent = nWordEnd - 1;
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index e05e98f..e1d9075 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -232,7 +232,7 @@ sal_Bool SwCrsrShell::SetCrsrInHdFt( sal_uInt16 nDescNo, sal_Bool bInHeader )
Point aPt( m_pCurCrsr->GetPtPos() );
- if( pCNd && 0 != pCNd->getLayoutFrm( GetLayout(), &aPt, 0, sal_False ) )
+ if( pCNd && 0 != pCNd->getLayoutFrm( GetLayout(), &aPt, 0, false ) )
{
// then we can set the cursor in here
SwCallLink aLk( *this ); // watch Crsr-Moves
@@ -435,7 +435,7 @@ sal_Bool SwCrsrShell::GotoNxtPrvTblFormula( sal_Bool bNext, sal_Bool bOnlyErrors
if( rPos.nNode < GetDoc()->GetNodes().GetEndOfExtras() )
// also at collection use only the first frame
aCurGEF.SetBodyPos( *rPos.nNode.GetNode().GetCntntNode()->getLayoutFrm( GetLayout(),
- &aPt, &rPos, sal_False ) );
+ &aPt, &rPos, false ) );
{
const SfxPoolItem* pItem;
const SwTableBox* pTBox;
@@ -453,7 +453,7 @@ sal_Bool SwCrsrShell::GotoNxtPrvTblFormula( sal_Bool bNext, sal_Bool bOnlyErrors
const SwCntntFrm* pCFrm;
SwNodeIndex aIdx( *pTBox->GetSttNd() );
const SwCntntNode* pCNd = GetDoc()->GetNodes().GoNext( &aIdx );
- if( pCNd && 0 != ( pCFrm = pCNd->getLayoutFrm( GetLayout(), &aPt, 0, sal_False ) ) &&
+ if( pCNd && 0 != ( pCFrm = pCNd->getLayoutFrm( GetLayout(), &aPt, 0, false ) ) &&
(IsReadOnlyAvailable() || !pCFrm->IsProtected() ))
{
_SetGetExpFld aCmp( *pTBox );
@@ -504,7 +504,7 @@ sal_Bool SwCrsrShell::GotoNxtPrvTOXMark( sal_Bool bNext )
if( rPos.nNode.GetIndex() < GetDoc()->GetNodes().GetEndOfExtras().GetIndex() )
// also at collection use only the first frame
aCurGEF.SetBodyPos( *rPos.nNode.GetNode().
- GetCntntNode()->getLayoutFrm( GetLayout(), &aPt, &rPos, sal_False ) );
+ GetCntntNode()->getLayoutFrm( GetLayout(), &aPt, &rPos, false ) );
{
const SfxPoolItem* pItem;
@@ -518,7 +518,7 @@ sal_Bool SwCrsrShell::GotoNxtPrvTOXMark( sal_Bool bNext )
RES_TXTATR_TOXMARK, n ) ) &&
0 != (pTxtTOX = ((SwTOXMark*)pItem)->GetTxtTOXMark() ) &&
( pTxtNd = &pTxtTOX->GetTxtNode())->GetNodes().IsDocNodes() &&
- 0 != ( pCFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt, 0, sal_False )) &&
+ 0 != ( pCFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt, 0, false )) &&
( IsReadOnlyAvailable() || !pCFrm->IsProtected() ))
{
SwNodeIndex aNdIndex( *pTxtNd ); // UNIX needs this object
@@ -593,7 +593,7 @@ void lcl_MakeFldLst(
{
const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode();
const SwCntntFrm* pCFrm =
- rTxtNode.getLayoutFrm( rTxtNode.GetDoc()->GetCurrentLayout(), &aPt, 0, sal_False );
+ rTxtNode.getLayoutFrm( rTxtNode.GetDoc()->GetCurrentLayout(), &aPt, 0, false );
if ( pCFrm != NULL
&& ( bInReadOnly || !pCFrm->IsProtected() ) )
{
@@ -686,7 +686,7 @@ sal_Bool SwCrsrShell::MoveFldType(
{
// also at collection use only the first frame
Point aPt;
- aSrch.SetBodyPos( *pTNd->getLayoutFrm( GetLayout(), &aPt, &rPos, sal_False ) );
+ aSrch.SetBodyPos( *pTNd->getLayoutFrm( GetLayout(), &aPt, &rPos, false ) );
}
it = aSrtLst.lower_bound( &aSrch );
@@ -1652,7 +1652,7 @@ bool SwContentAtPos::IsInProtectSect() const
const SwCntntFrm* pFrm;
return pNd && ( pNd->IsInProtectSect() ||
- ( 0 != ( pFrm = pNd->getLayoutFrm( pNd->GetDoc()->GetCurrentLayout(), 0,0,sal_False)) &&
+ ( 0 != ( pFrm = pNd->getLayoutFrm( pNd->GetDoc()->GetCurrentLayout(), 0, 0, false)) &&
pFrm->IsProtected() ));
}
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 0ce1518..25c6af0 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -537,7 +537,7 @@ sal_uInt16 SwPaM::GetPageNum( bool bAtPoint, const Point* pLayPos )
const SwPosition* pPos = bAtPoint ? m_pPoint : m_pMark;
if( 0 != ( pNd = pPos->nNode.GetNode().GetCntntNode() ) &&
- 0 != ( pCFrm = pNd->getLayoutFrm( pNd->GetDoc()->GetCurrentLayout(), pLayPos, pPos, sal_False )) &&
+ 0 != ( pCFrm = pNd->getLayoutFrm( pNd->GetDoc()->GetCurrentLayout(), pLayPos, pPos, false )) &&
0 != ( pPg = pCFrm->FindPageFrm() ))
return pPg->GetPhyPageNum();
return 0;
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index f4bb4a50..17b24f5 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -188,7 +188,7 @@ void _RestFlyInRange( _SaveFlyArr & rArr, const SwNodeIndex& rSttIdx,
pFmt->GetDoc()->GetSpzFrmFmts()->push_back( pFmt );
pFmt->SetFmtAttr( aAnchor );
SwCntntNode* pCNd = aPos.nNode.GetNode().GetCntntNode();
- if( pCNd && pCNd->getLayoutFrm( pFmt->GetDoc()->GetCurrentLayout(), 0, 0, sal_False ) )
+ if( pCNd && pCNd->getLayoutFrm( pFmt->GetDoc()->GetCurrentLayout(), 0, 0, false ) )
pFmt->MakeFrms();
}
}
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 5697e6a..844e64b 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -2377,7 +2377,7 @@ void SwDocUpdtFld::GetBodyNode( const SwTxtFld& rTFld, sal_uInt16 nFldWhich )
// always the first! (in tab headline, header-/footer)
Point aPt;
- const SwCntntFrm* pFrm = rTxtNd.getLayoutFrm( rDoc.GetCurrentLayout(), &aPt, 0, sal_False );
+ const SwCntntFrm* pFrm = rTxtNd.getLayoutFrm( rDoc.GetCurrentLayout(), &aPt, 0, false );
_SetGetExpFld* pNew = NULL;
sal_Bool bIsInBody = sal_False;
@@ -2441,7 +2441,7 @@ void SwDocUpdtFld::GetBodyNode( const SwSectionNode& rSectNd )
// always the first! (in tab headline, header-/footer)
Point aPt;
- const SwCntntFrm* pFrm = pCNd->getLayoutFrm( rDoc.GetCurrentLayout(), &aPt, 0, sal_False );
+ const SwCntntFrm* pFrm = pCNd->getLayoutFrm( rDoc.GetCurrentLayout(), &aPt, 0, false );
if( !pFrm )
break;
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 46fa511..5803090 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -165,7 +165,7 @@ static Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFmtAnchor& rAnch,
{
const SwPosition *pPos = rAnch.GetCntntAnchor();
const SwCntntNode* pNd = pPos->nNode.GetNode().GetCntntNode();
- const SwFrm* pOld = pNd ? pNd->getLayoutFrm( rDoc.GetCurrentLayout(), &aRet, 0, sal_False ) : 0;
+ const SwFrm* pOld = pNd ? pNd->getLayoutFrm( rDoc.GetCurrentLayout(), &aRet, 0, false ) : 0;
if( pOld )
aRet = pOld->Frm().Pos();
}
@@ -695,7 +695,7 @@ bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList,
// consider that drawing objects can be in
// header/footer. Thus, <GetFrm()> by left-top-corner
pTxtFrm = aPos.nNode.GetNode().
- GetCntntNode()->getLayoutFrm( GetCurrentLayout(), &aPt, 0, sal_False );
+ GetCntntNode()->getLayoutFrm( GetCurrentLayout(), &aPt, 0, false );
}
const SwFrm *pTmp = ::FindAnchor( pTxtFrm, aPt );
pNewAnchorFrm = pTmp->FindFlyFrm();
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 0896535..8de2cac 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -248,7 +248,7 @@ const SwTOXMark& SwDoc::GotoTOXMark( const SwTOXMark& rCurTOXMark,
continue;
Point aPt;
- const SwCntntFrm* pCFrm = pTOXSrc->getLayoutFrm( GetCurrentLayout(), &aPt, 0, sal_False );
+ const SwCntntFrm* pCFrm = pTOXSrc->getLayoutFrm( GetCurrentLayout(), &aPt, 0, false );
if (!pCFrm)
continue;
@@ -1667,7 +1667,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx,
long nRightMargin;
if( pPageDesc )
{
- const SwFrm* pFrm = pTOXNd->getLayoutFrm( pDoc->GetCurrentLayout(), 0, 0, sal_True );
+ const SwFrm* pFrm = pTOXNd->getLayoutFrm( pDoc->GetCurrentLayout(), 0, 0, true );
if( !pFrm || 0 == ( pFrm = pFrm->FindPageFrm() ) ||
pPageDesc != ((SwPageFrm*)pFrm)->GetPageDesc() )
// we have to go via the PageDesc here
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index d754d4d..4f66a68 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2475,7 +2475,7 @@ void SwDoc::GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr,
if( pShCrsr )
aPt = pShCrsr->GetPtPos();
- const SwFrm* pTmpFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &aPt, 0, sal_False );
+ const SwFrm* pTmpFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &aPt, 0, false );
do {
pTmpFrm = pTmpFrm->GetUpper();
} while ( !pTmpFrm->IsCellFrm() );
@@ -2689,7 +2689,7 @@ void SwDoc::SetTabCols( const SwTabCols &rNew, sal_Bool bCurRowOnly,
if( pShCrsr )
aPt = pShCrsr->GetPtPos();
- const SwFrm* pTmpFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &aPt, 0, sal_False );
+ const SwFrm* pTmpFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &aPt, 0, false );
do {
pTmpFrm = pTmpFrm->GetUpper();
} while ( !pTmpFrm->IsCellFrm() );
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 7d2a574..f6cd10b 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -388,7 +388,7 @@ sal_Bool SwNode::IsInVisibleArea( SwViewShell* pSh ) const
if( pSh )
{
const SwFrm* pFrm;
- if( pNd && 0 != ( pFrm = pNd->getLayoutFrm( pSh->GetLayout(), 0, 0, sal_False ) ) )
+ if( pNd && 0 != ( pFrm = pNd->getLayoutFrm( pSh->GetLayout(), 0, 0, false ) ) )
{
if ( pFrm->IsInTab() )
@@ -781,8 +781,8 @@ const SwTxtNode* SwNode::FindOutlineNodeOfLevel( sal_uInt8 nLvl ) const
const SwCntntNode* pCNd = GetCntntNode();
Point aPt( 0, 0 );
- const SwFrm* pFrm = pRet->getLayoutFrm( pRet->GetDoc()->GetCurrentLayout(), &aPt, 0, sal_False ),
- * pMyFrm = pCNd ? pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &aPt, 0, sal_False ) : 0;
+ const SwFrm* pFrm = pRet->getLayoutFrm( pRet->GetDoc()->GetCurrentLayout(), &aPt, 0, false ),
+ * pMyFrm = pCNd ? pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &aPt, 0, false ) : 0;
const SwPageFrm* pPgFrm = pFrm ? pFrm->FindPageFrm() : 0;
if( pPgFrm && pMyFrm &&
pPgFrm->Frm().Top() > pMyFrm->Frm().Top() )
@@ -1016,7 +1016,7 @@ sal_Bool SwCntntNode::InvalidateNumRule()
}
SwCntntFrm *SwCntntNode::getLayoutFrm( const SwRootFrm* _pRoot,
- const Point* pPoint, const SwPosition *pPos, const sal_Bool bCalcFrm ) const
+ const Point* pPoint, const SwPosition *pPos, const bool bCalcFrm ) const
{
return (SwCntntFrm*) ::GetFrmOfModify( _pRoot, *(SwModify*)this, FRM_CNTNT,
pPoint, pPos, bCalcFrm );
@@ -1869,7 +1869,7 @@ short SwCntntNode::GetTextDirection( const SwPosition& rPos,
aPt = *pPt;
// #i72024# - No format of the frame, because this can cause recursive layout actions
- SwFrm* pFrm = getLayoutFrm( GetDoc()->GetCurrentLayout(), &aPt, &rPos, sal_False );
+ SwFrm* pFrm = getLayoutFrm( GetDoc()->GetCurrentLayout(), &aPt, &rPos, false );
if ( pFrm )
{
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 03d4a05..8f2d13a 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -137,7 +137,7 @@ void SwEditShell::Insert2(const OUString &rStr, const bool bForceExpandHints )
Point aPt;
SwCntntFrm* pFrm =
((SwTxtNode&)rNode).getLayoutFrm( GetLayout(), &aPt, pTmpCrsr->GetPoint(),
- sal_False );
+ false );
SwScriptInfo aScriptInfo;
aScriptInfo.InitScriptInfo( (SwTxtNode&)rNode, pFrm->IsRightToLeft() );
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index 899e1b2..41fcaa4 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -908,7 +908,7 @@ uno::Reference< XSpellAlternatives >
SwCrsrMoveState aState;
aState.bRealWidth = sal_True;
SwCntntNode* pCntntNode = pCrsr->GetCntntNode();
- SwCntntFrm *pCntntFrame = pCntntNode->getLayoutFrm( GetLayout(), pPt, pCrsr->GetPoint(), sal_False);
+ SwCntntFrm *pCntntFrame = pCntntNode->getLayoutFrm( GetLayout(), pPt, pCrsr->GetPoint(), false);
pCntntFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState );
rContent = nWordEnd - 1;
@@ -1032,7 +1032,7 @@ bool SwEditShell::GetGrammarCorrection(
SwCrsrMoveState aState;
aState.bRealWidth = sal_True;
SwCntntNode* pCntntNode = pCrsr->GetCntntNode();
- SwCntntFrm *pCntntFrame = pCntntNode->getLayoutFrm( GetLayout(), pPt, pCrsr->GetPoint(), sal_False);
+ SwCntntFrm *pCntntFrame = pCntntNode->getLayoutFrm( GetLayout(), pPt, pCrsr->GetPoint(), false);
pCntntFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState );
rContent = nWordEnd - 1;
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index 6644b55..d693139 100644
--- a/sw/source/core/fields/cellfml.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list