[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 2 commits - cppcanvas/source svtools/Library_svt.mk svtools/Package_inc.mk

[Michael Meeks]

 cppcanvas/source/inc/implrenderer.hxx    |    2 +-
 cppcanvas/source/mtfrenderer/emfplus.cxx |    2 +-
 svtools/Library_svt.mk                   |    1 +
 svtools/Package_inc.mk                   |    1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit d5390c40ac4ea8ca3f91bbb16cee58cd0bece33f
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Mon Mar 14 15:55:28 2011 +0000

    compile and install filechangedchecker ...

diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 8236f15..b0fa12e 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -219,6 +219,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/misc/embedhlp \
     svtools/source/misc/embedtransfer \
     svtools/source/misc/filterutils \
+    svtools/source/misc/filechangedchecker \
     svtools/source/misc/helpagentwindow \
     svtools/source/misc/imagemgr \
     svtools/source/misc/imageresourceaccess \
diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
index 3afd5f4..b5a32a2 100644
--- a/svtools/Package_inc.mk
+++ b/svtools/Package_inc.mk
@@ -70,6 +70,7 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileurlbox.hxx,svtools
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fileview.hxx,svtools/fileview.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filter.hxx,svtools/filter.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filterutils.hxx,svtools/filterutils.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/filechangedchecker.hxx,svtools/filechangedchecker.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fixedhyper.hxx,svtools/fixedhyper.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltcall.hxx,svtools/fltcall.hxx))
 $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/fltdefs.hxx,svtools/fltdefs.hxx))
commit a6514723a23632a8ae41e224dacedb9c1688d9e8
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Mon Mar 14 10:30:59 2011 +0000

    cleanup

diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index 0695e2f..1ae2f42 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -293,7 +293,7 @@ static float GetSwapFloat( SvStream& rSt )
             sal_Int32       nMmY;
             /* multipart object data */
             bool            mbMultipart;
-            sal_uInt16          mMFlags;
+            sal_uInt16      mMFlags;
             SvMemoryStream  mMStream;
         };
 
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 359878d..a67f5a7 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1283,7 +1283,7 @@ namespace cppcanvas
                         EMFP_DEBUG (sal_Int32 brushIndex);
                         sal_Int32 points;
                         EMFP_DEBUG (sal_uInt32 color);
-                        EMFP_DEBUG (USHORT transparency = 0);
+                        EMFP_DEBUG (sal_uInt16 transparency = 0);
 
                         rMF >> brushIndexOrColor;
                         rMF >> points;