[Libreoffice-commits] .: connectivity/source toolkit/inc toolkit/source unusedcode.easy
connectivity/source/drivers/mozab/MResultSet.cxx | 14 -- connectivity/source/drivers/mozab/MResultSet.hxx |1 - toolkit/inc/toolkit/awt/vclxdevice.hxx |1 - toolkit/inc/toolkit/awt/vclxwindows.hxx |1 - toolkit/source/awt/vclxdevice.cxx|5 - toolkit/source/awt/vclxwindows.cxx |7 --- unusedcode.easy |3 --- 7 files changed, 32 deletions(-) New commits: commit 393b14fddd7b328a6e2af78c0c351447ccb0ba6a Author: Julien Nabet serval2...@yahoo.fr Date: Tue Apr 17 22:08:56 2012 +0200 Remove some unused methods diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx index ed92e42..6e1cdbe 100644 --- a/connectivity/source/drivers/mozab/MResultSet.cxx +++ b/connectivity/source/drivers/mozab/MResultSet.cxx @@ -717,16 +717,6 @@ void SAL_CALL OResultSet::release() throw() { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -// - -void OResultSet::initializeRow(OValueRow _rRow,sal_Int32 _nColumnCount) -{ -if(!_rRow.is()) -{ -_rRow = new OValueVector(_nColumnCount); -(_rRow-get())[0].setBound(sal_True); - ::std::for_each(_rRow-get().begin()+1,_rRow-get().end(),TSetBound(sal_False)); -} -} // - void OResultSet::parseParameter( const OSQLParseNode* pNode, rtl::OUString rMatchString ) @@ -1205,10 +1195,6 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep OSL_ENSURE(m_xColumns.is(), Need the Columns!!); -// sal_Int32 nColumnCount = m_xColumns-size(); -// initializeRow(m_aRow,nColumnCount); -// initializeRow(m_aEvaluateRow,nColumnCount); - switch( m_pSQLIterator-getStatementType() ) { case SQL_STATEMENT_SELECT: diff --git a/connectivity/source/drivers/mozab/MResultSet.hxx b/connectivity/source/drivers/mozab/MResultSet.hxx index 47e9ad1..2559b7f 100644 --- a/connectivity/source/drivers/mozab/MResultSet.hxx +++ b/connectivity/source/drivers/mozab/MResultSet.hxx @@ -258,7 +258,6 @@ protected: void parseParameter( const OSQLParseNode* pNode, rtl::OUString rMatchString ); void fillRowData() throw( ::com::sun::star::sdbc::SQLException ); -void initializeRow(OValueRow _rRow,sal_Int32 _nColumnCount); void analyseWhereClause( const OSQLParseNode* parseTree, MQueryExpression queryExpression); diff --git a/toolkit/inc/toolkit/awt/vclxdevice.hxx b/toolkit/inc/toolkit/awt/vclxdevice.hxx index fba5ec7..b800b2c 100644 --- a/toolkit/inc/toolkit/awt/vclxdevice.hxx +++ b/toolkit/inc/toolkit/awt/vclxdevice.hxx @@ -75,7 +75,6 @@ public: OutputDevice* GetOutputDevice() const { return mpOutputDevice; } voidSetCreatedWithToolkit( sal_Bool bCreatedWithToolkit ); -sal_BoolIsCreatedWithToolkit() const; // ::com::sun::star::uno::XInterface ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type rType ) throw(::com::sun::star::uno::RuntimeException); diff --git a/toolkit/inc/toolkit/awt/vclxwindows.hxx b/toolkit/inc/toolkit/awt/vclxwindows.hxx index 3949b54..a1f0784 100644 --- a/toolkit/inc/toolkit/awt/vclxwindows.hxx +++ b/toolkit/inc/toolkit/awt/vclxwindows.hxx @@ -338,7 +338,6 @@ public: static void ImplGetPropertyIds( std::list sal_uInt16 aIds ); virtual voidGetPropertyIds( std::list sal_uInt16 aIds ) { return ImplGetPropertyIds( aIds ); } -::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface getFirstActionListener (); }; // diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx index 40a5bb7..39c74b1 100644 --- a/toolkit/source/awt/vclxdevice.cxx +++ b/toolkit/source/awt/vclxdevice.cxx @@ -81,11 +81,6 @@ void VCLXDevice::SetCreatedWithToolkit( sal_Bool bCreatedWithToolkit ) nFlags = ~FLAGS_CREATEDWITHTOOLKIT; } -sal_Bool VCLXDevice::IsCreatedWithToolkit() const -{ -return ( nFlags FLAGS_CREATEDWITHTOOLKIT ) != 0; -} - // ::com::sun::star::uno::XInterface ::com::sun::star::uno::Any VCLXDevice::queryInterface( const ::com::sun::star::uno::Type rType ) throw(::com::sun::star::uno::RuntimeException) { diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 64a4ad8..b8d13e2 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -1335,13 +1335,6 @@ void VCLXRadioButton::ImplClickedOrToggled( sal_Bool bToggled ) } } -::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
[Libreoffice-commits] .: connectivity/source shell/source
connectivity/source/drivers/kab/makefile.mk |4 ++-- shell/source/backends/kdebe/makefile.mk |5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) New commits: commit f6eba1a27a4ffac50ab06a733e6eee1f5c7800ca Author: Petr Mladek pmla...@suse.cz Date: Fri Apr 13 16:52:59 2012 +0200 fix library link order to work with link --as-needed diff --git a/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk index c7f7b9a..9494037 100644 --- a/connectivity/source/drivers/kab/makefile.mk +++ b/connectivity/source/drivers/kab/makefile.mk @@ -111,14 +111,14 @@ SHL2VERSIONMAP=$(TARGET2).map SHL2TARGET= $(TARGET2)$(KAB_MAJOR) SHL2OBJS=$(SLO2FILES) -SHL2LINKFLAGS+=$(KAB_LIB) SHL2STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB)\ $(SALLIB) \ $(SALHELPERLIB) \ $(DBTOOLSLIB) \ -$(COMPHELPERLIB) +$(COMPHELPERLIB)\ +$(KAB_LIB) SHL2DEPN= SHL2IMPLIB= i$(TARGET2) diff --git a/shell/source/backends/kdebe/makefile.mk b/shell/source/backends/kdebe/makefile.mk index b1b12ad..265a3b6 100644 --- a/shell/source/backends/kdebe/makefile.mk +++ b/shell/source/backends/kdebe/makefile.mk @@ -63,11 +63,12 @@ SHL1OBJS=$(SLOFILES) SHL1DEF=$(MISC)$/$(SHL1TARGET).def SHL1IMPLIB=i$(SHL1TARGET) -SHL1LINKFLAGS+=$(KDE_LIBS) -lkio SHL1STDLIBS=\ $(CPPUHELPERLIB) \ $(CPPULIB) \ -$(SALLIB) +$(SALLIB) \ +$(KDE_LIBS) \ +-lkio SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/commontools/dbtools2.cxx | 73 ++- 1 file changed, 62 insertions(+), 11 deletions(-) New commits: commit 077e711b5f5f19fceed44e2d992bf5c027e75ab6 Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Mar 27 10:49:49 2012 +0200 fdo#47937: copy column privileges into table privileges diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index e559847..1ad8985 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -674,19 +674,20 @@ sal_Int32 getTablePrivileges(const Reference XDatabaseMetaData _xMetaData, Reference XResultSet xPrivileges = _xMetaData-getTablePrivileges(aVal, _sSchema, _sTable); Reference XRow xCurrentRow(xPrivileges, UNO_QUERY); +const ::rtl::OUString sUserWorkingFor = _xMetaData-getUserName(); +static const ::rtl::OUString sSELECT( RTL_CONSTASCII_USTRINGPARAM( SELECT )); +static const ::rtl::OUString sINSERT( RTL_CONSTASCII_USTRINGPARAM( INSERT )); +static const ::rtl::OUString sUPDATE( RTL_CONSTASCII_USTRINGPARAM( UPDATE )); +static const ::rtl::OUString sDELETE( RTL_CONSTASCII_USTRINGPARAM( DELETE )); +static const ::rtl::OUString sREAD( RTL_CONSTASCII_USTRINGPARAM( READ )); +static const ::rtl::OUString sCREATE( RTL_CONSTASCII_USTRINGPARAM( CREATE )); +static const ::rtl::OUString sALTER( RTL_CONSTASCII_USTRINGPARAM( ALTER )); +static const ::rtl::OUString sREFERENCE( RTL_CONSTASCII_USTRINGPARAM( REFERENCE )); +static const ::rtl::OUString sDROP( RTL_CONSTASCII_USTRINGPARAM( DROP )); + if ( xCurrentRow.is() ) { -::rtl::OUString sUserWorkingFor = _xMetaData-getUserName(); -static const ::rtl::OUString sSELECT( RTL_CONSTASCII_USTRINGPARAM( SELECT )); -static const ::rtl::OUString sINSERT( RTL_CONSTASCII_USTRINGPARAM( INSERT )); -static const ::rtl::OUString sUPDATE( RTL_CONSTASCII_USTRINGPARAM( UPDATE )); -static const ::rtl::OUString sDELETE( RTL_CONSTASCII_USTRINGPARAM( DELETE )); -static const ::rtl::OUString sREAD( RTL_CONSTASCII_USTRINGPARAM( READ )); -static const ::rtl::OUString sCREATE( RTL_CONSTASCII_USTRINGPARAM( CREATE )); -static const ::rtl::OUString sALTER( RTL_CONSTASCII_USTRINGPARAM( ALTER )); -static const ::rtl::OUString sREFERENCE( RTL_CONSTASCII_USTRINGPARAM( REFERENCE )); -static const ::rtl::OUString sDROP( RTL_CONSTASCII_USTRINGPARAM( DROP )); -// after creation the set is positioned before the first record, per definitionem +// after creation the set is positioned before the first record, per definition #ifdef DBG_UTIL Reference XResultSetMetaDataSupplier xSup(xPrivileges,UNO_QUERY); if ( xSup.is() ) @@ -743,6 +744,56 @@ sal_Int32 getTablePrivileges(const Reference XDatabaseMetaData _xMetaData, } } disposeComponent(xPrivileges); + +// Some drivers put a table privilege as soon as any column has the privilege, +// some drivers only if all columns have the privilege. +// To unifiy the situation, collect column privileges here, too. +Reference XResultSet xColumnPrivileges = _xMetaData-getColumnPrivileges(aVal, _sSchema, _sTable, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(%))); +Reference XRow xColumnCurrentRow(xColumnPrivileges, UNO_QUERY); +if ( xColumnCurrentRow.is() ) +{ +// after creation the set is positioned before the first record, per definition +::rtl::OUString sPrivilege, sGrantee; +while ( xColumnPrivileges-next() ) +{ +#ifdef DBG_UTIL +::rtl::OUString sCat, sSchema, sTableName, sColumnName, sGrantor, sGrantable; +sCat= xColumnCurrentRow-getString(1); +sSchema = xColumnCurrentRow-getString(2); +sTableName = xColumnCurrentRow-getString(3); +sColumnName = xColumnCurrentRow-getString(4); +sGrantor= xColumnCurrentRow-getString(5); +#endif +sGrantee= xColumnCurrentRow-getString(6); +sPrivilege = xColumnCurrentRow-getString(7); +#ifdef DBG_UTIL +sGrantable = xColumnCurrentRow-getString(8); +#endif + +if (!sUserWorkingFor.equalsIgnoreAsciiCase(sGrantee)) +continue; + +if (sPrivilege.equalsIgnoreAsciiCase(sSELECT)) +nPrivileges |= Privilege::SELECT; +else if (sPrivilege.equalsIgnoreAsciiCase(sINSERT)) +nPrivileges |= Privilege::INSERT; +else if (sPrivilege.equalsIgnoreAsciiCase(sUPDATE)) +nPrivileges |= Privilege::UPDATE; +else if
[Libreoffice-commits] .: connectivity/source unusedcode.easy
connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx |7 - connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx |1 connectivity/source/drivers/evoab2/NStatement.cxx| 12 -- connectivity/source/drivers/evoab2/NStatement.hxx|1 connectivity/source/drivers/file/FNoException.cxx|5 - connectivity/source/drivers/file/fanalyzer.cxx | 61 --- connectivity/source/inc/file/fanalyzer.hxx |2 unusedcode.easy |4 8 files changed, 93 deletions(-) New commits: commit 33a805ebcf1fa1e86854a0af4f90834a31e4ec0d Author: Santiago Martinez smvar...@gmail.com Date: Fri Mar 16 20:12:53 2012 +0100 Remove unused code as listed in unusedcode.easy diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx index 929150a..0a89e58 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx @@ -147,13 +147,6 @@ namespace connectivity } -guint -getFieldCount() -{ -initFields(); -return nFields; -} - const ColumnProperty * getField(guint n) { diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx index 45f93b9..2cb7207 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx @@ -64,7 +64,6 @@ namespace connectivity const SplitEvoColumns* get_evo_addr(); const ColumnProperty *getField(guint n); -guint getFieldCount() ; GType getGFieldType(guint nCol) ; sal_Int32 getFieldType(guint nCol) ; rtl::OUString getFieldTypeName(guint nCol) ; diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index 36786a4..81beb26 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.cxx @@ -163,18 +163,6 @@ void SAL_CALL OCommonStatement::close( ) throw(SQLException, RuntimeException) } // - -void OCommonStatement::reset() throw (SQLException) -{ -::osl::MutexGuard aGuard( m_aMutex ); -checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); - - -clearWarnings (); - -if (m_xResultSet.get().is()) -clearMyResultSet(); -} - void OCommonStatement::clearMyResultSet () throw (SQLException) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx index d12956e..3d6d923 100644 --- a/connectivity/source/drivers/evoab2/NStatement.hxx +++ b/connectivity/source/drivers/evoab2/NStatement.hxx @@ -190,7 +190,6 @@ namespace connectivity virtual ~OCommonStatement(); protected: -void reset () throw( ::com::sun::star::sdbc::SQLException); void clearMyResultSet () throw( ::com::sun::star::sdbc::SQLException); void parseSql( const ::rtl::OUString sql, QueryData _out_rQueryData ); EBookQuery *whereAnalysis( const OSQLParseNode* parseTree ); diff --git a/connectivity/source/drivers/file/FNoException.cxx b/connectivity/source/drivers/file/FNoException.cxx index 8090295..67599cb 100644 --- a/connectivity/source/drivers/file/FNoException.cxx +++ b/connectivity/source/drivers/file/FNoException.cxx @@ -66,11 +66,6 @@ void OPredicateCompiler::Clean() m_aCodeList.clear(); } // - -void OSQLAnalyzer::clean() -{ -m_aCompiler-Clean(); -} -// - void OSQLAnalyzer::bindParameterRow(OValueRefRow _pRow) { OCodeList rCodeList= m_aCompiler-m_aCodeList; diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx index d5f327d..fcaba19 100644 --- a/connectivity/source/drivers/file/fanalyzer.cxx +++ b/connectivity/source/drivers/file/fanalyzer.cxx @@ -212,67 +212,6 @@ void OSQLAnalyzer::bindSelectRow(const OValueRefRow _pRow) return pKeySet; } -//-- -void OSQLAnalyzer::describeParam(::rtl::ReferenceOSQLColumns rParameterColumns) -{ -OCodeList rCodeList= m_aCompiler-m_aCodeList; -OCodeStack aCodeStack; - -if (!rCodeList.size()) -return; // no predicate -if (!rParameterColumns-get().size()) -return; // no parameters - -// Create columns, that have a more precise description for the included -::rtl::ReferenceOSQLColumns aNewParamColumns =
[Libreoffice-commits] .: connectivity/source
connectivity/source/inc/odbc/OFunctiondefs.hxx | 20 connectivity/source/inc/odbc/OPreparedStatement.hxx | 13 - connectivity/source/inc/odbc/OResultSet.hxx |2 +- connectivity/source/inc/odbc/OResultSetMetaData.hxx |4 ++-- connectivity/source/inc/odbc/OStatement.hxx |2 +- connectivity/source/parse/sqliterator.cxx |4 ++-- 6 files changed, 18 insertions(+), 27 deletions(-) New commits: commit b5995754836c864bb38446060e17772c63253e37 Author: Philipp Weissenbacher p.weissenbac...@gmail.com Date: Mon Mar 5 23:34:51 2012 +0100 Translate German comments, fix some whitespace diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx index a53f072..e4c8968 100644 --- a/connectivity/source/inc/odbc/OFunctiondefs.hxx +++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx @@ -65,16 +65,15 @@ #ifdef ODBCIMP -// Stub-Version: dynamische Bindung an die DLL zur Laufzeit. -// odbcstub definiert die in den Quellen benutzten NSQL...-Methoden -// als indirekte Funktionsaufrufe. -// odbcimp zieht sich selbst preos2, odbc und postos2 an. +// Stub version: dynamic binding to the DLL at runtime. +// odbcstub defines the NSQL... methods used in the sources +// as indirect function calls. +// odbcimp uses preos2, odbc and postos2 itself. // #include odbc3imp.hxx #else -// Zur Zeit verwenden wir die ODBC-DLL von Watcom-SQL direkt (ueber die -// mitgelieferte Lib). +// Currently, we directly use the ODBC DLL from Watcom SQL (via the supplied lib) #ifndef ODBC_OS2 #define ODBC_OS2 @@ -101,8 +100,7 @@ #endif -// In der ODBC.H von Watcom werden Strings als char * erwartet -// (nicht, wie sonst bei ODBC ueblich, als UCHAR *). +// The ODBC.h from Watcom expects char*, not UCHAR* usually used with ODBC #if defined( ICC ) #define SDB_ODBC_CHAR unsigned char #else @@ -115,8 +113,7 @@ #ifdef UNX -// Zur Zeit verwenden wir die ODBC-shared library von Q+E direkt (ueber die -// mitgelieferte Lib). +// Currently, we directly use the ODBC shared library from Q+E (via the supplied lib) #ifndef ODBC_UNX #define ODBC_UNX @@ -128,8 +125,7 @@ #else #include odbc/sqlext.h #endif -#undef sal_Bool // Ist in qeodbc.h definiert, wird aber von solar.h noch einmal -// definiert. +#undef sal_Bool // Is defined in qeodbc.h, but gets redefined by solar.h #define SDB_ODBC_CHAR UCHAR #define SQL_WCHAR (-8) diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx index 076c9e0..7841456 100644 --- a/connectivity/source/inc/odbc/OPreparedStatement.hxx +++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx @@ -71,16 +71,11 @@ namespace connectivity // // Data attributes // -SQLSMALLINT numParams; // Number of parameter markers -// for the prepared statement +SQLSMALLINT numParams; // Number of parameter markers for the prepared statement OBoundParam*boundParams; -// Array of bound parameter -// objects. Each parameter -// marker will have a -// corresponding object to -// hold bind information, and -// resulting data. +// Array of bound parameter objects. Each parameter marker will have a +// corresponding object to hold bind information, and resulting data. ::com::sun::star::uno::Reference ::com::sun::star::sdbc::XResultSetMetaData m_xMetaData; sal_Bool m_bPrepared; @@ -109,7 +104,7 @@ namespace connectivity throw (::com::sun::star::uno::Exception); public: DECLARE_SERVICE_INFO(); -// ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: +// A ctor, needed to return the object OPreparedStatement( OConnection* _pConnection,const ::rtl::OUString sql); //XInterface diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx index e036225..c74407a 100644 --- a/connectivity/source/inc/odbc/OResultSet.hxx +++ b/connectivity/source/inc/odbc/OResultSet.hxx @@ -200,7 +200,7 @@ namespace connectivity ) const; public: DECLARE_SERVICE_INFO(); -// ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: +
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/mozab/MPreparedStatement.hxx |5 ++--- connectivity/source/parse/sqliterator.cxx|2 +- 2 files changed, 3 insertions(+), 4 deletions(-) New commits: commit 38b510af0a5ed1cd365666af84a062b2e67c00d5 Author: Philipp Weissenbacher p.weissenbac...@gmail.com Date: Mon Mar 5 23:56:13 2012 +0100 Finish translating connectivity, fix some whitespace diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.hxx b/connectivity/source/drivers/mozab/MPreparedStatement.hxx index 31cfa97..2151b3d 100644 --- a/connectivity/source/drivers/mozab/MPreparedStatement.hxx +++ b/connectivity/source/drivers/mozab/MPreparedStatement.hxx @@ -69,8 +69,7 @@ namespace connectivity // // Data attributes // -sal_Int32 m_nNumParams; // Number of parameter markers -// for the prepared statement +sal_Int32 m_nNumParams; // Number of parameter markers for the prepared statement ::rtl::OUString m_sSqlStatement; ::com::sun::star::uno::Reference ::com::sun::star::sdbc::XResultSetMetaData m_xMetaData; @@ -109,7 +108,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); -// ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: +// A ctor need for returning the object OPreparedStatement( OConnection* _pConnection,const ::rtl::OUString sql); void lateInit(); diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index c9d001d..11f95c5 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -1993,7 +1993,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getOrderTree() const OSL_ENSURE(pTableExp-count() == TABLE_EXPRESSION_CHILD_COUNT,OSQLParseTreeIterator: error in parse tree!); pOrderClause = pTableExp-getChild(ORDER_BY_CHILD_POS); -// Wenn es aber eine order_by ist, dann darf sie nicht leer sein: +// If it is a order_by, it must not be empty if(pOrderClause-count() != 3) pOrderClause = NULL; return pOrderClause; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/postgresql/pq_tools.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 4a8710409fbf69fb4c3e175c1a17d72ea06576ef Author: Julien Nabet serval2...@yahoo.fr Date: Sat Mar 3 23:41:06 2012 +0100 Fix lacking break in switch diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx index 56aed72..84d9741 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.cxx +++ b/connectivity/source/drivers/postgresql/pq_tools.cxx @@ -518,6 +518,7 @@ static bool isOperator( char c ) case '?': case '$': ret = true; +break; default: ret = false; } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/parse/sqliterator.cxx | 132 ++ connectivity/source/parse/sqlnode.cxx | 106 +++- 2 files changed, 117 insertions(+), 121 deletions(-) New commits: commit d1e5860bc001f092477421cb871636f3b0071e28 Author: Philipp Weissenbacher p.weissenbac...@gmail.com Date: Thu Mar 1 14:53:10 2012 +0530 Translate German comments. diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index ae31689..6a3b157 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -72,8 +72,8 @@ namespace connectivity Reference XNameAccess m_xTableContainer; Reference XNameAccess m_xQueryContainer; -::boost::shared_ptr OSQLTablesm_pTables; /// all tables which participate in the SQL statement -::boost::shared_ptr OSQLTablesm_pSubTables; /// all tables from sub queries not the tables from the select tables +::boost::shared_ptr OSQLTablesm_pTables; // all tables which participate in the SQL statement +::boost::shared_ptr OSQLTablesm_pSubTables; // all tables from sub queries not the tables from the select tables ::boost::shared_ptr QueryNameSet m_pForbiddenQueryNames; sal_uInt32 m_nIncludeMask; @@ -216,14 +216,14 @@ void OSQLParseTreeIterator::setParseTree(const OSQLParseNode * pNewParseTree) return; } -// falls m_pParseTree aber keine Connection, dann Fehler +// If m_pParseTree, but no connection then return if ( !m_pImpl-m_xTableContainer.is() ) return; m_aErrors = SQLException(); -// Statement-Typ ermitteln ... +// Determine statement type ... if (SQL_ISRULE(m_pParseTree,select_statement) || SQL_ISRULE(m_pParseTree,union_statement) ) { m_eStatementType = SQL_STATEMENT_SELECT; @@ -456,7 +456,7 @@ void OSQLParseTreeIterator::traverseOneTableName( OSQLTables _rTables,const OSQ ::rtl::OUString aSchema,aTableName,aComposedName; ::rtl::OUString aTableRange(rTableRange); -// Tabellenname abholen +// Get table name OSQLParseNode::getTableComponents(pTableName,aCatalog,aSchema,aTableName,m_pImpl-m_xDatabaseMetaData); // create the composed name like DOMAIN.USER.TABLE1 @@ -479,16 +479,16 @@ void OSQLParseTreeIterator::traverseOneTableName( OSQLTables _rTables,const OSQ //- void OSQLParseTreeIterator::impl_fillJoinConditions(const OSQLParseNode* i_pJoinCondition) { -if (i_pJoinCondition-count() == 3// Ausdruck is geklammert +if (i_pJoinCondition-count() == 3// Expression with brackets SQL_ISPUNCTUATION(i_pJoinCondition-getChild(0),() SQL_ISPUNCTUATION(i_pJoinCondition-getChild(2),))) { impl_fillJoinConditions(i_pJoinCondition-getChild(1)); } -else if (SQL_ISRULEOR2(i_pJoinCondition,search_condition,boolean_term) // AND/OR-Verknuepfung: +else if (SQL_ISRULEOR2(i_pJoinCondition,search_condition,boolean_term) // AND/OR logic operation: i_pJoinCondition-count() == 3) { -// nur AND Verkn�pfung zulassen +// Only allow AND logic operation if ( SQL_ISTOKEN(i_pJoinCondition-getChild(1),AND) ) { impl_fillJoinConditions(i_pJoinCondition-getChild(0)); @@ -498,7 +498,7 @@ void OSQLParseTreeIterator::impl_fillJoinConditions(const OSQLParseNode* i_pJoin else if (SQL_ISRULE(i_pJoinCondition,comparison_predicate)) { // only the comparison of columns is allowed -OSL_ENSURE(i_pJoinCondition-count() == 3,OQueryDesignView::InsertJoinConnection: Fehler im Parse Tree); +OSL_ENSURE(i_pJoinCondition-count() == 3,OQueryDesignView::InsertJoinConnection: error in the parse tree); if (SQL_ISRULE(i_pJoinCondition-getChild(0),column_ref) SQL_ISRULE(i_pJoinCondition-getChild(2),column_ref) i_pJoinCondition-getChild(1)-getNodeType() == SQL_NODE_EQUAL) @@ -540,7 +540,7 @@ void OSQLParseTreeIterator::getQualified_join( OSQLTables _rTables, const OSQLP else { const OSQLParseNode* pColumnCommalist = pJoin_spec-getChild(2); -// Alle Columns in der column_commalist ... +// All columns in the column_commalist ... for (sal_uInt32 i = 0; i pColumnCommalist-count(); i++) { const OSQLParseNode * pCol = pColumnCommalist-getChild(i); @@ -631,7 +631,7 @@ void OSQLParseTreeIterator::getSelect_statement(OSQLTables _rTables,const OSQLP const OSQLParseNode* pTableName = NULL; ::rtl::OUString aTableRange; for (sal_uInt32 i = 0; i pTableRefCommalist-count(); i++) -{ // from clause durchlaufen +{ // Process FROM clause
[Libreoffice-commits] .: connectivity/source
connectivity/source/inc/OTypeInfo.hxx | 28 - connectivity/source/inc/ado/Aolewrap.hxx| 45 +++- connectivity/source/inc/ado/Awrapado.hxx| 31 +-- connectivity/source/inc/ado/adoimp.hxx |2 connectivity/source/inc/java/lang/Object.hxx| 19 +++--- connectivity/source/inc/java/sql/Array.hxx |4 - connectivity/source/inc/java/sql/Blob.hxx |4 - connectivity/source/inc/java/sql/CallableStatement.hxx |4 - connectivity/source/inc/java/sql/Clob.hxx |4 - connectivity/source/inc/java/sql/Connection.hxx |4 - connectivity/source/inc/java/sql/DatabaseMetaData.hxx |4 - connectivity/source/inc/java/sql/DriverPropertyInfo.hxx |4 - connectivity/source/inc/java/sql/JStatement.hxx |8 +- connectivity/source/inc/java/sql/PreparedStatement.hxx |4 - connectivity/source/inc/java/sql/Ref.hxx|4 - connectivity/source/inc/java/sql/ResultSet.hxx |4 - connectivity/source/inc/java/sql/ResultSetMetaData.hxx |4 - connectivity/source/inc/java/sql/SQLException.hxx |6 +- connectivity/source/inc/java/sql/SQLWarning.hxx |4 - connectivity/source/inc/java/sql/Timestamp.hxx |6 +- connectivity/source/inc/java/util/Date.hxx |4 - connectivity/source/inc/java/util/Property.hxx |4 - 22 files changed, 98 insertions(+), 103 deletions(-) New commits: commit e5f5ab57a124ffaf5e26e90af5aa546ad8451d4d Author: Philipp Weissenbacher p.weissenbac...@gmail.com Date: Thu Mar 1 02:27:38 2012 +0100 Translate German comments, fix some whitespace diff --git a/connectivity/source/inc/OTypeInfo.hxx b/connectivity/source/inc/OTypeInfo.hxx index 825bf4e..42fda5f 100644 --- a/connectivity/source/inc/OTypeInfo.hxx +++ b/connectivity/source/inc/OTypeInfo.hxx @@ -37,26 +37,26 @@ namespace connectivity { struct OTypeInfo { -::rtl::OUString aTypeName; // Name des Types in der Datenbank -::rtl::OUString aLiteralPrefix; // Prefix zum Quoten -::rtl::OUString aLiteralSuffix; // Suffix zum Quoten -::rtl::OUString aCreateParams; // Parameter zum Erstellen +::rtl::OUString aTypeName; // Name of the type in the database +::rtl::OUString aLiteralPrefix; // Prefix for quoting +::rtl::OUString aLiteralSuffix; // Suffix for quoting +::rtl::OUString aCreateParams; // Parameter for creating ::rtl::OUString aLocalTypeName; -sal_Int32 nPrecision; // Laenge des Types +sal_Int32 nPrecision; // Length of the type -sal_Int16 nMaximumScale; // Nachkommastellen -sal_Int16 nMinimumScale; // Min Nachkommastellen +sal_Int16 nMaximumScale; // Decimal places +sal_Int16 nMinimumScale; // Minimum decimal places -sal_Int16 nType; // Datenbanktyp -sal_Int16 nSearchType;// kann nach dem Typen gesucht werden +sal_Int16 nType; // Database type +sal_Int16 nSearchType;// Can we search for the type? sal_Int16 nNumPrecRadix; // indicating the radix, which is usually 2 or 10 -sal_BoolbCurrency : 1,// Waehrung -bAutoIncrement : 1,// Ist es ein automatisch incrementierendes Feld -bNullable : 1,// Kann das Feld NULL annehmen -bCaseSensitive : 1,// Ist der Type Casesensitive -bUnsigned : 1,// Ist der Type Unsigned +sal_BoolbCurrency : 1,// Currency +bAutoIncrement : 1,// Is it an autoincrementing field? +bNullable : 1,// Can the field be NULL? +bCaseSensitive : 1,// Is the type case sensitive? +bUnsigned : 1,// Is the type unsigned? bEmpty_1: 1,// for later use bEmpty_2: 1; diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx index 51407bc..06bcadc 100644 --- a/connectivity/source/inc/ado/Aolewrap.hxx +++ b/connectivity/source/inc/ado/Aolewrap.hxx @@ -66,19 +66,17 @@ namespace connectivity }; // // -// Template-Klasse WpOLEBaseclass T +// Template class WpOLEBaseclass T // == // -// Objekte dieser Klasse haelt einen Zeiger auf ein Interface vom Typ T. -// Es gibt Konstruktoren und Zuweisungsoperator die sicherstellen, dass -// AddRef() und Release() entsprechend den COM-Konventionen
[Libreoffice-commits] .: connectivity/source
connectivity/source/inc/file/fanalyzer.hxx|4 ++-- connectivity/source/inc/file/fcode.hxx| 26 -- connectivity/source/inc/file/quotedstring.hxx |4 ++-- 3 files changed, 16 insertions(+), 18 deletions(-) New commits: commit db8715c5babb1b2a7defc31298ed07e64618d9ed Author: Philipp Weissenbacher p.weissenbac...@gmail.com Date: Tue Feb 28 14:56:22 2012 +0100 Translate German comments and fix some whitespace diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx index 03045f7..5faf61a 100644 --- a/connectivity/source/inc/file/fanalyzer.hxx +++ b/connectivity/source/inc/file/fanalyzer.hxx @@ -65,8 +65,8 @@ namespace connectivity { } OConnection* getConnection() const { return m_pConnection; } -void describeParam(::rtl::ReferenceOSQLColumns rParameterColumns); // genauere Beschreibung der Parameter -::std::vectorsal_Int32* bindEvaluationRow(OValueRefRow _pRow); // Anbinden einer Ergebniszeile an die Restrictions +void describeParam(::rtl::ReferenceOSQLColumns rParameterColumns); // More detailed description of parameters +::std::vectorsal_Int32* bindEvaluationRow(OValueRefRow _pRow); // Bind an evaluation row to the restriction /** bind the select columns if they contain a function which needs a row value @param _pRow the result row */ diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx index c74e633..8c8ed18 100644 --- a/connectivity/source/inc/file/fcode.hxx +++ b/connectivity/source/inc/file/fcode.hxx @@ -106,12 +106,12 @@ namespace connectivity sal_uInt16 getRowPos() const {return m_nRowPos;} virtual const ORowSetValue getValue() const; virtual void setValue(const ORowSetValue _rVal); -void bindValue(const OValueRefRow _pRow); // Bindung an den Wert, den der Operand repraesentiert +void bindValue(const OValueRefRow _pRow); // Bind to the value that the operand represents TYPEINFO(); }; -// Attribute aus einer Ergebniszeile +// Attributes from a result row class OOO_DLLPUBLIC_FILE OOperandAttr : public OOperandRow { protected: @@ -126,7 +126,7 @@ namespace connectivity TYPEINFO(); }; -// Parameter fuer ein Praedikat +// Parameter for a predicate class OOperandParam : public OOperandRow { public: @@ -136,7 +136,7 @@ namespace connectivity TYPEINFO(); }; -// WerteOperanden +// Value operands class OOperandValue : public OOperand { protected: @@ -158,7 +158,7 @@ namespace connectivity }; -// Konstanten +// Constants class OOperandConst : public OOperandValue { public: @@ -168,7 +168,7 @@ namespace connectivity }; -// Ergebnis Operanden +// Result operands class OOperandResult : public OOperandValue { protected: @@ -213,19 +213,18 @@ namespace connectivity TYPEINFO(); }; -// Operatoren +// Operators class OOO_DLLPUBLIC_FILE OOperator : public OCode { public: virtual void Exec(OCodeStack) = 0; -virtual sal_uInt16 getRequestedOperands() const;// Anzahl benoetigter Operanden -// Standard ist 2 +virtual sal_uInt16 getRequestedOperands() const;// Count of requested operands +// Defaults to 2 TYPEINFO(); }; -// boolsche Operatoren - +// Boolean operators class OOO_DLLPUBLIC_FILE OBoolOperator : public OOperator { public: @@ -315,8 +314,7 @@ namespace connectivity virtual sal_Bool operate(const OOperand*, const OOperand*) const; }; -// numerische Operatoren - +// Numerical operators class ONumOperator : public OOperator { public: @@ -357,7 +355,7 @@ namespace connectivity return getValue().getDouble() != double(0.0); } -// operator +// Operator class ONthOperator : public OOperator { public: diff --git a/connectivity/source/inc/file/quotedstring.hxx b/connectivity/source/inc/file/quotedstring.hxx index cd4ace0..67e7fda 100644 --- a/connectivity/source/inc/file/quotedstring.hxx +++ b/connectivity/source/inc/file/quotedstring.hxx @@ -35,8 +35,8 @@ namespace connectivity { //== -// Ableitung von String mit ueberladenen
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 15 ++ 1 file changed, 9 insertions(+), 6 deletions(-) New commits: commit ee0cb9d05d11c23421ec5d7b268eb8c5e049 Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Feb 27 13:10:40 2012 +0100 fdo#46675: expand group memberships in get*Privileges diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index 3748098..d925cb1 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -2071,7 +2071,8 @@ void DatabaseMetaData::init_getPrivs_stmt () { rtl::OUStringBuffer sSQL(300); sSQL.append( ASCII_STR( - SELECT * FROM ( + SELECT dp.TABLE_CAT, dp.TABLE_SCHEM, dp.TABLE_NAME, dp.GRANTOR, pr.rolname AS GRANTEE, dp.privilege, dp.is_grantable + FROM ( SELECT table_catalog AS TABLE_CAT, table_schema AS TABLE_SCHEM, table_name, grantor, grantee, privilege_type AS PRIVILEGE, is_grantable FROM information_schema.table_privileges) ); @@ -2093,14 +2094,15 @@ void DatabaseMetaData::init_getPrivs_stmt () WHERE c.relkind IN ('r', 'v') AND c.relacl IS NULL AND pg_has_role(rg.oid, c.relowner, 'USAGE') AND c.relowner=ro.oid AND c.relnamespace = pn.oid) ); sSQL.append( ASCII_STR( - ) s - WHERE table_schem LIKE ? AND table_name LIKE ? + ) dp, + (SELECT oid, rolname FROM pg_catalog.pg_roles UNION ALL VALUES (0, 'PUBLIC')) pr + WHERE table_schem LIKE ? AND table_name LIKE ? AND pg_has_role(pr.oid, dp.grantee, 'USAGE') ORDER BY table_schem, table_name, privilege ) ); m_getTablePrivs_stmt = m_origin-prepareStatement( sSQL.makeStringAndClear() ); sSQL.append( ASCII_STR( - SELECT * FROM ( + SELECT dp.TABLE_CAT, dp.TABLE_SCHEM, dp.TABLE_NAME, dp.COLUMN_NAME, dp.GRANTOR, pr.rolname AS GRANTEE, dp.PRIVILEGE, dp.IS_GRANTABLE FROM ( SELECT table_catalog AS TABLE_CAT, table_schema AS TABLE_SCHEM, table_name, column_name, grantor, grantee, privilege_type AS PRIVILEGE, is_grantable FROM information_schema.column_privileges) ); @@ -2122,8 +2124,9 @@ void DatabaseMetaData::init_getPrivs_stmt () WHERE c.relkind IN ('r', 'v') AND c.relacl IS NULL AND pg_has_role(rg.oid, c.relowner, 'USAGE') AND c.relowner=ro.oid AND c.relnamespace = pn.oid AND a.attrelid = c.oid AND a.attnum 0) ); sSQL.append( ASCII_STR( - ) s - WHERE table_schem = ? AND table_name = ? AND column_name LIKE ? + ) dp, + (SELECT oid, rolname FROM pg_catalog.pg_roles UNION ALL VALUES (0, 'PUBLIC')) pr + WHERE table_schem = ? AND table_name = ? AND column_name LIKE ? AND pg_has_role(pr.oid, dp.grantee, 'USAGE') ORDER BY column_name, privilege ) ); m_getColumnPrivs_stmt = m_origin-prepareStatement( sSQL.makeStringAndClear() ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source cui/source desktop/source
connectivity/source/commontools/dbtools2.cxx |1 cui/source/inc/treeopt.hxx |9 cui/source/options/optpath.cxx | 15 - cui/source/options/treeopt.cxx | 318 --- desktop/source/app/app.cxx | 43 --- 5 files changed, 164 insertions(+), 222 deletions(-) New commits: commit 161c3f179f71eda2a32dabaf68ff6fb3ba487062 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 14 14:19:07 2012 +0100 Some more comphelper/configurationhelper clean up diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index 7ea7bc9..e559847 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -53,7 +53,6 @@ #include tools/diagnose_ex.h #include unotools/sharedunocomponent.hxx -#include comphelper/configurationhelper.hxx //. namespace dbtools diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index a107750..90777c8 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -138,7 +138,6 @@ struct LastPageSaver // class OfaTreeOptionsDialog namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } } -namespace com { namespace sun { namespace star { namespace container { class XNameAccess; } } } } namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } namespace com { namespace sun { namespace star { namespace awt { class XContainerWindowProvider; } } } } @@ -192,12 +191,8 @@ private: com::sun::star::lang::XMultiServiceFactory xMFac, const com::sun::star::uno::Reference com::sun::star::frame::XFrame xFrame ); -Module* LoadModule( const rtl::OUString rModuleIdentifier, -const com::sun::star::uno::Reference -com::sun::star::container::XNameAccess xRoot ); -voidLoadNodes( const com::sun::star::uno::Reference -com::sun::star::container::XNameAccess xRoot, - Module* pModule, +Module* LoadModule( const rtl::OUString rModuleIdentifier ); +voidLoadNodes( Module* pModule, const rtl::OUString rExtensionId, VectorOfNodes rOutNodeList ); voidInsertNodes( const VectorOfNodes rNodeList ); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index cdecf06..4d8f8a9 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -50,7 +50,7 @@ #include optpath.hrc #include cuires.hrc #include helpid.hrc -#include comphelper/configurationhelper.hxx +#include comphelper/configuration.hxx #include comphelper/processfactory.hxx #include comphelper/string.hxx #include com/sun/star/uno/Exception.hpp @@ -59,6 +59,7 @@ #include com/sun/star/lang/XMultiServiceFactory.hpp #include com/sun/star/ui/dialogs/ExecutableDialogResults.hpp #include com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp +#include officecfg/Office/Common.hxx #include optHeaderTabListbox.hxx #include readonlyimage.hxx #include vcl/help.hxx @@ -532,13 +533,11 @@ void SvxPathTabPage::ChangeCurrentEntry( const String _rFolder ) // Set configuration flag to notify file picker that it's necessary // to take over the path provided. -Reference XMultiServiceFactory xFactory( ::comphelper::getProcessServiceFactory() ); -::comphelper::ConfigurationHelper::writeDirectKey(xFactory, -::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(org.openoffice.Office.Common/)), -::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(Path/Info)), -::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(WorkPathChanged)), -::com::sun::star::uno::makeAny(true), -::comphelper::ConfigurationHelper::E_STANDARD); +boost::shared_ptr comphelper::ConfigurationChanges batch( +comphelper::ConfigurationChanges::create()); +officecfg::Office::Common::Path::Info::WorkPathChanged::set( +true, batch); +batch-commit(); } } } diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 51a8066..96a5999 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -67,11 +67,11 @@ #include com/sun/star/frame/XModuleManager.hpp #include com/sun/star/loader/CannotActivateFactoryException.hpp #include com/sun/star/util/XMacroExpander.hpp -#include
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/postgresql/pq_connection.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4649fafa317f4717634d863d3f3edf1d0180fc1e Author: Takeshi Abe t...@fixedpoint.jp Date: Sat Feb 11 23:15:47 2012 +0900 Fixed wrong mapping to log level from postgresql-sdbc.ini diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index 4d8601c..8fb6382 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -188,7 +188,7 @@ static sal_Int32 readLogLevelFromConfiguration() else if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SQL)) ) loglevel = LogLevel::SQL; else if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(INFO)) ) -loglevel = LogLevel::SQL; +loglevel = LogLevel::INFO; else { fprintf( stderr, unknown loglevel %s\n, ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source cui/source filter/source framework/source reportdesign/source sc/source sfx2/source svtools/source sw/source vcl/aqua vcl/source
connectivity/source/drivers/postgresql/pq_connection.cxx |8 - connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |4 cui/source/dialogs/SpellDialog.cxx |2 filter/source/pdf/pdffilter.cxx|2 filter/source/svg/svgexport.cxx|2 framework/source/layoutmanager/toolbarlayoutmanager.cxx|6 reportdesign/source/ui/report/ReportController.cxx | 14 +- sc/source/core/data/documen5.cxx |8 - sfx2/source/view/viewprn.cxx |2 svtools/source/filter/SvFilterOptionsDialog.cxx|2 svtools/source/uno/unogridcolumnfacade.cxx | 16 +- sw/source/ui/lingu/olmenu.cxx |2 vcl/aqua/source/gdi/aquaprintaccessoryview.mm | 68 +- vcl/source/control/edit.cxx|2 vcl/source/gdi/print3.cxx |2 vcl/source/window/arrange.cxx |6 vcl/source/window/window4.cxx |6 17 files changed, 76 insertions(+), 76 deletions(-) New commits: commit 2b1758a2dc82200468905f7865468972a691b6a3 Author: Takeshi Abe t...@fixedpoint.jp Date: Fri Feb 10 23:00:44 2012 +0900 Prefer equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) to equalsAscii(...) diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index 63236b8..4d8601c 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -181,13 +181,13 @@ static sal_Int32 readLogLevelFromConfiguration() OUString str; if( bootstrapHandle.getFrom( ASCII_STR( PQ_LOGLEVEL ), str ) ) { -if( str.equalsAscii( NONE ) ) +if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(NONE)) ) loglevel = LogLevel::NONE; -else if( str.equalsAscii( ERROR ) ) +else if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(ERROR)) ) loglevel = LogLevel::ERROR; -else if( str.equalsAscii( SQL ) ) +else if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SQL)) ) loglevel = LogLevel::SQL; -else if( str.equalsAscii( INFO ) ) +else if( str.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(INFO)) ) loglevel = LogLevel::SQL; else { diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index b596eb4..4cb7952 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -1475,7 +1475,7 @@ static void columnMetaData2DatabaseTypeDescription( queryBuf.appendAscii( RTL_CONSTASCII_STRINGPARAM( SELECT oid,typtype,typname FROM pg_TYPE WHERE ) ); while( rs-next() ) { -if( row-getString( 9 ).equalsAscii( d ) oidMap.find( row-getInt( 12 ) ) == oidMap.end() ) +if( row-getString( 9 ).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(d)) oidMap.find( row-getInt( 12 ) ) == oidMap.end() ) { oidMap[row-getInt(12)] = DatabaseTypeDescription(); if( domains ) @@ -1646,7 +1646,7 @@ static void columnMetaData2DatabaseTypeDescription( row[1] = sNewSchema; row[2] = sNewTable; row[3] = xRow-getString(3); -if( xRow-getString(8).equalsAscii( d ) ) +if( xRow-getString(8).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(d)) ) { DatabaseTypeDescription desc( domainMap[xRow-getInt(11)] ); type = typeNameToDataType( desc.typeName, desc.typeType ); diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index a336a4b..483058e 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -1234,7 +1234,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck) sal_Int32 i = 0; while ( sFullCommentURL.isEmpty() i aProperties.getLength() ) { -if ( aProperties[i].Name.equalsAscii( FullCommentURL ) ) +if ( aProperties[i].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(FullCommentURL)) ) { uno::Any aValue = aProperties[i].Value; aValue = sFullCommentURL; diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx index 7ee1655..51c001f 100644 --- a/filter/source/pdf/pdffilter.cxx +++ b/filter/source/pdf/pdffilter.cxx @@ -69,7 +69,7 @@ sal_Bool PDFFilter::implExport( const Sequence PropertyValue
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit df58753d51c41253f26104d146a73ba74c42e33e Author: Julien Nabet serval2...@yahoo.fr Date: Sun Feb 5 13:23:59 2012 +0100 Remove wrong return This return prevented the execution of the following code diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx index f3c768d..865c906 100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx @@ -1039,8 +1039,6 @@ Reference XResultSet SAL_CALL MacabDatabaseMetaData::getProcedures( Reference XResultSet SAL_CALL MacabDatabaseMetaData::getVersionColumns( const Any, const ::rtl::OUString, const ::rtl::OUString table ) throw(SQLException, RuntimeException) { -return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eVersionColumns ); - ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eVersionColumns); Reference XResultSet xRef = pResult; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5e2b41dbfed8d0daae092074025e6194d0787360 Author: Caolán McNamara caol...@redhat.com Date: Thu Feb 2 10:17:12 2012 + unsigned int-sal_uInt32 diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index ebe5af8..712fad0 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -1617,7 +1617,7 @@ static void columnMetaData2DatabaseTypeDescription( Reference XStatement domainTypeStmt = m_origin-createStatement(); columnMetaData2DatabaseTypeDescription( domainMap, rs, domainTypeStmt ); -unsigned int colNum; +sal_uInt32 colNum(0); OUString sSchema( ASCII_STR(#invalid#) ); OUString sTable( ASCII_STR(#invalid#) ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/postgresql/makefile.mk |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) New commits: commit 1f741dfeeab848424b91420390d2853572056e00 Author: Lionel Elie Mamane lio...@mamane.lu Date: Thu Feb 2 18:37:49 2012 +0100 pgsql-sdbc: put libs libpq needs *before* libpq in the link line diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index 3900d21..8a831a6 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -88,14 +88,13 @@ LIBPQ_DEP_LIBS += \ LIBPQ_DEP_LIBS+=\ $(LDAPSDKLIB) .ENDIF -.ELSE +.ELSE # $(GUI)$(COM)!=WNTMSC LIBPQ_LINK=$(OUTDIR)/lib/libpq.a LIBPQ_DEP_LIBS+=$(eq,$(OS),MACOSX $(NULL) -Wl,--as-needed) .INCLUDE : $(OUTDIR_FOR_BUILD)/inc/postgresql/libpq-flags.mk LIBPQ_DEP_LIBS+=$(eq,$(OS),MACOSX $(NULL) -Wl,--no-as-needed) .ENDIF POSTGRESQL_INC=-I$(OUTDIR)/inc/postgresql -POSTGRESQL_LIB= .ENDIF # SYSTEM_POSTGRESQL CFLAGS+=$(POSTGRESQL_INC) \ @@ -161,8 +160,8 @@ SHL2STDLIBS= \ $(SALLIB) \ $(SALHELPERLIB)\ $(POSTGRESQL_LIB) \ -$(LIBPQ_LINK) \ -$(LIBPQ_DEP_LIBS) +$(LIBPQ_DEP_LIBS) \ +$(LIBPQ_LINK) SHL2LIBS= $(LIB2TARGET) SHL2DEF= $(MISC)/$(SHL2TARGET).def ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 23 +++--- 1 file changed, 9 insertions(+), 14 deletions(-) New commits: commit 7bd9ce1fae67539f9717c9ead628bd72dffafc37 Author: Lionel Elie Mamane lio...@mamane.lu Date: Wed Feb 1 18:53:41 2012 +0100 pgsql: simpler / safer check for system column diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index 7765086..ebe5af8 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -1389,16 +1389,11 @@ sal_Int32 typeNameToDataType( const OUString typeName, const OUString typtype return ret; } -static bool isSystemColumn( const OUString columnName ) +namespace { +inline bool isSystemColumn( sal_Int16 attnum ) { -return -columnName.compareToAscii( oid ) == 0 || -columnName.compareToAscii( tableoid ) == 0 || -columnName.compareToAscii( xmin ) == 0 || -columnName.compareToAscii( cmin ) == 0 || -columnName.compareToAscii( xmax ) == 0 || -columnName.compareToAscii( cmax ) == 0 || -columnName.compareToAscii( ctid ) == 0; +return attnum = 0; +} } // is not exported by the postgres header @@ -1593,7 +1588,8 @@ static void columnMetaData2DatabaseTypeDescription( pg_type.typtype, // 8 pg_attrdef.adsrc, // 9 pg_description.description,// 10 -pg_type.typbasetype// 11 +pg_type.typbasetype, // 11 +pg_attribute.attnum// 12 FROM pg_class, pg_attribute LEFT JOIN pg_attrdef ON pg_attribute.attrelid = pg_attrdef.adrelid AND pg_attribute.attnum = pg_attrdef.adnum LEFT JOIN pg_description ON pg_attribute.attrelid = pg_description.objoid AND pg_attribute.attnum=pg_description.objsubid, @@ -1627,8 +1623,7 @@ static void columnMetaData2DatabaseTypeDescription( while( rs-next() ) { -OUString columnName = xRow-getString(3); -if( m_pSettings-showSystemColumns || ! isSystemColumn( columnName ) ) +if( m_pSettings-showSystemColumns || ! isSystemColumn( xRow-getShort( 12 ) ) ) { OUString sNewSchema( xRow-getString(1) ); OUString sNewTable( xRow-getString(2) ); @@ -1645,7 +1640,7 @@ static void columnMetaData2DatabaseTypeDescription( row[0] = m_pSettings-catalog; row[1] = sNewSchema; row[2] = sNewTable; -row[3] = columnName; +row[3] = xRow-getString(3); if( xRow-getString(8).equalsAscii( d ) ) { DatabaseTypeDescription desc( domainMap[xRow-getInt(11)] ); @@ -1662,7 +1657,7 @@ static void columnMetaData2DatabaseTypeDescription( // row[7] BUFFER_LENGTH not used row[8] = scale; // row[9] RADIX TODO -if( xRow-getBoolean( 6 ) ! isSystemColumn(xRow-getString(3)) ) +if( xRow-getBoolean( 6 ) ! isSystemColumn(xRow-getInt( 12 )) ) { row[10] = OUString::valueOf(com::sun::star::sdbc::ColumnValue::NO_NULLS); row[17] = statics.NO; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/odbcbase/OStatement.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit ab2fb9c4f95f13a1579e0ac199a109d082fbe945 Author: Lionel Elie Mamane lio...@mamane.lu Date: Sun Jan 29 19:48:40 2012 +0100 remove erroneously committed debug code diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx b/connectivity/source/drivers/odbcbase/OStatement.cxx index 4d963c8..6355217 100644 --- a/connectivity/source/drivers/odbcbase/OStatement.cxx +++ b/connectivity/source/drivers/odbcbase/OStatement.cxx @@ -828,7 +828,6 @@ void OStatement_Base::setResultSetType(sal_Int32 _par0) nSet = SQL_SENSITIVE; break; default: -fprintf(stderr, _par0=%d\n, (int) _par0); OSL_FAIL( OStatement_Base::setResultSetType: invalid result set type! ); break; } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/evoab2/NConnection.cxx |4 - connectivity/source/drivers/evoab2/NDebug.cxx | 40 -- connectivity/source/drivers/evoab2/NDebug.hxx | 45 - connectivity/source/drivers/evoab2/NStatement.cxx | 13 ++ connectivity/source/drivers/evoab2/makefile.mk |1 5 files changed, 8 insertions(+), 95 deletions(-) New commits: commit e8d4222a1cf5770433d465441b35eced9b30f9b8 Author: Thomas Arnhold tho...@arnhold.org Date: Sun Jan 22 14:20:52 2012 +0100 Remove evoab debug facility and use SAL_INFO diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx index f3e5313..896d34f 100644 --- a/connectivity/source/drivers/evoab2/NConnection.cxx +++ b/connectivity/source/drivers/evoab2/NConnection.cxx @@ -36,8 +36,8 @@ #include comphelper/extract.hxx #include connectivity/dbexception.hxx #include comphelper/processfactory.hxx -#include NDebug.hxx #include comphelper/sequence.hxx +#include rtl/oustringostreaminserter.hxx using namespace connectivity::evoab; using namespace dbtools; @@ -105,7 +105,7 @@ IMPLEMENT_SERVICE_INFO(OEvoabConnection, com.sun.star.sdbc.drivers.evoab.Connec void OEvoabConnection::construct(const ::rtl::OUString url, const Sequence PropertyValue info) throw(SQLException) { osl_incrementInterlockedCount( m_refCount ); -EVO_TRACE_STRING(OEvoabConnection::construct()::url = %s\n, url ); +SAL_INFO(evoab2, OEvoabConnection::construct()::url = url ); ::rtl::OUString sPassword; const char* pPwd= password; diff --git a/connectivity/source/drivers/evoab2/NDebug.cxx b/connectivity/source/drivers/evoab2/NDebug.cxx deleted file mode 100644 index 6fa7af3..000 --- a/connectivity/source/drivers/evoab2/NDebug.cxx +++ /dev/null @@ -1,40 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * http://www.openoffice.org/license.html - * for a copy of the LGPLv3 License. - * - / - -#include NDebug.hxx -#include osl/diagnose.h -#if OSL_DEBUG_LEVEL 1 -void evo_traceStringMessage( const sal_Char *pFormat, - const ::rtl::OUString rString ) -{ -rtl::OString aStr(::rtl::OUStringToOString(rString, RTL_TEXTENCODING_UTF8)); -OSL_TRACE(pFormat, aStr.getStr()); -} -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab2/NDebug.hxx b/connectivity/source/drivers/evoab2/NDebug.hxx deleted file mode 100644 index 95ba056..000 --- a/connectivity/source/drivers/evoab2/NDebug.hxx +++ /dev/null @@ -1,45 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - /* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * http://www.openoffice.org/license.html - * for a copy of the LGPLv3 License. - * -
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/file/FResultSet.cxx |8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) New commits: commit 7177eebc6942cc66a20514a409788ef87b1383b5 Author: Michael Stahl mst...@redhat.com Date: Mon Jan 23 13:42:37 2012 +0100 connectivity: fdo#43479: sort order doesn't matter diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index c47e92f..3316e37 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -1449,7 +1449,7 @@ sal_Bool OResultSet::OpenImpl() // order of columns that are not specified in ORDER BY // clause is undefined, so it doesn't hurt to sort on // these; pad the vectors to include them. -for (sal_Int32 i = 1; +for (sal_Int32 i = 1; // 0: bookmark (see setBoundedColumns) static_castsize_t(i) m_aColMapping.size(); ++i) { if (::std::find(m_aOrderbyColumnNumber.begin(), @@ -1457,10 +1457,8 @@ sal_Bool OResultSet::OpenImpl() == m_aOrderbyColumnNumber.end()) { m_aOrderbyColumnNumber.push_back(i); -m_aOrderbyAscending.push_back( -(m_aOrderbyAscending.empty()) -? SQL_ASC // default for no ORDER BY -: m_aOrderbyAscending.back()); +// ASC or DESC doesn't matter +m_aOrderbyAscending.push_back(SQL_ASC); } } bDistinct = sal_True; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source vcl/inc vcl/source
connectivity/source/drivers/dbase/DTable.cxx |2 +- vcl/inc/vcl/graphictools.hxx |4 ++-- vcl/source/gdi/graphictools.cxx |2 +- 3 files changed, 4 insertions(+), 4 deletions(-) New commits: commit c6b8c461bb4b119f833517112813def858903415 Author: Michael Meeks michael.me...@suse.com Date: Thu Jan 19 09:58:23 2012 + WaE: fix misc. SvStream operator problems. diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 40f1469..dde41d2 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -1311,7 +1311,7 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject aFile, sal_Bool bCreateMe (*m_pFileStream) cTyp; if ( nDbaseType == VisualFoxPro ) -(*m_pFileStream) (nRecLength-1); +(*m_pFileStream) sal_uInt16(nRecLength-1); else m_pFileStream-Write(aBuffer, 4); diff --git a/vcl/inc/vcl/graphictools.hxx b/vcl/inc/vcl/graphictools.hxx index c027f6a..78be3b9 100644 --- a/vcl/inc/vcl/graphictools.hxx +++ b/vcl/inc/vcl/graphictools.hxx @@ -274,7 +274,7 @@ public: GradientTypeaGradientType, // TODO: Transparent gradients (orthogonal to normal ones) Color aGradient1stColor, // TODO: vector of colors and offsets Color aGradient2ndColor, -int aGradientStepCount, // numbers of steps to render the gradient. gradientStepsInfinite means infinitely many. +sal_Int32 aGradientStepCount, // numbers of steps to render the gradient. gradientStepsInfinite means infinitely many. const Graphic aFillGraphic ); // accessors @@ -348,7 +348,7 @@ private: GradientTypemaGradientType; Color maGradient1stColor; Color maGradient2ndColor; -int maGradientStepCount; +sal_Int32 maGradientStepCount; Graphic maFillGraphic; }; diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx index 3f6a0ec..d945e53 100644 --- a/vcl/source/gdi/graphictools.cxx +++ b/vcl/source/gdi/graphictools.cxx @@ -343,7 +343,7 @@ SvtGraphicFill::SvtGraphicFill( const PolyPolygon rPath, GradientTypeaGradientType, Color aGradient1stColor, Color aGradient2ndColor, -int aGradientStepCount, +sal_Int32 aGradientStepCount, const Graphic aFillGraphic ) : maPath( rPath ), maFillColor( aFillColor ), ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/jdbc/exports.dxp |1 + connectivity/source/drivers/jdbc/jservices.cxx | 16 +++- connectivity/source/drivers/jdbc/makefile.mk |2 -- 3 files changed, 16 insertions(+), 3 deletions(-) New commits: commit bb59742bcf4883af5876a2ffadcc4a689e414b60 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Jan 13 09:38:07 2012 +0100 Confine JDBC driver to thread-affine apartment for Java 6 performance ... so that the massive number of the JDBC driver's calls to JNI Attach/Detach- CurrentThread are guaranteed not to happen on the main thread (where they are extremely expensive, see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6978641 Fix for 6929067 introduces additional overhead in thread creation/termination paths). diff --git a/connectivity/source/drivers/jdbc/exports.dxp b/connectivity/source/drivers/jdbc/exports.dxp index 7003307..f0e1c69 100755 --- a/connectivity/source/drivers/jdbc/exports.dxp +++ b/connectivity/source/drivers/jdbc/exports.dxp @@ -1 +1,2 @@ +component_getImplementationEnvironment component_getFactory diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx index 59c73ff..85df771 100644 --- a/connectivity/source/drivers/jdbc/jservices.cxx +++ b/connectivity/source/drivers/jdbc/jservices.cxx @@ -83,7 +83,21 @@ struct ProviderRequest void* getProvider() const { return xRet.get(); } }; -//--- +extern C SAL_DLLPUBLIC_EXPORT void SAL_CALL +component_getImplementationEnvironment( +char const ** ppEnvTypeName, uno_Environment **) +{ +// Recent Java 6 VMs make calls to JNI Attach/DetachCurrentThread (which +// this code does extensively) very expensive. A follow-up JVM fix reduced +// the overhead significantly again for all threads but the main thread. So +// a quick hack to improve performance of this component again is to confine +// it in the affine apartment (where all code will run on a single, +// dedicated thread that is guaranteed no to be the main thread). However, +// a better fix would still be to redesign the code so that it does not call +// Attach/DetachCurrentThread so frequently: +*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME :affine; +} + extern C SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/connectivity/source/drivers/jdbc/makefile.mk b/connectivity/source/drivers/jdbc/makefile.mk index befdc73..4229c8f 100755 --- a/connectivity/source/drivers/jdbc/makefile.mk +++ b/connectivity/source/drivers/jdbc/makefile.mk @@ -78,8 +78,6 @@ SLOFILES=\ $(SLO)$/tools.obj \ $(SLO)$/ContextClassLoader.obj -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - # --- Library --- SHL1TARGET=$(JDBC_TARGET)$(DLLPOSTFIX) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source extensions/source
connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx | 29 +++-- connectivity/source/drivers/mozab/mozab.xcu|2 connectivity/source/drivers/mozab/mozab2.xcu |2 extensions/source/abpilot/abspilot.src |2 4 files changed, 19 insertions(+), 16 deletions(-) New commits: commit 8d7e1a6e13008bd7d35896e676796196038f1105 Author: Julien Nabet serval2...@yahoo.fr Date: Mon Jan 9 23:56:33 2012 +0100 Enabling Icedove addressbook connection for Base (Thank you Caolan) diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx index 4db639b..6e11eb3 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx @@ -69,24 +69,27 @@ namespace } // --- -static const char* DefaultProductDir[3][3] = +const size_t NB_PRODUCTS = 3; +const size_t NB_CANDIDATES = 4; + +static const char* DefaultProductDir[NB_PRODUCTS][NB_CANDIDATES] = { #if defined(XP_WIN) -{ Mozilla/SeaMonkey/, NULL, NULL }, -{ Mozilla/Firefox/, NULL, NULL }, -{ Thunderbird/, Mozilla/Thunderbird/, NULL } +{ Mozilla/SeaMonkey/, NULL, NULL, NULL }, +{ Mozilla/Firefox/, NULL, NULL, NULL }, +{ Thunderbird/, Mozilla/Thunderbird/, NULL, NULL } #elif(MACOSX) -{ ../Mozilla/SeaMonkey/, NULL, NULL }, -{ Firefox/, NULL, NULL }, -{ ../Thunderbird/, NULL, NULL } +{ ../Mozilla/SeaMonkey/, NULL, NULL, NULL }, +{ Firefox/, NULL, NULL, NULL }, +{ ../Thunderbird/, NULL, NULL, NULL } #else -{ .mozilla/seamonkey/, NULL, NULL }, -{ .mozilla/firefox/, NULL, NULL }, -{ .thunderbird/, .mozilla-thunderbird/, .mozilla/thunderbird/ } +{ .mozilla/seamonkey/, NULL, NULL, NULL }, +{ .mozilla/firefox/, NULL, NULL, NULL }, +{ .thunderbird/, .mozilla-thunderbird/, .mozilla/thunderbird/, .icedove } #endif }; -static const char* ProductRootEnvironmentVariable[3] = +static const char* ProductRootEnvironmentVariable[NB_PRODUCTS] = { MOZILLA_PROFILE_ROOT, MOZILLA_FIREFOX_PROFILE_ROOT, @@ -98,7 +101,7 @@ namespace { size_t productIndex = _product - 1; -static ::rtl::OUString s_productDirectories[3]; +static ::rtl::OUString s_productDirectories[NB_PRODUCTS]; if ( s_productDirectories[ productIndex ].isEmpty() ) { @@ -117,7 +120,7 @@ namespace const char* pProfileRegistry = profiles.ini; // check all possible candidates -for ( size_t i=0; i3; ++i ) +for ( size_t i=0; iNB_CANDIDATES; ++i ) { if ( NULL == DefaultProductDir[ productIndex ][ i ] ) break; diff --git a/connectivity/source/drivers/mozab/mozab.xcu b/connectivity/source/drivers/mozab/mozab.xcu index fa732d6..e554e46 100644 --- a/connectivity/source/drivers/mozab/mozab.xcu +++ b/connectivity/source/drivers/mozab/mozab.xcu @@ -84,7 +84,7 @@ valuecom.sun.star.comp.sdbc.MozabDriver/value /prop prop oor:name=DriverTypeDisplayName oor:type=xs:string -value xml:lang=en-USThunderbird Address Book/value +value xml:lang=en-USThunderbird/Icedove Address Book/value /prop node oor:name=Features node oor:name=EscapeDateTime oor:op=replace diff --git a/connectivity/source/drivers/mozab/mozab2.xcu b/connectivity/source/drivers/mozab/mozab2.xcu index d1a620d..d6a6317 100644 --- a/connectivity/source/drivers/mozab/mozab2.xcu +++ b/connectivity/source/drivers/mozab/mozab2.xcu @@ -52,7 +52,7 @@ valuecom.sun.star.comp.sdbc.MozabDriver/value /prop prop oor:name=DriverTypeDisplayName oor:type=xs:string -value xml:lang=en-USThunderbird Address Book/value +value xml:lang=en-USThunderbird/Icedove Address Book/value /prop node oor:name=MetaData node oor:name=SupportsBrowsing oor:op=replace diff --git a/extensions/source/abpilot/abspilot.src b/extensions/source/abpilot/abspilot.src index 289e466..c246af9 100644 --- a/extensions/source/abpilot/abspilot.src +++ b/extensions/source/abpilot/abspilot.src @@ -120,7 +120,7 @@ TabPage RID_PAGE_SELECTABTYPE { HelpID = extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_THUNDERBIRD; Size= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ; -Text [ en-US ] = Thunderbird; +Text [ en-US ] = Thunderbird/Icedove; }; RadioButton RB_KAB { ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 948f57e74dda7e64b7c72208eaec00eac1bb96ba Author: Julien Nabet serval2...@yahoo.fr Date: Sat Jan 7 17:48:13 2012 +0100 Fix fdo#44065 diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx index 9ef1314..e15da07 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx @@ -118,7 +118,7 @@ namespace connectivity { namespace mozab { { WebPage2, homeurl, DEF_CARD_ACCESS( WebPage2 ) }, { BirthYear, birthyear, DEF_CARD_ACCESS( BirthYear ) }, { BirthMonth, birthmonth, DEF_CARD_ACCESS( BirthMonth ) }, -{ BirthYear, birthday, DEF_CARD_ACCESS( BirthDay ) }, +{ BirthDay, birthday, DEF_CARD_ACCESS( BirthDay ) }, { Custom1,custom1, DEF_CARD_ACCESS( Custom1 ) }, { Custom2,custom2, DEF_CARD_ACCESS( Custom2 ) }, { Custom3,custom3, DEF_CARD_ACCESS( Custom3 ) }, ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx |8 1 file changed, 8 insertions(+) New commits: commit 6be6357cce999e5a1a692da1f682847be3723587 Author: Caolán McNamara caol...@redhat.com Date: Fri Jan 6 10:24:30 2012 + generic unix .mozilla dir is under home dir, not xdg-config-dir diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx index 3625e56..4db639b 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx @@ -56,7 +56,15 @@ namespace ::osl::Security aSecurity; ::rtl::OUString aConfigPath; +#if defined(XP_WIN) || defined(MACOSX) aSecurity.getConfigDir( aConfigPath ); +#else +//This is to find the dir under which .mozilla/.thunderbird is created. +//mozilla doesn't honour XDG_CONFIG_HOME, so raw home dir required here +//not xdg-config dir +aSecurity.getHomeDir( aConfigPath ); +#endif + return aConfigPath + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/)); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/evoab2/EApi.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit a8feb5b1df99c12a5cb644097f935e9ccf512ed5 Author: Rene Engelhard r...@debian.org Date: Sat Dec 24 14:08:51 2011 +0100 support libebook-1.2.so.12 (evolution 3.2) diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx index 12465f6..5cf5247 100644 --- a/connectivity/source/drivers/evoab2/EApi.cxx +++ b/connectivity/source/drivers/evoab2/EApi.cxx @@ -33,6 +33,7 @@ #define DECLARE_FN_POINTERS 1 #include EApi.h static const char *eBookLibNames[] = { +libebook-1.2.so.12, // bumped again libebook-1.2.so.10, // bumped again libebook-1.2.so.9, // evolution-2.8 libebook-1.2.so.5, // evolution-2.4 and 2.6+ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source sdext/source ucb/source
connectivity/source/drivers/mozab/makefile.mk |8 connectivity/source/drivers/mozab/mozabdrv.map |8 sdext/source/pdfimport/makefile.mk |4 sdext/source/presenter/makefile.mk |4 ucb/source/ucp/cmis/makefile.mk|4 5 files changed, 28 insertions(+) New commits: commit 6fd2d815174df8274153ddb7e99eab26ab7e563c Author: Michael Stahl mst...@redhat.com Date: Thu Dec 15 14:32:40 2011 +0100 fdo#43707: tweak workarounds for fdo#42865: Apparently on Windows the SAL_DLLPUBLIC_EXPORT does not work for unknown reasons, so use the old mapfiles on that platform. Should fix regressions from 1fb5eb21, 48dbaa51, a9da5a0b. diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk index 07e6dcc..d1d4873 100755 --- a/connectivity/source/drivers/mozab/makefile.mk +++ b/connectivity/source/drivers/mozab/makefile.mk @@ -85,7 +85,11 @@ SLOFILES=\ # --- MOZAB BASE Library --- +.IF $(GUI)==WNT +SHL1VERSIONMAP=$(SOLARENV)/src/component.map +.ELSE # just a quick hack for GCC fdo#42865 SHL1USE_EXPORTS = name +.ENDIF SHL1TARGET=$(TARGET)$(DLLPOSTFIX) SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ @@ -145,7 +149,11 @@ DEPOBJFILES=$(SLO2FILES) # --- MOZAB BASE Library --- +.IF $(GUI)==WNT +SHL2VERSIONMAP=$(TARGET2).map +.ELSE # just a quick hack for GCC fdo#42865 SHL2USE_EXPORTS = name +.ENDIF SHL2NOCHECK=TRUE SHL2TARGET=$(TARGET2)$(DLLPOSTFIX) SHL2OBJS=$(SLO2FILES) diff --git a/connectivity/source/drivers/mozab/mozabdrv.map b/connectivity/source/drivers/mozab/mozabdrv.map new file mode 100644 index 000..a431a07 --- /dev/null +++ b/connectivity/source/drivers/mozab/mozabdrv.map @@ -0,0 +1,8 @@ +UDK_3_0_0 { +global: +OMozabConnection_CreateInstance; +OMozillaBootstrap_CreateInstance; +setMozabServiceFactory; +local: +*; +}; diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk index 9262ef6..641e90f 100644 --- a/sdext/source/pdfimport/makefile.mk +++ b/sdext/source/pdfimport/makefile.mk @@ -91,7 +91,11 @@ SHL1STDLIBS=\ SHL1DEPN= SHL1IMPLIB=i$(SHL1TARGET) SHL1DEF= $(MISC)$/$(SHL1TARGET).def +.IF $(GUI)==WNT +SHL1VERSIONMAP=$(SOLARENV)/src/reg-component.map +.ELSE # just a quick hack for GCC fdo#42865 SHL1USE_EXPORTS = name +.ENDIF SHL1RPATH=OXT DEF1NAME=$(SHL1TARGET) diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index 6d9e5bb..7d74d96 100644 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -108,7 +108,11 @@ SHL1DEPN= SHL1IMPLIB=i$(SHL1TARGET) SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1DEF= $(MISC)$/$(SHL1TARGET).def +.IF $(GUI)==WNT +SHL1VERSIONMAP=$(SOLARENV)/src/reg-component.map +.ELSE # just a quick hack for GCC fdo#42865 SHL1USE_EXPORTS = name +.ENDIF SHL1RPATH= OXT DEF1NAME= $(SHL1TARGET) diff --git a/ucb/source/ucp/cmis/makefile.mk b/ucb/source/ucp/cmis/makefile.mk index a99d638..4170bba 100644 --- a/ucb/source/ucp/cmis/makefile.mk +++ b/ucb/source/ucp/cmis/makefile.mk @@ -70,7 +70,11 @@ SHL1STDLIBS = \ SHL1TARGET = $(TARGET) +.IF $(GUI)==WNT +SHL1VERSIONMAP=$(SOLARENV)/src/component.map +.ELSE # just a quick hack for GCC fdo#42865 SHL1USE_EXPORTS = name +.ENDIF SHL1DEPN = SHL1IMPLIB = i$(TARGET) SHL1LIBS = $(SLB)$/$(TARGET).lib ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source postgresql/makefile.mk
connectivity/source/drivers/postgresql/makefile.mk |1 + postgresql/makefile.mk |9 ++--- 2 files changed, 3 insertions(+), 7 deletions(-) New commits: commit f5501498eb4dae84146b8ad7372656bfe4b6ea35 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Dec 12 10:16:32 2011 +0100 Enable OpenSSL support in the internal libpq diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index 29f2029..68837d9 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -151,6 +151,7 @@ SHL2STDLIBS= \ $(CPPUHELPERLIB) \ $(SALLIB) \ $(SALHELPERLIB)\ + $(OPENSSLLIB) \ $(POSTGRESQL_LIB) \ $(LIBPQ_LINK) diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk index 2979779..898471b 100644 --- a/postgresql/makefile.mk +++ b/postgresql/makefile.mk @@ -52,17 +52,12 @@ CONFIGURE_DIR=. BUILD_DIR=src CONFIGURE_ACTION = -BUILD_ACTION = nmake -f win32.mak +BUILD_ACTION = nmake -f win32.mak USE_SSL=1 .ELSE CONFIGURE_DIR=. BUILD_DIR=src/interfaces/libpq -# TODO: -# --datarootdir changes where libpq expects internationalisation of its messages -# (which we don't install anyway for now...) -# --sysconfdir: config files. Ideally, we would like that to be the same as the platform default, -# but that's quite some guessing work. -CONFIGURE_ACTION = ./configure --without-readline --disable-shared +CONFIGURE_ACTION = ./configure --without-readline --disable-shared --with-openssl BUILD_ACTION = make -j$(GMAKE_MODULE_PARALLELISM) all-static-lib .ENDIF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source postgresql/makefile.mk postgresql/prj
connectivity/source/drivers/postgresql/makefile.mk |5 +++-- postgresql/makefile.mk |3 +++ postgresql/prj/build.lst |2 +- 3 files changed, 7 insertions(+), 3 deletions(-) New commits: commit a7639b7b5a77a458433d113f1c4b076d4469536e Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Dec 12 11:03:22 2011 +0100 Enable pgsql LDAP support when building with OpenLDAP diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index 68837d9..4784d75 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -151,9 +151,10 @@ SHL2STDLIBS= \ $(CPPUHELPERLIB) \ $(SALLIB) \ $(SALHELPERLIB)\ - $(OPENSSLLIB) \ $(POSTGRESQL_LIB) \ -$(LIBPQ_LINK) +$(LIBPQ_LINK) \ +$(OPENSSLLIB) \ +$(LDAPSDKLIB) SHL2LIBS= $(LIB2TARGET) SHL2DEF= $(MISC)$/$(SHL2TARGET).def diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk index 898471b..0628d71 100644 --- a/postgresql/makefile.mk +++ b/postgresql/makefile.mk @@ -58,6 +58,9 @@ CONFIGURE_DIR=. BUILD_DIR=src/interfaces/libpq CONFIGURE_ACTION = ./configure --without-readline --disable-shared --with-openssl +.IF $(WITH_LDAP) == YES $(WITH_OPENLDAP) == YES +CONFIGURE_ACTION += --with-ldap +.ENDIF BUILD_ACTION = make -j$(GMAKE_MODULE_PARALLELISM) all-static-lib .ENDIF diff --git a/postgresql/prj/build.lst b/postgresql/prj/build.lst index 756db8a..5059f95 100644 --- a/postgresql/prj/build.lst +++ b/postgresql/prj/build.lst @@ -1,3 +1,3 @@ -my postgresql : solenv sal NULL +my postgresql : solenv sal OPENSSL:openssl MOZ:moz NULL my postgresqlnmake - all my_mkout NULL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/dbase/DIndex.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 84a3f11c7a0cce586c15246079ea807aec38a439 Author: Julien Nabet serval2...@yahoo.fr Date: Mon Dec 12 22:00:26 2011 +0100 Remove ByteString diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index 0e22387..c5a0e4c 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -443,7 +443,7 @@ sal_Bool ODbaseIndex::DropImpl() Config aInfFile(sPhysicalPath); aInfFile.SetGroup(dBASE_III_GROUP); sal_uInt16 nKeyCnt = aInfFile.GetKeyCount(); -ByteString aKeyName; +rtl::OString aKeyName; String sEntry = m_Name; sEntry += String::CreateFromAscii(.ndx); @@ -452,7 +452,7 @@ sal_Bool ODbaseIndex::DropImpl() { // References the Key to an Index-file? aKeyName = aInfFile.GetKeyName( nKey ); -if (aKeyName.Copy(0,3) == NDX) +if (aKeyName.copy(0,3) == NDX) { if(sEntry == String(rtl::OStringToOUString(aInfFile.ReadKey(aKeyName),m_pTable-getConnection()-getTextEncoding( { ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/postgresql/makefile.mk |7 +++ 1 file changed, 7 insertions(+) New commits: commit 1a658dda70d2e139d124d60d64691356c9414f3e Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Dec 12 23:07:03 2011 +0100 postgresql-sdbc: do not use GNU ld-specific options on MacOS X diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index 7506efd..3f9bfb5 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -91,10 +91,17 @@ LIBPQ_DEP_LIBS+=\ .ENDIF .ELSE LIBPQ_LINK=$(OUTDIR)/lib/libpq.a +.IF $(GUI)==MAC +LIBPQ_DEP_LIBS += -Wl,-dead_strip_dylibs +.ELSE LIBPQ_DEP_LIBS += -Wl,--as-needed +.ENDIF .INCLUDE : $(OUTDIR_FOR_BUILD)/inc/postgresql/libpq-flags.mk +.IF $(GUI)==MAC +.ELSE LIBPQ_DEP_LIBS += -Wl,--no-as-needed .ENDIF +.ENDIF POSTGRESQL_INC=-I$(OUTDIR)/inc/postgresql POSTGRESQL_LIB= .ENDIF # SYSTEM_POSTGRESQL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source cppuhelper/test lingucomponent/source
connectivity/source/drivers/postgresql/makefile.mk | 11 ++- cppuhelper/test/bootstrap/makefile.mk |2 +- lingucomponent/source/languageguessing/makefile.mk |6 +++--- 3 files changed, 6 insertions(+), 13 deletions(-) New commits: commit 89b4260fc9ddc39ebc36ea44723f101aabf1d043 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Dec 13 01:59:12 2011 +0100 GUI is also UNX for Mac, to check for Mac use either OSâMACOSX or GUIBASEâaqua diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index 3f9bfb5..1fd0481 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -91,16 +91,9 @@ LIBPQ_DEP_LIBS+=\ .ENDIF .ELSE LIBPQ_LINK=$(OUTDIR)/lib/libpq.a -.IF $(GUI)==MAC -LIBPQ_DEP_LIBS += -Wl,-dead_strip_dylibs -.ELSE -LIBPQ_DEP_LIBS += -Wl,--as-needed -.ENDIF +LIBPQ_DEP_LIBS+=$(eq,$(OS),MACOSX -Wl,-dead_strip_dylibs -Wl,--as-needed) .INCLUDE : $(OUTDIR_FOR_BUILD)/inc/postgresql/libpq-flags.mk -.IF $(GUI)==MAC -.ELSE -LIBPQ_DEP_LIBS += -Wl,--no-as-needed -.ENDIF +LIBPQ_DEP_LIBS+=$(eq,$(OS),MACOSX $(NULL) -Wl,--no-as-needed) .ENDIF POSTGRESQL_INC=-I$(OUTDIR)/inc/postgresql POSTGRESQL_LIB= diff --git a/cppuhelper/test/bootstrap/makefile.mk b/cppuhelper/test/bootstrap/makefile.mk index 86665df..d1caeba 100644 --- a/cppuhelper/test/bootstrap/makefile.mk +++ b/cppuhelper/test/bootstrap/makefile.mk @@ -37,7 +37,7 @@ USE_DEFFILE:= TRUE .INCLUDE : settings.mk -.IF $(GUI)==UNX || $(GUI)==MAC +.IF $(GUI)==UNX PURPENVHELPERLIB := -luno_purpenvhelper$(COMID) .ELSE diff --git a/lingucomponent/source/languageguessing/makefile.mk b/lingucomponent/source/languageguessing/makefile.mk index 5fe1945..65036db 100644 --- a/lingucomponent/source/languageguessing/makefile.mk +++ b/lingucomponent/source/languageguessing/makefile.mk @@ -39,19 +39,19 @@ VISIBILITY_HIDDEN=TRUE # --- Files -.IF $(GUI)==UNX || $(GUI)==MAC +.IF $(GUI)==UNX .IF $(SYSTEM_LIBEXTTEXTCAT) == YES LIBTEXTCATLIB=$(LIBEXTTEXTCAT_LIBS) .ELSE LIBTEXTCATLIB=-lexttextcat .ENDIF -.ELSE # $(GUI)==UNX || $(GUI)==MAC +.ELSE # $(GUI)==UNX .IF $(COM)==GCC LIBTEXTCATLIB=-lilibexttextcat .ELSE LIBTEXTCATLIB=ilibexttextcat.lib .ENDIF -.ENDIF # $(GUI)==UNX || $(GUI)==MAC +.ENDIF # $(GUI)==UNX SLOFILES = \ $(SLO)$/altstrfunc.obj \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/postgresql/pq_connection.hxx|2 +- connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |2 +- connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx |8 3 files changed, 2 insertions(+), 10 deletions(-) New commits: commit e05856c798c227ca2e38d33d5e30aad2f711b8bb Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Dec 7 22:21:18 2011 +0100 Fix build of pgsql connector (std::hash - boost::hash) diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx index 2a34025..1ff8a1a 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.hxx +++ b/connectivity/source/drivers/postgresql/pq_connection.hxx @@ -183,7 +183,7 @@ typedef ::boost::unordered_map const sal_Int32, rtl::OUString, -::std::hash sal_Int32 , +::boost::hash sal_Int32 , ::std::equal_to sal_Int32 , Allocator ::std::pair sal_Int32, ::rtl::OUString Int2StringMap; diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx index 28aad9c..d26b150 100644 --- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx @@ -1455,7 +1455,7 @@ typedef ::boost::unordered_map sal_Int32, DatabaseTypeDescription, -::std::hash sal_Int32 , +::boost::hash sal_Int32 , ::std::equal_to sal_Int32 , Allocator ::std::pair sal_Int32, DatabaseTypeDescription Oid2DatabaseTypeDescriptionMap; diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx index 82ee02c..a67ca43 100644 --- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx @@ -181,14 +181,6 @@ ResultSetMetaData::ResultSetMetaData( } } -// typedef std::hash_map -// Oid, -// rtl::OUString, -// std::hash Oid , -// std::equal_to Oid , -// Allocator std::pair Oid, rtl::OUString PqTypeMap; - - void ResultSetMetaData::checkForTypes() { if( ! m_checkedForTypes ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/postgresql/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e53cf6c27fa1395983679ca2e81ead7f6fdb6e5d Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Dec 6 05:30:43 2011 +0100 pgsql-sdbc: do not use -s option to sed; GNU extension, breaks MacOS build diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index aa168b0..ac19cd9 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -211,7 +211,7 @@ $(DLLDEST)$/META-INF$/manifest.xml : manifest.xml +cp $? $@ $(DLLDEST)$/description.xml : description.xml -+sed -s -e 's/@EXTENSION_VERSION@/$(PQ_SDBC_VERSION)/' $? $@ ++sed -e 's/@EXTENSION_VERSION@/$(PQ_SDBC_VERSION)/' $? $@ $(DLLDEST)$/postgresql.xcu : postgresql.xcu rm -f $@ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/postgresql/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 402db3dceb02134860cf42af791523e7703c34dd Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Dec 5 00:09:50 2011 +0100 PostgreSQL-SDBC: increment version number diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index 615b26b..aa168b0 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -74,7 +74,7 @@ DLLPRE= PQ_SDBC_MAJOR=0 PQ_SDBC_MINOR=8 -PQ_SDBC_MICRO=1 +PQ_SDBC_MICRO=2 PQ_SDBC_VERSION=$(PQ_SDBC_MAJOR).$(PQ_SDBC_MINOR).$(PQ_SDBC_MICRO) CFLAGS+=$(POSTGRESQL_INC) \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source lingucomponent/source sal/inc sal/qa
connectivity/source/parse/sqlbison.y | 10 lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx | 12 sal/inc/rtl/strbuf.hxx | 36 - sal/inc/rtl/ustrbuf.hxx | 36 - sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 321 --- sal/qa/rtl_strings/rtl_OUStringBuffer.cxx| 172 - 6 files changed, 11 insertions(+), 576 deletions(-) New commits: commit 9ee19c8fad2c3c29c4ff4cc6c37ba8d24d641ccc Author: August Sodora aug...@gmail.com Date: Thu Dec 1 16:21:54 2011 -0500 fdo#41474: remove setCharAt and charAt from O[U]StringBuffer diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y index 062b46c..19bb494 100755 --- a/connectivity/source/parse/sqlbison.y +++ b/connectivity/source/parse/sqlbison.y @@ -4529,15 +4529,15 @@ const double fMilliSecondsPerDay = 8640.0; for (sal_Int32 i = 0; i nLen; i++) { - const sal_Unicode c = aMatchStr.charAt(i); - if (c == sSearch.charAt(0) || c == sSearch.charAt(1)) + const sal_Unicode c = aMatchStr[i]; + if (c == sSearch[0] || c == sSearch[1]) { - if (i 0 aMatchStr.charAt(i-1) == cEscape) + if (i 0 aMatchStr[i - 1] == cEscape) continue; else { - const sal_Unicode cCharacter = sReplace.charAt( (c == sSearch.charAt(0)) ? 0 : 1); - aMatchStr.setCharAt(i , cCharacter); + const sal_Unicode cCharacter = sReplace[(c == sSearch[0] ? 0 : 1)]; + aMatchStr[i] = cCharacter; } } } diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx index 92aecc5..5baf4d4 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx @@ -248,9 +248,9 @@ sal_Int16 MacSpellChecker::GetSpellFailure( const OUString rWord, const Locale sal_Int32 n = rBuf.getLength(); sal_Unicode c; for (sal_Int32 ix=0; ix n; ix++) { -c = rBuf.charAt(ix); -if ((c == 0x201C) || (c == 0x201D)) rBuf.setCharAt(ix,(sal_Unicode)0x0022); -if ((c == 0x2018) || (c == 0x2019)) rBuf.setCharAt(ix,(sal_Unicode)0x0027); +c = rBuf[ix]; +if ((c == 0x201C) || (c == 0x201D)) rBuf[ix] = (sal_Unicode)0x0022; +if ((c == 0x2018) || (c == 0x2019)) rBuf[ix] = (sal_Unicode)0x0027; } OUString nWord(rBuf.makeStringAndClear()); @@ -356,9 +356,9 @@ Reference XSpellAlternatives sal_Int32 n = rBuf.getLength(); sal_Unicode c; for (sal_Int32 ix=0; ix n; ix++) { - c = rBuf.charAt(ix); - if ((c == 0x201C) || (c == 0x201D)) rBuf.setCharAt(ix,(sal_Unicode)0x0022); - if ((c == 0x2018) || (c == 0x2019)) rBuf.setCharAt(ix,(sal_Unicode)0x0027); + c = rBuf[ix]; + if ((c == 0x201C) || (c == 0x201D)) rBuf[ix] = (sal_Unicode)0x0022; + if ((c == 0x2018) || (c == 0x2019)) rBuf[ix] = (sal_Unicode)0x0027; } OUString nWord(rBuf.makeStringAndClear()); diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx index 5f0b9b3..e3ae74b 100644 --- a/sal/inc/rtl/strbuf.hxx +++ b/sal/inc/rtl/strbuf.hxx @@ -269,25 +269,6 @@ public: } /** -Returns the character at a specific index in this string buffer. - -The first character of a string buffer is at index -code0/code, the next at index code1/code, and so on, for -array indexing. -p -The index argument must be greater than or equal to -code0/code, and less than the length of this string buffer. - -@param index the index of the desired character. -@return the character at the specified index of this string buffer. - */ -sal_Char charAt( sal_Int32 index ) -{ -assert(index = 0 index pData-length); -return pData-buffer[ index ]; -} - -/** Return a null terminated character array. */ const sal_Char* getStr() const { return pData-buffer; } @@ -313,23 +294,6 @@ public: } /** -The character at the specified index of this string buffer is set -to codech/code. - -The index argument must be greater than or equal to -code0/code, and less than the length of this string buffer. - -@param index the index of the character to modify. -
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/postgresql/pq_statics.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit aad641e29b87013ecd77d03d18d7755f284539d7 Author: Lionel Elie Mamane lio...@mamane.lu Date: Wed Nov 30 18:30:39 2011 +0100 pgsql-sdbc: adapt comment to new code situation diff --git a/connectivity/source/drivers/postgresql/pq_statics.cxx b/connectivity/source/drivers/postgresql/pq_statics.cxx index 3a95279..acd0d28 100644 --- a/connectivity/source/drivers/postgresql/pq_statics.cxx +++ b/connectivity/source/drivers/postgresql/pq_statics.cxx @@ -698,8 +698,9 @@ Statics getStatics() baseTypeDefs[i].value; } -// LEM TODO: this bears a passing resemblance with the structure of pg_catalog.pg_type -// LEM TODO: isSigned (last field) is not initialised +// This is the metadata for the columns of the recordset returned +// by ::com::sun::star::sdbc::XDatabaseMetaData::getTypeInfo(), +// that is what is returned by getTypeInfo().getMetaData() DefColumnMetaData defTypeInfoMetaData[] = { { TYPE_NAME, TYPEINFO, pg_catalog, , com::sun::star::sdbc::DataType::VARCHAR, 0,50,0,0,0,0, false }, // 0 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source filter/source jvmfwk/plugins salhelper/inc sd/inc sfx2/source sw/source tools/inc vcl/inc
connectivity/source/drivers/hsqldb/makefile.mk|2 +- filter/source/msfilter/svdfppt.cxx|2 +- jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx |2 +- salhelper/inc/salhelper/simplereferenceobject.hxx |2 +- sd/inc/helper/simplereferencecomponent.hxx|2 +- sfx2/source/bastyp/minarray.cxx |2 +- sw/source/core/text/pormulti.cxx |2 +- sw/source/ui/docvw/SidebarWin.cxx |2 +- sw/source/ui/wrtsh/wrtsh1.cxx |6 +++--- tools/inc/tools/solar.h |2 +- vcl/inc/vcl/pdfwriter.hxx |2 +- 11 files changed, 13 insertions(+), 13 deletions(-) New commits: commit c3dc0189848f3e4ab48985860ad1a627cec5850a Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com Date: Sun Nov 27 15:12:07 2011 +0700 typos fixing diff --git a/connectivity/source/drivers/hsqldb/makefile.mk b/connectivity/source/drivers/hsqldb/makefile.mk index 0401fb2..6da440d 100755 --- a/connectivity/source/drivers/hsqldb/makefile.mk +++ b/connectivity/source/drivers/hsqldb/makefile.mk @@ -88,7 +88,7 @@ SLOFILES=\ SHL1VERSIONMAP=$(HSQLDB_TARGET).map # --- Library --- -# NO $(DLLPOSTFIX) otherwise we have to find on which plattform we are for the java files +# NO $(DLLPOSTFIX) otherwise we have to find on which platform we are for the java files SHL1TARGET=$(HSQLDB_TARGET) SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index f534f34..2e8a488 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -6634,7 +6634,7 @@ PPTTextObj::PPTTextObj( SvStream rIn, SdrPowerPointImport rSdrPowerPointImport case PPT_PST_RTFDateTimeMCAtom: { -// Rude workaround for one specal case reported +// Rude workaround for one special case reported // by a customer. (#i75203#) // Don't even attempt to handle the general use diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx index cb3b51a..f5b4de9 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx @@ -75,7 +75,7 @@ OpenJDK at least, but probably not true for Lemotes JDK */ #elif defined AXP #define JFW_PLUGIN_ARCH alpha #else // SPARC, INTEL, POWERPC, MIPS, ARM, IA64, M68K, HPPA, ALPHA -#error unknown plattform +#error unknown platform #endif // SPARC, INTEL, POWERPC, MIPS, ARM, IA64, M68K, HPPA, ALPHA diff --git a/salhelper/inc/salhelper/simplereferenceobject.hxx b/salhelper/inc/salhelper/simplereferenceobject.hxx index c5ef6db..43ca440 100644 --- a/salhelper/inc/salhelper/simplereferenceobject.hxx +++ b/salhelper/inc/salhelper/simplereferenceobject.hxx @@ -77,7 +77,7 @@ public: /** @ATTENTION The results are undefined if, for any individual instance of SimpleReferenceObject, the total number of calls to acquire() exceeds -the total number of calls to release() by a plattform dependent amount +the total number of calls to release() by a platform dependent amount (which, hopefully, is quite large). */ inline void acquire() SAL_THROW(()) diff --git a/sd/inc/helper/simplereferencecomponent.hxx b/sd/inc/helper/simplereferencecomponent.hxx index 45194d8..c4b07fc 100644 --- a/sd/inc/helper/simplereferencecomponent.hxx +++ b/sd/inc/helper/simplereferencecomponent.hxx @@ -51,7 +51,7 @@ public: /** @ATTENTION The results are undefined if, for any individual instance of SimpleReferenceComponent, the total number of calls to acquire() exceeds -the total number of calls to release() by a plattform dependent amount +the total number of calls to release() by a platform dependent amount (which, hopefully, is quite large). */ SD_DLLPUBLIC void acquire(); diff --git a/sfx2/source/bastyp/minarray.cxx b/sfx2/source/bastyp/minarray.cxx index 891baa7..91de9e0 100644 --- a/sfx2/source/bastyp/minarray.cxx +++ b/sfx2/source/bastyp/minarray.cxx @@ -220,7 +220,7 @@ void SfxPtrArr::Insert( sal_uInt16 nPos, void* rElem ) { DBG_MEMTEST(); DBG_ASSERT( sal::static_int_cast unsigned (nUsed+1) ( USHRT_MAX / sizeof(void*) ), array too large ); -// Does the Array have o be copied? +// Does the Array have to be copied? if ( nUnused == 0 ) { // increase (rounded up ) to the next Grow-border diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx index 95737d3..e7ea3ff 100644 ---
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/evoab/LServices.cxx | 114 connectivity/source/drivers/evoab/exports.dxp |1 2 files changed, 115 deletions(-) New commits: commit e04361c897c08374c7be54ff3ae09d789ca7627f Author: Michael Meeks michael.me...@suse.com Date: Wed Nov 23 12:50:45 2011 + fully remove obsolete evolution 1.x connector diff --git a/connectivity/source/drivers/evoab/LServices.cxx b/connectivity/source/drivers/evoab/LServices.cxx deleted file mode 100644 index bd2b5f5..000 --- a/connectivity/source/drivers/evoab/LServices.cxx +++ /dev/null @@ -1,114 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * http://www.openoffice.org/license.html - * for a copy of the LGPLv3 License. - * - / - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include precompiled_connectivity.hxx -#include LDriver.hxx -#include cppuhelper/factory.hxx - -using namespace connectivity::evoab; -using ::rtl::OUString; -using ::com::sun::star::uno::Reference; -using ::com::sun::star::uno::Sequence; -using ::com::sun::star::lang::XSingleServiceFactory; -using ::com::sun::star::lang::XMultiServiceFactory; - -typedef Reference XSingleServiceFactory (SAL_CALL *createFactoryFunc) -( -const Reference XMultiServiceFactory rServiceManager, -const OUString rComponentName, -::cppu::ComponentInstantiation pCreateFunction, -const Sequence OUString rServiceNames, -rtl_ModuleCount* _pT -); - -//--- -struct ProviderRequest -{ -Reference XSingleServiceFactory xRet; -Reference XMultiServiceFactory const xServiceManager; -OUString const sImplementationName; - -ProviderRequest( -void* pServiceManager, -sal_Char const* pImplementationName -) -: xServiceManager(reinterpret_castXMultiServiceFactory*(pServiceManager)) -, sImplementationName(OUString::createFromAscii(pImplementationName)) -{ -} - -inline -sal_Bool CREATE_PROVIDER( -const OUString Implname, -const Sequence OUString Services, -::cppu::ComponentInstantiation Factory, -createFactoryFunc creator -) -{ -if (!xRet.is() (Implname == sImplementationName)) -try -{ -xRet = creator( xServiceManager, sImplementationName,Factory, Services,0); -} -catch(...) -{ -} -return xRet.is(); -} - -void* getProvider() const { return xRet.get(); } -}; - -//--- -extern C SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( -const sal_Char* pImplementationName, -void* pServiceManager, -void* /*pRegistryKey*/) -{ -void* pRet = 0; -if (pServiceManager) -{ -ProviderRequest aReq(pServiceManager,pImplementationName); - -aReq.CREATE_PROVIDER( -OEvoabDriver::getImplementationName_Static(), -OEvoabDriver::getSupportedServiceNames_Static(), -OEvoabDriver_CreateInstance, ::cppu::createSingleFactory) -; - -if(aReq.xRet.is()) -aReq.xRet-acquire(); - -pRet = aReq.getProvider(); -} - -return pRet; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab/exports.dxp b/connectivity/source/drivers/evoab/exports.dxp deleted file mode 100755 index 7003307..000 --- a/connectivity/source/drivers/evoab/exports.dxp +++ /dev/null @@ -1 +0,0 @@ -component_getFactory ___ Libreoffice-commits mailing list
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/dbase/dindexnode.cxx | 17 +++-- 1 file changed, 7 insertions(+), 10 deletions(-) New commits: commit d46118d174c98fe24995c137e3db1bb9b0cfc09c Author: August Sodora aug...@gmail.com Date: Sun Nov 20 22:55:43 2011 -0500 cppcheck: struct or union member 'NodeData::aDbl' is never used diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx index 83026f7..bccca3f 100644 --- a/connectivity/source/drivers/dbase/dindexnode.cxx +++ b/connectivity/source/drivers/dbase/dindexnode.cxx @@ -685,11 +685,8 @@ void ONDXNode::Read(SvStream rStream, ODbaseIndex rIndex) rStream aChild; } -union NodeData -{ -double aDbl; -char aData[128]; -} aNodeData; +char aData[128]; + //-- void ONDXNode::Write(SvStream rStream, const ONDXPage rPage) const { @@ -703,22 +700,22 @@ void ONDXNode::Write(SvStream rStream, const ONDXPage rPage) const { if (aKey.getValue().isNull()) { -memset(aNodeData.aData,0,rIndex.getHeader().db_keylen); - rStream.Write((sal_uInt8*)aNodeData.aData,rIndex.getHeader().db_keylen); +memset(aData,0,rIndex.getHeader().db_keylen); +rStream.Write((sal_uInt8*)aData,rIndex.getHeader().db_keylen); } else rStream (double) aKey.getValue(); } else { -memset(aNodeData.aData,0x20,rIndex.getHeader().db_keylen); +memset(aData,0x20,rIndex.getHeader().db_keylen); if (!aKey.getValue().isNull()) { ::rtl::OUString sValue = aKey.getValue(); ByteString aText(sValue.getStr(), rIndex.m_pTable-getConnection()-getTextEncoding()); - strncpy(aNodeData.aData,aText.GetBuffer(),std::min(rIndex.getHeader().db_keylen, aText.Len())); + strncpy(aData,aText.GetBuffer(),std::min(rIndex.getHeader().db_keylen, aText.Len())); } - rStream.Write((sal_uInt8*)aNodeData.aData,rIndex.getHeader().db_keylen); +rStream.Write((sal_uInt8*)aData,rIndex.getHeader().db_keylen); } rStream aChild; } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/postgresql/pq_allocator.hxx |2 +- connectivity/source/drivers/postgresql/pq_array.cxx |2 +- connectivity/source/drivers/postgresql/pq_array.hxx |2 +- connectivity/source/drivers/postgresql/pq_baseresultset.cxx |2 +- connectivity/source/drivers/postgresql/pq_baseresultset.hxx |2 +- connectivity/source/drivers/postgresql/pq_common.hxx|2 +- connectivity/source/drivers/postgresql/pq_connection.cxx|2 +- connectivity/source/drivers/postgresql/pq_connection.hxx|2 +- connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |2 +- connectivity/source/drivers/postgresql/pq_databasemetadata.hxx |2 +- connectivity/source/drivers/postgresql/pq_driver.cxx|2 +- connectivity/source/drivers/postgresql/pq_driver.hxx|2 +- connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx |2 +- connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.hxx |2 +- connectivity/source/drivers/postgresql/pq_preparedstatement.cxx |2 +- connectivity/source/drivers/postgresql/pq_preparedstatement.hxx |2 +- connectivity/source/drivers/postgresql/pq_resultset.cxx |2 +- connectivity/source/drivers/postgresql/pq_resultset.hxx |2 +- connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx |2 +- connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx |2 +- connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx |2 +- connectivity/source/drivers/postgresql/pq_sequenceresultset.hxx |2 +- connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx |2 +- connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.hxx |2 +- connectivity/source/drivers/postgresql/pq_statement.cxx |2 +- connectivity/source/drivers/postgresql/pq_statement.hxx |2 +- connectivity/source/drivers/postgresql/pq_statics.cxx |2 +- connectivity/source/drivers/postgresql/pq_statics.hxx |2 +- connectivity/source/drivers/postgresql/pq_tools.cxx |2 +- connectivity/source/drivers/postgresql/pq_tools.hxx |2 +- connectivity/source/drivers/postgresql/pq_updateableresultset.cxx |2 +- connectivity/source/drivers/postgresql/pq_updateableresultset.hxx |2 +- connectivity/source/drivers/postgresql/pq_xbase.cxx |2 +- connectivity/source/drivers/postgresql/pq_xbase.hxx |2 +- connectivity/source/drivers/postgresql/pq_xcolumn.cxx |2 +- connectivity/source/drivers/postgresql/pq_xcolumn.hxx |2 +- connectivity/source/drivers/postgresql/pq_xcolumns.cxx |2 +- connectivity/source/drivers/postgresql/pq_xcolumns.hxx |2 +- connectivity/source/drivers/postgresql/pq_xcontainer.cxx|2 +- connectivity/source/drivers/postgresql/pq_xcontainer.hxx|2 +- connectivity/source/drivers/postgresql/pq_xindex.cxx|2 +- connectivity/source/drivers/postgresql/pq_xindex.hxx|2 +- connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx |2 +- connectivity/source/drivers/postgresql/pq_xindexcolumn.hxx |2 +- connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx |2 +- connectivity/source/drivers/postgresql/pq_xindexcolumns.hxx |2 +- connectivity/source/drivers/postgresql/pq_xindexes.cxx |2 +- connectivity/source/drivers/postgresql/pq_xindexes.hxx |2 +- connectivity/source/drivers/postgresql/pq_xkey.cxx |2 +- connectivity/source/drivers/postgresql/pq_xkey.hxx |2 +- connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx|2 +- connectivity/source/drivers/postgresql/pq_xkeycolumn.hxx|2 +- connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx |2 +- connectivity/source/drivers/postgresql/pq_xkeycolumns.hxx |2 +- connectivity/source/drivers/postgresql/pq_xkeys.cxx |2 +- connectivity/source/drivers/postgresql/pq_xkeys.hxx |2 +- connectivity/source/drivers/postgresql/pq_xtable.cxx|2 +- connectivity/source/drivers/postgresql/pq_xtable.hxx|2 +- connectivity/source/drivers/postgresql/pq_xtables.cxx |2 +-
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/odbcbase/OConnection.cxx | 20 +-- 1 file changed, 18 insertions(+), 2 deletions(-) New commits: commit 9b58d9353073c6535da0529cd9a48e435f043fa8 Author: Terrence Enger ten...@iseries-guru.com Date: Thu Oct 27 16:37:50 2011 -0400 leaking connection handle call SQLDisconnect; check returns from SQLDisconnect and SQLFreeHandle diff --git a/connectivity/source/drivers/odbcbase/OConnection.cxx b/connectivity/source/drivers/odbcbase/OConnection.cxx index 891eabc..03bc39b 100644 --- a/connectivity/source/drivers/odbcbase/OConnection.cxx +++ b/connectivity/source/drivers/odbcbase/OConnection.cxx @@ -78,8 +78,24 @@ OConnection::~OConnection() close(); if ( SQL_NULL_HANDLE != m_aConnectionHandle ) -N3SQLFreeHandle( SQL_HANDLE_DBC, m_aConnectionHandle ); -m_aConnectionHandle = SQL_NULL_HANDLE; +{ +SQLRETURN rc; + +rc = N3SQLDisconnect( m_aConnectionHandle ); +if ( SQL_SUCCESS != rc + SQL_SUCCESS_WITH_INFO != rc ) +OSL_TRACE( Failure from SQLDisconnect, %s:%i + , __FILE__, __LINE__ + ); + +rc = N3SQLFreeHandle( SQL_HANDLE_DBC, m_aConnectionHandle ); +if ( SQL_SUCCESS != rc ) +OSL_TRACE( Failure from SQLFreeHandle for connection, %s:%i + , __FILE__, __LINE__ + ); + +m_aConnectionHandle = SQL_NULL_HANDLE; +} m_pDriver-release(); m_pDriver = NULL; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/kab/KDriver.cxx |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 738f9cc6a75a4857ecda43883c4dbdc128078556 Author: Michael Meeks michael.me...@suse.com Date: Wed Oct 5 14:21:15 2011 +0100 fix OString concatenation diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx index 8c55540..7240e53 100644 --- a/connectivity/source/drivers/kab/KDriver.cxx +++ b/connectivity/source/drivers/kab/KDriver.cxx @@ -32,6 +32,7 @@ #include KDriver.hxx #include KDEInit.h #include KConnection.hxx +#include rtl/strbuf.hxx /** === begin UNO includes === **/ #include com/sun/star/sdb/SQLContext.hpp @@ -106,7 +107,10 @@ namespace if ( !_rFunction ) { // did not find the symbol -OSL_FAIL( ::rtl::OString( lcl_getFunctionFromModuleOrUnload: could not find the symbol ) + ::rtl::OString( _pAsciiSymbolName ) ); +rtl::OStringBuffer aBuf; +aBuf.append( lcl_getFunctionFromModuleOrUnload: could not find the symbol ); +aBuf.append( _pAsciiSymbolName ); +OSL_FAIL( aBuf.makeStringAndClear().getStr() ); osl_unloadModule( _rModule ); _rModule = NULL; } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits