summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-09-11 11:40:05 +0200
committerMichael Stahl <mstahl@redhat.com>2014-09-12 16:23:45 +0000
commit1f8710fd9bef46d0648ab0379f02d7cb3c344954 (patch)
tree863af0a2474bf265dac7de8e35ccfe060277e87e
parent715bf79404b268a2b3e5184dd2aa3b55097c67fc (diff)
sfx2: remove optimization disabling workaround for GCC 4.2 bug
i#116803 was filed against OOo Linux baseline (some GCC 4.2.x); let's hope the current GCC versions that are required for C++11 work fine. Change-Id: Ie95b52c801564519aec348ae3fd56b14e2408234 Reviewed-on: https://gerrit.libreoffice.org/11396 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--sfx2/Library_sfx.mk16
1 files changed, 1 insertions, 15 deletions
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 8ce0196f782e..998dc63a033e 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -133,6 +133,7 @@ $(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/itemdel \
sfx2/source/control/minfitem \
sfx2/source/control/msg \
@@ -294,21 +295,6 @@ $(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) $(if $(call gb_LinkTarget__debug_enabled,sfx),$(gb_DEBUG_CFLAGS)) $(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,\