[Libreoffice-commits] .: 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/framework-extra-job-config.diff         |    6 ------
 patches/dev300/xlsx-shared-oox-chart-export-part1.diff |    3 ++-
 2 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit f0c18a34321cc9ee59ffb007c2d68efcbdc74dd3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Oct 14 16:59:20 2010 +0300

    Make xlsx-shared-oox-chart-export-part1.diff apply again

diff --git a/patches/dev300/xlsx-shared-oox-chart-export-part1.diff b/patches/dev300/xlsx-shared-oox-chart-export-part1.diff
index ef1e3af..f07af61 100644
--- a/patches/dev300/xlsx-shared-oox-chart-export-part1.diff
+++ b/patches/dev300/xlsx-shared-oox-chart-export-part1.diff
@@ -3992,7 +3992,7 @@ index 9944ecf..33abc57 100644
  
      mpFS->startElementNS( XML_a, XML_t, FSEND );
      mpFS->writeEscaped( sText );
-@@ -1526,5 +1529,64 @@ sal_Unicode DrawingML::SubstituteBullet( sal_Unicode cBulletId, ::com::sun::star
+@@ -1526,6 +1529,65 @@ sal_Unicode DrawingML::SubstituteBullet( sal_Unicode cBulletId, ::com::sun::star
      return sNumStr.GetChar( 0 );
  }
  
@@ -4057,6 +4057,7 @@ index 9944ecf..33abc57 100644
 +
  }
  }
+ 
 diff --git oox/source/export/makefile.mk oox/source/export/makefile.mk
 index 08fa7a0..97891cf 100644
 --- oox/source/export/makefile.mk
commit 46897f267da0c82728b644bf7b26eea7223a9051
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Oct 14 16:59:00 2010 +0300

    Make framework-extra-job-config.diff apply again

diff --git a/patches/dev300/framework-extra-job-config.diff b/patches/dev300/framework-extra-job-config.diff
index 96ca965..81b5571 100644
--- a/patches/dev300/framework-extra-job-config.diff
+++ b/patches/dev300/framework-extra-job-config.diff
@@ -91,12 +91,6 @@ diff --git framework/source/jobs/jobdata.cxx framework/source/jobs/jobdata.cxx
 index 6d48c3c..c0d490e 100644
 --- framework/source/jobs/jobdata.cxx
 +++ framework/source/jobs/jobdata.cxx
-@@ -1,4 +1,4 @@
--    /*************************************************************************
-+/*************************************************************************
-  *
-  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-  * 
 @@ -61,6 +61,7 @@ namespace framework{
  
  const sal_Char* JobData::JOBCFG_ROOT              = "/org.openoffice.Office.Jobs/Jobs/"   ;