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

[kyoshida svn gnome org]

Author: kyoshida
Date: Thu Jan 29 05:51:08 2009
New Revision: 15235
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15235&view=rev

Log:
2009-01-29  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/cws-npower11.diff: fixed build breakage.  
	Unfortunately this patch needs more fixes, especially because 
	GetEnglishOpCode() has become non-static method.


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	Thu Jan 29 05:51:08 2009
@@ -20339,7 +20339,7 @@
  ScVbaName::getRefersToRange() throw (css::uno::RuntimeException)
  {
 -	css::uno::Reference< oo::excel::XRange > xRange;
-+    uno::Reference< ov::excel::XRange > xRange = ScVbaRange::getRangeObjectForName( mxContext, mxNamedRange->getName(), getDocShell( mxModel ), ScAddress::CONV_XL_R1C1 );
++    uno::Reference< ov::excel::XRange > xRange = ScVbaRange::getRangeObjectForName( mxContext, mxNamedRange->getName(), getDocShell( mxModel ), ::formula::FormulaGrammar::CONV_XL_R1C1 );
  	return xRange;
  }
  
@@ -21507,7 +21507,7 @@
 +#define ZOOM_IN 10
 +#define ZOOM_MAX 400
 +
-+bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, ScAddress::Convention aConv = ScAddress::CONV_XL_A1 ) throw ( uno::RuntimeException );
++bool getScRangeListForAddress( const rtl::OUString& sName, ScDocShell* pDocSh, ScRange& refRange, ScRangeList& aCellRanges, ::formula::FormulaGrammar::AddressConvention aConv = ::formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException );
 +
 +ScVbaPageSetup::ScVbaPageSetup(const uno::Reference< XHelperInterface >& xParent, 
 +				const uno::Reference< uno::XComponentContext >& xContext,
@@ -21536,7 +21536,7 @@
 +    sal_Int32 nCount = aSeq.getLength();
 +    if( nCount )
 +    {
-+        ScAddress::Details aDetails( ScAddress::CONV_XL_A1, 0, 0 );
++        ScAddress::Details aDetails( ::formula::FormulaGrammar::CONV_XL_A1, 0, 0 );
 +        USHORT nFlags = SCA_VALID;
 +        nFlags |= ( SCA_TAB_ABSOLUTE | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB2_ABSOLUTE | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE );
 +		ScRangeList aRangeList;
@@ -21547,7 +21547,7 @@
 +			aRangeList.Append( aRange );
 +		}
 +		ScDocument* pDoc = getDocShell( mxModel )->GetDocument();
-+		aRangeList.Format( aPrintArea, nFlags, pDoc, ScAddress::CONV_XL_A1, ','  );
++		aRangeList.Format( aPrintArea, nFlags, pDoc, ::formula::FormulaGrammar::CONV_XL_A1, ','  );
 +    }
 +    
 +    return aPrintArea;
@@ -24014,7 +24014,7 @@
  	bool isSingleCellRange(); 
 -	css::uno::Reference< oo::excel::XRange > intersect( const css::uno::Reference< oo::excel::XRange >& xRange ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
 -        static css::uno::Reference< oo::excel::XRange > getRangeObjectForName( const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString& sRangeName, ScDocShell* pDocSh, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1  ) throw ( css::uno::RuntimeException );
-+        static css::uno::Reference< ov::excel::XRange > getRangeObjectForName( const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString& sRangeName, ScDocShell* pDocSh, ScAddress::Convention eConv = ScAddress::CONV_XL_A1  ) throw ( css::uno::RuntimeException );
++        static css::uno::Reference< ov::excel::XRange > getRangeObjectForName( const css::uno::Reference< css::uno::XComponentContext >& xContext, const rtl::OUString& sRangeName, ScDocShell* pDocSh, ::formula::FormulaGrammar::AddressConvention eConv = ::formula::FormulaGrammar::CONV_XL_A1  ) throw ( css::uno::RuntimeException );
  
      // Attributes
  	virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException);