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

From: noelpwer svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r14543 - in trunk: . patches/dev300
Date: Wed, 19 Nov 2008 13:42:23 +0000 (UTC)
Author: noelpwer
Date: Wed Nov 19 13:42:23 2008
New Revision: 14543
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14543&view=rev

Log:
2008-11-19  Noel Power  <noel power novell com>

        * patches/dev300/cws-npower11.diff: new version, includes fix for 
        n#444156


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 Nov 19 13:42:23 2008
@@ -8531,10 +8531,10 @@
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/vba/vbarange.cxx,v
 retrieving revision 1.9
-retrieving revision 1.5.34.18
-diff -u -p -u -p -b -w -B -r1.9 -r1.5.34.18
+retrieving revision 1.5.34.19
+diff -u -p -u -p -b -w -B -r1.9 -r1.5.34.19
 --- sc/source/ui/vba/vbarange.cxx	14 May 2008 10:03:31 -0000	1.9
-+++ sc/source/ui/vba/vbarange.cxx	3 Oct 2008 09:30:26 -0000	1.5.34.18
++++ sc/source/ui/vba/vbarange.cxx	12 Nov 2008 07:09:19 -0000	1.5.34.19
 @@ -115,6 +115,7 @@
  #include <org/openoffice/excel/XlCellType.hpp>
  #include <org/openoffice/excel/XlSpecialCellsValue.hpp>
@@ -8693,7 +8693,27 @@
                                                                                                                         
  	RangeHelper thisRange( mxRange );
  	table::CellRangeAddress thisRangeAddress =  thisRange.getCellRangeAddressable()->getRangeAddress();
-@@ -2686,6 +2763,167 @@ ScVbaRange::Replace( const ::rtl::OUStri
+@@ -1876,6 +1953,19 @@ ScVbaRange::Select() throw (uno::Runtime
+ 			xSelection->select( uno::makeAny( mxRanges ) );
+ 		else
+ 			xSelection->select( uno::makeAny( mxRange ) );
++		// set focus on document e.g.
++		// ThisComponent.CurrentController.Frame.getContainerWindow.SetFocus
++		try
++		{
++			uno::Reference< frame::XController > xController( getCurrentDocument()->getCurrentController(), uno::UNO_QUERY_THROW );
++			uno::Reference< frame::XFrame > xFrame( xController->getFrame(), uno::UNO_QUERY_THROW );
++			uno::Reference< awt::XWindow > xWin( xFrame->getContainerWindow(), uno::UNO_QUERY_THROW );
++			xWin->setFocus();
++		}
++		catch( uno::Exception& )
++		{
++		}		
++
+ 	}
+ }
+ 
+@@ -2686,6 +2776,167 @@ ScVbaRange::Replace( const ::rtl::OUStri
  	return sal_True; // always
  }
  
@@ -8861,7 +8881,7 @@
  uno::Reference< table::XCellRange > processKey( const uno::Any& Key, uno::Reference<  uno::XComponentContext >& xContext, ScDocShell* pDocSh )
  {
  	uno::Reference< excel::XRange > xKeyRange;
-@@ -2739,10 +2977,10 @@ void updateTableSortField( const uno::Re
+@@ -2739,10 +2990,10 @@ void updateTableSortField( const uno::Re
  
  		// make sure that upper left poing of key range is within the
  		// parent range
@@ -8875,7 +8895,7 @@
  		{
  			//determine col/row index
  			if ( bIsSortColumn )
-@@ -3116,6 +3354,18 @@ ScVbaRange::hasElements() throw (uno::Ru
+@@ -3116,6 +3367,18 @@ ScVbaRange::hasElements() throw (uno::Ru
  uno::Reference< container::XEnumeration > SAL_CALL 
  ScVbaRange::createEnumeration() throw (uno::RuntimeException)
  {
@@ -8894,7 +8914,7 @@
  	return new CellsEnumeration( mxContext, m_Areas );
  }
  
-@@ -3363,26 +3613,32 @@ ScVbaRange::getRowHeight() throw (uno::R
+@@ -3363,26 +3626,32 @@ ScVbaRange::getRowHeight() throw (uno::R
  		return xRange->getRowHeight();
  	}	
  
@@ -8932,7 +8952,7 @@
  	return uno::makeAny( nHeight );
  }
  
-@@ -4119,7 +4375,7 @@ ScVbaRange::Autofit() throw (uno::Runtim
+@@ -4119,7 +4388,7 @@ ScVbaRange::Autofit() throw (uno::Runtim
  		// if the range is a not a row or column range autofit will
  		// throw an error
  
@@ -8941,7 +8961,7 @@
  			DebugHelper::exception(SbERR_METHOD_FAILED, rtl::OUString()); 			
          ScDocShell* pDocShell = getDocShellFromRange( mxRange );
          if ( pDocShell )
-@@ -4298,6 +4554,113 @@ void ScVbaRange::setFormulaHidden(const 
+@@ -4298,6 +4567,113 @@ void ScVbaRange::setFormulaHidden(const 
  	xProps->setPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLPRO)), uno::makeAny(rCellAttr));
  }
  
@@ -9055,7 +9075,7 @@
  
  void SAL_CALL 
  ScVbaRange::PrintOut( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& ActivePrinter, const uno::Any& PrintToFile, const uno::Any& Collate, const uno::Any& PrToFileName ) throw (uno::RuntimeException)
-@@ -4516,7 +4879,7 @@ ScVbaRange::AutoOutline(  ) throw (scrip
+@@ -4516,7 +4892,7 @@ ScVbaRange::AutoOutline(  ) throw (scrip
  {
  	// #TODO #FIXME needs to check for summary row/col ( whatever they are )
  	// not valid for multi Area Addresses
@@ -9064,7 +9084,7 @@
  		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 )
-@@ -4734,6 +5097,7 @@ ScVbaRange::SpecialCells( const uno::Any
+@@ -4734,6 +5110,7 @@ ScVbaRange::SpecialCells( const uno::Any
  		case excel::XlCellType::xlCellTypeConstants:
  		case excel::XlCellType::xlCellTypeFormulas:
  		case excel::XlCellType::xlCellTypeVisible:
@@ -9072,7 +9092,7 @@
  		{
  			if ( bIsMultiArea )
  			{
-@@ -4894,7 +5258,7 @@ ScVbaRange::Subtotal( ::sal_Int32 _nGrou
+@@ -4894,7 +5271,7 @@ ScVbaRange::Subtotal( ::sal_Int32 _nGrou
  		sal_Bool bAddPageBreaks = sal_False;
  		PageBreaks >>= bAddPageBreaks;
  
@@ -9081,7 +9101,7 @@
  		uno::Reference< sheet::XSubTotalDescriptor > xSubDesc = xSub->createSubTotalDescriptor(sal_True);
  		uno::Reference< beans::XPropertySet > xSubDescPropertySet( xSubDesc, uno::UNO_QUERY_THROW );
  		xSubDescPropertySet->setPropertyValue(INSERTPAGEBREAKS, uno::makeAny( bAddPageBreaks));
-@@ -4955,27 +5319,6 @@ ScVbaRange::Subtotal( ::sal_Int32 _nGrou
+@@ -4955,27 +5332,6 @@ ScVbaRange::Subtotal( ::sal_Int32 _nGrou
  	}
  }
  
@@ -11967,117 +11987,117 @@
 ===================================================================
 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/cvsXlaWx0 differ
+Binary files /dev/null and /tmp/cvsf5aWwf 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/cvsYlaWx0 differ
+Binary files /dev/null and /tmp/cvsg5aWwf differ
 Index: sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/PageBreaks.xls
-Binary files /dev/null and /tmp/cvsZlaWx0 differ
+Binary files /dev/null and /tmp/cvsh5aWwf differ
 Index: sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/PageSetup.xls
-Binary files /dev/null and /tmp/cvs0laWx0 differ
+Binary files /dev/null and /tmp/cvsi5aWwf 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/cvs1laWx0 differ
+Binary files /dev/null and /tmp/cvsj5aWwf 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/cvs2laWx0 differ
+Binary files /dev/null and /tmp/cvsk5aWwf 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/cvs3laWx0 differ
+Binary files /dev/null and /tmp/cvsl5aWwf 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/cvs4laWx0 differ
+Binary files /dev/null and /tmp/cvsm5aWwf differ
 Index: sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/StrConv-test.xls
-Binary files /dev/null and /tmp/cvs5laWx0 differ
+Binary files /dev/null and /tmp/cvsn5aWwf differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Template.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Template.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Template.xls
-Binary files /dev/null and /tmp/cvs6laWx0 differ
+Binary files /dev/null and /tmp/cvso5aWwf 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/cvs7laWx0 differ
+Binary files /dev/null and /tmp/cvsp5aWwf 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/cvs8laWx0 differ
+Binary files /dev/null and /tmp/cvsq5aWwf 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/cvs9laWx0 differ
+Binary files /dev/null and /tmp/cvsr5aWwf differ
 Index: sc/source/ui/vba/testvba/TestDocuments/Window.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/Window.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/Window.xls
-Binary files /dev/null and /tmp/cvs.laWx0 differ
+Binary files /dev/null and /tmp/cvss5aWwf differ
 Index: sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/bytearraystring.xls
-Binary files /dev/null and /tmp/cvs_laWx0 differ
+Binary files /dev/null and /tmp/cvst5aWwf differ
 Index: sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/dateserial.xls
-Binary files /dev/null and /tmp/cvsamaWx0 differ
+Binary files /dev/null and /tmp/cvsu5aWwf differ
 Index: sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/datevalue.xls
-Binary files /dev/null and /tmp/cvsbmaWx0 differ
+Binary files /dev/null and /tmp/cvsv5aWwf differ
 Index: sc/source/ui/vba/testvba/TestDocuments/format.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/format.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/format.xls
-Binary files /dev/null and /tmp/cvscmaWx0 differ
+Binary files /dev/null and /tmp/cvsw5aWwf differ
 Index: sc/source/ui/vba/testvba/TestDocuments/partition.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/partition.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/partition.xls
-Binary files /dev/null and /tmp/cvsdmaWx0 differ
+Binary files /dev/null and /tmp/cvsx5aWwf differ
 Index: sc/source/ui/vba/testvba/TestDocuments/range-4.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/range-4.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/range-4.xls
-Binary files /dev/null and /tmp/cvsemaWx0 differ
+Binary files /dev/null and /tmp/cvsy5aWwf differ
 Index: sc/source/ui/vba/testvba/TestDocuments/replace.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/replace.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/replace.xls
-Binary files /dev/null and /tmp/cvsfmaWx0 differ
+Binary files /dev/null and /tmp/cvsz5aWwf differ
 Index: sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/stringplusdouble.xls
-Binary files /dev/null and /tmp/cvsgmaWx0 differ
+Binary files /dev/null and /tmp/cvsA5aWwf differ
 Index: sc/source/ui/vba/testvba/TestDocuments/window2.xls
 ===================================================================
 RCS file: sc/source/ui/vba/testvba/TestDocuments/window2.xls
 diff -N sc/source/ui/vba/testvba/TestDocuments/window2.xls
-Binary files /dev/null and /tmp/cvshmaWx0 differ
+Binary files /dev/null and /tmp/cvsB5aWwf 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]