From 3e82897353e576dc6e3fbf55371fda5a0c3415df Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 12 Jun 2014 14:06:28 +0200 Subject: improve the inlinesimplememberfunctions clang plugin Change-Id: I6d5a952901648e01904ef5c37f953c517304d31e --- sc/source/ui/app/scmod.cxx | 8 -------- sc/source/ui/cctrl/checklistmenu.cxx | 8 -------- sc/source/ui/dbgui/PivotLayoutDialog.cxx | 4 ---- sc/source/ui/docshell/externalrefmgr.cxx | 4 ---- sc/source/ui/inc/PivotLayoutDialog.hxx | 2 +- sc/source/ui/inc/checklistmenu.hxx | 4 ++-- sc/source/ui/inc/gridwin.hxx | 2 +- sc/source/ui/inc/preview.hxx | 2 +- sc/source/ui/inc/solveroptions.hxx | 3 ++- sc/source/ui/inc/tabview.hxx | 7 +++++-- sc/source/ui/inc/tphfedit.hxx | 2 +- sc/source/ui/inc/undocell.hxx | 2 +- sc/source/ui/inc/viewdata.hxx | 4 ++-- sc/source/ui/miscdlgs/solveroptions.cxx | 5 ----- sc/source/ui/optdlg/calcoptionsdlg.cxx | 4 ---- sc/source/ui/optdlg/calcoptionsdlg.hxx | 2 +- sc/source/ui/pagedlg/tphfedit.cxx | 4 ---- sc/source/ui/undo/undocell2.cxx | 4 ---- sc/source/ui/unoobj/textuno.cxx | 4 ---- sc/source/ui/view/gridwin.cxx | 1 - sc/source/ui/view/preview.cxx | 5 ----- sc/source/ui/view/tabview.cxx | 5 ----- sc/source/ui/view/tabview5.cxx | 5 ----- sc/source/ui/view/viewdata.cxx | 5 ----- 24 files changed, 17 insertions(+), 79 deletions(-) (limited to 'sc/source/ui') diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index a64d075b2541..b070c3697f7e 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -648,10 +648,6 @@ void ScModule::ResetDragObject() mpDragData->aJumpText = OUString(); } -const ScDragData& ScModule::GetDragData() const -{ - return *mpDragData; -} void ScModule::SetDragObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ) { @@ -679,10 +675,6 @@ void ScModule::SetDragJump( mpDragData->aJumpText = rText; } -const ScClipData& ScModule::GetClipData() const -{ - return *mpClipData; -} void ScModule::SetClipObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ) { diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index c4c6be5810fb..2e2413b367f6 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -428,10 +428,6 @@ void ScMenuFloatingWindow::drawAllMenuItems() } } -const Font& ScMenuFloatingWindow::getLabelFont() const -{ - return maLabelFont; -} void ScMenuFloatingWindow::executeMenuItem(size_t nPos) { @@ -656,10 +652,6 @@ void ScMenuFloatingWindow::setName(const OUString& rName) maName = rName; } -const OUString& ScMenuFloatingWindow::getName() const -{ - return maName; -} void ScMenuFloatingWindow::highlightMenuItem(size_t nPos, bool bSelected) { diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index dd9ca8a1d5b1..de2f4a623faf 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -596,10 +596,6 @@ ScDPLabelData* ScPivotLayoutDialog::GetLabelData(SCCOL nColumn) return &maPivotParameters.maLabelArray[nColumn]; } -ScDPLabelDataVector& ScPivotLayoutDialog::GetLabelDataVector() -{ - return maPivotParameters.maLabelArray; -} void ScPivotLayoutDialog::PushDataFieldNames(std::vector& rDataFieldNames) { diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index ab9a7b9b8d16..fae875483756 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -1103,10 +1103,6 @@ void ScExternalRefCache::addCacheDocToReferenced( sal_uInt16 nFileId ) } } -bool ScExternalRefCache::areAllCacheTablesReferenced() const -{ - return maReferenced.mbAllReferenced; -} void ScExternalRefCache::getAllCachedDataSpans( sal_uInt16 nFileId, sc::ColumnSpanSet& rSet ) const { diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index ace1ed5ffdb9..290773a317ff 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -127,7 +127,7 @@ public: bool IsDataElement(SCCOL nColumn); ScDPLabelData* GetLabelData(SCCOL nColumn); - ScDPLabelDataVector& GetLabelDataVector(); + ScDPLabelDataVector& GetLabelDataVector() { return maPivotParameters.maLabelArray;} void PushDataFieldNames(std::vector& rDataFieldNames); }; diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index d64c7015cd1b..b23da9aab1a3 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -68,7 +68,7 @@ public: size_t getSelectedMenuItem() const { return mnSelectedMenu;} void setName(const OUString& rName); - const OUString& getName() const; + const OUString& getName() const { return maName;} void executeMenuItem(size_t nPos); void getMenuItemPosSize(size_t nPos, Point& rPos, Size& rSize) const; @@ -81,7 +81,7 @@ protected: void drawMenuItem(size_t nPos); void drawSeparator(size_t nPos); void drawAllMenuItems(); - const Font& getLabelFont() const; + const Font& getLabelFont() const { return maLabelFont;} void queueLaunchSubMenu(size_t nPos, ScMenuFloatingWindow* pMenu); void queueCloseSubMenu(); diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 0a019357a5de..df03b88f525c 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -325,7 +325,7 @@ public: void FakeButtonUp(); - Point GetMousePosPixel() const; + Point GetMousePosPixel() const { return aCurMousePos; } void UpdateStatusPosSize(); void ClickExtern(); diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index 588149c9f6f4..bb5c79874979 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -163,7 +163,7 @@ public: virtual void SwitchView(); SC_DLLPUBLIC void SetSelectedTabs(const ScMarkData& rMark); - SC_DLLPUBLIC const ScMarkData::MarkedTabsType& GetSelectedTabs() const; + const ScMarkData::MarkedTabsType& GetSelectedTabs() const { return maSelectedTabs; } }; #endif diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index a31c653e4870..5b041b5062a5 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -62,7 +62,8 @@ public: const com::sun::star::uno::Sequence& rProperties ); virtual ~ScSolverOptionsDialog(); - const OUString& GetEngine() const; + // already updated in selection handler + const OUString& GetEngine() const { return maEngine; } const com::sun::star::uno::Sequence& GetProperties(); }; diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index d624759ba9f7..698087d38d4d 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -26,6 +26,8 @@ #include "hiranges.hxx" #include "viewutil.hxx" #include "select.hxx" +#include "gridwin.hxx" +#include "drawview.hxx" #include #include @@ -294,7 +296,8 @@ public: bool SelMouseButtonDown( const MouseEvent& rMEvt ); ScDrawView* GetScDrawView() { return pDrawView; } - SdrView* GetSdrView(); // gegen CLOKs + // gegen CLOKs + SdrView* GetSdrView() { return pDrawView; } bool IsMinimized() const { return bMinimized; } @@ -325,7 +328,7 @@ public: void FakeButtonUp( ScSplitPos eWhich ); ScGridWindow* GetActiveWin(); - Window* GetWindowByPos( ScSplitPos ePos ); + Window* GetWindowByPos( ScSplitPos ePos ) { return pGridWin[ePos]; } ScSplitPos FindWindow( Window* pWindow ) const; diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 5ca8953e0ced..3e60f12636da 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -124,7 +124,7 @@ public: void SetPopupMenu(PopupMenu* pPopUp); sal_uInt16 GetSelected() const { return nSelected;} - OString GetSelectedIdent() const; + OString GetSelectedIdent() const { return aSelectedIdent;} void SetMenuHdl( const Link& rLink ) { aMLink = rLink; } const Link& GetMenuHdl() const { return aMLink; } diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx index 380079f894bf..6995bf3ef325 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.hxx @@ -385,7 +385,7 @@ public: virtual bool CanRepeat( SfxRepeatTarget& ) const SAL_OVERRIDE; virtual OUString GetComment() const SAL_OVERRIDE; - CellValues& GetOldValues(); + CellValues& GetOldValues() { return maOldValues;} void SetNewValues( const std::vector& rVals ); }; diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 6a86e46720e3..34c62927bc87 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -23,6 +23,7 @@ #include "rangelst.hxx" #include "scdllapi.h" #include "viewopti.hxx" +#include "docsh.hxx" #include @@ -232,8 +233,7 @@ public: ScDocFunc& GetDocFunc() const; ScDBFunc* GetView() const { return pView; } ScTabViewShell* GetViewShell() const { return pViewShell; } - - SfxObjectShell* GetSfxDocShell() const; + SfxObjectShell* GetSfxDocShell() const { return pDocShell; } SfxBindings& GetBindings(); // from ViewShell's ViewFrame SfxDispatcher& GetDispatcher(); // from ViewShell's ViewFrame diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index ad004b017cbd..7a25b5aeed62 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -162,11 +162,6 @@ ScSolverOptionsDialog::~ScSolverOptionsDialog() delete mpCheckButtonData; } -const OUString& ScSolverOptionsDialog::GetEngine() const -{ - return maEngine; // already updated in selection handler -} - const uno::Sequence& ScSolverOptionsDialog::GetProperties() { // update maProperties from list box content diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index e5057af8148b..0a996e54b574 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -188,10 +188,6 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(Window* pParent, const ScCalcConfig& rC ScCalcOptionsDialog::~ScCalcOptionsDialog() {} -const ScCalcConfig& ScCalcOptionsDialog::GetConfig() const -{ - return maConfig; -} SvTreeListEntry *ScCalcOptionsDialog::createBoolItem(const OUString &rCaption, bool bValue) const { diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index 9a0f5795fcfb..9097725bf4b6 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -36,7 +36,7 @@ public: DECL_LINK( BtnAutomaticSelectHdl, void* ); DECL_LINK( DeviceSelHdl, void* ); - const ScCalcConfig& GetConfig() const; + const ScCalcConfig& GetConfig() const { return maConfig;} private: void FillOptionsList(); diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 2c92ccc7bbe3..faf5c4eb18ba 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -351,10 +351,6 @@ void ScExtIButton::SetPopupMenu(PopupMenu* pPopUp) } -OString ScExtIButton::GetSelectedIdent() const -{ - return aSelectedIdent; -} void ScExtIButton::MouseButtonDown( const MouseEvent& rMEvt ) { diff --git a/sc/source/ui/undo/undocell2.cxx b/sc/source/ui/undo/undocell2.cxx index f4b5d9376ad2..0b45efc419e9 100644 --- a/sc/source/ui/undo/undocell2.cxx +++ b/sc/source/ui/undo/undocell2.cxx @@ -54,10 +54,6 @@ OUString UndoSetCells::GetComment() const return ScGlobal::GetRscString(STR_UNDO_ENTERDATA); } -CellValues& UndoSetCells::GetOldValues() -{ - return maOldValues; -} void UndoSetCells::SetNewValues( const std::vector& rVals ) { diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index 3211f4508e34..5b5dd354961d 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -253,10 +253,6 @@ void ScHeaderFooterTextData::UpdateData(EditEngine& rEditEngine) bDataValid = false; } -const EditTextObject* ScHeaderFooterTextData::GetTextObject() const -{ - return mpTextObj; -} ScHeaderFooterTextObj::ScHeaderFooterTextObj( ScHeaderFooterContentObj& rContent, sal_uInt16 nP, const EditTextObject* pTextObj) : diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 790f7499e3fb..d6730ae3917b 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -4777,7 +4777,6 @@ void ScGridWindow::LoseFocus() Window::LoseFocus(); } -Point ScGridWindow::GetMousePosPixel() const { return aCurMousePos; } bool ScGridWindow::HitRangeFinder( const Point& rMouse, RfCorner& rCorner, sal_uInt16* pIndex, SCsCOL* pAddX, SCsROW* pAddY) diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 0735c42de636..3b3c0ace8d63 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -1606,9 +1606,4 @@ void ScPreview::SetSelectedTabs(const ScMarkData& rMark) maSelectedTabs = rMark.GetSelectedTabs(); } -const ScMarkData::MarkedTabsType& ScPreview::GetSelectedTabs() const -{ - return maSelectedTabs; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index caaee2278c04..0777d419637d 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -866,11 +866,6 @@ ScGridWindow* ScTabView::GetActiveWin() return pGridWin[ePos]; } -Window* ScTabView::GetWindowByPos( ScSplitPos ePos ) -{ - return pGridWin[ePos]; -} - void ScTabView::SetActivePointer( const Pointer& rPointer ) { for (sal_uInt16 i=0; i<4; i++) diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 4fea5a32da98..563bd2cf5657 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -430,11 +430,6 @@ void ScTabView::ViewOptionsHasChanged( bool bHScrollChanged, bool bGraphicsChang // Helper-Funktion gegen das Include des Drawing Layers -SdrView* ScTabView::GetSdrView() -{ - return pDrawView; -} - void ScTabView::DrawMarkListHasChanged() { if ( pDrawView ) diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index d77d8cd54493..14d41550082e 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -2071,11 +2071,6 @@ void ScViewData::SetScreen( const Rectangle& rVisArea ) ( aScrSize.Height() * ScGlobal::nScreenPPTY / HMM_PER_TWIPS ); } -SfxObjectShell* ScViewData::GetSfxDocShell() const -{ - return pDocShell; -} - ScDocFunc& ScViewData::GetDocFunc() const { return pDocShell->GetDocFunc(); -- cgit