ooo-build r12308 - in trunk: . patches/dev300

[noelpwer svn gnome org]

Author: noelpwer
Date: Wed Apr 23 15:22:11 2008
New Revision: 12308
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12308&view=rev

Log:
2008-04-23  Noel Power <noel,power novell com>

        * patches/dev300/cws-npower11.diff: again, last version had
        conflict markers in it



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/cws-npower11.diff

Modified: trunk/patches/dev300/cws-npower11.diff
==============================================================================
--- trunk/patches/dev300/cws-npower11.diff	(original)
+++ trunk/patches/dev300/cws-npower11.diff	Wed Apr 23 15:22:11 2008
@@ -1565,7 +1565,6 @@
 Index: sc/source/ui/vba/vbahelper.cxx
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/vba/vbahelper.cxx,v
-<<<<<<< .mine
 retrieving revision 1.4
 retrieving revision 1.3.42.3
 diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.3
@@ -1609,14 +1608,6 @@
  getTypeConverter( const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException)
  {
 @@ -220,6 +234,22 @@ dispatchRequests (uno::Reference< frame:
-=======
-retrieving revision 1.4
-retrieving revision 1.3.42.2
-diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.2
---- sc/source/ui/vba/vbahelper.cxx	29 Jan 2008 15:47:18 -0000	1.4
-+++ sc/source/ui/vba/vbahelper.cxx	13 Mar 2008 18:08:44 -0000	1.3.42.2
-@@ -220,6 +220,22 @@ dispatchRequests (uno::Reference< frame:
->>>>>>> .r12306
  }
  
  
@@ -1639,11 +1630,7 @@
  void
  implnPaste()
  {
-<<<<<<< .mine
 @@ -536,6 +566,11 @@ void PrintOutHelper( const uno::Any& Fro
-=======
-@@ -536,6 +552,11 @@ void PrintOutHelper( const uno::Any& Fro
->>>>>>> .r12306
  	//   of this method
  }
  
@@ -4456,7 +4443,6 @@
 Index: sc/source/ui/vba/vbaworksheet.cxx
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/vba/vbaworksheet.cxx,v
-<<<<<<< .mine
 retrieving revision 1.4
 retrieving revision 1.3.42.3
 diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.3
@@ -4622,14 +4608,6 @@
          {
              return aUnoObj;
 @@ -861,6 +825,29 @@ ScVbaWorksheet::getSheetID() throw (uno:
-=======
-retrieving revision 1.4
-retrieving revision 1.3.42.2
-diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.2
---- sc/source/ui/vba/vbaworksheet.cxx	29 Jan 2008 15:47:58 -0000	1.4
-+++ sc/source/ui/vba/vbaworksheet.cxx	13 Mar 2008 18:08:40 -0000	1.3.42.2
-@@ -861,6 +861,29 @@ ScVbaWorksheet::getSheetID() throw (uno:
->>>>>>> .r12306
  	return xAddressable->getRangeAddress().Sheet;
  }
  
@@ -4688,83 +4666,47 @@
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
-<<<<<<< .mine
 Binary files /dev/null and /tmp/cvsnpcFKH differ
-=======
-Binary files /dev/null and /tmp/cvstuairu differ
->>>>>>> .r12306
 Index: sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/MiscRangeTests.xls
-<<<<<<< .mine
 Binary files /dev/null and /tmp/cvssyCTyd differ
-=======
-Binary files /dev/null and /tmp/cvsuuairu differ
->>>>>>> .r12306
 Index: sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Ranges-2.xls
-<<<<<<< .mine
 Binary files /dev/null and /tmp/cvszM0ynJ differ
-=======
-Binary files /dev/null and /tmp/cvsvuairu differ
->>>>>>> .r12306
 Index: sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Ranges-3.xls
-<<<<<<< .mine
 Binary files /dev/null and /tmp/cvspDHQlf differ
-=======
-Binary files /dev/null and /tmp/cvswuairu differ
->>>>>>> .r12306
 Index: sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Ranges.xls
-<<<<<<< .mine
 Binary files /dev/null and /tmp/cvsJTWlkL differ
-=======
-Binary files /dev/null and /tmp/cvsxuairu differ
->>>>>>> .r12306
 Index: sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Shapes.xls
-<<<<<<< .mine
 Binary files /dev/null and /tmp/cvsum2Yrh differ
-=======
-Binary files /dev/null and /tmp/cvsyuairu differ
->>>>>>> .r12306
 Index: sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/TestAddress.xls
-<<<<<<< .mine
 Binary files /dev/null and /tmp/cvsFBESzN differ
-=======
-Binary files /dev/null and /tmp/cvszuairu differ
->>>>>>> .r12306
 Index: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest.xls
-<<<<<<< .mine
 Binary files /dev/null and /tmp/cvsQxpYHj differ
-=======
-Binary files /dev/null and /tmp/cvsAuairu differ
->>>>>>> .r12306
 Index: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/TestCalc_Rangetest2.xls
-<<<<<<< .mine
 Binary files /dev/null and /tmp/cvsnTZiQP differ
-=======
-Binary files /dev/null and /tmp/cvsBuairu differ
->>>>>>> .r12306
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/excel/AutoFilter.log
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/logs/excel/AutoFilter.log