[openoffice.org/f14/master] fix up patch

Caolan McNamara caolanm at fedoraproject.org
Fri Jan 7 15:36:16 UTC 2011


commit eb175c7be59e16f599e915e2014566a09c3f0970
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 7 15:35:58 2011 +0000

    fix up patch

 ...fice.org-3.1.0.ooo102061.sc.cellanchoring.patch |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch b/openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
index 1f781a4..25fe6e8 100644
--- a/openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
+++ b/openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
@@ -451,8 +451,8 @@ diff -ru sc.orig/source/core/data/drwlayer.cxx sc/source/core/data/drwlayer.cxx
 -	MoveAreaTwips( nTab, aRect, Point( 0,nDifTwips ), aTopLeft );
  }
  
- BOOL ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow )
-@@ -1846,35 +1767,105 @@
+ BOOL ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow, bool bIncludeNotes )
+@@ -1848,35 +1769,105 @@
  	}
  }
  
@@ -577,7 +577,7 @@ diff -ru sc.orig/source/core/data/drwlayer.cxx sc/source/core/data/drwlayer.cxx
  	if( pObj && bCreate )
  	{
  		ScDrawObjData* pData = new ScDrawObjData;
-@@ -1911,15 +1902,7 @@
+@@ -1913,15 +1904,7 @@
  
  ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj )				// static
  {
@@ -594,7 +594,7 @@ diff -ru sc.orig/source/core/data/drwlayer.cxx sc/source/core/data/drwlayer.cxx
  }
  
  // static:
-@@ -1972,7 +1955,7 @@
+@@ -1974,7 +1957,7 @@
  		else if ( pObj->ISA( SdrOle2Obj ) ) // OLE-Objekt
  		{
              // TODO/LEAN: working with visual area needs running state
@@ -603,7 +603,7 @@ diff -ru sc.orig/source/core/data/drwlayer.cxx sc/source/core/data/drwlayer.cxx
  			bObjSupported = TRUE;
  		}
  
-@@ -1990,14 +1973,9 @@
+@@ -1992,14 +1975,9 @@
  
  ScMacroInfo* ScDrawLayer::GetMacroInfo( SdrObject* pObj, BOOL bCreate )             // static
  {


More information about the scm-commits mailing list