diff options
Diffstat (limited to 'xfa/fgas')
-rw-r--r-- | xfa/fgas/layout/cfx_linebreak.cpp (renamed from xfa/fgas/layout/fgas_linebreak.cpp) | 2 | ||||
-rw-r--r-- | xfa/fgas/layout/cfx_linebreak.h (renamed from xfa/fgas/layout/fgas_linebreak.h) | 6 | ||||
-rw-r--r-- | xfa/fgas/layout/cfx_rtfbreak.cpp (renamed from xfa/fgas/layout/fgas_rtfbreak.cpp) | 4 | ||||
-rw-r--r-- | xfa/fgas/layout/cfx_rtfbreak.h (renamed from xfa/fgas/layout/fgas_rtfbreak.h) | 6 | ||||
-rw-r--r-- | xfa/fgas/layout/cfx_rtfbreak_unittest.cpp (renamed from xfa/fgas/layout/fgas_rtfbreak_unittest.cpp) | 8 | ||||
-rw-r--r-- | xfa/fgas/layout/cfx_txtbreak.cpp (renamed from xfa/fgas/layout/fgas_textbreak.cpp) | 5 | ||||
-rw-r--r-- | xfa/fgas/layout/cfx_txtbreak.h (renamed from xfa/fgas/layout/fgas_textbreak.h) | 6 |
7 files changed, 18 insertions, 19 deletions
diff --git a/xfa/fgas/layout/fgas_linebreak.cpp b/xfa/fgas/layout/cfx_linebreak.cpp index 2a9e3be522..9531bc55b0 100644 --- a/xfa/fgas/layout/fgas_linebreak.cpp +++ b/xfa/fgas/layout/cfx_linebreak.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/fgas/layout/fgas_linebreak.h" +#include "xfa/fgas/layout/cfx_linebreak.h" #include "core/fxcrt/fx_ucd.h" diff --git a/xfa/fgas/layout/fgas_linebreak.h b/xfa/fgas/layout/cfx_linebreak.h index 918c2e5caf..8ba022e71e 100644 --- a/xfa/fgas/layout/fgas_linebreak.h +++ b/xfa/fgas/layout/cfx_linebreak.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FGAS_LAYOUT_FGAS_LINEBREAK_H_ -#define XFA_FGAS_LAYOUT_FGAS_LINEBREAK_H_ +#ifndef XFA_FGAS_LAYOUT_CFX_LINEBREAK_H_ +#define XFA_FGAS_LAYOUT_CFX_LINEBREAK_H_ #include "core/fxcrt/fx_system.h" @@ -29,4 +29,4 @@ enum FX_LINEBREAKTYPE : uint8_t { extern const FX_LINEBREAKTYPE gs_FX_LineBreak_PairTable[64][32]; -#endif // XFA_FGAS_LAYOUT_FGAS_LINEBREAK_H_ +#endif // XFA_FGAS_LAYOUT_CFX_LINEBREAK_H_ diff --git a/xfa/fgas/layout/fgas_rtfbreak.cpp b/xfa/fgas/layout/cfx_rtfbreak.cpp index 842e729217..9acc082d8e 100644 --- a/xfa/fgas/layout/fgas_rtfbreak.cpp +++ b/xfa/fgas/layout/cfx_rtfbreak.cpp @@ -4,14 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/fgas/layout/fgas_rtfbreak.h" +#include "xfa/fgas/layout/cfx_rtfbreak.h" #include <algorithm> #include "core/fxcrt/fx_arabic.h" #include "third_party/base/stl_util.h" #include "xfa/fgas/font/cfgas_gefont.h" -#include "xfa/fgas/layout/fgas_linebreak.h" +#include "xfa/fgas/layout/cfx_linebreak.h" CFX_RTFBreak::CFX_RTFBreak(uint32_t dwLayoutStyles) : CFX_Break(dwLayoutStyles), diff --git a/xfa/fgas/layout/fgas_rtfbreak.h b/xfa/fgas/layout/cfx_rtfbreak.h index 7cbd250218..28adaa5d41 100644 --- a/xfa/fgas/layout/fgas_rtfbreak.h +++ b/xfa/fgas/layout/cfx_rtfbreak.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FGAS_LAYOUT_FGAS_RTFBREAK_H_ -#define XFA_FGAS_LAYOUT_FGAS_RTFBREAK_H_ +#ifndef XFA_FGAS_LAYOUT_CFX_RTFBREAK_H_ +#define XFA_FGAS_LAYOUT_CFX_RTFBREAK_H_ #include <deque> #include <vector> @@ -95,4 +95,4 @@ class CFX_RTFBreak : public CFX_Break { CFX_RetainPtr<CFX_Retainable> m_pUserData; }; -#endif // XFA_FGAS_LAYOUT_FGAS_RTFBREAK_H_ +#endif // XFA_FGAS_LAYOUT_CFX_RTFBREAK_H_ diff --git a/xfa/fgas/layout/fgas_rtfbreak_unittest.cpp b/xfa/fgas/layout/cfx_rtfbreak_unittest.cpp index cc3c86cadb..c8ffc4eb33 100644 --- a/xfa/fgas/layout/fgas_rtfbreak_unittest.cpp +++ b/xfa/fgas/layout/cfx_rtfbreak_unittest.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/fgas/layout/fgas_rtfbreak.h" +#include "xfa/fgas/layout/cfx_rtfbreak.h" #include <memory> @@ -14,7 +14,7 @@ #include "xfa/fgas/font/cfgas_fontmgr.h" #include "xfa/fgas/font/cfgas_gefont.h" -class RTFBreakTest : public testing::Test { +class CFX_RTFBreakTest : public testing::Test { public: void SetUp() override { CFX_GEModule::Get()->GetFontMgr()->SetSystemFontInfo( @@ -49,7 +49,7 @@ class RTFBreakTest : public testing::Test { // As soon as you get one of the control characters the break is complete // and must be consumed before you get any more characters .... -TEST_F(RTFBreakTest, AddChars) { +TEST_F(CFX_RTFBreakTest, AddChars) { auto b = CreateBreak(FX_LAYOUTSTYLE_ExpandTab); CFX_WideString str(L"Input String."); @@ -74,7 +74,7 @@ TEST_F(RTFBreakTest, AddChars) { EXPECT_EQ(str, b->GetBreakPieceUnstable(0)->GetString()); } -TEST_F(RTFBreakTest, ControlCharacters) { +TEST_F(CFX_RTFBreakTest, ControlCharacters) { auto b = CreateBreak(FX_LAYOUTSTYLE_ExpandTab); EXPECT_EQ(CFX_BreakType::Line, b->AppendChar(L'\v')); EXPECT_EQ(CFX_BreakType::Page, b->AppendChar(L'\f')); diff --git a/xfa/fgas/layout/fgas_textbreak.cpp b/xfa/fgas/layout/cfx_txtbreak.cpp index 83a03eed5e..e898a22991 100644 --- a/xfa/fgas/layout/fgas_textbreak.cpp +++ b/xfa/fgas/layout/cfx_txtbreak.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xfa/fgas/layout/fgas_textbreak.h" +#include "xfa/fgas/layout/cfx_txtbreak.h" #include <algorithm> @@ -12,7 +12,7 @@ #include "core/fxcrt/fx_memory.h" #include "third_party/base/ptr_util.h" #include "xfa/fgas/font/cfgas_gefont.h" -#include "xfa/fgas/layout/fgas_linebreak.h" +#include "xfa/fgas/layout/cfx_linebreak.h" namespace { @@ -35,7 +35,6 @@ void CFX_TxtBreak::SetLineWidth(float fLineWidth) { ASSERT(m_iLineWidth >= 20000); } - void CFX_TxtBreak::SetAlignment(int32_t iAlignment) { ASSERT(iAlignment >= CFX_TxtLineAlignment_Left && iAlignment <= CFX_TxtLineAlignment_Justified); diff --git a/xfa/fgas/layout/fgas_textbreak.h b/xfa/fgas/layout/cfx_txtbreak.h index 81aaf58219..0f11844453 100644 --- a/xfa/fgas/layout/fgas_textbreak.h +++ b/xfa/fgas/layout/cfx_txtbreak.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef XFA_FGAS_LAYOUT_FGAS_TEXTBREAK_H_ -#define XFA_FGAS_LAYOUT_FGAS_TEXTBREAK_H_ +#ifndef XFA_FGAS_LAYOUT_CFX_TXTBREAK_H_ +#define XFA_FGAS_LAYOUT_CFX_TXTBREAK_H_ #include <deque> #include <memory> @@ -99,4 +99,4 @@ class CFX_TxtBreak : public CFX_Break { int32_t m_iCombWidth; }; -#endif // XFA_FGAS_LAYOUT_FGAS_TEXTBREAK_H_ +#endif // XFA_FGAS_LAYOUT_CFX_TXTBREAK_H_ |