ooo-build r13936 - trunk/patches/dev300

From: noelpwer svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13936 - trunk/patches/dev300
Date: Thu, 18 Sep 2008 11:20:02 +0000 (UTC)
Author: noelpwer
Date: Thu Sep 18 11:20:02 2008
New Revision: 13936
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13936&view=rev

Log:
2008-09-17  Noel Power  <noel power novell com>

        * patches/dev300/apply: add forgotten patch for i#93214
        * patches/dev300/cws-npower11.diff: update with fix ComboBox  init
        * patches/vba/spinbutton-import-valuechange.diff: fix import for
        spinbutton change


Modified:
   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	Thu Sep 18 11:20:02 2008
@@ -967,11 +967,11 @@
 ===================================================================
 RCS file: /cvs/sc/sc/source/ui/vba/vbacombobox.cxx,v
 retrieving revision 1.4
-retrieving revision 1.3.42.5
-diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.5
+retrieving revision 1.3.42.6
+diff -u -p -u -p -b -w -B -r1.4 -r1.3.42.6
 --- sc/source/ui/vba/vbacombobox.cxx	11 Apr 2008 00:55:28 -0000	1.4
-+++ sc/source/ui/vba/vbacombobox.cxx	16 Sep 2008 17:55:19 -0000	1.3.42.5
-@@ -34,22 +34,25 @@ using namespace com::sun::star;
++++ sc/source/ui/vba/vbacombobox.cxx	17 Sep 2008 14:15:06 -0000	1.3.42.6
+@@ -34,22 +34,26 @@ using namespace com::sun::star;
  using namespace org::openoffice;
  
  
@@ -987,6 +987,7 @@
 -ScVbaComboBox::ScVbaComboBox( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< css::drawing::XControlShape >& xControlShape ) : ComboBoxImpl_BASE( xContext, xControlShape )
 +ScVbaComboBox::ScVbaComboBox( const uno::Reference< vba::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper, bool bDialogType ) : ComboBoxImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper ), mbDialogType( bDialogType )
  {
++    	mpListHelper.reset( new ListControlHelper( m_xProps ) );
  	// grab the default value property name
  	m_xProps->getPropertyValue( CONTROLSOURCEPROP ) >>= sSourceName;
  }
@@ -1004,7 +1005,7 @@
  uno::Any SAL_CALL 
  ScVbaComboBox::getValue() throw (uno::RuntimeException)
  {
-@@ -57,11 +60,48 @@ ScVbaComboBox::getValue() throw (uno::Ru
+@@ -57,11 +61,48 @@ ScVbaComboBox::getValue() throw (uno::Ru
  }
  
  void SAL_CALL 
@@ -1053,7 +1054,7 @@
  ::rtl::OUString SAL_CALL 
  ScVbaComboBox::getText() throw (uno::RuntimeException)
  {
-@@ -80,63 +120,55 @@ ScVbaComboBox::setText( const ::rtl::OUS
+@@ -80,63 +121,55 @@ ScVbaComboBox::setText( const ::rtl::OUS
  void SAL_CALL 
  ScVbaComboBox::AddItem( const uno::Any& pvargItem, const uno::Any& pvargIndex ) throw (uno::RuntimeException)
  {
@@ -11086,117 +11087,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/cvsyUa4nl differ
+Binary files /dev/null and /tmp/cvshla4mK 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/cvszUa4nl differ
+Binary files /dev/null and /tmp/cvsila4mK 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/cvsAUa4nl differ
+Binary files /dev/null and /tmp/cvsjla4mK 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/cvsBUa4nl differ
+Binary files /dev/null and /tmp/cvskla4mK 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/cvsCUa4nl differ
+Binary files /dev/null and /tmp/cvslla4mK 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/cvsDUa4nl differ
+Binary files /dev/null and /tmp/cvsmla4mK 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/cvsEUa4nl differ
+Binary files /dev/null and /tmp/cvsnla4mK 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/cvsFUa4nl differ
+Binary files /dev/null and /tmp/cvsola4mK 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/cvsGUa4nl differ
+Binary files /dev/null and /tmp/cvspla4mK 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/cvsHUa4nl differ
+Binary files /dev/null and /tmp/cvsqla4mK 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/cvsIUa4nl differ
+Binary files /dev/null and /tmp/cvsrla4mK 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/cvsJUa4nl differ
+Binary files /dev/null and /tmp/cvssla4mK 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/cvsKUa4nl differ
+Binary files /dev/null and /tmp/cvstla4mK 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/cvsLUa4nl differ
+Binary files /dev/null and /tmp/cvsula4mK 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/cvsMUa4nl differ
+Binary files /dev/null and /tmp/cvsvla4mK 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/cvsNUa4nl differ
+Binary files /dev/null and /tmp/cvswla4mK 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/cvsOUa4nl differ
+Binary files /dev/null and /tmp/cvsxla4mK 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/cvsPUa4nl differ
+Binary files /dev/null and /tmp/cvsyla4mK 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/cvsQUa4nl differ
+Binary files /dev/null and /tmp/cvszla4mK 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/cvsRUa4nl differ
+Binary files /dev/null and /tmp/cvsAla4mK 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/cvsSUa4nl differ
+Binary files /dev/null and /tmp/cvsBla4mK 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/cvsTUa4nl differ
+Binary files /dev/null and /tmp/cvsCla4mK 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/cvsUUa4nl differ
+Binary files /dev/null and /tmp/cvsDla4mK 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]