[Libreoffice-commits] .: 2 commits - connectivity/source postprocess/signing

[Libreoffice Gerrit user]

 connectivity/source/inc/odbc/OResultSet.hxx |   10 +++++-----
 postprocess/signing/makefile.mk             |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 113379e0507e83d3336993d79a49abc75928b42d
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Dec 7 10:08:35 2012 +0100

    We definitely want a log file to check in case something goes wrong
    
    Change-Id: Ie8ab243e72decae63717cf78d8e7038a74b4c1ae

diff --git a/postprocess/signing/makefile.mk b/postprocess/signing/makefile.mk
index 066927a..c9245d0 100644
--- a/postprocess/signing/makefile.mk
+++ b/postprocess/signing/makefile.mk
@@ -36,7 +36,7 @@ signing.done :
 .IF "$(WINDOWS_BUILD_SIGNING)"=="TRUE"
 .IF "$(COM)"=="MSC"
 .IF "$(product)"=="full"
-    $(PERL) signing.pl -e $(EXCLUDELIST) -f $(PFXFILE) -p $(PFXPASSWORD) -t $(TIMESTAMPURL) $(IMAGENAMES) && $(TOUCH) $(MISC)$/signing.done
+    $(PERL) signing.pl -e $(EXCLUDELIST) -l $(LOGFILE) -f $(PFXFILE) -p $(PFXPASSWORD) -t $(TIMESTAMPURL) $(IMAGENAMES) && $(TOUCH) $(MISC)$/signing.done
 .ELSE  # "$(product)"=="full"
     @echo Doing nothing on non product builds ...
 .ENDIF # "$(product)"=="full"
commit 06fa6ebbd5f7e3943afbf3552d31cdc0d1edb31a
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Dec 7 11:06:55 2012 +0200

    fix missing SAL_CALL attributes
    
    Change-Id: Ibdf93f27f08d4a76867c6871557d2d4967e7b9a5

diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index c6ef45b..db2e94a 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -182,11 +182,11 @@ namespace connectivity
             // for simple cases
             template < typename T > T impl_getValue( const sal_Int32 _nColumnIndex, SQLSMALLINT nType );
             // these cases need some special treatment
-            sal_Bool impl_getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            ::com::sun::star::uno::Sequence< sal_Int8 > impl_getBytes( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            ::com::sun::star::util::Date impl_getDate( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            ::com::sun::star::util::Time impl_getTime( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            ::com::sun::star::util::DateTime impl_getTimestamp( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            sal_Bool SAL_CALL impl_getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL impl_getBytes( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            ::com::sun::star::util::Date SAL_CALL impl_getDate( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            ::com::sun::star::util::Time SAL_CALL impl_getTime( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            ::com::sun::star::util::DateTime SAL_CALL impl_getTimestamp( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             sal_Int64 SAL_CALL impl_getLong( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             ::rtl::OUString SAL_CALL impl_getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL impl_getBookmark(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);