diff -r 6b24005a31b8 sfx2/Library_sfx.mk --- a/sfx2/Library_sfx.mk Wed Apr 06 15:10:04 2011 +0200 +++ b/sfx2/Library_sfx.mk Mon Apr 11 14:11:01 2011 +0200 @@ -129,7 +129,6 @@ 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 @@ sfx2/source/view/viewsh \ )) +# the following fixes a compiler optimization caused crash when in impress +# "opening stylist, select graphic style, select modify from context menu, cancel dialog, close stylist" +# only on unxlngi6 and unxlngi6.pro plattform (04/11/2011, issue 116803) +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,\