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

Kohei Yoshida kohei at kemper.freedesktop.org
Fri May 21 20:15:48 PDT 2010 

 patches/dev300/apply                                       |   38 ++++++-------
 patches/dev300/pptx-filter-as-a-separate-lib.diff          |    4 -
 patches/dev300/pptx-snapshot-at-ooxml03-creation.diff      |    2 
 patches/dev300/pptx-the-rest-from-git.diff                 |    2 
 patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff |    6 +-
 patches/lwp/cws-ooo11lotusfilter-lwp-filter.diff           |    4 -
 6 files changed, 28 insertions(+), 28 deletions(-)

New commits:
commit 80e5ca7cf637823a9527cb4f35d3b08775996461
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri May 21 23:14:56 2010 -0400

    escherex.hxx moved from svx to filter/msfilter & disabled SVG import.
    
    * patches/dev300/apply: disabled svg import patches.
    
    * patches/dev300/pptx-filter-as-a-separate-lib.diff:
    * patches/dev300/pptx-snapshot-at-ooxml03-creation.diff:
    * patches/dev300/pptx-the-rest-from-git.diff:
    * patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff:
      escherex.hxx header relocation.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ce96a2f..a28ed48 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2360,31 +2360,31 @@ xulrunner-1.9.1.diff, ccheney
 [ SVGImport ]
 # A bit less partial implementation of SVG import
 # Work in progress, but fairly usable already
-svg-import-filter.diff, thorsten
+# FIXME dev300-m77 svg-import-filter.diff, thorsten
 
 # like svg-import-filter.diff, but adds a graphic filter for SVG
-svg-import-filter-gfxfilter.diff, thorsten
+# FIXME dev300-m77 svg-import-filter-gfxfilter.diff, thorsten
 
 # fixes some nastiness with viewbox
-svg-import-viewbox-fix.diff, thorsten
+# FIXME dev300-m77 svg-import-viewbox-fix.diff, thorsten
 
 # improves parsing of paint fragments
-svg-import-painturi-fix.diff, thorsten
+# FIXME dev300-m77 svg-import-painturi-fix.diff, thorsten
 
 # much improved text import
-svg-import-textimport.diff, thorsten
+# FIXME dev300-m77 svg-import-textimport.diff, thorsten
 
 # fixing relative size calculation
-svg-import-convlength-fix.diff, cmc
+# FIXME dev300-m77 svg-import-convlength-fix.diff, cmc
 
 # fixing handling of opacity attribute
-svg-import-opacity-fix.diff, thorsten
+# FIXME dev300-m77 svg-import-opacity-fix.diff, thorsten
 
 # guard against empty gradient stops
-svg-import-empty-gradient-fix.diff, n#560255, thorsten
+# FIXME dev300-m77 svg-import-empty-gradient-fix.diff, n#560255, thorsten
 
 # eat exceptions before they reach unaware code
-svg-import-eh-fix.diff, cmc
+# FIXME dev300-m77 svg-import-eh-fix.diff, cmc
 
 [ NovellLikeOnlyWin32 ]
 novell-win32-msi-patchability.diff, tml
diff --git a/patches/dev300/pptx-filter-as-a-separate-lib.diff b/patches/dev300/pptx-filter-as-a-separate-lib.diff
index 009f354..69d776c 100644
--- a/patches/dev300/pptx-filter-as-a-separate-lib.diff
+++ b/patches/dev300/pptx-filter-as-a-separate-lib.diff
@@ -1237,7 +1237,7 @@ index 0000000..44afd27
 +
 +#ifndef _PptEscherEX_HXX
 +#define _PptEscherEX_HXX
-+#include <svx/escherex.hxx>
++#include <filter/msfilter/escherex.hxx>
 +
 +// ---------------------------------------------------------------------------------------------
 +// Werte fuer den ULONG im PPT_PST_TextHeaderAtom
@@ -1403,7 +1403,7 @@ index 0000000..c56c73a
 +#include "../ppt/pptanimations.hxx"
 +#endif
 +#include <pptexsoundcollection.hxx>
-+#include <svx/escherex.hxx>
++#include <filter/msfilter/escherex.hxx>
 +
 +#ifdef DBG_ANIM_LOG
 +#include <stdio.h>
diff --git a/patches/dev300/pptx-snapshot-at-ooxml03-creation.diff b/patches/dev300/pptx-snapshot-at-ooxml03-creation.diff
index 9c7390c..9994de6 100644
--- a/patches/dev300/pptx-snapshot-at-ooxml03-creation.diff
+++ b/patches/dev300/pptx-snapshot-at-ooxml03-creation.diff
@@ -4261,7 +4261,7 @@ index 0000000..5e5c81b
 +#include <cppuhelper/factory.hxx>
 +#include <sax/fshelper.hxx>
 +#include <rtl/ustrbuf.hxx>
-+#include <svx/escherex.hxx>
++#include <filter/msfilter/escherex.hxx>
 +#include <tools/poly.hxx>
 +
 +#include <com/sun/star/drawing/FillStyle.hpp>
diff --git a/patches/dev300/pptx-the-rest-from-git.diff b/patches/dev300/pptx-the-rest-from-git.diff
index 98789b1..7a13e64 100644
--- a/patches/dev300/pptx-the-rest-from-git.diff
+++ b/patches/dev300/pptx-the-rest-from-git.diff
@@ -250,7 +250,7 @@ index 5e5c81b..d5e1f32 100644
 --- sd/source/filter/pptx/pptx-epptooxml.cxx
 +++ sd/source/filter/pptx/pptx-epptooxml.cxx
 @@ -12,15 +12,32 @@
- #include <svx/escherex.hxx>
+ #include <filter/msfilter/escherex.hxx>
  #include <tools/poly.hxx>
  
 -#include <com/sun/star/drawing/FillStyle.hpp>
diff --git a/patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff b/patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff
index 00eac83..2c08e58 100644
--- a/patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff
+++ b/patches/dev300/xlsx-filter-as-a-separate-lib-xls-copy.diff
@@ -1836,7 +1836,7 @@ index 0000000..67a6e3f
 +#ifndef SC_XCL97ESC_HXX
 +#define SC_XCL97ESC_HXX
 +
-+#include <svx/escherex.hxx>
++#include <filter/msfilter/escherex.hxx>
 +#include <tools/table.hxx>
 +#include <tools/stack.hxx>
 +#include "xlescher.hxx"
@@ -19178,7 +19178,7 @@ index 0000000..5782a4a
 +#include <com/sun/star/chart2/TickmarkStyle.hpp>
 +
 +#include <vcl/outdev.hxx>
-+#include <svx/escherex.hxx>
++#include <filter/msfilter/escherex.hxx>
 +
 +#include "document.hxx"
 +#include "rangelst.hxx"
@@ -42658,7 +42658,7 @@ index 0000000..e601f28
 +#include <svx/xflgrit.hxx>
 +#include <svx/xbtmpit.hxx>
 +#include <svx/unomid.hxx>
-+#include <svx/escherex.hxx>
++#include <filter/msfilter/escherex.hxx>
 +
 +#include "global.hxx"
 +#include "xlconst.hxx"
commit 1f81e3853f4a2c85ed5af9ac610057b244446a5e
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri May 21 22:33:28 2010 -0400

    Temporarily disabled Lotus Word Pro filter.
    
    There was a very weird build error that I couldn't find a fix
    for.
    
    * patches/dev300/apply:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index e898258..ce96a2f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1498,16 +1498,16 @@ default-evo2-ab.diff, michael
 
 
 [ Lwp ]
-# Lotus Word Pro Import Filter
-lwp-filter-component.diff, i#11215, noelpwer
-# Integrate cws ooo11lotusfilter for WordPro filter
-cws-ooo11lotusfilter-lwp-filter-component.diff, Fong
-cws-ooo11lotusfilter-lwp-filter.diff, Fong
-cws-ooo11lotusfilter-lwp-xfilter.diff, Fong
-# avoid warning: control reaches end of non-void function
-warning-return-values-lotuswordpro.diff, pmladek
-# found by gcc-4.5; the empty operator= definitions seems to be evidently broken
-warning-return-values-lotuswordpro-2.diff, pmladek
+# FIXME dev300-m77 # Lotus Word Pro Import Filter
+# FIXME dev300-m77 lwp-filter-component.diff, i#11215, noelpwer
+# FIXME dev300-m77 # Integrate cws ooo11lotusfilter for WordPro filter
+# FIXME dev300-m77 cws-ooo11lotusfilter-lwp-filter-component.diff, Fong
+# FIXME dev300-m77 cws-ooo11lotusfilter-lwp-filter.diff, Fong
+# FIXME dev300-m77 cws-ooo11lotusfilter-lwp-xfilter.diff, Fong
+# FIXME dev300-m77 # avoid warning: control reaches end of non-void function
+# FIXME dev300-m77 warning-return-values-lotuswordpro.diff, pmladek
+# FIXME dev300-m77 # found by gcc-4.5; the empty operator= definitions seems to be evidently broken
+# FIXME dev300-m77 warning-return-values-lotuswordpro-2.diff, pmladek
 
 
 [ Win32Only ]
commit 68cb0eced4d8be385ad3838d98b81f417ebd9e88
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri May 21 22:06:44 2010 -0400

    More build fix.
    
    * patches/lwp/cws-ooo11lotusfilter-lwp-filter.diff:

diff --git a/patches/lwp/cws-ooo11lotusfilter-lwp-filter.diff b/patches/lwp/cws-ooo11lotusfilter-lwp-filter.diff
index e7073e6..477f2e3 100644
--- a/patches/lwp/cws-ooo11lotusfilter-lwp-filter.diff
+++ b/patches/lwp/cws-ooo11lotusfilter-lwp-filter.diff
@@ -4681,7 +4681,7 @@ index 0000000..e04e0a7
 +    SvMemoryStream aPicMemStream;
 +    aXOBitmap.Array2Bitmap();
 +    aXOBitmap.GetBitmap().Write(aPicMemStream);
-+    sal_uInt32 nSize = aPicMemStream.GetSize();
++    sal_uInt32 nSize = aPicMemStream.GetEndOfData();
 +    sal_uInt8* pImageBuff = new sal_uInt8 [nSize];
 +    memcpy(pImageBuff, aPicMemStream.GetData(), nSize);
 +
@@ -28518,7 +28518,7 @@ index 0000000..ec331cd
 +    if (pMemGrafStream)
 +    {
 +        // read image data
-+        sal_uInt32 nDataLen = pMemGrafStream->GetSize();
++        sal_uInt32 nDataLen = pMemGrafStream->GetEndOfData();
 +        pGrafData = new sal_uInt8 [nDataLen];
 +        pMemGrafStream->Read(pGrafData, nDataLen);
 +

More information about the ooo-build-commit mailing list