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
567dbbc5
Kaydet (Commit)
567dbbc5
authored
Nis 10, 2015
tarafından
Michael Meeks
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Fix NotifyEvent and IntroWindow bits.
Change-Id: Id12dbb9219a9581dd52d1f820c47f3da47b62187
üst
ed48a8af
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
21 deletions
+2
-21
event.hxx
include/vcl/event.hxx
+0
-17
svdata.hxx
vcl/inc/svdata.hxx
+1
-1
event.cxx
vcl/source/window/event.cxx
+1
-2
introwin.cxx
vcl/source/window/introwin.cxx
+0
-1
No files found.
include/vcl/event.hxx
Dosyayı görüntüle @
567dbbc5
...
@@ -436,23 +436,6 @@ public:
...
@@ -436,23 +436,6 @@ public:
const
CommandEvent
*
GetCommandEvent
()
const
;
const
CommandEvent
*
GetCommandEvent
()
const
;
};
};
inline
NotifyEvent
::
NotifyEvent
()
{
mpWindow
=
NULL
;
mpData
=
NULL
;
mnEventType
=
MouseNotifyEvent
::
NONE
;
mnRetValue
=
0
;
}
inline
NotifyEvent
::
NotifyEvent
(
MouseNotifyEvent
nEventType
,
vcl
::
Window
*
pWindow
,
const
void
*
pEvent
,
long
nRet
)
{
mpWindow
=
pWindow
;
mpData
=
const_cast
<
void
*>
(
pEvent
);
mnEventType
=
nEventType
;
mnRetValue
=
nRet
;
}
inline
const
KeyEvent
*
NotifyEvent
::
GetKeyEvent
()
const
inline
const
KeyEvent
*
NotifyEvent
::
GetKeyEvent
()
const
{
{
if
(
(
mnEventType
==
MouseNotifyEvent
::
KEYINPUT
)
||
(
mnEventType
==
MouseNotifyEvent
::
KEYUP
)
)
if
(
(
mnEventType
==
MouseNotifyEvent
::
KEYINPUT
)
||
(
mnEventType
==
MouseNotifyEvent
::
KEYUP
)
)
...
...
vcl/inc/svdata.hxx
Dosyayı görüntüle @
567dbbc5
...
@@ -327,7 +327,7 @@ struct ImplSVData
...
@@ -327,7 +327,7 @@ struct ImplSVData
ImplSVHelpData
maHelpData
;
// indepen data for Help classes
ImplSVHelpData
maHelpData
;
// indepen data for Help classes
ImplSVNWFData
maNWFData
;
ImplSVNWFData
maNWFData
;
UnoWrapperBase
*
mpUnoWrapper
;
UnoWrapperBase
*
mpUnoWrapper
;
vcl
::
Window
*
mpIntroWindow
;
// the splash screen
VclPtr
<
vcl
::
Window
>
mpIntroWindow
;
// the splash screen
DockingManager
*
mpDockingManager
;
DockingManager
*
mpDockingManager
;
BlendFrameCache
*
mpBlendFrameCache
;
BlendFrameCache
*
mpBlendFrameCache
;
bool
mbIsTestTool
;
bool
mbIsTestTool
;
...
...
vcl/source/window/event.cxx
Dosyayı görüntüle @
567dbbc5
...
@@ -586,10 +586,9 @@ NotifyEvent::NotifyEvent( MouseNotifyEvent nEventType, vcl::Window* pWindow,
...
@@ -586,10 +586,9 @@ NotifyEvent::NotifyEvent( MouseNotifyEvent nEventType, vcl::Window* pWindow,
const
void
*
pEvent
,
long
nRet
)
const
void
*
pEvent
,
long
nRet
)
{
{
mpWindow
=
pWindow
;
mpWindow
=
pWindow
;
mpData
=
(
void
*
)
pEvent
;
mpData
=
const_cast
<
void
*>
(
pEvent
)
;
mnEventType
=
nEventType
;
mnEventType
=
nEventType
;
mnRetValue
=
nRet
;
mnRetValue
=
nRet
;
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
vcl/source/window/introwin.cxx
Dosyayı görüntüle @
567dbbc5
...
@@ -45,7 +45,6 @@ IntroWindow::~IntroWindow()
...
@@ -45,7 +45,6 @@ IntroWindow::~IntroWindow()
void
IntroWindow
::
dispose
()
void
IntroWindow
::
dispose
()
{
{
// FIXME: really we should have a dispose & a ref-ptr there [!] ...
ImplSVData
*
pSVData
=
ImplGetSVData
();
ImplSVData
*
pSVData
=
ImplGetSVData
();
if
(
pSVData
->
mpIntroWindow
.
get
()
==
this
)
if
(
pSVData
->
mpIntroWindow
.
get
()
==
this
)
pSVData
->
mpIntroWindow
=
nullptr
;
pSVData
->
mpIntroWindow
=
nullptr
;
...
...
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