summaryrefslogtreecommitdiff
path: root/xmloff/source/style/xmlnumi.cxx
diff options
context:
space:
mode:
authorAndre Fischer <andre.f.fischer <Andre Fischer<andre.f.fischer@oracle.com>2010-11-05 10:17:51 +0100
committerAndre Fischer <andre.f.fischer <Andre Fischer<andre.f.fischer@oracle.com>2010-11-05 10:17:51 +0100
commit312cafc472e4ac74a045baf123476a2457c15185 (patch)
tree6a1e95fbf38b3355c2a243d88b8df2efae4ffe92 /xmloff/source/style/xmlnumi.cxx
parentc17699540dc03932a9f9262b84a53483fca2f40a (diff)
parent3c21373571fd0cf89391502aa132c5f420cd75c6 (diff)
impress195: merge with DEV300_m92
Diffstat (limited to 'xmloff/source/style/xmlnumi.cxx')
-rw-r--r--xmloff/source/style/xmlnumi.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 7306c7d5f0de..72efeabaaca4 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -374,7 +374,7 @@ SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl(
if( nLevel >= 1L )
nLevel--;
else
- nLevel = 0L;
+ nLevel = 0;
break;
case XML_TOK_TEXT_LEVEL_ATTR_STYLE_NAME:
sTextStyleName = rValue;
@@ -471,7 +471,7 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
{
sal_Int16 eType;
- sal_Int32 nCount = 0L;
+ sal_Int32 nCount = 0;
if( bBullet )
{
eType = NumberingType::CHAR_SPECIAL;
@@ -480,7 +480,7 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
if( bImage )
{
eType = NumberingType::BITMAP;
- nCount = 15L;
+ nCount = 15;
if( (sImageURL.getLength() > 0L) || xBase64Stream.is() )
nCount++;
@@ -490,7 +490,7 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
eType = NumberingType::ARABIC;
GetImport().GetMM100UnitConverter().convertNumFormat(
eType, sNumFormat, sNumLetterSync, sal_True );
- nCount = 15L;
+ nCount = 15;
}
if( ( bBullet || bNum ) && nRelSize )
@@ -505,7 +505,7 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
if( nCount > 0 )
{
beans::PropertyValue *pProps = aPropSeq.getArray();
- sal_Int32 nPos = 0L;
+ sal_Int32 nPos = 0;
pProps[nPos].Name =
OUString::createFromAscii( XML_UNO_NAME_NRULE_NUMBERINGTYPE );
pProps[nPos++].Value <<= (sal_Int16)eType ;