rpms/openoffice.org/devel openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch, NONE, 1.1 openoffice.org.spec, 1.1853, 1.1854
Caolan McNamara
caolanm at fedoraproject.org
Tue Mar 10 14:01:55 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13172
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch
Log Message:
Resolves: rhbz#481012 workaround incorrect branch/type selection or whatever it is
openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch:
--- NEW FILE openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch ---
diff -ru sw.orig/source/filter/ww8/ww8par2.cxx sw/source/filter/ww8/ww8par2.cxx
--- openoffice.org.orig/sw/source/filter/ww8/ww8par2.cxx 2009-03-10 12:59:18.000000000 +0000
+++ openoffice.org/sw/source/filter/ww8/ww8par2.cxx 2009-03-10 13:51:17.000000000 +0000
@@ -2509,7 +2509,15 @@
//ability to set the margin.
SvxLRSpaceItem aL( RES_LR_SPACE );
// set right to original DxaLeft (i28656)
+#if 0
+ // Weird type illness
aL.SetLeft( !bIsBiDi ? GetMinLeft() : pIo->maSectionManager.GetTextAreaWidth() - nPreferredWidth - nOrgDxaLeft);
+#else
+ if (!bIsBiDi)
+ aL.SetLeft( GetMinLeft() );
+ else
+ aL.SetLeft( pIo->maSectionManager.GetTextAreaWidth() - nPreferredWidth - nOrgDxaLeft );
+#endif
aItemSet.Put(aL);
}
}
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1853
retrieving revision 1.1854
diff -u -r1.1853 -r1.1854
--- openoffice.org.spec 6 Mar 2009 14:38:01 -0000 1.1853
+++ openoffice.org.spec 10 Mar 2009 14:01:25 -0000 1.1854
@@ -1,6 +1,6 @@
%define oootag OOO310
%define ooomilestone 4
-%define rh_rpm_release 1
+%define rh_rpm_release 2
# rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
%define __jar_repack %{nil}
@@ -137,6 +137,7 @@
Patch54: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
Patch55: workspace.localization35.patch
Patch56: workspace.cl12.patch
+Patch57: openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch
%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
%define instdir %{_libdir}
@@ -1615,6 +1616,7 @@
%patch54 -p1 -b .oooXXXXX.solenv.allowmissing.patch
%patch55 -p0 -b .workspace.localization35.patch
%patch56 -p0 -b .workspace.cl12.patch
+%patch57 -p1 -b .gccXXXXX.sw.typeillness.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4135,6 +4137,10 @@
unopkg list --shared > /dev/null 2>&1 || :
%changelog
+* Tue Mar 10 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-4.2
+- Resolves: rhbz#481012 workaround incorrect branch/type selection
+ or whatever it is with openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch
+
* Fri Mar 06 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-4.1
- report-builder will be broken until rhbz#474391 is resolved
- drop integrated workspace.gfbcrash.patch
More information about the scm-commits
mailing list