rpms/openoffice.org/devel workspace.cmcfixes28.patch, NONE, 1.1 openoffice.org.spec, 1.885, 1.886 openoffice.org-2.0.4.ooo69841.x86_64.pptimport.patch, 1.1, NONE openoffice.org-2.0.4.ooo69905.sd.casting.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Oct 3 09:07:23 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24683
Modified Files:
openoffice.org.spec
Added Files:
workspace.cmcfixes28.patch
Removed Files:
openoffice.org-2.0.4.ooo69841.x86_64.pptimport.patch
openoffice.org-2.0.4.ooo69905.sd.casting.patch
Log Message:
rh#208966# 64bit writer table calculations fix
workspace.cmcfixes28.patch:
./source/ui/app/optsitem.cxx | 0
sd/source/ui/app/optsitem.cxx | 4 +-
source/core/fields/cellfml.cxx | 0
source/editeng/impedit3.cxx | 0
svx/source/editeng/impedit3.cxx | 6 ++--
sw/source/core/fields/cellfml.cxx | 51 ++++++++++++--------------------------
6 files changed, 23 insertions(+), 38 deletions(-)
--- NEW FILE workspace.cmcfixes28.patch ---
Index: ./source/ui/app/optsitem.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/app/optsitem.cxx,v
retrieving revision 1.34
diff -u -r1.34 optsitem.cxx
--- openoffice.org.orig/sd/source/ui/app/optsitem.cxx 6 Mar 2006 09:04:40 -0000 1.34
+++ openoffice.org/sd/source/ui/app/optsitem.cxx 27 Sep 2006 08:31:47 -0000
@@ -126,7 +126,7 @@
{
if( !mbInit )
{
- SdOptionsGeneric* pThis = (SdOptionsGeneric*) this;
+ SdOptionsGeneric* pThis = const_cast<SdOptionsGeneric*>(this);
if( !mpCfgItem )
pThis->mpCfgItem = new SdOptionsItem( *this, maSubTree );
@@ -164,7 +164,7 @@
if( aNames.getLength() && ( aValues.getLength() == aNames.getLength() ) )
{
- if( ( (SdOptionsGeneric*) this )->WriteData( aValues.getArray() ) )
+ if( (const_cast<SdOptionsGeneric*>(this))->WriteData( aValues.getArray() ) )
rCfgItem.PutProperties( aNames, aValues );
else
{
Index: source/editeng/impedit3.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/editeng/impedit3.cxx,v
retrieving revision 1.109
diff -u -r1.109 impedit3.cxx
--- openoffice.org.orig/svx/source/editeng/impedit3.cxx 13 Jul 2006 10:35:37 -0000 1.109
+++ openoffice.org/svx/source/editeng/impedit3.cxx 25 Sep 2006 14:12:42 -0000
@@ -1311,10 +1311,11 @@
if ( nPara || IsFixedCellHeight() || pLine->GetStartPortion() ) // Nicht die aller erste Zeile
{
// #100508# There are documents with PropLineSpace 0, why?
+ // (cmc: re above question :-) such documents can be seen by importing a .ppt
if ( rLSItem.GetPropLineSpace() && ( rLSItem.GetPropLineSpace() != 100 ) )
{
sal_uInt16 nTxtHeight = pLine->GetHeight();
- sal_uInt32 nH = nTxtHeight;
+ sal_Int32 nH = nTxtHeight;
nH *= rLSItem.GetPropLineSpace();
nH /= 100;
// Der Ascent muss um die Differenz angepasst werden:
@@ -1653,10 +1654,11 @@
if ( nPara || IsFixedCellHeight() || pTmpLine->GetStartPortion() ) // Nicht die aller erste Zeile
{
// #100508# There are documents with PropLineSpace 0, why?
+ // (cmc: re above question :-) such documents can be seen by importing a .ppt
if ( rLSItem.GetPropLineSpace() && ( rLSItem.GetPropLineSpace() != 100 ) )
{
sal_uInt16 nTxtHeight = pTmpLine->GetHeight();
- sal_uInt32 nH = nTxtHeight;
+ sal_Int32 nH = nTxtHeight;
nH *= rLSItem.GetPropLineSpace();
nH /= 100;
// Der Ascent muss um die Differenz angepasst werden:
Index: source/core/fields/cellfml.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/fields/cellfml.cxx,v
retrieving revision 1.8
diff -u -r1.8 cellfml.cxx
--- openoffice.org.orig/sw/source/core/fields/cellfml.cxx 14 Dec 2005 14:48:32 -0000 1.8
+++ openoffice.org/sw/source/core/fields/cellfml.cxx 3 Oct 2006 08:55:16 -0000
@@ -378,18 +381,14 @@
// ein Bereich in dieser Klammer ?
if( pLastBox )
{
- //TODOUNICODE: does it work?
-// pEndBox = (SwTableBox*)(long)(*pLastBox);
- pEndBox = (SwTableBox*)pLastBox->ToInt32();
+ pEndBox = (SwTableBox*)pLastBox->ToInt64();
// ist das ueberhaupt ein gueltiger Pointer ??
if( !rTbl.GetTabSortBoxes().Seek_Entry( pEndBox ))
pEndBox = 0;
rFirstBox.Erase( 0, pLastBox->Len()+1 );
}
- //TODOUNICODE: does it work?
-// pSttBox = (SwTableBox*)(long)rFirstBox;
- pSttBox = (SwTableBox*)rFirstBox.ToInt32();
+ pSttBox = (SwTableBox*)rFirstBox.ToInt64();
// ist das ueberhaupt ein gueltiger Pointer ??
if( !rTbl.GetTabSortBoxes().Seek_Entry( pSttBox ))
pSttBox = 0;
@@ -467,7 +466,7 @@
if( pLastBox )
{
if( 0 != ( pRelBox = lcl_RelToBox( rTbl, pBox, *pLastBox )) )
- rNewStr += String::CreateFromInt32( (long)pRelBox );
+ rNewStr += String::CreateFromInt64( (sal_PtrDiff)pRelBox );
else
rNewStr += '0';
rNewStr += ':';
@@ -475,7 +474,7 @@
}
if( 0 != ( pRelBox = lcl_RelToBox( rTbl, pBox, rFirstBox )) )
- rNewStr += String::CreateFromInt32( (long)pRelBox );
+ rNewStr += String::CreateFromInt64( (sal_PtrDiff)pRelBox );
else
rNewStr += '0';
@@ -529,8 +528,7 @@
rFirstBox.Erase(0,1);
if( pLastBox )
{
-// pBox = (SwTableBox*)(long)(*pLastBox);
- pBox = (SwTableBox*)pLastBox->ToInt32();
+ pBox = (SwTableBox*)pLastBox->ToInt64();
// ist das ueberhaupt ein gueltiger Pointer ??
if( rTbl.GetTabSortBoxes().Seek_Entry( pBox ))
@@ -541,8 +539,7 @@
rFirstBox.Erase( 0, pLastBox->Len()+1 );
}
-// pBox = (SwTableBox*)(long)rFirstBox;
- pBox = (SwTableBox*)rFirstBox.ToInt32();
+ pBox = (SwTableBox*)rFirstBox.ToInt64();
// ist das ueberhaupt ein gueltiger Pointer ??
if( rTbl.GetTabSortBoxes().Seek_Entry( pBox ))
rNewStr += pBox->GetName();
@@ -564,13 +561,13 @@
if( pLastBox )
{
pBox = rTbl.GetTblBox( *pLastBox );
- rNewStr += String::CreateFromInt32( (long)pBox );
+ rNewStr += String::CreateFromInt64( (sal_PtrDiff)pBox );
rNewStr += ':';
rFirstBox.Erase( 0, pLastBox->Len()+1 );
}
pBox = rTbl.GetTblBox( rFirstBox );
- rNewStr += String::CreateFromInt32( (long)pBox );
+ rNewStr += String::CreateFromInt64( (sal_PtrDiff)pBox );
// Kennung fuer Box erhalten
rNewStr += rFirstBox.GetChar( rFirstBox.Len() - 1 );
@@ -899,8 +907,7 @@
if( !bExtrnlNm )
{
// in die Externe Darstellung umwandeln.
-// SwTableBox* pBox = (SwTableBox*)(long)sTmp;
- SwTableBox* pBox = (SwTableBox*)sTmp.ToInt32();
+ SwTableBox* pBox = (SwTableBox*)sTmp.ToInt64();
if( !rTbl.GetTabSortBoxes().Seek_Entry( pBox ))
return '?';
sTmp = pBox->GetName();
@@ -956,8 +963,7 @@
// ein Bereich in dieser Klammer ?
if( pLastBox )
{
-// pEndBox = (SwTableBox*)(long)(*pLastBox);
- pEndBox = (SwTableBox*)pLastBox->ToInt32();
+ pEndBox = (SwTableBox*)pLastBox->ToInt64();
// ist das ueberhaupt ein gueltiger Pointer ??
if( !rTbl.GetTabSortBoxes().Seek_Entry( pEndBox ))
@@ -965,8 +971,7 @@
rFirstBox.Erase( 0, pLastBox->Len()+1 );
}
-// pSttBox = (SwTableBox*)(long)rFirstBox;
- pSttBox = (SwTableBox*)rFirstBox.ToInt32();
+ pSttBox = (SwTableBox*)rFirstBox.ToInt64();
// ist das ueberhaupt ein gueltiger Pointer ??
if( !rTbl.GetTabSortBoxes().Seek_Entry( pSttBox ))
pSttBox = 0;
@@ -1056,12 +1061,8 @@
{
case INTRNL_NAME:
if( pLastBox )
- {
-// pEndBox = (SwTableBox*)(long)(*pLastBox);
- pEndBox = (SwTableBox*)pLastBox->ToInt32();
- }
-// pSttBox = (SwTableBox*)(long)rFirstBox;
- pSttBox = (SwTableBox*)rFirstBox.ToInt32();
+ pEndBox = (SwTableBox*)pLastBox->ToInt64();
+ pSttBox = (SwTableBox*)rFirstBox.ToInt64();
break;
case REL_NAME:
@@ -1171,12 +1172,8 @@
{
case INTRNL_NAME:
if( pLastBox )
- {
-// pEndBox = (SwTableBox*)(long)(*pLastBox);
- pEndBox = (SwTableBox*)pLastBox->ToInt32();
- }
-// pSttBox = (SwTableBox*)(long)rFirstBox;
- pSttBox = (SwTableBox*)rFirstBox.ToInt32();
+ pEndBox = (SwTableBox*)pLastBox->ToInt64();
+ pSttBox = (SwTableBox*)rFirstBox.ToInt64();
break;
case REL_NAME:
@@ -1262,8 +1259,8 @@
}
if( pLastBox )
- ( rNewStr += String::CreateFromInt32((long)pEndBox )) += ':';
- ( rNewStr += String::CreateFromInt32((long)pSttBox ))
+ ( rNewStr += String::CreateFromInt64((sal_PtrDiff)pEndBox)) += ':';
+ ( rNewStr += String::CreateFromInt64((sal_PtrDiff)pSttBox))
+= rFirstBox.GetChar( rFirstBox.Len() - 1 );
}
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.885
retrieving revision 1.886
diff -u -r1.885 -r1.886
--- openoffice.org.spec 29 Sep 2006 19:27:08 -0000 1.885
+++ openoffice.org.spec 3 Oct 2006 09:07:21 -0000 1.886
@@ -128,10 +128,9 @@
Patch60: openoffice.org-2.0.4.ooo69780.goodies.hugetile.patch
Patch61: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
Patch62: openoffice.org-2.0.4.ooo69530.sd.crash.patch
-Patch63: openoffice.org-2.0.4.ooo69841.x86_64.pptimport.patch
+Patch63: workspace.cmcfixes28.patch
Patch64: openoffice.org-2.0.4.ooo69236.slideshow.esccrash.patch
-Patch65: openoffice.org-2.0.4.ooo69905.sd.casting.patch
-Patch66: openoffice.org-2.0.4.ooo69992.vcl.im_yield.patch
+Patch65: openoffice.org-2.0.4.ooo69992.vcl.im_yield.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -994,10 +993,9 @@
%patch60 -p1 -b .ooo69780.goodies.hugetile.patch
%patch61 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
%patch62 -p1 -b .ooo69530.sd.crash.patch
-%patch63 -p1 -b .ooo69841.x86_64.pptimport.patch
+%patch63 -p1 -b .workspace.cmcfixes28.patch
%patch64 -p1 -b .ooo69236.slideshow.esccrash.patch
-%patch65 -p1 -b .ooo69905.sd.casting.patch
-%patch66 -p1 -b .ooo69992.vcl.im_yield.patch
+%patch65 -p1 -b .ooo69992.vcl.im_yield.patch
tar xzf %{SOURCE1}
@@ -2525,6 +2523,7 @@
%changelog
* Fri Sep 29 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.2
- add openoffice.org-2.0.4.ooo69992.vcl.im_yield.patch for rh#208537#
+- add workspace.cmcfixes28.patch for rh#208966#
* Thu Sep 28 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.4-5.1
- add openoffice.org-2.0.4.ooo69780.goodies.hugetile.patch for rh#207226#
--- openoffice.org-2.0.4.ooo69841.x86_64.pptimport.patch DELETED ---
--- openoffice.org-2.0.4.ooo69905.sd.casting.patch DELETED ---
More information about the fedora-cvs-commits
mailing list