[ooo-build-commit] .: patches/dev300 patches/vba

[Petr Mladek]

 patches/dev300/apply                       |    3 +++
 patches/vba/cws-vbasupportdev300-fake.diff |   12 ++++++++++++
 2 files changed, 15 insertions(+)

New commits:
commit 492ee372a6f44b8a4d575a0d0f8010dcc065e0c8
Author: Petr Mladek <pmladek at walk.suse.cz>
Date:   Fri Jul 30 20:12:45 2010 +0200

    added some needed stuff from cws-vbasupportdev300.diff
    
    * patches/vba/cws-vbasupportdev300-fake.diff:
    * patches/dev300/apply: adds some stuff that is needed by other diffs
      and will later be provided by the real cws-vbasupportdev300.diff

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a79c05a..9978fbf 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1553,6 +1553,9 @@ SectionOwner => noelpwer
 #                     enable the right hunks in writer-doc-comparison.diff again
 # FIXME ooo330-m2 partly updated for m2 cws-vbasupportdev300.diff
 # FIXME ooo330-m2 old version (m83) of the diff cws-vbasupportdev300_m83.diff, noelpwer
+# FIXME ooo330-m2 the fake diff adds just stuff needed by other diffs; it must be
+#                 removed after the real cws-vbasupportdev300.diff is enabled
+cws-vbasupportdev300-fake.diff
 
 # fix vbasupport for field related changes ( note this code
 # is disabled in vbasupportdev300 upstream )
diff --git a/patches/vba/cws-vbasupportdev300-fake.diff b/patches/vba/cws-vbasupportdev300-fake.diff
new file mode 100644
index 0000000..c1d19a7
--- /dev/null
+++ b/patches/vba/cws-vbasupportdev300-fake.diff
@@ -0,0 +1,12 @@
+--- sc/source/filter/xcl97/xcl97esc.cxx.old	2010-07-30 16:25:42.000000000 +0200
++++ sc/source/filter/xcl97/xcl97esc.cxx	2010-07-30 19:54:00.000000000 +0200
+@@ -256,7 +256,8 @@ EscherExHostAppData* XclEscherEx::StartS
+         {
+             // #107540# ignore permanent note shapes
+             // #i12190# do not ignore callouts (do not filter by object type ID)
+-            pCurrXclObj = new XclObjAny( mrObjMgr );   // just a metafile
++            // this line will be solved better by cws-vbasupportdev300.diff
++            pCurrXclObj = new XclObjAny( mrObjMgr, rxShape );   // just a metafile
+         }
+     }
+     if ( pCurrXclObj )