rpms/openoffice.org/F-11 openoffice.org-3.1.0.oooXXXXX.svx.64bit.patch, NONE, 1.1 openoffice.org.spec, 1.1923, 1.1924
Caolan McNamara
caolanm at fedoraproject.org
Thu Jul 9 19:32:45 UTC 2009
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org-3.1.0.oooXXXXX.svx.64bit.patch, NONE, 1.1 workspace.vcl103.patch, NONE, 1.1 openoffice.org.spec, 1.1960, 1.1961 openoffice.org-3.1.0.ooo103145.vcl.kwinworkaround.patch, 1.1, NONE openoffice.org-3.1.0.ooo103319.vcl.canttakethebeeping.patch, 1.1, NONE
- Next message (by thread): rpms/libprelude/devel .cvsignore, 1.18, 1.19 libprelude.spec, 1.44, 1.45 sources, 1.19, 1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13322
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-3.1.0.oooXXXXX.svx.64bit.patch
Log Message:
Resolves(maybe): rhbz#510327 openoffice.org-3.1.0.oooXXXXX.svx.64bit.patch
openoffice.org-3.1.0.oooXXXXX.svx.64bit.patch:
--- NEW FILE openoffice.org-3.1.0.oooXXXXX.svx.64bit.patch ---
diff -ru svx.orig/inc/svx/xcolit.hxx svx/inc/svx/xcolit.hxx
--- svx.orig/inc/svx/xcolit.hxx 2009-07-09 15:28:15.000000000 +0100
+++ svx/inc/svx/xcolit.hxx 2009-07-09 16:34:22.000000000 +0100
@@ -48,7 +48,7 @@
public:
TYPEINFO();
XColorItem() {}
- XColorItem(USHORT nWhich, long nIndex, const Color& rTheColor);
+ XColorItem(USHORT nWhich, INT32 nIndex, const Color& rTheColor);
virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
diff -ru svx.orig/inc/svx/xflclit.hxx svx/inc/svx/xflclit.hxx
--- svx.orig/inc/svx/xflclit.hxx 2009-07-09 15:28:15.000000000 +0100
+++ svx/inc/svx/xflclit.hxx 2009-07-09 16:32:16.000000000 +0100
@@ -46,7 +46,7 @@
public:
TYPEINFO();
XFillColorItem() {}
- XFillColorItem(long nIndex, const Color& rTheColor);
+ XFillColorItem(INT32 nIndex, const Color& rTheColor);
XFillColorItem(const String& rName, const Color& rTheColor);
XFillColorItem(SvStream& rIn);
diff -ru svx.orig/inc/svx/xflftrit.hxx svx/inc/svx/xflftrit.hxx
--- svx.orig/inc/svx/xflftrit.hxx 2009-07-09 15:28:15.000000000 +0100
+++ svx/inc/svx/xflftrit.hxx 2009-07-09 16:11:19.000000000 +0100
@@ -50,7 +50,7 @@
TYPEINFO();
XFillFloatTransparenceItem();
- XFillFloatTransparenceItem( long nIndex, const XGradient& rGradient, BOOL bEnable = TRUE );
+ XFillFloatTransparenceItem( INT32 nIndex, const XGradient& rGradient, BOOL bEnable = TRUE );
XFillFloatTransparenceItem(const String& rName, const XGradient& rGradient, BOOL bEnable = TRUE );
XFillFloatTransparenceItem(SfxItemPool* pPool, const XGradient& rTheGradient, BOOL bEnable = TRUE );
XFillFloatTransparenceItem(SfxItemPool* pPool );
diff -ru svx.orig/inc/svx/xflgrit.hxx svx/inc/svx/xflgrit.hxx
--- svx.orig/inc/svx/xflgrit.hxx 2009-07-09 15:28:12.000000000 +0100
+++ svx/inc/svx/xflgrit.hxx 2009-07-09 16:31:03.000000000 +0100
@@ -47,7 +47,7 @@
public:
TYPEINFO();
XFillGradientItem() : NameOrIndex(XATTR_FILLGRADIENT, -1) {}
- XFillGradientItem(long nIndex, const XGradient& rTheGradient);
+ XFillGradientItem(INT32 nIndex, const XGradient& rTheGradient);
XFillGradientItem(const UniString& rName, const XGradient& rTheGradient);
XFillGradientItem(SfxItemPool* pPool, const XGradient& rTheGradient);
XFillGradientItem(SfxItemPool* pPool );
diff -ru svx.orig/inc/svx/xflhtit.hxx svx/inc/svx/xflhtit.hxx
--- svx.orig/inc/svx/xflhtit.hxx 2009-07-09 15:28:13.000000000 +0100
+++ svx/inc/svx/xflhtit.hxx 2009-07-09 16:11:08.000000000 +0100
@@ -47,7 +47,7 @@
public:
TYPEINFO();
XFillHatchItem() : NameOrIndex(XATTR_FILLHATCH, -1) {}
- XFillHatchItem(long nIndex, const XHatch& rTheHatch);
+ XFillHatchItem(INT32 nIndex, const XHatch& rTheHatch);
XFillHatchItem(const String& rName, const XHatch& rTheHatch);
XFillHatchItem(SfxItemPool* pPool, const XHatch& rTheHatch);
XFillHatchItem(SfxItemPool* pPool );
diff -ru svx.orig/inc/svx/xftshcit.hxx svx/inc/svx/xftshcit.hxx
--- svx.orig/inc/svx/xftshcit.hxx 2009-07-09 15:28:12.000000000 +0100
+++ svx/inc/svx/xftshcit.hxx 2009-07-09 16:10:52.000000000 +0100
@@ -45,7 +45,7 @@
public:
TYPEINFO();
XFormTextShadowColorItem() {}
- XFormTextShadowColorItem(long nIndex, const Color& rTheColor);
+ XFormTextShadowColorItem(INT32 nIndex, const Color& rTheColor);
XFormTextShadowColorItem(const String& rName, const Color& rTheColor);
XFormTextShadowColorItem(SvStream& rIn);
diff -ru svx.orig/inc/svx/xit.hxx svx/inc/svx/xit.hxx
--- svx.orig/inc/svx/xit.hxx 2009-07-09 15:28:12.000000000 +0100
+++ svx/inc/svx/xit.hxx 2009-07-09 15:29:13.000000000 +0100
@@ -54,7 +54,7 @@
//-------------------
class SVX_DLLPUBLIC NameOrIndex : public SfxStringItem
{
- long nPalIndex;
+ INT32 nPalIndex;
protected:
void Detach() { nPalIndex = -1; }
@@ -62,7 +62,7 @@
public:
TYPEINFO();
NameOrIndex() { nPalIndex = -1; }
- NameOrIndex(USHORT nWhich, long nIndex);
+ NameOrIndex(USHORT nWhich, INT32 nIndex);
NameOrIndex(USHORT nWhich,
const String& rName= String());
NameOrIndex(USHORT nWhich, SvStream& rIn);
@@ -76,8 +76,8 @@
String GetName() const { return GetValue(); }
void SetName(const String& rName) { SetValue(rName); }
- long GetIndex() const { return nPalIndex; }
- void SetIndex(long nIndex) { nPalIndex = nIndex; }
+ INT32 GetIndex() const { return nPalIndex; }
+ void SetIndex(INT32 nIndex) { nPalIndex = nIndex; }
BOOL IsIndex() const { return (nPalIndex >= 0); }
/** this static checks if the given NameOrIndex item has a unique name for its value.
diff -ru svx.orig/inc/svx/xlnclit.hxx svx/inc/svx/xlnclit.hxx
--- svx.orig/inc/svx/xlnclit.hxx 2009-07-09 15:28:15.000000000 +0100
+++ svx/inc/svx/xlnclit.hxx 2009-07-09 16:34:06.000000000 +0100
@@ -42,7 +42,7 @@
public:
TYPEINFO();
XLineColorItem() {}
- XLineColorItem(long nIndex, const Color& rTheColor);
+ XLineColorItem(INT32 nIndex, const Color& rTheColor);
XLineColorItem(const String& rName, const Color& rTheColor);
XLineColorItem(SvStream& rIn);
diff -ru svx.orig/inc/svx/xlndsit.hxx svx/inc/svx/xlndsit.hxx
--- svx.orig/inc/svx/xlndsit.hxx 2009-07-09 15:28:12.000000000 +0100
+++ svx/inc/svx/xlndsit.hxx 2009-07-09 16:34:14.000000000 +0100
@@ -50,7 +50,7 @@
public:
TYPEINFO();
XLineDashItem() : NameOrIndex(XATTR_LINEDASH, -1) {}
- XLineDashItem(long nIndex, const XDash& rTheDash);
+ XLineDashItem(INT32 nIndex, const XDash& rTheDash);
XLineDashItem(const String& rName, const XDash& rTheDash);
XLineDashItem(SfxItemPool* pPool, const XDash& rTheDash);
XLineDashItem(SfxItemPool* pPool );
diff -ru svx.orig/inc/svx/xlnedit.hxx svx/inc/svx/xlnedit.hxx
--- svx.orig/inc/svx/xlnedit.hxx 2009-07-09 15:28:14.000000000 +0100
+++ svx/inc/svx/xlnedit.hxx 2009-07-09 16:31:26.000000000 +0100
@@ -46,7 +46,7 @@
public:
TYPEINFO();
- XLineEndItem(long nIndex = -1);
+ XLineEndItem(INT32 nIndex = -1);
XLineEndItem(const String& rName, const basegfx::B2DPolyPolygon& rPolyPolygon);
XLineEndItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon);
XLineEndItem(SfxItemPool* pPool );
diff -ru svx.orig/inc/svx/xlnstit.hxx svx/inc/svx/xlnstit.hxx
--- svx.orig/inc/svx/xlnstit.hxx 2009-07-09 15:28:14.000000000 +0100
+++ svx/inc/svx/xlnstit.hxx 2009-07-09 16:32:26.000000000 +0100
@@ -46,7 +46,7 @@
public:
TYPEINFO();
- XLineStartItem(long nIndex = -1);
+ XLineStartItem(INT32 nIndex = -1);
XLineStartItem(const String& rName, const basegfx::B2DPolyPolygon& rPolyPolygon);
XLineStartItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon);
XLineStartItem(SfxItemPool* pPool );
diff -ru svx.orig/inc/svx/xsflclit.hxx svx/inc/svx/xsflclit.hxx
--- svx.orig/inc/svx/xsflclit.hxx 2009-07-09 15:28:15.000000000 +0100
+++ svx/inc/svx/xsflclit.hxx 2009-07-09 16:31:12.000000000 +0100
@@ -41,7 +41,7 @@
public:
TYPEINFO();
XSecondaryFillColorItem() {}
- XSecondaryFillColorItem(long nIndex, const Color& rTheColor);
+ XSecondaryFillColorItem(INT32 nIndex, const Color& rTheColor);
XSecondaryFillColorItem(const String& rName, const Color& rTheColor);
XSecondaryFillColorItem(SvStream& rIn);
diff -ru svx.orig/source/xoutdev/xattr.cxx svx/source/xoutdev/xattr.cxx
--- svx.orig/source/xoutdev/xattr.cxx 2009-07-09 15:26:56.000000000 +0100
+++ svx/source/xoutdev/xattr.cxx 2009-07-09 16:32:04.000000000 +0100
@@ -66,6 +66,8 @@
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/vector/b2dvector.hxx>
+#include <stdio.h>
+
using namespace ::rtl;
using namespace ::com::sun::star;
@@ -108,7 +110,7 @@
/*************************************************************************
|*
-|* NameOrIndex::NameOrIndex(USHORT nWhich, long nIndex)
+|* NameOrIndex::NameOrIndex(USHORT nWhich, INT32 nIndex)
|*
|* Beschreibung
|* Ersterstellung 14.11.94
@@ -116,7 +118,7 @@
|*
*************************************************************************/
-NameOrIndex::NameOrIndex(USHORT _nWhich, long nIndex) :
+NameOrIndex::NameOrIndex(USHORT _nWhich, INT32 nIndex) :
SfxStringItem(_nWhich, aNameOrIndexEmptyString),
nPalIndex(nIndex)
{
@@ -134,7 +136,7 @@
NameOrIndex::NameOrIndex(USHORT _nWhich, const XubString& rName) :
SfxStringItem(_nWhich, rName),
- nPalIndex((long)-1)
+ nPalIndex(-1)
{
}
@@ -152,6 +154,7 @@
SfxStringItem(_nWhich, rIn)
{
rIn >> nPalIndex;
+ fprintf(stderr, "stream one way\n");
}
/*************************************************************************
@@ -230,7 +233,8 @@
SvStream& NameOrIndex::Store( SvStream& rOut, USHORT nItemVersion ) const
{
SfxStringItem::Store( rOut, nItemVersion );
- rOut << (INT32)nPalIndex;
+ rOut << nPalIndex;
+ fprintf(stderr, "stream the other way\n");
return rOut;
}
@@ -369,11 +373,11 @@
/*************************************************************************
|*
-|* XColorItem::XColorItem(USHORT nWhich, long nIndex, const Color& rTheColor)
+|* XColorItem::XColorItem(USHORT nWhich, INT32 nIndex, const Color& rTheColor)
|*
\************************************************************************/
-XColorItem::XColorItem(USHORT _nWhich, long nIndex, const Color& rTheColor) :
+XColorItem::XColorItem(USHORT _nWhich, INT32 nIndex, const Color& rTheColor) :
NameOrIndex(_nWhich, nIndex),
aColor(rTheColor)
{
@@ -884,7 +888,7 @@
/*************************************************************************
|*
-|* XLineDashItem::XLineDashItem(long nIndex, const XDash& rTheDash)
+|* XLineDashItem::XLineDashItem(INT32 nIndex, const XDash& rTheDash)
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -892,7 +896,7 @@
|*
*************************************************************************/
-XLineDashItem::XLineDashItem(long nIndex, const XDash& rTheDash) :
+XLineDashItem::XLineDashItem(INT32 nIndex, const XDash& rTheDash) :
NameOrIndex(XATTR_LINEDASH, nIndex),
aDash(rTheDash)
{
@@ -1501,7 +1505,7 @@
/*************************************************************************
|*
-|* XLineColorItem::XLineColorItem(long nIndex, const Color& rTheColor)
+|* XLineColorItem::XLineColorItem(INT32 nIndex, const Color& rTheColor)
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -1509,7 +1513,7 @@
|*
*************************************************************************/
-XLineColorItem::XLineColorItem(long nIndex, const Color& rTheColor) :
+XLineColorItem::XLineColorItem(INT32 nIndex, const Color& rTheColor) :
XColorItem(XATTR_LINECOLOR, nIndex, rTheColor)
{
}
@@ -1720,7 +1724,7 @@
/*************************************************************************
|*
-|* XLineStartItem::XLineStartItem(long nIndex)
+|* XLineStartItem::XLineStartItem(INT32 nIndex)
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -1728,7 +1732,7 @@
|*
*************************************************************************/
-XLineStartItem::XLineStartItem(long nIndex)
+XLineStartItem::XLineStartItem(INT32 nIndex)
: NameOrIndex(XATTR_LINESTART, nIndex)
{
}
@@ -2192,7 +2196,7 @@
/*************************************************************************
|*
-|* XLineEndItem::XLineEndItem(long nIndex)
+|* XLineEndItem::XLineEndItem(INT32 nIndex)
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -2200,7 +2204,7 @@
|*
*************************************************************************/
-XLineEndItem::XLineEndItem(long nIndex)
+XLineEndItem::XLineEndItem(INT32 nIndex)
: NameOrIndex(XATTR_LINEEND, nIndex)
{
}
@@ -2664,7 +2668,7 @@
/*************************************************************************
|*
-|* XLineStartWidthItem::XLineStartWidthItem(long nWidth)
+|* XLineStartWidthItem::XLineStartWidthItem(INT32 nWidth)
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -3249,7 +3253,7 @@
/*************************************************************************
|*
-|* XFillColorItem::XFillColorItem(long nIndex, const Color& rTheColor)
+|* XFillColorItem::XFillColorItem(INT32 nIndex, const Color& rTheColor)
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -3257,7 +3261,7 @@
|*
*************************************************************************/
-XFillColorItem::XFillColorItem(long nIndex, const Color& rTheColor) :
+XFillColorItem::XFillColorItem(INT32 nIndex, const Color& rTheColor) :
XColorItem(XATTR_FILLCOLOR, nIndex, rTheColor)
{
}
@@ -3372,7 +3376,7 @@
// -----------------------------
TYPEINIT1_AUTOFACTORY(XSecondaryFillColorItem, XColorItem);
-XSecondaryFillColorItem::XSecondaryFillColorItem(long nIndex, const Color& rTheColor) :
+XSecondaryFillColorItem::XSecondaryFillColorItem(INT32 nIndex, const Color& rTheColor) :
XColorItem(XATTR_SECONDARYFILLCOLOR, nIndex, rTheColor)
{
}
@@ -3510,7 +3514,7 @@
/*************************************************************************
|*
-|* XFillGradientItem::XFillGradientItem(long nIndex,
+|* XFillGradientItem::XFillGradientItem(INT32 nIndex,
|* const XGradient& rTheGradient)
|*
|* Beschreibung
@@ -3519,7 +3523,7 @@
|*
*************************************************************************/
-XFillGradientItem::XFillGradientItem(long nIndex,
+XFillGradientItem::XFillGradientItem(INT32 nIndex,
const XGradient& rTheGradient) :
NameOrIndex(XATTR_FILLGRADIENT, nIndex),
aGradient(rTheGradient)
@@ -4042,7 +4046,7 @@
//------------------------------------------------------------------------
-XFillFloatTransparenceItem::XFillFloatTransparenceItem( long nIndex, const XGradient& rGradient, BOOL bEnable ) :
+XFillFloatTransparenceItem::XFillFloatTransparenceItem( INT32 nIndex, const XGradient& rGradient, BOOL bEnable ) :
XFillGradientItem ( nIndex, rGradient ),
bEnabled ( bEnable )
{
@@ -4246,7 +4250,7 @@
/*************************************************************************
|*
-|* XFillHatchItem::XFillHatchItem(long nIndex,
+|* XFillHatchItem::XFillHatchItem(INT32 nIndex,
|* const XHatch& rTheHatch)
|*
|* Beschreibung
@@ -4255,7 +4259,7 @@
|*
*************************************************************************/
-XFillHatchItem::XFillHatchItem(long nIndex,
+XFillHatchItem::XFillHatchItem(INT32 nIndex,
const XHatch& rTheHatch) :
NameOrIndex(XATTR_FILLHATCH, nIndex),
aHatch(rTheHatch)
@@ -5258,7 +5262,7 @@
|*
*************************************************************************/
-XFormTextShadowColorItem::XFormTextShadowColorItem(long nIndex,
+XFormTextShadowColorItem::XFormTextShadowColorItem(INT32 nIndex,
const Color& rTheColor) :
XColorItem(XATTR_FORMTXTSHDWCOLOR, nIndex, rTheColor)
{
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/openoffice.org.spec,v
retrieving revision 1.1923
retrieving revision 1.1924
diff -u -p -r1.1923 -r1.1924
--- openoffice.org.spec 9 Jul 2009 11:55:46 -0000 1.1923
+++ openoffice.org.spec 9 Jul 2009 19:32:44 -0000 1.1924
@@ -148,6 +148,7 @@ Patch72: workspace.aw073.patch
Patch73: openoffice.org-3.1.1.ooo102932.sw.mailmerge.busted-integer-conversion.patch
Patch74: openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch
Patch75: workspace.calc311fixes.patch
+Patch76: openoffice.org-3.1.0.oooXXXXX.svx.64bit.patch
%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
%define instdir %{_libdir}
@@ -1654,6 +1655,7 @@ cat %{PATCH11} >> svtools/source/dialogs
%patch73 -p0 -b .ooo102932.sw.mailmerge.busted-integer-conversion.patch
%patch74 -p0 -b .ooo103277.vcl.kwinworkaround.patch
%patch75 -p0 -b .workspace.calc311fixes.patch
+%patch76 -p0 -b .oooXXXXX.svx.64bit.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4156,10 +4158,11 @@ fi
unopkg list --shared > /dev/null 2>&1 || :
%changelog
-* Thu Jul 02 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.5.UNBUILT
+* Thu Jul 09 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.5
- Resolves: rhbz#506984 openoffice.org-3.1.0.ooo103277.vcl.kwinworkaround.patch
- Resolves: rhbz#510394 Crash while saving xls file possibly due to
double free or corruption error
+- Resolves(maybe): rhbz#510327 openoffice.org-3.1.0.oooXXXXX.svx.64bit.patch
* Fri Jun 22 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-11.4
- Related: rhbz#472853 openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org-3.1.0.oooXXXXX.svx.64bit.patch, NONE, 1.1 workspace.vcl103.patch, NONE, 1.1 openoffice.org.spec, 1.1960, 1.1961 openoffice.org-3.1.0.ooo103145.vcl.kwinworkaround.patch, 1.1, NONE openoffice.org-3.1.0.ooo103319.vcl.canttakethebeeping.patch, 1.1, NONE
- Next message (by thread): rpms/libprelude/devel .cvsignore, 1.18, 1.19 libprelude.spec, 1.44, 1.45 sources, 1.19, 1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list