sw/inc/doc.hxx | 10 +++++-----
sw/inc/editsh.hxx | 2 +-
sw/inc/ftninfo.hxx | 4 ++--
sw/inc/ndtxt.hxx | 4 ++--
sw/source/core/doc/docfmt.cxx | 8 ++++----
sw/source/core/doc/docftn.cxx | 30 +++++++++++++++---------------
sw/source/core/doc/docglos.cxx | 6 +++---
sw/source/core/doc/doclay.cxx | 8 ++++----
sw/source/core/edit/editsh.cxx | 6 +++---
sw/source/core/frmedt/fecopy.cxx | 8 ++++----
sw/source/core/table/swtable.cxx | 4 ++--
sw/source/core/txtnode/ndtxt.cxx | 8 ++++----
sw/source/core/undo/SwUndoFmt.cxx | 4 ++--
sw/source/core/undo/unattr.cxx | 4 ++--
sw/source/ui/dochdl/gloshdl.cxx | 6 +++---
sw/source/ui/inc/gloshdl.hxx | 2 +-
sw/source/ui/shells/textglos.cxx | 2 +-
17 files changed, 58 insertions(+), 58 deletions(-)
New commits:
commit a94b902736ad2cc74224cad4ae64f83880ece632
Author: Takeshi Abe <t...@fixedpoint.jp>
Date: Sun Oct 28 23:38:30 2012 +0900
sal_Bool to bool
Change-Id: Ia71a4dc13e09a5fc42c282efc2b0d46b2ff007ab
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index b124a5a..6dc4bf2 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1198,7 +1198,7 @@ public:
const SfxPoolItem& GetDefault( sal_uInt16 nFmtHint ) const;
/// Do not expand text attributes.
- sal_Bool DontExpandFmt( const SwPosition& rPos, sal_Bool bFlag = sal_True
);
+ bool DontExpandFmt( const SwPosition& rPos, bool bFlag = true );
/* Formats */
const SwFrmFmts* GetFrmFmts() const { return pFrmFmtTbl; }
@@ -1326,7 +1326,7 @@ public:
void SetGlossaryDoc( SwDoc* pDoc ) { pGlossaryDoc = pDoc; }
/// travel over PaM Ring
- sal_Bool InsertGlossary( SwTextBlocks& rBlock, const String& rEntry,
+ bool InsertGlossary( SwTextBlocks& rBlock, const String& rEntry,
SwPaM& rPaM, SwCrsrShell* pShell = 0);
/** get the set of printable pages for the XRenderable API by
@@ -1925,8 +1925,8 @@ public:
void Unchain( SwFrmFmt &rFmt );
// For Copy/Move from FrmShell.
- SdrObject* CloneSdrObj( const SdrObject&, sal_Bool bMoveWithinDoc =
sal_False,
- sal_Bool bInsInPage = sal_True );
+ SdrObject* CloneSdrObj( const SdrObject&, bool bMoveWithinDoc = false,
+ bool bInsInPage = true );
//
// -------------------- FeShell - Interface end ------------------
@@ -1995,7 +1995,7 @@ public:
void ChgFmt(SwFmt & rFmt, const SfxItemSet & rSet);
void RenameFmt(SwFmt & rFmt, const String & sNewName,
- sal_Bool bBroadcast = sal_False);
+ bool bBroadcast = false);
/// Change a TOX undoable.
void ChgTOX(SwTOXBase & rTOX, const SwTOXBase & rNew);
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 2c76a42..1a73025 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -234,7 +234,7 @@ public:
/** If Cursor is at the end of a character style in which the
DontExpand-flag
is not yet set, the latter will be set (==> return TRUE). */
- sal_Bool DontExpandFmt();
+ bool DontExpandFmt();
/** Apply / remove attributes.
@return attributs in required AttributeSet.
diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx
index cccd6f7..b72338d 100644
--- a/sw/inc/ftninfo.hxx
+++ b/sw/inc/ftninfo.hxx
@@ -69,7 +69,7 @@ public:
SwClient *GetAnchorCharFmtDep() const { return
(SwClient*)&aAnchorCharFmtDep; }
SwEndNoteInfo & operator=(const SwEndNoteInfo&);
- sal_Bool operator==( const SwEndNoteInfo &rInf ) const;
+ bool operator==( const SwEndNoteInfo &rInf ) const;
SwEndNoteInfo( SwTxtFmtColl *pTxtColl = 0);
SwEndNoteInfo(const SwEndNoteInfo&);
@@ -107,7 +107,7 @@ public:
SwFtnInfo& operator=(const SwFtnInfo&);
- sal_Bool operator==( const SwFtnInfo &rInf ) const;
+ bool operator==( const SwFtnInfo &rInf ) const;
SwFtnInfo(SwTxtFmtColl* pTxtColl = 0);
SwFtnInfo(const SwFtnInfo&);
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 603522c..895ff87 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -348,8 +348,8 @@ public:
SwCntntNode *AppendNode( const SwPosition & );
/// When appropriate set DontExpand-flag at INet or character styles
respectively.
- sal_Bool DontExpandFmt( const SwIndex& rIdx, bool bFlag = true,
- sal_Bool bFmtToTxtAttributes = sal_True );
+ bool DontExpandFmt( const SwIndex& rIdx, bool bFlag = true,
+ bool bFmtToTxtAttributes = true );
enum GetTxtAttrMode {
DEFAULT, /// DEFAULT: (Start < nIndex <= End)
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index bbf9aae..94e2758 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -375,7 +375,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
{
nPtPos = nMkPos = rSt.GetIndex();
if( bTxtAttr )
- pTxtNd->DontExpandFmt( rSt, sal_True );
+ pTxtNd->DontExpandFmt( rSt, true );
}
}
@@ -2280,9 +2280,9 @@ void SwDoc::MoveLeftMargin( const SwPaM& rPam, bool
bRight, bool bModulus )
SetModified();
}
-sal_Bool SwDoc::DontExpandFmt( const SwPosition& rPos, sal_Bool bFlag )
+bool SwDoc::DontExpandFmt( const SwPosition& rPos, bool bFlag )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
if( pTxtNd )
{
@@ -2457,7 +2457,7 @@ void SwDoc::ChgFmt(SwFmt & rFmt, const SfxItemSet & rSet)
}
void SwDoc::RenameFmt(SwFmt & rFmt, const String & sNewName,
- sal_Bool bBroadcast)
+ bool bBroadcast)
{
SfxStyleFamily eFamily = SFX_STYLE_FAMILY_ALL;
diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx
index 353ddee..0c845c3 100644
--- a/sw/source/core/doc/docftn.cxx
+++ b/sw/source/core/doc/docftn.cxx
@@ -77,7 +77,7 @@ SwEndNoteInfo& SwEndNoteInfo::operator=(const SwEndNoteInfo&
rInfo)
}
-sal_Bool SwEndNoteInfo::operator==( const SwEndNoteInfo& rInfo ) const
+bool SwEndNoteInfo::operator==( const SwEndNoteInfo& rInfo ) const
{
return aPageDescDep.GetRegisteredIn() ==
rInfo.aPageDescDep.GetRegisteredIn() &&
@@ -231,7 +231,7 @@ SwFtnInfo& SwFtnInfo::operator=(const SwFtnInfo& rInfo)
}
-sal_Bool SwFtnInfo::operator==( const SwFtnInfo& rInfo ) const
+bool SwFtnInfo::operator==( const SwFtnInfo& rInfo ) const
{
return ePos == rInfo.ePos &&
eNum == rInfo.eNum &&
@@ -275,17 +275,17 @@ void SwDoc::SetFtnInfo(const SwFtnInfo& rInfo)
GetIDocumentUndoRedo().AppendUndo( new SwUndoFootNoteInfo(rOld) );
}
- sal_Bool bFtnPos = rInfo.ePos != rOld.ePos;
- sal_Bool bFtnDesc = rOld.ePos == FTNPOS_CHAPTER &&
+ bool bFtnPos = rInfo.ePos != rOld.ePos;
+ bool bFtnDesc = rOld.ePos == FTNPOS_CHAPTER &&
rInfo.GetPageDesc( *this ) != rOld.GetPageDesc(
*this );
- sal_Bool bExtra = rInfo.aQuoVadis != rOld.aQuoVadis ||
+ bool bExtra = rInfo.aQuoVadis != rOld.aQuoVadis ||
rInfo.aErgoSum != rOld.aErgoSum ||
rInfo.aFmt.GetNumberingType() !=
rOld.aFmt.GetNumberingType() ||
rInfo.GetPrefix() != rOld.GetPrefix() ||
rInfo.GetSuffix() != rOld.GetSuffix();
SwCharFmt *pOldChrFmt = rOld.GetCharFmt( *this ),
*pNewChrFmt = rInfo.GetCharFmt( *this );
- sal_Bool bFtnChrFmts = pOldChrFmt != pNewChrFmt;
+ bool bFtnChrFmts = pOldChrFmt != pNewChrFmt;
*pFtnInfo = rInfo;
@@ -346,7 +346,7 @@ void SwDoc::SetEndNoteInfo(const SwEndNoteInfo& rInfo)
GetIDocumentUndoRedo().AppendUndo(pUndo);
}
- sal_Bool bNumChg = rInfo.nFtnOffset != GetEndNoteInfo().nFtnOffset;
+ bool bNumChg = rInfo.nFtnOffset != GetEndNoteInfo().nFtnOffset;
// this seems to be an optimization: UpdateAllFtn() is only called
// if the offset changes; if the offset is the same,
// but type/prefix/suffix changes, just set new numbers.
@@ -356,11 +356,11 @@ void SwDoc::SetEndNoteInfo(const SwEndNoteInfo& rInfo)
|| (rInfo.GetPrefix() != GetEndNoteInfo().GetPrefix())
|| (rInfo.GetSuffix() != GetEndNoteInfo().GetSuffix())
);
- sal_Bool bFtnDesc = rInfo.GetPageDesc( *this ) !=
+ bool bFtnDesc = rInfo.GetPageDesc( *this ) !=
GetEndNoteInfo().GetPageDesc( *this );
SwCharFmt *pOldChrFmt = GetEndNoteInfo().GetCharFmt( *this ),
*pNewChrFmt = rInfo.GetCharFmt( *this );
- sal_Bool bFtnChrFmts = pOldChrFmt != pNewChrFmt;
+ bool bFtnChrFmts = pOldChrFmt != pNewChrFmt;
*pEndNoteInfo = rInfo;
@@ -429,8 +429,8 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const String&
rNumStr,
SwTxtFtn* pTxtFtn;
sal_uLong nIdx;
- sal_Bool bChg = sal_False;
- sal_Bool bTypeChgd = sal_False;
+ bool bChg = false;
+ bool bTypeChgd = false;
sal_uInt16 n = nPos; // save
while( nPos < rFtnArr.size() &&
(( nIdx = _SwTxtFtn_GetIndex((pTxtFtn = rFtnArr[ nPos++ ] )))
@@ -443,7 +443,7 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const String&
rNumStr,
if( rFtn.GetNumStr() != rNumStr ||
rFtn.IsEndNote() != bIsEndNote )
{
- bChg = sal_True;
+ bChg = true;
if ( pUndo )
{
pUndo->GetHistory().Add( *pTxtFtn );
@@ -453,7 +453,7 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const String&
rNumStr,
if( rFtn.IsEndNote() != bIsEndNote )
{
((SwFmtFtn&)rFtn).SetEndNote( bIsEndNote );
- bTypeChgd = sal_True;
+ bTypeChgd = true;
pTxtFtn->CheckCondColl();
//#i11339# dispose UNO wrapper when a footnote is changed
to an endnote or vice versa
SwPtrMsgPoolItem aMsgHint( RES_FOOTNOTE_DELETED,
(void*)&pTxtFtn->GetAttr() );
@@ -474,7 +474,7 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const String&
rNumStr,
if( rFtn.GetNumStr() != rNumStr ||
rFtn.IsEndNote() != bIsEndNote )
{
- bChg = sal_True;
+ bChg = true;
if ( pUndo )
{
pUndo->GetHistory().Add( *pTxtFtn );
@@ -484,7 +484,7 @@ bool SwDoc::SetCurFtn( const SwPaM& rPam, const String&
rNumStr,
if( rFtn.IsEndNote() != bIsEndNote )
{
((SwFmtFtn&)rFtn).SetEndNote( bIsEndNote );
- bTypeChgd = sal_True;
+ bTypeChgd = true;
pTxtFtn->CheckCondColl();
}
}
diff --git a/sw/source/core/doc/docglos.cxx b/sw/source/core/doc/docglos.cxx
index 42d2be5..dcb1288 100644
--- a/sw/source/core/doc/docglos.cxx
+++ b/sw/source/core/doc/docglos.cxx
@@ -107,10 +107,10 @@ static void lcl_copyDocumentProperties(
/* --------------------------------------------------
Description: inserts an AutoText block
--------------------------------------------------*/
-sal_Bool SwDoc::InsertGlossary( SwTextBlocks& rBlock, const String& rEntry,
+bool SwDoc::InsertGlossary( SwTextBlocks& rBlock, const String& rEntry,
SwPaM& rPaM, SwCrsrShell* pShell )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
sal_uInt16 nIdx = rBlock.GetIndex( rEntry );
if( (sal_uInt16) -1 != nIdx )
{
@@ -188,7 +188,7 @@ sal_Bool SwDoc::InsertGlossary( SwTextBlocks& rBlock, const
String& rEntry,
UnlockExpFlds();
if( !IsExpFldsLocked() )
UpdateExpFlds(NULL, true);
- bRet = sal_True;
+ bRet = true;
}
mbInsOnlyTxtGlssry = bSav_IsInsGlossary;
}
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index e9663f9..534143a 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -133,7 +133,7 @@ SwFrmFmt *SwDoc::MakeLayoutFmt( RndStdIds eRequest, const
SfxItemSet* pSet )
{
SwFrmFmt *pFmt = 0;
const sal_Bool bMod = IsModified();
- sal_Bool bHeader = sal_False;
+ bool bHeader = false;
switch ( eRequest )
{
@@ -141,7 +141,7 @@ SwFrmFmt *SwDoc::MakeLayoutFmt( RndStdIds eRequest, const
SfxItemSet* pSet )
case RND_STD_HEADERL:
case RND_STD_HEADERR:
{
- bHeader = sal_True;
+ bHeader = true;
// no break, we continue further down
}
case RND_STD_FOOTER:
@@ -522,8 +522,8 @@ SwFrmFmt *SwDoc::CopyLayoutFmt( const SwFrmFmt& rSource,
return pDest;
}
-SdrObject* SwDoc::CloneSdrObj( const SdrObject& rObj, sal_Bool bMoveWithinDoc,
- sal_Bool bInsInPage )
+SdrObject* SwDoc::CloneSdrObj( const SdrObject& rObj, bool bMoveWithinDoc,
+ bool bInsInPage )
{
// #i52858# - method name changed
SdrPage *pPg = GetOrCreateDrawModel()->GetPage( 0 );
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index 291727e..f216f3b 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -812,12 +812,12 @@ sal_Bool SwEditShell::DelINetAttrWithText()
// setzen an den Textzeichenattributen das DontExpand-Flag
-sal_Bool SwEditShell::DontExpandFmt()
+bool SwEditShell::DontExpandFmt()
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( !IsTableMode() && GetDoc()->DontExpandFmt( *GetCrsr()->GetPoint() ))
{
- bRet = sal_True;
+ bRet = true;
CallChgLnk();
}
return bRet;
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index b31f8e6..61a237f 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -201,7 +201,7 @@ sal_Bool SwFEShell::Copy( SwDoc* pClpDoc, const String*
pNewClpTxt )
aSet.Put( aAnchor );
SdrObject *const pNew =
- pClpDoc->CloneSdrObj( *pObj, sal_False, sal_True );
+ pClpDoc->CloneSdrObj( *pObj, false, true );
SwPaM aTemp(aPos);
pClpDoc->Insert(aTemp, *pNew, &aSet, NULL);
@@ -325,7 +325,7 @@ sal_Bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell,
const Point& rSttPt,
{
SdrObject* pNew = pDestDoc->CloneSdrObj( *pObj, bIsMove &&
- GetDoc() == pDestDoc, sal_False );
+ GetDoc() == pDestDoc, false );
pNew->NbcMove( aSiz );
pDestDrwView->InsertObjectAtView( pNew, *pDestPgView );
bInsWithFmt = sal_False;
@@ -387,7 +387,7 @@ sal_Bool SwFEShell::CopyDrawSel( SwFEShell* pDestShell,
const Point& rSttPt,
SfxItemSet aSet( pDestDoc->GetAttrPool(),aFrmFmtSetRange);
aSet.Put( aAnchor );
SdrObject* pNew = pDestDoc->CloneSdrObj( *pObj, bIsMove &&
- GetDoc() == pDestDoc, sal_True
);
+ GetDoc() == pDestDoc, true );
pFmt = pDestDoc->Insert( *pDestShell->GetCrsr(),
*pNew, &aSet, NULL );
}
@@ -913,7 +913,7 @@ sal_Bool SwFEShell::Paste( SwDoc* pClpDoc, sal_Bool
bIncludingPageFrames )
if( pSdrObj )
{
SdrObject* pNew = GetDoc()->CloneSdrObj( *pSdrObj,
- sal_False,
sal_False );
+ false, false );
// Insert object sets any anchor position to 0.
// Therefore we calculate the absolute position here
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 7c23b35..b727954 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -2101,7 +2101,7 @@ void ChgTextToNum( SwTableBox& rBox, const String& rTxt,
const Color* pCol,
// Reset DontExpand-Flags before exchange, to retrigger expansion
{
SwIndex aResetIdx( aIdx, n );
- pTNd->DontExpandFmt( aResetIdx, sal_False, sal_False );
+ pTNd->DontExpandFmt( aResetIdx, false, false );
}
if( !pDoc->IsIgnoreRedline() && !pDoc->GetRedlineTbl().empty() )
@@ -2154,7 +2154,7 @@ void ChgNumToText( SwTableBox& rBox, sal_uLong nFmt )
// exchange text
SwIndex aIdx( pTNd, sTxt.Len() );
// Reset DontExpand-Flags before exchange, to retrigger
expansion
- pTNd->DontExpandFmt( aIdx, sal_False, sal_False );
+ pTNd->DontExpandFmt( aIdx, false, false );
aIdx = 0;
pTNd->EraseText( aIdx, STRING_LEN,
IDocumentContentOperations::INS_EMPTYEXPAND );
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 83ef8f6..4cd6c62 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1108,8 +1108,8 @@ void SwTxtNode::_ChgTxtCollUpdateNum( const SwTxtFmtColl
*pOldColl,
// Wenn man sich genau am Ende einer Text- bzw. INetvorlage befindet,
// bekommt diese das DontExpand-Flag verpasst
-sal_Bool SwTxtNode::DontExpandFmt( const SwIndex& rIdx, bool bFlag,
- sal_Bool bFmtToTxtAttributes )
+bool SwTxtNode::DontExpandFmt( const SwIndex& rIdx, bool bFlag,
+ bool bFmtToTxtAttributes )
{
const xub_StrLen nIdx = rIdx.GetIndex();
if ( bFmtToTxtAttributes && nIdx == m_Text.Len() )
@@ -1117,7 +1117,7 @@ sal_Bool SwTxtNode::DontExpandFmt( const SwIndex& rIdx,
bool bFlag,
FmtToTxtAttr( this );
}
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if ( HasHints() )
{
const sal_uInt16 nEndCnt = m_pSwpHints->GetEndCount();
@@ -1133,7 +1133,7 @@ sal_Bool SwTxtNode::DontExpandFmt( const SwIndex& rIdx,
bool bFlag,
else if( bFlag != pTmp->DontExpand() && !pTmp->IsLockExpandFlag()
&& *pEnd > *pTmp->GetStart())
{
- bRet = sal_True;
+ bRet = true;
m_pSwpHints->NoteInHistory( pTmp );
pTmp->SetDontExpand( bFlag );
}
diff --git a/sw/source/core/undo/SwUndoFmt.cxx
b/sw/source/core/undo/SwUndoFmt.cxx
index 01baf2a..7ec5e16 100644
--- a/sw/source/core/undo/SwUndoFmt.cxx
+++ b/sw/source/core/undo/SwUndoFmt.cxx
@@ -177,7 +177,7 @@ void SwUndoRenameFmt::UndoImpl(::sw::UndoRedoContext &)
if (pFmt)
{
- pDoc->RenameFmt(*pFmt, sOldName, sal_True);
+ pDoc->RenameFmt(*pFmt, sOldName, true);
}
}
@@ -187,7 +187,7 @@ void SwUndoRenameFmt::RedoImpl(::sw::UndoRedoContext &)
if (pFmt)
{
- pDoc->RenameFmt(*pFmt, sNewName, sal_True);
+ pDoc->RenameFmt(*pFmt, sNewName, true);
}
}
diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx
index dc69cfc..f7a1894 100644
--- a/sw/source/core/undo/unattr.cxx
+++ b/sw/source/core/undo/unattr.cxx
@@ -656,7 +656,7 @@ void SwUndoResetAttr::UndoImpl(::sw::UndoRedoContext &
rContext)
if( pTNd )
{
SwIndex aIdx( pTNd, nSttCntnt );
- pTNd->DontExpandFmt( aIdx, sal_False );
+ pTNd->DontExpandFmt( aIdx, false );
}
}
@@ -1168,7 +1168,7 @@ void SwUndoDontExpandFmt::UndoImpl(::sw::UndoRedoContext
& rContext)
SwPosition& rPos = *pPam->GetPoint();
rPos.nNode = m_nNodeIndex;
rPos.nContent.Assign( rPos.nNode.GetNode().GetCntntNode(),
m_nContentIndex);
- pDoc->DontExpandFmt( rPos, sal_False );
+ pDoc->DontExpandFmt( rPos, false );
}
void SwUndoDontExpandFmt::RedoImpl(::sw::UndoRedoContext & rContext)
diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx
index 9cba41c..5672147 100644
--- a/sw/source/ui/dochdl/gloshdl.cxx
+++ b/sw/source/ui/dochdl/gloshdl.cxx
@@ -568,7 +568,7 @@ sal_Bool SwGlossaryHdl::Expand( const String& rShortName,
/*------------------------------------------------------------------------
Description: add autotext
------------------------------------------------------------------------*/
-sal_Bool SwGlossaryHdl::InsertGlossary(const String &rName)
+bool SwGlossaryHdl::InsertGlossary(const String &rName)
{
OSL_ENSURE(pWrtShell->CanInsert(), "illegal");
@@ -576,7 +576,7 @@ sal_Bool SwGlossaryHdl::InsertGlossary(const String &rName)
pCurGrp? pCurGrp: rStatGlossaries.GetGroupDoc(aCurGrp);
if (!pGlos)
- return sal_False;
+ return false;
SvxMacro aStartMacro(aEmptyStr, aEmptyStr, STARBASIC);
SvxMacro aEndMacro(aEmptyStr, aEmptyStr, STARBASIC);
@@ -608,7 +608,7 @@ sal_Bool SwGlossaryHdl::InsertGlossary(const String &rName)
if(!pCurGrp)
rStatGlossaries.PutGroupDoc(pGlos);
- return sal_True;
+ return true;
}
/*------------------------------------------------------------------------
diff --git a/sw/source/ui/inc/gloshdl.hxx b/sw/source/ui/inc/gloshdl.hxx
index 7368eda..ffa3278 100644
--- a/sw/source/ui/inc/gloshdl.hxx
+++ b/sw/source/ui/inc/gloshdl.hxx
@@ -86,7 +86,7 @@ public:
sal_Bool CopyToClipboard(SwWrtShell& rSh, const String& rShortName);
sal_Bool ExpandGlossary();
- sal_Bool InsertGlossary(const String &rName);
+ bool InsertGlossary(const String &rName);
void SetMacros(const String& rName,
const SvxMacro* pStart,
diff --git a/sw/source/ui/shells/textglos.cxx b/sw/source/ui/shells/textglos.cxx
index e2e5b8b..09de694 100644
--- a/sw/source/ui/shells/textglos.cxx
+++ b/sw/source/ui/shells/textglos.cxx
@@ -119,7 +119,7 @@ void SwTextShell::ExecGlossary(SfxRequest &rReq)
if ( fnSetActGroup )
(*fnSetActGroup)( aGroup );
pGlosHdl->SetCurGroup(aGroup, sal_True);
- rReq.SetReturnValue(SfxBoolItem(nSlot,
pGlosHdl->InsertGlossary( aName )));
+ rReq.SetReturnValue(SfxBoolItem(nSlot,
pGlosHdl->InsertGlossary( aName ) ? sal_True : sal_False));
rReq.Done();
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
