diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-25 12:01:49 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-25 12:01:49 +0100 |
| commit | 8e40bdbb2496be15fdba2e683af427bc2333be42 (patch) | |
| tree | 03ace0b9a2ffc12133cb0357fee75079c964f67a /testing/libreoffice/vbahelper.visibility.patch | |
| parent | 33fcf0e7b95e530b849e59e90fdea4001e01283d (diff) | |
| parent | 2aa2acfff38de7de825868995e49792ecfc03126 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/libvisual-projectm/PKGBUILD
community/python-memcached/PKGBUILD
community/python-mpi4py/PKGBUILD
core/sqlite3/PKGBUILD
core/udev/PKGBUILD
extra/kdeplasma-applets-networkmanagement/PKGBUILD
extra/pixman/PKGBUILD
extra/sg3_utils/PKGBUILD
libre/kdeutils-libre/PKGBUILD
libre/linux-libre/PKGBUILD
libre/linux-libre/linux-libre.install
multilib/lib32-libxcb/PKGBUILD
multilib/lib32-openssl/PKGBUILD
multilib/lib32-sdl_image/PKGBUILD
multilib/lib32-sqlite3/PKGBUILD
multilib/lib32-udev/PKGBUILD
Diffstat (limited to 'testing/libreoffice/vbahelper.visibility.patch')
| -rw-r--r-- | testing/libreoffice/vbahelper.visibility.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/testing/libreoffice/vbahelper.visibility.patch b/testing/libreoffice/vbahelper.visibility.patch deleted file mode 100644 index 5739100d0..000000000 --- a/testing/libreoffice/vbahelper.visibility.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:27:51.507604173 +0000 -+++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:28:26.230045727 +0000 -@@ -238,7 +238,7 @@ - - // including a HelperInterface implementation - template< typename Ifc1 > --class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 > -+class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 > - { - typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase; - protected: ---- sc/Library_vbaobj.mk -+++ sc/Library_vbaobj.mk -@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ - sc/source/ui/vba/vbaquerytable \ - sc/source/ui/vba/vbarange \ - sc/source/ui/vba/vbasheetobject \ -- sc/source/ui/vba/vbasheetobjects \ - sc/source/ui/vba/vbastyle \ - sc/source/ui/vba/vbastyles \ - sc/source/ui/vba/vbatextboxshape \ -@@ -133,6 +132,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ - sc/source/ui/vba/vbawsfunction \ - )) - -+$(eval $(call gb_Library_add_cxxobjects,vbaobj,\ -+ sc/source/ui/vba/vbasheetobjects \ -+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -+)) -+ - ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) - $(eval $(call gb_Library_set_ldflags,vbaobj,\ - $$(LDFLAGS) \ |