rpms/openoffice.org/F-7 openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch, 1.1, 1.2

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6153

Modified Files:
	openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch 
Log Message:
adjust patch

openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch:

Index: openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch	7 Jun 2007 16:44:54 -0000	1.1
+++ openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch	8 Jun 2007 17:48:35 -0000	1.2
@@ -1,6 +1,6 @@
---- openoffice.org.orig/svx/inc/svx/svdmark.hxx	2007-04-11 18:21:43.000000000 +0200
-+++ openoffice.org/svx/inc/svx/svdmark.hxx	2007-06-07 16:37:09.000000000 +0200
-@@ -69,7 +69,7 @@ class SdrUShortCont 
+--- openoffice.org.orig/svx/inc/svdmark.hxx	2007-04-11 18:21:43.000000000 +0200
++++ openoffice.org/svx/inc/svdmark.hxx	2007-06-07 16:37:09.000000000 +0200
+@@ -69,7 +69,7 @@
  	sal_Bool											mbSorted;
  
  private:
@@ -9,7 +9,7 @@
  
  public:
  	SdrUShortCont(sal_uInt16 nBlock, sal_uInt16 nInit, sal_uInt16 nResize)
-@@ -115,9 +115,9 @@ public:
+@@ -115,9 +115,9 @@
  		}
  	}
  
@@ -18,10 +18,10 @@
  	{ 
 -		maArray.Insert((void*)sal_uInt32(nElem),nPos); 
 +		maArray.Insert((void*)ULONG(nElem),nPos); 
- 
+ 		
  		if(mbSorted) 
  		{
-@@ -125,14 +125,14 @@ public:
+@@ -125,14 +125,14 @@
  		}
  	}
  
@@ -36,10 +36,10 @@
  	{ 
 -		maArray.Replace((void*)sal_uInt32(nElem), nPos); 
 +		maArray.Replace((void*)ULONG(nElem), nPos); 
- 
+ 		
  		if(mbSorted)
  		{
-@@ -140,24 +140,24 @@ public:
+@@ -140,24 +140,24 @@
  		}
  	}
  
@@ -69,7 +69,7 @@
  	}
  };
  
-@@ -338,20 +338,20 @@ public:
+@@ -339,20 +339,20 @@
  		mbSorted = sal_False; 
  	}
  
@@ -84,7 +84,7 @@
  	{ 
  		return (SdrMark*)(maList.GetObject(nNum)); 
  	}
- 
+ 	
 -	sal_uInt32 FindObject(const SdrObject* pObj) const;
 +	ULONG FindObject(const SdrObject* pObj) const;
  	void InsertEntry(const SdrMark& rMark, sal_Bool bChkSort = sal_True);
@@ -95,8 +95,8 @@
  	void Merge(const SdrMarkList& rSrcList, sal_Bool bReverse = sal_False);
  	sal_Bool DeletePageView(const SdrPageView& rPV);
  	sal_Bool InsertPageView(const SdrPageView& rPV);
---- openoffice.org.orig/svx/inc/svx/svdmrkv.hxx	2007-04-11 18:22:18.000000000 +0200
-+++ openoffice.org/svx/inc/svx/svdmrkv.hxx	2007-06-07 16:39:30.000000000 +0200
+--- openoffice.org.orig/svx/inc/svdmrkv.hxx	2007-04-11 18:22:18.000000000 +0200
++++ openoffice.org/svx/inc/svdmrkv.hxx	2007-06-07 16:39:30.000000000 +0200
 @@ -156,7 +156,7 @@ protected:
      Rectangle					aMarkedGluePointsRect;