------------------------------------------------------------
revno: 1983
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Mon 2010-05-10 14:14:32 +0200
message:
cherry-pickw-64bit-Size-mismatch.diff to fix graphical bullets on 64bit archs
added:
patches/sw-64bit-Size-mismatch.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2010-05-10 12:13:05 +0000
+++ b/changelog 2010-05-10 12:14:32 +0000
@@ -6,11 +6,13 @@
also fixing extensions
* debian/patches/do-not-delete-dbumiscres.src-resources.diff: don't
remove translation we should keep
+ * debian/patches/sw-64bit-Size-mismatch.diff: cherry-pick from ooo-build
+ master to fix graphical bullets on 64bit archs
* debian/rules:
- re-enable extensions on armel
- -- Rene Engelhard <r...@debian.org> Fri, 07 May 2010 16:11:33 +0200
+ -- Rene Engelhard <r...@debian.org> Mon, 10 May 2010 14:13:10 +0200
openoffice.org (1:3.2.0-9) unstable; urgency=low
=== modified file 'patches/series'
--- a/patches/series 2010-05-07 19:28:43 +0000
+++ b/patches/series 2010-05-10 12:14:32 +0000
@@ -10,3 +10,4 @@
fix-arm-eabi-bridge.diff
fix-calc-formula-option-tree.sdf.diff
do-not-delete-dbumiscres.src-resources.diff
+sw-64bit-Size-mismatch.diff
=== added file 'patches/sw-64bit-Size-mismatch.diff'
--- a/patches/sw-64bit-Size-mismatch.diff 1970-01-01 00:00:00 +0000
+++ b/patches/sw-64bit-Size-mismatch.diff 2010-05-10 12:14:32 +0000
@@ -0,0 +1,35 @@
+diff --git a/patches/dev300/apply b/patches/dev300/apply
+index e8abb5a..247e5c4 100644
+--- openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/apply
++++ openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/apply
+@@ -2340,6 +2340,9 @@ oooXXXX.partial-revert-ooo95118.diff
+ # it helps to get automatic depencies when packaging extensions in RPMs
+ ooo83878.unopkg.enablelinking.diff, i#83878, bnc#493994, caolan
+
++# graphical bullets invisible after saving documents on 64bit Linux
++sw-64bit-Size-mismatch.diff, i#101131, caolan
++
+ [ CairoFonts ]
+ # needs Gtk2.0 >= 2.10 and cairo, so this is on the own section
+ ooo59127.vcl.honourcairofont.diff
+diff --git a/patches/dev300/sw-64bit-Size-mismatch.diff
b/patches/dev300/sw-64bit-Size-mismatch.diff
+new file mode 100644
+index 0000000..375dc21
+--- /dev/null
++++
openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/sw-64bit-Size-mismatch.diff
+@@ -0,0 +1,15 @@
++diff -r 03068afc23c6 sw/source/core/unocore/unosett.cxx
++--- sw/source/core/unocore/unosett.cxx Sun Apr 25 15:43:24 2010 +0100
+++++ sw/source/core/unocore/unosett.cxx Tue Apr 27 16:55:25 2010 +0100
++@@ -1659,9 +1659,8 @@
++ aPropertyValues.Insert(pData,
aPropertyValues.Count());
++ }
++ Size aSize = rFmt.GetGraphicSize();
++- aSize.Width() = TWIP_TO_MM100( aSize.Width() );
++- aSize.Height() = TWIP_TO_MM100( aSize.Height() );
++- pData = new PropValData((void*)&aSize,
SW_PROP_NAME_STR(UNO_NAME_GRAPHIC_SIZE), ::getCppuType((const awt::Size*)0));
+++ awt::Size aAwtSize(TWIP_TO_MM100(aSize.Width()),
TWIP_TO_MM100(aSize.Height()));
+++ pData = new PropValData((void*)&aAwtSize,
SW_PROP_NAME_STR(UNO_NAME_GRAPHIC_SIZE), ::getCppuType((const awt::Size*)0));
++ aPropertyValues.Insert(pData, aPropertyValues.Count());
++
++ const SwFmtVertOrient* pOrient =
rFmt.GetGraphicOrientation();
