From: Fridrich S. <str...@us...> - 2008-12-03 13:00:38
|
Update of /cvsroot/libwpd/writerperfect/filter In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3728/filter Modified Files: FilterInternal.hxx OdgExporter.cxx PageSpan.cxx SectionStyle.cxx WordPerfectCollector.cxx WordPerfectCollector.hxx WriterProperties.hxx Log Message: some more float -> double changes Index: FilterInternal.hxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/FilterInternal.hxx,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- FilterInternal.hxx 9 Oct 2006 03:53:05 -0000 1.4 +++ FilterInternal.hxx 3 Dec 2008 13:00:31 -0000 1.5 @@ -26,6 +26,6 @@ #define WRITER_DEBUG_MSG(M) #endif -const float fDefaultSideMargin = 1.0f; // inches -const float fDefaultPageWidth = 8.5f; // inches (OOo required default: we will handle this later) -const float fDefaultPageHeight = 11.0f; // inches +const double fDefaultSideMargin = 1.0; // inches +const double fDefaultPageWidth = 8.5f; // inches (OOo required default: we will handle this later) +const double fDefaultPageHeight = 11.0; // inches Index: PageSpan.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/PageSpan.cxx,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- PageSpan.cxx 3 Dec 2008 12:52:08 -0000 1.17 +++ PageSpan.cxx 3 Dec 2008 13:00:31 -0000 1.18 @@ -92,7 +92,7 @@ if (mxPropList["fo:margin-left"]) return mxPropList["fo:margin-left"]->getDouble(); - return 0.0f; + return 0.0; } double PageSpan::getMarginRight() const @@ -100,7 +100,7 @@ if (mxPropList["fo:margin-right"]) return mxPropList["fo:margin-right"]->getDouble(); - return 0.0f; + return 0.0; } void PageSpan::writePageLayout(const int iNum, DocumentHandler *pHandler) const Index: OdgExporter.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/OdgExporter.cxx,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- OdgExporter.cxx 3 Dec 2008 12:52:08 -0000 1.27 +++ OdgExporter.cxx 3 Dec 2008 13:00:31 -0000 1.28 @@ -40,8 +40,8 @@ miGradientIndex(1), miDashIndex(1), miGraphicsStyleIndex(1), - mfWidth(0.0f), - mfHeight(0.0f), + mfWidth(0.0), + mfHeight(0.0), mbIsFlatXML(isFlatXML) { } Index: WordPerfectCollector.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/WordPerfectCollector.cxx,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- WordPerfectCollector.cxx 3 Dec 2008 12:52:08 -0000 1.67 +++ WordPerfectCollector.cxx 3 Dec 2008 13:00:31 -0000 1.68 @@ -75,7 +75,7 @@ mbUsed(false), mWriterDocumentStates(), mWriterListStates(), - mfSectionSpaceAfter(0.0f), + mfSectionSpaceAfter(0.0), miNumListStyles(0), mpCurrentContentElements(&mBodyElements), mpCurrentPageSpan(NULL), @@ -506,8 +506,8 @@ void WordPerfectCollector::openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns) { int iNumColumns = columns.count(); - float fSectionMarginLeft = 0.0f; - float fSectionMarginRight = 0.0f; + double fSectionMarginLeft = 0.0; + double fSectionMarginRight = 0.0; if (propList["fo:margin-left"]) fSectionMarginLeft = propList["fo:margin-left"]->getDouble(); if (propList["fo:margin-right"]) @@ -542,7 +542,7 @@ else mWriterDocumentStates.top().mbInFakeSection = false; - mfSectionSpaceAfter = 0.0f; + mfSectionSpaceAfter = 0.0; } void WordPerfectCollector::openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) Index: WordPerfectCollector.hxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/WordPerfectCollector.hxx,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- WordPerfectCollector.hxx 29 Oct 2008 20:00:26 -0000 1.35 +++ WordPerfectCollector.hxx 3 Dec 2008 13:00:31 -0000 1.36 @@ -188,7 +188,7 @@ // section styles std::vector<SectionStyle *> mSectionStyles; - float mfSectionSpaceAfter; + double mfSectionSpaceAfter; // table styles std::vector<TableStyle *> mTableStyles; Index: SectionStyle.cxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/SectionStyle.cxx,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- SectionStyle.cxx 25 Jun 2007 17:14:25 -0000 1.14 +++ SectionStyle.cxx 3 Dec 2008 13:00:31 -0000 1.15 @@ -73,7 +73,7 @@ else { columnProps.insert("fo:column-count", 0); - columnProps.insert("fo:column-gap", 0.0f); + columnProps.insert("fo:column-gap", 0.0); pHandler->startElement("style:columns", columnProps); } Index: WriterProperties.hxx =================================================================== RCS file: /cvsroot/libwpd/writerperfect/filter/WriterProperties.hxx,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- WriterProperties.hxx 12 Jul 2007 21:51:11 -0000 1.3 +++ WriterProperties.hxx 3 Dec 2008 13:00:31 -0000 1.4 @@ -30,6 +30,6 @@ #define IMP_DEFAULT_SUPER_SUB_SCRIPT "58%" #define IMP_NUM_CENTIMETERES_PER_INCH 2.54f #define IMP_DEFAULT_FONT_NAME "Times New Roman" -#define IMP_DEFAULT_FONT_SIZE 12.0f +#define IMP_DEFAULT_FONT_SIZE 12.0 #define IMP_DEFAULT_FONT_PITCH "variable" #endif |