[Libreoffice-commits] .: writerperfect/source

[Fridrich Strba]

 writerperfect/source/filter/FilterInternal.hxx |   30 -------------------------
 writerperfect/source/filter/OdgGenerator.cxx   |    2 -
 writerperfect/source/filter/OdtGenerator.cxx   |   16 +++++++++++++
 writerperfect/source/filter/TextRunStyle.cxx   |   16 +++++++++++++
 writerperfect/source/filter/TextRunStyle.hxx   |    3 ++
 5 files changed, 36 insertions(+), 31 deletions(-)

New commits:
commit 91fd138dfed7075f50525a4ccd042c689d3e1b3d
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Sat Sep 3 19:42:24 2011 +0200

    Get rid of some warnings

diff --git a/writerperfect/source/filter/FilterInternal.hxx b/writerperfect/source/filter/FilterInternal.hxx
index 7bb7edb..6b7a78e 100644
--- a/writerperfect/source/filter/FilterInternal.hxx
+++ b/writerperfect/source/filter/FilterInternal.hxx
@@ -43,34 +43,4 @@ struct ltstr
    }
 };
 
-static WPXString propListToStyleKey(const WPXPropertyList & xPropList)
-{
-   WPXString sKey;
-   WPXPropertyList::Iter i(xPropList);
-   for (i.rewind(); i.next(); )
-   {
-      WPXString sProp;
-      sProp.sprintf("[%s:%s]", i.key(), i()->getStr().cstr());
-      sKey.append(sProp);
-   }
-
-   return sKey;
-}
-
-static 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);
-   for (i.rewind(); i.next();)
-   {
-      sTabStops.append(propListToStyleKey(i()));
-   }
-   sKey.append(sTabStops);
-
-   return sKey;
-}
-
 #endif
diff --git a/writerperfect/source/filter/OdgGenerator.cxx b/writerperfect/source/filter/OdgGenerator.cxx
index bbd435c..3561bd8 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -1221,7 +1221,7 @@ void OdgGenerator::endEmbeddedGraphics()
 {
 }
 
-void OdgGenerator::startTextObject(WPXPropertyList const &propList, WPXPropertyListVector const &propListVec)
+void OdgGenerator::startTextObject(WPXPropertyList const &propList, WPXPropertyListVector const &)
 {
     TagOpenElement *pDrawFrameOpenElement = new TagOpenElement("draw:frame");
     TagOpenElement *pStyleStyleOpenElement = new TagOpenElement("style:style");
diff --git a/writerperfect/source/filter/OdtGenerator.cxx b/writerperfect/source/filter/OdtGenerator.cxx
index ba6d02f..1e64a3b 100644
--- a/writerperfect/source/filter/OdtGenerator.cxx
+++ b/writerperfect/source/filter/OdtGenerator.cxx
@@ -638,6 +638,22 @@ void OdtGenerator::closeSection()
     mpImpl->mfSectionSpaceAfter = 0.0;
 }
 
+static 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);
+   for (i.rewind(); i.next();)
+   {
+      sTabStops.append(propListToStyleKey(i()));
+   }
+   sKey.append(sTabStops);
+
+   return sKey;
+}
+
 void OdtGenerator::openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops)
 {
     // FIXMENOW: What happens if we open a footnote inside a table? do we then inherit the footnote's style
diff --git a/writerperfect/source/filter/TextRunStyle.cxx b/writerperfect/source/filter/TextRunStyle.cxx
index e09d3a5..c4fdd3c 100644
--- a/writerperfect/source/filter/TextRunStyle.cxx
+++ b/writerperfect/source/filter/TextRunStyle.cxx
@@ -178,3 +178,19 @@ void SpanStyle::write(OdfDocumentHandler *pHandler) const
     pHandler->endElement("style:text-properties");
     pHandler->endElement("style:style");
 }
+
+WPXString propListToStyleKey(const WPXPropertyList & xPropList)
+{
+   WPXString sKey;
+   WPXPropertyList::Iter i(xPropList);
+   for (i.rewind(); i.next(); )
+   {
+      WPXString sProp;
+      sProp.sprintf("[%s:%s]", i.key(), i()->getStr().cstr());
+      sKey.append(sProp);
+   }
+
+   return sKey;
+}
+
+
diff --git a/writerperfect/source/filter/TextRunStyle.hxx b/writerperfect/source/filter/TextRunStyle.hxx
index b9b5763..c9e104d 100644
--- a/writerperfect/source/filter/TextRunStyle.hxx
+++ b/writerperfect/source/filter/TextRunStyle.hxx
@@ -60,4 +60,7 @@ public:
 private:
         WPXPropertyList mPropList;
 };
+
+WPXString propListToStyleKey(const WPXPropertyList & xPropList);
+
 #endif