strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sal_Bool to bool

Browse source 
Change-Id: I33bb3e133b49fad6503aace3afda65c3b3371da9
This commit is contained in:
Takeshi Abe 2013-02-22 15:10:30 +09:00
parent d66ade0944
commit 59e8e8151a
10 changed files with 60 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sw/source/ui/dochdl/gloshdl.cxx
View file

@ -437,7 +437,7 @@ sal_Bool SwGlossaryHdl::Expand( const String& rShortName,
{
// get group name with path-extension
String sTitle;
String sGroupName = pGlossaryList->GetGroupName(i - 1, sal_False, &sTitle);
String sGroupName = pGlossaryList->GetGroupName(i - 1, false, &sTitle);
if(sGroupName == pGlossary->GetName())
continue;
sal_uInt16 nBlockCount = pGlossaryList->GetBlockCount(i -1);

2
sw/source/ui/inc/gloslst.hxx
View file

@ -61,7 +61,7 @@ public:
String& rShortName, String& rGroupName );
sal_uInt16 GetGroupCount();
String GetGroupName(sal_uInt16 nPos, sal_Bool bNoPath = sal_True, String* pTitle = 0);
String GetGroupName(sal_uInt16 nPos, bool bNoPath = true, String* pTitle = 0);
sal_uInt16 GetBlockCount(sal_uInt16 nGroup);
String GetBlockName(sal_uInt16 nGroup, sal_uInt16 nBlock, String& rShortName);

2
sw/source/ui/inc/initui.hxx
View file

@ -60,7 +60,7 @@ SW_DLLPUBLIC SwGlossaries* GetGlossaries();
class SwGlossaryList;
sal_Bool HasGlossaryList();
bool HasGlossaryList();
SwGlossaryList* GetGlossaryList();
extern void _InitUI();

4
sw/source/ui/inc/navipi.hxx
View file

@ -150,7 +150,7 @@ public:
void Update() { FillBox(); }
void UpdateListBox();
void MoveOutline(sal_uInt16 nSource, sal_uInt16 nTarget, sal_Bool bWithCilds);
void MoveOutline(sal_uInt16 nSource, sal_uInt16 nTarget, bool bWithCilds);
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
@ -168,7 +168,7 @@ public:
sal_Bool IsGlobalMode() const {return bGlobalMode;}
SwView* GetCreateView() const;
void CreateNavigationTool(const Rectangle& rRect, sal_Bool bSetFocus);
void CreateNavigationTool(const Rectangle& rRect, bool bSetFocus);
};
class SwNavigationChild : public SfxChildWindowContext

2
sw/source/ui/ribbar/workctrl.cxx
View file

@ -304,7 +304,7 @@ IMPL_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu)
SwGlossaryList* pGlossaryList = ::GetGlossaryList();
String sShortName;
String sGroup = pGlossaryList->GetGroupName(nBlock - 1, sal_False);
String sGroup = pGlossaryList->GetGroupName(nBlock - 1, false);
SwGlossaryHdl* pGlosHdl = pView->GetGlosHdl();
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();

58
sw/source/ui/utlui/content.cxx
View file

@ -277,7 +277,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
{
SwContentArr* pOldMember = 0;
sal_uInt16 nOldRegionCount = 0;
sal_Bool bInvalidate = sal_False;
bool bInvalidate = false;
if(!pMember)
pMember = new SwContentArr;
else if(!pMember->empty())
@ -320,7 +320,7 @@ void SwContentType::Init(sal_Bool* pbInvalidateWindow)
if(nOldRegionCount > nPos &&
((*pOldMember)[nPos])->IsInvisible()
!= pCnt->IsInvisible())
bInvalidate = sal_True;
bInvalidate = true;
}
}
nMemberCount = pMember->size();
@ -1030,7 +1030,7 @@ PopupMenu* SwContentTree::CreateContextMenu( void )
const SwContentType* pContType = ((SwContent*)pEntry->GetUserData())->GetParent();
const sal_uInt16 nContentType = pContType->GetType();
sal_Bool bReadonly = pActiveShell->GetView().GetDocShell()->IsReadOnly();
sal_Bool bVisible = !((SwContent*)pEntry->GetUserData())->IsInvisible();
bool bVisible = !((SwContent*)pEntry->GetUserData())->IsInvisible();
sal_Bool bProtected = ((SwContent*)pEntry->GetUserData())->IsProtect();
bool bEditable = pContType->IsEditable() &&
((bVisible && !bProtected) ||CONTENT_TYPE_REGION == nContentType);
@ -1394,7 +1394,7 @@ void SwContentTree::Display( bool bActive )
if(bReadOnly != bIsLastReadOnly)
{
bIsLastReadOnly = bReadOnly;
sal_Bool bDisable = pShell == 0 || bReadOnly;
bool bDisable = pShell == 0 || bReadOnly;
SwNavigationPI* pNavi = GetParentWindow();
pNavi->aContentToolBox.EnableItem(FN_ITEM_UP , !bDisable);
pNavi->aContentToolBox.EnableItem(FN_ITEM_DOWN, !bDisable);
@ -1571,7 +1571,7 @@ bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer,
sal_uInt16 nActType = pCnt->GetParent()->GetType();
String sUrl;
sal_Bool bOutline = sal_False;
bool bOutline = false;
String sOutlineText;
switch( nActType )
{
@ -1605,7 +1605,7 @@ bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer,
sEntry += pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineText(nPos, false);
sOutlineText = pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineText(nPos, true);
bIsOutlineMoveable = ((SwOutlineContent*)pCnt)->IsMoveable();
bOutline = sal_True;
bOutline = true;
}
}
break;
@ -1999,7 +1999,7 @@ void SwContentTree::SetActiveShell(SwWrtShell* pSh)
{
if(bIsInternalDrag)
bDocChgdInDragging = true;
sal_Bool bClear = pActiveShell != pSh;
bool bClear = pActiveShell != pSh;
if(bIsActive && bClear)
{
pActiveShell = pSh;
@ -2013,7 +2013,7 @@ void SwContentTree::SetActiveShell(SwWrtShell* pSh)
pActiveShell = pSh;
bIsActive = true;
bIsConstant = false;
bClear = sal_True;
bClear = true;
}
}
// nur wenn es die aktive View ist, wird das Array geloescht und
@ -2050,11 +2050,11 @@ void SwContentTree::SetConstantShell(SwWrtShell* pSh)
***************************************************************************/
void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier)
{
sal_Bool nMove = sal_False;
bool nMove = false;
switch( nCmd )
{
case FN_ITEM_DOWN:
case FN_ITEM_UP: nMove = sal_True;
case FN_ITEM_UP: nMove = true;
case FN_ITEM_LEFT:
case FN_ITEM_RIGHT:
if( !GetWrtShell()->GetView().GetDocShell()->IsReadOnly() &&
@ -2305,7 +2305,7 @@ sal_Bool SwContentTree::NotifyMoving( SvTreeListEntry* pTarget,
lcl_IsContent(pEntry),"Source == 0 or Source has no Content" );
GetParentWindow()->MoveOutline( nSourcePos,
nTargetPos,
sal_True);
true);
aActiveContentArr[CONTENT_TYPE_OUTLINE]->Invalidate();
Display(true);
@ -2343,7 +2343,7 @@ sal_Bool SwContentTree::NotifyCopying( SvTreeListEntry* pTarget,
OSL_ENSURE( pEntry &&
lcl_IsContent(pEntry),"Source == 0 or Source has no Content" );
GetParentWindow()->MoveOutline( nSourcePos, nTargetPos, sal_False);
GetParentWindow()->MoveOutline( nSourcePos, nTargetPos, false);
//TreeListBox wird aus dem Dokument neu geladen
aActiveContentArr[CONTENT_TYPE_OUTLINE]->Invalidate();
@ -2454,7 +2454,7 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent)
void SwContentTree::RequestHelp( const HelpEvent& rHEvt )
{
sal_Bool bCallBase = sal_True;
bool bCallBase = true;
if( rHEvt.GetMode() & HELPMODE_QUICK )
{
Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() ));
@ -2462,36 +2462,36 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt )
if( pEntry )
{
sal_uInt16 nType;
sal_Bool bBalloon = sal_False;
sal_Bool bContent = sal_False;
bool bBalloon = false;
bool bContent = false;
void* pUserData = pEntry->GetUserData();
if(lcl_IsContentType(pEntry))
nType = ((SwContentType*)pUserData)->GetType();
else
{
nType = ((SwContent*)pUserData)->GetParent()->GetType();
bContent = sal_True;
bContent = true;
}
String sEntry;
sal_Bool bRet = sal_False;
bool bRet = false;
if(bContent)
{
switch( nType )
{
case CONTENT_TYPE_URLFIELD:
sEntry = ((SwURLFieldContent*)pUserData)->GetURL();
bRet = sal_True;
bRet = true;
break;
case CONTENT_TYPE_POSTIT:
sEntry = ((SwPostItContent*)pUserData)->GetName();
bRet = sal_True;
bRet = true;
if(Help::IsBalloonHelpEnabled())
bBalloon = sal_True;
bBalloon = true;
break;
case CONTENT_TYPE_OUTLINE:
sEntry = ((SwOutlineContent*)pUserData)->GetName();
bRet = sal_True;
bRet = true;
break;
case CONTENT_TYPE_GRAPHIC:
sEntry = ((SwGraphicContent*)pUserData)->GetLink();
@ -2500,14 +2500,14 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt )
sEntry += String::CreateFromInt32(
((SwGraphicContent*)pUserData)->GetYPos());
#endif
bRet = sal_True;
bRet = true;
break;
#if OSL_DEBUG_LEVEL > 1
case CONTENT_TYPE_TABLE:
case CONTENT_TYPE_FRAME:
sEntry = String::CreateFromInt32(
((SwContent*)pUserData)->GetYPos() );
bRet = sal_True;
bRet = true;
break;
#endif
}
@ -2516,7 +2516,7 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt )
if(sEntry.Len())
sEntry += rtl::OUString(", ");
sEntry += sInvisible;
bRet = sal_True;
bRet = true;
}
}
else
@ -2527,7 +2527,7 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt )
sEntry += nMemberCount == 1
? ((SwContentType*)pUserData)->GetSingleName()
: ((SwContentType*)pUserData)->GetName();
bRet = sal_True;
bRet = true;
}
if(bRet)
{
@ -2553,13 +2553,13 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt )
else
Help::ShowQuickHelp( this, aItemRect, sEntry,
QUICKHELP_LEFT|QUICKHELP_VCENTER );
bCallBase = sal_False;
bCallBase = false;
}
}
else
{
Help::ShowQuickHelp( this, Rectangle(), aEmptyStr, 0 );
bCallBase = sal_False;
bCallBase = false;
}
}
}
@ -2966,7 +2966,7 @@ void SwContentTree::GotoContent(SwContent* pCnt)
{
pActiveShell->EnterStdMode();
sal_Bool bSel = sal_False;
bool bSel = false;
sal_uInt16 nJumpType = pCnt->GetParent()->GetType();
switch(nJumpType)
{
@ -2985,7 +2985,7 @@ void SwContentTree::GotoContent(SwContent* pCnt)
case CONTENT_TYPE_OLE :
{
if(pActiveShell->GotoFly(pCnt->GetName()))
bSel = sal_True;
bSel = true;
}
break;
case CONTENT_TYPE_BOOKMARK:

24
sw/source/ui/utlui/glbltree.cxx
View file

@ -123,24 +123,24 @@ static const char* aHelpForMenu[] =
class SwGlobalFrameListener_Impl : public SfxListener
{
sal_Bool bValid;
bool bValid;
public:
SwGlobalFrameListener_Impl(SfxViewFrame& rFrame) :
bValid(sal_True)
bValid(true)
{
StartListening(rFrame);
}
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
sal_Bool IsValid() const {return bValid;}
bool IsValid() const {return bValid;}
};
void SwGlobalFrameListener_Impl::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
if( rHint.ISA(SfxSimpleHint) &&
(((SfxSimpleHint&) rHint).GetId() == SFX_HINT_DYING))
bValid = sal_False;
bValid = false;
}
SwGlobalTree::SwGlobalTree(Window* pParent, const ResId& rResId) :
@ -453,7 +453,7 @@ sal_uInt16 SwGlobalTree::GetEnableFlags() const
void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt )
{
sal_Bool bParent = sal_True;
bool bParent = true;
Update(sal_True);
Display(true);
if( rHEvt.GetMode() & HELPMODE_QUICK )
@ -464,7 +464,7 @@ void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt )
(const SwGlblDocContent*)pEntry->GetUserData() : 0;
if( pCont && GLBLDOC_SECTION == pCont->GetType())
{
bParent = sal_False;
bParent = false;
SvLBoxTab* pTab;
SvLBoxItem* pItem = GetItem( pEntry, aPos.X(), &pTab );
if (pItem && SV_ITEM_ID_LBOXSTRING == pItem->GetType())
@ -506,7 +506,7 @@ void SwGlobalTree::SelectHdl()
SvTreeListEntry* pSel = FirstSelected();
sal_uInt16 nAbsPos = pSel ? (sal_uInt16)GetModel()->GetAbsPos(pSel) : 0;
SwNavigationPI* pNavi = GetParentWindow();
sal_Bool bReadonly = !pActiveShell ||
bool bReadonly = !pActiveShell ||
pActiveShell->GetView().GetDocShell()->IsReadOnly();
pNavi->aGlobalToolBox.EnableItem(FN_GLOBAL_EDIT, nSelCount == 1 && !bReadonly);
pNavi->aGlobalToolBox.EnableItem(FN_GLOBAL_OPEN, nSelCount <= 1 && !bReadonly);
@ -1056,7 +1056,7 @@ void SwGlobalTree::ExecCommand(sal_uInt16 nCmd)
{
if(GetSelectionCount() == 1)
{
sal_Bool bMove = sal_False;
bool bMove = false;
sal_uInt16 nSource = (sal_uInt16)GetModel()->GetAbsPos(pEntry);
sal_uInt16 nDest = nSource;
switch(nCmd)
@ -1164,14 +1164,14 @@ void SwGlobalTree::OpenDoc(const SwGlblDocContent* pCont)
{
String sFileName(pCont->GetSection()->GetLinkFileName().GetToken(0,
sfx2::cTokenSeperator));
sal_Bool bFound = sal_False;
bool bFound = false;
const SfxObjectShell* pCurr = SfxObjectShell::GetFirst();
while( !bFound && pCurr )
{
if(pCurr->GetMedium() &&
String(pCurr->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI)) == sFileName)
{
bFound = sal_True;
bFound = true;
SwGlobalTree::SetShowShell(pCurr);
Application::PostUserEvent( STATIC_LINK(
this, SwGlobalTree, ShowFrameHdl ) );
@ -1262,12 +1262,12 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* _pContent, const Sequen
sal_Int32 nFiles = _rFiles.getLength();
if ( nFiles )
{
sal_Bool bMove = sal_False;
bool bMove = false;
if ( !_pContent )
{
SvTreeListEntry* pLast = (SvTreeListEntry*)LastVisible();
_pContent = (SwGlblDocContent*)pLast->GetUserData();
bMove = sal_True;
bMove = true;
}
String sFilePassword;
sal_uInt16 nEntryCount = (sal_uInt16)GetEntryCount();

4
sw/source/ui/utlui/gloslst.cxx
View file

@ -186,7 +186,7 @@ sal_uInt16 SwGlossaryList::GetGroupCount()
return aGroupArr.size();
}
String SwGlossaryList::GetGroupName(sal_uInt16 nPos, sal_Bool bNoPath, String* pTitle)
String SwGlossaryList::GetGroupName(sal_uInt16 nPos, bool bNoPath, String* pTitle)
{
OSL_ENSURE(aGroupArr.size() > nPos, "group not available");
String sRet;
@ -321,7 +321,7 @@ void SwGlossaryList::Update()
// aktuellen Teilpfad registriert sind
if( nGroupPath == static_cast<sal_uInt16>(nPath) )
{
sal_Bool bFound = sal_False;
bool bFound = false;
String sCompareGroup = pGroup->sName.GetToken(0, GLOS_DELIM);
for(std::vector<String>::const_iterator j = aFoundGroupNames.begin(); j != aFoundGroupNames.end() && !bFound; ++j)
bFound = (sCompareGroup == *j);

2
sw/source/ui/utlui/initui.cxx
View file

@ -209,7 +209,7 @@ SwGlossaries* GetGlossaries()
return (pGlossaries);
}
sal_Bool HasGlossaryList()
bool HasGlossaryList()
{
return pGlossaryList != 0;
}

20
sw/source/ui/utlui/navipi.cxx
View file

@ -82,7 +82,7 @@ void SwNavigationPI::CleanEntry( String& rEntry )
------------------------------------------------------------------------*/
void SwNavigationPI::MoveOutline(sal_uInt16 nSource, sal_uInt16 nTarget,
sal_Bool bWithChildren)
bool bWithChildren)
{
SwView *pView = GetCreateView();
SwWrtShell &rSh = pView->GetWrtShell();
@ -227,7 +227,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
// mit Ctrl Unterebenen nicht mitnehmen
sal_Bool bOutlineWithChildren = ( KEY_MOD1 != pBox->GetModifier());
int nFuncId = 0;
sal_Bool bFocusToDoc = sal_False;
bool bFocusToDoc = false;
switch (nCurrItemId)
{
case FN_UP:
@ -270,7 +270,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
}
else if (rSh.GotoFooterTxt())
nFuncId = FN_TO_FOOTER;
bFocusToDoc = sal_True;
bFocusToDoc = true;
}
break;
case FN_SELECT_HEADER:
@ -284,7 +284,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
}
else if (rSh.GotoHeaderTxt())
nFuncId = FN_TO_HEADER;
bFocusToDoc = sal_True;
bFocusToDoc = true;
}
break;
case FN_SELECT_FOOTNOTE:
@ -309,7 +309,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxSelectHdl, ToolBox *, pBox )
else if (rSh.GotoPrevFtnAnchor())
nFuncId = FN_PREV_FOOTNOTE;
}
bFocusToDoc = sal_True;
bFocusToDoc = true;
}
break;
@ -379,7 +379,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox )
{
case FN_CREATE_NAVIGATION:
{
CreateNavigationTool(pBox->GetItemRect(FN_CREATE_NAVIGATION), sal_True);
CreateNavigationTool(pBox->GetItemRect(FN_CREATE_NAVIGATION), true);
}
break;
@ -443,13 +443,13 @@ void SwNavHelpToolBox::MouseButtonDown(const MouseEvent &rEvt)
if(rEvt.GetButtons() == MOUSE_LEFT &&
FN_CREATE_NAVIGATION == GetItemId(rEvt.GetPosPixel()))
{
((SwNavigationPI*)GetParent())->CreateNavigationTool(GetItemRect(FN_CREATE_NAVIGATION), sal_False);
((SwNavigationPI*)GetParent())->CreateNavigationTool(GetItemRect(FN_CREATE_NAVIGATION), false);
}
else
SwHelpToolBox::MouseButtonDown(rEvt);
}
void SwNavigationPI::CreateNavigationTool(const Rectangle& rRect, sal_Bool bSetFocus)
void SwNavigationPI::CreateNavigationTool(const Rectangle& rRect, bool bSetFocus)
{
Reference< XFrame > xFrame = GetCreateView()->GetViewFrame()->GetFrame().GetFrameInterface();
SwScrollNaviPopup* pPopup = new
@ -1066,7 +1066,7 @@ void SwNavigationPI::UpdateListBox()
aDocListBox.SetUpdateMode(sal_False);
aDocListBox.Clear();
SwView *pActView = GetCreateView();
sal_Bool bDisable = pActView == 0;
bool bDisable = pActView == 0;
SwView *pView = SwModule::GetFirstView();
sal_uInt16 nCount = 0;
sal_uInt16 nAct = 0;
@ -1112,7 +1112,7 @@ void SwNavigationPI::UpdateListBox()
sEntry += aStatusArr[ST_HIDDEN - ST_STATUS_FIRST];
sEntry += ')';
aDocListBox.InsertEntry(sEntry);
bDisable = sal_False;
bDisable = false;
}
if(aContentTree.IsActiveView())
{