Merge pull request 'COfficeDrawingPageParams' (#98) from feature/pdf-…

…params into develop Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/98
ONLYOFFICE · Nov 18, 2024 · 4bf363f · 4bf363f
2 parents c83e50d + c1b0102
commit 4bf363f
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 12 deletions.
diff --git a/DesktopEditor/graphics/pro/officedrawingfile.h b/DesktopEditor/graphics/pro/officedrawingfile.h
@@ -43,6 +43,18 @@ enum OfficeDrawingFileType
     odftUndefined = 255
 };
 
+struct COfficeDrawingPageParams
+{
+	bool m_bNeedDrawAnnotation;
+
+	COfficeDrawingPageParams() : m_bNeedDrawAnnotation(true){}
+
+	void SetDrawAnnotation(bool bDraw)
+	{
+		m_bNeedDrawAnnotation = bDraw;
+	}
+};
+
 class GRAPHICS_DECL IOfficeDrawingFile
 {
 public:
@@ -70,7 +82,7 @@ class GRAPHICS_DECL IOfficeDrawingFile
     // Pages info/draw
     virtual int GetPagesCount() = 0;
     virtual void GetPageInfo(int nPageIndex, double* pdWidth, double* pdHeight, double* pdDpiX, double* pdDpiY) = 0;
-    virtual void DrawPageOnRenderer(IRenderer* pRenderer, int nPageIndex, bool* pBreak) = 0;
+    virtual void DrawPageOnRenderer(IRenderer* pRenderer, int nPageIndex, bool* pBreak, COfficeDrawingPageParams* pParams = NULL) = 0;
 
     // Common methods/wrappers on GetPageInfo + DrawPageOnRenderer
     virtual unsigned char* ConvertToPixels(int nPageIndex, int nRasterW, int nRasterH,

diff --git a/DjVuFile/DjVu.cpp b/DjVuFile/DjVu.cpp
@@ -93,7 +93,7 @@ void CDjVuFile::GetPageInfo(int nPageIndex, double* pdWidth, double* pdHeight, d
 	if (m_pImplementation)
 		m_pImplementation->GetPageInfo(nPageIndex, pdWidth, pdHeight, pdDpiX, pdDpiY);
 }
-void CDjVuFile::DrawPageOnRenderer(IRenderer* pRenderer, int nPageIndex, bool* pBreak)
+void CDjVuFile::DrawPageOnRenderer(IRenderer* pRenderer, int nPageIndex, bool* pBreak, COfficeDrawingPageParams* pParams)
 {
 	if (m_pImplementation)
 		m_pImplementation->DrawPageOnRenderer(pRenderer, nPageIndex, pBreak);

diff --git a/DjVuFile/DjVu.h b/DjVuFile/DjVu.h
@@ -69,7 +69,7 @@ class DJVU_DECL_EXPORT CDjVuFile : public IOfficeDrawingFile
 
     virtual int GetPagesCount();
     virtual void GetPageInfo(int nPageIndex, double* pdWidth, double* pdHeight, double* pdDpiX, double* pdDpiY);
-    virtual void DrawPageOnRenderer(IRenderer* pRenderer, int nPageIndex, bool* pBreak);
+    virtual void DrawPageOnRenderer(IRenderer* pRenderer, int nPageIndex, bool* pBreak, COfficeDrawingPageParams* pParams = NULL);
     virtual std::wstring GetInfo();
 
     void ConvertToPdf(const std::wstring& path);

diff --git a/PdfFile/PdfFile.cpp b/PdfFile/PdfFile.cpp
@@ -382,11 +382,12 @@ bool CPdfFile::ValidMetaData()
 		return false;
 	return m_pInternal->pReader->ValidMetaData();
 }
-void CPdfFile::DrawPageOnRenderer(IRenderer* pRenderer, int nPageIndex, bool* pBreak)
+void CPdfFile::DrawPageOnRenderer(IRenderer* pRenderer, int nPageIndex, bool* pBreak, COfficeDrawingPageParams* pParams)
 {
 	if (!m_pInternal->pReader)
 		return;
 	pRenderer->CommandLong(c_nPenWidth0As1px, 1);
+	m_pInternal->pReader->SetParams(pParams);
 	m_pInternal->pReader->DrawPageOnRenderer(pRenderer, nPageIndex, pBreak);
 }
 std::wstring CPdfFile::GetInfo()

diff --git a/PdfFile/PdfFile.h b/PdfFile/PdfFile.h
@@ -121,7 +121,7 @@ class PDFFILE_DECL_EXPORT CPdfFile : public IOfficeDrawingFile, public IRenderer
 
 	virtual int GetPagesCount();
 	virtual void GetPageInfo(int nPageIndex, double* pdWidth, double* pdHeight, double* pdDpiX, double* pdDpiY);
-	virtual void DrawPageOnRenderer(IRenderer* pRenderer, int nPageIndex, bool* pBreak);
+	virtual void DrawPageOnRenderer(IRenderer* pRenderer, int nPageIndex, bool* pBreak, COfficeDrawingPageParams* pParams = NULL);
 	virtual std::wstring GetInfo();
 	virtual BYTE* GetStructure();
 	virtual BYTE* GetLinks(int nPageIndex);

diff --git a/PdfFile/PdfReader.cpp b/PdfFile/PdfReader.cpp
@@ -82,7 +82,7 @@ CPdfReader::CPdfReader(NSFonts::IApplicationFonts* pAppFonts)
 	SetCMapFile(NSFile::GetProcessDirectory() + L"/cmap.bin");
 #else
 	globalParams->setDrawFormFields(gFalse);
-	//globalParams->setDrawAnnotations(gFalse);
+	globalParams->setDrawAnnotations(gFalse);
 	SetCMapMemory(NULL, 0);
 #endif
 
@@ -448,6 +448,15 @@ void CPdfReader::Close()
 	RELEASEOBJECT(m_pPDFDocument);
 	m_mFonts.clear();
 }
+void CPdfReader::SetParams(COfficeDrawingPageParams* pParams)
+{
+	if (!pParams)
+		return;
+
+	GBool bDraw = pParams->m_bNeedDrawAnnotation ? gTrue : gFalse;
+	globalParams->setDrawFormFields(bDraw);
+	globalParams->setDrawAnnotations(bDraw);
+}
 
 int CPdfReader::GetError()
 {

diff --git a/PdfFile/PdfReader.h b/PdfFile/PdfReader.h
@@ -50,6 +50,7 @@ class CPdfReader
 
 	void Close();
 
+	void SetParams(COfficeDrawingPageParams* pParams);
 	std::wstring GetTempDirectory();
 	void SetTempDirectory(const std::wstring& directory);
 

diff --git a/PdfFile/lib/xpdf/Page.cc b/PdfFile/lib/xpdf/Page.cc
@@ -380,7 +380,7 @@ void Page::displaySlice(OutputDev *out, double hDPI, double vDPI,
   obj.free();
 
   // draw (non-form) annotations
-  if (globalParams->getDrawAnnotations()) {
+  if (true) {
     annotList = new Annots(doc, getAnnots(&obj));
     obj.free();
     annotList->generateAnnotAppearances();
@@ -392,12 +392,10 @@ void Page::displaySlice(OutputDev *out, double hDPI, double vDPI,
 	if (abortCheckCbk && (*abortCheckCbk)(abortCheckCbkData)) {
 	  break;
 	}
-#ifdef BUILDING_WASM_MODULE
 	sType = annotList->getAnnot(i)->getType();
-	if (sType->cmp("Link") == 0 || sType->cmp("FileAttachment") == 0 ||
+	if (globalParams->getDrawAnnotations() || sType->cmp("Link") == 0 || sType->cmp("FileAttachment") == 0 ||
 		sType->cmp("Sound") == 0 || sType->cmp("Movie") == 0 || sType->cmp("Screen") == 0 || sType->cmp("PrinterMark") == 0 ||
 		sType->cmp("TrapNet") == 0 || sType->cmp("Watermark") == 0 || sType->cmp("3D") == 0 || sType->cmp("Redact") == 0)
-#endif
 	annotList->getAnnot(i)->draw(gfx, printing);
       }
     }

diff --git a/XpsFile/XpsFile.cpp b/XpsFile/XpsFile.cpp
@@ -173,7 +173,7 @@ void CXpsFile::GetPageInfo(int nPageIndex, double* pdWidth, double* pdHeight, do
 	*pdDpiX   = 25.4;
 	*pdDpiY   = 25.4;
 }
-void CXpsFile::DrawPageOnRenderer(IRenderer* pRenderer, int nPageIndex, bool* pBreak)
+void CXpsFile::DrawPageOnRenderer(IRenderer* pRenderer, int nPageIndex, bool* pBreak, COfficeDrawingPageParams* pParams)
 {
     if (!m_pInternal->m_pDocument)
 		return;

diff --git a/XpsFile/XpsFile.h b/XpsFile/XpsFile.h
@@ -64,7 +64,7 @@ class XPS_DECL_EXPORT CXpsFile : public IOfficeDrawingFile
 
     virtual int GetPagesCount();
     virtual void GetPageInfo(int nPageIndex, double* pdWidth, double* pdHeight, double* pdDpiX, double* pdDpiY);
-    virtual void DrawPageOnRenderer(IRenderer* pRenderer, int nPageIndex, bool* pBreak);
+    virtual void DrawPageOnRenderer(IRenderer* pRenderer, int nPageIndex, bool* pBreak, COfficeDrawingPageParams* pParams = NULL);
     virtual std::wstring GetInfo();
 
 #ifndef DISABLE_PDF_CONVERTATION