ooo-build r12137 - trunk/patches/src680



Author: strba
Date: Wed Apr  9 11:10:28 2008
New Revision: 12137
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12137&view=rev

Log:
some gcc 4.3 build fixes

Modified:
   trunk/patches/src680/writerperfect-testing.diff

Modified: trunk/patches/src680/writerperfect-testing.diff
==============================================================================
--- trunk/patches/src680/writerperfect-testing.diff	(original)
+++ trunk/patches/src680/writerperfect-testing.diff	Wed Apr  9 11:10:28 2008
@@ -1,5 +1,5 @@
---- writerperfect/source/filter/DocumentCollector.cxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/filter/DocumentCollector.cxx	2008-04-07 16:22:53.000000000 +0200
+--- writerperfect/source/filter/DocumentCollector.cxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/filter/DocumentCollector.cxx	2008-04-09 11:04:24.000000000 +0200
 @@ -39,6 +39,8 @@
  
  #include "DocumentCollector.hxx"
@@ -1529,8 +1529,8 @@
 +	mpCurrentContentElements->push_back(new TagCloseElement("draw:text-box"));
 +}
 +
---- writerperfect/source/filter/DocumentCollector.hxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/filter/DocumentCollector.hxx	2008-04-07 16:24:33.000000000 +0200
+--- writerperfect/source/filter/DocumentCollector.hxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/filter/DocumentCollector.hxx	2008-04-09 11:04:24.000000000 +0200
 @@ -45,8 +45,9 @@
  #include <stack>
  #include <string.h>
@@ -1711,8 +1711,8 @@
  };
  
  #endif
---- writerperfect/source/filter/DocumentElement.cxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/filter/DocumentElement.cxx	2008-04-07 15:52:33.000000000 +0200
+--- writerperfect/source/filter/DocumentElement.cxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/filter/DocumentElement.cxx	2008-04-09 11:04:24.000000000 +0200
 @@ -26,6 +26,7 @@
   */
  
@@ -1759,8 +1759,8 @@
  	WPXPropertyList xBlankAttrList;
          
  	WPXString sTemp;
---- writerperfect/source/filter/DocumentElement.hxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/filter/DocumentElement.hxx	2008-04-07 15:51:57.000000000 +0200
+--- writerperfect/source/filter/DocumentElement.hxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/filter/DocumentElement.hxx	2008-04-09 11:04:24.000000000 +0200
 @@ -21,36 +21,31 @@
   *
   */
@@ -1848,8 +1848,8 @@
 -
 + 
  #endif
---- writerperfect/source/filter/DocumentHandler.hxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/filter/DocumentHandler.hxx	2008-04-07 15:17:32.000000000 +0200
+--- writerperfect/source/filter/DocumentHandler.hxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/filter/DocumentHandler.hxx	2008-04-09 11:04:24.000000000 +0200
 @@ -13,10 +13,12 @@
  #pragma warning( pop )
  #endif
@@ -1865,7 +1865,7 @@
  public:
          DocumentHandler(Reference < XDocumentHandler > &xHandler);
 --- writerperfect/source/filter/DocumentHandlerInterface.hxx	1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect/source/filter/DocumentHandlerInterface.hxx	2008-04-07 15:16:19.000000000 +0200
++++ writerperfect/source/filter/DocumentHandlerInterface.hxx	2008-04-09 11:04:24.000000000 +0200
 @@ -0,0 +1,45 @@
 +/*
 + * Copyright (C) 2004 William Lachance (wlach interlog com)
@@ -1912,8 +1912,8 @@
 +        virtual void characters(const WPXString &sCharacters) = 0;
 +};
 +#endif
---- writerperfect/source/filter/FontStyle.cxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/filter/FontStyle.cxx	2008-04-07 16:14:04.000000000 +0200
+--- writerperfect/source/filter/FontStyle.cxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/filter/FontStyle.cxx	2008-04-09 11:04:24.000000000 +0200
 @@ -29,7 +29,7 @@
  #include "DocumentElement.hxx"
  
@@ -1942,8 +1942,8 @@
 +	TagCloseElement styleClose("style:font-face");
  	styleClose.write(pHandler);
  }
---- writerperfect/source/filter/FontStyle.hxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/filter/FontStyle.hxx	2008-04-07 16:13:54.000000000 +0200
+--- writerperfect/source/filter/FontStyle.hxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/filter/FontStyle.hxx	2008-04-09 11:04:24.000000000 +0200
 @@ -21,28 +21,23 @@
   *
   */
@@ -1977,7 +1977,7 @@
  
  private:
 --- writerperfect/source/filter/GraphicsStyle.cxx	1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect/source/filter/GraphicsStyle.cxx	2008-04-07 16:12:43.000000000 +0200
++++ writerperfect/source/filter/GraphicsStyle.cxx	2008-04-09 11:04:24.000000000 +0200
 @@ -0,0 +1,40 @@
 +/* GraphicsStyle:
 + *
@@ -2020,7 +2020,7 @@
 +{        
 +}
 --- writerperfect/source/filter/GraphicsStyle.hxx	1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect/source/filter/GraphicsStyle.hxx	2008-04-07 16:13:12.000000000 +0200
++++ writerperfect/source/filter/GraphicsStyle.hxx	2008-04-09 11:04:24.000000000 +0200
 @@ -0,0 +1,40 @@
 +/* GraphicsStyle:
 + *
@@ -2063,7 +2063,7 @@
 +};
 +#endif
 --- writerperfect/source/filter/InternalHandler.cxx	1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect/source/filter/InternalHandler.cxx	2008-04-07 15:13:31.000000000 +0200
++++ writerperfect/source/filter/InternalHandler.cxx	2008-04-09 11:04:24.000000000 +0200
 @@ -0,0 +1,54 @@
 +/*
 + * Copyright (C) 2007 Fridrich Strba  strba bluewin ch)
@@ -2120,7 +2120,7 @@
 +	mpElements->push_back(new CharDataElement(sCharacters.cstr()));
 +}
 --- writerperfect/source/filter/InternalHandler.hxx	1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect/source/filter/InternalHandler.hxx	2008-04-07 15:15:24.000000000 +0200
++++ writerperfect/source/filter/InternalHandler.hxx	2008-04-09 11:04:24.000000000 +0200
 @@ -0,0 +1,46 @@
 +/*
 + * Copyright (C) 2007 Fridrich Strba  strba bluewin ch)
@@ -2168,8 +2168,8 @@
 +	std::vector<DocumentElement *> *mpElements;
 +};
 +#endif
---- writerperfect/source/filter/ListStyle.cxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/filter/ListStyle.cxx	2008-04-07 16:09:21.000000000 +0200
+--- writerperfect/source/filter/ListStyle.cxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/filter/ListStyle.cxx	2008-04-09 11:04:24.000000000 +0200
 @@ -29,7 +29,7 @@
  #include "DocumentElement.hxx"
  
@@ -2299,8 +2299,8 @@
  {
  	TagOpenElement listStyleOpenElement("text:list-style");
  	listStyleOpenElement.addAttribute("style:name", getName());
---- writerperfect/source/filter/ListStyle.hxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/filter/ListStyle.hxx	2008-04-07 16:11:31.000000000 +0200
+--- writerperfect/source/filter/ListStyle.hxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/filter/ListStyle.hxx	2008-04-09 11:04:24.000000000 +0200
 @@ -21,23 +21,18 @@
   *
   */
@@ -2362,8 +2362,8 @@
  	const int getListID() { return miListID; }
  	const bool isListLevelDefined(int iLevel) const;
  
---- writerperfect/source/filter/makefile.mk	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/filter/makefile.mk	2008-04-07 14:55:02.000000000 +0200
+--- 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
  .ENDIF
@@ -2406,7 +2406,7 @@
  
  .INCLUDE :  target.mk
 --- writerperfect/source/filter/OdgExporter.cxx	1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect/source/filter/OdgExporter.cxx	2008-04-07 16:14:41.000000000 +0200
++++ writerperfect/source/filter/OdgExporter.cxx	2008-04-09 11:04:24.000000000 +0200
 @@ -0,0 +1,615 @@
 +/* libwpg
 + * Copyright (C) 2006 Ariya Hidayat (ariya kde org)
@@ -3024,7 +3024,7 @@
 +	return WPXString(stringValue.c_str());
 +}
 --- writerperfect/source/filter/OdgExporter.hxx	1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect/source/filter/OdgExporter.hxx	2008-04-07 15:54:20.000000000 +0200
++++ writerperfect/source/filter/OdgExporter.hxx	2008-04-09 11:04:24.000000000 +0200
 @@ -0,0 +1,85 @@
 +/* libwpg
 + * Copyright (C) 2006 Ariya Hidayat (ariya kde org)
@@ -3111,8 +3111,8 @@
 +};
 +
 +#endif // __ODGEXPORTER_HXX__
---- writerperfect/source/filter/PageSpan.cxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/filter/PageSpan.cxx	2008-04-07 16:07:43.000000000 +0200
+--- writerperfect/source/filter/PageSpan.cxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/filter/PageSpan.cxx	2008-04-09 11:04:24.000000000 +0200
 @@ -103,39 +103,38 @@
           return 0.0f; 
  }
@@ -3252,8 +3252,8 @@
 -	headerFooterClose.write(pHandler);
  }
 -
---- writerperfect/source/filter/PageSpan.hxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/filter/PageSpan.hxx	2008-04-07 16:07:16.000000000 +0200
+--- writerperfect/source/filter/PageSpan.hxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/filter/PageSpan.hxx	2008-04-09 11:04:24.000000000 +0200
 @@ -26,25 +26,20 @@
   */
  #ifndef _PAGESPAN_H
@@ -3293,8 +3293,8 @@
  private:
          WPXPropertyList mxPropList;
  	std::vector<DocumentElement *> * mpHeaderContent;
---- writerperfect/source/filter/SectionStyle.cxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/filter/SectionStyle.cxx	2008-04-07 16:02:28.000000000 +0200
+--- writerperfect/source/filter/SectionStyle.cxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/filter/SectionStyle.cxx	2008-04-09 11:04:24.000000000 +0200
 @@ -33,7 +33,7 @@
  
  #ifdef _MSC_VER
@@ -3341,8 +3341,8 @@
  
  	pHandler->endElement("style:style");
  }
---- writerperfect/source/filter/SectionStyle.hxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/filter/SectionStyle.hxx	2008-04-07 15:55:23.000000000 +0200
+--- writerperfect/source/filter/SectionStyle.hxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/filter/SectionStyle.hxx	2008-04-09 11:04:24.000000000 +0200
 @@ -21,19 +21,13 @@
   *
   */
@@ -3377,8 +3377,8 @@
  	WPXPropertyListVector mColumns;
  };
  #endif
---- writerperfect/source/filter/Style.hxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/filter/Style.hxx	2008-04-07 15:56:37.000000000 +0200
+--- writerperfect/source/filter/Style.hxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/filter/Style.hxx	2008-04-09 11:04:24.000000000 +0200
 @@ -21,19 +21,13 @@
   *
   */
@@ -3409,8 +3409,8 @@
  	const WPXString &getName() const { return msName; }
  
   private:
---- writerperfect/source/filter/TableStyle.cxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/filter/TableStyle.cxx	2008-04-07 16:05:55.000000000 +0200
+--- writerperfect/source/filter/TableStyle.cxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/filter/TableStyle.cxx	2008-04-09 11:04:24.000000000 +0200
 @@ -27,7 +27,6 @@
   * Corel Corporation or Corel Corporation Limited."
   */
@@ -3527,8 +3527,8 @@
  
  		pHandler->endElement("style:style");
  
---- writerperfect/source/filter/TableStyle.hxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/filter/TableStyle.hxx	2008-04-07 16:04:44.000000000 +0200
+--- writerperfect/source/filter/TableStyle.hxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/filter/TableStyle.hxx	2008-04-09 11:04:24.000000000 +0200
 @@ -22,57 +22,53 @@
   *
   */
@@ -3599,8 +3599,8 @@
  	WPXPropertyListVector mColumns;
  	std::vector<TableCellStyle *> mTableCellStyles;
  	std::vector<TableRowStyle *> mTableRowStyles;
---- writerperfect/source/filter/TextRunStyle.cxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/filter/TextRunStyle.cxx	2008-04-07 15:57:53.000000000 +0200
+--- writerperfect/source/filter/TextRunStyle.cxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/filter/TextRunStyle.cxx	2008-04-09 11:04:24.000000000 +0200
 @@ -50,91 +50,95 @@
  	delete mpPropList;
  }
@@ -3778,8 +3778,8 @@
 +	pHandler->endElement("style:text-properties");
  	pHandler->endElement("style:style");
  }
---- writerperfect/source/filter/TextRunStyle.hxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/filter/TextRunStyle.hxx	2008-04-07 15:57:29.000000000 +0200
+--- writerperfect/source/filter/TextRunStyle.hxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/filter/TextRunStyle.hxx	2008-04-09 11:04:24.000000000 +0200
 @@ -29,26 +29,19 @@
  
  #ifndef _TEXTRUNSTYLE_H
@@ -3817,16 +3817,16 @@
  
  private:
          WPXPropertyList mPropList;
---- writerperfect/source/filter/WriterProperties.hxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/filter/WriterProperties.hxx	2008-04-07 14:28:01.000000000 +0200
+--- writerperfect/source/filter/WriterProperties.hxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/filter/WriterProperties.hxx	2008-04-09 11:04:24.000000000 +0200
 @@ -32,5 +32,4 @@
  #define IMP_DEFAULT_FONT_NAME "Times New Roman"
  #define IMP_DEFAULT_FONT_SIZE 12.0f
  #define IMP_DEFAULT_FONT_PITCH "variable"
 -#define IMP_DEFAULT_FONT_COLOR (new RGBSColor(0x00,0x00,0x00,0x64))
  #endif
---- writerperfect/source/stream/WPXSvStream.cxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/stream/WPXSvStream.cxx	2008-04-07 14:26:00.000000000 +0200
+--- writerperfect/source/stream/WPXSvStream.cxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/stream/WPXSvStream.cxx	2008-04-09 11:06:19.000000000 +0200
 @@ -9,7 +9,7 @@
  using namespace ::com::sun::star::io;
  
@@ -3836,6 +3836,15 @@
  		mxChildStorage(),
  		mxChildStream(),
  		mxStream(xStream),
+@@ -52,7 +52,7 @@
+ 	if (numBytesRead == 0)
+ 		return 0;
+ 
+-	return (const uint8_t *)maData.getConstArray();
++	return (const unsigned char *)maData.getConstArray();
+ }
+ 
+ long WPXSvInputStream::tell()
 @@ -167,8 +167,3 @@
  	else
  		return 0;
@@ -3845,8 +3854,8 @@
 -{
 -	return getDocumentOLEStream( "PerfectOffice_MAIN" );
 -}
---- writerperfect/source/stream/WPXSvStream.h	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/stream/WPXSvStream.h	2008-04-07 14:30:09.000000000 +0200
+--- writerperfect/source/stream/WPXSvStream.h	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/stream/WPXSvStream.h	2008-04-09 11:04:24.000000000 +0200
 @@ -12,13 +12,12 @@
  #if defined _MSC_VER
  #pragma warning( push, 1 )
@@ -3875,8 +3884,8 @@
  	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
  	virtual long tell();
  	virtual bool atEOS();
---- writerperfect/source/wpdimp/makefile.mk	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/wpdimp/makefile.mk	2008-04-07 14:56:12.000000000 +0200
+--- 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 @@
  INCPRE+=$(LIBWPD_CFLAGS)
  .ELSE
@@ -3894,8 +3903,8 @@
  .ENDIF
  
  # broken but ... necessary, internal include shafted ...
---- writerperfect/source/wpdimp/WordPerfectCollector.cxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/wpdimp/WordPerfectCollector.cxx	2008-04-07 16:29:18.000000000 +0200
+--- 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 @@
  #pragma warning( pop )
  #endif
@@ -3917,8 +3926,8 @@
          if (result != WPD_OK)
                  return false;
  
---- writerperfect/source/wpdimp/WordPerfectCollector.hxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/wpdimp/WordPerfectCollector.hxx	2008-04-07 16:29:07.000000000 +0200
+--- writerperfect/source/wpdimp/WordPerfectCollector.hxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/wpdimp/WordPerfectCollector.hxx	2008-04-09 11:04:24.000000000 +0200
 @@ -30,12 +30,13 @@
  #define _WORDPERFECTCOLLECTOR_HXX
  
@@ -3935,8 +3944,8 @@
 +	bool parseSourceDocument(WPXInputStream &pInput);
  };
  #endif
---- writerperfect/source/wpdimp/WordPerfectImportFilter.cxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/wpdimp/WordPerfectImportFilter.cxx	2008-04-07 14:46:02.000000000 +0200
+--- writerperfect/source/wpdimp/WordPerfectImportFilter.cxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/wpdimp/WordPerfectImportFilter.cxx	2008-04-09 11:04:24.000000000 +0200
 @@ -136,7 +136,7 @@
  	sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
  
@@ -3955,8 +3964,8 @@
  
  	if (confidence == WPD_CONFIDENCE_EXCELLENT)
  		sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer_WordPerfect_Document" ) );
---- writerperfect/source/wpgimp/makefile.mk	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/wpgimp/makefile.mk	2008-04-07 15:26:06.000000000 +0200
+--- writerperfect/source/wpgimp/makefile.mk	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/wpgimp/makefile.mk	2008-04-09 11:04:24.000000000 +0200
 @@ -12,12 +12,6 @@
  INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
  .ENDIF
@@ -3978,8 +3987,8 @@
      $(SLO)$/WPGImportFilter.obj \
  	$(SLO)$/wpgimport_genericfilter.obj		
  
---- writerperfect/source/wpgimp/WPGImportFilter.cxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/wpgimp/WPGImportFilter.cxx	2008-04-07 15:25:01.000000000 +0200
+--- writerperfect/source/wpgimp/WPGImportFilter.cxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/wpgimp/WPGImportFilter.cxx	2008-04-09 11:04:24.000000000 +0200
 @@ -75,7 +75,7 @@
  #endif
  
@@ -4023,8 +4032,8 @@
  	if (libwpg::WPGraphics::isSupported(input))
  		sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw_WordPerfect_Graphics" ) );
  
---- writerperfect/source/wpsimp/MSWorksCollector.cxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/wpsimp/MSWorksCollector.cxx	2008-04-07 16:21:27.000000000 +0200
+--- writerperfect/source/wpsimp/MSWorksCollector.cxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/wpsimp/MSWorksCollector.cxx	2008-04-09 11:04:24.000000000 +0200
 @@ -29,7 +29,7 @@
  #include "MSWorksCollector.hxx"
  #include <libwps/WPSDocument.h>
@@ -4046,8 +4055,8 @@
          if (result != WPS_OK)
                  return false;
  
---- writerperfect/source/wpsimp/MSWorksCollector.hxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/wpsimp/MSWorksCollector.hxx	2008-04-07 16:21:15.000000000 +0200
+--- writerperfect/source/wpsimp/MSWorksCollector.hxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/wpsimp/MSWorksCollector.hxx	2008-04-09 11:04:24.000000000 +0200
 @@ -30,12 +30,13 @@
  #define _MSWORKSCOLLECTOR_HXX
  
@@ -4064,8 +4073,8 @@
 +	bool parseSourceDocument(WPXInputStream &input);
  };
  #endif
---- writerperfect/source/wpsimp/MSWorksImportFilter.cxx	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/source/wpsimp/MSWorksImportFilter.cxx	2008-04-07 15:03:17.000000000 +0200
+--- writerperfect/source/wpsimp/MSWorksImportFilter.cxx	2008-04-09 11:04:01.000000000 +0200
++++ writerperfect/source/wpsimp/MSWorksImportFilter.cxx	2008-04-09 11:04:24.000000000 +0200
 @@ -127,7 +127,7 @@
  	sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
  	
@@ -4075,8 +4084,8 @@
  	Reference < XDocumentHandler > xInternalHandler( mxMSF->createInstance( sXMLImportService ), UNO_QUERY );
  
  	// The XImporter sets up an empty target document for XDocumentHandler to write to.. 
---- writerperfect/util/makefile.mk	2008-04-07 14:03:19.000000000 +0200
-+++ writerperfect/util/makefile.mk	2008-04-07 16:31:56.000000000 +0200
+--- 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) \
  	$(SALLIB) \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]