sfx2/source/appl/shutdownicon.cxx | 6 ++---- vcl/win/window/salframe.cxx | 10 +++++++++- 2 files changed, 11 insertions(+), 5 deletions(-)
New commits: commit dee4e3d4e29a69063d29e98ab93345197b3a7a03 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Thu Oct 24 10:35:45 2019 +0200 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Thu Oct 24 11:50:49 2019 +0200 Only define ShutdownIcon::getShortcutName for _WIN32 ...where sfx2/Library_sfx.mk only defines ENABLE_QUICKSTART_APPLET for WNT and MACOSX anyway, and compiling ShutdownIcon::getShortcutName on any other platform would have lead to a non-void function without a return statement Change-Id: I78726fb50ba58571b5397e83a0c1b44f808b2d1e Reviewed-on: https://gerrit.libreoffice.org/81430 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index ffda878b33c0..c0153cb12c8f 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -616,18 +616,16 @@ bool ShutdownIcon::IsQuickstarterInstalled() #ifdef ENABLE_QUICKSTART_APPLET -#ifndef MACOSX +#ifdef _WIN32 OUString ShutdownIcon::getShortcutName() { -#ifdef _WIN32 OUString aShortcutName(SfxResId(STR_QUICKSTART_LNKNAME) + ".lnk"); OUString aShortcut(GetAutostartFolderNameW32()); aShortcut += "\\" + aShortcutName; return aShortcut; -#endif // _WIN32 } -#endif +#endif // _WIN32 #endif bool ShutdownIcon::GetAutostart( ) commit b4378c7a2233562518dcedd819830896d5e31624 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Thu Oct 24 09:37:54 2019 +0200 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Thu Oct 24 11:50:20 2019 +0200 loplugin:classmemaccess (clang-cl) Change-Id: I4a403babbd24e7145aca4486230ae5b14b9eb581 Reviewed-on: https://gerrit.libreoffice.org/81428 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index 8755c98967fd..6f7971f01c33 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -3823,7 +3823,15 @@ static void UpdateFrameGeometry( HWND hWnd, WinSalFrame* pFrame ) RECT aRect; GetWindowRect( hWnd, &aRect ); - memset(&pFrame->maGeometry, 0, sizeof(SalFrameGeometry) ); + pFrame->maGeometry.nX = 0; + pFrame->maGeometry.nY = 0; + pFrame->maGeometry.nWidth = 0; + pFrame->maGeometry.nHeight = 0; + pFrame->maGeometry.nLeftDecoration = 0; + pFrame->maGeometry.nTopDecoration = 0; + pFrame->maGeometry.nRightDecoration = 0; + pFrame->maGeometry.nBottomDecoration = 0; + pFrame->maGeometry.nDisplayScreenNumber = 0; if ( IsIconic( hWnd ) ) return; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits