[ooo-build-commit] patches/dev300

Jan Nieuwenhuizen janneke at kemper.freedesktop.org
Thu Oct 22 11:57:47 PDT 2009


 patches/dev300/apply                              |    4 
 patches/dev300/xlsx-shared-import-and-export.diff |  233 ++++++++++------------
 2 files changed, 114 insertions(+), 123 deletions(-)

New commits:
commit b98ffeb621d672d4c1d7c2cd09789ef1e222dce9
Author: Jan Nieuwenhuizen <janneke at gnu.org>
Date:   Thu Oct 22 20:55:44 2009 +0200

    Update xlsx-shared-import-and-export to ooo320.
    
        * Modified     patches/dev300/apply
        * Modified     patches/dev300/xlsx-shared-import-and-export.diff

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 03dd1b6..5b39c37 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3137,9 +3137,7 @@ xlsx-snapshot.diff
 
 # Make the xlsx export and import work at the same time
 # (converts the xlsx export to a UNO filter)
-
-# FIXME: 2009-08-17: These don't apply either. Can't find file to patch etc. --tml
-# xlsx-shared-import-and-export.diff
+xlsx-shared-import-and-export.diff
 
 # xlsx-arabic-export-crash.diff, n#497419, janneke
 
diff --git a/patches/dev300/xlsx-shared-import-and-export.diff b/patches/dev300/xlsx-shared-import-and-export.diff
index a247ff6..ea0d86f 100644
--- a/patches/dev300/xlsx-shared-import-and-export.diff
+++ b/patches/dev300/xlsx-shared-import-and-export.diff
@@ -1,26 +1,38 @@
-# For the purpose of the 3.1 release, instead of sharing the binary and ooxml
-# export, we introduce a separate sc/source/filter/xlsx that creates libxlsx -
-# a filter for the XLSX files.  After the release, the changes will be
-# reverted so that the binary and ooxml are shared again.
-# The changes include:
-#   sc/source/filter/excel/* -> sc/source/filter/xlsx/xlsx-*
-#   sc/source/filter/inc/*.hxx -> sc/source/filter/xlsx/*.hxx
-#   scp2 introduction of libxlsx
+From 6fcd55e33610d652610fc454dca03a144d195fa5 Mon Sep 17 00:00:00 2001
+From: Jan Nieuwenhuizen <janneke at gnu.org>
+Date: Thu, 22 Oct 2009 16:37:41 +0200
+Subject: [PATCH] xlsx-shared-import-and-export for ooo320.
+
+---
+ oox/inc/oox/xls/excelfilter.hxx     |    2 +
+ oox/source/xls/excelfilter.cxx      |   28 ++++++
+ sc/inc/filter.hxx                   |    2 +-
+ sc/source/filter/excel/excdoc.cxx   |   12 +-
+ sc/source/filter/excel/excel.cxx    |   19 +----
+ sc/source/filter/excel/xestream.cxx |  180 ++++++++++++++++++++++++++++++-----
+ sc/source/filter/inc/excdoc.hxx     |    2 +-
+ sc/source/filter/inc/exp_op.hxx     |   15 ---
+ sc/source/filter/inc/xestream.hxx   |    8 +-
+ sc/source/ui/docshell/docsh.cxx     |    6 +-
+ sc/util/scfilt.map                  |    3 +
+ scp2/source/calc/file_calc.scp      |    2 +-
+ 12 files changed, 206 insertions(+), 73 deletions(-)
+
 diff --git oox/inc/oox/xls/excelfilter.hxx oox/inc/oox/xls/excelfilter.hxx
-index 4ed3418..f1e2d65 100644
+index 28059fe..c04a72c 100644
 --- oox/inc/oox/xls/excelfilter.hxx
 +++ oox/inc/oox/xls/excelfilter.hxx
-@@ -58,6 +58,8 @@ public:
- 	virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles();
+@@ -75,6 +75,8 @@ public:
+     virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles();
      virtual ::oox::drawingml::chart::ChartConverter& getChartConverter();
  
 +    virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw( ::com::sun::star::uno::RuntimeException );
 +
  private:
      virtual ::rtl::OUString implGetImplementationName() const;
- 
+ };
 diff --git oox/source/xls/excelfilter.cxx oox/source/xls/excelfilter.cxx
-index cb02ba3..fcf3d3f 100644
+index a5bfe5e..7154666 100644
 --- oox/source/xls/excelfilter.cxx
 +++ oox/source/xls/excelfilter.cxx
 @@ -43,7 +43,9 @@ using ::com::sun::star::uno::Any;
@@ -33,8 +45,8 @@ index cb02ba3..fcf3d3f 100644
  using ::com::sun::star::lang::XMultiServiceFactory;
  using ::com::sun::star::xml::sax::XFastDocumentHandler;
  using ::oox::core::BinaryFilterBase;
-@@ -143,6 +145,32 @@ const TableStyleListPtr ExcelFilter::getTableStyles()
-     return mpHelper->getChartConverter();
+@@ -172,6 +174,32 @@ const TableStyleListPtr ExcelFilter::getTableStyles()
+     return getWorkbookHelper().getChartConverter();
  }
  
 +sal_Bool SAL_CALL ExcelFilter::filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw( ::com::sun::star::uno::RuntimeException )
@@ -67,7 +79,7 @@ index cb02ba3..fcf3d3f 100644
  {
      return ExcelFilter_getImplementationName();
 diff --git sc/inc/filter.hxx sc/inc/filter.hxx
-index bc72301..275f787 100644
+index bcb15f1..92955e6 100644
 --- sc/inc/filter.hxx
 +++ sc/inc/filter.hxx
 @@ -72,7 +72,7 @@ enum EXCIMPFORMAT { EIF_AUTO, EIF_BIFF5, EIF_BIFF8, EIF_BIFF_LE4 };
@@ -80,9 +92,9 @@ index bc72301..275f787 100644
  
  // Optionen fuer DIF-Im-/Export (Kombination ueber '|')
 diff --git sc/source/filter/excel/excdoc.cxx sc/source/filter/excel/excdoc.cxx
-index ff03be7..0e213f6 100644
---- sc/source/filter/xlsx/xlsx-excdoc.cxx
-+++ sc/source/filter/xlsx/xlsx-excdoc.cxx
+index 516308d..4fc5e8d 100644
+--- sc/source/filter/excel/excdoc.cxx
++++ sc/source/filter/excel/excdoc.cxx
 @@ -769,19 +769,17 @@ void ExcDocument::Write( SvStream& rSvStrm )
  		pExpChangeTrack->Write();
  }
@@ -106,9 +118,9 @@ index ff03be7..0e213f6 100644
      rWorkbook->startElement( XML_workbook,
              XML_xmlns, "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
              FSNS(XML_xmlns, XML_r), "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
-@@ -800,7 +798,7 @@ void ExcDocument::WriteXml( SvStream& rStrm )
- 
-         GetOldRoot().pEscher->GetStrm().Seek(0);   // ready for take off
+@@ -825,7 +825,7 @@ void ExcDocument::WriteXml( SvStream& rStrm )
+                 // OOXTODO: XML_rupBuild
+                 FSEND );
  
 -        aHeader.WriteXml( aStrm );
 +        aHeader.WriteXml( rStrm );
@@ -131,15 +143,15 @@ index ff03be7..0e213f6 100644
      rWorkbook->endElement( XML_workbook );
      rWorkbook.reset();
  
--    aStrm.commit();
-+    rStrm.commit();
+-    aStrm.commitStorage();
++    rStrm.commitStorage();
  }
  
 diff --git sc/source/filter/excel/excel.cxx sc/source/filter/excel/excel.cxx
-index 1ae79fb..d19958d 100644
---- sc/source/filter/xlsx/xlsx-excel.cxx
-+++ sc/source/filter/xlsx/xlsx-excel.cxx
-@@ -250,25 +250,10 @@ static FltError lcl_ExportExcelBiff( SfxMedium& rMedium, ScDocument *pDocument,
+index 8365ef0..5bfa13c 100644
+--- sc/source/filter/excel/excel.cxx
++++ sc/source/filter/excel/excel.cxx
+@@ -264,25 +264,10 @@ static FltError lcl_ExportExcelBiff( SfxMedium& rMedium, ScDocument *pDocument,
      return eRet;
  }
  
@@ -166,22 +178,22 @@ index 1ae79fb..d19958d 100644
          return eERR_NI;
  
      // check the passed Calc document
-@@ -283,8 +268,6 @@ FltError ScFormatFilterPluginImpl::ScExportExcel5( SfxMedium& rMedium, ScDocumen
+@@ -297,8 +282,6 @@ FltError ScFormatFilterPluginImpl::ScExportExcel5( SfxMedium& rMedium, ScDocumen
      FltError eRet = eERR_UNKN_BIFF;
      if( eFormat == ExpBiff5 || eFormat == ExpBiff8 )
          eRet = lcl_ExportExcelBiff( rMedium, pDocument, pMedStrm, eFormat == ExpBiff8, eNach );
 -    else if( eFormat == Exp2007Xml )
 -        eRet = lcl_ExportExcel2007Xml( rMedium, pDocument, pMedStrm, eNach );
  
- 	return eRet;
+     return eRet;
  }
 diff --git sc/source/filter/excel/expop2.cxx sc/source/filter/excel/expop2.cxx
 index bed1d2c..b4763c4 100644
---- sc/source/filter/xlsx/xlsx-expop2.cxx
-+++ sc/source/filter/xlsx/xlsx-expop2.cxx
+--- sc/source/filter/excel/expop2.cxx
++++ sc/source/filter/excel/expop2.cxx
 @@ -153,63 +153,3 @@ ExportBiff8::~ExportBiff8()
- 	delete pExcRoot->pEscher;
- 	pExcRoot->pEscher = NULL;
+     delete pExcRoot->pEscher;
+     pExcRoot->pEscher = NULL;
  }
 -
 -
@@ -228,7 +240,7 @@ index bed1d2c..b4763c4 100644
 -        SvxImportMSVBasic aBasicImport( *pDocShell, *xRootStrg, bWriteBasicCode, bWriteBasicStrg );
 -        ULONG nErr = aBasicImport.SaveOrDelMSVBAStorage( TRUE, EXC_STORAGE_VBA_PROJECT );
 -        if( nErr != ERRCODE_NONE )
--            pDocShell->SetError( nErr );
+-            pDocShell->SetError( nErr, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
 -    }
 -
 -    pExcDoc->ReadDoc();         // ScDoc -> ExcDoc
@@ -244,10 +256,10 @@ index bed1d2c..b4763c4 100644
 -
 -
 diff --git sc/source/filter/excel/xestream.cxx sc/source/filter/excel/xestream.cxx
-index 33cd93b..a147e13 100644
---- sc/source/filter/xlsx/xlsx-xestream.cxx
-+++ sc/source/filter/xlsx/xlsx-xestream.cxx
-@@ -49,6 +49,11 @@
+index b83df4c..b6f1084 100644
+--- sc/source/filter/excel/xestream.cxx
++++ sc/source/filter/excel/xestream.cxx
+@@ -48,18 +48,29 @@
  #include "rangelst.hxx"
  #include "compiler.hxx"
  
@@ -259,8 +271,8 @@ index 33cd93b..a147e13 100644
  #include <oox/core/tokens.hxx>
  #include <formula/grammar.hxx>
  #include <oox/export/drawingml.hxx>
-@@ -58,14 +63,20 @@
- using ::std::vector;
+ 
+ #define DEBUG_XL_ENCRYPTION 0
  
  using ::com::sun::star::beans::PropertyValue;
 +using ::com::sun::star::embed::XStorage;
@@ -273,14 +285,11 @@ index 33cd93b..a147e13 100644
 +using ::com::sun::star::registry::InvalidRegistryException;
 +using ::com::sun::star::registry::XRegistryKey;
 +using ::com::sun::star::uno::Exception;
++using ::com::sun::star::uno::XInterface;
  using ::com::sun::star::uno::Reference;
  using ::com::sun::star::uno::Sequence;
  using ::com::sun::star::uno::UNO_QUERY;
-+using ::com::sun::star::uno::XInterface;
- using ::oox::drawingml::DrawingML;
- using ::rtl::OString;
- using ::rtl::OUString;
-@@ -968,29 +979,10 @@ sax_fastparser::FSHelperPtr XclXmlUtils::WriteFontData( sax_fastparser::FSHelper
+@@ -816,29 +826,10 @@ const char* XclXmlUtils::ToPsz( bool b )
  
  // ============================================================================
  
@@ -313,7 +322,7 @@ index 33cd93b..a147e13 100644
  }
  
  XclExpXmlStream::~XclExpXmlStream()
-@@ -1108,14 +1100,59 @@ oox::drawingml::chart::ChartConverter& XclExpXmlStream::getChartConverter()
+@@ -1017,14 +1011,62 @@ oox::drawingml::chart::ChartConverter& XclExpXmlStream::getChartConverter()
      return * (oox::drawingml::chart::ChartConverter*) NULL;
  }
  
@@ -356,7 +365,7 @@ index 33cd93b..a147e13 100644
 +                                      pOptions->IsLoadExcelBasicStorage() )
 +                .SaveOrDelMSVBAStorage( true, EXC_STORAGE_VBA_PROJECT) )
 +            {
-+                pShell->SetError( nError );
++                pShell->SetError( nError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
 +            }
 +
 +    OUString const workbook = CREATE_OUSTRING( "xl/workbook.xml" );
@@ -365,6 +374,9 @@ index 33cd93b..a147e13 100644
 +                                    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml",
 +                                    "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" ) );
 +
++    DrawingML::ResetCounters();
++    XclObjList::ResetCounters();
++
 +    // destruct at the end of the block
 +    {
 +        ExcDocument aDocRoot( aRoot );
@@ -377,7 +389,7 @@ index 33cd93b..a147e13 100644
  }
  
  void XclExpXmlStream::Trace( const char* format, ...)
-@@ -1126,3 +1163,98 @@ void XclExpXmlStream::Trace( const char* format, ...)
+@@ -1035,3 +1074,98 @@ void XclExpXmlStream::Trace( const char* format, ...)
      va_end( ap );
  }
  
@@ -477,22 +489,22 @@ index 33cd93b..a147e13 100644
 +}
 +#endif
 diff --git sc/source/filter/inc/excdoc.hxx sc/source/filter/inc/excdoc.hxx
-index dd73a3e..26edc01 100644
---- sc/source/filter/xlsx/excdoc.hxx
-+++ sc/source/filter/xlsx/excdoc.hxx
+index 3330335..985d949 100644
+--- sc/source/filter/inc/excdoc.hxx
++++ sc/source/filter/inc/excdoc.hxx
 @@ -113,7 +113,7 @@ public:
  
- 	void				ReadDoc( void );
- 	void				Write( SvStream& rSvStrm );
--	void				WriteXml( SvStream& rSvStrm );
+     void				ReadDoc( void );
+     void				Write( SvStream& rSvStrm );
+-    void				WriteXml( SvStream& rSvStrm );
 +	void				WriteXml( XclExpXmlStream& );
  };
  
  
 diff --git sc/source/filter/inc/exp_op.hxx sc/source/filter/inc/exp_op.hxx
-index f696cc3..b0197c1 100644
---- sc/source/filter/xlsx/exp_op.hxx
-+++ sc/source/filter/xlsx/exp_op.hxx
+index 0e05e00..2af24b4 100644
+--- sc/source/filter/inc/exp_op.hxx
++++ sc/source/filter/inc/exp_op.hxx
 @@ -130,21 +130,6 @@ public:
  };
  
@@ -516,18 +528,18 @@ index f696cc3..b0197c1 100644
  
  
 diff --git sc/source/filter/inc/xestream.hxx sc/source/filter/inc/xestream.hxx
-index 172f054..fc986fb 100644
---- sc/source/filter/xlsx/xestream.hxx
-+++ sc/source/filter/xlsx/xestream.hxx
-@@ -269,6 +269,7 @@ private:
+index 20008f1..74c8344 100644
+--- sc/source/filter/inc/xestream.hxx
++++ sc/source/filter/inc/xestream.hxx
+@@ -268,6 +268,7 @@ private:
      (s.Len() && s.GetChar( 0 ) != 0 ? XclXmlUtils::ToOString( s ).getStr() : NULL)
  
  class ScAddress;
 +class ScDocShell;
  class ScDocument;
- class ScFormulaCell;
  class ScRange;
-@@ -317,11 +318,11 @@ public:
+ class ScRangeList;
+@@ -307,11 +308,11 @@ public:
  class XclExpXmlStream : public oox::core::XmlFilterBase
  {
  public:
@@ -541,14 +553,14 @@ index 172f054..fc986fb 100644
  
      sax_fastparser::FSHelperPtr& GetCurrentStream();
      void PushStream( sax_fastparser::FSHelperPtr aStream );
-@@ -354,12 +355,13 @@ public:
+@@ -344,12 +345,13 @@ public:
      void Trace( const char* format, ...);
  private:
      virtual ::rtl::OUString implGetImplementationName() const;
 +    ScDocShell *getDocShell();
  
-     typedef std::map< ::rtl::OUString, 
-         std::pair< ::rtl::OUString, 
+     typedef std::map< ::rtl::OUString,
+         std::pair< ::rtl::OUString,
              sax_fastparser::FSHelperPtr > >     XclExpXmlPathToStateMap;
  
 -    const XclExpRoot&                           mrRoot;         /// Filter root data.
@@ -557,10 +569,10 @@ index 172f054..fc986fb 100644
      XclExpXmlPathToStateMap                     maOpenedStreamMap;
  };
 diff --git sc/source/ui/docshell/docsh.cxx sc/source/ui/docshell/docsh.cxx
-index 9ed459f..04825b9 100644
+index dbe6013..2ec116f 100644
 --- sc/source/ui/docshell/docsh.cxx
 +++ sc/source/ui/docshell/docsh.cxx
-@@ -166,7 +166,6 @@ static const sal_Char __FAR_DATA pFilterExcel95[]	= "MS Excel 95";
+@@ -169,7 +169,6 @@ static const sal_Char __FAR_DATA pFilterExcel95[]	= "MS Excel 95";
  static const sal_Char __FAR_DATA pFilterEx95Temp[]	= "MS Excel 95 Vorlage/Template";
  static const sal_Char __FAR_DATA pFilterExcel97[]	= "MS Excel 97";
  static const sal_Char __FAR_DATA pFilterEx97Temp[]	= "MS Excel 97 Vorlage/Template";
@@ -568,17 +580,17 @@ index 9ed459f..04825b9 100644
  static const sal_Char __FAR_DATA pFilterDBase[]		= "dBase";
  static const sal_Char __FAR_DATA pFilterDif[]		= "DIF";
  static const sal_Char __FAR_DATA pFilterSylk[]		= "SYLK";
-@@ -1954,8 +1953,7 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
- 	}
- 	else if (aFltName.EqualsAscii(pFilterExcel5) || aFltName.EqualsAscii(pFilterExcel95) ||
- 			 aFltName.EqualsAscii(pFilterExcel97) || aFltName.EqualsAscii(pFilterEx5Temp) ||
--			 aFltName.EqualsAscii(pFilterEx95Temp) || aFltName.EqualsAscii(pFilterEx97Temp) ||
--			 aFltName.EqualsAscii(pFilterEx07Xml))
+@@ -2000,8 +1999,7 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
+     }
+     else if (aFltName.EqualsAscii(pFilterExcel5) || aFltName.EqualsAscii(pFilterExcel95) ||
+              aFltName.EqualsAscii(pFilterExcel97) || aFltName.EqualsAscii(pFilterEx5Temp) ||
+-             aFltName.EqualsAscii(pFilterEx95Temp) || aFltName.EqualsAscii(pFilterEx97Temp) ||
+-             aFltName.EqualsAscii(pFilterEx07Xml))
 +			 aFltName.EqualsAscii(pFilterEx95Temp) || aFltName.EqualsAscii(pFilterEx97Temp))
- 	{
- 		WaitObject aWait( GetActiveDialogParent() );
+     {
+         WaitObject aWait( GetActiveDialogParent() );
  
-@@ -2008,8 +2006,6 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
+@@ -2043,8 +2041,6 @@ BOOL __EXPORT ScDocShell::ConvertTo( SfxMedium &rMed )
              ExportFormatExcel eFormat = ExpBiff5;
              if( aFltName.EqualsAscii( pFilterExcel97 ) || aFltName.EqualsAscii( pFilterEx97Temp ) )
                  eFormat = ExpBiff8;
@@ -587,52 +599,33 @@ index 9ed459f..04825b9 100644
              FltError eError = ScFormatFilter::Get().ScExportExcel5( rMed, &aDocument, eFormat, RTL_TEXTENCODING_MS_1252 );
  
              if( eError && !GetError() )
-# disabled for the temporary libxlsx diff --git sc/util/scfilt.map sc/util/scfilt.map
-# disabled for the temporary libxlsx index 589736f..dc24c02 100644
-# disabled for the temporary libxlsx --- sc/util/scfilt.map
-# disabled for the temporary libxlsx +++ sc/util/scfilt.map
-# disabled for the temporary libxlsx @@ -1,6 +1,9 @@
-# disabled for the temporary libxlsx  SCFILT_1_0 {
-# disabled for the temporary libxlsx    global:
-# disabled for the temporary libxlsx      ScFilterCreate;
-# disabled for the temporary libxlsx +    component_getImplementationEnvironment;
-# disabled for the temporary libxlsx +    component_writeInfo;
-# disabled for the temporary libxlsx +    component_getFactory;
-# disabled for the temporary libxlsx    local:
-# disabled for the temporary libxlsx      *;
-# disabled for the temporary libxlsx  };
-# disabled for the temporary libxlsx diff --git scp2/source/calc/file_calc.scp scp2/source/calc/file_calc.scp
-# disabled for the temporary libxlsx index e49770f..4674990 100644
-# disabled for the temporary libxlsx --- scp2/source/calc/file_calc.scp
-# disabled for the temporary libxlsx +++ scp2/source/calc/file_calc.scp
-# disabled for the temporary libxlsx @@ -49,7 +49,7 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sc, sc)
-# disabled for the temporary libxlsx  
-# disabled for the temporary libxlsx  STD_LIB_FILE_PATCH( gid_File_Lib_Scui, scui)
-# disabled for the temporary libxlsx  
-# disabled for the temporary libxlsx -STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
-# disabled for the temporary libxlsx +STD_UNO_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
-# disabled for the temporary libxlsx  
-# disabled for the temporary libxlsx  STD_UNO_LIB_FILE( gid_File_Lib_Scd, scd)
-# disabled for the temporary libxlsx  
+diff --git sc/util/scfilt.map sc/util/scfilt.map
+index 589736f..dc24c02 100644
+--- sc/util/scfilt.map
++++ sc/util/scfilt.map
+@@ -1,6 +1,9 @@
+ SCFILT_1_0 {
+   global:
+     ScFilterCreate;
++    component_getImplementationEnvironment;
++    component_writeInfo;
++    component_getFactory;
+   local:
+     *;
+ };
+diff --git scp2/source/calc/file_calc.scp scp2/source/calc/file_calc.scp
+index 89096b8..27fa17d 100644
 --- scp2/source/calc/file_calc.scp
 +++ scp2/source/calc/file_calc.scp
-@@ -49,6 +49,8 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sc, sc)
+@@ -55,7 +55,7 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sc, sc)
+ 
  STD_LIB_FILE_PATCH( gid_File_Lib_Scui, scui)
  
- STD_LIB_FILE_PATCH( gid_File_Lib_Scfilt, scfilt)
-+
-+STD_UNO_LIB_FILE( gid_File_Lib_Xlsx, xlsx)
+-STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
++STD_UNO_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
  
  STD_UNO_LIB_FILE( gid_File_Lib_Scd, scd)
  
---- scp2/source/calc/module_calc.scp	2009-01-06 14:16:56.000000000 +0100
-+++ scp2/source/calc/module_calc.scp	2009-04-30 09:36:28.000000000 +0200
-@@ -45,7 +45,7 @@ Module gid_Module_Prg_Calc_Bin
-     Minimal = YES;
-     Default = YES;
-     Styles = (HIDDEN_ROOT);
--    Files = (gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
-+    Files = (gid_File_Lib_Calc,gid_File_Lib_Sc,gid_File_Lib_Scui,gid_File_Lib_Scfilt,gid_File_Lib_Xlsx,gid_File_Lib_Scd,gid_File_Extra_Urldesktop_Calc,gid_File_Extra_Urlnew_Calc,gid_File_Extra_Urlstart_Calc,gid_File_Extra_Urltasks_Calc,gid_File_Oo_Office_Filter_Calc_Pkg,gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml,
-     gid_File_Lib_Solver,gid_File_Lib_Lpsolve,
-     gid_File_Oo_Office_Ui_Calccommands_Xcs,gid_File_Oo_Office_Ui_Calccommands_Xcu,gid_File_Oo_Office_Ui_Calcwindowstate_Xcs,
-     gid_File_Registry_Spool_Oo_Common_Calc_Xcu,gid_File_Registry_Spool_Oo_Setup_Calc_Xcu, gid_File_Registry_Spool_Oo_Office_Embedding_Calc_Xcu,
+-- 
+1.6.3.3
+


More information about the ooo-build-commit mailing list