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
338beca1
Kaydet (Commit)
338beca1
authored
Şub 22, 2014
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
coverity#440750 Dereference after null check
Change-Id: I155e9fabaf26df71758c4b8da92664a35956accb
üst
5071777a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
19 deletions
+27
-19
winproc.cxx
vcl/source/window/winproc.cxx
+27
-19
No files found.
vcl/source/window/winproc.cxx
Dosyayı görüntüle @
338beca1
...
@@ -287,16 +287,15 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
...
@@ -287,16 +287,15 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
{
{
ImplSVData
*
pSVData
=
ImplGetSVData
();
ImplSVData
*
pSVData
=
ImplGetSVData
();
Point
aMousePos
(
nX
,
nY
);
Point
aMousePos
(
nX
,
nY
);
Window
*
pChild
;
Window
*
pChild
(
NULL
)
;
bool
nRet
;
bool
bRet
(
false
)
;
sal_uInt16
nClicks
;
sal_uInt16
nClicks
(
0
)
;
ImplFrameData
*
pWinFrameData
=
pWindow
->
ImplGetFrameData
();
ImplFrameData
*
pWinFrameData
=
pWindow
->
ImplGetFrameData
();
sal_uInt16
nOldCode
=
pWinFrameData
->
mnMouseCode
;
sal_uInt16
nOldCode
=
pWinFrameData
->
mnMouseCode
;
// we need a mousemove event, befor we get a mousebuttondown or a
// we need a mousemove event, befor we get a mousebuttondown or a
// mousebuttonup event
// mousebuttonup event
if
(
(
nSVEvent
==
EVENT_MOUSEBUTTONDOWN
)
||
if
(
(
nSVEvent
==
EVENT_MOUSEBUTTONDOWN
)
||
(
nSVEvent
==
EVENT_MOUSEBUTTONUP
)
)
(
nSVEvent
==
EVENT_MOUSEBUTTONUP
)
)
{
{
if
(
(
nSVEvent
==
EVENT_MOUSEBUTTONUP
)
&&
pSVData
->
maHelpData
.
mbExtHelpMode
)
if
(
(
nSVEvent
==
EVENT_MOUSEBUTTONUP
)
&&
pSVData
->
maHelpData
.
mbExtHelpMode
)
Help
::
EndExtHelp
();
Help
::
EndExtHelp
();
...
@@ -594,6 +593,8 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
...
@@ -594,6 +593,8 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
return
false
;
return
false
;
}
}
else
else
{
if
(
pChild
)
{
{
// mouse click
// mouse click
if
(
nSVEvent
==
EVENT_MOUSEBUTTONDOWN
)
if
(
nSVEvent
==
EVENT_MOUSEBUTTONDOWN
)
...
@@ -631,12 +632,16 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
...
@@ -631,12 +632,16 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
pChild
->
ImplGetFrameData
()
->
mnMouseDownTime
=
nMsgTime
;
pChild
->
ImplGetFrameData
()
->
mnMouseDownTime
=
nMsgTime
;
}
}
nClicks
=
pChild
->
ImplGetFrameData
()
->
mnClickCount
;
nClicks
=
pChild
->
ImplGetFrameData
()
->
mnClickCount
;
}
pSVData
->
maAppData
.
mnLastInputTime
=
Time
::
GetSystemTicks
();
pSVData
->
maAppData
.
mnLastInputTime
=
Time
::
GetSystemTicks
();
}
}
DBG_ASSERT
(
pChild
,
"ImplHandleMouseEvent: pChild == NULL"
);
DBG_ASSERT
(
pChild
,
"ImplHandleMouseEvent: pChild == NULL"
);
if
(
!
pChild
)
return
false
;
// create mouse event
// create mouse event
Point
aChildPos
=
pChild
->
ImplFrameToOutput
(
aMousePos
);
Point
aChildPos
=
pChild
->
ImplFrameToOutput
(
aMousePos
);
MouseEvent
aMEvt
(
aChildPos
,
nClicks
,
nMode
,
nCode
,
nCode
);
MouseEvent
aMEvt
(
aChildPos
,
nClicks
,
nMode
,
nCode
,
nCode
);
...
@@ -668,6 +673,9 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
...
@@ -668,6 +673,9 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
bool
bCallHelpRequest
=
true
;
bool
bCallHelpRequest
=
true
;
DBG_ASSERT
(
pChild
,
"ImplHandleMouseEvent: pChild is NULL"
);
DBG_ASSERT
(
pChild
,
"ImplHandleMouseEvent: pChild is NULL"
);
if
(
!
pChild
)
return
false
;
ImplDelData
aDelData
;
ImplDelData
aDelData
;
NotifyEvent
aNEvt
(
nSVEvent
,
pChild
,
&
aMEvt
);
NotifyEvent
aNEvt
(
nSVEvent
,
pChild
,
&
aMEvt
);
pChild
->
ImplAddDel
(
&
aDelData
);
pChild
->
ImplAddDel
(
&
aDelData
);
...
@@ -685,10 +693,10 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
...
@@ -685,10 +693,10 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
}
}
if
(
ImplCallPreNotify
(
aNEvt
)
||
aDelData
.
IsDead
()
)
if
(
ImplCallPreNotify
(
aNEvt
)
||
aDelData
.
IsDead
()
)
n
Ret
=
true
;
b
Ret
=
true
;
else
else
{
{
n
Ret
=
false
;
b
Ret
=
false
;
if
(
nSVEvent
==
EVENT_MOUSEMOVE
)
if
(
nSVEvent
==
EVENT_MOUSEMOVE
)
{
{
if
(
pSVData
->
maWinData
.
mpTrackWin
)
if
(
pSVData
->
maWinData
.
mpTrackWin
)
...
@@ -703,7 +711,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
...
@@ -703,7 +711,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
pSVData
->
maWinData
.
mpTrackTimer
->
Start
();
pSVData
->
maWinData
.
mpTrackTimer
->
Start
();
}
}
bCallHelpRequest
=
false
;
bCallHelpRequest
=
false
;
n
Ret
=
true
;
b
Ret
=
true
;
}
}
else
else
{
{
...
@@ -730,7 +738,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
...
@@ -730,7 +738,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
{
{
if
(
pSVData
->
maWinData
.
mpTrackWin
&&
if
(
pSVData
->
maWinData
.
mpTrackWin
&&
!
(
pSVData
->
maWinData
.
mnTrackFlags
&
STARTTRACK_MOUSEBUTTONDOWN
)
)
!
(
pSVData
->
maWinData
.
mnTrackFlags
&
STARTTRACK_MOUSEBUTTONDOWN
)
)
n
Ret
=
true
;
b
Ret
=
true
;
else
else
{
{
pChild
->
ImplGetWindowImpl
()
->
mbMouseButtonDown
=
false
;
pChild
->
ImplGetWindowImpl
()
->
mbMouseButtonDown
=
false
;
...
@@ -742,7 +750,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
...
@@ -742,7 +750,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
if
(
pSVData
->
maWinData
.
mpTrackWin
)
if
(
pSVData
->
maWinData
.
mpTrackWin
)
{
{
pChild
->
EndTracking
();
pChild
->
EndTracking
();
n
Ret
=
true
;
b
Ret
=
true
;
}
}
else
else
{
{
...
@@ -767,19 +775,19 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
...
@@ -767,19 +775,19 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
{
{
if
(
bCallHelpRequest
&&
!
pSVData
->
maHelpData
.
mbKeyboardHelp
)
if
(
bCallHelpRequest
&&
!
pSVData
->
maHelpData
.
mbKeyboardHelp
)
ImplHandleMouseHelpRequest
(
pChild
,
pChild
->
OutputToScreenPixel
(
aMEvt
.
GetPosPixel
()
)
);
ImplHandleMouseHelpRequest
(
pChild
,
pChild
->
OutputToScreenPixel
(
aMEvt
.
GetPosPixel
()
)
);
n
Ret
=
true
;
b
Ret
=
true
;
}
}
else
if
(
!
n
Ret
)
else
if
(
!
b
Ret
)
{
{
if
(
nSVEvent
==
EVENT_MOUSEBUTTONDOWN
)
if
(
nSVEvent
==
EVENT_MOUSEBUTTONDOWN
)
{
{
if
(
!
pChild
->
ImplGetWindowImpl
()
->
mbMouseButtonDown
)
if
(
!
pChild
->
ImplGetWindowImpl
()
->
mbMouseButtonDown
)
n
Ret
=
true
;
b
Ret
=
true
;
}
}
else
else
{
{
if
(
!
pChild
->
ImplGetWindowImpl
()
->
mbMouseButtonUp
)
if
(
!
pChild
->
ImplGetWindowImpl
()
->
mbMouseButtonUp
)
n
Ret
=
true
;
b
Ret
=
true
;
}
}
}
}
...
@@ -796,14 +804,14 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
...
@@ -796,14 +804,14 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
if
(
!
bDrag
)
if
(
!
bDrag
)
{
{
// Command-Events
// Command-Events
if
(
/*!
n
Ret &&*/
(
nClicks
==
1
)
&&
(
nSVEvent
==
EVENT_MOUSEBUTTONDOWN
)
&&
if
(
/*!
b
Ret &&*/
(
nClicks
==
1
)
&&
(
nSVEvent
==
EVENT_MOUSEBUTTONDOWN
)
&&
(
nCode
==
MOUSE_MIDDLE
)
)
(
nCode
==
MOUSE_MIDDLE
)
)
{
{
sal_uInt16
nMiddleAction
=
pChild
->
GetSettings
().
GetMouseSettings
().
GetMiddleButtonAction
();
sal_uInt16
nMiddleAction
=
pChild
->
GetSettings
().
GetMouseSettings
().
GetMiddleButtonAction
();
if
(
nMiddleAction
==
MOUSE_MIDDLE_AUTOSCROLL
)
if
(
nMiddleAction
==
MOUSE_MIDDLE_AUTOSCROLL
)
n
Ret
=
!
ImplCallCommand
(
pChild
,
COMMAND_STARTAUTOSCROLL
,
NULL
,
true
,
&
aChildPos
);
b
Ret
=
!
ImplCallCommand
(
pChild
,
COMMAND_STARTAUTOSCROLL
,
NULL
,
true
,
&
aChildPos
);
else
if
(
nMiddleAction
==
MOUSE_MIDDLE_PASTESELECTION
)
else
if
(
nMiddleAction
==
MOUSE_MIDDLE_PASTESELECTION
)
n
Ret
=
!
ImplCallCommand
(
pChild
,
COMMAND_PASTESELECTION
,
NULL
,
true
,
&
aChildPos
);
b
Ret
=
!
ImplCallCommand
(
pChild
,
COMMAND_PASTESELECTION
,
NULL
,
true
,
&
aChildPos
);
}
}
else
else
{
{
...
@@ -836,14 +844,14 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
...
@@ -836,14 +844,14 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
Application
::
PostUserEvent
(
Link
(
pEv
,
ContextMenuEventLink
)
);
Application
::
PostUserEvent
(
Link
(
pEv
,
ContextMenuEventLink
)
);
}
}
else
else
n
Ret
=
!
ImplCallCommand
(
pChild
,
COMMAND_CONTEXTMENU
,
NULL
,
true
,
&
aChildPos
);
b
Ret
=
!
ImplCallCommand
(
pChild
,
COMMAND_CONTEXTMENU
,
NULL
,
true
,
&
aChildPos
);
}
}
}
}
}
}
}
}
}
}
return
n
Ret
;
return
b
Ret
;
}
}
// -----------------------------------------------------------------------
// -----------------------------------------------------------------------
...
...
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