GNOME.org
 

ooo-build r13016 - trunk/patches/test/vba

Author: noelpwer
Date: Tue Jul  1 20:04:02 2008
New Revision: 13016
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13016&view=rev

Log:
some m19 specific changes, also a lost diff


Modified:
   trunk/patches/test/vba/ObjectModule.diff

Modified: trunk/patches/test/vba/ObjectModule.diff
==============================================================================
--- trunk/patches/test/vba/ObjectModule.diff	(original)
+++ trunk/patches/test/vba/ObjectModule.diff	Tue Jul  1 20:04:02 2008
@@ -1065,6 +1065,19 @@
  //============================================================================
  
  }   // namespace basic
+diff --git extensions/source/propctrlr/defaultforminspection.cxx extensions/source/propctrlr/defaultforminspection.cxx
+index a71b2d9..fb3269c 100644
+--- extensions/source/propctrlr/defaultforminspection.cxx
++++ extensions/source/propctrlr/defaultforminspection.cxx
+@@ -154,7 +154,7 @@ namespace pcr
+             { "com.sun.star.form.inspection.EventHandler", false },
+ 
+             // a handler which introduces virtual properties for binding controls to spreadsheet cells
+-            { "com.sun.star.form.inspection.CellBindingPropertyHandler", true },
++            { "com.sun.star.form.inspection.CellBindingPropertyHandler", false },
+ 
+             // properties related to binding to an XForms DOM node
+             { "com.sun.star.form.inspection.XMLFormsPropertyHandler", true },
 diff --git offapi/com/sun/star/document/XVbaEventsHelper.idl offapi/com/sun/star/document/XVbaEventsHelper.idl
 index 88a93e8..c02ed79 100644
 --- offapi/com/sun/star/document/XVbaEventsHelper.idl
@@ -1145,7 +1158,7 @@
  
  # ------------------------------------------------------------------
 diff --git sc/inc/addruno.hxx sc/inc/addruno.hxx
-index e6f2e32..5e44356 100644
+index bc9391a..fad1f03 100644
 --- sc/inc/addruno.hxx
 +++ sc/inc/addruno.hxx
 @@ -50,7 +50,7 @@ private:
@@ -1158,7 +1171,7 @@
  public:
  
 diff --git sc/inc/document.hxx sc/inc/document.hxx
-index 6188643..cf97b2e 100644
+index 8a648d3..c15f3ec 100644
 --- sc/inc/document.hxx
 +++ sc/inc/document.hxx
 @@ -34,6 +34,7 @@
@@ -1187,7 +1200,7 @@
  					GetServiceManager() const { return xServiceManager; }
  
 diff --git sc/inc/unonames.hxx sc/inc/unonames.hxx
-index 8d03d94..18ff99a 100644
+index 4193574..a1350aa 100644
 --- sc/inc/unonames.hxx
 +++ sc/inc/unonames.hxx
 @@ -590,6 +590,7 @@
@@ -1265,7 +1278,7 @@
  
  
 diff --git sc/source/filter/excel/excimp8.cxx sc/source/filter/excel/excimp8.cxx
-index 59a0423..ad46dc3 100644
+index 49652a2..698d617 100644
 --- sc/source/filter/excel/excimp8.cxx
 +++ sc/source/filter/excel/excimp8.cxx
 @@ -105,6 +105,7 @@
@@ -1287,10 +1300,10 @@
  
  ImportExcel8::ImportExcel8( XclImpRootData& rImpData, SvStream& rStrm ) :
      ImportExcel( rImpData, rStrm ), mnTab(0)
-@@ -291,6 +292,44 @@ void ImportExcel8::ReadBasic( void )
-             SvxImportMSVBasic aBasicImport( *pShell, *xRootStrg, bLoadCode, bLoadStrg );
+@@ -292,6 +293,44 @@ void ImportExcel8::ReadBasic( void )
  			bool bAsComment = !bLoadExecutable || !lcl_hasVBAEnabled();
              aBasicImport.Import( EXC_STORAGE_VBA_PROJECT, EXC_STORAGE_VBA, bAsComment );
+             GetObjectManager().SetOleNameOverrideInfo( aBasicImport.ControlNameForObjectId() );
 +            // for each document module get the associated object for the codename and do a replacebyname
 +            ScDocument& aDoc = GetDoc();
 +            uno::Reference< script::XLibraryContainer > xLibContainer = GetDocShell()->GetBasicContainer();
@@ -1848,6 +1861,56 @@
  };
  
  #endif
+diff --git sc/source/ui/vba/vbarange.cxx sc/source/ui/vba/vbarange.cxx
+index 1736fa0..9d46d8c 100644
+--- sc/source/ui/vba/vbarange.cxx
++++ sc/source/ui/vba/vbarange.cxx
+@@ -214,24 +214,27 @@ uno::Reference< excel::XRange > lcl_make
+ 	uno::Sequence< table::CellRangeAddress  > sAddresses = xLocSheetCellRanges->getRangeAddresses();
+ 	ScRangeList aCellRanges;
+ 	sal_Int32 nLen = sAddresses.getLength();
+-	for ( sal_Int32 index = 0; index < nLen; ++index )
+-	{
+-		ScRange refRange;
+-		ScUnoConversion::FillScRange( refRange, sAddresses[ index ] );
+-		aCellRanges.Append( refRange );
+-	}
+-	// Single range
+-	if ( aCellRanges.First() == aCellRanges.Last() )
+-	{
+-		uno::Reference< table::XCellRange > xTmpRange( new ScCellRangeObj( pDoc, *aCellRanges.First() ) );
+-		// #FIXME need proper (WorkSheet) parent
+-		xRange = new ScVbaRange( xParent, xContext, xTmpRange );
+-	}
+-	else
+-	{
+-		uno::Reference< sheet::XSheetCellRangeContainer > xRanges( new ScCellRangesObj( pDoc, aCellRanges ) );
+-		// #FIXME need proper (WorkSheet) parent
+-		xRange = new ScVbaRange( xParent, xContext, xRanges );
++	if ( nLen )
++       	{ 
++		for ( sal_Int32 index = 0; index < nLen; ++index )
++		{
++			ScRange refRange;
++			ScUnoConversion::FillScRange( refRange, sAddresses[ index ] );
++			aCellRanges.Append( refRange );
++		}
++		// Single range
++		if ( aCellRanges.First() == aCellRanges.Last() )
++		{
++			uno::Reference< table::XCellRange > xTmpRange( new ScCellRangeObj( pDoc, *aCellRanges.First() ) );
++			// #FIXME need proper (WorkSheet) parent
++			xRange = new ScVbaRange( xParent, xContext, xTmpRange );
++		}
++		else
++		{
++			uno::Reference< sheet::XSheetCellRangeContainer > xRanges( new ScCellRangesObj( pDoc, aCellRanges ) );
++			// #FIXME need proper (WorkSheet) parent
++			xRange = new ScVbaRange( xParent, xContext, xRanges );
++		}
+ 	}
+ 	return xRange;
+ }
 diff --git scripting/source/dlgprov/dlgevtatt.cxx scripting/source/dlgprov/dlgevtatt.cxx
 index 902488e..325e825 100644
 --- scripting/source/dlgprov/dlgevtatt.cxx
@@ -2133,7 +2196,7 @@
      if (rLib->hasByName(sName))
          rLib->replaceByName(sName, aSourceAny);
 diff --git svx/source/msfilter/svxmsbas.cxx svx/source/msfilter/svxmsbas.cxx
-index c4ffd4b..d4ce87d 100644
+index 7bb049d..053da47 100644
 --- svx/source/msfilter/svxmsbas.cxx
 +++ svx/source/msfilter/svxmsbas.cxx
 @@ -54,6 +54,7 @@ using namespace com::sun::star::awt;
@@ -2144,7 +2207,7 @@
  using namespace com::sun::star::container;
  using namespace com::sun::star::script;
  using namespace com::sun::star::uno;
-@@ -250,12 +251,13 @@ BOOL SvxImportMSVBasic::ImportCode_Impl(
+@@ -267,12 +268,13 @@ BOOL SvxImportMSVBasic::ImportCode_Impl(
              Any aLibAny = xLibContainer->getByName( aLibName );
  		    aLibAny >>= xLib;
          }
@@ -2160,7 +2223,7 @@
                  Reference< XMultiServiceFactory> xSF(rDocSh.GetModel(), UNO_QUERY);
                  if ( xSF.is() )
                  {
-@@ -403,20 +405,24 @@ BOOL SvxImportMSVBasic::ImportCode_Impl(
+@@ -425,20 +427,24 @@ BOOL SvxImportMSVBasic::ImportCode_Impl(
  
  					Any aSourceAny;
                      OSL_TRACE("erm %d", mType );
@@ -2554,7 +2617,7 @@
              else if (xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlGroupBoxModel") ) ) )
              {
 diff --git xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
-index dba6d41..b7e9b8e 100644
+index dba6d41..ee10a4f 100644
 --- xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
 +++ xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
 @@ -34,6 +34,12 @@
@@ -2640,7 +2703,7 @@
 +		{
 +			sLinkedCell = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
 +			// we should probably limit this to vba mode also ( leave for now )
-+			if ( sLinkedCell.getLength() && _pImport->getDocOwner().is() )
++			if ( _pImport->getDocOwner().is() )
 +				sService = OUSTR("com.sun.star.form.component.RadioButton");
 +		}
 +		catch( Exception& /*e*/ )
@@ -2675,7 +2738,7 @@
 +		{
 +			sLinkedCell = xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
 +			// we should probably limit this to vba mode also ( leave for now )
-+			if ( sLinkedCell.getLength() && _pImport->getDocOwner().is() )
++			if ( _pImport->getDocOwner().is() )
 +				sService = OUSTR("com.sun.star.form.component.RadioButton");
 +		}
 +		catch( Exception& /*e*/ )
@@ -2709,7 +2772,7 @@
 +            sLinkedCell = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "linked-cell" ) );
 +            sCellRange = _xAttributes->getValueByUidName( _pImport->XMLNS_DIALOGS_UID, OUSTR( "source-cell-range" ) );
 +            // we should probably limit this to vba mode also ( leave for now )
-+            if ( sLinkedCell.getLength() || sCellRange.getLength() && _pImport->getDocOwner().is() )
++            if ( _pImport->getDocOwner().is() )
 +                sListBoxService = OUSTR("com.sun.star.form.component.ListBox");
 +        }
 +        catch( Exception& /*e*/ )
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]