[Libreoffice-commits] core.git: Branch 'feature/sidebar' - sd/source

Armin Le Grand alg at apache.org
Sat May 4 03:10:56 PDT 2013


 sd/source/ui/view/drviews9.cxx |   42 ++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

New commits:
commit 7849b4593dd635f950b2d6faa9ee7c9980a2a657
Author: Armin Le Grand <alg at apache.org>
Date:   Thu Apr 11 13:08:22 2013 +0000

    Related: #i121791# Corrected names for LineDashes, cleaned up resources
    
    (cherry picked from commit f45335265ec5597510bf7a17cf521906c0288b9d)
    
    Change-Id: I7d50a9bc5a17bce792cfd73ab830fd2ef0a17fe9

diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index 243b201..b69db95 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -352,13 +352,13 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
 
                         if (pEntry->GetName () == pName->GetValue ())
                         {
-                            XGradient &rGradient = pEntry->GetGradient ();
+                            XGradient aGradient(pEntry->GetGradient());
 
-                            if (rReq.GetSlot () == SID_SETGRADSTARTCOLOR) rGradient.SetStartColor (aColor);
-                            else rGradient.SetEndColor (aColor);
+                            if (rReq.GetSlot () == SID_SETGRADSTARTCOLOR) aGradient.SetStartColor (aColor);
+                            else aGradient.SetEndColor (aColor);
 
                             pAttr->Put (XFillStyleItem (XFILL_GRADIENT), XATTR_FILLSTYLE);
-                            pAttr->Put (XFillGradientItem (pName->GetValue (), rGradient), XATTR_FILLGRADIENT);
+                            pAttr->Put (XFillGradientItem (pName->GetValue (), aGradient), XATTR_FILLGRADIENT);
                             break;
                         }
                     }
@@ -413,12 +413,12 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
 
                         if (pEntry->GetName () == pName->GetValue ())
                         {
-                            XHatch &rHatch = pEntry->GetHatch ();
+                            XHatch aHatch(pEntry->GetHatch());
 
-                            rHatch.SetColor (aColor);
+                            aHatch.SetColor (aColor);
 
                             pAttr->Put (XFillStyleItem (XFILL_HATCH), XATTR_FILLSTYLE);
-                            pAttr->Put (XFillHatchItem (pName->GetValue (), rHatch), XATTR_FILLHATCH);
+                            pAttr->Put (XFillHatchItem (pName->GetValue (), aHatch), XATTR_FILLHATCH);
                             break;
                         }
                     }
@@ -527,18 +527,18 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
 
                             if (pEntry->GetName () == pName->GetValue ())
                             {
-                                XGradient &rGradient = pEntry->GetGradient ();
+                                XGradient aGradient(pEntry->GetGradient());
 
-                                rGradient.SetGradientStyle ((XGradientStyle) pStyle->GetValue ());
-                                rGradient.SetAngle (pAngle->GetValue () * 10);
-                                rGradient.SetBorder ((short) pBorder->GetValue ());
-                                rGradient.SetXOffset ((short) pCenterX->GetValue ());
-                                rGradient.SetYOffset ((short) pCenterY->GetValue ());
-                                rGradient.SetStartIntens ((short) pStart->GetValue ());
-                                rGradient.SetEndIntens ((short) pEnd->GetValue ());
+                                aGradient.SetGradientStyle ((XGradientStyle) pStyle->GetValue ());
+                                aGradient.SetAngle (pAngle->GetValue () * 10);
+                                aGradient.SetBorder ((short) pBorder->GetValue ());
+                                aGradient.SetXOffset ((short) pCenterX->GetValue ());
+                                aGradient.SetYOffset ((short) pCenterY->GetValue ());
+                                aGradient.SetStartIntens ((short) pStart->GetValue ());
+                                aGradient.SetEndIntens ((short) pEnd->GetValue ());
 
                                 pAttr->Put (XFillStyleItem (XFILL_GRADIENT), XATTR_FILLSTYLE);
-                                pAttr->Put (XFillGradientItem (pName->GetValue (), rGradient), XATTR_FILLGRADIENT);
+                                pAttr->Put (XFillGradientItem (pName->GetValue (), aGradient), XATTR_FILLGRADIENT);
                                 break;
                             }
                         }
@@ -595,14 +595,14 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
 
                             if (pEntry->GetName () == pName->GetValue ())
                             {
-                                XHatch &rHatch = pEntry->GetHatch ();
+                                XHatch aHatch(pEntry->GetHatch());
 
-                                rHatch.SetHatchStyle ((XHatchStyle) pStyle->GetValue ());
-                                rHatch.SetDistance (pDistance->GetValue ());
-                                rHatch.SetAngle (pAngle->GetValue () * 10);
+                                aHatch.SetHatchStyle ((XHatchStyle) pStyle->GetValue ());
+                                aHatch.SetDistance (pDistance->GetValue ());
+                                aHatch.SetAngle (pAngle->GetValue () * 10);
 
                                 pAttr->Put (XFillStyleItem (XFILL_HATCH), XATTR_FILLSTYLE);
-                                pAttr->Put (XFillHatchItem (pName->GetValue (), rHatch), XATTR_FILLHATCH);
+                                pAttr->Put (XFillHatchItem (pName->GetValue (), aHatch), XATTR_FILLHATCH);
                                 break;
                             }
                         }


More information about the Libreoffice-commits mailing list