ooo-build r11706 - in trunk: . patches/src680
- From: thorstenb svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r11706 - in trunk: . patches/src680
- Date: Tue, 26 Feb 2008 15:23:52 +0000 (GMT)
Author: thorstenb
Date: Tue Feb 26 15:23:51 2008
New Revision: 11706
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11706&view=rev
Log:
* patches/src680/svg-import-filter.diff: adding
workarounds for older compilers and spirit 1.6.1
Modified:
trunk/ChangeLog
trunk/patches/src680/svg-import-filter.diff
Modified: trunk/patches/src680/svg-import-filter.diff
==============================================================================
--- trunk/patches/src680/svg-import-filter.diff (original)
+++ trunk/patches/src680/svg-import-filter.diff Tue Feb 26 15:23:51 2008
@@ -44,7 +44,7 @@
+ <prop oor:name="ClipboardFormat"><value>doctype:xmlns="http://www.w3.org/2000/svg";</value></prop>
</node>
--- filter/source/svg/b2dellipse.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/b2dellipse.cxx 2008-02-23 21:35:38.000000000 +0100
++++ filter/source/svg/b2dellipse.cxx 2008-02-26 12:50:04.000000000 +0100
@@ -0,0 +1,139 @@
+/*************************************************************************
+ *
@@ -186,7 +186,7 @@
+//////////////////////////////////////////////////////////////////////////////
+// eof
--- filter/source/svg/b2dellipse.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/b2dellipse.hxx 2008-02-23 21:35:52.000000000 +0100
++++ filter/source/svg/b2dellipse.hxx 2008-02-26 12:50:04.000000000 +0100
@@ -0,0 +1,77 @@
+/*************************************************************************
+ *
@@ -265,8 +265,8 @@
+//////////////////////////////////////////////////////////////////////////////
+
+#endif /* _BASEGFX_B2DELLIPSE_HXX */
---- filter/source/svg/exports.map 2008-02-26 11:23:18.000000000 +0100
-+++ filter/source/svg/exports.map 2008-02-23 12:59:42.000000000 +0100
+--- filter/source/svg/exports.map 2008-02-26 16:03:58.000000000 +0100
++++ filter/source/svg/exports.map 2008-02-26 12:50:04.000000000 +0100
@@ -1,4 +1,4 @@
-PDFFILTER_1_0 {
+SVGFILTER_1_0 {
@@ -281,7 +281,7 @@
\ No newline at end of file
+};
--- filter/source/svg/gentoken.pl 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/gentoken.pl 2008-02-23 12:59:42.000000000 +0100
++++ filter/source/svg/gentoken.pl 2008-02-26 12:50:04.000000000 +0100
@@ -0,0 +1,58 @@
+# from oox/source/token - should really put this into solenv
+
@@ -342,7 +342,7 @@
+close ( HXX );
+close ( GPERF );
--- filter/source/svg/gfxtypes.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/gfxtypes.hxx 2008-02-23 12:59:42.000000000 +0100
++++ filter/source/svg/gfxtypes.hxx 2008-02-26 15:04:14.000000000 +0100
@@ -0,0 +1,309 @@
+/*************************************************************************
+ *
@@ -388,15 +388,15 @@
+ {}
+ ARGBColor( int r_, int g_, int b_ ) :
+ a(1.0),
-+ r(toDoubleColor(r_)),
-+ g(toDoubleColor(g_)),
-+ b(toDoubleColor(b_))
++ r(toDoubleColor(sal::static_int_cast<sal_uInt8>(r_))),
++ g(toDoubleColor(sal::static_int_cast<sal_uInt8>(g_))),
++ b(toDoubleColor(sal::static_int_cast<sal_uInt8>(b_)))
+ {}
+ ARGBColor( int a_, int r_, int g_, int b_ ) :
-+ a(toDoubleColor(a_)),
-+ r(toDoubleColor(r_)),
-+ g(toDoubleColor(g_)),
-+ b(toDoubleColor(b_))
++ a(toDoubleColor(sal::static_int_cast<sal_uInt8>(a_))),
++ r(toDoubleColor(sal::static_int_cast<sal_uInt8>(r_))),
++ g(toDoubleColor(sal::static_int_cast<sal_uInt8>(g_))),
++ b(toDoubleColor(sal::static_int_cast<sal_uInt8>(b_)))
+ {}
+ double a;
+ double r;
@@ -653,9 +653,9 @@
+} // namespace svgi
+
+#endif
---- filter/source/svg/makefile.mk 2008-02-26 11:23:18.000000000 +0100
-+++ filter/source/svg/makefile.mk 2008-02-23 15:23:12.000000000 +0100
-@@ -34,47 +34,48 @@
+--- filter/source/svg/makefile.mk 2008-02-26 16:03:58.000000000 +0100
++++ filter/source/svg/makefile.mk 2008-02-26 13:41:08.000000000 +0100
+@@ -34,24 +34,35 @@
#*************************************************************************
PRJ=..$/..
@@ -677,23 +677,28 @@
- $(SLO)$/svgfilter.obj \
+SLOFILES= \
+ $(SLO)$/b2dellipse.obj \
-+ $(SLO)$/parserfragments.obj \
++ $(SLO)$/parserfragments.obj \
$(SLO)$/svgexport.obj \
+ $(SLO)$/svgfilter.obj \
$(SLO)$/svgfontexport.obj \
- $(SLO)$/svgwriter.obj
-.IF "$(SOLAR_JAVA)"!=""
-SLOFILES+= $(SLO)$/svgimport.obj
--.ENDIF
+ $(SLO)$/svgimport.obj \
+ $(SLO)$/svgreader.obj \
+ $(SLO)$/svguno.obj \
+ $(SLO)$/svgwriter.obj \
+ $(SLO)$/tokenmap.obj \
+ $(SLO)$/units.obj
++
++.IF "$(COMID)"=="gcc3"
++.IF "$(CCNUMVER)">="000400000000"
++CFLAGS+=-DUSE_MODERN_SPIRIT
++.ENDIF
+ .ENDIF
# --- Library -----------------------------------
-
+@@ -59,22 +70,18 @@
SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX)
SHL1STDLIBS=\
@@ -720,7 +725,7 @@
SHL1DEPN=
SHL1IMPLIB= i$(SHL1TARGET)
-@@ -87,3 +88,15 @@
+@@ -87,3 +94,15 @@
# --- Targets ----------------------------------
.INCLUDE : target.mk
@@ -737,8 +742,8 @@
+$(SLO)$/svgreader.obj : $(INCCOM)$/tokens.cxx $(INCCOM)$/tokens.hxx
+
--- filter/source/svg/parserfragments.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/parserfragments.cxx 2008-02-26 11:49:33.000000000 +0100
-@@ -0,0 +1,384 @@
++++ filter/source/svg/parserfragments.cxx 2008-02-26 16:00:20.000000000 +0100
+@@ -0,0 +1,388 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -758,6 +763,7 @@
+#include "precompiled_filter.hxx"
+
+#include "parserfragments.hxx"
++#include "spirit_supplements.hxx"
+#include "gfxtypes.hxx"
+
+#include <basegfx/tools/canvastools.hxx>
@@ -784,7 +790,7 @@
+void setFourBitColor( double& rChannel, char nChar )
+{
+ const sal_uInt8 nVal(hex2int(nChar));
-+ fprintf(stderr, "setFourBitCOlor %d color\n", nVal );
++ OSL_TRACE( "setFourBitCOlor %d color", nVal );
+ rChannel = (nVal*16+nVal)/255.0;
+}
+
@@ -792,13 +798,13 @@
+{
+ const sal_uInt8 nVal0(hex2int(pStart[0]));
+ const sal_uInt8 nVal1(hex2int(pStart[1]));
-+ fprintf(stderr, "setEightbitCOlor %d, %d color\n", nVal0, nVal1 );
++ OSL_TRACE( "setEightbitCOlor %d, %d color", nVal0, nVal1 );
+ rChannel = (nVal0*16+nVal1)/255.0;
+}
+
+void setIntColor( double& rChannel, sal_uInt8 nVal )
+{
-+ fprintf(stderr, "setIntColor %d color\n", nVal );
++ OSL_TRACE( "setIntColor %d color", nVal );
+ rChannel = nVal/255.0;
+}
+
@@ -811,7 +817,7 @@
+ aCurr.rotate(fRotationAngle*M_PI/180);
+ aCurr.translate(rCurrTransform.m02,rCurrTransform.m12);
+
-+ fprintf(stderr, "calcRotation - fRotationAngle - %f\n", fRotationAngle);
++ OSL_TRACE("calcRotation - fRotationAngle - %f", fRotationAngle);
+ rTransforms.push_back(
+ basegfx::unotools::affineMatrixFromHomMatrix(
+ rCurrTransform,
@@ -1013,7 +1019,7 @@
+ // reset current transform after every push
+ )[assign_a(aCurrTransform,aIdentityTransform)],
+ // list delimiter is either ',' or space
-+ ',' | eps_p ))
++ ',' | eps_p ))
+ ),
+ // End grammar
+ space_p).full;
@@ -1102,29 +1108,32 @@
+
+ data.erase(data.begin(),data.end());
+
-+ return parse(sXlinkHref,
-+ // Begin grammar
-+ (
-+ // the data uri
-+ (str_p("data:") >> while_p(~eps_p(','))[anychar_p] >>
-+ ',' >> repeat_p(1, more)[anychar_p[boost::bind(&appendChar,
-+ boost::ref(data),
-+ _1)]])
++ std::string sLink(sXlinkHref);
++
++ if (!sLink.compare(0,5,"data:"))
++ {
++ // the inplace "data" uri
++ size_t position = sLink.rfind(',');
++ if (position > 0 && position < std::string::npos)
++ {
++ data = sLink.substr(position+1);
++ OSL_TRACE("%s", data.c_str());
++ return true;
++ }
++ }
++
++ return false;
+#if 0
-+ |
-+ // the "normal" uri
-+ (repeat_p(1, more)[anychar_p[boost::bind(&appendChar,
-+ boost::ref(data),
-+ _1)]])
++ // the "normal" outplace uri
++ (repeat_p(1, more)[anychar_p[boost::bind(&appendChar,
++ boost::ref(data),
++ _1)]])
+#endif
-+ ),
-+ // End grammar
-+ space_p).full;
+}
+
+} // namespace svgi
--- filter/source/svg/parserfragments.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/parserfragments.hxx 2008-02-26 11:45:57.000000000 +0100
++++ filter/source/svg/parserfragments.hxx 2008-02-26 12:50:04.000000000 +0100
@@ -0,0 +1,49 @@
+/*************************************************************************
+ *
@@ -1175,8 +1184,105 @@
+} // namespace svgi
+
+#endif
---- filter/source/svg/svgfilter.cxx 2008-02-26 11:23:18.000000000 +0100
-+++ filter/source/svg/svgfilter.cxx 2008-02-23 12:59:42.000000000 +0100
+--- filter/source/svg/spirit_supplements.hxx 1970-01-01 01:00:00.000000000 +0100
++++ filter/source/svg/spirit_supplements.hxx 2008-02-26 15:43:54.000000000 +0100
+@@ -0,0 +1,94 @@
++/*************************************************************************
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * Author:
++ * Fridrich Strba <fridrich strba bluewin ch>
++ * Thorsten Behrens <tbehrens novell com>
++ *
++ * Copyright (C) 2008, Novell Inc.
++ *
++ * The Contents of this file are made available subject to
++ * the terms of GNU Lesser General Public License Version 2.1.
++ *
++ ************************************************************************/
++
++#ifndef INCLUDED_SPIRIT_SUPPLEMENTS_HXX
++#define INCLUDED_SPIRIT_SUPPLEMENTS_HXX
++
++# ifndef USE_MODERN_SPIRIT
++# include <boost/spirit.hpp>
++
++namespace boost { namespace spirit
++{
++ template<typename Target, typename Value> struct assigner
++ {
++ assigner( Target& rTarget, Value aValue ) :
++ mrTarget(rTarget), maValue(aValue)
++ {}
++
++ void assign() const { mrTarget=maValue; }
++
++ void operator()() const { assign(); }
++ template<typename T1> void operator()(T1) const { assign(); }
++ template<typename T1,typename T2> void operator()(T1,T2) const { assign(); }
++ template<typename T1,typename T2,typename T3> void operator()(T1,T2,T3) const { assign(); }
++
++ Target& mrTarget;
++ const Value maValue;
++ };
++
++ template<typename Target, typename Value> inline assigner<Target,Value>
++ assign_a( Target& rTarget, Value aValue )
++ {
++ return assigner<Target,Value>(rTarget,aValue);
++ }
++
++ template <typename Target> inline assign_actor<Target>
++ assign_a(Target& rTarget)
++ {
++ return assign_actor<Target>(rTarget);
++ }
++
++ template<typename Target, typename Value> struct back_pusher
++ {
++ back_pusher( Target& rTarget, const Value& rValue ) :
++ mrTarget(rTarget), mrValue(rValue)
++ {}
++
++ void push_back() const { mrTarget.push_back(mrValue); }
++
++ void operator()() const { push_back(); }
++ template<typename T1> void operator()(T1) const { push_back(); }
++ template<typename T1,typename T2> void operator()(T1,T2) const { push_back(); }
++ template<typename T1,typename T2,typename T3> void operator()(T1,T2,T3) const { push_back(); }
++
++ Target& mrTarget;
++ const Value& mrValue;
++ };
++
++ template<typename Target, typename Value> inline back_pusher<Target,Value>
++ push_back_a( Target& rTarget, const Value& rValue )
++ {
++ return back_pusher<Target,Value>(rTarget,rValue);
++ }
++
++ template<typename Target> struct value_back_pusher
++ {
++ explicit value_back_pusher( Target& rTarget ) :
++ mrTarget(rTarget)
++ {}
++ template<typename T1> void operator()(T1 val) const { mrTarget.push_back(val); }
++
++ Target& mrTarget;
++ };
++
++ template<typename Target> inline value_back_pusher<Target>
++ push_back_a( Target& rTarget )
++ {
++ return value_back_pusher<Target>(rTarget);
++ }
++} }
++
++# endif
++#endif
+--- filter/source/svg/svgfilter.cxx 2008-02-26 16:03:59.000000000 +0100
++++ filter/source/svg/svgfilter.cxx 2008-02-26 12:50:04.000000000 +0100
@@ -96,11 +96,9 @@
if( pFocusWindow )
pFocusWindow->EnterWait();
@@ -1240,8 +1346,8 @@
// -----------------------------------------------------------------------------
---- filter/source/svg/svgfilter.hxx 2008-02-26 11:23:18.000000000 +0100
-+++ filter/source/svg/svgfilter.hxx 2008-02-23 12:59:42.000000000 +0100
+--- filter/source/svg/svgfilter.hxx 2008-02-26 16:03:59.000000000 +0100
++++ filter/source/svg/svgfilter.hxx 2008-02-26 12:50:04.000000000 +0100
@@ -231,18 +231,11 @@
class SVGActionWriter;
class EditFieldInfo;
@@ -1288,8 +1394,8 @@
// XExporter
virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException);
---- filter/source/svg/svgimport.cxx 2008-02-26 11:23:18.000000000 +0100
-+++ filter/source/svg/svgimport.cxx 2008-02-23 12:59:42.000000000 +0100
+--- filter/source/svg/svgimport.cxx 2008-02-26 16:03:59.000000000 +0100
++++ filter/source/svg/svgimport.cxx 2008-02-26 12:50:04.000000000 +0100
@@ -37,160 +37,59 @@
#include "precompiled_filter.hxx"
@@ -1500,8 +1606,8 @@
}
--- filter/source/svg/svgreader.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/svgreader.cxx 2008-02-26 11:48:21.000000000 +0100
-@@ -0,0 +1,1309 @@
++++ filter/source/svg_new/svgreader.cxx 2008-02-26 14:12:32.000000000 +0100
+@@ -0,0 +1,1306 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -1616,13 +1722,13 @@
+ maCurrState = maParentStates.back();
+ maCurrState.maTransform.identity();
+
-+ fprintf(stderr,"the CTM is currently #1: %f %f %f %f %f %f\n",
-+ maCurrState.maCTM.get(0,0),
-+ maCurrState.maCTM.get(0,1),
-+ maCurrState.maCTM.get(0,2),
-+ maCurrState.maCTM.get(1,0),
-+ maCurrState.maCTM.get(1,1),
-+ maCurrState.maCTM.get(1,2));
++ OSL_TRACE("the CTM is currently #1: %f %f %f %f %f %f",
++ maCurrState.maCTM.get(0,0),
++ maCurrState.maCTM.get(0,1),
++ maCurrState.maCTM.get(0,2),
++ maCurrState.maCTM.get(1,0),
++ maCurrState.maCTM.get(1,1),
++ maCurrState.maCTM.get(1,2));
+
+ // scan for style info
+ const sal_Int32 nNumElems( xAttributes->getLength() );
@@ -1654,13 +1760,13 @@
+ }
+ maCurrState.maCTM *= maCurrState.maTransform;
+
-+ fprintf(stderr,"the CTM is currently #2: %f %f %f %f %f %f\n",
-+ maCurrState.maCTM.get(0,0),
-+ maCurrState.maCTM.get(0,1),
-+ maCurrState.maCTM.get(0,2),
-+ maCurrState.maCTM.get(1,0),
-+ maCurrState.maCTM.get(1,1),
-+ maCurrState.maCTM.get(1,2));
++ OSL_TRACE("the CTM is currently #2: %f %f %f %f %f %f",
++ maCurrState.maCTM.get(0,0),
++ maCurrState.maCTM.get(0,1),
++ maCurrState.maCTM.get(0,2),
++ maCurrState.maCTM.get(1,0),
++ maCurrState.maCTM.get(1,1),
++ maCurrState.maCTM.get(1,2));
+
+ // if necessary, serialize to automatic-style section
+ writeStyle(xElem);
@@ -1959,12 +2065,11 @@
+ break;
+ }
+ default:
-+ fprintf(stderr,
-+ "unhandled token %s (detected as %s)\n",
-+ rtl::OUStringToOString(
-+ sAttribute,
-+ RTL_TEXTENCODING_UTF8 ).getStr(),
-+ getTokenName(nTokenId));
++ OSL_TRACE("unhandled token %s (detected as %s)",
++ rtl::OUStringToOString(
++ sAttribute,
++ RTL_TEXTENCODING_UTF8 ).getStr(),
++ getTokenName(nTokenId));
+ break;
+ }
+ }
@@ -2072,13 +2177,13 @@
+ sStyleId.toInt32());
+ maCurrState = pOrigState != mrStateMap.end() ? pOrigState->second : maParentStates.back();
+
-+ fprintf(stderr,"the CTM is now #2: %f %f %f %f %f %f\n",
-+ maCurrState.maCTM.get(0,0),
-+ maCurrState.maCTM.get(0,1),
-+ maCurrState.maCTM.get(0,2),
-+ maCurrState.maCTM.get(1,0),
-+ maCurrState.maCTM.get(1,1),
-+ maCurrState.maCTM.get(1,2));
++ OSL_TRACE("the CTM is now #2: %f %f %f %f %f %f",
++ maCurrState.maCTM.get(0,0),
++ maCurrState.maCTM.get(0,1),
++ maCurrState.maCTM.get(0,2),
++ maCurrState.maCTM.get(1,0),
++ maCurrState.maCTM.get(1,1),
++ maCurrState.maCTM.get(1,2));
+
+ const sal_Int32 nTokenId(getTokenId(xElem->getNodeName()));
+ switch(nTokenId)
@@ -2410,13 +2515,13 @@
+
+ xAttrs->Clear();
+
-+ fprintf(stderr,"the CTM is now #2: %f %f %f %f %f %f\n",
-+ maCurrState.maCTM.get(0,0),
-+ maCurrState.maCTM.get(0,1),
-+ maCurrState.maCTM.get(0,2),
-+ maCurrState.maCTM.get(1,0),
-+ maCurrState.maCTM.get(1,1),
-+ maCurrState.maCTM.get(1,2));
++ OSL_TRACE("the CTM is now #2: %f %f %f %f %f %f",
++ maCurrState.maCTM.get(0,0),
++ maCurrState.maCTM.get(0,1),
++ maCurrState.maCTM.get(0,2),
++ maCurrState.maCTM.get(1,0),
++ maCurrState.maCTM.get(1,1),
++ maCurrState.maCTM.get(1,2));
+
+ basegfx::B2DPolygon aPoly = basegfx::tools::createPolygonFromEllipse(rEllipse.getB2DEllipseCenter(),
+ rEllipse.getB2DEllipseRadius().getX(), rEllipse.getB2DEllipseRadius().getY());
@@ -2438,13 +2543,13 @@
+
+ xAttrs->Clear();
+
-+ fprintf(stderr,"the CTM is now #2: %f %f %f %f %f %f\n",
-+ maCurrState.maCTM.get(0,0),
-+ maCurrState.maCTM.get(0,1),
-+ maCurrState.maCTM.get(0,2),
-+ maCurrState.maCTM.get(1,0),
-+ maCurrState.maCTM.get(1,1),
-+ maCurrState.maCTM.get(1,2));
++ OSL_TRACE("the CTM is now #2: %f %f %f %f %f %f",
++ maCurrState.maCTM.get(0,0),
++ maCurrState.maCTM.get(0,1),
++ maCurrState.maCTM.get(0,2),
++ maCurrState.maCTM.get(1,0),
++ maCurrState.maCTM.get(1,1),
++ maCurrState.maCTM.get(1,2));
+
+ if( aState.maDashArray.size() )
+ {
@@ -2545,32 +2650,30 @@
+{
+ void operator()( const uno::Reference<xml::dom::XElement>& xElem )
+ {
-+ fprintf(stderr, "name: %s\n",
-+ rtl::OUStringToOString(
-+ xElem->getTagName(),
-+ RTL_TEXTENCODING_UTF8 ).getStr());
++ OSL_TRACE("name: %s",
++ rtl::OUStringToOString(
++ xElem->getTagName(),
++ RTL_TEXTENCODING_UTF8 ).getStr());
+ }
+
+ void operator()( const uno::Reference<xml::dom::XElement>& xElem,
+ const uno::Reference<xml::dom::XNamedNodeMap>& xAttributes )
+ {
-+ fprintf(stderr, "name: %s",
-+ rtl::OUStringToOString(
-+ xElem->getTagName(),
-+ RTL_TEXTENCODING_UTF8 ).getStr());
++ OSL_TRACE("name: %s",
++ rtl::OUStringToOString(
++ xElem->getTagName(),
++ RTL_TEXTENCODING_UTF8 ).getStr());
+ const sal_Int32 nNumElems( xAttributes->getLength() );
+ for( sal_Int32 i=0; i<nNumElems; ++i )
+ {
-+ fprintf(stderr, " %s=%s",
-+ rtl::OUStringToOString(
-+ xAttributes->item(i)->getNodeName(),
-+ RTL_TEXTENCODING_UTF8 ).getStr(),
-+ rtl::OUStringToOString(
-+ xAttributes->item(i)->getNodeValue(),
-+ RTL_TEXTENCODING_UTF8 ).getStr());
++ OSL_TRACE(" %s=%s",
++ rtl::OUStringToOString(
++ xAttributes->item(i)->getNodeName(),
++ RTL_TEXTENCODING_UTF8 ).getStr(),
++ rtl::OUStringToOString(
++ xAttributes->item(i)->getNodeValue(),
++ RTL_TEXTENCODING_UTF8 ).getStr());
+ }
-+
-+ fprintf(stderr, "\n");
+ }
+
+ void push() {}
@@ -2812,7 +2915,7 @@
+
+} // namespace svgi
--- filter/source/svg/svgreader.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/svgreader.hxx 2008-02-23 12:59:42.000000000 +0100
++++ filter/source/svg/svgreader.hxx 2008-02-26 12:50:04.000000000 +0100
@@ -0,0 +1,43 @@
+/*************************************************************************
+ *
@@ -2858,7 +2961,7 @@
+
+#endif
--- filter/source/svg/tokenmap.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/tokenmap.cxx 2008-02-23 12:59:42.000000000 +0100
++++ filter/source/svg/tokenmap.cxx 2008-02-26 12:50:04.000000000 +0100
@@ -0,0 +1,62 @@
+/*************************************************************************
+ *
@@ -2923,7 +3026,7 @@
+
+} // namespace svgi
--- filter/source/svg/tokenmap.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/tokenmap.hxx 2008-02-23 12:59:42.000000000 +0100
++++ filter/source/svg/tokenmap.hxx 2008-02-26 12:50:04.000000000 +0100
@@ -0,0 +1,32 @@
+/*************************************************************************
+ *
@@ -2958,7 +3061,7 @@
+
+#endif
--- filter/source/svg/tokens.txt 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/tokens.txt 2008-02-23 12:59:42.000000000 +0100
++++ filter/source/svg/tokens.txt 2008-02-26 12:50:04.000000000 +0100
@@ -0,0 +1,246 @@
+#######################################
+#
@@ -3208,8 +3311,8 @@
+zoomAndPan
\ No newline at end of file
--- filter/source/svg/units.cxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/units.cxx 2008-02-26 10:52:58.000000000 +0100
-@@ -0,0 +1,146 @@
++++ filter/source/svg/units.cxx 2008-02-26 15:24:28.000000000 +0100
+@@ -0,0 +1,110 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -3230,13 +3333,14 @@
+#include "precompiled_filter.hxx"
+
+#include "units.hxx"
++#include "spirit_supplements.hxx"
+
+#include <string.h>
+#include <rtl/ustring.hxx>
+
+#include <boost/bind.hpp>
+#include <boost/spirit.hpp>
-+#include <boost/spirit/dynamic/select.hpp>
++
+
+namespace svgi
+{
@@ -3318,46 +3422,9 @@
+ return convLength(nVal,eUnit);
+}
+
-+#if 0
-+void transformPathPointsString( rtl::OUString& sData )
-+{
-+ using namespace ::boost::spirit;
-+
-+ rtl::OUString sBackupString;
-+ rtl::OString aUTF8 = rtl::OUStringToOString( sData,
-+ RTL_TEXTENCODING_UTF8 );
-+ double nVal=0.0;
-+ const bool bRes = parse(aUTF8.getStr(),
-+ // Begin grammar
-+ (
-+ lexeme_d[
-+ repeat_p(1, more)[
-+ (real_p[assign_a(nVal)] >> str_p("cm")[boost::bind(&appendDouble,boost::ref(sBackupString),nVal,SVG_LENGTH_UNIT_CM)])
-+ | (real_p[assign_a(nVal)] >> str_p("em")[boost::bind(&appendDouble,boost::ref(sBackupString),nVal,SVG_LENGTH_UNIT_EM)])
-+ | (real_p[assign_a(nVal)] >> str_p("ex")[boost::bind(&appendDouble,boost::ref(sBackupString),nVal,SVG_LENGTH_UNIT_EX)])
-+ | (real_p[assign_a(nVal)] >> str_p("in")[boost::bind(&appendDouble,boost::ref(sBackupString),nVal,SVG_LENGTH_UNIT_IN)])
-+ | (real_p[assign_a(nVal)] >> str_p("mm")[boost::bind(&appendDouble,boost::ref(sBackupString),nVal,SVG_LENGTH_UNIT_MM)])
-+ | (real_p[assign_a(nVal)] >> str_p("pc")[boost::bind(&appendDouble,boost::ref(sBackupString),nVal,SVG_LENGTH_UNIT_PC)])
-+ | (real_p[assign_a(nVal)] >> str_p("pct")[boost::bind(&appendDouble,boost::ref(sBackupString),nVal,SVG_LENGTH_UNIT_PCT)])
-+ | (real_p[assign_a(nVal)] >> str_p("pt")[boost::bind(&appendDouble,boost::ref(sBackupString),nVal,SVG_LENGTH_UNIT_PT)])
-+ | (real_p[assign_a(nVal)] >> str_p("px")[boost::bind(&appendDouble,boost::ref(sBackupString),nVal,SVG_LENGTH_UNIT_PX)])
-+ | (real_p[boost::bind(&appendDouble,boost::ref(sBackupString),_1,SVG_LENGTH_UNIT_USER)])
-+ | anychar_p[boost::bind(&appendChar, boost::ref(sBackupString),_1)]
-+ ]
-+ ]
-+ ),
-+ // End grammar
-+ space_p).full;
-+
-+ if ( bRes )
-+ sData = sBackupString;
-+}
-+#endif
-+
-+
+} // namespace svgi
--- filter/source/svg/units.hxx 1970-01-01 01:00:00.000000000 +0100
-+++ filter/source/svg/units.hxx 2008-02-26 10:51:31.000000000 +0100
++++ filter/source/svg/units.hxx 2008-02-26 12:50:04.000000000 +0100
@@ -0,0 +1,47 @@
+/*************************************************************************
+ *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
