incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mba...@apache.org
Subject svn commit: r1172367 - /incubator/ooo/trunk/main/sfx2/Library_sfx.mk
Date Sun, 18 Sep 2011 21:28:53 GMT
Author: mbauer
Date: Sun Sep 18 21:28:52 2011
New Revision: 1172367

URL: http://svn.apache.org/viewvc?rev=1172367&view=rev
Log:
cws mba34issues01: #i116803#: possible crash on Linux when dispatch.cxx is compiled with optimization

Modified:
    incubator/ooo/trunk/main/sfx2/Library_sfx.mk

Modified: incubator/ooo/trunk/main/sfx2/Library_sfx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/Library_sfx.mk?rev=1172367&r1=1172366&r2=1172367&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sfx2/Library_sfx.mk (original)
+++ incubator/ooo/trunk/main/sfx2/Library_sfx.mk Sun Sep 18 21:28:52 2011
@@ -129,7 +129,6 @@ $(eval $(call gb_Library_add_exception_o
 	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_o
 	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,\



Mime
View raw message