Update of /cvsroot/datatype/3gpptext/renderer
In directory cvs-new:/tmp/cvs-serv15352/3gpptext/renderer

Modified Files:
      Tag: hxclient_1_5_0_cayenne
	3gppttrenderer.cpp 3gppttstructs.cpp 
Log Message:
Merge from HEAD
Adding paths for Code Warrior
Fixing WINSCW specific errors
Replacing _int64 type by long long when CW is defined

Index: 3gppttrenderer.cpp
===================================================================
RCS file: /cvsroot/datatype/3gpptext/renderer/3gppttrenderer.cpp,v
retrieving revision 1.23.8.2
retrieving revision 1.23.8.3
diff -u -d -r1.23.8.2 -r1.23.8.3
--- 3gppttrenderer.cpp	27 Apr 2005 14:35:42 -0000	1.23.8.2
+++ 3gppttrenderer.cpp	18 May 2005 00:59:32 -0000	1.23.8.3
@@ -2391,10 +2391,10 @@
                                 pHBufUTF8Text->Des()[i] = (UINT8)
                                        (pConvertedText[i + iCharsToSkipOver]);
                             }
-                            TInt kErr =
-                                    CnvUtfConverter::ConvertToUnicodeFromUtf8(
-                                    pHBufUTF16Text->Des(),
-                                    pHBufUTF8Text->Des() );
+                            TPtr16 chicken = pHBufUTF16Text->Des();
+                            CnvUtfConverter::ConvertToUnicodeFromUtf8(
+                                    chicken,
+                                    *pHBufUTF8Text );
 
                             delete pHBufUTF8Text;
                         }

Index: 3gppttstructs.cpp
===================================================================
RCS file: /cvsroot/datatype/3gpptext/renderer/3gppttstructs.cpp,v
retrieving revision 1.8.8.1
retrieving revision 1.8.8.2
diff -u -d -r1.8.8.1 -r1.8.8.2
--- 3gppttstructs.cpp	27 Apr 2005 14:35:43 -0000	1.8.8.1
+++ 3gppttstructs.cpp	18 May 2005 00:59:32 -0000	1.8.8.2
@@ -1082,10 +1082,10 @@
                         pHBufUTF8Text->Des()[i] =
                                 (UINT8)(pUnconvertedText[i]);
                     }
-                    TInt kErr =
-                            CnvUtfConverter::ConvertToUnicodeFromUtf8(
-                            pHBufUTF16Text->Des(),
-                            pHBufUTF8Text->Des() );
+                    TPtr16 chicken = pHBufUTF16Text->Des();
+                    CnvUtfConverter::ConvertToUnicodeFromUtf8(
+                                    chicken,
+                                    *pHBufUTF8Text );
 
                     delete pHBufUTF8Text;
                 }