[Libreoffice-commits] core.git: sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Fri Jun 26 04:41:45 PDT 2015
sw/source/core/doc/notxtfrm.cxx | 4 ++--
sw/source/core/inc/bodyfrm.hxx | 2 +-
sw/source/core/inc/cellfrm.hxx | 2 +-
sw/source/core/inc/flyfrm.hxx | 2 +-
sw/source/core/inc/flyfrms.hxx | 2 +-
sw/source/core/inc/frame.hxx | 2 +-
sw/source/core/inc/ftnfrm.hxx | 2 +-
sw/source/core/inc/hffrm.hxx | 2 +-
sw/source/core/inc/layfrm.hxx | 2 +-
sw/source/core/inc/notxtfrm.hxx | 2 +-
sw/source/core/inc/rowfrm.hxx | 2 +-
sw/source/core/inc/sectfrm.hxx | 2 +-
sw/source/core/inc/tabfrm.hxx | 2 +-
sw/source/core/inc/txtfrm.hxx | 2 +-
sw/source/core/layout/calcmove.cxx | 12 ++++++------
sw/source/core/layout/fly.cxx | 2 +-
sw/source/core/layout/flyincnt.cxx | 7 ++++---
sw/source/core/layout/flylay.cxx | 2 +-
sw/source/core/layout/ftnfrm.cxx | 2 +-
sw/source/core/layout/hffrm.cxx | 4 ++--
sw/source/core/layout/pagechg.cxx | 2 +-
sw/source/core/layout/sectfrm.cxx | 4 ++--
sw/source/core/layout/tabfrm.cxx | 10 +++++-----
sw/source/core/layout/unusedf.cxx | 2 +-
sw/source/core/layout/wsfrm.cxx | 2 +-
sw/source/core/text/frmform.cxx | 4 ++--
sw/source/core/text/inftxt.cxx | 2 +-
sw/source/core/text/txtfrm.cxx | 2 +-
28 files changed, 44 insertions(+), 43 deletions(-)
New commits:
commit 05e50b570f602c17218bb6e82bcaac2fbdd943c1
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Jun 26 11:46:05 2015 +0200
SwTextFrm::Format: use vcl::RenderContext
Change-Id: I468d662a612c951dc1482cfc685dee800bb11f82
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 14e7d3e..d040d35 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.cxx
@@ -480,13 +480,13 @@ void SwNoTextFrm::MakeAll()
if ( !mbValidSize )
{ mbValidSize = true;
- Format();
+ Format(getRootFrm()->GetCurrShell()->GetOut());
}
}
}
/** Calculate the Bitmap's site, if needed */
-void SwNoTextFrm::Format( const SwBorderAttrs * )
+void SwNoTextFrm::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderAttrs * )
{
const Size aNewSize( GetSize() );
diff --git a/sw/source/core/inc/bodyfrm.hxx b/sw/source/core/inc/bodyfrm.hxx
index 5e3e0be..375dec9 100644
--- a/sw/source/core/inc/bodyfrm.hxx
+++ b/sw/source/core/inc/bodyfrm.hxx
@@ -27,7 +27,7 @@ class SwBorderAttrs;
class SwBodyFrm: public SwLayoutFrm
{
protected:
- virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
+ virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
public:
SwBodyFrm( SwFrameFormat*, SwFrm* );
diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx
index efd3796..040cc03 100644
--- a/sw/source/core/inc/cellfrm.hxx
+++ b/sw/source/core/inc/cellfrm.hxx
@@ -36,7 +36,7 @@ class SwCellFrm: public SwLayoutFrm
virtual ~SwCellFrm();
protected:
- virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
+ virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
public:
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index 59f33db..be422b4 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -121,7 +121,7 @@ protected:
Point m_aContentPos; // content area's position relatively to Frm
bool m_bValidContentPos;
- virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
+ virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
void MakePrtArea( const SwBorderAttrs &rAttrs );
void MakeContentPos( const SwBorderAttrs &rAttrs );
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index 73dda04..4608577 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -195,7 +195,7 @@ public:
SwFlyInCntFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor );
- virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
+ virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
void SetRefPoint( const Point& rPoint, const Point &rRelAttr,
const Point &rRelPos );
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 2072d40..9c9f76a 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -573,7 +573,7 @@ public:
// environment (not e.g. for repeating table headlines)
bool IsFootnoteAllowed() const;
- virtual void Format( const SwBorderAttrs *pAttrs = 0 );
+ virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 );
virtual void CheckDirection( bool bVert );
diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx
index e9b2d3c..fe5b10e 100644
--- a/sw/source/core/inc/ftnfrm.hxx
+++ b/sw/source/core/inc/ftnfrm.hxx
@@ -42,7 +42,7 @@ public:
virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
- virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
+ virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
virtual void PaintBorder( const SwRect &, const SwPageFrm *pPage,
const SwBorderAttrs & ) const SAL_OVERRIDE;
virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const SAL_OVERRIDE;
diff --git a/sw/source/core/inc/hffrm.hxx b/sw/source/core/inc/hffrm.hxx
index 093c466..3adcec7 100644
--- a/sw/source/core/inc/hffrm.hxx
+++ b/sw/source/core/inc/hffrm.hxx
@@ -32,7 +32,7 @@ protected:
public:
SwHeadFootFrm(SwFrameFormat * pFrm, SwFrm*, sal_uInt16 aType);
- virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
+ virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
virtual SwTwips GrowFrm( SwTwips,
bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
virtual SwTwips ShrinkFrm( SwTwips,
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index b3b0ccb..1c95247 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -53,7 +53,7 @@ protected:
virtual void DestroyImpl() SAL_OVERRIDE;
virtual ~SwLayoutFrm();
- virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
+ virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
virtual void MakeAll() SAL_OVERRIDE;
SwFrm * m_pLower;
diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx
index e0a65c4..0c638bc 100644
--- a/sw/source/core/inc/notxtfrm.hxx
+++ b/sw/source/core/inc/notxtfrm.hxx
@@ -34,7 +34,7 @@ class SwNoTextFrm: public SwContentFrm
void InitCtor();
- void Format ( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
+ void Format ( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
void PaintPicture( vcl::RenderContext*, const SwRect& ) const;
virtual void DestroyImpl() SAL_OVERRIDE;
diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx
index e59c2d5..79fae7d 100644
--- a/sw/source/core/inc/rowfrm.hxx
+++ b/sw/source/core/inc/rowfrm.hxx
@@ -29,7 +29,7 @@ class SwBorderAttrs;
/// SwRowFrm is one table row in the document layout.
class SwRowFrm: public SwLayoutFrm
{
- virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
+ virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
/// Only change the Frame size, not the PrtArea SSize
virtual SwTwips ShrinkFrm( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx
index df36cf8..1b8135c 100644
--- a/sw/source/core/inc/sectfrm.hxx
+++ b/sw/source/core/inc/sectfrm.hxx
@@ -60,7 +60,7 @@ class SwSectionFrm: public SwLayoutFrm, public SwFlowFrm
protected:
virtual void MakeAll() SAL_OVERRIDE;
virtual bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, bool bHead, bool &rReformat ) SAL_OVERRIDE;
- virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
+ virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
virtual void SwClientNotify( const SwModify&, const SfxHint& ) SAL_OVERRIDE;
diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index 3f0c935..9c93ae1 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.hxx
@@ -107,7 +107,7 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm
protected:
virtual void MakeAll() SAL_OVERRIDE;
- virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
+ virtual void Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
// only changes the Framesize, not the PrtArea size
virtual SwTwips GrowFrm ( SwTwips, bool bTst = false, bool bInfo = false ) SAL_OVERRIDE;
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 1e5737d..693bb16 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -449,7 +449,7 @@ public:
inline SwTwips GetLeftMargin() const;
inline SwTwips GetRightMargin() const;
- virtual void Format( const SwBorderAttrs *pAttrs = 0 ) SAL_OVERRIDE;
+ 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
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index e52cfd0..280598c 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -765,7 +765,7 @@ void SwPageFrm::MakeAll()
{ // Set FixSize. For pages, this is not done from Upper, but from
// the attribute.
Frm().SSize( pAttrs->GetSize() );
- Format( pAttrs );
+ Format( getRootFrm()->GetCurrShell()->GetOut(), pAttrs );
}
}
}
@@ -850,7 +850,7 @@ void SwLayoutFrm::MakeAll()
pAccess = new SwBorderAttrAccess( SwFrm::GetCache(), this );
pAttrs = pAccess->Get();
}
- Format( pAttrs );
+ Format( getRootFrm()->GetCurrShell()->GetOut(), pAttrs );
}
} //while ( !mbValidPos || !mbValidSize || !mbValidPrtArea )
delete pAccess;
@@ -1334,7 +1334,7 @@ void SwContentFrm::MakeAll()
// without change occur.
if ( nConsecutiveFormatsWithoutChange <= cnStopFormat )
{
- Format();
+ Format(getRootFrm()->GetCurrShell()->GetOut());
}
#if OSL_DEBUG_LEVEL > 0
else
@@ -1386,7 +1386,7 @@ void SwContentFrm::MakeAll()
Prepare( PREP_WIDOWS_ORPHANS, 0, false );
mbValidSize = true;
bFormatted = sal_True;
- Format();
+ Format(getRootFrm()->GetCurrShell()->GetOut());
}
}
SwFrm *pNxt = HasFollow() ? NULL : FindNext();
@@ -1716,7 +1716,7 @@ void MakeNxt( SwFrm *pFrm, SwFrm *pNxt )
pNxt->Frm().Width( pNxt->GetUpper()->Prt().Width() );
}
static_cast<SwContentFrm*>(pNxt)->MakePrtArea( rAttrs );
- pNxt->Format( &rAttrs );
+ pNxt->Format( pNxt->getRootFrm()->GetCurrShell()->GetOut(), &rAttrs );
}
else
{
@@ -1730,7 +1730,7 @@ void MakeNxt( SwFrm *pFrm, SwFrm *pNxt )
else
pNxt->Frm().Width( pNxt->GetUpper()->Prt().Width() );
}
- pNxt->Format( &rAttrs );
+ pNxt->Format( pNxt->getRootFrm()->GetCurrShell()->GetOut(), &rAttrs );
}
pFrm->mbValidPos = bOldPos;
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 02eed3a..300f303 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -1236,7 +1236,7 @@ void SwFlyFrm::ChgRelPos( const Point &rNewPos )
*
* The FixSize is not inserted here.
*/
-void SwFlyFrm::Format( const SwBorderAttrs *pAttrs )
+void SwFlyFrm::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderAttrs *pAttrs )
{
OSL_ENSURE( pAttrs, "FlyFrm::Format, pAttrs is 0." );
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx
index cbd0d30..3593258 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -21,6 +21,7 @@
#include "frmtool.hxx"
#include "hints.hxx"
#include <fmtornt.hxx>
+#include "rootfrm.hxx"
#include "txtfrm.hxx"
#include "flyfrms.hxx"
#include <dflyobj.hxx>
@@ -128,7 +129,7 @@ void SwFlyInCntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
}
/// Here the content gets formatted initially.
-void SwFlyInCntFrm::Format( const SwBorderAttrs *pAttrs )
+void SwFlyInCntFrm::Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs *pAttrs )
{
if ( !Frm().Height() )
{
@@ -140,7 +141,7 @@ void SwFlyInCntFrm::Format( const SwBorderAttrs *pAttrs )
}
Unlock();
}
- SwFlyFrm::Format( pAttrs );
+ SwFlyFrm::Format( pRenderContext, pAttrs );
}
/** Calculate object position
@@ -240,7 +241,7 @@ void SwFlyInCntFrm::MakeAll()
}
if ( !mbValidSize )
- Format( &rAttrs );
+ Format( getRootFrm()->GetCurrShell()->GetOut(), &rAttrs );
if ( !mbValidPos )
{
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 9b351c0..d12f7d8 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -171,7 +171,7 @@ void SwFlyFreeFrm::MakeAll()
if ( !mbValidSize || bFormatHeightOnly )
{
mbValidSize = false;
- Format( &rAttrs );
+ Format( getRootFrm()->GetCurrShell()->GetOut(), &rAttrs );
bFormatHeightOnly = false;
}
}
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 7a77ea6..be7de21 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -180,7 +180,7 @@ static long lcl_Undersize( const SwFrm* pFrm )
}
/// "format" the frame (Fixsize is not set here).
-void SwFootnoteContFrm::Format( const SwBorderAttrs * )
+void SwFootnoteContFrm::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderAttrs * )
{
// calculate total border, only one distance to the top
const SwPageFrm* pPage = FindPageFrm();
diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx
index 18b29fa..a54fbbd 100644
--- a/sw/source/core/layout/hffrm.cxx
+++ b/sw/source/core/layout/hffrm.cxx
@@ -387,7 +387,7 @@ void SwHeadFootFrm::FormatSize(SwTwips nUL, const SwBorderAttrs * pAttrs)
}
}
-void SwHeadFootFrm::Format(const SwBorderAttrs * pAttrs)
+void SwHeadFootFrm::Format(vcl::RenderContext* pRenderContext, const SwBorderAttrs * pAttrs)
{
OSL_ENSURE( pAttrs, "SwFooterFrm::Format, pAttrs is 0." );
@@ -396,7 +396,7 @@ void SwHeadFootFrm::Format(const SwBorderAttrs * pAttrs)
if ( ! GetEatSpacing() && IsHeaderFrm())
{
- SwLayoutFrm::Format(pAttrs);
+ SwLayoutFrm::Format(pRenderContext, pAttrs);
}
else
{
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 0ba69f9..3a02ef3 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -66,7 +66,7 @@ SwBodyFrm::SwBodyFrm( SwFrameFormat *pFormat, SwFrm* pSib ):
mnFrmType = FRM_BODY;
}
-void SwBodyFrm::Format( const SwBorderAttrs * )
+void SwBodyFrm::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderAttrs * )
{
// Formatting of the body is too simple, thus, it gets an own format method.
// Borders etc. are not taken into account here.
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index 3922b7a..7d6d852 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -1207,7 +1207,7 @@ class ExtraFormatToPositionObjs
};
/// "formats" the frame; Frm and PrtArea
-void SwSectionFrm::Format( const SwBorderAttrs *pAttr )
+void SwSectionFrm::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderAttrs *pAttr )
{
if( !pSection ) // via DelEmpty
{
@@ -1803,7 +1803,7 @@ SwLayoutFrm *SwFrm::GetPrevSctLeaf( MakePageType )
if( !pNew->Lower() ) // Format single column sections
{
pNew->MakePos();
- pLayLeaf->Format(); // In order that the PrtArea is correct for the MoveBwd
+ pLayLeaf->Format(getRootFrm()->GetCurrShell()->GetOut()); // In order that the PrtArea is correct for the MoveBwd
}
else
pNew->SimpleFormat();
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 6b2202f..616a2a4 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -1898,7 +1898,7 @@ void SwTabFrm::MakeAll()
const long nOldPrtWidth = (Prt().*fnRect->fnGetWidth)();
const long nOldFrmWidth = (Frm().*fnRect->fnGetWidth)();
const Point aOldPrtPos = (Prt().*fnRect->fnGetPos)();
- Format( pAttrs );
+ Format( getRootFrm()->GetCurrShell()->GetOut(), pAttrs );
SwHTMLTableLayout *pLayout = GetTable()->GetHTMLTableLayout();
if ( pLayout &&
@@ -1964,7 +1964,7 @@ void SwTabFrm::MakeAll()
}
mbValidPrtArea = false;
- Format( pAttrs );
+ Format( getRootFrm()->GetCurrShell()->GetOut(), pAttrs );
}
lcl_RecalcTable( *this, 0, aNotify );
m_bLowersFormatted = true;
@@ -2656,7 +2656,7 @@ bool SwTabFrm::CalcFlyOffsets( SwTwips& rUpper,
/// "Formats" the frame; Frm and PrtArea.
/// The fixed size is not adjusted here.
-void SwTabFrm::Format( const SwBorderAttrs *pAttrs )
+void SwTabFrm::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderAttrs *pAttrs )
{
OSL_ENSURE( pAttrs, "TabFrm::Format, pAttrs ist 0." );
@@ -3928,7 +3928,7 @@ static sal_uInt16 lcl_GetBottomLineDist( const SwRowFrm& rRow )
return nBottomLineDist;
}
-void SwRowFrm::Format( const SwBorderAttrs *pAttrs )
+void SwRowFrm::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderAttrs *pAttrs )
{
SWRECTFN( this )
OSL_ENSURE( pAttrs, "SwRowFrm::Format without Attrs." );
@@ -4667,7 +4667,7 @@ static bool lcl_ArrangeLowers( SwLayoutFrm *pLay, long lYStart, bool bInva )
return bRet;
}
-void SwCellFrm::Format( const SwBorderAttrs *pAttrs )
+void SwCellFrm::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderAttrs *pAttrs )
{
OSL_ENSURE( pAttrs, "CellFrm::Format, pAttrs ist 0." );
const SwTabFrm* pTab = FindTabFrm();
diff --git a/sw/source/core/layout/unusedf.cxx b/sw/source/core/layout/unusedf.cxx
index a788a58..11e8ca6 100644
--- a/sw/source/core/layout/unusedf.cxx
+++ b/sw/source/core/layout/unusedf.cxx
@@ -21,7 +21,7 @@
#include "cntfrm.hxx"
#include "flyfrm.hxx"
-void SwFrm::Format( const SwBorderAttrs * )
+void SwFrm::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderAttrs * )
{
OSL_FAIL( "Format() of the base class called." );
}
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 838f0ef..918dd95 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -2925,7 +2925,7 @@ void SwLayoutFrm::ChgLowersProp( const Size& rOldSize )
*
* The Fixsize is not set here.
*/
-void SwLayoutFrm::Format( const SwBorderAttrs *pAttrs )
+void SwLayoutFrm::Format( vcl::RenderContext* /*pRenderContext*/, const SwBorderAttrs *pAttrs )
{
OSL_ENSURE( pAttrs, "LayoutFrm::Format, pAttrs ist 0." );
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 868580e..44a3db0 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -1684,7 +1684,7 @@ void SwTextFrm::_Format( vcl::RenderContext* pRenderContext, SwParaPortion *pPar
// We calculate the text frame's size and send a notification.
// Shrink() or Grow() to adjust the frame's size to the changed required space.
-void SwTextFrm::Format( const SwBorderAttrs * )
+void SwTextFrm::Format( vcl::RenderContext* pRenderContext, const SwBorderAttrs * )
{
SWRECTFN( this )
@@ -1802,7 +1802,7 @@ void SwTextFrm::Format( const SwBorderAttrs * )
}
do
{
- _Format( getRootFrm()->GetCurrShell()->GetOut(), aAccess.GetPara() );
+ _Format( pRenderContext, aAccess.GetPara() );
if( pFootnoteBoss && nFootnoteHeight )
{
const SwFootnoteContFrm* pCont = pFootnoteBoss->FindFootnoteCont();
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index ae679c3..3a38002 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -156,7 +156,7 @@ void SwTextInfo::CtorInitTextInfo( SwTextFrm *pFrm )
if (!m_pPara)
{
SAL_WARN("sw.core", "+SwTextInfo::CTOR: missing paragraph information");
- pFrm->Format();
+ pFrm->Format(pFrm->getRootFrm()->GetCurrShell()->GetOut());
m_pPara = pFrm->GetPara();
}
}
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 18f8979..7687086 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -2074,7 +2074,7 @@ SwTextFrm* SwTextFrm::GetFormatted( bool bForceQuickFormat )
// format information
// Optimization with FormatQuick()
if( bFormat && !FormatQuick( bForceQuickFormat ) )
- Format();
+ Format(getRootFrm()->GetCurrShell()->GetOut());
}
return this;
More information about the Libreoffice-commits
mailing list