Merge to master: Kill off some dodgy JS callbacks
[pdfium.git] / fpdfsdk / src / fsdk_baseannot.cpp
index c8e0735..2b8cee9 100644 (file)
@@ -596,11 +596,6 @@ CFX_ByteString CPDFSDK_Annot::GetSubType() const
        return "";
 }
 
-void CPDFSDK_Annot::ResetAppearance()
-{
-       ASSERT(FALSE);
-}
-
 void CPDFSDK_Annot::DrawAppearance(CFX_RenderDevice* pDevice, const CPDF_Matrix* pUser2Device,
                                                                   CPDF_Annot::AppearanceMode mode, const CPDF_RenderOptions* pOptions) 
 {
@@ -1067,7 +1062,7 @@ void CPDFSDK_Annot::WriteAppearance(const CFX_ByteString& sAPType, const CPDF_Re
                pStreamDict->SetAtRect("BBox", rcBBox);         
        }
        
-       pStream->SetData((FX_BYTE*)(FX_LPCSTR)sContents, sContents.GetLength(), FALSE, FALSE);
+       pStream->SetData((FX_BYTE*)sContents.c_str(), sContents.GetLength(), FALSE, FALSE);
 }
 
 #define BA_ANNOT_MINWIDTH                      1