fpdfsdk/src/formfiller/FFL_ListBox.cpp - Issue 1439223003: Merge to XFA: Remove relative includes.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: fpdfsdk/src/formfiller/FFL_ListBox.cpp

Issue 1439223003: Merge to XFA: Remove relative includes. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: fix merge Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: fpdfsdk/src/formfiller/FFL_ListBox.cpp

diff --git a/fpdfsdk/src/formfiller/FFL_ListBox.cpp b/fpdfsdk/src/formfiller/FFL_ListBox.cpp

index 343683016f7ab6c5ac946effb71ad1186d2467c3..53a7570716b3b487d2d53a536ec0b9a3aa22decd 100644

--- a/fpdfsdk/src/formfiller/FFL_ListBox.cpp

+++ b/fpdfsdk/src/formfiller/FFL_ListBox.cpp

@@ -4,13 +4,11 @@

-#include "../../include/formfiller/FormFiller.h"

-#include "../../include/formfiller/FFL_FormFiller.h"

-#include "../../include/formfiller/FFL_ListBox.h"

-//#include "../../include/formfiller/FFL_Module.h"

-#include "../../include/formfiller/FFL_IFormFiller.h"

-//#include "../../include/formfiller/FFL_Undo.h"

-#include "../../include/formfiller/FFL_CBA_Fontmap.h"

+#include "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h"

+#include "fpdfsdk/include/formfiller/FFL_FormFiller.h"

+#include "fpdfsdk/include/formfiller/FFL_IFormFiller.h"

+#include "fpdfsdk/include/formfiller/FFL_ListBox.h"

+#include "fpdfsdk/include/formfiller/FormFiller.h"

#define FFL_DEFAULTLISTBOXFONTSIZE 12.0f