cairo/cairo/makefile.mk | 2 +- sc/source/ui/unoobj/filtuno.cxx | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-)
New commits: commit bacafe9a07cb2af737b99641efc9cddf55340837 Author: Norbert Thiebaud <nthieb...@gmail.com> Date: Fri Dec 16 12:39:39 2011 -0600 WaE Mac unitialized value false positive diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index 6c1a651..4fe9f0f 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -82,7 +82,7 @@ SC_SIMPLE_SERVICE_INFO( ScFilterOptionsObj, SCFILTEROPTIONSOBJ_IMPLNAME, SCFILTE static void load_CharSet( rtl_TextEncoding &nCharSet, bool bExport ) { - sal_Int32 nChar; + sal_Int32 nChar = 0; Sequence<Any> aValues; const Any *pProperties; Sequence<OUString> aNames(1); @@ -101,7 +101,9 @@ static void load_CharSet( rtl_TextEncoding &nCharSet, bool bExport ) { pProperties[0] >>= nChar; if( nChar >= 0) + { nCharSet = (rtl_TextEncoding) nChar; + } } } commit 3293535767db68f7d2f96ccc15c31e503c3a8649 Author: Norbert Thiebaud <nthieb...@gmail.com> Date: Fri Dec 16 12:06:02 2011 -0600 MacOSX build breaker for MacOSX somehow having -L $solenv/$OUTPATH/lib which does not exist, in a command cause some trouble. in configure... diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk index 9aeecde..ccad5b4 100644 --- a/cairo/cairo/makefile.mk +++ b/cairo/cairo/makefile.mk @@ -59,7 +59,7 @@ PATCH_FILES+=..$/$(TARFILE_NAME).ios.patch .ENDIF cairo_CFLAGS=$(SOLARINC) -cairo_LDFLAGS=-L$(SOLARENV)$/$(OUTPATH)$/lib -L$(SOLARVER)$/$(INPATH)$/lib +cairo_LDFLAGS=-L$(SOLARVER)$/$(INPATH)$/lib cairo_CPPFLAGS= _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits