diff options
Diffstat (limited to 'sc/source/ui/inc')
27 files changed, 58 insertions, 58 deletions
diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx index 75bd457b4ad0..d5206a5fc60a 100644 --- a/sc/source/ui/inc/AccessibleCell.hxx +++ b/sc/source/ui/inc/AccessibleCell.hxx @@ -169,7 +169,7 @@ private: ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); bool IsSelected(); - ScDocument* GetDocument(ScTabViewShell* mpViewShell); + static ScDocument* GetDocument(ScTabViewShell* mpViewShell); ::std::unique_ptr< SvxEditSource > CreateEditSource(ScTabViewShell* pViewShell, ScAddress aCell, ScSplitPos eSplitPos); diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index a8f3180b3090..a181c241c276 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -109,7 +109,7 @@ protected: ScCsvControl& implGetControl() const; /** Returns the first child of rxParentObj, which has the role nRole. */ - XAccessibleRef implGetChildByRole( const XAccessibleRef& rxParentObj, sal_uInt16 nRole ) + static XAccessibleRef implGetChildByRole( const XAccessibleRef& rxParentObj, sal_uInt16 nRole ) throw( ::com::sun::star::uno::RuntimeException ); /** Creates a StateSetHelper and fills it with DEFUNC, OPAQUE, ENABLED, SHOWING and VISIBLE. */ ::utl::AccessibleStateSetHelper* implCreateStateSet(); diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index 0d47e004205c..154aaa11eafe 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -312,7 +312,7 @@ private: void RemoveChild(const com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessible>& xAcc, bool bFireEvent); OUString GetCurrentCellName() const; - OUString GetCurrentCellDescription() const; + static OUString GetCurrentCellDescription(); Rectangle GetVisibleArea_Impl() const; com::sun::star::uno::Sequence< com::sun::star::uno::Any > GetScAccFlowToSequence(); diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index b74360f5c743..3bc2d3c43772 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -291,8 +291,8 @@ private: void CreateSortedMarkedCells(); void AddMarkedRange(const ScRange& rRange); - ScDocument* GetDocument(ScTabViewShell* pViewShell); - Rectangle GetVisArea(ScTabViewShell* pViewShell, ScSplitPos eSplitPos); + static ScDocument* GetDocument(ScTabViewShell* pViewShell); + static Rectangle GetVisArea(ScTabViewShell* pViewShell, ScSplitPos eSplitPos); Rectangle GetVisCells(const Rectangle& rVisArea); typedef std::vector<ScMyAddress> VEC_MYADDR; @@ -339,8 +339,8 @@ public: bool IsScAddrFormulaSel (const ScAddress &addr) const; bool IsFormulaMode(); ScMyAddress CalcScAddressFromRangeList(ScRangeList *pMarkedRanges,sal_Int32 nSelectedChildIndex); - bool CalcScRangeDifferenceMax(ScRange *pSrc,ScRange *pDest,int nMax,VEC_MYADDR &vecRet,int &nSize); - bool CalcScRangeListDifferenceMax(ScRangeList *pSrc,ScRangeList *pDest,int nMax,VEC_MYADDR &vecRet); + static bool CalcScRangeDifferenceMax(ScRange *pSrc,ScRange *pDest,int nMax,VEC_MYADDR &vecRet,int &nSize); + static bool CalcScRangeListDifferenceMax(ScRangeList *pSrc,ScRangeList *pDest,int nMax,VEC_MYADDR &vecRet); }; #endif diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index 2d4601b6c92b..649e79e17261 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -105,7 +105,7 @@ private: ScAccessibleCell* mpAccessibleCell; using ScAccessibleCellBaseTextData::GetDocShell; - ScDocShell* GetDocShell(ScTabViewShell* pViewShell); + static ScDocShell* GetDocShell(ScTabViewShell* pViewShell); }; class ScAccessibleEditObjectTextData : public ScAccessibleTextData @@ -179,7 +179,7 @@ private: ScPreviewShell* mpViewShell; using ScAccessibleCellBaseTextData::GetDocShell; - ScDocShell* GetDocShell(ScPreviewShell* pViewShell); + static ScDocShell* GetDocShell(ScPreviewShell* pViewShell); }; class ScAccessiblePreviewHeaderCellTextData : public ScAccessibleCellBaseTextData @@ -205,7 +205,7 @@ private: bool mbRowHeader; using ScAccessibleCellBaseTextData::GetDocShell; - ScDocShell* GetDocShell(ScPreviewShell* pViewShell); + static ScDocShell* GetDocShell(ScPreviewShell* pViewShell); }; class ScAccessibleHeaderTextData : public ScAccessibleTextData diff --git a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx index 0b1d068149aa..3a5d75bab737 100644 --- a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx +++ b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx @@ -42,7 +42,7 @@ private: AnovaFactor meFactor; - void RowColumn(ScRangeList& rRangeList, AddressWalkerWriter& aOutput, + static void RowColumn(ScRangeList& rRangeList, AddressWalkerWriter& aOutput, FormulaTemplate& aTemplate, OUString& sFormula, GroupedBy aGroupedBy, ScRange* pResultRange); diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 833b541709dc..0c2363a0b5a1 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -89,9 +89,9 @@ public: inline void SetWindow(vcl::Window* _pWindow) { m_pWindow = _pWindow; } bool DoClose( sal_uInt16 nId ); - void SetDispatcherLock( bool bLock ); - void EnableSpreadsheets( bool bFlag = true, bool bChildren = true ); - void ViewShellChanged(); + static void SetDispatcherLock( bool bLock ); + static void EnableSpreadsheets( bool bFlag = true, bool bChildren = true ); + static void ViewShellChanged(); static void enableInput(bool _bInput); @@ -99,7 +99,7 @@ protected: vcl::Window* GetWindow(){ return m_pWindow; } public: - bool CanInputStart( const formula::RefEdit *pEdit ){ return !!pEdit; } + static bool CanInputStart( const formula::RefEdit *pEdit ){ return !!pEdit; } bool CanInputDone( bool bForced ){ return pRefEdit && (bForced || !pRefBtn); } }; @@ -129,7 +129,7 @@ private: protected: bool DoClose( sal_uInt16 nId ); - void SetDispatcherLock( bool bLock ); + static void SetDispatcherLock( bool bLock ); virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE; virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; @@ -166,7 +166,7 @@ public: public: bool EnterRefMode(); bool LeaveRefMode(); - inline bool CanInputStart( const formula::RefEdit *pEdit ); + static inline bool CanInputStart( const formula::RefEdit *pEdit ); inline bool CanInputDone( bool bForced ); }; @@ -310,7 +310,7 @@ struct ScAnyRefDlg : ::ScRefHdlrImpl< ScAnyRefDlg, SfxModelessDialog> inline bool ScRefHandler::CanInputStart( const formula::RefEdit *pEdit ) { - return m_aHelper.CanInputStart( pEdit ); + return ScFormulaReferenceHelper::CanInputStart( pEdit ); } inline bool ScRefHandler::CanInputDone( bool bForced ) diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx index 2318cf86acc5..3beb0784296a 100644 --- a/sc/source/ui/inc/cellsh.hxx +++ b/sc/source/ui/inc/cellsh.hxx @@ -104,7 +104,7 @@ public: void ExecutePage( SfxRequest& rReq ); void ExecutePageSel( SfxRequest& rReq ); void ExecuteMove( SfxRequest& rReq ); - void GetStateCursor( SfxItemSet& rSet ); + static void GetStateCursor( SfxItemSet& rSet ); }; #endif diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index e0d1e8cb187f..22ddf7ddeea1 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -108,11 +108,11 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry, public SfxListener DECL_LINK( OnEdChanged, Edit* ); // Searches the lookup table for the entry position, given condition mode - sal_Int32 ConditionModeToEntryPos( ScConditionMode eMode ) const; + static sal_Int32 ConditionModeToEntryPos( ScConditionMode eMode ); // Accesses the lookup table for the condition mode, given entry position - ScConditionMode EntryPosToConditionMode( sal_Int32 aEntryPos ) const; + static ScConditionMode EntryPosToConditionMode( sal_Int32 aEntryPos ); // Returns the number of edit fields used for a given condition mode - sal_Int32 GetNumberEditFields( ScConditionMode eMode ) const; + static sal_Int32 GetNumberEditFields( ScConditionMode eMode ); protected: virtual void Select() SAL_OVERRIDE; diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index 3c429d11a021..229c12055b42 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -145,7 +145,7 @@ private: OUString GetActionString( const ScChangeAction* pAction, ScDocument* pDoc ); void HandleListBoxSelection( bool bSelectHandle ); - void SetConflictAction( SvTreeListEntry* pRootEntry, ScConflictAction eConflictAction ); + static void SetConflictAction( SvTreeListEntry* pRootEntry, ScConflictAction eConflictAction ); void KeepHandler( bool bMine ); void KeepAllHandler( bool bMine ); diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index c71f7e979927..0c09811eb3dd 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -97,8 +97,8 @@ private: DECL_LINK( ModifyHdl, formula::RefEdit* ); DECL_LINK( SelectHdl, ListBox* ); - ScSubTotalFunc LbPosToFunc( sal_uInt16 nPos ); - sal_uInt16 FuncToLbPos( ScSubTotalFunc eFunc ); + static ScSubTotalFunc LbPosToFunc( sal_uInt16 nPos ); + static sal_uInt16 FuncToLbPos( ScSubTotalFunc eFunc ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_CONSDLG_HXX diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index f0c8be5e8374..f103f12c4de0 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -245,7 +245,7 @@ public: void AsciiSave( SvStream& rStream, const ScImportOptions& rOpt ); void GetSbxState( SfxItemSet &rSet ); - void GetDrawObjState( SfxItemSet &rSet ); + static void GetDrawObjState( SfxItemSet &rSet ); void Execute( SfxRequest& rReq ); void GetState( SfxItemSet &rSet ); @@ -276,7 +276,7 @@ public: void NotifyStyle( const SfxStyleSheetHint& rHint ); void DoAutoStyle( const ScRange& rRange, const OUString& rStyle ); - vcl::Window* GetActiveDialogParent(); + static vcl::Window* GetActiveDialogParent(); void ErrorMessage( sal_uInt16 nGlobStrId ); bool IsEditable() const; @@ -419,7 +419,7 @@ public: void SetSolverSaveData( const ScOptSolverSave& rData ); ScSheetSaveData* GetSheetSaveData(); - void ResetKeyBindings( ScOptionsUtil::KeyBindingType eType ); + static void ResetKeyBindings( ScOptionsUtil::KeyBindingType eType ); // password protection for Calc (derived from SfxObjectShell) // see also: FID_CHG_RECORD, SID_CHG_PROTECT diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index 3f12fe64bb86..ec203b227a52 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.hxx @@ -59,7 +59,7 @@ public: ScDrawShell(ScViewData* pData); virtual ~ScDrawShell(); - void StateDisableItems( SfxItemSet &rSet ); + static void StateDisableItems( SfxItemSet &rSet ); void ExecDrawAttr(SfxRequest& rReq); void GetDrawAttrState(SfxItemSet &rSet); @@ -85,7 +85,7 @@ public: ScDrawView* GetDrawView(); - bool AreAllObjectsOnLayer(sal_uInt16 nLayerNo,const SdrMarkList& rMark); + static bool AreAllObjectsOnLayer(sal_uInt16 nLayerNo,const SdrMarkList& rMark); void GetDrawAttrStateForIFBX( SfxItemSet& rSet ); ::rtl::OUString GetSidebarContextName(); diff --git a/sc/source/ui/inc/drtxtob.hxx b/sc/source/ui/inc/drtxtob.hxx index 65dbeadfe3a3..16c718c0b32c 100644 --- a/sc/source/ui/inc/drtxtob.hxx +++ b/sc/source/ui/inc/drtxtob.hxx @@ -52,7 +52,7 @@ public: ScDrawTextObjectBar(ScViewData* pData); virtual ~ScDrawTextObjectBar(); - void StateDisableItems( SfxItemSet &rSet ); + static void StateDisableItems( SfxItemSet &rSet ); void Execute( SfxRequest &rReq ); void ExecuteTrans( SfxRequest& rReq ); @@ -73,7 +73,7 @@ public: private: void ExecuteGlobal( SfxRequest &rReq ); // called by Execute for all objects - void GetGlobalClipState( SfxItemSet& rSet ); + static void GetGlobalClipState( SfxItemSet& rSet ); void ExecutePasteContents( SfxRequest &rReq ); bool IsNoteEdit(); }; diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index b525b189c18f..0f069f8d435c 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -102,10 +102,10 @@ public: protected: virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE; - void SaveLRUEntry(const ScFuncDesc* pFuncDesc); + static void SaveLRUEntry(const ScFuncDesc* pFuncDesc); - bool IsInputHdl(ScInputHandler* pHdl); - ScInputHandler* GetNextInputHandler(ScDocShell* pDocShell,PtrTabViewShell* ppViewSh); + static bool IsInputHdl(ScInputHandler* pHdl); + static ScInputHandler* GetNextInputHandler(ScDocShell* pDocShell,PtrTabViewShell* ppViewSh); }; #endif // INCLUDED_SC_SOURCE_UI_INC_FORMULA_HXX diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index e38ca5c08f74..d6edc1c4c73b 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -100,7 +100,7 @@ public: virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); protected: - void ImpForceQuadratic(Rectangle& rRect); + static void ImpForceQuadratic(Rectangle& rRect); public: // #i33136# diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index e311e15f8141..3aca0c89fefd 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -142,7 +142,7 @@ public: bool ImportStream( SvStream&, const OUString& rBaseURL, SotClipboardFormatId=SotClipboardFormatId::STRING ); bool ExportStream( SvStream&, const OUString& rBaseURL, SotClipboardFormatId=SotClipboardFormatId::STRING ); - bool ImportData( const OUString& rMimeType, + static bool ImportData( const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ); bool ExportData( const OUString& rMimeType, ::com::sun::star::uno::Any & rValue ); diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index dfad789dcf40..e5820b8ed39d 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -134,7 +134,7 @@ private: bool StartTable( sal_Unicode cTyped, bool bFromCommand, bool bInputActivated ); void RemoveSelection(); void UpdateFormulaMode(); - void InvalidateAttribs(); + static void InvalidateAttribs(); void ImplCreateEditEngine(); DECL_LINK( DelayTimer, Timer* ); void GetColData(); diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index bd1650a3e877..aba78346df6b 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -285,7 +285,7 @@ protected: virtual void SetText( const OUString& rString ) SAL_OVERRIDE; virtual OUString GetText() const SAL_OVERRIDE; - bool UseSubTotal( ScRangeList* pRangeList ) const; + static bool UseSubTotal( ScRangeList* pRangeList ); bool IsPointerAtResizePos(); private: VclPtr<ScPosWnd> aWndPos; diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx index f87e3dd99519..f9827f8dc63c 100644 --- a/sc/source/ui/inc/namemgrtable.hxx +++ b/sc/source/ui/inc/namemgrtable.hxx @@ -56,7 +56,7 @@ private: InitListener* mpInitListener; - void GetLine(ScRangeNameLine& aLine, SvTreeListEntry* pEntry); + static void GetLine(ScRangeNameLine& aLine, SvTreeListEntry* pEntry); void Init(); void CheckForFormulaString(); const ScRangeData* findRangeData(const ScRangeNameLine& rLine); diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index a7d801741c0c..cb23e7ab61b9 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -140,9 +140,9 @@ private: void EvalText (); void ExecuteCol (); - SCCOL AlphaToNum ( OUString& rStr ); - SCCOL NumStrToAlpha ( OUString& rStr ); - SCCOL NumToAlpha ( SCCOL nColNo, OUString& rStr ); + static SCCOL AlphaToNum ( OUString& rStr ); + static SCCOL NumStrToAlpha ( OUString& rStr ); + static SCCOL NumToAlpha ( SCCOL nColNo, OUString& rStr ); }; // class RowEdit @@ -272,8 +272,8 @@ private: void SetCurrentObject( const OUString& rName ); void SetCurrentDoc( const OUString& rDocName ); - ScTabViewShell* GetTabViewShell() const; - ScNavigatorSettings* GetNavigatorSettings(); + static ScTabViewShell* GetTabViewShell(); + static ScNavigatorSettings* GetNavigatorSettings(); bool GetViewData(); void UpdateColumn ( const SCCOL* pCol = NULL ); diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index a5f25ec50955..fa0cc5dfc913 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -95,8 +95,8 @@ private: void RemoveFromDefinedList(); void SetSelectDefinedList(); bool IsPageEntry(EditEngine*pEngine, EditTextObject* pTextObj); - bool IsDateEntry(EditTextObject* pTextObj); - bool IsExtFileNameEntry(EditTextObject* pTextObj); + static bool IsDateEntry(EditTextObject* pTextObj); + static bool IsExtFileNameEntry(EditTextObject* pTextObj); DECL_LINK( ListHdl_Impl, ListBox* ); DECL_LINK( ClickHdl, PushButton* ); DECL_LINK( MenuHdl, ScExtIButton* ); diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index 98109e1cf086..7b00360bcfd1 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -304,7 +304,7 @@ public: void UpdateDrawTextOutliner(); void DigitLanguageChanged(); - void UpdateInputLine(); + static void UpdateInputLine(); void InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eType, bool bPaint = true ); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index c06fdf2a44d9..4bc50e5ed59a 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -278,7 +278,7 @@ public: void GetImageMapState( SfxItemSet& rSet ); void ExecTbx( SfxRequest& rReq ); - void GetTbxState( SfxItemSet& rSet ); + static void GetTbxState( SfxItemSet& rSet ); void ExecuteSave( SfxRequest& rReq ); void GetSaveState( SfxItemSet& rSet ); @@ -287,8 +287,8 @@ public: void ExecuteUndo(SfxRequest& rReq); void GetUndoState(SfxItemSet &rSet); - void ExecuteSbx( SfxRequest& rReq ); - void GetSbxState( SfxItemSet& rSet ); + static void ExecuteSbx( SfxRequest& rReq ); + static void GetSbxState( SfxItemSet& rSet ); void ExecuteObject(SfxRequest& rReq); void GetObjectState(SfxItemSet &rSet); @@ -382,11 +382,11 @@ public: void ForceMove() { Move(); } - SvxNumberInfoItem* MakeNumberInfoItem( ScDocument* pDoc, ScViewData* pViewData ); + static SvxNumberInfoItem* MakeNumberInfoItem( ScDocument* pDoc, ScViewData* pViewData ); - void UpdateNumberFormatter ( const SvxNumberInfoItem& rInfoItem ); + static void UpdateNumberFormatter( const SvxNumberInfoItem& rInfoItem ); - void ExecuteCellFormatDlg ( SfxRequest& rReq, const OString &rTabPage = OString()); + void ExecuteCellFormatDlg( SfxRequest& rReq, const OString &rTabPage = OString()); bool GetFunction( OUString& rFuncStr, sal_uInt16 nErrCode = 0 ); diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index ecc8e0305483..a54536c11f79 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -65,8 +65,8 @@ protected: private: void Init (); void FillListBoxes (); - ScSubTotalFunc LbPosToFunc ( sal_uInt16 nPos ); - sal_uInt16 FuncToLbPos ( ScSubTotalFunc eFunc ); + static ScSubTotalFunc LbPosToFunc ( sal_uInt16 nPos ); + static sal_uInt16 FuncToLbPos ( ScSubTotalFunc eFunc ); sal_uInt16 GetFieldSelPos ( SCCOL nField ); // Handler ------------------------ diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 682fc0c3421f..a0c8663df0d9 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -85,7 +85,7 @@ private: void Init (); size_t UpdateUserListBox (); void UpdateEntries ( size_t nList ); - void MakeListStr ( OUString& rListStr ); + static void MakeListStr ( OUString& rListStr ); void AddNewList ( const OUString& rEntriesStr ); void RemoveList ( size_t nList ); void ModifyList ( size_t nSelList, diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index c768dbcfc393..2e696f189014 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -340,7 +340,7 @@ public: void UpdateSelectionArea( const ScMarkData& rSel, ScPatternAttr* pAttr = NULL ); // Internal helper functions protected: - void UpdateLineAttrs( ::editeng::SvxBorderLine& rLine, + static void UpdateLineAttrs( ::editeng::SvxBorderLine& rLine, const ::editeng::SvxBorderLine* pDestLine, const ::editeng::SvxBorderLine* pSrcLine, bool bColor ); |