[Libreoffice-commits] .: Branch 'libreoffice-4-0' - connectivity/source sal/inc

2013-01-25 Thread Libreoffice Gerrit user 
 connectivity/source/parse/sqlbison.y |   13 -
 sal/inc/sal/log-areas.dox|1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit e7827d556c302965af352b186a5cec86b548cf2a
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Wed Jan 23 15:20:24 2013 +0100

OSQLParser::RuleIDToRule should not silently change s_aReverseRuleIDLookup

Change-Id: I2b408a23162b1200bbcd530be7acb42435388b04
Reviewed-on: https://gerrit.libreoffice.org/1826
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/connectivity/source/parse/sqlbison.y 
b/connectivity/source/parse/sqlbison.y
index 96d0782..a0f7d43 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -4772,7 +4772,18 @@ sal_uInt32 OSQLParser::StrToRuleID(const ::rtl::OString 
 rValue)
 //-
 OSQLParseNode::Rule OSQLParser::RuleIDToRule( sal_uInt32 _nRule )
 {
-return s_aReverseRuleIDLookup[ _nRule ];
+OSQLParser::RuleIDMap::const_iterator i 
(s_aReverseRuleIDLookup.find(_nRule));
+if (i == s_aReverseRuleIDLookup.end())
+{
+SAL_WARN(connectivity.parse,
+connectivity::OSQLParser::RuleIDToRule cannot reverse-lookup 
rule. 
+Reverse mapping incomplete? 
+_nRule='  _nRule  ' 
+yytname[_nRule]='  yytname[_nRule]  ');
+return OSQLParseNode::UNKNOWN_RULE;
+}
+else
+return i-second;
 }
 
 //-
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index c167267..b5fa6f9 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -37,6 +37,7 @@ certain functionality.
 @section connectivity
 
 @li @c connectivity.mork
+@li @c connectivity.parse
 
 @section cui
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-4-0' - connectivity/source

2012-12-10 Thread Libreoffice Gerrit user 
 connectivity/source/manager/mdrivermanager.hxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit b05c792ffe408b9769de6e39d5ebd39749211f6b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Dec 10 12:31:37 2012 +0100

Fix previous commit

diff --git a/connectivity/source/manager/mdrivermanager.hxx 
b/connectivity/source/manager/mdrivermanager.hxx
index 87b145d..9f78ec9 100644
--- a/connectivity/source/manager/mdrivermanager.hxx
+++ b/connectivity/source/manager/mdrivermanager.hxx
@@ -24,10 +24,9 @@
 #include com/sun/star/lang/XMultiServiceFactory.hpp
 #include com/sun/star/uno/XNamingService.hpp
 #include com/sun/star/lang/XServiceInfo.hpp
-#include com/sun/star/sdbc/XDriverAccess.hpp
 #include com/sun/star/lang/XSingleServiceFactory.hpp
 
-#include cppuhelper/implbase4.hxx
+#include cppuhelper/implbase3.hxx
 #include comphelper/stl_types.hxx
 #include comphelper/logging.hxx
 #include comphelper/componentcontext.hxx
@@ -54,8 +53,7 @@ namespace drivermanager
 
//==
 //= OSDBCDriverManager - the one-instance service for managing SDBC drivers
 
//==
-typedef ::cppu::WeakImplHelper4::com::sun::star::sdbc::XDriverManager2
-,   ::com::sun::star::sdbc::XDriverAccess
+typedef ::cppu::WeakImplHelper3::com::sun::star::sdbc::XDriverManager2
 ,   ::com::sun::star::lang::XServiceInfo
 ,   ::com::sun::star::uno::XNamingService
OSDBCDriverManager_Base;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-4-0' - connectivity/source

2012-12-09 Thread Libreoffice Gerrit user 
 connectivity/source/drivers/odbcbase/OTools.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 23b9b17a0dadc87540e4274397d4be9ff48bbc78
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sat Dec 8 23:43:19 2012 +0100

Add missing breaks

Change-Id: Icaa08718c37c2c8823a21b6a3ae4ef8b62b52550
(cherry picked from commit 44b0bf91df1af9920b1c22a2f54bd70c9c44231b)

Signed-off-by: David Tardon dtar...@redhat.com

diff --git a/connectivity/source/drivers/odbcbase/OTools.cxx 
b/connectivity/source/drivers/odbcbase/OTools.cxx
index a868b0b..290aa61 100644
--- a/connectivity/source/drivers/odbcbase/OTools.cxx
+++ b/connectivity/source/drivers/odbcbase/OTools.cxx
@@ -682,8 +682,10 @@ SQLSMALLINT OTools::jdbcTypeToOdbc(sal_Int32 jdbcType)
 // ODBC doesn't have any notion of CLOB or BLOB
 case DataType::CLOB:
 odbcType = SQL_LONGVARCHAR;
+break;
 case DataType::BLOB:
 odbcType = SQL_LONGVARBINARY;
+break;
 }
 
 return odbcType;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-4-0' - connectivity/source

2012-12-07 Thread Libreoffice Gerrit user 
 connectivity/source/drivers/odbcbase/OResultSet.cxx |   12 ++--
 connectivity/source/inc/odbc/OResultSet.hxx |6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit e37ab9f9eaaa77949e49535ffe0bc13723801dac
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Fri Dec 7 10:32:58 2012 +0100

no SAL_CALL for internal utility functions

Change-Id: I7b945946d5e45d5518ab48fc8fe6cd66fba8d040

diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx 
b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index ddad30f..da69815 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -462,7 +462,7 @@ template  typename T  T OResultSet::impl_getValue( const 
sal_Int32 _nColumnInd
 }
 // -
 // this function exists for the implicit conversion to sal_Bool (compared to a 
direct call to impl_getValue)
-sal_Bool SAL_CALL OResultSet::impl_getBoolean( sal_Int32 columnIndex ) 
throw(SQLException, RuntimeException)
+sal_Bool OResultSet::impl_getBoolean( sal_Int32 columnIndex ) 
throw(SQLException, RuntimeException)
 {
 return impl_getValuesal_Int8(columnIndex, SQL_C_BIT);
 }
@@ -510,7 +510,7 @@ Sequence sal_Int8  SAL_CALL OResultSet::getBytes( 
sal_Int32 columnIndex ) thro
 }
 return nRet;
 }
-Sequence sal_Int8  SAL_CALL OResultSet::impl_getBytes( sal_Int32 columnIndex 
) throw(SQLException, RuntimeException)
+Sequence sal_Int8  OResultSet::impl_getBytes( sal_Int32 columnIndex ) 
throw(SQLException, RuntimeException)
 {
 const SWORD nColumnType = impl_getColumnType_nothrow(columnIndex);
 
@@ -531,7 +531,7 @@ Sequence sal_Int8  SAL_CALL OResultSet::impl_getBytes( 
sal_Int32 columnIndex )
 }
 }
 // -
-Date SAL_CALL OResultSet::impl_getDate( sal_Int32 columnIndex ) 
throw(SQLException, RuntimeException)
+Date OResultSet::impl_getDate( sal_Int32 columnIndex ) throw(SQLException, 
RuntimeException)
 {
 DATE_STRUCT aDate = impl_getValue DATE_STRUCT ( columnIndex,
   
m_pStatement-getOwnConnection()-useOldDateFormat() ? SQL_C_DATE : 
SQL_C_TYPE_DATE  );
@@ -570,7 +570,7 @@ sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 
columnIndex ) throw(SQLExcepti
 {
 return getValuesal_Int64( columnIndex );
 }
-sal_Int64 SAL_CALL OResultSet::impl_getLong( sal_Int32 columnIndex ) 
throw(SQLException, RuntimeException)
+sal_Int64 OResultSet::impl_getLong( sal_Int32 columnIndex ) 
throw(SQLException, RuntimeException)
 {
 try
 {
@@ -646,7 +646,7 @@ Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, 
const Reference ::co
 return getValuertl::OUString( columnIndex );
 }
 // -
-Time SAL_CALL OResultSet::impl_getTime( sal_Int32 columnIndex ) 
throw(SQLException, RuntimeException)
+Time OResultSet::impl_getTime( sal_Int32 columnIndex ) throw(SQLException, 
RuntimeException)
 {
 TIME_STRUCT aTime = impl_getValue TIME_STRUCT  ( columnIndex,
   
m_pStatement-getOwnConnection()-useOldDateFormat() ? SQL_C_TIME : 
SQL_C_TYPE_TIME );
@@ -658,7 +658,7 @@ Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) 
throw(SQLException, R
 return getValueTime( columnIndex );
 }
 // -
-DateTime SAL_CALL OResultSet::impl_getTimestamp( sal_Int32 columnIndex ) 
throw(SQLException, RuntimeException)
+DateTime OResultSet::impl_getTimestamp( sal_Int32 columnIndex ) 
throw(SQLException, RuntimeException)
 {
 TIMESTAMP_STRUCT aTime = impl_getValue TIMESTAMP_STRUCT  ( columnIndex,
  
m_pStatement-getOwnConnection()-useOldDateFormat() ? SQL_C_TIMESTAMP : 
SQL_C_TYPE_TIMESTAMP );
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx 
b/connectivity/source/inc/odbc/OResultSet.hxx
index c6ef45b..5d7a06c 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -187,9 +187,9 @@ namespace connectivity
 ::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_Int64 SAL_CALL impl_getLong( sal_Int32 columnIndex ) 
throw(::com::sun::star::sdbc::SQLException, 
::com::sun::star::uno::RuntimeException);
-

[Libreoffice-commits] .: Branch 'libreoffice-4-0' - connectivity/source

2012-12-07 Thread Libreoffice Gerrit user 
 connectivity/source/drivers/odbcbase/OResultSet.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 465d3512cca457c79e6ef85ad1cbf6bcc88e8882
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Fri Dec 7 14:46:46 2012 +0100

no SAL_CALL for internal utility functions

Change-Id: I789f8419a8020b8f5bc7a7a54639b076c1524e48

diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx 
b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index da69815..29c834e 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -635,7 +635,7 @@ Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, 
const Reference ::co
 return getValueORowSetValue( columnIndex ).makeAny();
 }
 // -
-::rtl::OUString SAL_CALL OResultSet::impl_getString( sal_Int32 columnIndex ) 
throw(SQLException, RuntimeException)
+::rtl::OUString OResultSet::impl_getString( sal_Int32 columnIndex ) 
throw(SQLException, RuntimeException)
 {
 checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 const SWORD nColumnType = impl_getColumnType_nothrow(columnIndex);
@@ -1173,7 +1173,7 @@ Any SAL_CALL OResultSet::getBookmark(  ) throw( 
SQLException,  RuntimeException)
 throw SQLException();
 return m_aRow[0].makeAny();
 }
-Sequencesal_Int8 SAL_CALL OResultSet::impl_getBookmark(  ) throw( 
SQLException,  RuntimeException)
+Sequencesal_Int8 OResultSet::impl_getBookmark(  ) throw( SQLException,  
RuntimeException)
 {
 RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, odbc, ocke.jans...@sun.com, 
OResultSet::getBookmark );
 checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits