incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1334023 - in /incubator/ooo/trunk/main: drawinglayer/ drawinglayer/inc/drawinglayer/primitive2d/ drawinglayer/source/primitive2d/ drawinglayer/source/processor2d/ svgio/ svgio/inc/svgio/svgreader/ svgio/source/svgreader/ svx/inc/svx/sdr/co...
Date Fri, 04 May 2012 15:16:23 GMT
Author: alg
Date: Fri May  4 15:16:22 2012
New Revision: 1334023

URL: http://svn.apache.org/viewvc?rev=1334023&view=rev
Log:
#119125# corected gradient rendering, added stuff to add Title and Description to primitives for later usage

Modified:
    incubator/ooo/trunk/main/drawinglayer/Library_drawinglayer.mk
    incubator/ooo/trunk/main/drawinglayer/Package_inc.mk
    incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
    incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx
    incubator/ooo/trunk/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
    incubator/ooo/trunk/main/drawinglayer/source/processor2d/vclprocessor2d.cxx
    incubator/ooo/trunk/main/svgio/Library_svgio.mk
    incubator/ooo/trunk/main/svgio/Package_inc.mk
    incubator/ooo/trunk/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
    incubator/ooo/trunk/main/svgio/inc/svgio/svgreader/svgtoken.hxx
    incubator/ooo/trunk/main/svgio/source/svgreader/svgdocumenthandler.cxx
    incubator/ooo/trunk/main/svgio/source/svgreader/svgnode.cxx
    incubator/ooo/trunk/main/svgio/source/svgreader/svgstyleattributes.cxx
    incubator/ooo/trunk/main/svgio/source/svgreader/svgtoken.cxx
    incubator/ooo/trunk/main/svx/inc/svx/sdr/contact/viewcontact.hxx
    incubator/ooo/trunk/main/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx
    incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontact.cxx
    incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrobj.cxx
    incubator/ooo/trunk/main/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx
    incubator/ooo/trunk/main/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx

Modified: incubator/ooo/trunk/main/drawinglayer/Library_drawinglayer.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/Library_drawinglayer.mk?rev=1334023&r1=1334022&r2=1334023&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/Library_drawinglayer.mk (original)
+++ incubator/ooo/trunk/main/drawinglayer/Library_drawinglayer.mk Fri May  4 15:16:22 2012
@@ -111,6 +111,7 @@ $(eval $(call gb_Library_add_exception_o
 	drawinglayer/source/primitive2d/mediaprimitive2d \
 	drawinglayer/source/primitive2d/metafileprimitive2d \
 	drawinglayer/source/primitive2d/modifiedcolorprimitive2d \
+	drawinglayer/source/primitive2d/objectinfoprimitive2d \
 	drawinglayer/source/primitive2d/pagepreviewprimitive2d \
 	drawinglayer/source/primitive2d/patternfillprimitive2d \
 	drawinglayer/source/primitive2d/polypolygonprimitive2d \

Modified: incubator/ooo/trunk/main/drawinglayer/Package_inc.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/Package_inc.mk?rev=1334023&r1=1334022&r2=1334023&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/Package_inc.mk (original)
+++ incubator/ooo/trunk/main/drawinglayer/Package_inc.mk Fri May  4 15:16:22 2012
@@ -49,6 +49,7 @@ $(eval $(call gb_Package_add_file,drawin
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/mediaprimitive2d.hxx,drawinglayer/primitive2d/mediaprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/metafileprimitive2d.hxx,drawinglayer/primitive2d/metafileprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx,drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/objectinfoprimitive2d.hxx,drawinglayer/primitive2d/objectinfoprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx,drawinglayer/primitive2d/pagepreviewprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/patternfillprimitive2d.hxx,drawinglayer/primitive2d/patternfillprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/pointarrayprimitive2d.hxx,drawinglayer/primitive2d/pointarrayprimitive2d.hxx))

Modified: incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx?rev=1334023&r1=1334022&r2=1334023&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx (original)
+++ incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx Fri May  4 15:16:22 2012
@@ -104,6 +104,7 @@
 #define PRIMITIVE2D_ID_SVGRADIALATOMPRIMITIVE2D             (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 65)
 #define PRIMITIVE2D_ID_CROPPRIMITIVE2D                      (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 66)
 #define PRIMITIVE2D_ID_PATTERNFILLPRIMITIVE2D               (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 67)
+#define PRIMITIVE2D_ID_OBJECTINFOPRIMITIVE2D                (PRIMITIVE2D_ID_RANGE_DRAWINGLAYER| 68)
 
 //////////////////////////////////////////////////////////////////////////////
 

Modified: incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx?rev=1334023&r1=1334022&r2=1334023&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx (original)
+++ incubator/ooo/trunk/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx Fri May  4 15:16:22 2012
@@ -196,6 +196,7 @@ namespace drawinglayer
                 const basegfx::B2DPoint& rStart,
                 const basegfx::B2DPoint& rEnd,
                 SpreadMethod aSpreadMethod = Spread_pad);
+            virtual ~SvgLinearGradientPrimitive2D();
 
             /// data read access
             const basegfx::B2DPoint& getEnd() const { return maEnd; }
@@ -209,7 +210,7 @@ namespace drawinglayer
             /// provide unique ID
             DeclPrimitrive2DIDBlock()
         };
-} // end of namespace primitive2d
+    } // end of namespace primitive2d
 } // end of namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
@@ -263,6 +264,7 @@ namespace drawinglayer
                 double fRadius,
                 SpreadMethod aSpreadMethod = Spread_pad,
                 const basegfx::B2DPoint* pFocal = 0);
+            virtual ~SvgRadialGradientPrimitive2D();
 
             /// data read access
             double getRadius() const { return mfRadius; }

Modified: incubator/ooo/trunk/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx?rev=1334023&r1=1334022&r2=1334023&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx (original)
+++ incubator/ooo/trunk/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx Fri May  4 15:16:22 2012
@@ -356,13 +356,18 @@ namespace drawinglayer
                         rFrom.getColor(), rFrom.getOffset() + nOffset,
                         rTo.getColor(), rTo.getOffset() + nOffset));
 
-                const double fTransFrom(1.0 - rFrom.getOpacity());
-                const double fTransTo(1.0 - rTo.getOpacity());
+                if(!getFullyOpaque())
+                {
+                    const double fTransFrom(1.0 - rFrom.getOpacity());
+                    const double fTransTo(1.0 - rTo.getOpacity());
+                    const basegfx::BColor aColorFrom(fTransFrom, fTransFrom, fTransFrom);
+                    const basegfx::BColor aColorTo(fTransTo, fTransTo, fTransTo);
 
-                rTargetOpacity.push_back(
-                    new SvgLinearAtomPrimitive2D(
-                        basegfx::BColor(fTransFrom, fTransFrom, fTransFrom), rFrom.getOffset() + nOffset,
-                        basegfx::BColor(fTransTo,fTransTo, fTransTo), rTo.getOffset() + nOffset));
+                    rTargetOpacity.push_back(
+                        new SvgLinearAtomPrimitive2D(
+                            aColorFrom, rFrom.getOffset() + nOffset,
+                            aColorTo, rTo.getOffset() + nOffset));
+                }
             }
         }
 
@@ -537,6 +542,10 @@ namespace drawinglayer
         {
         }
 
+        SvgLinearGradientPrimitive2D::~SvgLinearGradientPrimitive2D()
+        {
+        }
+
         bool SvgLinearGradientPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const
         {
             const SvgGradientHelper* pSvgGradientHelper = dynamic_cast< const SvgGradientHelper* >(&rPrimitive);
@@ -620,27 +629,30 @@ namespace drawinglayer
                             rTo.getColor(), fScaleTo));
                 }
 
-                const double fTransFrom(1.0 - rFrom.getOpacity());
-                const double fTransTo(1.0 - rTo.getOpacity());
-                const basegfx::BColor aColorFrom(fTransFrom, fTransFrom, fTransFrom);
-                const basegfx::BColor aColorTo(fTransTo, fTransTo, fTransTo);
-
-                if(isFocalSet())
+                if(!getFullyOpaque())
                 {
-                    const basegfx::B2DVector aTranslateFrom(maFocalVector * (maFocalLength - fScaleFrom));
-                    const basegfx::B2DVector aTranslateTo(maFocalVector * (maFocalLength - fScaleTo));
+                    const double fTransFrom(1.0 - rFrom.getOpacity());
+                    const double fTransTo(1.0 - rTo.getOpacity());
+                    const basegfx::BColor aColorFrom(fTransFrom, fTransFrom, fTransFrom);
+                    const basegfx::BColor aColorTo(fTransTo, fTransTo, fTransTo);
+
+                    if(isFocalSet())
+                    {
+                        const basegfx::B2DVector aTranslateFrom(maFocalVector * (maFocalLength - fScaleFrom));
+                        const basegfx::B2DVector aTranslateTo(maFocalVector * (maFocalLength - fScaleTo));
                         
-                    rTargetOpacity.push_back(
-                        new SvgRadialAtomPrimitive2D(
-                            aColorFrom, fScaleFrom, aTranslateFrom,
-                            aColorTo, fScaleTo, aTranslateTo));
-                }
-                else
-                {
-                    rTargetOpacity.push_back(
-                        new SvgRadialAtomPrimitive2D(
-                            aColorFrom, fScaleFrom,
-                            aColorTo, fScaleTo));
+                        rTargetOpacity.push_back(
+                            new SvgRadialAtomPrimitive2D(
+                                aColorFrom, fScaleFrom, aTranslateFrom,
+                                aColorTo, fScaleTo, aTranslateTo));
+                    }
+                    else
+                    {
+                        rTargetOpacity.push_back(
+                            new SvgRadialAtomPrimitive2D(
+                                aColorFrom, fScaleFrom,
+                                aColorTo, fScaleTo));
+                    }
                 }
             }
         }
@@ -796,7 +808,7 @@ namespace drawinglayer
             maMirroredGradientEntries(),
             mbFocalSet(false)
         {
-            if(pFocal)
+            if(pFocal && !pFocal->equal(getStart()))
             {
                 maFocal = *pFocal;
                 maFocalVector = maFocal - getStart();
@@ -804,6 +816,10 @@ namespace drawinglayer
             }
         }
 
+        SvgRadialGradientPrimitive2D::~SvgRadialGradientPrimitive2D()
+        {
+        }
+
         bool SvgRadialGradientPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const
         {
             const SvgGradientHelper* pSvgGradientHelper = dynamic_cast< const SvgGradientHelper* >(&rPrimitive);
@@ -863,28 +879,30 @@ namespace drawinglayer
                 // use color distance and discrete lengths to calculate step count
                 const sal_uInt32 nSteps(calculateStepsForSvgGradient(getColorA(), getColorB(), fDelta, fDiscreteUnit));
 
-                // prepare loop and polygon (with overlap for linear gradients)
-                double fStart(0.0);
-                double fStep(fDelta / nSteps);
+                // prepare polygon in needed width at start position (with discrete overlap)
                 const basegfx::B2DPolygon aPolygon(
                     basegfx::tools::createPolygonFromRect(
                         basegfx::B2DRange(
                             getOffsetA() - fDiscreteUnit, 
                             0.0, 
-                            getOffsetA() + fStep + fDiscreteUnit, 
+                            getOffsetA() + (fDelta / nSteps) + fDiscreteUnit, 
                             1.0)));
 
-                // loop and create primitives
+                // prepare loop (inside to outside, [0.0 .. 1.0[)
+                double fUnitScale(0.0);
+                const double fUnitStep(1.0 / nSteps);
+                
+                // prepare result set (known size)
                 xRetval.realloc(nSteps);
 
-                for(sal_uInt32 a(0); a < nSteps; a++, fStart += fStep)
+                for(sal_uInt32 a(0); a < nSteps; a++, fUnitScale += fUnitStep)
                 {
                     basegfx::B2DPolygon aNew(aPolygon);
 
-                    aNew.transform(basegfx::tools::createTranslateB2DHomMatrix(fStart, 0.0));
+                    aNew.transform(basegfx::tools::createTranslateB2DHomMatrix(fDelta * fUnitScale, 0.0));
                     xRetval[a] = new PolyPolygonColorPrimitive2D(
                         basegfx::B2DPolyPolygon(aNew), 
-                        basegfx::interpolate(getColorA(), getColorB(), fStart/fDelta));
+                        basegfx::interpolate(getColorA(), getColorB(), fUnitScale));
                 }
             }
 
@@ -948,24 +966,24 @@ namespace drawinglayer
                 // use color distance and discrete lengths to calculate step count
                 const sal_uInt32 nSteps(calculateStepsForSvgGradient(getColorA(), getColorB(), fDeltaScale, fDiscreteUnit));
 
-                // prepare loop (outside to inside, full polygons, no polypolygons with holes)
-                double fEndScale(getScaleB());
-                double fStepScale(fDeltaScale / nSteps);
+                // prepare loop ([0.0 .. 1.0[, full polygons, no polypolygons with holes)
+                double fUnitScale(0.0);
+                const double fUnitStep(1.0 / nSteps);
 
-                // loop and create primitives
+                // prepare result set (known size)
                 xRetval.realloc(nSteps);
 
-                for(sal_uInt32 a(0); a < nSteps; a++, fEndScale -= fStepScale)
+                for(sal_uInt32 a(0); a < nSteps; a++, fUnitScale += fUnitStep)
                 {
-                    const double fUnitScale(fEndScale/fDeltaScale);
                     basegfx::B2DHomMatrix aTransform;
+                    const double fEndScale(getScaleB() - (fDeltaScale * fUnitScale));
 
                     if(isTranslateSet())
                     {
                         const basegfx::B2DVector aTranslate(
                             basegfx::interpolate(
-                                getTranslateA(), 
                                 getTranslateB(), 
+                                getTranslateA(), 
                                 fUnitScale));
 
                         aTransform = basegfx::tools::createScaleTranslateB2DHomMatrix(
@@ -986,7 +1004,7 @@ namespace drawinglayer
                     aNew.transform(aTransform);
                     xRetval[a] = new PolyPolygonColorPrimitive2D(
                         basegfx::B2DPolyPolygon(aNew), 
-                        basegfx::interpolate(getColorA(), getColorB(), fUnitScale));
+                        basegfx::interpolate(getColorB(), getColorA(), fUnitScale));
                 }
             }
 

Modified: incubator/ooo/trunk/main/drawinglayer/source/processor2d/vclprocessor2d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/source/processor2d/vclprocessor2d.cxx?rev=1334023&r1=1334022&r2=1334023&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/source/processor2d/vclprocessor2d.cxx (original)
+++ incubator/ooo/trunk/main/drawinglayer/source/processor2d/vclprocessor2d.cxx Fri May  4 15:16:22 2012
@@ -1404,27 +1404,30 @@ namespace drawinglayer
                 // use color distance and discrete lengths to calculate step count
                 const sal_uInt32 nSteps(calculateStepsForSvgGradient(aColorA, aColorB, fDelta, fDiscreteUnit));
 
-                // prepare loop and polygon
-                double fStart(0.0);
-                double fStep(fDelta / nSteps);
+                // switch off line painting
+                mpOutputDevice->SetLineColor();
+
+                // prepare polygon in needed width at start position (with discrete overlap)
                 const basegfx::B2DPolygon aPolygon(
                     basegfx::tools::createPolygonFromRect(
                         basegfx::B2DRange(
                             rCandidate.getOffsetA() - fDiscreteUnit, 
                             0.0, 
-                            rCandidate.getOffsetA() + fStep + fDiscreteUnit, 
+                            rCandidate.getOffsetA() + (fDelta / nSteps) + fDiscreteUnit, 
                             1.0)));
 
-                // switch off line painting
-                mpOutputDevice->SetLineColor();
+
+                // prepare loop ([0.0 .. 1.0[)
+                double fUnitScale(0.0);
+                const double fUnitStep(1.0 / nSteps);
 
                 // loop and paint
-                for(sal_uInt32 a(0); a < nSteps; a++, fStart += fStep)
+                for(sal_uInt32 a(0); a < nSteps; a++, fUnitScale += fUnitStep)
                 {
                     basegfx::B2DPolygon aNew(aPolygon);
 
-                    aNew.transform(maCurrentTransformation * basegfx::tools::createTranslateB2DHomMatrix(fStart, 0.0));
-                    mpOutputDevice->SetFillColor(Color(basegfx::interpolate(aColorA, aColorB, fStart/fDelta)));
+                    aNew.transform(maCurrentTransformation * basegfx::tools::createTranslateB2DHomMatrix(fDelta * fUnitScale, 0.0));
+                    mpOutputDevice->SetFillColor(Color(basegfx::interpolate(aColorA, aColorB, fUnitScale)));
                     mpOutputDevice->DrawPolyPolygon(basegfx::B2DPolyPolygon(aNew));
                 }
             }
@@ -1446,21 +1449,21 @@ namespace drawinglayer
                 // switch off line painting
                 mpOutputDevice->SetLineColor();
 
-                // prepare loop (outside to inside)
-                double fEndScale(rCandidate.getScaleB());
-                double fStepScale(fDeltaScale / nSteps);
+                // prepare loop ([0.0 .. 1.0[, full polygons, no polypolygons with holes)
+                double fUnitScale(0.0);
+                const double fUnitStep(1.0 / nSteps);
 
-                for(sal_uInt32 a(0); a < nSteps; a++, fEndScale -= fStepScale)
+                for(sal_uInt32 a(0); a < nSteps; a++, fUnitScale += fUnitStep)
                 {
-                    const double fUnitScale(fEndScale/fDeltaScale);
                     basegfx::B2DHomMatrix aTransform;
+                    const double fEndScale(rCandidate.getScaleB() - (fDeltaScale * fUnitScale));
 
                     if(rCandidate.isTranslateSet())
                     {
                         const basegfx::B2DVector aTranslate(
                             basegfx::interpolate(
-                                rCandidate.getTranslateA(), 
                                 rCandidate.getTranslateB(), 
+                                rCandidate.getTranslateA(), 
                                 fUnitScale));
 
                         aTransform = basegfx::tools::createScaleTranslateB2DHomMatrix(
@@ -1479,7 +1482,7 @@ namespace drawinglayer
                     basegfx::B2DPolygon aNew(basegfx::tools::createPolygonFromUnitCircle());
                     
                     aNew.transform(maCurrentTransformation * aTransform);
-                    mpOutputDevice->SetFillColor(Color(basegfx::interpolate(aColorA, aColorB, fUnitScale)));
+                    mpOutputDevice->SetFillColor(Color(basegfx::interpolate(aColorB, aColorA, fUnitScale)));
                     mpOutputDevice->DrawPolyPolygon(basegfx::B2DPolyPolygon(aNew));
                 }
             }

Modified: incubator/ooo/trunk/main/svgio/Library_svgio.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svgio/Library_svgio.mk?rev=1334023&r1=1334022&r2=1334023&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svgio/Library_svgio.mk (original)
+++ incubator/ooo/trunk/main/svgio/Library_svgio.mk Fri May  4 15:16:22 2012
@@ -80,6 +80,7 @@ $(eval $(call gb_Library_add_exception_o
     svgio/source/svgreader/svgsvgnode \
     svgio/source/svgreader/svgsymbolnode \
     svgio/source/svgreader/svgtextnode \
+    svgio/source/svgreader/svgtitledescnode \
     svgio/source/svgreader/svgtoken \
     svgio/source/svgreader/svgtrefnode \
     svgio/source/svgreader/svgtools \

Modified: incubator/ooo/trunk/main/svgio/Package_inc.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svgio/Package_inc.mk?rev=1334023&r1=1334022&r2=1334023&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svgio/Package_inc.mk (original)
+++ incubator/ooo/trunk/main/svgio/Package_inc.mk Fri May  4 15:16:22 2012
@@ -45,6 +45,7 @@ $(eval $(call gb_Package_add_file,svgio_
 $(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgsvgnode.hxx,svgio/svgreader/svgsvgnode.hxx))
 $(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgsymbolnode.hxx,svgio/svgreader/svgsymbolnode.hxx))
 $(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgtextnode.hxx,svgio/svgreader/svgtextnode.hxx))
+$(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgtitledescnode.hxx,svgio/svgreader/svgtitledescnode.hxx))
 $(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgtoken.hxx,svgio/svgreader/svgtoken.hxx))
 $(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgtrefnode.hxx,svgio/svgreader/svgtrefnode.hxx))
 $(eval $(call gb_Package_add_file,svgio_inc,inc/svgio/svgreader/svgtools.hxx,svgio/svgreader/svgtools.hxx))

Modified: incubator/ooo/trunk/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx?rev=1334023&r1=1334022&r2=1334023&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx (original)
+++ incubator/ooo/trunk/main/svgio/inc/svgio/svgreader/svgstyleattributes.hxx Fri May  4 15:16:22 2012
@@ -172,6 +172,8 @@ namespace svgio
             TextAnchor                  maTextAnchor;
             SvgPaint                    maColor;
             SvgNumber                   maOpacity;
+            rtl::OUString               maTitle;
+            rtl::OUString               maDesc;
 
             /// link to content. If set, the node can be fetched on demand
             rtl::OUString               maClipPathXLink;
@@ -377,6 +379,14 @@ namespace svgio
             const SvgNumber getOpacity() const { return maOpacity; }
             void setOpacity(const SvgNumber& rOpacity = SvgNumber()) { maOpacity = rOpacity; }
 
+            // Title content
+            const rtl::OUString& getTitle() const { return maTitle; }
+            void setTitle(const rtl::OUString& rNew) { maTitle = rNew; }
+
+            // Desc content
+            const rtl::OUString& getDesc() const { return maDesc; }
+            void setDesc(const rtl::OUString& rNew) { maDesc = rNew; }
+
             // ClipPathXLink content
             const rtl::OUString getClipPathXLink() const { return maClipPathXLink; }
             void setClipPathXLink(const rtl::OUString& rNew) { maClipPathXLink = rNew; }

Modified: incubator/ooo/trunk/main/svgio/inc/svgio/svgreader/svgtoken.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svgio/inc/svgio/svgreader/svgtoken.hxx?rev=1334023&r1=1334022&r2=1334023&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svgio/inc/svgio/svgreader/svgtoken.hxx (original)
+++ incubator/ooo/trunk/main/svgio/inc/svgio/svgreader/svgtoken.hxx Fri May  4 15:16:22 2012
@@ -106,6 +106,8 @@ namespace svgio
             SVGTokenPatternContentUnits,
             SVGTokenPatternTransform,
             SVGTokenOpacity,
+            SVGTokenTitle,
+            SVGTokenDesc,
 
             // AspectRatio and params
             SVGTokenPreserveAspectRatio,
@@ -184,6 +186,8 @@ namespace svgio
 
         SVGToken StrToSVGToken(const rtl::OUString& rStr);
 
+        const rtl::OUString& getStrTitle(); 
+        const rtl::OUString& getStrDesc(); 
     } // end of namespace svgreader
 } // end of namespace svgio
 

Modified: incubator/ooo/trunk/main/svgio/source/svgreader/svgdocumenthandler.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svgio/source/svgreader/svgdocumenthandler.cxx?rev=1334023&r1=1334022&r2=1334023&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svgio/source/svgreader/svgdocumenthandler.cxx (original)
+++ incubator/ooo/trunk/main/svgio/source/svgreader/svgdocumenthandler.cxx Fri May  4 15:16:22 2012
@@ -49,6 +49,7 @@
 #include <svgio/svgreader/svgmasknode.hxx>
 #include <svgio/svgreader/svgmarkernode.hxx>
 #include <svgio/svgreader/svgpatternnode.hxx>
+#include <svgio/svgreader/svgtitledescnode.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -252,6 +253,15 @@ namespace svgio
                         break;
                     }
 
+                    /// title and description
+                    case SVGTokenTitle:
+                    case SVGTokenDesc:
+                    {
+                        /// new node for Title and/or Desc
+                        mpTarget = new SvgTitleDescNode(aSVGToken, maDocument, mpTarget);
+                        break;
+                    }
+
                     /// gradients
                     case SVGTokenLinearGradient:
                     case SVGTokenRadialGradient:
@@ -366,6 +376,7 @@ namespace svgio
                 const SVGToken aSVGToken(StrToSVGToken(aName));
                 SvgNode* pWhitespaceCheck(SVGTokenText == aSVGToken ? mpTarget : 0);
                 SvgStyleNode* pCssStyle(SVGTokenStyle == aSVGToken ? static_cast< SvgStyleNode* >(mpTarget) : 0);
+                SvgTitleDescNode* pSvgTitleDescNode(SVGTokenTitle == aSVGToken || SVGTokenDesc == aSVGToken ? static_cast< SvgTitleDescNode* >(mpTarget) : 0);
 
                 switch(aSVGToken)
                 {
@@ -388,6 +399,10 @@ namespace svgio
                     case SVGTokenRect:
                     case SVGTokenImage:
                     
+                    /// title and description
+                    case SVGTokenTitle:
+                    case SVGTokenDesc:
+
                     /// gradients
                     case SVGTokenLinearGradient:
                     case SVGTokenRadialGradient:
@@ -438,6 +453,23 @@ namespace svgio
                     }
                 }
 
+                if(pSvgTitleDescNode && mpTarget)
+                {
+                    const rtl::OUString aText(pSvgTitleDescNode->getText());
+
+                    if(aText.getLength())
+                    {
+                        if(SVGTokenTitle == aSVGToken)
+                        {
+                            mpTarget->parseAttribute(getStrTitle(), aSVGToken, aText);
+                        }
+                        else // if(SVGTokenDesc == aSVGToken)
+                        {
+                            mpTarget->parseAttribute(getStrDesc(), aSVGToken, aText);
+                        }
+                    }
+                }
+
                 if(pCssStyle && pCssStyle->isTextCss())
                 {
                     // css style parsing
@@ -463,72 +495,74 @@ namespace svgio
 
         void SvgDocHdl::characters( const ::rtl::OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException)
         {
-            if(mpTarget)
-            {
-                const sal_uInt32 nLength(aChars.getLength());
+            const sal_uInt32 nLength(aChars.getLength());
 
-                if(nLength &&
-                    (SVGTokenText == mpTarget->getType() || 
-                    SVGTokenTspan == mpTarget->getType() || 
-                    SVGTokenTextPath == mpTarget->getType() ||
-                    SVGTokenStyle == mpTarget->getType()))
+            if(mpTarget && nLength)
+            {
+                switch(mpTarget->getType())
                 {
-                    switch(mpTarget->getType())
+                    case SVGTokenText:
+                    case SVGTokenTspan:
+                    case SVGTokenTextPath:
                     {
-                        case SVGTokenText:
-                        case SVGTokenTspan:
-                        case SVGTokenTextPath:
-                        {
-                            const SvgNodeVector& rChilds = mpTarget->getChildren();
-                            SvgCharacterNode* pTarget = 0;
+                        const SvgNodeVector& rChilds = mpTarget->getChildren();
+                        SvgCharacterNode* pTarget = 0;
 
-                            if(rChilds.size())
-                            {
-                                pTarget = dynamic_cast< SvgCharacterNode* >(rChilds[rChilds.size() - 1]);
-                            }
+                        if(rChilds.size())
+                        {
+                            pTarget = dynamic_cast< SvgCharacterNode* >(rChilds[rChilds.size() - 1]);
+                        }
 
-                            if(pTarget)
-                            {
-                                // concatenate to current character span
-                                pTarget->concatenate(aChars);
-                            }
-                            else
-                            {
-                                // add character span as simplified tspan (no arguments)
-                                // as direct child of SvgTextNode/SvgTspanNode/SvgTextPathNode
-                                new SvgCharacterNode(maDocument, mpTarget, aChars);
-                            }
-                            break;
+                        if(pTarget)
+                        {
+                            // concatenate to current character span
+                            pTarget->concatenate(aChars);
                         }
-                        case SVGTokenStyle:
+                        else
                         {
-                            SvgStyleNode& rSvgStyleNode = static_cast< SvgStyleNode& >(*mpTarget);
+                            // add character span as simplified tspan (no arguments)
+                            // as direct child of SvgTextNode/SvgTspanNode/SvgTextPathNode
+                            new SvgCharacterNode(maDocument, mpTarget, aChars);
+                        }
+                        break;
+                    }
+                    case SVGTokenStyle:
+                    {
+                        SvgStyleNode& rSvgStyleNode = static_cast< SvgStyleNode& >(*mpTarget);
 
-                            if(rSvgStyleNode.isTextCss())
+                        if(rSvgStyleNode.isTextCss())
+                        {
+                            // collect characters for css style
+                            if(maCssContents.size())
                             {
-                                // collect characters for css style
-                                if(maCssContents.size())
-                                {
-                                    const ::rtl::OUString aTrimmedChars(aChars.trim());
+                                const ::rtl::OUString aTrimmedChars(aChars.trim());
                                 
-                                    if(aTrimmedChars.getLength())
-                                    {
-                                        std::vector< rtl::OUString >::iterator aString(maCssContents.end() - 1);
-                                        (*aString) += aTrimmedChars;
-                                    }
-                                }
-                                else
+                                if(aTrimmedChars.getLength())
                                 {
-                                    OSL_ENSURE(false, "Closing CssStyle, but no collector string on stack (!)");
+                                    std::vector< rtl::OUString >::iterator aString(maCssContents.end() - 1);
+                                    (*aString) += aTrimmedChars;
                                 }
                             }
-                            break;
-                        }
-                        default:
-                        {
-                            // characters not used by a known node
-                            break;
+                            else
+                            {
+                                OSL_ENSURE(false, "Closing CssStyle, but no collector string on stack (!)");
+                            }
                         }
+                        break;
+                    }
+                    case SVGTokenTitle:
+                    case SVGTokenDesc:
+                    {
+                        SvgTitleDescNode& rSvgTitleDescNode = static_cast< SvgTitleDescNode& >(*mpTarget);
+
+                        // add text directly to SvgTitleDescNode
+                        rSvgTitleDescNode.concatenate(aChars);
+                        break;
+                    }
+                    default:
+                    {
+                        // characters not used by a known node
+                        break;
                     }
                 }
             }

Modified: incubator/ooo/trunk/main/svgio/source/svgreader/svgnode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svgio/source/svgreader/svgnode.cxx?rev=1334023&r1=1334022&r2=1334023&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svgio/source/svgreader/svgnode.cxx (original)
+++ incubator/ooo/trunk/main/svgio/source/svgreader/svgnode.cxx Fri May  4 15:16:22 2012
@@ -27,6 +27,7 @@
 #include <svgio/svgreader/svgdocument.hxx>
 #include <svgio/svgreader/svgnode.hxx>
 #include <svgio/svgreader/svgstyleattributes.hxx>
+#include <drawinglayer/primitive2d/objectinfoprimitive2d.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -189,6 +190,40 @@ namespace svgio
                         OSL_ENSURE(false, "Null-Pointer in child node list (!)");
                     }
                 }
+
+                if(rTarget.hasElements())
+                {
+                    const SvgStyleAttributes* pStyles = getSvgStyleAttributes();
+
+                    if(pStyles)
+                    {
+                        // check if we have Title or Desc
+                        const rtl::OUString& rTitle = pStyles->getTitle();
+                        const rtl::OUString& rDesc = pStyles->getDesc();
+
+                        if(rTitle.getLength() || rDesc.getLength())
+                        {
+                            // default object name is empty
+                            rtl::OUString aObjectName;
+
+                            // use path as object name when outmost element
+                            if(SVGTokenSvg == getType())
+                            {
+                                aObjectName = getDocument().getAbsolutePath();
+                            }
+
+                            // pack in ObjectInfoPrimitive2D group
+                            const drawinglayer::primitive2d::Primitive2DReference xRef(
+                                new drawinglayer::primitive2d::ObjectInfoPrimitive2D(
+                                    rTarget,
+                                    aObjectName,
+                                    rTitle,
+                                    rDesc));
+
+                            rTarget = drawinglayer::primitive2d::Primitive2DSequence(&xRef, 1);
+                        }
+                    }
+                }
             }
         }
 

Modified: incubator/ooo/trunk/main/svgio/source/svgreader/svgstyleattributes.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svgio/source/svgreader/svgstyleattributes.cxx?rev=1334023&r1=1334022&r2=1334023&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svgio/source/svgreader/svgstyleattributes.cxx (original)
+++ incubator/ooo/trunk/main/svgio/source/svgreader/svgstyleattributes.cxx Fri May  4 15:16:22 2012
@@ -1193,6 +1193,8 @@ namespace svgio
             maTextAnchor(TextAnchor_notset),
             maColor(),
             maOpacity(1.0),
+            maTitle(),
+            maDesc(),
             maClipPathXLink(),
             maMaskXLink(),
             maMarkerStartXLink(),
@@ -1762,6 +1764,16 @@ namespace svgio
                     }
                     break;
                 }
+                case SVGTokenTitle:
+                {
+                    setTitle(aContent);
+                    break;
+                }
+                case SVGTokenDesc:
+                {
+                    setDesc(aContent);
+                    break;
+                }
                 case SVGTokenClipPathProperty:
                 {
                     readLocalUrl(aContent, maClipPathXLink);

Modified: incubator/ooo/trunk/main/svgio/source/svgreader/svgtoken.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svgio/source/svgreader/svgtoken.cxx?rev=1334023&r1=1334022&r2=1334023&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svgio/source/svgreader/svgtoken.cxx (original)
+++ incubator/ooo/trunk/main/svgio/source/svgreader/svgtoken.cxx Fri May  4 15:16:22 2012
@@ -97,6 +97,8 @@ namespace svgio
         static rtl::OUString aSVGStrPatternContentUnits(rtl::OUString::createFromAscii("patternContentUnits")); 
         static rtl::OUString aSVGStrPatternTransform(rtl::OUString::createFromAscii("patternTransform")); 
         static rtl::OUString aSVGStrOpacity(rtl::OUString::createFromAscii("opacity")); 
+        static rtl::OUString aSVGStrTitle(rtl::OUString::createFromAscii("title")); 
+        static rtl::OUString aSVGStrDesc(rtl::OUString::createFromAscii("desc")); 
 
         static rtl::OUString aSVGStrPreserveAspectRatio(rtl::OUString::createFromAscii("preserveAspectRatio")); 
         static rtl::OUString aSVGStrDefer(rtl::OUString::createFromAscii("defer")); 
@@ -236,6 +238,8 @@ namespace svgio
                 aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrPatternContentUnits, SVGTokenPatternContentUnits));
                 aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrPatternTransform, SVGTokenPatternTransform));
                 aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrOpacity, SVGTokenOpacity));
+                aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrTitle, SVGTokenTitle));
+                aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrDesc, SVGTokenDesc));
 
                 aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrPreserveAspectRatio, SVGTokenPreserveAspectRatio));
                 aSVGTokenMapperList.insert(SVGTokenValueType(aSVGStrDefer, SVGTokenDefer));
@@ -314,6 +318,16 @@ namespace svgio
                 return aResult->second;
             }
         }
+
+        const rtl::OUString& getStrTitle()
+        {
+            return aSVGStrTitle; 
+        }
+
+        const rtl::OUString& getStrDesc()
+        {
+            return aSVGStrDesc; 
+        }
     } // end of namespace svgreader
 } // end of namespace svgio
 

Modified: incubator/ooo/trunk/main/svx/inc/svx/sdr/contact/viewcontact.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/inc/svx/sdr/contact/viewcontact.hxx?rev=1334023&r1=1334022&r2=1334023&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/inc/svx/sdr/contact/viewcontact.hxx (original)
+++ incubator/ooo/trunk/main/svx/inc/svx/sdr/contact/viewcontact.hxx Fri May  4 15:16:22 2012
@@ -152,6 +152,11 @@ namespace sdr
 			// add Gluepoints (if available)
 			virtual drawinglayer::primitive2d::Primitive2DSequence createGluePointPrimitive2DSequence() const;
 
+            // allow embedding if needed (e.g. for SdrObjects, evtl. Name, Title and description get added). This
+            // is a helper normally used from getViewIndependentPrimitive2DSequence(), but there is one exception
+            // for 3D scenes
+            virtual drawinglayer::primitive2d::Primitive2DSequence embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DSequence& rSource) const;
+
             // delete all existing VOCs including DrawHierarchy which will invalidate all
             // visualisations, too. Used mostly at object removal from DrawHierarchy to
             // delete all existing VOCs by purpose, but can also be used for other purposes.

Modified: incubator/ooo/trunk/main/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx?rev=1334023&r1=1334022&r2=1334023&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx (original)
+++ incubator/ooo/trunk/main/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx Fri May  4 15:16:22 2012
@@ -84,6 +84,11 @@ namespace sdr
 
 			// add Gluepoints (if available)
 			virtual drawinglayer::primitive2d::Primitive2DSequence createGluePointPrimitive2DSequence() const;
+            
+            // allow embedding if needed (e.g. for SdrObjects, evtl. Name, Title and description get added). This
+            // is a helper normally used from getViewIndependentPrimitive2DSequence(), but there is one exception
+            // for 3D scenes
+            virtual drawinglayer::primitive2d::Primitive2DSequence embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DSequence& rSource) const;
 		};
 	} // end of namespace contact
 } // end of namespace sdr

Modified: incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontact.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontact.cxx?rev=1334023&r1=1334022&r2=1334023&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontact.cxx (original)
+++ incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontact.cxx Fri May  4 15:16:22 2012
@@ -282,7 +282,13 @@ namespace sdr
 		drawinglayer::primitive2d::Primitive2DSequence ViewContact::getViewIndependentPrimitive2DSequence() const
 		{
 			// local up-to-date checks. Create new list and compare.
-			const drawinglayer::primitive2d::Primitive2DSequence xNew(createViewIndependentPrimitive2DSequence());
+			drawinglayer::primitive2d::Primitive2DSequence xNew(createViewIndependentPrimitive2DSequence());
+
+            if(xNew.hasElements())
+            {
+                // allow evtl. embedding in object-specific infos, e.g. Name, Title, Description
+                xNew = embedToObjectSpecificInformation(xNew);
+            }
 
 			if(!drawinglayer::primitive2d::arePrimitive2DSequencesEqual(mxViewIndependentPrimitive2DSequence, xNew))
 			{
@@ -301,6 +307,12 @@ namespace sdr
 			return drawinglayer::primitive2d::Primitive2DSequence();
 		}
 
+        drawinglayer::primitive2d::Primitive2DSequence ViewContact::embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DSequence& rSource) const
+        {
+            // nothing to do for default
+            return rSource;
+        }
+
         void ViewContact::flushViewObjectContacts(bool bWithHierarchy)
         {
             if(bWithHierarchy)

Modified: incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrobj.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrobj.cxx?rev=1334023&r1=1334022&r2=1334023&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrobj.cxx (original)
+++ incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrobj.cxx Fri May  4 15:16:22 2012
@@ -38,6 +38,7 @@
 #include <svx/sdrpagewindow.hxx>
 #include <svx/sdrpaintwindow.hxx>
 #include <svx/sdr/primitive2d/sdrprimitivetools.hxx>
+#include <drawinglayer/primitive2d/objectinfoprimitive2d.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -183,6 +184,27 @@ namespace sdr
 
 			return xRetval;
 		}
+
+        drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrObj::embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DSequence& rSource) const
+        {
+            if(rSource.hasElements() && 
+                (GetSdrObject().GetName().Len() || 
+                 GetSdrObject().GetTitle().Len() || 
+                 GetSdrObject().GetDescription().Len()))
+            {
+                const drawinglayer::primitive2d::Primitive2DReference xRef(
+                    new drawinglayer::primitive2d::ObjectInfoPrimitive2D(
+                        rSource,
+                        GetSdrObject().GetName(),
+                        GetSdrObject().GetTitle(),
+                        GetSdrObject().GetDescription()));
+
+                return drawinglayer::primitive2d::Primitive2DSequence(&xRef, 1);
+            }
+
+            return rSource;
+        }
+
 	} // end of namespace contact
 } // end of namespace sdr
 

Modified: incubator/ooo/trunk/main/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx?rev=1334023&r1=1334022&r2=1334023&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx (original)
+++ incubator/ooo/trunk/main/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx Fri May  4 15:16:22 2012
@@ -96,7 +96,10 @@ namespace sdr
 
 			if(xRetval.hasElements())
 			{
-				// handle GluePoint
+                // allow evtl. embedding in object-specific infos, e.g. Name, Title, Description
+                xRetval = rViewContact.embedToObjectSpecificInformation(xRetval);
+
+                // handle GluePoint
 				if(!GetObjectContact().isOutputToPrinter() && GetObjectContact().AreGluePointsVisible())
 				{
 					const drawinglayer::primitive2d::Primitive2DSequence xGlue(GetViewContact().createGluePointPrimitive2DSequence());

Modified: incubator/ooo/trunk/main/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx?rev=1334023&r1=1334022&r2=1334023&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx (original)
+++ incubator/ooo/trunk/main/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx Fri May  4 15:16:22 2012
@@ -55,6 +55,19 @@ namespace drawinglayer
                         getSdrLFSTAttribute().getFillFloatTransGradient()));
 			}
 
+			// add graphic content
+			if(255L != getGraphicAttr().GetTransparency())
+			{
+                // standard graphic fill
+                const Primitive2DReference xGraphicContentPrimitive(
+                    new GraphicPrimitive2D(
+                        getTransform(), 
+                        getGraphicObject(), 
+                        getGraphicAttr()));
+
+                appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, xGraphicContentPrimitive);
+			}
+
 			// add line
 			if(!getSdrLFSTAttribute().getLine().isDefault())
 			{
@@ -91,19 +104,6 @@ namespace drawinglayer
 				}
 			}
 
-			// add graphic content
-			if(255L != getGraphicAttr().GetTransparency())
-			{
-                // standard graphic fill
-                const Primitive2DReference xGraphicContentPrimitive(
-                    new GraphicPrimitive2D(
-                        getTransform(), 
-                        getGraphicObject(), 
-                        getGraphicAttr()));
-
-                appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, xGraphicContentPrimitive);
-			}
-
 			// add text
 			if(!getSdrLFSTAttribute().getText().isDefault())
 			{



Mime
View raw message