svn commit: r1600100 - in /openoffice/trunk/main/sw/source/core: inc/pagefrm.hxx layout/paintfrm.cxx

[alg]

Author: alg
Date: Wed Jun  4 11:12:30 2014
New Revision: 1600100

URL: http://svn.apache.org/r1600100
Log:
Corrected GetDrawBackgrdColor to return a value, not a reference, removed 
unused var

Modified:
    openoffice/trunk/main/sw/source/core/inc/pagefrm.hxx
    openoffice/trunk/main/sw/source/core/layout/paintfrm.cxx

Modified: openoffice/trunk/main/sw/source/core/inc/pagefrm.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/inc/pagefrm.hxx?rev=1600100&r1=1600099&r2=1600100&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/inc/pagefrm.hxx (original)
+++ openoffice/trunk/main/sw/source/core/inc/pagefrm.hxx Wed Jun  4 11:12:30 
2014
@@ -317,7 +317,7 @@ public:
 
         @return reference to an instance of class Color
     */
-    const Color& GetDrawBackgrdColor() const;
+    const Color GetDrawBackgrdColor() const;
 
     /** paint margin area of a page
 

Modified: openoffice/trunk/main/sw/source/core/layout/paintfrm.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/layout/paintfrm.cxx?rev=1600100&r1=1600099&r2=1600100&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/layout/paintfrm.cxx (original)
+++ openoffice/trunk/main/sw/source/core/layout/paintfrm.cxx Wed Jun  4 
11:12:30 2014
@@ -308,8 +308,7 @@ void SwCalcPixStatics( OutputDevice *pOu
 //Zum Sichern der statics, damit das Paint (quasi) reentrant wird.
 class SwSavePaintStatics
 {
-       sal_Bool                        bSFlyMetafile,
-                        bSPageOnly;
+       sal_Bool                        bSFlyMetafile; // not used: bSPageOnly;
        ViewShell                  *pSGlobalShell;
        OutputDevice       *pSFlyMetafileOut;
        SwFlyFrm                   *pSRetoucheFly,
@@ -3011,7 +3010,7 @@ SwRootFrm::Paint(SwRect const& rRect, Sw
                 /// 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, sal_True );
 
@@ -6489,7 +6488,7 @@ void SwLayoutFrm::RefreshExtraData( cons
 
     @return Color
 */
-const Color& SwPageFrm::GetDrawBackgrdColor() const
+const Color SwPageFrm::GetDrawBackgrdColor() const
 {
     const SvxBrushItem* pBrushItem;
     const Color* pDummyColor;
@@ -6605,7 +6604,7 @@ void SwFrm::Retouche( const SwPageFrm * 
             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 );
@@ -6881,7 +6880,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageM
 
         // 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 );