ooo-build r12956 - trunk/patches/dev300

From: strba svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r12956 - trunk/patches/dev300
Date: Tue, 24 Jun 2008 20:19:04 +0000 (UTC)
Author: strba
Date: Tue Jun 24 20:19:03 2008
New Revision: 12956
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12956&view=rev

Log:
dumping some code for password dialogue

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

Modified: trunk/patches/dev300/writerperfect-testing.diff
==============================================================================
--- trunk/patches/dev300/writerperfect-testing.diff	(original)
+++ trunk/patches/dev300/writerperfect-testing.diff	Tue Jun 24 20:19:03 2008
@@ -1,5 +1,5 @@
---- 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
+--- writerperfect//source/filter/DocumentCollector.cxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/filter/DocumentCollector.cxx	2008-06-24 21:07:12.000000000 +0200
 @@ -39,6 +39,8 @@
  
  #include "DocumentCollector.hxx"
@@ -90,7 +90,7 @@
  		(*iterBody) = NULL;
  	}
  
-@@ -115,90 +131,113 @@
+@@ -115,97 +131,118 @@
  
  	WRITER_DEBUG_MSG(("Destroying the rest of the styles elements\n"));
  	for (std::map<WPXString, ParagraphStyle *, ltstr>::iterator iterTextStyle = mTextStyleHash.begin(); iterTextStyle != mTextStyleHash.end(); iterTextStyle++) {
@@ -162,8 +162,19 @@
 -	TagCloseElement defaultParagraphStyleCloseElement("style:default-style");
 -	defaultParagraphStyleCloseElement.write(pHandler);
 +	pHandler->endElement("style:default-style");
++
++	TagOpenElement defaultTableRowStyleOpenElement("style:default-style");
++	defaultTableRowStyleOpenElement.addAttribute("style:family", "table-row");
++	defaultTableRowStyleOpenElement.write(pHandler);
++
++	TagOpenElement defaultTableRowPropertiesOpenElement("style:table-row-properties");
++	defaultTableRowPropertiesOpenElement.addAttribute("fo:keep-together", "auto");
++	defaultTableRowPropertiesOpenElement.write(pHandler);
++
++	pHandler->endElement("style:table-row-properties");
++	pHandler->endElement("style:default-style");
  
--	TagOpenElement standardStyleOpenElement("style:style");
+ 	TagOpenElement standardStyleOpenElement("style:style");
 -        standardStyleOpenElement.addAttribute("style:name", "Standard");
 -        standardStyleOpenElement.addAttribute("style:family", "paragraph");
 -        standardStyleOpenElement.addAttribute("style:class", "text");
@@ -197,20 +208,9 @@
 -        tableHeadingStyleOpenElement.write(pHandler);
 -        TagCloseElement tableHeadingStyleCloseElement("style:style");
 -        tableHeadingStyleCloseElement.write(pHandler);
-+	TagOpenElement defaultTableRowStyleOpenElement("style:default-style");
-+	defaultTableRowStyleOpenElement.addAttribute("style:family", "table-row");
-+	defaultTableRowStyleOpenElement.write(pHandler);
-+
-+	TagOpenElement defaultTableRowPropertiesOpenElement("style:table-row-properties");
-+	defaultTableRowPropertiesOpenElement.addAttribute("fo:keep-together", "auto");
-+	defaultTableRowPropertiesOpenElement.write(pHandler);
-+
-+	pHandler->endElement("style:table-row-properties");
-+	pHandler->endElement("style:default-style");
- 
+-
 -	TagCloseElement stylesCloseElement("office:styles");
 -	stylesCloseElement.write(pHandler);
-+	TagOpenElement standardStyleOpenElement("style:style");
 +	standardStyleOpenElement.addAttribute("style:name", "Standard");
 +	standardStyleOpenElement.addAttribute("style:family", "paragraph");
 +	standardStyleOpenElement.addAttribute("style:class", "text");
@@ -255,11 +255,6 @@
 +	pHandler->endElement("office:styles");
  }
  
- // writes everything up to the automatic styles declarations..
-@@ -206,11 +245,9 @@
- {
- }
- 
 -void DocumentCollector::_writeMasterPages(DocumentHandler *pHandler)
 +void DocumentCollector::_writeMasterPages(DocumentHandlerInterface *pHandler)
  {
@@ -270,7 +265,7 @@
  	int pageNumber = 1;
  	for (unsigned int i=0; i<mPageSpans.size(); i++)
  	{
-@@ -222,99 +259,118 @@
+@@ -217,99 +254,118 @@
  	pHandler->endElement("office:master-styles");
  }
  
@@ -428,7 +423,7 @@
  
  
  	pHandler->endElement("office:automatic-styles");
-@@ -323,15 +379,20 @@
+@@ -318,15 +374,20 @@
  
   	WRITER_DEBUG_MSG(("WriterWordPerfect: Document Body: Writing out the document..\n"));
   	// writing out the document
@@ -452,7 +447,7 @@
  
  	pHandler->endDocument();
  
-@@ -341,32 +402,32 @@
+@@ -336,32 +397,32 @@
  
  WPXString propListToStyleKey(const WPXPropertyList & xPropList)
  {
@@ -505,7 +500,7 @@
  }
  
  // _allocateFontName: add a (potentially mapped) font style to the hash if it's not already there, do nothing otherwise
-@@ -379,11 +440,29 @@
+@@ -374,11 +435,29 @@
  	}
  }
  
@@ -535,7 +530,7 @@
  }
  
  void DocumentCollector::openHeader(const WPXPropertyList &propList)
-@@ -391,9 +470,9 @@
+@@ -386,9 +465,9 @@
  	std::vector<DocumentElement *> * pHeaderFooterContentElements = new std::vector<DocumentElement *>;
  
  	if (propList["libwpd:occurence"]->getStr() == "even")
@@ -548,7 +543,7 @@
  
  	mpCurrentContentElements = pHeaderFooterContentElements;
  }
-@@ -408,9 +487,9 @@
+@@ -403,9 +482,9 @@
  	std::vector<DocumentElement *> * pHeaderFooterContentElements = new std::vector<DocumentElement *>;
  
  	if (propList["libwpd:occurence"]->getStr() == "even")
@@ -561,7 +556,7 @@
  
  	mpCurrentContentElements = pHeaderFooterContentElements;
  }
-@@ -422,7 +501,7 @@
+@@ -417,7 +496,7 @@
  
  void DocumentCollector::openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns)
  {
@@ -570,7 +565,7 @@
  	float fSectionMarginLeft = 0.0f;
  	float fSectionMarginRight = 0.0f;
  	if (propList["fo:margin-left"])
-@@ -432,38 +511,33 @@
+@@ -427,38 +506,33 @@
  
  	if (iNumColumns > 1 || fSectionMarginLeft != 0 || fSectionMarginRight != 0)
  	{
@@ -621,7 +616,7 @@
  	mfSectionSpaceAfter = 0.0f;
  }
  
-@@ -471,11 +545,11 @@
+@@ -466,11 +540,11 @@
  {
  	// FIXMENOW: What happens if we open a footnote inside a table? do we then inherit the footnote's style
  	// from "Table Contents"
@@ -635,7 +630,7 @@
  	{
  		// 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
-@@ -487,31 +561,35 @@
+@@ -482,31 +556,35 @@
  		sName.sprintf("FS");
  
  		WPXString sParagraphHashKey("P|FS");
@@ -682,7 +677,7 @@
  			mTextStyleHash[sKey] = pStyle;
  		}
  		else
-@@ -523,56 +601,56 @@
+@@ -518,56 +596,56 @@
  	// create a document element corresponding to the paragraph, and append it to our list of document elements
  	TagOpenElement *pParagraphOpenElement = new TagOpenElement("text:p");
  	pParagraphOpenElement->addAttribute("text:style-name", pStyle->getName());
@@ -754,7 +749,7 @@
  
  	// this rather appalling conditional makes sure we only start a new list (rather than continue an old
  	// one) if: (1) we have no prior list OR (2) the prior list is actually definitively different
-@@ -580,168 +658,174 @@
+@@ -575,168 +653,174 @@
  	// 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 && 
@@ -1005,7 +1000,7 @@
  }
  
  void DocumentCollector::closeListElement()
-@@ -750,183 +834,234 @@
+@@ -745,183 +829,234 @@
  	// could contain another list level in OOo's implementation of lists). that is done in the closeListLevel
  	// code (or when we open another list element)
  
@@ -1105,33 +1100,33 @@
 +
 +	mpCurrentContentElements->push_back(new TagCloseElement("text:note-body"));
 +	mpCurrentContentElements->push_back(new TagCloseElement("text:note"));
++}
++
++void DocumentCollector::openComment(const WPXPropertyList & /* propList */)
++{
++	mWriterListStates.push(WriterListState());
++	mpCurrentContentElements->push_back(new TagOpenElement("office:annotation"));
++
++	mWriterDocumentStates.top().mbInNote = true;
  }
  
 -void DocumentCollector::openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns)
-+void DocumentCollector::openComment(const WPXPropertyList & /* propList */)
++void DocumentCollector::closeComment()
  {
 -	WPXString sTableName;
 -	sTableName.sprintf("Table%i", mTableStyles.size());
-+	mWriterListStates.push(WriterListState());
-+	mpCurrentContentElements->push_back(new TagOpenElement("office:annotation"));
++	mWriterDocumentStates.top().mbInNote = false;
++	if (mWriterListStates.size() > 1)
++		mWriterListStates.pop();
  
 -	// FIXME: we base the table style off of the page's margin left, ignoring (potential) wordperfect margin
 -	// state which is transmitted inside the page. could this lead to unacceptable behaviour?
 -        // WLACH_REFACTORING: characterize this behaviour, probably should nip it at the bud within libwpd
 -	TableStyle *pTableStyle = new TableStyle(propList, columns, sTableName.cstr());
-+	mWriterDocumentStates.top().mbInNote = true;
++	mpCurrentContentElements->push_back(new TagCloseElement("office:annotation"));
 +}
-+
-+void DocumentCollector::closeComment()
-+{
-+	mWriterDocumentStates.top().mbInNote = false;
-+	if (mWriterListStates.size() > 1)
-+		mWriterListStates.pop();
  
 -	if (mWriterDocumentState.mbFirstElement && mpCurrentContentElements == &mBodyElements)
-+	mpCurrentContentElements->push_back(new TagCloseElement("office:annotation"));
-+}
-+
 +void DocumentCollector::openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns)
 +{
 +	if (!mWriterDocumentStates.top().mbInNote)
@@ -1142,13 +1137,14 @@
 -	}
 +		WPXString sTableName;
 +		sTableName.sprintf("Table%i", mTableStyles.size());
-+
+ 
+-	mTableStyles.push_back(pTableStyle);
 +		// FIXME: we base the table style off of the page's margin left, ignoring (potential) wordperfect margin
 +		// state which is transmitted inside the page. could this lead to unacceptable behaviour?
 +		// WLACH_REFACTORING: characterize this behaviour, probably should nip it at the bud within libwpd
 +		TableStyle *pTableStyle = new TableStyle(propList, columns, sTableName.cstr());
  
--	mTableStyles.push_back(pTableStyle);
+-	mpCurrentTableStyle = pTableStyle;
 +		if (mWriterDocumentStates.top().mbFirstElement && mpCurrentContentElements == &mBodyElements)
 +		{
 +			WPXString sMasterPageName("Page_Style_1");
@@ -1156,16 +1152,13 @@
 +			mWriterDocumentStates.top().mbFirstElement = false;
 +		}
  
--	mpCurrentTableStyle = pTableStyle;
-+		mTableStyles.push_back(pTableStyle);
- 
 -	TagOpenElement *pTableOpenElement = new TagOpenElement("table:table");
-+		mpCurrentTableStyle = pTableStyle;
++		mTableStyles.push_back(pTableStyle);
  
 -	pTableOpenElement->addAttribute("table:name", sTableName.cstr());
 -	pTableOpenElement->addAttribute("table:style-name", sTableName.cstr());
 -	mpCurrentContentElements->push_back(static_cast<DocumentElement *>(pTableOpenElement));
-+		TagOpenElement *pTableOpenElement = new TagOpenElement("table:table");
++		mpCurrentTableStyle = pTableStyle;
  
 -	for (int i=0; i<pTableStyle->getNumColumns(); i++) 
 -        {
@@ -1174,6 +1167,8 @@
 -		sColumnStyleName.sprintf("%s.Column%i", sTableName.cstr(), (i+1));
 -		pTableColumnOpenElement->addAttribute("table:style-name", sColumnStyleName.cstr());
 -		mpCurrentContentElements->push_back(pTableColumnOpenElement);
++		TagOpenElement *pTableOpenElement = new TagOpenElement("table:table");
++
 +		pTableOpenElement->addAttribute("table:name", sTableName.cstr());
 +		pTableOpenElement->addAttribute("table:style-name", sTableName.cstr());
 +		mpCurrentContentElements->push_back(pTableOpenElement);
@@ -1333,7 +1328,7 @@
  }
  
  void DocumentCollector::insertText(const WPXString &text)
-@@ -934,3 +1069,195 @@
+@@ -929,3 +1064,195 @@
  	DocumentElement *pText = new TextElement(text);
  	mpCurrentContentElements->push_back(pText);
  }
@@ -1529,8 +1524,8 @@
 +	mpCurrentContentElements->push_back(new TagCloseElement("draw:text-box"));
 +}
 +
---- 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
+--- writerperfect//source/filter/DocumentCollector.hxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/filter/DocumentCollector.hxx	2008-06-24 21:07:12.000000000 +0200
 @@ -45,8 +45,9 @@
  #include <stack>
  #include <string.h>
@@ -1655,7 +1650,7 @@
  
  	// paragraph styles
  	std::map<WPXString, ParagraphStyle *, ltstr> mTextStyleHash;
-@@ -170,10 +200,18 @@
+@@ -169,10 +199,18 @@
  
  	// table styles
  	std::vector<TableStyle *> mTableStyles;
@@ -1675,7 +1670,7 @@
  	// style elements
  	std::vector<DocumentElement *> mStylesElements;
  	// content elements
-@@ -186,18 +224,18 @@
+@@ -185,18 +223,18 @@
  	PageSpan *mpCurrentPageSpan;
  	int miNumPageStyles;
  
@@ -1702,8 +1697,8 @@
  };
  
  #endif
---- 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
+--- writerperfect//source/filter/DocumentElement.cxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/filter/DocumentElement.cxx	2008-06-24 21:07:12.000000000 +0200
 @@ -26,6 +26,7 @@
   */
  
@@ -1750,8 +1745,8 @@
  	WPXPropertyList xBlankAttrList;
          
  	WPXString sTemp;
---- 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
+--- writerperfect//source/filter/DocumentElement.hxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/filter/DocumentElement.hxx	2008-06-24 21:07:12.000000000 +0200
 @@ -21,36 +21,31 @@
   *
   */
@@ -1839,9 +1834,9 @@
 -
 + 
  #endif
---- 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 @@
+--- writerperfect//source/filter/DocumentHandler.hxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/filter/DocumentHandler.hxx	2008-06-24 21:07:12.000000000 +0200
+@@ -11,10 +11,12 @@
  #pragma warning( pop )
  #endif
  
@@ -1855,8 +1850,8 @@
  {
  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-09 11:04:24.000000000 +0200
+--- writerperfect//source/filter/DocumentHandlerInterface.hxx	1970-01-01 01:00:00.000000000 +0100
++++ writerperfect//source/filter/DocumentHandlerInterface.hxx	2008-06-24 21:07:12.000000000 +0200
 @@ -0,0 +1,45 @@
 +/*
 + * Copyright (C) 2004 William Lachance (wlach interlog com)
@@ -1903,8 +1898,8 @@
 +        virtual void characters(const WPXString &sCharacters) = 0;
 +};
 +#endif
---- 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
+--- writerperfect//source/filter/FontStyle.cxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/filter/FontStyle.cxx	2008-06-24 21:07:12.000000000 +0200
 @@ -29,7 +29,7 @@
  #include "DocumentElement.hxx"
  
@@ -1933,8 +1928,8 @@
 +	TagCloseElement styleClose("style:font-face");
  	styleClose.write(pHandler);
  }
---- 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
+--- writerperfect//source/filter/FontStyle.hxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/filter/FontStyle.hxx	2008-06-24 21:07:12.000000000 +0200
 @@ -21,28 +21,23 @@
   *
   */
@@ -1967,8 +1962,8 @@
  	const WPXString &getFontFamily() const { return msFontFamily; }
  
  private:
---- writerperfect/source/filter/GraphicsStyle.cxx	1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect/source/filter/GraphicsStyle.cxx	2008-04-09 11:04:24.000000000 +0200
+--- writerperfect//source/filter/GraphicsStyle.cxx	1970-01-01 01:00:00.000000000 +0100
++++ writerperfect//source/filter/GraphicsStyle.cxx	2008-06-24 21:07:12.000000000 +0200
 @@ -0,0 +1,40 @@
 +/* GraphicsStyle:
 + *
@@ -2010,8 +2005,8 @@
 +void GraphicsStyle::write(DocumentHandlerInterface * /* pHandler */) const
 +{        
 +}
---- writerperfect/source/filter/GraphicsStyle.hxx	1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect/source/filter/GraphicsStyle.hxx	2008-04-09 11:04:24.000000000 +0200
+--- writerperfect//source/filter/GraphicsStyle.hxx	1970-01-01 01:00:00.000000000 +0100
++++ writerperfect//source/filter/GraphicsStyle.hxx	2008-06-24 21:07:12.000000000 +0200
 @@ -0,0 +1,40 @@
 +/* GraphicsStyle:
 + *
@@ -2053,8 +2048,8 @@
 +	virtual void write(DocumentHandlerInterface *pHandler) const;
 +};
 +#endif
---- writerperfect/source/filter/InternalHandler.cxx	1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect/source/filter/InternalHandler.cxx	2008-04-09 11:04:24.000000000 +0200
+--- writerperfect//source/filter/InternalHandler.cxx	1970-01-01 01:00:00.000000000 +0100
++++ writerperfect//source/filter/InternalHandler.cxx	2008-06-24 21:07:12.000000000 +0200
 @@ -0,0 +1,54 @@
 +/*
 + * Copyright (C) 2007 Fridrich Strba  strba bluewin ch)
@@ -2110,8 +2105,8 @@
 +{
 +	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-09 11:04:24.000000000 +0200
+--- writerperfect//source/filter/InternalHandler.hxx	1970-01-01 01:00:00.000000000 +0100
++++ writerperfect//source/filter/InternalHandler.hxx	2008-06-24 21:07:12.000000000 +0200
 @@ -0,0 +1,46 @@
 +/*
 + * Copyright (C) 2007 Fridrich Strba  strba bluewin ch)
@@ -2159,8 +2154,8 @@
 +	std::vector<DocumentElement *> *mpElements;
 +};
 +#endif
---- 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
+--- writerperfect//source/filter/ListStyle.cxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/filter/ListStyle.cxx	2008-06-24 21:07:12.000000000 +0200
 @@ -29,7 +29,7 @@
  #include "DocumentElement.hxx"
  
@@ -2290,8 +2285,8 @@
  {
  	TagOpenElement listStyleOpenElement("text:list-style");
  	listStyleOpenElement.addAttribute("style:name", getName());
---- 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
+--- writerperfect//source/filter/ListStyle.hxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/filter/ListStyle.hxx	2008-06-24 21:07:12.000000000 +0200
 @@ -21,23 +21,18 @@
   *
   */
@@ -2353,9 +2348,9 @@
  	const int getListID() { return miListID; }
  	const bool isListLevelDefined(int iLevel) const;
  
---- 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,6 +12,10 @@
+--- writerperfect//source/filter/makefile.mk	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/filter/makefile.mk	2008-06-24 21:07:12.000000000 +0200
+@@ -10,6 +10,10 @@
  INCPRE+=$(LIBWPD_CFLAGS)
  .ENDIF
  
@@ -2366,7 +2361,7 @@
  .IF "$(SYSTEM_LIBWPS)" == "YES"
  INCPRE+=$(LIBWPS_CFLAGS)
  .ENDIF
-@@ -18,14 +22,17 @@ 
+@@ -18,14 +22,17 @@
  INCPRE+= -I..
  
  SLOFILES= \
@@ -2393,8 +2388,8 @@
 +	$(SLO)$/TextRunStyle.obj
  
  .INCLUDE :  target.mk
---- writerperfect/source/filter/OdgExporter.cxx	1970-01-01 01:00:00.000000000 +0100
-+++ writerperfect/source/filter/OdgExporter.cxx	2008-04-09 11:04:24.000000000 +0200
+--- writerperfect//source/filter/OdgExporter.cxx	1970-01-01 01:00:00.000000000 +0100
++++ writerperfect//source/filter/OdgExporter.cxx	2008-06-24 21:07:12.000000000 +0200
 @@ -0,0 +1,615 @@
 +/* libwpg
 + * Copyright (C) 2006 Ariya Hidayat (ariya kde org)
@@ -3011,8 +3006,8 @@
 +	}
 +	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-09 11:04:24.000000000 +0200
+--- writerperfect//source/filter/OdgExporter.hxx	1970-01-01 01:00:00.000000000 +0100
++++ writerperfect//source/filter/OdgExporter.hxx	2008-06-24 21:07:12.000000000 +0200
 @@ -0,0 +1,85 @@
 +/* libwpg
 + * Copyright (C) 2006 Ariya Hidayat (ariya kde org)
@@ -3099,10 +3094,10 @@
 +};
 +
 +#endif // __ODGEXPORTER_HXX__
---- 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; 
+--- writerperfect//source/filter/PageSpan.cxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/filter/PageSpan.cxx	2008-06-24 21:07:12.000000000 +0200
+@@ -87,39 +87,38 @@
+         return 0; // should never happen
  }
  
 -void PageSpan::writePageMaster(const int iNum, DocumentHandler *pHandler) const
@@ -3155,7 +3150,7 @@
  {
  	int iSpan = 0;
  	(bLastPageSpan) ? iSpan = 1 : iSpan = getSpan();
-@@ -143,38 +142,66 @@
+@@ -127,38 +126,66 @@
  	for (int i=iStartingNum; i<(iStartingNum+iSpan); i++)
  	{
  		TagOpenElement masterPageOpen("style:master-page");
@@ -3232,7 +3227,7 @@
  {
  	TagOpenElement headerFooterOpen(headerFooterTagName);
  	headerFooterOpen.write(pHandler);
-@@ -183,7 +210,4 @@
+@@ -167,7 +194,4 @@
  	     iter++) {
  		(*iter)->write(pHandler);
  	}
@@ -3240,8 +3235,8 @@
 -	headerFooterClose.write(pHandler);
  }
 -
---- 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
+--- writerperfect//source/filter/PageSpan.hxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/filter/PageSpan.hxx	2008-06-24 21:07:12.000000000 +0200
 @@ -26,25 +26,20 @@
   */
  #ifndef _PAGESPAN_H
@@ -3270,9 +3265,9 @@
 +	void writePageLayout(const int iNum, DocumentHandlerInterface *pHandler) const;
 +	void writeMasterPages(const int iStartingNum, const int iPageLayoutNum, const bool bLastPageSpan, DocumentHandlerInterface *pHandler) const;
  	int getSpan() const;
- 	float getMarginLeft() const;
- 	float getMarginRight() const;
-@@ -56,7 +51,7 @@
+ 
+ 	const std::vector<DocumentElement *> * getHeaderContent() const { return mpHeaderContent; }
+@@ -54,7 +49,7 @@
  	void setFooterLeftContent(std::vector<DocumentElement *> * pFooterContent) { mpFooterLeftContent = pFooterContent; }
  protected:
  	void _writeHeaderFooter(const char *headerFooterTagName, const std::vector<DocumentElement *> & headerFooterContent,
@@ -3281,8 +3276,8 @@
  private:
          WPXPropertyList mxPropList;
  	std::vector<DocumentElement *> * mpHeaderContent;
---- 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
+--- writerperfect//source/filter/SectionStyle.cxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/filter/SectionStyle.cxx	2008-06-24 21:07:12.000000000 +0200
 @@ -33,7 +33,7 @@
  
  #ifdef _MSC_VER
@@ -3329,8 +3324,8 @@
  
  	pHandler->endElement("style:style");
  }
---- 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
+--- writerperfect//source/filter/SectionStyle.hxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/filter/SectionStyle.hxx	2008-06-24 21:07:12.000000000 +0200
 @@ -21,19 +21,13 @@
   *
   */
@@ -3365,8 +3360,8 @@
  	WPXPropertyListVector mColumns;
  };
  #endif
---- 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
+--- writerperfect//source/filter/Style.hxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/filter/Style.hxx	2008-06-24 21:07:12.000000000 +0200
 @@ -21,19 +21,13 @@
   *
   */
@@ -3397,8 +3392,8 @@
  	const WPXString &getName() const { return msName; }
  
   private:
---- 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
+--- writerperfect//source/filter/TableStyle.cxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/filter/TableStyle.cxx	2008-06-24 21:07:12.000000000 +0200
 @@ -27,7 +27,6 @@
   * Corel Corporation or Corel Corporation Limited."
   */
@@ -3515,8 +3510,8 @@
  
  		pHandler->endElement("style:style");
  
---- 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
+--- writerperfect//source/filter/TableStyle.hxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/filter/TableStyle.hxx	2008-06-24 21:07:12.000000000 +0200
 @@ -22,57 +22,53 @@
   *
   */
@@ -3587,8 +3582,8 @@
  	WPXPropertyListVector mColumns;
  	std::vector<TableCellStyle *> mTableCellStyles;
  	std::vector<TableRowStyle *> mTableRowStyles;
---- 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
+--- writerperfect//source/filter/TextRunStyle.cxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/filter/TextRunStyle.cxx	2008-06-24 21:07:12.000000000 +0200
 @@ -50,91 +50,95 @@
  	delete mpPropList;
  }
@@ -3766,8 +3761,8 @@
 +	pHandler->endElement("style:text-properties");
  	pHandler->endElement("style:style");
  }
---- 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
+--- writerperfect//source/filter/TextRunStyle.hxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/filter/TextRunStyle.hxx	2008-06-24 21:07:12.000000000 +0200
 @@ -29,26 +29,19 @@
  
  #ifndef _TEXTRUNSTYLE_H
@@ -3805,16 +3800,16 @@
  
  private:
          WPXPropertyList mPropList;
---- 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
+--- writerperfect//source/filter/WriterProperties.hxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/filter/WriterProperties.hxx	2008-06-24 21:07:12.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-09 11:04:01.000000000 +0200
-+++ writerperfect/source/stream/WPXSvStream.cxx	2008-04-09 11:06:19.000000000 +0200
+--- writerperfect//source/stream/WPXSvStream.cxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/stream/WPXSvStream.cxx	2008-06-24 21:07:12.000000000 +0200
 @@ -9,7 +9,7 @@
  using namespace ::com::sun::star::io;
  
@@ -3851,8 +3846,8 @@
 -{
 -	return getDocumentOLEStream( "PerfectOffice_MAIN" );
 -}
---- 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
+--- writerperfect//source/stream/WPXSvStream.h	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/stream/WPXSvStream.h	2008-06-24 21:07:12.000000000 +0200
 @@ -12,13 +12,12 @@
  #if defined _MSC_VER
  #pragma warning( push, 1 )
@@ -3881,8 +3876,8 @@
  	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
  	virtual long tell();
  	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
+--- writerperfect//source/wpdimp/makefile.mk	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/wpdimp/makefile.mk	2008-06-24 21:07:12.000000000 +0200
 @@ -10,6 +10,10 @@
  INCPRE+=$(LIBWPD_CFLAGS)
  .ENDIF
@@ -3894,8 +3889,8 @@
  .IF "$(SYSTEM_LIBWPS)" == "YES"
  INCPRE+=$(LIBWPS_CFLAGS)
  .ENDIF
---- 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
+--- writerperfect//source/wpdimp/WordPerfectCollector.cxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/wpdimp/WordPerfectCollector.cxx	2008-06-24 21:07:12.000000000 +0200
 @@ -35,7 +35,7 @@
  #pragma warning( pop )
  #endif
@@ -3917,8 +3912,8 @@
          if (result != WPD_OK)
                  return false;
  
---- 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
+--- writerperfect//source/wpdimp/WordPerfectCollector.hxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/wpdimp/WordPerfectCollector.hxx	2008-06-24 21:07:12.000000000 +0200
 @@ -30,12 +30,13 @@
  #define _WORDPERFECTCOLLECTOR_HXX
  
@@ -3935,9 +3930,32 @@
 +	bool parseSourceDocument(WPXInputStream &pInput);
  };
  #endif
---- 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 @@
+--- writerperfect//source/wpdimp/WordPerfectImportFilter.cxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/wpdimp/WordPerfectImportFilter.cxx	2008-06-24 21:14:26.000000000 +0200
+@@ -50,6 +50,7 @@
+ #include <xmloff/xmlkywd.hxx>
+ #endif
+ #include <ucbhelper/content.hxx>
++#include <sfx2/passwd.hxx>
+ 
+ #include "filter/FilterInternal.hxx"
+ #include "filter/DocumentHandler.hxx"
+@@ -98,7 +99,13 @@
+ 	throw (RuntimeException)
+ {
+ 	WRITER_DEBUG_MSG(("WordPerfectImportFilter::importImpl: Got here!\n"));
+-
++	String aPasswd;
++	{
++			SfxPasswordDialog* pPasswdDlg =
++					new SfxPasswordDialog( 0 );
++				if(pPasswdDlg->Execute())
++					aPasswd = pPasswdDlg->GetPassword();
++	}
+ 	sal_Int32 nLength = aDescriptor.getLength();
+ 	const PropertyValue * pValue = aDescriptor.getConstArray();
+ 	OUString sURL;
+@@ -119,7 +126,7 @@
  	sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
  
  	// An XML import service: what we push sax messages to..
@@ -3946,7 +3964,7 @@
  	uno::Reference < XDocumentHandler > xInternalHandler( mxMSF->createInstance( sXMLImportService ), UNO_QUERY );
  
  	// The XImporter sets up an empty target document for XDocumentHandler to write to.. 
-@@ -221,7 +221,7 @@
+@@ -204,7 +211,7 @@
  	if (input.atEOS())
          return ::rtl::OUString();
  
@@ -3955,8 +3973,8 @@
  
  	if (confidence == WPD_CONFIDENCE_EXCELLENT)
  		sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "writer_WordPerfect_Document" ) );
---- 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
+--- writerperfect//source/wpgimp/makefile.mk	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/wpgimp/makefile.mk	2008-06-24 21:07:12.000000000 +0200
 @@ -12,12 +12,6 @@
  INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
  .ENDIF
@@ -3978,8 +3996,8 @@
      $(SLO)$/WPGImportFilter.obj \
  	$(SLO)$/wpgimport_genericfilter.obj		
  
---- 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
+--- writerperfect//source/wpgimp/WPGImportFilter.cxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/wpgimp/WPGImportFilter.cxx	2008-06-24 21:07:12.000000000 +0200
 @@ -75,7 +75,7 @@
  #endif
  
@@ -4023,8 +4041,8 @@
  	if (libwpg::WPGraphics::isSupported(input))
  		sTypeName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "draw_WordPerfect_Graphics" ) );
  
---- 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
+--- writerperfect//source/wpsimp/MSWorksCollector.cxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/wpsimp/MSWorksCollector.cxx	2008-06-24 21:07:12.000000000 +0200
 @@ -29,7 +29,7 @@
  #include "MSWorksCollector.hxx"
  #include <libwps/WPSDocument.h>
@@ -4046,8 +4064,8 @@
          if (result != WPS_OK)
                  return false;
  
---- 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
+--- writerperfect//source/wpsimp/MSWorksCollector.hxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/wpsimp/MSWorksCollector.hxx	2008-06-24 21:07:12.000000000 +0200
 @@ -30,12 +30,13 @@
  #define _MSWORKSCOLLECTOR_HXX
  
@@ -4064,8 +4082,8 @@
 +	bool parseSourceDocument(WPXInputStream &input);
  };
  #endif
---- 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
+--- writerperfect//source/wpsimp/MSWorksImportFilter.cxx	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//source/wpsimp/MSWorksImportFilter.cxx	2008-06-24 21:07:12.000000000 +0200
 @@ -127,7 +127,7 @@
  	sFileName = OUStringToOString(sURL, RTL_TEXTENCODING_INFO_ASCII);
  	
@@ -4084,10 +4102,20 @@
  
  	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) \
+Files writerperfect//unxlngi6.pro/lib/libwpftli.so and writerperfect//unxlngi6.pro/lib/libwpftli.so differ
+--- writerperfect//util/makefile.mk	2008-06-24 21:05:26.000000000 +0200
++++ writerperfect//util/makefile.mk	2008-06-24 21:40:23.000000000 +0200
+@@ -44,6 +44,8 @@
+ 	$(SOTLIB) \
+ 	$(SO2LIB) \
+ 	$(SVTOOLLIB) \
++	$(SFXLIB) \
++	$(VCLLIB) \
+ 	$(UNOTOOLSLIB) \
+ 	$(TOOLSLIB) \
+ 	$(COMPHELPERLIB) \
+@@ -52,7 +54,8 @@
+ 	$(CPPULIB) \
  	$(SALLIB) \
  	$(XMLOFFLIB) \
 -	$(LIBWPD)
@@ -4096,7 +4124,7 @@
  
  SHL1TARGET = wpft$(DLLPOSTFIX)
  SHL1IMPLIB = i$(SHL1TARGET)
-@@ -82,7 +83,8 @@
+@@ -81,7 +84,8 @@
  	$(SALLIB) \
  	$(XMLOFFLIB) \
  	$(LIBWPS) \
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]