summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/ooxml/OOXMLPropertySet.cxx12
-rw-r--r--writerfilter/source/ooxml/OOXMLPropertySet.hxx2
2 files changed, 7 insertions, 7 deletions
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.cxx b/writerfilter/source/ooxml/OOXMLPropertySet.cxx
index 3ef7a30b11ff..0b353dfb8039 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.cxx
@@ -599,35 +599,35 @@ OOXMLUniversalMeasureValue::OOXMLUniversalMeasureValue(const char * pValue, sal_
pValue[nLen-2] == 'p' &&
pValue[nLen-1] == 't')
{
- mnValue = static_cast<sal_uInt32>(val * npPt);
+ mnValue = static_cast<int>(val * npPt);
}
else if (nLen > 2 &&
pValue[nLen - 2] == 'c' &&
pValue[nLen - 1] == 'm')
{
- mnValue = static_cast<sal_uInt32>(val * npPt * 72 / 2.54);
+ mnValue = static_cast<int>(val * npPt * 72 / 2.54);
}
else if (nLen > 2 &&
pValue[nLen - 2] == 'm' &&
pValue[nLen - 1] == 'm')
{
- mnValue = static_cast<sal_uInt32>(val * npPt * 72 / 25.4);
+ mnValue = static_cast<int>(val * npPt * 72 / 25.4);
}
else if (nLen > 2 &&
pValue[nLen - 2] == 'i' &&
pValue[nLen - 1] == 'n')
{
- mnValue = static_cast<sal_uInt32>(val * npPt * 72);
+ mnValue = static_cast<int>(val * npPt * 72);
}
else if (nLen > 2 &&
pValue[nLen - 2] == 'p' &&
( pValue[nLen - 1] == 'c' || pValue[nLen - 1] == 'i' ))
{
- mnValue = static_cast<sal_uInt32>(val * npPt * 12);
+ mnValue = static_cast<int>(val * npPt * 12);
}
else
{
- mnValue = static_cast<sal_uInt32>(val);
+ mnValue = static_cast<int>(val);
}
}
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.hxx b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
index 73889a4abb9b..45aba15e2ccc 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.hxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
@@ -232,7 +232,7 @@ public:
class OOXMLUniversalMeasureValue : public OOXMLValue
{
private:
- sal_uInt32 mnValue;
+ int mnValue;
public:
OOXMLUniversalMeasureValue(const char * pValue, sal_uInt32 npPt);
virtual ~OOXMLUniversalMeasureValue() override;