diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-10-24 10:35:45 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-10-24 11:50:49 +0200 |
| commit | dee4e3d4e29a69063d29e98ab93345197b3a7a03 (patch) | |
| tree | 5128fd3a2adb106209f5aeb10d8c6520d6a03703 /sfx2 | |
| parent | b4378c7a2233562518dcedd819830896d5e31624 (diff) | |
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 <sbergman@redhat.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/shutdownicon.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
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( ) |