[Libreoffice-commits] .: 4 commits - cppcanvas/prj cppcanvas/source svtools/source

[Radek Doulík]

 cppcanvas/prj/d.lst                        |    1 +
 cppcanvas/source/mtfrenderer/emfplus.cxx   |    2 +-
 cppcanvas/source/uno/makefile.mk           |    8 ++++++++
 cppcanvas/source/uno/mtfrenderer.component |    7 +++++++
 svtools/source/filter/wmf/enhwmf.cxx       |    3 +--
 5 files changed, 18 insertions(+), 3 deletions(-)

New commits:
commit 0841b717cdb928197e30221a91a4b37cf7b2b1f8
Author: Radek Doulik <rodo at novell.com>
Date:   Fri Jun 10 15:59:33 2011 +0200

    make the renderer component point to the right shared library

diff --git a/cppcanvas/source/uno/makefile.mk b/cppcanvas/source/uno/makefile.mk
index 76d2594..5e06f4f 100644
--- a/cppcanvas/source/uno/makefile.mk
+++ b/cppcanvas/source/uno/makefile.mk
@@ -60,3 +60,11 @@ DEF1EXPORTFILE=exports.dxp
 # ==========================================================================
 
 .INCLUDE :	target.mk
+
+$(MISC)/mtfrenderer.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        mtfrenderer.component
+	$(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+         $(SOLARENV)/bin/createcomponent.xslt mtfrenderer.component
+
+ALLTAR : $(MISC)/mtfrenderer.component
diff --git a/cppcanvas/source/uno/mtfrenderer.component b/cppcanvas/source/uno/mtfrenderer.component
new file mode 100644
index 0000000..32284e4
--- /dev/null
+++ b/cppcanvas/source/uno/mtfrenderer.component
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.rendering.MtfRenderer">
+    <service name="com.sun.star.rendering.MtfRenderer"/>
+  </implementation>
+</component>
diff --git a/cppcanvas/util/makefile.mk b/cppcanvas/util/makefile.mk
index 74d86e6..01cf623 100644
--- a/cppcanvas/util/makefile.mk
+++ b/cppcanvas/util/makefile.mk
@@ -68,11 +68,3 @@ DEFLIB1NAME	=$(TARGET)
 
 $(MISC)$/$(SHL1TARGET).flt : makefile.mk
     @$(TYPE) $(TARGET).flt > $@
-
-$(MISC)/mtfrenderer.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        mtfrenderer.component
-	$(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-         $(SOLARENV)/bin/createcomponent.xslt mtfrenderer.component
-
-ALLTAR : $(MISC)/mtfrenderer.component
commit 14d00e073a9d6dc5a1657d3589aec1060108f465
Author: Radek Doulik <rodo at novell.com>
Date:   Fri Jun 10 12:07:18 2011 +0200

    fixed debug build

diff --git a/svtools/source/filter/wmf/enhwmf.cxx b/svtools/source/filter/wmf/enhwmf.cxx
index 981a760..6ef5053 100644
--- a/svtools/source/filter/wmf/enhwmf.cxx
+++ b/svtools/source/filter/wmf/enhwmf.cxx
@@ -235,7 +235,7 @@ static sal_Bool ImplReadRegion( PolyPolygon& rPolyPoly, SvStream& rSt, sal_uInt3
 EMFP_DEBUG(void dumpWords( SvStream& s, int i )
 {
     sal_uInt32 pos = s.Tell();
-    INT16 data;
+    sal_Int16 data;
     for( ; i > 0; i -- ) {
         s >> data;
         EMFP_DEBUG(printf ("\t\t\tdata: %04hx\n", data));
@@ -1530,4 +1530,4 @@ EnhWMFReader::~EnhWMFReader()
 
 };
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit befc87e1fecd3db726bccd6302f3159a4e0fc712
Author: Radek Doulik <rodo at novell.com>
Date:   Fri Jun 10 12:07:07 2011 +0200

    added mtfrenderer component

diff --git a/cppcanvas/prj/d.lst b/cppcanvas/prj/d.lst
index 7b998d9..eed2dcd 100644
--- a/cppcanvas/prj/d.lst
+++ b/cppcanvas/prj/d.lst
@@ -2,6 +2,7 @@
 ..\%__SRC%\bin\mtfrenderer*.dll %_DEST%\bin\mtfrenderer*.dll
 ..\%__SRC%\lib\icppcanvas.lib %_DEST%\lib\icppcanvas.lib
 ..\%__SRC%\lib\lib*.* %_DEST%\lib\lib*.*
+..\%__SRC%\misc\mtfrenderer.component %_DEST%\xml\mtfrenderer.component
 
 mkdir: %_DEST%\inc\cppcanvas
 ..\inc\cppcanvas\bitmap.hxx %_DEST%\inc\cppcanvas\bitmap.hxx
diff --git a/cppcanvas/util/makefile.mk b/cppcanvas/util/makefile.mk
index 01cf623..74d86e6 100644
--- a/cppcanvas/util/makefile.mk
+++ b/cppcanvas/util/makefile.mk
@@ -68,3 +68,11 @@ DEFLIB1NAME	=$(TARGET)
 
 $(MISC)$/$(SHL1TARGET).flt : makefile.mk
     @$(TYPE) $(TARGET).flt > $@
+
+$(MISC)/mtfrenderer.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        mtfrenderer.component
+	$(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+         $(SOLARENV)/bin/createcomponent.xslt mtfrenderer.component
+
+ALLTAR : $(MISC)/mtfrenderer.component
commit 96ff410f47bce1805de681b778cbbe277e5e2bf9
Author: Radek Doulik <rodo at novell.com>
Date:   Fri Jun 10 11:52:26 2011 +0200

    make the debug build work again

diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index a67f5a7..7bbde90 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -105,7 +105,7 @@ namespace cppcanvas
         EMFP_DEBUG (void dumpWords (SvStream& s, int i)
         {
             sal_uInt32 pos = s.Tell ();
-            INT16 data;
+            sal_Int16 data;
             for (; i > 0; i --) {
                 s >> data;
                 printf ("EMF+\tdata: %04hX\n", data);