[ooo-build-commit] .: patches/dev300

[Fridrich Strba]

 patches/dev300/apply                            |   18 +++++++++---------
 patches/dev300/svg-import-filter-gfxfilter.diff |    8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit d8a8802562e38785122f63bef7adaf5ab075ba73
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Jul 15 16:22:34 2010 +0200

    Port the svg-import patches to m83
    
    * patches/dev300/apply:
    * patches/dev300/svg-import-filter-gfxfilter.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index d78ab65..9fcb4c9 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2303,31 +2303,31 @@ xulrunner-1.9.1.diff, ccheney
 [ SVGImport ]
 # A bit less partial implementation of SVG import
 # Work in progress, but fairly usable already
-# FIXME dev300-m77 svg-import-filter.diff, thorsten
+svg-import-filter.diff, thorsten
 
 # like svg-import-filter.diff, but adds a graphic filter for SVG
-# FIXME dev300-m77 svg-import-filter-gfxfilter.diff, thorsten
+svg-import-filter-gfxfilter.diff, thorsten
 
 # fixes some nastiness with viewbox
-# FIXME dev300-m77 svg-import-viewbox-fix.diff, thorsten
+svg-import-viewbox-fix.diff, thorsten
 
 # improves parsing of paint fragments
-# FIXME dev300-m77 svg-import-painturi-fix.diff, thorsten
+svg-import-painturi-fix.diff, thorsten
 
 # much improved text import
-# FIXME dev300-m77 svg-import-textimport.diff, thorsten
+svg-import-textimport.diff, thorsten
 
 # fixing relative size calculation
-# FIXME dev300-m77 svg-import-convlength-fix.diff, cmc
+svg-import-convlength-fix.diff, cmc
 
 # fixing handling of opacity attribute
-# FIXME dev300-m77 svg-import-opacity-fix.diff, thorsten
+svg-import-opacity-fix.diff, thorsten
 
 # guard against empty gradient stops
-# FIXME dev300-m77 svg-import-empty-gradient-fix.diff, n#560255, thorsten
+svg-import-empty-gradient-fix.diff, n#560255, thorsten
 
 # eat exceptions before they reach unaware code
-# FIXME dev300-m77 svg-import-eh-fix.diff, cmc
+svg-import-eh-fix.diff, cmc
 
 [ NovellLikeOnlyWin32 ]
 novell-win32-msi-patchability.diff, tml
diff --git a/patches/dev300/svg-import-filter-gfxfilter.diff b/patches/dev300/svg-import-filter-gfxfilter.diff
index b47dd8a..4d4a6cb 100644
--- a/patches/dev300/svg-import-filter-gfxfilter.diff
+++ b/patches/dev300/svg-import-filter-gfxfilter.diff
@@ -50,7 +50,7 @@ index 0000000..185b5aa
 --- /dev/null
 +++ filter/source/svg/exports.map
 @@ -0,0 +1,10 @@
-+SVGFILTER_1_0 {
++UDK_3_0_0 {
 +        global:
 +                component_getImplementationEnvironment;
 +                component_getFactory;
@@ -140,7 +140,7 @@ index a566ff2..0edcce8 100644
 +#include <vcl/graph.hxx>
 +#include <vcl/virdev.hxx>
 +#include <vcl/gradient.hxx>
-+#include <svx/impgrf.hxx>
++#include <svtools/filter.hxx>
 +#include <tools/zcodec.hxx>
 +
  #include <boost/bind.hpp>
@@ -451,7 +451,7 @@ index a566ff2..0edcce8 100644
 +                                        STREAM_READ);
 +                    USHORT nFormat = GRFILTER_FORMAT_DONTKNOW;
 +                    USHORT pDeterminedFormat = GRFILTER_FORMAT_DONTKNOW;
-+                    GetGrfFilter()->ImportGraphic( aGraphic, String(), aSrc ,nFormat,&pDeterminedFormat );
++                    GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), aSrc ,nFormat,&pDeterminedFormat );
 +
 +                    if (pDeterminedFormat == GRFILTER_FORMAT_DONTKNOW)
 +                    {
@@ -494,7 +494,7 @@ index a566ff2..0edcce8 100644
 +                                    if (nStreamLen_)
 +                                    {
 +                                        pDest->Seek(0L);
-+                                        GetGrfFilter()->ImportGraphic( aGraphic, String(), *pDest ,nFormat,&pDeterminedFormat );
++                                        GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *pDest ,nFormat,&pDeterminedFormat );
 +                                    }
 +                                }
 +                                delete pDest;