1 files changed, 11 insertions, 13 deletions
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
index 67a79ca307cc..46d1cb2f1edf 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <vcl/pdfextoutdevdata.hxx> // vcl::PDFExtOutDevData support
+#include <tools/lazydelete.hxx>
 
 class GDIMetaFile;
 namespace tools
@@ -63,6 +64,8 @@ class PolyPolygonColorPrimitive2D;
 class MaskPrimitive2D;
 class UnifiedTransparencePrimitive2D;
 class TransparencePrimitive2D;
+class ObjectInfoPrimitive2D;
+class FillGraphicPrimitive2D;
 class StructureTagPrimitive2D;
 }
 
@@ -105,7 +108,7 @@ private:
                                    const attribute::LineStartEndAttribute* pEnd);
     void impStartSvtGraphicStroke(SvtGraphicStroke const* pSvtGraphicStroke);
     void impEndSvtGraphicStroke(SvtGraphicStroke const* pSvtGraphicStroke);
-    void popStructureElement(vcl::PDFWriter::StructElement eElem);
+    void popStructureElement(vcl::pdf::StructElement eElem);
     void popListItem();
     void popList();
 
@@ -142,12 +145,12 @@ private:
         const primitive2d::UnifiedTransparencePrimitive2D& rUniTransparenceCandidate);
     void processTransparencePrimitive2D(
         const primitive2d::TransparencePrimitive2D& rTransparenceCandidate);
+    void
+    processObjectInfoPrimitive2D(const primitive2d::ObjectInfoPrimitive2D& rObjectInfoPrimitive2D);
+    void processFillGraphicPrimitive2D(
+        primitive2d::FillGraphicPrimitive2D const& rFillGraphicPrimitive2D);
     void processStructureTagPrimitive2D(
         const primitive2d::StructureTagPrimitive2D& rStructureTagCandidate);
-    void processPrimitive2DOnPixelProcessor(const primitive2d::BasePrimitive2D& rCandidate);
-    VclPtr<VirtualDevice> CreateBufferDevice(const basegfx::B2DRange& rCandidateRange,
-                                             geometry::ViewInformation2D& rViewInfo,
-                                             tools::Rectangle& rRectLogic, Size& rSizePixel);
 
     /// Convert the fWidth to the same space as its coordinates.
     double getTransformedLineWidth(double fWidth) const;
@@ -171,13 +174,6 @@ private:
      */
     double mfCurrentUnifiedTransparence;
 
-    /*  break iterator support
-        made static so it only needs to be fetched once, even with many single
-        constructed VclMetafileProcessor2D. It's still incarnated on demand,
-        but exists for OOo runtime now by purpose.
-     */
-    static css::uno::Reference<css::i18n::XBreakIterator> mxBreakIterator;
-
     /*  vcl::PDFExtOutDevData support
         For the first step, some extra actions at vcl::PDFExtOutDevData need to
         be emulated with the VclMetafileProcessor2D. These are potentially temporarily
@@ -193,7 +189,9 @@ private:
     bool mbInListItem;
     bool mbBulletPresent;
 
-    std::stack<vcl::PDFWriter::StructElement> maListElements;
+    std::stack<vcl::pdf::StructElement> maListElements;
+
+    primitive2d::StructureTagPrimitive2D const* mpCurrentStructureTag = nullptr;
 
 protected:
     /*  the local processor for BasePrimitive2D-Implementation based primitives,