From d060ad1e445c202ee449bfd4c535166fecb84a31 Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mbauer@apache.org>
Date: Sun, 18 Sep 2011 20:28:52 +0000
Subject: cws mba34issues01: #i116803#: possible crash on Linux when
 dispatch.cxx is compiled with optimization

---
 sfx2/Library_sfx.mk | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index c18b46c8f16e..fbc6b95b96d2 100755
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -129,7 +129,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
     sfx2/source/config/evntconf \
     sfx2/source/control/bindings \
     sfx2/source/control/ctrlitem \
-    sfx2/source/control/dispatch \
     sfx2/source/control/macro \
     sfx2/source/control/minfitem \
     sfx2/source/control/msg \
@@ -237,6 +236,20 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
     sfx2/source/view/viewsh \
 ))
 
+# i116803: crash in impress when
+# "opening stylist, select graphic style, select modify from context menu, cancel dialog, close stylist"
+# only on unxlngi6 and unxlngi6.pro platform
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_cxxobjects,sfx,\
+    sfx2/source/control/dispatch \
+    , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+else
+$(eval $(call gb_Library_add_exception_objects,sfx,\
+    sfx2/source/control/dispatch \
+))
+endif
+
 $(eval $(call gb_SdiTarget_SdiTarget,sfx2/sdi/sfxslots,sfx2/sdi/sfx))
 
 $(eval $(call gb_SdiTarget_set_include,sfx2/sdi/sfxslots,\
-- 
cgit