Lock page in LoadFXAnnot to prevent unintended page closing

fpdfsdk/include/fsdk_mgr.h

Index: fpdfsdk/include/fsdk_mgr.h
diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h
index 95d1a79352ec7f33d87bf40d868a8caddb9e3aec..7353e496800efe1853ecc5d63e6dcbc7f80b2d1a 100644
--- a/fpdfsdk/include/fsdk_mgr.h
+++ b/fpdfsdk/include/fsdk_mgr.h
@@ -460,7 +460,9 @@ private:
 	CPDF_OCContext *		m_pOccontent;
 	FX_BOOL					m_bChangeMask;
 };
-
+#define PAGEVIEW_FLAG_VALID 0x01
+#define PAGEVIEW_FLAG_LOCK 0x02
+#define PAGEVIEW_FLAG_TAKEOVERPAGE 0x04
 class CPDFSDK_PageView FX_FINAL
 {
 public:
@@ -528,10 +530,14 @@ private:
 	FX_BOOL m_bExitWidget;
 	FX_BOOL m_bOnWidget;
 public:
-	void SetValid(FX_BOOL bValid) {m_bValid = bValid;}
-	FX_BOOL IsValid() {return m_bValid;}
+        void SetValid(FX_BOOL bValid) {m_Flag |= PAGEVIEW_FLAG_VALID;}

[Tom Sepez, 2014/09/23 23:38:54]

nit: we should probably clean up the redundant public: private: public:
declarations by grouping them together appropriately, unless there's some reason
to avoid doing this

[Bo Xu, 2014/09/24 01:01:13]

Done.

+        FX_BOOL IsValid() {return m_Flag & PAGEVIEW_FLAG_VALID;}
+        void TakeOverPage() {m_Flag |= PAGEVIEW_FLAG_TAKEOVERPAGE;}
+        FX_BOOL IsLocked() {return m_Flag & PAGEVIEW_FLAG_LOCK;}
+        void SetLock() {m_Flag |= PAGEVIEW_FLAG_LOCK;}
+        void ClearLock() {m_Flag &= ~PAGEVIEW_FLAG_LOCK;}
 private:
-	FX_BOOL m_bValid;
+	FX_BOOL m_Flag;

[Tom Sepez, 2014/09/23 23:38:54]

How many of these objects are we going to have allocated at one time?  I might
be simpler just to have m_bValid, m_bLocked, and m_bTakeOverPage.

Then you can have 
  bool IsLocked();
  void SetLocked(bool locked);

instead of Set/Clear methods.

[Bo Xu, 2014/09/24 01:01:13]

Done.

 };