windows: warning 4706 is disabled globally in com_MSC_defs.mk

So there is no need to do this locally, too.

Change-Id: Ibc623235cae07a86dfd0dbc1d7672ca4273facec

5 files changed, 3 insertions, 18 deletions

diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index de0d7b7a28ec..8ff9b0c84faa 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -50,7 +50,7 @@
 #pragma disable_warn
 #elif defined _MSC_VER
 #pragma warning(push, 1)
-#pragma warning(disable:4273 4701 4706)
+#pragma warning(disable:4273 4701)
 #endif
 
 #if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 99addf5c86f7..2777137eea95 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -607,10 +607,6 @@ sal_Bool SvxAutoCorrect::FnChgToEnEmDash(
     return bRet;
 }
 
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable: 4706) // assignment within conditional expression
-#endif
 
 sal_Bool SvxAutoCorrect::FnAddNonBrkSpace(
                                 SvxAutoCorrDoc& rDoc, const OUString& rTxt,
@@ -697,9 +693,6 @@ sal_Bool SvxAutoCorrect::FnAddNonBrkSpace(
     return bRet;
 }
 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
 
 sal_Bool SvxAutoCorrect::FnSetINetAttr( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
                                     xub_StrLen nSttPos, xub_StrLen nEndPos,
diff --git a/idlc/source/parser.y b/idlc/source/parser.y
index d7fba7efed40..da3853e3d161 100644
--- a/idlc/source/parser.y
+++ b/idlc/source/parser.y
@@ -214,7 +214,7 @@ bool includes(AstDeclaration const * type1, AstDeclaration const * type2) {
 #pragma disable_warn
 #elif defined _MSC_VER
 #pragma warning(push, 1)
-#pragma warning(disable: 4273 4701 4702 4706)
+#pragma warning(disable: 4273 4701 4702)
 #endif
 %}
 /*
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.cxx b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
index 0ab511208a33..53a1f18a575f 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils.cxx
+++ b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
@@ -45,10 +45,7 @@ sal_uInt32 AStringLen( const sal_Char *pAStr )
 
     return nStrLen;
 } // AStringLen
-/* disable assignment within condition expression */
-#if defined WNT && defined _MSC_VER
-#pragma warning( disable : 4706 )
-#endif
+
 sal_Char* cpystr( sal_Char* dst, const sal_Char* src )
 {
     const sal_Char* psrc = src;
diff --git a/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h b/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h
index 2ed2e32dd58b..defa6b7eb634 100755
--- a/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h
+++ b/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h
@@ -258,7 +258,6 @@ extern "C" {
     #elif ( defined( _MSC_VER ) )
 
         #pragma warning( disable:4127 ) // Disable "conditional expression is constant" warning for debug macros.
-        #pragma warning( disable:4706 ) // Disable "assignment within conditional expression" for Microsoft headers.
 
     #endif
 
@@ -266,10 +265,6 @@ extern "C" {
     #include    <winsock2.h>
     #include    <ws2tcpip.h>
 
-    #if ( defined( _MSC_VER ) )
-        #pragma warning( default:4706 )
-    #endif
-
 #else
     #error unknown OS - update this file to support your OS
 #endif