diff options
author | Elton Chung <elton@layerjet.com> | 2012-02-20 21:21:13 +0800 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-02-20 15:56:17 +0000 |
commit | eab072e468506f9759a9aeddd631fbd97908e6f8 (patch) | |
tree | b9ca2dabe838383bdbd7b5e3437ef40a1b3359af | |
parent | fe981519f57a621c94e339a5453d7714af081acb (diff) |
Remove unused code
-rw-r--r-- | dbaccess/source/core/api/OptimisticSet.cxx | 10 | ||||
-rw-r--r-- | dbaccess/source/core/api/OptimisticSet.hxx | 12 | ||||
-rw-r--r-- | oox/inc/oox/xls/externallinkbuffer.hxx | 2 | ||||
-rw-r--r-- | oox/inc/oox/xls/formulabase.hxx | 8 | ||||
-rw-r--r-- | oox/inc/oox/xls/stylesbuffer.hxx | 4 | ||||
-rw-r--r-- | oox/inc/oox/xls/workbookhelper.hxx | 8 | ||||
-rw-r--r-- | oox/inc/oox/xls/worksheethelper.hxx | 26 | ||||
-rw-r--r-- | oox/source/xls/externallinkbuffer.cxx | 6 | ||||
-rw-r--r-- | oox/source/xls/formulabase.cxx | 9 | ||||
-rw-r--r-- | oox/source/xls/formulaparser.cxx | 14 | ||||
-rw-r--r-- | oox/source/xls/stylesbuffer.cxx | 12 | ||||
-rw-r--r-- | oox/source/xls/workbookhelper.cxx | 25 | ||||
-rw-r--r-- | oox/source/xls/worksheethelper.cxx | 46 | ||||
-rwxr-xr-x | unusedcode.easy | 16 |
14 files changed, 0 insertions, 198 deletions
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index 801daeb75741..99cfcd4f47b3 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -452,16 +452,6 @@ void OptimisticSet::executeDelete(const ORowSetRow& _rDeleteRow,const ::rtl::OUS } } -::rtl::OUString OptimisticSet::getComposedTableName(const ::rtl::OUString& /*_sCatalog*/, - const ::rtl::OUString& /*_sSchema*/, - const ::rtl::OUString& /*_sTable*/) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::getComposedTableName" ); - ::rtl::OUString aComposedName; - - return aComposedName; -} - void OptimisticSet::fillJoinedColumns_throw(const ::std::vector< TNodePair >& i_aJoinColumns) { ::std::vector< TNodePair >::const_iterator aIter = i_aJoinColumns.begin(); diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx index 4e44de65681a..dac366f1c02d 100644 --- a/dbaccess/source/core/api/OptimisticSet.hxx +++ b/dbaccess/source/core/api/OptimisticSet.hxx @@ -53,18 +53,6 @@ namespace dbaccess mutable bool m_bResultSetChanged; - /** - getComposedTableName return the composed table name for the query - @param _sCatalog the catalogname may be empty - @param _sSchema the schemaname may be empty - @param _sTable the tablename - - @return the composed name - */ - ::rtl::OUString getComposedTableName( const ::rtl::OUString& _sCatalog, - const ::rtl::OUString& _sSchema, - const ::rtl::OUString& _sTable); - void impl_convertValue_throw(const ORowSetRow& _rInsertRow,const SelectColumnDescription& i_aMetaData); void executeDelete(const ORowSetRow& _rDeleteRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName); diff --git a/oox/inc/oox/xls/externallinkbuffer.hxx b/oox/inc/oox/xls/externallinkbuffer.hxx index 8e1e42f71592..071b251a8ba5 100644 --- a/oox/inc/oox/xls/externallinkbuffer.hxx +++ b/oox/inc/oox/xls/externallinkbuffer.hxx @@ -362,8 +362,6 @@ public: ExternalLinkRef importExternSheet( BiffInputStream& rStrm ); /** Imports the EXTERNALBOOK record from the passed stream. */ ExternalLinkRef importExternalBook( BiffInputStream& rStrm ); - /** Imports the EXTERNALNAME record from the passed stream. */ - void importExternalName( BiffInputStream& rStrm ); /** Imports the BIFF8 EXTERNSHEET record from the passed stream. */ void importExternSheet8( BiffInputStream& rStrm ); diff --git a/oox/inc/oox/xls/formulabase.hxx b/oox/inc/oox/xls/formulabase.hxx index 610b2274a69b..1d34343ec6ef 100644 --- a/oox/inc/oox/xls/formulabase.hxx +++ b/oox/inc/oox/xls/formulabase.hxx @@ -701,14 +701,6 @@ public: // ------------------------------------------------------------------------ - /** Generates a cell range string in Calc's absolute $Sheet.$A$1:$A$ - notation from the passed cell range address. - - @param rRange The cell range address to be converted to a string. - */ - ::rtl::OUString generateApiRangeString( - const ::com::sun::star::table::CellRangeAddress& rRange ) const; - /** Generates a string in Calc formula notation from the passed string. @param rString The string value. diff --git a/oox/inc/oox/xls/stylesbuffer.hxx b/oox/inc/oox/xls/stylesbuffer.hxx index 365474a5edde..68d7431889ea 100644 --- a/oox/inc/oox/xls/stylesbuffer.hxx +++ b/oox/inc/oox/xls/stylesbuffer.hxx @@ -830,10 +830,6 @@ public: /** Inserts a new number format code. */ void importNumFmt( const AttributeList& rAttribs ); - /** Sets all attributes from the alignment element. */ - void importAlignment( const AttributeList& rAttribs ); - /** Sets all attributes from the protection element. */ - void importProtection( const AttributeList& rAttribs ); /** Imports the DXF record from the passed stream. */ void importDxf( SequenceInputStream& rStrm ); diff --git a/oox/inc/oox/xls/workbookhelper.hxx b/oox/inc/oox/xls/workbookhelper.hxx index e0310b8143e7..b7ac389a18e6 100644 --- a/oox/inc/oox/xls/workbookhelper.hxx +++ b/oox/inc/oox/xls/workbookhelper.hxx @@ -168,10 +168,6 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > getSheetFromDoc( const ::rtl::OUString& rSheet ) const; - /** Returns the XCell interface for the passed cell address. */ - ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > - getCellFromDoc( - const ::com::sun::star::table::CellAddress& rAddress ) const; /** Returns the XCellRange interface for the passed cell range address. */ ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > getCellRangeFromDoc( @@ -274,15 +270,11 @@ public: // BIFF2-BIFF8 specific (MUST NOT be called in OOXML/BIFF12 filter) ------- - /** Returns the base BIFF filter object. */ - ::oox::core::BinaryFilterBase& getBiffFilter() const; /** Returns the BIFF type in binary filter. */ BiffType getBiff() const; /** Returns the text encoding used to import/export byte strings. */ rtl_TextEncoding getTextEncoding() const; - /** Sets the text encoding to import/export byte strings. */ - void setTextEncoding( rtl_TextEncoding eTextEnc ); /** Sets code page read from a CODEPAGE record for byte string import. */ void setCodePage( sal_uInt16 nCodePage ); /** Sets text encoding from the default application font, if CODEPAGE record is missing. */ diff --git a/oox/inc/oox/xls/worksheethelper.hxx b/oox/inc/oox/xls/worksheethelper.hxx index 33ae0a8e0c82..798e5ccac08b 100644 --- a/oox/inc/oox/xls/worksheethelper.hxx +++ b/oox/inc/oox/xls/worksheethelper.hxx @@ -219,29 +219,6 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSheetCellRanges > getCellRangeList( const ApiCellRangeList& rRanges ) const; - /** Returns the address of the passed cell. The cell reference must be valid. */ - static ::com::sun::star::table::CellAddress - getCellAddress( - const ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell >& rxCell ); - /** Returns the address of the passed cell range. The range reference must be valid. */ - static ::com::sun::star::table::CellRangeAddress - getRangeAddress( - const ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >& rxRange ); - - /** Returns the XCellRange interface for a column. */ - ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > - getColumn( sal_Int32 nCol ) const; - /** Returns the XCellRange interface for a row. */ - ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > - getRow( sal_Int32 nRow ) const; - - /** Returns the XTableColumns interface for a range of columns. */ - ::com::sun::star::uno::Reference< ::com::sun::star::table::XTableColumns > - getColumns( const ValueRange& rColRange ) const; - /** Returns the XTableRows interface for a range of rows. */ - ::com::sun::star::uno::Reference< ::com::sun::star::table::XTableRows > - getRows( const ValueRange& rRowRange ) const; - /** Returns the XDrawPage interface of the draw page of the current sheet. */ ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > getDrawPage() const; @@ -327,9 +304,6 @@ public: void putFormulaResult( const ::com::sun::star::table::CellAddress& rAddress, double fValue ) const; - void putFormulaString( - const ::com::sun::star::table::CellAddress& rAddress, - const ::rtl::OUString& rText ) const; /** Inserts a string cell directly into the Calc sheet. */ void putString( diff --git a/oox/source/xls/externallinkbuffer.cxx b/oox/source/xls/externallinkbuffer.cxx index 93e4fb3cf86b..8f79b8007973 100644 --- a/oox/source/xls/externallinkbuffer.cxx +++ b/oox/source/xls/externallinkbuffer.cxx @@ -1015,12 +1015,6 @@ ExternalLinkRef ExternalLinkBuffer::importExternalBook( BiffInputStream& rStrm ) return xExtLink; } -void ExternalLinkBuffer::importExternalName( BiffInputStream& rStrm ) -{ - if( !maLinks.empty() ) - maLinks.back()->importExternalName( rStrm ); -} - void ExternalLinkBuffer::importExternSheet8( BiffInputStream& rStrm ) { OSL_ENSURE( getBiff() == BIFF8, "ExternalLinkBuffer::importExternSheet8 - wrong BIFF version" ); diff --git a/oox/source/xls/formulabase.cxx b/oox/source/xls/formulabase.cxx index 98925d766f6e..7cb36293d024 100644 --- a/oox/source/xls/formulabase.cxx +++ b/oox/source/xls/formulabase.cxx @@ -1480,15 +1480,6 @@ OUString FormulaProcessorBase::generateRangeList2dString( const ApiCellRangeList // ---------------------------------------------------------------------------- -OUString FormulaProcessorBase::generateApiRangeString( const CellRangeAddress& rRange ) const -{ - OUString aRangeName; - PropertySet aRangeProp( getCellRangeFromDoc( rRange ) ); - aRangeProp.getProperty( aRangeName, PROP_AbsoluteName ); - OSL_ENSURE( !aRangeName.isEmpty(), "FormulaProcessorBase::generateApiRangeString - cannot create cell range string" ); - return aRangeName; -} - OUString FormulaProcessorBase::generateApiString( const OUString& rString ) { OUString aRetString = rString; diff --git a/oox/source/xls/formulaparser.cxx b/oox/source/xls/formulaparser.cxx index a5ffd49ea266..abf89922de50 100644 --- a/oox/source/xls/formulaparser.cxx +++ b/oox/source/xls/formulaparser.cxx @@ -772,20 +772,6 @@ ApiToken& FormulaParserImpl::getOperandToken( size_t nOpCountFromEnd, size_t nOp return maTokenStorage[ *(aIndexIt + nTokenIndex) ]; } -void FormulaParserImpl::removeOperand( size_t nOpCountFromEnd, size_t nOpIndex ) -{ - OSL_ENSURE( (nOpIndex < nOpCountFromEnd) && (nOpCountFromEnd <= maOperandSizeStack.size()), - "FormulaParserImpl::removeOperand - invalid parameters" ); - // remove indexes into token storage, but do not touch storage itself - SizeTypeVector::iterator aSizeEnd = maOperandSizeStack.end(); - SizeTypeVector::iterator aSizeIt = aSizeEnd - nOpCountFromEnd + nOpIndex; - size_t nRemainingSize = 0; - for( SizeTypeVector::iterator aIt = aSizeIt + 1; aIt != aSizeEnd; ++aIt ) - nRemainingSize += *aIt; - maTokenIndexes.erase( maTokenIndexes.end() - nRemainingSize - *aSizeIt, maTokenIndexes.end() - nRemainingSize ); - maOperandSizeStack.erase( aSizeIt ); -} - bool FormulaParserImpl::pushOperandToken( sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces ) { size_t nSpacesSize = appendWhiteSpaceTokens( pSpaces ); diff --git a/oox/source/xls/stylesbuffer.cxx b/oox/source/xls/stylesbuffer.cxx index 53125499db08..91cd06535fd8 100644 --- a/oox/source/xls/stylesbuffer.cxx +++ b/oox/source/xls/stylesbuffer.cxx @@ -2614,18 +2614,6 @@ void Dxf::importNumFmt( const AttributeList& rAttribs ) mxNumFmt = getStyles().importNumFmt( rAttribs ); } -void Dxf::importAlignment( const AttributeList& rAttribs ) -{ - mxAlignment.reset( new Alignment( *this ) ); - mxAlignment->importAlignment( rAttribs ); -} - -void Dxf::importProtection( const AttributeList& rAttribs ) -{ - mxProtection.reset( new Protection( *this ) ); - mxProtection->importProtection( rAttribs ); -} - void Dxf::importDxf( SequenceInputStream& rStrm ) { sal_Int32 nNumFmtId = -1; diff --git a/oox/source/xls/workbookhelper.cxx b/oox/source/xls/workbookhelper.cxx index 675a6a17deda..1c018a880de1 100644 --- a/oox/source/xls/workbookhelper.cxx +++ b/oox/source/xls/workbookhelper.cxx @@ -759,20 +759,6 @@ Reference< XSpreadsheet > WorkbookHelper::getSheetFromDoc( const OUString& rShee return xSheet; } -Reference< XCell > WorkbookHelper::getCellFromDoc( const CellAddress& rAddress ) const -{ - Reference< XCell > xCell; - try - { - Reference< XSpreadsheet > xSheet( getSheetFromDoc( rAddress.Sheet ), UNO_SET_THROW ); - xCell = xSheet->getCellByPosition( rAddress.Column, rAddress.Row ); - } - catch( Exception& ) - { - } - return xCell; -} - Reference< XCellRange > WorkbookHelper::getCellRangeFromDoc( const CellRangeAddress& rRange ) const { Reference< XCellRange > xRange; @@ -931,12 +917,6 @@ bool WorkbookHelper::importOoxFragment( const ::rtl::Reference< FragmentHandler // BIFF specific -------------------------------------------------------------- -BinaryFilterBase& WorkbookHelper::getBiffFilter() const -{ - OSL_ENSURE( mrBookGlob.getFilterType() == FILTER_BIFF, "WorkbookHelper::getBiffFilter - invalid call" ); - return mrBookGlob.getBiffFilter(); -} - BiffType WorkbookHelper::getBiff() const { return mrBookGlob.getBiff(); @@ -947,11 +927,6 @@ rtl_TextEncoding WorkbookHelper::getTextEncoding() const return mrBookGlob.getTextEncoding(); } -void WorkbookHelper::setTextEncoding( rtl_TextEncoding eTextEnc ) -{ - mrBookGlob.setTextEncoding( eTextEnc ); -} - void WorkbookHelper::setCodePage( sal_uInt16 nCodePage ) { mrBookGlob.setCodePage( nCodePage ); diff --git a/oox/source/xls/worksheethelper.cxx b/oox/source/xls/worksheethelper.cxx index 14e7d2403eba..97ce24dab006 100644 --- a/oox/source/xls/worksheethelper.cxx +++ b/oox/source/xls/worksheethelper.cxx @@ -1408,46 +1408,6 @@ Reference< XSheetCellRanges > WorksheetHelper::getCellRangeList( const ApiCellRa return mrSheetGlob.getCellRangeList( rRanges ); } -CellAddress WorksheetHelper::getCellAddress( const Reference< XCell >& rxCell ) -{ - CellAddress aAddress; - Reference< XCellAddressable > xAddressable( rxCell, UNO_QUERY ); - OSL_ENSURE( xAddressable.is(), "WorksheetHelper::getCellAddress - cell reference not addressable" ); - if( xAddressable.is() ) - aAddress = xAddressable->getCellAddress(); - return aAddress; -} - -CellRangeAddress WorksheetHelper::getRangeAddress( const Reference< XCellRange >& rxRange ) -{ - CellRangeAddress aRange; - Reference< XCellRangeAddressable > xAddressable( rxRange, UNO_QUERY ); - OSL_ENSURE( xAddressable.is(), "WorksheetHelper::getRangeAddress - cell range reference not addressable" ); - if( xAddressable.is() ) - aRange = xAddressable->getRangeAddress(); - return aRange; -} - -Reference< XCellRange > WorksheetHelper::getColumn( sal_Int32 nCol ) const -{ - return mrSheetGlob.getColumn( nCol ); -} - -Reference< XCellRange > WorksheetHelper::getRow( sal_Int32 nRow ) const -{ - return mrSheetGlob.getRow( nRow ); -} - -Reference< XTableColumns > WorksheetHelper::getColumns( const ValueRange& rColRange ) const -{ - return mrSheetGlob.getColumns( rColRange ); -} - -Reference< XTableRows > WorksheetHelper::getRows( const ValueRange& rRowRange ) const -{ - return mrSheetGlob.getRows( rRowRange ); -} - Reference< XDrawPage > WorksheetHelper::getDrawPage() const { return mrSheetGlob.getDrawPage(); @@ -1664,12 +1624,6 @@ void WorksheetHelper::putFormulaResult( const CellAddress& rAddress, double fVal if( xCell.is() ) xCell->setFormulaResult( fValue ); } -void WorksheetHelper::putFormulaString( const CellAddress& rAddress, const OUString& rFormula ) const -{ - Reference< XCell2 > xCell( getCell( rAddress ), UNO_QUERY ); - if( xCell.is() ) xCell->setFormulaString( rFormula ); -} - void WorksheetHelper::putString( const CellAddress& rAddress, const OUString& rText ) const { Reference< XText > xText( getCell( rAddress ), UNO_QUERY ); diff --git a/unusedcode.easy b/unusedcode.easy index bd261888e280..df36cf74f9df 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1068,7 +1068,6 @@ connectivity::toString(com::sun::star::uno::Any const&) cppcanvas::internal::(anonymous namespace)::TransparencyGroupAction::TransparencyGroupAction(std::auto_ptr<GDIMetaFile>&, cppcanvas::Renderer::Parameters const&, basegfx::B2DPoint const&, basegfx::B2DVector const&, double, boost::shared_ptr<cppcanvas::Canvas> const&, cppcanvas::internal::OutDevState const&) cppcanvas::internal::ImplSprite::ImplSprite(com::sun::star::uno::Reference<com::sun::star::rendering::XSpriteCanvas> const&, com::sun::star::uno::Reference<com::sun::star::rendering::XAnimatedSprite> const&, boost::shared_ptr<cppcanvas::internal::ImplSpriteCanvas::TransformationArbiter> const&) cppcanvas::internal::ImplText::ImplText(boost::shared_ptr<cppcanvas::Canvas> const&, rtl::OUString const&) -dbaccess::OptimisticSet::getComposedTableName(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&) dbaui::getKeyColumns(com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> const&, int) dbtools::CharsetIteratorDerefHelper::CharsetIteratorDerefHelper() dbtools::DBTypeConversion::toINT64(com::sun::star::util::DateTime const&) @@ -1195,28 +1194,13 @@ oox::xls::CellBlock::isExpandable(oox::ValueRange const&) const oox::xls::CellBlock::startNextRow() oox::xls::Color::importColorRgb(oox::SequenceInputStream&) oox::xls::Comment::importAnchor(bool, int, rtl::OUString const&) -oox::xls::Dxf::importAlignment(oox::AttributeList const&) -oox::xls::Dxf::importProtection(oox::AttributeList const&) -oox::xls::ExternalLinkBuffer::importExternalName(oox::xls::BiffInputStream&) oox::xls::FormulaParser::convertNumberToHyperlink(rtl::OUString const&, double) const oox::xls::FormulaParser::importOleTargetLink(oox::xls::BiffInputStream&, unsigned short const*) const -oox::xls::FormulaParserImpl::removeOperand(unsigned long, unsigned long) -oox::xls::FormulaProcessorBase::generateApiRangeString(com::sun::star::table::CellRangeAddress const&) const oox::xls::ShapeAnchor::getToCell() const oox::xls::SheetDataBuffer::XfIdRange::set(com::sun::star::table::CellAddress const&, int, int) oox::xls::SheetDataBuffer::XfIdRange::tryExpand(com::sun::star::table::CellAddress const&, int, int) oox::xls::SheetDataBuffer::XfIdRange::tryMerge(oox::xls::SheetDataBuffer::XfIdRange const&) oox::xls::SheetDataBuffer::XfIdRowRange::intersects(com::sun::star::table::CellRangeAddress const&) const -oox::xls::WorkbookHelper::getBiffFilter() const -oox::xls::WorkbookHelper::getCellFromDoc(com::sun::star::table::CellAddress const&) const -oox::xls::WorkbookHelper::setTextEncoding(unsigned short) -oox::xls::WorksheetHelper::getCellAddress(com::sun::star::uno::Reference<com::sun::star::table::XCell> const&) -oox::xls::WorksheetHelper::getColumn(int) const -oox::xls::WorksheetHelper::getColumns(oox::ValueRange const&) const -oox::xls::WorksheetHelper::getRangeAddress(com::sun::star::uno::Reference<com::sun::star::table::XCellRange> const&) -oox::xls::WorksheetHelper::getRow(int) const -oox::xls::WorksheetHelper::getRows(oox::ValueRange const&) const -oox::xls::WorksheetHelper::putFormulaString(com::sun::star::table::CellAddress const&, rtl::OUString const&) const oox::xls::Xf::hasAnyUsedFlags() const pdfi::createOdfEmitter(com::sun::star::uno::Reference<com::sun::star::io::XOutputStream> const&) psp::GetCommandLineTokenCount(rtl::OString const&) |