[Libreoffice-commits] .: 2 commits - sw/inc sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Nov 2 20:22:35 PDT 2012
sw/inc/doc.hxx | 20 ++++++++++----------
sw/inc/editsh.hxx | 8 ++++----
sw/inc/list.hxx | 2 +-
sw/source/core/crsr/crsrsh.cxx | 4 ++--
sw/source/core/doc/doclay.cxx | 4 ++--
sw/source/core/doc/docnum.cxx | 26 +++++++++++++-------------
sw/source/core/doc/list.cxx | 6 +++---
sw/source/core/doc/poolfmt.cxx | 2 +-
sw/source/core/edit/ednumber.cxx | 14 +++++++-------
sw/source/core/undo/SwUndoFmt.cxx | 4 ++--
sw/source/core/undo/unnum.cxx | 4 ++--
sw/source/core/unocore/unosett.cxx | 2 +-
sw/source/filter/rtf/rtfnum.cxx | 8 ++++----
sw/source/filter/ww8/ww8par2.cxx | 4 ++--
sw/source/filter/ww8/ww8par3.cxx | 2 +-
sw/source/ui/app/docstyle.cxx | 2 +-
sw/source/ui/docvw/edtwin.cxx | 2 +-
17 files changed, 57 insertions(+), 57 deletions(-)
New commits:
commit 2a9fd5d68304beebcffd2f6a66e65c95eb433c40
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sat Nov 3 12:18:57 2012 +0900
sal_Bool to bool
Change-Id: I35412e2d2e36e3eabdff2a6692bf6edc68a2d724
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 86f90b5..372f8b6 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1515,7 +1515,7 @@ public:
/// add optional parameter <eDefaultNumberFormatPositionAndSpaceMode>
sal_uInt16 MakeNumRule( const String &rName,
const SwNumRule* pCpy = 0,
- sal_Bool bBroadcast = sal_False,
+ bool bBroadcast = false,
const SvxNumberFormat::SvxNumPositionAndSpaceMode eDefaultNumberFormatPositionAndSpaceMode =
SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
sal_uInt16 FindNumRule( const String& rName ) const;
@@ -1525,7 +1525,7 @@ public:
bool RenameNumRule(const String & aOldName, const String & aNewName,
bool bBroadcast = false);
bool DelNumRule( const String& rName, bool bBroadCast = false );
- String GetUniqueNumRuleName( const String* pChkStr = 0, sal_Bool bAutoNum = sal_True ) const;
+ String GetUniqueNumRuleName( const String* pChkStr = 0, bool bAutoNum = true ) const;
void UpdateNumRule(); /// Update all invalids.
void ChgNumRuleFmts( const SwNumRule& rRule, const String * pOldName = 0 );
@@ -1584,7 +1584,7 @@ public:
according to offsets. (if negative: go to doc start). */
bool MoveParagraph( const SwPaM&, long nOffset = 1, bool bIsOutlMv = false );
- sal_Bool NumOrNoNum( const SwNodeIndex& rIdx, sal_Bool bDel = sal_False);
+ bool NumOrNoNum( const SwNodeIndex& rIdx, sal_Bool bDel = sal_False);
void StopNumRuleAnimations( OutputDevice* );
@@ -1971,12 +1971,12 @@ public:
@param sListId list Id of the list whose level has to be marked/unmarked
@param nListLevel level to mark
- @param bValue - sal_True mark the level
- - sal_False unmark the level
+ @param bValue - true mark the level
+ - false unmark the level
*/
void MarkListLevel( const String& sListId,
const int nListLevel,
- const sal_Bool bValue );
+ const bool bValue );
/** Marks/Unmarks a list level of a certain list
@@ -1984,12 +1984,12 @@ public:
@param rList list whose level has to be marked/unmarked
@param nListLevel level to mark
- @param bValue - sal_True mark the level
- - sal_False unmark the level
+ @param bValue - true mark the level
+ - false unmark the level
*/
void MarkListLevel( SwList& rList,
const int nListLevel,
- const sal_Bool bValue );
+ const bool bValue );
/// Change a format undoable.
void ChgFmt(SwFmt & rFmt, const SfxItemSet & rSet);
@@ -2019,7 +2019,7 @@ public:
*/
String GetPaMDescr(const SwPaM & rPaM) const;
- sal_Bool IsFirstOfNumRule(SwPosition & rPos);
+ bool IsFirstOfNumRule(SwPosition & rPos);
// access methods for XForms model(s)
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index add80c3..65c19b8 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -502,7 +502,7 @@ public:
bool MoveNumParas( bool bUpperLower, bool bUpperLeft );
/// Switch on/off of numbering via Delete/Backspace.
- sal_Bool NumOrNoNum( sal_Bool bDelete = sal_False, sal_Bool bChkStart = sal_True);
+ bool NumOrNoNum( sal_Bool bDelete = sal_False, bool bChkStart = true);
// #i23726#
// #i90078#
@@ -511,8 +511,8 @@ public:
void ChangeIndentOfAllListLevels( short nDiff );
// Adjust method name
void SetIndent(short nIndent, const SwPosition & rPos);
- sal_Bool IsFirstOfNumRule() const;
- sal_Bool IsFirstOfNumRule(const SwPaM & rPaM) const;
+ bool IsFirstOfNumRule() const;
+ bool IsFirstOfNumRule(const SwPaM & rPaM) const;
sal_Bool IsNoNum( sal_Bool bChkStart = sal_True ) const;
@@ -532,7 +532,7 @@ public:
sal_Bool HasNumber() const;
sal_Bool HasBullet() const;
- String GetUniqueNumRuleName( const String* pChkStr = 0, sal_Bool bAutoNum = sal_True ) const;
+ String GetUniqueNumRuleName( const String* pChkStr = 0, bool bAutoNum = true ) const;
void ChgNumRuleFmts( const SwNumRule& rRule );
/// Set (and query if) a numbering with StartFlag starts at current PointPos.
diff --git a/sw/inc/list.hxx b/sw/inc/list.hxx
index e30a5ad..f21a32f 100644
--- a/sw/inc/list.hxx
+++ b/sw/inc/list.hxx
@@ -48,7 +48,7 @@ class SwList
void ValidateListTree();
void MarkListLevel( const int nListLevel,
- const sal_Bool bValue );
+ const bool bValue );
bool IsListLevelMarked( const int nListLevel ) const;
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 97201b6..0b78ab9 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -409,11 +409,11 @@ void SwCrsrShell::MarkListLevel( const String& sListId,
nListLevel != nMarkedListLevel)
{
if ( sMarkedListId.Len() > 0 )
- pDoc->MarkListLevel( sMarkedListId, nMarkedListLevel, sal_False );
+ pDoc->MarkListLevel( sMarkedListId, nMarkedListLevel, false );
if ( sListId.Len() > 0 )
{
- pDoc->MarkListLevel( sListId, nListLevel, sal_True );
+ pDoc->MarkListLevel( sListId, nListLevel, true );
}
sMarkedListId = sListId;
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index fcd91a6..0ae339d 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1833,7 +1833,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
aStPos.nContent = 0;
SwCntntNode* pCNd = pEnd->nNode.GetNode().GetCntntNode();
aEndPos.nContent = pCNd ? pCNd->Len() : 1;
- sal_Bool bCheckDel = sal_True;
+ bool bCheckDel = true;
// There is a some Redline Delete Object for the range
for( ; nRedlPos < GetRedlineTbl().size(); ++nRedlPos )
@@ -1854,7 +1854,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
break;
case POS_INSIDE: // Pos1 is completely inside Pos2
// that's valid, but check all following for overlapping
- bCheckDel = sal_False;
+ bCheckDel = false;
break;
case POS_OUTSIDE: // Pos2 is completely inside Pos1
@@ -1931,7 +1931,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
rOrigPam.DeleteMark();
rOrigPam.GetPoint()->nNode = aIdx.GetIndex() - 1;
- sal_Bool bDelLastPara = !aInsPos.nNode.GetNode().IsCntntNode();
+ bool bDelLastPara = !aInsPos.nNode.GetNode().IsCntntNode();
/* When copying to a non-content node Copy will
insert a paragraph before that node and insert before
@@ -2079,9 +2079,9 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
return true;
}
-sal_Bool SwDoc::NumOrNoNum( const SwNodeIndex& rIdx, sal_Bool bDel )
+bool SwDoc::NumOrNoNum( const SwNodeIndex& rIdx, sal_Bool bDel )
{
- sal_Bool bResult = sal_False;
+ bool bResult = false;
SwTxtNode * pTxtNd = rIdx.GetNode().GetTxtNode();
if (pTxtNd && pTxtNd->GetNumRule() != NULL &&
@@ -2095,7 +2095,7 @@ sal_Bool SwDoc::NumOrNoNum( const SwNodeIndex& rIdx, sal_Bool bDel )
SetModified();
- bResult = sal_True;
+ bResult = true;
if (GetIDocumentUndoRedo().DoesUndo())
{
@@ -2113,7 +2113,7 @@ sal_Bool SwDoc::NumOrNoNum( const SwNodeIndex& rIdx, sal_Bool bDel )
DelNumRules(aPam);
- bResult = sal_True;
+ bResult = true;
}
}
@@ -2180,7 +2180,7 @@ void SwDoc::AddNumRule(SwNumRule * pRule)
sal_uInt16 SwDoc::MakeNumRule( const String &rName,
const SwNumRule* pCpy,
- sal_Bool bBroadcast,
+ bool bBroadcast,
const SvxNumberFormat::SvxNumPositionAndSpaceMode eDefaultNumberFormatPositionAndSpaceMode )
{
SwNumRule* pNew;
@@ -2222,7 +2222,7 @@ sal_uInt16 SwDoc::MakeNumRule( const String &rName,
return nRet;
}
-String SwDoc::GetUniqueNumRuleName( const String* pChkStr, sal_Bool bAutoNum ) const
+String SwDoc::GetUniqueNumRuleName( const String* pChkStr, bool bAutoNum ) const
{
String aName;
if( bAutoNum )
@@ -2308,7 +2308,7 @@ void SwDoc::UpdateNumRule()
void SwDoc::MarkListLevel( const String& sListId,
const int nListLevel,
- const sal_Bool bValue )
+ const bool bValue )
{
SwList* pList = getListByName( sListId );
@@ -2320,15 +2320,15 @@ void SwDoc::MarkListLevel( const String& sListId,
void SwDoc::MarkListLevel( SwList& rList,
const int nListLevel,
- const sal_Bool bValue )
+ const bool bValue )
{
// Set new marked list level and notify all affected nodes of the changed mark.
rList.MarkListLevel( nListLevel, bValue );
}
-sal_Bool SwDoc::IsFirstOfNumRule(SwPosition & rPos)
+bool SwDoc::IsFirstOfNumRule(SwPosition & rPos)
{
- sal_Bool bResult = sal_False;
+ bool bResult = false;
SwTxtNode * pTxtNode = rPos.nNode.GetNode().GetTxtNode();
if (pTxtNode)
diff --git a/sw/source/core/doc/list.cxx b/sw/source/core/doc/list.cxx
index df6a7d4..941f94c 100644
--- a/sw/source/core/doc/list.cxx
+++ b/sw/source/core/doc/list.cxx
@@ -51,7 +51,7 @@ class SwListImpl
void ValidateListTree();
void MarkListLevel( const int nListLevel,
- const sal_Bool bValue );
+ const bool bValue );
bool IsListLevelMarked( const int nListLevel ) const;
@@ -177,7 +177,7 @@ void SwListImpl::ValidateListTree()
}
void SwListImpl::MarkListLevel( const int nListLevel,
- const sal_Bool bValue )
+ const bool bValue )
{
if ( bValue )
{
@@ -270,7 +270,7 @@ void SwList::ValidateListTree()
}
void SwList::MarkListLevel( const int nListLevel,
- const sal_Bool bValue )
+ const bool bValue )
{
mpListImpl->MarkListLevel( nListLevel, bValue );
}
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 29829d3..ddb31d0 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -1642,7 +1642,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( sal_uInt16 nId )
{
sal_Bool bIsModified = IsModified();
- n = MakeNumRule( aNm, 0, sal_False, eNumberFormatPositionAndSpaceMode );
+ n = MakeNumRule( aNm, 0, false, eNumberFormatPositionAndSpaceMode );
pNewRule = GetNumRuleTbl()[ n ];
pNewRule->SetPoolFmtId( nId );
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index 541f0e7..1f0294e 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -270,9 +270,9 @@ bool SwEditShell::NumUpDown( bool bDown )
return bRet;
}
// -> #i23726#
-sal_Bool SwEditShell::IsFirstOfNumRule() const
+bool SwEditShell::IsFirstOfNumRule() const
{
- sal_Bool bResult = sal_False;
+ bool bResult = false;
SwPaM * pCrsr = GetCrsr();
if (pCrsr->GetNext() == pCrsr)
@@ -283,9 +283,9 @@ sal_Bool SwEditShell::IsFirstOfNumRule() const
return bResult;
}
-sal_Bool SwEditShell::IsFirstOfNumRule(const SwPaM & rPaM) const
+bool SwEditShell::IsFirstOfNumRule(const SwPaM & rPaM) const
{
- sal_Bool bResult = sal_False;
+ bool bResult = false;
SwPosition aPos(*rPaM.GetPoint());
bResult = GetDoc()->IsFirstOfNumRule(aPos);
@@ -597,9 +597,9 @@ sal_Bool SwEditShell::IsOutlineCopyable( sal_uInt16 nIdx ) const
}
-sal_Bool SwEditShell::NumOrNoNum( sal_Bool bNumOn, sal_Bool bChkStart )
+bool SwEditShell::NumOrNoNum( sal_Bool bNumOn, bool bChkStart )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
SwPaM* pCrsr = GetCrsr();
if( pCrsr->GetNext() == pCrsr && !pCrsr->HasMark() &&
( !bChkStart || !pCrsr->GetPoint()->nContent.GetIndex()) )
@@ -696,7 +696,7 @@ void SwEditShell::SetCurNumRule( const SwNumRule& rRule,
EndAllAction();
}
-String SwEditShell::GetUniqueNumRuleName( const String* pChkStr, sal_Bool bAutoNum ) const
+String SwEditShell::GetUniqueNumRuleName( const String* pChkStr, bool bAutoNum ) const
{
return GetDoc()->GetUniqueNumRuleName( pChkStr, bAutoNum );
}
diff --git a/sw/source/core/undo/SwUndoFmt.cxx b/sw/source/core/undo/SwUndoFmt.cxx
index 588097c..7946385 100644
--- a/sw/source/core/undo/SwUndoFmt.cxx
+++ b/sw/source/core/undo/SwUndoFmt.cxx
@@ -385,7 +385,7 @@ void SwUndoNumruleCreate::UndoImpl(::sw::UndoRedoContext &)
void SwUndoNumruleCreate::RedoImpl(::sw::UndoRedoContext &)
{
- pDoc->MakeNumRule(aNew.GetName(), &aNew, sal_True);
+ pDoc->MakeNumRule(aNew.GetName(), &aNew, true);
}
SwRewriter SwUndoNumruleCreate::GetRewriter() const
@@ -411,7 +411,7 @@ SwUndoNumruleDelete::SwUndoNumruleDelete(const SwNumRule & rRule,
void SwUndoNumruleDelete::UndoImpl(::sw::UndoRedoContext &)
{
- pDoc->MakeNumRule(aOld.GetName(), &aOld, sal_True);
+ pDoc->MakeNumRule(aOld.GetName(), &aOld, true);
}
void SwUndoNumruleDelete::RedoImpl(::sw::UndoRedoContext &)
diff --git a/sw/source/core/undo/unnum.cxx b/sw/source/core/undo/unnum.cxx
index 32f6236..bb9e71a 100644
--- a/sw/source/core/undo/unnum.cxx
+++ b/sw/source/core/undo/unnum.cxx
@@ -338,11 +338,11 @@ void SwUndoNumOrNoNum::RepeatImpl(::sw::RepeatContext & rContext)
SwDoc & rDoc = rContext.GetDoc();
if (mbOldNum && ! mbNewNum)
{
- rDoc.NumOrNoNum(rContext.GetRepeatPaM().GetPoint()->nNode, sal_False);
+ rDoc.NumOrNoNum(rContext.GetRepeatPaM().GetPoint()->nNode, false);
}
else if ( ! mbOldNum && mbNewNum )
{
- rDoc.NumOrNoNum(rContext.GetRepeatPaM().GetPoint()->nNode, sal_True);
+ rDoc.NumOrNoNum(rContext.GetRepeatPaM().GetPoint()->nNode, true);
}
}
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 7f70498..dca5968 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1220,7 +1220,7 @@ SwXNumberingRules::SwXNumberingRules(SwDoc& rDoc) :
#if OSL_DEBUG_LEVEL > 1
sal_uInt16 nIndex =
#endif
- rDoc.MakeNumRule( sCreatedNumRuleName, 0, sal_False,
+ rDoc.MakeNumRule( sCreatedNumRuleName, 0, false,
// #i89178#
numfunc::GetDefaultPositionAndSpaceMode() );
#if OSL_DEBUG_LEVEL > 1
diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx
index 74f00b7..61f37f0 100644
--- a/sw/source/filter/rtf/rtfnum.cxx
+++ b/sw/source/filter/rtf/rtfnum.cxx
@@ -364,10 +364,10 @@ void SwRTFParser::ReadListTable()
lcl_ExpandNumFmts( *pCurRule );
String sTmp(rtl::OUString(RTF_NUMRULE_NAME " 1"));
- aEntry.nListDocPos = pDoc->MakeNumRule( sTmp, 0, sal_False, SvxNumberFormat::LABEL_ALIGNMENT );
+ aEntry.nListDocPos = pDoc->MakeNumRule( sTmp, 0, false, SvxNumberFormat::LABEL_ALIGNMENT );
pCurRule = pDoc->GetNumRuleTbl()[ aEntry.nListDocPos ];
// #i91400#
- pCurRule->SetName( pDoc->GetUniqueNumRuleName( &sTmp, sal_False ),
+ pCurRule->SetName( pDoc->GetUniqueNumRuleName( &sTmp, false ),
*pDoc );
pCurRule->SetAutoRule( sal_False );
@@ -567,7 +567,7 @@ void SwRTFParser::ReadListOverrideTable()
aEntry.nListDocPos = pDoc->MakeNumRule( sTmp, pRule );
pRule = pDoc->GetNumRuleTbl()[ aEntry.nListDocPos ];
// #i91400#
- pRule->SetName( pDoc->GetUniqueNumRuleName( &sTmp, sal_False ),
+ pRule->SetName( pDoc->GetUniqueNumRuleName( &sTmp, false ),
*pDoc );
pRule->SetAutoRule( sal_False );
@@ -818,7 +818,7 @@ SwNumRule *SwRTFParser::ReadNumSecLevel( int nToken )
aListArr.push_back( aEntry );
pCurRule = pDoc->GetNumRuleTbl()[ aEntry.nListDocPos ];
// #i91400#
- pCurRule->SetName( pDoc->GetUniqueNumRuleName( &sTmp, sal_False ), *pDoc );
+ pCurRule->SetName( pDoc->GetUniqueNumRuleName( &sTmp, false ), *pDoc );
pCurRule->SetAutoRule( sal_False );
pCurRule->SetContinusNum( bContinus );
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 824771a..283300f 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -782,7 +782,7 @@ SwNumRule* SwWW8ImplReader::GetStyRule()
const String aName( rDoc.GetUniqueNumRuleName( &aBaseName, false) );
// #i86652#
- sal_uInt16 nRul = rDoc.MakeNumRule( aName, 0, sal_False,
+ sal_uInt16 nRul = rDoc.MakeNumRule( aName, 0, false,
SvxNumberFormat::LABEL_ALIGNMENT );
pStyles->pStyRule = rDoc.GetNumRuleTbl()[nRul];
// Auto == false-> Nummerierungsvorlage
@@ -1000,7 +1000,7 @@ void SwWW8ImplReader::StartAnl(const sal_uInt8* pSprm13)
{
// #i86652#
pNumRule = rDoc.GetNumRuleTbl()[
- rDoc.MakeNumRule( sNumRule, 0, sal_False,
+ rDoc.MakeNumRule( sNumRule, 0, false,
SvxNumberFormat::LABEL_ALIGNMENT ) ];
}
if (pTableDesc)
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index c1b4ac7..c76c7f3 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1039,7 +1039,7 @@ SwNumRule* WW8ListManager::CreateNextRule(bool bSimple)
sPrefix += String::CreateFromInt32(nUniqueList++);
// #i86652#
sal_uInt16 nRul =
- rDoc.MakeNumRule( rDoc.GetUniqueNumRuleName(&sPrefix), 0, sal_False,
+ rDoc.MakeNumRule( rDoc.GetUniqueNumRuleName(&sPrefix), 0, false,
SvxNumberFormat::LABEL_ALIGNMENT );
SwNumRule* pMyNumRule = rDoc.GetNumRuleTbl()[nRul];
pMyNumRule->SetAutoRule(false);
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index 275c3c0..e7a08e1 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -1749,7 +1749,7 @@ void SwDocStyleSheet::Create()
sTmpNm = rDoc.GetUniqueNumRuleName();
SwNumRule* pRule = rDoc.GetNumRuleTbl()[
- rDoc.MakeNumRule( sTmpNm, 0, sal_False,
+ rDoc.MakeNumRule( sTmpNm, 0, false,
// #i89178#
numfunc::GetDefaultPositionAndSpaceMode() ) ];
pRule->SetAutoRule( sal_False );
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 0a2d352..99f315a 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -1983,7 +1983,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
}
}
if ( bCallNumOrNoNum &&
- rSh.NumOrNoNum( !bOnlyBackspaceKey, sal_True ) )
+ rSh.NumOrNoNum( !bOnlyBackspaceKey, true ) )
{
eKeyState = KS_NumOrNoNum;
}
commit f70cf02d9073a2a7557eb01bac401213d5c11314
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Sat Nov 3 12:18:21 2012 +0900
make it static
Change-Id: Iaf29abb4f7067898318476538773663713e09067
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 5329a63..9d94145 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -984,7 +984,7 @@ SwDrawFrmFmt* SwDoc::Insert( const SwPaM &rRg,
frames at character - o.k. if the PaM starts at least at the same position
as the frame
---------------------------------------------------------------------------*/
-bool TstFlyRange( const SwPaM* pPam, const SwPosition* pFlyPos,
+static bool lcl_TstFlyRange( const SwPaM* pPam, const SwPosition* pFlyPos,
RndStdIds nAnchorId )
{
bool bOk = false;
@@ -1042,7 +1042,7 @@ void SwDoc::GetAllFlyFmts( SwPosFlyFrms& rPosFlyFmts,
((FLY_AS_CHAR == rAnchor.GetAnchorId()) && bAsCharAlso)))
{
if( pCmpRange &&
- !TstFlyRange( pCmpRange, pAPos, rAnchor.GetAnchorId() ))
+ !lcl_TstFlyRange( pCmpRange, pAPos, rAnchor.GetAnchorId() ))
continue; // not a valid FlyFrame
pFPos = new SwPosFlyFrm( pAPos->nNode, pFly, rPosFlyFmts.size() );
rPosFlyFmts.insert( pFPos );
More information about the Libreoffice-commits
mailing list