summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Engelhard <rene@rene-engelhard.de>2024-03-17 17:42:43 +0100
committerMichael Weghorn <m.weghorn@posteo.de>2024-03-21 09:04:08 +0100
commit10831c8b7b39f058452e640ba804f5a928441ed9 (patch)
treea96331dec2fc9c3e84279ba57a61253b9684c56b
parentb54dbc842491349ea1fd144988feb7e25ea5f106 (diff)
fix 32bit build with clang
seen in a build-with-clang experiment: /home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:575:39: error: non-constant-expression cannot be narrowed from type 'unsigned int' to 'tools::Long' (aka 'long') in initializer list [-Wc++11-narrowing] maGeometry.setPosSize({ x, y }, { w, h }); ^ /home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:575:39: note: insert an explicit cast to silence this issue maGeometry.setPosSize({ x, y }, { w, h }); ^ static_cast<Long>( ) /home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:575:42: error: non-constant-expression cannot be narrowed from type 'unsigned int' to 'tools::Long' (aka 'long') in initializer list [-Wc++11-narrowing] maGeometry.setPosSize({ x, y }, { w, h }); ^ /home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:575:42: note: insert an explicit cast to silence this issue maGeometry.setPosSize({ x, y }, { w, h }); ^ static_cast<Long>( ) /home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:1473:34: error: non-constant-expression cannot be narrowed from type 'unsigned int' to 'tools::Long' (aka 'long') in initializer list [-Wc++11-narrowing] maGeometry.setSize({ pState->GetMaximizedWidth(), pState->GetMaximizedHeight() }); ^~~~~~~~~~~~~~~~~~~~~~~~~~~ /home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:1473:34: note: insert an explicit cast to silence this issue maGeometry.setSize({ pState->GetMaximizedWidth(), pState->GetMaximizedHeight() }); ^~~~~~~~~~~~~~~~~~~~~~~~~~~ static_cast<Long>( ) /home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:1473:63: error: non-constant-expression cannot be narrowed from type 'unsigned int' to 'tools::Long' (aka 'long') in initializer list [-Wc++11-narrowing] maGeometry.setSize({ pState->GetMaximizedWidth(), pState->GetMaximizedHeight() }); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ /home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:1473:63: note: insert an explicit cast to silence this issue maGeometry.setSize({ pState->GetMaximizedWidth(), pState->GetMaximizedHeight() }); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ static_cast<Long>( ) /home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:3481:60: error: non-constant-expression cannot be narrowed from type 'unsigned int' to 'tools::Long' (aka 'long') in initializer list [-Wc++11-narrowing] maGeometry.setPosSize({ xp + nLeft, yp + nTop }, { w, h }); ^ /home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:3481:60: note: insert an explicit cast to silence this issue maGeometry.setPosSize({ xp + nLeft, yp + nTop }, { w, h }); ^ static_cast<Long>( ) /home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:3481:63: error: non-constant-expression cannot be narrowed from type 'unsigned int' to 'tools::Long' (aka 'long') in initializer list [-Wc++11-narrowing] maGeometry.setPosSize({ xp + nLeft, yp + nTop }, { w, h }); ^ /home/rene/LibreOffice/git/master/vcl/unx/generic/window/salframe.cxx:3481:63: note: insert an explicit cast to silence this issue maGeometry.setPosSize({ xp + nLeft, yp + nTop }, { w, h }); ^ static_cast<Long>( ) 6 errors generated. make[2]: *** [/home/rene/LibreOffice/git/master/solenv/gbuild/LinkTarget.mk:340: /home/rene/LibreOffice/git/master/workdir/CxxObject/vcl/unx/generic/window/salframe.o] Error 1 Fails with clang 16, builds with gcc 12 Change-Id: I668e3178aaaf528947c96db090f7b458e7f76754 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165039 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Jenkins
-rw-r--r--vcl/unx/generic/window/salframe.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index e3300de34357..f845b691cdcd 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -572,7 +572,7 @@ void X11SalFrame::Init( SalFrameStyleFlags nSalFrameStyle, SalX11Screen nXScreen
Hints.window_group = GetShellWindow();
}
- maGeometry.setPosSize({ x, y }, { w, h });
+ maGeometry.setPosSize({ x, y }, { static_cast<tools::Long>(w), static_cast<tools::Long>(h) });
updateScreenNumber();
XSync( GetXDisplay(), False );
@@ -1470,7 +1470,7 @@ void X11SalFrame::SetWindowState( const vcl::WindowData *pState )
pState->width(), pState->height());
// guess maximized geometry from last time
maGeometry.setPos({ pState->GetMaximizedX(), pState->GetMaximizedY() });
- maGeometry.setSize({ pState->GetMaximizedWidth(), pState->GetMaximizedHeight() });
+ maGeometry.setSize({ static_cast<tools::Long>(pState->GetMaximizedWidth()), static_cast<tools::Long>(pState->GetMaximizedHeight()) });
cairo_xlib_surface_set_size(mpSurface, pState->GetMaximizedWidth(), pState->GetMaximizedHeight());
updateScreenNumber();
}
@@ -3478,7 +3478,7 @@ bool X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent )
* note: this works because hWM_Parent is direct child of root,
* not necessarily parent of GetShellWindow()
*/
- maGeometry.setPosSize({ xp + nLeft, yp + nTop }, { w, h });
+ maGeometry.setPosSize({ xp + nLeft, yp + nTop }, { static_cast<tools::Long>(w), static_cast<tools::Long>(h) });
}
// limit width and height if we are too large: #47757