diff options
| author | Noel Grandin <noel@peralex.com> | 2015-07-21 10:44:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-21 13:30:13 +0000 |
| commit | 407731c9f403c35357a0d1428c9b99835f79a5f7 (patch) | |
| tree | c3550703ea961e727e9fa155aa8efaa96ae84dd0 /sw/source/core | |
| parent | 2b75376a149803865c7cc0dbc72a870c1d86f428 (diff) | |
loplugin:unusedmethods sw
Change-Id: Ied51535fa169451fc4991237122817a34a59f6fe
Reviewed-on: https://gerrit.libreoffice.org/17256
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw/source/core')
31 files changed, 2 insertions, 336 deletions
diff --git a/sw/source/core/access/accfrmobjmap.hxx b/sw/source/core/access/accfrmobjmap.hxx index fedc573b97ce..d2593333f819 100644 --- a/sw/source/core/access/accfrmobjmap.hxx +++ b/sw/source/core/access/accfrmobjmap.hxx @@ -118,9 +118,7 @@ public: static bool IsSortingRequired( const SwFrm& rFrm ); - iterator begin() { return maMap.begin(); } const_iterator cbegin() const { return maMap.cbegin(); } - iterator end() { return maMap.end(); } const_iterator cend() const { return maMap.cend(); } const_reverse_iterator crbegin() const { return maMap.crbegin(); } const_reverse_iterator crend() const { return maMap.crend(); } diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx index 8a589df53de3..2fc6e3f7d498 100644 --- a/sw/source/core/access/accpage.hxx +++ b/sw/source/core/access/accpage.hxx @@ -38,9 +38,6 @@ class SwAccessiblePage : public SwAccessibleContext using SwAccessibleFrame::GetBounds; protected: - // return the bounding box for the page in page preview mode - SwRect GetBounds( /* const SwFrm *pFrm =0 */ ); - // Set states for getAccessibleStateSet. // This derived class additionally sets // FOCUSABLE(1) and FOCUSED(+) diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx index 475886684f73..735324e3b111 100644 --- a/sw/source/core/access/accpara.hxx +++ b/sw/source/core/access/accpara.hxx @@ -197,9 +197,6 @@ protected: return *pPortionData; } - // determine if portion data is currently available - bool HasPortionData() { return (pPortionData != NULL); } - //helpers for word boundaries bool GetCharBoundary( com::sun::star::i18n::Boundary& rBound, diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx index 50a3ab13af53..a5b7163eb093 100644 --- a/sw/source/core/doc/DocumentDrawModelManager.cxx +++ b/sw/source/core/doc/DocumentDrawModelManager.cxx @@ -306,38 +306,6 @@ bool DocumentDrawModelManager::IsVisibleLayerId( const SdrLayerID& _nLayerId ) c return bRetVal; } -SdrLayerID DocumentDrawModelManager::GetVisibleLayerIdByInvisibleOne( const SdrLayerID& _nInvisibleLayerId ) -{ - SdrLayerID nVisibleLayerId; - - if ( _nInvisibleLayerId == GetInvisibleHeavenId() ) - { - nVisibleLayerId = GetHeavenId(); - } - else if ( _nInvisibleLayerId == GetInvisibleHellId() ) - { - nVisibleLayerId = GetHellId(); - } - else if ( _nInvisibleLayerId == GetInvisibleControlsId() ) - { - nVisibleLayerId = GetControlsId(); - } - else if ( _nInvisibleLayerId == GetHeavenId() || - _nInvisibleLayerId == GetHellId() || - _nInvisibleLayerId == GetControlsId() ) - { - OSL_FAIL( "<SwDoc::GetVisibleLayerIdByInvisibleOne(..)> - given layer ID already an invisible one." ); - nVisibleLayerId = _nInvisibleLayerId; - } - else - { - OSL_FAIL( "<SwDoc::GetVisibleLayerIdByInvisibleOne(..)> - given layer ID is unknown." ); - nVisibleLayerId = _nInvisibleLayerId; - } - - return nVisibleLayerId; -} - SdrLayerID DocumentDrawModelManager::GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLayerId ) { SdrLayerID nInvisibleLayerId; diff --git a/sw/source/core/doc/DocumentListItemsManager.cxx b/sw/source/core/doc/DocumentListItemsManager.cxx index 66de4083f0c7..e095651fd7b7 100644 --- a/sw/source/core/doc/DocumentListItemsManager.cxx +++ b/sw/source/core/doc/DocumentListItemsManager.cxx @@ -76,19 +76,6 @@ OUString DocumentListItemsManager::getListItemText( const SwNodeNum& rNodeNum, : OUString(); } -void DocumentListItemsManager::getListItems( tSortedNodeNumList& orNodeNumList ) const -{ - orNodeNumList.clear(); - orNodeNumList.reserve( mpListItemsList->size() ); - - tImplSortedNodeNumList::iterator aIter; - tImplSortedNodeNumList::iterator aEndIter = mpListItemsList->end(); - for ( aIter = mpListItemsList->begin(); aIter != aEndIter; ++aIter ) - { - orNodeNumList.push_back( (*aIter) ); - } -} - void DocumentListItemsManager::getNumItems( tSortedNodeNumList& orNodeNumList ) const { orNodeNumList.clear(); diff --git a/sw/source/core/doc/DocumentStateManager.cxx b/sw/source/core/doc/DocumentStateManager.cxx index ede8ef96e834..0401fa607d73 100644 --- a/sw/source/core/doc/DocumentStateManager.cxx +++ b/sw/source/core/doc/DocumentStateManager.cxx @@ -33,7 +33,6 @@ DocumentStateManager::DocumentStateManager( SwDoc& i_rSwdoc ) : mbLoaded(false), mbUpdateExpField(false), mbNewDoc(false), - mbPageNums(false), mbInCallModified(false) { } @@ -85,11 +84,6 @@ bool DocumentStateManager::IsInCallModified() const return mbInCallModified; } -bool DocumentStateManager::IsLoaded() const -{ - return mbLoaded; -} - bool DocumentStateManager::IsUpdateExpField() const { return mbUpdateExpField; @@ -100,16 +94,6 @@ bool DocumentStateManager::IsNewDoc() const return mbNewDoc; } -bool DocumentStateManager::IsPageNums() const -{ - return mbPageNums; -} - -void DocumentStateManager::SetPageNums(bool b) -{ - mbPageNums = b; -} - void DocumentStateManager::SetNewDoc(bool b) { mbNewDoc = b; diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index 1ca85a523cfc..621c4bf040b9 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -1263,22 +1263,6 @@ SwFlyFrameFormat* SwDoc::InsertDrawLabel( return pNewFormat; } -IMPL_LINK( SwDoc, BackgroundDone, SvxBrushItem*, ) -{ - SwViewShell* pStartSh = getIDocumentLayoutAccess().GetCurrentViewShell(); - if(pStartSh) - for(SwViewShell& rShell : pStartSh->GetRingContainer()) - { - if(rShell.GetWin()) - { - // Make sure to repaint with virtual device - rShell.LockPaint(); - rShell.UnlockPaint( true ); - } - } - return 0; -} - static OUString lcl_GetUniqueFlyName( const SwDoc* pDoc, sal_uInt16 nDefStrId ) { if( pDoc->IsInMailMerge()) diff --git a/sw/source/core/frmedt/feflyole.cxx b/sw/source/core/frmedt/feflyole.cxx index cd9804ac3336..9b69a4e727f4 100644 --- a/sw/source/core/frmedt/feflyole.cxx +++ b/sw/source/core/frmedt/feflyole.cxx @@ -92,22 +92,6 @@ OUString SwFEShell::GetUniqueFrameName() const return GetDoc()->GetUniqueFrameName(); } -void SwFEShell::MakeObjVisible( const uno::Reference < embed::XEmbeddedObject >& xObj ) const -{ - SwFlyFrm *pFly = FindFlyFrm( xObj ); - if ( pFly ) - { - SwRect aTmp( pFly->Prt() ); - aTmp += pFly->Frm().Pos(); - if ( !aTmp.IsOver( VisArea() ) ) - { - const_cast<SwFEShell*>(this)->StartAction(); - const_cast<SwFEShell*>(this)->MakeVisible( aTmp ); - const_cast<SwFEShell*>(this)->EndAction(); - } - } -} - bool SwFEShell::FinishOLEObj() // Server is terminated { SfxInPlaceClient* pIPClient = GetSfxViewShell()->GetIPClient(); diff --git a/sw/source/core/inc/DocumentDrawModelManager.hxx b/sw/source/core/inc/DocumentDrawModelManager.hxx index 4fbaf39e6285..dfa406ff80d3 100644 --- a/sw/source/core/inc/DocumentDrawModelManager.hxx +++ b/sw/source/core/inc/DocumentDrawModelManager.hxx @@ -59,8 +59,6 @@ public: virtual bool IsVisibleLayerId( const SdrLayerID& _nLayerId ) const SAL_OVERRIDE; - virtual SdrLayerID GetVisibleLayerIdByInvisibleOne( const SdrLayerID& _nInvisibleLayerId ) SAL_OVERRIDE; - virtual SdrLayerID GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLayerId ) SAL_OVERRIDE; virtual bool Search(const SwPaM& rPaM, const SvxSearchItem& rSearchItem) SAL_OVERRIDE; diff --git a/sw/source/core/inc/DocumentListItemsManager.hxx b/sw/source/core/inc/DocumentListItemsManager.hxx index 1c3e1527dbae..0074881230be 100644 --- a/sw/source/core/inc/DocumentListItemsManager.hxx +++ b/sw/source/core/inc/DocumentListItemsManager.hxx @@ -41,8 +41,6 @@ public: const bool bWithNumber = true, const bool bWithSpacesForLevel = false ) const SAL_OVERRIDE; - void getListItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const SAL_OVERRIDE; - void getNumItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const SAL_OVERRIDE; virtual ~DocumentListItemsManager(); diff --git a/sw/source/core/inc/DocumentStateManager.hxx b/sw/source/core/inc/DocumentStateManager.hxx index edd4319d7340..f5c834384f1f 100644 --- a/sw/source/core/inc/DocumentStateManager.hxx +++ b/sw/source/core/inc/DocumentStateManager.hxx @@ -39,11 +39,8 @@ public: void ResetModified() SAL_OVERRIDE; bool IsModified() const SAL_OVERRIDE; bool IsInCallModified() const SAL_OVERRIDE; - bool IsLoaded() const SAL_OVERRIDE; bool IsUpdateExpField() const SAL_OVERRIDE; bool IsNewDoc() const SAL_OVERRIDE; - bool IsPageNums() const SAL_OVERRIDE; - void SetPageNums(bool b) SAL_OVERRIDE; void SetNewDoc(bool b) SAL_OVERRIDE; void SetUpdateExpFieldStat(bool b) SAL_OVERRIDE; void SetLoaded(bool b) SAL_OVERRIDE; @@ -55,7 +52,6 @@ private: bool mbLoaded ; //< TRUE: Doc loaded. bool mbUpdateExpField ; //< TRUE: Update expression fields. bool mbNewDoc ; //< TRUE: new Doc. - bool mbPageNums ; //< TRUE: There are virtual page numbers. bool mbInCallModified; //< TRUE: in Set/Reset-Modified link. }; diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx index 18e137ba4690..6442a9408b7c 100644 --- a/sw/source/core/inc/cntfrm.hxx +++ b/sw/source/core/inc/cntfrm.hxx @@ -74,7 +74,6 @@ public: inline const SwContentNode *GetNode() const; inline SwContentNode *GetNode(); - sal_uInt16 GetSectionLevel(); inline const SwContentFrm *GetFollow() const; inline SwContentFrm *GetFollow(); @@ -89,12 +88,6 @@ public: bool bSetInReadOnly = false ) const; virtual bool UnitDown( SwPaM *, const SwTwips nOffset = 0, bool bSetInReadOnly = false ) const; - inline bool StartNextPage( SwPaM * ) const; - inline bool StartPrevPage( SwPaM * ) const; - inline bool StartCurrPage( SwPaM * ) const; - inline bool EndCurrPage( SwPaM * ) const; - inline bool EndNextPage( SwPaM * ) const; - inline bool EndPrevPage( SwPaM * ) const; // nMaxHeight is the required height // bSplit indicates that the paragraph has to be split diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx index b0bd4c3d0396..b2d745619b45 100644 --- a/sw/source/core/inc/docfld.hxx +++ b/sw/source/core/inc/docfld.hxx @@ -84,12 +84,8 @@ public: const SwTextField* GetTextField() const { return TEXTFIELD == eSetGetExpFieldType ? CNTNT.pTextField : 0; } - const SwTextTOXMark* GetTOX() const - { return TEXTTOXMARK == eSetGetExpFieldType ? CNTNT.pTextTOX : 0; } const SwSection* GetSection() const { return SECTIONNODE == eSetGetExpFieldType ? CNTNT.pSection : 0; } - const SwTableBox* GetTableBox() const - { return TABLEBOX == eSetGetExpFieldType ? CNTNT.pTBox : 0; } const SwTextINetFormat* GetINetFormat() const { return TEXTINET == eSetGetExpFieldType ? CNTNT.pTextINet : 0; } const SwFlyFrameFormat* GetFlyFormat() const diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx index e73764432ec0..7689e2ae7d69 100644 --- a/sw/source/core/inc/doctxm.hxx +++ b/sw/source/core/inc/doctxm.hxx @@ -46,7 +46,6 @@ class SwTOXBaseSection : public SwTOXBase, public SwSection void UpdateTable( const SwTextNode* pOwnChapterNode ); void UpdateSequence( const SwTextNode* pOwnChapterNode ); void UpdateAuthorities( const SwTOXInternational& rIntl ); - void UpdateAll(); // insert sorted into array for creation void InsertSorted(SwTOXSortTabBase* pBase); @@ -54,12 +53,6 @@ class SwTOXBaseSection : public SwTOXBase, public SwSection // insert alpha delimiter at creation void InsertAlphaDelimitter( const SwTOXInternational& rIntl ); - // generate text body - void GenerateText( sal_uInt16 nArrayIdx, - sal_uInt16 nCount, - const sal_uInt32 _nTOXSectNdIdx, - const SwPageDesc* _pDefaultPageDesc ); - // replace page num placeholder with actual page number void _UpdatePageNum( SwTextNode* pNd, const std::vector<sal_uInt16>& rNums, diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx index 83bf4d661d4e..7d36258c8a50 100644 --- a/sw/source/core/inc/drawfont.hxx +++ b/sw/source/core/inc/drawfont.hxx @@ -283,22 +283,6 @@ public: return nIdx + nLen; } - long GetLeft() const - { -#ifdef DBG_UTIL - OSL_ENSURE( m_bLeft, "DrawTextInfo: Undefined left range" ); -#endif - return nLeft; - } - - long GetRight() const - { -#ifdef DBG_UTIL - OSL_ENSURE( m_bRight, "DrawTextInfo: Undefined right range" ); -#endif - return nRight; - } - long GetKanaDiff() const { #ifdef DBG_UTIL diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index d1c3af05da4b..a619b080ca3b 100644 --- a/sw/source/core/inc/flyfrm.hxx +++ b/sw/source/core/inc/flyfrm.hxx @@ -128,9 +128,6 @@ protected: void Lock() { bLocked = true; } void Unlock() { bLocked = false; } - void SetMinHeight() { bMinHeight = true; } - void ResetMinHeight(){ bMinHeight = false; } - Size CalcRel( const SwFormatFrmSize &rSz ) const; SwTwips CalcAutoWidth() const; @@ -141,8 +138,6 @@ protected: /** method to assure that anchored object is registered at the correct page frame - - #i28701# */ virtual void RegisterAtCorrectPage() SAL_OVERRIDE; @@ -210,13 +205,10 @@ public: void SetNotifyBack() { bNotifyBack = true; } void ResetNotifyBack() { bNotifyBack = false; } bool IsNoShrink() const { return bNoShrink; } - void SetNoShrink( bool bNew ) { bNoShrink = bNew; } bool IsLockDeleteContent() const { return bLockDeleteContent; } - void SetLockDeleteContent( bool bNew ) { bLockDeleteContent = bNew; } bool IsClipped() const { return bHeightClipped || bWidthClipped; } bool IsHeightClipped() const { return bHeightClipped; } - bool IsWidthClipped() const { return bWidthClipped; } bool IsLowerOf( const SwLayoutFrm* pUpper ) const; inline bool IsUpperOf( const SwFlyFrm& _rLower ) const diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx index 8e2109411599..a73901d3de94 100644 --- a/sw/source/core/inc/fntcache.hxx +++ b/sw/source/core/inc/fntcache.hxx @@ -80,10 +80,6 @@ class SwFntObj : public SwCacheObj static MapMode *pPixMap; static VclPtr<OutputDevice> pPixOut; - void calcLinePos(SwDrawTextInfo& rInf, Point& aStart, Point& aEnd, sal_Int32 nStart, - sal_Int32 nWrLen, sal_Int32 nCnt, const bool bSwitchH2V, const bool bSwitchL2R, - long nHalfSpace, long* pKernArray, const bool bBidiPor); - public: DECL_FIXEDMEMPOOL_NEWDEL(SwFntObj) diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 6e8dd25a8b43..58df49f40f11 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -533,19 +533,15 @@ public: bool IsInBalancedSection() const; inline bool IsReverse() const { return mbReverse; } - inline void SetReverse( bool bNew ){ mbReverse = bNew; } inline bool IsVertical() const; inline bool IsVertLR() const; inline bool GetVerticalFlag() const { return mbVertical; } - inline void SetVertical( bool bNew ){ mbVertical = bNew; } - inline void SetbVertLR( bool bNew ) { mbVertLR = bNew; } inline void SetDerivedVert( bool bNew ){ mbDerivedVert = bNew; } inline void SetInvalidVert( bool bNew) { mbInvalidVert = bNew; } inline bool IsRightToLeft() const; inline bool GetRightToLeftFlag() const { return mbRightToLeft; } - inline void SetRightToLeft( bool bNew ){ mbRightToLeft = bNew; } inline void SetDerivedR2L( bool bNew ) { mbDerivedR2L = bNew; } inline void SetInvalidR2L( bool bNew ) { mbInvalidR2L = bNew; } @@ -582,7 +578,6 @@ public: const SwAttrSet *GetAttrSet() const; inline bool HasFixSize() const { return mbFixSize; } - inline void SetFixSize( bool bNew ) { mbFixSize = bNew; } // check all pages (starting from the given) and correct them if needed static void CheckPageDescs( SwPageFrm *pStart, bool bNotifyFields = true, SwPageFrm** ppPrev = 0); @@ -825,10 +820,6 @@ public: void SetBottomTopMargins( long, long ); void SetLeftRightMargins( long, long ); void SetRightLeftMargins( long, long ); - void SetLeftAndWidth( long nLeft, long nWidth ); - void SetTopAndHeight( long nTop, long nHeight ); - void SetRightAndWidth( long nRight, long nWidth ); - void SetBottomAndHeight( long nBottom, long nHeight ); long GetPrtLeft() const; long GetPrtBottom() const; long GetPrtRight() const; @@ -846,7 +837,6 @@ public: // #i65250# inline sal_uInt32 GetFrmId() const { return mnFrmId; } - static inline sal_uInt32 GetLastFrmId() { return mnLastFrmId; } // NEW TABLES // Some functions for covered/covering table cells. This way unnecessary diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx index 23a222659bcb..cc58afc289de 100644 --- a/sw/source/core/inc/frmtool.hxx +++ b/sw/source/core/inc/frmtool.hxx @@ -189,13 +189,7 @@ public: ~SwFrmNotify(); const SwRect &Frm() const { return aFrm; } - const SwRect &Prt() const { return aPrt; } void SetInvaKeep() { bInvaKeep = true; } - // #i49383# - void FrmDeleted() - { - mbFrmDeleted = true; - } }; class SwLayNotify : public SwFrmNotify @@ -221,8 +215,6 @@ class SwFlyNotify : public SwLayNotify public: SwFlyNotify( SwFlyFrm *pFlyFrm ); ~SwFlyNotify(); - - SwPageFrm *GetOldPage() const { return pOldPage; } }; class SwContentNotify : public SwFrmNotify @@ -348,7 +340,6 @@ public: inline const SwAttrSet &GetAttrSet() const { return rAttrSet; } inline const SvxULSpaceItem &GetULSpace() const { return rUL; } - inline const SvxLRSpaceItem &GetLRSpace() const { return rLR; } inline const SvxBoxItem &GetBox() const { return rBox; } inline const SvxShadowItem &GetShadow() const { return rShadow; } @@ -409,7 +400,6 @@ public: SwOrderIter( const SwPageFrm *pPage, bool bFlysOnly = true ); void Current( const SdrObject *pNew ) { pCurrent = pNew; } - const SdrObject *Current() const { return pCurrent; } const SdrObject *operator()() const { return pCurrent; } const SdrObject *Top(); const SdrObject *Bottom(); diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx index a0d2d6852ef6..0a39fc113997 100644 --- a/sw/source/core/inc/layfrm.hxx +++ b/sw/source/core/inc/layfrm.hxx @@ -46,8 +46,6 @@ class SwLayoutFrm: public SwFrm friend SwFrm* SwClearDummies( SwFrm* pFrm ); #endif - void CopySubtree( const SwLayoutFrm *pDest ); - protected: virtual void DestroyImpl() SAL_OVERRIDE; diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index 45c3989ee88b..38dc3c18eef0 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -318,11 +318,6 @@ public: virtual bool FillSelection( SwSelectionList& rList, const SwRect& rRect ) const SAL_OVERRIDE; - static inline sal_Int8 ShadowPxWidth() - { - return mnShadowPxWidth; - } - const SwRect PrtWithoutHeaderAndFooter() const; // in case this is am empty page, this function returns the 'reference' page diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx index e7a98cdf52d3..25da09538f24 100644 --- a/sw/source/core/inc/rootfrm.hxx +++ b/sw/source/core/inc/rootfrm.hxx @@ -324,7 +324,6 @@ public: static void SetNoVirDev( const bool bNew ) { mbNoVirDev = bNew; } inline long GetBrowseWidth() const; - void SetBrowseWidth( long n ) { mbBrowseWidthValid = true; mnBrowseWidth = n;} inline void InvalidateBrowseWidth(); bool IsNewLayout() const { return mbIsNewLayout; } diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx index 668578acd815..cbdfbe27365c 100644 --- a/sw/source/core/inc/sectfrm.hxx +++ b/sw/source/core/inc/sectfrm.hxx @@ -99,8 +99,6 @@ public: */ bool SplitSect( SwFrm* pFrm, bool bApres ); void DelEmpty( bool bRemove ); // Like Cut(), except for that Follow chaining is maintained - bool IsToIgnore() const // No size, no content; need to be ignored - { return !Frm().Height() && !ContainsContent(); } SwFootnoteContFrm* ContainsFootnoteCont( const SwFootnoteContFrm* pCont = NULL ) const; bool Growable() const; SwTwips _Shrink( SwTwips, bool bTst ); @@ -145,7 +143,6 @@ public: bool IsFootnoteAtEnd() const { return bFootnoteAtEnd; } bool IsEndnAtEnd() const { return bEndnAtEnd; } bool IsAnyNoteAtEnd() const { return bFootnoteAtEnd || bEndnAtEnd; } - bool AreNotesAtEnd() const { return bFootnoteAtEnd && bEndnAtEnd; } void SetContentLock( bool bNew ) { bContentLock = bNew; } bool IsContentLocked() const { return bContentLock; } diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx index 20f06eb8244c..9897a2032d0a 100644 --- a/sw/source/core/inc/swcache.hxx +++ b/sw/source/core/inc/swcache.hxx @@ -103,7 +103,6 @@ public: bool Insert( SwCacheObj *pNew ); void Delete( const void *pOwner ); -// void Delete( const void *pOwner, const sal_uInt16 nIndex ); void SetLRUOfst( const sal_uInt16 nOfst ); /// nOfst determines how many are not to be touched void ResetLRUOfst() { pFirst = pRealFirst; } @@ -112,7 +111,6 @@ public: inline void DecreaseMax( const sal_uInt16 nSub ); sal_uInt16 GetCurMax() const { return nCurMax; } inline SwCacheObj *First() { return pRealFirst; } - inline SwCacheObj *Last() { return pLast; } static inline SwCacheObj *Next( SwCacheObj *pCacheObj); inline SwCacheObj* operator[](sal_uInt16 nIndex) { return m_aCacheObjects[nIndex]; } inline sal_uInt16 size() { return m_aCacheObjects.size(); } @@ -154,7 +152,6 @@ class SwCacheObj protected: const void *pOwner; - inline void SetOwner( const void *pNew ) { pOwner = pNew; } public: @@ -165,7 +162,6 @@ public: inline bool IsOwner( const void *pNew ) const; inline sal_uInt16 GetCachePos() const { return nCachePos; } - inline void Invalidate() { pOwner = 0; } inline bool IsLocked() const { return 0 != nLock; } @@ -176,10 +172,6 @@ public: inline void Lock() { ++nLock; } inline void Unlock() { --nLock; } #endif - - SwCacheObj *Next() { return pNext; } - SwCacheObj *Prev() { return pPrev; } - }; /** diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx index 97da4572235e..076352107411 100644 --- a/sw/source/core/inc/swfont.hxx +++ b/sw/source/core/inc/swfont.hxx @@ -196,9 +196,6 @@ public: inline void ChkMagic( SwViewShell *pSh, sal_uInt8 nWhich ) { if( !aSub[ nWhich ].pMagic ) GoMagic( pSh, nWhich ); } - // assumes the MagicNumber of a (hopefully not identical) colleague - inline void CopyMagic( const SwFont* pFnt, sal_uInt8 nWhich ) - { aSub[nWhich].CopyMagic( pFnt->aSub[nWhich] ); } inline void GetMagic( const void* &rMagic, sal_uInt16 &rIdx, sal_uInt8 nWhich ) { rMagic = aSub[nWhich].pMagic; rIdx = aSub[nWhich].nFntIndex; } inline void SetMagic( const void* pNew, const sal_uInt16 nIdx, sal_uInt8 nWhich ) @@ -250,32 +247,21 @@ public: // Get/Set-methods for the current setting inline void SetNoHyph( const bool bNew ); - inline bool IsNoHyph() const { return bNoHyph; } inline void SetBlink( const bool bBlink ); inline bool IsBlink() const { return bBlink; } inline sal_uInt8 &GetTox() { return nToxCnt; } - inline sal_uInt8 GetTox() const { return nToxCnt; } inline bool IsTox() const { return ( 0 != nToxCnt ); } inline sal_uInt8 &GetRef() { return nRefCnt; } - inline sal_uInt8 GetRef() const { return nRefCnt; } inline bool IsRef() const { return ( 0 != nRefCnt ); } inline sal_uInt8 &GetMeta() { return m_nMetaCount; } - inline sal_uInt8 GetMeta() const { return m_nMetaCount; } inline bool IsMeta() const { return (0 != m_nMetaCount); } inline sal_uInt8 &GetInputField() { return m_nInputFieldCount; } - inline sal_uInt8 GetInputField() const { return m_nInputFieldCount; } inline bool IsInputField() const { return (0 != m_nInputFieldCount); } - inline void SetURL( const bool bURL ); inline bool IsURL() const { return bURL; } inline void SetGreyWave( const bool bNew ); inline bool IsGreyWave() const { return bGreyWave; } inline void SetNoCol( const bool bNew ); - inline bool IsNoCol() const { return bNoColReplace; } - - inline void SetPaintBlank( const bool bNew ); inline bool IsPaintBlank() const { return bPaintBlank; } - inline void SetPaintWrong( const bool bNew ); - inline bool IsPaintWrong() const { return bPaintWrong; } // setting of the base class font for SwTextCharFormat void SetDiffFnt( const SfxItemSet* pSet, @@ -290,72 +276,37 @@ public: const Color& GetUnderColor() const { return aUnderColor; } FontUnderline GetOverline() const { return aSub[nActual].GetOverline(); } const Color& GetOverColor() const { return aOverColor; } - short GetFixKerning() const { return aSub[nActual].GetFixKerning(); } FontStrikeout GetStrikeout() const { return aSub[nActual].GetStrikeout(); } const Color& GetColor() const { return aSub[nActual].GetColor(); } - bool IsShadow() const { return aSub[nActual].IsShadow(); } bool IsWordLineMode() const { return aSub[nActual].IsWordLineMode(); } - bool IsOutline() const { return aSub[nActual].IsOutline(); } - bool IsKerning() const { return aSub[nActual].IsKerning(); } short GetEscapement() const { return aSub[nActual].GetEscapement(); } SvxCaseMap GetCaseMap() const { return aSub[nActual].GetCaseMap(); } sal_uInt8 GetPropr() const { return aSub[nActual].GetPropr(); } FontItalic GetItalic() const { return aSub[nActual].GetItalic(); } LanguageType GetLanguage() const { return aSub[nActual].GetLanguage(); } - FontAlign GetAlign() const { return aSub[nActual].GetAlign(); } - const OUString& GetName() const { return aSub[nActual].GetName(); } - const OUString& GetStyleName() const {return aSub[nActual].GetStyleName();} - FontFamily GetFamily() const { return aSub[nActual].GetFamily(); } - FontPitch GetPitch() const { return aSub[nActual].GetPitch(); } - rtl_TextEncoding GetCharSet() const { return aSub[nActual].GetCharSet(); } long GetHeight() const { return aSub[nActual].GetSize().Height(); } FontWeight GetWeight() const { return aSub[nActual].GetWeight(); } FontEmphasisMark GetEmphasisMark() const { return aSub[nActual].GetEmphasisMark(); } - sal_uInt16 GetPropWidth() const { return aSub[nActual].GetPropWidth(); } sal_uInt16 GetOrientation( const bool nVertLayout = false ) const; inline const OUString& GetName( const sal_uInt8 nWhich ) const { return aSub[nWhich].GetName(); } inline LanguageType GetLanguage( const sal_uInt8 nWhich ) const { return aSub[nWhich].GetLanguage(); } - inline const OUString& GetStyleName( const sal_uInt8 nWhich ) const - { return aSub[nWhich].GetStyleName(); } - inline FontFamily GetFamily( const sal_uInt8 nWhich ) const - { return aSub[nWhich].GetFamily(); } - inline FontItalic GetItalic( const sal_uInt8 nWhich ) const - { return aSub[nWhich].GetItalic(); } - inline FontPitch GetPitch( const sal_uInt8 nWhich ) const - { return aSub[nWhich].GetPitch(); } inline rtl_TextEncoding GetCharSet( const sal_uInt8 nWhich ) const { return aSub[nWhich].GetCharSet(); } inline long GetHeight( const sal_uInt8 nWhich ) const { return aSub[nWhich].GetSize().Height(); } - inline FontWeight GetWeight( const sal_uInt8 nWhich ) const - { return aSub[nWhich].GetWeight(); } - inline FontEmphasisMark GetEmphasisMark( const sal_uInt8 nWhich ) const - { return aSub[nWhich].GetEmphasisMark(); } // makes the logical font be effective in the OutputDevice void ChgPhysFnt( SwViewShell *pSh, OutputDevice& rOut ); - Size GetCapitalSize( SwDrawTextInfo& rInf ) - { return aSub[nActual].GetCapitalSize( rInf ); } - sal_Int32 GetCapitalBreak( SwViewShell const* pSh, const OutputDevice* pOut, const SwScriptInfo* pScript, const OUString& rText, long nTextWidth, const sal_Int32 nIdx, const sal_Int32 nLen ); - sal_Int32 GetCapitalCrsrOfst( SwDrawTextInfo& rInf ) - { return aSub[nActual].GetCapitalCrsrOfst( rInf ); } - - void DrawCapital( SwDrawTextInfo &rInf ) - { aSub[nActual].DrawCapital( rInf ); } - - void DrawStretchCapital( SwDrawTextInfo &rInf ) - { aSub[nActual].DrawStretchCapital( rInf ); } - void DoOnCapitals( SwDoCapitals &rDo ) { aSub[nActual].DoOnCapitals( rDo ); } @@ -859,16 +810,6 @@ inline void SwFont::SetLanguage( const LanguageType eNewLang, const sal_uInt8 nW } } -inline void SwFont::SetPaintBlank( const bool bNew ) -{ - bPaintBlank = bNew; -} - -inline void SwFont::SetPaintWrong( const bool bNew ) -{ - bPaintWrong = bNew; -} - inline void SwFont::SetNoHyph( const bool bNew ) { bNoHyph = bNew; @@ -879,11 +820,6 @@ inline void SwFont::SetBlink( const bool bNew ) bBlink = bNew; } -inline void SwFont::SetURL( const bool bNew ) -{ - bURL = bNew; -} - inline void SwFont::SetGreyWave( const bool bNew ) { bGreyWave = bNew; @@ -1064,7 +1000,6 @@ public: inline SvStatistics() { Reset(); } - inline void PrintOn( SvStream &rOS ) const; //$ ostream inline bool IsEmpty() const { return !( nGetTextSize || nDrawText || @@ -1077,26 +1012,7 @@ extern SvStatistics g_SvStat; #define SV_STAT(nWhich) ++(g_SvStat.nWhich); -inline void SvStatistics::PrintOn( SvStream &rOS ) const //$ ostream -{ - if( IsEmpty() ) - return; - - rOS.WriteCharPtr( "{ SV called:\n" ); - if( nGetTextSize ) - rOS.WriteCharPtr( "\tnGetTextSize: " ).WriteUInt16( nGetTextSize ).WriteChar( '\n' ); - if( nDrawText ) - rOS.WriteCharPtr( "\tnDrawText: " ).WriteUInt16( nDrawText ).WriteChar( '\n' ); - if( nGetStretchTextSize ) - rOS.WriteCharPtr( "\tnGetStretchTextSize: " ).WriteUInt16( nGetStretchTextSize ).WriteChar( '\n' ); - if( nDrawStretchText ) - rOS.WriteCharPtr( "\tnDrawStretchText: " ).WriteUInt16( nDrawStretchText ).WriteChar( '\n' ); - if( nChangeFont ) - rOS.WriteCharPtr( "\tnChangeFont: " ).WriteUInt16( nChangeFont ).WriteChar( '\n' ); - if( nGetFontMetric ) - rOS.WriteCharPtr( "\tnGetFontMetric: " ).WriteUInt16( nGetFontMetric ).WriteChar( '\n' ); - rOS.WriteCharPtr( "}\n" ); -} + #else #define SV_STAT(nWhich) #endif /* DBG_UTIL */ diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx index dca483993646..a6e9363e8d4f 100644 --- a/sw/source/core/inc/tabfrm.hxx +++ b/sw/source/core/inc/tabfrm.hxx @@ -34,7 +34,6 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm // does the special treatment for _Get[Next|Prev]Leaf() using SwFrm::GetLeaf; - SwLayoutFrm *GetLeaf( MakePageType eMakePage, bool bFwd ); SwTable * m_pTable; diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 693bb16419ec..cc9e9d5871b9 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -85,8 +85,6 @@ class SwTextFrm: public SwContentFrm // Separates the Master and creates a Follow or adjusts the data in the Follow void _AdjustFollow( SwTextFormatter &rLine, const sal_Int32 nOffset, const sal_Int32 nStrEnd, const sal_uInt8 nMode ); - inline void AdjustFollow( SwTextFormatter &rLine, const sal_Int32 nOffset, - const sal_Int32 nStrEnd, const sal_uInt8 nMode ); // Iterates all Lines and sets the line spacing using the attribute void CalcLineSpace(); @@ -198,13 +196,6 @@ class SwTextFrm: public SwContentFrm */ void _CalcHeightOfLastLine( const bool _bUseFont = false ); - // ST2 - SwWrongList* _SmartTagScan ( const OUString& aTextToScan, SwWrongList *pSmartTagList, - sal_Int32 nBegin,sal_Int32 nEnd, - sal_Int32 nInsertPos, sal_Int32 nActPos, - sal_Int32 &nChgStart, sal_Int32 &nChgEnd, - sal_Int32 &nInvStart, sal_Int32 &nInvEnd); - virtual void DestroyImpl() SAL_OVERRIDE; virtual ~SwTextFrm(); @@ -442,22 +433,12 @@ public: */ SwTwips GetFootnoteLine( const SwTextFootnote *pFootnote ) const; - /** - * Returns the left and the right margin document coordinates - * (taking the paragraph attributes into account) - */ - inline SwTwips GetLeftMargin() const; - inline SwTwips GetRightMargin() const; - virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE; virtual void CheckDirection( bool bVert ) SAL_OVERRIDE; /// Returns the sum of line height in pLine sal_uInt16 GetParHeight() const; - /// Returns the remaining height - inline SwTwips GetRstHeight() const; - inline SwTextFrm *GetFollow(); inline const SwTextFrm *GetFollow() const; @@ -490,7 +471,6 @@ public: static void SetTextCache( SwCache *pNew ) { pTextCache = pNew; } static long GetMinPrtLine() { return nMinPrtLine; } - static void SetMinPrtLine( long nNew ) { nMinPrtLine = nNew; } inline sal_uInt16 GetCacheIdx() const { return nCacheIdx; } inline void SetCacheIdx( const sal_uInt16 nNew ) { nCacheIdx = nNew; } @@ -693,23 +673,6 @@ inline bool SwTextFrm::HasPara() const return nCacheIdx!=USHRT_MAX && _HasPara(); } -/// 9104: Frm().Height() - Prt().Height(), see widorp.cxx and 7455, 6114, 7908 -inline SwTwips SwTextFrm::GetRstHeight() const -{ - return !GetUpper() ? 0 : static_cast<const SwFrm*>(GetUpper())->Frm().Top() - + static_cast<const SwFrm*>(GetUpper())->Prt().Top() - + static_cast<const SwFrm*>(GetUpper())->Prt().Height() - - Frm().Top() - (Frm().Height() - Prt().Height()); -} - -inline SwTwips SwTextFrm::GetLeftMargin() const -{ - return Frm().Left() + Prt().Left(); -} -inline SwTwips SwTextFrm::GetRightMargin() const -{ - return Frm().Left() + Prt().Left() + Prt().Width(); -} inline SwTwips SwTextFrm::GrowTst( const SwTwips nGrow ) { return Grow( nGrow, true ); @@ -751,13 +714,6 @@ inline const SwTextFrm *SwTextFrm::GetFrmAtPos( const SwPosition &rPos) const return const_cast<SwTextFrm*>(this)->GetFrmAtPos( rPos ); } -inline void SwTextFrm::AdjustFollow( SwTextFormatter &rLine, - const sal_Int32 nOffset, const sal_Int32 nStrEnd, const sal_uInt8 nMode ) -{ - if ( HasFollow() ) - _AdjustFollow( rLine, nOffset, nStrEnd, nMode ); -} - inline void SwTextFrm::SetOfst( const sal_Int32 nNewOfst ) { if ( nOfst != nNewOfst ) diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx index 53c4e02814dd..036ab7e4b9a6 100644 --- a/sw/source/core/inc/unoport.hxx +++ b/sw/source/core/inc/unoport.hxx @@ -122,8 +122,6 @@ private: bool m_bIsCollapsed; - SwFormatField * GetFieldFormat(bool bInit = false); - void init(const SwUnoCrsr* pPortionCursor); protected: @@ -136,10 +134,6 @@ protected: const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - void GetPropertyValues( const OUString *pPropertyNames, - ::com::sun::star::uno::Any *pValues, - sal_Int32 nLength ); - void GetPropertyValue( ::com::sun::star::uno::Any &rVal, const SfxItemPropertySimpleEntry& rEntry, SwUnoCrsr *pUnoCrsr, SfxItemSet *&pSet ); @@ -234,7 +228,6 @@ public: ::com::sun::star::text::XTextContent > xMeta) { m_xMeta = xMeta; } - bool IsCollapsed() const { return m_bIsCollapsed; } void SetCollapsed(bool bSet) { m_bIsCollapsed = bSet;} SwTextPortionType GetTextPortionType() const { return m_ePortionType; } diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx index 3146ec39e893..6e9544a07a41 100644 --- a/sw/source/core/inc/viewimp.hxx +++ b/sw/source/core/inc/viewimp.hxx @@ -191,8 +191,6 @@ public: bool IsIdleAction() const { return pIdleAct != 0; } SwLayAction &GetLayAction() { return *pLayAct; } const SwLayAction &GetLayAction() const { return *pLayAct; } - SwLayIdle &GetIdleAction() { return *pIdleAct;} - const SwLayIdle &GetIdleAction() const { return *pIdleAct;} /** * If an Action is running we ask it to check whether it's time diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx index 10a030982f32..085ab615bea6 100644 --- a/sw/source/core/inc/wrong.hxx +++ b/sw/source/core/inc/wrong.hxx @@ -205,8 +205,6 @@ public: inline WrongListType GetWrongListType() const { return meType; } inline sal_Int32 GetBeginInv() const { return nBeginInvalid; } inline sal_Int32 GetEndInv() const { return nEndInvalid; } - inline bool InsideInvalid( sal_Int32 nChk ) const - { return nChk >= nBeginInvalid && nChk <= nEndInvalid; } void SetInvalid( sal_Int32 nBegin, sal_Int32 nEnd ); inline void Validate(){ nBeginInvalid = nEndInvalid = COMPLETE_STRING; } void Invalidate( sal_Int32 nBegin, sal_Int32 nEnd ); diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index 1285d1b8d8a3..2b8aa17a272c 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -963,7 +963,7 @@ void SwRedlineSaveData::RedlineToDoc( SwPaM& rPam ) rDoc.getIDocumentRedlineAccess().SetRedlineMode_intern((RedlineMode_t)(eOld | nsRedlineMode_t::REDLINE_DONTCOMBINE_REDLINES)); //#i92154# let UI know about a new redline with comment if (rDoc.GetDocShell() && (!pRedl->GetComment().isEmpty()) ) - rDoc.GetDocShell()->Broadcast(SwRedlineHint(pRedl,SWREDLINE_INSERTED)); + rDoc.GetDocShell()->Broadcast(SwRedlineHint()); bool const bSuccess = rDoc.getIDocumentRedlineAccess().AppendRedline( pRedl, true ); assert(bSuccess); // SwRedlineSaveData::RedlineToDoc: insert redline failed |