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
042f16a1
Kaydet (Commit)
042f16a1
authored
Mar 16, 2016
tarafından
Miklos Vajna
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
vcl: fix loplugin:defaultparams
Change-Id: Ic947d1a4a341a778c88d1225b1a2ea66df697084
üst
e8826d81
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
toolbox.cxx
vcl/source/window/toolbox.cxx
+2
-3
window.cxx
vcl/source/window/window.cxx
+4
-4
No files found.
vcl/source/window/toolbox.cxx
Dosyayı görüntüle @
042f16a1
...
@@ -3131,8 +3131,7 @@ void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos,
...
@@ -3131,8 +3131,7 @@ void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos,
}
}
else
else
bClip
=
false
;
bClip
=
false
;
rRenderContext
.
DrawCtrlText
(
aPos
,
pItem
->
maText
,
0
,
pItem
->
maText
.
getLength
(),
DrawTextFlags
::
Mnemonic
,
rRenderContext
.
DrawCtrlText
(
aPos
,
pItem
->
maText
,
0
,
pItem
->
maText
.
getLength
()
);
nullptr
,
nullptr
);
if
(
bClip
)
if
(
bClip
)
rRenderContext
.
SetClipRegion
();
rRenderContext
.
SetClipRegion
();
rRenderContext
.
SetFont
(
aOldFont
);
rRenderContext
.
SetFont
(
aOldFont
);
...
@@ -3286,7 +3285,7 @@ void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos,
...
@@ -3286,7 +3285,7 @@ void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos,
if
(
!
pItem
->
mbEnabled
)
if
(
!
pItem
->
mbEnabled
)
nTextStyle
|=
DrawTextFlags
::
Disable
;
nTextStyle
|=
DrawTextFlags
::
Disable
;
rRenderContext
.
DrawCtrlText
(
Point
(
nTextOffX
,
nTextOffY
),
pItem
->
maText
,
rRenderContext
.
DrawCtrlText
(
Point
(
nTextOffX
,
nTextOffY
),
pItem
->
maText
,
0
,
pItem
->
maText
.
getLength
(),
nTextStyle
,
nullptr
,
nullptr
);
0
,
pItem
->
maText
.
getLength
(),
nTextStyle
);
if
(
bRotate
)
if
(
bRotate
)
SetFont
(
aOldFont
);
SetFont
(
aOldFont
);
}
}
...
...
vcl/source/window/window.cxx
Dosyayı görüntüle @
042f16a1
...
@@ -2582,7 +2582,7 @@ void Window::EnableInput( bool bEnable, bool bChild )
...
@@ -2582,7 +2582,7 @@ void Window::EnableInput( bool bEnable, bool bChild )
void
Window
::
EnableInput
(
bool
bEnable
,
const
vcl
::
Window
*
pExcludeWindow
)
void
Window
::
EnableInput
(
bool
bEnable
,
const
vcl
::
Window
*
pExcludeWindow
)
{
{
EnableInput
(
bEnable
,
true
/*bChild*/
);
EnableInput
(
bEnable
);
// pExecuteWindow is the first Overlap-Frame --> if this
// pExecuteWindow is the first Overlap-Frame --> if this
// shouldn't be the case, than this must be changed in dialog.cxx
// shouldn't be the case, than this must be changed in dialog.cxx
...
@@ -2597,7 +2597,7 @@ void Window::EnableInput( bool bEnable, const vcl::Window* pExcludeWindow )
...
@@ -2597,7 +2597,7 @@ void Window::EnableInput( bool bEnable, const vcl::Window* pExcludeWindow )
// Is Window not in the exclude window path or not the
// Is Window not in the exclude window path or not the
// exclude window, than change the status
// exclude window, than change the status
if
(
!
pExcludeWindow
||
!
pExcludeWindow
->
ImplIsWindowOrChild
(
pSysWin
,
true
)
)
if
(
!
pExcludeWindow
||
!
pExcludeWindow
->
ImplIsWindowOrChild
(
pSysWin
,
true
)
)
pSysWin
->
EnableInput
(
bEnable
,
true
/*bChild*/
);
pSysWin
->
EnableInput
(
bEnable
);
}
}
pSysWin
=
pSysWin
->
mpWindowImpl
->
mpNextOverlap
;
pSysWin
=
pSysWin
->
mpWindowImpl
->
mpNextOverlap
;
}
}
...
@@ -2614,7 +2614,7 @@ void Window::EnableInput( bool bEnable, const vcl::Window* pExcludeWindow )
...
@@ -2614,7 +2614,7 @@ void Window::EnableInput( bool bEnable, const vcl::Window* pExcludeWindow )
// Is Window not in the exclude window path or not the
// Is Window not in the exclude window path or not the
// exclude window, than change the status
// exclude window, than change the status
if
(
!
pExcludeWindow
||
!
pExcludeWindow
->
ImplIsWindowOrChild
(
pFrameWin
,
true
)
)
if
(
!
pExcludeWindow
||
!
pExcludeWindow
->
ImplIsWindowOrChild
(
pFrameWin
,
true
)
)
pFrameWin
->
EnableInput
(
bEnable
,
true
/*bChild*/
);
pFrameWin
->
EnableInput
(
bEnable
);
}
}
}
}
pFrameWin
=
pFrameWin
->
mpWindowImpl
->
mpFrameData
->
mpNextFrame
;
pFrameWin
=
pFrameWin
->
mpWindowImpl
->
mpFrameData
->
mpNextFrame
;
...
@@ -2633,7 +2633,7 @@ void Window::EnableInput( bool bEnable, const vcl::Window* pExcludeWindow )
...
@@ -2633,7 +2633,7 @@ void Window::EnableInput( bool bEnable, const vcl::Window* pExcludeWindow )
// Is Window not in the exclude window path or not the
// Is Window not in the exclude window path or not the
// exclude window, than change the status
// exclude window, than change the status
if
(
!
pExcludeWindow
||
!
pExcludeWindow
->
ImplIsWindowOrChild
(
(
*
p
),
true
)
)
if
(
!
pExcludeWindow
||
!
pExcludeWindow
->
ImplIsWindowOrChild
(
(
*
p
),
true
)
)
(
*
p
)
->
EnableInput
(
bEnable
,
true
/*bChild*/
);
(
*
p
)
->
EnableInput
(
bEnable
);
}
}
++
p
;
++
p
;
}
}
...
...
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