summaryrefslogtreecommitdiff
path: root/fpdfsdk/src/fsdk_baseannot.cpp
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-04-17 13:57:46 -0700
committerTom Sepez <tsepez@chromium.org>2015-04-17 13:57:46 -0700
commit48606843d54c5f870d69627afedd574b58d65b3e (patch)
treeb8c8fe92e99f2deea542611dfb21e94a2c06541d /fpdfsdk/src/fsdk_baseannot.cpp
parent916228365f7f03a51e5fb0e4bab03fa708b107c5 (diff)
downloadpdfium-48606843d54c5f870d69627afedd574b58d65b3e.tar.xz
Replace FX_NEW with new, remove tests from fpdfsdk
R=thestig@chromium.org Review URL: https://codereview.chromium.org/1089823004
Diffstat (limited to 'fpdfsdk/src/fsdk_baseannot.cpp')
-rw-r--r--fpdfsdk/src/fsdk_baseannot.cpp32
1 files changed, 13 insertions, 19 deletions
diff --git a/fpdfsdk/src/fsdk_baseannot.cpp b/fpdfsdk/src/fsdk_baseannot.cpp
index 7848740510..2ac6d0d875 100644
--- a/fpdfsdk/src/fsdk_baseannot.cpp
+++ b/fpdfsdk/src/fsdk_baseannot.cpp
@@ -780,7 +780,7 @@ void CPDFSDK_Annot::SetBorderWidth(int nWidth)
if (pBorder)
{
- pBorder->SetAt(2, FX_NEW CPDF_Number(nWidth));
+ pBorder->SetAt(2, new CPDF_Number(nWidth));
}
else
{
@@ -788,7 +788,7 @@ void CPDFSDK_Annot::SetBorderWidth(int nWidth)
if (!pBSDict)
{
- pBSDict = FX_NEW CPDF_Dictionary;
+ pBSDict = new CPDF_Dictionary;
m_pAnnot->m_pAnnotDict->SetAt("BS", pBSDict);
}
@@ -827,7 +827,7 @@ void CPDFSDK_Annot::SetBorderStyle(int nStyle)
CPDF_Dictionary* pBSDict = m_pAnnot->m_pAnnotDict->GetDict("BS");
if (!pBSDict)
{
- pBSDict = FX_NEW CPDF_Dictionary;
+ pBSDict = new CPDF_Dictionary;
m_pAnnot->m_pAnnotDict->SetAt("BS", pBSDict);
}
@@ -889,11 +889,11 @@ void CPDFSDK_Annot::SetBorderDash(const CFX_IntArray& array)
CPDF_Dictionary* pBSDict = m_pAnnot->m_pAnnotDict->GetDict("BS");
if (!pBSDict)
{
- pBSDict = FX_NEW CPDF_Dictionary;
+ pBSDict = new CPDF_Dictionary;
m_pAnnot->m_pAnnotDict->SetAt("BS", pBSDict);
}
- CPDF_Array* pArray = FX_NEW CPDF_Array;
+ CPDF_Array* pArray = new CPDF_Array;
for (int i=0,sz=array.GetSize(); i<sz; i++)
{
pArray->AddInteger(array[i]);
@@ -937,7 +937,7 @@ void CPDFSDK_Annot::SetColor(FX_COLORREF color)
ASSERT(m_pAnnot != NULL);
ASSERT(m_pAnnot->m_pAnnotDict != NULL);
- CPDF_Array* pArray = FX_NEW CPDF_Array;
+ CPDF_Array* pArray = new CPDF_Array;
pArray->AddNumber((FX_FLOAT)FXSYS_GetRValue(color) / 255.0f);
pArray->AddNumber((FX_FLOAT)FXSYS_GetGValue(color) / 255.0f);
pArray->AddNumber((FX_FLOAT)FXSYS_GetBValue(color) / 255.0f);
@@ -1010,7 +1010,7 @@ void CPDFSDK_Annot::WriteAppearance(const CFX_ByteString& sAPType, const CPDF_Re
if (!pAPDict)
{
- pAPDict = FX_NEW CPDF_Dictionary;
+ pAPDict = new CPDF_Dictionary;
m_pAnnot->m_pAnnotDict->SetAt("AP", pAPDict);
}
@@ -1027,7 +1027,7 @@ void CPDFSDK_Annot::WriteAppearance(const CFX_ByteString& sAPType, const CPDF_Re
CPDF_Dictionary* pAPTypeDict = pAPDict->GetDict(sAPType);
if (!pAPTypeDict)
{
- pAPTypeDict = FX_NEW CPDF_Dictionary;
+ pAPTypeDict = new CPDF_Dictionary;
pAPDict->SetAt(sAPType, pAPTypeDict);
}
@@ -1035,24 +1035,18 @@ void CPDFSDK_Annot::WriteAppearance(const CFX_ByteString& sAPType, const CPDF_Re
pStream = pAPTypeDict->GetStream(sAPState);
}
- if (!pStream)
+ if (!pStream)
{
- ASSERT(m_pPageView != NULL);
CPDF_Document* pDoc = m_pPageView->GetPDFDocument();
- ASSERT(pDoc != NULL);
-
- pStream = FX_NEW CPDF_Stream(NULL, 0, NULL);
+ pStream = new CPDF_Stream(NULL, 0, NULL);
FX_INT32 objnum = pDoc->AddIndirectObject(pStream);
- //pAPDict->SetAtReference(sAPType, pDoc, objnum);
- ASSERT(pParentDict != NULL);
pParentDict->SetAtReference(sAPType, pDoc, objnum);
}
-
- CPDF_Dictionary * pStreamDict = pStream->GetDict();
-
+
+ CPDF_Dictionary *pStreamDict = pStream->GetDict();
if (!pStreamDict)
{
- pStreamDict = FX_NEW CPDF_Dictionary;
+ pStreamDict = new CPDF_Dictionary;
pStreamDict->SetAtName("Type", "XObject");
pStreamDict->SetAtName("Subtype", "Form");
pStreamDict->SetAtInteger("FormType", 1);