[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 3 commits - cppcanvas/prj cppcanvas/source

[Fridrich Strba]

 cppcanvas/prj/d.lst                        |    1 +
 cppcanvas/source/mtfrenderer/emfplus.cxx   |    2 +-
 cppcanvas/source/uno/makefile.mk           |    8 ++++++++
 cppcanvas/source/uno/mtfrenderer.component |    7 +++++++
 4 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 147671396ba2576f8814395f26e2112090b76911
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
    
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

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 8b0f95253f517c015ff0c4d0b8534ea81d4c0e8d
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 7ed2d10..c05b2f4 100644
--- a/cppcanvas/prj/d.lst
+++ b/cppcanvas/prj/d.lst
@@ -2,6 +2,7 @@
 ..\%__SRC%\bin\mtfrenderer*.dll %_DEST%\bin%_EXT%\mtfrenderer*.dll
 ..\%__SRC%\lib\icppcanvas.lib %_DEST%\lib%_EXT%\icppcanvas.lib
 ..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
+..\%__SRC%\misc\mtfrenderer.component %_DEST%\xml\mtfrenderer.component
 
 mkdir: %_DEST%\inc%_EXT%\cppcanvas
 ..\inc\cppcanvas\bitmap.hxx %_DEST%\inc%_EXT%\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 804351ed11c19a20e5c65ad208ac8d0cb189cc9a
Author: Radek Doulik <rodo at novell.com>
Date:   Fri Jun 10 11:52:26 2011 +0200

    make the debug build work again
    
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

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);