diff options
author | Noel Grandin <noel@peralex.com> | 2014-06-12 14:06:28 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-06-17 10:55:17 +0200 |
commit | 3e82897353e576dc6e3fbf55371fda5a0c3415df (patch) | |
tree | 71c2f03128885000efae1852dccb504f8355c79e /svx | |
parent | ec95abf2d8afeec38c9225ea49caa0e08d82b504 (diff) |
improve the inlinesimplememberfunctions clang plugin
Change-Id: I6d5a952901648e01904ef5c37f953c517304d31e
Diffstat (limited to 'svx')
27 files changed, 6 insertions, 145 deletions
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 3f9ded6faf37..ccea64fb5b29 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,svx,\ i18nlangtag \ i18nutil \ sal \ + salhelper \ sfx \ sot \ svl \ diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 49c1a1d4c310..63dde670fe5f 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -1306,10 +1306,6 @@ OUString -uno::Reference< drawing::XShape > AccessibleShape::GetXShape() -{ - return( mxShape ); -} diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx index 4a89f38da17a..4c2c31f40872 100644 --- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx @@ -86,11 +86,6 @@ void AccessibleShapeTreeInfo::SetDocumentWindow ( -uno::Reference<XAccessibleComponent> - AccessibleShapeTreeInfo::GetDocumentWindow (void) const -{ - return mxDocumentWindow; -} @@ -104,11 +99,6 @@ void AccessibleShapeTreeInfo::SetControllerBroadcaster ( -uno::Reference<document::XEventBroadcaster> - AccessibleShapeTreeInfo::GetControllerBroadcaster (void) const -{ - return mxModelBroadcaster; -} @@ -122,11 +112,6 @@ void AccessibleShapeTreeInfo::SetModelBroadcaster ( -Reference<document::XEventBroadcaster> - AccessibleShapeTreeInfo::GetModelBroadcaster (void) const -{ - return mxModelBroadcaster; -} @@ -152,11 +137,6 @@ void AccessibleShapeTreeInfo::SetController ( -Reference<frame::XController> - AccessibleShapeTreeInfo::GetController (void) const -{ - return mxController; -} diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 656c50c28fe2..c0d01aacc604 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -732,10 +732,6 @@ void SvxShowCharSet::ReleaseAccessible() } -ScrollBar* SvxShowCharSet::getScrollBar() -{ - return &aVscrollSB; -} sal_Int32 SvxShowCharSet::getMaxCharCount() const { diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 0ace4bf3ea66..ddc9e0cc2bd8 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -641,10 +641,6 @@ void SvxRectCtl::Reset() // Returns the currently selected RECT_POINT -RECT_POINT SvxRectCtl::GetActualRP() const -{ - return( eRP ); -} void SvxRectCtl::SetActualRP( RECT_POINT eNewRP ) { diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index d9db1f8921aa..1459ef1bbb1b 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -628,10 +628,6 @@ const basegfx::B3DHomMatrix& E3dObject::GetFullTransform() const return maFullTransform; } -const basegfx::B3DHomMatrix& E3dObject::GetTransform() const -{ - return maTransformation; -} void E3dObject::NbcSetTransform(const basegfx::B3DHomMatrix& rMatrix) { diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index 25bea99cf298..16a57671eba3 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -286,10 +286,6 @@ bool SdrCustomShapeGeometryItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMe else return true; } -const uno::Sequence< beans::PropertyValue >& SdrCustomShapeGeometryItem::GetGeometry() const -{ - return aPropSeq; -} SdrCustomShapeReplacementURLItem::SdrCustomShapeReplacementURLItem() : SfxStringItem( SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, "" ) diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index 97ac53b7a452..d690f2ae8c0c 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -250,9 +250,5 @@ void SvxZoomSliderItem::AddSnappingPoint( sal_Int32 nNew ) pValues[ nValues ] = nNew; } -const com::sun::star::uno::Sequence < sal_Int32 >& SvxZoomSliderItem::GetSnappingPoints() const -{ - return maValues; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx index e74326c5d487..67241aa45cd2 100644 --- a/svx/source/sdr/contact/objectcontact.cxx +++ b/svx/source/sdr/contact/objectcontact.cxx @@ -148,10 +148,6 @@ namespace sdr } // method to get the primitiveAnimator - sdr::animation::primitiveAnimator& ObjectContact::getPrimitiveAnimator() - { - return maPrimitiveAnimator; - } // method to get the EventHandler. It will // return a existing one or create a new one using CreateEventHandler(). diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index 109cb5bdce99..bd152cf66849 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -1321,10 +1321,6 @@ IMPL_LINK(AreaPropertyPanel, ModifyTransparentHdl_Impl, void*, EMPTYARG) } -Color AreaPropertyPanel::GetLastColor (void) const -{ - return maLastColor; -} diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx index bd6677d732fc..13f76b577a66 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.hxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx @@ -177,7 +177,7 @@ private: void Update(); void ImpUpdateTransparencies(); - Color GetLastColor (void) const; + const Color& GetLastColor (void) const { return maLastColor;} void SetColor ( const OUString& rsColorName, const Color aColor); diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index b819b00833f0..eecb7d2c44ca 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -163,10 +163,6 @@ void NBOTypeMgrBase::StoreBulCharFmtName_impl() { } } } -OUString NBOTypeMgrBase::GetBulCharFmtName() -{ - return aNumCharFmtName; -} void NBOTypeMgrBase::ImplLoad(const OUString& filename) { bIsLoading = true; diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx index 4486cfe35950..dbcc1eb0206c 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.cxx +++ b/svx/source/sidebar/text/TextPropertyPanel.cxx @@ -82,10 +82,6 @@ TextPropertyPanel* TextPropertyPanel::Create ( rContext); } -::sfx2::sidebar::ControllerItem& TextPropertyPanel::GetSpaceController() -{ - return maSpacingControl; -} TextPropertyPanel::TextPropertyPanel ( Window* pParent, const cssu::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const ::sfx2::sidebar::EnumContext& /*rContext*/ ) : PanelLayout(pParent, "SidebarTextPanel", "svx/ui/sidebartextpanel.ui", rxFrame), @@ -298,10 +294,6 @@ void TextPropertyPanel::NotifyItemUpdate ( } } -Color& TextPropertyPanel::GetUnderlineColor() -{ - return meUnderlineColor; -} } } // end of namespace svx::sidebar diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx index a863e0848dc5..9bd78bc6a2d9 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.hxx +++ b/svx/source/sidebar/text/TextPropertyPanel.hxx @@ -54,11 +54,11 @@ public: virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE; - ::sfx2::sidebar::ControllerItem& GetSpaceController(); + ::sfx2::sidebar::ControllerItem& GetSpaceController() { return maSpacingControl;} long GetSelFontSize(); void EndSpacingPopupMode (void); void EndUnderlinePopupMode (void); - Color& GetUnderlineColor(); + Color& GetUnderlineColor() { return meUnderlineColor;} virtual void HandleContextChange ( diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index 963d7feb6a50..98d700d463dd 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -369,10 +369,6 @@ void SdrPaintWindow::DrawOverlay(const Region& rRegion) } } -const Region& SdrPaintWindow::GetRedrawRegion() const -{ - return maRedrawRegion; -} void SdrPaintWindow::SetRedrawRegion(const Region& rNew) { diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 4b80ef0044e7..dac12e7a6341 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -1876,10 +1876,6 @@ void SdrModel::SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTabl ImpSetOutlinerDefaults( pHitTestOutliner ); } -rtl::Reference<SvxForbiddenCharactersTable> SdrModel::GetForbiddenCharsTable() const -{ - return mpForbiddenCharactersTable; -} void SdrModel::SetCharCompressType( sal_uInt16 nType ) { diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index c18f84c716ac..d8513d51d136 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -2680,10 +2680,6 @@ void SdrObject::SetMarkProtect(bool bProt) -bool SdrObject::IsPrintable() const -{ - return !bNoPrint; -} void SdrObject::SetEmptyPresObj(bool bEpt) @@ -3231,10 +3227,6 @@ bool SdrObject::HasLineStyle() const // usually this data makes no sence after the import is finished, since the object // might be resized -Rectangle SdrObject::GetBLIPSizeRectangle() const -{ - return maBLIPSizeRectangle; -} void SdrObject::SetBLIPSizeRectangle( const Rectangle& aRect ) { diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 4b1c22b490c5..75e8b470a813 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -649,15 +649,7 @@ bool SdrGrafObj::IsLinkedGraphic() const return !aFileName.isEmpty(); } -const OUString& SdrGrafObj::GetFileName() const -{ - return aFileName; -} -const OUString& SdrGrafObj::GetFilterName() const -{ - return aFilterName; -} void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index dbe91a6c2843..04f52ebcd2a4 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1197,10 +1197,6 @@ bool SdrPageProperties::isUsedByModel() const return mpSdrPage->IsInserted(); } -const SfxItemSet& SdrPageProperties::GetItemSet() const -{ - return *mpProperties; -} void SdrPageProperties::PutItemSet(const SfxItemSet& rSet) { diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index 39ffbaa5e02a..addcc38352ca 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -951,10 +951,6 @@ void SdrPageView::SetApplicationBackgroundColor(Color aBackgroundColor) maBackgroundColor = aBackgroundColor; } -Color SdrPageView::GetApplicationBackgroundColor() const -{ - return maBackgroundColor; -} // Set document color for svx at SdrPageViews void SdrPageView::SetApplicationDocumentColor(Color aDocumentColor) @@ -962,10 +958,6 @@ void SdrPageView::SetApplicationDocumentColor(Color aDocumentColor) maDocumentColor = aDocumentColor; } -Color SdrPageView::GetApplicationDocumentColor() const -{ - return maDocumentColor; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 3e09f9d64fb4..e80b179b1b44 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -1250,10 +1250,6 @@ void SdrPaintView::VisAreaChanged(const SdrPageWindow& /*rWindow*/) Broadcast(SvxViewHint(SvxViewHint::SVX_HINT_VIEWCHANGED)); } -const svtools::ColorConfig& SdrPaintView::getColorConfig() const -{ - return maColorConfig; -} void SdrPaintView::onChangeColorConfig() { @@ -1265,10 +1261,6 @@ void SdrPaintView::SetGridColor( Color aColor ) maGridColor = aColor; } -Color SdrPaintView::GetGridColor() const -{ - return maGridColor; -} // Set background color for svx at SdrPageViews void SdrPaintView::SetApplicationBackgroundColor(Color aBackgroundColor) diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index e73b316caa40..9bb5cfc41da7 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -1430,10 +1430,6 @@ void SdrView::ConfigurationChanged( ::utl::ConfigurationBroadcaster*p, sal_uInt3 SdrCreateView::ConfigurationChanged(p, nHint); } -SvtAccessibilityOptions& SdrView::getAccessibilityOptions() -{ - return maAccessibilityOptions; -} /** method is called whenever the global SvtAccessibilityOptions is changed */ void SdrView::onAccessibilityOptionsChanged() diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 54dbea75e293..eafd2e52f468 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -581,10 +581,6 @@ sal_Int32 SAL_CALL AccessibleCell::getAccessibleIndexInParent (void) throw (Runt return mnIndexInParent; } -sdr::table::CellRef AccessibleCell::getCellRef() -{ - return mxCell; -} OUString AccessibleCell::getCellName( sal_Int32 nCol, sal_Int32 nRow ) { diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index e417d710221b..dba2e091f508 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -72,7 +72,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - sdr::table::CellRef getCellRef(); + sdr::table::CellRef getCellRef() { return mxCell;} void UpdateChildren(); OUString getCellName( sal_Int32 nCol, sal_Int32 nRow ); diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index d62d58d7c113..1e854d5cedae 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -136,7 +136,7 @@ public: void addRange( SvxUnoTextRangeBase* pNewRange ); void removeRange( SvxUnoTextRangeBase* pOldRange ); - const SvxUnoTextRangeBaseList& getRanges() const; + const SvxUnoTextRangeBaseList& getRanges() const { return maTextRanges;} void lock(); void unlock(); @@ -264,10 +264,6 @@ void SvxTextEditSourceImpl::removeRange( SvxUnoTextRangeBase* pOldRange ) -const SvxUnoTextRangeBaseList& SvxTextEditSourceImpl::getRanges() const -{ - return maTextRanges; -} diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 20c60e1387e2..d5af6f29f6b8 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -730,10 +730,6 @@ SvStream& XLineDashItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const return rOut; } -const XDash& XLineDashItem::GetDashValue() const -{ - return aDash; -} SfxItemPresentation XLineDashItem::GetPresentation ( @@ -1334,10 +1330,6 @@ SvStream& XLineStartItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const return rOut; } -basegfx::B2DPolyPolygon XLineStartItem::GetLineStartValue() const -{ - return maPolyPolygon; -} SfxItemPresentation XLineStartItem::GetPresentation ( @@ -1692,10 +1684,6 @@ SvStream& XLineEndItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const return rOut; } -basegfx::B2DPolyPolygon XLineEndItem::GetLineEndValue() const -{ - return maPolyPolygon; -} /** this function searches in both the models pool and the styles pool for XLineStartItem and XLineEndItem with the same value or name and returns an item with the value of @@ -3119,10 +3107,6 @@ SvStream& XFillHatchItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const return rOut; } -const XHatch& XFillHatchItem::GetHatchValue() const // GetValue -> GetHatchValue -{ - return aHatch; -} SfxItemPresentation XFillHatchItem::GetPresentation ( diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 71dbdba847df..3070c497d20b 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -370,10 +370,6 @@ SvStream& XFillBitmapItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) cons return rOut; } -const GraphicObject& XFillBitmapItem::GetGraphicObject() const -{ - return maGraphicObject; -} void XFillBitmapItem::SetGraphicObject(const GraphicObject& rGraphicObject) { |