Minimize scope of variables

Change-Id: I6602c84b9bd7143e5e7b224c17559b083c9b7f9c
Reviewed-on: https://gerrit.libreoffice.org/71439
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>

starmath/source/ElementsDockingWindow.cxx

@@ -334,8 +334,6 @@ void SmElementsControl::LayoutOrPaintContents(vcl::RenderContext *pContext)
         }
         else
         {
-            Size aSizePixel = LogicToPixel(Size(element->getNode()->GetWidth(),
-                                                element->getNode()->GetHeight()));
             if (mbVerticalMode)
             {
                 if (y + boxY > nControlHeight)
@@ -363,14 +361,17 @@ void SmElementsControl::LayoutOrPaintContents(vcl::RenderContext *pContext)
                 pContext->Pop();
             }
 
-            Point location(x + ((boxX - aSizePixel.Width()) / 2),
-                           y + ((boxY - aSizePixel.Height()) / 2));
+            element->mBoxLocation = Point(x,y);
+            element->mBoxSize = Size(boxX, boxY);
 
             if (pContext)
+            {
+                Size aSizePixel = LogicToPixel(Size(element->getNode()->GetWidth(),
+                                                    element->getNode()->GetHeight()));
+                Point location(x + ((boxX - aSizePixel.Width()) / 2),
+                               y + ((boxY - aSizePixel.Height()) / 2));
                 SmDrawingVisitor(*pContext, PixelToLogic(location), element->getNode().get());
-
-            element->mBoxLocation = Point(x,y);
-            element->mBoxSize = Size(boxX, boxY);
+            }
 
             if (mbVerticalMode)
                 y += boxY;

vcl/source/outdev/text.cxx

@@ -1264,14 +1264,15 @@ std::unique_ptr<SalLayout> OutputDevice::ImplLayout(const OUString& rOrigStr,
         pLayoutCache = nullptr; // don't use cache with modified string!
         pGlyphs = nullptr;
     }
+
     DeviceCoordinate nPixelWidth = static_cast<DeviceCoordinate>(nLogicalWidth);
-    std::unique_ptr<DeviceCoordinate[]> xDXPixelArray;
-    DeviceCoordinate* pDXPixelArray(nullptr);
     if( nLogicalWidth && mbMap )
     {
         nPixelWidth = LogicWidthToDeviceCoordinate( nLogicalWidth );
     }
 
+    std::unique_ptr<DeviceCoordinate[]> xDXPixelArray;
+    DeviceCoordinate* pDXPixelArray(nullptr);
     if( pDXArray)
     {
         if(mbMap)