Kaydet (Commit) 5ad71fb4 authored tarafından Armin Le Grand's avatar Armin Le Grand Kaydeden (comit) Caolán McNamara

Corrected GetDrawBackgrdColor to return a value, not a reference

(cherry picked from commit a8a26535)

Conflicts:
	sw/source/core/layout/paintfrm.cxx

Change-Id: I1e0a5a255d67d130f85a8c5c739c4e5cd4ce03c5
üst e4abc1cb
...@@ -234,7 +234,7 @@ public: ...@@ -234,7 +234,7 @@ public:
@return reference to an instance of class Color @return reference to an instance of class Color
*/ */
const Color& GetDrawBackgrdColor() const; const Color GetDrawBackgrdColor() const;
/** paint margin area of a page /** paint margin area of a page
......
...@@ -3277,7 +3277,7 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c ...@@ -3277,7 +3277,7 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c
// OD 29.08.2002 #102450# // OD 29.08.2002 #102450#
// determine background color of page for <PaintLayer> method // determine background color of page for <PaintLayer> method
// calls, paint <hell> or <heaven> // calls, paint <hell> or <heaven>
const Color aPageBackgrdColor = pPage->GetDrawBackgrdColor(); const Color aPageBackgrdColor(pPage->GetDrawBackgrdColor());
pPage->PaintBaBo( aPaintRect, pPage, true ); pPage->PaintBaBo( aPaintRect, pPage, true );
...@@ -7200,7 +7200,7 @@ void SwLayoutFrm::RefreshExtraData( const SwRect &rRect ) const ...@@ -7200,7 +7200,7 @@ void SwLayoutFrm::RefreshExtraData( const SwRect &rRect ) const
@return Color @return Color
*/ */
const Color& SwPageFrm::GetDrawBackgrdColor() const const Color SwPageFrm::GetDrawBackgrdColor() const
{ {
const SvxBrushItem* pBrushItem; const SvxBrushItem* pBrushItem;
const Color* pDummyColor; const Color* pDummyColor;
...@@ -7299,7 +7299,7 @@ void SwFrm::Retouche( const SwPageFrm * pPage, const SwRect &rRect ) const ...@@ -7299,7 +7299,7 @@ void SwFrm::Retouche( const SwPageFrm * pPage, const SwRect &rRect ) const
SwRect aRetouchePart( rRetouche ); SwRect aRetouchePart( rRetouche );
if ( aRetouchePart.HasArea() ) if ( aRetouchePart.HasArea() )
{ {
const Color aPageBackgrdColor = pPage->GetDrawBackgrdColor(); const Color aPageBackgrdColor(pPage->GetDrawBackgrdColor());
const IDocumentDrawModelAccess* pIDDMA = pSh->getIDocumentDrawModelAccess(); const IDocumentDrawModelAccess* pIDDMA = pSh->getIDocumentDrawModelAccess();
// --> OD #i76669# // --> OD #i76669#
SwViewObjectContactRedirector aSwRedirector( *pSh ); SwViewObjectContactRedirector aSwRedirector( *pSh );
...@@ -7570,7 +7570,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap ) ...@@ -7570,7 +7570,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap )
// OD 09.12.2002 #103045# - determine page, fly frame is on // OD 09.12.2002 #103045# - determine page, fly frame is on
const SwPageFrm* pFlyPage = pFly->FindPageFrm(); const SwPageFrm* pFlyPage = pFly->FindPageFrm();
const Color aPageBackgrdColor = pFlyPage->GetDrawBackgrdColor(); const Color aPageBackgrdColor(pFlyPage->GetDrawBackgrdColor());
const IDocumentDrawModelAccess* pIDDMA = pSh->getIDocumentDrawModelAccess(); const IDocumentDrawModelAccess* pIDDMA = pSh->getIDocumentDrawModelAccess();
// --> OD #i76669# // --> OD #i76669#
SwViewObjectContactRedirector aSwRedirector( *pSh ); SwViewObjectContactRedirector aSwRedirector( *pSh );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment