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

[Tor Lillqvist]

 patches/dev300/apply                          |    6 +++++-
 patches/dev300/chart-subtitle-xls-export.diff |   14 +++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 08c980fa7f128dd8f0f74dd9a80bdb006408c420
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 13:58:50 2009 +0300

    Bypass calc-sheet-tab-color-oox.diff for now
    
    * patches/dev300/apply: Bypass calc-sheet-tab-color-oox.diff for now.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 2b5100e..4af3904 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1900,7 +1900,11 @@ calc-grammar-xls-english-sc.diff, kohei
 calc-sheet-tab-color-officecfg.diff, i#5560, kohei/danielbw
 calc-sheet-tab-color-svtools.diff,   i#5560, kohei/danielbw
 calc-sheet-tab-color-sc.diff,        i#5560, kohei/danielbw
-calc-sheet-tab-color-oox.diff,       i#5560, kohei/danielbw
+
+# FIXME: 2009-08-12: Doesn't apply, and it's not that obvious how to
+# adapt it. --tml
+# calc-sheet-tab-color-oox.diff,     i#5560, kohei/danielbw
+
 calc-sheet-tab-color-filter.diff,    i#5560, kohei/danielbw
 
 # Make it easier to un-select tabs when multiple tabs are selected.
commit 29a5136f16f777de3448b7601fa6fd5e3cdf4ac7
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 13:36:02 2009 +0300

    Adapt chart-subtitle-xls-export.diff for dev300-m54
    
    * patches/dev300/chart-subtitle-xls-export.diff: Adapt for dev300-m54.

diff --git a/patches/dev300/chart-subtitle-xls-export.diff b/patches/dev300/chart-subtitle-xls-export.diff
index a765715..88f04bb 100644
--- a/patches/dev300/chart-subtitle-xls-export.diff
+++ b/patches/dev300/chart-subtitle-xls-export.diff
@@ -1,13 +1,13 @@
---- sc/source/filter/excel/xechart.cxx.old	2009-04-06 16:42:05.000000000 +0000
-+++ sc/source/filter/excel/xechart.cxx	2009-04-06 16:42:05.000000000 +0000
+--- sc/source/filter/excel/xechart.cxx
++++ sc/source/filter/excel/xechart.cxx
 @@ -36,6 +36,7 @@
  #include <com/sun/star/i18n/XBreakIterator.hpp>
  #include <com/sun/star/i18n/ScriptType.hpp>
  #include <com/sun/star/drawing/FillStyle.hpp>
 +#include <com/sun/star/chart/XChartDocument.hpp>
- #include <com/sun/star/chart2/XChartDocument.hpp>
- #include <com/sun/star/chart2/XDiagram.hpp>
- #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
+ #include <com/sun/star/chart/ChartAxisLabelPosition.hpp>
+ #include <com/sun/star/chart/ChartAxisPosition.hpp>
+ #include <com/sun/star/chart/DataLabelPlacement.hpp>
 @@ -876,6 +877,13 @@ void XclExpChSourceLink::ConvertNumFmt(
      }
  }
@@ -29,8 +29,8 @@
 -void XclExpChText::ConvertTitle( Reference< XTitle > xTitle, sal_uInt16 nTarget )
 +void XclExpChText::ConvertTitle( Reference< XTitle > xTitle, sal_uInt16 nTarget, const String* pSubTitle )
  {
-     mxSrcLink.reset();
-     mxObjLink.reset( new XclExpChObjectLink( nTarget, XclChDataPointPos( 0, 0 ) ) );
+     switch( nTarget )
+     {
 @@ -991,6 +999,14 @@ void XclExpChText::ConvertTitle( Referen
          // string sequence
          mxSrcLink.reset( new XclExpChSourceLink( GetChRoot(), EXC_CHSRCLINK_TITLE ) );