Primitive2DReference : ambiguous symbol

Change-Id: I98876ab880e6a22693ffba9f50bf989b33ef7f1f

3 files changed, 15 insertions, 15 deletions

diff --git a/sfx2/source/control/templatecontaineritem.cxx b/sfx2/source/control/templatecontaineritem.cxx
index c594bfd2b643..5dc8c301ee88 100644
--- a/sfx2/source/control/templatecontaineritem.cxx
+++ b/sfx2/source/control/templatecontaineritem.cxx
@@ -65,18 +65,18 @@ void TemplateContainerItem::Paint (drawinglayer::processor2d::BaseProcessor2D *p
         nSeqSize += 3;
 
     BColor aFillColor = pAttrs->aFillColor;
-    Primitive2DSequence aSeq(nSeqSize);
+    drawinglayer::primitive2d::Primitive2DSequence aSeq(nSeqSize);
 
     // Draw background
     if ( mbSelected || mbHover )
         aFillColor = pAttrs->aHighlightColor;
 
-    aSeq[nCount++] = Primitive2DReference( new PolyPolygonColorPrimitive2D(
+    aSeq[nCount++] = drawinglayer::primitive2d::Primitive2DReference( new PolyPolygonColorPrimitive2D(
                                                B2DPolyPolygon(Polygon(maDrawArea,5,5).getB2DPolygon()),
                                                aFillColor));
 
     // Create rounded rectangle border
-    aSeq[nCount++] = Primitive2DReference( new PolygonStrokePrimitive2D(
+    aSeq[nCount++] = drawinglayer::primitive2d::Primitive2DReference( new PolygonStrokePrimitive2D(
                                               Polygon(maThumbnailArea,5,5).getB2DPolygon(),
                                               LineAttribute(BColor(0.8, 0.8, 0.8), 2.0)));
 
@@ -137,9 +137,9 @@ void TemplateContainerItem::Paint (drawinglayer::processor2d::BaseProcessor2D *p
             aBounds.append(B2DPoint(fPosX,fPosY+fHeight));
             aBounds.setClosed(true);
 
-            aSeq[nCount++] = Primitive2DReference( new PolyPolygonColorPrimitive2D(
+            aSeq[nCount++] = drawinglayer::primitive2d::Primitive2DReference( new PolyPolygonColorPrimitive2D(
                                                 B2DPolyPolygon(aBounds), Color(COL_WHITE).getBColor()));
-            aSeq[nCount++] = Primitive2DReference( new FillGraphicPrimitive2D(
+            aSeq[nCount++] = drawinglayer::primitive2d::Primitive2DReference( new FillGraphicPrimitive2D(
                                                 createScaleTranslateB2DHomMatrix(1.0,1.0,fPosX,fPosY),
                                                 FillGraphicAttribute(Graphic(*pImage),
                                                                     B2DRange(
@@ -149,7 +149,7 @@ void TemplateContainerItem::Paint (drawinglayer::processor2d::BaseProcessor2D *p
                                                 ));
 
             // draw thumbnail borders
-            aSeq[nCount++] = Primitive2DReference(createBorderLine(aBounds));
+            aSeq[nCount++] = drawinglayer::primitive2d::Primitive2DReference(createBorderLine(aBounds));
         }
     }
 
diff --git a/sfx2/source/control/templateviewitem.cxx b/sfx2/source/control/templateviewitem.cxx
index 7abafd030e86..f488f81697de 100644
--- a/sfx2/source/control/templateviewitem.cxx
+++ b/sfx2/source/control/templateviewitem.cxx
@@ -94,10 +94,10 @@ void TemplateViewItem::Paint(drawinglayer::processor2d::BaseProcessor2D *pProces
     aBounds.append(B2DPoint(fPosX,fPosY+fHeight));
     aBounds.setClosed(true);
 
-    aSeq[1] = Primitive2DReference( new PolyPolygonColorPrimitive2D(
+    aSeq[1] = drawinglayer::primitive2d::Primitive2DReference( new PolyPolygonColorPrimitive2D(
                                         B2DPolyPolygon(aBounds), Color(COL_WHITE).getBColor()));
 
-    aSeq[2] = Primitive2DReference( new FillGraphicPrimitive2D(
+    aSeq[2] = drawinglayer::primitive2d::Primitive2DReference( new FillGraphicPrimitive2D(
                                         createTranslateB2DHomMatrix(maPrev1Pos.X(),maPrev1Pos.Y()),
                                         FillGraphicAttribute(Graphic(maPreview1),
                                                             B2DRange(
@@ -107,7 +107,7 @@ void TemplateViewItem::Paint(drawinglayer::processor2d::BaseProcessor2D *pProces
                                         ));
 
     // draw thumbnail borders
-    aSeq[3] = Primitive2DReference(createBorderLine(aBounds));
+    aSeq[3] = drawinglayer::primitive2d::Primitive2DReference(createBorderLine(aBounds));
 
     addTextPrimitives(maTitle, pAttrs, maTextPos, aSeq);
 
diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx
index 34981ec669ed..b8b4bd33bd60 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -244,14 +244,14 @@ void ThumbnailViewItem::Paint (drawinglayer::processor2d::BaseProcessor2D *pProc
                                const ThumbnailItemAttributes *pAttrs)
 {
     BColor aFillColor = pAttrs->aFillColor;
-    Primitive2DSequence aSeq(4);
+    drawinglayer::primitive2d::Primitive2DSequence aSeq(4);
 
     // Draw background
     if ( mbSelected || mbHover )
         aFillColor = pAttrs->aHighlightColor;
 
     sal_uInt32 nPrimitive = 0;
-    aSeq[nPrimitive++] = Primitive2DReference( new PolyPolygonColorPrimitive2D(
+    aSeq[nPrimitive++] = drawinglayer::primitive2d::Primitive2DReference( new PolyPolygonColorPrimitive2D(
                                                B2DPolyPolygon(Polygon(maDrawArea,5,5).getB2DPolygon()),
                                                aFillColor));
 
@@ -259,7 +259,7 @@ void ThumbnailViewItem::Paint (drawinglayer::processor2d::BaseProcessor2D *pProc
     Point aPos = maPrev1Pos;
     Size aImageSize = maPreview1.GetSizePixel();
 
-    aSeq[nPrimitive++] = Primitive2DReference( new FillGraphicPrimitive2D(
+    aSeq[nPrimitive++] = drawinglayer::primitive2d::Primitive2DReference( new FillGraphicPrimitive2D(
                                         createTranslateB2DHomMatrix(aPos.X(),aPos.Y()),
                                         FillGraphicAttribute(Graphic(maPreview1),
                                                             B2DRange(
@@ -281,7 +281,7 @@ void ThumbnailViewItem::Paint (drawinglayer::processor2d::BaseProcessor2D *pProc
     aBounds.append(B2DPoint(fPosX,fPosY+fHeight));
     aBounds.setClosed(true);
 
-    aSeq[nPrimitive++] = Primitive2DReference(createBorderLine(aBounds));
+    aSeq[nPrimitive++] = drawinglayer::primitive2d::Primitive2DReference(createBorderLine(aBounds));
 
     // Draw text below thumbnail
     aPos = maTextPos;
@@ -290,7 +290,7 @@ void ThumbnailViewItem::Paint (drawinglayer::processor2d::BaseProcessor2D *pProc
     pProcessor->process(aSeq);
 }
 
-void ThumbnailViewItem::addTextPrimitives (const OUString& rText, const ThumbnailItemAttributes *pAttrs, Point aPos, Primitive2DSequence& rSeq)
+void ThumbnailViewItem::addTextPrimitives (const OUString& rText, const ThumbnailItemAttributes *pAttrs, Point aPos, drawinglayer::primitive2d::Primitive2DSequence& rSeq)
 {
     drawinglayer::primitive2d::TextLayouterDevice aTextDev;
 
@@ -335,7 +335,7 @@ void ThumbnailViewItem::addTextPrimitives (const OUString& rText, const Thumbnai
                     pAttrs->aFontSize.getX(), pAttrs->aFontSize.getY(),
                     nLineX, double( aPos.Y() ) ) );
 
-        rSeq[nPrimitives++] = Primitive2DReference(
+        rSeq[nPrimitives++] = drawinglayer::primitive2d::Primitive2DReference(
                     new TextSimplePortionPrimitive2D(aTextMatrix,
                                                      aText,nLineStart,nLineLength,
                                                      std::vector< double >( ),