summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/fpdfapi/parser/cpdf_object_unittest.cpp5
-rw-r--r--core/fpdfdoc/cpdf_aaction.cpp10
-rw-r--r--core/fpdfdoc/cpdf_aaction.h3
-rw-r--r--fpdfsdk/cpdfsdk_widget.cpp6
-rw-r--r--xfa/fgas/font/cfgas_fontmgr.cpp2
5 files changed, 16 insertions, 10 deletions
diff --git a/core/fpdfapi/parser/cpdf_object_unittest.cpp b/core/fpdfapi/parser/cpdf_object_unittest.cpp
index 169e0f1e56..770c718431 100644
--- a/core/fpdfapi/parser/cpdf_object_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_object_unittest.cpp
@@ -697,8 +697,9 @@ TEST(PDFArrayTest, AddInteger) {
}
TEST(PDFArrayTest, AddStringAndName) {
- const char* vals[] = {"", "a", "ehjhRIOYTTFdfcdnv", "122323",
- "$#%^&**", " ", "This is a test.\r\n"};
+ static constexpr const char* vals[] = {
+ "", "a", "ehjhRIOYTTFdfcdnv", "122323",
+ "$#%^&**", " ", "This is a test.\r\n"};
auto string_array = pdfium::MakeUnique<CPDF_Array>();
auto name_array = pdfium::MakeUnique<CPDF_Array>();
for (size_t i = 0; i < FX_ArraySize(vals); ++i) {
diff --git a/core/fpdfdoc/cpdf_aaction.cpp b/core/fpdfdoc/cpdf_aaction.cpp
index 033bf03a6a..fd29b52ef6 100644
--- a/core/fpdfdoc/cpdf_aaction.cpp
+++ b/core/fpdfdoc/cpdf_aaction.cpp
@@ -8,9 +8,13 @@
namespace {
-const char* g_sAATypes[] = {"E", "X", "D", "U", "Fo", "Bl", "PO", "PC",
- "PV", "PI", "O", "C", "K", "F", "V", "C",
- "WC", "WS", "DS", "WP", "DP", ""};
+constexpr const char* g_sAATypes[] = {"E", "X", "D", "U", "Fo", "Bl", "PO",
+ "PC", "PV", "PI", "O", "C", "K", "F",
+ "V", "C", "WC", "WS", "DS", "WP", "DP"};
+
+// |g_sAATypes| should have as many elements as enum AActionType.
+static_assert(FX_ArraySize(g_sAATypes) == CPDF_AAction::NumberOfActions,
+ "g_sAATypes count mismatch");
} // namespace
diff --git a/core/fpdfdoc/cpdf_aaction.h b/core/fpdfdoc/cpdf_aaction.h
index b2b691fc26..bacf1790f8 100644
--- a/core/fpdfdoc/cpdf_aaction.h
+++ b/core/fpdfdoc/cpdf_aaction.h
@@ -34,7 +34,8 @@ class CPDF_AAction {
SaveDocument,
DocumentSaved,
PrintDocument,
- DocumentPrinted
+ DocumentPrinted,
+ NumberOfActions // Must be last.
};
CPDF_AAction();
diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp
index e21ce73167..60a4d52657 100644
--- a/fpdfsdk/cpdfsdk_widget.cpp
+++ b/fpdfsdk/cpdfsdk_widget.cpp
@@ -164,11 +164,8 @@ static XFA_EVENTTYPE GetXFAEventType(CPDF_AAction::AActionType eAAT,
eEventType = XFA_EVENT_Exit;
break;
case CPDF_AAction::PageOpen:
- break;
case CPDF_AAction::PageClose:
- break;
case CPDF_AAction::PageVisible:
- break;
case CPDF_AAction::PageInvisible:
break;
case CPDF_AAction::KeyStroke:
@@ -188,6 +185,9 @@ static XFA_EVENTTYPE GetXFAEventType(CPDF_AAction::AActionType eAAT,
case CPDF_AAction::PrintDocument:
case CPDF_AAction::DocumentPrinted:
break;
+ case CPDF_AAction::NumberOfActions:
+ NOTREACHED();
+ break;
}
return eEventType;
diff --git a/xfa/fgas/font/cfgas_fontmgr.cpp b/xfa/fgas/font/cfgas_fontmgr.cpp
index 4b395c9ddf..9cb772ecba 100644
--- a/xfa/fgas/font/cfgas_fontmgr.cpp
+++ b/xfa/fgas/font/cfgas_fontmgr.cpp
@@ -443,7 +443,7 @@ FX_LPEnumAllFonts FX_GetDefFontEnumerator() {
namespace {
-const char* g_FontFolders[] = {
+constexpr const char* g_FontFolders[] = {
#if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_
"/usr/share/fonts", "/usr/share/X11/fonts/Type1",
"/usr/share/X11/fonts/TTF", "/usr/local/share/fonts",