[Libreoffice-commits] core.git: setup_native/source

Mike Kaganski mike.kaganski at collabora.com
Fri Feb 2 05:00:15 UTC 2018 

 setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx |    6 ------
 setup_native/source/win32/customactions/quickstarter/quickstarter.cxx             |    6 ------
 setup_native/source/win32/customactions/quickstarter/quickstarter.hxx             |    6 ------
 setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx   |    7 -------
 setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx               |    6 ------
 setup_native/source/win32/customactions/regactivex/regactivex.cxx                 |    6 ------
 setup_native/source/win32/customactions/sellang/sorttree.cxx                      |    6 ------
 setup_native/source/win32/customactions/shellextensions/shlxtmsi.hxx              |    9 ---------
 setup_native/source/win32/customactions/tools/checkversion.cxx                    |    6 ------
 setup_native/source/win32/customactions/tools/seterror.cxx                        |    6 ------
 10 files changed, 64 deletions(-)

New commits:
commit d297fad623d3b1c2b6604886f53b7fe8f8d33fbe
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Wed Jan 31 21:09:39 2018 +0300

    setup_native: MSVC: pragma warning: make more specific, remove obsolete
    
    Change-Id: Ie9f63d982acf368d27bb5b97728b060a80e8bd67
    Reviewed-on: https://gerrit.libreoffice.org/49047
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx b/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
index 4ea57b8e3087..4fad91039c7e 100644
--- a/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
+++ b/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
@@ -26,15 +26,9 @@
     the service we do nothing.
 */
 
-#ifdef _MSC_VER
-#pragma warning(push, 1) /* disable warnings within system headers */
-#endif
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <msiquery.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 /*
     Advapi.dll needs to be loaded dynamically because the service
diff --git a/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx b/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx
index 8245d7f18753..0e83d9964e80 100644
--- a/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx
+++ b/setup_native/source/win32/customactions/quickstarter/quickstarter.cxx
@@ -19,13 +19,7 @@
 
 #include "quickstarter.hxx"
 
-#ifdef _MSC_VER
-#pragma warning(push, 1) /* disable warnings within system headers */
-#endif
 #include <psapi.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 #include <malloc.h>
 
diff --git a/setup_native/source/win32/customactions/quickstarter/quickstarter.hxx b/setup_native/source/win32/customactions/quickstarter/quickstarter.hxx
index 664cff4c0a22..2370f4691833 100644
--- a/setup_native/source/win32/customactions/quickstarter/quickstarter.hxx
+++ b/setup_native/source/win32/customactions/quickstarter/quickstarter.hxx
@@ -20,15 +20,9 @@
 #ifndef INCLUDED_SETUP_NATIVE_SOURCE_WIN32_CUSTOMACTIONS_QUICKSTARTER_QUICKSTARTER_HXX
 #define INCLUDED_SETUP_NATIVE_SOURCE_WIN32_CUSTOMACTIONS_QUICKSTARTER_QUICKSTARTER_HXX
 
-#ifdef _MSC_VER
-#pragma warning(push, 1) /* disable warnings within system headers */
-#endif
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <msiquery.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 #include <string>
 
diff --git a/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx b/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx
index 3e0f8d6be674..5f720a2b8516 100644
--- a/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx
+++ b/setup_native/source/win32/customactions/quickstarter/remove_quickstart_link.cxx
@@ -19,14 +19,7 @@
 
 #include "quickstarter.hxx"
 
-#ifdef _MSC_VER
-#pragma warning(push, 1) /* disable warnings within system headers */
-#pragma warning(disable: 4917)
-#endif
 #include <shlobj.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 extern "C" UINT __stdcall RemoveQuickstarterLink( MSIHANDLE hMSI )
 {
diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
index efcfb0dd705d..da72f34c7e92 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -17,15 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifdef _MSC_VER
-#pragma warning(push, 1) /* disable warnings within system headers */
-#endif
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <msiquery.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 #include <malloc.h>
 #include <string>
diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
index 947fbfbd9e9a..561ced1d906e 100644
--- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx
+++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
@@ -17,17 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifdef _MSC_VER
-#pragma warning(push, 1) /* disable warnings within system headers */
-#endif
 #if !defined WIN32_LEAN_AND_MEAN
 # define WIN32_LEAN_AND_MEAN
 #endif
 #include <windows.h>
 #include <msiquery.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 #include <string.h>
 #include <malloc.h>
diff --git a/setup_native/source/win32/customactions/sellang/sorttree.cxx b/setup_native/source/win32/customactions/sellang/sorttree.cxx
index b34832e49137..25354bdea6bf 100644
--- a/setup_native/source/win32/customactions/sellang/sorttree.cxx
+++ b/setup_native/source/win32/customactions/sellang/sorttree.cxx
@@ -7,16 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifdef _MSC_VER
-#pragma warning(push, 1) /* disable warnings within system headers */
-#endif
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <msi.h>
 #include <commctrl.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 extern "C" UINT __stdcall SortTree(MSIHANDLE)
 {
diff --git a/setup_native/source/win32/customactions/shellextensions/shlxtmsi.hxx b/setup_native/source/win32/customactions/shellextensions/shlxtmsi.hxx
index 2da81714373e..3a08060bee60 100644
--- a/setup_native/source/win32/customactions/shellextensions/shlxtmsi.hxx
+++ b/setup_native/source/win32/customactions/shellextensions/shlxtmsi.hxx
@@ -20,18 +20,9 @@
 #ifndef INCLUDED_SETUP_NATIVE_SOURCE_WIN32_CUSTOMACTIONS_SHELLEXTENSIONS_SHLXTMSI_HXX
 #define INCLUDED_SETUP_NATIVE_SOURCE_WIN32_CUSTOMACTIONS_SHELLEXTENSIONS_SHLXTMSI_HXX
 
-#ifdef _MSC_VER
-#pragma warning(push, 1) /* disable warnings within system headers */
-#endif
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <msiquery.h>
-#ifdef _WIN32_WINNT_WINBLUE
-#include <VersionHelpers.h>
-#endif
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 #include <string>
 
diff --git a/setup_native/source/win32/customactions/tools/checkversion.cxx b/setup_native/source/win32/customactions/tools/checkversion.cxx
index 3d73df89d6b6..12e43a08cdc8 100644
--- a/setup_native/source/win32/customactions/tools/checkversion.cxx
+++ b/setup_native/source/win32/customactions/tools/checkversion.cxx
@@ -17,15 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifdef _MSC_VER
-#pragma warning(push,1) // disable warnings within system headers
-#endif
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <msiquery.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 #include <string.h>
 #include <malloc.h>
diff --git a/setup_native/source/win32/customactions/tools/seterror.cxx b/setup_native/source/win32/customactions/tools/seterror.cxx
index 5e06a14a98e7..e0c4389fd1a7 100644
--- a/setup_native/source/win32/customactions/tools/seterror.cxx
+++ b/setup_native/source/win32/customactions/tools/seterror.cxx
@@ -17,14 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifdef _MSC_VER
-#pragma warning(push,1) // disable warnings within system headers
-#endif
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 #include <string.h>
 #include <malloc.h>

More information about the Libreoffice-commits mailing list