Formatting and bail-out early (to not re-format too much)

Change-Id: If4c55fe669f7bb861baca0ae224675ca74004de5

sc/source/filter/starcalc/scflt.cxx

@@ -492,9 +492,9 @@ Sc10PatternData::Sc10PatternData(SvStream& rStream)
     rStream.Read(Reserved, sizeof(Reserved));
 }
 
-Sc10PatternCollection::Sc10PatternCollection(SvStream& rStream) :
-  ScCollection (4, 4),
-  nError     (0)
+Sc10PatternCollection::Sc10PatternCollection(SvStream& rStream)
+    : ScCollection(4, 4)
+    , nError(0)
 {
     sal_uInt16 ID;
     rStream.ReadUInt16( ID );
@@ -551,9 +551,9 @@ Sc10DataBaseData::Sc10DataBaseData(SvStream& rStream)
     DataBaseRec.QueryValue2 = ScfTools::ReadLongDouble(rStream);
 }
 
-Sc10DataBaseCollection::Sc10DataBaseCollection(SvStream& rStream) :
-  ScCollection (4, 4),
-  nError     (0)
+Sc10DataBaseCollection::Sc10DataBaseCollection(SvStream& rStream)
+    : ScCollection(4, 4)
+    , nError(0)
 {
     sal_uInt16 ID;
     rStream.ReadUInt16( ID );
@@ -1698,8 +1698,9 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
     if (nError == 0) LoadAttr(aFlag);
     if (nError == 0) LoadAttr(aPattern);
 
-    if (nError == 0)
-    {
+    if (nError)
+        return;
+
     SCROW nStart;
     SCROW nEnd;
     sal_uInt16 i;
@@ -2121,7 +2122,6 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
         }
         nStart = nEnd + 1;
     }
-  }
 }
 
 void Sc10Import::LoadAttr(Sc10ColAttr& rAttr)
@@ -2299,7 +2299,8 @@ void Sc10Import::LoadObjects()
 {
     sal_uInt16 ID;
     rStream.ReadUInt16( ID );
-  if (rStream.IsEof()) return;
+    if (rStream.IsEof())
+        return;
     if (ID == ObjectID)
     {
         sal_uInt16 nAnz;
@@ -2380,8 +2381,8 @@ void Sc10Import::LoadObjects()
 
                             delete pTypeData;
                         }
-          }
                         break;
+                    }
                     default :
                         nError = errUnknownFormat;
                         break;

sot/source/sdstor/ucbstorage.cxx

@@ -518,7 +518,11 @@ public:
     void                        ReadContent();
     void                        CreateContent();
     ::ucbhelper::Content*       GetContent()
-                                { if ( !m_pContent ) CreateContent(); return m_pContent; }
+                                {
+                                    if ( !m_pContent )
+                                        CreateContent();
+                                    return m_pContent;
+                                }
     UCBStorageElementList_Impl& GetChildrenList()
                                 {
                                     long nError = m_nError;
@@ -532,7 +536,6 @@ public:
                                             m_pAntiImpl->SetError( nError );
                                         }
                                     }
-
                                     return m_aChildrenList;
                                 }
 
@@ -661,8 +664,7 @@ UCBStorageStream_Impl::UCBStorageStream_Impl( const OUString& rName, StreamMode
 
         if ( bRepair )
         {
-            xComEnv = new ::ucbhelper::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(),
-                                                     xProgress );
+            xComEnv = new ::ucbhelper::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(), xProgress );
             aTemp += "?repairpackage";
         }