[Libreoffice-commits] .: 2 commits - desktop/scripts xmlhelp/source

[Michael Meeks]

 desktop/scripts/soffice.sh                    |    2 +-
 xmlhelp/source/cxxhelp/provider/databases.cxx |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 29e7e2ddb08d1cb69bf176d55ca03c5f0ce02ebf
Author: Baptiste Daroussin <bapt at freebsd.org>
Date:   Mon Jan 31 19:59:18 2011 +0000

    initial FreeBSD work

diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 2989edd..e485b11 100644
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -70,7 +70,7 @@ fi
 sd_binary=`basename "$0" | sed 's/libreoffice/soffice/g'`.bin
 
 case "`uname -s`" in
-NetBSD|OpenBSD) # this is a temporary hack until we can live with the default search paths
+NetBSD|OpenBSD|FreeBSD) # this is a temporary hack until we can live with the default search paths
     sd_prog1="$sd_prog/../basis-link/program"
     sd_prog2="$sd_prog/../basis-link/ure-link/lib"
     LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
commit 918b3ce876bc3b2dfff66a8baaf526bc3f382bf1
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Fri Jan 14 14:23:52 2011 +0000

    make the xmlhelp fix even safer

diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 185d954..df0c627 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -826,13 +826,13 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,Db* pDb,const rtl:
     listTitle.realloc( id.size() );
 
     int nSize = 0;
+    Dbt data;
+    DBData aDBData;
     const sal_Char* pData = NULL;
     const sal_Char pEmpty[] = "";
 
     for( sal_uInt32 i = 0; i < id.size(); ++i )
     {
-        DBData aDBData;
-
         listId[i] = id[i];
         listAnchor[i] = anchor[i];
 
@@ -855,7 +855,6 @@ void KeywordInfo::KeywordElement::init( Databases *pDatabases,Db* pDb,const rtl:
             {
                 Dbt key_( static_cast< void* >( const_cast< sal_Char* >( idi.getStr() ) ),
                          idi.getLength() );
-                Dbt data;
                 pDb->get( 0,&key_,&data,0 );
                 nSize = data.get_size();
                 pData = static_cast<sal_Char*>( data.get_data() );