Index: inc/xmlehelp.hxx
===================================================================
RCS file: /cvs/xml/xmloff/inc/xmlehelp.hxx,v
retrieving revision 1.4
retrieving revision 1.4.38.1
diff -u -r1.4 -r1.4.38.1
--- inc/xmlehelp.hxx	9 Sep 2005 13:13:24 -0000	1.4
+++ inc/xmlehelp.hxx	26 Oct 2005 18:06:43 -0000	1.4.38.1
@@ -45,10 +45,10 @@
 class SvXMLExportHelper
 {
 public:
-	static void AddLength( long nValue, MapUnit eValueUnit,
+	static void AddLength( sal_Int32 nValue, MapUnit eValueUnit,
 						   ::rtl::OUStringBuffer& rOut,
 						   MapUnit eOutUnit );
-	static void AddPercentage( long nVal, ::rtl::OUStringBuffer& rOut );
+	static void AddPercentage( sal_Int32 nVal, ::rtl::OUStringBuffer& rOut );
 	static double GetConversionFactor(::rtl::OUStringBuffer& rUnit, 
 		const MapUnit eCoreUnit, const MapUnit eDestUnit);
 	static MapUnit GetUnitFromString(const ::rtl::OUString& rString, 
Index: source/core/xmlehelp.cxx
===================================================================
RCS file: /cvs/xml/xmloff/source/core/xmlehelp.cxx,v
retrieving revision 1.9
retrieving revision 1.9.26.1
diff -u -r1.9 -r1.9.26.1
--- source/core/xmlehelp.cxx	23 Sep 2005 11:44:26 -0000	1.9
+++ source/core/xmlehelp.cxx	26 Oct 2005 18:06:43 -0000	1.9.26.1
@@ -57,7 +57,7 @@
 using namespace ::rtl;
 using namespace ::xmloff::token;
 
-void SvXMLExportHelper::AddLength( long nValue, MapUnit eValueUnit,
+void SvXMLExportHelper::AddLength( sal_Int32 nValue, MapUnit eValueUnit,
 		   			  	   		   OUStringBuffer& rOut,
 								   MapUnit eOutUnit )
 {
@@ -69,9 +69,9 @@
 	}
 	
 	// The new length is (nVal * nMul)/(nDiv*nFac*10)
-	long nMul = 1000;
-	long nDiv = 1;
-	long nFac = 100;
+	sal_Int32 nMul = 1000;
+	sal_Int32 nDiv = 1;
+	sal_Int32 nFac = 100;
 	enum XMLTokenEnum eUnit = XML_TOKEN_INVALID;
 	switch( eValueUnit )
 	{
@@ -180,7 +180,7 @@
 	}
 
 
-	long nLongVal;
+	sal_Int32 nLongVal;
 	BOOL bOutLongVal = TRUE;
 	if( nValue > LONG_MAX / nMul )
 	{
@@ -194,8 +194,8 @@
 
 		if( nBigVal.IsLong() )
 		{
-			// To convert the value into a string a long is sufficient
-			nLongVal = (long)nBigVal;
+			// To convert the value into a string a sal_Int32 is sufficient
+			nLongVal = sal_Int32( nBigVal );
 		}
 		else
 		{
@@ -241,7 +241,7 @@
 		rOut.append( GetXMLToken(eUnit) );
 #if 0
 	enum XMLTokenEnum eUnit;
-	long nFac = 1;
+	sal_Int32 nFac = 1;
 	switch( eOutUnit )
 	{
 	case MAP_100TH_MM:
@@ -317,7 +317,7 @@
 
 }
 
-void SvXMLExportHelper::AddPercentage( long nValue, OUStringBuffer& rOut )
+void SvXMLExportHelper::AddPercentage( sal_Int32 nValue, OUStringBuffer& rOut )
 {
 	rOut.append( nValue );
 	rOut.append( sal_Unicode('%' ) );
Index: source/style/XMLBackgroundImageContext.cxx
===================================================================
RCS file: /cvs/xml/xmloff/source/style/XMLBackgroundImageContext.cxx,v
retrieving revision 1.11
retrieving revision 1.11.36.1
diff -u -r1.11 -r1.11.36.1
--- source/style/XMLBackgroundImageContext.cxx	9 Sep 2005 14:31:09 -0000	1.11
+++ source/style/XMLBackgroundImageContext.cxx	26 Oct 2005 18:06:44 -0000	1.11.36.1
@@ -247,7 +247,7 @@
 					}
 					else if( -1 != aToken.indexOf( sal_Unicode('%') ) )
 					{
-						long nPrc = 50;
+						sal_Int32 nPrc = 50;
 						if( rUnitConverter.convertPercent( nPrc, aToken ) )
 						{
 							if( !bHori )
Index: source/style/backhdl.cxx
===================================================================
RCS file: /cvs/xml/xmloff/source/style/backhdl.cxx,v
retrieving revision 1.4
retrieving revision 1.4.38.1
diff -u -r1.4 -r1.4.38.1
--- source/style/backhdl.cxx	9 Sep 2005 14:36:42 -0000	1.4
+++ source/style/backhdl.cxx	26 Oct 2005 18:06:44 -0000	1.4.38.1
@@ -106,7 +106,7 @@
 		}
 		else if( -1 != aToken.indexOf( sal_Unicode('%') ) )
 		{
-			long nPrc = 50;
+			sal_Int32 nPrc = 50;
 			if( rUnitConverter.convertPercent( nPrc, aToken ) )
 			{
 				if( !bHori )
Index: source/style/bordrhdl.cxx
===================================================================
RCS file: /cvs/xml/xmloff/source/style/bordrhdl.cxx,v
retrieving revision 1.5
retrieving revision 1.5.38.1
diff -u -r1.5 -r1.5.38.1
--- source/style/bordrhdl.cxx	9 Sep 2005 14:37:14 -0000	1.5
+++ source/style/bordrhdl.cxx	26 Oct 2005 18:06:45 -0000	1.5.38.1
@@ -354,7 +354,7 @@
 	sal_uInt16 nNamedWidth = USHRT_MAX;
 	Color aColor;
 
-	long nTemp;
+	sal_Int32 nTemp;
 	while( aTokens.getNextToken( aToken ) && aToken.getLength() != 0 )
 	{
 		if( !bHasWidth &&
Index: source/style/xmlnume.cxx
===================================================================
RCS file: /cvs/xml/xmloff/source/style/xmlnume.cxx,v
retrieving revision 1.23
retrieving revision 1.23.38.1
diff -u -r1.23 -r1.23.38.1
--- source/style/xmlnume.cxx	9 Sep 2005 14:52:49 -0000	1.23
+++ source/style/xmlnume.cxx	26 Oct 2005 18:06:45 -0000	1.23.38.1
@@ -300,7 +300,7 @@
 	
 	// text:level
 	OUStringBuffer sTmp;
-	sTmp.append( nLevel+1L );
+	sTmp.append( nLevel + 1 );
 	GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_LEVEL, sTmp.makeStringAndClear() );
 	if( sTextStyleName.getLength() > 0 )
 		GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_STYLE_NAME, 
Index: source/text/XMLSectionExport.cxx
===================================================================
RCS file: /cvs/xml/xmloff/source/text/XMLSectionExport.cxx,v
retrieving revision 1.39
retrieving revision 1.39.38.1
diff -u -r1.39 -r1.39.38.1
--- source/text/XMLSectionExport.cxx	9 Sep 2005 15:15:57 -0000	1.39
+++ source/text/XMLSectionExport.cxx	26 Oct 2005 18:06:45 -0000	1.39.38.1
@@ -1908,7 +1908,7 @@
 									  GetExport().EncodeStyleName( sStyle ) );
 
 			OUStringBuffer sTmp;
-			sTmp.append( nLevel+1L );
+			sTmp.append( nLevel + 1 );
 			GetExport().AddAttribute( XML_NAMESPACE_TEXT, XML_LEVEL,
 								  	  sTmp.makeStringAndClear() );
 			SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, XML_H,
Index: source/text/txtparae.cxx
===================================================================
RCS file: /cvs/xml/xmloff/source/text/txtparae.cxx,v
retrieving revision 1.124
retrieving revision 1.124.36.1
diff -u -r1.124 -r1.124.36.1
--- source/text/txtparae.cxx	9 Sep 2005 15:31:14 -0000	1.124
+++ source/text/txtparae.cxx	26 Oct 2005 18:06:46 -0000	1.124.36.1
@@ -1674,7 +1674,7 @@
 				if( -1 != nOutlineLevel )
 				{
 					OUStringBuffer sTmp;
-					sTmp.append( (sal_Int32)nOutlineLevel+1L );
+					sTmp.append( sal_Int32( nOutlineLevel + 1 ) );
 					GetExport().AddAttribute( XML_NAMESPACE_TEXT,
 											  XML_OUTLINE_LEVEL,
 								  sTmp.makeStringAndClear() );