[Libreoffice-commits] .: 2 commits - sw/inc sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Dec 24 17:01:42 PST 2012
sw/inc/shellio.hxx | 2
sw/source/filter/inc/fltshell.hxx | 42 +++++++++----------
sw/source/filter/inc/wrtswtbl.hxx | 12 ++---
sw/source/filter/inc/wwstyles.hxx | 2
sw/source/filter/writer/writer.cxx | 6 +-
sw/source/filter/writer/wrtswtbl.cxx | 8 +--
sw/source/filter/ww1/fltshell.cxx | 74 +++++++++++++++++------------------
sw/source/filter/ww1/w1class.hxx | 2
8 files changed, 73 insertions(+), 75 deletions(-)
New commits:
commit de9475756effa8102cc4090db8d03393a02fdc65
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Mon Dec 24 19:36:11 2012 +0900
Remove useless declaration
Change-Id: Ia42f2b93b8f34a3339cb8fd84468d4347a7bbb08
diff --git a/sw/source/filter/inc/wwstyles.hxx b/sw/source/filter/inc/wwstyles.hxx
index 1e2539a..f3f343a 100644
--- a/sw/source/filter/inc/wwstyles.hxx
+++ b/sw/source/filter/inc/wwstyles.hxx
@@ -20,8 +20,6 @@
#ifndef WW_WWSTYLES_HXX
#define WW_WWSTYLES_HXX
-class String; //yuck...
-
#include <sal/types.h>
namespace ww
commit 879006b722a618519ce84215b491c1d4f9426e5a
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Mon Dec 24 19:33:58 2012 +0900
sal_Bool to bool
Change-Id: Ibbf9e257fff19ab6305bd401a1746e6d0bcb47fd
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 674bf7c..3341eaf 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -396,7 +396,7 @@ protected:
sal_Bool CopyNextPam( SwPaM ** );
void PutNumFmtFontsInAttrPool();
- void PutEditEngFontsInAttrPool( sal_Bool bIncl_CJK_CTL = sal_True );
+ void PutEditEngFontsInAttrPool( bool bIncl_CJK_CTL = true );
virtual sal_uLong WriteStream() = 0;
void SetBaseURL( const String& rURL ) { sBaseURL = rURL; }
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index 8422ab8..a6e4806 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -349,7 +349,7 @@ public:
virtual const SfxPoolItem& GetNodeOrStyAttr(sal_uInt16 nWhich) = 0;
virtual const SfxPoolItem& GetCellAttr(sal_uInt16 nWhich);
- virtual sal_Bool BeginTable();
+ virtual bool BeginTable();
virtual void NextTableCell();
virtual void NextTableRow();
virtual void SetTableWidth(SwTwips nW);
@@ -361,10 +361,10 @@ public:
virtual void DeleteCell(sal_uInt16 nCell);
virtual void EndTable();
- virtual sal_Bool IsInFly() = 0;
+ virtual bool IsInFly() = 0;
virtual void SetFlyFrmAttr(const SfxPoolItem& rAttr) = 0;
virtual const SfxPoolItem& GetFlyFrmAttr(sal_uInt16 nWhich) = 0;
- virtual sal_Bool BeginFly( RndStdIds eAnchor, sal_Bool bAbsolutePos,
+ virtual bool BeginFly( RndStdIds eAnchor, sal_Bool bAbsolutePos,
const SfxItemSet* pMoreAttrs = 0 );
virtual void SetFlyAnchor( RndStdIds eAnchor );
virtual void EndFly();
@@ -406,7 +406,7 @@ public:
sal_Bool IsInTable();
virtual const SfxPoolItem& GetCellAttr(sal_uInt16 nWhich);
- virtual sal_Bool BeginTable();
+ virtual bool BeginTable();
virtual void NextTableCell();
virtual void NextTableRow();
virtual void SetTableWidth(SwTwips nW);
@@ -419,10 +419,10 @@ public:
virtual void EndTable();
SwFrmFmt* MakeFly( RndStdIds eAnchor, SfxItemSet* pSet );
- virtual sal_Bool IsInFly();
+ virtual bool IsInFly();
virtual void SetFlyFrmAttr(const SfxPoolItem& rAttr);
virtual const SfxPoolItem& GetFlyFrmAttr(sal_uInt16 nWhich);
- virtual sal_Bool BeginFly( RndStdIds eAnchor, sal_Bool bAbsolutePos,
+ virtual bool BeginFly( RndStdIds eAnchor, sal_Bool bAbsolutePos,
const SfxItemSet* pMoreAttrs = 0 );
virtual void EndFly();
};
@@ -431,7 +431,7 @@ class SwFltFormatCollection : public SwFltOutBase
{
SwTxtFmtColl* pColl;
SfxItemSet* pFlyAttrs; // Simulation der Flys in Styles
- sal_Bool bHasFly;
+ bool bHasFly;
public:
SwFltFormatCollection(SwDoc&, RES_POOL_COLLFMT_TYPE nType);
SwFltFormatCollection(SwDoc&, const String& rName );
@@ -448,19 +448,19 @@ public:
// SwTxtFmtColl* Search(String, CharSet eSrc);
SwTxtFmtColl* GetColl() { return pColl; }
- void SetHasFly() { bHasFly = sal_True; }
+ void SetHasFly() { bHasFly = true; }
SfxItemSet* GetpFlyAttrs() { return pFlyAttrs; }
virtual SwFltOutBase& operator << (const SfxPoolItem& rItem);
virtual const SfxPoolItem& GetAttr(sal_uInt16 nWhich);
virtual const SfxPoolItem& GetNodeOrStyAttr(sal_uInt16 nWhich);
- virtual sal_Bool IsInFly();
+ virtual bool IsInFly();
virtual void SetFlyFrmAttr(const SfxPoolItem& rAttr);
virtual const SfxPoolItem& GetFlyFrmAttr(sal_uInt16 nWhich);
- virtual sal_Bool BeginFly( RndStdIds eAnchor, sal_Bool bAbsolutePos,
+ virtual bool BeginFly( RndStdIds eAnchor, sal_Bool bAbsolutePos,
const SfxItemSet* pMoreAttrs = 0 );
- sal_Bool BeginStyleFly( SwFltOutDoc* pOutDoc );
+ bool BeginStyleFly( SwFltOutDoc* pOutDoc );
virtual void EndFly();
};
@@ -562,8 +562,8 @@ public:
return ( pOut == pOutDoc ) ? pOutDoc->IsInTable() : 0; }
const SfxPoolItem& GetCellAttr(sal_uInt16 nWhich) {
return pOut->GetCellAttr(nWhich); }
- sal_Bool BeginTable() {
- sal_Bool b = pOut->BeginTable();
+ bool BeginTable() {
+ bool b = pOut->BeginTable();
if(b) eSubMode = Table;
return b; }
void NextTableCell() {
@@ -589,8 +589,8 @@ public:
void EndTable() {
pOut->EndTable(); }
// methoden zur verwaltung von Flys
- sal_Bool IsInFly() { return pOut->IsInFly(); }
- sal_Bool BeginFly( RndStdIds eAnchor = FLY_AT_PARA, sal_Bool bAbsolutePos = sal_False );
+ bool IsInFly() { return pOut->IsInFly(); }
+ bool BeginFly( RndStdIds eAnchor = FLY_AT_PARA, sal_Bool bAbsolutePos = sal_False );
void SetFlyAnchor( RndStdIds eAnchor )
{ pOut->SetFlyAnchor( eAnchor ); }
void SetFlyXPos( short nXPos, sal_Int16 eHRel = com::sun::star::text::RelOrientation::FRAME,
@@ -650,12 +650,12 @@ public:
const SfxPoolItem& GetAttr(sal_uInt16 nWhich);
const SfxPoolItem& GetFlyFrmAttr(sal_uInt16 nWhich);
SwFieldType* GetSysFldType(sal_uInt16 eWhich);
- sal_Bool GetWeightBold();
- sal_Bool GetPostureItalic();
- sal_Bool GetCrossedOut();
- sal_Bool GetContour();
- sal_Bool GetCaseKapitaelchen();
- sal_Bool GetCaseVersalien();
+ bool GetWeightBold();
+ bool GetPostureItalic();
+ bool GetCrossedOut();
+ bool GetContour();
+ bool GetCaseKapitaelchen();
+ bool GetCaseVersalien();
const String& GetBaseURL() const { return sBaseURL; }
};
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index 0c120b6..729a612 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@@ -106,7 +106,7 @@ class SW_DLLPUBLIC SwWriteTableRow
const SvxBrushItem *pBackground;// Hintergrund
long nPos; // End-Position (twips) der Zeile
- sal_Bool mbUseLayoutHeights;
+ bool mbUseLayoutHeights;
// Forbidden and not implemented.
SwWriteTableRow();
@@ -125,7 +125,7 @@ public:
bool bTopBorder : 1; // Welche Umrandungen sind da?
bool bBottomBorder : 1;
- SwWriteTableRow( long nPos, sal_Bool bUseLayoutHeights );
+ SwWriteTableRow( long nPos, bool bUseLayoutHeights );
SwWriteTableCell *AddCell( const SwTableBox *pBox,
sal_uInt16 nRow, sal_uInt16 nCol,
@@ -250,15 +250,15 @@ protected:
sal_uInt32 nTabWidth; // Absolute/Relative Breite der Tabelle
bool bRelWidths : 1; // Breiten relativ ausgeben?
- sal_Bool bUseLayoutHeights : 1; // Layout zur Hoehenbestimmung nehmen?
+ bool bUseLayoutHeights : 1; // Layout zur Hoehenbestimmung nehmen?
#ifdef DBG_UTIL
- sal_Bool m_bGetLineHeightCalled : 1;
+ bool m_bGetLineHeightCalled : 1;
#endif
bool bColsOption : 1;
bool bColTags : 1;
- sal_Bool bLayoutExport : 1;
- sal_Bool bCollectBorderWidth : 1;
+ bool bLayoutExport : 1;
+ bool bCollectBorderWidth : 1;
virtual sal_Bool ShouldExpandSub( const SwTableBox *pBox,
sal_Bool bExpandedBefore, sal_uInt16 nDepth ) const;
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx
index ab7a0e1..cb60fb6 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -361,7 +361,7 @@ void Writer::PutNumFmtFontsInAttrPool()
const SwNumFmt* pFmt;
const Font* pFont;
const Font* pDefFont = &numfunc::GetDefBulletFont();
- sal_Bool bCheck = sal_False;
+ bool bCheck = false;
for( sal_uInt16 nGet = rListTbl.size(); nGet; )
if( pDoc->IsUsed( *(pRule = rListTbl[ --nGet ] )))
@@ -378,7 +378,7 @@ void Writer::PutNumFmtFontsInAttrPool()
continue;
}
else if( *pFont == *pDefFont )
- bCheck = sal_True;
+ bCheck = true;
_AddFontItem( rPool, SvxFontItem( pFont->GetFamily(),
pFont->GetName(), pFont->GetStyleName(),
@@ -386,7 +386,7 @@ void Writer::PutNumFmtFontsInAttrPool()
}
}
-void Writer::PutEditEngFontsInAttrPool( sal_Bool bIncl_CJK_CTL )
+void Writer::PutEditEngFontsInAttrPool( bool bIncl_CJK_CTL )
{
SfxItemPool& rPool = pDoc->GetAttrPool();
if( rPool.GetSecondaryPool() )
diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx
index 55afa3c..09ebf0a 100644
--- a/sw/source/filter/writer/wrtswtbl.cxx
+++ b/sw/source/filter/writer/wrtswtbl.cxx
@@ -55,7 +55,7 @@ sal_Int16 SwWriteTableCell::GetVertOri() const
//-----------------------------------------------------------------------
-SwWriteTableRow::SwWriteTableRow( long nPosition, sal_Bool bUseLayoutHeights )
+SwWriteTableRow::SwWriteTableRow( long nPosition, bool bUseLayoutHeights )
: pBackground(0), nPos(nPosition), mbUseLayoutHeights(bUseLayoutHeights),
nTopBorder(USHRT_MAX), nBottomBorder(USHRT_MAX), bTopBorder(true),
bBottomBorder(true)
@@ -98,8 +98,8 @@ sal_uInt32 SwWriteTable::GetBoxWidth( const SwTableBox *pBox )
long SwWriteTable::GetLineHeight( const SwTableLine *pLine )
{
#ifdef DBG_UTIL
- sal_Bool bOldGetLineHeightCalled = m_bGetLineHeightCalled;
- m_bGetLineHeightCalled = sal_True;
+ bool bOldGetLineHeightCalled = m_bGetLineHeightCalled;
+ m_bGetLineHeightCalled = true;
#endif
long nHeight = 0;
@@ -115,7 +115,7 @@ long SwWriteTable::GetLineHeight( const SwTableLine *pLine )
// #i60390# - in some cases we still want to continue
// to use the layout heights even if one of the rows has a height of 0
// ('hidden' rows)
- bUseLayoutHeights = bLayoutAvailable; /*sal_False;*/
+ bUseLayoutHeights = bLayoutAvailable;
#ifdef DBG_UTIL
SAL_WARN_IF( !bLayoutAvailable && bOldGetLineHeightCalled, "sw", "Layout ungueltig?" );
diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx
index 7839cf0..a634c30 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -64,7 +64,7 @@
using namespace com::sun::star;
-static SwCntntNode* GetCntntNode(SwDoc* pDoc, SwNodeIndex& rIdx, sal_Bool bNext)
+static SwCntntNode* GetCntntNode(SwDoc* pDoc, SwNodeIndex& rIdx, bool bNext)
{
SwCntntNode * pCNd = rIdx.GetNode().GetCntntNode();
if(!pCNd && 0 == (pCNd = bNext ? pDoc->GetNodes().GoNext(&rIdx)
@@ -123,13 +123,13 @@ bool SwFltStackEntry::MakeRegion(SwDoc* pDoc, SwPaM& rRegion, bool bCheck,
// !!! Die Content-Indizies beziehen sich immer auf den Node !!!
rRegion.GetPoint()->nNode = rMkPos.m_nNode.GetIndex() + 1;
- SwCntntNode* pCNd = GetCntntNode(pDoc, rRegion.GetPoint()->nNode, sal_True);
+ SwCntntNode* pCNd = GetCntntNode(pDoc, rRegion.GetPoint()->nNode, true);
rRegion.GetPoint()->nContent.Assign(pCNd, rMkPos.m_nCntnt);
rRegion.SetMark();
if (rMkPos.m_nNode != rPtPos.m_nNode)
{
rRegion.GetPoint()->nNode = rPtPos.m_nNode.GetIndex() + 1;
- pCNd = GetCntntNode(pDoc, rRegion.GetPoint()->nNode, sal_False);
+ pCNd = GetCntntNode(pDoc, rRegion.GetPoint()->nNode, false);
}
rRegion.GetPoint()->nContent.Assign(pCNd, rPtPos.m_nCntnt);
OSL_ENSURE( CheckNodesRange( rRegion.Start()->nNode,
@@ -397,7 +397,7 @@ static void MakePoint(const SwFltStackEntry& rEntry, SwDoc* pDoc,
// nur noch im Format gesetzt werden.
rRegion.DeleteMark();
rRegion.GetPoint()->nNode = rEntry.m_aMkPos.m_nNode.GetIndex() + 1;
- SwCntntNode* pCNd = GetCntntNode(pDoc, rRegion.GetPoint()->nNode, sal_True);
+ SwCntntNode* pCNd = GetCntntNode(pDoc, rRegion.GetPoint()->nNode, true);
rRegion.GetPoint()->nContent.Assign(pCNd, rEntry.m_aMkPos.m_nCntnt);
}
@@ -428,8 +428,8 @@ static void MakeBookRegionOrPoint(const SwFltStackEntry& rEntry, SwDoc* pDoc,
// rTmpStart ist ReinRaus-Parameter: Anfang des zu untersuchenden Bereiches rein,
// Anfang des gueltigen Bereichs raus
// rTmpEnd ist raus-Parameter
-// Return-Bool ist sal_True fuer gueltigen Bereich
-static sal_Bool IterateNumrulePiece( const SwNodeIndex& rEnd,
+// Return-Bool ist true fuer gueltigen Bereich
+static bool IterateNumrulePiece( const SwNodeIndex& rEnd,
SwNodeIndex& rTmpStart, SwNodeIndex& rTmpEnd )
{
while( ( rTmpStart <= rEnd )
@@ -961,7 +961,7 @@ SwFltShell::SwFltShell(SwDoc* pDoc, SwPaM& rPaM, const String& rBaseURL, sal_Boo
// verhinder das Einlesen von Tabellen in Fussnoten / Tabellen
sal_uLong nNd = pPos->nNode.GetIndex();
- sal_Bool bReadNoTbl = 0 != pSttNd->FindTableNode() ||
+ bool bReadNoTbl = 0 != pSttNd->FindTableNode() ||
( nNd < pDoc->GetNodes().GetEndOfInserts().GetIndex() &&
pDoc->GetNodes().GetEndOfInserts().StartOfSectionIndex() < nNd );
if( bReadNoTbl )
@@ -1260,36 +1260,36 @@ SwFieldType* SwFltShell::GetSysFldType(sal_uInt16 eWhich)
return GetDoc().GetSysFldType(eWhich);
}
-sal_Bool SwFltShell::GetWeightBold()
+bool SwFltShell::GetWeightBold()
{
return ((SvxWeightItem&)GetNodeOrStyAttr(RES_CHRATR_WEIGHT)).GetWeight()
!= WEIGHT_NORMAL;
}
-sal_Bool SwFltShell::GetPostureItalic()
+bool SwFltShell::GetPostureItalic()
{
return ((SvxPostureItem&)GetNodeOrStyAttr(RES_CHRATR_POSTURE)).GetPosture()
!= ITALIC_NONE;
}
-sal_Bool SwFltShell::GetCrossedOut()
+bool SwFltShell::GetCrossedOut()
{
return ((SvxCrossedOutItem&)GetNodeOrStyAttr(RES_CHRATR_CROSSEDOUT))
.GetStrikeout() != STRIKEOUT_NONE;
}
-sal_Bool SwFltShell::GetContour()
+bool SwFltShell::GetContour()
{
return ((SvxContourItem&)GetNodeOrStyAttr(RES_CHRATR_CONTOUR)).GetValue();
}
-sal_Bool SwFltShell::GetCaseKapitaelchen()
+bool SwFltShell::GetCaseKapitaelchen()
{
return ((SvxCaseMapItem&)GetNodeOrStyAttr(RES_CHRATR_CASEMAP))
.GetCaseMap() == SVX_CASEMAP_KAPITAELCHEN;
}
-sal_Bool SwFltShell::GetCaseVersalien()
+bool SwFltShell::GetCaseVersalien()
{
return ((SvxCaseMapItem&)GetNodeOrStyAttr(RES_CHRATR_CASEMAP))
.GetCaseMap() == SVX_CASEMAP_VERSALIEN;
@@ -1314,10 +1314,10 @@ const SfxPoolItem& SwFltOutBase::GetCellAttr(sal_uInt16 nWhich)
return GetDoc().GetAttrPool().GetDefaultItem(nWhich);
}
-sal_Bool SwFltOutBase::BeginTable()
+bool SwFltOutBase::BeginTable()
{
OSL_FAIL("BeginTable ausserhalb von normalem Text");
- return sal_False;
+ return false;
}
void SwFltOutBase::NextTableCell()
@@ -1375,14 +1375,14 @@ void SwFltOutBase::EndTable()
return pTable != 0;
};
-sal_Bool SwFltOutDoc::BeginTable()
+bool SwFltOutDoc::BeginTable()
{
if(bReadNoTbl)
- return sal_False;
+ return false;
if (pTable){
OSL_FAIL("BeginTable in Table");
- return sal_False;
+ return false;
}
// Alle Attribute schliessen, da sonst Attribute
// entstehen koennen, die in Flys reinragen
@@ -1401,7 +1401,7 @@ sal_Bool SwFltOutDoc::BeginTable()
usTableX =
usTableY = 0;
SeekCell(usTableY, usTableX, sal_True);
- return sal_True;
+ return true;
}
SwTableBox* SwFltOutDoc::GetBox(sal_uInt16 ny, sal_uInt16 nx /*= USHRT_MAX */)
@@ -1697,7 +1697,7 @@ SfxItemSet* SwFltOutBase::NewFlyDefaults()
return p;
}
-sal_Bool SwFltOutBase::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
+bool SwFltOutBase::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
sal_Bool bAbsolutePos /*= sal_False*/,
const SfxItemSet* pMoreAttrs /*= 0*/)
{
@@ -1705,7 +1705,7 @@ sal_Bool SwFltOutBase::BeginFly( RndStdIds eAnchor /*= FLY_AT_PARA*/,
OSL_ENSURE(!pMoreAttrs, "SwFltOutBase:BeginFly mit pMoreAttrs" );
eFlyAnchor = eAnchor;
bFlyAbsPos = bAbsolutePos; // Bloedsinn eigentlich
- return sal_True;
+ return true;
}
/*virtual*/ void SwFltOutBase::SetFlyAnchor( RndStdIds eAnchor )
@@ -1734,7 +1734,7 @@ void SwFltOutBase::EndFly()
// Flys in SwFltDoc
//-----------------------------------------------------------------------------
-/* virtual */ sal_Bool SwFltOutDoc::IsInFly()
+/* virtual */ bool SwFltOutDoc::IsInFly()
{
return pFly != 0;
};
@@ -1746,7 +1746,7 @@ SwFrmFmt* SwFltOutDoc::MakeFly( RndStdIds eAnchor, SfxItemSet* pSet )
return pFly;
}
-sal_Bool SwFltOutDoc::BeginFly( RndStdIds eAnchor,
+bool SwFltOutDoc::BeginFly( RndStdIds eAnchor,
sal_Bool bAbsolutePos ,
const SfxItemSet* pMoreAttrs)
@@ -1785,7 +1785,7 @@ sal_Bool SwFltOutDoc::BeginFly( RndStdIds eAnchor,
SwCntntNode *pNode = pPaM->GetCntntNode();
pPaM->GetPoint()->nContent.Assign( pNode, 0 );
- return sal_True;
+ return true;
}
/*virtual*/ void SwFltOutDoc::SetFlyFrmAttr(const SfxPoolItem& rAttr)
@@ -1829,7 +1829,7 @@ void SwFltOutDoc::EndFly()
//-----------------------------------------------------------------------------
// Flys in SwFltFormatCollection
//-----------------------------------------------------------------------------
-/*virtual*/ sal_Bool SwFltFormatCollection::IsInFly()
+/*virtual*/ bool SwFltFormatCollection::IsInFly()
{
return bHasFly;
};
@@ -1850,48 +1850,48 @@ void SwFltOutDoc::EndFly()
return GetDoc().GetAttrPool().GetDefaultItem(nWhich);
}
-sal_Bool SwFltFormatCollection::BeginFly( RndStdIds eAnchor,
+bool SwFltFormatCollection::BeginFly( RndStdIds eAnchor,
sal_Bool bAbsolutePos,
const SfxItemSet* pMoreAttrs)
{
SwFltOutBase::BeginFly( eAnchor, bAbsolutePos, pMoreAttrs );
- bHasFly = sal_True;
- return sal_True;
+ bHasFly = true;
+ return true;
}
void SwFltFormatCollection::EndFly() // Wird nie aufgerufen
{
}
-sal_Bool SwFltFormatCollection::BeginStyleFly( SwFltOutDoc* pOutDoc )
+bool SwFltFormatCollection::BeginStyleFly( SwFltOutDoc* pOutDoc )
{
OSL_ENSURE( pOutDoc, "BeginStyleFly ohne pOutDoc" );
OSL_ENSURE( pOutDoc && !pOutDoc->IsInFly(), "BeginStyleFly in Fly" );
if( pOutDoc && !pOutDoc->IsInFly() )
return pOutDoc->BeginFly( eFlyAnchor, bFlyAbsPos, pFlyAttrs );
else
- return sal_False;
+ return false;
}
//-----------------------------------------------------------------------------
// Flys in SwFltShell
//-----------------------------------------------------------------------------
-sal_Bool SwFltShell::BeginFly( RndStdIds eAnchor,
+bool SwFltShell::BeginFly( RndStdIds eAnchor,
sal_Bool bAbsolutePos)
{
if (pOut->IsInFly()){
OSL_FAIL("BeginFly in Fly");
- return sal_False;
+ return false;
}
if (pOutDoc->IsInTable()){
OSL_FAIL("BeginFly in Table");
- return sal_False;
+ return false;
}
pOut->BeginFly( eAnchor, bAbsolutePos, pColls[nAktStyle]->GetpFlyAttrs() );
eSubMode = Fly;
- return sal_True;
+ return true;
}
void SwFltShell::SetFlyXPos( short nXPos, sal_Int16 eHRel,
@@ -2020,7 +2020,7 @@ SwPageDesc* SwFltShell::MakePageDesc(SwPageDesc* pFirstPageDesc)
if(bStdPD) // keine Neuen PageDescs
return pCurrentPageDesc;
- sal_Bool bFollow = (pFirstPageDesc != 0);
+ bool bFollow = (pFirstPageDesc != 0);
SwPageDesc* pNewPD;
sal_uInt16 nPos;
if (bFollow && pFirstPageDesc->GetFollow() != pFirstPageDesc)
@@ -2053,7 +2053,7 @@ SwFltFormatCollection::SwFltFormatCollection(
SwFltOutBase(_rDoc),
pColl(_rDoc.GetTxtCollFromPool( static_cast< sal_uInt16 >(nType), false )),
pFlyAttrs( 0 ),
- bHasFly( sal_False )
+ bHasFly( false )
{
Reset(); // Default-Attrs loeschen und Auto-Flag
}
@@ -2062,7 +2062,7 @@ SwFltFormatCollection::SwFltFormatCollection(
SwDoc& _rDoc, const String& rName ) :
SwFltOutBase(_rDoc),
pFlyAttrs( 0 ),
- bHasFly( sal_False )
+ bHasFly( false )
{
pColl = _rDoc.MakeTxtFmtColl(rName, (SwTxtFmtColl*)_rDoc.GetDfltTxtFmtColl());
Reset(); // Default-Attrs loeschen und Auto-Flag
diff --git a/sw/source/filter/ww1/w1class.hxx b/sw/source/filter/ww1/w1class.hxx
index 0c0aa92..acc52a1 100644
--- a/sw/source/filter/ww1/w1class.hxx
+++ b/sw/source/filter/ww1/w1class.hxx
@@ -174,7 +174,7 @@ public:
String GetText( sal_uLong ulOffset, sal_uLong nLen ) const;
enum Consts { MinChar = 32 };
- static sal_Bool IsChar( sal_Unicode c ) { return c >= MinChar; }
+ static bool IsChar( sal_Unicode c ) { return c >= MinChar; }
};
/////////////////////////////////////////////////////////////// DocText
More information about the Libreoffice-commits
mailing list