recreated tag libreoffice-3.3.3.1 which had these commits:

commit 1bcb7c0787a73a4caaf385d9c7a0668f6ce0c712 (tag: refs/tags/libreoffice-3.3.3.1)
Author: Petr Mladek <pmladek@suse.cz>
Date:   Tue May 31 17:39:05 2011 +0200

    Version 3.3.3.1, tag libreoffice-3.3.3.1 (3.3.3-rc1)

commit d74a6ab18ffdb0f1eb796dc9211e7d2109d348c8
Author: Caolán McNamara <caolanm@redhat.com>
Date:   Wed Apr 6 21:37:47 2011 +0100

    avoid possibility of accessing out of range ObjTimes

 lotuswordpro/source/filter/lwpidxmgr.hxx |    2 +-
 lotuswordpro/source/filter/lwpobjid.cxx  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

12 files changed, 101 insertions, 101 deletions

diff --git a/writerperfect/source/filter/DocumentCollector.cxx b/writerperfect/source/filter/DocumentCollector.cxx
index b44811267338..b8f848e4bfe8 100644
--- a/writerperfect/source/filter/DocumentCollector.cxx
+++ b/writerperfect/source/filter/DocumentCollector.cxx
@@ -265,7 +265,7 @@ void DocumentCollector::_writePageLayouts(DocumentHandlerInterface *pHandler)
 }
 
 bool DocumentCollector::_writeTargetDocument(DocumentHandlerInterface *pHandler)
-{
+{        
     WRITER_DEBUG_MSG(("WriterWordPerfect: Document Body: Printing out the header stuff..\n"));
 
     WRITER_DEBUG_MSG(("WriterWordPerfect: Document Body: Start Document\n"));
@@ -329,10 +329,10 @@ bool DocumentCollector::_writeTargetDocument(DocumentHandlerInterface *pHandler)
     }
 
     for (std::map<WPXString, ParagraphStyle *, ltstr>::const_iterator iterTextStyle = mTextStyleHash.begin();
-             iterTextStyle != mTextStyleHash.end(); iterTextStyle++)
+             iterTextStyle != mTextStyleHash.end(); iterTextStyle++) 
         {
         // writing out the paragraph styles
-        if (strcmp((iterTextStyle->second)->getName().cstr(), "Standard"))
+        if (strcmp((iterTextStyle->second)->getName().cstr(), "Standard")) 
                 {
             // don't write standard paragraph "no styles" style
             (iterTextStyle->second)->write(pHandler);
@@ -341,7 +341,7 @@ bool DocumentCollector::_writeTargetDocument(DocumentHandlerInterface *pHandler)
 
         // span styles..
     for (std::map<WPXString, SpanStyle *, ltstr>::const_iterator iterSpanStyle = mSpanStyleHash.begin();
-             iterSpanStyle != mSpanStyleHash.end(); iterSpanStyle++)
+             iterSpanStyle != mSpanStyleHash.end(); iterSpanStyle++) 
         {
                 (iterSpanStyle->second)->write(pHandler);
     }
@@ -406,7 +406,7 @@ WPXString propListToStyleKey(const WPXPropertyList & xPropList)
 WPXString getParagraphStyleKey(const WPXPropertyList & xPropList, const WPXPropertyListVector & xTabStops)
 {
         WPXString sKey = propListToStyleKey(xPropList);
-
+        
         WPXString sTabStops;
         sTabStops.sprintf("[num-tab-stops:%i]", xTabStops.count());
         WPXPropertyListVector::Iter i(xTabStops);
@@ -509,10 +509,10 @@ void DocumentCollector::openSection(const WPXPropertyList &propList, const WPXPr
 
         WPXString sSectionName;
         sSectionName.sprintf("Section%i", mSectionStyles.size());
-
+        
         SectionStyle *pSectionStyle = new SectionStyle(propList, columns, sSectionName.cstr());
         mSectionStyles.push_back(pSectionStyle);
-
+        
         TagOpenElement *pSectionOpenElement = new TagOpenElement("text:section");
         pSectionOpenElement->addAttribute("text:style-name", pSectionStyle->getName());
         pSectionOpenElement->addAttribute("text:name", pSectionStyle->getName());
@@ -536,16 +536,16 @@ void DocumentCollector::openParagraph(const WPXPropertyList &propList, const WPX
 {
     // FIXMENOW: What happens if we open a footnote inside a table? do we then inherit the footnote's style
     // from "Table Contents"
-
+    
     WPXPropertyList *pPersistPropList = new WPXPropertyList(propList);
     ParagraphStyle *pStyle = NULL;
 
     if (mWriterDocumentStates.top().mbFirstElement && mpCurrentContentElements == &mBodyElements)
     {
-        // we don't have to go through the fuss of determining if the paragraph style is
+        // we don't have to go through the fuss of determining if the paragraph style is 
         // unique in this case, because if we are the first document element, then we
         // are singular. Neither do we have to determine what our parent style is-- we can't
-        // be inside a table in this case (the table would be the first document element
+        // be inside a table in this case (the table would be the first document element 
         //in that case)
         pPersistPropList->insert("style:parent-style-name", "Standard");
         WPXString sName;
@@ -583,10 +583,10 @@ void DocumentCollector::openParagraph(const WPXPropertyList &propList, const WPX
         if (mTextStyleHash.find(sKey) == mTextStyleHash.end())
         {
             WPXString sName;
-            sName.sprintf("S%i", mTextStyleHash.size());
-
+            sName.sprintf("S%i", mTextStyleHash.size()); 
+            
             pStyle = new ParagraphStyle(pPersistPropList, tabStops, sName);
-
+    
             mTextStyleHash[sKey] = pStyle;
         }
         else
@@ -619,11 +619,11 @@ void DocumentCollector::openSpan(const WPXPropertyList &propList)
         {
         // allocate a new paragraph style
         sName.sprintf("Span%i", mSpanStyleHash.size());
-        SpanStyle *pStyle = new SpanStyle(sName.cstr(), propList);
+        SpanStyle *pStyle = new SpanStyle(sName.cstr(), propList);                
 
         mSpanStyleHash[sSpanHashKey] = pStyle;
     }
-    else
+    else 
         {
         sName.sprintf("%s", mSpanStyleHash.find(sSpanHashKey)->second->getName().cstr());
     }
@@ -654,7 +654,7 @@ void DocumentCollector::defineOrderedListLevel(const WPXPropertyList &propList)
     // from the list that is just being defined (listIDs differ) OR (3) we can tell that the user actually
     // is starting a new list at level 1 (and only level 1)
     if (pOrderedListStyle == NULL || pOrderedListStyle->getListID() != id  ||
-        (propList["libwpd:level"] && propList["libwpd:level"]->getInt()==1 &&
+        (propList["libwpd:level"] && propList["libwpd:level"]->getInt()==1 && 
          (propList["text:start-value"] && propList["text:start-value"]->getInt() != (mWriterListStates.top().miLastListNumber+1))))
     {
         WRITER_DEBUG_MSG(("Attempting to create a new ordered list style (listid: %i)\n", id));
@@ -799,13 +799,13 @@ void DocumentCollector::openListElement(const WPXPropertyList &propList, const W
 
         WPXString sKey = getParagraphStyleKey(*pPersistPropList, tabStops);
 
-        if (mTextStyleHash.find(sKey) == mTextStyleHash.end())
+        if (mTextStyleHash.find(sKey) == mTextStyleHash.end()) 
         {
                 WPXString sName;
-                sName.sprintf("S%i", mTextStyleHash.size());
-
+                sName.sprintf("S%i", mTextStyleHash.size()); 
+        
                 pStyle = new ParagraphStyle(pPersistPropList, tabStops, sName);
-
+                
                 mTextStyleHash[sKey] = pStyle;
         }
         else
@@ -822,7 +822,7 @@ void DocumentCollector::openListElement(const WPXPropertyList &propList, const W
 
     if (mpCurrentContentElements == &mBodyElements)
         mWriterDocumentStates.top().mbFirstParagraphInPageSpan = false;
-
+        
     mWriterListStates.top().mbListElementOpened.top() = true;
     mWriterListStates.top().mbListElementParagraphOpened = true;
     mWriterListStates.top().mbListContinueNumbering = false;
@@ -860,7 +860,7 @@ void DocumentCollector::openFootnote(const WPXPropertyList &propList)
     mpCurrentContentElements->push_back(new TagCloseElement("text:note-citation"));
 
     mpCurrentContentElements->push_back(new TagOpenElement("text:note-body"));
-
+    
     mWriterDocumentStates.top().mbInNote = true;
 }
 
@@ -953,7 +953,7 @@ void DocumentCollector::openTable(const WPXPropertyList &propList, const WPXProp
     pTableOpenElement->addAttribute("table:style-name", sTableName.cstr());
     mpCurrentContentElements->push_back(pTableOpenElement);
 
-    for (int i=0; i<pTableStyle->getNumColumns(); i++)
+    for (int i=0; i<pTableStyle->getNumColumns(); i++) 
         {
         TagOpenElement *pTableColumnOpenElement = new TagOpenElement("table:table-column");
         WPXString sColumnStyleName;
@@ -981,7 +981,7 @@ void DocumentCollector::openTableRow(const WPXPropertyList &propList)
     sTableRowStyleName.sprintf("%s.Row%i", mpCurrentTableStyle->getName().cstr(), mpCurrentTableStyle->getNumTableRowStyles());
     TableRowStyle *pTableRowStyle = new TableRowStyle(propList, sTableRowStyleName.cstr());
     mpCurrentTableStyle->addTableRowStyle(pTableRowStyle);
-
+    
     TagOpenElement *pTableRowOpenElement = new TagOpenElement("table:table-row");
     pTableRowOpenElement->addAttribute("table:style-name", sTableRowStyleName);
     mpCurrentContentElements->push_back(pTableRowOpenElement);
@@ -1013,7 +1013,7 @@ void DocumentCollector::openTableCell(const WPXPropertyList &propList)
     TagOpenElement *pTableCellOpenElement = new TagOpenElement("table:table-cell");
     pTableCellOpenElement->addAttribute("table:style-name", sTableCellStyleName);
     if (propList["table:number-columns-spanned"])
-                pTableCellOpenElement->addAttribute("table:number-columns-spanned",
+                pTableCellOpenElement->addAttribute("table:number-columns-spanned", 
                                                     propList["table:number-columns-spanned"]->getStr().cstr());
         if (propList["table:number-rows-spanned"])
                 pTableCellOpenElement->addAttribute("table:number-rows-spanned",
diff --git a/writerperfect/source/filter/DocumentElement.cxx b/writerperfect/source/filter/DocumentElement.cxx
index f330ab0ace47..18380e14a615 100644
--- a/writerperfect/source/filter/DocumentElement.cxx
+++ b/writerperfect/source/filter/DocumentElement.cxx
@@ -3,7 +3,7 @@
  * document: paragraph and spans of text, as well as section breaks.
  *
  * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -22,7 +22,7 @@
  *
  */
 
-/* "This product is not manufactured, approved, or supported by
+/* "This product is not manufactured, approved, or supported by 
  * Corel Corporation or Corel Corporation Limited."
  */
 
@@ -44,8 +44,8 @@ void TagOpenElement::write(DocumentHandlerInterface *pHandler) const
 }
 
 void TagOpenElement::print() const
-{
-    TagElement::print();
+{ 
+    TagElement::print(); 	
 }
 
 void TagOpenElement::addAttribute(const char *szAttributeName, const WPXString &sAttributeValue)
@@ -78,12 +78,12 @@ void TextElement::write(DocumentHandlerInterface *pHandler) const
     if (msTextBuf.len() <= 0)
         return;
     WPXPropertyList xBlankAttrList;
-
+        
     WPXString sTemp;
 
     int iNumConsecutiveSpaces = 0;
         WPXString::Iter i(msTextBuf);
-    for (i.rewind(); i.next();)
+    for (i.rewind(); i.next();) 
         {
         if (*(i()) == ASCII_SPACE)
             iNumConsecutiveSpaces++;
diff --git a/writerperfect/source/filter/DocumentHandler.cxx b/writerperfect/source/filter/DocumentHandler.cxx
index c61ffc0c19c5..ab16391f3109 100644
--- a/writerperfect/source/filter/DocumentHandler.cxx
+++ b/writerperfect/source/filter/DocumentHandler.cxx
@@ -1,8 +1,8 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
+/* 
  * Copyright (C) 2004 William Lachance (william.lachance@sympatico.ca)
  * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com)
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -41,7 +41,7 @@ DocumentHandler::DocumentHandler(Reference < XDocumentHandler > &xHandler) :
 {
 }
 
-void DocumentHandler::startDocument()
+void DocumentHandler::startDocument() 
 {
     mxHandler->startDocument();
 }
diff --git a/writerperfect/source/filter/FontStyle.cxx b/writerperfect/source/filter/FontStyle.cxx
index e15c6651edd9..07afe4bf3408 100644
--- a/writerperfect/source/filter/FontStyle.cxx
+++ b/writerperfect/source/filter/FontStyle.cxx
@@ -1,9 +1,9 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* FontStyle: Stores (and writes) font-based information that is needed at
+/* FontStyle: Stores (and writes) font-based information that is needed at 
  * the head of an OO document.
  *
  * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -22,7 +22,7 @@
  *
  */
 
-/* "This product is not manufactured, approved, or supported by
+/* "This product is not manufactured, approved, or supported by 
  * Corel Corporation or Corel Corporation Limited."
  */
 #include "FontStyle.hxx"
@@ -35,12 +35,12 @@ FontStyle::FontStyle(const char *psName, const char *psFontFamily) : Style(psNam
 {
 }
 
-FontStyle::~FontStyle()
+FontStyle::~FontStyle() 
 {
 }
 
 void FontStyle::write(DocumentHandlerInterface *pHandler) const
-{
+{        
     TagOpenElement styleOpen("style:font-face");
     styleOpen.addAttribute("style:name", getName());
     styleOpen.addAttribute("svg:font-family", msFontFamily);
diff --git a/writerperfect/source/filter/ListStyle.cxx b/writerperfect/source/filter/ListStyle.cxx
index b991b12a236e..a5c178013640 100644
--- a/writerperfect/source/filter/ListStyle.cxx
+++ b/writerperfect/source/filter/ListStyle.cxx
@@ -176,7 +176,7 @@ void ListStyle::write(DocumentHandlerInterface *pHandler) const
 
     for (int i=0; i<WP6_NUM_LIST_LEVELS; i++) {
         if (mppListLevels[i] != NULL)
-            mppListLevels[i]->write(pHandler, i);
+            mppListLevels[i]->write(pHandler, i);		
     }
 
     pHandler->endElement("text:list-style");
diff --git a/writerperfect/source/filter/SectionStyle.cxx b/writerperfect/source/filter/SectionStyle.cxx
index fadc190ab9b6..f88b800dba4c 100644
--- a/writerperfect/source/filter/SectionStyle.cxx
+++ b/writerperfect/source/filter/SectionStyle.cxx
@@ -5,7 +5,7 @@
  *
  * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
  * Copyright (c) 2004 Fridrich Strba (fridrich.strba@bluewin.ch)
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -24,7 +24,7 @@
  *
  */
 
-/* "This product is not manufactured, approved, or supported by
+/* "This product is not manufactured, approved, or supported by 
  * Corel Corporation or Corel Corporation Limited."
  */
 #include "FilterInternal.hxx"
@@ -36,9 +36,9 @@
 double rint(double x);
 #endif /* _WIN32 */
 
-SectionStyle::SectionStyle(const WPXPropertyList &xPropList,
-                           const WPXPropertyListVector &xColumns,
-                           const char *psName) :
+SectionStyle::SectionStyle(const WPXPropertyList &xPropList, 
+                           const WPXPropertyListVector &xColumns, 
+                           const char *psName) : 
         Style(psName),
         mPropList(xPropList),
         mColumns(xColumns)
@@ -60,10 +60,10 @@ void SectionStyle::write(DocumentHandlerInterface *pHandler) const
     WPXPropertyList columnProps;
 
     if (mColumns.count() > 1)
-    {
+    {		
                 columnProps.insert("fo:column-count", (int)mColumns.count());
                 pHandler->startElement("style:columns", columnProps);
-
+    
                 WPXPropertyListVector::Iter i(mColumns);
                 for (i.rewind(); i.next();)
         {
@@ -80,7 +80,7 @@ void SectionStyle::write(DocumentHandlerInterface *pHandler) const
 
     pHandler->endElement("style:columns");
 
-
+        
     pHandler->endElement("style:section-properties");
 
     pHandler->endElement("style:style");
diff --git a/writerperfect/source/filter/TableStyle.cxx b/writerperfect/source/filter/TableStyle.cxx
index 2fc66ed04841..4157a423fb1f 100644
--- a/writerperfect/source/filter/TableStyle.cxx
+++ b/writerperfect/source/filter/TableStyle.cxx
@@ -1,11 +1,11 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* TableStyle: Stores (and writes) table-based information that is
+/* TableStyle: Stores (and writes) table-based information that is 
  * needed at the head of an OO document.
  *
  * Copyright (C) 2002-2004 William Lachance (william.lachance@sympatico.ca)
  * Copyright (C) 2004 Net Integration Technologies, Inc. (http://www.net-itech.com)
  * Copyright (C) 2004 Fridrich Strba (fridrich.strba@bluewin.ch)
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -24,7 +24,7 @@
  *
  */
 
-/* "This product is not manufactured, approved, or supported by
+/* "This product is not manufactured, approved, or supported by 
  * Corel Corporation or Corel Corporation Limited."
  */
 #include <math.h>
@@ -64,7 +64,7 @@ void TableCellStyle::write(DocumentHandlerInterface *pHandler) const
         pHandler->startElement("style:table-cell-properties", stylePropList);
     pHandler->endElement("style:table-cell-properties");
 
-    pHandler->endElement("style:style");
+    pHandler->endElement("style:style");	
 }
 
 TableRowStyle::TableRowStyle(const WPXPropertyList &propList, const char *psName) :
@@ -79,7 +79,7 @@ void TableRowStyle::write(DocumentHandlerInterface *pHandler) const
     styleOpen.addAttribute("style:name", getName());
     styleOpen.addAttribute("style:family", "table-row");
     styleOpen.write(pHandler);
-
+    
         TagOpenElement stylePropertiesOpen("style:table-row-properties");
         if (mPropList["style:min-row-height"])
                 stylePropertiesOpen.addAttribute("style:min-row-height", mPropList["style:min-row-height"]->getStr());
@@ -88,12 +88,12 @@ void TableRowStyle::write(DocumentHandlerInterface *pHandler) const
     stylePropertiesOpen.addAttribute("fo:keep-together", "auto");
         stylePropertiesOpen.write(pHandler);
         pHandler->endElement("style:table-row-properties");
-
-    pHandler->endElement("style:style");
+    
+    pHandler->endElement("style:style");		
 }
+    
 
-
-TableStyle::TableStyle(const WPXPropertyList &xPropList, const WPXPropertyListVector &columns, const char *psName) :
+TableStyle::TableStyle(const WPXPropertyList &xPropList, const WPXPropertyListVector &columns, const char *psName) : 
     Style(psName),
         mPropList(xPropList),
         mColumns(columns)
@@ -135,7 +135,7 @@ void TableStyle::write(DocumentHandlerInterface *pHandler) const
     pHandler->endElement("style:table-properties");
 
     pHandler->endElement("style:style");
-
+        
     int i=1;
         WPXPropertyListVector::Iter j(mColumns);
     for (j.rewind(); j.next();)
diff --git a/writerperfect/source/filter/TextRunStyle.cxx b/writerperfect/source/filter/TextRunStyle.cxx
index 96101a0a7608..7ee21ffdd1b6 100644
--- a/writerperfect/source/filter/TextRunStyle.cxx
+++ b/writerperfect/source/filter/TextRunStyle.cxx
@@ -113,7 +113,7 @@ void ParagraphStyle::write(DocumentHandlerInterface *pHandler) const
             WPXPropertyList::Iter j(i2());
                         for (j.rewind(); j.next(); )
                         {
-                                tabStopOpen.addAttribute(j.key(), j()->getStr().cstr());
+                                tabStopOpen.addAttribute(j.key(), j()->getStr().cstr());			
                         }
                         tabStopOpen.write(pHandler);
                         pHandler->endElement("style:tab-stop");
diff --git a/writerperfect/source/stream/WPXSvStream.cxx b/writerperfect/source/stream/WPXSvStream.cxx
index fd7d98604a07..e0cba748317c 100644
--- a/writerperfect/source/stream/WPXSvStream.cxx
+++ b/writerperfect/source/stream/WPXSvStream.cxx
@@ -84,7 +84,7 @@ int WPXSvInputStream::seek(long offset, WPX_SEEK_TYPE seekType)
 
     int retVal = 0;
     if (tmpOffset < 0)
-    {
+    {	
         tmpOffset = 0;
         retVal = -1;
     }
diff --git a/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx b/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx
index 606b6160f686..cf70c6d46340 100644
--- a/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx
+++ b/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx
@@ -139,7 +139,7 @@ sal_Bool SAL_CALL WordPerfectImportFilter::importImpl( const Sequence< ::com::su
     OUString sXMLImportService ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.XMLOasisImporter" ) );
     uno::Reference < XDocumentHandler > xInternalHandler( mxMSF->createInstance( sXMLImportService ), UNO_QUERY );
 
-    // The XImporter sets up an empty target document for XDocumentHandler to write to..
+    // The XImporter sets up an empty target document for XDocumentHandler to write to.. 
     uno::Reference < XImporter > xImporter(xInternalHandler, UNO_QUERY);
     xImporter->setTargetDocument(mxDoc);
 
@@ -209,13 +209,13 @@ OUString SAL_CALL WordPerfectImportFilter::detect( com::sun::star::uno::Sequence
         {
             return ::rtl::OUString();
         }
-
+        
                 if (!xInputStream.is())
                     return ::rtl::OUString();
         }
-
+        
     WPXSvInputStream input( xInputStream );
-
+    
     if (input.atEOS())
         return ::rtl::OUString();
 
@@ -235,12 +235,12 @@ OUString SAL_CALL WordPerfectImportFilter::detect( com::sun::star::uno::Sequence
            Descriptor[location].Value <<=sTypeName;
     }
 
-    return sTypeName;
+    return sTypeName;	
 }
 
 
 // XInitialization
-void SAL_CALL WordPerfectImportFilter::initialize( const Sequence< Any >& aArguments )
+void SAL_CALL WordPerfectImportFilter::initialize( const Sequence< Any >& aArguments ) 
     throw (Exception, RuntimeException)
 {
     WRITER_DEBUG_MSG(("WordPerfectImportFilter::initialize: Got here!\n"));
@@ -268,19 +268,19 @@ OUString WordPerfectImportFilter_getImplementationName ()
 
 #define SERVICE_NAME1 "com.sun.star.document.ImportFilter"
 #define SERVICE_NAME2 "com.sun.star.document.ExtendedTypeDetection"
-sal_Bool SAL_CALL WordPerfectImportFilter_supportsService( const OUString& ServiceName )
+sal_Bool SAL_CALL WordPerfectImportFilter_supportsService( const OUString& ServiceName ) 
     throw (RuntimeException)
 {
     return (ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME1 ) ) ||
         ServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( SERVICE_NAME2 ) ) );
 }
-Sequence< OUString > SAL_CALL WordPerfectImportFilter_getSupportedServiceNames(  )
+Sequence< OUString > SAL_CALL WordPerfectImportFilter_getSupportedServiceNames(  ) 
     throw (RuntimeException)
 {
     Sequence < OUString > aRet(2);
         OUString* pArray = aRet.getArray();
         pArray[0] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME1 ) );
-    pArray[1] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME2 ) );
+    pArray[1] =  OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME2 ) ); 
         return aRet;
 }
 #undef SERVICE_NAME2
@@ -293,17 +293,17 @@ uno::Reference< XInterface > SAL_CALL WordPerfectImportFilter_createInstance( co
 }
 
 // XServiceInfo
-OUString SAL_CALL WordPerfectImportFilter::getImplementationName(  )
+OUString SAL_CALL WordPerfectImportFilter::getImplementationName(  ) 
     throw (RuntimeException)
 {
     return WordPerfectImportFilter_getImplementationName();
 }
-sal_Bool SAL_CALL WordPerfectImportFilter::supportsService( const OUString& rServiceName )
+sal_Bool SAL_CALL WordPerfectImportFilter::supportsService( const OUString& rServiceName ) 
     throw (RuntimeException)
 {
     return WordPerfectImportFilter_supportsService( rServiceName );
 }
-Sequence< OUString > SAL_CALL WordPerfectImportFilter::getSupportedServiceNames(  )
+Sequence< OUString > SAL_CALL WordPerfectImportFilter::getSupportedServiceNames(  ) 
     throw (RuntimeException)
 {
     return WordPerfectImportFilter_getSupportedServiceNames();
diff --git a/writerperfect/source/wpdimp/WordPerfectImportFilter.hxx b/writerperfect/source/wpdimp/WordPerfectImportFilter.hxx
index 50b995ff70bf..2e8a2d5a7ff1 100644
--- a/writerperfect/source/wpdimp/WordPerfectImportFilter.hxx
+++ b/writerperfect/source/wpdimp/WordPerfectImportFilter.hxx
@@ -1,30 +1,30 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
+/* 
  * Copyright (C) 2000 by Sun Microsystems, Inc.
  * Copyright (C) 2002-2004 William Lachance (wlach@interlog.com)
  * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com)
  * Copyright (C) 2004 Fridrich Strba <fridrich.strba@bluewin.ch>
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
  * 02111-1307, USA.
  *
  *  Contributor(s): Martin Gallwey (gallwey@sun.com)
  *
  */
 
-/* "This product is not manufactured, approved, or supported by
+/* "This product is not manufactured, approved, or supported by 
  * Corel Corporation or Corel Corporation Limited."
  */
 #ifndef _WORDPERFECTIMPORTFILTER_HXX
@@ -42,7 +42,7 @@
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/implbase5.hxx>
 
-enum FilterType
+enum FilterType 
 {
     FILTER_IMPORT,
     FILTER_EXPORT
@@ -50,8 +50,8 @@ enum FilterType
 /* This component will be instantiated for both import or export. Whether it calls
  * setSourceDocument or setTargetDocument determines which Impl function the filter
  * member calls */
-class WordPerfectImportFilter : public cppu::WeakImplHelper5
-<
+class WordPerfectImportFilter : public cppu::WeakImplHelper5 
+< 
     com::sun::star::document::XFilter,
     com::sun::star::document::XImporter,
     com::sun::star::document::XExtendedFilterDetection,
@@ -68,7 +68,7 @@ protected:
 
     FilterType meType;
 
-    sal_Bool SAL_CALL importImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
+    sal_Bool SAL_CALL importImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) 
         throw (::com::sun::star::uno::RuntimeException);
 
 public:
@@ -77,29 +77,29 @@ public:
     virtual ~WordPerfectImportFilter() {}
 
     // XFilter
-        virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
+        virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) 
         throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL cancel(  )
+        virtual void SAL_CALL cancel(  ) 
         throw (::com::sun::star::uno::RuntimeException);
 
     // XImporter
-        virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc )
+        virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) 
         throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 
      //XExtendedFilterDetection
-    virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor )
+    virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor ) 
         throw( com::sun::star::uno::RuntimeException );
 
     // XInitialization
-        virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
+        virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) 
         throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+        virtual ::rtl::OUString SAL_CALL getImplementationName(  ) 
         throw (::com::sun::star::uno::RuntimeException);
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) 
         throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) 
         throw (::com::sun::star::uno::RuntimeException);
 
 };
@@ -107,10 +107,10 @@ public:
 ::rtl::OUString WordPerfectImportFilter_getImplementationName()
     throw ( ::com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL WordPerfectImportFilter_supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL WordPerfectImportFilter_supportsService( const ::rtl::OUString& ServiceName ) 
     throw ( ::com::sun::star::uno::RuntimeException );
 
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL WordPerfectImportFilter_getSupportedServiceNames(  )
+::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL WordPerfectImportFilter_getSupportedServiceNames(  ) 
     throw ( ::com::sun::star::uno::RuntimeException );
 
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
diff --git a/writerperfect/source/wpdimp/wpft_genericfilter.cxx b/writerperfect/source/wpdimp/wpft_genericfilter.cxx
index 216753640352..2e8264f051a7 100644
--- a/writerperfect/source/wpdimp/wpft_genericfilter.cxx
+++ b/writerperfect/source/wpdimp/wpft_genericfilter.cxx
@@ -3,24 +3,24 @@
  *
  * Portions of this code Copyright 2000 by Sun Microsystems, Inc.
  * Rest is Copyright (C) 2002 William Lachance (wlach@interlog.com)
- *
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
  * 02111-1307, USA.
  */
 
-/* "This product is not manufactured, approved, or supported by
+/* "This product is not manufactured, approved, or supported by 
  * Corel Corporation or Corel Corporation Limited."
  */
 #include <stdio.h>
@@ -56,9 +56,9 @@ sal_Bool SAL_CALL component_writeInfo(
         {
             sal_Int32 nPos = 0;
             Reference< XRegistryKey > xNewKey(
-                reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( WordPerfectImportFilter_getImplementationName() ) );
+                reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( WordPerfectImportFilter_getImplementationName() ) ); 
             xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
-
+            
             const Sequence< OUString > & rSNL = WordPerfectImportFilter_getSupportedServiceNames();
             const OUString * pArray = rSNL.getConstArray();
             for ( nPos = rSNL.getLength(); nPos--; )
@@ -94,7 +94,7 @@ void * SAL_CALL component_getFactory(
             reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
             OUString::createFromAscii( pImplName ),
             WordPerfectImportFilter_createInstance, WordPerfectImportFilter_getSupportedServiceNames() ) );
-
+        
         if (xFactory.is())
         {
             xFactory->acquire();
@@ -116,7 +116,7 @@ void * SAL_CALL component_getFactory(
         }
     }
 #endif
-
+    
     return pRet;
 }
 }