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

[Tor Lillqvist]

 patches/dev300/apply                             |   12 ++++++++++--
 patches/dev300/oox-import-chart-externalref.diff |   14 ++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

New commits:
commit 9bccb96c61d99b9bd8588aa618ca3e7e36df893e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 10:10:59 2009 +0300

    Bypass oox-import-table-autofilter.diff for now
    
    * patches/dev300/apply: Bypass oox-import-table-autofilter.diff as it
      doesn't apply to dev300-m54 with a trivial fix.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5773dfb..0262856 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1829,7 +1829,13 @@ buildfix-oox-depends-on-unotools.diff
 oox-fix-placeholder-layout.diff, n#485316, n#480223, rodo
 oox-fix-list-style-apply.diff, n#485417, rodo
 oox-import-chart-externalref.diff, n#480868, janneke
-oox-import-table-autofilter.diff, n#479381, janneke
+
+# FIXME: 2009-08-12: The patch to tablefragment.cxx doesn't apply and
+# it isn't trivial to make it apply. I am unsure whether the expected
+# semantics of the function being patched has changed.  Actual
+# understanding of the code needed.
+#oox-import-table-autofilter.diff, n#479381, janneke
+
 oox-import-conditional-formatting.diff, n#479396, i#100544, janneke
 oox-import-shape-textbox-hyperlink.diff, n#480854, janneke
 oox-fix-ole2.diff, n#485418, rodo
commit 5bdb0357979eeedbc57073b6dbdb798bafc14e9a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 10:06:39 2009 +0300

    Adapt oox-import-chart-externalref.diff for dev300-m54
    
    * patches/dev300/oox-import-chart-externalref.diff: Adapt for
      dev300-m54.

diff --git a/patches/dev300/oox-import-chart-externalref.diff b/patches/dev300/oox-import-chart-externalref.diff
index e249f55..285d316 100644
--- a/patches/dev300/oox-import-chart-externalref.diff
+++ b/patches/dev300/oox-import-chart-externalref.diff
@@ -1,18 +1,14 @@
-diff --git oox/inc/oox/xls/formulaparser.hxx oox/inc/oox/xls/formulaparser.hxx
-index fa3b86e..6bf27a2 100644
 --- oox/inc/oox/xls/formulaparser.hxx
 +++ oox/inc/oox/xls/formulaparser.hxx
 @@ -86,6 +86,8 @@ public:
-                             const ::rtl::OUString& rUrl,
-                             double fValue ) const;
+                             BiffInputStream& rStrm,
+                             const sal_uInt16* pnFmlaSize = 0 ) const;
  
 +    ::rtl::OUString     printFormulaTokens( ApiTokenSequence const& rTokens );
 +
  private:
      ::std::auto_ptr< FormulaParserImpl > mxImpl;
  };
-diff --git oox/source/xls/excelchartconverter.cxx oox/source/xls/excelchartconverter.cxx
-index cf9f986..a1ce829 100644
 --- oox/source/xls/excelchartconverter.cxx
 +++ oox/source/xls/excelchartconverter.cxx
 @@ -93,10 +93,8 @@ Reference< XDataSequence > ExcelChartConverter::createDataSequence(
@@ -21,20 +17,18 @@ index cf9f986..a1ce829 100644
  
 -            // create a range list from the token sequence
 -            ApiCellRangeList aRanges;
--            rParser.extractCellRangeList( aRanges, aContext.getTokens() );
+-            rParser.extractCellRangeList( aRanges, aContext.getTokens(), false );
 -            aRangeRep = rParser.generateApiRangeListString( aRanges );
 +            // create a range representation string from the token sequence.
 +            aRangeRep = rParser.printFormulaTokens( aContext.getTokens() );
          }
          else if( !rDataSeq.maData.empty() )
          {
-diff --git oox/source/xls/formulaparser.cxx oox/source/xls/formulaparser.cxx
-index 161802b..12d610b 100644
 --- oox/source/xls/formulaparser.cxx
 +++ oox/source/xls/formulaparser.cxx
 @@ -73,6 +73,8 @@ class FormulaParserImpl : public OpCodeProvider
  public:
-     explicit            FormulaParserImpl( const OpCodeProvider& rOpCodeProv );
+     explicit            FormulaParserImpl( const FormulaParser& rParent );
  
 +    virtual ::rtl::OUString printFormulaTokens( ApiTokenSequence const& rTokens );
 +
commit b5c32cb6a97f8431180c3977b9aa216d82d8aec2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 10:00:20 2009 +0300

    Bypass docx-import-fixes.diff for now
    
    * patches/dev300/apply: Comment out docx-import-fixes.diff with a
      FIXME note. Does not apply to dev300-m54. Upstream code for vml
      shapes has been much restructured.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 02d3153..5773dfb 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1820,7 +1820,9 @@ win32-installer-register-moox-types.diff
 
 writerfilter-module-writer.diff
 writerfilter-source-dmapper-domainmapper-debug.diff
-docx-import-fixes.diff
+# FIXME: 2009-08-12: Does not apply at all, upstream code has 
+# been restructured substantially
+# docx-import-fixes.diff
 
 buildfix-oox-depends-on-unotools.diff