diff options
Diffstat (limited to 'sc/source/filter')
-rw-r--r-- | sc/source/filter/inc/addressconverter.hxx | 3 | ||||
-rw-r--r-- | sc/source/filter/inc/biffinputstream.hxx | 2 | ||||
-rw-r--r-- | sc/source/filter/inc/defnamesbuffer.hxx | 8 | ||||
-rw-r--r-- | sc/source/filter/inc/xestream.hxx | 3 | ||||
-rw-r--r-- | sc/source/filter/oox/defnamesbuffer.cxx | 19 |
5 files changed, 1 insertions, 34 deletions
diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx index abe6aecebb4c..25da7e98d24d 100644 --- a/sc/source/filter/inc/addressconverter.hxx +++ b/sc/source/filter/inc/addressconverter.hxx @@ -93,9 +93,6 @@ struct BinAddress inline explicit BinAddress( sal_Int32 nCol, sal_Int32 nRow ) : mnCol( nCol ), mnRow( nRow ) {} inline explicit BinAddress( const ::com::sun::star::table::CellAddress& rAddr ) : mnCol( rAddr.Column ), mnRow( rAddr.Row ) {} - inline void set( sal_Int32 nCol, sal_Int32 nRow ) { mnCol = nCol; mnRow = nRow; } - inline void set( const ::com::sun::star::table::CellAddress& rAddr ) { mnCol = rAddr.Column; mnRow = rAddr.Row; } - void read( SequenceInputStream& rStrm ); void read( BiffInputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false ); }; diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx index 74c1c890bd68..13f9dbaa5e03 100644 --- a/sc/source/filter/inc/biffinputstream.hxx +++ b/sc/source/filter/inc/biffinputstream.hxx @@ -329,8 +329,6 @@ public: bool restorePosition(); - inline BiffInputStream& getStream() { return mrStrm; } - private: BiffInputStream& mrStrm; sal_Int64 mnRecHandle; diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx index 187a46adda83..0eee4f55e910 100644 --- a/sc/source/filter/inc/defnamesbuffer.hxx +++ b/sc/source/filter/inc/defnamesbuffer.hxx @@ -84,14 +84,6 @@ public: ::com::sun::star::uno::Any getReference( const ::com::sun::star::table::CellAddress& rBaseAddr ) const; protected: - /** Converts the OOXML formula string stored in the own model. */ - ApiTokenSequence importOoxFormula( sal_Int16 nBaseSheet ); - /** Imports the BIFF12 formula from the passed stream. */ - ApiTokenSequence importBiff12Formula( sal_Int16 nBaseSheet, SequenceInputStream& rStrm ); - /** Imports the BIFF formula from the passed stream. */ - ApiTokenSequence importBiffFormula( sal_Int16 nBaseSheet, BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize = 0 ); - -protected: DefinedNameModel maModel; /// Model data for this defined name. mutable OUString maUpModelName; /// Model name converted to uppercase ASCII. OUString maCalcName; /// Final name used in the Calc document. diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 77d79a88bf4f..ac75f7f033ce 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -350,8 +350,7 @@ public: SAX_ARGS_FUNC_SUBST( arg, convert, 13 ) SAX_ARGS_FUNC_SUBST( arg, convert, 14 ) \ SAX_ARGS_FUNC_SUBST( arg, convert, 15 ) SAX_ARGS_FUNC_SUBST( arg, convert, 16 ) \ SAX_ARGS_FUNC_SUBST( arg, convert, 17 ) SAX_ARGS_FUNC_SUBST( arg, convert, 18 ) \ - SAX_ARGS_FUNC_SUBST( arg, convert, 19 ) SAX_ARGS_FUNC_SUBST( arg, convert, 20 ) \ - SAX_ARGS_FUNC_SUBST( arg, convert, 21 ) SAX_ARGS_FUNC_SUBST( arg, convert, 22 ) + SAX_ARGS_FUNC_SUBST( arg, convert, 19 ) SAX_ARGS_FUNC_SUBST( arg, convert, 20 ) SAX_ARGS_FUNC( const char*, ) SAX_ARGS_FUNC( const OString&, .getStr() ) #undef SAX_ARGS_FUNC_DECL diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index 69cf01a18b51..20bb85281fa3 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -227,25 +227,6 @@ Any DefinedNameBase::getReference( const CellAddress& rBaseAddr ) const return Any(); } -ApiTokenSequence DefinedNameBase::importOoxFormula( sal_Int16 nBaseSheet ) -{ - return (!maModel.maFormula.isEmpty()) ? - getFormulaParser().importFormula( CellAddress( nBaseSheet, 0, 0 ), maModel.maFormula ) : - getFormulaParser().convertErrorToFormula( BIFF_ERR_NAME ); -} - -ApiTokenSequence DefinedNameBase::importBiff12Formula( sal_Int16 nBaseSheet, SequenceInputStream& rStrm ) -{ - return getFormulaParser().importFormula( CellAddress( nBaseSheet, 0, 0 ), FORMULATYPE_DEFINEDNAME, rStrm ); -} - -ApiTokenSequence DefinedNameBase::importBiffFormula( sal_Int16 nBaseSheet, BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize ) -{ - return (!pnFmlaSize || (*pnFmlaSize > 0)) ? - getFormulaParser().importFormula( CellAddress( nBaseSheet, 0, 0 ), FORMULATYPE_DEFINEDNAME, rStrm, pnFmlaSize ) : - getFormulaParser().convertErrorToFormula( BIFF_ERR_NAME ); -} - DefinedName::DefinedName( const WorkbookHelper& rHelper ) : DefinedNameBase( rHelper ), mpScRangeData(NULL), |