diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-01-30 10:22:38 +0100 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-01-30 10:22:38 +0100 |
commit | 2838b2c9bdf93427757947b1167539e97263180e (patch) | |
tree | 2641ed1f2205b1ccd5c0c18402325e4af6d9550c /writerperfect | |
parent | WaE: throw out some warnings (diff) | |
download | core-2838b2c9bdf93427757947b1167539e97263180e.tar.gz core-2838b2c9bdf93427757947b1167539e97263180e.zip |
Use double instead of float
Diffstat (limited to 'writerperfect')
-rw-r--r-- | writerperfect/source/filter/DocumentCollector.cxx | 2 | ||||
-rw-r--r-- | writerperfect/source/filter/DocumentCollector.hxx | 2 | ||||
-rw-r--r-- | writerperfect/source/filter/FilterInternal.hxx | 6 | ||||
-rw-r--r-- | writerperfect/source/filter/ListStyle.cxx | 12 | ||||
-rw-r--r-- | writerperfect/source/filter/SectionStyle.cxx | 2 | ||||
-rw-r--r-- | writerperfect/source/filter/TextRunStyle.cxx | 6 | ||||
-rw-r--r-- | writerperfect/source/filter/WriterProperties.hxx | 4 |
7 files changed, 17 insertions, 17 deletions
diff --git a/writerperfect/source/filter/DocumentCollector.cxx b/writerperfect/source/filter/DocumentCollector.cxx index 5f8633be5179..de14d34ee6e9 100644 --- a/writerperfect/source/filter/DocumentCollector.cxx +++ b/writerperfect/source/filter/DocumentCollector.cxx @@ -82,7 +82,7 @@ DocumentCollector::DocumentCollector(WPXInputStream *pInput, DocumentHandlerInte mbUsed(false), mWriterDocumentStates(), mWriterListStates(), - mfSectionSpaceAfter(0.0f), + mfSectionSpaceAfter(0.0), miNumListStyles(0), mpCurrentContentElements(&mBodyElements), mpCurrentPageSpan(NULL), diff --git a/writerperfect/source/filter/DocumentCollector.hxx b/writerperfect/source/filter/DocumentCollector.hxx index 619bc1de603d..6d0d35396201 100644 --- a/writerperfect/source/filter/DocumentCollector.hxx +++ b/writerperfect/source/filter/DocumentCollector.hxx @@ -204,7 +204,7 @@ private: // section styles std::vector<SectionStyle *> mSectionStyles; - float mfSectionSpaceAfter; + double mfSectionSpaceAfter; // table styles std::vector<TableStyle *> mTableStyles; diff --git a/writerperfect/source/filter/FilterInternal.hxx b/writerperfect/source/filter/FilterInternal.hxx index c53e83ec5d35..fcac328c95a0 100644 --- a/writerperfect/source/filter/FilterInternal.hxx +++ b/writerperfect/source/filter/FilterInternal.hxx @@ -31,9 +31,9 @@ #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.5; // inches (OOo required default: we will handle this later) +const double fDefaultPageHeight = 11.0; // inches #endif diff --git a/writerperfect/source/filter/ListStyle.cxx b/writerperfect/source/filter/ListStyle.cxx index c7fdc0d0a835..b991b12a236e 100644 --- a/writerperfect/source/filter/ListStyle.cxx +++ b/writerperfect/source/filter/ListStyle.cxx @@ -73,11 +73,11 @@ void OrderedListLevelStyle::write(DocumentHandlerInterface *pHandler, int iLevel listLevelStyleOpen.write(pHandler); TagOpenElement stylePropertiesOpen("style:list-level-properties"); - if (mPropList["text:space-before"] && mPropList["text:space-before"]->getDouble() > 0.0f) + if (mPropList["text:space-before"] && mPropList["text:space-before"]->getDouble() > 0.0) stylePropertiesOpen.addAttribute("text:space-before", mPropList["text:space-before"]->getStr()); - if (mPropList["text:min-label-width"] && mPropList["text:min-label-width"]->getDouble() > 0.0f) + if (mPropList["text:min-label-width"] && mPropList["text:min-label-width"]->getDouble() > 0.0) stylePropertiesOpen.addAttribute("text:min-label-width", mPropList["text:min-label-width"]->getStr()); - if (mPropList["text:min-label-distance"] && mPropList["text:min-label-distance"]->getDouble() > 0.0f) + if (mPropList["text:min-label-distance"] && mPropList["text:min-label-distance"]->getDouble() > 0.0) stylePropertiesOpen.addAttribute("text:min-label-distance", mPropList["text:min-label-distance"]->getStr()); stylePropertiesOpen.write(pHandler); @@ -120,11 +120,11 @@ void UnorderedListLevelStyle::write(DocumentHandlerInterface *pHandler, int iLev listLevelStyleOpen.write(pHandler); TagOpenElement stylePropertiesOpen("style:list-level-properties"); - if (mPropList["text:space-before"] && mPropList["text:space-before"]->getDouble() > 0.0f) + if (mPropList["text:space-before"] && mPropList["text:space-before"]->getDouble() > 0.0) stylePropertiesOpen.addAttribute("text:space-before", mPropList["text:space-before"]->getStr()); - if (mPropList["text:min-label-width"] && mPropList["text:min-label-width"]->getDouble() > 0.0f) + if (mPropList["text:min-label-width"] && mPropList["text:min-label-width"]->getDouble() > 0.0) stylePropertiesOpen.addAttribute("text:min-label-width", mPropList["text:min-label-width"]->getStr()); - if (mPropList["text:min-label-distance"] && mPropList["text:min-label-distance"]->getDouble() > 0.0f) + if (mPropList["text:min-label-distance"] && mPropList["text:min-label-distance"]->getDouble() > 0.0) stylePropertiesOpen.addAttribute("text:min-label-distance", mPropList["text:min-label-distance"]->getStr()); stylePropertiesOpen.addAttribute("style:font-name", "OpenSymbol"); stylePropertiesOpen.write(pHandler); diff --git a/writerperfect/source/filter/SectionStyle.cxx b/writerperfect/source/filter/SectionStyle.cxx index 1b65fc7eae38..fadc190ab9b6 100644 --- a/writerperfect/source/filter/SectionStyle.cxx +++ b/writerperfect/source/filter/SectionStyle.cxx @@ -74,7 +74,7 @@ void SectionStyle::write(DocumentHandlerInterface *pHandler) const 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); } diff --git a/writerperfect/source/filter/TextRunStyle.cxx b/writerperfect/source/filter/TextRunStyle.cxx index 9b3bc9825fd9..96101a0a7608 100644 --- a/writerperfect/source/filter/TextRunStyle.cxx +++ b/writerperfect/source/filter/TextRunStyle.cxx @@ -81,10 +81,10 @@ void ParagraphStyle::write(DocumentHandlerInterface *pHandler) const propList.insert("fo:margin-top", i()->getStr()); if (strcmp(i.key(), "fo:margin-bottom") == 0) { - if (i()->getDouble() > 0.0f) + if (i()->getDouble() > 0.0) propList.insert("fo:margin-bottom", i()->getStr()); else - propList.insert("fo:margin-bottom", 0.0f); + propList.insert("fo:margin-bottom", 0.0); } if (strcmp(i.key(), "fo:line-height") == 0) propList.insert("fo:line-height", i()->getStr()); @@ -149,7 +149,7 @@ void SpanStyle::write(DocumentHandlerInterface *pHandler) const if (mPropList["fo:font-size"]) { - if (mPropList["fo:font-size"]->getDouble() > 0.0f) + if (mPropList["fo:font-size"]->getDouble() > 0.0) { propList.insert("style:font-size-asian", mPropList["fo:font-size"]->getStr()); propList.insert("style:font-size-complex", mPropList["fo:font-size"]->getStr()); diff --git a/writerperfect/source/filter/WriterProperties.hxx b/writerperfect/source/filter/WriterProperties.hxx index 757807ef3977..3889b21e2be8 100644 --- a/writerperfect/source/filter/WriterProperties.hxx +++ b/writerperfect/source/filter/WriterProperties.hxx @@ -29,9 +29,9 @@ #define _WRITER_PROPERTIES_H #define IMP_DEFAULT_SUPER_SUB_SCRIPT "58%" -#define IMP_NUM_CENTIMETERES_PER_INCH 2.54f +#define IMP_NUM_CENTIMETERES_PER_INCH 2.54 #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 |