Kaydet (Commit) eed249f5 authored tarafından Takeshi Abe's avatar Takeshi Abe

sal_Bool to bool

Change-Id: I36603ac94b190a67b61b63b5ae0d981c09fcb270
üst 8600bc24
......@@ -114,9 +114,9 @@
#include <swserv.hxx>
#include <switerator.hxx>
extern sal_Bool bFrmDrag;
extern sal_Bool bDDINetAttr;
extern sal_Bool bExecuteDrag;
extern bool bFrmDrag;
extern bool bDDINetAttr;
extern bool bExecuteDrag;
#define OLESIZE 11905 - 2 * lMinBorder, 6 * MM50
......@@ -1940,7 +1940,7 @@ void SwTransferable::SetSelInShell( SwWrtShell& rSh, sal_Bool bSelectFrm,
{
rSh.HideCrsr();
rSh.EnterSelFrmMode( pPt );
bFrmDrag = sal_True;
bFrmDrag = true;
}
}
}
......@@ -1951,7 +1951,7 @@ void SwTransferable::SetSelInShell( SwWrtShell& rSh, sal_Bool bSelectFrm,
rSh.UnSelectFrm();
rSh.LeaveSelFrmMode();
rSh.GetView().GetEditWin().StopInsFrm();
bFrmDrag = sal_False;
bFrmDrag = false;
}
else if( rSh.GetView().GetDrawFuncPtr() )
rSh.GetView().GetEditWin().StopInsFrm();
......@@ -3142,7 +3142,7 @@ int SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
{
rSh.HideCrsr();
rSh.EnterSelFrmMode( &rDragPt );
bFrmDrag = sal_True;
bFrmDrag = true;
}
const int nSelection = rSh.GetSelectionType();
......@@ -3164,7 +3164,7 @@ int SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
rSh.LeaveSelFrmMode();
rSh.UnSelectFrm();
rSh.ShowCrsr();
bFrmDrag = sal_False;
bFrmDrag = false;
}
}
}
......@@ -3270,7 +3270,7 @@ int SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
// is there an URL attribute at the insert point? Then replace that,
// so simply put up a selection?
rSh.DelINetAttrWithText();
bDDINetAttr = sal_True;
bDDINetAttr = true;
}
if ( rSrcSh.IsSelFrmMode() )
......
......@@ -45,24 +45,24 @@ using namespace ::com::sun::star;
// no include "dbgoutsw.hxx" here!!!!!!
extern bool bNoInterrupt;
extern sal_Bool bFrmDrag;
extern sal_Bool bDDTimerStarted;
extern bool bFrmDrag;
extern bool bDDTimerStarted;
sal_Bool bExecuteDrag = sal_False;
bool bExecuteDrag = false;
void SwEditWin::StartDDTimer()
{
aTimer.SetTimeoutHdl(LINK(this, SwEditWin, DDHandler));
aTimer.SetTimeout(480);
aTimer.Start();
bDDTimerStarted = sal_True;
bDDTimerStarted = true;
}
void SwEditWin::StopDDTimer(SwWrtShell *pSh, const Point &rPt)
{
aTimer.Stop();
bDDTimerStarted = sal_False;
bDDTimerStarted = false;
if(!pSh->IsSelFrmMode())
pSh->SetCursor(&rPt, false);
aTimer.SetTimeoutHdl(LINK(this,SwEditWin, TimerHandler));
......@@ -118,8 +118,8 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel )
{
bMBPressed = sal_False;
ReleaseMouse();
bFrmDrag = sal_False;
bExecuteDrag = sal_True;
bFrmDrag = false;
bExecuteDrag = true;
SwEditWin::nDDStartPosY = aDocPos.Y();
SwEditWin::nDDStartPosX = aDocPos.X();
aMovePos = aDocPos;
......@@ -483,16 +483,16 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
IMPL_LINK_NOARG(SwEditWin, DDHandler)
{
bDDTimerStarted = sal_False;
bDDTimerStarted = false;
aTimer.Stop();
aTimer.SetTimeout(240);
bMBPressed = sal_False;
ReleaseMouse();
bFrmDrag = sal_False;
bFrmDrag = false;
if ( rView.GetViewFrame() )
{
bExecuteDrag = sal_True;
bExecuteDrag = true;
StartExecuteDrag();
}
return 0;
......
This diff is collapsed.
......@@ -74,7 +74,7 @@ friend void PageNumNotify( ViewShell* pVwSh,
static long nDDStartPosX, nDDStartPosY;
static Color aTextColor; // text color; for the watering can
static sal_Bool bTransparentBackColor; // transparent background
static bool bTransparentBackColor; // transparent background
static Color aTextBackColor; // text background; for the watering can
/*
......@@ -265,9 +265,9 @@ public:
{ return aTextBackColor; }
void SetTextBackColor(const Color& rCol )
{ aTextBackColor = rCol; }
void SetTextBackColorTransparent(sal_Bool bSet)
void SetTextBackColorTransparent(bool bSet)
{ bTransparentBackColor = bSet; }
sal_Bool IsTextBackColorTransparent()
bool IsTextBackColorTransparent()
{ return bTransparentBackColor; }
void LockKeyInput(sal_Bool bSet){bLockInput = bSet;}
......
......@@ -118,7 +118,7 @@ void SwView::Activate(sal_Bool bMDIActivate)
void SwView::Deactivate(sal_Bool bMDIActivate)
{
extern sal_Bool bFlushCharBuffer ;
extern bool bFlushCharBuffer ;
// Befinden sich noch Zeichen im Input Buffer?
if( bFlushCharBuffer )
GetEditWin().FlushInBuffer();
......
......@@ -203,7 +203,7 @@ public:
static sal_Bool IsInModalMode();
static sal_uInt16 GetDispatchLevel();
static sal_Bool AnyInput( sal_uInt16 nType = VCL_INPUT_ANY );
static bool AnyInput( sal_uInt16 nType = VCL_INPUT_ANY );
static sal_uLong GetLastInputInterval();
static sal_Bool IsUICaptured();
......
......@@ -539,9 +539,9 @@ sal_uInt16 Application::GetDispatchLevel()
// -----------------------------------------------------------------------
sal_Bool Application::AnyInput( sal_uInt16 nType )
bool Application::AnyInput( sal_uInt16 nType )
{
return (sal_Bool)ImplGetSVData()->mpDefInst->AnyInput( nType );
return ImplGetSVData()->mpDefInst->AnyInput( nType );
}
// -----------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment