ooo-build r15247 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Thu Jan 29 19:51:38 2009
New Revision: 15247
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15247&view=rev

Log:
2009-01-29  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/sc-export-shape-hlink-bindings-m39.diff:
	* patches/dev300/sc-export-shape-hlink-bindings.diff:
	* patches/dev300/apply: fixed another build breakage for dev300-m40.
	The hunk was applied to the wrong section of the target file.



Added:
   trunk/patches/dev300/sc-export-shape-hlink-bindings-m39.diff
      - copied unchanged from r15242, /trunk/patches/dev300/sc-export-shape-hlink-bindings.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/sc-export-shape-hlink-bindings.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Jan 29 19:51:38 2009
@@ -1974,10 +1974,15 @@
 # export of macro bindings for shapes
 sc-export-shape-macro-bindings.diff, n#304739, noelpwer
 
-[ VBAObjects ]
+[ VBAObjects <= dev300-m39 ]
+# export of hlink bindings for shapes
+sc-export-shape-hlink-bindings-m39.diff, n#304739, noelpwer
+
+[ VBAObjects > dev300-m39 ]
 # export of hlink bindings for shapes
 sc-export-shape-hlink-bindings.diff, n#304739, noelpwer
 
+[ VBAObjects ]
 # attributes present in the vba streams can override the default shape name
 # used for the control in the binary format
 sc-vbaimport-override-controlname.diff, n#359933, noelpwer

Modified: trunk/patches/dev300/sc-export-shape-hlink-bindings.diff
==============================================================================
--- trunk/patches/dev300/sc-export-shape-hlink-bindings.diff	(original)
+++ trunk/patches/dev300/sc-export-shape-hlink-bindings.diff	Thu Jan 29 19:51:38 2009
@@ -42,19 +42,20 @@
  };
  
  class XclEscherEx : public EscherEx, protected XclExpRoot
+diff --git sc/source/filter/xcl97/xcl97esc.cxx sc/source/filter/xcl97/xcl97esc.cxx
 diff --git sc/source/filter/inc/xecontent.hxx sc/source/filter/inc/xecontent.hxx
-index f0b4302..8d14276 100644
+index 729d653..aeb6c13 100644
 --- sc/source/filter/inc/xecontent.hxx
 +++ sc/source/filter/inc/xecontent.hxx
-@@ -113,6 +113,7 @@ public:
-     /** Returns the cell representation text or 0, if not available. */
+@@ -116,6 +116,8 @@ public:
      inline const String* GetRepr() const { return mxRepr.get(); }
  
+     virtual void        SaveXml( XclExpXmlStream& rStrm );
++
 +    virtual void        WriteEmbeddedData( XclExpStream& rStrm );
  private:
      /** Builds file name from the passed file URL. Tries to convert to relative file name.
          @param rnLevel  (out-param) The parent directory level.
-diff --git sc/source/filter/xcl97/xcl97esc.cxx sc/source/filter/xcl97/xcl97esc.cxx
 index aaa0316..cf9da11 100644
 --- sc/source/filter/xcl97/xcl97esc.cxx
 +++ sc/source/filter/xcl97/xcl97esc.cxx