GNOME.org
 

ooo-build r14718 - in trunk: . patches/test

Author: kyoshida
Date: Wed Dec  3 18:37:04 2008
New Revision: 14718
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14718&view=rev

Log:
2008-12-03  Kohei Yoshida  <kyoshida novell com>

	* patches/test/calc-dp-custom-names-offapi.diff: split the offapi part 
	from the patch below.

	* patches/test/calc-dp-custom-names.diff: moved the offapi part to the
	patch above.


Added:
   trunk/patches/test/calc-dp-custom-names-offapi.diff
Modified:
   trunk/ChangeLog
   trunk/patches/test/calc-dp-custom-names.diff

Added: trunk/patches/test/calc-dp-custom-names-offapi.diff
==============================================================================
--- (empty file)
+++ trunk/patches/test/calc-dp-custom-names-offapi.diff	Wed Dec  3 18:37:04 2008
@@ -0,0 +1,22 @@
+diff --git offapi/com/sun/star/sheet/MemberResultFlags.idl offapi/com/sun/star/sheet/MemberResultFlags.idl
+index 788673c..943e9ac 100644
+--- offapi/com/sun/star/sheet/MemberResultFlags.idl
++++ offapi/com/sun/star/sheet/MemberResultFlags.idl
+@@ -59,6 +59,17 @@ published constants MemberResultFlags
+ 	 */
+ 	const long CONTINUE = 4;
+ 
++    //-------------------------------------------------------------------------
++
++    /** The element contains a grand total. 
++     */
++    const long GRANDTOTAL = 8;
++
++    //-------------------------------------------------------------------------
++
++    /** The element is a numeric value.
++     */
++    const long NUMERIC = 16;
+ };
+ 
+ //=============================================================================

Modified: trunk/patches/test/calc-dp-custom-names.diff
==============================================================================
--- trunk/patches/test/calc-dp-custom-names.diff	(original)
+++ trunk/patches/test/calc-dp-custom-names.diff	Wed Dec  3 18:37:04 2008
@@ -1,27 +1,5 @@
-diff --git offapi/com/sun/star/sheet/MemberResultFlags.idl offapi/com/sun/star/sheet/MemberResultFlags.idl
-index 788673c..943e9ac 100644
---- offapi/com/sun/star/sheet/MemberResultFlags.idl
-+++ offapi/com/sun/star/sheet/MemberResultFlags.idl
-@@ -59,6 +59,17 @@ published constants MemberResultFlags
- 	 */
- 	const long CONTINUE = 4;
- 
-+    //-------------------------------------------------------------------------
-+
-+    /** The element contains a grand total. 
-+     */
-+    const long GRANDTOTAL = 8;
-+
-+    //-------------------------------------------------------------------------
-+
-+    /** The element is a numeric value.
-+     */
-+    const long NUMERIC = 16;
- };
- 
- //=============================================================================
 diff --git sc/inc/dpobject.hxx sc/inc/dpobject.hxx
-index cef08cb..052205e 100644
+index b006185..58162b1 100644
 --- sc/inc/dpobject.hxx
 +++ sc/inc/dpobject.hxx
 @@ -38,6 +38,8 @@
@@ -52,7 +30,7 @@
      BOOL                IsDuplicated( long nDim );
      long                GetDimCount();
 diff --git sc/inc/dpsave.hxx sc/inc/dpsave.hxx
-index 8a42ead..c11f97c 100644
+index ca61f04..ebcca70 100644
 --- sc/inc/dpsave.hxx
 +++ sc/inc/dpsave.hxx
 @@ -34,9 +34,11 @@
@@ -295,10 +273,10 @@
      sal_Int32               Compare( const ScDPMember& rOther ) const;      // visible order
  
 diff --git sc/inc/unonames.hxx sc/inc/unonames.hxx
-index 18c858b..8e573bb 100644
+index 0dbbfe3..eb1a777 100644
 --- sc/inc/unonames.hxx
 +++ sc/inc/unonames.hxx
-@@ -557,6 +557,9 @@
+@@ -558,6 +558,9 @@
  #define SC_UNO_ROWFIELDCOUNT        "RowFieldCount"
  #define SC_UNO_COLUMNFIELDCOUNT     "ColumnFieldCount"
  #define SC_UNO_DATAFIELDCOUNT       "DataFieldCount"
@@ -309,7 +287,7 @@
  //  (preliminary:)
  #define SC_UNO_REFVALUE				"ReferenceValue"
 diff --git sc/source/core/data/dpobject.cxx sc/source/core/data/dpobject.cxx
-index 4f49665..17bf84c 100644
+index dc256de..c0ff01a 100644
 --- sc/source/core/data/dpobject.cxx
 +++ sc/source/core/data/dpobject.cxx
 @@ -83,6 +83,7 @@ using ::com::sun::star::uno::UNO_QUERY;
@@ -413,7 +391,7 @@
  
  String ScDPObject::GetDimName( long nDim, BOOL& rIsDataLayout )
 diff --git sc/source/core/data/dpoutput.cxx sc/source/core/data/dpoutput.cxx
-index 6683028..e7e3f71 100644
+index d9b1df3..888af7f 100644
 --- sc/source/core/data/dpoutput.cxx
 +++ sc/source/core/data/dpoutput.cxx
 @@ -81,6 +81,7 @@
@@ -556,7 +534,7 @@
  		rOrient = sheet::DataPilotFieldOrientation_ROW;
  		long nField = nCol - nTabStartCol;
 diff --git sc/source/core/data/dpsave.cxx sc/source/core/data/dpsave.cxx
-index dbcfe30..bde214a 100644
+index 621573f..9c69fb5 100644
 --- sc/source/core/data/dpsave.cxx
 +++ sc/source/core/data/dpsave.cxx
 @@ -60,6 +60,7 @@
@@ -900,7 +878,7 @@
  		catch(uno::Exception&)
  		{
 diff --git sc/source/core/data/dptabres.cxx sc/source/core/data/dptabres.cxx
-index c52139c..87d0698 100644
+index d8f6454..e53ecb9 100644
 --- sc/source/core/data/dptabres.cxx
 +++ sc/source/core/data/dptabres.cxx
 @@ -67,6 +67,7 @@ using ::std::vector;
@@ -1061,7 +1039,7 @@
  		}
  		else if ( pMember->IsVisible() )
 diff --git sc/source/core/data/dptabsrc.cxx sc/source/core/data/dptabsrc.cxx
-index 600eb7b..0f9add4 100644
+index 8cc8f03..fc5b220 100644
 --- sc/source/core/data/dptabsrc.cxx
 +++ sc/source/core/data/dptabsrc.cxx
 @@ -83,6 +83,7 @@ using ::com::sun::star::uno::Reference;
@@ -1421,10 +1399,10 @@
  	{
  		DBG_ERROR("unknown property");
 diff --git sc/source/filter/excel/read.cxx sc/source/filter/excel/read.cxx
-index a868e17..27f0446 100644
+index 326364b..5e747ca 100644
 --- sc/source/filter/excel/read.cxx
 +++ sc/source/filter/excel/read.cxx
-@@ -1187,6 +1187,9 @@ FltError ImportExcel8::Read( void )
+@@ -1196,6 +1196,9 @@ FltError ImportExcel8::Read( void )
              eLastErr = SCWARN_IMPORT_ROW_OVERFLOW;
          else if( rAddrConv.IsColTruncated() )
              eLastErr = SCWARN_IMPORT_COLUMN_OVERFLOW;
@@ -1435,10 +1413,10 @@
  
  	return eLastErr;
 diff --git sc/source/filter/excel/xepivot.cxx sc/source/filter/excel/xepivot.cxx
-index 2a4994a..824ea9b 100644
+index c7c1bf7..29390dd 100644
 --- sc/source/filter/excel/xepivot.cxx
 +++ sc/source/filter/excel/xepivot.cxx
-@@ -64,6 +64,7 @@ using ::com::sun::star::sheet::DataPilotFieldSortInfo;
+@@ -65,6 +65,7 @@ using ::com::sun::star::sheet::DataPilotFieldSortInfo;
  using ::com::sun::star::sheet::DataPilotFieldAutoShowInfo;
  using ::com::sun::star::sheet::DataPilotFieldLayoutInfo;
  using ::com::sun::star::sheet::DataPilotFieldReference;
@@ -1446,7 +1424,7 @@
  
  // ============================================================================
  // Pivot cache
-@@ -942,6 +943,11 @@ void XclExpPTItem::SetPropertiesFromMember( const ScDPSaveMember& rSaveMem )
+@@ -943,6 +944,11 @@ void XclExpPTItem::SetPropertiesFromMember( const ScDPSaveMember& rSaveMem )
  {
      ::set_flag( maItemInfo.mnFlags, EXC_SXVI_HIDDEN, !rSaveMem.GetIsVisible() );
      ::set_flag( maItemInfo.mnFlags, EXC_SXVI_HIDEDETAIL, !rSaveMem.GetShowDetails() );
@@ -1458,7 +1436,7 @@
  }
  
  void XclExpPTItem::WriteBody( XclExpStream& rStrm )
-@@ -1010,8 +1016,13 @@ void XclExpPTField::SetPropertiesFromDim( const ScDPSaveDimension& rSaveDim )
+@@ -1011,8 +1017,13 @@ void XclExpPTField::SetPropertiesFromDim( const ScDPSaveDimension& rSaveDim )
      ::set_flag( maFieldExtInfo.mnFlags, EXC_SXVDEX_SHOWALL, rSaveDim.GetShowEmpty() );
  
      // visible name
@@ -1474,7 +1452,7 @@
  
      // subtotals
      XclPTSubtotalVec aSubtotals;
-@@ -1078,7 +1089,11 @@ void XclExpPTField::SetDataPropertiesFromDim( const ScDPSaveDimension& rSaveDim
+@@ -1079,7 +1090,11 @@ void XclExpPTField::SetDataPropertiesFromDim( const ScDPSaveDimension& rSaveDim
      rDataInfo.SetApiAggFunc( eFunc );
  
      // visible name
@@ -1487,7 +1465,7 @@
  
      // result field reference
      if( const DataPilotFieldReference* pFieldRef = rSaveDim.GetReferenceValue() )
-@@ -1187,10 +1202,9 @@ XclExpPivotTable::XclExpPivotTable( const XclExpRoot& rRoot, const ScDPObject& r
+@@ -1188,10 +1203,9 @@ XclExpPivotTable::XclExpPivotTable( const XclExpRoot& rRoot, const ScDPObject& r
          // pivot table properties from DP object
          mnOutScTab = rOutScRange.aStart.Tab();
          maPTInfo.maTableName = rDPObj.GetName();
@@ -1499,7 +1477,7 @@
  
          if( const ScDPSaveData* pSaveData = rDPObj.GetSaveData() )
          {
-@@ -1271,8 +1285,10 @@ void XclExpPivotTable::Save( XclExpStream& rStrm )
+@@ -1272,8 +1286,10 @@ void XclExpPivotTable::Save( XclExpStream& rStrm )
          WriteSxli( rStrm, maPTInfo.mnDataCols, maPTInfo.mnColFields );
          // SXEX
          WriteSxex( rStrm );
@@ -1512,7 +1490,7 @@
      }
  }
  
-@@ -1306,6 +1322,15 @@ void XclExpPivotTable::SetPropertiesFromDP( const ScDPSaveData& rSaveData )
+@@ -1307,6 +1323,15 @@ void XclExpPivotTable::SetPropertiesFromDP( const ScDPSaveData& rSaveData )
      ::set_flag( maPTInfo.mnFlags, EXC_SXVIEW_COLGRAND, rSaveData.GetColumnGrand() );
      ::set_flag( maPTExtInfo.mnFlags, EXC_SXEX_DRILLDOWN, rSaveData.GetDrillDown() );
      mbFilterBtn = rSaveData.GetFilterButton();
@@ -1528,7 +1506,7 @@
  }
  
  void XclExpPivotTable::SetFieldPropertiesFromDim( const ScDPSaveDimension& rSaveDim )
-@@ -1413,17 +1438,21 @@ void XclExpPivotTable::Finalize()
+@@ -1414,17 +1439,21 @@ void XclExpPivotTable::Finalize()
      rnDataXclRow = rnXclRow1 + maPTInfo.mnColFields + 1;
      if( maDataFields.empty() )
          ++rnDataXclRow;
@@ -1554,7 +1532,7 @@
  }
  
  // records ----------------------------------------------------------------
-@@ -1499,14 +1528,68 @@ void XclExpPivotTable::WriteSxex( XclExpStream& rStrm ) const
+@@ -1500,14 +1529,68 @@ void XclExpPivotTable::WriteSxex( XclExpStream& rStrm ) const
      rStrm.EndRecord();
  }
  
@@ -1627,10 +1605,10 @@
      }
  }
 diff --git sc/source/filter/excel/xestring.cxx sc/source/filter/excel/xestring.cxx
-index a367647..6660f33 100644
+index 1e2e0bf..dac338a 100644
 --- sc/source/filter/excel/xestring.cxx
 +++ sc/source/filter/excel/xestring.cxx
-@@ -380,7 +380,8 @@ void XclExpString::WriteFormats( XclExpStream& rStrm, bool bWriteSize ) const
+@@ -484,7 +484,8 @@ void XclExpString::WritePhoneticSettings( XclExpStream& rStrm ) const
  
  void XclExpString::Write( XclExpStream& rStrm ) const
  {
@@ -1640,7 +1618,7 @@
      WriteBuffer( rStrm );
      if( IsWriteFormats() )      // only in BIFF8 included in string
          WriteFormats( rStrm );
-@@ -494,6 +495,7 @@ void XclExpString::Init( sal_Int32 nCurrLen, XclStrFlags nFlags, sal_uInt16 nMax
+@@ -605,6 +606,7 @@ void XclExpString::Init( sal_Int32 nCurrLen, XclStrFlags nFlags, sal_uInt16 nMax
      mbSmartFlags = bBiff8 && ::get_flag( nFlags, EXC_STR_SMARTFLAGS );
      mbSkipFormats = ::get_flag( nFlags, EXC_STR_SEPARATEFORMATS );
      mbWrapped = false;
@@ -1649,7 +1627,7 @@
      SetStrLen( nCurrLen );
  
 diff --git sc/source/filter/excel/xipivot.cxx sc/source/filter/excel/xipivot.cxx
-index 22379de..74b42b1 100644
+index f0d8c4c..cc449b9 100644
 --- sc/source/filter/excel/xipivot.cxx
 +++ sc/source/filter/excel/xipivot.cxx
 @@ -847,6 +847,11 @@ void XclImpPivotCache::ReadPivotCacheStream( XclImpStream& rStrm )
@@ -1858,7 +1836,7 @@
  
  // ============================================================================
 diff --git sc/source/filter/excel/xlpivot.cxx sc/source/filter/excel/xlpivot.cxx
-index c7aa590..002f290 100644
+index 7e00cf2..cecd910 100644
 --- sc/source/filter/excel/xlpivot.cxx
 +++ sc/source/filter/excel/xlpivot.cxx
 @@ -32,6 +32,7 @@
@@ -1869,7 +1847,7 @@
  #include "xistream.hxx"
  #include "xestream.hxx"
  #include "xestring.hxx"
-@@ -579,7 +580,9 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTFieldInfo& rInfo )
+@@ -581,7 +582,9 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTFieldInfo& rInfo )
  XclPTFieldExtInfo::XclPTFieldExtInfo() :
      mnFlags( EXC_SXVDEX_DEFAULTFLAGS ),
      mnSortField( EXC_SXVDEX_SORT_OWN ),
@@ -2044,10 +2022,10 @@
      ScfUInt16Vec        maRowFields;        /// Row field indexes.
      ScfUInt16Vec        maColFields;        /// Column field indexes.
 diff --git sc/source/filter/inc/xestring.hxx sc/source/filter/inc/xestring.hxx
-index d4ce93d..fba1f6b 100644
+index 9b9e7ed..0168b81 100644
 --- sc/source/filter/inc/xestring.hxx
 +++ sc/source/filter/inc/xestring.hxx
-@@ -285,6 +285,7 @@ private:
+@@ -336,6 +336,7 @@ private:
      bool                mbSmartFlags;   /// true = omit flags on empty string; false = always write flags.
      bool                mbSkipFormats;  /// true = skip formats on export; false = write complete formatted string.
      bool                mbWrapped;      /// true = text contains several paragraphs.
@@ -2104,7 +2082,7 @@
      typedef ::std::vector< XclImpPivotCacheRef >    XclImpPivotCacheVec;
      typedef ::std::vector< XclImpPivotTableRef >    XclImpPivotTableVec;
 diff --git sc/source/filter/inc/xlpivot.hxx sc/source/filter/inc/xlpivot.hxx
-index be40dc9..9f773fa 100644
+index 5b88882..8b5bd4e 100644
 --- sc/source/filter/inc/xlpivot.hxx
 +++ sc/source/filter/inc/xlpivot.hxx
 @@ -43,6 +43,8 @@
@@ -2116,7 +2094,7 @@
  class XclImpStream;
  class XclExpStream;
  
-@@ -669,6 +671,8 @@ struct XclPTFieldExtInfo
+@@ -671,6 +673,8 @@ struct XclPTFieldExtInfo
      sal_uInt32          mnFlags;        /// Several flags and number of items for AutoShow.
      sal_uInt16          mnSortField;    /// Index to data field sorting bases on.
      sal_uInt16          mnShowField;    /// Index to data field AutoShow bases on.
@@ -2125,7 +2103,7 @@
  
      explicit            XclPTFieldExtInfo();
  
-@@ -794,19 +798,20 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTExtInfo& rInfo );
+@@ -796,19 +800,20 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTExtInfo& rInfo );
  
  // Pivot table autoformat settings ==============================================
  
@@ -2152,7 +2130,7 @@
  // ============================================================================
  #endif
 diff --git sc/source/filter/inc/xlstring.hxx sc/source/filter/inc/xlstring.hxx
-index 626b11b..0a078a4 100644
+index 0b30049..89f8275 100644
 --- sc/source/filter/inc/xlstring.hxx
 +++ sc/source/filter/inc/xlstring.hxx
 @@ -43,6 +43,7 @@ const XclStrFlags EXC_STR_FORCEUNICODE      = 0x0001;   /// Always use UCS-2 cha
@@ -2164,7 +2142,7 @@
  // ----------------------------------------------------------------------------
  
 diff --git sc/source/ui/dbgui/pvfundlg.cxx sc/source/ui/dbgui/pvfundlg.cxx
-index b7a089f..10e67ce 100644
+index adc048c..24ae67c 100644
 --- sc/source/ui/dbgui/pvfundlg.cxx
 +++ sc/source/ui/dbgui/pvfundlg.cxx
 @@ -708,7 +708,9 @@ ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, USHOR
@@ -2290,7 +2268,7 @@
  			USHORT nWhichPivot = SC_MOD()->GetPool().GetWhich( SID_PIVOT_TABLE );
  			ScPivotItem aOutItem( nWhichPivot, &aSaveData, &aOutRange, bToNewTable );
 diff --git sc/source/ui/inc/pvfundlg.hxx sc/source/ui/inc/pvfundlg.hxx
-index 989051c..2d07d7f 100644
+index 804f162..1707cd6 100644
 --- sc/source/ui/inc/pvfundlg.hxx
 +++ sc/source/ui/inc/pvfundlg.hxx
 @@ -55,6 +55,8 @@
@@ -2326,7 +2304,7 @@
  
  // ============================================================================
 diff --git sc/source/ui/unoobj/dapiuno.cxx sc/source/ui/unoobj/dapiuno.cxx
-index 61715d8..5874bdd 100644
+index 8732865..7a72040 100644
 --- sc/source/ui/unoobj/dapiuno.cxx
 +++ sc/source/ui/unoobj/dapiuno.cxx
 @@ -1605,7 +1605,13 @@ rtl::OUString SAL_CALL ScDataPilotFieldObj::getName() throw(uno::RuntimeExceptio
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]