diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-03-09 16:58:12 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-13 13:43:05 +0000 |
| commit | c36fe07a4d800cab2bfbec95e8580ea2b0e406d2 (patch) | |
| tree | 7d3cce091856f50d08aaf646022f464b4ab186a0 /xfa/fgas/layout/fgas_rtfbreak_unittest.cpp | |
| parent | e472622d33bdca2316a22ff5ff8d77ac975c2eb2 (diff) | |
| download | pdfium-c36fe07a4d800cab2bfbec95e8580ea2b0e406d2.tar.xz | |
Cleanup FX_TXTBREAK
This Cl removes the FX_TXTBREAK defines and unifies the type with the
CFX_RTFBreakType which is renamed to CFX_BreakType.
Change-Id: I890ae5e08a65f922d714aaaa9ab0f9f8a882cb3c
Reviewed-on: https://pdfium-review.googlesource.com/2939
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fgas/layout/fgas_rtfbreak_unittest.cpp')
| -rw-r--r-- | xfa/fgas/layout/fgas_rtfbreak_unittest.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xfa/fgas/layout/fgas_rtfbreak_unittest.cpp b/xfa/fgas/layout/fgas_rtfbreak_unittest.cpp index bbac9d5806..b20afb7103 100644 --- a/xfa/fgas/layout/fgas_rtfbreak_unittest.cpp +++ b/xfa/fgas/layout/fgas_rtfbreak_unittest.cpp @@ -54,9 +54,9 @@ TEST_F(RTFBreakTest, AddChars) { CFX_WideString str(L"Input String."); for (int32_t i = 0; i < str.GetLength(); i++) - EXPECT_EQ(CFX_RTFBreakType::None, b->AppendChar(str.GetAt(i))); + EXPECT_EQ(CFX_BreakType::None, b->AppendChar(str.GetAt(i))); - EXPECT_EQ(CFX_RTFBreakType::Paragraph, b->AppendChar(L'\n')); + EXPECT_EQ(CFX_BreakType::Paragraph, b->AppendChar(L'\n')); ASSERT_EQ(1, b->CountBreakPieces()); EXPECT_EQ(str + L"\n", b->GetBreakPieceUnstable(0)->GetString()); @@ -66,21 +66,21 @@ TEST_F(RTFBreakTest, AddChars) { str = L"Second str."; for (int32_t i = 0; i < str.GetLength(); i++) - EXPECT_EQ(CFX_RTFBreakType::None, b->AppendChar(str.GetAt(i))); + EXPECT_EQ(CFX_BreakType::None, b->AppendChar(str.GetAt(i))); // Force the end of the break at the end of the string. - b->EndBreak(CFX_RTFBreakType::Paragraph); + b->EndBreak(CFX_BreakType::Paragraph); ASSERT_EQ(1, b->CountBreakPieces()); EXPECT_EQ(str, b->GetBreakPieceUnstable(0)->GetString()); } TEST_F(RTFBreakTest, ControlCharacters) { auto b = CreateBreak(FX_RTFLAYOUTSTYLE_ExpandTab); - EXPECT_EQ(CFX_RTFBreakType::Line, b->AppendChar(L'\v')); - EXPECT_EQ(CFX_RTFBreakType::Page, b->AppendChar(L'\f')); + EXPECT_EQ(CFX_BreakType::Line, b->AppendChar(L'\v')); + EXPECT_EQ(CFX_BreakType::Page, b->AppendChar(L'\f')); // 0x2029 is the Paragraph Separator unicode character. - EXPECT_EQ(CFX_RTFBreakType::Paragraph, b->AppendChar(0x2029)); - EXPECT_EQ(CFX_RTFBreakType::Paragraph, b->AppendChar(L'\n')); + EXPECT_EQ(CFX_BreakType::Paragraph, b->AppendChar(0x2029)); + EXPECT_EQ(CFX_BreakType::Paragraph, b->AppendChar(L'\n')); ASSERT_EQ(1, b->CountBreakPieces()); EXPECT_EQ(L"\v", b->GetBreakPieceUnstable(0)->GetString()); |