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
92f92db2
Kaydet (Commit)
92f92db2
authored
Eyl 25, 2014
tarafından
Tor Lillqvist
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
mhPrevInst was pointless
Change-Id: Iacd1c0856f991e11ef26d7ff6bf1e75264b89ac9
üst
50c62725
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
41 deletions
+35
-41
saldata.hxx
vcl/inc/win/saldata.hxx
+0
-1
salinst.cxx
vcl/win/source/app/salinst.cxx
+35
-40
No files found.
vcl/inc/win/saldata.hxx
Dosyayı görüntüle @
92f92db2
...
...
@@ -74,7 +74,6 @@ public:
public
:
HINSTANCE
mhInst
;
// default instance handle
HINSTANCE
mhPrevInst
;
// previous instance handle
int
mnCmdShow
;
// default frame show style
HPALETTE
mhDitherPal
;
// dither palette
HGLOBAL
mhDitherDIB
;
// dither memory handle
...
...
vcl/win/source/app/salinst.cxx
Dosyayı görüntüle @
92f92db2
...
...
@@ -332,7 +332,6 @@ void SalData::initKeyCodeMap()
SalData
::
SalData
()
{
mhInst
=
0
;
// default instance handle
mhPrevInst
=
0
;
// previous instance handle
mnCmdShow
=
0
;
// default frame show style
mhDitherPal
=
0
;
// dither palette
mhDitherDIB
=
0
;
// dither memory handle
...
...
@@ -435,7 +434,6 @@ void InitSalMain()
aSI
.
cb
=
sizeof
(
aSI
);
GetStartupInfo
(
&
aSI
);
pData
->
mhInst
=
GetModuleHandle
(
NULL
);
pData
->
mhPrevInst
=
NULL
;
pData
->
mnCmdShow
=
aSI
.
wShowWindow
;
}
}
...
...
@@ -464,44 +462,41 @@ SalInstance* CreateSalInstance()
pSalData
->
mnAppThreadId
=
GetCurrentThreadId
();
// register frame class
if
(
!
pSalData
->
mhPrevInst
)
{
WNDCLASSEXW
aWndClassEx
;
aWndClassEx
.
cbSize
=
sizeof
(
aWndClassEx
);
aWndClassEx
.
style
=
CS_OWNDC
;
aWndClassEx
.
lpfnWndProc
=
SalFrameWndProcW
;
aWndClassEx
.
cbClsExtra
=
0
;
aWndClassEx
.
cbWndExtra
=
SAL_FRAME_WNDEXTRA
;
aWndClassEx
.
hInstance
=
pSalData
->
mhInst
;
aWndClassEx
.
hCursor
=
0
;
aWndClassEx
.
hbrBackground
=
0
;
aWndClassEx
.
lpszMenuName
=
0
;
aWndClassEx
.
lpszClassName
=
SAL_FRAME_CLASSNAMEW
;
ImplLoadSalIcon
(
SAL_RESID_ICON_DEFAULT
,
aWndClassEx
.
hIcon
,
aWndClassEx
.
hIconSm
);
if
(
!
RegisterClassExW
(
&
aWndClassEx
)
)
return
NULL
;
aWndClassEx
.
hIcon
=
0
;
aWndClassEx
.
hIconSm
=
0
;
aWndClassEx
.
style
|=
CS_SAVEBITS
;
aWndClassEx
.
lpszClassName
=
SAL_SUBFRAME_CLASSNAMEW
;
if
(
!
RegisterClassExW
(
&
aWndClassEx
)
)
return
NULL
;
// shadow effect for popups on XP
if
(
aSalShlData
.
mbWXP
)
aWndClassEx
.
style
|=
CS_DROPSHADOW
;
aWndClassEx
.
lpszClassName
=
SAL_TMPSUBFRAME_CLASSNAMEW
;
if
(
!
RegisterClassExW
(
&
aWndClassEx
)
)
return
NULL
;
aWndClassEx
.
style
=
0
;
aWndClassEx
.
lpfnWndProc
=
SalComWndProcW
;
aWndClassEx
.
cbWndExtra
=
0
;
aWndClassEx
.
lpszClassName
=
SAL_COM_CLASSNAMEW
;
if
(
!
RegisterClassExW
(
&
aWndClassEx
)
)
return
NULL
;
}
WNDCLASSEXW
aWndClassEx
;
aWndClassEx
.
cbSize
=
sizeof
(
aWndClassEx
);
aWndClassEx
.
style
=
CS_OWNDC
;
aWndClassEx
.
lpfnWndProc
=
SalFrameWndProcW
;
aWndClassEx
.
cbClsExtra
=
0
;
aWndClassEx
.
cbWndExtra
=
SAL_FRAME_WNDEXTRA
;
aWndClassEx
.
hInstance
=
pSalData
->
mhInst
;
aWndClassEx
.
hCursor
=
0
;
aWndClassEx
.
hbrBackground
=
0
;
aWndClassEx
.
lpszMenuName
=
0
;
aWndClassEx
.
lpszClassName
=
SAL_FRAME_CLASSNAMEW
;
ImplLoadSalIcon
(
SAL_RESID_ICON_DEFAULT
,
aWndClassEx
.
hIcon
,
aWndClassEx
.
hIconSm
);
if
(
!
RegisterClassExW
(
&
aWndClassEx
)
)
return
NULL
;
aWndClassEx
.
hIcon
=
0
;
aWndClassEx
.
hIconSm
=
0
;
aWndClassEx
.
style
|=
CS_SAVEBITS
;
aWndClassEx
.
lpszClassName
=
SAL_SUBFRAME_CLASSNAMEW
;
if
(
!
RegisterClassExW
(
&
aWndClassEx
)
)
return
NULL
;
// shadow effect for popups on XP
if
(
aSalShlData
.
mbWXP
)
aWndClassEx
.
style
|=
CS_DROPSHADOW
;
aWndClassEx
.
lpszClassName
=
SAL_TMPSUBFRAME_CLASSNAMEW
;
if
(
!
RegisterClassExW
(
&
aWndClassEx
)
)
return
NULL
;
aWndClassEx
.
style
=
0
;
aWndClassEx
.
lpfnWndProc
=
SalComWndProcW
;
aWndClassEx
.
cbWndExtra
=
0
;
aWndClassEx
.
lpszClassName
=
SAL_COM_CLASSNAMEW
;
if
(
!
RegisterClassExW
(
&
aWndClassEx
)
)
return
NULL
;
HWND
hComWnd
=
CreateWindowExW
(
WS_EX_TOOLWINDOW
,
SAL_COM_CLASSNAMEW
,
L""
,
WS_POPUP
,
0
,
0
,
0
,
0
,
0
,
0
,
...
...
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