incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1222204 - in /incubator/ooo/branches/alg/svgreplacement/main/drawinglayer: inc/drawinglayer/primitive2d/ source/primitive2d/
Date Thu, 22 Dec 2011 12:42:55 GMT
Author: alg
Date: Thu Dec 22 12:42:55 2011
New Revision: 1222204

URL: http://svn.apache.org/viewvc?rev=1222204&view=rev
Log:
svg: WaE changes for newer Linux Gcc (4.6.1)

Modified:
    incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx
    incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
    incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
    incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/source/primitive2d/textbreakuphelper.cxx

Modified: incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx?rev=1222204&r1=1222203&r2=1222204&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx
(original)
+++ incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/inc/drawinglayer/primitive2d/svggradientprimitive2d.hxx
Thu Dec 22 12:42:55 2011
@@ -173,7 +173,7 @@ namespace drawinglayer
             const SvgGradientEntryVector& getGradientEntries() const { return maGradientEntries;
}
             const basegfx::B2DPoint& getStart() const { return maStart; }
             SpreadMethod getSpreadMethod() const { return maSpreadMethod; }
-            const double getOverlapping() const { return mfOverlapping; }
+            double getOverlapping() const { return mfOverlapping; }
 
             /// compare operator
 			virtual bool operator==(const SvgGradientHelper& rSvgGradientHelper) const;
@@ -361,7 +361,7 @@ namespace drawinglayer
             const basegfx::BColor& getColorB() const { return maColorB; }
             double getOffsetA() const { return mfOffsetA; }
             double getOffsetB() const { return mfOffsetB; }
-            const double getOverlapping() const { return mfOverlapping; }
+            double getOverlapping() const { return mfOverlapping; }
 
             /// compare operator
 			virtual bool operator==(const BasePrimitive2D& rPrimitive) const;
@@ -448,7 +448,7 @@ namespace drawinglayer
             double getScaleB() const { return mfScaleB; }
             const basegfx::B2DVector& getTranslateA() const { return maTranslateA; }
             const basegfx::B2DVector& getTranslateB() const { return maTranslateB; }
-            const double getOverlapping() const { return mfOverlapping; }
+            double getOverlapping() const { return mfOverlapping; }
             bool getTranslateSet() const { return mbTranslateSet; }
 
             /// compare operator

Modified: incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx?rev=1222204&r1=1222203&r2=1222204&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
(original)
+++ incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/source/primitive2d/patternfillprimitive2d.cxx
Thu Dec 22 12:42:55 2011
@@ -143,7 +143,7 @@ namespace drawinglayer
             return false;
         }
 
-        basegfx::B2DRange PatternFillPrimitive2D::getB2DRange(const geometry::ViewInformation2D&
rViewInformation) const
+        basegfx::B2DRange PatternFillPrimitive2D::getB2DRange(const geometry::ViewInformation2D&
/*rViewInformation*/) const
         {
             return getMask().getB2DRange();
         }

Modified: incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx?rev=1222204&r1=1222203&r2=1222204&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
(original)
+++ incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
Thu Dec 22 12:42:55 2011
@@ -809,7 +809,6 @@ namespace drawinglayer
             {
                 // at least two color stops in range [0.0 .. 1.0], sorted, non-null vector,
not completely
                 // invisible, width and height to fill are not empty
-                const SvgGradientEntryVector& rEntries = getGradientEntries();
                 const basegfx::B2DRange aPolyRange(getPolyPolygon().getB2DRange());
                 const double fPolyWidth(aPolyRange.getWidth());
                 const double fPolyHeight(aPolyRange.getHeight());
@@ -967,7 +966,7 @@ namespace drawinglayer
 {
 	namespace primitive2d
 	{
-        Primitive2DSequence SvgLinearAtomPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D&
rViewInformation) const
+        Primitive2DSequence SvgLinearAtomPrimitive2D::create2DDecomposition(const geometry::ViewInformation2D&
/*rViewInformation*/) const
         {
             Primitive2DSequence xRetval;
             const double fDelta(getOffsetB() - getOffsetA());

Modified: incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/source/primitive2d/textbreakuphelper.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/source/primitive2d/textbreakuphelper.cxx?rev=1222204&r1=1222203&r2=1222204&view=diff
==============================================================================
--- incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/source/primitive2d/textbreakuphelper.cxx
(original)
+++ incubator/ooo/branches/alg/svgreplacement/main/drawinglayer/source/primitive2d/textbreakuphelper.cxx
Thu Dec 22 12:42:55 2011
@@ -94,8 +94,8 @@ namespace drawinglayer
 					else
 					{
 						// get from DXArray
-						const sal_uInt32 nIndex(static_cast< sal_uInt32 >(nIndex - mpSource->getTextPosition()));
-						fOffset = mpSource->getDXArray()[nIndex - 1];
+						const sal_uInt32 nIndex2(static_cast< sal_uInt32 >(nIndex - mpSource->getTextPosition()));
+						fOffset = mpSource->getDXArray()[nIndex2 - 1];
 					}
 
                     // need offset without FontScale for building the new transformation.
The
@@ -183,7 +183,7 @@ namespace drawinglayer
             }
         }
 
-        bool TextBreakupHelper::allowChange(sal_uInt32 nCount, basegfx::B2DHomMatrix&
rNewTransform, sal_uInt32 nIndex, sal_uInt32 nLength)
+        bool TextBreakupHelper::allowChange(sal_uInt32 /*nCount*/, basegfx::B2DHomMatrix&
/*rNewTransform*/, sal_uInt32 /*nIndex*/, sal_uInt32 /*nLength*/)
         {
             return true;
         }



Mime
View raw message