diff options
Diffstat (limited to 'connectivity/source/inc')
19 files changed, 2 insertions, 161 deletions
diff --git a/connectivity/source/inc/OTypeInfo.hxx b/connectivity/source/inc/OTypeInfo.hxx index 12a96580ca43..5294c8e5ac36 100644 --- a/connectivity/source/inc/OTypeInfo.hxx +++ b/connectivity/source/inc/OTypeInfo.hxx @@ -74,8 +74,6 @@ namespace connectivity bool operator == (const OTypeInfo& lh) const { return lh.nType == nType; } bool operator != (const OTypeInfo& lh) const { return lh.nType != nType; } - - inline OUString getDBName() const { return aTypeName; } }; } diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx index ed424641373c..b40aaa1d4fff 100644 --- a/connectivity/source/inc/dbase/DIndex.hxx +++ b/connectivity/source/inc/dbase/DIndex.hxx @@ -111,10 +111,8 @@ namespace connectivity void SetRootPos(sal_uInt32 nPos) {m_nRootPage = nPos;} void SetPageCount(sal_uInt32 nCount) {m_nPageCount = nCount;} - sal_uInt32 GetRootPos() {return m_nRootPage;} sal_uInt32 GetPageCount() {return m_nPageCount;} - bool IsText() const {return m_aHeader.db_keytype == 0;} sal_uInt16 GetMaxNodes() const {return m_aHeader.db_maxkeys;} bool Insert(sal_uInt32 nRec, const ORowSetValue& rValue); @@ -136,7 +134,6 @@ namespace connectivity bool isUnique() const { return m_IsUnique; } bool UseCollector() const {return m_bUseCollector;} // Tree operations - void Insert(ONDXPagePtr aCurPage, ONDXNode& rNode); void Release(bool bSave = true); bool ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue); }; diff --git a/connectivity/source/inc/dbase/DIndexIter.hxx b/connectivity/source/inc/dbase/DIndexIter.hxx index 772bfb93de99..7d3dd2fb5b56 100644 --- a/connectivity/source/inc/dbase/DIndexIter.hxx +++ b/connectivity/source/inc/dbase/DIndexIter.hxx @@ -39,9 +39,8 @@ namespace connectivity ODbaseIndex* m_pIndex; ONDXPagePtr m_aRoot, m_aCurLeaf; - sal_uInt16 m_nCurNode; + sal_uInt16 m_nCurNode; - protected: sal_uIntPtr Find(bool bFirst); sal_uIntPtr GetCompare(bool bFirst); sal_uIntPtr GetLike(bool bFirst); @@ -51,8 +50,6 @@ namespace connectivity ONDXKey* GetFirstKey(ONDXPage* pPage, const file::OOperand& rKey); ONDXKey* GetNextKey(); - ODbaseIndex* GetIndex() const {return m_pIndex;} - public: OIndexIterator(ODbaseIndex* pInd, diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx index b32163511e6a..17cb9b769f43 100644 --- a/connectivity/source/inc/dbase/dindexnode.hxx +++ b/connectivity/source/inc/dbase/dindexnode.hxx @@ -70,9 +70,6 @@ namespace connectivity bool operator > (const ONDXKey& rKey) const; bool operator >= (const ONDXKey& rKey) const; - bool Load (SvFileStream& rStream, bool bText); - bool Write(SvFileStream& rStream, bool bText); - static bool IsText(sal_Int32 eType); private: @@ -157,7 +154,6 @@ namespace connectivity bool IsLeaf() const; bool IsModified() const; bool HasParent(); - bool HasChild() const; bool IsFull() const; @@ -224,7 +220,6 @@ namespace connectivity inline bool ONDXPage::IsLeaf() const {return !aChild.HasPage();} inline bool ONDXPage::IsModified() const {return bModified;} inline bool ONDXPage::HasParent() {return aParent.Is();} - inline bool ONDXPage::HasChild() const {return aChild.HasPage();} inline ONDXPagePtr ONDXPage::GetParent() {return aParent;} inline void ONDXPage::SetParent(ONDXPagePtr aPa = ONDXPagePtr()) @@ -269,41 +264,11 @@ namespace connectivity // Setting the child, via reference to retain the PagePos void SetChild(ONDXPagePtr aCh = ONDXPagePtr(), ONDXPage* = NULL); - void SetKey(ONDXKey& rKey) {aKey = rKey;} void Write(SvStream &rStream, const ONDXPage& rPage) const; void Read(SvStream &rStream, ODbaseIndex&); }; - // inline implementation - -// inline ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec) -// : ONDXKey_BASE(eType) -// , nRecord(nRec),xValue(rVal) -// { -// } - - -// inline ONDXKey::ONDXKey(const OUString& aStr, sal_uInt32 nRec) -// : ONDXKey_BASE(::com::sun::star::sdbc::DataType::VARCHAR) -// ,nRecord(nRec) -// { -// if (aStr.len()) -// xValue = aStr; -// } - -// inline ONDXKey::ONDXKey(double aVal, sal_uInt32 nRec) -// : ONDXKey_BASE(::com::sun::star::sdbc::DataType::DOUBLE) -// ,nRecord(nRec) -// ,xValue(aVal) -// { -// } - -// inline ONDXKey::ONDXKey(sal_uInt32 nRec) -// :nRecord(nRec) -// { -// } - inline ONDXKey::ONDXKey(const ONDXKey& rKey) : ONDXKey_BASE(rKey.getDBType()) ,nRecord(rKey.nRecord) diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx index 2b6bc47069f6..eaede692c871 100644 --- a/connectivity/source/inc/file/FConnection.hxx +++ b/connectivity/source/inc/file/FConnection.hxx @@ -83,9 +83,6 @@ namespace connectivity css::uno::RuntimeException, css::uno::DeploymentException); - - void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); - // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index 356a40e997b1..fc481ed47813 100644 --- a/connectivity/source/inc/file/FStatement.hxx +++ b/connectivity/source/inc/file/FStatement.hxx @@ -112,7 +112,6 @@ namespace connectivity OSQLAnalyzer* createAnalyzer(); void closeResultSet() throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception); - sal_Int32 getPrecision ( sal_Int32 sqlType); void disposeResultSet(); void GetAssignValues(); diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx index 2c59dfd9f44b..725e0f28ccdb 100644 --- a/connectivity/source/inc/file/fcode.hxx +++ b/connectivity/source/inc/file/fcode.hxx @@ -76,7 +76,6 @@ namespace connectivity virtual void setValue(const ORowSetValue& _rVal) = 0; sal_Int32 getDBType() const {return m_eDBType;} - virtual OEvaluateSet* preProcess(OBoolOperator* pOp, OOperand* pRight = 0); inline bool isValid() const; TYPEINFO_OVERRIDE(); @@ -90,7 +89,6 @@ namespace connectivity OOperandRow(sal_uInt16 _nPos, sal_Int32 _rType); public: - sal_uInt16 getRowPos() const {return m_nRowPos;} virtual const ORowSetValue& getValue() const SAL_OVERRIDE; virtual void setValue(const ORowSetValue& _rVal) SAL_OVERRIDE; void bindValue(const OValueRefRow& _pRow); // Bind to the value that the operand represents @@ -108,7 +106,6 @@ namespace connectivity OOperandAttr(sal_uInt16 _nPos, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn); - virtual OEvaluateSet* preProcess(OBoolOperator* pOp, OOperand* pRight = 0) SAL_OVERRIDE; TYPEINFO_OVERRIDE(); }; @@ -202,8 +199,6 @@ namespace connectivity { public: virtual void Exec(OCodeStack&) = 0; - virtual sal_uInt16 getRequestedOperands() const; // Count of requested operands - // Defaults to 2 TYPEINFO_OVERRIDE(); }; @@ -225,7 +220,6 @@ namespace connectivity protected: virtual void Exec(OCodeStack&) SAL_OVERRIDE; virtual bool operate(const OOperand*, const OOperand* = NULL) const SAL_OVERRIDE; - virtual sal_uInt16 getRequestedOperands() const SAL_OVERRIDE; }; class OOp_AND : public OBoolOperator @@ -251,7 +245,6 @@ namespace connectivity TYPEINFO_OVERRIDE(); public: virtual void Exec(OCodeStack&) SAL_OVERRIDE; - virtual sal_uInt16 getRequestedOperands() const SAL_OVERRIDE; virtual bool operate(const OOperand*, const OOperand* = NULL) const SAL_OVERRIDE; }; @@ -366,7 +359,6 @@ namespace connectivity { public: virtual void Exec(OCodeStack&) SAL_OVERRIDE; - virtual sal_uInt16 getRequestedOperands() const SAL_OVERRIDE; virtual ORowSetValue operate(const ORowSetValue& lhs) const = 0; TYPEINFO_OVERRIDE(); diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx index 7f09023ae4b6..5b0d52c8b644 100644 --- a/connectivity/source/inc/file/fcomp.hxx +++ b/connectivity/source/inc/file/fcomp.hxx @@ -65,7 +65,6 @@ namespace connectivity void Clean(); bool isClean() const {return m_aCodeList.empty();} bool hasCode() const {return !isClean();} - bool hasORCondition() const {return m_bORCondition;} void setOrigColumns(const OFileColumns& rCols) { m_orgColumns = rCols; } const OFileColumns getOrigColumns() const { return m_orgColumns; } protected: diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx index f45fe0fd5ba3..ecd982ef0c62 100644 --- a/connectivity/source/inc/flat/ETable.hxx +++ b/connectivity/source/inc/flat/ETable.hxx @@ -57,7 +57,6 @@ namespace connectivity bool m_bNeedToReadLine; private: void fillColumns(const ::com::sun::star::lang::Locale& _aLocale); - bool CreateFile(const INetURLObject& aFile, bool& bCreateMemo); bool readLine(sal_Int32 *pEndPos = NULL, sal_Int32 *pStartPos = NULL, bool nonEmpty = false); void setRowPos(::std::vector<TRowPositionInFile>::size_type rowNum, const TRowPositionInFile &rowPos); void impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine, sal_Int32& nStartPosFirstLine, sal_Int32& nStartPosFirstLine2, diff --git a/connectivity/source/inc/hsqldb/HTables.hxx b/connectivity/source/inc/hsqldb/HTables.hxx index 75c95e013a37..26e5c3965460 100644 --- a/connectivity/source/inc/hsqldb/HTables.hxx +++ b/connectivity/source/inc/hsqldb/HTables.hxx @@ -49,20 +49,6 @@ namespace connectivity // XDrop void appendNew(const OUString& _rsNewTable); - // some helper functions - /** - returns a sql string which contains the column definition part for create or alter statements - */ - static OUString getColumnSqlType(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); - /** - returns the "not null" part or the default part of the table statement - */ - static OUString getColumnSqlNotNullDefault(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); - /** - returns the corresponding typename - can contain () which have to filled with values - */ - static OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); }; } } diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx index fa04e0a9ae1c..6d96a48e3e72 100644 --- a/connectivity/source/inc/java/ContextClassLoader.hxx +++ b/connectivity/source/inc/java/ContextClassLoader.hxx @@ -57,8 +57,6 @@ namespace connectivity { namespace jdbc ~ContextClassLoaderScope() { pop(true); } - void pop() { pop(false); } - bool isActive() const { return ( m_currentThread.is() ) diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx index adaa7a87a7ad..2200bdf1b661 100644 --- a/connectivity/source/inc/java/lang/Object.hxx +++ b/connectivity/source/inc/java/lang/Object.hxx @@ -92,7 +92,6 @@ namespace connectivity void saveRef( JNIEnv * pEnv, jobject myObj ); jobject getJavaObject() const { return object; } - java_lang_Object * GetWrapper() { return this; } void clearObject(JNIEnv& rEnv); void clearObject(); diff --git a/connectivity/source/inc/mysql/YTables.hxx b/connectivity/source/inc/mysql/YTables.hxx index e3bb892c8ed5..5783c06ca334 100644 --- a/connectivity/source/inc/mysql/YTables.hxx +++ b/connectivity/source/inc/mysql/YTables.hxx @@ -51,20 +51,6 @@ namespace connectivity // XDrop void appendNew(const OUString& _rsNewTable); - // some helper functions - /** - returns a sql string which contains the column definition part for create or alter statements - */ - static OUString getColumnSqlType(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); - /** - returns the "not null" part or the default part of the table statement - */ - static OUString getColumnSqlNotNullDefault(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); - /** - returns the corresponding typename - can contain () which have to filled with values - */ - static OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColProp); /** convert the sql statement to fit MySQL notation @param _sSql in/out diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx index d851e2a2740e..e07baf5ba000 100644 --- a/connectivity/source/inc/odbc/OBoundParam.hxx +++ b/connectivity/source/inc/odbc/OBoundParam.hxx @@ -61,15 +61,6 @@ namespace connectivity } - // getBindDataBuffer - // Returns the data buffer to be used when binding to a parameter - - void* getBindDataBuffer () - { - return binaryData; - } - - // getBindLengthBuffer // Returns the length buffer to be used when binding to a parameter @@ -113,45 +104,6 @@ namespace connectivity } - // setSqlType - // Sets the Java sql type used to register an OUT parameter - - - void setSqlType(sal_Int32 type) - { - sqlType = type; - } - - - // getSqlType - // Gets the Java sql type used to register an OUT parameter - - - sal_Int32 getSqlType () - { - return sqlType; - } - - - // setOutputParameter - // Sets the flag indicating if this is an OUTPUT parameter - - - void setOutputParameter (bool output) - { - outputParameter = output; - } - - - // isOutputParameter - // Gets the OUTPUT parameter flag - - - bool isOutputParameter () - { - return outputParameter; - } - protected: // Data attributes diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx index 8dfb0627efc8..6598addf60a5 100644 --- a/connectivity/source/inc/odbc/OConnection.hxx +++ b/connectivity/source/inc/odbc/OConnection.hxx @@ -91,8 +91,6 @@ namespace connectivity // OConnection(const SQLHANDLE _pConnectionHandle); virtual ~OConnection(); - void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); - // OComponentHelper virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInterface @@ -133,15 +131,11 @@ namespace connectivity inline bool isIgnoreDriverPrivilegesEnabled() const { return m_bIgnoreDriverPrivileges; } inline bool preventGetVersionColumns() const { return m_bPreventGetVersionColumns; } inline bool useOldDateFormat() const { return m_bUseOldDateFormat; } - inline SQLHANDLE getDriverHandle() const { return m_pDriverHandleCopy;} inline ODBCDriver* getDriver() const { return m_pDriver;} - inline OUString getUserName() const { return m_sUser; } SQLHANDLE createStatementHandle(); // close and free the handle and set it to SQL_NULLHANDLE void freeStatementHandle(SQLHANDLE& _pHandle); - - const TTypeInfoVector& getTypeInfo() const { return m_aTypeInfo; } }; } } diff --git a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx index 2a63bb7187f1..38beb19b7d33 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx @@ -58,18 +58,10 @@ namespace connectivity OUString getURLImpl(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw() SAL_OVERRIDE; virtual ~ODatabaseMetaData(); - public: - - inline OConnection* getOwnConnection() const { return m_pConnection; } - inline oslGenericFunction getOdbcFunction(ODBC3SQLFunctionId _nIndex) const - { - return m_pConnection->getOdbcFunction(_nIndex); - } + public: ODatabaseMetaData(const SQLHANDLE _pHandle,OConnection* _pCon); - - // XDatabaseMetaData virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx index 1685c248b031..16a7213e2086 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx @@ -192,8 +192,6 @@ namespace connectivity // XColumnLocate virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - const ::connectivity::TIntVector& getColumnMapping() { return m_aColMapping; } - void openTablesTypes( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void openTypeInfo() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void openCatalogs() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx index 59968836c6d3..1aab573aa498 100644 --- a/connectivity/source/inc/odbc/OPreparedStatement.hxx +++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx @@ -82,7 +82,6 @@ namespace connectivity void setParameterPre(sal_Int32 parameterIndex); template <typename T> void setScalarParameter(sal_Int32 parameterIndex, sal_Int32 _nType, SQLULEN _nColumnSize, const T i_Value); void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, SQLULEN _nColumnSize, sal_Int32 _nScale, const void* _pData, SQLULEN _nDataLen, SQLLEN _nDataAllocLen); - void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, sal_Int32 _nColumnSize, sal_Int32 _nByteSize, void* _pData); // Wrappers for special cases void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, sal_Int16 _nScale, const OUString &_sData); void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, const com::sun::star::uno::Sequence< sal_Int8 > &_Data); diff --git a/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx index c971548e59f3..ff544c9fb047 100644 --- a/connectivity/source/inc/odbc/OTools.hxx +++ b/connectivity/source/inc/odbc/OTools.hxx @@ -134,12 +134,6 @@ namespace connectivity SQLUINTEGER &_rValue, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - static void GetInfo(OConnection* _pConnection, - SQLHANDLE _aConnectionHandle, - SQLUSMALLINT _nInfo, - bool &_rValue, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - static sal_Int32 MapOdbcType2Jdbc(SQLSMALLINT _nType); static SQLSMALLINT jdbcTypeToOdbc(sal_Int32 jdbcType); |