rpms/abiword/devel abiword-2.4.6-toc-layout.patch, NONE, 1.1 abiword.spec, 1.44, 1.45
Lubomir Kundrak (lkundrak)
fedora-extras-commits at redhat.com
Tue Sep 4 16:18:19 UTC 2007
- Previous message (by thread): rpms/perl-DBIx-SearchBuilder/devel .cvsignore, 1.9, 1.10 perl-DBIx-SearchBuilder.spec, 1.13, 1.14 sources, 1.9, 1.10
- Next message (by thread): rpms/perl-DBIx-SearchBuilder/F-7 .cvsignore, 1.9, 1.10 perl-DBIx-SearchBuilder.spec, 1.13, 1.14 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: lkundrak
Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1999
Modified Files:
abiword.spec
Added Files:
abiword-2.4.6-toc-layout.patch
Log Message:
Fix 248103
abiword-2.4.6-toc-layout.patch:
--- NEW FILE abiword-2.4.6-toc-layout.patch ---
r21892 | sum1 | 2007-09-04 01:28:58 +0200 (Tue, 04 Sep 2007) | 4 lines
Fix Red Hat Bug 248103, TOC layout crash when importing RTF.
--- abiword-2.4.6.orig/abi/src/text/fmt/xp/fl_DocLayout.cpp 2007-09-04 17:19:39.000000000 +0200
+++ abiword-2.4.6/abi/src/text/fmt/xp/fl_DocLayout.cpp 2007-09-04 17:23:30.000000000 +0200
@@ -595,14 +595,19 @@ void FL_DocLayout::fillLayouts(void)
fl_ContainerLayout * pCL = pLastSec->getLastLayout();
fl_BlockLayout * pBL = NULL;
bool bRebreak = false;
- if(pCL->getContainerType() == FL_CONTAINER_BLOCK)
+ if(pCL && (pCL->getContainerType() == FL_CONTAINER_BLOCK))
+
{
pBL = static_cast<fl_BlockLayout *>(pCL);
}
- else
+ else if(pCL)
{
pBL = pCL->getPrevBlockInDocument();
}
+ else
+ {
+ UT_ASSERT_HARMLESS(pCL);
+ }
if(pBL)
{
fp_Line * pLine = static_cast<fp_Line *>(pBL->getLastContainer());
Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- abiword.spec 6 Apr 2007 16:10:03 -0000 1.44
+++ abiword.spec 4 Sep 2007 16:17:46 -0000 1.45
@@ -3,7 +3,7 @@
Summary: The AbiWord word processor
Name: abiword
Version: 2.4.6
-Release: 5%{?dist}
+Release: 6%{?dist}
Epoch: 1
Group: Applications/Editors
License: GPL
@@ -41,6 +41,7 @@
Patch0: abiword-2.0.9-windowshelppaths.patch
Patch1: abiword-2.4.4-desktop.patch
Patch2: abiword-2.4.6-fontmanager.patch
+Patch3: abiword-2.4.6-toc-layout.patch
%description
AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -51,6 +52,7 @@
%patch0 -p1 -b .windowshelppaths
%patch1 -p1 -b .desktop
%patch2 -p1 -b .fontmanager
+%patch3 -p1 -b .toc-layout
%build
cd abi
@@ -132,6 +134,9 @@
%{_datadir}/icons/*png
%changelog
+* Tue Sep 04 2007 Lubomir Kundrak <lkundrak at redhat.com> - 1:2.4.6-6.fc7
+- Fix 248103
+
* Fri Apr 06 2007 Marc Maurer <uwog at abisource.com> - 1:2.4.6-5.fc7
- Rebuild
- Previous message (by thread): rpms/perl-DBIx-SearchBuilder/devel .cvsignore, 1.9, 1.10 perl-DBIx-SearchBuilder.spec, 1.13, 1.14 sources, 1.9, 1.10
- Next message (by thread): rpms/perl-DBIx-SearchBuilder/F-7 .cvsignore, 1.9, 1.10 perl-DBIx-SearchBuilder.spec, 1.13, 1.14 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list