emfplus: finetuning, UnitTest, not active by default

Change-Id: Ie085ad2610a306c7f9c44551114041d0950d1af5

4 files changed, 24 insertions, 25 deletions

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 38c196f53b8f..93c6bd0033bb 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1710,10 +1710,9 @@ namespace drawinglayer
                 }
                 case PRIMITIVE2D_ID_METAFILEPRIMITIVE2D :
                 {
-                    static bool bUseMetaFilePrimitiveDecomposition(true);
                     const primitive2d::MetafilePrimitive2D& aMetafile = static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate);
 
-                    if(bUseMetaFilePrimitiveDecomposition && !aMetafile.getMetaFile().GetUseCanvas())
+                    if(!aMetafile.getMetaFile().GetUseCanvas())
                     {
                         // Use new Metafile decomposition.
                         // TODO EMF+ stuffed into METACOMMENT support required
@@ -1721,8 +1720,24 @@ namespace drawinglayer
                     }
                     else
                     {
+#ifdef DBG_UTIL
+                        // switch to test EMFPlus-enhanced MetafileDecomposition, don't do
+                        // this by default in debug mode
+                        static bool bTestEMFPDecomposition(false);
+
+                        if (bTestEMFPDecomposition)
+                        {
+                            process(rCandidate);
+                        }
+                        else
+                        {
+                            // direct draw of MetaFile
+                            RenderMetafilePrimitive2D(aMetafile);
+                        }
+#else // DBG_UTIL
                         // direct draw of MetaFile, use default processing
                         RenderMetafilePrimitive2D(aMetafile);
+#endif // DBG_UTIL
                     }
 
                     break;
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 177c780f212f..039986566d00 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -505,11 +505,13 @@ namespace drawinglayer
                     else
                     {
 #ifdef DBG_UTIL
-                        // switch to test EMFPlus-enhanced MetafileDecomposition
-                        static bool bTestEMFPDecomposition(true);
-                        // switch to show the new visualization color.-changed behind
-                        // the original output vor visual testing
-                        static bool bUseChangedColorObject(true);
+                        // switch to test EMFPlus-enhanced MetafileDecomposition, don't do
+                        // this by default in debug mode
+                        static bool bTestEMFPDecomposition(false);
+
+                        // switch to show the new visualization color changed behind
+                        // the original output vor visual testing, also not by default in debug mode
+                        static bool bUseChangedColorObject(false);
 
                         if (bTestEMFPDecomposition)
                         {
diff --git a/drawinglayer/source/tools/emfphelperdata.hxx b/drawinglayer/source/tools/emfphelperdata.hxx
index a700df8dac6c..67f423436fa4 100644
--- a/drawinglayer/source/tools/emfphelperdata.hxx
+++ b/drawinglayer/source/tools/emfphelperdata.hxx
@@ -25,8 +25,6 @@
 #include <tools/stream.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/vector/b2dsize.hxx>
-//#include <com/sun/star/rendering/XCanvasFont.hpp>
-//#include <com/sun/star/rendering/TextDirection.hpp>
 
 // predefines
 class SvStream;
@@ -252,10 +250,6 @@ namespace emfplushelper
         // readers
         void ReadRectangle(SvStream& s, float& x, float& y, float &width, float& height, bool bCompressed = false);
         bool readXForm(SvStream& rIn, basegfx::B2DHomMatrix& rTarget);
-
-        /// data holders access
-//        wmfemfhelper::TargetHolders& getTargetHolders() const { return mrTargetHolders; }
-//        wmfemfhelper::PropertyHolders& getPropertyHolders() const { return mrPropertyHolders; }
     };
 }
 
diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx
index 4c7a298b912f..f10c05724f60 100644
--- a/drawinglayer/source/tools/wmfemfhelper.cxx
+++ b/drawinglayer/source/tools/wmfemfhelper.cxx
@@ -18,16 +18,9 @@
  */
 
 #include <wmfemfhelper.hxx>
-
-//#include <basegfx/tools/canvastools.hxx>
-//#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
-//#include <basegfx/color/bcolor.hxx>
 #include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx>
 #include <vcl/lineinfo.hxx>
-//#include <drawinglayer/attribute/lineattribute.hxx>
-//#include <drawinglayer/attribute/strokeattribute.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
-//#include <vcl/metaact.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
@@ -37,24 +30,19 @@
 #include <vcl/salbtype.hxx>
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 #include <drawinglayer/primitive2d/fillgradientprimitive2d.hxx>
-//#include <vcl/svapp.hxx>
 #include <drawinglayer/primitive2d/transparenceprimitive2d.hxx>
 #include <drawinglayer/primitive2d/fillhatchprimitive2d.hxx>
 #include <drawinglayer/primitive2d/maskprimitive2d.hxx>
 #include <basegfx/polygon/b2dpolygonclipper.hxx>
 #include <drawinglayer/primitive2d/invertprimitive2d.hxx>
 #include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx>
-//#include <drawinglayer/primitive2d/fillgraphicprimitive2d.hxx>
 #include <drawinglayer/primitive2d/wallpaperprimitive2d.hxx>
-//#include <drawinglayer/primitive2d/textprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
 #include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx>
-//#include <i18nlangtag/languagetag.hxx>
 #include <drawinglayer/primitive2d/textlineprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx>
 #include <drawinglayer/primitive2d/epsprimitive2d.hxx>
 #include <tools/fract.hxx>
-//#include <numeric>
 #include <vcl/gradient.hxx>
 #include <vcl/hatch.hxx>
 #include <emfplushelper.hxx>