[Libreoffice-commits] .: 2 commits - download extensions/source

[Peter Foley]

 download                          |    5 +++--
 extensions/source/ole/unoobjw.cxx |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit f00172b81c8bab0b1c62cbca1bc14b83deed8806
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Sun Dec 11 19:54:48 2011 -0500

    fix automatic download of dlls on windows

diff --git a/download b/download
index c889a46..9b68703 100755
--- a/download
+++ b/download
@@ -211,8 +211,8 @@ if [ "$COM" = "MSC" -a -n "$md5sum" ]; then
     TMPUNPACK=`cygpath -d $TARFILE_LOCATION/tmp`
     chmod a+w $TARFILE_LOCATION/tmp
     if [ ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/dbghinst.EXE ]; then
-	if [ ! -x $TARFILE_LOCATION/dbghinst.EXE ]; then
-	    chmod +x $TARFILE_LOCATION/dbghinst.EXE
+	if [ ! -x `cygpath $TARFILE_LOCATION`/dbghinst.EXE ]; then
+	    chmod +x `cygpath $TARFILE_LOCATION`/dbghinst.EXE
 	fi
         $TARFILE_LOCATION/dbghinst.EXE /T:$TMPUNPACK /C
         sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/dbghelp.exe | sed "s/ .*//"`
@@ -222,6 +222,7 @@ if [ "$COM" = "MSC" -a -n "$md5sum" ]; then
     fi
     if [ ! -f ./external/gdiplus/gdiplus.dll -a -f $TARFILE_LOCATION/WindowsXP-KB975337-x86-ENU.exe ]; then
 	gdiplus_dll_path=asms/10/msft/windows/gdiplus/gdiplus.dll
+	chmod +x `cygpath $TARFILE_LOCATION`/WindowsXP-KB975337-x86-ENU.exe
 
 	# Run it through cmd so that the UAC prompt is displayed
 	echo
commit f44d288a96f4efa23cbcc172261962c8010f9797
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Sun Dec 11 19:50:08 2011 -0500

    fix ole build failure

diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 4672696..49d4349 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -85,7 +85,7 @@ namespace ole_adapter
 boost::unordered_map<sal_uInt32, WeakReference<XInterface> > UnoObjToWrapperMap;
 static sal_Bool writeBackOutParameter(VARIANTARG* pDest, VARIANT* pSource);
 static sal_Bool writeBackOutParameter2( VARIANTARG* pDest, VARIANT* pSource);
-static HRESULT mapCannotConvertException( CannotConvertException e, unsigned int * puArgErr);
+static HRESULT mapCannotConvertException(const CannotConvertException &e, unsigned int * puArgErr);
 
 
 /* Does not throw any exceptions.