diff options
| -rw-r--r-- | desktop/source/app/app.cxx | 7 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 7 | ||||
| -rw-r--r-- | desktop/source/lib/init.cxx | 7 | ||||
| -rw-r--r-- | desktop/win32/source/QuickStart/QuickStart.cxx | 6 | ||||
| -rw-r--r-- | desktop/win32/source/guistdio/guistdio.inc | 6 | ||||
| -rw-r--r-- | desktop/win32/source/unoinfo.cxx | 6 |
6 files changed, 0 insertions, 39 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index da71a0aae2b7..d3eadd1d4987 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -130,16 +130,9 @@ #endif #ifdef _WIN32 -#ifdef _MSC_VER -#pragma warning(push, 1) /* disable warnings within system headers */ -#pragma warning (disable: 4005) -#endif #define WIN32_LEAN_AND_MEAN #include <windows.h> -#ifdef _MSC_VER -#pragma warning(pop) #endif -#endif //WNT #if defined(_WIN32) #include <process.h> diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 928ac82ff81d..84246cd046db 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -81,17 +81,10 @@ #include <memory> #ifdef _WIN32 -#if defined _MSC_VER -#pragma warning (push, 1) -#pragma warning (disable: 4005) -#endif #if !defined WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN #endif #include <windows.h> -#if defined _MSC_VER -#pragma warning (pop) -#endif #include <objbase.h> #endif diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 54f81663517b..ab7b72d526dc 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -201,10 +201,6 @@ static const ExtensionMap aDrawExtensionMap[] = * by css, it might turn out to be worth mapping some of these missing cursors * to available cursors? */ -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning( disable : 4592) -#endif static const std::map <PointerStyle, OString> aPointerMap { { PointerStyle::Arrow, "default" }, // PointerStyle::Null ? @@ -246,9 +242,6 @@ static const std::map <PointerStyle, OString> aPointerMap { // Pivot Delete, TabSelectS through TabSelectSW // PaintBrush, HideWhiteSpace, ShowWhiteSpace }; -#ifdef _MSC_VER -#pragma warning(pop) -#endif static OUString getUString(const char* pString) { diff --git a/desktop/win32/source/QuickStart/QuickStart.cxx b/desktop/win32/source/QuickStart/QuickStart.cxx index 0cc673c77191..476f6533d530 100644 --- a/desktop/win32/source/QuickStart/QuickStart.cxx +++ b/desktop/win32/source/QuickStart/QuickStart.cxx @@ -21,15 +21,9 @@ #include <sal/config.h> -#if defined _MSC_VER -#pragma warning(push, 1) -#endif #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <shellapi.h> -#if defined _MSC_VER -#pragma warning(pop) -#endif #include "resource.h" #include <systools/win32/uwinapi.h> diff --git a/desktop/win32/source/guistdio/guistdio.inc b/desktop/win32/source/guistdio/guistdio.inc index 5d6634bb9c5c..eb1b9cda1639 100644 --- a/desktop/win32/source/guistdio/guistdio.inc +++ b/desktop/win32/source/guistdio/guistdio.inc @@ -18,13 +18,7 @@ */ #define WIN32_LEAN_AND_MEAN -#ifdef _MSC_VER -#pragma warning(push,1) // disable warnings within system headers -#endif #include <windows.h> -#ifdef _MSC_VER -#pragma warning(pop) -#endif #include <string.h> #include <stdlib.h> diff --git a/desktop/win32/source/unoinfo.cxx b/desktop/win32/source/unoinfo.cxx index 3ee7e7750335..3a41b6e0985e 100644 --- a/desktop/win32/source/unoinfo.cxx +++ b/desktop/win32/source/unoinfo.cxx @@ -23,13 +23,7 @@ #include <wchar.h> #define WIN32_LEAN_AND_MEAN -#if defined _MSC_VER -#pragma warning(push, 1) -#endif #include <windows.h> -#if defined _MSC_VER -#pragma warning(pop) -#endif #include <tools/pathutils.hxx> |