[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source unusedcode.easy
Miklos Vajna
vmiklos at collabora.co.uk
Sat Oct 18 06:17:56 PDT 2014
sw/inc/hintids.hxx | 5 ++
sw/inc/hints.hxx | 7 +++-
sw/source/core/attr/hints.cxx | 21 ------------
sw/source/core/layout/laycache.cxx | 63 -------------------------------------
sw/source/core/layout/layhelp.hxx | 4 --
sw/source/core/text/inftxt.cxx | 23 -------------
sw/source/core/text/inftxt.hxx | 1
unusedcode.easy | 3 -
8 files changed, 11 insertions(+), 116 deletions(-)
New commits:
commit fdfc82ff2af11f37a61ae65da061e7e6ef8966a0
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sat Oct 18 14:48:48 2014 +0200
move doxygen comments to header
Change-Id: I828f4290c99e750df66548109ef8ae9b496af297
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 76d5202..5774ffb 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -431,6 +431,11 @@ typedef SfxPoolItem* SwDfltAttrTab[ POOLATTR_END - POOLATTR_BEGIN ];
extern SwDfltAttrTab aAttrTab;
extern SfxItemInfo aSlotTab[];
+/** Get the default attribute from corresponding default attribute table.
+
+ @param[in] nWhich Position in table
+ @return Attribute if found, null pointer otherwise
+*/
SW_DLLPUBLIC const SfxPoolItem* GetDfltAttr( sal_uInt16 nWhich );
SW_DLLPUBLIC sal_uInt16 GetWhichOfScript( sal_uInt16 nWhich, sal_uInt16 nScript );
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index f3af1af..bf6b5f9 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -132,6 +132,11 @@ class SwRefMarkFldUpdate : public SwMsgPoolItem
{
public:
const OutputDevice* pOut; ///< pointer to the current output device
+ /** Is sent if reference marks should be updated.
+
+ To get the page/chapter number, the frame has to be asked. For that we need
+ the current OutputDevice.
+ */
SwRefMarkFldUpdate( const OutputDevice* );
};
@@ -166,6 +171,7 @@ public:
bool bModified : 1;
bool bBehindSplitLine : 1;
+ /** Is sent if a table should be recalculated */
SwTableFmlUpdate( const SwTable* );
};
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index 69eace5..2aed426 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 )
{
}
-/** Is sent if reference marks should be updated.
-
- To get the page/chapter number, the frame has to be asked. For that we need
- the current OutputDevice.
-*/
SwRefMarkFldUpdate::SwRefMarkFldUpdate( const OutputDevice* pOutput )
: SwMsgPoolItem( RES_REFMARKFLD_UPDATE ),
pOut( pOutput )
@@ -66,7 +61,6 @@ SwDocPosUpdate::SwDocPosUpdate( const SwTwips nDcPos )
{
}
-/** Is sent if a table should be recalculated */
SwTableFmlUpdate::SwTableFmlUpdate( const SwTable* pNewTbl )
: SwMsgPoolItem( RES_TABLEFML_UPDATE ),
pTbl( pNewTbl ), pHistory( 0 ), nSplitLine( USHRT_MAX ),
@@ -117,7 +111,6 @@ SwMsgPoolItem::SwMsgPoolItem( sal_uInt16 nWhch )
{
}
-// "Overhead" of SfxPoolItem
bool SwMsgPoolItem::operator==( const SfxPoolItem& ) const
{
OSL_FAIL( "SwMsgPoolItem knows no ==" );
@@ -131,11 +124,6 @@ SfxPoolItem* SwMsgPoolItem::Clone( SfxItemPool* ) const
}
#if OSL_DEBUG_LEVEL > 0
-/** Get the default attribute from corresponding default attribute table.
-
- @param[in] nWhich Position in table
- @return Attribute if found, null pointer otherwise
-*/
const SfxPoolItem* GetDfltAttr( sal_uInt16 nWhich )
{
OSL_ASSERT( nWhich < POOLATTR_END && nWhich >= POOLATTR_BEGIN );
@@ -145,10 +133,6 @@ const SfxPoolItem* GetDfltAttr( sal_uInt16 nWhich )
return pHt;
}
#else
-/** Get the default attribute from corresponding default attribute table.
-
- @param[in] nWhich Position in table
-*/
const SfxPoolItem* GetDfltAttr( sal_uInt16 nWhich )
{
return aAttrTab[ nWhich - POOLATTR_BEGIN ];
commit e094ac0ff95f82a05810fc98945eb5229d19eadb
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Sat Oct 18 14:46:09 2014 +0200
sw: remaining unused methods
Change-Id: Ie150d2e497053966c5f75cea50c87888fda98659
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index a971b15..f3af1af 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 9b0f6a6..69eace5 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 0a3ff4c..8f835aa 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 306147f..47412c0 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 311059c..1b78155 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 32a43b8..f9246e3 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 3455a33..c60f235 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()
More information about the Libreoffice-commits
mailing list