diff options
Diffstat (limited to 'sw')
51 files changed, 49 insertions, 257 deletions
diff --git a/sw/inc/ToxWhitespaceStripper.hxx b/sw/inc/ToxWhitespaceStripper.hxx index 4e1061986166..bc8e8699c032 100644 --- a/sw/inc/ToxWhitespaceStripper.hxx +++ b/sw/inc/ToxWhitespaceStripper.hxx @@ -39,7 +39,7 @@ public: GetPositionInStrippedString(sal_Int32 pos) const; OUString - GetStrippedString() const; + GetStrippedString() const { return mStripped;} private: OUString mStripped; diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx index 28da2cabb061..425952bd824b 100644 --- a/sw/inc/anchoreddrawobject.hxx +++ b/sw/inc/anchoreddrawobject.hxx @@ -141,7 +141,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject // accessors to the object area and its position virtual const SwRect GetObjRect() const SAL_OVERRIDE; // Return value can be NULL. - const Rectangle* GetLastObjRect() const; + const Rectangle* GetLastObjRect() const { return mpLastObjRect;} void SetLastObjRect( const Rectangle& _rNewObjRect ); diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx index fcc5c1b0868e..14750c879437 100644 --- a/sw/inc/anchoredobject.hxx +++ b/sw/inc/anchoredobject.hxx @@ -214,11 +214,11 @@ class SW_DLLPUBLIC SwAnchoredObject // accessors to member <mpDrawObj> void SetDrawObj( SdrObject& _rDrawObj ); - const SdrObject* GetDrawObj() const; + const SdrObject* GetDrawObj() const { return mpDrawObj;} SdrObject* DrawObj() { return mpDrawObj;} // accessors to member <mpAnchorFrm> - const SwFrm* GetAnchorFrm() const; + const SwFrm* GetAnchorFrm() const { return mpAnchorFrm;} SwFrm* AnchorFrm() { return mpAnchorFrm;} void ChgAnchorFrm( SwFrm* _pNewAnchorFrm ); /** determine anchor frame containing the anchor position @@ -233,7 +233,7 @@ class SW_DLLPUBLIC SwAnchoredObject SwFrm* GetAnchorFrmContainingAnchPos(); SwPageFrm* GetPageFrm() { return mpPageFrm;} - const SwPageFrm* GetPageFrm() const; + const SwPageFrm* GetPageFrm() const { return mpPageFrm;} void SetPageFrm( SwPageFrm* _pNewPageFrm ); /** method to determine the page frame, on which the 'anchor' of @@ -291,7 +291,7 @@ class SW_DLLPUBLIC SwAnchoredObject void CheckCharRectAndTopOfLine( const bool _bCheckForParaPorInf = true ); // accessors to member <maLastCharRect> - const SwRect& GetLastCharRect() const; + const SwRect& GetLastCharRect() const { return maLastCharRect;} SwTwips GetRelCharX( const SwFrm* pFrm ) const; SwTwips GetRelCharY( const SwFrm* pFrm ) const; void AddLastCharY( long nDiff ); @@ -353,7 +353,7 @@ class SW_DLLPUBLIC SwAnchoredObject // accessors to the current relative position (relative to anchor // position of anchor frame) - const Point GetCurrRelPos() const; + const Point GetCurrRelPos() const { return maRelPos;} void SetCurrRelPos( Point _aRelPos ); // accessors to the format diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index 578615599cdf..63c92528b476 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -260,8 +260,8 @@ class SwDrawVirtObj : public SdrVirtObj SwDrawVirtObj& operator= (const SwDrawVirtObj& rObj); /// connection to writer layout - const SwAnchoredObject* GetAnchoredObj() const; - SwAnchoredObject* AnchoredObj(); + const SwAnchoredObject* GetAnchoredObj() const { return &maAnchoredDrawObj;} + SwAnchoredObject* AnchoredObj() { return &maAnchoredDrawObj;} const SwFrm* GetAnchorFrm() const; SwFrm* AnchorFrm(); void RemoveFromWriterLayout(); diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 7554ebf70277..217eddcceccc 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1862,7 +1862,7 @@ public: // access container for XForms model; will be NULL if !isXForms() com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> - getXForms() const; + getXForms() const { return mxXForms;} com::sun::star::uno::Reference< com::sun::star::linguistic2::XProofreadingIterator > GetGCIterator() const; diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 246971fc22fc..250be7f7fe46 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -474,12 +474,12 @@ public: /// Text virtual OUString GetPar2() const SAL_OVERRIDE; virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; - OUString GetTxt() const { return sTxt; } - OUString GetInitials() const; + const OUString& GetTxt() const { return sTxt; } + const OUString& GetInitials() const { return sInitials;} void SetName(const OUString& rStr); - OUString GetName() const; + const OUString& GetName() const { return sName;} - const OutlinerParaObject* GetTextObject() const; + const OutlinerParaObject* GetTextObject() const { return mpText;} void SetTextObject( OutlinerParaObject* pText ); sal_Int32 GetNumberOfParagraphs() const; diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx index f44c03af08a5..129fac481920 100644 --- a/sw/inc/flddropdown.hxx +++ b/sw/inc/flddropdown.hxx @@ -181,28 +181,28 @@ public: @return the selected item */ - OUString GetSelectedItem() const; + const OUString& GetSelectedItem() const { return aSelectedItem;} /** Returns the name of the field. @return the name of the field */ - OUString GetName() const; + const OUString& GetName() const { return aName;} /** Returns the help text of the field. @return the help text of the field */ - OUString GetHelp() const; + const OUString& GetHelp() const { return aHelp;} /** Returns the tool tip of the field. @return the tool tip of the field */ - OUString GetToolTip() const; + const OUString& GetToolTip() const { return aToolTip;} /** Sets the selected item. diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index b8e72f283042..d8c71d6c4479 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -243,7 +243,7 @@ public: SwAttrSet* pAutoAttr ); ///< in ndole.cxx /// Array of all OutlineNodes. - const SwOutlineNodes& GetOutLineNds() const; + const SwOutlineNodes& GetOutLineNds() const { return *pOutlineNds;} /// Update all Nodes - Rule/Format-Change. void UpdateOutlineNode(SwNode & rNd); diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 100c176ef588..212a612b9bdc 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -201,7 +201,7 @@ public: /// Returns the with our graphic attributes filled Graphic-Attr-Structure. GraphicAttr& GetGraphicAttr( GraphicAttr&, const SwFrm* pFrm ) const; - boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer(); + boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer() { return mpThreadConsumer;} bool IsLinkedInputStreamReady() const { return mbLinkedInputStreamReady;} void TriggerAsyncRetrieveInputStream(); void ApplyInputStream( diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx index 3142000f35b2..95a5c2a63190 100644 --- a/sw/inc/printdata.hxx +++ b/sw/inc/printdata.hxx @@ -248,7 +248,7 @@ public: void CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt, OutputDevice *pOutDev ); void DeletePostItData(); - SfxObjectShellLock const& GetTempDocShell() const; + SfxObjectShellLock const& GetTempDocShell() const { return m_xTempDocShell;} void SetTempDocShell(SfxObjectShellLock const&); bool IsViewOptionAdjust() const { return m_pViewOptionAdjust != 0; } diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index f36fb141ece3..33ebb321435f 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -635,7 +635,7 @@ public: void InvalidateSelection( const SwPageFrm* _pSelectedPageFrm ); - const SwRect& GetVisArea() const; + const SwRect& GetVisArea() const { return maVisArea;} /** Adjust the MapMode so that the preview page appears at the * proper position. rPoint identifies the page for which the @@ -723,10 +723,6 @@ struct ContainsPredicate } }; -const SwRect& SwAccPreviewData::GetVisArea() const -{ - return maVisArea; -} void SwAccPreviewData::AdjustMapMode( MapMode& rMapMode, const Point& rPoint ) const diff --git a/sw/source/core/doc/docxforms.cxx b/sw/source/core/doc/docxforms.cxx index 1d464830ab9e..db8d5c4428d0 100644 --- a/sw/source/core/doc/docxforms.cxx +++ b/sw/source/core/doc/docxforms.cxx @@ -44,10 +44,6 @@ using frame::XModule; using xforms::XFormsUIHelper1; using com::sun::star::container::XIndexAccess; -Reference<XNameContainer> SwDoc::getXForms() const -{ - return mxXForms; -} bool SwDoc::isXForms() const { diff --git a/sw/source/core/doc/list.cxx b/sw/source/core/doc/list.cxx index 4ccaf42aeeed..276def0ba06d 100644 --- a/sw/source/core/doc/list.cxx +++ b/sw/source/core/doc/list.cxx @@ -35,9 +35,9 @@ class SwListImpl const SwNodes& rNodes ); ~SwListImpl(); - const OUString GetListId() const; + const OUString GetListId() const { return msListId;} - const OUString GetDefaultListStyleName() const; + const OUString GetDefaultListStyleName() const { return msDefaultListStyleName;} void InsertListItem( SwNodeNum& rNodeNum, const int nLevel ); @@ -110,15 +110,7 @@ SwListImpl::~SwListImpl() } } -const OUString SwListImpl::GetListId() const -{ - return msListId; -} -const OUString SwListImpl::GetDefaultListStyleName() const -{ - return msDefaultListStyleName; -} void SwListImpl::InsertListItem( SwNodeNum& rNodeNum, const int nLevel ) diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx index 95edb7a82f75..905b91ff68af 100644 --- a/sw/source/core/docnode/ndnum.cxx +++ b/sw/source/core/docnode/ndnum.cxx @@ -90,9 +90,5 @@ void SwNodes::UpdtOutlineIdx( const SwNode& rNd ) UpdateOutlineNode( *(*pOutlineNds)[ nPos ]); } -const SwOutlineNodes & SwNodes::GetOutLineNds() const -{ - return *pOutlineNds; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index c9caf9d91db5..2f6dba71aca5 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -2171,18 +2171,6 @@ SwDrawVirtObj* SwDrawVirtObj::Clone() const return pObj; } -// connection to writer layout - -const SwAnchoredObject* SwDrawVirtObj::GetAnchoredObj() const -{ - return &maAnchoredDrawObj; -} - -SwAnchoredObject* SwDrawVirtObj::AnchoredObj() -{ - return &maAnchoredDrawObj; -} - const SwFrm* SwDrawVirtObj::GetAnchorFrm() const { // #i26791# - use new member <maAnchoredDrawObj> diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 7ae51794b71a..bd64283610f1 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -1727,25 +1727,13 @@ OUString SwPostItField::GetPar2() const return sTxt; } -OUString SwPostItField::GetInitials() const -{ - return sInitials; -} void SwPostItField::SetName(const OUString& rName) { sName = rName; } -OUString SwPostItField::GetName() const -{ - return sName; -} -const OutlinerParaObject* SwPostItField::GetTextObject() const -{ - return mpText; -} void SwPostItField::SetTextObject( OutlinerParaObject* pText ) { diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx index 0a6cd7e3bfde..c6840191c6a2 100644 --- a/sw/source/core/fields/flddropdown.cxx +++ b/sw/source/core/fields/flddropdown.cxx @@ -132,25 +132,9 @@ uno::Sequence<OUString> SwDropDownField::GetItemSequence() const return aSeq; } -OUString SwDropDownField::GetSelectedItem() const -{ - return aSelectedItem; -} -OUString SwDropDownField::GetName() const -{ - return aName; -} -OUString SwDropDownField::GetHelp() const -{ - return aHelp; -} -OUString SwDropDownField::GetToolTip() const -{ - return aToolTip; -} bool SwDropDownField::SetSelectedItem(const OUString & rItem) { diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 9452ad971d19..a818742f0cd3 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -1202,12 +1202,6 @@ bool SwGrfNode::IsSelected() const return bRet; } -// #i73788# -boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > SwGrfNode::GetThreadConsumer() -{ - return mpThreadConsumer; -} - void SwGrfNode::TriggerAsyncRetrieveInputStream() { if ( !IsLinkedFile() ) diff --git a/sw/source/core/inc/ascharanchoredobjectposition.hxx b/sw/source/core/inc/ascharanchoredobjectposition.hxx index be6a4f84a11c..0e6abccaf553 100644 --- a/sw/source/core/inc/ascharanchoredobjectposition.hxx +++ b/sw/source/core/inc/ascharanchoredobjectposition.hxx @@ -128,13 +128,13 @@ namespace objectpositioning virtual void CalcPosition() SAL_OVERRIDE; // calculated anchored position for object position type AS_CHAR - Point GetAnchorPos() const; + const Point& GetAnchorPos() const { return maAnchorPos;} // calculated relative position to base line for object position type AS_CHAR SwTwips GetRelPosY() const { return mnRelPos;} // determined object rectangle including spacing for object position type AS_CHAR - SwRect GetObjBoundRectInclSpacing() const; + const SwRect& GetObjBoundRectInclSpacing() const { return maObjBoundRect;} // determined line alignment relative to line height sal_uInt8 GetLineAlignment() const { return mnLineAlignment;} diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx index 8db7247f45e5..2e585cb3fb0e 100644 --- a/sw/source/core/inc/rolbck.hxx +++ b/sw/source/core/inc/rolbck.hxx @@ -255,7 +255,7 @@ class SwHistoryBookmark : public SwHistoryHint virtual void SetInDoc(SwDoc * pDoc, bool) SAL_OVERRIDE; bool IsEqualBookmark(const ::sw::mark::IMark& rBkmk); - const OUString& GetName() const; + const OUString& GetName() const { return m_aName;} private: const OUString m_aName; diff --git a/sw/source/core/inc/tocntntanchoredobjectposition.hxx b/sw/source/core/inc/tocntntanchoredobjectposition.hxx index 4146d8f7f7ab..66e5d5d24aa5 100644 --- a/sw/source/core/inc/tocntntanchoredobjectposition.hxx +++ b/sw/source/core/inc/tocntntanchoredobjectposition.hxx @@ -80,7 +80,7 @@ namespace objectpositioning /** frame, at which the vertical position is oriented at */ - const SwLayoutFrm& GetVertPosOrientFrm() const; + const SwLayoutFrm& GetVertPosOrientFrm() const { return *mpVertPosOrientFrm;} }; } // namespace objectpositioning diff --git a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx index 31ddfe88bb3d..ca89944a37f4 100644 --- a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx +++ b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx @@ -45,7 +45,7 @@ namespace objectpositioning /** calculated relative position for object */ - Point GetRelPos() const; + const Point& GetRelPos() const { return maRelPos;} }; } // namespace objectpositioning diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx index f750029106cb..0d02c4d856ce 100644 --- a/sw/source/core/inc/unoflatpara.hxx +++ b/sw/source/core/inc/unoflatpara.hxx @@ -125,7 +125,7 @@ public: virtual void SAL_CALL changeAttributes(::sal_Int32 nPos, ::sal_Int32 nLen, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< ::sal_Int32 > SAL_CALL getLanguagePortions() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - const SwTxtNode* getTxtNode() const; + const SwTxtNode* getTxtNode() const { return mpTxtNode;} static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId(); diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx index 1e011aaa6efd..4138f0160104 100644 --- a/sw/source/core/layout/anchoreddrawobject.cxx +++ b/sw/source/core/layout/anchoreddrawobject.cxx @@ -717,12 +717,6 @@ void SwAnchoredDrawObject::AdjustPositioningAttr( const SwFrm* _pNewAnchorFrm, GetFrmFmt().SetFmtAttr( SwFmtVertOrient( nVertRelPos, text::VertOrientation::NONE, text::RelOrientation::FRAME ) ); } -// --> #i34748# - change return type -const Rectangle* SwAnchoredDrawObject::GetLastObjRect() const -{ - return mpLastObjRect; -} - // --> #i34748# - change return type. // If member <mpLastObjRect> is NULL, create one. void SwAnchoredDrawObject::SetLastObjRect( const Rectangle& _rNewLastRect ) diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index b6cf395e9a65..1df522b794a1 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -112,16 +112,8 @@ void SwAnchoredObject::SetDrawObj( SdrObject& _rDrawObj ) mpDrawObj = &_rDrawObj; } -const SdrObject* SwAnchoredObject::GetDrawObj() const -{ - return mpDrawObj; -} -const SwFrm* SwAnchoredObject::GetAnchorFrm() const -{ - return mpAnchorFrm; -} void SwAnchoredObject::ChgAnchorFrm( SwFrm* _pNewAnchorFrm ) @@ -154,10 +146,6 @@ SwFrm* SwAnchoredObject::GetAnchorFrmContainingAnchPos() } -const SwPageFrm* SwAnchoredObject::GetPageFrm() const -{ - return mpPageFrm; -} void SwAnchoredObject::SetPageFrm( SwPageFrm* _pNewPageFrm ) { @@ -177,10 +165,6 @@ void SwAnchoredObject::SetPageFrm( SwPageFrm* _pNewPageFrm ) } } -const SwRect& SwAnchoredObject::GetLastCharRect() const -{ - return maLastCharRect; -} SwTwips SwAnchoredObject::GetRelCharX( const SwFrm* pFrm ) const { @@ -365,10 +349,6 @@ void SwAnchoredObject::ClearCharRectAndTopOfLine() mnLastTopOfLine = 0; } -const Point SwAnchoredObject::GetCurrRelPos() const -{ - return maRelPos; -} void SwAnchoredObject::SetCurrRelPos( Point _aRelPos ) { maRelPos = _aRelPos; diff --git a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx index 10919aedb8bb..9c9dd6c0fa76 100644 --- a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx @@ -393,20 +393,4 @@ SwTwips SwAsCharAnchoredObjectPosition::_GetRelPosToBase( return nRelPosToBase; } -/** calculated anchored position for object position */ -Point SwAsCharAnchoredObjectPosition::GetAnchorPos() const -{ - return maAnchorPos; -} - -/** calculated relative position to base line for object position */ - -/** determined object rectangle including spacing for object */ -SwRect SwAsCharAnchoredObjectPosition::GetObjBoundRectInclSpacing() const -{ - return maObjBoundRect; -} - -/** determined line alignment */ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx index ed1f130b6e60..96643ba82f88 100644 --- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx @@ -1094,9 +1094,5 @@ const SwFrm& SwToCntntAnchoredObjectPosition::_GetHoriVirtualAnchor( return *pHoriVirtAnchFrm; } -const SwLayoutFrm& SwToCntntAnchoredObjectPosition::GetVertPosOrientFrm() const -{ - return *mpVertPosOrientFrm; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx index cf8730977045..fe23cfed5df2 100644 --- a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx @@ -226,10 +226,4 @@ void SwToLayoutAnchoredObjectPosition::CalcPosition() maRelPos = aRelPos; } -/** calculated relative position for object position */ -Point SwToLayoutAnchoredObjectPosition::GetRelPos() const -{ - return maRelPos; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/tox/ToxWhitespaceStripper.cxx b/sw/source/core/tox/ToxWhitespaceStripper.cxx index b01c92c5b169..cd0024ef33d8 100644 --- a/sw/source/core/tox/ToxWhitespaceStripper.cxx +++ b/sw/source/core/tox/ToxWhitespaceStripper.cxx @@ -53,10 +53,5 @@ ToxWhitespaceStripper::GetPositionInStrippedString(sal_Int32 pos) const return mNewPositions.at(upos); } -OUString -ToxWhitespaceStripper::GetStrippedString() const -{ - return mStripped; -} } diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index 5d6b98881b5e..f7c696c921c0 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -678,10 +678,6 @@ bool SwHistoryBookmark::IsEqualBookmark(const ::sw::mark::IMark& rBkmk) && m_aName == rBkmk.GetName(); } -const OUString& SwHistoryBookmark::GetName() const -{ - return m_aName; -} SwHistorySetAttrSet::SwHistorySetAttrSet( const SfxItemSet& rSet, sal_uLong nNodePos, const std::set<sal_uInt16> &rSetArr ) diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx index 4bffefa2ce50..555a0ff9d218 100644 --- a/sw/source/core/unocore/unoflatpara.cxx +++ b/sw/source/core/unocore/unoflatpara.cxx @@ -70,10 +70,6 @@ SwXFlatParagraph::~SwXFlatParagraph() { } -const SwTxtNode* SwXFlatParagraph::getTxtNode() const -{ - return mpTxtNode; -} // XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx index feeb5d896883..164d760a1405 100644 --- a/sw/source/core/view/printdata.cxx +++ b/sw/source/core/view/printdata.cxx @@ -71,10 +71,6 @@ void SwRenderData::DeletePostItData() } } -SfxObjectShellLock const& SwRenderData::GetTempDocShell() const -{ - return m_xTempDocShell; -} void SwRenderData::SetTempDocShell(SfxObjectShellLock const& xShell) { diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index fc19e785b817..60462cbdea29 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -214,7 +214,7 @@ public: virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE; virtual SfxPoolItem* Clone(SfxItemPool* = 0) const SAL_OVERRIDE; void SetFrmFmt(SwFrmFmt * _pFrmFmt); - const SwFrmFmt* GetFrmFmt() const; + const SwFrmFmt* GetFrmFmt() const { return pFrmFmt;} SwFrmFmt* GetFrmFmt() { return pFrmFmt;} }; diff --git a/sw/source/filter/ww1/fltshell.cxx b/sw/source/filter/ww1/fltshell.cxx index 454cad669d73..7cd8b9fad273 100644 --- a/sw/source/filter/ww1/fltshell.cxx +++ b/sw/source/filter/ww1/fltshell.cxx @@ -868,10 +868,6 @@ void SwFltAnchor::SetFrmFmt(SwFrmFmt * _pFrmFmt) pFrmFmt = _pFrmFmt; } -const SwFrmFmt * SwFltAnchor::GetFrmFmt() const -{ - return pFrmFmt; -} bool SwFltAnchor::operator==(const SfxPoolItem& rItem) const diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx index d6544742865f..97a5d40d7dee 100644 --- a/sw/source/filter/ww8/WW8TableInfo.cxx +++ b/sw/source/filter/ww8/WW8TableInfo.cxx @@ -346,10 +346,6 @@ RowSpansPtr WW8TableNodeInfoInner::getRowSpansOfRow() -const SwRect & WW8TableNodeInfoInner::getRect() const -{ - return maRect; -} #ifdef DBG_UTIL ::std::string WW8TableNodeInfoInner::toString() const @@ -546,10 +542,6 @@ sal_uInt32 WW8TableNodeInfo::getRow() const return getInnerForDepth(mnDepth)->getRow(); } -const ww8::WW8TableNodeInfo::Inners_t & WW8TableNodeInfo::getInners() const -{ - return mInners; -} const WW8TableNodeInfoInner::Pointer_t WW8TableNodeInfo::getFirstInner() const { @@ -1454,20 +1446,8 @@ void WW8TableCellGridRow::setRowSpans(RowSpansPtr pRowSpans) m_pRowSpans = pRowSpans; } -TableBoxVectorPtr WW8TableCellGridRow::getTableBoxVector() const -{ - return m_pTableBoxVector; -} -WidthsPtr WW8TableCellGridRow::getWidths() const -{ - return m_pWidths; -} -RowSpansPtr WW8TableCellGridRow::getRowSpans() const -{ - return m_pRowSpans; -} CellInfo::CellInfo(const SwRect & aRect, WW8TableNodeInfo * pNodeInfo) : m_aRect(aRect), m_pNodeInfo(pNodeInfo), m_nFmtFrmWidth(0) diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx index 4c2188a84d8a..d91798d3da38 100644 --- a/sw/source/filter/ww8/WW8TableInfo.hxx +++ b/sw/source/filter/ww8/WW8TableInfo.hxx @@ -96,7 +96,7 @@ public: bool isVertMerge() const; const SwTableBox * getTableBox() const { return mpTableBox;} const SwTable * getTable() const { return mpTable;} - const SwRect & getRect() const; + const SwRect & getRect() const { return maRect;} const SwNode * getNode() const; @@ -205,7 +205,7 @@ public: const SwNode * getNextNode() const { return mpNextNode;} const SwRect & getRect() const; - const Inners_t & getInners() const; + const Inners_t & getInners() const { return mInners;} const WW8TableNodeInfoInner::Pointer_t getFirstInner() const; const WW8TableNodeInfoInner::Pointer_t getInnerForDepth(sal_uInt32 nDepth) const; @@ -251,9 +251,9 @@ public: void setWidths(WidthsPtr pGridCols); void setRowSpans(RowSpansPtr pRowSpans); - TableBoxVectorPtr getTableBoxVector() const; - WidthsPtr getWidths() const; - RowSpansPtr getRowSpans() const; + TableBoxVectorPtr getTableBoxVector() const { return m_pTableBoxVector;} + WidthsPtr getWidths() const { return m_pWidths;} + RowSpansPtr getRowSpans() const { return m_pRowSpans;} }; class WW8TableCellGrid diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx index f293b38ff6fb..35b557228ab8 100644 --- a/sw/source/filter/ww8/docxexport.cxx +++ b/sw/source/filter/ww8/docxexport.cxx @@ -1259,16 +1259,6 @@ void DocxExport::WriteEmbeddings() } } -VMLExport& DocxExport::VMLExporter() -{ - return *m_pVMLExport; -} - -DocxSdrExport& DocxExport::SdrExporter() -{ - return *m_pSdrExport; -} - bool DocxExport::isMirroredMargin() { bool bMirroredMargins = false; diff --git a/sw/source/filter/ww8/docxexport.hxx b/sw/source/filter/ww8/docxexport.hxx index 950db249f066..3415b0396cc2 100644 --- a/sw/source/filter/ww8/docxexport.hxx +++ b/sw/source/filter/ww8/docxexport.hxx @@ -268,10 +268,10 @@ public: virtual ~DocxExport(); /// Reference to the VMLExport instance for the main document. - oox::vml::VMLExport& VMLExporter(); + oox::vml::VMLExport& VMLExporter() { return *m_pVMLExport; } /// Reference to the DocxSdrExport instance for the main document. - DocxSdrExport& SdrExporter(); + DocxSdrExport& SdrExporter() { return *m_pSdrExport; } /// Set the document default tab stop. void setDefaultTabStop( int stop ) { m_aSettings.defaultTabStop = stop; } diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 0020e0504707..130edf14f9b6 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -438,11 +438,6 @@ OStringBuffer& RtfAttributeOutput::RunText() return m_aRunText.getLastBuffer(); } -OStringBuffer& RtfAttributeOutput::Styles() -{ - return m_aStyles; -} - void RtfAttributeOutput::RawText(const OUString& rText, bool /*bForceUnicode*/, rtl_TextEncoding eCharSet) { m_aRunText->append(msfilter::rtfutil::OutString(rText, eCharSet)); diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx index f43d3d88e6ff..fdd8ff176910 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.hxx +++ b/sw/source/filter/ww8/rtfattributeoutput.hxx @@ -76,7 +76,7 @@ public: // Access to (anyway) private buffers, used by the sdr exporter OStringBuffer& RunText(); - OStringBuffer& Styles(); + OStringBuffer& Styles() { return m_aStyles; } /// Output text (without markup). virtual void RawText(const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet) SAL_OVERRIDE; diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 65c9b00c116b..0bc4ea88aaba 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -3113,10 +3113,6 @@ SwMSConvertControls::SwMSConvertControls( SfxObjectShell *pDSh,SwPaM *pP ) : oox { } -sal_uInt32 SwMSConvertControls::GenerateObjectID() -{ - return ++mnObjectId; -} // in transitioning away old filter for ole/ocx controls, ReadOCXStream has been made pure virtual in // filter/source/msocximex.cxx, so.. we need an implementation here diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 5d35ae21f0cc..215c33ad2ec4 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -200,10 +200,6 @@ sal_uInt16 MSWordStyles::BuildGetSlot( const SwFmt& rFmt ) return nRet; } -sal_uInt16 MSWordStyles::BuildGetSlot(const SwNumRule&) -{ - return nUsedSlots++; -} sal_uInt16 MSWordStyles::GetWWId( const SwFmt& rFmt ) const { diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 36b260f21029..46c407712920 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -1578,7 +1578,7 @@ class MSWordStyles /// Get slot number during building the style table. sal_uInt16 BuildGetSlot( const SwFmt& rFmt ); - sal_uInt16 BuildGetSlot( const SwNumRule& rNumRule ); + sal_uInt16 BuildGetSlot( const SwNumRule& /*rNumRule*/ ) { return nUsedSlots++;} /// Return information about one style. void GetStyleData( SwFmt* pFmt, bool& bFmtColl, sal_uInt16& nBase, sal_uInt16& nNext ); diff --git a/sw/source/filter/ww8/ww8glsy.cxx b/sw/source/filter/ww8/ww8glsy.cxx index 1ed667ca0694..f66573e4d66a 100644 --- a/sw/source/filter/ww8/ww8glsy.cxx +++ b/sw/source/filter/ww8/ww8glsy.cxx @@ -235,12 +235,6 @@ bool WW8Glossary::Load( SwTextBlocks &rBlocks, bool bSaveRelFile ) return bRet; } -bool WW8GlossaryFib::IsGlossaryFib() -{ - // fGlsy will indicate whether this has AutoText or not - return fGlsy; -} - sal_uInt32 WW8GlossaryFib::FindGlossaryFibOffset(SvStream & /* rTableStrm */, SvStream & /* rStrm */, const WW8Fib &rFib) diff --git a/sw/source/filter/ww8/ww8glsy.hxx b/sw/source/filter/ww8/ww8glsy.hxx index d6c35fad8656..06cc79ec8e94 100644 --- a/sw/source/filter/ww8/ww8glsy.hxx +++ b/sw/source/filter/ww8/ww8glsy.hxx @@ -37,7 +37,8 @@ public: WW8GlossaryFib( SvStream& rStrm, sal_uInt8 nWantedVersion , SvStream& rTableStrm, const WW8Fib &rFib) : WW8Fib(rStrm, nWantedVersion,FindGlossaryFibOffset(rTableStrm,rStrm,rFib)) {} - bool IsGlossaryFib(); + // fGlsy will indicate whether this has AutoText or not + bool IsGlossaryFib() { return fGlsy; } private: sal_uInt32 FindGlossaryFibOffset(SvStream &rTableStrm,SvStream &rStrm, const WW8Fib &rFib); diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 4ffb00bfd562..6da60d5a3bf2 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -537,12 +537,12 @@ class WW8FieldEntry SwNodeIndex GetPtNode() { return maStartPos.GetPtNode(); }; sal_Int32 GetPtCntnt() { return maStartPos.GetPtCntnt(); }; - OUString GetBookmarkName(); - OUString GetBookmarkCode(); + OUString GetBookmarkName() { return msBookmarkName;} + OUString GetBookmarkCode() { return msMarkCode;} void SetBookmarkName(const OUString& bookmarkName); void SetBookmarkType(const OUString& bookmarkType); void SetBookmarkCode(const OUString& bookmarkCode); - ::sw::mark::IFieldmark::parameter_map_t& getParameters(); + ::sw::mark::IFieldmark::parameter_map_t& getParameters() { return maParams;} }; // Mini-Merker fuer einige Flags @@ -712,7 +712,7 @@ public: com::sun::star::drawing::XShape > *pShapeRef=0, bool bFloatingCtrl=false ); private: - sal_uInt32 GenerateObjectID(); + sal_uInt32 GenerateObjectID() { return ++mnObjectId; } SwPaM *pPaM; sal_uInt32 mnObjectId; }; diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index aba9ee4e59ad..e3414ee10e9d 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -654,15 +654,7 @@ WW8FieldEntry &WW8FieldEntry::operator=(const WW8FieldEntry &rOther) throw() return *this; } -OUString WW8FieldEntry::GetBookmarkName() -{ - return msBookmarkName; -} -OUString WW8FieldEntry::GetBookmarkCode() -{ - return msMarkCode; -} void WW8FieldEntry::SetBookmarkName(const OUString& bookmarkName) { @@ -679,10 +671,6 @@ void WW8FieldEntry::SetBookmarkCode(const OUString& bookmarkCode) msMarkCode = bookmarkCode; } -::sw::mark::IFieldmark::parameter_map_t& WW8FieldEntry::getParameters() -{ - return maParams; -} // Read_Field liest ein Feld ein oder, wenn es nicht gelesen werden kann, // wird 0 zurueckgegeben, so dass das Feld vom Aufrufer textuell gelesen wird. diff --git a/sw/source/ui/vba/vbapalette.cxx b/sw/source/ui/vba/vbapalette.cxx index 1622a389d27b..0cdbb5157ed2 100644 --- a/sw/source/ui/vba/vbapalette.cxx +++ b/sw/source/ui/vba/vbapalette.cxx @@ -86,11 +86,5 @@ VbaPalette::VbaPalette() mxPalette = new DefaultPalette(); } -uno::Reference< container::XIndexAccess > -VbaPalette::getPalette() const -{ - - return mxPalette; -} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/vba/vbapalette.hxx b/sw/source/ui/vba/vbapalette.hxx index 41e0d1ab79f3..e20fba925800 100644 --- a/sw/source/ui/vba/vbapalette.hxx +++ b/sw/source/ui/vba/vbapalette.hxx @@ -28,7 +28,7 @@ public: VbaPalette(); // if no palette available e.g. because the document doesn't have a // palette defined then a default palette will be returned. - css::uno::Reference< css::container::XIndexAccess > getPalette() const; + css::uno::Reference< css::container::XIndexAccess > getPalette() const { return mxPalette;} }; #endif diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index c2baa4b03a72..2d835ec6cbfd 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -455,7 +455,8 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); OUString GetSelDescr() const; - SwNavigationMgr& GetNavigationMgr(); + SwNavigationMgr& GetNavigationMgr() { return aNavigationMgr; } + void addCurrentPosition(); bool GotoFly( const OUString& rName, FlyCntType eType = FLYCNTTYPE_ALL, bool bSelFrame = true ); diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 2653bc0cf304..7d751b30335d 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -1475,10 +1475,6 @@ SwFrmFmt *SwWrtShell::GetTblStyle(const OUString &rFmtName) return 0; } -SwNavigationMgr& SwWrtShell::GetNavigationMgr() { - return aNavigationMgr; -} - void SwWrtShell::addCurrentPosition() { SwPaM* pPaM = GetCrsr(); aNavigationMgr.addEntry(*pPaM->GetPoint()); |