|
 |
f325b2 |
From e30be4212a631189bdfb68e3a72e2f80ae0a6f75 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Norbert Thiebaud <nthiebaud@gmail.com>
|
|
|
f325b2 |
Date: Sun, 21 Feb 2016 08:27:05 -0800
|
|
|
f325b2 |
Subject: [PATCH 395/398] WaE buggy warning in vs2015-r1
|
|
|
f325b2 |
|
|
|
f325b2 |
http://stackoverflow.com/questions/34013930/error-c4592-symbol-will-be-dynamically-initialized-vs2015-1-static-const-std
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Icbe882ad237d1e4f105006d8821ed5c89b06f525
|
|
|
f325b2 |
Reviewed-on: https://gerrit.libreoffice.org/22601
|
|
|
f325b2 |
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
|
f325b2 |
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
|
f325b2 |
(cherry picked from commit e895f1979ebf82cbab9739356ce97fc937efbdd0)
|
|
|
f325b2 |
Signed-off-by: Michael Stahl <mstahl@redhat.com>
|
|
|
f325b2 |
(cherry picked from commit c344820237efee7c3c7309a9f30ff8739aa8b5b4)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
desktop/source/lib/init.cxx | 7 +++++++
|
|
|
f325b2 |
1 file changed, 7 insertions(+)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
|
|
|
f325b2 |
index 9e5c52917eb7..184d7772ffc9 100644
|
|
|
f325b2 |
--- a/desktop/source/lib/init.cxx
|
|
|
f325b2 |
+++ b/desktop/source/lib/init.cxx
|
|
|
f325b2 |
@@ -186,6 +186,10 @@ static const ExtensionMap aDrawExtensionMap[] =
|
|
|
f325b2 |
* by css, it might turn out to be worth mapping some of these missing cursors
|
|
|
f325b2 |
* to available cursors?
|
|
|
f325b2 |
*/
|
|
|
f325b2 |
+#ifdef _MSC_VER
|
|
|
f325b2 |
+#pragma warning(push)
|
|
|
f325b2 |
+#pragma warning( disable : 4592)
|
|
|
f325b2 |
+#endif
|
|
|
f325b2 |
static const std::map <PointerStyle, OString> aPointerMap {
|
|
|
f325b2 |
{ PointerStyle::Arrow, "default" },
|
|
|
f325b2 |
// PointerStyle::Null ?
|
|
|
f325b2 |
@@ -228,6 +232,9 @@ static const std::map <PointerStyle, OString> aPointerMap {
|
|
|
f325b2 |
// Pivot Delete, TabSelectS through TabSelectSW
|
|
|
f325b2 |
// PaintBrush, HideWhiteSpace, ShowWhiteSpace
|
|
|
f325b2 |
};
|
|
|
f325b2 |
+#ifdef _MSC_VER
|
|
|
f325b2 |
+#pragma warning(pop)
|
|
|
f325b2 |
+#endif
|
|
|
f325b2 |
|
|
|
f325b2 |
static OUString getUString(const char* pString)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|