shell/source/win32/simplemail/simplemapi.hxx | 5 ----- vcl/win/source/app/salinst.cxx | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-)
New commits: commit 326f3e40ba427f901e68642229c5e2c422d6135f Author: Thomas Arnhold <[email protected]> Date: Thu Oct 31 21:06:25 2013 +0100 shell: mapix.h is not needed at all Change-Id: I1a55a4c260b781f7427bf149d32f1cae6149fe9a diff --git a/shell/source/win32/simplemail/simplemapi.hxx b/shell/source/win32/simplemail/simplemapi.hxx index 6495d4f..58f72fc 100644 --- a/shell/source/win32/simplemail/simplemapi.hxx +++ b/shell/source/win32/simplemail/simplemapi.hxx @@ -26,11 +26,6 @@ #endif #include <windows.h> #include <mapi.h> -#ifndef __MINGW32__ -#if NTDDI_VERSION < NTDDI_WIN8 -#include <mapix.h> -#endif -#endif #if defined _MSC_VER #pragma warning(pop) #endif commit b4655065ad8866a346dc7c01658eaef30f85bbec Author: Thomas Arnhold <[email protected]> Date: Thu Oct 31 21:04:54 2013 +0100 vcl: fix brace Change-Id: Ib41c9521a8b8e5b8ebc170f9b7e45379a51f1bd5 diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index cb19f87..ee72036 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -1103,10 +1103,10 @@ void WinSalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUS } } } + } #else (void) rDocumentService; #endif - } // For whatever reason, we could not use the SHARD_APPIDINFO semantics SHAddToRecentDocs(SHARD_PATHW, (PCWSTR) system_path.getStr()); } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
