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

[Norbert Thiebaud]

 desktop/source/lib/init.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit e895f1979ebf82cbab9739356ce97fc937efbdd0
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Feb 21 08:27:05 2016 -0800

    WaE buggy warning in vs2015-r1
    
    http://stackoverflow.com/questions/34013930/error-c4592-symbol-will-be-dynamically-initialized-vs2015-1-static-const-std
    
    Change-Id: Icbe882ad237d1e4f105006d8821ed5c89b06f525
    Reviewed-on: https://gerrit.libreoffice.org/22601
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index bb480b3..5eb2aa1 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -179,6 +179,10 @@ 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 ?
@@ -222,6 +226,9 @@ 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)
 {