diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-18 14:46:09 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-10-18 15:17:34 +0200 |
commit | e094ac0ff95f82a05810fc98945eb5229d19eadb (patch) | |
tree | 7393f3d2b0d1642ee31c5a0143b5dd382fc3da72 | |
parent | 9e207520a697dd63ee8ef4de5b2b55df2952b34b (diff) |
sw: remaining unused methods
Change-Id: Ie150d2e497053966c5f75cea50c87888fda98659
-rw-r--r-- | sw/inc/hints.hxx | 1 | ||||
-rw-r--r-- | sw/source/core/attr/hints.cxx | 5 | ||||
-rw-r--r-- | sw/source/core/layout/laycache.cxx | 63 | ||||
-rw-r--r-- | sw/source/core/layout/layhelp.hxx | 4 | ||||
-rw-r--r-- | sw/source/core/text/inftxt.cxx | 23 | ||||
-rw-r--r-- | sw/source/core/text/inftxt.hxx | 1 | ||||
-rw-r--r-- | unusedcode.easy | 3 |
7 files changed, 0 insertions, 100 deletions
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx index a971b15f2928..f3af1afd06a6 100644 --- a/sw/inc/hints.hxx +++ b/sw/inc/hints.hxx @@ -103,7 +103,6 @@ private: public: SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW ); - SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW, std::vector<sal_uInt16> aW ); sal_Int32 getStart() const { diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx index 9b0f6a60866c..69eace5bc7c8 100644 --- a/sw/source/core/attr/hints.cxx +++ b/sw/source/core/attr/hints.cxx @@ -49,11 +49,6 @@ SwUpdateAttr::SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW ) { } -SwUpdateAttr::SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW, std::vector<sal_uInt16> aW ) - : SwMsgPoolItem( RES_UPDATE_ATTR ), nStart( nS ), nEnd( nE ), nWhichAttr( nW ), aWhichFmtAttr( aW ) -{ -} - /** Is sent if reference marks should be updated. To get the page/chapter number, the frame has to be asked. For that we need diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index 0a3ff4c2af78..8f835aa1dbdf 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -992,69 +992,6 @@ void SwLayHelper::_CheckFlyCache( SwPageFrm* pPage ) } } -/** - * looks for the given text frame in the fly cache and sets - * the position and size, if possible. - * The fly cache is sorted by pages and we start searching with the given page. - * If we found the page number in the fly cache, we set - * the rpPage parameter to the right page, if possible. - */ -bool SwLayHelper::CheckPageFlyCache( SwPageFrm* &rpPage, SwFlyFrm* pFly ) -{ - if( !pFly->GetAnchorFrm() || !pFly->GetVirtDrawObj() || - pFly->GetAnchorFrm()->FindFooterOrHeader() ) - return false; - bool bRet = false; - SwDoc* pDoc = rpPage->GetFmt()->GetDoc(); - SwLayCacheImpl *pCache = pDoc->GetLayoutCache() ? - pDoc->GetLayoutCache()->LockImpl() : NULL; - if( pCache ) - { - sal_uInt16 nPgNum = rpPage->GetPhyPageNum(); - sal_uInt16 nIdx = 0; - sal_uInt16 nCnt = pCache->GetFlyCount(); - sal_uLong nOrdNum = pFly->GetVirtDrawObj()->GetOrdNum(); - SwFlyCache* pFlyC = 0; - - // skip fly frames from pages before the current page - while( nIdx < nCnt && - nPgNum > (pFlyC = &pCache->GetFlyCache( nIdx ))->nPageNum ) - ++nIdx; - - while( nIdx < nCnt && - nOrdNum != (pFlyC = &pCache->GetFlyCache( nIdx ))->nOrdNum ) - ++nIdx; - if( nIdx < nCnt ) - { - SwPageFrm *pPage = rpPage; - while( pPage && pPage->GetPhyPageNum() < pFlyC->nPageNum ) - pPage = (SwPageFrm*)pPage->GetNext(); - // #i43266# - if the found page is an empty page, - // take the previous one (take next one, if previous one doesn't exists) - if ( pPage && pPage->IsEmptyPage() ) - { - pPage = static_cast<SwPageFrm*>( pPage->GetPrev() - ? pPage->GetPrev() - : pPage->GetNext() ); - } - if( pPage ) - { - rpPage = pPage; - pFly->Frm().Pos().X() = pFlyC->Left() + pPage->Frm().Left(); - pFly->Frm().Pos().Y() = pFlyC->Top() + pPage->Frm().Top(); - if ( pCache->IsUseFlyCache() ) - { - pFly->Frm().Width( pFlyC->Width() ); - pFly->Frm().Height( pFlyC->Height() ); - } - bRet = true; - } - } - pDoc->GetLayoutCache()->UnlockImpl(); - } - return bRet; -} - SwLayCacheIoImpl::SwLayCacheIoImpl( SvStream& rStrm, bool bWrtMd ) : pStream( &rStrm ), nFlagRecEnd ( 0 ), diff --git a/sw/source/core/layout/layhelp.hxx b/sw/source/core/layout/layhelp.hxx index 306147fc4f5a..47412c001de6 100644 --- a/sw/source/core/layout/layhelp.hxx +++ b/sw/source/core/layout/layhelp.hxx @@ -126,10 +126,6 @@ public: /// position, if they are in the fly cache. void CheckFlyCache( SwPageFrm* pPage ) { if( pImpl && nFlyIdx < pImpl->GetFlyCount() ) _CheckFlyCache( pPage ); } - - /// Look for this text frame and set it to the right position, - /// if it's in the fly cache. - static bool CheckPageFlyCache( SwPageFrm* &rpPage, SwFlyFrm* pFly ); }; // Contains the data structures that are required to read and write a layout cache. diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 311059c51910..1b78155a20d2 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -915,29 +915,6 @@ void SwTxtPaintInfo::DrawRect( const SwRect &rRect, bool bNoGraphic, } } -void SwTxtPaintInfo::DrawSpecial(const SwLinePortion &rPor, sal_Unicode cChar, const Color& rColor) const -{ - if( OnWin() ) - { - sal_uInt16 nOldWidth = rPor.Width(); - OUString sChar( cChar ); - SwPosSize aSize( GetTxtSize( sChar ) ); - - ((SwLinePortion&)rPor).Width( aSize.Width() ); - - SwRect aRect; - CalcRect( rPor, &aRect ); - - if( aRect.HasArea() ) - { - const sal_uInt8 nOptions = 0; - lcl_DrawSpecial( *this, rPor, aRect, rColor, cChar, nOptions ); - } - - ((SwLinePortion&)rPor).Width( nOldWidth ); - } -} - void SwTxtPaintInfo::DrawTab( const SwLinePortion &rPor ) const { if( OnWin() ) diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index 32a43b8cb505..f9246e33e248 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -449,7 +449,6 @@ public: void DrawRect( const SwRect &rRect, bool bNoGraphic = false, bool bRetouche = true ) const; - void DrawSpecial(const SwLinePortion &rPor, sal_Unicode cChar, const Color& rColor) const; void DrawTab( const SwLinePortion &rPor ) const; void DrawLineBreak( const SwLinePortion &rPor ) const; void DrawRedArrow( const SwLinePortion &rPor ) const; diff --git a/unusedcode.easy b/unusedcode.easy index 3455a33301bb..c60f235edb91 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -48,9 +48,6 @@ SvtListener::IsListening(SvtBroadcaster&) const SvxFontListBox::GetSelectEntry() const SvxOpenGLObject::getRenderer() SvxOpenGLObject::setRenderer(IOpenGLRenderer*) -SwLayHelper::CheckPageFlyCache(SwPageFrm*&, SwFlyFrm*) -SwTxtPaintInfo::DrawSpecial(SwLinePortion const&, unsigned short, Color const&) const -SwUpdateAttr::SwUpdateAttr(int, int, unsigned short, std::__debug::vector<unsigned short, std::allocator<unsigned short> >) Test::testCopyPasteSkipEmptyConditionalFormatting() Test::testPerf() Test::testSharedFormulaMoveBlock() |