[Libreoffice-commits] core.git: Branch 'feature/OperationSmiley' - svx/source

[Armin Le Grand (CIB)]

 svx/source/customshapes/EnhancedCustomShapeEngine.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e739d02af4d8cf299753c0884255a63ad5037cf9
Author: Armin Le Grand <Armin.Le.Grand at cib.de (CIB)>
Date:   Fri Mar 16 18:17:54 2018 +0100

    OperationSmiley: Corrected shadowing of local variables
    
    Change-Id: I7826c7d80ca822cd8211cbf9444f21c3bcfaf6aa

diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 899ea6e03c26..133c008ebc4e 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -205,10 +205,10 @@ SdrObject* EnhancedCustomShapeEngine::ImplForceGroupWithText(
 
             if(bIsSdrObjCustomShape)
             {
-                SdrObjCustomShape& rSdrObjCustomShape(
+                SdrObjCustomShape& rSdrObjCustomShape2(
                     static_cast< SdrObjCustomShape& >(
                         *GetSdrObjectFromXShape(mxShape)));
-                EnhancedCustomShape2d aCustomShape2d(rSdrObjCustomShape);
+                EnhancedCustomShape2d aCustomShape2d(rSdrObjCustomShape2);
                 aTextBounds = aCustomShape2d.GetTextRect();
             }