[ooo-build-commit] .: 3 commits - patches/dev300

[Katarina Machalkova]

 patches/dev300/apply                   |    1 +
 patches/dev300/ooxml-filters-calc.diff |    4 ++--
 patches/dev300/ooxml-filters.diff      |   15 ++++++++-------
 3 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit 2a9beffda15eb47b0c8a7f0c99efbfec401f6446
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Tue May 11 17:49:20 2010 +0200

    Added muthu's patch, implementing OOXML Calc UI hooks
    
    * patches/dev300/apply:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1c24f73..b061256 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3307,6 +3307,7 @@ xlsx-shared-xlsx-export-no-more-svstream-sotstorage.diff
 #xlsx-shared-xlsx-export-perf-rowbuffer.diff
 
 ooxml-filters.diff, cbosdo
+ooxml-filters-calc.diff, muthu
 
 # depends on pptx-autoplay-fix.diff
 ooxml-autoplay-fix.diff, tml
commit ae0e9fdd3d7d539715ba6aa65bc61b16c664daa8
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Tue May 11 17:45:52 2010 +0200

    Make getVersion() method public
    
    * patches/dev300/ooxml-filters.diff:

diff --git a/patches/dev300/ooxml-filters.diff b/patches/dev300/ooxml-filters.diff
index 7e86358..806e848 100644
--- a/patches/dev300/ooxml-filters.diff
+++ b/patches/dev300/ooxml-filters.diff
@@ -152,14 +152,15 @@ index d96c1ab..b896a9b 100644
  struct FilterBaseImpl;
  
  typedef ::cppu::WeakImplHelper5<
-@@ -282,6 +288,7 @@ protected:
-                         implGetInputStream( ::comphelper::MediaDescriptor& rMediaDesc ) const;
-     virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >
-                         implGetOutputStream( ::comphelper::MediaDescriptor& rMediaDesc ) const;
+@@ -104,6 +104,8 @@
+     /** Returns true, if filter is an export filter. */
+     bool                isExportFilter() const;
+
 +    OoxmlVersion getVersion( );
- 
- private:
-     void                setMediaDescriptor(
++
+     /** Derived classes implement import of the entire document. */
+     virtual bool        importDocument() = 0;
+
 diff --git oox/source/core/filterbase.cxx oox/source/core/filterbase.cxx
 index 4dc3451..d360bda 100644
 --- oox/source/core/filterbase.cxx
commit 286a1b59c74a4c6de94656e9a30f3a520e8458d8
Author: Katarina Machalkova <kmachalkova at suse.cz>
Date:   Tue May 11 17:44:18 2010 +0200

    Added meaningful FileFormatVersion entry
    
    XclExpXmlStream::getVersion() reads it
    
    * patches/dev300/ooxml-filters-calc.diff:

diff --git a/patches/dev300/ooxml-filters-calc.diff b/patches/dev300/ooxml-filters-calc.diff
index 8d74041..6fb1a4e 100644
--- a/patches/dev300/ooxml-filters-calc.diff
+++ b/patches/dev300/ooxml-filters-calc.diff
@@ -50,7 +50,7 @@
 +    <prop oor:name="UIComponent"/>
 +    <prop oor:name="FilterService"><value>com.sun.star.comp.oox.ExcelFilter</value></prop>
 +    <prop oor:name="UserData"><value>OOXML</value></prop>
-+    <prop oor:name="FileFormatVersion"/>
++    <prop oor:name="FileFormatVersion"><value>1</value></prop>
 +    <prop oor:name="Type"><value>Office Open XML Spreadsheet Template</value></prop>
 +    <prop oor:name="TemplateName"/>
 +    <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
@@ -72,7 +72,7 @@
 +    <prop oor:name="UIComponent"/>
 +    <prop oor:name="FilterService"><value>com.sun.star.comp.oox.ExcelFilter</value></prop>
 +    <prop oor:name="UserData"><value>OOXML</value></prop>
-+    <prop oor:name="FileFormatVersion"/>
++    <prop oor:name="FileFormatVersion"><value>1</value></prop>
 +    <prop oor:name="Type"><value>Office Open XML Spreadsheet</value></prop>
 +    <prop oor:name="TemplateName"/>
 +    <prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>