ooo-build r14442 - in branches/ooo-build-3-0: . patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Fri Oct 31 13:08:40 2008
New Revision: 14442
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14442&view=rev

Log:
    * patches/dev300/svg-import-filter.diff: added workaround for old
    boost & Windows



Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/svg-import-filter.diff

Modified: branches/ooo-build-3-0/patches/dev300/svg-import-filter.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/svg-import-filter.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/svg-import-filter.diff	Fri Oct 31 13:08:40 2008
@@ -1458,7 +1458,7 @@
 index 0000000..3a40e14
 --- /dev/null
 +++ filter/source/svg/spirit_supplements.hxx
-@@ -0,0 +1,94 @@
+@@ -0,0 +1,115 @@
 +/*************************************************************************
 + *
 + *    OpenOffice.org - a multi-platform office productivity suite
@@ -1482,6 +1482,27 @@
 +
 +namespace boost { namespace spirit
 +{
++    template <>
++    class assign_actor< std::pair<const char*,const char*> >
++    {
++    public:
++        explicit assign_actor(std::pair<const char*,const char*>& ref_)
++            : ref(ref_) {}
++
++        template <typename T2>
++        void operator()(T2 const& val) const
++        { ref = val; }
++        
++        template <typename IteratorT>
++        void operator()(IteratorT const& f, IteratorT const& l) const
++        { 
++            ref.first = f, ref.second = l;
++        }
++
++    private:
++        std::pair<const char*,const char*>& ref;
++    };
++
 +    template<typename Target, typename Value> struct assigner
 +    {
 +        assigner( Target& rTarget, Value aValue ) : 
@@ -3218,7 +3239,7 @@
 +                basegfx::B2DPolygon aPoly;
 +                aPoly = basegfx::tools::createPolygonFromRect(
 +                    basegfx::B2DRange(x,y,x+width,y+height),
-+                    rx, ry );
++                    rx/width, ry/height );
 +
 +                writePathShape(xAttrs,
 +                               xUnoAttrs,