ooo-build r15485 - in trunk: . patches/vba

[noelpwer svn gnome org]

Author: noelpwer
Date: Fri Mar  6 12:35:54 2009
New Revision: 15485
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15485&view=rev

Log:
2009-03-06  Noel Power<noel power novell com>

        * patches/vba/vba-word-support.diff: fix some code lost when during
        word support code reorganisation



Modified:
   trunk/ChangeLog
   trunk/patches/vba/vba-word-support.diff

Modified: trunk/patches/vba/vba-word-support.diff
==============================================================================
--- trunk/patches/vba/vba-word-support.diff	(original)
+++ trunk/patches/vba/vba-word-support.diff	Fri Mar  6 12:35:54 2009
@@ -2481,21 +2481,6 @@
  	$(UCR)$/msforms.db \
  	$(UCR)$/constants.db
  
-diff --git sc/inc/cellsuno.hxx sc/inc/cellsuno.hxx
-index 17b226d..da70b18 100644
---- sc/inc/cellsuno.hxx
-+++ sc/inc/cellsuno.hxx
-@@ -175,7 +175,9 @@ class SC_DLLPUBLIC ScCellRangesBase : public com::sun::star::beans::XPropertySet
- {
- 	friend class ScTabViewObj;		// fuer select()
- 	friend class ScTableSheetObj;	// fuer createCursorByRange()
-- 	friend class ooo::vba::ScVbaCellRangeAccess;
-+	friend class NumFormatHelper;	// VBA helper Class that helps manipulate format data
-+	friend class ScVbaRange;	//Main VBA helper class for Range
-+	friend class ScVbaFont;	//Main VBA helper class for Font
- 
- private:
- 	SfxItemPropertySet		aPropSet;
 diff --git sc/inc/docuno.hxx sc/inc/docuno.hxx
 index f036a23..58ebb35 100644
 --- sc/inc/docuno.hxx
@@ -2933,7 +2918,7 @@
 index 0000000..f2d1f5e
 --- /dev/null
 +++ sc/source/ui/vba/excelvbahelper.cxx
-@@ -0,0 +1,210 @@
+@@ -0,0 +1,218 @@
 +/*************************************************************************
 + *
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -2968,6 +2953,7 @@
 +#include "tabvwsh.hxx"
 +#include "transobj.hxx"
 +#include "scmod.hxx"
++#include "cellsuno.hxx"
 +#include <comphelper/processfactory.hxx>
 +
 +using namespace ::com::sun::star;
@@ -3141,6 +3127,13 @@
 +	return NULL;
 +}
 +
++SfxItemSet*
++ScVbaCellRangeAccess::GetDataSet( ScCellRangeObj* pRangeObj )
++{
++	SfxItemSet* pDataSet = pRangeObj ? pRangeObj->GetCurrentDataSet( true ) : NULL ;
++	return pDataSet;
++	
++}
 +} //excel
 +} //vba 
 +} //ooo 
@@ -3149,7 +3142,7 @@
 index 0000000..e9e321a
 --- /dev/null
 +++ sc/source/ui/vba/excelvbahelper.hxx
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,60 @@
 +/*************************************************************************
 + *
 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -3185,6 +3178,8 @@
 +#include<vbahelper/vbahelper.hxx>
 +#include <docsh.hxx>
 +
++class ScCellRangeObj;
++
 +namespace ooo 
 +{
 +	namespace vba 
@@ -3199,6 +3194,11 @@
 +		ScDocShell* getDocShell( css::uno::Reference< css::frame::XModel>& xModel ) ;
 +		ScTabViewShell* getCurrentBestViewShell();
 +		SfxViewFrame* getCurrentViewFrame();
++            class ScVbaCellRangeAccess
++            {
++            public:
++                static SfxItemSet* GetDataSet( ScCellRangeObj* pRangeObj );
++            };
 +};
 +};
 +};
@@ -7888,19 +7888,6 @@
  
  typedef InheritedHelperInterfaceImpl1< ov::msforms::XFillFormat > ScVbaFillFormat_BASE;
  
-diff --git sc/source/ui/vba/vbafont.cxx sc/source/ui/vba/vbafont.cxx
-index f1bfeaa..091c734 100644
---- sc/source/ui/vba/vbafont.cxx
-+++ sc/source/ui/vba/vbafont.cxx
-@@ -76,7 +76,7 @@ ScVbaFont::ScVbaFont( const uno::Reference< XHelperInterface >& xParent, const u
- SfxItemSet*  
- ScVbaFont::GetDataSet()
- {
--    SfxItemSet* pDataSet = ScVbaCellRangeAccess::GetDataSet( mpRangeObj );
-+    SfxItemSet* pDataSet = mpRangeObj ? mpRangeObj->GetCurrentDataSet( true ) : NULL ;
-     return pDataSet;
- }
- 
 diff --git sc/source/ui/vba/vbafont.hxx sc/source/ui/vba/vbafont.hxx
 index f73d729..efca63c 100644
 --- sc/source/ui/vba/vbafont.hxx
@@ -11738,25 +11725,6 @@
  // begin test includes
  #include <com/sun/star/sheet/FunctionArgument.hpp>
  // end test includes
-@@ -253,7 +252,8 @@ ScCellRangeObj*  ScVbaRange::getCellRangeObj() throw ( uno::RuntimeException )
- SfxItemSet*  ScVbaRange::getCurrentDataSet( ) throw ( uno::RuntimeException )
- {
- 	ScCellRangeObj* pUnoCellRange = getCellRangeObj();
--	SfxItemSet* pDataSet = ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
-+	SfxItemSet* pDataSet = 	pUnoCellRange ? pUnoCellRange->GetCurrentDataSet( true ) : NULL ;
-+
- 	if ( !pDataSet )
- 		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't access Itemset for range" ) ), uno::Reference< uno::XInterface >() );
- 	return pDataSet;	
-@@ -470,7 +470,7 @@ public:
- 		if ( pUnoCellRange )
- 		{
- 			
--			SfxItemSet* pDataSet = 	ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
-+			SfxItemSet* pDataSet = 	pUnoCellRange->GetCurrentDataSet( true );
- 			SfxItemState eState = pDataSet->GetItemState( ATTR_VALUE_FORMAT, TRUE, NULL);
- 			// one of the cells in the range is not like the other ;-)
- 			// so return a zero length format to indicate that
 @@ -1999,7 +1999,7 @@ bool cellInRange( const table::CellRangeAddress& rAddr, const sal_Int32& nCol, c
  
  void setCursor(  const SCCOL& nCol, const SCROW& nRow, bool bInSel = true )
@@ -31327,3 +31295,62 @@
  		StarBASIC* pBasic = pBasMgr->GetLib( aLibName );
  		if( pBasic )
  			bVBACompat = pBasic->isVBAEnabled();
+diff --git sc/inc/cellsuno.hxx sc/inc/cellsuno.hxx
+index ac4640c..abe836a 100644
+--- sc/inc/cellsuno.hxx
++++ sc/inc/cellsuno.hxx
+@@ -152,8 +152,10 @@ public:
+ namespace ooo
+ {
+     namespace vba {
++        namespace excel {
+ 	class ScVbaCellRangeAccess;  // Vba Helper class 
+     }
++    }
+ }
+ 
+ class SC_DLLPUBLIC ScCellRangesBase : public com::sun::star::beans::XPropertySet,
+@@ -175,7 +177,7 @@ class SC_DLLPUBLIC ScCellRangesBase : public com::sun::star::beans::XPropertySet
+ {
+ 	friend class ScTabViewObj;		// fuer select()
+ 	friend class ScTableSheetObj;	// fuer createCursorByRange()
+- 	friend class ooo::vba::ScVbaCellRangeAccess;
++ 	friend class ooo::vba::excel::ScVbaCellRangeAccess;
+ 
+ private:
+ 	SfxItemPropertySet		aPropSet;
+diff --git sc/source/ui/vba/vbafont.cxx sc/source/ui/vba/vbafont.cxx
+index f1bfeaa..41d09e9 100644
+--- sc/source/ui/vba/vbafont.cxx
++++ sc/source/ui/vba/vbafont.cxx
+@@ -76,7 +76,7 @@ ScVbaFont::ScVbaFont( const uno::Reference< XHelperInterface >& xParent, const u
+ SfxItemSet*  
+ ScVbaFont::GetDataSet()
+ {
+-    SfxItemSet* pDataSet = ScVbaCellRangeAccess::GetDataSet( mpRangeObj );
++    SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( mpRangeObj );
+     return pDataSet;
+ }
+ 
+diff --git sc/source/ui/vba/vbarange.cxx sc/source/ui/vba/vbarange.cxx
+index d04ea33..7a31267 100644
+--- sc/source/ui/vba/vbarange.cxx
++++ sc/source/ui/vba/vbarange.cxx
+@@ -252,7 +252,7 @@ ScCellRangeObj*  ScVbaRange::getCellRangeObj() throw ( uno::RuntimeException )
+ SfxItemSet*  ScVbaRange::getCurrentDataSet( ) throw ( uno::RuntimeException )
+ {
+ 	ScCellRangeObj* pUnoCellRange = getCellRangeObj();
+-	SfxItemSet* pDataSet = ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
++	SfxItemSet* pDataSet = excel::ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
+ 	if ( !pDataSet )
+ 		throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't access Itemset for range" ) ), uno::Reference< uno::XInterface >() );
+ 	return pDataSet;	
+@@ -469,7 +469,7 @@ public:
+ 		if ( pUnoCellRange )
+ 		{
+ 			
+-			SfxItemSet* pDataSet = 	ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
++			SfxItemSet* pDataSet = 	excel::ScVbaCellRangeAccess::GetDataSet( pUnoCellRange );
+ 			SfxItemState eState = pDataSet->GetItemState( ATTR_VALUE_FORMAT, TRUE, NULL);
+ 			// one of the cells in the range is not like the other ;-)
+ 			// so return a zero length format to indicate that