Menu
▾
▴
[Libwpd-cvs] libwpd2/src/lib WP1ContentListener.cpp, 1.27, 1.28 WP1ContentListener.h, 1.21, 1.22 WP1SetTabsGroup.cpp, 1.11, 1.12 WP1StylesListener.cpp, 1.12, 1.13 WP1StylesListener.h, 1.17, 1.18 WP3ContentListener.cpp, 1.43, 1.44 WP3ContentListener.h, 1.29, 1.30 WP3DefinitionGroup.cpp, 1.6, 1.7 WP3DefinitionGroup.h, 1.6, 1.7 WP3IndentGroup.cpp, 1.3, 1.4 WP3IndentGroup.h, 1.3, 1.4 WP3Listener.h, 1.27, 1.28 WP3PageFormatGroup.cpp, 1.20, 1.21 WP3PageFormatGroup.h, 1.10, 1.11 WP3StylesListener.cpp, 1.32, 1.33 WP3StylesListener.h, 1.28, 1.29 WP3TabGroup.cpp, 1.4, 1.5 WP3TabGroup.h, 1.4, 1.5 WP3WindowGroup.cpp, 1.9, 1.10 WP3WindowGroup.h, 1.6, 1.7 WP42ContentListener.cpp, 1.23, 1.24 WP42ContentListener.h, 1.21, 1.22 WP42Listener.h, 1.20, 1.21 WP42Parser.cpp, 1.37, 1.38 WP42StylesListener.cpp, 1.22, 1.23 WP42StylesListener.h, 1.18, 1.19 WP5ContentListener.cpp, 1.39, 1.40 WP5ContentListener.h, 1.31, 1.32 WP5FontGroup.cpp, 1.5, 1.6 WP5FontGroup.h, 1.4, 1.5 WP5IndentGroup.cpp, 1.4, 1.5 WP5IndentGroup.h, 1.4, 1.5 WP5ListFontsUsedPacket.cpp, 1.6, 1.7 WP5ListFontsUsedPacket.h, 1.5, 1.6 WP5Listener.h, 1.29, 1.30 WP5PageFormatGroup.cpp, 1.16, 1.17 WP5PageFormatGroup.h, 1.10, 1.11 WP5Parser.cpp, 1.42, 1.43 WP5StylesListener.cpp, 1.33, 1.34 WP5StylesListener.h, 1.31, 1.32 WP5TabGroup.cpp, 1.5, 1.6 WP5TabGroup.h, 1.4, 1.5 WP6ColumnGroup.cpp, 1.25, 1.26 WP6ColumnGroup.h, 1.20, 1.21 WP6ContentListener.cpp, 1.69, 1.70 WP6ContentListener.h, 1.32, 1.33 WP6Listener.h, 1.23, 1.24 WP6ParagraphGroup.cpp, 1.37, 1.38 WP6ParagraphGroup.h, 1.27, 1.28 WP6StylesListener.cpp, 1.30, 1.31 WP6StylesListener.h, 1.28, 1.29 WP6TabGroup.cpp, 1.25, 1.26 WP6TabGroup.h, 1.17, 1.18 WPXContentListener.cpp, 1.41, 1.42 WPXContentListener.h, 1.25, 1.26 WPXPageSpan.cpp, 1.30, 1.31 WPXPageSpan.h, 1.25, 1.26 WPXProperty.cpp, 1.18, 1.19 libwpd_internal.cpp, 1.42, 1.43 libwpd_internal.h, 1.34, 1.35
Update of /cvsroot/libwpd/libwpd2/src/lib In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6324/src/lib Modified Files: WP1ContentListener.cpp WP1ContentListener.h WP1SetTabsGroup.cpp WP1StylesListener.cpp WP1StylesListener.h WP3ContentListener.cpp WP3ContentListener.h WP3DefinitionGroup.cpp WP3DefinitionGroup.h WP3IndentGroup.cpp WP3IndentGroup.h WP3Listener.h WP3PageFormatGroup.cpp WP3PageFormatGroup.h WP3StylesListener.cpp WP3StylesListener.h WP3TabGroup.cpp WP3TabGroup.h WP3WindowGroup.cpp WP3WindowGroup.h WP42ContentListener.cpp WP42ContentListener.h WP42Listener.h WP42Parser.cpp WP42StylesListener.cpp WP42StylesListener.h WP5ContentListener.cpp WP5ContentListener.h WP5FontGroup.cpp WP5FontGroup.h WP5IndentGroup.cpp WP5IndentGroup.h WP5ListFontsUsedPacket.cpp WP5ListFontsUsedPacket.h WP5Listener.h WP5PageFormatGroup.cpp WP5PageFormatGroup.h WP5Parser.cpp WP5StylesListener.cpp WP5StylesListener.h WP5TabGroup.cpp WP5TabGroup.h WP6ColumnGroup.cpp WP6ColumnGroup.h WP6ContentListener.cpp WP6ContentListener.h WP6Listener.h WP6ParagraphGroup.cpp WP6ParagraphGroup.h WP6StylesListener.cpp WP6StylesListener.h WP6TabGroup.cpp WP6TabGroup.h WPXContentListener.cpp WPXContentListener.h WPXPageSpan.cpp WPXPageSpan.h WPXProperty.cpp libwpd_internal.cpp libwpd_internal.h Log Message: all float -> double (it does not take so much more space and saves big deal of precision) Index: WP1ContentListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP1ContentListener.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- WP1ContentListener.h 27 Oct 2008 13:06:49 -0000 1.21 +++ WP1ContentListener.h 3 Dec 2008 13:40:34 -0000 1.22 @@ -72,7 +72,7 @@ void headerFooterGroup(uint8_t headerFooterDefinition, WP1SubDocument *subDocument); void suppressPageCharacteristics(uint8_t /* suppressCode */) {} void justificationChange(uint8_t justification); - void lineSpacingChange(uint8_t spacing) { WPXContentListener::lineSpacingChange((float)((double)spacing/2.0f)); } + void lineSpacingChange(uint8_t spacing) { WPXContentListener::lineSpacingChange((double)((double)spacing/2.0)); } void flushRightOn(); void flushRightOff() {} void centerOn(); Index: WP5IndentGroup.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP5IndentGroup.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- WP5IndentGroup.cpp 22 Nov 2007 12:20:33 -0000 1.4 +++ WP5IndentGroup.cpp 3 Dec 2008 13:40:34 -0000 1.5 @@ -32,7 +32,7 @@ WP5IndentGroup::WP5IndentGroup(WPXInputStream *input, WPXEncryption *encryption, uint8_t groupID) : WP5FixedLengthGroup(groupID), m_indentType(0), - m_indentPosition(0.0f) + m_indentPosition(0.0) { _read(input, encryption); } Index: WP5IndentGroup.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP5IndentGroup.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- WP5IndentGroup.h 22 Nov 2007 12:20:34 -0000 1.4 +++ WP5IndentGroup.h 3 Dec 2008 13:40:34 -0000 1.5 @@ -40,7 +40,7 @@ private: uint8_t m_indentType; - float m_indentPosition; + double m_indentPosition; }; #endif /* WP5INDENTGROUP_H */ Index: WP5ContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP5ContentListener.cpp,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- WP5ContentListener.cpp 11 Nov 2008 10:23:01 -0000 1.39 +++ WP5ContentListener.cpp 3 Dec 2008 13:40:34 -0000 1.40 @@ -48,7 +48,7 @@ WPXContentListener(pageList, documentInterface), m_parseState(new WP5ContentParsingState), m_subDocuments(subDocuments), - m_defaultFontSize(12.0f), + m_defaultFontSize(12.0), m_defaultFontName("Times New Roman") { } @@ -70,10 +70,10 @@ appendUCS4(m_parseState->m_textBuffer, (uint32_t)character); } -void WP5ContentListener::insertTab(uint8_t tabType, float tabPosition) +void WP5ContentListener::insertTab(uint8_t tabType, double tabPosition) { bool tmpHasTabPositionInformation = true; - if (tabPosition >= (float)((double)0xFFFE/(double)WPX_NUM_WPUS_PER_INCH) || tabPosition == 0.0f) + if (tabPosition >= (double)((double)0xFFFE/(double)WPX_NUM_WPUS_PER_INCH) || tabPosition == 0.0) tmpHasTabPositionInformation = false; if (!isUndoOn()) @@ -165,10 +165,10 @@ } } -void WP5ContentListener::insertIndent(uint8_t indentType, float indentPosition) +void WP5ContentListener::insertIndent(uint8_t indentType, double indentPosition) { bool tmpHasIndentPositionInformation = true; - if (indentPosition >= (float)((double)0xFFFE/(double)WPX_NUM_WPUS_PER_INCH) || indentPosition == 0.0f) + if (indentPosition >= (double)((double)0xFFFE/(double)WPX_NUM_WPUS_PER_INCH) || indentPosition == 0.0) tmpHasIndentPositionInformation = false; if (!isUndoOn()) @@ -183,7 +183,7 @@ else m_ps->m_leftMarginByTabs = indentPosition - m_ps->m_pageMarginLeft - m_ps->m_sectionMarginRight - m_ps->m_leftMarginByPageMarginChange - m_ps->m_leftMarginByParagraphMarginChange; - if (m_ps->m_paragraphTextIndent != 0.0f) + if (m_ps->m_paragraphTextIndent != 0.0) m_ps->m_textIndentByTabs -= m_ps->m_paragraphTextIndent; break; @@ -194,7 +194,7 @@ m_ps->m_leftMarginByTabs = indentPosition - m_ps->m_pageMarginLeft - m_ps->m_sectionMarginLeft - m_ps->m_leftMarginByPageMarginChange - m_ps->m_leftMarginByParagraphMarginChange; m_ps->m_rightMarginByTabs = m_ps->m_leftMarginByTabs; - if (m_ps->m_paragraphTextIndent != 0.0f) + if (m_ps->m_paragraphTextIndent != 0.0) m_ps->m_textIndentByTabs -= m_ps->m_paragraphTextIndent; break; @@ -262,7 +262,7 @@ break; } // Note: WordPerfect has an offset from the left edge of the page. We translate it to the offset from the left margin - m_ps->m_tableDefinition.m_leftOffset = (float)((double)leftOffset / (double)WPX_NUM_WPUS_PER_INCH) - m_ps->m_paragraphMarginLeft; + m_ps->m_tableDefinition.m_leftOffset = (double)((double)leftOffset / (double)WPX_NUM_WPUS_PER_INCH) - m_ps->m_paragraphMarginLeft; // remove all the old column information m_ps->m_tableDefinition.m_columns.clear(); @@ -278,9 +278,9 @@ { // define the new column WPXColumnDefinition colDef; - colDef.m_width = (float)((double)width / (double)WPX_NUM_WPUS_PER_INCH); - colDef.m_leftGutter = (float)((double)width / (double)WPX_NUM_WPUS_PER_INCH); - colDef.m_rightGutter = (float)((double)width / (double)WPX_NUM_WPUS_PER_INCH); + colDef.m_width = (double)((double)width / (double)WPX_NUM_WPUS_PER_INCH); + colDef.m_leftGutter = (double)((double)width / (double)WPX_NUM_WPUS_PER_INCH); + colDef.m_rightGutter = (double)((double)width / (double)WPX_NUM_WPUS_PER_INCH); // add the new column definition to our table definition m_ps->m_tableDefinition.m_columns.push_back(colDef); @@ -322,7 +322,7 @@ if (!isUndoOn()) { _flushText(); - float rowHeightInch = (float)((double) rowHeight / (double)WPX_NUM_WPUS_PER_INCH); + double rowHeightInch = (double)((double) rowHeight / (double)WPX_NUM_WPUS_PER_INCH); _openTableRow(rowHeightInch, isMinimumHeight, isHeaderRow); } } @@ -440,20 +440,20 @@ { if (!isUndoOn()) { - float marginInch = (float)((double)margin/ (double)WPX_NUM_WPUS_PER_INCH); + double marginInch = (double)((double)margin/ (double)WPX_NUM_WPUS_PER_INCH); switch(side) { case WPX_LEFT: if (m_ps->m_numColumns > 1) { - m_ps->m_leftMarginByPageMarginChange = 0.0f; + m_ps->m_leftMarginByPageMarginChange = 0.0; m_ps->m_sectionMarginLeft = marginInch - m_ps->m_pageMarginLeft; } else { m_ps->m_leftMarginByPageMarginChange = marginInch - m_ps->m_pageMarginLeft; - m_ps->m_sectionMarginLeft = 0.0f; + m_ps->m_sectionMarginLeft = 0.0; } m_ps->m_paragraphMarginLeft = m_ps->m_leftMarginByPageMarginChange + m_ps->m_leftMarginByParagraphMarginChange @@ -462,13 +462,13 @@ case WPX_RIGHT: if (m_ps->m_numColumns > 1) { - m_ps->m_rightMarginByPageMarginChange = 0.0f; + m_ps->m_rightMarginByPageMarginChange = 0.0; m_ps->m_sectionMarginRight = marginInch - m_ps->m_pageMarginRight; } else { m_ps->m_rightMarginByPageMarginChange = marginInch - m_ps->m_pageMarginRight; - m_ps->m_sectionMarginRight = 0.0f; + m_ps->m_sectionMarginRight = 0.0; } m_ps->m_paragraphMarginRight = m_ps->m_rightMarginByPageMarginChange + m_ps->m_rightMarginByParagraphMarginChange @@ -490,7 +490,7 @@ } } -void WP5ContentListener::setFont(const WPXString &fontName, float fontSize) +void WP5ContentListener::setFont(const WPXString &fontName, double fontSize) { if (!isUndoOn()) { @@ -596,7 +596,7 @@ m_subDocuments.push_back(subDocument); } -void WP5ContentListener::setDefaultFont(const WPXString &fontName, float fontSize) +void WP5ContentListener::setDefaultFont(const WPXString &fontName, double fontSize) { m_defaultFontName = fontName; m_defaultFontSize = fontSize; @@ -656,8 +656,8 @@ WPXPropertyList propList; - propList.insert("svg:height", (float)((double)height/(double)WPX_NUM_WPUS_PER_INCH)); - propList.insert("svg:width", (float)((double)width/(double)WPX_NUM_WPUS_PER_INCH)); + propList.insert("svg:height", (double)((double)height/(double)WPX_NUM_WPUS_PER_INCH)); + propList.insert("svg:width", (double)((double)width/(double)WPX_NUM_WPUS_PER_INCH)); if ( alignment & 0x80 ) propList.insert( "style:wrap", "dynamic" ); @@ -684,7 +684,7 @@ switch ( (positionAndType & 0x1c) >> 2 ) { case 0x00: - propList.insert("svg:height", (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom ) ); + propList.insert("svg:height", (double)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom ) ); propList.insert("style:vertical-rel", "page-content" ); propList.insert("style:vertical-pos", "middle" ); break; @@ -694,11 +694,11 @@ else { propList.insert("style:vertical-pos", "from-top" ); - float newPosition = (float)((double)y/(double)WPX_NUM_WPUS_PER_INCH); - if (newPosition > (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + double newPosition = (double)((double)y/(double)WPX_NUM_WPUS_PER_INCH); + if (newPosition > (double)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom - (double)height/(double)WPX_NUM_WPUS_PER_INCH) ) { - newPosition = (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + newPosition = (double)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom - (double)height/(double)WPX_NUM_WPUS_PER_INCH); } propList.insert("svg:y", newPosition); @@ -710,12 +710,12 @@ else { propList.insert("style:vertical-pos", "from-top" ); - float newPosition = (float)((m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom - - (double)height/(double)WPX_NUM_WPUS_PER_INCH)/2.0f); - if (newPosition > (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + double newPosition = (double)((m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + - (double)height/(double)WPX_NUM_WPUS_PER_INCH)/2.0); + if (newPosition > (double)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom - (double)height/(double)WPX_NUM_WPUS_PER_INCH) ) { - newPosition = (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + newPosition = (double)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom - (double)height/(double)WPX_NUM_WPUS_PER_INCH); } propList.insert("svg:y", newPosition); @@ -727,12 +727,12 @@ else { propList.insert("style:vertical-pos", "from-top" ); - float newPosition = (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + double newPosition = (double)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom - (double)height/(double)WPX_NUM_WPUS_PER_INCH + (double)y/(double)WPX_NUM_WPUS_PER_INCH); - if (newPosition > (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + if (newPosition > (double)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom - (double)height/(double)WPX_NUM_WPUS_PER_INCH) ) { - newPosition = (float)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom + newPosition = (double)(m_ps->m_pageFormLength - m_ps->m_pageMarginTop - m_ps->m_pageMarginBottom - (double)height/(double)WPX_NUM_WPUS_PER_INCH); } propList.insert("svg:y", newPosition); @@ -741,7 +741,7 @@ case 0x04: propList.insert("style:vertical-rel", "page" ); propList.insert("style:vertical-pos", "from-top" ); - propList.insert("svg:y", (float)((double)y/(double)WPX_NUM_WPUS_PER_INCH)); + propList.insert("svg:y", (double)((double)y/(double)WPX_NUM_WPUS_PER_INCH)); break; default: break; @@ -756,7 +756,7 @@ else { propList.insert( "style:horizontal-pos", "from-left"); - propList.insert( "svg:x", (float)((double)x/(double)WPX_NUM_WPUS_PER_INCH)); + propList.insert( "svg:x", (double)((double)x/(double)WPX_NUM_WPUS_PER_INCH)); } break; case 0x01: @@ -765,7 +765,7 @@ else { propList.insert( "style:horizontal-pos", "from-left"); - propList.insert( "svg:x", (float)(m_ps->m_pageFormWidth - m_ps->m_pageMarginLeft - m_ps->m_pageMarginRight + propList.insert( "svg:x", (double)(m_ps->m_pageFormWidth - m_ps->m_pageMarginLeft - m_ps->m_pageMarginRight - (double)width/(double)WPX_NUM_WPUS_PER_INCH + (double)x/(double)WPX_NUM_WPUS_PER_INCH)); } break; @@ -775,12 +775,12 @@ else { propList.insert( "style:horizontal-pos", "from-left"); - propList.insert( "svg:x", (float)((m_ps->m_pageFormWidth - m_ps->m_pageMarginLeft - m_ps->m_pageMarginRight - - (double)width/(double)WPX_NUM_WPUS_PER_INCH)/2.0f + (double)x/(double)WPX_NUM_WPUS_PER_INCH)); + propList.insert( "svg:x", (double)((m_ps->m_pageFormWidth - m_ps->m_pageMarginLeft - m_ps->m_pageMarginRight + - (double)width/(double)WPX_NUM_WPUS_PER_INCH)/2.0 + (double)x/(double)WPX_NUM_WPUS_PER_INCH)); } break; case 0x03: - propList.insert("svg:width", (float)(m_ps->m_pageFormWidth - m_ps->m_pageMarginLeft - m_ps->m_pageMarginRight ) ); + propList.insert("svg:width", (double)(m_ps->m_pageFormWidth - m_ps->m_pageMarginLeft - m_ps->m_pageMarginRight ) ); propList.insert("style:horizontal-rel", "page-content" ); propList.insert("style:horizontal-pos", "center" ); break; Index: WP6ContentListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6ContentListener.h,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- WP6ContentListener.h 27 Oct 2008 13:06:49 -0000 1.32 +++ WP6ContentListener.h 3 Dec 2008 13:40:34 -0000 1.33 @@ -75,8 +75,8 @@ WPXString m_textAfterDisplayReference; WPXString m_textAfterNumber; - float m_paragraphMarginBottomRelative; - float m_paragraphMarginBottomAbsolute; + double m_paragraphMarginBottomRelative; + double m_paragraphMarginBottomAbsolute; int m_numRemovedParagraphBreaks; @@ -151,24 +151,24 @@ void defineTabStops(const bool isRelative, const std::vector<WPXTabStop> &tabStops, const std::vector<bool> &usePreWP9LeaderMethods); void insertCharacter(const uint16_t character); - void insertTab(const uint8_t tabType, float tabPosition); + void insertTab(const uint8_t tabType, double tabPosition); void handleLineBreak(); void insertEOL(); void insertBreak(const uint8_t breakType) { WPXContentListener::insertBreak(breakType); }; - void lineSpacingChange(const float lineSpacing) { WPXContentListener::lineSpacingChange(lineSpacing); }; + void lineSpacingChange(const double lineSpacing) { WPXContentListener::lineSpacingChange(lineSpacing); }; void justificationChange(const uint8_t justification) { WPXContentListener::justificationChange(justification); }; void characterColorChange(const uint8_t red, const uint8_t green, const uint8_t blue); void characterShadingChange(const uint8_t shading); void highlightChange(const bool isOn, const RGBSColor color); void fontChange(const uint16_t matchedFontPointSize, const uint16_t fontPID); void attributeChange(const bool isOn, const uint8_t attribute); - void spacingAfterParagraphChange(const float spacingRelative, const float spacingAbsolute); + void spacingAfterParagraphChange(const double spacingRelative, const double spacingAbsolute); void pageMarginChange(const uint8_t /* side */, const uint16_t /* margin */) {} void pageFormChange(const uint16_t /* length */, const uint16_t /* width */, const WPXFormOrientation /* orientation */) {} void marginChange(const uint8_t side, const uint16_t margin); void paragraphMarginChange(const uint8_t side, const int16_t margin); void indentFirstLineChange(const int16_t offset); - void columnChange(const WPXTextColumnType columnType, const uint8_t numColumns, const std::vector<float> &columnWidth, + void columnChange(const WPXTextColumnType columnType, const uint8_t numColumns, const std::vector<double> &columnWidth, const std::vector<bool> &isFixedWidth); void updateOutlineDefinition(const WP6OutlineLocation outlineLocation, const uint16_t outlineHash, const uint8_t *numberingMethods, const uint8_t tabBehaviourFlag); Index: WP6ColumnGroup.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6ColumnGroup.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- WP6ColumnGroup.cpp 22 Nov 2007 12:20:38 -0000 1.25 +++ WP6ColumnGroup.cpp 3 Dec 2008 13:40:34 -0000 1.26 @@ -34,7 +34,7 @@ m_margin(0), m_colType(0), m_numColumns(0), - m_rowSpacing(0.0f), + m_rowSpacing(0.0), m_isFixedWidth(), m_columnWidth() { @@ -59,8 +59,8 @@ m_colType = readU8(input, encryption); uint32_t tmpRowSpacing = readU32(input, encryption); int16_t tmpRowSpacingIntegerPart = (int16_t)((tmpRowSpacing & 0xffff0000) >> 16); - float tmpRowSpacingFractionalPart = (float)((double)(tmpRowSpacing & 0xffff)/(double)0x10000); - m_rowSpacing = (float)tmpRowSpacingIntegerPart + tmpRowSpacingFractionalPart; + double tmpRowSpacingFractionalPart = (double)((double)(tmpRowSpacing & 0xffff)/(double)0x10000); + m_rowSpacing = (double)tmpRowSpacingIntegerPart + tmpRowSpacingFractionalPart; m_numColumns = readU8(input, encryption); uint8_t tmpDefinition; uint16_t tmpWidth; @@ -73,12 +73,12 @@ if ((tmpDefinition & 0x01) == 0x01) { m_isFixedWidth.push_back(true); - m_columnWidth.push_back((float)((double)tmpWidth/(double)WPX_NUM_WPUS_PER_INCH)); + m_columnWidth.push_back((double)((double)tmpWidth/(double)WPX_NUM_WPUS_PER_INCH)); } else { m_isFixedWidth.push_back(false); - m_columnWidth.push_back((float)((double)tmpWidth/(double)0x10000)); + m_columnWidth.push_back((double)((double)tmpWidth/(double)0x10000)); } } Index: WP3DefinitionGroup.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3DefinitionGroup.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- WP3DefinitionGroup.h 22 Nov 2007 12:20:23 -0000 1.6 +++ WP3DefinitionGroup.h 3 Dec 2008 13:40:34 -0000 1.7 @@ -45,7 +45,7 @@ uint8_t m_colType; uint8_t m_numColumns; std::vector<bool> m_isFixedWidth; - std::vector<float> m_columnWidth; + std::vector<double> m_columnWidth; }; Index: WP42Listener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP42Listener.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- WP42Listener.h 27 Oct 2008 13:06:49 -0000 1.20 +++ WP42Listener.h 3 Dec 2008 13:40:34 -0000 1.21 @@ -40,7 +40,7 @@ virtual void startDocument() = 0; virtual void startSubDocument() = 0; virtual void insertCharacter(uint16_t character) = 0; - virtual void insertTab(uint8_t tabType, float tabPosition) = 0; + virtual void insertTab(uint8_t tabType, double tabPosition) = 0; virtual void insertBreak(uint8_t breakType) = 0; virtual void insertEOL() = 0; virtual void attributeChange(bool isOn, uint8_t attribute) = 0; Index: WP42StylesListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP42StylesListener.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- WP42StylesListener.cpp 27 Oct 2008 13:06:49 -0000 1.22 +++ WP42StylesListener.cpp 3 Dec 2008 13:40:34 -0000 1.23 @@ -36,8 +36,8 @@ m_currentPage(), m_nextPage(), m_subDocuments(subDocuments), - m_tempMarginLeft(1.0f), - m_tempMarginRight(1.0f), + m_tempMarginLeft(1.0), + m_tempMarginRight(1.0), m_currentPageHasContent(false), m_isSubDocument(false), m_pageListHardPageMark(m_pageList.end()) @@ -79,7 +79,7 @@ m_pageListHardPageMark--; } } - m_currentPage = WPXPageSpan(m_pageList.back(), 0.0f, 0.0f); + m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0); m_currentPage.setPageSpan(1); for(std::vector<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin(); Index: WP5FontGroup.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP5FontGroup.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- WP5FontGroup.cpp 22 Nov 2007 12:20:32 -0000 1.5 +++ WP5FontGroup.cpp 3 Dec 2008 13:40:34 -0000 1.6 @@ -58,7 +58,7 @@ if (getSize() >= 36) { input->seek(2, WPX_SEEK_CUR); - m_fontSize = (float)(readU16(input, encryption) / 50); + m_fontSize = (double)(readU16(input, encryption) / 50); } break; default: @@ -71,7 +71,7 @@ WPD_DEBUG_MSG(("WordPerfect: handling a Font group\n")); int tmpFontNameOffset; - float tmpFontSize = 12.0f; + double tmpFontSize = 12.0; WPXString tmpFontName("Times New Roman"); switch(getSubGroup()) Index: WPXProperty.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXProperty.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- WPXProperty.cpp 3 Dec 2008 12:16:00 -0000 1.18 +++ WPXProperty.cpp 3 Dec 2008 13:40:34 -0000 1.19 @@ -123,7 +123,7 @@ double WPXStringProperty::getDouble() const { - return 0.0f; + return 0.0; } WPXString WPXStringProperty::getStr() const @@ -219,7 +219,7 @@ WPXString WPXPercentProperty::getStr() const { - WPXString str = doubleToString(getDouble()*100.0f); + WPXString str = doubleToString(getDouble()*100.0); str.append("%"); return str; } Index: WP3TabGroup.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3TabGroup.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- WP3TabGroup.cpp 22 Nov 2007 12:20:26 -0000 1.4 +++ WP3TabGroup.cpp 3 Dec 2008 13:40:34 -0000 1.5 @@ -31,7 +31,7 @@ WP3FixedLengthGroup(groupID), m_subGroup(0), m_modeType(0), - m_position(0.0f) + m_position(0.0) { _read(input, encryption); } @@ -40,7 +40,7 @@ { m_subGroup = readU8(input, encryption); m_modeType = readU8(input, encryption); - m_position = fixedPointToFloat(readU32(input, encryption, true)) / 72.0f; + m_position = fixedPointToDouble(readU32(input, encryption, true)) / 72.0; } void WP3TabGroup::parse(WP3Listener *listener) Index: WP6TabGroup.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6TabGroup.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- WP6TabGroup.h 22 Nov 2007 12:20:46 -0000 1.17 +++ WP6TabGroup.h 3 Dec 2008 13:40:34 -0000 1.18 @@ -37,7 +37,7 @@ void parse(WP6Listener *listener); private: - float m_position; + double m_position; bool m_ignoreFunction; }; Index: WP1ContentListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP1ContentListener.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- WP1ContentListener.cpp 29 Oct 2008 19:58:54 -0000 1.27 +++ WP1ContentListener.cpp 3 Dec 2008 13:40:34 -0000 1.28 @@ -51,7 +51,7 @@ m_subDocuments(subDocuments) { *(m_ps->m_fontName) = "Geneva"; - m_ps->m_fontSize = 12.0f; + m_ps->m_fontSize = 12.0; } WP1ContentListener::~WP1ContentListener() @@ -215,7 +215,7 @@ { _closeSpan(); - m_ps->m_fontSize=float(pointSize); + m_ps->m_fontSize=double(pointSize); } } @@ -386,7 +386,7 @@ { if (leftMargin) { - float leftMarginInch = (float)((double)leftMargin/72.0f); + double leftMarginInch = (double)((double)leftMargin/72.0); m_ps->m_leftMarginByPageMarginChange = leftMarginInch - m_ps->m_pageMarginLeft; m_ps->m_paragraphMarginLeft = m_ps->m_leftMarginByPageMarginChange + m_ps->m_leftMarginByParagraphMarginChange @@ -395,7 +395,7 @@ } if (rightMargin) { - float rightMarginInch = (float)((double)rightMargin/72.0f); + double rightMarginInch = (double)((double)rightMargin/72.0); m_ps->m_rightMarginByPageMarginChange = rightMarginInch - m_ps->m_pageMarginRight; m_ps->m_paragraphMarginRight = m_ps->m_rightMarginByPageMarginChange + m_ps->m_rightMarginByParagraphMarginChange @@ -414,7 +414,7 @@ else { m_parseState->m_numDeferredTabs = 0; - m_ps->m_leftMarginByTabs += (float)((double)leftMarginOffset / 72.0f); + m_ps->m_leftMarginByTabs += (double)((double)leftMarginOffset / 72.0); m_ps->m_paragraphMarginLeft = m_ps->m_leftMarginByPageMarginChange + m_ps->m_leftMarginByParagraphMarginChange + m_ps->m_leftMarginByTabs; @@ -432,8 +432,8 @@ else { m_parseState->m_numDeferredTabs = 0; - m_ps->m_leftMarginByTabs += (float)((double)leftRightMarginOffset / 72.0f); - m_ps->m_rightMarginByTabs += (float)((double)leftRightMarginOffset / 72.0f); + m_ps->m_leftMarginByTabs += (double)((double)leftRightMarginOffset / 72.0); + m_ps->m_rightMarginByTabs += (double)((double)leftRightMarginOffset / 72.0); m_ps->m_paragraphMarginLeft = m_ps->m_leftMarginByPageMarginChange + m_ps->m_leftMarginByParagraphMarginChange + m_ps->m_leftMarginByTabs; @@ -453,7 +453,7 @@ { if (!m_parseState->m_numDeferredTabs) { - m_ps->m_textIndentByTabs -= (float)((double)release / 72.0f); + m_ps->m_textIndentByTabs -= (double)((double)release / 72.0); m_ps->m_paragraphTextIndent = m_ps->m_textIndentByParagraphIndentChange + m_ps->m_textIndentByTabs; } @@ -537,8 +537,8 @@ _openSpan(); WPXPropertyList propList; - propList.insert("svg:width", (float)((double)width/72.0f)); - propList.insert("svg:height", (float)((double)height/72.0f)); + propList.insert("svg:width", (double)((double)width/72.0)); + propList.insert("svg:height", (double)((double)height/72.0)); propList.insert("text:anchor-type", "as-char"); m_documentInterface->openFrame(propList); Index: WP5ContentListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP5ContentListener.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- WP5ContentListener.h 27 Oct 2008 13:06:49 -0000 1.31 +++ WP5ContentListener.h 3 Dec 2008 13:40:34 -0000 1.32 @@ -57,14 +57,14 @@ void startDocument() { WPXContentListener::startDocument(); }; void startSubDocument() { WPXContentListener::startSubDocument(); }; - void setFont(const WPXString &fontName, float fontSize); + void setFont(const WPXString &fontName, double fontSize); void setTabs(const std::vector<WPXTabStop> &tabStops, uint16_t tabOffset); void insertCharacter(uint16_t character); - void insertTab(uint8_t tabType, float tabPosition); - void insertIndent(uint8_t indentType, float indentPosition); + void insertTab(uint8_t tabType, double tabPosition); + void insertIndent(uint8_t indentType, double indentPosition); void insertEOL(); void insertBreak(uint8_t breakType) { WPXContentListener::insertBreak(breakType); }; - void lineSpacingChange(float lineSpacing) { WPXContentListener::lineSpacingChange(lineSpacing); }; + void lineSpacingChange(double lineSpacing) { WPXContentListener::lineSpacingChange(lineSpacing); }; void justificationChange(uint8_t justification) { WPXContentListener::justificationChange(justification); }; void characterColorChange(uint8_t red, uint8_t green, uint8_t blue); void attributeChange(bool isOn, uint8_t attribute); @@ -91,7 +91,7 @@ void headerFooterGroup(uint8_t headerFooterType, uint8_t occurenceBits, WP5SubDocument *subDocument); void suppressPageCharacteristics(uint8_t /* suppressCode */) {}; - void setDefaultFont(const WPXString &fontName, float fontSize); + void setDefaultFont(const WPXString &fontName, double fontSize); void boxOn(uint8_t positionAndType, uint8_t alignment, uint16_t width, uint16_t height, uint16_t x, uint16_t y); virtual void boxOff(); @@ -108,7 +108,7 @@ WP5ContentListener& operator=(const WP5ContentListener&); WP5ContentParsingState *m_parseState; std::vector<WP5SubDocument *> &m_subDocuments; - float m_defaultFontSize; + double m_defaultFontSize; WPXString m_defaultFontName; }; Index: WP3PageFormatGroup.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3PageFormatGroup.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- WP3PageFormatGroup.cpp 15 Apr 2008 19:48:02 -0000 1.20 +++ WP3PageFormatGroup.cpp 3 Dec 2008 13:40:34 -0000 1.21 @@ -35,7 +35,7 @@ WP3VariableLengthGroup(), m_leftMargin(0), m_rightMargin(0), - m_lineSpacing(1.0f), + m_lineSpacing(1.0), m_isRelative(false), m_tabStops(), m_topMargin(0), @@ -56,7 +56,7 @@ // this group can contain different kinds of data, thus we need to read // the contents accordingly int8_t tmpTabType = 0; - float tmpTabPosition = 0.0f; + double tmpTabPosition = 0.0; WPXTabStop tmpTabStop = WPXTabStop(); switch (getSubGroup()) @@ -75,7 +75,7 @@ { uint32_t lineSpacing = readU32(input, encryption, true); int16_t lineSpacingIntegerPart = (int16_t)((lineSpacing & 0xFFFF0000) >> 16); - float lineSpacingFractionalPart = (float)((double)(lineSpacing & 0xFFFF)/(double)0xFFFF); + double lineSpacingFractionalPart = (double)((double)(lineSpacing & 0xFFFF)/(double)0xFFFF); WPD_DEBUG_MSG(("WordPerfect: Page format group line spacing - integer part: %i fractional part: %f (original value: %i)\n", lineSpacingIntegerPart, lineSpacingFractionalPart, lineSpacing)); m_lineSpacing = lineSpacingIntegerPart + lineSpacingFractionalPart; @@ -96,7 +96,7 @@ { if (input->atEOS()) throw FileException(); - tmpTabPosition = fixedPointToFloat(readU32(input, encryption, true)) / 72.0f; + tmpTabPosition = fixedPointToDouble(readU32(input, encryption, true)) / 72.0; if (tmpTabType < 0) { Index: WP5FontGroup.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP5FontGroup.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- WP5FontGroup.h 22 Nov 2007 12:20:32 -0000 1.4 +++ WP5FontGroup.h 3 Dec 2008 13:40:34 -0000 1.5 @@ -39,7 +39,7 @@ private: uint8_t m_red, m_green, m_blue; uint8_t m_fontNumber; - float m_fontSize; + double m_fontSize; }; #endif /* WP5FONTGROUP_H */ Index: WP3IndentGroup.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3IndentGroup.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- WP3IndentGroup.cpp 22 Nov 2007 12:20:25 -0000 1.3 +++ WP3IndentGroup.cpp 3 Dec 2008 13:40:34 -0000 1.4 @@ -30,7 +30,7 @@ WP3IndentGroup::WP3IndentGroup(WPXInputStream *input, WPXEncryption *encryption, uint8_t groupID) : WP3FixedLengthGroup(groupID), m_subGroup(0), - m_offset(0.0f) + m_offset(0.0) { _read(input, encryption); } @@ -38,7 +38,7 @@ void WP3IndentGroup::_readContents(WPXInputStream *input, WPXEncryption *encryption) { m_subGroup = readU8(input, encryption); - m_offset = fixedPointToFloat(readU32(input, encryption, true)); + m_offset = fixedPointToDouble(readU32(input, encryption, true)); } void WP3IndentGroup::parse(WP3Listener *listener) Index: WP42StylesListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP42StylesListener.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- WP42StylesListener.h 27 Oct 2008 13:06:49 -0000 1.18 +++ WP42StylesListener.h 3 Dec 2008 13:40:34 -0000 1.19 @@ -42,7 +42,7 @@ void startDocument() {} void startSubDocument() {} void insertCharacter(uint16_t /* character */) { if (!isUndoOn()) m_currentPageHasContent = true; } - void insertTab(uint8_t /* tabType */, float /* tabPosition */) { if (!isUndoOn()) m_currentPageHasContent = true; } + void insertTab(uint8_t /* tabType */, double /* tabPosition */) { if (!isUndoOn()) m_currentPageHasContent = true; } void insertEOL() { if (!isUndoOn()) m_currentPageHasContent = true; } void insertBreak(uint8_t breakType); void attributeChange(bool /* isOn */, uint8_t /* attribute */) {} @@ -58,7 +58,7 @@ private: WPXPageSpan m_currentPage, m_nextPage; std::vector<WP42SubDocument *> &m_subDocuments; - float m_tempMarginLeft, m_tempMarginRight; + double m_tempMarginLeft, m_tempMarginRight; bool m_currentPageHasContent; bool m_isSubDocument; std::list<WPXPageSpan>::iterator m_pageListHardPageMark; Index: libwpd_internal.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_internal.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- libwpd_internal.h 27 Oct 2008 13:06:49 -0000 1.34 +++ libwpd_internal.h 3 Dec 2008 13:40:34 -0000 1.35 @@ -97,7 +97,7 @@ const uint16_t **chars); uint16_t fixedPointToWPUs(const uint32_t fixedPointNumber); -float fixedPointToFloat(const uint32_t fixedPointNumber); +double fixedPointToDouble(const uint32_t fixedPointNumber); enum WPXFileType { WP6_DOCUMENT, WP5_DOCUMENT, WP42_DOCUMENT, OTHER }; enum WPXNumberingType { ARABIC, LOWERCASE, UPPERCASE, LOWERCASE_ROMAN, UPPERCASE_ROMAN }; @@ -183,9 +183,9 @@ struct _WPXColumnDefinition { _WPXColumnDefinition(); // initializes all values to 0 - float m_width; - float m_leftGutter; - float m_rightGutter; + double m_width; + double m_leftGutter; + double m_rightGutter; }; typedef struct _WPXColumnProperties WPXColumnProperties; @@ -199,9 +199,9 @@ typedef struct _WPXTabStop WPXTabStop; struct _WPXTabStop { - _WPXTabStop(float position, WPXTabAlignment alignment, uint16_t leaderCharacter, uint8_t leaderNumSpaces); + _WPXTabStop(double position, WPXTabAlignment alignment, uint16_t leaderCharacter, uint8_t leaderNumSpaces); _WPXTabStop(); - float m_position; + double m_position; WPXTabAlignment m_alignment; uint16_t m_leaderCharacter; uint8_t m_leaderNumSpaces; Index: WP1SetTabsGroup.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP1SetTabsGroup.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- WP1SetTabsGroup.cpp 22 Nov 2007 12:20:20 -0000 1.11 +++ WP1SetTabsGroup.cpp 3 Dec 2008 13:40:34 -0000 1.12 @@ -45,14 +45,14 @@ // Now read the new condensed tab table int8_t tmpTabType = 0; - float tmpTabPosition = 0.0f; + double tmpTabPosition = 0.0; WPXTabStop tmpTabStop = WPXTabStop(); while (((tmpTabType = (int8_t)readU8(input, encryption)) & 0xff) != 0xff) { if (input->atEOS()) throw FileException(); - tmpTabPosition = (float)((double)readU16(input, encryption, true) / 72.0f); + tmpTabPosition = (double)((double)readU16(input, encryption, true) / 72.0); if (tmpTabType < 0) { Index: WP6ParagraphGroup.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6ParagraphGroup.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- WP6ParagraphGroup.cpp 22 Nov 2007 12:20:43 -0000 1.37 +++ WP6ParagraphGroup.cpp 3 Dec 2008 13:40:34 -0000 1.38 @@ -87,7 +87,7 @@ { uint32_t lineSpacing = readU32(input, encryption); int16_t lineSpacingIntegerPart = (int16_t)((lineSpacing & 0xFFFF0000) >> 16); - float lineSpacingFractionalPart = (float)(lineSpacing & 0xFFFF)/(float)0xFFFF; + double lineSpacingFractionalPart = (double)(lineSpacing & 0xFFFF)/(double)0xFFFF; WPD_DEBUG_MSG(("WordPerfect: line spacing integer part: %i fractional part: %f (original value: %i)\n", lineSpacingIntegerPart, lineSpacingFractionalPart, lineSpacing)); m_lineSpacing = lineSpacingIntegerPart + lineSpacingFractionalPart; @@ -102,7 +102,7 @@ WP6ParagraphGroup_TabSetSubGroup::WP6ParagraphGroup_TabSetSubGroup(WPXInputStream *input, WPXEncryption *encryption) : m_isRelative(false), - m_tabAdjustValue(0.0f), + m_tabAdjustValue(0.0), m_usePreWP9LeaderMethods(), m_tabStops() { @@ -111,12 +111,12 @@ if (tmp_definition == 0) { m_isRelative = false; - m_tabAdjustValue = 0.0f; + m_tabAdjustValue = 0.0; } else { m_isRelative = true; - m_tabAdjustValue = (float)((double)tmp_tabAdjustValue/(double)WPX_NUM_WPUS_PER_INCH); + m_tabAdjustValue = (double)((double)tmp_tabAdjustValue/(double)WPX_NUM_WPUS_PER_INCH); } uint8_t tmp_repetitionCount = 0; WPXTabStop tmp_tabStop; @@ -191,7 +191,7 @@ { if (tmp_tabPosition != 0xFFFF) { - tmp_tabStop.m_position = (float)((double)tmp_tabPosition/(double)WPX_NUM_WPUS_PER_INCH) - + tmp_tabStop.m_position = (double)((double)tmp_tabPosition/(double)WPX_NUM_WPUS_PER_INCH) - m_tabAdjustValue; m_tabStops.push_back(tmp_tabStop); m_usePreWP9LeaderMethods.push_back(tmp_usePreWP9LeaderMethod); @@ -201,7 +201,7 @@ { for (int k=0; k<tmp_repetitionCount; k++) { - tmp_tabStop.m_position += (float)((double)tmp_tabPosition/(double)WPX_NUM_WPUS_PER_INCH); + tmp_tabStop.m_position += (double)((double)tmp_tabPosition/(double)WPX_NUM_WPUS_PER_INCH); m_tabStops.push_back(tmp_tabStop); m_usePreWP9LeaderMethods.push_back(tmp_usePreWP9LeaderMethod); } @@ -284,20 +284,20 @@ WP6ParagraphGroup_SpacingAfterParagraphSubGroup::WP6ParagraphGroup_SpacingAfterParagraphSubGroup(WPXInputStream *input, WPXEncryption *encryption, const uint16_t sizeNonDeletable) : - m_spacingAfterParagraphAbsolute(0.0f), - m_spacingAfterParagraphRelative(1.0f), + m_spacingAfterParagraphAbsolute(0.0), + m_spacingAfterParagraphRelative(1.0), m_sizeNonDeletable(sizeNonDeletable) { uint32_t spacingAfterRelative = readU32(input, encryption); int16_t spacingAfterIntegerPart = (int16_t)((spacingAfterRelative & 0xFFFF0000) >> 16); - float spacingAfterFractionalPart = (float)(spacingAfterRelative & 0xFFFF)/(float)0xFFFF; + double spacingAfterFractionalPart = (double)(spacingAfterRelative & 0xFFFF)/(double)0xFFFF; WPD_DEBUG_MSG(("WordPerfect: spacing after paragraph relative integer part: %i fractional part: %f (original value: %i)\n", spacingAfterIntegerPart, spacingAfterFractionalPart, spacingAfterRelative)); m_spacingAfterParagraphRelative = spacingAfterIntegerPart + spacingAfterFractionalPart; if (m_sizeNonDeletable == (uint16_t)0x06) // Let us use the optional information that is in WPUs { uint16_t spacingAfterAbsolute = readU16(input, encryption); - m_spacingAfterParagraphAbsolute = (float)((double)spacingAfterAbsolute / (double)WPX_NUM_WPUS_PER_INCH); + m_spacingAfterParagraphAbsolute = (double)((double)spacingAfterAbsolute / (double)WPX_NUM_WPUS_PER_INCH); WPD_DEBUG_MSG(("WordPerfect: spacing after paragraph absolute: %i\n", spacingAfterAbsolute)); } } Index: WPXPageSpan.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WPXPageSpan.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- WPXPageSpan.h 9 Nov 2007 16:02:41 -0000 1.25 +++ WPXPageSpan.h 3 Dec 2008 13:40:34 -0000 1.26 @@ -62,31 +62,31 @@ { public: WPXPageSpan(); - WPXPageSpan(const WPXPageSpan &page, float paragraphMarginLeft, float paragraphMarginRight); + WPXPageSpan(const WPXPageSpan &page, double paragraphMarginLeft, double paragraphMarginRight); WPXPageSpan(const WPXPageSpan &page); virtual ~WPXPageSpan(); bool getHeaderFooterSuppression(const uint8_t headerFooterType) const { if (headerFooterType <= WPX_FOOTER_B) return m_isHeaderFooterSuppressed[headerFooterType]; return false; } - float getFormLength() const { return m_formLength; } - float getFormWidth() const { return m_formWidth; } + double getFormLength() const { return m_formLength; } + double getFormWidth() const { return m_formWidth; } WPXFormOrientation getFormOrientation() const { return m_formOrientation; } - float getMarginLeft() const { return m_marginLeft; } - float getMarginRight() const { return m_marginRight; } - float getMarginTop() const { return m_marginTop; } - float getMarginBottom() const { return m_marginBottom; } + double getMarginLeft() const { return m_marginLeft; } + double getMarginRight() const { return m_marginRight; } + double getMarginTop() const { return m_marginTop; } + double getMarginBottom() const { return m_marginBottom; } int getPageSpan() const { return m_pageSpan; } const std::vector<WPXHeaderFooter> & getHeaderFooterList() const { return m_headerFooterList; } void setHeaderFooter(const WPXHeaderFooterType type, const uint8_t headerFooterType, const WPXHeaderFooterOccurence occurence, const WPXSubDocument * subDocument, WPXTableList tableList); void setHeadFooterSuppression(const uint8_t headerFooterType, const bool suppress) { m_isHeaderFooterSuppressed[headerFooterType] = suppress; } - void setFormLength(const float formLength) { m_formLength = formLength; } - void setFormWidth(const float formWidth) { m_formWidth = formWidth; } + void setFormLength(const double formLength) { m_formLength = formLength; } + void setFormWidth(const double formWidth) { m_formWidth = formWidth; } void setFormOrientation(const WPXFormOrientation formOrientation) { m_formOrientation = formOrientation; } - void setMarginLeft(const float marginLeft) { m_marginLeft = marginLeft; } - void setMarginRight(const float marginRight) { m_marginRight = marginRight; } - void setMarginTop(const float marginTop) { m_marginTop = marginTop; } - void setMarginBottom(const float marginBottom) { m_marginBottom = marginBottom; } + void setMarginLeft(const double marginLeft) { m_marginLeft = marginLeft; } + void setMarginRight(const double marginRight) { m_marginRight = marginRight; } + void setMarginTop(const double marginTop) { m_marginTop = marginTop; } + void setMarginBottom(const double marginBottom) { m_marginBottom = marginBottom; } void setPageSpan(const int pageSpan) { m_pageSpan = pageSpan; } void makeConsistent(int startingPageNumber); @@ -97,10 +97,10 @@ private: bool m_isHeaderFooterSuppressed[WPX_NUM_HEADER_FOOTER_TYPES]; - float m_formLength, m_formWidth; + double m_formLength, m_formWidth; WPXFormOrientation m_formOrientation; - float m_marginLeft, m_marginRight; - float m_marginTop, m_marginBottom; + double m_marginLeft, m_marginRight; + double m_marginTop, m_marginBottom; std::vector<WPXHeaderFooter> m_headerFooterList; int m_pageSpan; Index: libwpd_internal.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/libwpd_internal.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- libwpd_internal.cpp 8 Dec 2007 09:26:37 -0000 1.42 +++ libwpd_internal.cpp 3 Dec 2008 13:40:34 -0000 1.43 @@ -925,16 +925,16 @@ uint16_t fixedPointToWPUs(const uint32_t fixedPointNumber) { int16_t fixedPointNumberIntegerPart = (int16_t)((fixedPointNumber & 0xFFFF0000) >> 16); - float fixedPointNumberFractionalPart = (float)((double)(fixedPointNumber & 0x0000FFFF)/(double)0xFFFF); - uint16_t numberWPU = (uint16_t)rint((((float)fixedPointNumberIntegerPart + fixedPointNumberFractionalPart)*50)/3); + double fixedPointNumberFractionalPart = (double)((double)(fixedPointNumber & 0x0000FFFF)/(double)0xFFFF); + uint16_t numberWPU = (uint16_t)rint((((double)fixedPointNumberIntegerPart + fixedPointNumberFractionalPart)*50)/3); return numberWPU; } -float fixedPointToFloat(const uint32_t fixedPointNumber) +double fixedPointToDouble(const uint32_t fixedPointNumber) { int16_t fixedPointNumberIntegerPart = (int16_t)((fixedPointNumber & 0xFFFF0000) >> 16); - float fixedPointNumberFractionalPart = (float)((double)(fixedPointNumber & 0x0000FFFF)/(double)0xFFFF); - return ((float)fixedPointNumberIntegerPart + fixedPointNumberFractionalPart); + double fixedPointNumberFractionalPart = (double)((double)(fixedPointNumber & 0x0000FFFF)/(double)0xFFFF); + return ((double)fixedPointNumberIntegerPart + fixedPointNumberFractionalPart); } _RGBSColor::_RGBSColor(uint8_t r, uint8_t g, uint8_t b, uint8_t s) @@ -961,7 +961,7 @@ { } -_WPXTabStop::_WPXTabStop(float position, WPXTabAlignment alignment, uint16_t leaderCharacter, uint8_t leaderNumSpaces) +_WPXTabStop::_WPXTabStop(double position, WPXTabAlignment alignment, uint16_t leaderCharacter, uint8_t leaderNumSpaces) : m_position(position), m_alignment(alignment), m_leaderCharacter(leaderCharacter), @@ -970,7 +970,7 @@ } _WPXTabStop::_WPXTabStop() - : m_position(0.0f), + : m_position(0.0), m_alignment(LEFT), m_leaderCharacter('\0'), m_leaderNumSpaces(0) @@ -978,9 +978,9 @@ } _WPXColumnDefinition::_WPXColumnDefinition() - : m_width(0.0f), - m_leftGutter(0.0f), - m_rightGutter(0.0f) + : m_width(0.0), + m_leftGutter(0.0), + m_rightGutter(0.0) { } Index: WP5StylesListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP5StylesListener.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- WP5StylesListener.h 27 Oct 2008 13:06:49 -0000 1.31 +++ WP5StylesListener.h 3 Dec 2008 13:40:34 -0000 1.32 @@ -43,16 +43,16 @@ void startDocument() {} void startSubDocument() {} - void setFont(const WPXString& /* fontName */, float /* fontSize */) {} + void setFont(const WPXString& /* fontName */, double /* fontSize */) {} void setTabs(const std::vector<WPXTabStop>& /* tabStops */, uint16_t /* tabOffset */) {} void insertCharacter(uint16_t /* character */) { /*if (!isUndoOn())*/ m_currentPageHasContent = true; } - void insertTab(uint8_t /* tabType */, float /* tabPosition */) { /*if (!isUndoOn())*/ m_currentPageHasContent = true; } - virtual void insertIndent(uint8_t /* indentType */, float /* indentPosition */) { /*if (!isUndoOn())*/ m_currentPageHasContent = true; } + void insertTab(uint8_t /* tabType */, double /* tabPosition */) { /*if (!isUndoOn())*/ m_currentPageHasContent = true; } + virtual void insertIndent(uint8_t /* indentType */, double /* indentPosition */) { /*if (!isUndoOn())*/ m_currentPageHasContent = true; } void characterColorChange(uint8_t /* red */, uint8_t /* green */, uint8_t /* blue */) {}; void insertEOL() { /*if (!isUndoOn())*/ m_currentPageHasContent = true; } void insertBreak(uint8_t breakType); void attributeChange(bool /* isOn */, uint8_t /* attribute */) {} - void lineSpacingChange(float /* lineSpacing */) {} + void lineSpacingChange(double /* lineSpacing */) {} void justificationChange(uint8_t /* justification */) {} void pageMarginChange(uint8_t side, uint16_t margin); void pageFormChange(uint16_t length, uint16_t width, WPXFormOrientation orientation); @@ -90,7 +90,7 @@ WPXTableList m_tableList; WPXTable *m_currentTable; - float m_tempMarginLeft, m_tempMarginRight; + double m_tempMarginLeft, m_tempMarginRight; bool m_currentPageHasContent; bool m_isSubDocument; std::vector<WP5SubDocument *> &m_subDocuments; Index: WP6ParagraphGroup.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6ParagraphGroup.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- WP6ParagraphGroup.h 22 Nov 2007 12:20:43 -0000 1.27 +++ WP6ParagraphGroup.h 3 Dec 2008 13:40:34 -0000 1.28 @@ -37,7 +37,7 @@ void parse(WP6Listener *listener, const uint8_t numPrefixIDs, uint16_t const *prefixIDs) const; private: - float m_lineSpacing; + double m_lineSpacing; }; class WP6ParagraphGroup_JustificationModeSubGroup : public WP6VariableLengthGroup_SubGroup @@ -57,8 +57,8 @@ void parse(WP6Listener *listener, const uint8_t numPrefixIDs, uint16_t const *prefixIDs) const; private: - float m_spacingAfterParagraphAbsolute; - float m_spacingAfterParagraphRelative; + double m_spacingAfterParagraphAbsolute; + double m_spacingAfterParagraphRelative; uint16_t m_sizeNonDeletable; }; @@ -71,7 +71,7 @@ private: bool m_isRelative; - float m_tabAdjustValue; + double m_tabAdjustValue; std::vector<bool> m_usePreWP9LeaderMethods; std::vector<WPXTabStop> m_tabStops; }; Index: WP5ListFontsUsedPacket.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP5ListFontsUsedPacket.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- WP5ListFontsUsedPacket.cpp 22 Nov 2007 12:20:34 -0000 1.6 +++ WP5ListFontsUsedPacket.cpp 3 Dec 2008 13:40:34 -0000 1.7 @@ -46,7 +46,7 @@ int numFonts = (int)(dataSize / 86); // 86 == size of the structure describing the font WPD_DEBUG_MSG(("WP5 List Fonts Used Packet, data size: %i, number fonts: %i\n", dataSize, numFonts)); int tempFontNameOffset; - float tempFontSize; + double tempFontSize; for (int i=0; i<numFonts; i++) { input->seek(18, WPX_SEEK_CUR); @@ -54,13 +54,13 @@ if (m_packetType == WP50_LIST_FONTS_USED_PACKET) { input->seek(2, WPX_SEEK_CUR); - tempFontSize=(float)(readU16(input, encryption) / 50); + tempFontSize=(double)(readU16(input, encryption) / 50); input->seek(62, WPX_SEEK_CUR); } else { input->seek(27, WPX_SEEK_CUR); - tempFontSize=(float)(readU16(input, encryption) / 50); + tempFontSize=(double)(readU16(input, encryption) / 50); input->seek(37, WPX_SEEK_CUR); } WPD_DEBUG_MSG(("WP5 List Fonts Used Packet, font number: %i, font name offset: %i, font size, %.4f\n", i, tempFontNameOffset, tempFontSize)); @@ -76,10 +76,10 @@ return 0; } -float WP5ListFontsUsedPacket::getFontSize(const int fontNumber) const +double WP5ListFontsUsedPacket::getFontSize(const int fontNumber) const { if ((fontNumber >= 0) && ((long)fontNumber < (long)m_fontSize.size())) return m_fontSize[fontNumber]; - return 0.0f; + return 0.0; } Index: WP6StylesListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP6StylesListener.h,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- WP6StylesListener.h 27 Oct 2008 13:06:49 -0000 1.28 +++ WP6StylesListener.h 3 Dec 2008 13:40:34 -0000 1.29 @@ -57,7 +57,7 @@ void defineTabStops(const bool /* isRelative */, const std::vector<WPXTabStop> & /* tabStops */, const std::vector<bool> & /* usePreWP9LeaderMethods */) {} void insertCharacter(const uint16_t /* character */) { if (!isUndoOn()) m_currentPageHasContent = true; } - void insertTab(const uint8_t /* tabType */, float /* tabPosition */) { if (!isUndoOn()) m_currentPageHasContent = true; } + void insertTab(const uint8_t /* tabType */, double /* tabPosition */) { if (!isUndoOn()) m_currentPageHasContent = true; } void handleLineBreak() { if (!isUndoOn()) m_currentPageHasContent = true; } void insertEOL() { if (!isUndoOn()) m_currentPageHasContent = true; } void insertBreak(const uint8_t breakType); @@ -66,8 +66,8 @@ void highlightChange(const bool /* isOn */, const RGBSColor /* color */) {} void fontChange(const uint16_t /* matchedFontPointSize */, const uint16_t /* fontPID */) {} void attributeChange(const bool /* isOn */, const uint8_t /* attribute */) {} - void lineSpacingChange(const float /* lineSpacing */) {} - void spacingAfterParagraphChange(const float /* spacingRelative */, const float /* spacingAbsolute */) {} + void lineSpacingChange(const double /* lineSpacing */) {} + void spacingAfterParagraphChange(const double /* spacingRelative */, const double /* spacingAbsolute */) {} void justificationChange(const uint8_t /* justification */) {} void pageMarginChange(const uint8_t side, const uint16_t margin); void pageFormChange(const uint16_t length, const uint16_t width, const WPXFormOrientation orientation); @@ -75,7 +75,7 @@ void paragraphMarginChange(const uint8_t /* side */, const int16_t /* margin */) {} void indentFirstLineChange(const int16_t /* offset */) {} void columnChange(const WPXTextColumnType /* columnType */, const uint8_t /* numColumns */, - const std::vector<float> & /* columnWidth */, const std::vector<bool> & /* isFixedWidth */) {} + const std::vector<double> & /* columnWidth */, const std::vector<bool> & /* isFixedWidth */) {} void updateOutlineDefinition(const WP6OutlineLocation /* outlineLocation */, const uint16_t /* outlineHash */, const uint8_t * /* numberingMethods */, const uint8_t /* tabBehaviourFlag */) {} @@ -129,7 +129,7 @@ WPXTableList m_tableList; WPXTable * m_currentTable; - float m_tempMarginLeft, m_tempMarginRight; + double m_tempMarginLeft, m_tempMarginRight; bool m_currentPageHasContent; bool m_isTableDefined; bool m_isSubDocument; Index: WP3StylesListener.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP3StylesListener.h,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- WP3StylesListener.h 7 Nov 2008 17:24:23 -0000 1.28 +++ WP3StylesListener.h 3 Dec 2008 13:40:34 -0000 1.29 @@ -42,11 +42,11 @@ void startSubDocument() {} void insertCharacter(uint16_t /* character */) { if (!isUndoOn()) m_currentPageHasContent = true; } void insertTab() { if (!isUndoOn()) m_currentPageHasContent = true; } - void insertTab(uint8_t /* tabType */, float /* tabPosition */) { if (!isUndoOn()) m_currentPageHasContent = true; } + void insertTab(uint8_t /* tabType */, double /* tabPosition */) { if (!isUndoOn()) m_currentPageHasContent = true; } void insertEOL() { if (!isUndoOn()) m_currentPageHasContent = true; } void insertBreak(uint8_t breakType); void attributeChange(bool /* isOn */, uint8_t /* attribute */) {} - void lineSpacingChange(float /* lineSpacing */) {} + void lineSpacingChange(double /* lineSpacing */) {} void justificationChange(uint8_t /* justification */) {} void pageMarginChange(uint8_t side, uint16_t margin); void pageFormChange(uint16_t length, uint16_t width, WPXFormOrientation orientation); @@ -54,7 +54,7 @@ void indentFirstLineChange(int16_t /* offset */) {} void setTabs(bool /* isRelative */, const std::vector<WPXTabStop> /* tabStops */) {} void columnChange(WPXTextColumnType /* columnType */, uint8_t /* numColumns */, - const std::vector<float> & /* columnWidth */, const std::vector<bool> & /* isFixedWidth */) {} + const std::vector<double> & /* columnWidth */, const std::vector<bool> & /* isFixedWidth */) {} void endDocument(); void endSubDocument(); @@ -80,14 +80,14 @@ void suppressPage(uint16_t suppressCode); void backTab() { if (!isUndoOn()) m_currentPageHasContent = true; } void leftIndent() {} - void leftIndent(float /* offset */) {} + void leftIndent(double /* offset */) {} void leftRightIndent() {} - void leftRightIndent(float /* offset */) {} - void insertPicture(float /* height */, float /* width */, float /* verticalOffset */, float /* horizontalOffset */, uint8_t /* leftColumn */, uint8_t /* rightColumn */, + void leftRightIndent(double /* offset */) {} + void insertPicture(double /* height */, double /* width */, double /* verticalOffset */, double /* horizontalOffset */, uint8_t /* leftColumn */, uint8_t /* rightColumn */, uint16_t /* figureFlags */, const WPXBinaryData & /* binaryData */) {} - void insertTextBox(float /* height */, float /* width */, float /* verticalOffset */, float /* horizontalOffset */, uint8_t /* leftColumn */, uint8_t /* rightColumn */, + void insertTextBox(double /* height */, double /* width */, double /* verticalOffset */, double /* horizontalOffset */, uint8_t /* leftColumn */, uint8_t /* rightColumn */, uint16_t /* figureFlags */, const WP3SubDocument * /* subDocument */, const WP3SubDocument * /* caption */) {} - void insertWP51Table(float /* height */, float /* width */, float /* verticalOffset */, float /* horizontalOffset */, uint8_t /* leftColumn */, uint8_t /* rightColumn */, + void insertWP51Table(double /* height */, double /* width */, double /* verticalOffset */, double /* horizontalOffset */, uint8_t /* leftColumn */, uint8_t /* rightColumn */, uint16_t /* figureFlags */, const WP3SubDocument * /* subDocument */, const WP3SubDocument * /* caption */) {} protected: @@ -100,7 +100,7 @@ WPXTableList m_tableList; WPXTable *m_currentTable; - float m_tempMarginLeft, m_tempMarginRight; + double m_tempMarginLeft, m_tempMarginRight; bool m_currentPageHasContent; bool m_isSubDocument; std::vector<WP3SubDocument *> &m_subDocuments; Index: WP1StylesListener.cpp =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP1StylesListener.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- WP1StylesListener.cpp 27 Oct 2008 13:06:49 -0000 1.12 +++ WP1StylesListener.cpp 3 Dec 2008 13:40:34 -0000 1.13 @@ -35,8 +35,8 @@ m_currentPage(), m_nextPage(), m_subDocuments(subDocuments), - m_tempMarginLeft(1.0f), - m_tempMarginRight(1.0f), + m_tempMarginLeft(1.0), + m_tempMarginRight(1.0), m_currentPageHasContent(false), m_isSubDocument(false), m_pageListHardPageMark(m_pageList.end()) @@ -78,7 +78,7 @@ m_pageListHardPageMark--; } } - m_currentPage = WPXPageSpan(m_pageList.back(), 0.0f, 0.0f); + m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0); m_currentPage.setPageSpan(1); for(std::vector<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin(); @@ -117,11 +117,11 @@ return; // do not collect L/R margin information in sub documents std::list<WPXPageSpan>::iterator Iter; - float marginInch = 0.0f; + double marginInch = 0.0; if (leftMargin) { - marginInch = (float)((double)leftMargin / 72.0f); + marginInch = (double)((double)leftMargin / 72.0); WPD_DEBUG_MSG(("Left Margin: %ipts = %.4finch\n", leftMargin, marginInch)); if (!m_currentPageHasContent && (m_pageListHardPageMark == m_pageList.end())) m_currentPage.setMarginLeft(marginInch); @@ -139,7 +139,7 @@ if (rightMargin) { - marginInch = (float)((double)rightMargin / 72.0f); + marginInch = (double)((double)rightMargin / 72.0); WPD_DEBUG_MSG(("Right Margin: %ipts = %.4finch\n", rightMargin, marginInch)); if (!m_currentPageHasContent && (m_pageListHardPageMark == m_pageList.end())) m_currentPage.setMarginRight(marginInch); @@ -162,7 +162,7 @@ if (!isUndoOn()) { if (!topMargin) return; - float marginInch = (float)((double)topMargin / 72.0f); + double marginInch = (double)((double)topMargin / 72.0); m_currentPage.setMarginTop(marginInch); } } @@ -172,7 +172,7 @@ if (!isUndoOn()) { if (!bottomMargin) return; - float marginInch = (float)((double)bottomMargin / 72.0f); + double marginInch = (double)((double)bottomMargin / 72.0); m_currentPage.setMarginBottom(marginInch); } } Index: WP5TabGroup.h =================================================================== RCS file: /cvsroot/libwpd/libwpd2/src/lib/WP5TabGroup.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- WP5TabGroup.h ... [truncated message content] |
