[Libwpd-cvs] writerperfect/filter ListStyle.cxx, 1.16, 1.16.2.1 PageSpan.cxx, 1.16, 1.16.2.1 TextRunStyle.cxx, 1.17, 1.17.2.1 WordPerfectCollector.cxx, 1.66, 1.66.2.1

[Fridrich S. <str...@us...>]

Update of /cvsroot/libwpd/writerperfect/filter
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15857/filter

Modified Files:
      Tag: fs_experimental
	ListStyle.cxx PageSpan.cxx TextRunStyle.cxx 
	WordPerfectCollector.cxx 
Log Message:
getFloat -> getDouble

Index: WordPerfectCollector.cxx
===================================================================
RCS file: /cvsroot/libwpd/writerperfect/filter/WordPerfectCollector.cxx,v
retrieving revision 1.66
retrieving revision 1.66.2.1
diff -u -d -r1.66 -r1.66.2.1
--- WordPerfectCollector.cxx	9 Nov 2008 08:57:49 -0000	1.66
+++ WordPerfectCollector.cxx	3 Dec 2008 16:01:45 -0000	1.66.2.1
@@ -509,16 +509,16 @@
 	float fSectionMarginLeft = 0.0f;
 	float fSectionMarginRight = 0.0f;
 	if (propList["fo:margin-left"])
-		fSectionMarginLeft = propList["fo:margin-left"]->getFloat();
+		fSectionMarginLeft = propList["fo:margin-left"]->getDouble();
 	if (propList["fo:margin-right"])
-		fSectionMarginRight = propList["fo:margin-right"]->getFloat();
+		fSectionMarginRight = propList["fo:margin-right"]->getDouble();
 
 	if (iNumColumns > 1 || fSectionMarginLeft != 0 || fSectionMarginRight != 0)
 	{
 		if (propList["fo:margin-bottom"])
-			mfSectionSpaceAfter = propList["fo:margin-bottom"]->getFloat();
+			mfSectionSpaceAfter = propList["fo:margin-bottom"]->getDouble();
 		else if (propList["libwpd:margin-bottom"])
-			mfSectionSpaceAfter =  propList["libwpd:margin-bottom"]->getFloat();
+			mfSectionSpaceAfter =  propList["libwpd:margin-bottom"]->getDouble();
 
 		WPXString sSectionName;
 		sSectionName.sprintf("Section%i", mSectionStyles.size());

Index: TextRunStyle.cxx
===================================================================
RCS file: /cvsroot/libwpd/writerperfect/filter/TextRunStyle.cxx,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -d -r1.17 -r1.17.2.1
--- TextRunStyle.cxx	10 Sep 2007 14:34:43 -0000	1.17
+++ TextRunStyle.cxx	3 Dec 2008 16:01:45 -0000	1.17.2.1
@@ -80,7 +80,7 @@
 			propList.insert("fo:margin-top", i()->getStr());
 		if (strcmp(i.key(), "fo:margin-bottom") == 0)
 		{
-			if (i()->getFloat() > 0.0f)
+			if (i()->getDouble() > 0.0f)
 				propList.insert("fo:margin-bottom", i()->getStr());
 			else
 				propList.insert("fo:margin-bottom", 0.0f);
@@ -105,7 +105,7 @@
 		WPXPropertyListVector::Iter i(mxTabStops);
 		for (i.rewind(); i.next();)
 		{
-			if (i()["style:position"] && i()["style:position"]->getFloat() < 0)
+			if (i()["style:position"] && i()["style:position"]->getDouble() < 0)
 				continue;
 			TagOpenElement tabStopOpen("style:tab-stop");
 			
@@ -148,7 +148,7 @@
 
 	if (mPropList["fo:font-size"])
 	{
-		if (mPropList["fo:font-size"]->getFloat() > 0.0f)
+		if (mPropList["fo:font-size"]->getDouble() > 0.0f)
 		{
 			propList.insert("style:font-size-asian", mPropList["fo:font-size"]->getStr());
 			propList.insert("style:font-size-complex", mPropList["fo:font-size"]->getStr());

Index: PageSpan.cxx
===================================================================
RCS file: /cvsroot/libwpd/writerperfect/filter/PageSpan.cxx,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -d -r1.16 -r1.16.2.1
--- PageSpan.cxx	7 Jul 2007 09:49:39 -0000	1.16
+++ PageSpan.cxx	3 Dec 2008 16:01:45 -0000	1.16.2.1
@@ -90,7 +90,7 @@
 float PageSpan::getMarginLeft() const
 { 
         if (mxPropList["fo:margin-left"])
-                return mxPropList["fo:margin-left"]->getFloat();
+                return mxPropList["fo:margin-left"]->getDouble();
 
          return 0.0f; 
 }
@@ -98,7 +98,7 @@
 float PageSpan::getMarginRight() const
 { 
         if (mxPropList["fo:margin-right"])
-                return mxPropList["fo:margin-right"]->getFloat();
+                return mxPropList["fo:margin-right"]->getDouble();
 
          return 0.0f; 
 }

Index: ListStyle.cxx
===================================================================
RCS file: /cvsroot/libwpd/writerperfect/filter/ListStyle.cxx,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -d -r1.16 -r1.16.2.1
--- ListStyle.cxx	17 Jul 2007 19:30:22 -0000	1.16
+++ ListStyle.cxx	3 Dec 2008 16:01:45 -0000	1.16.2.1
@@ -70,11 +70,11 @@
 	listLevelStyleOpen.write(pHandler);
 
 	TagOpenElement stylePropertiesOpen("style:list-level-properties");
-	if (mPropList["text:space-before"] && mPropList["text:space-before"]->getFloat() > 0.0f)
+	if (mPropList["text:space-before"] && mPropList["text:space-before"]->getDouble() > 0.0f)
 		stylePropertiesOpen.addAttribute("text:space-before", mPropList["text:space-before"]->getStr());
-	if (mPropList["text:min-label-width"] && mPropList["text:min-label-width"]->getFloat() > 0.0f)
+	if (mPropList["text:min-label-width"] && mPropList["text:min-label-width"]->getDouble() > 0.0f)
 		stylePropertiesOpen.addAttribute("text:min-label-width", mPropList["text:min-label-width"]->getStr());
-	if (mPropList["text:min-label-distance"] && mPropList["text:min-label-distance"]->getFloat() > 0.0f)
+	if (mPropList["text:min-label-distance"] && mPropList["text:min-label-distance"]->getDouble() > 0.0f)
 		stylePropertiesOpen.addAttribute("text:min-label-distance", mPropList["text:min-label-distance"]->getStr());
 	stylePropertiesOpen.write(pHandler);
 
@@ -117,11 +117,11 @@
 	listLevelStyleOpen.write(pHandler);
 
 	TagOpenElement stylePropertiesOpen("style:list-level-properties");
-	if (mPropList["text:space-before"] && mPropList["text:space-before"]->getFloat() > 0.0f)
+	if (mPropList["text:space-before"] && mPropList["text:space-before"]->getDouble() > 0.0f)
 		stylePropertiesOpen.addAttribute("text:space-before", mPropList["text:space-before"]->getStr());
-	if (mPropList["text:min-label-width"] && mPropList["text:min-label-width"]->getFloat() > 0.0f)
+	if (mPropList["text:min-label-width"] && mPropList["text:min-label-width"]->getDouble() > 0.0f)
 		stylePropertiesOpen.addAttribute("text:min-label-width", mPropList["text:min-label-width"]->getStr());
-	if (mPropList["text:min-label-distance"] && mPropList["text:min-label-distance"]->getFloat() > 0.0f)
+	if (mPropList["text:min-label-distance"] && mPropList["text:min-label-distance"]->getDouble() > 0.0f)
 		stylePropertiesOpen.addAttribute("text:min-label-distance", mPropList["text:min-label-distance"]->getStr());
 	stylePropertiesOpen.addAttribute("style:font-name", "OpenSymbol");
 	stylePropertiesOpen.write(pHandler);