mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expand macro COMPAT_BODY in vcl

Browse Source 
Change-Id: I598ba7a6f8c51958d8130448529d21073004aad6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108448
Tested-by: Julien Nabet <serval2412@yahoo.fr>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
This commit is contained in:
Julien Nabet
2020-12-29 10:45:50 +01:00
parent c7efa4fd4f
commit c0eee433e0
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
vcl/source/window/window.cxx
View File

@@ -3900,30 +3900,36 @@ void Window::RequestDoubleBuffering(bool bRequest)
* dispose and this altered a lot of code paths, that * dispose and this altered a lot of code paths, that
* are better left unchanged for now. * are better left unchanged for now.
*/ */
#define COMPAT_BODY(method,args) \
if (!mpWindowImpl || mpWindowImpl->mbInDispose) \
Window::method args; \
else \
method args;
void Window::CompatGetFocus() void Window::CompatGetFocus()
{ {
COMPAT_BODY(GetFocus,()) if (!mpWindowImpl || mpWindowImpl->mbInDispose)
Window::GetFocus();
else
GetFocus();
} }
void Window::CompatLoseFocus() void Window::CompatLoseFocus()
{ {
COMPAT_BODY(LoseFocus,()) if (!mpWindowImpl || mpWindowImpl->mbInDispose)
Window::LoseFocus();
else
LoseFocus();
} }
void Window::CompatStateChanged( StateChangedType nStateChange ) void Window::CompatStateChanged( StateChangedType nStateChange )
{ {
COMPAT_BODY(StateChanged,(nStateChange)) if (!mpWindowImpl || mpWindowImpl->mbInDispose)
Window::StateChanged(nStateChange);
else
StateChanged(nStateChange);
} }
void Window::CompatDataChanged( const DataChangedEvent& rDCEvt ) void Window::CompatDataChanged( const DataChangedEvent& rDCEvt )
{ {
COMPAT_BODY(DataChanged,(rDCEvt)) if (!mpWindowImpl || mpWindowImpl->mbInDispose)
Window::DataChanged(rDCEvt);
else
DataChanged(rDCEvt);
} }
bool Window::CompatPreNotify( NotifyEvent& rNEvt ) bool Window::CompatPreNotify( NotifyEvent& rNEvt )