diff -r 748ec5531811 -r 336bee5c2d35 charconvfw/charconvplugins/src/plugins/ISO2022JP1_2.CPP
--- a/charconvfw/charconvplugins/src/plugins/ISO2022JP1_2.CPP	Tue Aug 31 17:01:26 2010 +0300
+++ b/charconvfw/charconvplugins/src/plugins/ISO2022JP1_2.CPP	Wed Sep 01 12:39:40 2010 +0100
@@ -105,7 +105,6 @@
 		const TDesC16& aUnicode, 
 		CCnvCharacterSetConverter::TArrayOfAscendingIndices& aIndicesOfUnconvertibleCharacters)
 	{
-    TInt ret = KErrNone;
     RArray<CnvUtilities::SCharacterSet> characterSets;
     if ( FeatureManager::FeatureSupported(KFeatureIdJapanesePicto) )
         {        
@@ -113,19 +112,19 @@
         characterSet.iConversionData=&CnvJisRoman::ConversionData();
         characterSet.iConvertFromIntermediateBufferInPlace=ConvertFromJisRomanToJisInPlace;
         characterSet.iEscapeSequence=&KLit8EscapeSequenceForJisRoman;
-        ret |= characterSets.Append(characterSet);
+        characterSets.Append(characterSet);
         characterSet.iConversionData=&CCnvCharacterSetConverter::AsciiConversionData();
         characterSet.iConvertFromIntermediateBufferInPlace=ConvertFromAsciiToJisInPlace;
         characterSet.iEscapeSequence=&KLit8EscapeSequenceForAscii;
-        ret |= characterSets.Append(characterSet);
+        characterSets.Append(characterSet);
         characterSet.iConversionData=&CnvJisX0208::ConversionData();
         characterSet.iConvertFromIntermediateBufferInPlace=ConvertFromJisX0208ToJisInPlace;
         characterSet.iEscapeSequence=&KLit8EscapeSequenceForJisX0208_1983;
-        ret |= characterSets.Append(characterSet);
+        characterSets.Append(characterSet);
         characterSet.iConversionData=&CnvJisX0212::ConversionData();
         characterSet.iConvertFromIntermediateBufferInPlace=ConvertFromJisX0212ToJisInPlace;
         characterSet.iEscapeSequence=&KLit8EscapeSequenceForJisX0212_1990;
-        ret |= characterSets.Append(characterSet);
+        characterSets.Append(characterSet);
 
         SetCharacterSetsForPictograph(characterSets);
         }
@@ -135,21 +134,20 @@
 	    characterSet.iConversionData=&CnvJisRoman::ConversionData();
 	    characterSet.iConvertFromIntermediateBufferInPlace=ConvertFromJisRomanToJisInPlace;
 	    characterSet.iEscapeSequence=&KLit8EscapeSequenceForJisRoman;
-	    ret |= characterSets.Append(characterSet);
+        characterSets.Append(characterSet);
     	characterSet.iConversionData=&CCnvCharacterSetConverter::AsciiConversionData();
     	characterSet.iConvertFromIntermediateBufferInPlace=ConvertFromAsciiToJisInPlace;
     	characterSet.iEscapeSequence=&KLit8EscapeSequenceForAscii;
-    	ret |= characterSets.Append(characterSet);
+        characterSets.Append(characterSet);
     	characterSet.iConversionData=&CnvJisX0208::ConversionData();
     	characterSet.iConvertFromIntermediateBufferInPlace=ConvertFromJisX0208ToJisInPlace;
     	characterSet.iEscapeSequence=&KLit8EscapeSequenceForJisX0208_1983;
-    	ret |= characterSets.Append(characterSet);
+        characterSets.Append(characterSet);
     	characterSet.iConversionData=&CnvJisX0212::ConversionData();
     	characterSet.iConvertFromIntermediateBufferInPlace=ConvertFromJisX0212ToJisInPlace;
     	characterSet.iEscapeSequence=&KLit8EscapeSequenceForJisX0212_1990;
-    	ret |= characterSets.Append(characterSet);
+        characterSets.Append(characterSet);
         }
-    __ASSERT_DEBUG(!ret, User::Panic(_L("RArray append failure"), ret));
 	TUint notUsed;
 	TUint inputConversionFlags=CCnvCharacterSetConverter::EInputConversionFlagMustEndInDefaultCharacterSet;
     TInt unconvert = CnvUtilities::ConvertFromUnicode(aDefaultEndiannessOfForeignCharacters, aReplacementForUnconvertibleUnicodeCharacters, aForeign, aUnicode, aIndicesOfUnconvertibleCharacters, 
@@ -205,11 +203,7 @@
 
 const TImplementationProxy ImplementationTable[] = 
 	{
-#ifdef S60_TEST
-    IMPLEMENTATION_PROXY_ENTRY(0x01000009,  CISO2022JP1ConverterImpl::NewL)
-#else
-	IMPLEMENTATION_PROXY_ENTRY(0x100066A3,	CISO2022JP1ConverterImpl::NewL)
-#endif	
+		IMPLEMENTATION_PROXY_ENTRY(0x100066A3,	CISO2022JP1ConverterImpl::NewL)
 	};
 
 EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)