[Libreoffice-commits] .: connectivity/inc connectivity/source
connectivity/inc/connectivity/sqliterator.hxx | 14 +++---
connectivity/source/parse/sqliterator.cxx | 15 +--
2 files changed, 16 insertions(+), 13 deletions(-)
New commits:
commit c9a40d21fa4f657ae52d2765d284d12ccbe51c4f
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Dec 11 11:04:22 2012 +0100
When parsing does not give a table name, take it from the column
Change-Id: Ie8a2c7e473d717cc22c51205dd8cdc59934de8b1
diff --git a/connectivity/inc/connectivity/sqliterator.hxx
b/connectivity/inc/connectivity/sqliterator.hxx
index 82f8505..5da60c2 100644
--- a/connectivity/inc/connectivity/sqliterator.hxx
+++ b/connectivity/inc/connectivity/sqliterator.hxx
@@ -69,7 +69,7 @@ namespace connectivity
::std::auto_ptr OSQLParseTreeIteratorImpl m_pImpl;
-voidtraverseParameter(const OSQLParseNode*
_pParseNode,const OSQLParseNode* _pColumnRef,const ::rtl::OUString
_aColumnName,const ::rtl::OUString _aTableRange, const ::rtl::OUString
_rColumnAlias);
+voidtraverseParameter(const OSQLParseNode*
_pParseNode,const OSQLParseNode* _pColumnRef,const ::rtl::OUString
_aColumnName, ::rtl::OUString _aTableRange, const ::rtl::OUString
_rColumnAlias);
// inserts a table into the map
voidtraverseOneTableName( OSQLTables _rTables,const
OSQLParseNode * pTableName, const ::rtl::OUString rTableRange );
voidtraverseORCriteria(OSQLParseNode *
pSearchCondition);
@@ -92,25 +92,25 @@ namespace connectivity
@param rColumnName
the column name to look for
@param rTableRange
-the table alias name
+the table alias name; if empty, look in all tables
@return
the desired column object, or NULL/ if no such column could
be found
*/
static ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet findColumn(
-const OSQLTables _rTables, const ::rtl::OUString rColumnName,
const ::rtl::OUString rTableRange );
+const OSQLTables _rTables, const ::rtl::OUString rColumnName,
::rtl::OUString rTableRange );
/** finds a column with a given name, belonging to a given table
@param rColumnName
the column name to look for
@param rTableRange
-the table alias name
+the table alias name; if empty, look in all tables
@param _bLookInSubTables
TRUE/ if and only if not only our direct tables, but also
our sub tables (from sub selects)
should be searched
@return
*/
::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet findColumn(
-const ::rtl::OUString rColumnName, const ::rtl::OUString
rTableRange, bool _bLookInSubTables );
+const ::rtl::OUString rColumnName, ::rtl::OUString
rTableRange, bool _bLookInSubTables );
protected:
void setSelectColumnName(::rtl::ReferenceOSQLColumns
_rColumns,const ::rtl::OUString rColumnName,const ::rtl::OUString
rColumnAlias, const ::rtl::OUString rTableRange,sal_Bool
bFkt=sal_False,sal_Int32 _nType =
com::sun::star::sdbc::DataType::VARCHAR,sal_Bool bAggFkt=sal_False);
@@ -320,8 +320,8 @@ namespace connectivity
*/
voidimpl_getQueryParameterColumns( const OSQLTable _rQuery );
-void setOrderByColumnName(const ::rtl::OUString rColumnName, const
::rtl::OUString rTableRange, sal_Bool bAscending);
-void setGroupByColumnName(const ::rtl::OUString rColumnName, const
::rtl::OUString rTableRange);
+void setOrderByColumnName(const ::rtl::OUString rColumnName,
::rtl::OUString rTableRange, sal_Bool bAscending);
+void setGroupByColumnName(const ::rtl::OUString rColumnName,
::rtl::OUString rTableRange);
private:
/** appends an SQLException corresponding to the given error code to
our error collection
diff --git a/connectivity/source/parse/sqliterator.cxx
b/connectivity/source/parse/sqliterator.cxx
index 7d91655..d2a63e2 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -1441,7 +1441,7 @@ void
OSQLParseTreeIterator::traverseANDCriteria(OSQLParseNode * pSearchCondition
void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode
,const OSQLParseNode*
_pParentNode
,const ::rtl::OUString
_aColumnName
- ,const ::rtl::OUString
_aTableRange
+ ,::rtl::OUString _aTableRange
,const ::rtl::OUString
_rColumnAlias)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, parse, ocke.jans...@sun.com,
[Libreoffice-commits] .: connectivity/inc connectivity/source
connectivity/inc/connectivity/dbtools.hxx |6 -
connectivity/source/commontools/dbtools.cxx | 22 ---
connectivity/source/drivers/mork/MQueryHelper.cxx | 25 --
connectivity/source/drivers/mork/MQueryHelper.hxx |2 -
4 files changed, 55 deletions(-)
New commits:
commit dc157e8a31fda636a933fa8e0f1662abfea73ec7
Author: José Guilherme Vanz guilherme@gmail.com
Date: Wed Nov 14 02:15:53 2012 -0200
Cleanup unusedcode.easy
This commit removes some unused code from unusedcode.easy
Change-Id: I204edb6a29e23af244e7997622c5a9b3f596cb2f
Signed-off-by: José Guilherme Vanz guilherme@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/1052
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/connectivity/inc/connectivity/dbtools.hxx
b/connectivity/inc/connectivity/dbtools.hxx
index 7f48e14..854e4e9 100644
--- a/connectivity/inc/connectivity/dbtools.hxx
+++ b/connectivity/inc/connectivity/dbtools.hxx
@@ -191,12 +191,6 @@ namespace dbtools
/** returns the connection the RowSet is currently working with (which is
the ActiveConnection property)
*/
OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference
::com::sun::star::sdbc::XConnection getConnection(const
::com::sun::star::uno::Reference ::com::sun::star::sdbc::XRowSet _rxRowSet)
throw (::com::sun::star::uno::RuntimeException);
-OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference
::com::sun::star::sdbc::XConnection getConnection(
-const ::rtl::OUString _rsTitleOrPath,
-const ::rtl::OUString _rsUser,
-const ::rtl::OUString _rsPwd,
-const ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory _rxFactory);
-
OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference
::com::sun::star::sdbc::XConnection getConnection_withFeedback(
const ::rtl::OUString _rDataSourceName,
const ::rtl::OUString _rUser,
diff --git a/connectivity/source/commontools/dbtools.cxx
b/connectivity/source/commontools/dbtools.cxx
index 6c758f8..183ad8d 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -344,28 +344,6 @@ Reference XConnection getConnection_withFeedback(const
::rtl::OUString _rData
}
//--
-Reference XConnection getConnection(
-const ::rtl::OUString _rsTitleOrPath,
-const ::rtl::OUString _rsUser,
-const ::rtl::OUString _rsPwd,
-const Reference XComponentContext _rxContext)
-{
-Reference XConnection xReturn;
-try
-{
-xReturn = getConnection_allowException(_rsTitleOrPath, _rsUser,
_rsPwd, _rxContext);
-}
-catch(Exception)
-{
-}
-
-// TODO: if there were not dozens of places which rely on getConnection
not throwing an exception
-// I would change this ...
-
-return xReturn;
-}
-
-//--
Reference XConnection getConnection(const Reference XRowSet _rxRowSet)
throw (RuntimeException)
{
Reference XConnection xReturn;
diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx
b/connectivity/source/drivers/mork/MQueryHelper.cxx
index efd56f4..e02db93 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.cxx
@@ -53,11 +53,6 @@ MQueryHelperResultEntry::~MQueryHelperResultEntry()
{
}
-void MQueryHelperResultEntry::insert( const rtl::OString key, rtl::OUString
value )
-{
-m_Fields[ key ] = value;
-}
-
rtl::OUString MQueryHelperResultEntry::getValue( const rtl::OString key )
const
{
FieldMap::const_iterator iter = m_Fields.find( key );
@@ -149,26 +144,6 @@ void MQueryHelper::reset()
m_aError.reset();
}
-MQueryHelperResultEntry* MQueryHelper::next()
-{
-MQueryHelperResultEntry* result;
-sal_uInt32 index;
-
-m_aMutex.acquire();
-index = m_nIndex;
-m_aMutex.release();
-
-result = getByIndex( index + 1) ; // Add 1 as Row is numbered from 1 to N
-
-if ( result ) {
-m_aMutex.acquire();
-m_nIndex++;
-m_aMutex.release();
-}
-
-return( result );
-}
-
MQueryHelperResultEntry*
MQueryHelper::getByIndex(sal_uInt32 nRow)
{
diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx
b/connectivity/source/drivers/mork/MQueryHelper.hxx
index de1fff0..9ba91ca 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.hxx
@@ -155,7 +155,6 @@ namespace connectivity
MQueryHelperResultEntry();
~MQueryHelperResultEntry();
-voidinsert( const rtl::OString key, rtl::OUString
value );
rtl::OUString getValue( const rtl::OString key ) const;
[Libreoffice-commits] .: connectivity/inc connectivity/source unusedcode.easy
connectivity/inc/connectivity/CommonTools.hxx |1
connectivity/source/commontools/CommonTools.cxx | 62
unusedcode.easy |1
3 files changed, 64 deletions(-)
New commits:
commit ff74564b39c6f0b2063158ffe7eb8faa99f12c4b
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 23 11:23:16 2012 +0100
callcatcher: update unusedcode
Change-Id: I18f823b99349002bb148d474a6a9aabdf2d419ef
diff --git a/connectivity/inc/connectivity/CommonTools.hxx
b/connectivity/inc/connectivity/CommonTools.hxx
index 13999ab..ac1c0d9 100644
--- a/connectivity/inc/connectivity/CommonTools.hxx
+++ b/connectivity/inc/connectivity/CommonTools.hxx
@@ -50,7 +50,6 @@ namespace connectivity
return match(rWild.getStr(), rStr.getStr(), cEscape);
}
//--
-OOO_DLLPUBLIC_DBTOOLS rtl::OUString toString(const
::com::sun::star::uno::Any rValue);
OOO_DLLPUBLIC_DBTOOLS rtl::OUString toDateString(const
::com::sun::star::util::Date rDate);
OOO_DLLPUBLIC_DBTOOLS rtl::OUString toTimeString(const
::com::sun::star::util::Time rTime);
OOO_DLLPUBLIC_DBTOOLS rtl::OUString toDateTimeString(const
::com::sun::star::util::DateTime rDateTime);
diff --git a/connectivity/source/commontools/CommonTools.cxx
b/connectivity/source/commontools/CommonTools.cxx
index 2764c6d..d8bb7ff 100644
--- a/connectivity/source/commontools/CommonTools.cxx
+++ b/connectivity/source/commontools/CommonTools.cxx
@@ -152,68 +152,6 @@ namespace connectivity
return rtl::OUString::createFromAscii(s);
}
-
-
//--
-rtl::OUString toString(const Any rValue)
-{
-rtl::OUString aRes;
-TypeClass aDestinationClass = rValue.getValueType().getTypeClass();
-
-switch (aDestinationClass)
-{
-case TypeClass_CHAR:
-aRes =
::rtl::OUString::valueOf(*(sal_Unicode*)rValue.getValue());
-break;
-case TypeClass_FLOAT:
-aRes = ::rtl::OUString::valueOf(*(float*)rValue.getValue());
-break;
-case TypeClass_DOUBLE:
-aRes = ::rtl::OUString::valueOf(*(double*)rValue.getValue());
-break;
-case TypeClass_BOOLEAN:
-aRes =
::rtl::OUString::valueOf((sal_Int32)*(sal_Bool*)rValue.getValue());
-break;
-case TypeClass_BYTE:
-case TypeClass_SHORT:
-case TypeClass_LONG:
-aRes =
::rtl::OUString::valueOf(*(sal_Int32*)rValue.getValue());
-break;
-case TypeClass_HYPER:
-{
-sal_Int64 nValue = 0;
-OSL_VERIFY( rValue = nValue );
-aRes = ::rtl::OUString::valueOf(nValue);
-}
-case TypeClass_STRING:
-rValue = aRes;
-break;
-case TypeClass_STRUCT:
-if (rValue.getValueType() == ::getCppuType((const
::com::sun::star::util::Date*)0))
-{
-::com::sun::star::util::Date aDate;
-rValue = aDate;
-aRes = toDateString(aDate);
-}
-else if (rValue.getValueType() == ::getCppuType((const
::com::sun::star::util::DateTime*)0))
-{
-::com::sun::star::util::DateTime aDT;
-rValue = aDT;
-aRes = toDateTimeString(aDT);
-}
-else if (rValue.getValueType() == ::getCppuType((const
::com::sun::star::util::Time*)0))
-{
-::com::sun::star::util::Time aTime;
-rValue = aTime;
-aRes = toTimeString(aTime);
-}
-
-break;
-default:
-;
-}
-return aRes;
-}
-
//
-
::rtl::Reference jvmaccess::VirtualMachine getJavaVM(const
ReferenceXMultiServiceFactory _rxFactory)
{
diff --git a/unusedcode.easy b/unusedcode.easy
index e541859..f0992ae 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -68,7 +68,6 @@ connectivity::file::OStatement_Base::reset()
connectivity::mozab::MQueryHelper::next()
connectivity::sdbcx::OGroup::OGroup(rtl::OUString const, unsigned char)
connectivity::sdbcx::OGroup::OGroup(unsigned char)
-connectivity::toString(com::sun::star::uno::Any const)
dbtools::getConnection(rtl::OUString const, rtl::OUString const,
rtl::OUString const,
com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory
const)
formula::FormulaTokenIterator::First()
framework::OReadMenuDocumentHandler::getServiceFactory()
[Libreoffice-commits] .: connectivity/inc connectivity/source
connectivity/inc/connectivity/sqlnode.hxx|2 +-
connectivity/source/drivers/mozab/MPreparedStatement.cxx |4 ++--
connectivity/source/drivers/mozab/MPreparedStatement.hxx |2 +-
connectivity/source/drivers/mozab/MResultSet.cxx | 14 +++---
connectivity/source/drivers/mozab/MResultSetMetaData.cxx |2 +-
connectivity/source/drivers/mozab/MStatement.cxx |2 +-
connectivity/source/inc/TSortIndex.hxx |2 +-
7 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit d567a320b20bbbe5abe8c8cdc25476076f7fbcff
Author: Caolán McNamara caol...@redhat.com
Date: Tue May 29 10:15:06 2012 +0100
WaE: signed/unsigned etc.
Change-Id: I3e2e43f5854b8bc33a442ecd25e089d20a122018
diff --git a/connectivity/inc/connectivity/sqlnode.hxx
b/connectivity/inc/connectivity/sqlnode.hxx
index 8874ed0..8d7a3fb 100644
--- a/connectivity/inc/connectivity/sqlnode.hxx
+++ b/connectivity/inc/connectivity/sqlnode.hxx
@@ -272,7 +272,7 @@ namespace connectivity
void setParent(OSQLParseNode* pParseNode) {m_pParent = pParseNode;};
-sal_uInt32 count() const {return m_aChildren.size();};
+size_t count() const {return m_aChildren.size();};
inline OSQLParseNode* getChild(sal_uInt32 nPos) const;
void append(OSQLParseNode* pNewSubTree);
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx
b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
index c9b27e3..cb1fd13 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
@@ -408,11 +408,11 @@ ORowSetValue x)
}
//--
-sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const
ReferenceXPropertySet _xCol)
+size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const
ReferenceXPropertySet _xCol)
{
OSL_UNUSED( pParameter );
// Count of the newly added Parameters
-sal_uInt32 nParameter = m_xParamColumns-get().size()+1;
+size_t nParameter = m_xParamColumns-get().size()+1;
OSL_ENSURE(SQL_ISRULE(pParameter,parameter),OResultSet::AddParameter:
Argument is not a Parameter);
OSL_ENSURE(pParameter-count() 0,OResultSet: error in parse tree);
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.hxx
b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
index eca24fd..90f2cc7 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
@@ -97,7 +97,7 @@ namespace connectivity
void checkAndResizeParameters(sal_Int32 parameterIndex);
void setParameter(sal_Int32 parameterIndex, const ORowSetValue x);
-sal_uInt32 AddParameter(connectivity::OSQLParseNode * pParameter,
+size_t AddParameter(connectivity::OSQLParseNode * pParameter,
const ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet _xCol);
void scanParameter(OSQLParseNode* pParseNode,::std::vector
OSQLParseNode* _rParaNodes);
void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode*
_pNode,const OSQLTable _xTable);
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx
b/connectivity/source/drivers/mozab/MResultSet.cxx
index c64b5b8..5bb0af5 100644
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -886,8 +886,8 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*
parseT
OSQLParseNode *pOptEscape;
const OSQLParseNode* pPart2 = parseTree-getChild(1);
pColumn = parseTree-getChild(0);// Match
Item
-pAtom = pPart2-getChild(pPart2-count()-2); // Match String
-pOptEscape = pPart2-getChild(pPart2-count()-1); // Opt Escape
Rule
+pAtom =
pPart2-getChild(static_castsal_uInt32(pPart2-count()-2)); // Match
String
+pOptEscape =
pPart2-getChild(static_castsal_uInt32(pPart2-count()-1)); // Opt Escape
Rule
(void)pOptEscape;
const bool bNot = SQL_ISTOKEN(pPart2-getChild(0), NOT);
@@ -1297,7 +1297,7 @@ void SAL_CALL OResultSet::executeQuery() throw(
::com::sun::star::sdbc::SQLExcep
}
m_pKeySet = m_pSortIndex-CreateKeySet();
-m_CurrentRowCount = m_pKeySet-get().size();
+m_CurrentRowCount =
static_castsal_Int32(m_pKeySet-get().size());
#if OSL_DEBUG_LEVEL 0
for( OKeySet::Vector::size_type i = 0; i
m_pKeySet-get().size(); i++ )
OSL_TRACE(Sorted: %d - %d, i, (m_pKeySet-get())[i]
);
@@ -1405,7 +1405,7 @@ void OResultSet::setBoundedColumns(const OValueRow _rRow,
{
[Libreoffice-commits] .: connectivity/inc
connectivity/inc/connectivity/dbcharset.hxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 553455ae8a9b8adc477323043073068b8c7ecfc3
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue May 29 11:20:40 2012 +0200
-Werror=conversion
Change-Id: I3d4055722e8f7c22c50f892e62b5b3246904ce50
diff --git a/connectivity/inc/connectivity/dbcharset.hxx
b/connectivity/inc/connectivity/dbcharset.hxx
index cb13fcd..cbaceb0 100644
--- a/connectivity/inc/connectivity/dbcharset.hxx
+++ b/connectivity/inc/connectivity/dbcharset.hxx
@@ -29,6 +29,10 @@
#ifndef _DBHELPER_DBCHARSET_HXX_
#define _DBHELPER_DBCHARSET_HXX_
+#include sal/config.h
+
+#include cstddef
+
#include comphelper/stl_types.hxx
#include rtl/textenc.h
#include rtl/tencinfo.h
@@ -84,7 +88,7 @@ namespace dbtools
*/
CharsetIterator find(const ::rtl::OUString _rIanaName, const IANA)
const;
-sal_Int32 size() const { ensureConstructed( ); return
m_aEncodings.size(); }
+std::size_t size() const { ensureConstructed( ); return
m_aEncodings.size(); }
/// get access to the first element of the charset collection
CharsetIterator begin() const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/inc connectivity/source connectivity/workben
connectivity/inc/connectivity/sdbcx/VIndex.hxx |1 - connectivity/inc/connectivity/sqlparse.hxx |1 - connectivity/source/commontools/ConnectionWrapper.cxx |2 -- connectivity/source/commontools/TColumnsHelper.cxx |1 - connectivity/source/cpool/ZConnectionPool.cxx |1 - connectivity/source/drivers/dbase/DIndex.cxx |1 - connectivity/source/drivers/evoab2/NStatement.hxx |1 - connectivity/source/drivers/file/fcode.cxx |1 - connectivity/source/drivers/file/fcomp.cxx |1 - connectivity/source/drivers/jdbc/JConnection.cxx |1 - connectivity/source/drivers/jdbc/ResultSet.cxx |1 - connectivity/source/drivers/mozab/MColumns.cxx |1 - connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx|1 - connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx |1 - connectivity/source/parse/sqlnode.cxx |3 --- connectivity/source/sdbcx/VCatalog.cxx |1 - connectivity/workben/testmoz/main.cxx |1 - connectivity/workben/testmoz/mozthread.cxx |1 - 18 files changed, 21 deletions(-) New commits: commit 86647a187371f03a05a329f24366b0ac2e6c7fbf Author: Takeshi Abe t...@fixedpoint.jp Date: Wed Mar 28 23:39:31 2012 +0900 removed duplicate includes in connectivity diff --git a/connectivity/inc/connectivity/sdbcx/VIndex.hxx b/connectivity/inc/connectivity/sdbcx/VIndex.hxx index 4058e91..c62d815 100644 --- a/connectivity/inc/connectivity/sdbcx/VIndex.hxx +++ b/connectivity/inc/connectivity/sdbcx/VIndex.hxx @@ -41,7 +41,6 @@ #include connectivity/sdbcx/VDescriptor.hxx #include connectivity/dbtoolsdllapi.hxx #include com/sun/star/lang/XServiceInfo.hpp -#include com/sun/star/sdbcx/XDataDescriptorFactory.hpp #include cppuhelper/implbase1.hxx namespace connectivity diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/connectivity/inc/connectivity/sqlparse.hxx index 6b3f975..88c0637 100644 --- a/connectivity/inc/connectivity/sqlparse.hxx +++ b/connectivity/inc/connectivity/sqlparse.hxx @@ -48,7 +48,6 @@ #include connectivity/dbtoolsdllapi.hxx #include connectivity/sqlerror.hxx #include salhelper/singletonref.hxx -#include osl/mutex.hxx #include map diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx index d9a61f6..f668433 100644 --- a/connectivity/source/commontools/ConnectionWrapper.cxx +++ b/connectivity/source/commontools/ConnectionWrapper.cxx @@ -37,8 +37,6 @@ #include rtl/digest.h #include algorithm -#include algorithm - using namespace connectivity; //-- using namespace com::sun::star::uno; diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx index 2e05aa7..d051a2d 100644 --- a/connectivity/source/commontools/TColumnsHelper.cxx +++ b/connectivity/source/commontools/TColumnsHelper.cxx @@ -28,7 +28,6 @@ #include connectivity/TColumnsHelper.hxx #include connectivity/sdbcx/VColumn.hxx -#include connectivity/sdbcx/VColumn.hxx #include com/sun/star/sdbc/XRow.hpp #include com/sun/star/sdbc/XResultSet.hpp #include com/sun/star/sdbc/DataType.hpp diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx index bfdfafc..0297c3a 100644 --- a/connectivity/source/cpool/ZConnectionPool.cxx +++ b/connectivity/source/cpool/ZConnectionPool.cxx @@ -38,7 +38,6 @@ #include ZPoolCollection.hxx #include connectivity/ConnectionWrapper.hxx #include com/sun/star/beans/XPropertySet.hpp -#include connectivity/ConnectionWrapper.hxx using namespace ::com::sun::star::uno; diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index f64a630..458afcc 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -46,7 +46,6 @@ #include connectivity/dbexception.hxx #include dbase/DResultSet.hxx #include diagnose_ex.h -#include comphelper/types.hxx #include resource/dbase_res.hrc #include unotools/sharedunocomponent.hxx diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx index 2550003..e292a8f 100644 --- a/connectivity/source/drivers/evoab2/NStatement.hxx +++ b/connectivity/source/drivers/evoab2/NStatement.hxx @@ -47,7 +47,6 @@ #include com/sun/star/util/XCancellable.hpp #include cppuhelper/compbase5.hxx #include comphelper/propertycontainer.hxx -#include com/sun/star/lang/XServiceInfo.hpp #include EApi.h diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx index
[Libreoffice-commits] .: connectivity/inc connectivity/source sc/source unusedcode.easy vbahelper/inc vbahelper/source
connectivity/inc/connectivity/dbcharset.hxx |1
connectivity/source/commontools/dbcharset.cxx |6 -
sc/source/ui/vba/excelvbahelper.cxx | 22 --
sc/source/ui/vba/excelvbahelper.hxx |1
unusedcode.easy | 10
vbahelper/inc/vbahelper/vbahelper.hxx | 11 -
vbahelper/source/vbahelper/vbahelper.cxx | 31 --
7 files changed, 82 deletions(-)
New commits:
commit fdd3427a584a3f14ecb0d00557417434db04df99
Author: Santiago Martinez smvar...@gmail.com
Date: Thu Mar 8 11:14:41 2012 +0530
Removed unused code.
diff --git a/connectivity/inc/connectivity/dbcharset.hxx
b/connectivity/inc/connectivity/dbcharset.hxx
index 60c96fb..cb13fcd 100644
--- a/connectivity/inc/connectivity/dbcharset.hxx
+++ b/connectivity/inc/connectivity/dbcharset.hxx
@@ -116,7 +116,6 @@ namespace dbtools
::rtl::OUString getIanaName() const { return m_aIanaName; }
protected:
-CharsetIteratorDerefHelper();
CharsetIteratorDerefHelper( const rtl_TextEncoding _eEncoding, const
::rtl::OUString _rIanaName );
};
diff --git a/connectivity/source/commontools/dbcharset.cxx
b/connectivity/source/commontools/dbcharset.cxx
index 87b78c4..45729df 100644
--- a/connectivity/source/commontools/dbcharset.cxx
+++ b/connectivity/source/commontools/dbcharset.cxx
@@ -154,12 +154,6 @@ namespace dbtools
{
}
-//-
-CharsetIteratorDerefHelper::CharsetIteratorDerefHelper()
-:m_eEncoding(RTL_TEXTENCODING_DONTKNOW)
-{
-}
-
//=
//= OCharsetMap::CharsetIterator
//=
diff --git a/sc/source/ui/vba/excelvbahelper.cxx
b/sc/source/ui/vba/excelvbahelper.cxx
index 7ee13b2..3d80796 100644
--- a/sc/source/ui/vba/excelvbahelper.cxx
+++ b/sc/source/ui/vba/excelvbahelper.cxx
@@ -139,19 +139,6 @@ void implSetZoom( const uno::Reference frame::XModel
xModel, sal_Int16 nZoom
pViewSh-GetViewData()-SetZoom( aFract, aFract, nTabs );
pViewSh-RefreshZoom();
}
-bool isInPrintPreview( SfxViewFrame* pView )
-{
-sal_uInt16 nViewNo = SID_VIEWSHELL1 - SID_VIEWSHELL0;
-if ( pView-GetObjectShell()-GetFactory().GetViewFactoryCount()
-nViewNo !pView-GetObjectShell()-IsInPlaceActive() )
-{
-SfxViewFactory rViewFactory =
-pView-GetObjectShell()-GetFactory().GetViewFactory(nViewNo);
-if ( pView-GetCurViewId() == rViewFactory.GetOrdinal() )
-return true;
-}
-return false;
-}
const ::rtl::OUString REPLACE_CELLS_WARNING( RTL_CONSTASCII_USTRINGPARAM(
ReplaceCellsWarning));
@@ -321,15 +308,6 @@ getCurrentBestViewShell( const uno::Reference
uno::XComponentContext xConte
return getBestViewShell( xModel );
}
-SfxViewFrame*
-getViewFrame( const uno::Reference frame::XModel xModel )
-{
-ScTabViewShell* pViewShell = getBestViewShell( xModel );
-if ( pViewShell )
-return pViewShell-GetViewFrame();
-return NULL;
-}
-
sal_Bool IsR1C1ReferFormat( ScDocument* pDoc, const rtl::OUString sRangeStr )
{
ScRangeList aCellRanges;
diff --git a/sc/source/ui/vba/excelvbahelper.hxx
b/sc/source/ui/vba/excelvbahelper.hxx
index 85031ad..53f44c9 100644
--- a/sc/source/ui/vba/excelvbahelper.hxx
+++ b/sc/source/ui/vba/excelvbahelper.hxx
@@ -59,7 +59,6 @@ bool implnCopyRange( const css::uno::Reference
css::frame::XModel xModel, con
ScTabViewShell* getBestViewShell( const css::uno::Reference
css::frame::XModel xModel ) ;
ScDocShell* getDocShell( const css::uno::Reference css::frame::XModel
xModel ) ;
ScTabViewShell* getCurrentBestViewShell( const css::uno::Reference
css::uno::XComponentContext xContext );
-SfxViewFrame* getViewFrame( const css::uno::Reference css::frame::XModel
xModel );
sal_Bool IsR1C1ReferFormat( ScDocument* pDoc, const ::rtl::OUString sRangeStr
);
formula::FormulaGrammar::Grammar GetFormulaGrammar( ScDocument* pDoc, const
ScAddress sAddress, const css::uno::Any aFormula );
diff --git a/unusedcode.easy b/unusedcode.easy
index 80eff11..58a4e92 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -875,7 +875,6 @@ cppcanvas::internal::(anonymous
namespace)::TransparencyGroupAction::Transparenc
cppcanvas::internal::ImplSprite::ImplSprite(com::sun::star::uno::Referencecom::sun::star::rendering::XSpriteCanvas
const,
com::sun::star::uno::Referencecom::sun::star::rendering::XAnimatedSprite
const,
boost::shared_ptrcppcanvas::internal::ImplSpriteCanvas::TransformationArbiter
const)
cppcanvas::internal::ImplText::ImplText(boost::shared_ptrcppcanvas::Canvas
const, rtl::OUString const)
dbaui::getKeyColumns(com::sun::star::uno::Referencecom::sun::star::container::XIndexAccess
const, int)
