GNOME.org
 

ooo-build r12183 - in branches/sled-10-sp1-ooo-build-2-4: . patches/src680

Author: noelpwer
Date: Wed Apr 16 12:17:44 2008
New Revision: 12183
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12183&view=rev

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

        * patches/src680/cws-npower11.diff: regenerated cws for included fix for
        regression with Range.AutoOutline ( stops an unwanted basic error )



Modified:
   branches/sled-10-sp1-ooo-build-2-4/ChangeLog
   branches/sled-10-sp1-ooo-build-2-4/patches/src680/cws-npower11.diff

Modified: branches/sled-10-sp1-ooo-build-2-4/patches/src680/cws-npower11.diff
==============================================================================
--- branches/sled-10-sp1-ooo-build-2-4/patches/src680/cws-npower11.diff	(original)
+++ branches/sled-10-sp1-ooo-build-2-4/patches/src680/cws-npower11.diff	Wed Apr 16 12:17:44 2008
@@ -454,12 +454,12 @@
 Index: sc/source/ui/vba/vbahelper.cxx
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/vba/vbahelper.cxx,v
-retrieving revision 1.3
-retrieving revision 1.3.42.1
-diff -u -p -u -p -b -w -B -r1.3 -r1.3.42.1
---- sc/source/ui/vba/vbahelper.cxx	7 Dec 2007 10:53:38 -0000	1.3
-+++ sc/source/ui/vba/vbahelper.cxx	18 Jan 2008 16:51:38 -0000	1.3.42.1
-@@ -219,6 +219,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:
  }
  
  
@@ -482,7 +482,7 @@
  void
  implnPaste()
  {
-@@ -535,6 +551,11 @@ void PrintOutHelper( const uno::Any& Fro
+@@ -536,6 +552,11 @@ void PrintOutHelper( const uno::Any& Fro
  	//   of this method
  }
  
@@ -658,14 +658,14 @@
 Index: sc/source/ui/vba/vbarange.cxx
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/vba/vbarange.cxx,v
-retrieving revision 1.5
-retrieving revision 1.5.34.5
-diff -u -p -u -p -b -w -B -r1.5 -r1.5.34.5
---- sc/source/ui/vba/vbarange.cxx	14 Dec 2007 12:41:04 -0000	1.5
-+++ sc/source/ui/vba/vbarange.cxx	10 Mar 2008 11:56:40 -0000	1.5.34.5
+retrieving revision 1.6
+retrieving revision 1.5.34.7
+diff -u -p -u -p -b -w -B -r1.6 -r1.5.34.7
+--- sc/source/ui/vba/vbarange.cxx	29 Jan 2008 17:03:20 -0000	1.6
++++ sc/source/ui/vba/vbarange.cxx	16 Apr 2008 10:40:19 -0000	1.5.34.7
 @@ -521,6 +521,34 @@ sal_Int32 m_nArea;
  typedef ::cppu::WeakImplHelper1< container::XEnumeration > CellsEnumeration_BASE;
- typedef vector< CellPos > vCellPos;
+ typedef ::std::vector< CellPos > vCellPos;
  
 +// #FIXME - QUICK
 +// we could probably could and should modify CellsEnumeration below
@@ -724,9 +724,7 @@
  ScVbaRange::ScVbaRange( uno::Sequence< uno::Any> const & args,
 -    uno::Reference< uno::XComponentContext> const & xContext )  throw ( lang::IllegalArgumentException ) : ScVbaRange_BASE( getXSomethingFromArgs< vba::XHelperInterface >( args, 0 ), xContext, getXSomethingFromArgs< beans::XPropertySet >( args, 1, false ), getModelFromRange( getXSomethingFromArgs< table::XCellRange >( args, 1 ) ), true ), mbIsRows( sal_False ), mbIsColumns( sal_False )
 +    uno::Reference< uno::XComponentContext> const & xContext )  throw ( lang::IllegalArgumentException ) : ScVbaRange_BASE( getXSomethingFromArgs< vba::XHelperInterface >( args, 0 ), xContext, getXSomethingFromArgs< beans::XPropertySet >( args, 1, false ), getModelFromXIf( getXSomethingFromArgs< uno::XInterface >( args, 1 ) ), true ), mbIsRows( sal_False ), mbIsColumns( sal_False )
- {
--	mxRange.set( mxPropertySet, uno::UNO_QUERY_THROW );
--	uno::Reference< container::XIndexAccess > xIndex( new SingleRangeIndexAccess( mxContext, mxRange ) );
++{
 +	mxRange.set( mxPropertySet, uno::UNO_QUERY );
 +	mxRanges.set( mxPropertySet, uno::UNO_QUERY );
 +	uno::Reference< container::XIndexAccess >  xIndex;
@@ -735,7 +733,9 @@
 +		xIndex = new SingleRangeIndexAccess( mxContext, mxRange );
 +	}
 +	else if ( mxRanges.is() )
-+	{
+ {
+-	mxRange.set( mxPropertySet, uno::UNO_QUERY_THROW );
+-	uno::Reference< container::XIndexAccess > xIndex( new SingleRangeIndexAccess( mxContext, mxRange ) );
 +		xIndex.set( mxRanges, uno::UNO_QUERY_THROW );
 +	}
  	m_Areas = new ScVbaRangeAreas( mxContext, xIndex, mbIsRows, mbIsColumns );
@@ -807,6 +807,15 @@
  			DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); 			
          ScDocShell* pDocShell = getDocShellFromRange( mxRange );
          if ( pDocShell )
+@@ -4521,7 +4605,7 @@ ScVbaRange::AutoOutline(  ) throw (scrip
+ {
+ 	// #TODO #FIXME needs to check for summary row/col ( whatever they are )
+ 	// not valid for multi Area Addresses
+-	if ( m_Areas->getCount() )
++	if ( m_Areas->getCount() > 1 )
+ 		DebugHelper::exception(SbERR_METHOD_FAILED, STR_ERRORMESSAGE_APPLIESTOSINGLERANGEONLY); 			
+ 	// So needs to either span an entire Row or a just be a single cell 
+ 	// ( that contains a summary RowColumn )
 @@ -4739,6 +4823,7 @@ ScVbaRange::SpecialCells( const uno::Any
  		case excel::XlCellType::xlCellTypeConstants:
  		case excel::XlCellType::xlCellTypeFormulas:
@@ -1020,11 +1029,11 @@
 Index: sc/source/ui/vba/vbawindow.cxx
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/vba/vbawindow.cxx,v
-retrieving revision 1.3
-retrieving revision 1.3.42.1
-diff -u -p -u -p -b -w -B -r1.3 -r1.3.42.1
---- sc/source/ui/vba/vbawindow.cxx	7 Dec 2007 11:05:13 -0000	1.3
-+++ sc/source/ui/vba/vbawindow.cxx	18 Jan 2008 16:51:38 -0000	1.3.42.1
+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/vbawindow.cxx	29 Jan 2008 08:02:52 -0000	1.4
++++ sc/source/ui/vba/vbawindow.cxx	13 Mar 2008 18:08:58 -0000	1.3.42.2
 @@ -42,7 +42,11 @@
  #include <com/sun/star/view/DocumentZoomType.hpp>
  #include <com/sun/star/table/CellRangeAddress.hpp>
@@ -1037,7 +1046,7 @@
  
  #include <docsh.hxx>
  #include <tabvwsh.hxx>
-@@ -443,8 +447,8 @@ ScVbaWindow::Close( const uno::Any& Save
+@@ -446,8 +450,8 @@ ScVbaWindow::Close( const uno::Any& Save
  	workbook.Close(SaveChanges, FileName, RouteWorkBook );
  }
  
@@ -1048,7 +1057,7 @@
  { 
  	return new ScVbaPane( mxContext, m_xViewPane ); 
  }
-@@ -631,7 +635,8 @@ ScVbaWindow::setSplitColumn( sal_Int32 _
+@@ -634,7 +638,8 @@ ScVbaWindow::setSplitColumn( sal_Int32 _
  	if( getSplitColumn() != _splitcolumn )
  	{
  		sal_Bool bFrozen = getFreezePanes();
@@ -1058,7 +1067,7 @@
  		SplitAtDefinedPosition( !bFrozen );
  	}
  }
-@@ -663,7 +668,8 @@ ScVbaWindow::setSplitRow( sal_Int32 _spl
+@@ -666,7 +671,8 @@ ScVbaWindow::setSplitRow( sal_Int32 _spl
  	if( getSplitRow() != _splitrow )
  	{
  		sal_Bool bFrozen = getFreezePanes();
@@ -1068,7 +1077,7 @@
  		SplitAtDefinedPosition( !bFrozen );
  	}
  }
-@@ -738,6 +744,184 @@ ScVbaWindow::setZoom( const uno::Any& _z
+@@ -741,6 +747,184 @@ ScVbaWindow::setZoom( const uno::Any& _z
  	}			
  }
  
@@ -1361,12 +1370,12 @@
 Index: sc/source/ui/vba/vbaworksheet.cxx
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/vba/vbaworksheet.cxx,v
-retrieving revision 1.3
-retrieving revision 1.3.42.1
-diff -u -p -u -p -b -w -B -r1.3 -r1.3.42.1
---- sc/source/ui/vba/vbaworksheet.cxx	7 Dec 2007 11:06:55 -0000	1.3
-+++ sc/source/ui/vba/vbaworksheet.cxx	18 Jan 2008 16:51:38 -0000	1.3.42.1
-@@ -860,6 +860,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:
  	return xAddressable->getRangeAddress().Sheet;
  }
  
@@ -1416,47 +1425,47 @@
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/AutoFilter.xls
-Binary files /dev/null and /tmp/cvsh_aqgX differ
+Binary files /dev/null and /tmp/cvstuairu differ
 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
-Binary files /dev/null and /tmp/cvsi_aqgX differ
+Binary files /dev/null and /tmp/cvsuuairu differ
 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
-Binary files /dev/null and /tmp/cvsj_aqgX differ
+Binary files /dev/null and /tmp/cvsvuairu differ
 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
-Binary files /dev/null and /tmp/cvsk_aqgX differ
+Binary files /dev/null and /tmp/cvswuairu differ
 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
-Binary files /dev/null and /tmp/cvsl_aqgX differ
+Binary files /dev/null and /tmp/cvsxuairu differ
 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
-Binary files /dev/null and /tmp/cvsm_aqgX differ
+Binary files /dev/null and /tmp/cvsyuairu differ
 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
-Binary files /dev/null and /tmp/cvsn_aqgX differ
+Binary files /dev/null and /tmp/cvszuairu differ
 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
-Binary files /dev/null and /tmp/cvso_aqgX differ
+Binary files /dev/null and /tmp/cvsAuairu differ
 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
-Binary files /dev/null and /tmp/cvsp_aqgX differ
+Binary files /dev/null and /tmp/cvsBuairu differ
 Index: sc/source/ui/vba/testvba/TestDocuments/logs/excel/AutoFilter.log
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/logs/excel/AutoFilter.log
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]