svn commit: r1558622 - in /openoffice/branches/alg_writerframes/main/sw/source/core/layout: atrfrm.cxx fillattributes.cxx paintfrm.cxx

[alg]

Author: alg
Date: Thu Jan 16 00:03:09 2014
New Revision: 1558622

URL: http://svn.apache.org/r1558622
Log:
adapted first callers of fallbacks

Modified:
    openoffice/branches/alg_writerframes/main/sw/source/core/layout/atrfrm.cxx
    
openoffice/branches/alg_writerframes/main/sw/source/core/layout/fillattributes.cxx
    openoffice/branches/alg_writerframes/main/sw/source/core/layout/paintfrm.cxx

Modified: 
openoffice/branches/alg_writerframes/main/sw/source/core/layout/atrfrm.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/sw/source/core/layout/atrfrm.cxx?rev=1558622&r1=1558621&r2=1558622&view=diff
==============================================================================
--- openoffice/branches/alg_writerframes/main/sw/source/core/layout/atrfrm.cxx 
(original)
+++ openoffice/branches/alg_writerframes/main/sw/source/core/layout/atrfrm.cxx 
Thu Jan 16 00:03:09 2014
@@ -3118,7 +3118,11 @@ const String SwFlyFrmFmt::GetObjDescript
 */
 sal_Bool SwFlyFrmFmt::IsBackgroundTransparent() const
 {
-    sal_Bool bReturn = sal_False;
+    //UUUU
+    if(RES_FLYFRMFMT == Which() && getFillAttributes())
+    {
+        return getFillAttributes()->isTransparent();
+    }
 
     /// NOTE: If background color is "no fill"/"auto fill" (COL_TRANSPARENT)
     ///     and there is no background graphic, it "inherites" the background
@@ -3127,7 +3131,7 @@ sal_Bool SwFlyFrmFmt::IsBackgroundTransp
          (GetBackground().GetColor() != COL_TRANSPARENT)
        )
     {
-        bReturn = sal_True;
+        return sal_True;
     }
     else
     {
@@ -3137,11 +3141,11 @@ sal_Bool SwFlyFrmFmt::IsBackgroundTransp
              (pTmpGrf->GetAttr().GetTransparency() != 0)
            )
         {
-            bReturn = sal_True;
+            return sal_True;
         }
     }
 
-    return bReturn;
+    return sal_False;
 }
 
 /** SwFlyFrmFmt::IsBackgroundBrushInherited - for #103898#
@@ -3158,15 +3162,18 @@ sal_Bool SwFlyFrmFmt::IsBackgroundTransp
 */
 sal_Bool SwFlyFrmFmt::IsBackgroundBrushInherited() const
 {
-    sal_Bool bReturn = sal_False;
-
-    if ( (GetBackground().GetColor() == COL_TRANSPARENT) &&
+    //UUUU
+    if(RES_FLYFRMFMT == Which() && getFillAttributes())
+    {
+        return !getFillAttributes()->isUsed();
+    }
+    else if ( (GetBackground().GetColor() == COL_TRANSPARENT) &&
          !(GetBackground().GetGraphicObject()) )
     {
-        bReturn = sal_True;
+        return sal_True;
     }
 
-    return bReturn;
+    return sal_False;
 }
 
 // --> OD 2006-02-28 #125892#

Modified: 
openoffice/branches/alg_writerframes/main/sw/source/core/layout/fillattributes.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/sw/source/core/layout/fillattributes.cxx?rev=1558622&r1=1558621&r2=1558622&view=diff
==============================================================================
--- 
openoffice/branches/alg_writerframes/main/sw/source/core/layout/fillattributes.cxx
 (original)
+++ 
openoffice/branches/alg_writerframes/main/sw/source/core/layout/fillattributes.cxx
 Thu Jan 16 00:03:09 2014
@@ -115,6 +115,13 @@ bool FillAttributes::isTransparent() con
         return true;
     }
 
+    if(hasSdrFillAttribute())
+    {
+        const Graphic& rGraphic = 
getFillAttribute().getFillGraphic().getFillGraphic();
+
+        return rGraphic.IsSupportedGraphic() && rGraphic.IsTransparent();
+    }
+
     return false;
 }
 

Modified: 
openoffice/branches/alg_writerframes/main/sw/source/core/layout/paintfrm.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/alg_writerframes/main/sw/source/core/layout/paintfrm.cxx?rev=1558622&r1=1558621&r2=1558622&view=diff
==============================================================================
--- 
openoffice/branches/alg_writerframes/main/sw/source/core/layout/paintfrm.cxx 
(original)
+++ 
openoffice/branches/alg_writerframes/main/sw/source/core/layout/paintfrm.cxx 
Thu Jan 16 00:03:09 2014
@@ -3422,6 +3422,10 @@ sal_Bool SwFlyFrm::IsBackgroundTranspare
             {
                 bBackgroundTransparent = sal_True;
             }
+            else if(aFillAttributes.get() && aFillAttributes->isUsed()) //UUUU
+            {
+                bBackgroundTransparent = aFillAttributes->isTransparent();
+            }
             else if ( pBackgrdBrush )
             {
                 if ( (pBackgrdBrush->GetColor().GetTransparency() != 0) &&
@@ -3441,10 +3445,6 @@ sal_Bool SwFlyFrm::IsBackgroundTranspare
                     }
                 }
             }
-            else if(aFillAttributes.get() && aFillAttributes->isUsed())
-            {
-                bBackgroundTransparent = aFillAttributes->isTransparent();
-            }
         }
     }