[Libreoffice-commits] core.git: vcl/source
Tor Lillqvist
tml at collabora.com
Thu Mar 3 07:47:43 UTC 2016
vcl/source/window/syswin.cxx | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 65de9aa744fd51ee3d90a400f8413ae2805520ce
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Mar 3 09:43:26 2016 +0200
Follow our code layout style
Consistency is important. (I know that we are wildly inconsistent in
many things, even inside individual source files. Like the spacing of
the expression in an if statement. But putting an opening brace on a
separate line is something we do quite consistently.)
Change-Id: I7c50628653b94a4da0fc4dc8db8869a5f1a64527
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 080d72a..1feffa9 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -642,9 +642,10 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData )
aState.mnHeight = rData.GetHeight();
if ( (aState.mnMask & SAL_FRAME_POSSIZE_X) &&
- (aState.mnMask & SAL_FRAME_POSSIZE_Y) &&
- (aState.mnMask & SAL_FRAME_POSSIZE_WIDTH) &&
- (aState.mnMask & SAL_FRAME_POSSIZE_HEIGHT) ) {
+ (aState.mnMask & SAL_FRAME_POSSIZE_Y) &&
+ (aState.mnMask & SAL_FRAME_POSSIZE_WIDTH) &&
+ (aState.mnMask & SAL_FRAME_POSSIZE_HEIGHT) )
+ {
mbInitialLayoutDone = true;
}
@@ -1107,7 +1108,8 @@ void SystemWindow::DoInitialLayout()
if (isLayoutEnabled())
{
- if (!mbInitialLayoutDone) {
+ if (!mbInitialLayoutDone)
+ {
mbIsCalculatingInitialLayoutSize = true;
setDeferredProperties();
setOptimalLayoutSize();
More information about the Libreoffice-commits
mailing list