Re-merge fixes for bugs 1860 and 1543.
EXPORTS
_ZN15CTestBitmapFile5NewLCERK5TRect11TCharFormat @ 1 NONAME
_ZN15CTestBitmapFile7AppendLEP8CPicture @ 2 NONAME
_ZN15CTestBitmapFile7AppendLERK7TDesC16 @ 3 NONAME
_ZN15CTestBitmapFile8CompareLERK5TDes8 @ 4 NONAME
_ZN15CTestBitmapFile9SaveFileLERK7TDesC16 @ 5 NONAME
_ZN15CTestBitmapFileD0Ev @ 6 NONAME
_ZN15CTestBitmapFileD1Ev @ 7 NONAME
_ZN15CTestBitmapFileD2Ev @ 8 NONAME
_ZN27CTestBitmapZipFileExtractor11BitmapFileLERK7TDesC16 @ 9 NONAME
_ZN27CTestBitmapZipFileExtractor5NewLCERK7TDesC16 @ 10 NONAME
_ZN27CTestBitmapZipFileExtractorD0Ev @ 11 NONAME
_ZN27CTestBitmapZipFileExtractorD1Ev @ 12 NONAME
_ZN27CTestBitmapZipFileExtractorD2Ev @ 13 NONAME
_ZTI15CTestBitmapFile @ 14 NONAME
_ZTI27CTestBitmapZipFileExtractor @ 15 NONAME
_ZTV15CTestBitmapFile @ 16 NONAME
_ZTV27CTestBitmapZipFileExtractor @ 17 NONAME