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
8c4bbc0a
Kaydet (Commit)
8c4bbc0a
authored
May 06, 2015
tarafından
Michael Meeks
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
tdf#91100 - don't Notify focus changes after dispose.
Change-Id: If870f88d1d83db8bd436ac1bb9a1c676c34605b5
üst
e5ce3680
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
42 additions
and
39 deletions
+42
-39
basedlgs.cxx
sfx2/source/dialog/basedlgs.cxx
+42
-39
No files found.
sfx2/source/dialog/basedlgs.cxx
Dosyayı görüntüle @
8c4bbc0a
...
...
@@ -48,8 +48,8 @@ using namespace ::com::sun::star::uno;
SingleTabDlgImpl
::
SingleTabDlgImpl
()
:
m_pSfxPage
(
NULL
)
,
m_pLine
(
NULL
)
{
}
{
}
class
SfxModelessDialog_Impl
:
public
SfxListener
{
...
...
@@ -335,30 +335,31 @@ void SfxModelessDialog::Init(SfxBindings *pBindinx, SfxChildWindow *pCW)
*/
bool
SfxModelessDialog
::
Notify
(
NotifyEvent
&
rEvt
)
{
if
(
rEvt
.
GetType
()
==
MouseNotifyEvent
::
GETFOCUS
)
{
pBindings
->
SetActiveFrame
(
pImp
->
pMgr
->
GetFrame
()
);
pImp
->
pMgr
->
Activate_Impl
();
}
else
if
(
rEvt
.
GetType
()
==
MouseNotifyEvent
::
LOSEFOCUS
&&
!
HasChildPathFocus
()
)
{
pBindings
->
SetActiveFrame
(
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
frame
::
XFrame
>
()
);
pImp
->
pMgr
->
Deactivate_Impl
();
}
else
if
(
rEvt
.
GetType
()
==
MouseNotifyEvent
::
KEYINPUT
)
if
(
pImp
)
{
// First, allow KeyInput for Dialog functions ( TAB etc. )
if
(
!
ModelessDialog
::
Notify
(
rEvt
)
&&
SfxViewShell
::
Current
()
)
// then also for valid global accelerators.
return
SfxViewShell
::
Current
()
->
GlobalKeyInput_Impl
(
*
rEvt
.
GetKeyEvent
()
);
return
true
;
if
(
rEvt
.
GetType
()
==
MouseNotifyEvent
::
GETFOCUS
)
{
pBindings
->
SetActiveFrame
(
pImp
->
pMgr
->
GetFrame
()
);
pImp
->
pMgr
->
Activate_Impl
();
}
else
if
(
rEvt
.
GetType
()
==
MouseNotifyEvent
::
LOSEFOCUS
&&
!
HasChildPathFocus
()
)
{
pBindings
->
SetActiveFrame
(
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
frame
::
XFrame
>
()
);
pImp
->
pMgr
->
Deactivate_Impl
();
}
else
if
(
rEvt
.
GetType
()
==
MouseNotifyEvent
::
KEYINPUT
)
{
// First, allow KeyInput for Dialog functions ( TAB etc. )
if
(
!
ModelessDialog
::
Notify
(
rEvt
)
&&
SfxViewShell
::
Current
()
)
// then also for valid global accelerators.
return
SfxViewShell
::
Current
()
->
GlobalKeyInput_Impl
(
*
rEvt
.
GetKeyEvent
()
);
return
true
;
}
}
return
ModelessDialog
::
Notify
(
rEvt
);
}
SfxModelessDialog
::~
SfxModelessDialog
()
{
disposeOnce
();
...
...
@@ -369,6 +370,7 @@ void SfxModelessDialog::dispose()
if
(
pImp
->
pMgr
->
GetFrame
().
is
()
&&
pImp
->
pMgr
->
GetFrame
()
==
pBindings
->
GetActiveFrame
()
)
pBindings
->
SetActiveFrame
(
NULL
);
delete
pImp
;
pImp
=
NULL
;
ModelessDialog
::
dispose
();
}
...
...
@@ -423,33 +425,34 @@ bool SfxFloatingWindow::Notify( NotifyEvent& rEvt )
*/
{
if
(
rEvt
.
GetType
()
==
MouseNotifyEvent
::
GETFOCUS
)
{
pBindings
->
SetActiveFrame
(
pImp
->
pMgr
->
GetFrame
()
);
pImp
->
pMgr
->
Activate_Impl
();
}
else
if
(
rEvt
.
GetType
()
==
MouseNotifyEvent
::
LOSEFOCUS
)
if
(
pImp
)
{
if
(
!
HasChildPathFocus
()
)
if
(
rEvt
.
GetType
()
==
MouseNotifyEvent
::
GETFOCUS
)
{
pBindings
->
SetActiveFrame
(
NULL
);
pImp
->
pMgr
->
Deactivate_Impl
();
pBindings
->
SetActiveFrame
(
pImp
->
pMgr
->
GetFrame
()
);
pImp
->
pMgr
->
Activate_Impl
();
}
else
if
(
rEvt
.
GetType
()
==
MouseNotifyEvent
::
LOSEFOCUS
)
{
if
(
!
HasChildPathFocus
()
)
{
pBindings
->
SetActiveFrame
(
NULL
);
pImp
->
pMgr
->
Deactivate_Impl
();
}
}
else
if
(
rEvt
.
GetType
()
==
MouseNotifyEvent
::
KEYINPUT
)
{
// First, allow KeyInput for Dialog functions
if
(
!
FloatingWindow
::
Notify
(
rEvt
)
&&
SfxViewShell
::
Current
()
)
// then also for valid global accelerators.
return
SfxViewShell
::
Current
()
->
GlobalKeyInput_Impl
(
*
rEvt
.
GetKeyEvent
()
);
return
true
;
}
}
else
if
(
rEvt
.
GetType
()
==
MouseNotifyEvent
::
KEYINPUT
)
{
// First, allow KeyInput for Dialog functions
if
(
!
FloatingWindow
::
Notify
(
rEvt
)
&&
SfxViewShell
::
Current
()
)
// then also for valid global accelerators.
return
SfxViewShell
::
Current
()
->
GlobalKeyInput_Impl
(
*
rEvt
.
GetKeyEvent
()
);
return
true
;
}
return
FloatingWindow
::
Notify
(
rEvt
);
}
SfxFloatingWindow
::
SfxFloatingWindow
(
SfxBindings
*
pBindinx
,
SfxChildWindow
*
pCW
,
vcl
::
Window
*
pParent
,
WinBits
nWinBits
)
:
...
...
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