[Libreoffice-commits] core.git: sc/source

Samuel Mehrbrodt (via logerrit) logerrit at kemper.freedesktop.org
Thu Aug 5 10:51:52 UTC 2021


 sc/source/filter/xcl97/xcl97esc.cxx |   61 ++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 30 deletions(-)

New commits:
commit 94b45e3b74e889a65fc619d1132cfa6e4af44ba7
Author:     Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
AuthorDate: Thu Aug 5 11:07:54 2021 +0200
Commit:     Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
CommitDate: Thu Aug 5 12:51:18 2021 +0200

    Format ShapeInteractionHelper::PopulateShapeInteractionInfo
    
    It has weird intentation, 2/3 spaces instead of 4.
    Apply clang-format just to this method.
    
    Change-Id: If976ef9701e17448c7f527e1792a85dcaad8fa07
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120063
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>

diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx
index cef0b52a6b48..bc7c70c46e56 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -540,37 +540,38 @@ ShapeInteractionHelper::CreateShapeObj( XclExpObjectManager& rObjMgr, const Refe
     return new XclExpShapeObj( rObjMgr, xShape, pDoc );
 }
 
-void
-ShapeInteractionHelper::PopulateShapeInteractionInfo( const XclExpObjectManager& rObjMgr, const Reference< XShape >& xShape, EscherExHostAppData& rHostAppData )
+void ShapeInteractionHelper::PopulateShapeInteractionInfo(const XclExpObjectManager& rObjMgr,
+                                                          const Reference<XShape>& xShape,
+                                                          EscherExHostAppData& rHostAppData)
 {
-   try
-   {
-      SvMemoryStream* pMemStrm = nullptr;
-      OUString sHyperLink;
-      OUString sMacro;
-      SdrObject* pObj = GetSdrObjectFromXShape( xShape );
-      if (pObj)
-        sHyperLink = pObj->getHyperlink();
-      if ( ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo( pObj ) )
-      {
-         sMacro = pInfo->GetMacro();
-      }
-      if (  !sHyperLink.isEmpty() )
-      {
-         pMemStrm = new SvMemoryStream();
-         XclExpStream tmpStream( *pMemStrm, rObjMgr.GetRoot() );
-         ScAddress dummyAddress;
-         SvxURLField aUrlField;
-         aUrlField.SetURL( sHyperLink );
-         XclExpHyperlink hExpHlink( rObjMgr.GetRoot(), aUrlField, dummyAddress );
-         hExpHlink.WriteEmbeddedData( tmpStream );
-      }
-      if ( !sHyperLink.isEmpty() || !sMacro.isEmpty() )
-          rHostAppData.SetInteractionInfo( new InteractionInfo( pMemStrm ) );
-   }
-   catch( Exception& )
-   {
-   }
+    try
+    {
+        SvMemoryStream* pMemStrm = nullptr;
+        OUString sHyperLink;
+        OUString sMacro;
+        SdrObject* pObj = GetSdrObjectFromXShape(xShape);
+        if (pObj)
+            sHyperLink = pObj->getHyperlink();
+        if (ScMacroInfo* pInfo = ScDrawLayer::GetMacroInfo(pObj))
+        {
+            sMacro = pInfo->GetMacro();
+        }
+        if (!sHyperLink.isEmpty())
+        {
+            pMemStrm = new SvMemoryStream();
+            XclExpStream tmpStream(*pMemStrm, rObjMgr.GetRoot());
+            ScAddress dummyAddress;
+            SvxURLField aUrlField;
+            aUrlField.SetURL(sHyperLink);
+            XclExpHyperlink hExpHlink(rObjMgr.GetRoot(), aUrlField, dummyAddress);
+            hExpHlink.WriteEmbeddedData(tmpStream);
+        }
+        if (!sHyperLink.isEmpty() || !sMacro.isEmpty())
+            rHostAppData.SetInteractionInfo(new InteractionInfo(pMemStrm));
+    }
+    catch (Exception&)
+    {
+    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list