[Libreoffice-commits] core.git: sw/source

[Armin Le Grand]

 sw/source/core/inc/pagefrm.hxx     |    2 +-
 sw/source/core/layout/paintfrm.cxx |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 5ad71fb44ef45bd6026c501ca1b779974c3d6621
Author: Armin Le Grand <alg at apache.org>
Date:   Wed Jun 4 11:12:30 2014 +0000

    Corrected GetDrawBackgrdColor to return a value, not a reference
    
    (cherry picked from commit a8a2653568d31a2fb76aeb3183e128e3304452bd)
    
    Conflicts:
    	sw/source/core/layout/paintfrm.cxx
    
    Change-Id: I1e0a5a255d67d130f85a8c5c739c4e5cd4ce03c5

diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index c80601f..4469bd7 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -234,7 +234,7 @@ public:
 
         @return reference to an instance of class Color
     */
-    const Color& GetDrawBackgrdColor() const;
+    const Color GetDrawBackgrdColor() const;
 
     /** paint margin area of a page
 
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index a8dbaa8..8ee0c0c 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3277,7 +3277,7 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c
                 // OD 29.08.2002 #102450#
                 // determine background color of page for <PaintLayer> method
                 // calls, paint <hell> or <heaven>
-                const Color aPageBackgrdColor = pPage->GetDrawBackgrdColor();
+                const Color aPageBackgrdColor(pPage->GetDrawBackgrdColor());
 
                 pPage->PaintBaBo( aPaintRect, pPage, true );
 
@@ -7200,7 +7200,7 @@ void SwLayoutFrm::RefreshExtraData( const SwRect &rRect ) const
 
     @return Color
 */
-const Color& SwPageFrm::GetDrawBackgrdColor() const
+const Color SwPageFrm::GetDrawBackgrdColor() const
 {
     const SvxBrushItem* pBrushItem;
     const Color* pDummyColor;
@@ -7299,7 +7299,7 @@ void SwFrm::Retouche( const SwPageFrm * pPage, const SwRect &rRect ) const
             SwRect aRetouchePart( rRetouche );
             if ( aRetouchePart.HasArea() )
             {
-                const Color aPageBackgrdColor = pPage->GetDrawBackgrdColor();
+                const Color aPageBackgrdColor(pPage->GetDrawBackgrdColor());
                 const IDocumentDrawModelAccess* pIDDMA = pSh->getIDocumentDrawModelAccess();
                 // --> OD #i76669#
                 SwViewObjectContactRedirector aSwRedirector( *pSh );
@@ -7570,7 +7570,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap )
 
         // OD 09.12.2002 #103045# - determine page, fly frame is on
         const SwPageFrm* pFlyPage = pFly->FindPageFrm();
-        const Color aPageBackgrdColor = pFlyPage->GetDrawBackgrdColor();
+        const Color aPageBackgrdColor(pFlyPage->GetDrawBackgrdColor());
         const IDocumentDrawModelAccess* pIDDMA = pSh->getIDocumentDrawModelAccess();
         // --> OD #i76669#
         SwViewObjectContactRedirector aSwRedirector( *pSh );