diff options
Diffstat (limited to 'sc/source')
-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 | ||||
-rw-r--r-- | sc/source/ui/inc/autofmt.hxx | 7 | ||||
-rw-r--r-- | sc/source/ui/inc/condformatdlgentry.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/dbnamdlg.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/inc/filtdlg.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/inc/mvtabdlg.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/inc/namedlg.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/inc/tpview.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/validate.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/mvtabdlg.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/optdlg/calcoptionsdlg.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/sidebar/AlignmentPropertyPanel.hxx | 1 |
16 files changed, 1 insertions, 63 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), diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx index 6beebfd9b994..4f0b96a876df 100644 --- a/sc/source/ui/inc/autofmt.hxx +++ b/sc/source/ui/inc/autofmt.hxx @@ -95,13 +95,6 @@ private: SAL_DLLPRIVATE void MakeFonts(sal_uInt16 nIndex, vcl::Font& rFont, vcl::Font& rCJKFont, vcl::Font& rCTLFont ); - - SAL_DLLPRIVATE void CheckPriority(sal_uInt16 nCurLine, AutoFmtLine eLine, editeng::SvxBorderLine& rLine); - SAL_DLLPRIVATE void GetLines(sal_uInt16 nIndex, AutoFmtLine eLine, - editeng::SvxBorderLine& rLineD, editeng::SvxBorderLine& rLineLT, - editeng::SvxBorderLine& rLineL, editeng::SvxBorderLine& rLineLB, - editeng::SvxBorderLine& rLineRT, editeng::SvxBorderLine& rLineR, - editeng::SvxBorderLine& rLineRB); }; #endif // INCLUDED_SC_SOURCE_UI_INC_AUTOFMT_HXX diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index d5c78f92ab9e..5bb04e32721c 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -57,8 +57,6 @@ protected: ScDocument* mpDoc; ScAddress maPos; - DECL_LINK( EdModifyHdl, Edit* ); - virtual void Select(); virtual void Deselect(); diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index 41fb9a5f91b4..68154228fb02 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -84,7 +84,6 @@ private: ScDBCollection aLocalDbCol; ScRange theCurArea; std::vector<ScRange> aRemoveList; - DECL_LINK( FocusToComoboxHdl, Timer* ); private: void Init(); diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index aeb9905f76dc..b7d0e060f807 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -218,7 +218,6 @@ private: DECL_LINK( FilterAreaSelHdl, ListBox* ); DECL_LINK( FilterAreaModHdl, formula::RefEdit* ); DECL_LINK( EndDlgHdl, Button* ); - DECL_LINK( ScrollHdl, ScrollBar* ); // Hack: RefInput control DECL_LINK_TYPED( TimeOutHdl, Idle*, void ); diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index c19d14a607bd..fa3e5ed2a051 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -40,7 +40,6 @@ public: bool GetRenameTable () const { return bRenameTable; } void GetTabNameString( OUString& rString ) const; void SetForceCopyTable (); - void EnableCopyTable (bool bFlag=true); void EnableRenameTable (bool bFlag=true); private: diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 1642311e60b6..467193d8d6f0 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -106,7 +106,6 @@ private: DECL_LINK( CancelBtnHdl, void * ); DECL_LINK( AddBtnHdl, void * ); DECL_LINK( RemoveBtnHdl, void * ); - DECL_LINK( SelectBtnHdl, void * ); DECL_LINK( EdModifyHdl, void * ); DECL_LINK( AssignGetFocusHdl, void * ); DECL_LINK( SelectionChangedHdl_Impl, void* ); diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index baece6cffd4a..2dc3667ae9ab 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -106,15 +106,11 @@ class ScTpLayoutOptions : public SfxTabPage SvxStringArray aUnitArr; - DECL_LINK( CBHdl, CheckBox* ); - DECL_LINK(MetricHdl, void *); DECL_LINK( AlignHdl, CheckBox* ); ScDocument *pDoc; - DECL_LINK( UpdateHdl, CheckBox* ); - ScTpLayoutOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ); public: diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 371d99369f76..d050942fb8bb 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -171,8 +171,6 @@ class ScValidationDlg { typedef ScRefHdlrImpl<ScValidationDlg, SfxTabDialog, false> ScValidationDlgBase; - DECL_LINK( OkHdl, Button * ); - ScTabViewShell *m_pTabVwSh; VclPtr<VclHBox> m_pHBox; sal_uInt16 m_nValuePageId; diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index b589a592f5a0..7948d09111f4 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -92,14 +92,6 @@ void ScMoveTableDlg::SetForceCopyTable() pBtnCopy->Disable(); } -void ScMoveTableDlg::EnableCopyTable(bool bFlag) -{ - if(bFlag) - pBtnCopy->Enable(); - else - pBtnCopy->Disable(); -} - void ScMoveTableDlg::EnableRenameTable(bool bFlag) { bRenameTable = bFlag; diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index 4d80e9657b0d..ff29e4bd9f6d 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -40,7 +40,6 @@ public: DECL_LINK( BtnAutomaticSelectHdl, void* ); DECL_LINK( DeviceSelHdl, void* ); - DECL_LINK( NumModifiedHdl, void * ); DECL_LINK( EditModifiedHdl, Edit * ); DECL_STATIC_LINK( ScCalcOptionsDialog, TestClickHdl, PushButton* ); DECL_LINK( AsZeroModifiedHdl, CheckBox*); diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx index 6702194630e1..42e4bcac6352 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx @@ -101,7 +101,6 @@ private: DECL_LINK( CBOXMergnCellClkHdl, void * ); DECL_LINK( CBOXWrapTextClkHdl, void * ); DECL_LINK( AngleModifiedHdl, void * ); - DECL_LINK( RotationHdl, void * ); DECL_LINK( ClickStackHdl, void * ); DECL_LINK( ReferenceEdgeHdl, Control* ); |