diff options
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/core/data/colcontainer.cxx | 7 | ||||
-rw-r--r-- | sc/source/core/data/colorscale.cxx | 8 | ||||
-rw-r--r-- | sc/source/core/data/table1.cxx | 8 | ||||
-rw-r--r-- | sc/source/filter/inc/addressconverter.hxx | 29 | ||||
-rw-r--r-- | sc/source/filter/inc/biffinputstream.hxx | 9 | ||||
-rw-r--r-- | sc/source/filter/inc/formulabuffer.hxx | 11 | ||||
-rw-r--r-- | sc/source/filter/inc/stylesbuffer.hxx | 4 | ||||
-rw-r--r-- | sc/source/filter/inc/worksheethelper.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/oox/addressconverter.cxx | 22 | ||||
-rw-r--r-- | sc/source/filter/oox/biffinputstream.cxx | 10 | ||||
-rw-r--r-- | sc/source/filter/oox/formulabuffer.cxx | 43 | ||||
-rw-r--r-- | sc/source/filter/oox/stylesbuffer.cxx | 24 | ||||
-rw-r--r-- | sc/source/filter/oox/worksheethelper.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.cxx | 1 | ||||
-rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.hxx | 5 |
15 files changed, 0 insertions, 193 deletions
diff --git a/sc/source/core/data/colcontainer.cxx b/sc/source/core/data/colcontainer.cxx index a4cf1c677953..7433240c8999 100644 --- a/sc/source/core/data/colcontainer.cxx +++ b/sc/source/core/data/colcontainer.cxx @@ -36,13 +36,6 @@ ScColContainer::~ScColContainer() } -bool ScColContainer::ColumnExists( SCCOL nColIdx ) const -{ - if ( nColIdx < 0 || nColIdx >= size() ) - return false; - return true; -} - void ScColContainer::Clear() { SCCOL nSize = size(); diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index 1a088851aa4f..72c016ce421b 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -276,14 +276,6 @@ void ScColorScaleEntry::UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt ) mpListener.reset(new ScFormulaListener(mpCell.get())); } -bool ScColorScaleEntry::NeedsRepaint() const -{ - if(mpListener) - return mpListener->NeedsRepaint(); - - return false; -} - void ScColorScaleEntry::SetColor(const Color& rColor) { maColor = rColor; diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index 277f6c139519..0eb5b19f7f08 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -2226,14 +2226,6 @@ void ScTable::DeleteBroadcasters( aCol[nCol].DeleteBroadcasters(rBlockPos, nRow1, nRow2); } -bool ScTable::HasBroadcaster( SCCOL nCol ) const -{ - if (!ValidCol(nCol)) - return false; - - return aCol[nCol].HasBroadcaster(); -} - void ScTable::FillMatrix( ScMatrix& rMat, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, svl::SharedStringPool* pPool ) const { size_t nMatCol = 0; diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx index 52d3c5929cdc..6213aa971664 100644 --- a/sc/source/filter/inc/addressconverter.hxx +++ b/sc/source/filter/inc/addressconverter.hxx @@ -90,7 +90,6 @@ struct BinAddress inline explicit BinAddress() : mnCol( 0 ), mnRow( 0 ) {} inline explicit BinAddress( sal_Int32 nCol, sal_Int32 nRow ) : mnCol( nCol ), mnRow( nRow ) {} - inline explicit BinAddress( const css::table::CellAddress& rAddr ) : mnCol( rAddr.Column ), mnRow( rAddr.Row ) {} inline explicit BinAddress( const ScAddress& rAddr ) : mnCol( rAddr.Col() ), mnRow( rAddr.Row() ) {} void read( SequenceInputStream& rStrm ); @@ -297,27 +296,11 @@ public: @return true = Cell address could be parsed from the passed string. */ static bool convertToCellAddressUnchecked( - css::table::CellAddress& orAddress, - const OUString& rString, - sal_Int16 nSheet ); - - /** Converts the passed string to a single cell address, without checking - any sheet limits. - - @param orAddress (out-parameter) Returns the converted cell address. - @param rString Cell address string in A1 notation. - @param nSheet Sheet index to be inserted into orAddress. - @return true = Cell address could be parsed from the passed string. - */ - static bool convertToCellAddressUnchecked( ScAddress& orAddress, const OUString& rString, sal_Int16 nSheet ); static bool convertToCellAddressUnchecked( - css::table::CellAddress& orAddress, const char* pStr, sal_Int16 nSheet ); - - static bool convertToCellAddressUnchecked( ScAddress& orAddress, const char* pStr, sal_Int16 nSheet ); /** Tries to convert the passed string to a single cell address. @@ -359,18 +342,6 @@ public: @param nSheet Sheet index to be inserted into orAddress. */ static void convertToCellAddressUnchecked( - css::table::CellAddress& orAddress, - const BinAddress& rBinAddress, - sal_Int16 nSheet ); - - /** Converts the passed address to a single cell address, without checking - any sheet limits. - - @param orAddress (out-parameter) Returns the converted cell address. - @param rBinAddress Binary cell address struct. - @param nSheet Sheet index to be inserted into orAddress. - */ - static void convertToCellAddressUnchecked( ScAddress& orAddress, const BinAddress& rBinAddress, sal_Int16 nSheet ); diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx index 997b5632c4ce..a46baca71954 100644 --- a/sc/source/filter/inc/biffinputstream.hxx +++ b/sc/source/filter/inc/biffinputstream.hxx @@ -335,15 +335,6 @@ private: sal_Int64 mnRecPos; }; -/** Stores the current position of the passed stream on construction and - restores it automatically on destruction. */ -class BiffInputStreamPosGuard : private BiffInputStreamPos -{ -public: - explicit BiffInputStreamPosGuard( BiffInputStream& rStrm ); - ~BiffInputStreamPosGuard(); -}; - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/formulabuffer.hxx b/sc/source/filter/inc/formulabuffer.hxx index b72dc086fa09..1cb323b7c217 100644 --- a/sc/source/filter/inc/formulabuffer.hxx +++ b/sc/source/filter/inc/formulabuffer.hxx @@ -123,30 +123,19 @@ private: public: explicit FormulaBuffer( const WorkbookHelper& rHelper ); void finalizeImport(); - void setCellFormula( const css::table::CellAddress& rAddress, const OUString& ); void setCellFormula( const ScAddress& rAddress, const OUString& ); void setCellFormula( - const css::table::CellAddress& rAddress, sal_Int32 nSharedId, - const OUString& rCellValue, sal_Int32 nValueType ); - void setCellFormula( const ScAddress& rAddress, sal_Int32 nSharedId, const OUString& rCellValue, sal_Int32 nValueType ); void setCellFormulaValue( - const css::table::CellAddress& rAddress, const OUString& rValueStr, sal_Int32 nCellType ); - void setCellFormulaValue( const ScAddress& rAddress, const OUString& rValueStr, sal_Int32 nCellType ); void setCellArrayFormula( const css::table::CellRangeAddress& rRangeAddress, - const css::table::CellAddress& rTokenAddress, - const OUString& ); - void setCellArrayFormula( const css::table::CellRangeAddress& rRangeAddress, const ScAddress& rTokenAddress, const OUString& ); - void createSharedFormulaMapEntry( const css::table::CellAddress& rAddress, - sal_Int32 nSharedId, const OUString& rTokens ); void createSharedFormulaMapEntry( const ScAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokens ); diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index b4813386cce8..8090953328df 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -468,8 +468,6 @@ public: /** Writes all border attributes to the passed property map. */ void writeToPropertyMap( PropertyMap& rPropMap ) const; - bool hasBorder() const; - private: /** Returns the border line struct specified by the passed XML token identifier. */ BorderLineModel* getBorderLine( sal_Int32 nElement ); @@ -657,8 +655,6 @@ public: /** Writes all formatting attributes to the passed property map. */ void writeToPropertyMap( PropertyMap& rPropMap ) const; - /** Writes all formatting attributes to the passed property set. */ - void writeToPropertySet( PropertySet& rPropSet ) const; void writeToDoc( ScDocumentImport& rDoc, const css::table::CellRangeAddress& rRange ); diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx index a00e4e48c30c..96230596aec5 100644 --- a/sc/source/filter/inc/worksheethelper.hxx +++ b/sc/source/filter/inc/worksheethelper.hxx @@ -289,8 +289,6 @@ public: /** Inserts a formula cell directly into the Calc sheet. */ void putFormulaTokens( - const css::table::CellAddress& rAddress, const ApiTokenSequence& rTokens ); - void putFormulaTokens( const ScAddress& rAddress, const ApiTokenSequence& rTokens ); /** Initial conversion before importing the worksheet. */ diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx index 5c434c5b6cdb..8036d58421b1 100644 --- a/sc/source/filter/oox/addressconverter.cxx +++ b/sc/source/filter/oox/addressconverter.cxx @@ -349,20 +349,6 @@ bool AddressConverter::checkCellAddress( const ScAddress& rAddress, bool bTrackO checkRow( rAddress.Row(), bTrackOverflow ); } -bool AddressConverter::convertToCellAddressUnchecked( CellAddress& orAddress, - const OUString& rString, sal_Int16 nSheet ) -{ - orAddress.Sheet = nSheet; - return parseOoxAddress2d( orAddress.Column, orAddress.Row, rString ); -} - -bool AddressConverter::convertToCellAddressUnchecked( - css::table::CellAddress& orAddress, const char* pStr, sal_Int16 nSheet ) -{ - orAddress.Sheet = nSheet; - return parseOoxAddress2d(orAddress.Column, orAddress.Row, pStr); -} - bool AddressConverter::convertToCellAddressUnchecked( ScAddress& orAddress, const OUString& rString, sal_Int16 nSheet ) { @@ -420,14 +406,6 @@ ScAddress AddressConverter::createValidCellAddress( return aAddress; } -void AddressConverter::convertToCellAddressUnchecked( CellAddress& orAddress, - const BinAddress& rBinAddress, sal_Int16 nSheet ) -{ - orAddress.Sheet = nSheet; - orAddress.Column = rBinAddress.mnCol; - orAddress.Row = rBinAddress.mnRow; -} - void AddressConverter::convertToCellAddressUnchecked( ScAddress& orAddress, const BinAddress& rBinAddress, sal_Int16 nSheet ) { diff --git a/sc/source/filter/oox/biffinputstream.cxx b/sc/source/filter/oox/biffinputstream.cxx index c9840ba2f84d..0607e067e669 100644 --- a/sc/source/filter/oox/biffinputstream.cxx +++ b/sc/source/filter/oox/biffinputstream.cxx @@ -492,16 +492,6 @@ void BiffInputStreamPos::restorePosition() mrStrm.seek( mnRecPos ); } -BiffInputStreamPosGuard::BiffInputStreamPosGuard( BiffInputStream& rStrm ) : - BiffInputStreamPos( rStrm ) -{ -} - -BiffInputStreamPosGuard::~BiffInputStreamPosGuard() -{ - restorePosition(); -} - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index 14e3f45eaa1c..b265093696ea 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -467,16 +467,6 @@ FormulaBuffer::SheetItem FormulaBuffer::getSheetItem( SCTAB nTab ) } void FormulaBuffer::createSharedFormulaMapEntry( - const table::CellAddress& rAddress, - sal_Int32 nSharedId, const OUString& rTokens ) -{ - assert( rAddress.Sheet >= 0 && (size_t)rAddress.Sheet < maSharedFormulas.size() ); - std::vector<SharedFormulaEntry>& rSharedFormulas = maSharedFormulas[ rAddress.Sheet ]; - SharedFormulaEntry aEntry(rAddress, rTokens, nSharedId); - rSharedFormulas.push_back( aEntry ); -} - -void FormulaBuffer::createSharedFormulaMapEntry( const ScAddress& rAddress, sal_Int32 nSharedId, const OUString& rTokens ) { @@ -486,12 +476,6 @@ void FormulaBuffer::createSharedFormulaMapEntry( rSharedFormulas.push_back( aEntry ); } -void FormulaBuffer::setCellFormula( const css::table::CellAddress& rAddress, const OUString& rTokenStr ) -{ - assert( rAddress.Sheet >= 0 && (size_t)rAddress.Sheet < maCellFormulas.size() ); - maCellFormulas[ rAddress.Sheet ].push_back( TokenAddressItem( rTokenStr, rAddress ) ); -} - void FormulaBuffer::setCellFormula( const ScAddress& rAddress, const OUString& rTokenStr ) { assert( rAddress.Tab() >= 0 && (size_t)rAddress.Tab() < maCellFormulas.size() ); @@ -499,14 +483,6 @@ void FormulaBuffer::setCellFormula( const ScAddress& rAddress, const OUString& r } void FormulaBuffer::setCellFormula( - const table::CellAddress& rAddress, sal_Int32 nSharedId, const OUString& rCellValue, sal_Int32 nValueType ) -{ - assert( rAddress.Sheet >= 0 && (size_t)rAddress.Sheet < maSharedFormulaIds.size() ); - maSharedFormulaIds[rAddress.Sheet].push_back( - SharedFormulaDesc(rAddress, nSharedId, rCellValue, nValueType)); -} - -void FormulaBuffer::setCellFormula( const ScAddress& rAddress, sal_Int32 nSharedId, const OUString& rCellValue, sal_Int32 nValueType ) { assert( rAddress.Tab() >= 0 && (size_t)rAddress.Tab() < maSharedFormulaIds.size() ); @@ -514,14 +490,6 @@ void FormulaBuffer::setCellFormula( SharedFormulaDesc(rAddress, nSharedId, rCellValue, nValueType)); } -void FormulaBuffer::setCellArrayFormula( const css::table::CellRangeAddress& rRangeAddress, const css::table::CellAddress& rTokenAddress, const OUString& rTokenStr ) -{ - - TokenAddressItem tokenPair( rTokenStr, rTokenAddress ); - assert( rRangeAddress.Sheet >= 0 && (size_t)rRangeAddress.Sheet < maCellArrayFormulas.size() ); - maCellArrayFormulas[ rRangeAddress.Sheet ].push_back( TokenRangeAddressItem( tokenPair, rRangeAddress ) ); -} - void FormulaBuffer::setCellArrayFormula( const css::table::CellRangeAddress& rRangeAddress, const ScAddress& rTokenAddress, const OUString& rTokenStr ) { @@ -531,17 +499,6 @@ void FormulaBuffer::setCellArrayFormula( const css::table::CellRangeAddress& rRa } void FormulaBuffer::setCellFormulaValue( - const css::table::CellAddress& rAddress, const OUString& rValueStr, sal_Int32 nCellType ) -{ - assert( rAddress.Sheet >= 0 && (size_t)rAddress.Sheet < maCellFormulaValues.size() ); - FormulaValue aVal; - aVal.maCellAddress = ScAddress ( rAddress.Column, rAddress.Row, rAddress.Sheet ); - aVal.maValueStr = rValueStr; - aVal.mnCellType = nCellType; - maCellFormulaValues[rAddress.Sheet].push_back(aVal); -} - -void FormulaBuffer::setCellFormulaValue( const ScAddress& rAddress, const OUString& rValueStr, sal_Int32 nCellType ) { assert( rAddress.Tab() >= 0 && (size_t)rAddress.Tab() < maCellFormulaValues.size() ); diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 6b056a08fd55..f6eaddfdbf76 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -1629,23 +1629,6 @@ void Border::writeToPropertyMap( PropertyMap& rPropMap ) const } } -bool Border::hasBorder() const -{ - if (lcl_isBorder(maApiData.maBottom)) - return true; - - if (lcl_isBorder(maApiData.maTop)) - return true; - - if (lcl_isBorder(maApiData.maLeft)) - return true; - - if (lcl_isBorder(maApiData.maRight)) - return true; - - return false; -} - BorderLineModel* Border::getBorderLine( sal_Int32 nElement ) { switch( nElement ) @@ -2228,13 +2211,6 @@ void Xf::writeToPropertyMap( PropertyMap& rPropMap ) const rStyles.writeFillToPropertyMap( rPropMap, maModel.mnFillId ); } -void Xf::writeToPropertySet( PropertySet& rPropSet ) const -{ - PropertyMap aPropMap; - writeToPropertyMap( aPropMap ); - rPropSet.setProperties( aPropMap ); -} - void Xf::writeToDoc( ScDocumentImport& rDoc, const table::CellRangeAddress& rRange ) { const StylesBuffer& rStyles = getStyles(); diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index cda819bafa0f..81c92e00ff8e 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -1622,16 +1622,6 @@ void WorksheetHelper::putRichString( const ScAddress& rAddress, const RichString getDocImport().setEditCell(rAddress, rString.convert(rEE, pFirstPortionFont)); } -void WorksheetHelper::putFormulaTokens( const CellAddress& rAddress, const ApiTokenSequence& rTokens ) -{ - ScDocumentImport& rDoc = getDocImport(); - ScTokenArray aTokenArray; - ScAddress aCellPos; - ScUnoConversion::FillScAddress( aCellPos, rAddress ); - ScTokenConversion::ConvertToTokenArray(rDoc.getDoc(), aTokenArray, rTokens); - rDoc.setFormulaCell(aCellPos, new ScTokenArray(aTokenArray)); -} - void WorksheetHelper::putFormulaTokens( const ScAddress& rAddress, const ApiTokenSequence& rTokens ) { ScDocumentImport& rDoc = getDocImport(); diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 5b26fecc6330..af6b1cd82ec6 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -73,7 +73,6 @@ #include "xmlsourcedlg.hxx" #include "editutil.hxx" -IMPL_ABSTDLG_BASE(ScVclAbstractDialog_Impl); IMPL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl); IMPL_ABSTDLG_BASE(AbstractScColRowLabelDlg_Impl); diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index d2d3626e44f1..95294ae1470e 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -98,11 +98,6 @@ long Class::GetResult() \ return pDlg->GetResult(); \ } -class ScVclAbstractDialog_Impl : public VclAbstractDialog -{ - DECL_ABSTDLG_BASE(ScVclAbstractDialog_Impl,Dialog) -}; - class AbstractScImportAsciiDlg_Impl : public AbstractScImportAsciiDlg { DECL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl, ScImportAsciiDlg) |