diff options
Diffstat (limited to 'xmloff/source/transform/TransformerBase.cxx')
| -rwxr-xr-x[-rw-r--r--] | xmloff/source/transform/TransformerBase.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index 35536b872b43..2761a3f234ef 100644..100755 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -34,7 +34,7 @@ #include <com/sun/star/i18n/UnicodeType.hpp> #include <comphelper/processfactory.hxx> #include <xmloff/nmspmap.hxx> -#include "xmlnmspe.hxx" +#include "xmloff/xmlnmspe.hxx" #include "IgnoreTContext.hxx" #include "RenameElemTContext.hxx" #include "ProcAttrTContext.hxx" @@ -80,7 +80,7 @@ bool lcl_ConvertAttr( OUString & rOutAttribute, sal_Int32 nParam ) } } // anonymous namespace -XMLTransformerContext *XMLTransformerBase::CreateContext( USHORT nPrefix, +XMLTransformerContext *XMLTransformerBase::CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rQName ) { XMLTransformerActions::key_type aKey( nPrefix, rLocalName ); @@ -606,8 +606,8 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( // #i13778#,#i36248# apply correct twip-to-1/100mm nMeasure = (sal_Int32)( nMeasure >= 0 - ? ((nMeasure*127L+36L)/72L) - : ((nMeasure*127L-36L)/72L) ); + ? ((nMeasure*127+36)/72) + : ((nMeasure*127-36)/72) ); rtl::OUStringBuffer aBuffer; SvXMLUnitConverter::convertMeasure( aBuffer, nMeasure, MAP_100TH_MM, nDestUnit ); @@ -766,8 +766,8 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( // #i13778#,#i36248#/ apply correct 1/100mm-to-twip conversion nMeasure = (sal_Int32)( nMeasure >= 0 - ? ((nMeasure*72L+63L)/127L) - : ((nMeasure*72L-63L)/127L) ); + ? ((nMeasure*72+63)/127) + : ((nMeasure*72-63)/127) ); OUStringBuffer aBuffer; SvXMLUnitConverter::convertMeasure( aBuffer, nMeasure, MAP_100TH_MM, nDestUnit ); @@ -1187,7 +1187,7 @@ sal_Bool XMLTransformerBase::NegPercent( OUString& rValue ) sal_Bool bNeg = sal_False; double nVal = 0; - sal_Int32 nPos = 0L; + sal_Int32 nPos = 0; sal_Int32 nLen = rValue.getLength(); // skip white space |