[Libreoffice-commits] .: 2 commits - libxml2/makefile.mk libxml2/prj libxslt/prj sc/source

[Norbert Thiebaud]

 libxml2/makefile.mk              |    2 +-
 libxml2/prj/d.lst                |    2 ++
 libxslt/prj/d.lst                |    5 +++++
 sc/source/core/data/dpobject.cxx |    2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 23dace36e79aba275592d611298abe524d4adbbf
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Feb 22 15:58:53 2012 -0600

    WaE unitialized variable

diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 4d3ff60..5d4e8bc 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -1795,7 +1795,7 @@ void lcl_FillOldFields(
             {
                 uno::Any aOrigAny = xDimProp->getPropertyValue(
                     OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_DP_ORIGINAL_POS)));
-                sal_Int32 nTmp;
+                sal_Int32 nTmp = 0;
                 if (aOrigAny >>= nTmp)
                     nDupSource = static_cast<sal_Int32>(nTmp);
             }
commit 49843f0f9788e01805d8d0d27428fe5e6a4cc530
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Feb 22 15:58:19 2012 -0600

    support using for libxml2 internal on MacOSX

diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index 78c4c3e..b9f6db4 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -146,7 +146,7 @@ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 OUTDIR2INC=include$/libxml 
 
 .IF "$(OS)"=="MACOSX"
-EXTRPATH=URELIB
+EXTRPATH=LOADER
 OUT2LIB+=.libs$/libxml2.*.dylib
 OUT2BIN+=.libs$/xmllint
 OUT2BIN+=xml2-config
diff --git a/libxml2/prj/d.lst b/libxml2/prj/d.lst
index 6e7bbb4..d5e98d4 100644
--- a/libxml2/prj/d.lst
+++ b/libxml2/prj/d.lst
@@ -2,6 +2,8 @@ mkdir: %_DEST%\inc\external\libxml
 ..\%__SRC%\inc\libxml\*.h %_DEST%\inc\external\libxml\*.h
 ..\%__SRC%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so.2
 symlink: %_DEST%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so
+..\%__SRC%\lib\libxml2.2.dylib %_DEST%\lib\libxml2.2.dylib
+symlink: %_DEST%\lib\libxml2.2.dylib %_DEST%\lib\libxml2.dylib
 ..\%__SRC%\lib\libxml2.so %_DEST%\lib\libxml2.so
 ..\%__SRC%\lib\*.lib %_DEST%\lib
 ..\%__SRC%\lib\libxml2.dll.a %_DEST%\lib\libxml2.dll.a
diff --git a/libxslt/prj/d.lst b/libxslt/prj/d.lst
index 0627cc1..f3613b0 100644
--- a/libxslt/prj/d.lst
+++ b/libxslt/prj/d.lst
@@ -1,10 +1,15 @@
 mkdir: %_DEST%\inc\external\libxslt
 ..\%__SRC%\inc\*.h %_DEST%\inc\external\libxslt\*.h
+..\%__SRC%\lib\libxslt.1.dylib %_DEST%\lib\libxslt.1.dylib
+symlink: %_DEST%\lib\libxslt.1.dylib %_DEST%\lib\libxslt.dylib
+...\%__SRC%\lib\libexslt.so %_DEST%\lib\libexslt.so
 ..\%__SRC%\lib\libxslt.so.1 %_DEST%\lib\libxslt.so.1
 symlink: %_DEST%\lib\libxslt.so.1 %_DEST%\lib\libxslt.so
 ..\%__SRC%\lib\libxslt.so %_DEST%\lib\libxslt.so
 ..\%__SRC%\lib\libexslt.so.0 %_DEST%\lib\libexslt.so.0
 symlink: %_DEST%\lib\libexslt.so.0 %_DEST%\lib\libexslt.so
+..\%__SRC%\lib\libexslt.0.dylib %_DEST%\lib\libexslt.0.dylib
+symlink: %_DEST%\lib\libexslt.0.dylib %_DEST%\lib\libexslt.dylib
 ..\%__SRC%\lib\libexslt.so %_DEST%\lib\libexslt.so
 ..\%__SRC%\lib\libxslt*.* %_DEST%\lib\libxslt*.*
 ..\%__SRC%\lib\lib*.dll.a %_DEST%\lib\*.a