rpms/openoffice.org/devel openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch, NONE, 1.1.2.1 openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch, 1.1, 1.1.2.1 openoffice.org.spec, 1.1440.2.9, 1.1440.2.10
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Mon Mar 10 16:01:19 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17247
Modified Files:
Tag: openoffice_org-2_4_0-9_1_999_fc9
openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
openoffice.org.spec
Added Files:
Tag: openoffice_org-2_4_0-9_1_999_fc9
openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
Log Message:
merge
openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch:
--- NEW FILE openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch ---
Index: unx/gtk/window/gtkframe.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v
retrieving revision 1.72.8.2
diff -u -r1.72.8.2 gtkframe.cxx
--- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx 23 Jan 2008 17:17:10 -0000 1.72.8.2
+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx 10 Mar 2008 15:32:32 -0000
@@ -1158,8 +1169,8 @@
if( m_pParent )
{
- nX = ((long)m_pParent->maGeometry.nWidth - (long)maGeometry.nWidth)/2;
- nY = ((long)m_pParent->maGeometry.nHeight - (long)maGeometry.nHeight)/2;
+ nX = ((int)m_pParent->maGeometry.nWidth - (int)maGeometry.nWidth)/2;
+ nY = ((int)m_pParent->maGeometry.nHeight - (int)maGeometry.nHeight)/2;
}
else
@@ -1191,8 +1202,8 @@
break;
}
}
- nX = nScreenX + (nScreenWidth - (long)maGeometry.nWidth)/2;
- nY = nScreenY + (nScreenHeight - (long)maGeometry.nHeight)/2;
+ nX = nScreenX + (nScreenWidth - (int)maGeometry.nWidth)/2;
+ nY = nScreenY + (nScreenHeight - (int)maGeometry.nHeight)/2;
}
SetPosSize( nX, nY, 0, 0, SAL_FRAME_POSSIZE_X | SAL_FRAME_POSSIZE_Y );
}
@@ -1426,25 +1438,25 @@
Size aScreenSize = GetX11SalData()->GetDisplay()->GetScreenSize( m_nScreen );
if( ! (m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) )
{
- if( nX < (long)maGeometry.nLeftDecoration )
+ if( nX < (int)maGeometry.nLeftDecoration )
nX = maGeometry.nLeftDecoration;
- if( nY < (long)maGeometry.nTopDecoration )
+ if( nY < (int)maGeometry.nTopDecoration )
nY = maGeometry.nTopDecoration;
- if( (nX + (long)maGeometry.nWidth + (long)maGeometry.nRightDecoration) > (long)aScreenSize.Width() )
+ if( (nX + (int)maGeometry.nWidth + (int)maGeometry.nRightDecoration) > aScreenSize.Width() )
nX = aScreenSize.Width() - maGeometry.nWidth - maGeometry.nRightDecoration;
- if( (nY + (long)maGeometry.nHeight + (long)maGeometry.nBottomDecoration) > (long)aScreenSize.Height() )
+ if( (nY + (int)maGeometry.nHeight + (int)maGeometry.nBottomDecoration) > aScreenSize.Height() )
nY = aScreenSize.Height() - maGeometry.nHeight - maGeometry.nBottomDecoration;
}
else
{
- if( nX + (long)maGeometry.nWidth < 10 )
- nX = 10 - (long)maGeometry.nWidth;
- if( nY + (long)maGeometry.nHeight < 10 )
- nY = 10 - (long)maGeometry.nHeight;
- if( nX > (long)aScreenSize.Width() - 10 )
- nX = (long)aScreenSize.Width() - 10;
- if( nY > (long)aScreenSize.Height() - 10 )
- nY = (long)aScreenSize.Height() - 10;
+ if( nX + (int)maGeometry.nWidth < 10 )
+ nX = 10 - (int)maGeometry.nWidth;
+ if( nY + (int)maGeometry.nHeight < 10 )
+ nY = 10 - (int)maGeometry.nHeight;
+ if( nX > aScreenSize.Width() - 10 )
+ nX = aScreenSize.Width() - 10;
+ if( nY > aScreenSize.Height() - 10 )
+ nY = aScreenSize.Height() - 10;
}
if( nX != maGeometry.nX || nY != maGeometry.nY )
Index: unx/source/window/salframe.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/source/window/salframe.cxx,v
retrieving revision 1.219.110.3
diff -u -r1.219.110.3 salframe.cxx
--- openoffice.org.orig/vcl/unx/source/window/salframe.cxx 25 Jan 2008 16:37:31 -0000 1.219.110.3
+++ openoffice.org/unx/source/window/salframe.cxx 10 Mar 2008 15:32:43 -0000
@@ -1714,14 +1714,14 @@
}
// adjust position so that frame fits onto screen
- if( aPosSize.Right()+(long)aGeom.nRightDecoration > aScreenSize.Width()-1 )
- aPosSize.Move( (long)aScreenSize.Width() - (long)aPosSize.Right() - (long)aGeom.nRightDecoration, 0 );
- if( aPosSize.Bottom()+(long)aGeom.nBottomDecoration > aScreenSize.Height()-1 )
- aPosSize.Move( 0, (long)aScreenSize.Height() - (long)aPosSize.Bottom() - (long)aGeom.nBottomDecoration );
- if( aPosSize.Left() < (long)aGeom.nLeftDecoration )
- aPosSize.Move( (long)aGeom.nLeftDecoration - (long)aPosSize.Left(), 0 );
- if( aPosSize.Top() < (long)aGeom.nTopDecoration )
- aPosSize.Move( 0, (long)aGeom.nTopDecoration - (long)aPosSize.Top() );
+ if( aPosSize.Right()+(int)aGeom.nRightDecoration > aScreenSize.Width()-1 )
+ aPosSize.Move( aScreenSize.Width() - aPosSize.Right() - (int)aGeom.nRightDecoration, 0 );
+ if( aPosSize.Bottom()+(int)aGeom.nBottomDecoration > aScreenSize.Height()-1 )
+ aPosSize.Move( 0, aScreenSize.Height() - aPosSize.Bottom() - (int)aGeom.nBottomDecoration );
+ if( aPosSize.Left() < (int)aGeom.nLeftDecoration )
+ aPosSize.Move( (int)aGeom.nLeftDecoration - aPosSize.Left(), 0 );
+ if( aPosSize.Top() < (int)aGeom.nTopDecoration )
+ aPosSize.Move( 0, (int)aGeom.nTopDecoration - aPosSize.Top() );
}
// resize with new args
openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch:
Index: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch 1 Aug 2007 12:04:00 -0000 1.1
+++ openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch 10 Mar 2008 16:00:23 -0000 1.1.2.1
@@ -108,3 +108,18 @@
{BMP_FOIL_11, BMP_FOIL_11_H, STR_AUTOLAYOUT_OBJ, WritingMode_LR_TB,
AUTOLAYOUT_OBJ},
{BMP_FOIL_02, BMP_FOIL_02_H, STR_AUTOLAYOUT_CHART, WritingMode_LR_TB,
+Index: source/token/tokens.txt
+===================================================================
+RCS file: /cvs/xml/oox/source/token/tokens.txt,v
+retrieving revision 1.2
+diff -u -r1.2 tokens.txt
+--- openoffice.org.orig/oox/source/token/tokens.txt 17 Jan 2008 08:06:07 -0000 1.2
++++ openoffice.org/oox/source/token/tokens.txt 10 Mar 2008 15:57:51 -0000
+@@ -2431,6 +2431,7 @@
+ handoutMasterId
+ handoutMasterIdLst
+ handoutView
++handouts
+ handouts1
+ handouts2
+ handouts3
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.9
retrieving revision 1.1440.2.10
diff -u -r1.1440.2.9 -r1.1440.2.10
--- openoffice.org.spec 10 Mar 2008 10:48:46 -0000 1.1440.2.9
+++ openoffice.org.spec 10 Mar 2008 16:00:23 -0000 1.1440.2.10
@@ -142,6 +142,7 @@
Patch68: workspace.cmcfixes43.patch
Patch69: openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
Patch70: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
+Patch71: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
%define instdir %{_libdir}/openoffice.org
%define OFFICEUPD 300
@@ -1100,6 +1101,7 @@
%patch68 -p1 -b .workspace.cmcfixes43.patch
%patch69 -p1 -b .ooo86588.sw.buildfix.patch
%patch70 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
+%patch71 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2880,6 +2882,15 @@
- add workspace.cmcfixes43.patch
- add openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
+* Mon Mar 10 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-10.2
+- Resolves: rhbz#429632 add openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
+
+* Sun Mar 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-10.1
+- next release candidate
+- rhbz#293791 Restore draw back to the menus and revert to upstream app names
+- drop integrated openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
+- Resolves: rhbz#436518 add openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
+
* Sun Mar 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-10.1
- next release candidate
- rhbz#293791 Restore draw back to the menus and revert to upstream app names
More information about the fedora-extras-commits
mailing list