summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreroen2013-09-29 02:52:52 +0200
committereroen2013-09-29 02:52:52 +0200
commita95bf17938265d71364dc104aebea6c169ad5d62 (patch)
tree29ff81622d0337f655f91c625f34521ece3c21e0
parentd57cf00bf6069b51743872870d862a2b199941d4 (diff)
downloaderoen-overlay-a95bf17938265d71364dc104aebea6c169ad5d62.tar.gz
eroen-overlay-a95bf17938265d71364dc104aebea6c169ad5d62.tar.bz2
eroen-overlay-a95bf17938265d71364dc104aebea6c169ad5d62.tar.xz
libreoffice-4.1.2.2 - -r1 patch from gentoo
-rw-r--r--app-office/libreoffice/files/libreoffice-4.1.2.2-idfattrib.patch15
-rw-r--r--app-office/libreoffice/libreoffice-4.1.2.2-r1.ebuild (renamed from app-office/libreoffice/libreoffice-4.1.2.2.ebuild)4
2 files changed, 18 insertions, 1 deletions
diff --git a/app-office/libreoffice/files/libreoffice-4.1.2.2-idfattrib.patch b/app-office/libreoffice/files/libreoffice-4.1.2.2-idfattrib.patch
new file mode 100644
index 00000000..9402b6b7
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-4.1.2.2-idfattrib.patch
@@ -0,0 +1,15 @@
+--- a/sc/inc/global.hxx 2013-09-17 19:27:21.000000000 +0300
++++ b/sc/inc/global.hxx 2013-09-24 23:12:34.277966796 +0300
+@@ -190,7 +190,7 @@ const sal_uInt16 IDF_HARDATTR = 0x0020
+ const sal_uInt16 IDF_OUTLINE = 0x0800; /// Sheet / outlining (grouping) information
+ const sal_uInt16 IDF_NOCAPTIONS = 0x0200; /// Internal use only (undo etc.): do not copy/delete caption objects of cell notes.
+ const sal_uInt16 IDF_ADDNOTES = 0x0400; /// Internal use only (copy from clip): do not delete existing cell contents when pasting notes.
+ const sal_uInt16 IDF_SPECIAL_BOOLEAN = 0x1000;
+-const sal_uInt16 IDF_ATTRIB = IDF_HARDATTR | IDF_STYLES | IDF_OUTLINE;
++const sal_uInt16 IDF_ATTRIB = IDF_HARDATTR | IDF_STYLES;
+ const sal_uInt16 IDF_CONTENTS = IDF_VALUE | IDF_DATETIME | IDF_STRING | IDF_NOTE | IDF_FORMULA | IDF_OUTLINE;
+ const sal_uInt16 IDF_ALL = IDF_CONTENTS | IDF_ATTRIB | IDF_OBJECTS;
+otes.
+
+ /// Copy flags for auto/series fill functions: do not touch notes and drawing objects.
+ const sal_uInt16 IDF_AUTOFILL = IDF_ALL & ~(IDF_NOTE | IDF_OBJECTS);
diff --git a/app-office/libreoffice/libreoffice-4.1.2.2.ebuild b/app-office/libreoffice/libreoffice-4.1.2.2-r1.ebuild
index aec8b4d5..8c77ce3b 100644
--- a/app-office/libreoffice/libreoffice-4.1.2.2.ebuild
+++ b/app-office/libreoffice/libreoffice-4.1.2.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.2.2.ebuild,v 1.1 2013/09/23 12:05:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.2.2-r1.ebuild,v 1.1 2013/09/27 20:45:40 dilfridge Exp $
EAPI=5
@@ -230,6 +230,8 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
# not upstreamable stuff
"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
+ # bug 485862
+ "${FILESDIR}/${P}-idfattrib.patch"
)
REQUIRED_USE="