Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
bcefd5cd
Kaydet (Commit)
bcefd5cd
authored
Mar 14, 2015
tarafından
Miklos Vajna
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
SwWrtShell: rename member variables missing their prefixes
Change-Id: I78ae647cca9167e130592fd11b8dd15c512a2353
üst
5e999832
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
251 additions
and
251 deletions
+251
-251
wrtsh.hxx
sw/source/uibase/inc/wrtsh.hxx
+55
-55
move.cxx
sw/source/uibase/wrtsh/move.cxx
+54
-54
select.cxx
sw/source/uibase/wrtsh/select.cxx
+98
-98
wrtsh1.cxx
sw/source/uibase/wrtsh/wrtsh1.cxx
+29
-29
wrtsh2.cxx
sw/source/uibase/wrtsh/wrtsh2.cxx
+4
-4
wrtsh3.cxx
sw/source/uibase/wrtsh/wrtsh3.cxx
+9
-9
wrtundo.cxx
sw/source/uibase/wrtsh/wrtundo.cxx
+2
-2
No files found.
sw/source/uibase/inc/wrtsh.hxx
Dosyayı görüntüle @
bcefd5cd
...
...
@@ -94,19 +94,19 @@ private:
typedef
long
(
SwWrtShell
::*
SELECTFUNC
)(
const
Point
*
,
bool
bProp
);
SELECTFUNC
fnDrag
;
SELECTFUNC
fnSetCrsr
;
SELECTFUNC
fnEndDrag
;
SELECTFUNC
fnKillSel
;
SELECTFUNC
m_
fnDrag
;
SELECTFUNC
m_
fnSetCrsr
;
SELECTFUNC
m_
fnEndDrag
;
SELECTFUNC
m_
fnKillSel
;
public
:
using
SwEditShell
::
Insert
;
long
SetCursor
(
const
Point
*
pPt
,
bool
bProp
)
{
return
(
this
->*
fnSetCrsr
)(
pPt
,
bProp
);
}
long
Drag
(
const
Point
*
pPt
,
bool
bProp
)
{
return
(
this
->*
fnDrag
)(
pPt
,
bProp
);
}
long
EndDrag
(
const
Point
*
pPt
,
bool
bProp
)
{
return
(
this
->*
fnEndDrag
)(
pPt
,
bProp
);
}
long
KillSelection
(
const
Point
*
pPt
,
bool
bProp
)
{
return
(
this
->*
fnKillSel
)(
pPt
,
bProp
);
}
long
SetCursor
(
const
Point
*
pPt
,
bool
bProp
)
{
return
(
this
->*
m_
fnSetCrsr
)(
pPt
,
bProp
);
}
long
Drag
(
const
Point
*
pPt
,
bool
bProp
)
{
return
(
this
->*
m_
fnDrag
)(
pPt
,
bProp
);
}
long
EndDrag
(
const
Point
*
pPt
,
bool
bProp
)
{
return
(
this
->*
m_
fnEndDrag
)(
pPt
,
bProp
);
}
long
KillSelection
(
const
Point
*
pPt
,
bool
bProp
)
{
return
(
this
->*
m_
fnKillSel
)(
pPt
,
bProp
);
}
// reset all selections
long
ResetSelect
(
const
Point
*
,
bool
);
...
...
@@ -115,45 +115,45 @@ public:
inline
void
ResetCursorStack
();
SelectionType
GetSelectionType
()
const
;
bool
IsModePushed
()
const
{
return
0
!=
pModeStack
;
}
bool
IsModePushed
()
const
{
return
0
!=
m_
pModeStack
;
}
void
PushMode
();
void
PopMode
();
void
SttSelect
();
void
EndSelect
();
bool
IsInSelect
()
const
{
return
bInSelect
;
}
void
SetInSelect
(
bool
bSel
=
true
)
{
bInSelect
=
bSel
;
}
bool
IsInSelect
()
const
{
return
m_
bInSelect
;
}
void
SetInSelect
(
bool
bSel
=
true
)
{
m_
bInSelect
=
bSel
;
}
// is there a text- or frameselection?
bool
HasSelection
()
const
{
return
SwCrsrShell
::
HasSelection
()
||
IsMultiSelection
()
||
IsSelFrmMode
()
||
IsObjSelected
();
}
bool
Pop
(
bool
bOldCrsr
=
true
);
void
EnterStdMode
();
bool
IsStdMode
()
const
{
return
!
bExtMode
&&
!
bAddMode
&&
!
bBlockMode
;
}
bool
IsStdMode
()
const
{
return
!
m_bExtMode
&&
!
m_bAddMode
&&
!
m_
bBlockMode
;
}
void
EnterExtMode
();
void
LeaveExtMode
();
bool
ToggleExtMode
();
bool
IsExtMode
()
const
{
return
bExtMode
;
}
bool
IsExtMode
()
const
{
return
m_
bExtMode
;
}
void
EnterAddMode
();
void
LeaveAddMode
();
bool
ToggleAddMode
();
bool
IsAddMode
()
const
{
return
bAddMode
;
}
bool
IsAddMode
()
const
{
return
m_
bAddMode
;
}
void
EnterBlockMode
();
void
LeaveBlockMode
();
bool
ToggleBlockMode
();
bool
IsBlockMode
()
const
{
return
bBlockMode
;
}
bool
IsBlockMode
()
const
{
return
m_
bBlockMode
;
}
void
SetInsMode
(
bool
bOn
=
true
);
void
ToggleInsMode
()
{
SetInsMode
(
!
bIns
);
}
bool
IsInsMode
()
const
{
return
bIns
;
}
void
ToggleInsMode
()
{
SetInsMode
(
!
m_
bIns
);
}
bool
IsInsMode
()
const
{
return
m_
bIns
;
}
void
SetRedlineModeAndCheckInsMode
(
sal_uInt16
eMode
);
void
EnterSelFrmMode
(
const
Point
*
pStartDrag
=
0
);
void
LeaveSelFrmMode
();
bool
IsSelFrmMode
()
const
{
return
bLayoutMode
;
}
bool
IsSelFrmMode
()
const
{
return
m_
bLayoutMode
;
}
// reset selection of frames
void
UnSelectFrm
();
...
...
@@ -164,9 +164,9 @@ public:
inline
void
EndSelTblCells
();
// leave per word or per line selection mode. Is usually called in MB-Up.
bool
IsExtSel
()
const
{
return
bSelWrd
||
bSelLn
;
}
bool
IsExtSel
()
const
{
return
m_bSelWrd
||
m_
bSelLn
;
}
// query whether the active fnDrag pointer is set to BeginDrag
// query whether the active
m_
fnDrag pointer is set to BeginDrag
// is needed for MouseMove to work around bugs 55592/55931
inline
bool
Is_FnDragEQBeginDrag
()
const
;
...
...
@@ -254,8 +254,8 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
void
NoEdit
(
bool
bHideCrsr
=
true
);
void
Edit
();
bool
IsRetainSelection
()
const
{
return
mbRetainSelection
;
}
void
SetRetainSelection
(
bool
bRet
)
{
mbRetainSelection
=
bRet
;
}
bool
IsRetainSelection
()
const
{
return
m
_
bRetainSelection
;
}
void
SetRetainSelection
(
bool
bRet
)
{
m
_
bRetainSelection
=
bRet
;
}
// change current data base and notify
void
ChgDBData
(
const
SwDBData
&
SwDBData
);
...
...
@@ -412,8 +412,8 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
bool
SelectNextPrevHyperlink
(
bool
bNext
=
true
);
// determine corresponding SwView
const
SwView
&
GetView
()
const
{
return
rView
;
}
SwView
&
GetView
()
{
return
rView
;
}
const
SwView
&
GetView
()
const
{
return
m_
rView
;
}
SwView
&
GetView
()
{
return
m_
rView
;
}
// Because nobody else is doing it, here is a ExecMacro()
void
ExecMacro
(
const
SvxMacro
&
rMacro
,
OUString
*
pRet
=
0
,
SbxArray
*
pArgs
=
0
);
...
...
@@ -455,7 +455,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
OUString
GetSelDescr
()
const
;
SwNavigationMgr
&
GetNavigationMgr
()
{
return
aNavigationMgr
;
}
SwNavigationMgr
&
GetNavigationMgr
()
{
return
m_
aNavigationMgr
;
}
void
addCurrentPosition
();
bool
GotoFly
(
const
OUString
&
rName
,
FlyCntType
eType
=
FLYCNTTYPE_ALL
,
...
...
@@ -493,7 +493,7 @@ private:
bExt
(
_bExt
),
bIns
(
_bIns
)
{}
}
*
pModeStack
;
}
*
m_
pModeStack
;
// carry cursor along when PageUp / -Down
enum
PageMove
...
...
@@ -501,7 +501,7 @@ private:
MV_NO
,
MV_PAGE_UP
,
MV_PAGE_DOWN
}
ePageMove
;
}
m_
ePageMove
;
struct
CrsrStack
{
...
...
@@ -522,14 +522,14 @@ private:
}
}
*
pCrsrStack
;
}
*
m_
pCrsrStack
;
SwView
&
rView
;
SwNavigationMgr
aNavigationMgr
;
SwView
&
m_
rView
;
SwNavigationMgr
m_
aNavigationMgr
;
Point
aDest
;
bool
bDestOnStack
;
bool
HasCrsrStack
()
const
{
return
0
!=
pCrsrStack
;
}
Point
m_
aDest
;
bool
m_
bDestOnStack
;
bool
HasCrsrStack
()
const
{
return
0
!=
m_
pCrsrStack
;
}
SAL_DLLPRIVATE
bool
PushCrsr
(
SwTwips
lOffset
,
bool
bSelect
);
SAL_DLLPRIVATE
bool
PopCrsr
(
bool
bUpdate
,
bool
bSelect
=
false
);
...
...
@@ -547,21 +547,21 @@ private:
SAL_DLLPRIVATE
bool
_BwdPara
();
// selections
bool
bIns
:
1
;
bool
bInSelect
:
1
;
bool
bExtMode
:
1
;
bool
bAddMode
:
1
;
bool
bBlockMode
:
1
;
bool
bLayoutMode
:
1
;
bool
bCopy
:
1
;
bool
bSelWrd
:
1
;
bool
bSelLn
:
1
;
bool
bIsInClickToEdit
:
1
;
bool
bClearMark
:
1
;
// don't delete selection for ChartAutoPilot
bool
mbRetainSelection
:
1
;
// Do not remove selections
Point
aStart
;
Link
aSelTblLink
;
bool
m_
bIns
:
1
;
bool
m_
bInSelect
:
1
;
bool
m_
bExtMode
:
1
;
bool
m_
bAddMode
:
1
;
bool
m_
bBlockMode
:
1
;
bool
m_
bLayoutMode
:
1
;
bool
m_
bCopy
:
1
;
bool
m_
bSelWrd
:
1
;
bool
m_
bSelLn
:
1
;
bool
m_
bIsInClickToEdit
:
1
;
bool
m_
bClearMark
:
1
;
// don't delete selection for ChartAutoPilot
bool
m
_
bRetainSelection
:
1
;
// Do not remove selections
Point
m_
aStart
;
Link
m_
aSelTblLink
;
// resets the cursor stack after movement by PageUp/-Down
SAL_DLLPRIVATE
void
_ResetCursorStack
();
...
...
@@ -593,7 +593,7 @@ private:
SAL_DLLPRIVATE
long
AddLeaveSelect
(
const
Point
*
,
bool
bProp
=
false
);
SAL_DLLPRIVATE
long
Ignore
(
const
Point
*
,
bool
bProp
=
false
);
SAL_DLLPRIVATE
void
LeaveExtSel
()
{
bSelWrd
=
bSelLn
=
false
;}
SAL_DLLPRIVATE
void
LeaveExtSel
()
{
m_bSelWrd
=
m_
bSelLn
=
false
;}
SAL_DLLPRIVATE
bool
GoStart
(
bool
KeepArea
=
false
,
bool
*
=
0
,
bool
bSelect
=
false
,
bool
bDontMoveRegion
=
false
);
...
...
@@ -619,24 +619,24 @@ inline void SwWrtShell::ResetCursorStack()
inline
void
SwWrtShell
::
SelTblCells
(
const
Link
&
rLink
,
bool
bMark
)
{
SetSelTblCells
(
true
);
bClearMark
=
bMark
;
aSelTblLink
=
rLink
;
m_
bClearMark
=
bMark
;
m_
aSelTblLink
=
rLink
;
}
inline
void
SwWrtShell
::
EndSelTblCells
()
{
SetSelTblCells
(
false
);
bClearMark
=
true
;
m_
bClearMark
=
true
;
}
inline
bool
SwWrtShell
::
IsInClickToEdit
()
const
{
return
bIsInClickToEdit
;
}
inline
bool
SwWrtShell
::
IsInClickToEdit
()
const
{
return
m_
bIsInClickToEdit
;
}
inline
bool
SwWrtShell
::
Is_FnDragEQBeginDrag
()
const
{
#ifdef __GNUC__
SELECTFUNC
fnTmp
=
&
SwWrtShell
::
BeginDrag
;
return
fnDrag
==
fnTmp
;
return
m_
fnDrag
==
fnTmp
;
#else
return
fnDrag
==
&
SwWrtShell
::
BeginDrag
;
return
m_
fnDrag
==
&
SwWrtShell
::
BeginDrag
;
#endif
}
...
...
sw/source/uibase/wrtsh/move.cxx
Dosyayı görüntüle @
bcefd5cd
...
...
@@ -74,7 +74,7 @@ void SwWrtShell::MoveCrsr( bool bWithSelect )
else
{
EndSelect
();
(
this
->*
fnKillSel
)(
0
,
false
);
(
this
->*
m_
fnKillSel
)(
0
,
false
);
}
}
...
...
@@ -100,7 +100,7 @@ bool SwWrtShell::Left( sal_uInt16 nMode, bool bSelect,
{
Point
aTmp
(
VisArea
().
Pos
()
);
aTmp
.
X
()
-=
VisArea
().
Width
()
*
nReadOnlyScrollOfst
/
100
;
rView
.
SetVisArea
(
aTmp
);
m_
rView
.
SetVisArea
(
aTmp
);
return
true
;
}
else
...
...
@@ -117,8 +117,8 @@ bool SwWrtShell::Right( sal_uInt16 nMode, bool bSelect,
{
Point
aTmp
(
VisArea
().
Pos
()
);
aTmp
.
X
()
+=
VisArea
().
Width
()
*
nReadOnlyScrollOfst
/
100
;
aTmp
.
X
()
=
rView
.
SetHScrollMax
(
aTmp
.
X
()
);
rView
.
SetVisArea
(
aTmp
);
aTmp
.
X
()
=
m_
rView
.
SetHScrollMax
(
aTmp
.
X
()
);
m_
rView
.
SetVisArea
(
aTmp
);
return
true
;
}
else
...
...
@@ -134,7 +134,7 @@ bool SwWrtShell::Up( bool bSelect, sal_uInt16 nCount, bool bBasicCall )
{
Point
aTmp
(
VisArea
().
Pos
()
);
aTmp
.
Y
()
-=
VisArea
().
Height
()
*
nReadOnlyScrollOfst
/
100
;
rView
.
SetVisArea
(
aTmp
);
m_
rView
.
SetVisArea
(
aTmp
);
return
true
;
}
...
...
@@ -148,8 +148,8 @@ bool SwWrtShell::Down( bool bSelect, sal_uInt16 nCount, bool bBasicCall )
{
Point
aTmp
(
VisArea
().
Pos
()
);
aTmp
.
Y
()
+=
VisArea
().
Height
()
*
nReadOnlyScrollOfst
/
100
;
aTmp
.
Y
()
=
rView
.
SetVScrollMax
(
aTmp
.
Y
()
);
rView
.
SetVisArea
(
aTmp
);
aTmp
.
Y
()
=
m_
rView
.
SetVScrollMax
(
aTmp
.
Y
()
);
m_
rView
.
SetVisArea
(
aTmp
);
return
true
;
}
...
...
@@ -163,7 +163,7 @@ bool SwWrtShell::LeftMargin( bool bSelect, bool bBasicCall )
{
Point
aTmp
(
VisArea
().
Pos
()
);
aTmp
.
X
()
=
DOCUMENTBORDER
;
rView
.
SetVisArea
(
aTmp
);
m_
rView
.
SetVisArea
(
aTmp
);
return
true
;
}
else
...
...
@@ -181,7 +181,7 @@ bool SwWrtShell::RightMargin( bool bSelect, bool bBasicCall )
aTmp
.
X
()
=
GetDocSize
().
Width
()
-
VisArea
().
Width
()
+
DOCUMENTBORDER
;
if
(
DOCUMENTBORDER
>
aTmp
.
X
()
)
aTmp
.
X
()
=
DOCUMENTBORDER
;
rView
.
SetVisArea
(
aTmp
);
m_
rView
.
SetVisArea
(
aTmp
);
return
true
;
}
else
...
...
@@ -197,7 +197,7 @@ bool SwWrtShell::GoStart( bool bKeepArea, bool *pMoveTable,
if
(
IsCrsrInTbl
()
)
{
const
bool
bBoxSelection
=
HasBoxSelection
();
if
(
!
bBlockMode
)
if
(
!
m_
bBlockMode
)
{
if
(
!
bSelect
)
EnterStdMode
();
...
...
@@ -230,7 +230,7 @@ bool SwWrtShell::GoStart( bool bKeepArea, bool *pMoveTable,
}
}
if
(
!
bBlockMode
)
if
(
!
m_
bBlockMode
)
{
if
(
!
bSelect
)
EnterStdMode
();
...
...
@@ -396,9 +396,9 @@ bool SwWrtShell::PushCrsr(SwTwips lOffset, bool bSelect)
bool
bDiff
=
false
;
SwRect
aOldRect
(
GetCharRect
()
),
aTmpArea
(
VisArea
()
);
// bDestOnStack indicates if I could not set the coursor at the current
//
m_
bDestOnStack indicates if I could not set the coursor at the current
// position, because in this region is no content.
if
(
!
bDestOnStack
)
if
(
!
m_
bDestOnStack
)
{
Point
aPt
(
aOldRect
.
Center
()
);
...
...
@@ -408,12 +408,12 @@ bool SwWrtShell::PushCrsr(SwTwips lOffset, bool bSelect)
aPt
.
Y
()
=
aTmpArea
.
Top
()
+
aTmpArea
.
Height
()
/
2
;
aPt
.
Y
()
+=
lOffset
;
aDest
=
GetCntntPos
(
aPt
,
lOffset
>
0
);
aDest
.
X
()
=
aPt
.
X
();
bDestOnStack
=
true
;
m_
aDest
=
GetCntntPos
(
aPt
,
lOffset
>
0
);
m_
aDest
.
X
()
=
aPt
.
X
();
m_
bDestOnStack
=
true
;
}
// If we had a frame selection, it must be removed after the fnSetCrsr
// If we had a frame selection, it must be removed after the
m_
fnSetCrsr
// and we have to remember the position on the stack to return to it later.
bool
bIsFrmSel
=
false
;
...
...
@@ -422,7 +422,7 @@ bool SwWrtShell::PushCrsr(SwTwips lOffset, bool bSelect)
//position is longer on the stack.
//The new visible region is to be determined beforehand.
aTmpArea
.
Pos
().
Y
()
+=
lOffset
;
if
(
aTmpArea
.
IsInside
(
aDest
)
)
if
(
aTmpArea
.
IsInside
(
m_
aDest
)
)
{
if
(
bSelect
)
SttSelect
();
...
...
@@ -446,7 +446,7 @@ bool SwWrtShell::PushCrsr(SwTwips lOffset, bool bSelect)
CallChgLnk
();
}
(
this
->*
fnSetCrsr
)(
&
aDest
,
true
);
(
this
->*
m_fnSetCrsr
)(
&
m_
aDest
,
true
);
bDiff
=
aOldRect
!=
GetCharRect
();
...
...
@@ -458,41 +458,41 @@ bool SwWrtShell::PushCrsr(SwTwips lOffset, bool bSelect)
}
// reset Dest. SPoint Flags
bDestOnStack
=
false
;
m_
bDestOnStack
=
false
;
}
// Position into the stack; bDiff indicates if there is a
// difference between the old and the new cursor position.
pCrsrStack
=
new
CrsrStack
(
bDiff
,
bIsFrmSel
,
aOldRect
.
Center
(),
lOffset
,
pCrsrStack
);
return
!
bDestOnStack
&&
bDiff
;
m_
pCrsrStack
=
new
CrsrStack
(
bDiff
,
bIsFrmSel
,
aOldRect
.
Center
(),
lOffset
,
m_
pCrsrStack
);
return
!
m_
bDestOnStack
&&
bDiff
;
}
bool
SwWrtShell
::
PopCrsr
(
bool
bUpdate
,
bool
bSelect
)
{
if
(
0
==
pCrsrStack
)
if
(
0
==
m_
pCrsrStack
)
return
false
;
const
bool
bValidPos
=
pCrsrStack
->
bValidCurPos
;
const
bool
bValidPos
=
m_
pCrsrStack
->
bValidCurPos
;
if
(
bUpdate
&&
bValidPos
)
{
// If a predecessor is on the stack,
// use the flag for a valid position.
SwRect
aTmpArea
(
VisArea
());
aTmpArea
.
Pos
().
Y
()
-=
pCrsrStack
->
lOffset
;
if
(
aTmpArea
.
IsInside
(
pCrsrStack
->
aDocPos
)
)
aTmpArea
.
Pos
().
Y
()
-=
m_
pCrsrStack
->
lOffset
;
if
(
aTmpArea
.
IsInside
(
m_
pCrsrStack
->
aDocPos
)
)
{
if
(
bSelect
)
SttSelect
();
else
EndSelect
();
(
this
->*
fnSetCrsr
)(
&
pCrsrStack
->
aDocPos
,
!
pCrsrStack
->
bIsFrmSel
);
if
(
pCrsrStack
->
bIsFrmSel
&&
IsObjSelectable
(
pCrsrStack
->
aDocPos
))
(
this
->*
m_fnSetCrsr
)(
&
m_pCrsrStack
->
aDocPos
,
!
m_
pCrsrStack
->
bIsFrmSel
);
if
(
m_pCrsrStack
->
bIsFrmSel
&&
IsObjSelectable
(
m_
pCrsrStack
->
aDocPos
))
{
HideCrsr
();
SelectObj
(
pCrsrStack
->
aDocPos
);
EnterSelFrmMode
(
&
pCrsrStack
->
aDocPos
);
SelectObj
(
m_
pCrsrStack
->
aDocPos
);
EnterSelFrmMode
(
&
m_
pCrsrStack
->
aDocPos
);
}
}
// If a discrepancy between the visible range and the
...
...
@@ -504,13 +504,13 @@ bool SwWrtShell::PopCrsr(bool bUpdate, bool bSelect)
return
false
;
}
}
CrsrStack
*
pTmp
=
pCrsrStack
;
pCrsrStack
=
pCrsrStack
->
pNext
;
CrsrStack
*
pTmp
=
m_
pCrsrStack
;
m_pCrsrStack
=
m_
pCrsrStack
->
pNext
;
delete
pTmp
;
if
(
0
==
pCrsrStack
)
if
(
0
==
m_
pCrsrStack
)
{
ePageMove
=
MV_NO
;
bDestOnStack
=
false
;
m_
ePageMove
=
MV_NO
;
m_
bDestOnStack
=
false
;
}
return
bValidPos
;
}
...
...
@@ -520,14 +520,14 @@ bool SwWrtShell::PopCrsr(bool bUpdate, bool bSelect)
void
SwWrtShell
::
_ResetCursorStack
()
{
while
(
pCrsrStack
)
while
(
m_
pCrsrStack
)
{
CrsrStack
*
const
pTmp
=
pCrsrStack
->
pNext
;
delete
pCrsrStack
;
pCrsrStack
=
pTmp
;
CrsrStack
*
const
pTmp
=
m_
pCrsrStack
->
pNext
;
delete
m_
pCrsrStack
;
m_
pCrsrStack
=
pTmp
;
}
ePageMove
=
MV_NO
;
bDestOnStack
=
false
;
m_
ePageMove
=
MV_NO
;
m_
bDestOnStack
=
false
;
}
/**
if no stack exists --> cancel selection
...
...
@@ -554,11 +554,11 @@ bool SwWrtShell::PageCrsr(SwTwips lOffset, bool bSelect)
// SwViewShell::StartAction();
PageMove
eDir
=
lOffset
>
0
?
MV_PAGE_DOWN
:
MV_PAGE_UP
;
// Change of direction and stack present
if
(
eDir
!=
ePageMove
&&
ePageMove
!=
MV_NO
&&
PopCrsr
(
true
,
bSelect
))
if
(
eDir
!=
m_ePageMove
&&
m_
ePageMove
!=
MV_NO
&&
PopCrsr
(
true
,
bSelect
))
return
true
;
const
bool
bRet
=
PushCrsr
(
lOffset
,
bSelect
);
ePageMove
=
eDir
;
m_
ePageMove
=
eDir
;
return
bRet
;
}
...
...
@@ -583,7 +583,7 @@ bool SwWrtShell::GotoMark( const ::sw::mark::IMark* const pMark, bool bSelect, b
SwPosition
aPos
=
*
GetCrsr
()
->
GetPoint
();
bool
bRet
=
SwCrsrShell
::
GotoMark
(
pMark
,
bStart
);
if
(
bRet
)
aNavigationMgr
.
addEntry
(
aPos
);
m_
aNavigationMgr
.
addEntry
(
aPos
);
return
bRet
;
}
...
...
@@ -592,7 +592,7 @@ bool SwWrtShell::GotoFly( const OUString& rName, FlyCntType eType, bool bSelFram
SwPosition
aPos
=
*
GetCrsr
()
->
GetPoint
();
bool
bRet
=
SwFEShell
::
GotoFly
(
rName
,
eType
,
bSelFrame
);
if
(
bRet
)
aNavigationMgr
.
addEntry
(
aPos
);
m_
aNavigationMgr
.
addEntry
(
aPos
);
return
bRet
;
}
...
...
@@ -601,7 +601,7 @@ bool SwWrtShell::GotoINetAttr( const SwTxtINetFmt& rAttr )
SwPosition
aPos
=
*
GetCrsr
()
->
GetPoint
();
bool
bRet
=
SwCrsrShell
::
GotoINetAttr
(
rAttr
);
if
(
bRet
)
aNavigationMgr
.
addEntry
(
aPos
);
m_
aNavigationMgr
.
addEntry
(
aPos
);
return
bRet
;
}
...
...
@@ -616,7 +616,7 @@ bool SwWrtShell::GotoOutline( const OUString& rName )
SwPosition
aPos
=
*
GetCrsr
()
->
GetPoint
();
bool
bRet
=
SwCrsrShell
::
GotoOutline
(
rName
);
if
(
bRet
)
aNavigationMgr
.
addEntry
(
aPos
);
m_
aNavigationMgr
.
addEntry
(
aPos
);
return
bRet
;
}
...
...
@@ -625,7 +625,7 @@ bool SwWrtShell::GotoRegion( const OUString& rName )
SwPosition
aPos
=
*
GetCrsr
()
->
GetPoint
();
bool
bRet
=
SwCrsrShell
::
GotoRegion
(
rName
);
if
(
bRet
)
aNavigationMgr
.
addEntry
(
aPos
);
m_
aNavigationMgr
.
addEntry
(
aPos
);
return
bRet
;
}
...
...
@@ -635,7 +635,7 @@ bool SwWrtShell::GotoRefMark( const OUString& rRefMark, sal_uInt16 nSubType,
SwPosition
aPos
=
*
GetCrsr
()
->
GetPoint
();
bool
bRet
=
SwCrsrShell
::
GotoRefMark
(
rRefMark
,
nSubType
,
nSeqNo
);
if
(
bRet
)
aNavigationMgr
.
addEntry
(
aPos
);
m_
aNavigationMgr
.
addEntry
(
aPos
);
return
bRet
;
}
...
...
@@ -644,7 +644,7 @@ bool SwWrtShell::GotoNextTOXBase( const OUString* pName )
SwPosition
aPos
=
*
GetCrsr
()
->
GetPoint
();
bool
bRet
=
SwCrsrShell
::
GotoNextTOXBase
(
pName
);
if
(
bRet
)
aNavigationMgr
.
addEntry
(
aPos
);
m_
aNavigationMgr
.
addEntry
(
aPos
);
return
bRet
;
}
...
...
@@ -653,7 +653,7 @@ bool SwWrtShell::GotoTable( const OUString& rName )
SwPosition
aPos
=
*
GetCrsr
()
->
GetPoint
();
bool
bRet
=
SwCrsrShell
::
GotoTable
(
rName
);
if
(
bRet
)
aNavigationMgr
.
addEntry
(
aPos
);
m_
aNavigationMgr
.
addEntry
(
aPos
);
return
bRet
;
}
...
...
@@ -661,7 +661,7 @@ bool SwWrtShell::GotoFld( const SwFmtFld& rFld ) {
SwPosition
aPos
=
*
GetCrsr
()
->
GetPoint
();
bool
bRet
=
SwCrsrShell
::
GotoFld
(
rFld
);
if
(
bRet
)
aNavigationMgr
.
addEntry
(
aPos
);
m_
aNavigationMgr
.
addEntry
(
aPos
);
return
bRet
;
}
...
...
@@ -669,7 +669,7 @@ const SwRangeRedline* SwWrtShell::GotoRedline( sal_uInt16 nArrPos, bool bSelect
SwPosition
aPos
=
*
GetCrsr
()
->
GetPoint
();
const
SwRangeRedline
*
pRedline
=
SwCrsrShell
::
GotoRedline
(
nArrPos
,
bSelect
);
if
(
pRedline
)
aNavigationMgr
.
addEntry
(
aPos
);
m_
aNavigationMgr
.
addEntry
(
aPos
);
return
pRedline
;
}
...
...
sw/source/uibase/wrtsh/select.cxx
Dosyayı görüntüle @
bcefd5cd
...
...
@@ -81,9 +81,9 @@ bool SwWrtShell::SelWrd(const Point *pPt, bool )
EndSelect
();
if
(
bRet
)
{
bSelWrd
=
true
;
m_
bSelWrd
=
true
;
if
(
pPt
)
aStart
=
*
pPt
;
m_
aStart
=
*
pPt
;
}
return
bRet
;
}
...
...
@@ -99,9 +99,9 @@ void SwWrtShell::SelSentence(const Point *pPt, bool )
}
EndSelect
();
if
(
pPt
)
aStart
=
*
pPt
;
bSelLn
=
true
;
bSelWrd
=
false
;
// disable SelWord, otherwise no SelLine goes on
m_
aStart
=
*
pPt
;
m_
bSelLn
=
true
;
m_
bSelWrd
=
false
;
// disable SelWord, otherwise no SelLine goes on
}
void
SwWrtShell
::
SelPara
(
const
Point
*
pPt
,
bool
)
...
...
@@ -115,9 +115,9 @@ void SwWrtShell::SelPara(const Point *pPt, bool )
}
EndSelect
();
if
(
pPt
)
aStart
=
*
pPt
;
bSelLn
=
false
;
bSelWrd
=
false
;
// disable SelWord, otherwise no SelLine goes on
m_
aStart
=
*
pPt
;
m_
bSelLn
=
false
;
m_
bSelWrd
=
false
;
// disable SelWord, otherwise no SelLine goes on
}
long
SwWrtShell
::
SelAll
()
...
...
@@ -125,7 +125,7 @@ long SwWrtShell::SelAll()
const
bool
bLockedView
=
IsViewLocked
();
LockView
(
true
);
{
if
(
bBlockMode
)
if
(
m_
bBlockMode
)
LeaveBlockMode
();
SwMvContext
aMvContext
(
this
);
bool
bMoveTable
=
false
;
...
...
@@ -279,25 +279,25 @@ sal_uLong SwWrtShell::SearchAttr( const SfxItemSet& rFindSet, bool bNoColls,
void
SwWrtShell
::
PushMode
()
{
pModeStack
=
new
ModeStack
(
pModeStack
,
bIns
,
bExtMode
,
bAddMode
,
bBlockMode
);
m_pModeStack
=
new
ModeStack
(
m_pModeStack
,
m_bIns
,
m_bExtMode
,
m_bAddMode
,
m_
bBlockMode
);
}
void
SwWrtShell
::
PopMode
()
{
if
(
0
==
pModeStack
)
if
(
0
==
m_
pModeStack
)
return
;
if
(
bExtMode
&&
!
pModeStack
->
bExt
)
if
(
m_bExtMode
&&
!
m_
pModeStack
->
bExt
)
LeaveExtMode
();
if
(
bAddMode
&&
!
pModeStack
->
bAdd
)
if
(
m_bAddMode
&&
!
m_
pModeStack
->
bAdd
)
LeaveAddMode
();
if
(
bBlockMode
&&
!
pModeStack
->
bBlock
)
if
(
m_bBlockMode
&&
!
m_
pModeStack
->
bBlock
)
LeaveBlockMode
();
bIns
=
pModeStack
->
bIns
;
m_bIns
=
m_
pModeStack
->
bIns
;
ModeStack
*
pTmp
=
pModeStack
->
pNext
;
delete
pModeStack
;
pModeStack
=
pTmp
;
ModeStack
*
pTmp
=
m_
pModeStack
->
pNext
;
delete
m_
pModeStack
;
m_
pModeStack
=
pTmp
;
}
// Two methodes for setting cursors: the first maps at the
...
...
@@ -348,11 +348,11 @@ long SwWrtShell::ResetSelect(const Point *,bool)
// after EndAction().
{
SwActContext
aActContext
(
this
);
bSelWrd
=
bSelLn
=
false
;
m_bSelWrd
=
m_
bSelLn
=
false
;
KillPams
();
ClearMark
();
fnKillSel
=
&
SwWrtShell
::
Ignore
;
fnSetCrsr
=
&
SwWrtShell
::
SetCrsr
;
m_
fnKillSel
=
&
SwWrtShell
::
Ignore
;
m_
fnSetCrsr
=
&
SwWrtShell
::
SetCrsr
;
}
// After canceling of all selections an update of Attr-Controls
...
...
@@ -374,19 +374,19 @@ long SwWrtShell::Ignore(const Point *, bool ) {
void
SwWrtShell
::
SttSelect
()
{
if
(
bInSelect
)
if
(
m_
bInSelect
)
return
;
if
(
!
HasMark
())
SetMark
();
if
(
bBlockMode
)
if
(
m_
bBlockMode
)
{
SwShellCrsr
*
pTmp
=
getShellCrsr
(
true
);
if
(
!
pTmp
->
HasMark
()
)
pTmp
->
SetMark
();
}
fnKillSel
=
&
SwWrtShell
::
Ignore
;
fnSetCrsr
=
&
SwWrtShell
::
SetCrsr
;
bInSelect
=
true
;
m_
fnKillSel
=
&
SwWrtShell
::
Ignore
;
m_
fnSetCrsr
=
&
SwWrtShell
::
SetCrsr
;
m_
bInSelect
=
true
;
Invalidate
();
SwTransferable
::
CreateSelection
(
*
this
);
}
...
...
@@ -395,18 +395,18 @@ void SwWrtShell::SttSelect()
void
SwWrtShell
::
EndSelect
()
{
if
(
bInSelect
&&
!
bExtMode
)
if
(
m_bInSelect
&&
!
m_
bExtMode
)
{
bInSelect
=
false
;
if
(
bAddMode
)
m_
bInSelect
=
false
;
if
(
m_
bAddMode
)
{
AddLeaveSelect
(
0
,
false
);
}
else
{
SttLeaveSelect
(
0
,
false
);
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
m_
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
m_
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
}
}
SwWordCountWrapper
*
pWrdCnt
=
static_cast
<
SwWordCountWrapper
*>
(
GetView
().
GetViewFrame
()
->
GetChildWindow
(
SwWordCountWrapper
::
GetChildWindowId
()));
...
...
@@ -435,7 +435,7 @@ long SwWrtShell::ExtSelWrd(const Point *pPt, bool )
// check the direction of the selection with the new point
bool
bRet
=
false
,
bMoveCrsr
=
true
,
bToTop
=
false
;
SwCrsrShell
::
SelectWord
(
&
aStart
);
// select the startword
SwCrsrShell
::
SelectWord
(
&
m_
aStart
);
// select the startword
SwCrsrShell
::
Push
();
// save the cursor
SwCrsrShell
::
SetCrsr
(
*
pPt
);
// and check the direction
...
...
@@ -520,13 +520,13 @@ long SwWrtShell::ExtSelLn(const Point *pPt, bool )
void
SwWrtShell
::
EnterStdMode
()
{
if
(
bAddMode
)
if
(
m_
bAddMode
)
LeaveAddMode
();
if
(
bBlockMode
)
if
(
m_
bBlockMode
)
LeaveBlockMode
();
bBlockMode
=
false
;
bExtMode
=
false
;
bInSelect
=
false
;
m_
bBlockMode
=
false
;
m_
bExtMode
=
false
;
m_
bInSelect
=
false
;
if
(
IsSelFrmMode
())
{
UnSelectFrm
();
...
...
@@ -539,12 +539,12 @@ void SwWrtShell::EnterStdMode()
// GetChgLnk().Call()
{
SwActContext
aActContext
(
this
);
bSelWrd
=
bSelLn
=
false
;
m_bSelWrd
=
m_
bSelLn
=
false
;
if
(
!
IsRetainSelection
()
)
KillPams
();
ClearMark
();
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
m_
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
m_
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
}
}
Invalidate
();
...
...
@@ -555,21 +555,21 @@ void SwWrtShell::EnterStdMode()
void
SwWrtShell
::
EnterExtMode
()
{
if
(
bBlockMode
)
if
(
m_
bBlockMode
)
{
LeaveBlockMode
();
KillPams
();
ClearMark
();
}
bExtMode
=
true
;
bAddMode
=
false
;
bBlockMode
=
false
;
m_
bExtMode
=
true
;
m_
bAddMode
=
false
;
m_
bBlockMode
=
false
;
SttSelect
();
}
void
SwWrtShell
::
LeaveExtMode
()
{
bExtMode
=
false
;
m_
bExtMode
=
false
;
EndSelect
();
}
...
...
@@ -578,7 +578,7 @@ void SwWrtShell::LeaveExtMode()
long
SwWrtShell
::
SttLeaveSelect
(
const
Point
*
,
bool
)
{
if
(
SwCrsrShell
::
HasSelection
()
&&
!
IsSelTblCells
()
&&
bClearMark
)
{
if
(
SwCrsrShell
::
HasSelection
()
&&
!
IsSelTblCells
()
&&
m_
bClearMark
)
{
return
0
;
}
ClearMark
();
...
...
@@ -600,13 +600,13 @@ long SwWrtShell::AddLeaveSelect(const Point *, bool )
void
SwWrtShell
::
EnterAddMode
()
{
if
(
IsTableMode
())
return
;
if
(
bBlockMode
)
if
(
m_
bBlockMode
)
LeaveBlockMode
();
fnKillSel
=
&
SwWrtShell
::
Ignore
;
fnSetCrsr
=
&
SwWrtShell
::
SetCrsr
;
bAddMode
=
true
;
bBlockMode
=
false
;
bExtMode
=
false
;
m_
fnKillSel
=
&
SwWrtShell
::
Ignore
;
m_
fnSetCrsr
=
&
SwWrtShell
::
SetCrsr
;
m_
bAddMode
=
true
;
m_
bBlockMode
=
false
;
m_
bExtMode
=
false
;
if
(
SwCrsrShell
::
HasSelection
())
CreateCrsr
();
Invalidate
();
...
...
@@ -614,9 +614,9 @@ void SwWrtShell::EnterAddMode()
void
SwWrtShell
::
LeaveAddMode
()
{
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
bAddMode
=
false
;
m_
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
m_
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
m_
bAddMode
=
false
;
Invalidate
();
}
...
...
@@ -624,16 +624,16 @@ void SwWrtShell::LeaveAddMode()
void
SwWrtShell
::
EnterBlockMode
()
{
bBlockMode
=
false
;
m_
bBlockMode
=
false
;
EnterStdMode
();
bBlockMode
=
true
;
m_
bBlockMode
=
true
;
CrsrToBlockCrsr
();
Invalidate
();
}
void
SwWrtShell
::
LeaveBlockMode
()
{
bBlockMode
=
false
;
m_
bBlockMode
=
false
;
BlockCrsrToCrsr
();
EndSelect
();
Invalidate
();
...
...
@@ -643,9 +643,9 @@ void SwWrtShell::LeaveBlockMode()
void
SwWrtShell
::
SetInsMode
(
bool
bOn
)
{
bIns
=
bOn
;
SwCrsrShell
::
SetOverwriteCrsr
(
!
bIns
);
const
SfxBoolItem
aTmp
(
SID_ATTR_INSERT
,
bIns
);
m_
bIns
=
bOn
;
SwCrsrShell
::
SetOverwriteCrsr
(
!
m_
bIns
);
const
SfxBoolItem
aTmp
(
SID_ATTR_INSERT
,
m_
bIns
);
GetView
().
GetViewFrame
()
->
GetBindings
().
SetState
(
aTmp
);
StartAction
();
EndAction
();
...
...
@@ -663,7 +663,7 @@ void SwWrtShell::SetRedlineModeAndCheckInsMode( sal_uInt16 eMode )
long
SwWrtShell
::
BeginFrmDrag
(
const
Point
*
pPt
,
bool
bIsShift
)
{
fnDrag
=
&
SwFEShell
::
Drag
;
m_
fnDrag
=
&
SwFEShell
::
Drag
;
if
(
bStartDrag
)
{
Point
aTmp
(
nStartDragX
,
nStartDragY
);
...
...
@@ -682,21 +682,21 @@ void SwWrtShell::EnterSelFrmMode(const Point *pPos)
nStartDragY
=
pPos
->
Y
();
bStartDrag
=
true
;
}
bLayoutMode
=
true
;
m_
bLayoutMode
=
true
;
HideCrsr
();
// equal call of BeginDrag in the SwFEShell
fnDrag
=
&
SwWrtShell
::
BeginFrmDrag
;
fnEndDrag
=
&
SwWrtShell
::
UpdateLayoutFrm
;
m_
fnDrag
=
&
SwWrtShell
::
BeginFrmDrag
;
m_
fnEndDrag
=
&
SwWrtShell
::
UpdateLayoutFrm
;
SwBaseShell
::
SetFrmMode
(
FLY_DRAG_START
,
this
);
Invalidate
();
}
void
SwWrtShell
::
LeaveSelFrmMode
()
{
fnDrag
=
&
SwWrtShell
::
BeginDrag
;
fnEndDrag
=
&
SwWrtShell
::
DefaultEndDrag
;
bLayoutMode
=
false
;
m_
fnDrag
=
&
SwWrtShell
::
BeginDrag
;
m_
fnEndDrag
=
&
SwWrtShell
::
DefaultEndDrag
;
m_
bLayoutMode
=
false
;
bStartDrag
=
false
;
Edit
();
SwBaseShell
::
SetFrmMode
(
FLY_DRAG_END
,
this
);
...
...
@@ -715,7 +715,7 @@ IMPL_LINK( SwWrtShell, ExecFlyMac, void *, pFlyFmt )
{
const
SvxMacro
&
rMac
=
rFmtMac
.
GetMacro
(
SW_EVENT_OBJECT_SELECT
);
if
(
IsFrmSelected
()
)
bLayoutMode
=
true
;
m_
bLayoutMode
=
true
;
CallChgLnk
();
ExecMacro
(
rMac
);
}
...
...
@@ -726,7 +726,7 @@ long SwWrtShell::UpdateLayoutFrm(const Point *pPt, bool )
{
// still a dummy
SwFEShell
::
EndDrag
(
pPt
,
false
);
fnDrag
=
&
SwWrtShell
::
BeginFrmDrag
;
m_
fnDrag
=
&
SwWrtShell
::
BeginFrmDrag
;
return
1
;
}
...
...
@@ -734,47 +734,47 @@ long SwWrtShell::UpdateLayoutFrm(const Point *pPt, bool )
bool
SwWrtShell
::
ToggleAddMode
()
{
bAddMode
?
LeaveAddMode
()
:
EnterAddMode
();
m_
bAddMode
?
LeaveAddMode
()
:
EnterAddMode
();
Invalidate
();
return
!
bAddMode
;
return
!
m_
bAddMode
;
}
bool
SwWrtShell
::
ToggleBlockMode
()
{
bBlockMode
?
LeaveBlockMode
()
:
EnterBlockMode
();
m_
bBlockMode
?
LeaveBlockMode
()
:
EnterBlockMode
();
Invalidate
();
return
!
bBlockMode
;
return
!
m_
bBlockMode
;
}
bool
SwWrtShell
::
ToggleExtMode
()
{
bExtMode
?
LeaveExtMode
()
:
EnterExtMode
();
m_
bExtMode
?
LeaveExtMode
()
:
EnterExtMode
();
Invalidate
();
return
!
bExtMode
;
return
!
m_
bExtMode
;
}
// Dragging in standard mode (Selecting of content)
long
SwWrtShell
::
BeginDrag
(
const
Point
*
/*pPt*/
,
bool
)
{
if
(
bSelWrd
)
if
(
m_
bSelWrd
)
{
bInSelect
=
true
;
m_
bInSelect
=
true
;
if
(
!
IsCrsrPtAtEnd
()
)
SwapPam
();
fnDrag
=
&
SwWrtShell
::
ExtSelWrd
;
fnSetCrsr
=
&
SwWrtShell
::
Ignore
;
m_
fnDrag
=
&
SwWrtShell
::
ExtSelWrd
;
m_
fnSetCrsr
=
&
SwWrtShell
::
Ignore
;
}
else
if
(
bSelLn
)
else
if
(
m_
bSelLn
)
{
bInSelect
=
true
;
fnDrag
=
&
SwWrtShell
::
ExtSelLn
;
fnSetCrsr
=
&
SwWrtShell
::
Ignore
;
m_
bInSelect
=
true
;
m_
fnDrag
=
&
SwWrtShell
::
ExtSelLn
;
m_
fnSetCrsr
=
&
SwWrtShell
::
Ignore
;
}
else
{
fnDrag
=
&
SwWrtShell
::
DefaultDrag
;
m_
fnDrag
=
&
SwWrtShell
::
DefaultDrag
;
SttSelect
();
}
...
...
@@ -784,19 +784,19 @@ long SwWrtShell::BeginDrag(const Point * /*pPt*/, bool )
long
SwWrtShell
::
DefaultDrag
(
const
Point
*
,
bool
)
{
if
(
IsSelTblCells
()
)
aSelTblLink
.
Call
(
this
);
m_
aSelTblLink
.
Call
(
this
);
return
1
;
}
long
SwWrtShell
::
DefaultEndDrag
(
const
Point
*
/*pPt*/
,
bool
)
{
fnDrag
=
&
SwWrtShell
::
BeginDrag
;
m_
fnDrag
=
&
SwWrtShell
::
BeginDrag
;
if
(
IsExtSel
()
)
LeaveExtSel
();
if
(
IsSelTblCells
()
)
aSelTblLink
.
Call
(
this
);
m_
aSelTblLink
.
Call
(
this
);
EndSelect
();
return
1
;
}
...
...
@@ -808,8 +808,8 @@ bool SwWrtShell::SelectTableRowCol( const Point& rPt, const Point* pEnd, bool bR
SttSelect
();
if
(
SelTblRowCol
(
rPt
,
pEnd
,
bRowDrag
))
{
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
m_
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
m_
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
return
true
;
}
return
false
;
...
...
@@ -821,8 +821,8 @@ bool SwWrtShell::SelectTableRow()
{
if
(
SelTblRow
()
)
{
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
m_
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
m_
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
return
true
;
}
return
false
;
...
...
@@ -832,8 +832,8 @@ bool SwWrtShell::SelectTableCol()
{
if
(
SelTblCol
()
)
{
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
m_
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
m_
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
return
true
;
}
return
false
;
...
...
@@ -843,8 +843,8 @@ bool SwWrtShell::SelectTableCell()
{
if
(
SelTblBox
()
)
{
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
m_
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
m_
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
return
true
;
}
return
false
;
...
...
@@ -947,8 +947,8 @@ bool SwWrtShell::SelectNextPrevHyperlink( bool bNext )
// Set the function pointer for the canceling of the selection
// set at cursor
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
m_
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
m_
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
bCreateXSelection
=
true
;
}
else
if
(
bFrmSelected
)
...
...
sw/source/uibase/wrtsh/wrtsh1.cxx
Dosyayı görüntüle @
bcefd5cd
...
...
@@ -109,30 +109,30 @@ using namespace sw::mark;
using
namespace
com
::
sun
::
star
;
#define COMMON_INI_LIST \
fnDrag(&SwWrtShell::BeginDrag),\
fnSetCrsr(&SwWrtShell::SetCrsr),\
fnEndDrag(&SwWrtShell::DefaultEndDrag),\
fnKillSel(&SwWrtShell::Ignore),\
pModeStack(0), \
ePageMove(MV_NO),\
pCrsrStack(0), \
rView(rShell),\
aNavigationMgr(*this), \
bDestOnStack(false)
m_
fnDrag(&SwWrtShell::BeginDrag),\
m_
fnSetCrsr(&SwWrtShell::SetCrsr),\
m_
fnEndDrag(&SwWrtShell::DefaultEndDrag),\
m_
fnKillSel(&SwWrtShell::Ignore),\
m_
pModeStack(0), \
m_
ePageMove(MV_NO),\
m_
pCrsrStack(0), \
m_
rView(rShell),\
m_
aNavigationMgr(*this), \
m_
bDestOnStack(false)
#define BITFLD_INI_LIST \
bClearMark = \
bIns = true;\
bAddMode = \
bBlockMode = \
bExtMode = \
bInSelect = \
bCopy = \
bLayoutMode = \
bSelWrd = \
bSelLn = \
mbRetainSelection = false; \
bIsInClickToEdit = false;
m_
bClearMark = \
m_
bIns = true;\
m_
bAddMode = \
m_
bBlockMode = \
m_
bExtMode = \
m_
bInSelect = \
m_
bCopy = \
m_
bLayoutMode = \
m_
bSelWrd = \
m_
bSelLn = \
m
_
bRetainSelection = false; \
m_
bIsInClickToEdit = false;
static
SvxAutoCorrect
*
lcl_IsAutoCorr
()
{
...
...
@@ -196,10 +196,10 @@ void SwWrtShell::Insert( const OUString &rStr )
bool
bStarted
=
false
;
bool
bHasSel
=
HasSelection
(),
bCallIns
=
bIns
/*|| bHasSel*/
;
bCallIns
=
m_
bIns
/*|| bHasSel*/
;
bool
bDeleted
=
false
;
if
(
bHasSel
||
(
!
bIns
&&
SelectHiddenRange
()
)
)
if
(
bHasSel
||
(
!
m_
bIns
&&
SelectHiddenRange
()
)
)
{
// Only here parenthesizing, because the normal
// insert is already in parentheses at Editshell.
...
...
@@ -935,7 +935,7 @@ void SwWrtShell::InsertFootnote(const OUString &rStr, bool bEndNote, bool bEdit
Left
(
CRSR_SKIP_CHARS
,
false
,
1
,
false
);
GotoFtnTxt
();
}
aNavigationMgr
.
addEntry
(
aPos
);
m_
aNavigationMgr
.
addEntry
(
aPos
);
}
}
...
...
@@ -950,7 +950,7 @@ void SwWrtShell::SplitNode( bool bAutoFmt, bool bCheckTableStart )
{
SwActContext
aActContext
(
this
);
rView
.
GetEditWin
().
FlushInBuffer
();
m_
rView
.
GetEditWin
().
FlushInBuffer
();
bool
bHasSel
=
HasSelection
();
if
(
bHasSel
)
{
...
...
@@ -1493,7 +1493,7 @@ SwFrmFmt *SwWrtShell::GetTblStyle(const OUString &rFmtName)
void
SwWrtShell
::
addCurrentPosition
()
{
SwPaM
*
pPaM
=
GetCrsr
();
aNavigationMgr
.
addEntry
(
*
pPaM
->
GetPoint
());
m_
aNavigationMgr
.
addEntry
(
*
pPaM
->
GetPoint
());
}
// Applying templates
...
...
@@ -1658,8 +1658,8 @@ bool SwWrtShell::Pop( bool bOldCrsr )
bool
bRet
=
SwCrsrShell
::
Pop
(
bOldCrsr
);
if
(
bRet
&&
IsSelection
()
)
{
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
m_
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
m_
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
}
return
bRet
;
}
...
...
sw/source/uibase/wrtsh/wrtsh2.cxx
Dosyayı görüntüle @
bcefd5cd
...
...
@@ -326,7 +326,7 @@ void SwWrtShell::ClickToField( const SwField& rFld )
EndAllAction
();
}
bIsInClickToEdit
=
true
;
m_
bIsInClickToEdit
=
true
;
switch
(
rFld
.
GetTyp
()
->
Which
()
)
{
case
RES_JUMPEDITFLD
:
...
...
@@ -406,7 +406,7 @@ void SwWrtShell::ClickToField( const SwField& rFld )
SAL_WARN_IF
(
rFld
.
IsClickable
(),
"sw"
,
"unhandled clickable field!"
);
}
bIsInClickToEdit
=
false
;
m_
bIsInClickToEdit
=
false
;
}
void
SwWrtShell
::
ClickToINetAttr
(
const
SwFmtINetFmt
&
rItem
,
sal_uInt16
nFilter
)
...
...
@@ -414,7 +414,7 @@ void SwWrtShell::ClickToINetAttr( const SwFmtINetFmt& rItem, sal_uInt16 nFilter
if
(
rItem
.
GetValue
().
isEmpty
()
)
return
;
bIsInClickToEdit
=
true
;
m_
bIsInClickToEdit
=
true
;
// At first run the possibly set ObjectSelect Macro
const
SvxMacro
*
pMac
=
rItem
.
GetMacro
(
SFX_EVENT_MOUSECLICK_OBJECT
);
...
...
@@ -434,7 +434,7 @@ void SwWrtShell::ClickToINetAttr( const SwFmtINetFmt& rItem, sal_uInt16 nFilter
const_cast
<
SwTxtINetFmt
*>
(
pTxtAttr
)
->
SetVisitedValid
(
true
);
}
bIsInClickToEdit
=
false
;
m_
bIsInClickToEdit
=
false
;
}
bool
SwWrtShell
::
ClickToINetGrf
(
const
Point
&
rDocPt
,
sal_uInt16
nFilter
)
...
...
sw/source/uibase/wrtsh/wrtsh3.cxx
Dosyayı görüntüle @
bcefd5cd
...
...
@@ -43,7 +43,7 @@ extern bool g_bNoInterrupt; // in swmodule.cxx
bool
SwWrtShell
::
MoveBookMark
(
BookMarkMove
eFuncId
,
const
::
sw
::
mark
::
IMark
*
const
pMark
)
{
addCurrentPosition
();
(
this
->*
fnKillSel
)(
0
,
false
);
(
this
->*
m_
fnKillSel
)(
0
,
false
);
bool
bRet
=
true
;
switch
(
eFuncId
)
...
...
@@ -61,15 +61,15 @@ bool SwWrtShell::MoveBookMark( BookMarkMove eFuncId, const ::sw::mark::IMark* co
}
if
(
IsSelection
()
)
{
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
m_
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
m_
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
}
return
bRet
;
}
bool
SwWrtShell
::
GotoField
(
const
SwFmtFld
&
rFld
)
{
(
this
->*
fnKillSel
)(
0
,
false
);
(
this
->*
m_
fnKillSel
)(
0
,
false
);
bool
bRet
=
SwCrsrShell
::
GotoFld
(
rFld
);
if
(
bRet
&&
IsSelFrmMode
()
)
...
...
@@ -80,8 +80,8 @@ bool SwWrtShell::GotoField( const SwFmtFld& rFld )
if
(
IsSelection
()
)
{
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
m_
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
m_
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
}
return
bRet
;
...
...
@@ -89,7 +89,7 @@ bool SwWrtShell::GotoField( const SwFmtFld& rFld )
bool
SwWrtShell
::
GotoFieldmark
(
::
sw
::
mark
::
IFieldmark
const
*
const
pMark
)
{
(
this
->*
fnKillSel
)(
0
,
false
);
(
this
->*
m_
fnKillSel
)(
0
,
false
);
bool
bRet
=
SwCrsrShell
::
GotoFieldmark
(
pMark
);
if
(
bRet
&&
IsSelFrmMode
()
)
{
...
...
@@ -98,8 +98,8 @@ bool SwWrtShell::GotoFieldmark(::sw::mark::IFieldmark const * const pMark)
}
if
(
IsSelection
()
)
{
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
m_
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
m_
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
}
return
bRet
;
}
...
...
sw/source/uibase/wrtsh/wrtundo.cxx
Dosyayı görüntüle @
bcefd5cd
...
...
@@ -70,8 +70,8 @@ void SwWrtShell::Do( DoType eDoType, sal_uInt16 nCnt )
// Set the function pointer for canceling the selection at the
// cursor position.
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
m_
fnKillSel
=
&
SwWrtShell
::
ResetSelect
;
m_
fnSetCrsr
=
&
SwWrtShell
::
SetCrsrKillSel
;
bCreateXSelection
=
true
;
}
else
if
(
bFrmSelected
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment