Resync to trunk, windows non-pro buildaoo/aw080

17 files changed, 34 insertions, 29 deletions

diff --git a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx
index bd3b7575b38d..72529c55ed84 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/baseprimitive2d.hxx
@@ -87,13 +87,13 @@ namespace drawinglayer
             using this primitive and do not know it, may get the decomposition and process
             these instead. An example is e.g. a fat line, who's decomposition may contain
             the geometric representation of that line using filled polygon prmimitives. When
-            the renderer knows how to handle fat lines, he may proccess this primitive directly;
+            the renderer knows how to handle fat lines, he may process this primitive directly;
             if not he can use the decomposition. With this functionality, renderers may operate by
             knowing only a small set of primitives.
 
             When a primitive does not implement get2DDecomposition, it is called a 'Basic Primitive' and
             belongs to the set of primitives which a processor should be able to handle. Practice
-            will define this minimal sets of primitives. When defined and the concept is prooved,
+            will define this minimal sets of primitives. When defined and the concept is proved,
             unique UNO APIs may be defined/implemented for these set to allow more intense work
             with primitives using UNO.
 
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx
index e18bc9062c70..0fbd6c0b316c 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/metafileprimitive2d.hxx
@@ -40,7 +40,7 @@ namespace drawinglayer
 
             This is the MetaFile representing primitive. It's geometry is defined
             by MetaFileTransform. The content (defined by MetaFile) will be scaled
-            to the geometric definiton by using PrefMapMode and PrefSize of the
+            to the geometric definition by using PrefMapMode and PrefSize of the
             Metafile.
 
             It has shown that this not always guarantees that all Metafile content
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx
index af8b7b85c412..3226f174058a 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx
@@ -43,7 +43,7 @@ namespace drawinglayer
             For the possibilities of color modifications, please refer
             to the basegfx::BColorModifier definitions in basegfx. For
             processing there is tooling in basegfx to build a stack of
-            BColorModifierSharedPtrs to always be able to proccess the correct
+            BColorModifierSharedPtrs to always be able to process the correct
             colors.
 
             If a renderer does not handle this primitive, the content will
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
index c3b20eb9cf52..f3d358ac4aad 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
@@ -42,7 +42,7 @@ namespace drawinglayer
             the logic size of a 'pixel' depends on the view transformation.
 
             This is one of the non-decomposable primitives, so a renderer
-            should proccess it (Currently it is only used for grid visualisation,
+            should process it (Currently it is only used for grid visualisation,
             but this may change).
          */
         class DRAWINGLAYER_DLLPUBLIC PointArrayPrimitive2D : public BasePrimitive2D
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx
index 629fc721826b..dae855d81fe3 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/polygonprimitive2d.hxx
@@ -46,7 +46,7 @@ namespace drawinglayer
             this primitive is view-dependent, too.
 
             This is one of the non-decomposable primitives, so a renderer
-            should proccess it.
+            should process it.
          */
         class DRAWINGLAYER_DLLPUBLIC PolygonHairlinePrimitive2D : public BasePrimitive2D
         {
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
index 10d9685be373..fdc442f38798 100644
--- a/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive2d/polypolygonprimitive2d.hxx
@@ -251,7 +251,7 @@ namespace drawinglayer
 
             This primitive defines a PolyPolygon filled with a single color.
             This is one of the non-decomposable primitives, so a renderer
-            should proccess it.
+            should process it.
          */
         class DRAWINGLAYER_DLLPUBLIC PolyPolygonColorPrimitive2D : public BasePrimitive2D
         {
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx
index 233085a0e02b..4e0d3998d2e6 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx
@@ -43,7 +43,7 @@ namespace drawinglayer
             this primitive is view-dependent, too.
 
             This is one of the non-decomposable 3D primitives, so a renderer
-            should proccess it.
+            should process it.
          */
         class DRAWINGLAYER_DLLPUBLIC PolygonHairlinePrimitive3D : public BasePrimitive3D
         {
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx
index 3f6518cb0bf6..1f11f94f9931 100644
--- a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx
+++ b/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx
@@ -39,7 +39,7 @@ namespace drawinglayer
 
             This primitive defines a planar 3D PolyPolygon filled with a single color.
             This is one of the non-decomposable primitives, so a renderer
-            should proccess it.
+            should process it.
 
             It is assumed here that the PolyPolgon is a single plane in 3D.
          */
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 92fafaecf208..7d716896bd20 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -952,7 +952,7 @@ namespace
 
     /** helper to take needed action on ClipRegion change. This method needs to be called
         on any Region change, e.g. at the obvious actions doing this, but also at pop-calls
-        whcih change the Region of the current context. It takes care of creating the
+        which change the Region of the current context. It takes care of creating the
         current embeddec context, set the new Region at the context and eventually prepare
         a new target for embracing new geometry to the current region
      */
@@ -972,7 +972,7 @@ namespace
         // This ClipPolyPolygon is identical to the current one, so there is no need to
         // create a MaskPrimitive2D containing the up-to-now created primitives, but
         // this was done before. While this does not lead to wrong primitive
-        // representations of the metafile data, it creates unneccesarily expensive
+        // representations of the metafile data, it creates unnecessarily expensive
         // representations. Just detecting when no really 'new' ClipPolyPolygon gets set
         // solves the problem.
 
@@ -1143,7 +1143,7 @@ namespace
 
     /** helper to create needed data to emulate the VCL Wallpaper Metafile action.
         It is a quite mighty action. This helper decides if color and/or gradient
-        background is needed for the wnated bitmap fill and then creates the needed
+        background is needed for the wanted bitmap fill and then creates the needed
         WallpaperBitmapPrimitive2D. This primitive was created for this purpose and
         takes over all needed logic of orientations and tiling.
      */
@@ -2127,8 +2127,13 @@ namespace
                             drawinglayer::primitive2d::Primitive2DSequence xSubContent;
                             {
                                 rTargetHolders.Push();
-                                // #i# for sub-Mteafile contents, do start with new, default render state
+
+                                // for sub-Mteafile contents, do start with new, default render state
+                                // #124686# ...but copy font, this is already set accordingly
+                                const Font& rTargetFont = rPropertyHolders.Current().getFont();
                                 rPropertyHolders.PushDefault();
+                                rPropertyHolders.Current().setFont(rTargetFont);
+
                                 interpretMetafile(aGDIMetaFile, rTargetHolders, rPropertyHolders, rViewInformation);
                                 xSubContent = rTargetHolders.Current().getPrimitive2DSequence(rPropertyHolders.Current());
                                 rPropertyHolders.Pop();
diff --git a/drawinglayer/source/processor2d/contourextractor2d.cxx b/drawinglayer/source/processor2d/contourextractor2d.cxx
index b7b754671301..4db6b06e3956 100644
--- a/drawinglayer/source/processor2d/contourextractor2d.cxx
+++ b/drawinglayer/source/processor2d/contourextractor2d.cxx
@@ -144,7 +144,7 @@ namespace drawinglayer
                         getViewInformation2D().getExtendedInformationSequence());
                     updateViewInformation(aViewInformation2D);
 
-                    // proccess content
+                    // process content
                     process(rTransformCandidate.getChildren());
 
                     // restore transformations
@@ -159,13 +159,13 @@ namespace drawinglayer
                     const primitive2d::Primitive2DSequence xExtracted2DSceneGeometry(rScenePrimitive2DCandidate.getGeometry2D());
                     const primitive2d::Primitive2DSequence xExtracted2DSceneShadow(rScenePrimitive2DCandidate.getShadow2D(getViewInformation2D()));
 
-                    // proccess content
+                    // process content
                     if(xExtracted2DSceneGeometry.hasElements())
                     {
                         process(xExtracted2DSceneGeometry);
                     }
 
-                    // proccess content
+                    // process content
                     if(xExtracted2DSceneShadow.hasElements())
                     {
                         process(xExtracted2DSceneShadow);
diff --git a/drawinglayer/source/processor2d/hittestprocessor2d.cxx b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
index dd423d36e6e7..885fc7a10954 100644
--- a/drawinglayer/source/processor2d/hittestprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/hittestprocessor2d.cxx
@@ -231,7 +231,7 @@ namespace drawinglayer
                 //
                 //     if(xExtracted2DSceneShadow.hasElements())
                 //     {
-                //         // proccess extracted 2D content
+                //         // process extracted 2D content
                 //         process(xExtracted2DSceneShadow);
                 //     }
                 // }
@@ -256,7 +256,7 @@ namespace drawinglayer
                 //
                 // if(xExtracted2DSceneGeometry.hasElements() || xExtracted2DSceneShadow.hasElements())
                 // {
-                //     // proccess extracted 2D content
+                //     // process extracted 2D content
                 //     process(xExtracted2DSceneGeometry);
                 //     process(xExtracted2DSceneShadow);
                 // }
@@ -299,7 +299,7 @@ namespace drawinglayer
                         getViewInformation2D().getExtendedInformationSequence());
                     updateViewInformation(aViewInformation2D);
 
-                    // proccess child content recursively
+                    // process child content recursively
                     process(rTransformCandidate.getChildren());
 
                     // restore transformations
diff --git a/drawinglayer/source/processor2d/linegeometryextractor2d.cxx b/drawinglayer/source/processor2d/linegeometryextractor2d.cxx
index 97ecf9da6952..2e98485dd2b3 100644
--- a/drawinglayer/source/processor2d/linegeometryextractor2d.cxx
+++ b/drawinglayer/source/processor2d/linegeometryextractor2d.cxx
@@ -106,7 +106,7 @@ namespace drawinglayer
                         getViewInformation2D().getExtendedInformationSequence());
                     updateViewInformation(aViewInformation2D);
 
-                    // proccess content
+                    // process content
                     process(rTransformCandidate.getChildren());
 
                     // restore transformations
diff --git a/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx b/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx
index 59a47fc790a6..cd5a32bc978f 100644
--- a/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx
+++ b/drawinglayer/source/processor2d/textaspolygonextractor2d.cxx
@@ -89,7 +89,7 @@ namespace drawinglayer
 
                 // as can be seen from the TextSimplePortionPrimitive2D and the
                 // TextDecoratedPortionPrimitive2D, inside of the mnInText marks
-                // the following primitives can occurr containing geometry data
+                // the following primitives can occur containing geometry data
                 // from text decomposition:
                 //
                 // - PolyPolygonColorPrimitive2D
@@ -195,7 +195,7 @@ namespace drawinglayer
                         getViewInformation2D().getExtendedInformationSequence());
                     updateViewInformation(aViewInformation2D);
 
-                    // proccess content
+                    // process content
                     process(rTransformCandidate.getChildren());
 
                     // restore transformations
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 38a949e95a73..61098a89d190 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -2014,7 +2014,7 @@ namespace drawinglayer
 
                             // Okay, basic implementation finished and tested. The DPI stuff was hard
                             // and not easy to find out that it's needed.
-                            // Since this will not yet happen normally (as long as noone constructs
+                            // Since this will not yet happen normally (as long as no one constructs
                             // transparence primitives with non-trivial transparence content) i will for now not
                             // refine to tiling here.
 
@@ -2146,7 +2146,7 @@ namespace drawinglayer
                         mpPDFExtOutDevData->BeginStructureElement(rTagElement);
                     }
 
-                    // proccess childs normally
+                    // process childs normally
                     process(rStructureTagCandidate.getChildren());
 
                     if(mpPDFExtOutDevData &&  bTagUsed)
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 9f628493f047..077b094ff793 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -663,7 +663,7 @@ namespace drawinglayer
 
                     if(bSuppressFatToHairlineCorrection)
                     {
-                        // remeber that we enter a PolygonStrokePrimitive2D decomposition,
+                        // remember that we enter a PolygonStrokePrimitive2D decomposition,
                         // used for AA thick line drawing
                         mnPolygonStrokePrimitive2D++;
 
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 0c5aec374bc1..a506ca80d206 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -1090,7 +1090,7 @@ namespace drawinglayer
                 getViewInformation2D().getExtendedInformationSequence());
             updateViewInformation(aViewInformation2D);
 
-            // proccess content
+            // process content
             process(rTransformCandidate.getChildren());
 
             // restore transformations
@@ -1114,7 +1114,7 @@ namespace drawinglayer
                 getViewInformation2D().getExtendedInformationSequence());
             updateViewInformation(aViewInformation2D);
 
-            // proccess decomposed content
+            // process decomposed content
             process(rPagePreviewCandidate.get2DDecomposition(getViewInformation2D()));
 
             // restore transformations
@@ -1387,7 +1387,7 @@ namespace drawinglayer
 
             if(!bDone)
             {
-                // remeber that we enter a PolygonStrokePrimitive2D decomposition,
+                // remember that we enter a PolygonStrokePrimitive2D decomposition,
                 // used for AA thick line drawing
                 mnPolygonStrokePrimitive2D++;
 
diff --git a/drawinglayer/source/processor3d/geometry2dextractor.cxx b/drawinglayer/source/processor3d/geometry2dextractor.cxx
index 83c2c2eb1c8b..809b8f2c14e9 100644
--- a/drawinglayer/source/processor3d/geometry2dextractor.cxx
+++ b/drawinglayer/source/processor3d/geometry2dextractor.cxx
@@ -138,7 +138,7 @@ namespace drawinglayer
                 }
                 case PRIMITIVE3D_ID_SHADOWPRIMITIVE3D :
                 {
-                    // accept but ignore labels and shadow; these should be extracted seperately
+                    // accept but ignore labels and shadow; these should be extracted separately
                     break;
                 }
                 default :