ooo-build r15249 - in trunk: . patches/dev300 patches/vba

[kyoshida svn gnome org]

Author: kyoshida
Date: Thu Jan 29 20:50:19 2009
New Revision: 15249
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15249&view=rev

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

	* patches/dev300/apply:	
	* patches/vba/enhanced-form-userform-controls-m39.diff:
	* patches/vba/enhanced-form-userform-controls.diff: adjusted for the 
	address convention relocation.
	
	* patches/dev300/calc-formula-asian-phonetic.diff: 
	* patches/dev300/sc-datapilot-dynamic-range.diff: fixed build breakages.



Added:
   trunk/patches/vba/enhanced-form-userform-controls-m39.diff   (props changed)
      - copied unchanged from r15242, /trunk/patches/vba/enhanced-form-userform-controls.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/calc-formula-asian-phonetic.diff
   trunk/patches/dev300/sc-datapilot-dynamic-range.diff
   trunk/patches/vba/enhanced-form-userform-controls.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Jan 29 20:50:19 2009
@@ -2026,11 +2026,19 @@
 # import graphic for image control
 controls-with-images-import.diff, Fong
 
+[ VBAObjects <= dev300-m39 ]
+#use of form control models in userforms/dialogs, additionally
+#enables use of document embedded images in image control for
+#userforms/dialogs ( note: depends on controls-with-images-in-document.diff )
+enhanced-form-userform-controls-m39.diff, noelpwer
+
+[ VBAObjects > dev300-m39 ]
 #use of form control models in userforms/dialogs, additionally
 #enables use of document embedded images in image control for
 #userforms/dialogs ( note: depends on controls-with-images-in-document.diff )
 enhanced-form-userform-controls.diff, noelpwer
 
+[ VBAObjects ]
 # object module support... getting there
 ObjectModule.diff
 # userform ( depends on ObjectModule.diff )

Modified: trunk/patches/dev300/calc-formula-asian-phonetic.diff
==============================================================================
--- trunk/patches/dev300/calc-formula-asian-phonetic.diff	(original)
+++ trunk/patches/dev300/calc-formula-asian-phonetic.diff	Thu Jan 29 20:50:19 2009
@@ -1707,7 +1707,7 @@
 +    return sal_True;
 +}
 +
-+static sal_uInt16 lcl_GetKanaType ( const ::rtl::OUString* pText )
++static sal_uInt16 lcl_GetKanaType ( const ::boost::optional< ::rtl::OUString >& pText )
 +{
 +    sal_uInt16 aKanaType = 0;
 +

Modified: trunk/patches/dev300/sc-datapilot-dynamic-range.diff
==============================================================================
--- trunk/patches/dev300/sc-datapilot-dynamic-range.diff	(original)
+++ trunk/patches/dev300/sc-datapilot-dynamic-range.diff	Thu Jan 29 20:50:19 2009
@@ -182,7 +182,7 @@
 +
 +        aFtInArea		( this, ScResId( FT_INAREA) ),
 +        aEdInPos		( this, ScResId( ED_INAREA) ),
-+        aRbInPos		( this, ScResId( RB_INAREA ), &aEdInPos ),
++        aRbInPos		( this, ScResId( RB_INAREA ), &aEdInPos, this ),
 +
  		aLbOutPos		( this, ScResId( LB_OUTAREA ) ),
  		aFtOutArea		( this, ScResId( FT_OUTAREA ) ),

Modified: trunk/patches/vba/enhanced-form-userform-controls.diff
==============================================================================
--- trunk/patches/vba/enhanced-form-userform-controls.diff	(original)
+++ trunk/patches/vba/enhanced-form-userform-controls.diff	Thu Jan 29 20:50:19 2009
@@ -353,7 +353,7 @@
      sal_Bool                bIsRange;
  
 -    sal_Bool                ParseUIString( const String& rUIString );
-+    sal_Bool                ParseUIString( const String& rUIString, ScAddress::Convention eConv = ScAddress::CONV_OOO );
++    sal_Bool                ParseUIString( const String& rUIString, ::formula::FormulaGrammar::AddressConvention eConv = ::formula::FormulaGrammar::CONV_OOO );
  
  public:
  
@@ -378,7 +378,7 @@
  }
  
 -sal_Bool ScAddressConversionObj::ParseUIString( const String& rUIString )
-+sal_Bool ScAddressConversionObj::ParseUIString( const String& rUIString, ScAddress::Convention eConv )
++sal_Bool ScAddressConversionObj::ParseUIString( const String& rUIString, ::formula::FormulaGrammar::AddressConvention eConv )
  {
      if (!pDocShell)
          return sal_False;
@@ -423,9 +423,9 @@
 -    else if ( aNameStr.EqualsAscii( SC_UNONAME_PERSREPR ) )
 +    else if ( aNameStr.EqualsAscii( SC_UNONAME_PERSREPR ) || aNameStr.EqualsAscii( SC_UNONAME_XL_A1_REPR ) )
      {
-+        ScAddress::Convention aConv = ScAddress::CONV_OOO; 
++        ::formula::FormulaGrammar::AddressConvention aConv = ::formula::FormulaGrammar::CONV_OOO; 
 +        if ( aNameStr.EqualsAscii( SC_UNONAME_XL_A1_REPR ) )
-+            aConv = ScAddress::CONV_XL_A1; 
++            aConv = ::formula::FormulaGrammar::CONV_XL_A1; 
          //  parse the file format string
          rtl::OUString sRepresentation;
          if (aValue >>= sRepresentation)
@@ -445,9 +445,9 @@
 -    else if ( aNameStr.EqualsAscii( SC_UNONAME_PERSREPR ) )
 +    else if ( aNameStr.EqualsAscii( SC_UNONAME_PERSREPR ) || aNameStr.EqualsAscii( SC_UNONAME_XL_A1_REPR ) )
      {
-+        ScAddress::Convention aConv = ScAddress::CONV_OOO; 
++        ::formula::FormulaGrammar::AddressConvention aConv = ::formula::FormulaGrammar::CONV_OOO; 
 +        if ( aNameStr.EqualsAscii( SC_UNONAME_XL_A1_REPR ) )
-+            aConv = ScAddress::CONV_XL_A1; 
++            aConv = ::formula::FormulaGrammar::CONV_XL_A1; 
 +
          //  generate file format string - always include sheet
          String aFormatStr;
@@ -460,7 +460,7 @@
              String aSecond;
 -            aRange.aEnd.Format( aSecond, SCA_VALID | SCA_TAB_3D, pDoc );
 +            USHORT nFlags = SCA_VALID;
-+            if( aConv != ScAddress::CONV_XL_A1 )
++            if( aConv != ::formula::FormulaGrammar::CONV_XL_A1 )
 +		nFlags |= SCA_TAB_3D;
 +            aRange.aEnd.Format( aSecond, SCA_VALID | SCA_TAB_3D, pDoc, aConv );
              aFormatStr.Append( aSecond );