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

SwEditWin: rename member variables missing their prefix

Browse source 
Change-Id: I8e35a4c5df9bcca2b3cefd1044053185d3133353
This commit is contained in:
Miklos Vajna 2013-03-09 16:25:14 +01:00
parent 66b86df573
commit d273e8bb93
5 changed files with 638 additions and 638 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
sw/source/ui/docvw/edtdd.cxx
View file

@ -52,36 +52,36 @@ bool bExecuteDrag = false;
void SwEditWin::StartDDTimer()
{
aTimer.SetTimeoutHdl(LINK(this, SwEditWin, DDHandler));
aTimer.SetTimeout(480);
aTimer.Start();
m_aTimer.SetTimeoutHdl(LINK(this, SwEditWin, DDHandler));
m_aTimer.SetTimeout(480);
m_aTimer.Start();
bDDTimerStarted = true;
}
void SwEditWin::StopDDTimer(SwWrtShell *pSh, const Point &rPt)
{
aTimer.Stop();
m_aTimer.Stop();
bDDTimerStarted = false;
if(!pSh->IsSelFrmMode())
pSh->SetCursor(&rPt, false);
aTimer.SetTimeoutHdl(LINK(this,SwEditWin, TimerHandler));
m_aTimer.SetTimeoutHdl(LINK(this,SwEditWin, TimerHandler));
}
void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel )
{
SwWrtShell &rSh = rView.GetWrtShell();
SwWrtShell &rSh = m_rView.GetWrtShell();
if( rSh.GetDrawView() )
{
CommandEvent aDragEvent( rPosPixel, COMMAND_STARTDRAG, sal_True );
if( rSh.GetDrawView()->Command( aDragEvent, this ) )
{
rView.GetViewFrame()->GetBindings().InvalidateAll(sal_False);
m_rView.GetViewFrame()->GetBindings().InvalidateAll(sal_False);
return; // Event evaluated by SdrView
}
}
if ( !pApplyTempl && !rSh.IsDrawCreate() && !IsDrawAction())
if ( !m_pApplyTempl && !rSh.IsDrawCreate() && !IsDrawAction())
{
sal_Bool bStart = sal_False, bDelSelect = sal_False;
SdrObject *pObj = NULL;
@ -97,7 +97,7 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel )
bStart = sal_True;
}
else if( !bFrmDrag && rView.GetDocShell()->IsReadOnly() &&
else if( !bFrmDrag && m_rView.GetDocShell()->IsReadOnly() &&
OBJCNT_NONE != rSh.GetObjCntType( aDocPos, pObj ))
{
rSh.LockPaint();
@ -114,15 +114,15 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel )
sal_False );
}
if ( bStart && !bIsInDrag )
if ( bStart && !m_bIsInDrag )
{
bMBPressed = sal_False;
m_bMBPressed = sal_False;
ReleaseMouse();
bFrmDrag = false;
bExecuteDrag = true;
SwEditWin::nDDStartPosY = aDocPos.Y();
SwEditWin::nDDStartPosX = aDocPos.X();
aMovePos = aDocPos;
SwEditWin::m_nDDStartPosY = aDocPos.Y();
SwEditWin::m_nDDStartPosX = aDocPos.X();
m_aMovePos = aDocPos;
StartExecuteDrag();
if( bDelSelect )
{
@ -135,38 +135,38 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel )
void SwEditWin::StartExecuteDrag()
{
if( !bExecuteDrag || bIsInDrag )
if( !bExecuteDrag || m_bIsInDrag )
return;
bIsInDrag = sal_True;
m_bIsInDrag = sal_True;
SwTransferable* pTransfer = new SwTransferable( rView.GetWrtShell() );
SwTransferable* pTransfer = new SwTransferable( m_rView.GetWrtShell() );
uno::Reference<
datatransfer::XTransferable > xRef( pTransfer );
pTransfer->StartDrag( this, aMovePos );
pTransfer->StartDrag( this, m_aMovePos );
}
void SwEditWin::DragFinished()
{
DropCleanup();
aTimer.SetTimeoutHdl( LINK(this,SwEditWin, TimerHandler) );
bIsInDrag = sal_False;
m_aTimer.SetTimeoutHdl( LINK(this,SwEditWin, TimerHandler) );
m_bIsInDrag = sal_False;
}
void SwEditWin::DropCleanup()
{
SwWrtShell &rSh = rView.GetWrtShell();
SwWrtShell &rSh = m_rView.GetWrtShell();
// reset statuses
bNoInterrupt = false;
if ( bOldIdleSet )
if ( m_bOldIdleSet )
{
((SwViewOption*)rSh.GetViewOptions())->SetIdle( bOldIdle );
bOldIdleSet = sal_False;
((SwViewOption*)rSh.GetViewOptions())->SetIdle( m_bOldIdle );
m_bOldIdleSet = sal_False;
}
if ( pUserMarker )
if ( m_pUserMarker )
CleanupDropUserMarker();
else
rSh.UnSetVisCrsr();
@ -175,11 +175,11 @@ void SwEditWin::DropCleanup()
void SwEditWin::CleanupDropUserMarker()
{
if ( pUserMarker )
if ( m_pUserMarker )
{
delete pUserMarker;
pUserMarker = 0;
pUserMarkerObj = 0;
delete m_pUserMarker;
m_pUserMarker = 0;
m_pUserMarkerObj = 0;
}
}
@ -198,7 +198,7 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt )
sal_Int8 nRet = DND_ACTION_NONE;
//A Drop to an open OutlinerView doesn't concern us (also see QueryDrop)
SwWrtShell &rSh = rView.GetWrtShell();
SwWrtShell &rSh = m_rView.GetWrtShell();
const Point aDocPt( PixelToLogic( rEvt.maPosPixel ));
SdrObject *pObj = 0;
OutlinerView* pOLV;
@ -251,7 +251,7 @@ sal_Int8 SwEditWin::ExecuteDrop( const ExecuteDropEvent& rEvt )
sal_uInt16 SwEditWin::GetDropDestination( const Point& rPixPnt, SdrObject ** ppObj )
{
SwWrtShell &rSh = rView.GetWrtShell();
SwWrtShell &rSh = m_rView.GetWrtShell();
const Point aDocPt( PixelToLogic( rPixPnt ) );
if( rSh.ChgCurrPam( aDocPt ) || rSh.IsOverReadOnlyPos( aDocPt ) )
return 0;
@ -332,10 +332,10 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
return rEvt.mnAction;
}
if( rView.GetDocShell()->IsReadOnly() )
if( m_rView.GetDocShell()->IsReadOnly() )
return DND_ACTION_NONE;
SwWrtShell &rSh = rView.GetWrtShell();
SwWrtShell &rSh = m_rView.GetWrtShell();
Point aPixPt( rEvt.maPosPixel );
@ -353,10 +353,10 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
sal_uLong current_tick = Time::GetSystemTicks();
if((current_tick-last_tick) > 500) {
last_tick = current_tick;
if(!bOldIdleSet) {
bOldIdle = rSh.GetViewOptions()->IsIdle();
if(!m_bOldIdleSet) {
m_bOldIdle = rSh.GetViewOptions()->IsIdle();
((SwViewOption *)rSh.GetViewOptions())->SetIdle(sal_False);
bOldIdleSet = sal_True;
m_bOldIdleSet = sal_True;
}
CleanupDropUserMarker();
if(aPixPt.X() > aWin.Right()) aPixPt.X() += nMargin;
@ -369,9 +369,9 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
}
}
if(bOldIdleSet) {
((SwViewOption *)rSh.GetViewOptions())->SetIdle( bOldIdle );
bOldIdleSet = sal_False;
if(m_bOldIdleSet) {
((SwViewOption *)rSh.GetViewOptions())->SetIdle( m_bOldIdle );
m_bOldIdleSet = sal_False;
}
SdrObject *pObj = NULL;
@ -461,14 +461,14 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
{
rSh.UnSetVisCrsr();
if ( pUserMarkerObj != pObj )
if ( m_pUserMarkerObj != pObj )
{
CleanupDropUserMarker();
pUserMarkerObj = pObj;
m_pUserMarkerObj = pObj;
if(pUserMarkerObj)
if(m_pUserMarkerObj)
{
pUserMarker = new SdrDropMarkerOverlay( *rSh.GetDrawView(), *pUserMarkerObj );
m_pUserMarker = new SdrDropMarkerOverlay( *rSh.GetDrawView(), *m_pUserMarkerObj );
}
}
}
@ -484,13 +484,13 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
IMPL_LINK_NOARG(SwEditWin, DDHandler)
{
bDDTimerStarted = false;
aTimer.Stop();
aTimer.SetTimeout(240);
bMBPressed = sal_False;
m_aTimer.Stop();
m_aTimer.SetTimeout(240);
m_bMBPressed = sal_False;
ReleaseMouse();
bFrmDrag = false;
if ( rView.GetViewFrame() )
if ( m_rView.GetViewFrame() )
{
bExecuteDrag = true;
StartExecuteDrag();

1032
sw/source/ui/docvw/edtwin.cxx
View file

File diff suppressed because it is too large Load diff

12
sw/source/ui/docvw/edtwin2.cxx
View file

@ -99,7 +99,7 @@ static void lcl_GetRedlineHelp( const SwRedline& rRedl, String& rTxt, sal_Bool b
void SwEditWin::RequestHelp(const HelpEvent &rEvt)
{
SwWrtShell &rSh = rView.GetWrtShell();
SwWrtShell &rSh = m_rView.GetWrtShell();
bool bQuickBalloon = 0 != (rEvt.GetMode() & ( HELPMODE_QUICK | HELPMODE_BALLOON ));
if(bQuickBalloon && rSh.GetViewOptions()->IsPreventTips())
return;
@ -211,7 +211,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
}
}
// #i80029#
sal_Bool bExecHyperlinks = rView.GetDocShell()->IsReadOnly();
sal_Bool bExecHyperlinks = m_rView.GetDocShell()->IsReadOnly();
if ( !bExecHyperlinks )
{
SvtSecurityOptions aSecOpts;
@ -503,13 +503,13 @@ void SwEditWin::Paint(const Rectangle& rRect)
if(!pWrtShell)
return;
bool bPaintShadowCrsr = false;
if( pShadCrsr )
if( m_pShadCrsr )
{
Rectangle aRect( pShadCrsr->GetRect());
Rectangle aRect( m_pShadCrsr->GetRect());
// fully resides inside?
if( rRect.IsInside( aRect ) )
// dann aufheben
delete pShadCrsr, pShadCrsr = 0;
delete m_pShadCrsr, m_pShadCrsr = 0;
else if( rRect.IsOver( aRect ))
{
// resides somewhat above, then everything is clipped outside
@ -526,7 +526,7 @@ void SwEditWin::Paint(const Rectangle& rRect)
pWrtShell->Paint( rRect );
if( bPaintShadowCrsr )
pShadCrsr->Paint();
m_pShadCrsr->Paint();
}

4
sw/source/ui/docvw/edtwin3.cxx
View file

@ -113,7 +113,7 @@ void FrameNotify( ViewShell* pVwSh, FlyMode eMode )
--------------------------------------------------------------------*/
sal_Bool SwEditWin::RulerColumnDrag( const MouseEvent& rMEvt, sal_Bool bVerticalMode)
{
SvxRuler& rRuler = bVerticalMode ? rView.GetVLineal() : rView.GetHLineal();
SvxRuler& rRuler = bVerticalMode ? m_rView.GetVLineal() : m_rView.GetHLineal();
return (!rRuler.StartDocDrag( rMEvt, RULER_TYPE_BORDER ) &&
!rRuler.StartDocDrag( rMEvt, RULER_TYPE_MARGIN1) &&
!rRuler.StartDocDrag( rMEvt, RULER_TYPE_MARGIN2));
@ -125,7 +125,7 @@ sal_Bool SwEditWin::RulerColumnDrag( const MouseEvent& rMEvt, sal_Bool bVertical
sal_Bool SwEditWin::RulerMarginDrag( const MouseEvent& rMEvt,
const bool bVerticalMode )
{
SvxRuler& rRuler = bVerticalMode ? rView.GetVLineal() : rView.GetHLineal();
SvxRuler& rRuler = bVerticalMode ? m_rView.GetVLineal() : m_rView.GetHLineal();
return !rRuler.StartDocDrag( rMEvt, RULER_TYPE_INDENT);
}

134
sw/source/ui/inc/edtwin.hxx
View file

@ -69,13 +69,13 @@ friend void PageNumNotify( ViewShell* pVwSh,
sal_uInt16 nVirtNum,
const String& rPg );
static QuickHelpData* pQuickHlpData;
static QuickHelpData* m_pQuickHlpData;
static long nDDStartPosX, nDDStartPosY;
static long m_nDDStartPosX, m_nDDStartPosY;
static Color aTextColor; // text color; for the watering can
static bool bTransparentBackColor; // transparent background
static Color aTextBackColor; // text background; for the watering can
static Color m_aTextColor; // text color; for the watering can
static bool m_bTransparentBackColor; // transparent background
static Color m_aTextBackColor; // text background; for the watering can
/*
* timer and handler for scrolling on when the mousepointer
@ -83,62 +83,62 @@ friend void PageNumNotify( ViewShell* pVwSh,
* The selection is increased towards the mouse position
* regularly.
*/
AutoTimer aTimer;
AutoTimer m_aTimer;
// timer for overlapping KeyInputs (e.g. for tables)
Timer aKeyInputTimer;
Timer m_aKeyInputTimer;
// timer for ANY-KeyInut question without a following KeyInputEvent
Timer aKeyInputFlushTimer;
Timer m_aKeyInputFlushTimer;
String aInBuffer;
LanguageType eBufferLanguage;
Point aStartPos;
Point aMovePos;
Point aRszMvHdlPt;
Timer aTemplateTimer;
String m_aInBuffer;
LanguageType m_eBufferLanguage;
Point m_aStartPos;
Point m_aMovePos;
Point m_aRszMvHdlPt;
Timer m_aTemplateTimer;
// type/object where the mouse pointer is
SwCallMouseEvent aSaveCallEvent;
SwCallMouseEvent m_aSaveCallEvent;
SwApplyTemplate *pApplyTempl;
SwAnchorMarker *pAnchorMarker; // for relocating the anchor
SwApplyTemplate *m_pApplyTempl;
SwAnchorMarker *m_pAnchorMarker; // for relocating the anchor
SdrDropMarkerOverlay *pUserMarker;
SdrObject *pUserMarkerObj;
SwShadowCursor *pShadCrsr;
Point *pRowColumnSelectionStart; // save position where table row/column selection has been started
SdrDropMarkerOverlay *m_pUserMarker;
SdrObject *m_pUserMarkerObj;
SwShadowCursor *m_pShadCrsr;
Point *m_pRowColumnSelectionStart; // save position where table row/column selection has been started
SwView &rView;
SwView &m_rView;
int aActHitType; // current mouse pointer
int m_aActHitType; // current mouse pointer
sal_uLong m_nDropFormat; // format from the last QueryDrop
sal_uInt16 m_nDropAction; // action from the last QueryDrop
sal_uInt16 m_nDropDestination; // destination from the last QueryDrop
sal_uInt16 eBezierMode;
sal_uInt16 nInsFrmColCount; // column number for interactive frame
SdrObjKind eDrawMode;
sal_Bool bMBPressed : 1,
bInsDraw : 1,
bInsFrm : 1,
bIsInMove : 1,
bIsInDrag : 1, // don't execute StartExecuteDrag twice
bOldIdle : 1, // to stop to idle
bOldIdleSet : 1, // during QeueryDrop
bTblInsDelMode : 1, //
bTblIsInsMode : 1, //
bChainMode : 1, // connect frames
bWasShdwCrsr : 1, // ShadowCrsr was on in MouseButtonDown
bLockInput : 1, // lock while calc panel is active
bIsRowDrag : 1, //selection of rows is used, in combination with pRowColumnSelectionStart
sal_uInt16 m_eBezierMode;
sal_uInt16 m_nInsFrmColCount; // column number for interactive frame
SdrObjKind m_eDrawMode;
sal_Bool m_bMBPressed : 1,
m_bInsDraw : 1,
m_bInsFrm : 1,
m_bIsInMove : 1,
m_bIsInDrag : 1, // don't execute StartExecuteDrag twice
m_bOldIdle : 1, // to stop to idle
m_bOldIdleSet : 1, // during QeueryDrop
m_bTblInsDelMode : 1, //
m_bTblIsInsMode : 1, //
m_bChainMode : 1, // connect frames
m_bWasShdwCrsr : 1, // ShadowCrsr was on in MouseButtonDown
m_bLockInput : 1, // lock while calc panel is active
m_bIsRowDrag : 1, //selection of rows is used, in combination with m_pRowColumnSelectionStart
/** #i42732# display status of font size/name depending on either the input language or the
selection position depending on what has changed lately
*/
bUseInputLanguage: 1,
bObjectSelect : 1;
m_bUseInputLanguage: 1,
m_bObjectSelect : 1;
sal_uInt16 nKS_NUMDOWN_Count; // #i23725#
sal_uInt16 nKS_NUMINDENTINC_Count;
sal_uInt16 m_nKS_NUMDOWN_Count; // #i23725#
sal_uInt16 m_nKS_NUMINDENTINC_Count;
SwFrameControlsManager m_aFrameControlsManager;
@ -222,60 +222,60 @@ public:
void UpdatePointer(const Point &, sal_uInt16 nButtons = 0);
sal_Bool IsDrawSelMode();
sal_Bool IsDrawAction() { return (bInsDraw); }
void SetDrawAction(sal_Bool bFlag) { bInsDraw = bFlag; }
sal_Bool IsDrawAction() { return (m_bInsDraw); }
void SetDrawAction(sal_Bool bFlag) { m_bInsDraw = bFlag; }
void SetObjectSelect( sal_Bool bVal ) { bObjectSelect = bVal; }
sal_Bool IsObjectSelect() const { return bObjectSelect; }
void SetObjectSelect( sal_Bool bVal ) { m_bObjectSelect = bVal; }
sal_Bool IsObjectSelect() const { return m_bObjectSelect; }
inline SdrObjKind GetSdrDrawMode(/*sal_Bool bBuf = sal_False*/) const { return eDrawMode; }
inline void SetSdrDrawMode( SdrObjKind eSdrObjectKind ) { eDrawMode = eSdrObjectKind; SetObjectSelect( sal_False ); }
inline SdrObjKind GetSdrDrawMode(/*sal_Bool bBuf = sal_False*/) const { return m_eDrawMode; }
inline void SetSdrDrawMode( SdrObjKind eSdrObjectKind ) { m_eDrawMode = eSdrObjectKind; SetObjectSelect( sal_False ); }
void StdDrawMode( SdrObjKind eSdrObjectKind, sal_Bool bObjSelect );
sal_Bool IsFrmAction() { return (bInsFrm); }
inline sal_uInt16 GetBezierMode() { return eBezierMode; }
void SetBezierMode(sal_uInt16 eBezMode) { eBezierMode = eBezMode; }
sal_Bool IsFrmAction() { return (m_bInsFrm); }
inline sal_uInt16 GetBezierMode() { return m_eBezierMode; }
void SetBezierMode(sal_uInt16 eBezMode) { m_eBezierMode = eBezMode; }
void EnterDrawTextMode(const Point& aDocPos); // turn on DrawTextEditMode
void InsFrm(sal_uInt16 nCols);
void StopInsFrm();
sal_uInt16 GetFrmColCount() const {return nInsFrmColCount;} // column number for interactive frame
sal_uInt16 GetFrmColCount() const {return m_nInsFrmColCount;} // column number for interactive frame
void SetChainMode( sal_Bool bOn );
sal_Bool IsChainMode() const { return bChainMode; }
sal_Bool IsChainMode() const { return m_bChainMode; }
void FlushInBuffer();
sal_Bool IsInputSequenceCheckingRequired( const String &rText, const SwPaM& rCrsr ) const;
void SetApplyTemplate(const SwApplyTemplate &);
SwApplyTemplate* GetApplyTemplate() const { return pApplyTempl; }
SwApplyTemplate* GetApplyTemplate() const { return m_pApplyTempl; }
void StartExecuteDrag();
void DragFinished();
sal_uInt16 GetDropAction() const { return m_nDropAction; }
sal_uLong GetDropFormat() const { return m_nDropFormat; }
Color GetTextColor() { return aTextColor; }
Color GetTextColor() { return m_aTextColor; }
void SetTextColor(const Color& rCol ) { aTextColor = rCol; }
void SetTextColor(const Color& rCol ) { m_aTextColor = rCol; }
Color GetTextBackColor()
{ return aTextBackColor; }
{ return m_aTextBackColor; }
void SetTextBackColor(const Color& rCol )
{ aTextBackColor = rCol; }
{ m_aTextBackColor = rCol; }
void SetTextBackColorTransparent(bool bSet)
{ bTransparentBackColor = bSet; }
{ m_bTransparentBackColor = bSet; }
bool IsTextBackColorTransparent()
{ return bTransparentBackColor; }
void LockKeyInput(sal_Bool bSet){bLockInput = bSet;}
{ return m_bTransparentBackColor; }
void LockKeyInput(sal_Bool bSet){m_bLockInput = bSet;}
const SwView &GetView() const { return rView; }
SwView &GetView() { return rView; }
const SwView &GetView() const { return m_rView; }
SwView &GetView() { return m_rView; }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
static inline long GetDDStartPosX() { return nDDStartPosX; }
static inline long GetDDStartPosY() { return nDDStartPosY; }
static inline long GetDDStartPosX() { return m_nDDStartPosX; }
static inline long GetDDStartPosY() { return m_nDDStartPosY; }
static void _InitStaticData();
static void _FinitStaticData();
@ -291,7 +291,7 @@ public:
language or the selection position depending on what has changed lately
*/
void SetUseInputLanguage( sal_Bool bNew );
sal_Bool IsUseInputLanguage() const { return bUseInputLanguage; }
sal_Bool IsUseInputLanguage() const { return m_bUseInputLanguage; }
SwFrameControlsManager& GetFrameControlsManager() { return m_aFrameControlsManager; }