GNOME.org
 

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

Author: pmladek
Date: Tue Feb 24 14:46:05 2009
New Revision: 15407
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15407&view=rev

Log:
2009-02-24  Petr Mladek  <pmladek suse cz>

	* patches/dev300/calc-formula-asian-phonetic.diff:
	* patches/dev300/chart-skip-hidden-cells-sc.diff:
	* patches/dev300/chart-skip-hidden-cells-sc-m1.diff:
	* patches/vba/sc-hacky-handle-boolean.diff:
	* patches/vba/vbaevents-services-sources.diff:
	* patches/vba/vbaevents-services-sources-m1.diff:
	* patches/vba/vba-word-support.diff:
	* patches/vba/vba-word-support-m1.diff:
	* patches/vba/vba-workbook-worksheet-events.diff:
	* patches/dev300/apply: fix build with ooo310-m2



Added:
   trunk/patches/dev300/chart-skip-hidden-cells-sc-m1.diff   (props changed)
      - copied unchanged from r15404, /trunk/patches/dev300/chart-skip-hidden-cells-sc.diff
   trunk/patches/vba/vba-word-support-m1.diff   (props changed)
      - copied unchanged from r15404, /trunk/patches/vba/vba-word-support.diff
   trunk/patches/vba/vbaevents-services-sources-m1.diff   (props changed)
      - copied unchanged from r15404, /trunk/patches/vba/vbaevents-services-sources.diff
Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/patches/dev300/apply
   trunk/patches/dev300/calc-formula-asian-phonetic.diff
   trunk/patches/dev300/chart-skip-hidden-cells-sc.diff
   trunk/patches/vba/sc-hacky-handle-boolean.diff
   trunk/patches/vba/vba-word-support.diff
   trunk/patches/vba/vba-workbook-worksheet-events.diff
   trunk/patches/vba/vbaevents-services-sources.diff

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Tue Feb 24 14:46:05 2009
@@ -1,39 +1,50 @@
 last change 
 
-2008-12-03  Kohei Yoshida  <kyoshida novell com> 
+2008-12-04  Kohei Yoshida  <kyoshida novell com> 
 
-<------>* patches/dev300/apply:>
-<------>* patches/dev300/chart-axis-multi-chart-types-chart2.diff:
-<------>* patches/dev300/chart-axis-multi-chart-types-sc.diff: moved from th
-<------>test directory to enable them in build by default.  These patches.
-<------>slightly modify chart's behavior to match Excel's behavior, for case
-<------>where multiple chart types are mixed in a single chart..
-<------>(i#95934, n#437322)
+<------>* patches/dev300/calc-grammar-xls-english-offapi.diff:
+<------>* patches/dev300/calc-grammar-xls-english-sc.diff: support additiona
+<------>grammar type for English Excel formula syntax.
 
 
 ooo-build-3.1.0.1:
 
     + features:
-	+ support ooo310-m1 [Tor, 
+	+ support ooo310-m2 [Tor, Rene, Kohei, Petr, ...]
+
     + bug fixes:
 	+ more on skipping data in hidden cells when rendering charts
 	  (bnc#404190, i#81209) [Kohei]
+	+ more on multiline formula reference (i#35913) [William]
 	+ avoid internal Err:529 (bnc#440808) [Kohei]
 	+ another DataPilot and filtered ranges regression [Kohei]
 	+ documetn Calc localized separator in helpcontent [Kohei]
 	+ multiple chart types in a single chart (i#95934, bnc#437322) [Kohei]
+	+ another grammar type for English Excel formula syntax [Kohei]
+	+ custom names in data pilot (bnc#338014, i#22029) [Kohei]
+	+ formatting in part of a cell (i#96853) [Kohei]
 	+ XLS import crasher (bnc#447560, bnc#458985) [Noel]
 	+ "always save" on in Calc (bnc##450789) [Kohei]
+	+ text color and alignment in PPT import (bnc#443127) [Thorsten]
+	+ DirectX canvas when the device is lost (bnc#445628) [Thorsten]
 	+ shapes export into XLS (i#96858) [Noel]
+	+ pyuno for python-2.6 (bnc#448776) [Petr]
 	+ SMTP dialog fix [Rene]
     + VBA bits:
 	+ XLS import crasher (bnc#447560, bnc#458985) [Noel]
+	+ English Excel formula syntax parsing (bnc#422145) [Kohei]
+	+ spaces in resource names [Noel]
+	+ commandbar issues [Fong]
+    + l10n:
+	+ French translation fixes (bnc#448699, i#96775) [Kohei]
     + build bits:
 	+ missing inline specifier (i#96585) [Thorsten]
 	+ better packaging of Sun templates [KAMI]
 	+ fixes for ARM [Matthias]
 	+ MCS path [Jo]
-+ update OxygenOffice bits [KAMI]
+    + update OxygenOffice bits [KAMI]
+    + experimental:
+	+ split build [Petr]
 
 
 ooo-build-3.0.0.9:

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Feb 24 14:46:05 2009
@@ -887,8 +887,15 @@
 # skip data in hidden cells when rendering charts.
 chart-skip-hidden-cells-chart2.diff, n#404190, i#81209, n#427545, kohei
 chart-skip-hidden-cells-xmloff.diff, n#404190, i#81209, n#425617, kohei
+
+[ CalcFixes <= dev300-m42 <= ooo310-m1 ]
+chart-skip-hidden-cells-sc-m1.diff, n#404190, i#81209, n#425617, kohei
+
+[ CalcFixes > dev300-m42 > ooo310-m1 ]
 chart-skip-hidden-cells-sc.diff, n#404190, i#81209, n#425617, kohei
 
+[ CalcFixes ]
+
 # render charts with multiple chart types correctly for xls interop.
 chart-axis-multi-chart-types-chart2.diff, n#437322, i#95934, kohei
 chart-axis-multi-chart-types-sc.diff,     n#437322, i#95934, kohei
@@ -1724,13 +1731,13 @@
 # support to display spinbutton in userform
 vba-spinbutton-in-userform.diff, Fong
 
-vbaevents-services-sources.diff, i#68893
-
 [ VBAObjects <= dev300-m42 <= ooo310-m1 ]
+vbaevents-services-sources-m1.diff, i#68893
 # vba workbook/worksheet events
 vba-workbook-worksheet-events-m1.diff, Fong
 
 [ VBAObjects > dev300-m42 > ooo310-m1 ]
+vbaevents-services-sources.diff, i#68893
 # vba workbook/worksheet events
 vba-workbook-worksheet-events.diff, Fong
 
@@ -1824,7 +1831,11 @@
 # vba for word support
 vba-word-support-m0.diff
 
-[ VBAObjects > dev300-m41 > ooo310-m0 ]
+[ VBAObjects == dev300-m42 == ooo310-m1 ]
+# vba for word support
+vba-word-support-m1.diff
+
+[ VBAObjects > dev300-m42 > ooo310-m1 ]
 # vba for word support
 vba-word-support.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	Tue Feb 24 14:46:05 2009
@@ -1,3 +1,60 @@
+diff --git formula/inc/formula/compiler.hrc formula/inc/formula/compiler.hrc
+index 8c402c2..9aea242 100644
+--- formula/inc/formula/compiler.hrc
++++ formula/inc/formula/compiler.hrc
+@@ -193,7 +193,8 @@
+ #define SC_OPCODE_UNICODE           155
+ #define SC_OPCODE_UNICHAR           156
+ #define SC_OPCODE_GAMMA             157
+-#define SC_OPCODE_STOP_1_PAR        158
++#define SC_OPCODE_PHONETIC          158
++#define SC_OPCODE_STOP_1_PAR        159
+ 
+ /*** Functions with more than one parameters ***/
+ #define SC_OPCODE_START_2_PAR       201
+diff --git formula/inc/formula/opcode.hxx formula/inc/formula/opcode.hxx
+index 4b93aab..6171a59 100644
+--- formula/inc/formula/opcode.hxx
++++ formula/inc/formula/opcode.hxx
+@@ -186,6 +186,7 @@ enum OpCodeEnum
+         ocAsc               = SC_OPCODE_ASC,
+         ocUnicode           = SC_OPCODE_UNICODE,
+         ocUnichar           = SC_OPCODE_UNICHAR,
++        ocPhonetic          = SC_OPCODE_PHONETIC,
+ 	// Functions with more than one parameters
+ 		ocArcTan2			= SC_OPCODE_ARC_TAN_2,
+ 		ocCeil				= SC_OPCODE_CEIL,
+diff --git formula/source/core/resource/core_resource.src formula/source/core/resource/core_resource.src
+index b1b79a5..0aa767c 100644
+--- formula/source/core/resource/core_resource.src
++++ formula/source/core/resource/core_resource.src
+@@ -337,6 +337,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
+ 	String SC_OPCODE_HYPERLINK { Text = "HYPERLINK" ; };
+     String SC_OPCODE_INFO { Text = "INFO" ; };
+     String SC_OPCODE_BAHTTEXT { Text = "COM.MICROSOFT.BAHTTEXT" ; };
++    String SC_OPCODE_PHONETIC { Text = "PHONETIC" ; };
+     String SC_OPCODE_GET_PIVOT_DATA { Text = "GETPIVOTDATA" ; };
+ 	String SC_OPCODE_EUROCONVERT { Text = "EUROCONVERT" ; };
+ 	String SC_OPCODE_NUMBERVALUE { Text = "NUMBERVALUE" ; };
+@@ -661,6 +662,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
+ 	String SC_OPCODE_HYPERLINK { Text = "HYPERLINK" ; };
+     String SC_OPCODE_INFO { Text = "INFO" ; };
+     String SC_OPCODE_BAHTTEXT { Text = "BAHTTEXT" ; };
++    String SC_OPCODE_PHONETIC { Text = "PHONETIC" ; };
+     String SC_OPCODE_GET_PIVOT_DATA { Text = "GETPIVOTDATA" ; };
+ 	String SC_OPCODE_EUROCONVERT { Text = "EUROCONVERT" ; };
+ 	String SC_OPCODE_NUMBERVALUE { Text = "NUMBERVALUE" ; };
+@@ -1815,6 +1817,10 @@ Resource RID_STRLIST_FUNCTION_NAMES
+     {
+         Text [ en-US ] = "BAHTTEXT";
+     };
++    String SC_OPCODE_PHONETIC
++    {
++        Text [ en-US ] = "PHONETIC";
++    };
+     String SC_OPCODE_GET_PIVOT_DATA
+     {
+         Text [ en-US ] = "GETPIVOTDATA";
 diff --git sc/inc/cell.hxx sc/inc/cell.hxx
 index 5b95f8f..d240861 100644
 --- sc/inc/cell.hxx

Modified: trunk/patches/dev300/chart-skip-hidden-cells-sc.diff
==============================================================================
--- trunk/patches/dev300/chart-skip-hidden-cells-sc.diff	(original)
+++ trunk/patches/dev300/chart-skip-hidden-cells-sc.diff	Tue Feb 24 14:46:05 2009
@@ -473,7 +473,7 @@
      {
          m_pValueListener->EndListeningAll();
  
-@@ -1368,8 +1400,102 @@ void ScChart2DataSequence::RefChanged()
+@@ -1368,8 +1400,104 @@ void ScChart2DataSequence::RefChanged()
                  m_pDocument->StartListeningArea( *m_xRanges->GetObject(i), m_pValueListener );
          }
      }
@@ -552,7 +552,9 @@
 +                                rItem.mbIsValue = true;
 +                        }
 +                        break;
++#if DBG_UTIL
 +                        case CELLTYPE_DESTROYED:
++#endif
 +                        case CELLTYPE_EDIT:
 +                        case CELLTYPE_NONE:
 +                        case CELLTYPE_NOTE:

Modified: trunk/patches/vba/sc-hacky-handle-boolean.diff
==============================================================================
--- trunk/patches/vba/sc-hacky-handle-boolean.diff	(original)
+++ trunk/patches/vba/sc-hacky-handle-boolean.diff	Tue Feb 24 14:46:05 2009
@@ -20,20 +20,22 @@
 diff -u -p -r1.18 column3.cxx
 --- sc/source/core/data/column3.cxx	28 Sep 2005 11:29:59 -0000	1.18
 +++ sc/source/core/data/column3.cxx	9 Nov 2005 17:53:11 -0000
-@@ -781,6 +781,7 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE n
+@@ -781,8 +781,10 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE n
      bool bCloneValue    = (nFlags & IDF_VALUE) != 0;
      bool bCloneDateTime = (nFlags & IDF_DATETIME) != 0;
      bool bCloneString   = (nFlags & IDF_STRING) != 0;
 +    bool bCloneSpecialBoolean  = (nFlags & IDF_SPECIAL_BOOLEAN) != 0;
      bool bCloneFormula  = (nFlags & IDF_FORMULA) != 0;
      bool bCloneNote     = (nFlags & IDF_NOTE) != 0;
++    bool bForceFormula  = false;
  
-@@ -806,7 +807,19 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE n
+     ScBaseCell* pNew = 0;
+     ScBaseCell& rSource = *pItems[nIndex].pCell;
+@@ -806,7 +807,18 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE n
          break;
  
  		case CELLTYPE_FORMULA:
 -            if (bCloneFormula)
-+            bool bForceFormula = false;
 +            if ( bCloneSpecialBoolean )
 +            {
 +                ScFormulaCell& rForm = (ScFormulaCell&)rSource;

Modified: trunk/patches/vba/vba-word-support.diff
==============================================================================
--- trunk/patches/vba/vba-word-support.diff	(original)
+++ trunk/patches/vba/vba-word-support.diff	Tue Feb 24 14:46:05 2009
@@ -2517,12 +2517,12 @@
                      public com::sun::star::document::XDocumentEventCompatibleHelper,
  					public SvxFmMSFactory,	// derived from XMultiServiceFactory
                      public com::sun::star::lang::XServiceInfo
-@@ -300,8 +297,6 @@ public:
- 								throw(::com::sun::star::uno::RuntimeException);
- 	virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
- 								throw(::com::sun::star::uno::RuntimeException);
-- 	virtual rtl::OUString SAL_CALL getCodeNameForObject( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& aObj )
--								throw(::com::sun::star::uno::RuntimeException);
+@@ -317,8 +317,6 @@ public:
+     virtual void SAL_CALL removeChangesListener( const ::com::sun::star::uno::Reference<
+                                     ::com::sun::star::util::XChangesListener >& aListener )
+                                 throw (::com::sun::star::uno::RuntimeException);
+-    virtual rtl::OUString SAL_CALL getCodeNameForObject( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& aObj ) 
+-                                throw(::com::sun::star::uno::RuntimeException); 
                              // XVbaEventHelper
      virtual sal_Bool SAL_CALL processCompatibleEvent( sal_Int16 nEventId ) throw (::com::sun::star::uno::RuntimeException);
  };

Modified: trunk/patches/vba/vba-workbook-worksheet-events.diff
==============================================================================
--- trunk/patches/vba/vba-workbook-worksheet-events.diff	(original)
+++ trunk/patches/vba/vba-workbook-worksheet-events.diff	Tue Feb 24 14:46:05 2009
@@ -2164,16 +2164,17 @@
  					public SvxFmMSFactory,	// derived from XMultiServiceFactory
                      public com::sun::star::lang::XServiceInfo
  {
-@@ -303,6 +305,8 @@ public:
- 								throw(::com::sun::star::uno::RuntimeException);
-  	virtual rtl::OUString SAL_CALL getCodeNameForObject( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& aObj )
- 								throw(::com::sun::star::uno::RuntimeException);
+@@ -319,8 +316,10 @@ public:
+                                     ::com::sun::star::util::XChangesListener >& aListener )
+                                 throw (::com::sun::star::uno::RuntimeException);
+     virtual rtl::OUString SAL_CALL getCodeNameForObject( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& aObj ) 
+                                 throw(::com::sun::star::uno::RuntimeException); 
 +                            // XVbaEventHelper
 +    virtual sal_Bool SAL_CALL processCompatibleEvent( sal_Int16 nEventId ) throw (::com::sun::star::uno::RuntimeException);
  };
  
  
-
+ class ScDrawPagesObj : public cppu::WeakImplHelper2<
 --- /home/feng/work/ooo-build/build/dev300-m14/sc/source/ui/view/gridwin.cxx	2008-06-16 21:30:17.000000000 +0800
 +++ sc/source/ui/view/gridwin.cxx	2008-06-16 17:37:15.000000000 +0800
 @@ -150,7 +150,13 @@

Modified: trunk/patches/vba/vbaevents-services-sources.diff
==============================================================================
--- trunk/patches/vba/vbaevents-services-sources.diff	(original)
+++ trunk/patches/vba/vbaevents-services-sources.diff	Tue Feb 24 14:46:05 2009
@@ -573,15 +573,17 @@
  					public SvxFmMSFactory,	// derived from XMultiServiceFactory
                      public com::sun::star::lang::XServiceInfo
  {
-@@ -295,6 +298,8 @@ public:
- 								throw(::com::sun::star::uno::RuntimeException);
- 	virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
- 								throw(::com::sun::star::uno::RuntimeException);
-+ 	virtual rtl::OUString SAL_CALL getCodeNameForObject( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& aObj )
-+								throw(::com::sun::star::uno::RuntimeException);
+@@ -314,8 +314,10 @@ public:
+                                 throw (::com::sun::star::uno::RuntimeException);
+     virtual void SAL_CALL removeChangesListener( const ::com::sun::star::uno::Reference<
+                                     ::com::sun::star::util::XChangesListener >& aListener )
+                                 throw (::com::sun::star::uno::RuntimeException);
++    virtual rtl::OUString SAL_CALL getCodeNameForObject( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& aObj ) 
++                                throw(::com::sun::star::uno::RuntimeException); 
  };
  
  
+ class ScDrawPagesObj : public cppu::WeakImplHelper2<
 diff --git sc/inc/scextopt.hxx sc/inc/scextopt.hxx
 index d9e654e..64b2f5b 100644
 --- sc/inc/scextopt.hxx
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]