[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - connectivity/source solenv/gbuild

[Norbert Thiebaud]

 connectivity/source/drivers/postgresql/pq_preparedstatement.cxx |    2 -
 connectivity/source/drivers/postgresql/pq_statement.cxx         |    2 -
 connectivity/source/drivers/postgresql/pq_xtables.cxx           |    2 -
 solenv/gbuild/extensions/post_AuxTargets.mk                     |   19 ++++------
 4 files changed, 12 insertions(+), 13 deletions(-)

New commits:
commit 7fb4d669510994e409677be33868561bfcc37403
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Dec 8 13:03:37 2011 -0600

    WaE Mac gcc is confused with >>= operator overload (it is not alone)
    
    >>= operator overload turn the right-value of the operator into a
    left value... which confuse the heck out of the compiler's detection
    of use of unitialized variables (and also C-reader like me for
    whom >>= means something else altogether...
    (why on earth are we right-bitshifting... with an unitialized variable...
    oh! fracking operator overload!!!)

diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index b900c0f..9c35eef 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -681,7 +681,7 @@ void PreparedStatement::setObjectWithInfo(
     if( com::sun::star::sdbc::DataType::DECIMAL == targetSqlType ||
         com::sun::star::sdbc::DataType::NUMERIC == targetSqlType )
     {
-        double myDouble;
+        double myDouble = 0.0;
         OUString myString;
         if( x >>= myDouble )
         {
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx
index b7f7401..7304b15 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -448,7 +448,7 @@ static Sequence< ::rtl::OUString > lookupKeys(
         while( enumeration->hasMoreElements() )
         {
             enumeration->nextElement() >>= set;
-            sal_Int32 keyType;
+            sal_Int32 keyType = 0;
             if( (set->getPropertyValue( st.TYPE ) >>= keyType ) &&
                 keyType == com::sun::star::sdbcx::KeyType::PRIMARY )
             {
diff --git a/connectivity/source/drivers/postgresql/pq_xtables.cxx b/connectivity/source/drivers/postgresql/pq_xtables.cxx
index 483cc3f..44b1e18 100644
--- a/connectivity/source/drivers/postgresql/pq_xtables.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtables.cxx
@@ -222,7 +222,7 @@ static void appendColumnList(
                 OUString type = sqltype2string( column );
                 if( isAutoIncrement )
                 {
-                    sal_Int32 dataType;
+                    sal_Int32 dataType = 0;
                     column->getPropertyValue( st.TYPE ) >>= dataType;
                     if( com::sun::star::sdbc::DataType::INTEGER == dataType )
                     {
commit c08f5d7de3edae2ed6ca419043da0b13a9877f25
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Dec 8 12:58:35 2011 -0600

    ./download need to be run with $SRCDIR as working dir

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk
index a193869..7622047 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -43,8 +43,7 @@ distro-pack-install: install
 	$(SRCDIR)/bin/distro-install-file-lists
 
 $(SRCDIR)/src.downloaded: $(SRCDIR)/ooo.lst $(SRCDIR)/download
-	$(if $(filter YES,$(DO_FETCH_TARBALLS)),@$(SRCDIR)/download $(SRCDIR)/ooo.lst)
-	@touch $@
+	$(if $(filter YES,$(DO_FETCH_TARBALLS)),cd $(SRCDIR) && ./download ./ooo.lst && touch $@,touch $@)
 
 fetch: $(SRCDIR)/src.downloaded
 
commit 531098efd73a8e741ee502353071fefb58ee0cb8
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Dec 8 12:58:10 2011 -0600

    clean-up header and set the modfiel appropriately

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk
index 5e11850..a193869 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -1,24 +1,24 @@
-#   -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#  
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
 #   Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#  
+#
 #   The contents of this file are subject to the Mozilla Public License Version
 #   1.1 (the "License"); you may not use this file except in compliance with
 #   the License or as specified alternatively below. You may obtain a copy of
 #   the License at http://www.mozilla.org/MPL/
-#  
+#
 #   Software distributed under the License is distributed on an "AS IS" basis,
 #   WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
 #   for the specific language governing rights and limitations under the
 #   License.
-#  
+#
 #   Major Contributor(s):
 #   [ Copyright (C) 2011 Bjoern Michaelsen <bjoern.michaelsen at canonical.com> (initial developer) ]
-#  
+#
 #   All Rights Reserved.
-#  
+#
 #   For minor contributions see the git repository.
-#  
+#
 #   Alternatively, the contents of this file may be used under the terms of
 #   either the GNU General Public License Version 3 or later (the "GPLv3+"), or
 #   the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),