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

[strba svn gnome org]

Author: strba
Date: Mon Jun 23 13:51:07 2008
New Revision: 12939
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12939&view=rev

Log:
fix UnstableLibwpd section

Added:
   trunk/patches/dev300/config_office-testing.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/writerperfect-testing.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jun 23 13:51:07 2008
@@ -1,3 +1,4 @@
+
 #
 # The format of this file is:
 #
@@ -57,7 +58,7 @@
 SUSE-10.2 : NovellBase, BerkeleyDB43, EMFPlus
 SUSE-10.3 : NovellBase, BerkeleyDB43, EMFPlus
 SUSE-11.0 : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, CairoFonts
-SUSE      : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, CairoFonts
+SUSE      : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, CairoFonts, UnstableLibwpd
 SUSE-reduced:NovellBase,BerkeleyDB43, ReducedDefaults
 # Debian
 DebianBase : LinuxCommon, DebianBaseOnly, Lockdown, GCCSTL, BerkeleyDB43, Split, PostgreSQL
@@ -2198,12 +2199,6 @@
 cairo-canvas-cairo.diff
 
 
-[ UnstableLibwpd ]
-libwpd-testing.diff
-libwpg-testing.diff
-libwps-testing.diff
-writerperfect-testing.diff
-
 [ WWInProgress ]
 sw_layout_in_table_cell_fix.diff, n#367341, flr
 
@@ -2238,3 +2233,10 @@
 kde4-kde_headers.diff
 kde4-salnativewidgets-kde.diff
 
+[ UnstableLibwpd ]
+config_office-testing.diff
+libwpd-testing.diff
+libwpg-testing.diff
+libwps-testing.diff
+writerperfect-testing.diff
+

Added: trunk/patches/dev300/config_office-testing.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/config_office-testing.diff	Mon Jun 23 13:51:07 2008
@@ -0,0 +1,29 @@
+--- config_office/configure.in	2008-06-23 14:46:06.000000000 +0200
++++ config_office/configure.in	2008-06-23 14:47:00.000000000 +0200
+@@ -3534,7 +3534,7 @@
+         test "$with_system_libwpd" != "no"; then
+     AC_MSG_RESULT([external])
+     SYSTEM_LIBWPD=YES
+-    PKG_CHECK_MODULES( LIBWPD, libwpd-0.8 )
++    PKG_CHECK_MODULES( LIBWPD, libwpd-0.9 libwpd-stream-0.9 )
+ else
+     AC_MSG_RESULT([internal])
+     SYSTEM_LIBWPD=NO
+@@ -3552,7 +3552,7 @@
+         test "$with_system_libwps" != "no"; then
+     AC_MSG_RESULT([external])
+     SYSTEM_LIBWPS=YES
+-    PKG_CHECK_MODULES( LIBWPS, libwps-0.1 )
++    PKG_CHECK_MODULES( LIBWPS, libwps-0.2 )
+ else
+     AC_MSG_RESULT([internal])
+     SYSTEM_LIBWPS=NO
+@@ -3570,7 +3570,7 @@
+         test "$with_system_libwpg" != "no"; then
+     AC_MSG_RESULT([external])
+     SYSTEM_LIBWPG=YES
+-    PKG_CHECK_MODULES( LIBWPG, libwpg-0.1 )
++    PKG_CHECK_MODULES( LIBWPG, libwpg-0.2 )
+ else
+     AC_MSG_RESULT([internal])
+     SYSTEM_LIBWPG=NO

Modified: trunk/patches/dev300/writerperfect-testing.diff
==============================================================================
--- trunk/patches/dev300/writerperfect-testing.diff	(original)
+++ trunk/patches/dev300/writerperfect-testing.diff	Mon Jun 23 13:51:07 2008
@@ -1612,7 +1612,7 @@
  
   	virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns);
   	virtual void openTableRow(const WPXPropertyList &propList);
-@@ -134,32 +156,40 @@
+@@ -134,25 +156,33 @@
  	virtual void closeTableCell();
  	virtual void insertCoveredTableCell(const WPXPropertyList &propList);
   	virtual void closeTable();
@@ -1628,11 +1628,10 @@
  protected:
  	void _resetDocumentState();
 -	bool _writeTargetDocument(DocumentHandler *pHandler);
-+	bool _writeTargetDocument(DocumentHandlerInterface *pHandler);
- 	void _writeBegin();
 -	void _writeDefaultStyles(DocumentHandler *pHandler);
 -	void _writeMasterPages(DocumentHandler *pHandler);
 -	void _writePageMasters(DocumentHandler *pHandler);
++	bool _writeTargetDocument(DocumentHandlerInterface *pHandler);
 +	void _writeDefaultStyles(DocumentHandlerInterface *pHandler);
 +	void _writeMasterPages(DocumentHandlerInterface *pHandler);
 +	void _writePageLayouts(DocumentHandlerInterface *pHandler);
@@ -1656,14 +1655,6 @@
  
  	// paragraph styles
  	std::map<WPXString, ParagraphStyle *, ltstr> mTextStyleHash;
- 
--        // span styles
--        std::map<WPXString, SpanStyle *, ltstr> mSpanStyleHash;
-+	// span styles
-+	std::map<WPXString, SpanStyle *, ltstr> mSpanStyleHash;
- 
- 	// font styles
- 	std::map<WPXString, FontStyle *, ltstr> mFontHash;
 @@ -170,10 +200,18 @@
  
  	// table styles
@@ -2364,21 +2355,18 @@
  
 --- writerperfect/source/filter/makefile.mk	2008-04-09 11:04:01.000000000 +0200
 +++ writerperfect/source/filter/makefile.mk	2008-04-09 11:04:24.000000000 +0200
-@@ -12,24 +12,28 @@
- INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
+@@ -12,6 +12,10 @@
+ INCPRE+=$(LIBWPD_CFLAGS)
  .ENDIF
  
--.IF "$(SYSTEM_LIBWPS)" == "YES"
--INCPRE+=$(LIBWPS_CFLAGS)
 +.IF "$(SYSTEM_LIBWPG)" == "YES"
 +INCPRE+=$(LIBWPG_CFLAGS)
- .ELSE
--INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwps
-+INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
- .ENDIF
- 
++.ENDIF
 +
- # broken but ... necessary, internal include shafted ...
+ .IF "$(SYSTEM_LIBWPS)" == "YES"
+ INCPRE+=$(LIBWPS_CFLAGS)
+ .ENDIF
+@@ -18,14 +22,17 @@ 
  INCPRE+= -I..
  
  SLOFILES= \
@@ -3895,23 +3883,17 @@
  	virtual bool atEOS();
 --- writerperfect/source/wpdimp/makefile.mk	2008-04-09 11:04:01.000000000 +0200
 +++ writerperfect/source/wpdimp/makefile.mk	2008-04-09 11:04:24.000000000 +0200
-@@ -10,12 +10,13 @@
+@@ -10,6 +10,10 @@
  INCPRE+=$(LIBWPD_CFLAGS)
- .ELSE
- INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
-+INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
  .ENDIF
  
--.IF "$(SYSTEM_LIBWPS)" == "YES"
--INCPRE+=$(LIBWPS_CFLAGS)
 +.IF "$(SYSTEM_LIBWPG)" == "YES"
 +INCPRE+=$(LIBWPG_CFLAGS)
- .ELSE
--INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwps
-+INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
++.ENDIF
++
+ .IF "$(SYSTEM_LIBWPS)" == "YES"
+ INCPRE+=$(LIBWPS_CFLAGS)
  .ENDIF
- 
- # broken but ... necessary, internal include shafted ...
 --- writerperfect/source/wpdimp/WordPerfectCollector.cxx	2008-04-09 11:04:01.000000000 +0200
 +++ writerperfect/source/wpdimp/WordPerfectCollector.cxx	2008-04-09 11:04:24.000000000 +0200
 @@ -35,7 +35,7 @@
@@ -4093,17 +4075,26 @@
  	Reference < XDocumentHandler > xInternalHandler( mxMSF->createInstance( sXMLImportService ), UNO_QUERY );
  
  	// The XImporter sets up an empty target document for XDocumentHandler to write to.. 
+@@ -212,7 +212,7 @@
+ 	if (input.atEOS())
+         return ::rtl::OUString();
+ 
+-	confidence = WPSDocument::isFileFormatSupported(&input, false);
++	confidence = WPSDocument::isFileFormatSupported(&input);
+ 
+ 	if ((confidence == WPS_CONFIDENCE_EXCELLENT) || (confidence == WPS_CONFIDENCE_GOOD))
+ 		sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer_MS_Works_Document" ) );
 --- writerperfect/util/makefile.mk	2008-04-09 11:04:01.000000000 +0200
 +++ writerperfect/util/makefile.mk	2008-04-09 11:04:24.000000000 +0200
 @@ -53,7 +53,8 @@
- 	$(CPPULIB) \
+  	$(CPPULIB) \
  	$(SALLIB) \
  	$(XMLOFFLIB) \
 -	$(LIBWPD)
 +	$(LIBWPD) \
 +	$(LIBWPG)
  
- SHL1TARGET = wpft$(UPD)$(DLLPOSTFIX)
+ SHL1TARGET = wpft$(DLLPOSTFIX)
  SHL1IMPLIB = i$(SHL1TARGET)
 @@ -82,7 +83,8 @@
  	$(SALLIB) \
@@ -4113,5 +4104,5 @@
 +	$(LIBWPD) \
 +	$(LIBWPG)
  
- SHL2TARGET = msworks$(UPD)$(DLLPOSTFIX)
+ SHL2TARGET = msworks$(DLLPOSTFIX)
  SHL2IMPLIB = i$(SHL2TARGET)