ooo-build r15251 - in trunk: . patches/dev300 patches/vba

[kyoshida svn gnome org]

Author: kyoshida
Date: Thu Jan 29 22:25:59 2009
New Revision: 15251
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15251&view=rev

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

	* patches/vba/vba-show-data-form-link-fix.diff: 
	* patches/dev300/apply: added to export 
	ScTabViewShell::GetDialogParent() symbol that the vba code calls.
	
	* patches/dev300/calc-change-track-xls-export-fix.diff: export 
	ScChangeTrack::Clone().

	Now sc finally builds!


Added:
   trunk/patches/vba/vba-show-data-form-link-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/calc-change-track-xls-export-fix.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Jan 29 22:25:59 2009
@@ -342,6 +342,8 @@
 [ CWSBackports > dev300-m38 ]
 #api changes
 cws-npower11.diff
+# GetDialogParent() symbol needs to be exported.
+vba-show-data-form-link-fix.diff, kohei
 
 [ CWSBackports < dev300-m40 ]
 # not for upstreaming: don't disable the entire visibility, just

Modified: trunk/patches/dev300/calc-change-track-xls-export-fix.diff
==============================================================================
--- trunk/patches/dev300/calc-change-track-xls-export-fix.diff	(original)
+++ trunk/patches/dev300/calc-change-track-xls-export-fix.diff	Thu Jan 29 22:25:59 2009
@@ -11,6 +11,15 @@
  			USHORT				GetLoadedFileFormatVersion() const
  									{ return nLoadedFileFormatVersion; }
  
+@@ -1423,7 +1423,7 @@ public:
+                                     { return bTime100thSeconds; }
+ 
+             void                AppendCloned( ScChangeAction* pAppend );
+-            ScChangeTrack*      Clone( ScDocument* pDocument ) const;
++            SC_DLLPUBLIC ScChangeTrack* Clone( ScDocument* pDocument ) const;
+             void                MergeActionState( ScChangeAction* pAct, const ScChangeAction* pOtherAct );
+ #if DEBUG_CHANGETRACK
+             String              ToString() const;
 diff --git sc/source/core/tool/chgtrack.cxx sc/source/core/tool/chgtrack.cxx
 index 86d81cc..830f397 100644
 --- sc/source/core/tool/chgtrack.cxx

Added: trunk/patches/vba/vba-show-data-form-link-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/vba/vba-show-data-form-link-fix.diff	Thu Jan 29 22:25:59 2009
@@ -0,0 +1,13 @@
+diff --git sc/source/ui/inc/tabvwsh.hxx sc/source/ui/inc/tabvwsh.hxx
+index 7ce1670..d8966e2 100644
+--- sc/source/ui/inc/tabvwsh.hxx
++++ sc/source/ui/inc/tabvwsh.hxx
+@@ -251,7 +251,7 @@ public:
+ 
+ 	virtual			~ScTabViewShell();
+ 
+-	Window*			GetDialogParent();
++	SC_DLLPUBLIC Window* GetDialogParent();
+ 
+     bool            IsRefInputMode() const;
+ 	void			ExecuteInputDirect();