1 files changed, 19 insertions, 23 deletions

diff --git a/drawinglayer/inc/wmfemfhelper.hxx b/drawinglayer/inc/wmfemfhelper.hxx
index 7b643bf5e36c..f085065c1ea6 100644
--- a/drawinglayer/inc/wmfemfhelper.hxx
+++ b/drawinglayer/inc/wmfemfhelper.hxx
@@ -22,10 +22,10 @@
 #include <sal/config.h>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <vcl/font.hxx>
-#include <vcl/outdevstate.hxx>
+#include <rtl/ref.hxx>
+#include <vcl/rendercontext/State.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <memory>
 
 // predefines
 namespace drawinglayer::geometry { class ViewInformation2D; }
@@ -43,19 +43,24 @@ namespace wmfemfhelper
     class TargetHolder
     {
     private:
-        std::vector< std::unique_ptr<drawinglayer::primitive2d::BasePrimitive2D> > aTargets;
+        drawinglayer::primitive2d::Primitive2DContainer aTargets;
 
     public:
         TargetHolder();
         ~TargetHolder();
         sal_uInt32 size() const;
-        void append(std::unique_ptr<drawinglayer::primitive2d::BasePrimitive2D> pCandidate);
+        void append(const rtl::Reference<drawinglayer::primitive2d::BasePrimitive2D> & pCandidate)
+        {
+            append(pCandidate.get());
+        }
+        void append(drawinglayer::primitive2d::Primitive2DContainer xCandidate)
+        {
+            aTargets.append(std::move(xCandidate));
+        }
+        void append(drawinglayer::primitive2d::BasePrimitive2D* pCandidate);
         drawinglayer::primitive2d::Primitive2DContainer getPrimitive2DSequence(const PropertyHolder& rPropertyHolder);
     };
-}
 
-namespace wmfemfhelper
-{
     /** Helper class which builds a stack on the TargetHolder class */
     class TargetHolders
     {
@@ -70,10 +75,7 @@ namespace wmfemfhelper
         TargetHolder& Current();
         ~TargetHolders();
     };
-}
 
-namespace wmfemfhelper
-{
     /** helper class for graphic context
 
     This class allows to hold a complete representation of classic
@@ -101,9 +103,9 @@ namespace wmfemfhelper
         /// font, etc.
         vcl::Font               maFont;
         RasterOp                maRasterOp;
-        ComplexTextLayoutFlags   mnLayoutMode;
+        vcl::text::ComplexTextLayoutFlags   mnLayoutMode;
         LanguageType            maLanguageType;
-        PushFlags               mnPushFlags;
+        vcl::PushFlags               mnPushFlags;
 
         /// contains all active markers
         bool                    mbLineColor : 1;
@@ -168,21 +170,18 @@ namespace wmfemfhelper
         bool isRasterOpForceBlack() const { return RasterOp::N0 == maRasterOp; }
         bool isRasterOpActive() const { return isRasterOpInvert() || isRasterOpForceBlack(); }
 
-        ComplexTextLayoutFlags getLayoutMode() const { return mnLayoutMode; }
-        void setLayoutMode(ComplexTextLayoutFlags nNew) { if (nNew != mnLayoutMode) mnLayoutMode = nNew; }
+        vcl::text::ComplexTextLayoutFlags getLayoutMode() const { return mnLayoutMode; }
+        void setLayoutMode(vcl::text::ComplexTextLayoutFlags nNew) { if (nNew != mnLayoutMode) mnLayoutMode = nNew; }
 
         LanguageType getLanguageType() const { return maLanguageType; }
         void setLanguageType(LanguageType aNew) { if (aNew != maLanguageType) maLanguageType = aNew; }
 
-        PushFlags getPushFlags() const { return mnPushFlags; }
-        void setPushFlags(PushFlags nNew) { if (nNew != mnPushFlags) mnPushFlags = nNew; }
+        vcl::PushFlags getPushFlags() const { return mnPushFlags; }
+        void setPushFlags(vcl::PushFlags nNew) { if (nNew != mnPushFlags) mnPushFlags = nNew; }
 
         bool getLineOrFillActive() const { return (mbLineColor || mbFillColor); }
     };
-}
 
-namespace wmfemfhelper
-{
     /** stack for properties
 
     This class builds a stack based on the PropertyHolder
@@ -200,15 +199,12 @@ namespace wmfemfhelper
     public:
         PropertyHolders();
         void PushDefault();
-        void Push(PushFlags nPushFlags);
+        void Push(vcl::PushFlags nPushFlags);
         void Pop();
         PropertyHolder& Current();
         ~PropertyHolders();
     };
-}
 
-namespace wmfemfhelper
-{
     drawinglayer::primitive2d::Primitive2DContainer interpretMetafile(
         const GDIMetaFile& rMetaFile,
         const drawinglayer::geometry::ViewInformation2D& rViewInformation);