summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2011-10-06 16:10:32 +0300
committerTor Lillqvist <tlillqvist@suse.com>2011-10-07 12:49:39 +0300
commit6b9fbc03b84bd97404107973a9d569432b6f74c0 (patch)
tree14c55e7519fdf19b71018212865324e5be8e9b5a /editeng
parent288ce7b4ab9c55554b7ca085106eae2e56bc0a3c (diff)
WaE: assignment within conditional expression
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/misc/svxacorr.cxx9
1 files changed, 9 insertions, 0 deletions
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 72c30181f8da..7e53771e3b9c 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -643,6 +643,11 @@ 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 String& rTxt,
xub_StrLen, xub_StrLen nEndPos,
@@ -724,6 +729,10 @@ sal_Bool SvxAutoCorrect::FnAddNonBrkSpace(
return bRet;
}
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
sal_Bool SvxAutoCorrect::FnSetINetAttr( SvxAutoCorrDoc& rDoc, const String& rTxt,
xub_StrLen nSttPos, xub_StrLen nEndPos,
LanguageType eLang )