ooo-build r11359 - in trunk: . patches/ooxml patches/src680

[pmladek svn gnome org]

Author: pmladek
Date: Tue Jan 22 15:09:43 2008
New Revision: 11359
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11359&view=rev

Log:
2008-01-22  Petr Mladek  <pmladek suse cz>

	* patches/src680/xmloff-field-patch.diff: add missing returns

	* patches/ooxml/buildfix-writerfilter-ooxml-deps.diff,
	  patches/src680/apply: fix build dependencies



Added:
   trunk/patches/ooxml/buildfix-writerfilter-ooxml-deps.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/xmloff-field-patch.diff

Added: trunk/patches/ooxml/buildfix-writerfilter-ooxml-deps.diff
==============================================================================
--- (empty file)
+++ trunk/patches/ooxml/buildfix-writerfilter-ooxml-deps.diff	Tue Jan 22 15:09:43 2008
@@ -0,0 +1,22 @@
+--- writerfilter/source/ooxml/makefile.mk.old	2007-12-05 15:32:51.000000000 +0100
++++ writerfilter/source/ooxml/makefile.mk	2008-01-22 14:54:49.000000000 +0100
+@@ -214,17 +214,12 @@ $(SLOFASTNAMESPACES): $(OOXMLFASTRESOURC
+ 
+ $(GENERATEDFILES): $(OOXMLRESOURCESTOOLSXSL)
+ 
++$(SLOFILES): $(OOXMLGENHEADERS)
++
+ $(SLO)/OOXMLfastresources.obj: $(OOXMLFASTRESOURCESCXX) $(OOXMLGENHEADERS)
+ 
+ $(SLO)/OOXMLvalues.obj: $(OOXMLVALUESCXX) $(OOXMLVALUESHXX)
+ 
+-$(SLO)$/OOXMLDocumentImpl.obj: $(OOXMLGENHEADERS)
+-$(SLO)$/OOXMLPropertySetImpl.obj: $(OOXMLGENHEADERS)
+-$(SLO)$/OOXMLStreamImpl.obj: $(OOXMLGENHEADERS)
+-$(SLO)$/OOXMLFastDocumentHandler.obj: $(OOXMLGENHEADERS)
+-$(SLO)$/OOXMLFastTokenHandler.obj: $(OOXMLGENHEADERS)
+-$(SLO)$/Handler.obj: $(OOXMLGENHEADERS)
+-
+ $(SLOFASTNAMESPACES): OOXMLFastHelper.hxx
+ 
+ .PHONY: genclean genmake genheaders

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Tue Jan 22 15:09:43 2008
@@ -1478,6 +1478,8 @@
 
 buildfix-x86-64-visibility-workaround-writerfilter.diff
 
+buildfix-writerfilter-ooxml-deps.diff
+
 writerfilter-source-dmapper-domainmapper_cxx.diff
 
 [ OOXSTLport5 ]

Modified: trunk/patches/src680/xmloff-field-patch.diff
==============================================================================
--- trunk/patches/src680/xmloff-field-patch.diff	(original)
+++ trunk/patches/src680/xmloff-field-patch.diff	Tue Jan 22 15:09:43 2008
@@ -594,7 +594,7 @@
 +	DBG_ASSERT(!aFieldStack.empty(), "stack is empty: not good! Do a pushFieldCtx before...");
 +	if (!aFieldStack.empty()) {
 +		return aFieldStack.top().first.first;
-+	} else  ::rtl::OUString();
++	} else  return ::rtl::OUString();
 +}
 +
 +::rtl::OUString XMLTextImportHelper::getCurrentFieldType()
@@ -602,7 +602,7 @@
 +	DBG_ASSERT(!aFieldStack.empty(), "stack is empty: not good! Do a pushFieldCtx before...");
 +	if (!aFieldStack.empty()) {
 +		return aFieldStack.top().first.second;
-+	} else  ::rtl::OUString();
++	} else  return ::rtl::OUString();
 +}
 +
 +bool XMLTextImportHelper::hasCurrentFieldCtx()