INTEGRATION: CWS libwpdupgrade (1.1.2); FILE MERGED

2005/02/07 18:33:52 rene 1.1.2.2: adapt to newer libwpd CVS since before, nothing worked at all ;)

Submitted By (like the last patches, forgot to mention it :/) : fridrich_strba@
2005/02/02 20:44:45 rene 1.1.2.1: upgrade writerperfect to new libwpd API and implement --with-system-libwpd.
Remove old libwpd/ stuff, tarball will come when the actual release happened :-)

1 files changed, 15 insertions, 39 deletions

diff --git a/writerperfect/source/filter/TextRunStyle.hxx b/writerperfect/source/filter/TextRunStyle.hxx
index 0ce6d3e7ad7d..4174113812f2 100644
--- a/writerperfect/source/filter/TextRunStyle.hxx
+++ b/writerperfect/source/filter/TextRunStyle.hxx
@@ -3,6 +3,7 @@
  * document.
  *
  * 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
@@ -32,56 +33,31 @@
 
 #include "Style.hxx"
 
-using com::sun::star::uno::Reference;
-using com::sun::star::xml::sax::XDocumentHandler;
-
 class TagOpenElement;
 class DocumentElement;
+class DocumentHandler;
 
-class SpanStyle : public Style
+class ParagraphStyle
 {
 public:
-    SpanStyle(const uint32_t iTextAttributeBits, const char *pFontName, const float fFontSize, const RGBSColor *pFontColor,
-          const RGBSColor *pHighlightColor, const char *psName);
-    virtual void write(Reference < XDocumentHandler > &xHandler) const;
-    const int getTextAttributeBits() const { return miTextAttributeBits; }
-    const UTF8String & getFontName() const { return msFontName; }
-    const float getFontSize() const { return mfFontSize; }
-
-    void _addTextProperties(TagOpenElement *pStylePropertiesOpenElement) const;
-
+    ParagraphStyle(WPXPropertyList *propList, const WPXPropertyListVector &tabStops, const WPXString &sName);
+    virtual ~ParagraphStyle();
+    virtual void write(DocumentHandler &xHandler) const;
+    WPXString getName() const { return msName; }
 private:
-    int miTextAttributeBits;
-    UTF8String msFontName;
-    float mfFontSize;
-    RGBSColor m_fontColor;
-    RGBSColor m_highlightColor;
+    WPXPropertyList *mpPropList;
+    WPXPropertyListVector mxTabStops;
+    WPXString msName;
 };
 
-class ParagraphStyle : public Style, public TopLevelElementStyle
+
+class SpanStyle : public Style
 {
 public:
-    ParagraphStyle(const uint8_t iParagraphJustification,
-               const float fMarginLeft, const float fMarginRight, const float fTextIndent,
-               const float fLineSpacing, const float fSpacingAfterParagraph,
-               const bool bColumnBreak, const bool bPageBreak, const char *psName, const char *psParentName);
-
-    virtual ~ParagraphStyle();
-
-    void setListStyleName(UTF8String &sListStyleName) { delete mpsListStyleName ; mpsListStyleName = new UTF8String(sListStyleName); }
-    virtual void write(Reference < XDocumentHandler > &xHandler) const;
-    const virtual bool isParagraphStyle() const { return true; }
+    SpanStyle(const char *psName, const WPXPropertyList &xPropList);
+    virtual void write(DocumentHandler &xHandler) const;
 
 private:
-    UTF8String msParentName;
-    UTF8String *mpsListStyleName;
-    float mfMarginLeft;
-    float mfMarginRight;
-    float mfTextIndent;
-    float mfLineSpacing;
-    float mfSpacingAfterParagraph;
-    uint8_t miParagraphJustification;
-    bool mbColumnBreak;
-    bool mbPageBreak;
+        WPXPropertyList mPropList;
 };
 #endif