rpms/openoffice.org/F-12 openoffice.org.spec, 1.2059, 1.2060 workspace.hb32bugs01.patch, 1.2, 1.3

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10931

Modified Files:
	openoffice.org.spec workspace.hb32bugs01.patch 
Log Message:
Resolves: rhbz#560435 rtf dropcap crash (caolanm)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/openoffice.org.spec,v
retrieving revision 1.2059
retrieving revision 1.2060
diff -u -p -r1.2059 -r1.2060
--- openoffice.org.spec	25 Jan 2010 09:29:06 -0000	1.2059
+++ openoffice.org.spec	2 Feb 2010 12:47:43 -0000	1.2060
@@ -4317,7 +4317,7 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Mon Jan 25 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.25-UNBUILT
+* Tue Feb 02 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.25-UNBUILT
 - Resolves: rhbz#549890 add workspace.extmgr01.patch (dtardon)
 - Resolves: rhbz#551983 OpenOffice writer crashes when opening document
   with link in footnote (dtardon)
@@ -4332,6 +4332,7 @@ fi
 - Resolves: rhbz#558342 [abrt] crash in SvxNumOptionsTabPage::InitControls
   (dtardon)
 - Resolves: ooo#108637/rhbz#558253 sfx2 uisavedir (caolanm)
+- Resolves: rhbz#560435 rtf dropcap crash (caolanm)
 
 * Tue Dec 22 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.24
 - Resolves: rhbz#545824 bustage in writer with emboldened fonts

workspace.hb32bugs01.patch:
 source/filter/rtf/rtffly.cxx     |   14 ++++++++++----
 source/filter/ww8/wrtw8num.cxx   |    6 ++++--
 source/svrtf/rtfitem.cxx         |   12 ++++++++----
 sw/source/filter/ww8/ww8par6.cxx |   11 +++++++++++
 4 files changed, 33 insertions(+), 10 deletions(-)

Index: workspace.hb32bugs01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-12/workspace.hb32bugs01.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.hb32bugs01.patch	16 Jun 2009 11:54:12 -0000	1.2
+++ workspace.hb32bugs01.patch	2 Feb 2010 12:47:44 -0000	1.3
@@ -74,3 +74,37 @@ diff -ru ww8/wrtw8num.cxx ww8/wrtw8num.c
                      }
                      break;
                      case SvxNumberFormat::NOTHING:
+diff -ru rtf/rtffly.cxx rtf/rtffly.cxx
+--- sw.orig/source/filter/rtf/rtffly.cxx	2010-02-02 12:43:32.000000000 +0000
++++ sw/source/filter/rtf/rtffly.cxx	2010-02-02 12:43:55.000000000 +0000
+@@ -263,20 +263,26 @@
+ 				pSttNd->GetIndex() + 1 == pEndNd->GetIndex()
+ 				&& pSttNd->GetTxt().Len()>0 /* #i38227# leave drop caps with no content as fly frames */ )
+ 			{
++				ULONG nPos = pSttNd->GetIndex();
++				SwDoc * pDoc = pSttNd->GetDoc();
++
+ 				BOOL bJoined;
+ 				{
+-					SwPaM aTmp( *pEndNd, 0, *pSttNd, pSttNd->GetTxt().Len() );
++					SwPaM aTmp( *pSttNd, pSttNd->GetTxt().Len(), *pEndNd, 0 );
+ 					bJoined = pDoc->DeleteAndJoin( aTmp );
+ 				}
+-				if( bJoined )
++
++				SwTxtNode * pNd = (pDoc->GetNodes()[nPos])->GetTxtNode();
++
++				if( bJoined && pNd != NULL)
+ 				{
+ 					SwFmtDrop aDropCap;
+ 					aDropCap.GetLines() = (BYTE)pFlySave->nDropLines;
+ 					aDropCap.GetChars() = 1;
+ 
+ 					SwIndex aIdx( pEndNd );
+-					pEndNd->RstAttr( aIdx, 1, RES_CHRATR_FONTSIZE );
+-                    pEndNd->SetAttr( aDropCap );
++					pNd->RstAttr( aIdx, 1, RES_CHRATR_FONTSIZE );
++                    pNd->SetAttr( aDropCap );
+ 				}
+ 				delete pFlySave;
+ 				continue;