sd: support square and circle PDF annot. as custom marker

Use the existing polygon code paths, but convert a ellipse or
the rectangle to the polygon, and add that as a custom marker
for the annotation.

Change-Id: I8f8657b868f2c410a3f604dcc1e609f4c6a12638
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104366
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

3 files changed, 52 insertions, 1 deletions

diff --git a/include/vcl/pdf/PDFAnnotationMarker.hxx b/include/vcl/pdf/PDFAnnotationMarker.hxx
index 2cfbeaa31111..4cf088dc1b8e 100644
--- a/include/vcl/pdf/PDFAnnotationMarker.hxx
+++ b/include/vcl/pdf/PDFAnnotationMarker.hxx
@@ -27,6 +27,14 @@ struct VCL_DLLPUBLIC PDFAnnotationMarker
     Color maFillColor;
 };
 
+struct VCL_DLLPUBLIC PDFAnnotationMarkerCircle : public PDFAnnotationMarker
+{
+};
+
+struct VCL_DLLPUBLIC PDFAnnotationMarkerSquare : public PDFAnnotationMarker
+{
+};
+
 struct VCL_DLLPUBLIC PDFAnnotationMarkerPolygon : public PDFAnnotationMarker
 {
     basegfx::B2DPolygon maPolygon;
diff --git a/sd/source/filter/pdf/sdpdffilter.cxx b/sd/source/filter/pdf/sdpdffilter.cxx
index a1f6100cfd19..28cf7b6902dd 100644
--- a/sd/source/filter/pdf/sdpdffilter.cxx
+++ b/sd/source/filter/pdf/sdpdffilter.cxx
@@ -120,6 +120,31 @@ bool SdPdfFilter::Import()
                     rCustomAnnotationMarker.maFillColor = pMarker->maFillColor;
                     rCustomAnnotationMarker.maPolygons.push_back(pMarker->maPolygon);
                 }
+                else if (rPDFAnnotation.meSubType == vcl::pdf::PDFAnnotationSubType::Square)
+                {
+                    auto* pMarker = static_cast<vcl::pdf::PDFAnnotationMarkerSquare*>(
+                        rPDFAnnotation.mpMarker.get());
+                    basegfx::B2DPolygon aPoly
+                        = basegfx::utils::createPolygonFromRect(rPDFAnnotation.maRectangle);
+                    rCustomAnnotationMarker.mnLineWidth = pMarker->mnWidth;
+                    rCustomAnnotationMarker.maFillColor = pMarker->maFillColor;
+                    rCustomAnnotationMarker.maPolygons.push_back(aPoly);
+                }
+                else if (rPDFAnnotation.meSubType == vcl::pdf::PDFAnnotationSubType::Circle)
+                {
+                    auto* pMarker = static_cast<vcl::pdf::PDFAnnotationMarkerCircle*>(
+                        rPDFAnnotation.mpMarker.get());
+
+                    basegfx::B2DPoint rCenter = rPDFAnnotation.maRectangle.getCenter();
+                    double fRadiusX = rPDFAnnotation.maRectangle.getWidth() / 2;
+                    double fRadiusY = rPDFAnnotation.maRectangle.getHeight() / 2;
+
+                    basegfx::B2DPolygon aPoly
+                        = basegfx::utils::createPolygonFromEllipse(rCenter, fRadiusX, fRadiusY);
+                    rCustomAnnotationMarker.mnLineWidth = pMarker->mnWidth;
+                    rCustomAnnotationMarker.maFillColor = pMarker->maFillColor;
+                    rCustomAnnotationMarker.maPolygons.push_back(aPoly);
+                }
             }
         }
     }
diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx
index 856cc7864d77..001303194259 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -255,7 +255,9 @@ findAnnotations(const std::unique_ptr<vcl::pdf::PDFiumPage>& pPage, basegfx::B2D
             auto eSubtype = pAnnotation->getSubType();
 
             if (eSubtype == vcl::pdf::PDFAnnotationSubType::Text
-                || eSubtype == vcl::pdf::PDFAnnotationSubType::Polygon)
+                || eSubtype == vcl::pdf::PDFAnnotationSubType::Polygon
+                || eSubtype == vcl::pdf::PDFAnnotationSubType::Circle
+                || eSubtype == vcl::pdf::PDFAnnotationSubType::Square)
             {
                 OUString sAuthor = pAnnotation->getString(vcl::pdf::constDictionaryKeyTitle);
                 OUString sText = pAnnotation->getString(vcl::pdf::constDictionaryKeyContents);
@@ -308,6 +310,22 @@ findAnnotations(const std::unique_ptr<vcl::pdf::PDFiumPage>& pPage, basegfx::B2D
                             pMarker->maFillColor = pAnnotation->getInteriorColor();
                     }
                 }
+                else if (eSubtype == vcl::pdf::PDFAnnotationSubType::Square)
+                {
+                    auto pMarker = std::make_shared<vcl::pdf::PDFAnnotationMarkerSquare>();
+                    rPDFGraphicAnnotation.mpMarker = pMarker;
+                    pMarker->mnWidth = convertPointToMm100(pAnnotation->getBorderWidth());
+                    if (pAnnotation->hasKey(vcl::pdf::constDictionaryKeyInteriorColor))
+                        pMarker->maFillColor = pAnnotation->getInteriorColor();
+                }
+                else if (eSubtype == vcl::pdf::PDFAnnotationSubType::Circle)
+                {
+                    auto pMarker = std::make_shared<vcl::pdf::PDFAnnotationMarkerCircle>();
+                    rPDFGraphicAnnotation.mpMarker = pMarker;
+                    pMarker->mnWidth = convertPointToMm100(pAnnotation->getBorderWidth());
+                    if (pAnnotation->hasKey(vcl::pdf::constDictionaryKeyInteriorColor))
+                        pMarker->maFillColor = pAnnotation->getInteriorColor();
+                }
             }
         }
     }