Kaydet (Commit) a8a26535 authored tarafından Armin Le Grand's avatar Armin Le Grand

Corrected GetDrawBackgrdColor to return a value, not a reference, removed unused var

üst 08030236
...@@ -317,7 +317,7 @@ public: ...@@ -317,7 +317,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
......
...@@ -308,8 +308,7 @@ void SwCalcPixStatics( OutputDevice *pOut ) ...@@ -308,8 +308,7 @@ void SwCalcPixStatics( OutputDevice *pOut )
//Zum Sichern der statics, damit das Paint (quasi) reentrant wird. //Zum Sichern der statics, damit das Paint (quasi) reentrant wird.
class SwSavePaintStatics class SwSavePaintStatics
{ {
sal_Bool bSFlyMetafile, sal_Bool bSFlyMetafile; // not used: bSPageOnly;
bSPageOnly;
ViewShell *pSGlobalShell; ViewShell *pSGlobalShell;
OutputDevice *pSFlyMetafileOut; OutputDevice *pSFlyMetafileOut;
SwFlyFrm *pSRetoucheFly, SwFlyFrm *pSRetoucheFly,
...@@ -3011,7 +3010,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const ...@@ -3011,7 +3010,7 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) const
/// 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, sal_True ); pPage->PaintBaBo( aPaintRect, pPage, sal_True );
...@@ -6489,7 +6488,7 @@ void SwLayoutFrm::RefreshExtraData( const SwRect &rRect ) const ...@@ -6489,7 +6488,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;
...@@ -6605,7 +6604,7 @@ void SwFrm::Retouche( const SwPageFrm * pPage, const SwRect &rRect ) const ...@@ -6605,7 +6604,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 );
...@@ -6881,7 +6880,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap ) ...@@ -6881,7 +6880,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